3 files changed, 98 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_front.php b/phpBB/includes/mcp/mcp_front.php
index 04206a6fcd..b4ec0092e7 100644
--- a/phpBB/includes/mcp/mcp_front.php
+++ b/phpBB/includes/mcp/mcp_front.php
@@ -26,6 +26,7 @@ function mcp_front_view($id, $mode, $action)
 {
 	global $phpEx, $phpbb_root_path, $config;
 	global $template, $db, $user, $auth, $module;
+	global $phpbb_dispatcher;
 
 	// Latest 5 unapproved
 	if ($module->loaded('queue'))
@@ -80,6 +81,19 @@ function mcp_front_view($id, $mode, $action)
 				}
 			}
 
+			/**
+			* Alter list of posts and total as required
+			*
+			* @event core.mcp_front_view_queue_postid_list_after
+			* @var	int		total						Number of unapproved posts
+			* @var	array	post_list					List of unapproved posts
+			* @var	array	forum_list					List of forums that contain the posts
+			* @var	array	forum_names					Associative array with forum_id as key and it's corresponding forum_name as value
+			* @since 3.1.0-RC3
+			*/
+			$vars = array('total', 'post_list', 'forum_list', 'forum_names');
+			extract($phpbb_dispatcher->trigger_event('core.mcp_front_view_queue_postid_list_after', compact($vars)));
+
 			if ($total)
 			{
 				$sql = 'SELECT p.post_id, p.post_subject, p.post_time, p.post_attachment, p.poster_id, p.post_username, u.username, u.username_clean, u.user_colour, t.topic_id, t.topic_title, t.topic_first_post_id, p.forum_id
@@ -178,6 +192,18 @@ function mcp_front_view($id, $mode, $action)
 
 					'ORDER_BY'	=> 'p.post_time DESC',
 				);
+
+				/**
+				* Alter sql query to get latest reported posts
+				*
+				* @event core.mcp_front_reports_listing_query_before
+				* @var	int		sql_ary						Associative array with the query to be executed
+				* @var	array	forum_list					List of forums that contain the posts
+				* @since 3.1.0-RC3
+				*/
+				$vars = array('sql_ary', 'forum_list');
+				extract($phpbb_dispatcher->trigger_event('core.mcp_front_reports_listing_query_before', compact($vars)));
+
 				$sql = $db->sql_build_query('SELECT', $sql_ary);
 				$result = $db->sql_query_limit($sql, 5);
 
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index 9f6125f256..92000c6ceb 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -1114,6 +1114,7 @@ function mcp_fork_topic($topic_ids)
 	$forum_id = request_var('f', 0);
 	$redirect = request_var('redirect', build_url(array('action', 'quickmod')));
 	$additional_msg = $success_msg = '';
+	$counter = array();
 
 	$s_hidden_fields = build_hidden_fields(array(
 		'topic_id_list'	=> $topic_ids,
@@ -1306,9 +1307,20 @@ function mcp_fork_topic($topic_ids)
 					'post_edit_time'	=> (int) $row['post_edit_time'],
 					'post_edit_count'	=> (int) $row['post_edit_count'],
 					'post_edit_locked'	=> (int) $row['post_edit_locked'],
-					'post_postcount'	=> 0,
+					'post_postcount'	=> $row['post_postcount'],
 				);
-
+				// Adjust post count only if the post can be incremented to the user counter
+				if ($row['post_postcount'])
+				{
+					if (isset($counter[$row['poster_id']]))
+					{
+						++$counter[$row['poster_id']];
+					}
+					else
+					{
+						$counter[$row['poster_id']] = 1;
+					}
+				}
 				$db->sql_query('INSERT INTO ' . POSTS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary));
 				$new_post_id = $db->sql_nextid();
 
@@ -1428,6 +1440,18 @@ function mcp_fork_topic($topic_ids)
 			WHERE forum_id = ' . $to_forum_id;
 		$db->sql_query($sql);
 
+		if (!empty($counter))
+		{
+			// Do only one query per user and not a query per post.
+			foreach ($counter as $user_id => $count)
+			{
+				$sql = 'UPDATE ' . USERS_TABLE . '
+					SET user_posts = user_posts + ' . (int) $count . '
+					WHERE user_id = ' . (int) $user_id;
+				$db->sql_query($sql);
+			}
+		}
+
 		sync('topic', 'topic_id', $new_topic_id_list);
 		sync('forum', 'forum_id', $to_forum_id);
 
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 37ce3c6fc3..54b31c642a 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -429,6 +429,29 @@ class mcp_queue
 								OR t.topic_delete_user = 0)
 							$limit_time_sql
 						ORDER BY $sort_order_sql";
+
+					/**
+					* Alter sql query to get posts in queue to be accepted
+					*
+					* @event core.mcp_queue_get_posts_query_before
+					* @var	string	sql						Associative array with the query to be executed
+					* @var	array	forum_list				List of forums that contain the posts
+					* @var	int		visibility_const		Integer with one of the possible ITEM_* constant values
+					* @var	int		topic_id				If topic_id not equal to 0, the topic id to filter the posts to display
+					* @var	string	limit_time_sql			String with the SQL code to limit the time interval of the post (Note: May be empty string)
+					* @var	string	sort_order_sql			String with the ORDER BY SQL code used in this query
+					* @since 3.1.0-RC3
+					*/
+					$vars = array(
+						'sql',
+						'forum_list',
+						'visibility_const',
+						'topic_id',
+						'limit_time_sql',
+						'sort_order_sql',
+					);
+					extract($phpbb_dispatcher->trigger_event('core.mcp_queue_get_posts_query_before', compact($vars)));
+
 					$result = $db->sql_query_limit($sql, $config['topics_per_page'], $start);
 
 					$i = 0;
@@ -478,6 +501,29 @@ class mcp_queue
 							AND topic_delete_user <> 0
 							$limit_time_sql
 						ORDER BY $sort_order_sql";
+
+					/**
+					* Alter sql query to get information on all topics in the list of forums provided.
+					*
+					* @event core.mcp_queue_get_posts_for_topics_query_before
+					* @var	string	sql						String with the query to be executed
+					* @var	array	forum_list				List of forums that contain the posts
+					* @var	int		visibility_const		Integer with one of the possible ITEM_* constant values
+					* @var	int		topic_id				topic_id in the page request
+					* @var	string	limit_time_sql			String with the SQL code to limit the time interval of the post (Note: May be empty string)
+					* @var	string	sort_order_sql			String with the ORDER BY SQL code used in this query
+					* @since 3.1.0-RC3
+					*/
+					$vars = array(
+						'sql',
+						'forum_list',
+						'visibility_const',
+						'topic_id',
+						'limit_time_sql',
+						'sort_order_sql',
+					);
+					extract($phpbb_dispatcher->trigger_event('core.mcp_queue_get_posts_for_topics_query_before', compact($vars)));
+
 					$result = $db->sql_query_limit($sql, $config['topics_per_page'], $start);
 
 					$rowset = array();