1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-17 22:11:26 +02:00

[ticket/13455] Update calls to request_var()

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

View File

@@ -26,7 +26,7 @@ class acp_database
function main($id, $mode)
{
global $cache, $db, $user, $auth, $template, $table_prefix;
global $cache, $db, $user, $auth, $template, $table_prefix, $request;
global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx, $phpbb_log;
$this->db_tools = new \phpbb\db\tools\tools($db);
@@ -36,7 +36,7 @@ class acp_database
$this->tpl_name = 'acp_database';
$this->page_title = 'ACP_DATABASE';
$action = request_var('action', '');
$action = $request->variable('action', '');
$submit = (isset($_POST['submit'])) ? true : false;
$template->assign_vars(array(
@@ -52,10 +52,10 @@ class acp_database
switch ($action)
{
case 'download':
$type = request_var('type', '');
$table = array_intersect($this->db_tools->sql_list_tables(), request_var('table', array('')));
$format = request_var('method', '');
$where = request_var('where', '');
$type = $request->variable('type', '');
$table = array_intersect($this->db_tools->sql_list_tables(), $request->variable('table', array('')));
$format = $request->variable('method', '');
$where = $request->variable('where', '');
if (!sizeof($table))
{
@@ -221,9 +221,9 @@ class acp_database
switch ($action)
{
case 'submit':
$delete = request_var('delete', '');
$file = request_var('file', '');
$download = request_var('download', '');
$delete = $request->variable('delete', '');
$file = $request->variable('file', '');
$download = $request->variable('download', '');
if (!preg_match('#^backup_\d{10,}_[a-z\d]{16}\.(sql(?:\.(?:gz|bz2))?)$#', $file, $matches))
{
@@ -1868,7 +1868,8 @@ class oracle_extractor extends base_extractor
{
function write_table($table_name)
{
global $db;
global $db, $request;
$sql_data = '-- Table: ' . $table_name . "\n";
$sql_data .= "DROP TABLE $table_name\n/\n";
$sql_data .= "\nCREATE TABLE $table_name (\n";
@@ -1961,7 +1962,7 @@ class oracle_extractor extends base_extractor
AND C.SEQUENCE_NAME = A.REFERENCED_NAME";
$result = $db->sql_query($sql);
$type = request_var('type', '');
$type = $request->variable('type', '');
while ($row = $db->sql_fetchrow($result))
{