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

libs/web: improve ip6addr datype validation, accept both CIDR and IP/Mask notation

Browse source
This commit is contained in:
Jo-Philipp Wich 2011-12-20 02:44:32 +00:00
parent 78332ec723
commit 6ae669da06
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,13 +49,15 @@ var cbi_validators = {
'ip4addr': function(v) 'ip4addr': function(v)
{ {
if( v.match(/^(\d+)\.(\d+)\.(\d+)\.(\d+)(\/(\d+))?$/) ) if (v.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})(\/(\S+))?$/))
{ {
return (RegExp.$1 >= 0) && (RegExp.$1 <= 255) && return (RegExp.$1 >= 0) && (RegExp.$1 <= 255) &&
(RegExp.$2 >= 0) && (RegExp.$2 <= 255) && (RegExp.$2 >= 0) && (RegExp.$2 <= 255) &&
(RegExp.$3 >= 0) && (RegExp.$3 <= 255) && (RegExp.$3 >= 0) && (RegExp.$3 <= 255) &&
(RegExp.$4 >= 0) && (RegExp.$4 <= 255) && (RegExp.$4 >= 0) && (RegExp.$4 <= 255) &&
(!RegExp.$5 || ((RegExp.$6 >= 0) && (RegExp.$6 <= 32))) ((RegExp.$6.indexOf('.') < 0)
? ((RegExp.$6 >= 0) && (RegExp.$6 <= 32))
: (cbi_validators.ip4addr(RegExp.$6)))
; ;
} }