libs/web: fix "port" datatype to allow port 0

[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 53a3454..b543d9f 100644 (file)
--- a/libs/web/luasrc/cbi/datatypes.lua
+++ b/libs/web/luasrc/cbi/datatypes.lua
@@ -35,7 +35,7 @@ function bool(val)
        return false
 end
 
-function uint(val)
+function uinteger(val)
        local n = tonumber(val)
        if n ~= nil and math.floor(n) == n and n >= 0 then
                return true
@@ -44,7 +44,7 @@ function uint(val)
        return false
 end
 
-function int(val)
+function integer(val)
        local n = tonumber(val)
        if n ~= nil and math.floor(n) == n then
                return true
@@ -53,6 +53,11 @@ function int(val)
        return false
 end
 
+function ufloat(val)
+       local n = tonumber(val)
+       return ( n ~= nil and n >= 0 )
+end
+
 function float(val)
        return ( tonumber(val) ~= nil )
 end
@@ -89,7 +94,7 @@ end
 
 function port(val)
        val = tonumber(val)
-       return ( val and val >= 1 and val <= 65535 )
+       return ( val and val >= 0 and val <= 65535 )
 end
 
 function portrange(val)
@@ -122,10 +127,9 @@ function macaddr(val)
 end
 
 function hostname(val)
-       if val and val:match("[a-zA-Z0-9_][a-zA-Z0-9_%-%.]*") then
-               return true     -- XXX: ToDo: need better solution
+       if val and (#val < 254) and val.match(val, "^[a-zA-Z0-9][a-zA-Z0-9%-%.]*[a-zA-Z0-9]$") then
+               return true
        end
-
        return false
 end
 
@@ -149,7 +153,7 @@ function wepkey(val)
        if (#val == 10) or (#val == 26) then
                return (val:match("^[a-fA-F0-9]+$") ~= nil)
        else
-               return (#v == 5) or (#v == 13)
+               return (#val == 5) or (#val == 13)
        end
 end
 
@@ -204,3 +208,19 @@ function device( val, seen )
 
        return false
 end
+
+function uciname(val)
+       return (val:match("^[a-zA-Z0-9_]+$") ~= nil)
+end
+
+function range(val, min, max)
+       val = tonumber(val)
+       min = tonumber(min)
+       max = tonumber(max)
+
+       if val ~= nil and min ~= nil and max ~= nil then
+               return ((val >= min) and (val <= max))
+       end
+
+       return false
+end