diff options
| author | Dries Buytaert <dries@buytaert.net> | 2003-06-25 15:46:03 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2003-06-25 15:46:03 +0000 |
| commit | 2689d6aa1ea3f8af7f405da3a25bea75d433b686 (patch) | |
| tree | 15ed3ed52b7ca1eec6389d20f962265301ff004c | |
| parent | 1f91ef891e5b9cf727b76748e017007be9fc375a (diff) | |
| download | brdo-2689d6aa1ea3f8af7f405da3a25bea75d433b686.tar.gz brdo-2689d6aa1ea3f8af7f405da3a25bea75d433b686.tar.bz2 | |
- Narrow the set of allowed usernames to prevent people from messing with it.
| -rw-r--r-- | modules/user.module | 3 | ||||
| -rw-r--r-- | modules/user/user.module | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/modules/user.module b/modules/user.module index 3b024c9d7..0e03f6e81 100644 --- a/modules/user.module +++ b/modules/user.module @@ -175,9 +175,8 @@ function user_validate_name($name) { if (ereg("^ ", $name)) return t("The username cannot begin with a space."); 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 (ereg("[^ a-zA-Z0-9@-@]", $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 (!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.", array("%name" => $name)); } diff --git a/modules/user/user.module b/modules/user/user.module index 3b024c9d7..0e03f6e81 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -175,9 +175,8 @@ function user_validate_name($name) { if (ereg("^ ", $name)) return t("The username cannot begin with a space."); 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 (ereg("[^ a-zA-Z0-9@-@]", $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 (!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.", array("%name" => $name)); } |