friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

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
This commit is contained in:
Hypolite Petovan 2018-10-21 15:10:51 -04:00
parent b08408c086
commit c1bca43fee
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.ini.php
View File

@ -367,13 +367,13 @@ urlpath =
; username_min_length (Integer) ; username_min_length (Integer)
; The minimum character length a username can be. ; 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. ; 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_min_length = 3
; username_max_length (Integer) ; username_max_length (Integer)
; The maximum character length a username can be. ; 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. ; 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 username_max_length = 48
; worker_cooldown (Integer) ; worker_cooldown (Integer)

4
src/Model/User.php
View File

@ -466,8 +466,8 @@ class User
// collapse multiple spaces in name // collapse multiple spaces in name
$username = preg_replace('/ +/', ' ', $username); $username = preg_replace('/ +/', ' ', $username);
$username_min_length = max(1, min(255, intval(Config::get('system', 'username_min_length', 0)))); $username_min_length = max(1, min(150, intval(Config::get('system', 'username_min_length', 3))));
$username_max_length = max(1, min(255, intval(Config::get('system', 'username_max_length', 0)))); $username_max_length = max(1, min(150, intval(Config::get('system', 'username_max_length', 48))));
if ($username_min_length > $username_max_length) { 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); 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);