Changeset 8091

Timestamp:

12/14/11 16:01:54 (18 months ago)

Author:

jow

Message:

libs/web: allow one-character hostnames

Location:

luci/trunk/libs/web

Files:

• htdocs/luci-static/resources/cbi.js (modified) (1 diff)
• luasrc/cbi/datatypes.lua (modified) (1 diff)

luci/trunk/libs/web/htdocs/luci-static/resources/cbi.js

@@ -152 +152 @@
 
     '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;

luci/trunk/libs/web/luasrc/cbi/datatypes.lua

@@ -142 +142 @@
 
 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