Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ticket/16004] Add check-in for Emojis in Username #5556

Merged
merged 5 commits into from Apr 7, 2019
Merged

[ticket/16004] Add check-in for Emojis in Username #5556

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dc80ffd
[ticket/16004] Add check-in for Emojis in Username
3D-I Mar 31, 2019
5bd2c06
[ticket/16004] Move the check-in to a more appropriated place
3D-I Mar 31, 2019
dc610b5
[ticket/16004] Add a line of comment in the docblock
3D-I Mar 31, 2019
b890448
[ticket/16004] Amend the whole docblock
3D-I Mar 31, 2019
7160c67
[ticket/16004] Add tests/functions/validate_username_test.php
3D-I Apr 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions phpBB/includes/functions_user.php
View file
Open in desktop
Expand Up @@ -1709,6 +1709,14 @@ function validate_username($username, $allowed_username = false)
return false;
}

// The very first check is for
// out-of-bounds characters that are currently
// not supported by utf8_bin in MySQL
if (preg_match('/[\x{10000}-\x{10FFFF}]/u', $username))
{
return 'INVALID_EMOJIS_USERNAME';
3D-I marked this conversation as resolved.
Show resolved Hide resolved
}

// ... fast checks first.
if (strpos($username, '"') !== false || strpos($username, '"') !== false || empty($clean_username))
{
Expand Down
1 change: 1 addition & 0 deletions phpBB/language/en/ucp.php
View file
Open in desktop
Expand Up @@ -272,6 +272,7 @@
'IMPORTANT_NEWS' => 'Important announcements',
'INVALID_USER_BIRTHDAY' => 'The entered birthday is not a valid date.',
'INVALID_CHARS_USERNAME' => 'The username contains forbidden characters.',
'INVALID_EMOJIS_USERNAME' => 'The username contains forbidden characters (Emoji).',
'INVALID_CHARS_NEW_PASSWORD'=> 'The password does not contain the required characters.',
'ITEMS_REQUIRED' => 'The items marked with * are required profile fields and need to be filled out.',

Expand Down