applications/luci-firewall: cope with both tables and strings when processing zone...

[project/luci.git] / applications / luci-firewall / luasrc / model / cbi / firewall / rule-details.lua

diff --git a/applications/luci-firewall/luasrc/model/cbi/firewall/rule-details.lua b/applications/luci-firewall/luasrc/model/cbi/firewall/rule-details.lua
index 8a8ac32..d29879c 100644 (file)
--- a/applications/luci-firewall/luasrc/model/cbi/firewall/rule-details.lua
+++ b/applications/luci-firewall/luasrc/model/cbi/firewall/rule-details.lua
@@ -13,6 +13,7 @@ You may obtain a copy of the License at
 ]]--
 
 local sys = require "luci.sys"
+local utl = require "luci.util"
 local dsp = require "luci.dispatcher"
 local nxo = require "nixio"
 
@@ -62,7 +63,7 @@ elseif rule_type == "redirect" then
                        local n = s.network or s.name
                        if n then
                                local i
-                               for i in n:gmatch("%S+") do
+                               for i in utl.imatch(n) do
                                        if i == "wan" then
                                                wan_zone = s.name
                                                return false
@@ -106,16 +107,6 @@ elseif rule_type == "redirect" then
        o.template = "cbi/firewall_zonelist"
 
 
-       o = s:option(DynamicList, "src_mac", translate("Source MAC address"))
-       o.rmempty = true
-       o.datatype = "neg(macaddr)"
-       o.placeholder = translate("any")
-
-       luci.sys.net.mac_hints(function(mac, name)
-               o:value(mac, "%s (%s)" %{ mac, name })
-       end)
-
-
        o = s:option(Value, "src_ip", translate("Source IP address"))
        o.rmempty = true
        o.datatype = "neg(ipaddr)"
@@ -156,7 +147,7 @@ elseif rule_type == "redirect" then
 
        o.rmempty = true
        o.placeholder = translate("any")
-       o.datatype = "portrange"
+       o.datatype = "neg(portrange)"
 
 
        o = s:option(Value, "src_dip",