diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-12-25 14:47:57 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-12-25 14:47:57 +0000 |
| commit | 5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730 (patch) | |
| tree | a083f062a59bdacfe913d1cc84d96813037185ec /phpBB/install | |
| parent | ddfef8d832e84eca694bc6d98f2d4ec3ca480142 (diff) | |
| download | forums-5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730.tar forums-5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730.tar.gz forums-5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730.tar.bz2 forums-5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730.tar.xz forums-5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730.zip | |
add nils' request and super globals class
rename request:: to phpbb_request::
git-svn-id: file:///svn/phpbb/trunk@9230 89ea8834-ac86-4346-8a33-228a782c2dd0
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 | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index eaec24ef4f..552fb7a113 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 = request::is_set_post('submit'); + $submit = phpbb_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 (!request::variable('confirm', false)) + if (!phpbb_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 (!request::variable('confirm', false)) + } // if (!phpbb_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 ca1e8fea22..f0d5d70d3e 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 (request::is_set_post('testdb')) + if (phpbb_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 (request::is_set_post('check')) + if (phpbb_request::is_set_post('check')) { $error = array(); @@ -954,7 +954,7 @@ class install_install extends module } } - if (request::is_set_post('dldone')) + if (phpbb_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 (request::is_set_post('dlconfig')) + if (phpbb_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 f10caf9d54..28ee7a95ff 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 (request::variable('check_again', false, false, request::POST)) + if (phpbb_request::variable('check_again', false, false, phpbb_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 = (request::variable('check_again', false, false, request::POST)) ? false : $cache->get('_update_list'); + $update_list = (phpbb_request::variable('check_again', false, false, phpbb_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 @@ -823,7 +823,7 @@ class install_update extends module // Choose FTP, if not available use fsock... $method = basename(request_var('method', '')); - $submit = request::is_set_post('submit'); + $submit = phpbb_request::is_set_post('submit'); $test_ftp_connection = request_var('test_connection', ''); if (!$method || !class_exists($method)) |