mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 02:06:32 +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

3
phpBB/install/database_update.php
View File

@@ -109,9 +109,6 @@ $db = $phpbb_container->get('dbal.conn');
/* @var $phpbb_log \phpbb\log\log_interface */
$phpbb_log = $phpbb_container->get('log');
// make sure request_var uses this request instance
request_var('', 0, false, false, $request); // "dependency injection" for a function
// Grab global variables, re-cache if necessary
/* @var $config \phpbb\config\config */
$config = $phpbb_container->get('config');

3
phpBB/install/index.php
View File

@@ -149,9 +149,6 @@ $phpbb_dispatcher = $phpbb_container->get('dispatcher');
/* @var $request \phpbb\request\request_interface */
$request = $phpbb_container->get('request');
// make sure request_var uses this request instance
request_var('', 0, false, false, $request); // "dependency injection" for a function
// Try and load an appropriate language if required
$language = basename($request->variable('language', ''));

34
phpBB/install/install_convert.php
View File

@@ -153,7 +153,7 @@ class install_convert extends module
// Detect if there is already a conversion in progress at this point and offer to resume
// It's quite possible that the user will get disconnected during a large conversion so they need to be able to resume it
$new_conversion = request_var('new_conv', 0);
$new_conversion = $request->variable('new_conv', 0);
if ($new_conversion)
{
@@ -390,7 +390,7 @@ class install_convert extends module
// We need to fill the config to let internal functions correctly work
$config = new \phpbb\config\db($db, new \phpbb\cache\driver\null, CONFIG_TABLE);
$convertor_tag = request_var('tag', '');
$convertor_tag = $request->variable('tag', '');
if (empty($convertor_tag))
{
@@ -415,15 +415,15 @@ class install_convert extends module
$submit = (isset($_POST['submit'])) ? true : false;
$src_dbms = request_var('src_dbms', $convertor_data['dbms']);
$src_dbhost = request_var('src_dbhost', $convertor_data['dbhost']);
$src_dbport = request_var('src_dbport', $convertor_data['dbport']);
$src_dbuser = request_var('src_dbuser', $convertor_data['dbuser']);
$src_dbpasswd = request_var('src_dbpasswd', $convertor_data['dbpasswd']);
$src_dbname = request_var('src_dbname', $convertor_data['dbname']);
$src_table_prefix = request_var('src_table_prefix', $convertor_data['table_prefix']);
$forum_path = request_var('forum_path', $convertor_data['forum_path']);
$refresh = request_var('refresh', 1);
$src_dbms = $request->variable('src_dbms', $convertor_data['dbms']);
$src_dbhost = $request->variable('src_dbhost', $convertor_data['dbhost']);
$src_dbport = $request->variable('src_dbport', $convertor_data['dbport']);
$src_dbuser = $request->variable('src_dbuser', $convertor_data['dbuser']);
$src_dbpasswd = $request->variable('src_dbpasswd', $convertor_data['dbpasswd']);
$src_dbname = $request->variable('src_dbname', $convertor_data['dbname']);
$src_table_prefix = $request->variable('src_table_prefix', $convertor_data['table_prefix']);
$forum_path = $request->variable('forum_path', $convertor_data['forum_path']);
$refresh = $request->variable('refresh', 1);
// Default URL of the old board
// @todo Are we going to use this for attempting to convert URL references in posts, or should we remove it?
@@ -804,10 +804,10 @@ class install_convert extends module
include($phpbb_root_path . 'includes/message_parser.' . $phpEx);
$message_parser = new parse_message();
$jump = request_var('jump', 0);
$final_jump = request_var('final_jump', 0);
$sync_batch = request_var('sync_batch', -1);
$last_statement = request_var('last', 0);
$jump = $request->variable('jump', 0);
$final_jump = $request->variable('final_jump', 0);
$sync_batch = $request->variable('sync_batch', -1);
$last_statement = $request->variable('last', 0);
// We are running sync...
if ($sync_batch >= 0)
@@ -828,9 +828,9 @@ class install_convert extends module
return;
}
$current_table = request_var('current_table', 0);
$current_table = $request->variable('current_table', 0);
$old_current_table = min(-1, $current_table - 1);
$skip_rows = request_var('skip_rows', 0);
$skip_rows = $request->variable('skip_rows', 0);
if (!$current_table && !$skip_rows)
{

60
phpBB/install/install_install.php
View File

@@ -2078,36 +2078,38 @@ class install_install extends module
*/
function get_submitted_data()
{
global $request;
return array(
'language' => basename(request_var('language', '')),
'dbms' => request_var('dbms', ''),
'dbhost' => request_var('dbhost', '', true),
'dbport' => request_var('dbport', ''),
'dbuser' => request_var('dbuser', ''),
'dbpasswd' => request_var('dbpasswd', '', true),
'dbname' => request_var('dbname', ''),
'table_prefix' => request_var('table_prefix', ''),
'default_lang' => basename(request_var('default_lang', '')),
'admin_name' => utf8_normalize_nfc(request_var('admin_name', '', true)),
'admin_pass1' => request_var('admin_pass1', '', true),
'admin_pass2' => request_var('admin_pass2', '', true),
'board_email' => strtolower(request_var('board_email', '')),
'img_imagick' => request_var('img_imagick', ''),
'ftp_path' => request_var('ftp_path', ''),
'ftp_user' => request_var('ftp_user', ''),
'ftp_pass' => request_var('ftp_pass', ''),
'email_enable' => request_var('email_enable', ''),
'smtp_delivery' => request_var('smtp_delivery', ''),
'smtp_host' => request_var('smtp_host', ''),
'smtp_auth' => request_var('smtp_auth', ''),
'smtp_user' => request_var('smtp_user', ''),
'smtp_pass' => request_var('smtp_pass', ''),
'cookie_secure' => request_var('cookie_secure', ''),
'force_server_vars' => request_var('force_server_vars', ''),
'server_protocol' => request_var('server_protocol', ''),
'server_name' => request_var('server_name', ''),
'server_port' => request_var('server_port', ''),
'script_path' => request_var('script_path', ''),
'language' => basename($request->variable('language', '')),
'dbms' => $request->variable('dbms', ''),
'dbhost' => $request->variable('dbhost', ''),
'dbport' => $request->variable('dbport', ''),
'dbuser' => $request->variable('dbuser', ''),
'dbpasswd' => $request->variable('dbpasswd', '', true),
'dbname' => $request->variable('dbname', ''),
'table_prefix' => $request->variable('table_prefix', ''),
'default_lang' => basename($request->variable('default_lang', '')),
'admin_name' => utf8_normalize_nfc($request->variable('admin_name', '', true)),
'admin_pass1' => $request->variable('admin_pass1', '', true),
'admin_pass2' => $request->variable('admin_pass2', '', true),
'board_email' => strtolower($request->variable('board_email', '')),
'img_imagick' => $request->variable('img_imagick', ''),
'ftp_path' => $request->variable('ftp_path', ''),
'ftp_user' => $request->variable('ftp_user', ''),
'ftp_pass' => $request->variable('ftp_pass', ''),
'email_enable' => $request->variable('email_enable', ''),
'smtp_delivery' => $request->variable('smtp_delivery', ''),
'smtp_host' => $request->variable('smtp_host', ''),
'smtp_auth' => $request->variable('smtp_auth', ''),
'smtp_user' => $request->variable('smtp_user', ''),
'smtp_pass' => $request->variable('smtp_pass', ''),
'cookie_secure' => $request->variable('cookie_secure', ''),
'force_server_vars' => $request->variable('force_server_vars', ''),
'server_protocol' => $request->variable('server_protocol', ''),
'server_name' => $request->variable('server_name', ''),
'server_port' => $request->variable('server_port', ''),
'script_path' => $request->variable('script_path', ''),
);
}

46
phpBB/install/install_update.php
View File

@@ -351,7 +351,7 @@ class install_update extends module
$this->page_title = 'STAGE_FILE_CHECK';
// Now make sure our update list is correct if the admin refreshes
$action = request_var('action', '');
$action = $request->variable('action', '');
// We are directly within an update. To make sure our update list is correct we check its status.
$update_list = ($request->variable('check_again', false, false, \phpbb\request\request_interface::POST)) ? false : $cache->get('_update_list');
@@ -541,8 +541,8 @@ class install_update extends module
$s_hidden_fields = '';
$params = array();
$conflicts = request_var('conflict', array('' => 0));
$modified = request_var('modified', array('' => 0));
$conflicts = $request->variable('conflict', array('' => 0));
$modified = $request->variable('modified', array('' => 0));
foreach ($conflicts as $filename => $merge_option)
{
@@ -560,7 +560,7 @@ class install_update extends module
$params[] = 'modified[' . urlencode($filename) . ']=' . urlencode($merge_option);
}
$no_update = request_var('no_update', array(0 => ''));
$no_update = $request->variable('no_update', array(0 => ''));
foreach ($no_update as $index => $filename)
{
@@ -795,7 +795,7 @@ class install_update extends module
{
$this->include_file('includes/functions_compress.' . $phpEx);
$use_method = request_var('use_method', '');
$use_method = $request->variable('use_method', '');
$methods = array('.tar');
$available_methods = array('.tar.gz' => 'zlib', '.tar.bz2' => 'bz2', '.zip' => 'zlib');
@@ -866,9 +866,9 @@ class install_update extends module
$this->include_file('includes/functions_transfer.' . $phpEx);
// Choose FTP, if not available use fsock...
$method = basename(request_var('method', ''));
$method = basename($request->variable('method', ''));
$submit = (isset($_POST['submit'])) ? true : false;
$test_ftp_connection = request_var('test_connection', '');
$test_ftp_connection = $request->variable('test_connection', '');
if (!$method || !class_exists($method))
{
@@ -885,12 +885,12 @@ class install_update extends module
if ($test_ftp_connection || $submit)
{
$transfer = new $method(
request_var('host', ''),
request_var('username', ''),
$request->variable('host', ''),
$request->variable('username', ''),
htmlspecialchars_decode($request->untrimmed_variable('password', '')),
request_var('root_path', ''),
request_var('port', ''),
request_var('timeout', '')
$request->variable('root_path', ''),
$request->variable('port', ''),
$request->variable('timeout', '')
);
$test_connection = $transfer->open_session();
@@ -978,12 +978,12 @@ class install_update extends module
else
{
$transfer = new $method(
request_var('host', ''),
request_var('username', ''),
$request->variable('host', ''),
$request->variable('username', ''),
htmlspecialchars_decode($request->untrimmed_variable('password', '')),
request_var('root_path', ''),
request_var('port', ''),
request_var('timeout', '')
$request->variable('root_path', ''),
$request->variable('port', ''),
$request->variable('timeout', '')
);
$transfer->open_session();
}
@@ -1107,15 +1107,15 @@ class install_update extends module
*/
function show_diff(&$update_list)
{
global $phpbb_root_path, $template, $user, $phpbb_adm_relative_path;
global $phpbb_root_path, $template, $user, $request, $phpbb_adm_relative_path;
$this->tpl_name = 'install_update_diff';
$this->page_title = 'VIEWING_FILE_DIFF';
$status = request_var('status', '');
$file = request_var('file', '');
$diff_mode = request_var('diff_mode', 'inline');
$status = $request->variable('status', '');
$file = $request->variable('file', '');
$diff_mode = $request->variable('diff_mode', 'inline');
// First of all make sure the file is within our file update list with the correct status
$found_entry = array();
@@ -1144,7 +1144,7 @@ class install_update extends module
switch ($status)
{
case 'conflict':
$option = request_var('op', 0);
$option = $request->variable('op', 0);
switch ($option)
{
@@ -1195,7 +1195,7 @@ class install_update extends module
break;
case 'modified':
$option = request_var('op', 0);
$option = $request->variable('op', 0);
switch ($option)
{