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

luci-0.11: merge r9351

Browse source
This commit is contained in:
Jo-Philipp Wich 2012-10-06 23:50:52 +00:00
commit e01533db7c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -148,8 +148,8 @@ var cbi_validators = {
'hostname': function()
{
if (this.length <= 253)
return (this.match(/^[a-zA-Z]+$/) != null ||
(this.match(/^[a-zA-Z0-9][a-zA-Z0-9\-.]*[a-zA-Z0-9]$/) &&
return (this.match(/^[a-zA-Z0-9]+$/) != null ||
(this.match(/^[a-zA-Z0-9_][a-zA-Z0-9_\-.]*[a-zA-Z0-9]$/) &&
this.match(/[^0-9.]/)));
return false;

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

@ -179,8 +179,8 @@ 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("^[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