aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp/mcp_notes.php
diff options
context:
space:
mode:
authorGaëtan Muller <m.gaetan89@gmail.com>2015-01-04 20:41:04 +0100
committerGaëtan Muller <m.gaetan89@gmail.com>2015-02-03 20:50:40 +0100
commitf6e06da4c68917dafb057bf7fe19f884a3e148c2 (patch)
treee68e2c80b8588e066069a574ea7d0bda887c6ddd /phpBB/includes/mcp/mcp_notes.php
parent284aa8c496d658c196a0dfa3c90657415ee4c2ee (diff)
downloadforums-f6e06da4c68917dafb057bf7fe19f884a3e148c2.tar
forums-f6e06da4c68917dafb057bf7fe19f884a3e148c2.tar.gz
forums-f6e06da4c68917dafb057bf7fe19f884a3e148c2.tar.bz2
forums-f6e06da4c68917dafb057bf7fe19f884a3e148c2.tar.xz
forums-f6e06da4c68917dafb057bf7fe19f884a3e148c2.zip
[ticket/13455] Update calls to `request_var()`
PHPBB3-13455
Diffstat (limited to 'phpBB/includes/mcp/mcp_notes.php')
-rw-r--r--phpBB/includes/mcp/mcp_notes.php24
1 files changed, 12 insertions, 12 deletions
diff --git a/phpBB/includes/mcp/mcp_notes.php b/phpBB/includes/mcp/mcp_notes.php
index 4fd17ccf48..ec7dcaada3 100644
--- a/phpBB/includes/mcp/mcp_notes.php
+++ b/phpBB/includes/mcp/mcp_notes.php
@@ -35,10 +35,10 @@ class mcp_notes
function main($id, $mode)
{
- global $auth, $db, $user, $template;
+ global $auth, $db, $user, $template, $request;
global $config, $phpbb_root_path, $phpEx;
- $action = request_var('action', array('' => ''));
+ $action = $request->variable('action', array('' => ''));
if (is_array($action))
{
@@ -74,15 +74,15 @@ class mcp_notes
*/
function mcp_notes_user_view($action)
{
- global $phpEx, $phpbb_root_path, $config, $phpbb_log;
+ global $phpEx, $phpbb_root_path, $config, $phpbb_log, $request;
global $template, $db, $user, $auth, $phpbb_container;
- $user_id = request_var('u', 0);
- $username = request_var('username', '', true);
- $start = request_var('start', 0);
- $st = request_var('st', 0);
- $sk = request_var('sk', 'b');
- $sd = request_var('sd', 'd');
+ $user_id = $request->variable('u', 0);
+ $username = $request->variable('username', '', true);
+ $start = $request->variable('start', 0);
+ $st = $request->variable('st', 0);
+ $sk = $request->variable('sk', 'b');
+ $sd = $request->variable('sd', 'd');
/* @var $pagination \phpbb\pagination */
$pagination = $phpbb_container->get('pagination');
@@ -116,8 +116,8 @@ class mcp_notes
$deletemark = ($action == 'del_marked') ? true : false;
$deleteall = ($action == 'del_all') ? true : false;
- $marked = request_var('marknote', array(0));
- $usernote = utf8_normalize_nfc(request_var('usernote', '', true));
+ $marked = $request->variable('marknote', array(0));
+ $usernote = utf8_normalize_nfc($request->variable('usernote', '', true));
// Handle any actions
if (($deletemark || $deleteall) && $auth->acl_get('a_clearlogs'))
@@ -201,7 +201,7 @@ class mcp_notes
$sql_where = ($st) ? (time() - ($st * 86400)) : 0;
$sql_sort = $sort_by_sql[$sk] . ' ' . (($sd == 'd') ? 'DESC' : 'ASC');
- $keywords = utf8_normalize_nfc(request_var('keywords', '', true));
+ $keywords = utf8_normalize_nfc($request->variable('keywords', '', true));
$keywords_param = !empty($keywords) ? '&amp;keywords=' . urlencode(htmlspecialchars_decode($keywords)) : '';
$log_data = array();