aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-07-22 20:11:45 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-07-22 20:11:45 +0000
commitec1da5b1fd694b4f1abcf4fa8009095d23b2c1a6 (patch)
treec6a4f679afd375f000d5b64485c7e14737fc941b /phpBB/includes/ucp
parentfcb0c89962242fec72d7ed01c7049601a696e4be (diff)
downloadforums-ec1da5b1fd694b4f1abcf4fa8009095d23b2c1a6.tar
forums-ec1da5b1fd694b4f1abcf4fa8009095d23b2c1a6.tar.gz
forums-ec1da5b1fd694b4f1abcf4fa8009095d23b2c1a6.tar.bz2
forums-ec1da5b1fd694b4f1abcf4fa8009095d23b2c1a6.tar.xz
forums-ec1da5b1fd694b4f1abcf4fa8009095d23b2c1a6.zip
try to normalize everything...
git-svn-id: file:///svn/phpbb/trunk@7920 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp')
-rw-r--r--phpBB/includes/ucp/ucp_groups.php8
-rw-r--r--phpBB/includes/ucp/ucp_pm_options.php4
-rw-r--r--phpBB/includes/ucp/ucp_register.php2
3 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 1e8bd23af9..44b5498ca7 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -454,8 +454,8 @@ class ucp_groups
// Did we submit?
if ($update)
{
- $group_name = request_var('group_name', '', true);
- $group_desc = request_var('group_desc', '', true);
+ $group_name = utf8_normalize_nfc(request_var('group_name', '', true));
+ $group_desc = utf8_normalize_nfc(request_var('group_desc', '', true));
$group_type = request_var('group_type', GROUP_FREE);
$allow_desc_bbcode = request_var('desc_parse_bbcode', false);
@@ -591,7 +591,7 @@ class ucp_groups
}
else if (!$group_id)
{
- $group_name = request_var('group_name', '', true);
+ $group_name = utf8_normalize_nfc(request_var('group_name', '', true));
$group_desc_data = array(
'text' => '',
'allow_bbcode' => true,
@@ -951,7 +951,7 @@ class ucp_groups
$user->add_lang(array('acp/groups', 'acp/common'));
- $names = request_var('usernames', '', true);
+ $names = utf8_normalize_nfc(request_var('usernames', '', true));
if (!$group_id)
{
diff --git a/phpBB/includes/ucp/ucp_pm_options.php b/phpBB/includes/ucp/ucp_pm_options.php
index f242c864b6..95326090c7 100644
--- a/phpBB/includes/ucp/ucp_pm_options.php
+++ b/phpBB/includes/ucp/ucp_pm_options.php
@@ -60,7 +60,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
// Add Folder
if (isset($_POST['addfolder']))
{
- $folder_name = request_var('foldername', '', true);
+ $folder_name = utf8_normalize_nfc(request_var('foldername', '', true));
if ($folder_name)
{
@@ -104,7 +104,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
// Rename folder
if (isset($_POST['rename_folder']))
{
- $new_folder_name = request_var('new_folder_name', '', true);
+ $new_folder_name = utf8_normalize_nfc(request_var('new_folder_name', '', true));
$rename_folder_id= request_var('rename_folder_id', 0);
if (!$new_folder_name)
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index 2dab4af710..b62ee04318 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -79,7 +79,7 @@ class ucp_register
{
// We do not include the password!
$s_hidden_fields = array_merge($s_hidden_fields, array(
- 'username' => request_var('username', '', true),
+ 'username' => utf8_normalize_nfc(request_var('username', '', true)),
'email' => strtolower(request_var('email', '')),
'email_confirm' => strtolower(request_var('email_confirm', '')),
'confirm_code' => request_var('confirm_code', ''),