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

luci-0.10: merge r8096, r8097 and r8098

Browse source
This commit is contained in:
Jo-Philipp Wich 2011-12-16 01:43:17 +00:00
parent 41469346de
commit 9847037963
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
applications/luci-firewall/luasrc/model/cbi/luci_fw/zone.lua
View file

@ -129,7 +129,7 @@ msrc = s:taboption("advanced", DynamicList, "masq_src",
translate("Restrict Masquerading to given source subnets"))
msrc.optional = true
msrc.datatype = "neg_network_ip4addr"
msrc.datatype = "neg(network)"
msrc.placeholder = "0.0.0.0/0"
msrc:depends("family", "")
msrc:depends("family", "ipv4")
@ -138,7 +138,7 @@ mdest = s:taboption("advanced", DynamicList, "masq_dest",
translate("Restrict Masquerading to given destination subnets"))
mdest.optional = true
mdest.datatype = "neg_network_ip4addr"
mdest.datatype = "neg(network)"
mdest.placeholder = "0.0.0.0/0"
mdest:depends("family", "")
mdest:depends("family", "ipv4")

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

@ -159,6 +159,11 @@ var cbi_validators = {
return false;
},
'network': function(v)
{
return cbi_validators.uciname(v) || cbi_validators.host(v);
},
'wpakey': function(v)
{
if( v.length == 64 )

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

@ -154,6 +154,10 @@ 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)