mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

[ticket/13455] Update calls to request_var()

Browse Source 
PHPBB3-13455
This commit is contained in:
Gaëtan Muller
2015-01-04 20:41:04 +01:00
parent 284aa8c496
commit f6e06da4c6
93 changed files with 1052 additions and 1059 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
phpBB/phpbb/captcha/plugins/captcha_abstract.php
View File

@@ -34,12 +34,12 @@ abstract class captcha_abstract
function init($type)
{
global $config, $db, $user;
global $config, $db, $user, $request;
// read input
$this->confirm_id = request_var('confirm_id', '');
$this->confirm_code = request_var('confirm_code', '');
$refresh = request_var('refresh_vc', false) && $config['confirm_refresh'];
$this->confirm_id = $request->variable('confirm_id', '');
$this->confirm_code = $request->variable('confirm_code', '');
$refresh = $request->variable('refresh_vc', false) && $config['confirm_refresh'];
$this->type = (int) $type;
@@ -125,7 +125,7 @@ abstract class captcha_abstract
{
foreach ($this->captcha_vars as $captcha_var => $template_var)
{
$variables .= '&' . rawurlencode($captcha_var) . '=' . request_var($captcha_var, (int) $config[$captcha_var]);
$variables .= '&' . rawurlencode($captcha_var) . '=' . $request->variable($captcha_var, (int) $config[$captcha_var]);
}
}
@@ -350,7 +350,9 @@ abstract class captcha_abstract
function is_solved()
{
if (request_var('confirm_code', false) && $this->solved === 0)
global $request;
if ($request->variable('confirm_code', false) && $this->solved === 0)
{
$this->validate();
}

12
phpBB/phpbb/captcha/plugins/gd.php
View File

@@ -53,7 +53,7 @@ class gd extends captcha_abstract
function acp_page($id, &$module)
{
global $db, $user, $auth, $template, $phpbb_log;
global $db, $user, $auth, $template, $phpbb_log, $request;
global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
$user->add_lang('acp/board');
@@ -70,14 +70,14 @@ class gd extends captcha_abstract
$form_key = 'acp_captcha';
add_form_key($form_key);
$submit = request_var('submit', '');
$submit = $request->variable('submit', '');
if ($submit && check_form_key($form_key))
{
$captcha_vars = array_keys($this->captcha_vars);
foreach ($captcha_vars as $captcha_var)
{
$value = request_var($captcha_var, 0);
$value = $request->variable($captcha_var, 0);
if ($value >= 0)
{
$config->set($captcha_var, $value);
@@ -95,7 +95,7 @@ class gd extends captcha_abstract
{
foreach ($this->captcha_vars as $captcha_var => $template_var)
{
$var = (isset($_REQUEST[$captcha_var])) ? request_var($captcha_var, 0) : $config[$captcha_var];
$var = (isset($_REQUEST[$captcha_var])) ? $request->variable($captcha_var, 0) : $config[$captcha_var];
$template->assign_var($template_var, $var);
}
@@ -109,7 +109,7 @@ class gd extends captcha_abstract
function execute_demo()
{
global $config;
global $config, $request;
$config_old = $config;
@@ -121,7 +121,7 @@ class gd extends captcha_abstract
foreach ($this->captcha_vars as $captcha_var => $template_var)
{
$config->set($captcha_var, request_var($captcha_var, (int) $config[$captcha_var]));
$config->set($captcha_var, $request->variable($captcha_var, (int) $config[$captcha_var]));
}
parent::execute_demo();
$config = $config_old;

40
phpBB/phpbb/captcha/plugins/qa.php
View File

@@ -58,14 +58,14 @@ class qa
*/
function init($type)
{
global $config, $db, $user;
global $config, $db, $user, $request;
// load our language file
$user->add_lang('captcha_qa');
// read input
$this->confirm_id = request_var('qa_confirm_id', '');
$this->answer = utf8_normalize_nfc(request_var('qa_answer', '', true));
$this->confirm_id = $request->variable('qa_confirm_id', '');
$this->answer = utf8_normalize_nfc($request->variable('qa_answer', '', true));
$this->type = (int) $type;
$this->question_lang = $user->lang_name;
@@ -544,9 +544,9 @@ class qa
*/
function check_answer()
{
global $db;
global $db, $request;
$answer = ($this->question_strict) ? utf8_normalize_nfc(request_var('qa_answer', '', true)) : utf8_clean_string(utf8_normalize_nfc(request_var('qa_answer', '', true)));
$answer = ($this->question_strict) ? utf8_normalize_nfc($request->variable('qa_answer', '', true)) : utf8_clean_string(utf8_normalize_nfc($request->variable('qa_answer', '', true)));
$sql = 'SELECT answer_text
FROM ' . $this->table_captcha_answers . '
@@ -598,7 +598,9 @@ class qa
*/
function is_solved()
{
if (request_var('qa_answer', false) && $this->solved === 0)
global $request;
if ($request->variable('qa_answer', false) && $this->solved === 0)
{
$this->validate();
}
@@ -611,7 +613,7 @@ class qa
*/
function acp_page($id, &$module)
{
global $db, $user, $auth, $template, $phpbb_log;
global $db, $user, $auth, $template, $phpbb_log, $request;
global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
$user->add_lang('acp/board');
@@ -627,9 +629,9 @@ class qa
$form_key = 'acp_captcha';
add_form_key($form_key);
$submit = request_var('submit', false);
$question_id = request_var('question_id', 0);
$action = request_var('action', '');
$submit = $request->variable('submit', false);
$question_id = $request->variable('question_id', 0);
$action = $request->variable('action', '');
// we have two pages, so users might want to navigate from one to the other
$list_url = $module->u_action . "&configure=1&select_captcha=" . $this->get_service_name();
@@ -675,10 +677,10 @@ class qa
{
// okay, show the editor
$error = false;
$input_question = request_var('question_text', '', true);
$input_answers = request_var('answers', '', true);
$input_lang = request_var('lang_iso', '', true);
$input_strict = request_var('strict', false);
$input_question = $request->variable('question_text', '', true);
$input_answers = $request->variable('answers', '', true);
$input_lang = $request->variable('lang_iso', '', true);
$input_strict = $request->variable('strict', false);
$langs = $this->get_languages();
foreach ($langs as $lang => $entry)
@@ -826,11 +828,13 @@ class qa
*/
function acp_get_question_input()
{
$answers = utf8_normalize_nfc(request_var('answers', '', true));
global $request;
$answers = utf8_normalize_nfc($request->variable('answers', '', true));
$question = array(
'question_text' => request_var('question_text', '', true),
'strict' => request_var('strict', false),
'lang_iso' => request_var('lang_iso', ''),
'question_text' => $request->variable('question_text', '', true),
'strict' => $request->variable('strict', false),
'lang_iso' => $request->variable('lang_iso', ''),
'answers' => (strlen($answers)) ? explode("\n", $answers) : '',
);

14
phpBB/phpbb/captcha/plugins/recaptcha.php
View File

@@ -37,12 +37,12 @@ class recaptcha extends captcha_abstract
function init($type)
{
global $config, $db, $user;
global $config, $db, $user, $request;
$user->add_lang('captcha_recaptcha');
parent::init($type);
$this->challenge = request_var('recaptcha_challenge_field', '');
$this->response = request_var('recaptcha_response_field', '');
$this->challenge = $request->variable('recaptcha_challenge_field', '');
$this->response = $request->variable('recaptcha_response_field', '');
}
public function is_available()
@@ -75,7 +75,7 @@ class recaptcha extends captcha_abstract
function acp_page($id, &$module)
{
global $config, $db, $template, $user, $phpbb_log;
global $config, $db, $template, $user, $phpbb_log, $request;
$captcha_vars = array(
'recaptcha_pubkey' => 'RECAPTCHA_PUBKEY',
@@ -87,14 +87,14 @@ class recaptcha extends captcha_abstract
$form_key = 'acp_captcha';
add_form_key($form_key);
$submit = request_var('submit', '');
$submit = $request->variable('submit', '');
if ($submit && check_form_key($form_key))
{
$captcha_vars = array_keys($captcha_vars);
foreach ($captcha_vars as $captcha_var)
{
$value = request_var($captcha_var, '');
$value = $request->variable($captcha_var, '');
if ($value)
{
$config->set($captcha_var, $value);
@@ -112,7 +112,7 @@ class recaptcha extends captcha_abstract
{
foreach ($captcha_vars as $captcha_var => $template_var)
{
$var = (isset($_REQUEST[$captcha_var])) ? request_var($captcha_var, '') : ((isset($config[$captcha_var])) ? $config[$captcha_var] : '');
$var = (isset($_REQUEST[$captcha_var])) ? $request->variable($captcha_var, '') : ((isset($config[$captcha_var])) ? $config[$captcha_var] : '');
$template->assign_var($template_var, $var);
}

2
phpBB/phpbb/profilefields/type/type_date.php
View File

@@ -72,7 +72,7 @@ class type_date extends type_base
'lang_options' => $field_data['lang_options'],
);
$always_now = request_var('always_now', -1);
$always_now = $request->variable('always_now', -1);
if ($always_now == -1)
{
$s_checked = ($field_data['field_default_value'] == 'now') ? true : false;

12
phpBB/phpbb/session.php
View File

@@ -139,7 +139,7 @@ class session
'root_script_path' => str_replace(' ', '%20', htmlspecialchars($root_script_path)),
'page' => $page,
'forum' => request_var('f', 0),
'forum' => $request->variable('f', 0),
);
return $page_array;
@@ -253,23 +253,23 @@ class session
if ($request->is_set($config['cookie_name'] . '_sid', \phpbb\request\request_interface::COOKIE) || $request->is_set($config['cookie_name'] . '_u', \phpbb\request\request_interface::COOKIE))
{
$this->cookie_data['u'] = request_var($config['cookie_name'] . '_u', 0, false, true);
$this->cookie_data['k'] = request_var($config['cookie_name'] . '_k', '', false, true);
$this->session_id = request_var($config['cookie_name'] . '_sid', '', false, true);
$this->cookie_data['u'] = $request->variable($config['cookie_name'] . '_u', 0, false, \phpbb\request\request_interface::COOKIE);
$this->cookie_data['k'] = $request->variable($config['cookie_name'] . '_k', '', false, \phpbb\request\request_interface::COOKIE);
$this->session_id = $request->variable($config['cookie_name'] . '_sid', '', false, \phpbb\request\request_interface::COOKIE);
$SID = (defined('NEED_SID')) ? '?sid=' . $this->session_id : '?sid=';
$_SID = (defined('NEED_SID')) ? $this->session_id : '';
if (empty($this->session_id))
{
$this->session_id = $_SID = request_var('sid', '');
$this->session_id = $_SID = $request->variable('sid', '');
$SID = '?sid=' . $this->session_id;
$this->cookie_data = array('u' => 0, 'k' => '');
}
}
else
{
$this->session_id = $_SID = request_var('sid', '');
$this->session_id = $_SID = $request->variable('sid', '');
$SID = '?sid=' . $this->session_id;
}