* CBI: updates

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

diff --git a/src/ffluci/util.lua b/src/ffluci/util.lua
index 6e0d8675a3740d56c2a68dafbae868e3d92034ca..38f33a20d46f224cddf049d7ffab548c1d8bfb9e 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
@@ -92,6 +95,7 @@ function exec(command)
        return data
 end
 
+
 -- Runs "command" and returns its output as a array of lines
 function execl(command)
        local pp   = io.popen(command)  
@@ -108,23 +112,72 @@ function execl(command)
        return data
 end
 
+
 -- Populate obj in the scope of f as key 
 function extfenv(f, key, obj)
        local scope = getfenv(f)
        scope[key] = obj
-       setfenv(f, scope)
 end
 
 
+-- Checks whether an object is an instanceof class
+function instanceof(object, class)
+       local meta = getmetatable(object)
+    while meta and meta.__index do 
+       if meta.__index == class then
+               return true
+       end
+        meta = getmetatable(meta.__index)
+    end
+    return false       
+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)
+end 
+
+
+-- Returns the Haserl unique sessionid
+function sessionid()
+       return ENV.SESSIONID
+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)
 end
 
+
+-- Validates a variable
+function validate(value, cast_number, cast_int, valid)
+       if cast_number or cast_int then
+               value = tonumber(value)
+       end
+       
+       if cast_int and not(value % 1 == 0) then
+               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
+
+
 -- Returns the filename of the calling script
 function __file__()
        return debug.getinfo(2, 'S').source:sub(2)