6 files changed, 18 insertions, 28 deletions
diff --git a/phpBB/includes/mcp/mcp_ban.php b/phpBB/includes/mcp/mcp_ban.php
index 30d015fa0a..0e4c8e6726 100644
--- a/phpBB/includes/mcp/mcp_ban.php
+++ b/phpBB/includes/mcp/mcp_ban.php
@@ -32,8 +32,8 @@ class mcp_ban
 		// Include the admin banning interface...
 		include(PHPBB_ROOT_PATH . 'includes/acp/acp_ban.' . PHP_EXT);
 
-		$bansubmit		= (isset($_POST['bansubmit'])) ? true : false;
-		$unbansubmit	= (isset($_POST['unbansubmit'])) ? true : false;
+		$bansubmit		= request::is_set_post('bansubmit');
+		$unbansubmit	= request::is_set_post('unbansubmit');
 		$current_time	= time();
 
 		$user->add_lang(array('acp/ban', 'acp/users'));
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index 66a2e2ad9d..ef28d5efd0 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -33,7 +33,10 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 	if ($merge_select)
 	{
 		// Fixes a "bug" that makes forum_view use the same ordering as topic_view
-		unset($_POST['sk'], $_POST['sd'], $_REQUEST['sk'], $_REQUEST['sd']);
+		request::overwrite('sk', null, request::POST);
+		request::overwrite('sd', null, request::POST);
+		request::overwrite('sk', null, request::REQUEST);
+		request::overwrite('sd', null, request::REQUEST);
 	}
 
 	$forum_id			= $forum_info['forum_id'];
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index 4370228fb5..217ff7c896 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -576,21 +576,15 @@ function mcp_move_topic($topic_ids)
 			}
 		}
 	}
-	else if (isset($_POST['confirm']))
+	else if (request::is_set_post('confirm'))
 	{
 		$additional_msg = $user->lang['FORUM_NOT_EXIST'];
 	}
 
-	if (!$to_forum_id || $additional_msg)
-	{
-		unset($_POST['confirm']);
-		unset($_REQUEST['confirm_key']);
-	}
-
-	if (confirm_box(true))
+	if ($to_forum_id && !$additional_msg && confirm_box(true))
 	{
 		$topic_data = get_topic_data($topic_ids);
-		$leave_shadow = (isset($_POST['move_leave_shadow'])) ? true : false;
+		$leave_shadow = request::is_set_post('move_leave_shadow');
 
 		$topics_moved = sizeof($topic_ids);
 		$topics_authed_moved = 0;
@@ -789,7 +783,7 @@ function mcp_delete_topic($topic_ids)
 		confirm_box(false, (sizeof($topic_ids) == 1) ? 'DELETE_TOPIC' : 'DELETE_TOPICS', $s_hidden_fields);
 	}
 
-	if (!isset($_REQUEST['quickmod']))
+	if (!request::is_set('quickmod'))
 	{
 		$redirect = request_var('redirect', 'index.' . PHP_EXT);
 		$redirect = reapply_sid($redirect);
@@ -982,18 +976,12 @@ function mcp_fork_topic($topic_ids)
 			}
 		}
 	}
-	else if (isset($_POST['confirm']))
+	else if (request::is_set_post('confirm'))
 	{
 		$additional_msg = $user->lang['FORUM_NOT_EXIST'];
 	}
 
-	if ($additional_msg)
-	{
-		unset($_POST['confirm']);
-		unset($_REQUEST['confirm_key']);
-	}
-
-	if (confirm_box(true))
+	if (!$additional_msg && confirm_box(true))
 	{
 		$topic_data = get_topic_data($topic_ids, 'f_post');
 
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 48bcd044f5..b94c838d43 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -484,7 +484,7 @@ function approve_post($post_id_list, $id, $mode)
 
 	if (confirm_box(true))
 	{
-		$notify_poster = (isset($_REQUEST['notify_poster'])) ? true : false;
+		$notify_poster = request::is_set('notify_poster');
 
 		// If Topic -> total_topics = total_topics+1, total_posts = total_posts+1, forum_topics = forum_topics+1, forum_posts = forum_posts+1
 		// If Post -> total_posts = total_posts+1, forum_posts = forum_posts+1, topic_replies = topic_replies+1
@@ -803,7 +803,7 @@ function disapprove_post($post_id_list, $id, $mode)
 		'redirect'		=> $redirect)
 	);
 
-	$notify_poster = (isset($_REQUEST['notify_poster'])) ? true : false;
+	$notify_poster = request::is_set('notify_poster');
 	$disapprove_reason = '';
 
 	if ($reason_id)
@@ -818,7 +818,6 @@ function disapprove_post($post_id_list, $id, $mode)
 		if (!$row || (!$reason && strtolower($row['reason_title']) == 'other'))
 		{
 			$additional_msg = $user->lang['NO_REASON_DISAPPROVAL'];
-			unset($_POST['confirm']);
 		}
 		else
 		{
@@ -837,7 +836,7 @@ function disapprove_post($post_id_list, $id, $mode)
 
 	$post_info = get_post_data($post_id_list, 'm_approve');
 
-	if (confirm_box(true))
+	if (!$additional_message && confirm_box(true))
 	{
 
 		// If Topic -> forum_topics_real -= 1
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index 18aacd53a9..bd1bc4f659 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -45,7 +45,7 @@ function mcp_topic_view($id, $mode, $action)
 	$forum_id		= request_var('f', 0);
 	$to_topic_id	= request_var('to_topic_id', 0);
 	$to_forum_id	= request_var('to_forum_id', 0);
-	$sort			= isset($_POST['sort']) ? true : false;
+	$sort			= request::is_set_post('sort');
 	$submitted_id_list	= request_var('post_ids', array(0));
 	$checked_ids = $post_id_list = request_var('post_id_list', array(0));
 
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php
index d91b8b690a..d989254e15 100644
--- a/phpBB/includes/mcp/mcp_warn.php
+++ b/phpBB/includes/mcp/mcp_warn.php
@@ -195,7 +195,7 @@ class mcp_warn
 
 		$post_id = request_var('p', 0);
 		$forum_id = request_var('f', 0);
-		$notify = (isset($_REQUEST['notify_user'])) ? true : false;
+		$notify = request::is_set('notify_user');
 		$warning = utf8_normalize_nfc(request_var('warning', '', true));
 
 		$sql = 'SELECT u.*, p.*
@@ -337,7 +337,7 @@ class mcp_warn
 
 		$user_id = request_var('u', 0);
 		$username = request_var('username', '', true);
-		$notify = (isset($_REQUEST['notify_user'])) ? true : false;
+		$notify = request::is_set('notify_user');
 		$warning = utf8_normalize_nfc(request_var('warning', '', true));
 
 		$sql_where = ($user_id) ? "user_id = $user_id" : "username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'";