From 550f270a0027e67a0eb19d99fbe54d6045696a0b Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 22 Apr 2007 15:27:40 +0000 Subject: #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 --- phpBB/includes/functions_user.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'phpBB/includes/functions_user.php') diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index d335c32cd5..bbd2d070cb 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -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) . "'"; -- cgit v1.2.1