1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +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

@@ -35,12 +35,12 @@ class mcp_logs
function main($id, $mode)
{
global $auth, $db, $user, $template;
global $auth, $db, $user, $template, $request;
global $config, $phpbb_root_path, $phpEx, $phpbb_container, $phpbb_log;
$user->add_lang('acp/common');
$action = request_var('action', array('' => ''));
$action = $request->variable('action', array('' => ''));
if (is_array($action))
{
@@ -48,19 +48,19 @@ class mcp_logs
}
else
{
$action = request_var('action', '');
$action = $request->variable('action', '');
}
// Set up general vars
$start = request_var('start', 0);
$start = $request->variable('start', 0);
$deletemark = ($action == 'del_marked') ? true : false;
$deleteall = ($action == 'del_all') ? true : false;
$marked = request_var('mark', array(0));
$marked = $request->variable('mark', array(0));
// Sort keys
$sort_days = request_var('st', 0);
$sort_key = request_var('sk', 't');
$sort_dir = request_var('sd', 'd');
$sort_days = $request->variable('st', 0);
$sort_key = $request->variable('sk', 't');
$sort_dir = $request->variable('sd', 'd');
$this->tpl_name = 'mcp_logs';
$this->page_title = 'MCP_LOGS';
@@ -79,7 +79,7 @@ class mcp_logs
break;
case 'forum_logs':
$forum_id = request_var('f', 0);
$forum_id = $request->variable('f', 0);
if (!in_array($forum_id, $forum_list))
{
@@ -90,7 +90,7 @@ class mcp_logs
break;
case 'topic_logs':
$topic_id = request_var('t', 0);
$topic_id = $request->variable('t', 0);
$sql = 'SELECT forum_id
FROM ' . TOPICS_TABLE . '
@@ -124,7 +124,7 @@ class mcp_logs
}
else if ($deleteall)
{
$keywords = utf8_normalize_nfc(request_var('keywords', '', true));
$keywords = utf8_normalize_nfc($request->variable('keywords', '', true));
$conditions = array(
'forum_id' => array('IN' => $forum_list),
@@ -158,7 +158,7 @@ class mcp_logs
'sd' => $sort_dir,
'i' => $id,
'mode' => $mode,
'action' => request_var('action', array('' => ''))))
'action' => $request->variable('action', array('' => ''))))
);
}
}
@@ -175,7 +175,7 @@ class mcp_logs
$sql_where = ($sort_days) ? (time() - ($sort_days * 86400)) : 0;
$sql_sort = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
$keywords = utf8_normalize_nfc(request_var('keywords', '', true));
$keywords = utf8_normalize_nfc($request->variable('keywords', '', true));
$keywords_param = !empty($keywords) ? '&keywords=' . urlencode(htmlspecialchars_decode($keywords)) : '';
// Grab log data