1 files changed, 111 insertions, 100 deletions
diff --git a/phpBB/includes/mcp/mcp_front.php b/phpBB/includes/mcp/mcp_front.php
index af262baa29..5d8aa18c16 100644
--- a/phpBB/includes/mcp/mcp_front.php
+++ b/phpBB/includes/mcp/mcp_front.php
@@ -1,10 +1,13 @@
 <?php
 /**
 *
-* @package mcp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
@@ -23,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'))
@@ -37,18 +41,33 @@ function mcp_front_view($id, $mode, $action)
 
 		if (!empty($forum_list))
 		{
-			$sql = 'SELECT COUNT(post_id) AS total
-				FROM ' . POSTS_TABLE . '
-				WHERE forum_id IN (0, ' . implode(', ', $forum_list) . ')
-					AND post_approved = 0';
+			$sql_ary = array(
+				'SELECT' => 'COUNT(post_id) AS total',
+				'FROM' => array(
+						POSTS_TABLE => 'p',
+					),
+				'WHERE' => $db->sql_in_set('p.forum_id', $forum_list) . '
+					AND ' . $db->sql_in_set('p.post_visibility', array(ITEM_UNAPPROVED, ITEM_REAPPROVE))
+			);
+
+			/**
+			* Allow altering the query to get the number of unapproved posts
+			*
+			* @event core.mcp_front_queue_unapproved_total_before
+			* @var	array	sql_ary			Query array to get the total number of unapproved posts
+			* @var	array	forum_list		List of forums to look for unapproved posts
+			* @since 3.1.5-RC1
+			*/
+			$vars = array('sql_ary', 'forum_list');
+			extract($phpbb_dispatcher->trigger_event('core.mcp_front_queue_unapproved_total_before', compact($vars)));
+
+			$sql = $db->sql_build_query('SELECT', $sql_ary);
 			$result = $db->sql_query($sql);
 			$total = (int) $db->sql_fetchfield('total');
 			$db->sql_freeresult($result);
 
 			if ($total)
 			{
-				$global_id = $forum_list[0];
-
 				$sql = 'SELECT forum_id, forum_name
 					FROM ' . FORUMS_TABLE . '
 					WHERE ' . $db->sql_in_set('forum_id', $forum_list);
@@ -62,9 +81,9 @@ function mcp_front_view($id, $mode, $action)
 
 				$sql = 'SELECT post_id
 					FROM ' . POSTS_TABLE . '
-					WHERE forum_id IN (0, ' . implode(', ', $forum_list) . ')
-						AND post_approved = 0
-					ORDER BY post_time DESC';
+					WHERE ' . $db->sql_in_set('forum_id', $forum_list) . '
+						AND ' . $db->sql_in_set('post_visibility', array(ITEM_UNAPPROVED, ITEM_REAPPROVE)) . '
+					ORDER BY post_time DESC, post_id DESC';
 				$result = $db->sql_query_limit($sql, 5);
 
 				while ($row = $db->sql_fetchrow($result))
@@ -79,29 +98,36 @@ 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.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
+				$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
 					FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . USERS_TABLE . ' u
 					WHERE ' . $db->sql_in_set('p.post_id', $post_list) . '
 						AND t.topic_id = p.topic_id
 						AND p.poster_id = u.user_id
-					ORDER BY p.post_time DESC';
+					ORDER BY p.post_time DESC, p.post_id DESC';
 				$result = $db->sql_query($sql);
 
 				while ($row = $db->sql_fetchrow($result))
 				{
-					$global_topic = ($row['forum_id']) ? false : true;
-					if ($global_topic)
-					{
-						$row['forum_id'] = $global_id;
-					}
-
 					$template->assign_block_vars('unapproved', array(
 						'U_POST_DETAILS'	=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&amp;mode=approve_details&amp;f=' . $row['forum_id'] . '&amp;p=' . $row['post_id']),
-						'U_MCP_FORUM'		=> (!$global_topic) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&amp;mode=forum_view&amp;f=' . $row['forum_id']) : '',
+						'U_MCP_FORUM'		=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&amp;mode=forum_view&amp;f=' . $row['forum_id']),
 						'U_MCP_TOPIC'		=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&amp;mode=topic_view&amp;f=' . $row['forum_id'] . '&amp;t=' . $row['topic_id']),
-						'U_FORUM'			=> (!$global_topic) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']) : '',
+						'U_FORUM'			=> append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']),
 						'U_TOPIC'			=> append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id'] . '&amp;t=' . $row['topic_id']),
 
 						'AUTHOR_FULL'		=> get_username_string('full', $row['poster_id'], $row['username'], $row['user_colour']),
@@ -109,12 +135,13 @@ function mcp_front_view($id, $mode, $action)
 						'AUTHOR_COLOUR'		=> get_username_string('colour', $row['poster_id'], $row['username'], $row['user_colour']),
 						'U_AUTHOR'			=> get_username_string('profile', $row['poster_id'], $row['username'], $row['user_colour']),
 
-						'FORUM_NAME'	=> (!$global_topic) ? $forum_names[$row['forum_id']] : $user->lang['GLOBAL_ANNOUNCEMENT'],
+						'FORUM_NAME'	=> $forum_names[$row['forum_id']],
 						'POST_ID'		=> $row['post_id'],
 						'TOPIC_TITLE'	=> $row['topic_title'],
 						'SUBJECT'		=> ($row['post_subject']) ? $row['post_subject'] : $user->lang['NO_SUBJECT'],
-						'POST_TIME'		=> $user->format_date($row['post_time']))
-					);
+						'POST_TIME'		=> $user->format_date($row['post_time']),
+						'ATTACH_ICON_IMG'	=> ($auth->acl_get('u_download') && $auth->acl_get('f_download', $row['forum_id']) && $row['post_attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',
+					));
 				}
 				$db->sql_freeresult($result);
 			}
@@ -126,22 +153,9 @@ function mcp_front_view($id, $mode, $action)
 			$template->assign_vars(array(
 				'S_HIDDEN_FIELDS'		=> $s_hidden_fields,
 				'S_MCP_QUEUE_ACTION'	=> append_sid("{$phpbb_root_path}mcp.$phpEx", "i=queue"),
+				'L_UNAPPROVED_TOTAL'	=> $user->lang('UNAPPROVED_POSTS_TOTAL', (int) $total),
+				'S_HAS_UNAPPROVED_POSTS'=> ($total != 0),
 			));
-
-			if ($total == 0)
-			{
-				$template->assign_vars(array(
-					'L_UNAPPROVED_TOTAL'		=> $user->lang['UNAPPROVED_POSTS_ZERO_TOTAL'],
-					'S_HAS_UNAPPROVED_POSTS'	=> false)
-				);
-			}
-			else
-			{
-				$template->assign_vars(array(
-					'L_UNAPPROVED_TOTAL'		=> ($total == 1) ? $user->lang['UNAPPROVED_POST_TOTAL'] : sprintf($user->lang['UNAPPROVED_POSTS_TOTAL'], $total),
-					'S_HAS_UNAPPROVED_POSTS'	=> true)
-				);
-			}
 		}
 	}
 
@@ -159,31 +173,41 @@ function mcp_front_view($id, $mode, $action)
 				WHERE r.post_id = p.post_id
 					AND r.pm_id = 0
 					AND r.report_closed = 0
-					AND p.forum_id IN (0, ' . implode(', ', $forum_list) . ')';
+					AND ' . $db->sql_in_set('p.forum_id', $forum_list);
+
+			/**
+			* Alter sql query to count the number of reported posts
+			*
+			* @event core.mcp_front_reports_count_query_before
+			* @var	string	sql				The query string used to get the number of reports that exist
+			* @var	array	forum_list		List of forums that contain the posts
+			* @since 3.1.5-RC1
+			*/
+			$vars = array('sql', 'forum_list');
+			extract($phpbb_dispatcher->trigger_event('core.mcp_front_reports_count_query_before', compact($vars)));
+
 			$result = $db->sql_query($sql);
 			$total = (int) $db->sql_fetchfield('total');
 			$db->sql_freeresult($result);
 
 			if ($total)
 			{
-				$global_id = $forum_list[0];
-
-				$sql = $db->sql_build_query('SELECT', array(
-					'SELECT'	=> 'r.report_time, p.post_id, p.post_subject, p.post_time, u.username, u.username_clean, u.user_colour, u.user_id, u2.username as author_name, u2.username_clean as author_name_clean, u2.user_colour as author_colour, u2.user_id as author_id, t.topic_id, t.topic_title, f.forum_id, f.forum_name',
+				$sql_ary = array(
+					'SELECT'	=> 'r.report_time, p.post_id, p.post_subject, p.post_time, p.post_attachment, u.username, u.username_clean, u.user_colour, u.user_id, u2.username as author_name, u2.username_clean as author_name_clean, u2.user_colour as author_colour, u2.user_id as author_id, t.topic_id, t.topic_title, f.forum_id, f.forum_name',
 
 					'FROM'		=> array(
 						REPORTS_TABLE			=> 'r',
 						REPORTS_REASONS_TABLE	=> 'rr',
 						TOPICS_TABLE			=> 't',
 						USERS_TABLE				=> array('u', 'u2'),
-						POSTS_TABLE				=> 'p'
+						POSTS_TABLE				=> 'p',
 					),
 
 					'LEFT_JOIN'	=> array(
 						array(
 							'FROM'	=> array(FORUMS_TABLE => 'f'),
-							'ON'	=> 'f.forum_id = p.forum_id'
-						)
+							'ON'	=> 'f.forum_id = p.forum_id',
+						),
 					),
 
 					'WHERE'		=> 'r.post_id = p.post_id
@@ -193,25 +217,32 @@ function mcp_front_view($id, $mode, $action)
 						AND p.topic_id = t.topic_id
 						AND r.user_id = u.user_id
 						AND p.poster_id = u2.user_id
-						AND p.forum_id IN (0, ' . implode(', ', $forum_list) . ')',
+						AND ' . $db->sql_in_set('p.forum_id', $forum_list),
 
-					'ORDER_BY'	=> 'p.post_time DESC'
-				));
+					'ORDER_BY'	=> 'p.post_time DESC, p.post_id DESC',
+				);
+
+				/**
+				* Alter sql query to get latest reported posts
+				*
+				* @event core.mcp_front_reports_listing_query_before
+				* @var	array	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);
 
 				while ($row = $db->sql_fetchrow($result))
 				{
-					$global_topic = ($row['forum_id']) ? false : true;
-					if ($global_topic)
-					{
-						$row['forum_id'] = $global_id;
-					}
-
 					$template->assign_block_vars('report', array(
 						'U_POST_DETAILS'	=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'f=' . $row['forum_id'] . '&amp;p=' . $row['post_id'] . "&amp;i=reports&amp;mode=report_details"),
-						'U_MCP_FORUM'		=> (!$global_topic) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'f=' . $row['forum_id'] . "&amp;i=$id&amp;mode=forum_view") : '',
+						'U_MCP_FORUM'		=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'f=' . $row['forum_id'] . "&amp;i=$id&amp;mode=forum_view"),
 						'U_MCP_TOPIC'		=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'f=' . $row['forum_id'] . '&amp;t=' . $row['topic_id'] . "&amp;i=$id&amp;mode=topic_view"),
-						'U_FORUM'			=> (!$global_topic) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']) : '',
+						'U_FORUM'			=> append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']),
 						'U_TOPIC'			=> append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id'] . '&amp;t=' . $row['topic_id']),
 
 						'REPORTER_FULL'		=> get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
@@ -224,34 +255,26 @@ function mcp_front_view($id, $mode, $action)
 						'AUTHOR_COLOUR'		=> get_username_string('colour', $row['author_id'], $row['author_name'], $row['author_colour']),
 						'U_AUTHOR'			=> get_username_string('profile', $row['author_id'], $row['author_name'], $row['author_colour']),
 
-						'FORUM_NAME'	=> (!$global_topic) ? $row['forum_name'] : $user->lang['GLOBAL_ANNOUNCEMENT'],
+						'FORUM_NAME'	=> $row['forum_name'],
 						'TOPIC_TITLE'	=> $row['topic_title'],
 						'SUBJECT'		=> ($row['post_subject']) ? $row['post_subject'] : $user->lang['NO_SUBJECT'],
 						'REPORT_TIME'	=> $user->format_date($row['report_time']),
 						'POST_TIME'		=> $user->format_date($row['post_time']),
+						'ATTACH_ICON_IMG'	=> ($auth->acl_get('u_download') && $auth->acl_get('f_download', $row['forum_id']) && $row['post_attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',
 					));
 				}
+				$db->sql_freeresult($result);
 			}
 
-			if ($total == 0)
-			{
-				$template->assign_vars(array(
-					'L_REPORTS_TOTAL'	=>	$user->lang['REPORTS_ZERO_TOTAL'],
-					'S_HAS_REPORTS'		=>	false)
-				);
-			}
-			else
-			{
-				$template->assign_vars(array(
-					'L_REPORTS_TOTAL'	=> ($total == 1) ? $user->lang['REPORT_TOTAL'] : sprintf($user->lang['REPORTS_TOTAL'], $total),
-					'S_HAS_REPORTS'		=> true)
-				);
-			}
+			$template->assign_vars(array(
+				'L_REPORTS_TOTAL'	=> $user->lang('REPORTS_TOTAL', (int) $total),
+				'S_HAS_REPORTS'		=> ($total != 0),
+			));
 		}
 	}
 
 	// Latest 5 reported PMs
-	if ($module->loaded('pm_reports') && $auth->acl_getf_global('m_report'))
+	if ($module->loaded('pm_reports') && $auth->acl_get('m_pm_report'))
 	{
 		$template->assign_var('S_SHOW_PM_REPORTS', true);
 		$user->add_lang(array('ucp'));
@@ -269,14 +292,14 @@ function mcp_front_view($id, $mode, $action)
 		{
 			include($phpbb_root_path . 'includes/functions_privmsgs.' . $phpEx);
 
-			$sql = $db->sql_build_query('SELECT', array(
-				'SELECT'	=> 'r.report_id, r.report_time, p.msg_id, p.message_subject, p.message_time, p.to_address, p.bcc_address, u.username, u.username_clean, u.user_colour, u.user_id, u2.username as author_name, u2.username_clean as author_name_clean, u2.user_colour as author_colour, u2.user_id as author_id',
+			$sql_ary = array(
+				'SELECT'	=> 'r.report_id, r.report_time, p.msg_id, p.message_subject, p.message_time, p.to_address, p.bcc_address, p.message_attachment, u.username, u.username_clean, u.user_colour, u.user_id, u2.username as author_name, u2.username_clean as author_name_clean, u2.user_colour as author_colour, u2.user_id as author_id',
 
 				'FROM'		=> array(
 					REPORTS_TABLE			=> 'r',
 					REPORTS_REASONS_TABLE	=> 'rr',
 					USERS_TABLE				=> array('u', 'u2'),
-					PRIVMSGS_TABLE				=> 'p'
+					PRIVMSGS_TABLE				=> 'p',
 				),
 
 				'WHERE'		=> 'r.pm_id = p.msg_id
@@ -286,8 +309,9 @@ function mcp_front_view($id, $mode, $action)
 					AND r.user_id = u.user_id
 					AND p.author_id = u2.user_id',
 
-				'ORDER_BY'	=> 'p.message_time DESC'
-			));
+				'ORDER_BY'	=> 'p.message_time DESC',
+			);
+			$sql = $db->sql_build_query('SELECT', $sql_ary);
 			$result = $db->sql_query_limit($sql, 5);
 
 			$pm_by_id = $pm_list = array();
@@ -296,6 +320,7 @@ function mcp_front_view($id, $mode, $action)
 				$pm_by_id[(int) $row['msg_id']] = $row;
 				$pm_list[] = (int) $row['msg_id'];
 			}
+			$db->sql_freeresult($result);
 
 			$address_list = get_recipient_strings($pm_by_id);
 
@@ -320,24 +345,15 @@ function mcp_front_view($id, $mode, $action)
 					'REPORT_TIME'		=> $user->format_date($row['report_time']),
 					'PM_TIME'			=> $user->format_date($row['message_time']),
 					'RECIPIENTS'		=> implode(', ', $address_list[$row['msg_id']]),
+					'ATTACH_ICON_IMG'	=> ($auth->acl_get('u_download') && $row['message_attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',
 				));
 			}
 		}
 
-		if ($total == 0)
-		{
-			$template->assign_vars(array(
-				'L_PM_REPORTS_TOTAL'	=>	$user->lang['PM_REPORTS_ZERO_TOTAL'],
-				'S_HAS_PM_REPORTS'		=>	false)
-			);
-		}
-		else
-		{
-			$template->assign_vars(array(
-				'L_PM_REPORTS_TOTAL'	=> ($total == 1) ? $user->lang['PM_REPORT_TOTAL'] : sprintf($user->lang['PM_REPORTS_TOTAL'], $total),
-				'S_HAS_PM_REPORTS'		=> true)
-			);
-		}
+		$template->assign_vars(array(
+			'L_PM_REPORTS_TOTAL'	=> $user->lang('PM_REPORTS_TOTAL', (int) $total),
+			'S_HAS_PM_REPORTS'		=> ($total != 0),
+		));
 	}
 
 	// Latest 5 logs
@@ -347,9 +363,6 @@ function mcp_front_view($id, $mode, $action)
 
 		if (!empty($forum_list))
 		{
-			// Add forum_id 0 for global announcements
-			$forum_list[] = 0;
-
 			$log_count = false;
 			$log = array();
 			view_log('mod', $log, $log_count, 5, 0, $forum_list);
@@ -376,5 +389,3 @@ function mcp_front_view($id, $mode, $action)
 	$template->assign_var('S_MCP_ACTION', append_sid("{$phpbb_root_path}mcp.$phpEx"));
 	make_jumpbox(append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&amp;mode=forum_view'), 0, false, 'm_', true);
 }
-
-?>
-\ No newline at end of file