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

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)
{