From c1bca43feea8bbb16debdeeb9ece71d434556c6c Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 21 Oct 2018 15:10:51 -0400 Subject: [PATCH] Changing default/max values for username_min/max_length - Restoring legacy default values (3 and 48 respectively) - Lowering the max value to 150 to take the full profile URL length into account --- config/config.ini.php | 4 ++-- src/Model/User.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/config.ini.php b/config/config.ini.php index 05a8738e9d..8d1c66dbb5 100644 --- a/config/config.ini.php +++ b/config/config.ini.php @@ -367,13 +367,13 @@ urlpath = ; username_min_length (Integer) ; The minimum character length a username can be. ; This length is check once the username has been trimmed and multiple spaces have been collapsed into one. -; Minimum for this config value is 1. Maximum is 255; +; Minimum for this config value is 1. Maximum is 150 as the resulting profile URL shouldn't be longer than 255 chars. username_min_length = 3 ; username_max_length (Integer) ; The maximum character length a username can be. ; This length is check once the username has been trimmed and multiple spaces have been collapsed into one. -; Minimum for this config value is 1. Maximum is 255; +; Minimum for this config value is 1. Maximum is 150 as the resulting profile URL shouldn't be longer than 255 chars. username_max_length = 48 ; worker_cooldown (Integer) diff --git a/src/Model/User.php b/src/Model/User.php index 2fda6aac28..4dcd507048 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -466,8 +466,8 @@ class User // collapse multiple spaces in name $username = preg_replace('/ +/', ' ', $username); - $username_min_length = max(1, min(255, intval(Config::get('system', 'username_min_length', 0)))); - $username_max_length = max(1, min(255, intval(Config::get('system', 'username_max_length', 0)))); + $username_min_length = max(1, min(150, intval(Config::get('system', 'username_min_length', 3)))); + $username_max_length = max(1, min(150, intval(Config::get('system', 'username_max_length', 48)))); if ($username_min_length > $username_max_length) { logger(L10n::t('system.username_min_length (%s) and system.username_max_length (%s) are excluding each other, swapping values.', $username_min_length, $username_max_length), LOGGER_WARNING);