mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

[ticket/13455] Update calls to request_var()

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

58
phpBB/includes/acp/acp_prune.php
View File

@@ -51,11 +51,11 @@ class acp_prune
*/
function prune_forums($id, $mode)
{
global $db, $user, $auth, $template, $cache, $phpbb_log;
global $db, $user, $auth, $template, $cache, $phpbb_log, $request;
global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
$all_forums = request_var('all_forums', 0);
$forum_id = request_var('f', array(0));
$all_forums = $request->variable('all_forums', 0);
$forum_id = $request->variable('f', array(0));
$submit = (isset($_POST['submit'])) ? true : false;
if ($all_forums)
@@ -77,14 +77,14 @@ class acp_prune
{
if (confirm_box(true))
{
$prune_posted = request_var('prune_days', 0);
$prune_viewed = request_var('prune_vieweddays', 0);
$prune_posted = $request->variable('prune_days', 0);
$prune_viewed = $request->variable('prune_vieweddays', 0);
$prune_all = (!$prune_posted && !$prune_viewed) ? true : false;
$prune_flags = 0;
$prune_flags += (request_var('prune_old_polls', 0)) ? 2 : 0;
$prune_flags += (request_var('prune_announce', 0)) ? 4 : 0;
$prune_flags += (request_var('prune_sticky', 0)) ? 8 : 0;
$prune_flags += ($request->variable('prune_old_polls', 0)) ? 2 : 0;
$prune_flags += ($request->variable('prune_announce', 0)) ? 4 : 0;
$prune_flags += ($request->variable('prune_sticky', 0)) ? 8 : 0;
// Convert days to seconds for timestamp functions...
$prunedate_posted = time() - ($prune_posted * 86400);
@@ -169,11 +169,11 @@ class acp_prune
'all_forums' => $all_forums,
'f' => $forum_id,
'prune_days' => request_var('prune_days', 0),
'prune_vieweddays' => request_var('prune_vieweddays', 0),
'prune_old_polls' => request_var('prune_old_polls', 0),
'prune_announce' => request_var('prune_announce', 0),
'prune_sticky' => request_var('prune_sticky', 0),
'prune_days' => $request->variable('prune_days', 0),
'prune_vieweddays' => $request->variable('prune_vieweddays', 0),
'prune_old_polls' => $request->variable('prune_old_polls', 0),
'prune_announce' => $request->variable('prune_announce', 0),
'prune_sticky' => $request->variable('prune_sticky', 0),
)));
}
}
@@ -229,7 +229,7 @@ class acp_prune
*/
function prune_users($id, $mode)
{
global $db, $user, $auth, $template, $cache, $phpbb_log;
global $db, $user, $auth, $template, $cache, $phpbb_log, $request;
global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
$user->add_lang('memberlist');
@@ -238,8 +238,8 @@ class acp_prune
if ($prune)
{
$action = request_var('action', 'deactivate');
$deleteposts = request_var('deleteposts', 0);
$action = $request->variable('action', 'deactivate');
$deleteposts = $request->variable('deleteposts', 0);
if (confirm_box(true))
{
@@ -311,8 +311,8 @@ class acp_prune
'mode' => $mode,
'prune' => 1,
'deleteposts' => request_var('deleteposts', 0),
'action' => request_var('action', ''),
'deleteposts' => $request->variable('deleteposts', 0),
'action' => $request->variable('action', ''),
)), 'confirm_body_prune.html');
}
}
@@ -369,9 +369,9 @@ class acp_prune
{
global $user, $db, $request;
$users_by_name = request_var('users', '', true);
$users_by_id = request_var('user_ids', array(0));
$group_id = request_var('group_id', 0);
$users_by_name = $request->variable('users', '', true);
$users_by_id = $request->variable('user_ids', array(0));
$group_id = $request->variable('group_id', 0);
$posts_on_queue = (trim($request->variable('posts_on_queue', '')) === '') ? false : $request->variable('posts_on_queue', 0);
if ($users_by_name)
@@ -388,15 +388,15 @@ class acp_prune
}
else
{
$username = request_var('username', '', true);
$email = request_var('email', '');
$username = $request->variable('username', '', true);
$email = $request->variable('email', '');
$active_select = request_var('active_select', 'lt');
$count_select = request_var('count_select', 'eq');
$queue_select = request_var('queue_select', 'gt');
$joined_before = request_var('joined_before', '');
$joined_after = request_var('joined_after', '');
$active = request_var('active', '');
$active_select = $request->variable('active_select', 'lt');
$count_select = $request->variable('count_select', 'eq');
$queue_select = $request->variable('queue_select', 'gt');
$joined_before = $request->variable('joined_before', '');
$joined_after = $request->variable('joined_after', '');
$active = $request->variable('active', '');
$count = ($request->variable('count', '') === '') ? false : $request->variable('count', 0);