summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Wittens <steven@10.no-reply.drupal.org>2004-09-24 02:38:29 +0000
committerSteven Wittens <steven@10.no-reply.drupal.org>2004-09-24 02:38:29 +0000
commitf298481316427a829220ce5d32c63436dba9b2b4 (patch)
tree7aebb6a074ca3afd6ed7e3d6941dc8777c9ea2ef
parent4d2485348270af5ca8172de97ba884faf56ddf0d (diff)
downloadbrdo-f298481316427a829220ce5d32c63436dba9b2b4.tar.gz
brdo-f298481316427a829220ce5d32c63436dba9b2b4.tar.bz2
- user.module: allow non-ascii usernames.
-rw-r--r--modules/user.module2
-rw-r--r--modules/user/user.module2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/user.module b/modules/user.module
index 0bec6677b..d780cd6df 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -177,7 +177,7 @@ function user_validate_name($name) {
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('[^ [:alnum:]@_.-]', $name)) return t('The username contains an illegal character.');
+ if (ereg("[^\x80-\xF7 [:alnum:]@_.-]", $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' => "<em>$name</em>"));
}
diff --git a/modules/user/user.module b/modules/user/user.module
index 0bec6677b..d780cd6df 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -177,7 +177,7 @@ function user_validate_name($name) {
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('[^ [:alnum:]@_.-]', $name)) return t('The username contains an illegal character.');
+ if (ereg("[^\x80-\xF7 [:alnum:]@_.-]", $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' => "<em>$name</em>"));
}