mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-04 15:57:45 +02:00
#10005, #10003, #10001, #9999, #9945, #9965, #9909, #9906, #9877, #9861, #9831, #9830, #9815, #9665, #9624
prosilver adjustments for important announcements in ucp - #9995 MCP fixes for user notes/warnings - #9981 Preserving imageset values on save/edit find a member link for Mass PM's - #9925 syndicate window.onload events where necessary - #9878 Duplicate topics in forums with announcements - #9840 Email template for forced re-activation - #9808 Topic pagination adjustment - #9763 Changed compose message layout in UCP - #9706, #9702 Fixed inline attachment font size (hopefully) git-svn-id: file:///svn/phpbb/trunk@7384 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -1184,6 +1184,12 @@ function validate_username($username, $allowed_username = false)
|
||||
return false;
|
||||
}
|
||||
|
||||
// ... fast checks first.
|
||||
if (strpos($username, '"') !== false || strpos($username, '"') !== false)
|
||||
{
|
||||
return 'INVALID_CHARS';
|
||||
}
|
||||
|
||||
$mbstring = $pcre = false;
|
||||
|
||||
// generic UTF-8 character types supported?
|
||||
@@ -1247,6 +1253,7 @@ function validate_username($username, $allowed_username = false)
|
||||
break;
|
||||
|
||||
case 'USERNAME_ASCII':
|
||||
default:
|
||||
$pcre = true;
|
||||
$regex = '[\x01-\x7F]+';
|
||||
break;
|
||||
@@ -1269,11 +1276,6 @@ function validate_username($username, $allowed_username = false)
|
||||
}
|
||||
}
|
||||
|
||||
if (strpos($username, '"') !== false || strpos($username, '"') !== false)
|
||||
{
|
||||
return 'INVALID_CHARS';
|
||||
}
|
||||
|
||||
$sql = 'SELECT username
|
||||
FROM ' . USERS_TABLE . "
|
||||
WHERE username_clean = '" . $db->sql_escape($clean_username) . "'";
|
||||
|
Reference in New Issue
Block a user