Changeset 6367 for luci/trunk/libs/core/luasrc/model/network.lua

Timestamp:

10/30/10 18:56:06 (3 years ago)

Author:

jow

Message:

libs/core: use imatch() in firewall and network model

Files:

• luci/trunk/libs/core/luasrc/model/network.lua (modified) (3 diffs)

luci/trunk/libs/core/luasrc/model/network.lua

@@ -92 +92 @@
         return s1
     end
-end
-
-function _strlist(x)
-    if x == nil then
-        x = ""
-    elseif type(x) == "table" then
-        x = table.concat(x, " ")
-    end
-
-    return x:gmatch("%S+")
 end
 
@@ -620 +610 @@
     else
         local nfs = { }
-        for ifn in _strlist(self:get("ifname")) do
+        for ifn in utl.imatch(self:get("ifname")) do
             ifn = ifn:match("[^:]+")
             nfs[ifn] = interface(ifn)
@@ -662 +652 @@
         return ifname == ifn
     else
-        for ifn in _strlist(self:get("ifname")) do
+        for ifn in utl.imatch(self:get("ifname")) do
             ifn = ifn:match("[^:]+")
             if ifn == ifname then