treewide: switch firewall zone, network and iface lists to dropdown code

Also switch the weekday and monthday lists in the firewall rule details to
cbi dropdowns, vastly uncluttering the form.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

3 files changed, 27 insertions, 36 deletions

diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua
index 38e5de7b39..5c630bb5ce 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua
@@ -351,7 +351,6 @@ if has_firewall then
 
 	fwzone.template = "cbi/firewall_zonelist"
 	fwzone.network = arg[1]
-	fwzone.rmempty = false
 
 	function fwzone.cfgvalue(self, section)
 		self.iface = section
@@ -360,22 +359,16 @@ if has_firewall then
 	end
 
 	function fwzone.write(self, section, value)
-		local zone = fw:get_zone(value)
-
-		if not zone and value == '-' then
-			value = m:formvalue(self:cbid(section) .. ".newzone")
-			if value and #value > 0 then
-				zone = fw:add_zone(value)
-			else
-				fw:del_network(section)
-			end
-		end
-
+		local zone = fw:get_zone(value) or fw:add_zone(value)
 		if zone then
 			fw:del_network(section)
 			zone:add_network(section)
 		end
 	end
+
+	function fwzone.remove(self, section)
+		fw:del_network(section)
+	end
 end
 
 
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua
index cacaa25958..d51a72aba1 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -390,22 +390,16 @@ network.novirtual = true
 function network.write(self, section, value)
 	local i = nw:get_interface(section)
 	if i then
-		if value == '-' then
-			value = m:formvalue(self:cbid(section) .. ".newnet")
-			if value and #value > 0 then
-				local n = nw:add_network(value, {proto="none"})
-				if n then n:add_interface(i) end
-			else
-				local n = i:get_network()
-				if n then n:del_interface(i) end
-			end
-		else
-			local v
-			for _, v in ipairs(i:get_networks()) do
-				v:del_interface(i)
-			end
-			for v in ut.imatch(value) do
-				local n = nw:get_network(v)
+		local _, net, old, new = nil, nil, {}, {}
+
+		for _, net in ipairs(i:get_networks()) do
+			old[net:name()] = true
+		end
+
+		for net in ut.imatch(value) do
+			new[net] = true
+			if not old[net] then
+				local n = nw:get_network(net) or nw:add_network(net, { proto = "none" })
 				if n then
 					if not n:is_empty() then
 						n:set("type", "bridge")
@@ -414,6 +408,15 @@ function network.write(self, section, value)
 				end
 			end
 		end
+
+		for net, _ in pairs(old) do
+			if not new[net] then
+				local n = nw:get_network(net)
+				if n then
+					n:del_interface(i)
+				end
+			end
+		end
 	end
 end
 
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua
index 8277deb2f6..e8a3058826 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua
@@ -94,14 +94,9 @@ function newnet.parse(self, section)
 	local net, zone
 
 	if has_firewall then
-		local zval  = fwzone:formvalue(section)
-		zone = fw:get_zone(zval)
-
-		if not zone and zval == '-' then
-			zval = m:formvalue(fwzone:cbid(section) .. ".newzone")
-			if zval and #zval > 0 then
-				zone = fw:add_zone(zval)
-			end
+		local value = fwzone:formvalue(section)
+		if value and #value > 0 then
+			zone = fw:get_zone(value) or fw:add_zone(value)
 		end
 	end