* Replaced luafilesystem with luaposix library

[project/luci.git] / src / ffluci / util.lua

diff --git a/src/ffluci/util.lua b/src/ffluci/util.lua
index 082310f..c47a898 100644 (file)
--- a/src/ffluci/util.lua
+++ b/src/ffluci/util.lua
@@ -150,11 +150,19 @@ function instanceof(object, class)
 end
 
 
+-- Creates valid XML PCDATA from a string
+function pcdata(value)
+       value = value:gsub("&", "&")        
+       value = value:gsub('"', """)
+       value = value:gsub("'", "'")
+       value = value:gsub("<", "&lt;") 
+       return value:gsub(">", "&gt;")
+end
+
+
 -- Resets the scope of f doing a shallow copy of its scope into a new table
 function resfenv(f)
-       local scope = getfenv(f)
-       setfenv(f, {})
-       updfenv(f, scope)
+       setfenv(f, clone(getfenv(f)))
 end 
 
 
@@ -166,36 +174,46 @@ end
 
 -- Splits a string into an array (Taken from lua-users.org)
 function split(str, pat)
-   local t = {}
-   local fpat = "(.-)" .. pat
-   local last_end = 1
-   local s, e, cap = str:find(fpat, 1)
-   while s do
-      if s ~= 1 or cap ~= "" then
-        table.insert(t,cap)
-      end
-      last_end = e+1
-      s, e, cap = str:find(fpat, last_end)
-   end
-   if last_end <= #str then
-      cap = str:sub(last_end)
-      table.insert(t, cap)
-   end
-   return t
+       pat = pat or "\n"
+       
+       local t = {}
+       local fpat = "(.-)" .. pat
+       local last_end = 1
+       local s, e, cap = str:find(fpat, 1)
+       
+       while s do
+               if s ~= 1 or cap ~= "" then
+                       table.insert(t,cap)
+               end
+               last_end = e+1
+               s, e, cap = str:find(fpat, last_end)
+       end
+       
+       if last_end <= #str then
+               cap = str:sub(last_end)
+               table.insert(t, cap)
+       end
+       
+       return t
+end
+
+
+-- Updates given table with new values
+function update(t, updates)
+       for k, v in pairs(updates) do
+               t[k] = v
+       end     
 end
 
 
 -- Updates the scope of f with "extscope"
 function updfenv(f, extscope)
-       local scope = getfenv(f)
-       for k, v in pairs(extscope) do
-               scope[k] = v
-       end
+       update(getfenv(f), extscope)
 end
 
 
 -- Validates a variable
-function validate(value, valid, cast_number, cast_int)
+function validate(value, cast_number, cast_int)
        if cast_number or cast_int then
                value = tonumber(value)
        end
@@ -204,15 +222,6 @@ function validate(value, valid, cast_number, cast_int)
                value = nil
        end
        
-       
-       if type(valid) == "function" then
-               value = valid(value)
-       elseif type(valid) == "table" then
-               if not contains(valid, value) then
-                       value = nil
-               end
-       end
-       
        return value
 end