libs/web: remove debugging code

[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..71f4a2a 100644 (file)
--- a/libs/web/luasrc/cbi/datatypes.lua
+++ b/libs/web/luasrc/cbi/datatypes.lua
@@ -17,12 +17,63 @@ local fs = require "nixio.fs"
 local ip = require "luci.ip"
 local math = require "math"
 local util = require "luci.util"
-local tonumber, type = tonumber, type
+local tonumber, type, unpack, select = tonumber, type, unpack, select
 
 
 module "luci.cbi.datatypes"
 
 
+_M['or'] = function(v, ...)
+       local i
+       for i = 1, select('#', ...), 2 do
+               local f = select(i, ...)
+               local a = select(i+1, ...)
+               if type(f) ~= "function" then
+                       if f == v then
+                               return true
+                       end
+                       i = i - 1
+               elseif f(v, unpack(a)) then
+                       return true
+               end
+       end
+       return false
+end
+
+_M['and'] = function(v, ...)
+       local i
+       for i = 1, select('#', ...), 2 do
+               local f = select(i, ...)
+               local a = select(i+1, ...)
+               if type(f) ~= "function" then
+                       if f ~= v then
+                               return false
+                       end
+                       i = i - 1
+               elseif not f(v, unpack(a)) then
+                       return false
+               end
+       end
+       return true
+end
+
+function neg(v, ...)
+       return _M['or'](v:gsub("^%s*!%s*", ""), ...)
+end
+
+function list(v, subvalidator, subargs)
+       if type(subvalidator) ~= "function" then
+               return false
+       end
+       local token
+       for token in v:gmatch("%S+") do
+               if not subvalidator(token, unpack(subargs)) then
+                       return false
+               end
+       end
+       return true
+end
+
 function bool(val)
        if val == "1" or val == "yes" or val == "on" or val == "true" then
                return true
@@ -66,13 +117,6 @@ function ipaddr(val)
        return ip4addr(val) or ip6addr(val)
 end
 
-function neg_ipaddr(v)
-       if type(v) == "string" then
-               v = v:gsub("^%s*!", "")
-       end
-       return v and ipaddr(v)
-end
-
 function ip4addr(val)
        if val then
                return ip.IPv4(val) and true or false
@@ -81,13 +125,6 @@ function ip4addr(val)
        return false
 end
 
-function neg_ip4addr(v)
-       if type(v) == "string" then
-               v = v:gsub("^%s*!", "")
-       end
-               return v and ip4addr(v)
-end
-
 function ip4prefix(val)
        val = tonumber(val)
        return ( val and val >= 0 and val <= 32 )
@@ -141,7 +178,11 @@ function macaddr(val)
 end
 
 function hostname(val)
-       if val and (#val < 254) and val.match(val, "^[a-zA-Z0-9][a-zA-Z0-9%-%.]*[a-zA-Z0-9]$") then
+       if val and (#val < 254) and (
+          val:match("^[a-zA-Z]+$") or
+          (val:match("^[a-zA-Z0-9][a-zA-Z0-9%-%.]*[a-zA-Z0-9]$") and
+           val:match("[^0-9%.]"))
+       ) then
                return true
        end
        return false
@@ -151,6 +192,10 @@ function host(val)
        return hostname(val) or ipaddr(val)
 end
 
+function network(val)
+       return uciname(val) or host(val)
+end
+
 function wpakey(val)
        if #val == 64 then
                return (val:match("^[a-fA-F0-9]+$") ~= nil)
@@ -238,3 +283,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