diff options
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/install_convert.php | 6 | ||||
| -rw-r--r-- | phpBB/install/install_install.php | 8 | ||||
| -rw-r--r-- | phpBB/install/install_update.php | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index 319505d57a..eaec24ef4f 100644 --- a/phpBB/install/install_convert.php +++ b/phpBB/install/install_convert.php @@ -381,7 +381,7 @@ class install_convert extends module $this->p_master->error($lang['DEV_NO_TEST_FILE'], __LINE__, __FILE__); } - $submit = (isset($_POST['submit'])) ? true : false; + $submit = request::is_set_post('submit'); $src_dbms = request_var('src_dbms', $convertor_data['dbms']); $src_dbhost = request_var('src_dbhost', $convertor_data['dbhost']); @@ -805,7 +805,7 @@ class install_convert extends module if (!$current_table && !$skip_rows) { - if (empty($_REQUEST['confirm'])) + if (!request::variable('confirm', false)) { // If avatars / ranks / smilies folders are specified make sure they are writable $bad_folders = array(); @@ -966,7 +966,7 @@ class install_convert extends module )); return; - } // if (empty($_REQUEST['confirm'])) + } // if (!request::variable('confirm', false)) $template->assign_block_vars('checks', array( 'S_LEGEND' => true, diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index fce0350c31..ca1e8fea22 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -559,7 +559,7 @@ class install_install extends module $available_dbms = get_available_dbms(false, true); // Has the user opted to test the connection? - if (isset($_POST['testdb'])) + if (request::is_set_post('testdb')) { if (!isset($available_dbms[$data['dbms']]) || !$available_dbms[$data['dbms']]['AVAILABLE']) { @@ -700,7 +700,7 @@ class install_install extends module $data['default_lang'] = ($data['default_lang'] !== '') ? $data['default_lang'] : $data['language']; - if (isset($_POST['check'])) + if (request::is_set_post('check')) { $error = array(); @@ -954,7 +954,7 @@ class install_install extends module } } - if (isset($_POST['dldone'])) + if (request::is_set_post('dldone')) { // Do a basic check to make sure that the file has been uploaded // Note that all we check is that the file has _something_ in it @@ -981,7 +981,7 @@ class install_install extends module { // OK, so it didn't work let's try the alternatives - if (isset($_POST['dlconfig'])) + if (request::is_set_post('dlconfig')) { // They want a copy of the file to download, so send the relevant headers and dump out the data header('Content-Type: text/x-delimtext; name="config.' . PHP_EXT . '"'); diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 8312b3fc55..f10caf9d54 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -208,7 +208,7 @@ class install_update extends module $this->include_file('includes/diff/renderer.' . PHP_EXT); // Make sure we stay at the file check if checking the files again - if (!empty($_POST['check_again'])) + if (request::variable('check_again', false, false, request::POST)) { $sub = $this->p_master->sub = 'file_check'; } @@ -297,7 +297,7 @@ class install_update extends module $action = request_var('action', ''); // We are directly within an update. To make sure our update list is correct we check its status. - $update_list = (!empty($_POST['check_again'])) ? false : $cache->get('_update_list'); + $update_list = (request::variable('check_again', false, false, request::POST)) ? false : $cache->get('_update_list'); $modified = ($update_list !== false) ? @filemtime($cache->cache_dir . 'data_update_list.' . PHP_EXT) : 0; // Make sure the list is up-to-date @@ -644,7 +644,7 @@ class install_update extends module { $cache->put('_diff_files', $file_list); - if (!empty($_REQUEST['download'])) + if (request_var('download', false)) { $params[] = 'download=1'; } @@ -747,7 +747,7 @@ class install_update extends module $file_list['status'] = -1; $cache->put('_diff_files', $file_list); - if (!empty($_REQUEST['download'])) + if (request_var('download', false)) { $this->include_file('includes/functions_compress.' . PHP_EXT); @@ -823,7 +823,7 @@ class install_update extends module // Choose FTP, if not available use fsock... $method = basename(request_var('method', '')); - $submit = (isset($_POST['submit'])) ? true : false; + $submit = request::is_set_post('submit'); $test_ftp_connection = request_var('test_connection', ''); if (!$method || !class_exists($method)) @@ -881,7 +881,7 @@ class install_update extends module 'DATA' => $data, 'NAME' => $user->lang[strtoupper($method . '_' . $data)], 'EXPLAIN' => $user->lang[strtoupper($method . '_' . $data) . '_EXPLAIN'], - 'DEFAULT' => (!empty($_REQUEST[$data])) ? request_var($data, '') : $default + 'DEFAULT' => (request_var($data, false)) ? request_var($data, '') : $default )); } |
