validate.js: make validate_isName() match PHP code.

thirtybees · Apr 21, 2019 · f04f1de · f04f1de
1 parent 7ad147d
commit f04f1de
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/classes/Validate.php b/classes/Validate.php
@@ -232,7 +232,8 @@ public static function isImageSize($size)
     }
 
     /**
-     * Check for name validity
+     * Check for name validity. This should match validate_isName() in
+     * js/validate.js.
      *
      * @param string $name Name to validate
      *

diff --git a/js/validate.js b/js/validate.js
@@ -106,8 +106,8 @@ var unicode_hack = (function() {
  */
 function validate_isName(s)
 {
-	var reg = /^[^0-9!<>,;?=+()@#"°{}_$%:]+$/;
-	return reg.test(s);
+  return ! /www|http/i.test(s)
+      && /^[^0-9!\[\]<>;?=+()@#"°{}_$%:\/\\\*\^]*$/.test(s);
 }
 
 function validate_isGenericName(s)