diff options
| author | Kjartan Mannes <kjartan@2.no-reply.drupal.org> | 2002-04-15 22:06:27 +0000 |
|---|---|---|
| committer | Kjartan Mannes <kjartan@2.no-reply.drupal.org> | 2002-04-15 22:06:27 +0000 |
| commit | 0bd45edcb7dd5d46e1d0e915523dd19fe104b5af (patch) | |
| tree | cfd6ef69c5d1015e2dc49cba8782fb7804d5b700 | |
| parent | 6840a20935eb9e74261f74f6d9387b66367930cb (diff) | |
| download | brdo-0bd45edcb7dd5d46e1d0e915523dd19fe104b5af.tar.gz brdo-0bd45edcb7dd5d46e1d0e915523dd19fe104b5af.tar.bz2 | |
- changing regex. Fixes http://www.drupal.org/node.php?id=107
| -rw-r--r-- | modules/user.module | 3 | ||||
| -rw-r--r-- | modules/user/user.module | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/modules/user.module b/modules/user.module index 66533c811..f8e38a655 100644 --- a/modules/user.module +++ b/modules/user.module @@ -171,7 +171,8 @@ function user_validate_name($name) { if (ereg(" \$", $name)) 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("[^a-zA-Z0-9@-@]", $name)) return t("The Username contains an illegal character."); - if (!eregi('^[a-z0-9]+(@[a-z0-9]+)?$', $name)) return t("The name 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 (!eregi('^[[:print:]]+', $name)) return t("The name contains an illegal character."); if (strlen($name) > 56) return t("The Username '$name' is too long: it must be less than 56 characters."); } diff --git a/modules/user/user.module b/modules/user/user.module index 66533c811..f8e38a655 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -171,7 +171,8 @@ function user_validate_name($name) { if (ereg(" \$", $name)) 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("[^a-zA-Z0-9@-@]", $name)) return t("The Username contains an illegal character."); - if (!eregi('^[a-z0-9]+(@[a-z0-9]+)?$', $name)) return t("The name 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 (!eregi('^[[:print:]]+', $name)) return t("The name contains an illegal character."); if (strlen($name) > 56) return t("The Username '$name' is too long: it must be less than 56 characters."); } |