aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2012-06-02 13:04:48 -0700
committerCash Costello <cash.costello@gmail.com>2012-06-02 13:04:48 -0700
commitd7a43c6ab26dc28c3b3c88bcede44d75a3f4a4fe (patch)
tree0ee2c336e9953a100c56764ef1e604d9b2b0ab86
parent09d1daf77665f989c5f8e77be46fb5b378f3bce7 (diff)
parent88f1e8307f9a83b506ecae2e013125389310fed6 (diff)
downloadelgg-d7a43c6ab26dc28c3b3c88bcede44d75a3f4a4fe.tar.gz
elgg-d7a43c6ab26dc28c3b3c88bcede44d75a3f4a4fe.tar.bz2
Merge pull request #193 from jeabakker/#4406
#4406: validate username for max chars
-rw-r--r--engine/lib/users.php6
-rw-r--r--languages/en.php1
2 files changed, 7 insertions, 0 deletions
diff --git a/engine/lib/users.php b/engine/lib/users.php
index 7d427e743..241b524f9 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -810,6 +810,12 @@ function validate_username($username) {
$msg = elgg_echo('registration:usernametooshort', array($CONFIG->minusername));
throw new RegistrationException($msg);
}
+
+ // username in the database has a limit of 128 characters
+ if (strlen($username) > 128) {
+ $msg = elgg_echo('registration:usernametoolong', array(128));
+ throw new RegistrationException($msg);
+ }
// Blacklist for bad characters (partially nicked from mediawiki)
$blacklist = '/[' .
diff --git a/languages/en.php b/languages/en.php
index d7de34015..81852107b 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -505,6 +505,7 @@ $english = array(
'registration:notemail' => 'The email address you provided does not appear to be a valid email address.',
'registration:userexists' => 'That username already exists',
'registration:usernametooshort' => 'Your username must be a minimum of %u characters long.',
+ 'registration:usernametoolong' => 'Your username is too long it can have a maximum of %u characters.',
'registration:passwordtooshort' => 'The password must be a minimum of %u characters long.',
'registration:dupeemail' => 'This email address has already been registered.',
'registration:invalidchars' => 'Sorry, your username contains the character %s which is invalid. The following characters are invalid: %s',