libs/web: add new datatypes min(...), max(...) and neg_network_ip4addr

[project/luci.git] / libs / web / luasrc / cbi / datatypes.lua

diff --git a/libs/web/luasrc/cbi/datatypes.lua b/libs/web/luasrc/cbi/datatypes.lua
index d4603cf..6640db6 100644 (file)
--- a/libs/web/luasrc/cbi/datatypes.lua
+++ b/libs/web/luasrc/cbi/datatypes.lua
@@ -227,6 +227,13 @@ function uciname(val)
        return (val:match("^[a-zA-Z0-9_]+$") ~= nil)
 end
 
+function neg_network_ip4addr(val)
+       if type(v) == "string" then
+               v = v:gsub("^%s*!", "")
+               return (uciname(v) or ip4addr(v))
+       end     
+end
+
 function range(val, min, max)
        val = tonumber(val)
        min = tonumber(min)
@@ -238,3 +245,25 @@ function range(val, min, max)
 
        return false
 end
+
+function min(val, min)
+       val = tonumber(val)
+       min = tonumber(min)
+
+       if val ~= nil and min ~= nil then
+               return (val >= min)
+       end
+
+       return false
+end
+
+function max(val, max)
+       val = tonumber(val)
+       max = tonumber(max)
+
+       if val ~= nil and max ~= nil then
+               return (val <= max)
+       end
+
+       return false
+end