* 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 12031ff..c47a898 100644 (file)
--- a/src/ffluci/util.lua
+++ b/src/ffluci/util.lua
@@ -36,7 +36,10 @@ function class(base)
                setmetatable(inst, {__index = class})
                
                if inst.__init__ then
-                       inst:__init__(...)
+                       local stat, err = pcall(inst.__init__, inst, ...)
+                       if not stat then
+                               error(err)
+                       end
                end
                
                return inst
@@ -53,6 +56,23 @@ function class(base)
 end
 
 
+-- Clones an object (deep on-demand)
+function clone(object, deep)
+       local copy = {}
+       
+       for k, v in pairs(object) do
+               if deep and type(v) == "table" then
+                       v = clone(v, deep)
+               end
+               copy[k] = v
+       end
+       
+       setmetatable(copy, getmetatable(object))
+       
+       return copy
+end
+
+
 -- Checks whether a table has an object "value" in it
 function contains(table, value)
        for k,v in pairs(table) do
@@ -114,7 +134,6 @@ end
 function extfenv(f, key, obj)
        local scope = getfenv(f)
        scope[key] = obj
-       setfenv(f, scope)
 end
 
 
@@ -131,35 +150,78 @@ 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)
+       setfenv(f, clone(getfenv(f)))
+end 
+
+
+-- Returns the Haserl unique sessionid
+function sessionid()
+       return ENV.SESSIONID
+end
+
+
+-- Splits a string into an array (Taken from lua-users.org)
+function split(str, pat)
+       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
-       setfenv(f, scope)
+       update(getfenv(f), extscope)
 end
 
 
 -- Validates a variable
-function validate(value, cast_number, cast_int, valid)
+function validate(value, cast_number, cast_int)
        if cast_number or cast_int then
                value = tonumber(value)
        end
        
-       if cast_int and not(value % 1 == 0) then
+       if cast_int and value and not(value % 1 == 0) then
                value = nil
        end
        
-       
-       if type(valid) == "function" then
-               value = valid(value)
-       elseif type(valid) == "table" then
-               if not ffluci.util.contains(valid, value) then
-                       value = nil
-               end
-       end
-       
        return value
 end