Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libs/web: remove neg_ipaddr, neg_ip4addr and neg_network_ip4addr datatypes, can be represented with neg(type)

Browse source
This commit is contained in:
Jo-Philipp Wich 2012-01-07 22:06:02 +00:00
parent e4dc649e82
commit 3812f29087
2 changed files with 0 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libs/web/htdocs/luci-static/resources/cbi.js
View file

@ -42,11 +42,6 @@ var cbi_validators = {
return cbi_validators.ip4addr(v) || cbi_validators.ip6addr(v); return cbi_validators.ip4addr(v) || cbi_validators.ip6addr(v);
}, },
'neg_ipaddr': function(v)
{
return cbi_validators.ip4addr(v.replace(/^\s*!/, "")) || cbi_validators.ip6addr(v.replace(/^\s*!/, ""));
},
'ip4addr': function(v) 'ip4addr': function(v)
{ {
if (v.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})(\/(\S+))?$/)) if (v.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})(\/(\S+))?$/))
@ -64,11 +59,6 @@ var cbi_validators = {
return false; return false;
}, },
'neg_ip4addr': function(v)
{
return cbi_validators.ip4addr(v.replace(/^\s*!/, ""));
},
'ip6addr': function(v) 'ip6addr': function(v)
{ {
if( v.match(/^([a-fA-F0-9:.]+)(\/(\d+))?$/) ) if( v.match(/^([a-fA-F0-9:.]+)(\/(\d+))?$/) )
@ -191,12 +181,6 @@ var cbi_validators = {
return (v.match(/^[a-zA-Z0-9_]+$/) != null); return (v.match(/^[a-zA-Z0-9_]+$/) != null);
}, },
'neg_network_ip4addr': function(v)
{
v = v.replace(/^\s*!/, "");
return cbi_validators.uciname(v) || cbi_validators.ip4addr(v);
},
'range': function(v, args) 'range': function(v, args)
{ {
var min = parseInt(args[0]); var min = parseInt(args[0]);

21
libs/web/luasrc/cbi/datatypes.lua
View file

@ -66,13 +66,6 @@ function ipaddr(val)
return ip4addr(val) or ip6addr(val) return ip4addr(val) or ip6addr(val)
end end
function neg_ipaddr(v)
if type(v) == "string" then
v = v:gsub("^%s*!", "")
end
return v and ipaddr(v)
end
function ip4addr(val) function ip4addr(val)
if val then if val then
return ip.IPv4(val) and true or false return ip.IPv4(val) and true or false
@ -81,13 +74,6 @@ function ip4addr(val)
return false return false
end end
function neg_ip4addr(v)
if type(v) == "string" then
v = v:gsub("^%s*!", "")
end
return v and ip4addr(v)
end
function ip4prefix(val) function ip4prefix(val)
val = tonumber(val) val = tonumber(val)
return ( val and val >= 0 and val <= 32 ) return ( val and val >= 0 and val <= 32 )
@ -235,13 +221,6 @@ function uciname(val)
return (val:match("^[a-zA-Z0-9_]+$") ~= nil) return (val:match("^[a-zA-Z0-9_]+$") ~= nil)
end 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) function range(val, min, max)
val = tonumber(val) val = tonumber(val)
min = tonumber(min) min = tonumber(min)