X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fbase%2Fluasrc%2Fluasrc%2Fcbi%2Fdatatypes.lua;fp=modules%2Fbase%2Fluasrc%2Fluasrc%2Fcbi%2Fdatatypes.lua;h=0000000000000000000000000000000000000000;hp=c5f4ec0f0dfe0f3eac63c0ed0e1606a1ea953a7b;hb=d4dc08dcb219a278a94e68aa87c13bca6361eeca;hpb=8c866ce4527f22d413fca3a46691ea31c58154c5;ds=sidebyside

diff --git a/modules/base/luasrc/luasrc/cbi/datatypes.lua b/modules/base/luasrc/luasrc/cbi/datatypes.lua
deleted file mode 100644
index c5f4ec0f0..000000000
--- a/modules/base/luasrc/luasrc/cbi/datatypes.lua
+++ /dev/null
@@ -1,345 +0,0 @@
---[[
-
-LuCI - Configuration Bind Interface - Datatype Tests
-(c) 2010 Jo-Philipp Wich <xm@subsignal.org>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-$Id$
-
-]]--
-
-local fs = require "nixio.fs"
-local ip = require "luci.ip"
-local math = require "math"
-local util = require "luci.util"
-local tonumber, tostring, type, unpack, select = tonumber, tostring, 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
-	elseif val == "0" or val == "no" or val == "off" or val == "false" then
-		return true
-	elseif val == "" or val == nil then
-		return true
-	end
-
-	return false
-end
-
-function uinteger(val)
-	local n = tonumber(val)
-	if n ~= nil and math.floor(n) == n and n >= 0 then
-		return true
-	end
-
-	return false
-end
-
-function integer(val)
-	local n = tonumber(val)
-	if n ~= nil and math.floor(n) == n then
-		return true
-	end
-
-	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
-
-function ipaddr(val)
-	return ip4addr(val) or ip6addr(val)
-end
-
-function ip4addr(val)
-	if val then
-		return ip.IPv4(val) and true or false
-	end
-
-	return false
-end
-
-function ip4prefix(val)
-	val = tonumber(val)
-	return ( val and val >= 0 and val <= 32 )
-end
-
-function ip6addr(val)
-	if val then
-		return ip.IPv6(val) and true or false
-	end
-
-	return false
-end
-
-function ip6prefix(val)
-	val = tonumber(val)
-	return ( val and val >= 0 and val <= 128 )
-end
-
-function port(val)
-	val = tonumber(val)
-	return ( val and val >= 0 and val <= 65535 )
-end
-
-function portrange(val)
-	local p1, p2 = val:match("^(%d+)%-(%d+)$")
-	if p1 and p2 and port(p1) and port(p2) then
-		return true
-	else
-		return port(val)
-	end
-end
-
-function macaddr(val)
-	if val and val:match(
-		"^[a-fA-F0-9]+:[a-fA-F0-9]+:[a-fA-F0-9]+:" ..
-		 "[a-fA-F0-9]+:[a-fA-F0-9]+:[a-fA-F0-9]+$"
-	) then
-		local parts = util.split( val, ":" )
-
-		for i = 1,6 do
-			parts[i] = tonumber( parts[i], 16 )
-			if parts[i] < 0 or parts[i] > 255 then
-				return false
-			end
-		end
-
-		return true
-	end
-
-	return false
-end
-
-function hostname(val)
-	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
-end
-
-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)
-	else
-		return (#val >= 8) and (#val <= 63)
-	end
-end
-
-function wepkey(val)
-	if val:sub(1, 2) == "s:" then
-		val = val:sub(3)
-	end
-
-	if (#val == 10) or (#val == 26) then
-		return (val:match("^[a-fA-F0-9]+$") ~= nil)
-	else
-		return (#val == 5) or (#val == 13)
-	end
-end
-
-function string(val)
-	return true		-- Everything qualifies as valid string
-end
-
-function directory( val, seen )
-	local s = fs.stat(val)
-	seen = seen or { }
-
-	if s and not seen[s.ino] then
-		seen[s.ino] = true
-		if s.type == "dir" then
-			return true
-		elseif s.type == "lnk" then
-			return directory( fs.readlink(val), seen )
-		end
-	end
-
-	return false
-end
-
-function file( val, seen )
-	local s = fs.stat(val)
-	seen = seen or { }
-
-	if s and not seen[s.ino] then
-		seen[s.ino] = true
-		if s.type == "reg" then
-			return true
-		elseif s.type == "lnk" then
-			return file( fs.readlink(val), seen )
-		end
-	end
-
-	return false
-end
-
-function device( val, seen )
-	local s = fs.stat(val)
-	seen = seen or { }
-
-	if s and not seen[s.ino] then
-		seen[s.ino] = true
-		if s.type == "chr" or s.type == "blk" then
-			return true
-		elseif s.type == "lnk" then
-			return device( fs.readlink(val), seen )
-		end
-	end
-
-	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
-
-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
-
-function rangelength(val, min, max)
-	val = tostring(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
-
-function minlength(val, min)
-	val = tostring(val)
-	min = tonumber(min)
-
-	if val ~= nil and min ~= nil then
-		return (#val >= min)
-	end
-
-	return false
-end
-
-function maxlength(val, max)
-	val = tostring(val)
-	max = tonumber(max)
-
-	if val ~= nil and max ~= nil then
-		return (#val <= max)
-	end
-
-	return false
-end
-
-function phonedigit(val)
-	return (val:match("^[0-9\*#!%.]+$") ~= nil)
-end