diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-10-07 12:36:31 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-10-07 12:36:31 +0000 |
| commit | f8528a659c919d7bc1e78c5aacc95e27cddec627 (patch) | |
| tree | bb70865f922867a83fa144f315ad40014a982e2b /phpBB/includes/ucp | |
| parent | e87f740a9e7a048b7900d92ede04f405a337441c (diff) | |
| download | forums-f8528a659c919d7bc1e78c5aacc95e27cddec627.tar forums-f8528a659c919d7bc1e78c5aacc95e27cddec627.tar.gz forums-f8528a659c919d7bc1e78c5aacc95e27cddec627.tar.bz2 forums-f8528a659c919d7bc1e78c5aacc95e27cddec627.tar.xz forums-f8528a659c919d7bc1e78c5aacc95e27cddec627.zip | |
tried to begin adjusting all string functions where applicable - still a *lot* to do.
i hope i catched all relevant sections and did not mess something up.
git-svn-id: file:///svn/phpbb/trunk@6452 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_options.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_remind.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_resend.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_zebra.php | 8 |
5 files changed, 9 insertions, 9 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index fc05c36290..1fa32f4290 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -448,9 +448,9 @@ function compose_pm($id, $mode, $action) { $subject = request_var('subject', '', true); - if (strcmp($subject, strtoupper($subject)) == 0 && $subject) + if ($subject && strcmp($subject, utf8_strtoupper($subject)) === 0) { - $subject = strtolower($subject); + $subject = utf8_strtolower($subject); } $message_parser->message = request_var('message', '', true); diff --git a/phpBB/includes/ucp/ucp_pm_options.php b/phpBB/includes/ucp/ucp_pm_options.php index 72af30fa21..6948e0dfea 100644 --- a/phpBB/includes/ucp/ucp_pm_options.php +++ b/phpBB/includes/ucp/ucp_pm_options.php @@ -653,7 +653,7 @@ function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule { $sql = 'SELECT user_id FROM ' . USERS_TABLE . " - WHERE LOWER(username) = '" . $db->sql_escape(strtolower($rule_string)) . "'"; + WHERE LOWER(username) = '" . $db->sql_escape(utf8_strtolower($rule_string)) . "'"; $result = $db->sql_query($sql); $rule_user_id = (int) $db->sql_fetchfield('user_id'); $db->sql_freeresult($result); diff --git a/phpBB/includes/ucp/ucp_remind.php b/phpBB/includes/ucp/ucp_remind.php index 11edb54b95..4c0eb757fc 100644 --- a/phpBB/includes/ucp/ucp_remind.php +++ b/phpBB/includes/ucp/ucp_remind.php @@ -31,7 +31,7 @@ class ucp_remind $sql = 'SELECT user_id, username, user_email, user_jabber, user_notify_type, user_type, user_lang FROM ' . USERS_TABLE . " WHERE user_email = '" . $db->sql_escape($email) . "' - AND LOWER(username) = '" . $db->sql_escape(strtolower($username)) . "'"; + AND LOWER(username) = '" . $db->sql_escape(utf8_strtolower($username)) . "'"; $result = $db->sql_query($sql); $user_row = $db->sql_fetchrow($result); $db->sql_freeresult($result); diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php index 63d3aea790..fb44cbaff4 100644 --- a/phpBB/includes/ucp/ucp_resend.php +++ b/phpBB/includes/ucp/ucp_resend.php @@ -31,7 +31,7 @@ class ucp_resend $sql = 'SELECT user_id, group_id, username, user_email, user_type, user_lang, user_actkey FROM ' . USERS_TABLE . " WHERE user_email = '" . $db->sql_escape($email) . "' - AND LOWER(username) = '" . $db->sql_escape(strtolower($username)) . "'"; + AND LOWER(username) = '" . $db->sql_escape(utf8_strtolower($username)) . "'"; $result = $db->sql_query($sql); $user_row = $db->sql_fetchrow($result); $db->sql_freeresult($result); diff --git a/phpBB/includes/ucp/ucp_zebra.php b/phpBB/includes/ucp/ucp_zebra.php index ac46e80b98..acea2cf965 100644 --- a/phpBB/includes/ucp/ucp_zebra.php +++ b/phpBB/includes/ucp/ucp_zebra.php @@ -42,7 +42,7 @@ class ucp_zebra if ($data['add']) { - $data['add'] = array_map('trim', array_map('strtolower', explode("\n", $data['add']))); + $data['add'] = array_map('trim', array_map('utf8_strtolower', explode("\n", $data['add']))); // Do these name/s exist on a list already? If so, ignore ... we could be // 'nice' and automatically handle names added to one list present on @@ -59,11 +59,11 @@ class ucp_zebra { if ($row['friend']) { - $friends[] = strtolower($row['username']); + $friends[] = utf8_strtolower($row['username']); } else { - $foes[] = strtolower($row['username']); + $foes[] = utf8_strtolower($row['username']); } } $db->sql_freeresult($result); @@ -88,7 +88,7 @@ class ucp_zebra // remove the user himself from the username array $n = sizeof($data['add']); - $data['add'] = array_diff($data['add'], array(strtolower($user->data['username']))); + $data['add'] = array_diff($data['add'], array(utf8_strtolower($user->data['username']))); if (sizeof($data['add']) < $n) { |