diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2011-12-14 15:01:54 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-12-14 15:01:54 +0000 |
| commit | c5811d52d0dbcf059418462ae983aaa09aa076b5 (patch) | |
| tree | 1a16dd8d91e155ba0314d52980bd42168df09661 /libs/web | |
| parent | 3bccd252811bde56656fd23719a9c6122e4e42ca (diff) | |
libs/web: allow one-character hostnames
Diffstat (limited to 'libs/web')
| -rw-r--r-- | libs/web/htdocs/luci-static/resources/cbi.js | 6 | ||||
| -rw-r--r-- | libs/web/luasrc/cbi/datatypes.lua | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libs/web/htdocs/luci-static/resources/cbi.js b/libs/web/htdocs/luci-static/resources/cbi.js index 5eee59c34..123e8e1ab 100644 --- a/libs/web/htdocs/luci-static/resources/cbi.js +++ b/libs/web/htdocs/luci-static/resources/cbi.js @@ -151,8 +151,10 @@ var cbi_validators = { }, 'hostname': function(v) - { if ( v.length <= 253 ) - return (v.match(/^[a-zA-Z0-9][a-zA-Z0-9\-.]*[a-zA-Z0-9]$/) != null); + { + if (v.length <= 253) + return (v.match(/^[a-zA-Z0-9]+$/) != null || + v.match(/^[a-zA-Z0-9][a-zA-Z0-9\-.]*[a-zA-Z0-9]$/) != null); return false; }, diff --git a/libs/web/luasrc/cbi/datatypes.lua b/libs/web/luasrc/cbi/datatypes.lua index fc3048e37..3c768ab76 100644 --- a/libs/web/luasrc/cbi/datatypes.lua +++ b/libs/web/luasrc/cbi/datatypes.lua @@ -141,7 +141,10 @@ function macaddr(val) end function hostname(val) - if val and (#val < 254) and val.match(val, "^[a-zA-Z0-9][a-zA-Z0-9%-%.]*[a-zA-Z0-9]$") then + if val and (#val < 254) and ( + val:match("^[a-zA-Z0-9]+$") or + val:match("^[a-zA-Z0-9][a-zA-Z0-9%-%.]*[a-zA-Z0-9]$") + ) then return true end return false |