modules/admin-full: Correctly unload firewall config in network configuration page

[project/luci.git] / modules / admin-full / luasrc / model / cbi / admin_network / ifaces.lua

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
index 9065636..7166312 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
@@ -12,11 +12,11 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
+require("luci.tools.webadmin")
 arg[1] = arg[1] or ""
-
 m = Map("network", translate("interfaces"), translate("a_n_ifaces1"))
 
-s = m:section(NamedSection, arg[1], "interface", translate("interfaces"))
+s = m:section(NamedSection, arg[1], "interface")
 s.addremove = true
 
 p = s:option(ListValue, "proto", translate("protocol"))
@@ -38,6 +38,50 @@ for i,d in ipairs(luci.sys.net.devices()) do
        end
 end
 
+local zones = luci.tools.webadmin.network_get_zones(arg[1])
+if zones then 
+       if #zones == 0 then
+               m:chain("firewall")
+               
+               fwzone = s:option(Value, "_fwzone", 
+                       translate("network_interface_fwzone"),
+                       translate("network_interface_fwzone_desc"))
+               fwzone.rmempty = true
+               fwzone:value("", "- " .. translate("none") .. " -")
+               fwzone:value(arg[1])
+               luci.model.uci.load_config("firewall")
+               luci.model.uci.foreach("firewall", "zone",
+                       function (section)
+                               fwzone:value(section.name)
+                       end
+               )
+               
+               function fwzone.write(self, section, value)     
+                       local zone = luci.tools.webadmin.firewall_find_zone(value)
+                       local stat
+                       
+                       if not zone then
+                               stat = luci.model.uci.section("firewall", "zone", nil, {
+                                       name = value,
+                                       network = section
+                               })
+                       else
+                               local net = luci.model.uci.get("firewall", zone, "network")
+                               net = (net or value) .. " " .. section
+                               stat = luci.model.uci.set("firewall", zone, "network", net)
+                       end
+                       
+                       if stat then
+                               self.render = function() end
+                       end
+               end
+       else
+               fwzone = s:option(DummyValue, "_fwzone", translate("zone"))
+               fwzone.value = table.concat(zones, ", ")
+       end
+       fwzone.titleref = luci.dispatcher.build_url("admin", "network", "firewall", "zones")
+       luci.model.uci.unload("firewall")
+end
 
 ipaddr = s:option(Value, "ipaddr", translate("ipaddress"))
 ipaddr.rmempty = true
@@ -77,29 +121,36 @@ mtu.isinteger = true
 mac = s:option(Value, "macaddr", translate("macaddress"))
 mac.optional = true
 
+
+srv = s:option(Value, "server", translate("network_interface_server"))
+srv:depends("proto", "pptp")
+srv.rmempty = true
+
 user = s:option(Value, "username", translate("username"))
 user.rmempty = true
 user:depends("proto", "pptp")
-user:depends("proto", "ppoe")
+user:depends("proto", "pppoe")
 
 pass = s:option(Value, "password", translate("password"))
 pass.rmempty = true
 pass:depends("proto", "pptp")
-pass:depends("proto", "ppoe")
+pass:depends("proto", "pppoe")
 
-ka = s:option(Value, "keepalive")
+ka = s:option(Value, "keepalive",
+ translate("network_interface_keepalive"),
+ translate("network_interface_keepalive_desc")
+)
 ka.rmempty = true
 ka:depends("proto", "pptp")
-ka:depends("proto", "ppoe")
+ka:depends("proto", "pppoe")
 
-demand = s:option(Value, "demand")
+demand = s:option(Value, "demand", 
+ translate("network_interface_demand"),
+ translate("network_interface_demand_desc")
+)
 demand.rmempty = true
 demand:depends("proto", "pptp")
-demand:depends("proto", "ppoe")
-
-srv = s:option(Value, "server")
-srv:depends("proto", "pptp")
-srv.rmempty = true
+demand:depends("proto", "pppoe")