1 files changed, 52 insertions, 32 deletions
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index 4f27d32a5a..6b2e9266b3 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -34,6 +34,7 @@ class mcp_main
 	{
 		global $auth, $db, $user, $template, $action;
 		global $config, $phpbb_root_path, $phpEx, $request;
+		global $phpbb_dispatcher;
 
 		$quickmod = ($mode == 'quickmod') ? true : false;
 
@@ -151,6 +152,16 @@ class mcp_main
 
 				mcp_restore_topic($topic_ids);
 			break;
+
+			default:
+				/**
+				* This event allows you to handle custom quickmod options
+				*
+				* @event core.modify_quickmod_actions
+				* @since 3.1.0-a4
+				*/
+				$phpbb_dispatcher->dispatch('core.modify_quickmod_actions');
+			break;
 		}
 
 		switch ($mode)
@@ -219,7 +230,7 @@ class mcp_main
 */
 function lock_unlock($action, $ids)
 {
-	global $auth, $user, $db, $phpEx, $phpbb_root_path;
+	global $auth, $user, $db, $phpEx, $phpbb_root_path, $request;
 
 	if ($action == 'lock' || $action == 'unlock')
 	{
@@ -256,6 +267,7 @@ function lock_unlock($action, $ids)
 	unset($orig_ids);
 
 	$redirect = request_var('redirect', build_url(array('action', 'quickmod')));
+	$redirect = reapply_sid($redirect);
 
 	$s_hidden_fields = build_hidden_fields(array(
 		$sql_id . '_list'	=> $ids,
@@ -279,24 +291,22 @@ function lock_unlock($action, $ids)
 		}
 
 		$success_msg = $l_prefix . ((sizeof($ids) == 1) ? '' : 'S') . '_' . (($action == 'lock' || $action == 'lock_post') ? 'LOCKED' : 'UNLOCKED') . '_SUCCESS';
-	}
-	else
-	{
-		confirm_box(false, strtoupper($action) . '_' . $l_prefix . ((sizeof($ids) == 1) ? '' : 'S'), $s_hidden_fields);
-	}
 
-	$redirect = request_var('redirect', "index.$phpEx");
-	$redirect = reapply_sid($redirect);
+		meta_refresh(2, $redirect);
+		$message = $user->lang[$success_msg];
 
-	if (!$success_msg)
-	{
-		redirect($redirect);
+		if (!$request->is_ajax())
+		{
+			$message .= '<br /><br />' . $user->lang('RETURN_PAGE', '<a href="' . $redirect . '">', '</a>');
+		}
+		trigger_error($message);
 	}
 	else
 	{
-		meta_refresh(2, $redirect);
-		trigger_error($user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>'));
+		confirm_box(false, strtoupper($action) . '_' . $l_prefix . ((sizeof($ids) == 1) ? '' : 'S'), $s_hidden_fields);
 	}
+
+	redirect($redirect);
 }
 
 /**
@@ -304,7 +314,7 @@ function lock_unlock($action, $ids)
 */
 function change_topic_type($action, $topic_ids)
 {
-	global $auth, $user, $db, $phpEx, $phpbb_root_path;
+	global $auth, $user, $db, $phpEx, $phpbb_root_path, $request;
 
 	switch ($action)
 	{
@@ -341,6 +351,7 @@ function change_topic_type($action, $topic_ids)
 	}
 
 	$redirect = request_var('redirect', build_url(array('action', 'quickmod')));
+	$redirect = reapply_sid($redirect);
 
 	$s_hidden_fields = array(
 		'topic_id_list'	=> $topic_ids,
@@ -381,24 +392,22 @@ function change_topic_type($action, $topic_ids)
 				add_log('mod', $forum_id, $topic_id, 'LOG_TOPIC_TYPE_CHANGED', $row['topic_title']);
 			}
 		}
-	}
-	else
-	{
-		confirm_box(false, $l_new_type, build_hidden_fields($s_hidden_fields));
-	}
 
-	$redirect = request_var('redirect', "index.$phpEx");
-	$redirect = reapply_sid($redirect);
+		meta_refresh(2, $redirect);
+		$message = $user->lang[$success_msg];
 
-	if (!$success_msg)
-	{
-		redirect($redirect);
+		if (!$request->is_ajax())
+		{
+			$message .= '<br /><br />' . $user->lang('RETURN_PAGE', '<a href="' . $redirect . '">', '</a>');
+		}
+		trigger_error($message);
 	}
 	else
 	{
-		meta_refresh(2, $redirect);
-		trigger_error($user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>'));
+		confirm_box(false, $l_new_type, build_hidden_fields($s_hidden_fields));
 	}
+
+	redirect($redirect);
 }
 
 /**
@@ -406,9 +415,8 @@ function change_topic_type($action, $topic_ids)
 */
 function mcp_move_topic($topic_ids)
 {
-	global $auth, $user, $db, $template;
+	global $auth, $user, $db, $template, $phpbb_log, $request;
 	global $phpEx, $phpbb_root_path;
-	global $request;
 
 	// Here we limit the operation to one forum only
 	$forum_id = check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_move'), true);
@@ -485,7 +493,7 @@ function mcp_move_topic($topic_ids)
 			{
 				$topics_moved++;
 			}
-			elseif ($topic_info['topic_visibility'] == ITEM_UNAPPROVED)
+			elseif ($topic_info['topic_visibility'] == ITEM_UNAPPROVED || $topic_info['topic_visibility'] == ITEM_REAPPROVE)
 			{
 				$topics_moved_unapproved++;
 			}
@@ -516,9 +524,19 @@ function mcp_move_topic($topic_ids)
 		$forum_ids = array($to_forum_id);
 		foreach ($topic_data as $topic_id => $row)
 		{
-			// Get the list of forums to resync, add a log entry
+			// Get the list of forums to resync
 			$forum_ids[] = $row['forum_id'];
-			add_log('mod', $to_forum_id, $topic_id, 'LOG_MOVE', $row['forum_name'], $forum_data['forum_name']);
+
+			// We add the $to_forum_id twice, because 'forum_id' is updated
+			// when the topic is moved again later.
+			$phpbb_log->add('mod', $user->data['user_id'], $user->ip, 'LOG_MOVE', false, array(
+				'forum_id'		=> (int) $to_forum_id,
+				'topic_id'		=> (int) $topic_id,
+				$row['forum_name'],
+				$forum_data['forum_name'],
+				(int) $row['forum_id'],
+				(int) $forum_data['forum_id'],
+			));
 
 			// Leave a redirection if required and only if the topic is visible to users
 			if ($leave_shadow && $row['topic_visibility'] == ITEM_APPROVED && $row['topic_type'] != POST_GLOBAL)
@@ -921,7 +939,7 @@ function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '',
 		// None of the topics is really deleted, so a redirect won't hurt much.
 		$deleted_topics = 0;
 
-		$success_msg = (sizeof($post_info) == 1) ? 'POST_DELETED_SUCCESS' : 'POSTS_DELETED_SUCCESS';
+		$success_msg = (sizeof($post_info) == 1) ? $user->lang['POST_DELETED_SUCCESS'] : $user->lang['POSTS_DELETED_SUCCESS'];
 
 		foreach ($approve_log as $row)
 		{
@@ -1212,6 +1230,7 @@ function mcp_fork_topic($topic_ids)
 					$total_topics++;
 				break;
 				case ITEM_UNAPPROVED:
+				case ITEM_REAPPROVE:
 					$total_topics_unapproved++;
 				break;
 				case ITEM_DELETED:
@@ -1298,6 +1317,7 @@ function mcp_fork_topic($topic_ids)
 						$total_posts++;
 					break;
 					case ITEM_UNAPPROVED:
+					case ITEM_REAPPROVE:
 						$total_posts_unapproved++;
 					break;
 					case ITEM_DELETED: