mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-13 04:04:12 +02:00
Code Issues Releases Wiki Activity

[ticket/13455] Remove unnecessary calls to utf8_normalize_nfc()

Browse Source 
PHPBB3-13455
This commit is contained in:
Gaëtan Muller
2015-02-02 21:35:46 +01:00
parent f6e06da4c6
commit abcb2680ee
36 changed files with 97 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/acp/acp_attachments.php
View File

@@ -508,7 +508,7 @@ class acp_attachments
$ext_row = array();
}
$group_name = utf8_normalize_nfc($request->variable('group_name', '', true));
$group_name = $request->variable('group_name', '', true);
$new_group_name = ($action == 'add') ? $group_name : (($ext_row['group_name'] != $group_name) ? $group_name : '');
if (!$group_name)
@@ -690,7 +690,7 @@ class acp_attachments
if ($action == 'add')
{
$ext_group_row = array(
'group_name' => utf8_normalize_nfc($request->variable('group_name', '', true)),
'group_name' => $request->variable('group_name', '', true),
'cat_id' => 0,
'allow_group' => 1,
'allow_in_pm' => 1,

4
phpBB/includes/acp/acp_bbcodes.php
View File

@@ -86,8 +86,8 @@ class acp_bbcodes
$display_on_posting = $request->variable('display_on_posting', 0);
$bbcode_match = $request->variable('bbcode_match', '');
$bbcode_tpl = htmlspecialchars_decode(utf8_normalize_nfc($request->variable('bbcode_tpl', '', true)));
$bbcode_helpline = utf8_normalize_nfc($request->variable('bbcode_helpline', '', true));
$bbcode_tpl = htmlspecialchars_decode($request->variable('bbcode_tpl', '', true));
$bbcode_helpline = $request->variable('bbcode_helpline', '', true);
break;
}

2
phpBB/includes/acp/acp_board.php
View File

@@ -484,7 +484,7 @@ class acp_board
}
$this->new_config = $config;
$cfg_array = (isset($_REQUEST['config'])) ? utf8_normalize_nfc($request->variable('config', array('' => ''), true)) : $this->new_config;
$cfg_array = (isset($_REQUEST['config'])) ? $request->variable('config', array('' => ''), true) : $this->new_config;
$error = array();
// We validate the complete config if wished

2
phpBB/includes/acp/acp_bots.php
View File

@@ -144,7 +144,7 @@ class acp_bots
include_once($phpbb_root_path . 'includes/functions_user.' . $phpEx);
$bot_row = array(
'bot_name' => utf8_normalize_nfc($request->variable('bot_name', '', true)),
'bot_name' => $request->variable('bot_name', '', true),
'bot_agent' => $request->variable('bot_agent', ''),
'bot_ip' => $request->variable('bot_ip', ''),
'bot_active' => $request->variable('bot_active', true),

2
phpBB/includes/acp/acp_disallow.php
View File

@@ -49,7 +49,7 @@ class acp_disallow
if ($disallow)
{
$disallowed_user = str_replace('*', '%', utf8_normalize_nfc($request->variable('disallowed_user', '', true)));
$disallowed_user = str_replace('*', '%', $request->variable('disallowed_user', '', true));
if (!$disallowed_user)
{

4
phpBB/includes/acp/acp_email.php
View File

@@ -42,8 +42,8 @@ class acp_email
$usernames = $request->variable('usernames', '', true);
$usernames = (!empty($usernames)) ? explode("\n", $usernames) : array();
$group_id = $request->variable('g', 0);
$subject = utf8_normalize_nfc($request->variable('subject', '', true));
$message = utf8_normalize_nfc($request->variable('message', '', true));
$subject = $request->variable('subject', '', true);
$message = $request->variable('message', '', true);
// Do the job ...
if ($submit)

8
phpBB/includes/acp/acp_forums.php
View File

@@ -117,14 +117,14 @@ class acp_forums
'type_action' => $request->variable('type_action', ''),
'forum_status' => $request->variable('forum_status', ITEM_UNLOCKED),
'forum_parents' => '',
'forum_name' => utf8_normalize_nfc($request->variable('forum_name', '', true)),
'forum_name' => $request->variable('forum_name', '', true),
'forum_link' => $request->variable('forum_link', ''),
'forum_link_track' => $request->variable('forum_link_track', false),
'forum_desc' => utf8_normalize_nfc($request->variable('forum_desc', '', true)),
'forum_desc' => $request->variable('forum_desc', '', true),
'forum_desc_uid' => '',
'forum_desc_options' => 7,
'forum_desc_bitfield' => '',
'forum_rules' => utf8_normalize_nfc($request->variable('forum_rules', '', true)),
'forum_rules' => $request->variable('forum_rules', '', true),
'forum_rules_uid' => '',
'forum_rules_options' => 7,
'forum_rules_bitfield' => '',
@@ -445,7 +445,7 @@ class acp_forums
'parent_id' => $this->parent_id,
'forum_type' => FORUM_POST,
'forum_status' => ITEM_UNLOCKED,
'forum_name' => utf8_normalize_nfc($request->variable('forum_name', '', true)),
'forum_name' => $request->variable('forum_name', '', true),
'forum_link' => '',
'forum_link_track' => false,
'forum_desc' => '',

6
phpBB/includes/acp/acp_groups.php
View File

@@ -362,8 +362,8 @@ class acp_groups
trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
}
$group_name = utf8_normalize_nfc($request->variable('group_name', '', true));
$group_desc = utf8_normalize_nfc($request->variable('group_desc', '', true));
$group_name = $request->variable('group_name', '', true);
$group_desc = $request->variable('group_desc', '', true);
$group_type = $request->variable('group_type', GROUP_FREE);
$allow_desc_bbcode = $request->variable('desc_parse_bbcode', false);
@@ -618,7 +618,7 @@ class acp_groups
}
else if (!$group_id)
{
$group_name = utf8_normalize_nfc($request->variable('group_name', '', true));
$group_name = $request->variable('group_name', '', true);
$group_desc_data = array(
'text' => '',
'allow_bbcode' => true,

8
phpBB/includes/acp/acp_icons.php
View File

@@ -334,16 +334,16 @@ class acp_icons
$image_width = (isset($_POST['width'])) ? $request->variable('width', array('' => 0)) : array();
$image_height = (isset($_POST['height'])) ? $request->variable('height', array('' => 0)) : array();
$image_add = (isset($_POST['add_img'])) ? $request->variable('add_img', array('' => 0)) : array();
$image_emotion = utf8_normalize_nfc($request->variable('emotion', array('' => ''), true));
$image_code = utf8_normalize_nfc($request->variable('code', array('' => ''), true));
$image_emotion = $request->variable('emotion', array('' => ''), true);
$image_code = $request->variable('code', array('' => ''), true);
$image_display_on_posting = (isset($_POST['display_on_posting'])) ? $request->variable('display_on_posting', array('' => 0)) : array();
// Ok, add the relevant bits if we are adding new codes to existing emoticons...
if ($request->variable('add_additional_code', false, false, \phpbb\request\request_interface::POST))
{
$add_image = $request->variable('add_image', '');
$add_code = utf8_normalize_nfc($request->variable('add_code', '', true));
$add_emotion = utf8_normalize_nfc($request->variable('add_emotion', '', true));
$add_code = $request->variable('add_code', '', true);
$add_emotion = $request->variable('add_emotion', '', true);
if ($add_image && $add_emotion && $add_code)
{

4
phpBB/includes/acp/acp_language.php
View File

@@ -82,8 +82,8 @@ class acp_language
$sql_ary = array(
'lang_english_name' => $request->variable('lang_english_name', $row['lang_english_name']),
'lang_local_name' => utf8_normalize_nfc($request->variable('lang_local_name', $row['lang_local_name'], true)),
'lang_author' => utf8_normalize_nfc($request->variable('lang_author', $row['lang_author'], true)),
'lang_local_name' => $request->variable('lang_local_name', $row['lang_local_name'], true),
'lang_author' => $request->variable('lang_author', $row['lang_author'], true),
);
$db->sql_query('UPDATE ' . LANG_TABLE . '

4
phpBB/includes/acp/acp_logs.php
View File

@@ -70,7 +70,7 @@ class acp_logs
$conditions['log_time'] = array('>=', time() - ($sort_days * 86400));
}
$keywords = utf8_normalize_nfc($request->variable('keywords', '', true));
$keywords = $request->variable('keywords', '', true);
$conditions['keywords'] = $keywords;
}
@@ -108,7 +108,7 @@ class acp_logs
$sql_where = ($sort_days) ? (time() - ($sort_days * 86400)) : 0;
$sql_sort = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
$keywords = utf8_normalize_nfc($request->variable('keywords', '', true));
$keywords = $request->variable('keywords', '', true);
$keywords_param = !empty($keywords) ? '&keywords=' . urlencode(htmlspecialchars_decode($keywords)) : '';
$l_title = $user->lang['ACP_' . strtoupper($mode) . '_LOGS'];

4
phpBB/includes/acp/acp_modules.php
View File

@@ -253,7 +253,7 @@ class acp_modules
'module_enabled' => 0,
'module_display' => 1,
'parent_id' => 0,
'module_langname' => utf8_normalize_nfc($request->variable('module_langname', '', true)),
'module_langname' => $request->variable('module_langname', '', true),
'module_mode' => '',
'module_auth' => '',
);
@@ -266,7 +266,7 @@ class acp_modules
$module_data['module_display'] = $request->variable('module_display', (int) $module_row['module_display']);
$module_data['parent_id'] = $request->variable('module_parent_id', (int) $module_row['parent_id']);
$module_data['module_class'] = $this->module_class;
$module_data['module_langname'] = utf8_normalize_nfc($request->variable('module_langname', (string) $module_row['module_langname'], true));
$module_data['module_langname'] = $request->variable('module_langname', (string) $module_row['module_langname'], true);
$module_data['module_mode'] = $request->variable('module_mode', (string) $module_row['module_mode']);
$submit = (isset($_POST['submit'])) ? true : false;

8
phpBB/includes/acp/acp_permission_roles.php
View File

@@ -148,8 +148,8 @@ class acp_permission_roles
trigger_error($user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING);
}
$role_name = utf8_normalize_nfc($request->variable('role_name', '', true));
$role_description = utf8_normalize_nfc($request->variable('role_description', '', true));
$role_name = $request->variable('role_name', '', true);
$role_description = $request->variable('role_description', '', true);
$auth_settings = $request->variable('setting', array('' => 0));
if (!$role_name)
@@ -228,8 +228,8 @@ class acp_permission_roles
$options_from = $request->variable('options_from', 0);
$role_row = array(
'role_name' => utf8_normalize_nfc($request->variable('role_name', '', true)),
'role_description' => utf8_normalize_nfc($request->variable('role_description', '', true)),
'role_name' => $request->variable('role_name', '', true),
'role_description' => $request->variable('role_description', '', true),
'role_type' => $permission_type,
);

8
phpBB/includes/acp/acp_profile.php
View File

@@ -347,7 +347,7 @@ class acp_profile
'field_is_contact' => 0,
'field_contact_desc'=> '',
'field_contact_url' => '',
'lang_name' => utf8_normalize_nfc($request->variable('field_ident', '', true)),
'lang_name' => $request->variable('field_ident', '', true),
'lang_explain' => '',
'lang_default_value'=> '')
);
@@ -416,7 +416,7 @@ class acp_profile
// step 2
foreach ($exclude[2] as $key)
{
$var = utf8_normalize_nfc($request->variable($key, $field_row[$key], true));
$var = $request->variable($key, $field_row[$key], true);
$field_data = $cp->vars;
$var = $profile_field->get_excluded_options($key, $action, $var, $field_data, 2);
@@ -462,7 +462,7 @@ class acp_profile
foreach ($exclude[3] as $key)
{
$cp->vars[$key] = utf8_normalize_nfc($request->variable($key, array(0 => ''), true));
$cp->vars[$key] = $request->variable($key, array(0 => ''), true);
if (!$cp->vars[$key] && $action == 'edit')
{
@@ -760,7 +760,7 @@ class acp_profile
$lang_options[$lang_id]['lang_iso'] = $lang_iso;
foreach ($options as $field => $field_type)
{
$value = ($action == 'create') ? utf8_normalize_nfc($request->variable('l_' . $field, array(0 => ''), true)) : $cp->vars['l_' . $field];
$value = ($action == 'create') ? $request->variable('l_' . $field, array(0 => ''), true) : $cp->vars['l_' . $field];
if ($field == 'lang_options')
{
$var = (!isset($cp->vars['l_lang_options'][$lang_id]) || !is_array($cp->vars['l_lang_options'][$lang_id])) ? $cp->vars['lang_options'] : $cp->vars['l_lang_options'][$lang_id];

2
phpBB/includes/acp/acp_ranks.php
View File

@@ -50,7 +50,7 @@ class acp_ranks
{
trigger_error($user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING);
}
$rank_title = utf8_normalize_nfc($request->variable('title', '', true));
$rank_title = $request->variable('title', '', true);
$special_rank = $request->variable('special_rank', 0);
$min_posts = ($special_rank) ? 0 : max(0, $request->variable('min_posts', 0));
$rank_image = $request->variable('rank_image', '');

4
phpBB/includes/acp/acp_reasons.php
View File

@@ -50,8 +50,8 @@ class acp_reasons
case 'edit':
$reason_row = array(
'reason_title' => utf8_normalize_nfc($request->variable('reason_title', '', true)),
'reason_description' => utf8_normalize_nfc($request->variable('reason_description', '', true)),
'reason_title' => $request->variable('reason_title', '', true),
'reason_description' => $request->variable('reason_description', '', true),
);
if ($submit)

16
phpBB/includes/acp/acp_users.php
View File

@@ -40,7 +40,7 @@ class acp_users
$this->tpl_name = 'acp_users';
$error = array();
$username = utf8_normalize_nfc($request->variable('username', '', true));
$username = $request->variable('username', '', true);
$user_id = $request->variable('u', 0);
$action = $request->variable('action', '');
@@ -304,8 +304,8 @@ class acp_users
break;
}
$ban_reason = utf8_normalize_nfc($request->variable('ban_reason', $user->lang[$reason], true));
$ban_give_reason = utf8_normalize_nfc($request->variable('ban_give_reason', '', true));
$ban_reason = $request->variable('ban_reason', $user->lang[$reason], true);
$ban_give_reason = $request->variable('ban_give_reason', '', true);
// Log not used at the moment, we simply utilize the ban function.
$result = user_ban(substr($action, 3), $ban, 0, 0, 0, $ban_reason, $ban_give_reason);
@@ -794,7 +794,7 @@ class acp_users
// Handle registration info updates
$data = array(
'username' => utf8_normalize_nfc($request->variable('user', $user_row['username'], true)),
'username' => $request->variable('user', $user_row['username'], true),
'user_founder' => $request->variable('user_founder', ($user_row['user_type'] == USER_FOUNDER) ? 1 : 0),
'email' => strtolower($request->variable('user_email', $user_row['user_email'])),
'new_password' => $request->variable('new_password', '', true),
@@ -1131,7 +1131,7 @@ class acp_users
$deletemark = (isset($_POST['delmarked'])) ? true : false;
$deleteall = (isset($_POST['delall'])) ? true : false;
$marked = $request->variable('mark', array(0));
$message = utf8_normalize_nfc($request->variable('message', '', true));
$message = $request->variable('message', '', true);
/* @var $pagination \phpbb\pagination */
$pagination = $phpbb_container->get('pagination');
@@ -1245,7 +1245,7 @@ class acp_users
$deleteall = (isset($_POST['delall'])) ? true : false;
$confirm = (isset($_POST['confirm'])) ? true : false;
$marked = $request->variable('mark', array(0));
$message = utf8_normalize_nfc($request->variable('message', '', true));
$message = $request->variable('message', '', true);
// Sort keys
$sort_days = $request->variable('st', 0);
@@ -1398,7 +1398,7 @@ class acp_users
$user_row['iso_lang_id'] = $row['lang_id'];
$data = array(
'jabber' => utf8_normalize_nfc($request->variable('jabber', $user_row['user_jabber'], true)),
'jabber' => $request->variable('jabber', $user_row['user_jabber'], true),
'bday_day' => 0,
'bday_month' => 0,
'bday_year' => 0,
@@ -1531,7 +1531,7 @@ class acp_users
include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
$data = array(
'dateformat' => utf8_normalize_nfc($request->variable('dateformat', $user_row['user_dateformat'], true)),
'dateformat' => $request->variable('dateformat', $user_row['user_dateformat'], true),
'lang' => basename($request->variable('lang', $user_row['user_lang'])),
'tz' => $request->variable('tz', $user_row['user_timezone']),
'style' => $request->variable('style', $user_row['user_style']),

4
phpBB/includes/acp/acp_words.php
View File

@@ -89,8 +89,8 @@ class acp_words
}
$word_id = $request->variable('id', 0);
$word = utf8_normalize_nfc($request->variable('word', '', true));
$replacement = utf8_normalize_nfc($request->variable('replacement', '', true));
$word = $request->variable('word', '', true);
$replacement = $request->variable('replacement', '', true);
if ($word === '' || $replacement === '')
{