libs/web: remove neg_ipaddr, neg_ip4addr and neg_network_ip4addr datatypes, can be...

diff --git a/libs/web/htdocs/luci-static/resources/cbi.js b/libs/web/htdocs/luci-static/resources/cbi.js
index b21adbb..05e15d2 100644 (file)
--- a/libs/web/htdocs/luci-static/resources/cbi.js
+++ b/libs/web/htdocs/luci-static/resources/cbi.js
@@ -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)
        {
                if (v.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})(\/(\S+))?$/))
        'ip4addr': function(v)
        {
                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)
        {
                if( v.match(/^([a-fA-F0-9:.]+)(\/(\d+))?$/) )
        'ip6addr': function(v)
        {
                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)
        {
                var min = parseInt(args[0]);
        'range': function(v, args)
        {
                var min = parseInt(args[0]);

diff --git a/libs/web/luasrc/cbi/datatypes.lua b/libs/web/luasrc/cbi/datatypes.lua
index 65a8eed..9f5a3eb 100644 (file)
--- a/libs/web/luasrc/cbi/datatypes.lua
+++ b/libs/web/luasrc/cbi/datatypes.lua
@@ -66,13 +66,6 @@ function ipaddr(val)
        return ip4addr(val) or ip6addr(val)
 end
 
        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
 function ip4addr(val)
        if val then
                return ip.IPv4(val) and true or false


@@ -81,13 +74,6 @@ function ip4addr(val)
        return false
 end
 
        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 )
 function ip4prefix(val)
        val = tonumber(val)
        return ( val and val >= 0 and val <= 32 )


@@ -235,13 +221,6 @@ function uciname(val)
        return (val:match("^[a-zA-Z0-9_]+$") ~= nil)
 end
 
        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)
 function range(val, min, max)
        val = tonumber(val)
        min = tonumber(min)