X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drupal-hacks%2Fuser.module;h=ce3e56f2e7cb694a68cc005164677765b6a47069;hb=cc69977eaad2e905c9496db4f466640ad3d96b0f;hp=430e08ab731f460fe25555dec374f20d3243695e;hpb=f2c8d17b0c549d8e3cd7cf665f84bfb71cde7398;p=plewww.git

diff --git a/drupal-hacks/user.module b/drupal-hacks/user.module
index 430e08a..ce3e56f 100644
--- a/drupal-hacks/user.module
+++ b/drupal-hacks/user.module
@@ -233,8 +233,8 @@ function user_validate_name($name) {
   if (!strlen($name)) return t('You must enter a username.');
   if (substr($name, 0, 1) == ' ') return t('The username cannot begin with a space.');
   if (substr($name, -1) == ' ') return t('The username cannot end with a space.');
-  if (ereg('  ', $name)) return t('The username cannot contain multiple spaces in a row.');
-  if (ereg("[^\x80-\xF7 [:alnum:]@_.-]", $name)) return t('The username contains an illegal character.');
+  if (preg_match('/  /', $name)) return t('The username cannot contain multiple spaces in a row.');
+  if (preg_match("/[^\x80-\xF7 [:alnum:]@_.-]/", $name)) return t('The username contains an illegal character.');
   if (preg_match('/[\x{80}-\x{A0}'.          // Non-printable ISO-8859-1 + NBSP
                    '\x{AD}'.                 // Soft-hyphen
                    '\x{2000}-\x{200F}'.      // Various space characters
@@ -247,8 +247,11 @@ function user_validate_name($name) {
                    $name)) {
     return t('The username contains an illegal character.');
   }
-  if (ereg('@', $name) && !eregi('@([0-9a-z](-?[0-9a-z])*.)+[a-z]{2}([zmuvtg]|fo|me)?$', $name)) return t('The username is not a valid authentication ID.');
-  if (strlen($name) > 56) return t('The username %name is too long: it must be less than 56 characters.', array('%name' => theme('placeholder', $name)));
+  if (preg_match('/@/', $name) && !preg_match('/@([0-9a-z](-?[0-9a-z])*.)+[a-z]{2}([zmuvtg]|fo|me)?$/i', $name)) 
+    return t('The username is not a valid authentication ID.');
+  if (strlen($name) > 56) 
+    return t('The username %name is too long: it must be less than 56 characters.', 
+	     array('%name' => theme('placeholder', $name)));
 }
 
 function user_validate_mail($mail) {