mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-24 01:03:05 +02:00
- fixes for the following bugs:
#5326 #5318 #5304 #5290 #5288 #5278 #5276 #5272 #5266 - also fixed the "Call-time pass-by-reference" bug #5252 - within this step changed the normalize calls to require references. - added captcha size variables to the class scope (suggestion was posted at area51) git-svn-id: file:///svn/phpbb/trunk@6584 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -76,7 +76,7 @@ class acp_bbcodes
|
||||
|
||||
$bbcode_match = request_var('bbcode_match', '');
|
||||
$bbcode_tpl = htmlspecialchars_decode(request_var('bbcode_tpl', ''));
|
||||
$bbcode_helpline = request_var('bbcode_helpline', '');
|
||||
$bbcode_helpline = request_var('bbcode_helpline', '', true);
|
||||
break;
|
||||
}
|
||||
|
||||
|
@@ -346,11 +346,7 @@ class acp_board
|
||||
}
|
||||
|
||||
$this->new_config = $config;
|
||||
$cfg_array = (isset($_REQUEST['config'])) ? request_var('config', array('' => ''), true) : $this->new_config;
|
||||
if (isset($_REQUEST['config']))
|
||||
{
|
||||
utf8_normalize_nfc(&$cfg_array);
|
||||
}
|
||||
$cfg_array = (isset($_REQUEST['config'])) ? utf8_normalize_nfc(request_var('config', array('' => ''), true)) : $this->new_config;
|
||||
$error = array();
|
||||
|
||||
// We validate the complete config if whished
|
||||
|
@@ -615,8 +615,8 @@ class acp_forums
|
||||
$forum_data = $this->get_forum_info($forum_id);
|
||||
|
||||
$subforums_id = array();
|
||||
|
||||
$subforums = get_forum_branch($forum_id, 'children');
|
||||
|
||||
foreach ($subforums as $row)
|
||||
{
|
||||
$subforums_id[] = $row['forum_id'];
|
||||
@@ -647,6 +647,7 @@ class acp_forums
|
||||
|
||||
'FORUM_NAME' => $forum_data['forum_name'],
|
||||
'S_FORUM_POST' => ($forum_data['forum_type'] == FORUM_POST) ? true : false,
|
||||
'S_FORUM_LINK' => ($forum_data['forum_type'] == FORUM_LINK) ? true : false,
|
||||
'S_HAS_SUBFORUMS' => ($forum_data['right_id'] - $forum_data['left_id'] > 1) ? true : false,
|
||||
'S_FORUMS_LIST' => $forums_list,
|
||||
'S_ERROR' => (sizeof($errors)) ? true : false,
|
||||
|
@@ -107,11 +107,11 @@ class acp_language
|
||||
$hidden_data = build_hidden_fields(array(
|
||||
'file' => $this->language_file,
|
||||
'dir' => $this->language_directory,
|
||||
'method' => $method,
|
||||
'entry' => $_POST['entry']),
|
||||
true
|
||||
'method' => $method)
|
||||
);
|
||||
|
||||
$hidden_data .= build_hidden_fields(array('entry' => $_POST['entry']), true, STRIP);
|
||||
|
||||
$template->assign_vars(array(
|
||||
'S_UPLOAD' => true,
|
||||
'NAME' => $method,
|
||||
|
@@ -983,15 +983,13 @@ class acp_users
|
||||
'yim' => request_var('yim', $user_row['user_yim']),
|
||||
'jabber' => request_var('jabber', $user_row['user_jabber']),
|
||||
'website' => request_var('website', $user_row['user_website']),
|
||||
'location' => request_var('location', $user_row['user_from'], true),
|
||||
'occupation' => request_var('occupation', $user_row['user_occ'], true),
|
||||
'interests' => request_var('interests', $user_row['user_interests'], true),
|
||||
'location' => utf8_normalize_nfc(request_var('location', $user_row['user_from'], true)),
|
||||
'occupation' => utf8_normalize_nfc(request_var('occupation', $user_row['user_occ'], true)),
|
||||
'interests' => utf8_normalize_nfc(request_var('interests', $user_row['user_interests'], true)),
|
||||
'bday_day' => 0,
|
||||
'bday_month' => 0,
|
||||
'bday_year' => 0,
|
||||
);
|
||||
|
||||
utf8_normalize_nfc(array(&$data['location'], &$data['occupation'], &$data['interests']));
|
||||
|
||||
if ($user_row['user_birthday'])
|
||||
{
|
||||
@@ -1551,10 +1549,8 @@ class acp_users
|
||||
$enable_bbcode = ($config['allow_sig_bbcode']) ? request_var('enable_bbcode', $this->optionget($user_row, 'bbcode')) : false;
|
||||
$enable_smilies = ($config['allow_sig_smilies']) ? request_var('enable_smilies', $this->optionget($user_row, 'smilies')) : false;
|
||||
$enable_urls = request_var('enable_urls', true);
|
||||
$signature = request_var('signature', $user_row['user_sig'], true);
|
||||
|
||||
utf8_normalize_nfc(&$signature);
|
||||
|
||||
$signature = utf8_normalize_nfc(request_var('signature', $user_row['user_sig'], true));
|
||||
|
||||
$preview = (isset($_POST['preview'])) ? true : false;
|
||||
|
||||
if ($submit || $preview)
|
||||
|
@@ -68,12 +68,10 @@ class acp_words
|
||||
break;
|
||||
|
||||
case 'save':
|
||||
$word_id = request_var('id', 0);
|
||||
$word = request_var('word', '', true);
|
||||
$replacement = request_var('replacement', '', true);
|
||||
$word_id = request_var('id', 0);
|
||||
$word = utf8_normalize_nfc(request_var('word', '', true));
|
||||
$replacement = utf8_normalize_nfc(request_var('replacement', '', true));
|
||||
|
||||
utf8_normalize_nfc(array(&$word, &$replacement));
|
||||
|
||||
if (!$word || !$replacement)
|
||||
{
|
||||
trigger_error($user->lang['ENTER_WORD'] . adm_back_link($this->u_action), E_USER_WARNING);
|
||||
|
Reference in New Issue
Block a user