mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-08 09:26:34 +02:00
Code Issues Releases Wiki Activity

If unique nicknames are enabled, don't allow using someone else's username as a nickname

Browse Source
This commit is contained in:
Alexander Skvortsov
2020-12-02 15:29:08 -05:00
parent a82404f1c9
commit b3f6fb8241
2 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
extensions/nicknames/src/AddNicknameValidation.php
View File

@@ -21,20 +21,25 @@ class AddNicknameValidation
public function __invoke($flarumValidator, Validator $validator) public function __invoke($flarumValidator, Validator $validator)
{ {
$unique_nickname = ($this->settings->get('flarum-nicknames.unique')) ? 'unique:users,nickname' : ''; $nicknameRules = [
function ($attribute, $value, $fail) {
$regex = $this->settings->get('flarum-nicknames.regex');
if ($regex && !preg_match_all("/$regex/", $value)) {
$fail(app('translator')->trans('flarum-nicknames.api.invalid_nickname_message'));
}
},
'min:' . $this->settings->get('flarum-nicknames.min'),
'max:' . $this->settings->get('flarum-nicknames.max'),
'nullable'
];
if ($this->settings->get('flarum-nicknames.unique')) {
$nicknameRules[] = 'unique:users,username';
$nicknameRules[] = 'unique:users,nickname';
}
$validator->setRules([ $validator->setRules([
'nickname' => [ 'nickname' => $nicknameRules,
$unique_nickname,
function ($attribute, $value, $fail) {
$regex = $this->settings->get('flarum-nicknames.regex');
if ($regex && !preg_match_all("/$regex/", $value)) {
$fail(app('translator')->trans('flarum-nicknames.api.invalid_nickname_message'));
}
},
'min:' . $this->settings->get('flarum-nicknames.min', 1),
'max:' . $this->settings->get('flarum-nicknames.max', 150),
],
] + $validator->getRules()); ] + $validator->getRules());
} }
} }

13
extensions/nicknames/src/SaveNicknameToDatabase.php
View File

@@ -21,7 +21,18 @@ class SaveNicknameToDatabase {
} else { } else {
$actor->assertCan('edit', $user); $actor->assertCan('edit', $user);
} }
$user->nickname = $attributes['nickname'];
$nickname = $attributes['nickname'];
// If unique validation is enabled, the nickname will be checked
// against ALL nicknames and usernames, including the username
// of the current user. So, to allow users to reset their nickname
// back to their username, in this case we'd set it to null.
if ($user->username === $nickname) {
$user->nickname = null;
} else {
$user->nickname = $nickname;
}
} }
} }
} }