diff options
Diffstat (limited to 'phpBB/includes/mcp/mcp_queue.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_queue.php | 1147 | 
1 files changed, 688 insertions, 459 deletions
| diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index 764461fa53..1fa89af8e1 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -2,9 +2,8 @@  /**  *  * @package mcp -* @version $Id$  * @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2  *  */ @@ -26,15 +25,15 @@ class mcp_queue  	var $p_master;  	var $u_action; -	function mcp_queue(&$p_master) +	public function mcp_queue(&$p_master)  	{  		$this->p_master = &$p_master;  	} -	function main($id, $mode) +	public function main($id, $mode)  	{ -		global $auth, $db, $user, $template, $cache; -		global $config, $phpbb_root_path, $phpEx, $action; +		global $auth, $db, $user, $template, $cache, $request; +		global $config, $phpbb_root_path, $phpEx, $action, $phpbb_container;  		include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx); @@ -46,25 +45,99 @@ class mcp_queue  		switch ($action)  		{  			case 'approve': -			case 'disapprove': +			case 'restore':  				include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); -				$post_id_list = request_var('post_id_list', array(0)); +				$post_id_list = $request->variable('post_id_list', array(0)); +				$topic_id_list = $request->variable('topic_id_list', array(0)); -				if (!sizeof($post_id_list)) +				if (!empty($post_id_list)) +				{ +					self::approve_posts($action, $post_id_list, 'queue', $mode); +				} +				else if (!empty($topic_id_list)) +				{ +					self::approve_topics($action, $topic_id_list, 'queue', $mode); +				} +				else  				{  					trigger_error('NO_POST_SELECTED');  				} +			break; + +			case 'delete': +				$post_id_list = $request->variable('post_id_list', array(0)); +				$topic_id_list = $request->variable('topic_id_list', array(0)); -				if ($action == 'approve') +				if (!empty($post_id_list)) +				{ +					if (!function_exists('mcp_delete_post')) +					{ +						global $phpbb_root_path, $phpEx; +						include($phpbb_root_path . 'includes/mcp/mcp_main.' . $phpEx); +					} +					mcp_delete_post($post_id_list, false, '', $action); +				} +				else if (!empty($topic_id_list))  				{ -					approve_post($post_id_list, 'queue', $mode); +					if (!function_exists('mcp_delete_topic')) +					{ +						global $phpbb_root_path, $phpEx; +						include($phpbb_root_path . 'includes/mcp/mcp_main.' . $phpEx); +					} +					mcp_delete_topic($topic_id_list, false, '', $action);  				}  				else  				{ -					disapprove_post($post_id_list, 'queue', $mode); +					trigger_error('NO_POST_SELECTED');  				} +			break; +			case 'disapprove': +				$post_id_list = $request->variable('post_id_list', array(0)); +				$topic_id_list = $request->variable('topic_id_list', array(0)); + +				if (!empty($topic_id_list) && $mode == 'deleted_topics') +				{ +					if (!function_exists('mcp_delete_topics')) +					{ +						global $phpbb_root_path, $phpEx; +						include($phpbb_root_path . 'includes/mcp/mcp_main.' . $phpEx); +					} +					mcp_delete_topic($topic_id_list, false, '', 'disapprove'); +					return; +				} + +				if (!class_exists('messenger')) +				{ +					include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); +				} + +				if (!empty($topic_id_list)) +				{ +					$post_visibility = ($mode == 'deleted_topics') ? ITEM_DELETED : ITEM_UNAPPROVED; +					$sql = 'SELECT post_id +						FROM ' . POSTS_TABLE . ' +						WHERE post_visibility = ' . $post_visibility . ' +							AND ' . $db->sql_in_set('topic_id', $topic_id_list); +					$result = $db->sql_query($sql); + +					$post_id_list = array(); +					while ($row = $db->sql_fetchrow($result)) +					{ +						$post_id_list[] = (int) $row['post_id']; +					} +					$db->sql_freeresult($result); +				} + +				if (!empty($post_id_list)) +				{ +					self::disapprove_posts($post_id_list, 'queue', $mode); +				} +				else +				{ +					trigger_error('NO_POST_SELECTED'); +				}  			break;  		} @@ -79,12 +152,16 @@ class mcp_queue  				$post_id = request_var('p', 0);  				$topic_id = request_var('t', 0); +				$phpbb_notifications = $phpbb_container->get('notification_manager'); +  				if ($topic_id)  				{  					$topic_info = get_topic_data(array($topic_id), 'm_approve');  					if (isset($topic_info[$topic_id]['topic_first_post_id']))  					{  						$post_id = (int) $topic_info[$topic_id]['topic_first_post_id']; + +						$phpbb_notifications->mark_notifications_read('topic_in_queue', $topic_id, $user->data['user_id']);  					}  					else  					{ @@ -92,6 +169,8 @@ class mcp_queue  					}  				} +				$phpbb_notifications->mark_notifications_read('post_in_queue', $post_id, $user->data['user_id']); +  				$post_info = get_post_data(array($post_id), 'm_approve', true);  				if (!sizeof($post_info)) @@ -106,8 +185,8 @@ class mcp_queue  					$template->assign_vars(array(  						'S_TOPIC_REVIEW'	=> true,  						'S_BBCODE_ALLOWED'	=> $post_info['enable_bbcode'], -						'TOPIC_TITLE'		=> $post_info['topic_title']) -					); +						'TOPIC_TITLE'		=> $post_info['topic_title'], +					));  				}  				$extensions = $attachments = $topic_tracking_info = array(); @@ -127,17 +206,8 @@ class mcp_queue  				$post_unread = (isset($topic_tracking_info[$post_info['topic_id']]) && $post_info['post_time'] > $topic_tracking_info[$post_info['topic_id']]) ? true : false;  				// Process message, leave it uncensored -				$message = $post_info['post_text']; - -				if ($post_info['bbcode_bitfield']) -				{ -					include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); -					$bbcode = new bbcode($post_info['bbcode_bitfield']); -					$bbcode->bbcode_second_pass($message, $post_info['bbcode_uid'], $post_info['bbcode_bitfield']); -				} - -				$message = bbcode_nl2br($message); -				$message = smiley_text($message); +				$parse_flags = ($post_info['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES; +				$message = generate_text_for_display($post_info['post_text'], $post_info['bbcode_uid'], $post_info['bbcode_bitfield'], $parse_flags, false);  				if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id']))  				{ @@ -170,12 +240,39 @@ class mcp_queue  						foreach ($attachments as $attachment)  						{  							$template->assign_block_vars('attachment', array( -								'DISPLAY_ATTACHMENT'	=> $attachment) -							); +								'DISPLAY_ATTACHMENT'	=> $attachment, +							));  						}  					}  				} +				// Deleting information +				if ($post_info['post_visibility'] == ITEM_DELETED && $post_info['post_delete_user']) +				{ +					// User having deleted the post also being the post author? +					if (!$post_info['post_delete_user'] || $post_info['post_delete_user'] == $post_info['poster_id']) +					{ +						$display_username = get_username_string('full', $post_info['poster_id'], $post_info['username'], $post_info['user_colour'], $post_info['post_username']); +					} +					else +					{ +						$sql = 'SELECT u.user_id, u.username, u.user_colour +							FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u +							WHERE p.post_id =  ' . $post_info['post_id'] . ' +								AND p.post_delete_user = u.user_id'; +						$result = $db->sql_query($sql); +						$post_delete_userinfo = $db->sql_fetchrow($result); +						$db->sql_freeresult($result); +						$display_username = get_username_string('full', $post_info['post_delete_user'], $post_delete_userinfo['username'], $post_delete_userinfo['user_colour']); +					} + +					$l_deleted_by = $user->lang('DELETED_INFORMATION', $display_username, $user->format_date($post_info['post_delete_time'], false, true)); +				} +				else +				{ +					$l_deleted_by = ''; +				} +  				$post_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $post_info['forum_id'] . '&p=' . $post_info['post_id'] . '#p' . $post_info['post_id']);  				$topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $post_info['forum_id'] . '&t=' . $post_info['topic_id']); @@ -184,9 +281,12 @@ class mcp_queue  					'U_APPROVE_ACTION'		=> append_sid("{$phpbb_root_path}mcp.$phpEx", "i=queue&p=$post_id&f=$forum_id"),  					'S_CAN_VIEWIP'			=> $auth->acl_get('m_info', $post_info['forum_id']),  					'S_POST_REPORTED'		=> $post_info['post_reported'], -					'S_POST_UNAPPROVED'		=> !$post_info['post_approved'], +					'S_POST_UNAPPROVED'		=> ($post_info['post_visibility'] == ITEM_UNAPPROVED),  					'S_POST_LOCKED'			=> $post_info['post_edit_locked'],  					'S_USER_NOTES'			=> true, +					'S_POST_DELETED'		=> ($post_info['post_visibility'] == ITEM_DELETED), +					'DELETED_MESSAGE'		=> $l_deleted_by, +					'DELETE_REASON'			=> $post_info['post_delete_reason'],  					'U_EDIT'				=> ($auth->acl_get('m_edit', $post_info['forum_id'])) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=edit&f={$post_info['forum_id']}&p={$post_info['post_id']}") : '',  					'U_MCP_APPROVE'			=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=approve_details&f=' . $post_info['forum_id'] . '&p=' . $post_id), @@ -198,7 +298,8 @@ class mcp_queue  					'MINI_POST_IMG'			=> ($post_unread) ? $user->img('icon_post_target_unread', 'UNREAD_POST') : $user->img('icon_post_target', 'POST'), -					'RETURN_QUEUE'			=> sprintf($user->lang['RETURN_QUEUE'], '<a href="' . append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue' . (($topic_id) ? '&mode=unapproved_topics' : '&mode=unapproved_posts')) . "&start=$start\">", '</a>'), + +					'RETURN_QUEUE'			=> sprintf($user->lang['RETURN_QUEUE'], '<a href="' . append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue' . (($topic_id) ? '&mode=unapproved_topics' : '&mode=unapproved_posts')) . '&start=' . $start . '">', '</a>'),  					'RETURN_POST'			=> sprintf($user->lang['RETURN_POST'], '<a href="' . $post_url . '">', '</a>'),  					'RETURN_TOPIC_SIMPLE'	=> sprintf($user->lang['RETURN_TOPIC_SIMPLE'], '<a href="' . $topic_url . '">', '</a>'),  					'REPORTED_IMG'			=> $user->img('icon_topic_reported', $user->lang['POST_REPORTED']), @@ -225,9 +326,16 @@ class mcp_queue  			case 'unapproved_topics':  			case 'unapproved_posts': +			case 'deleted_topics': +			case 'deleted_posts': +				$m_perm = 'm_approve'; +				$is_topics = ($mode == 'unapproved_topics' || $mode == 'deleted_topics') ? true : false; +				$is_restore = ($mode == 'deleted_posts' || $mode == 'deleted_topics') ? true : false; +				$visibility_const = (!$is_restore) ? ITEM_UNAPPROVED : ITEM_DELETED; +  				$user->add_lang(array('viewtopic', 'viewforum')); -				$topic_id = request_var('t', 0); +				$topic_id = $request->variable('t', 0);  				$forum_info = array();  				if ($topic_id) @@ -243,7 +351,7 @@ class mcp_queue  					$forum_id = $topic_info['forum_id'];  				} -				$forum_list_approve = get_forum_list('m_approve', false, true); +				$forum_list_approve = get_forum_list($m_perm, false, true);  				$forum_list_read = array_flip(get_forum_list('f_read', true, true)); // Flipped so we can isset() the forum IDs  				// Remove forums we cannot read @@ -269,20 +377,16 @@ class mcp_queue  						trigger_error('NOT_MODERATOR');  					} -					$global_id = $forum_list[0]; - -					$forum_list = implode(', ', $forum_list); - -					$sql = 'SELECT SUM(forum_topics) as sum_forum_topics -						FROM ' . FORUMS_TABLE . " -						WHERE forum_id IN (0, $forum_list)"; +					$sql = 'SELECT SUM(forum_topics_approved) as sum_forum_topics +						FROM ' . FORUMS_TABLE . ' +						WHERE ' . $db->sql_in_set('forum_id', $forum_list);  					$result = $db->sql_query($sql); -					$forum_info['forum_topics'] = (int) $db->sql_fetchfield('sum_forum_topics'); +					$forum_info['forum_topics_approved'] = (int) $db->sql_fetchfield('sum_forum_topics');  					$db->sql_freeresult($result);  				}  				else  				{ -					$forum_info = get_forum_data(array($forum_id), 'm_approve'); +					$forum_info = get_forum_data(array($forum_id), $m_perm);  					if (!sizeof($forum_info))  					{ @@ -291,7 +395,6 @@ class mcp_queue  					$forum_info = $forum_info[$forum_id];  					$forum_list = $forum_id; -					$global_id = $forum_id;  				}  				$forum_options = '<option value="0"' . (($forum_id == 0) ? ' selected="selected"' : '') . '>' . $user->lang['ALL_FORUMS'] . '</option>'; @@ -305,21 +408,22 @@ class mcp_queue  				$sort_by_sql = $sort_order_sql = array();  				mcp_sorting($mode, $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $forum_id, $topic_id); -				$forum_topics = ($total == -1) ? $forum_info['forum_topics'] : $total; +				$forum_topics = ($total == -1) ? $forum_info['forum_topics_approved'] : $total;  				$limit_time_sql = ($sort_days) ? 'AND t.topic_last_post_time >= ' . (time() - ($sort_days * 86400)) : '';  				$forum_names = array(); -				if ($mode == 'unapproved_posts') +				if (!$is_topics)  				{  					$sql = 'SELECT p.post_id -						FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t' . (($sort_order_sql[0] == 'u') ? ', ' . USERS_TABLE . ' u' : '') . " -						WHERE p.forum_id IN (0, $forum_list) -							AND p.post_approved = 0 -							" . (($sort_order_sql[0] == 'u') ? 'AND u.user_id = p.poster_id' : '') . ' +						FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t' . (($sort_order_sql[0] == 'u') ? ', ' . USERS_TABLE . ' u' : '') . ' +						WHERE ' . $db->sql_in_set('p.forum_id', $forum_list) . ' +							AND p.post_visibility = ' . $visibility_const . ' +							' . (($sort_order_sql[0] == 'u') ? 'AND u.user_id = p.poster_id' : '') . '  							' . (($topic_id) ? 'AND p.topic_id = ' . $topic_id : '') . "  							AND t.topic_id = p.topic_id -							AND t.topic_first_post_id <> p.post_id +							AND (t.topic_visibility <> p.post_visibility +								OR t.topic_delete_user = 0)  							$limit_time_sql  						ORDER BY $sort_order_sql";  					$result = $db->sql_query_limit($sql, $config['topics_per_page'], $start); @@ -335,7 +439,7 @@ class mcp_queue  					if (sizeof($post_ids))  					{ -						$sql = 'SELECT t.topic_id, t.topic_title, t.forum_id, p.post_id, p.post_subject, p.post_username, p.poster_id, p.post_time, u.username, u.username_clean, u.user_colour +						$sql = 'SELECT t.topic_id, t.topic_title, t.forum_id, p.post_id, p.post_subject, p.post_username, p.poster_id, p.post_time, p.post_attachment, u.username, u.username_clean, u.user_colour  							FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . USERS_TABLE . ' u  							WHERE ' . $db->sql_in_set('p.post_id', $post_ids) . '  								AND t.topic_id = p.topic_id @@ -346,10 +450,7 @@ class mcp_queue  						$post_data = $rowset = array();  						while ($row = $db->sql_fetchrow($result))  						{ -							if ($row['forum_id']) -							{ -								$forum_names[] = $row['forum_id']; -							} +							$forum_names[] = $row['forum_id'];  							$post_data[$row['post_id']] = $row;  						}  						$db->sql_freeresult($result); @@ -367,10 +468,11 @@ class mcp_queue  				}  				else  				{ -					$sql = 'SELECT t.forum_id, t.topic_id, t.topic_title, t.topic_title AS post_subject, t.topic_time AS post_time, t.topic_poster AS poster_id, t.topic_first_post_id AS post_id, t.topic_first_poster_name AS username, t.topic_first_poster_colour AS user_colour -						FROM ' . TOPICS_TABLE . " t -						WHERE forum_id IN (0, $forum_list) -							AND topic_approved = 0 +					$sql = 'SELECT t.forum_id, t.topic_id, t.topic_title, t.topic_title AS post_subject, t.topic_time AS post_time, t.topic_poster AS poster_id, t.topic_first_post_id AS post_id, t.topic_attachment AS post_attachment, t.topic_first_poster_name AS username, t.topic_first_poster_colour AS user_colour +						FROM ' . TOPICS_TABLE . ' t +						WHERE ' . $db->sql_in_set('forum_id', $forum_list) . ' +							AND topic_visibility = ' . $visibility_const . " +							AND topic_delete_user <> 0  							$limit_time_sql  						ORDER BY $sort_order_sql";  					$result = $db->sql_query_limit($sql, $config['topics_per_page'], $start); @@ -378,10 +480,7 @@ class mcp_queue  					$rowset = array();  					while ($row = $db->sql_fetchrow($result))  					{ -						if ($row['forum_id']) -						{ -							$forum_names[] = $row['forum_id']; -						} +						$forum_names[] = $row['forum_id'];  						$rowset[] = $row;  					}  					$db->sql_freeresult($result); @@ -405,20 +504,14 @@ class mcp_queue  				foreach ($rowset as $row)  				{ -					$global_topic = ($row['forum_id']) ? false : true; -					if ($global_topic) -					{ -						$row['forum_id'] = $global_id; -					} -  					if (empty($row['post_username']))  					{ -						$row['post_username'] = $user->lang['GUEST']; +						$row['post_username'] = $row['username'] ?: $user->lang['GUEST'];  					}  					$template->assign_block_vars('postrow', array(  						'U_TOPIC'			=> append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id'] . '&t=' . $row['topic_id']), -						'U_VIEWFORUM'		=> (!$global_topic) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']) : '', +						'U_VIEWFORUM'		=> append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']),  						'U_VIEWPOST'		=> append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id'] . '&p=' . $row['post_id']) . (($mode == 'unapproved_posts') ? '#p' . $row['post_id'] : ''),  						'U_VIEW_DETAILS'	=> append_sid("{$phpbb_root_path}mcp.$phpEx", "i=queue&start=$start&mode=approve_details&f={$row['forum_id']}&p={$row['post_id']}" . (($mode == 'unapproved_topics') ? "&t={$row['topic_id']}" : '')), @@ -428,572 +521,708 @@ class mcp_queue  						'U_POST_AUTHOR'			=> get_username_string('profile', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']),  						'POST_ID'		=> $row['post_id'], -						'FORUM_NAME'	=> (!$global_topic) ? $forum_names[$row['forum_id']] : $user->lang['GLOBAL_ANNOUNCEMENT'], +						'TOPIC_ID'		=> $row['topic_id'], +						'FORUM_NAME'	=> $forum_names[$row['forum_id']],  						'POST_SUBJECT'	=> ($row['post_subject'] != '') ? $row['post_subject'] : $user->lang['NO_SUBJECT'],  						'TOPIC_TITLE'	=> $row['topic_title'], -						'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']) : '', +					));  				}  				unset($rowset, $forum_names); +				$base_url = $this->u_action . "&f=$forum_id&st=$sort_days&sk=$sort_key&sd=$sort_dir"; +				phpbb_generate_template_pagination($template, $base_url, 'pagination', 'start', $total, $config['topics_per_page'], $start); +  				// Now display the page  				$template->assign_vars(array( -					'L_DISPLAY_ITEMS'		=> ($mode == 'unapproved_posts') ? $user->lang['DISPLAY_POSTS'] : $user->lang['DISPLAY_TOPICS'], -					'L_EXPLAIN'				=> ($mode == 'unapproved_posts') ? $user->lang['MCP_QUEUE_UNAPPROVED_POSTS_EXPLAIN'] : $user->lang['MCP_QUEUE_UNAPPROVED_TOPICS_EXPLAIN'], -					'L_TITLE'				=> ($mode == 'unapproved_posts') ? $user->lang['MCP_QUEUE_UNAPPROVED_POSTS'] : $user->lang['MCP_QUEUE_UNAPPROVED_TOPICS'], +					'L_DISPLAY_ITEMS'		=> (!$is_topics) ? $user->lang['DISPLAY_POSTS'] : $user->lang['DISPLAY_TOPICS'], +					'L_EXPLAIN'				=> $user->lang['MCP_QUEUE_' . strtoupper($mode) . '_EXPLAIN'], +					'L_TITLE'				=> $user->lang['MCP_QUEUE_' . strtoupper($mode)],  					'L_ONLY_TOPIC'			=> ($topic_id) ? sprintf($user->lang['ONLY_TOPIC'], $topic_info['topic_title']) : '',  					'S_FORUM_OPTIONS'		=> $forum_options,  					'S_MCP_ACTION'			=> build_url(array('t', 'f', 'sd', 'st', 'sk')), -					'S_TOPICS'				=> ($mode == 'unapproved_posts') ? false : true, +					'S_TOPICS'				=> $is_topics, +					'S_RESTORE'				=> $is_restore, -					'PAGINATION'			=> generate_pagination($this->u_action . "&f=$forum_id&st=$sort_days&sk=$sort_key&sd=$sort_dir", $total, $config['topics_per_page'], $start), -					'PAGE_NUMBER'			=> on_page($total, $config['topics_per_page'], $start), +					'PAGE_NUMBER'			=> phpbb_on_page($template, $user, $base_url, $total, $config['topics_per_page'], $start),  					'TOPIC_ID'				=> $topic_id, -					'TOTAL'					=> ($total == 1) ? (($mode == 'unapproved_posts') ? $user->lang['VIEW_TOPIC_POST'] : $user->lang['VIEW_FORUM_TOPIC']) : sprintf((($mode == 'unapproved_posts') ? $user->lang['VIEW_TOPIC_POSTS'] : $user->lang['VIEW_FORUM_TOPICS']), $total), +					'TOTAL'					=> $user->lang(((!$is_topics) ? 'VIEW_TOPIC_POSTS' : 'VIEW_FORUM_TOPICS'), (int) $total),  				));  				$this->tpl_name = 'mcp_queue';  			break;  		}  	} -} -/** -* Approve Post/Topic -*/ -function approve_post($post_id_list, $id, $mode) -{ -	global $db, $template, $user, $config; -	global $phpEx, $phpbb_root_path; - -	if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve'))) +	/** +	* Approve/Restore posts +	* +	* @param $action		string	Action we perform on the posts ('approve' or 'restore') +	* @param $post_id_list	array	IDs of the posts to approve/restore +	* @param $id			mixed	Category of the current active module +	* @param $mode			string	Active module +	* @return null +	*/ +	static public function approve_posts($action, $post_id_list, $id, $mode)  	{ -		trigger_error('NOT_AUTHORISED'); -	} +		global $db, $template, $user, $config, $request, $phpbb_container; +		global $phpEx, $phpbb_root_path; -	$redirect = request_var('redirect', build_url(array('quickmod'))); -	$success_msg = ''; - -	$s_hidden_fields = build_hidden_fields(array( -		'i'				=> $id, -		'mode'			=> $mode, -		'post_id_list'	=> $post_id_list, -		'action'		=> 'approve', -		'redirect'		=> $redirect) -	); - -	$post_info = get_post_data($post_id_list, 'm_approve'); +		if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve'))) +		{ +			trigger_error('NOT_AUTHORISED'); +		} -	if (confirm_box(true)) -	{ -		$notify_poster = (isset($_REQUEST['notify_poster'])) ? true : false; +		$redirect = $request->variable('redirect', build_url(array('quickmod'))); +		$success_msg = $post_url = ''; +		$approve_log = array(); -		// 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 +		$s_hidden_fields = build_hidden_fields(array( +			'i'				=> $id, +			'mode'			=> $mode, +			'post_id_list'	=> $post_id_list, +			'action'		=> $action, +			'redirect'		=> $redirect, +		)); -		$total_topics = $total_posts = 0; -		$topic_approve_sql = $post_approve_sql = $topic_id_list = $forum_id_list = $approve_log = array(); -		$user_posts_sql = $post_approved_list = array(); +		$post_info = get_post_data($post_id_list, 'm_approve'); -		foreach ($post_info as $post_id => $post_data) +		if (confirm_box(true))  		{ -			if ($post_data['post_approved']) -			{ -				$post_approved_list[] = $post_id; -				continue; -			} +			$notify_poster = ($action == 'approve' && isset($_REQUEST['notify_poster'])); -			$topic_id_list[$post_data['topic_id']] = 1; +			$topic_info = array(); -			if ($post_data['forum_id']) +			// Group the posts by topic_id +			foreach ($post_info as $post_id => $post_data)  			{ -				$forum_id_list[$post_data['forum_id']] = 1; -			} +				if ($post_data['post_visibility'] == ITEM_APPROVED) +				{ +					continue; +				} +				$topic_id = (int) $post_data['topic_id']; -			// User post update (we do not care about topic or post, since user posts are strictly connected to posts) -			// But we care about forums where post counts get not increased. ;) -			if ($post_data['post_postcount']) -			{ -				$user_posts_sql[$post_data['poster_id']] = (empty($user_posts_sql[$post_data['poster_id']])) ? 1 : $user_posts_sql[$post_data['poster_id']] + 1; -			} +				$topic_info[$topic_id]['posts'][] = (int) $post_id; +				$topic_info[$topic_id]['forum_id'] = (int) $post_data['forum_id']; -			// Topic or Post. ;) -			if ($post_data['topic_first_post_id'] == $post_id) -			{ -				if ($post_data['forum_id']) +				// Refresh the first post, if the time or id is older then the current one +				if ($post_id <= $post_data['topic_first_post_id'] || $post_data['post_time'] <= $post_data['topic_time'])  				{ -					$total_topics++; +					$topic_info[$topic_id]['first_post'] = true;  				} -				$topic_approve_sql[] = $post_data['topic_id']; + +				// Refresh the last post, if the time or id is newer then the current one +				if ($post_id >= $post_data['topic_last_post_id'] || $post_data['post_time'] >= $post_data['topic_last_post_time']) +				{ +					$topic_info[$topic_id]['last_post'] = true; +				} + +				$post_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f={$post_data['forum_id']}&t={$post_data['topic_id']}&p={$post_data['post_id']}") . '#p' . $post_data['post_id'];  				$approve_log[] = array( -					'type'			=> 'topic', -					'post_subject'	=> $post_data['post_subject'],  					'forum_id'		=> $post_data['forum_id'],  					'topic_id'		=> $post_data['topic_id'], +					'post_subject'	=> $post_data['post_subject'],  				);  			} -			else + +			$phpbb_content_visibility = $phpbb_container->get('content.visibility'); +			foreach ($topic_info as $topic_id => $topic_data)  			{ -				$approve_log[] = array( -					'type'			=> 'post', -					'post_subject'	=> $post_data['post_subject'], -					'forum_id'		=> $post_data['forum_id'], -					'topic_id'		=> $post_data['topic_id'], -				); +				$phpbb_content_visibility->set_post_visibility(ITEM_APPROVED, $topic_data['posts'], $topic_id, $topic_data['forum_id'], $user->data['user_id'], time(), '', isset($topic_data['first_post']), isset($topic_data['last_post']));  			} -			if ($post_data['forum_id']) +			if (sizeof($post_info) >= 1)  			{ -				$total_posts++; +				$success_msg = (sizeof($post_info) == 1) ? 'POST_' . strtoupper($action) . 'D_SUCCESS' : 'POSTS_' . strtoupper($action) . 'D_SUCCESS'; +			} -				// Increment by topic_replies if we approve a topic... -				// This works because we do not adjust the topic_replies when re-approving a topic after an edit. -				if ($post_data['topic_first_post_id'] == $post_id && $post_data['topic_replies']) +			foreach ($approve_log as $log_data) +			{ +				add_log('mod', $log_data['forum_id'], $log_data['topic_id'], 'LOG_POST_' . strtoupper($action) . 'D', $log_data['post_subject']); +			} + +			// Only send out the mails, when the posts are being approved +			if ($action == 'approve') +			{ +				$phpbb_notifications = $phpbb_container->get('notification_manager'); + +				// Handle notifications +				foreach ($post_info as $post_id => $post_data)  				{ -					$total_posts += $post_data['topic_replies']; +					$phpbb_notifications->delete_notifications('post_in_queue', $post_id); + +					$phpbb_notifications->add_notifications(array( +						'quote', +						'bookmark', +						'post', +					), $post_data); + +					$phpbb_notifications->mark_notifications_read(array( +						'quote', +						'bookmark', +						'post', +					), $post_data['post_id'], $user->data['user_id']); + +					// Notify Poster? +					if ($notify_poster) +					{ +						if ($post_data['poster_id'] == ANONYMOUS) +						{ +							continue; +						} + +						$phpbb_notifications->add_notifications('approve_post', $post_data); +					}  				}  			} - -			$post_approve_sql[] = $post_id;  		} - -		$post_id_list = array_values(array_diff($post_id_list, $post_approved_list)); -		for ($i = 0, $size = sizeof($post_approved_list); $i < $size; $i++) +		else  		{ -			unset($post_info[$post_approved_list[$i]]); -		} +			$show_notify = false; -		if (sizeof($topic_approve_sql)) -		{ -			$sql = 'UPDATE ' . TOPICS_TABLE . ' -				SET topic_approved = 1 -				WHERE ' . $db->sql_in_set('topic_id', $topic_approve_sql); -			$db->sql_query($sql); -		} +			if ($action == 'approve') +			{ +				foreach ($post_info as $post_data) +				{ +					if ($post_data['poster_id'] == ANONYMOUS) +					{ +						continue; +					} +					else +					{ +						$show_notify = true; +						break; +					} +				} +			} -		if (sizeof($post_approve_sql)) -		{ -			$sql = 'UPDATE ' . POSTS_TABLE . ' -				SET post_approved = 1 -				WHERE ' . $db->sql_in_set('post_id', $post_approve_sql); -			$db->sql_query($sql); +			$template->assign_vars(array( +				'S_NOTIFY_POSTER'			=> $show_notify, +				'S_' . strtoupper($action)	=> true, +			)); + +			confirm_box(false, strtoupper($action) . '_POST' . ((sizeof($post_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html');  		} -		unset($topic_approve_sql, $post_approve_sql); +		$redirect = $request->variable('redirect', "index.$phpEx"); +		$redirect = reapply_sid($redirect); -		foreach ($approve_log as $log_data) +		if (!$success_msg)  		{ -			add_log('mod', $log_data['forum_id'], $log_data['topic_id'], ($log_data['type'] == 'topic') ? 'LOG_TOPIC_APPROVED' : 'LOG_POST_APPROVED', $log_data['post_subject']); +			redirect($redirect);  		} - -		if (sizeof($user_posts_sql)) +		else  		{ -			// Try to minimize the query count by merging users with the same post count additions -			$user_posts_update = array(); +			meta_refresh(3, $redirect); -			foreach ($user_posts_sql as $user_id => $user_posts) +			// If approving one post, also give links back to post... +			$add_message = ''; +			if (sizeof($post_info) == 1 && $post_url)  			{ -				$user_posts_update[$user_posts][] = $user_id; +				$add_message = '<br /><br />' . sprintf($user->lang['RETURN_POST'], '<a href="' . $post_url . '">', '</a>');  			} -			foreach ($user_posts_update as $user_posts => $user_id_ary) +			$message = $user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>') . $add_message; + +			if ($request->is_ajax())  			{ -				$sql = 'UPDATE ' . USERS_TABLE . ' -					SET user_posts = user_posts + ' . $user_posts . ' -					WHERE ' . $db->sql_in_set('user_id', $user_id_ary); -				$db->sql_query($sql); +				$json_response = new phpbb_json_response; +				$json_response->send(array( +					'MESSAGE_TITLE'		=> $user->lang['INFORMATION'], +					'MESSAGE_TEXT'		=> $message, +					'REFRESH_DATA'		=> null, +					'visible'			=> true, +				));  			} -		} -		if ($total_topics) -		{ -			set_config_count('num_topics', $total_topics, true); +			trigger_error($message);  		} +	} -		if ($total_posts) +	/** +	* Approve/Restore topics +	* +	* @param $action		string	Action we perform on the posts ('approve' or 'restore') +	* @param $topic_id_list	array	IDs of the topics to approve/restore +	* @param $id			mixed	Category of the current active module +	* @param $mode			string	Active module +	* @return null +	*/ +	static public function approve_topics($action, $topic_id_list, $id, $mode) +	{ +		global $db, $template, $user, $config; +		global $phpEx, $phpbb_root_path, $request, $phpbb_container; + +		if (!check_ids($topic_id_list, TOPICS_TABLE, 'topic_id', array('m_approve')))  		{ -			set_config_count('num_posts', $total_posts, true); +			trigger_error('NOT_AUTHORISED');  		} -		sync('topic', 'topic_id', array_keys($topic_id_list), true); -		sync('forum', 'forum_id', array_keys($forum_id_list), true, true); -		unset($topic_id_list, $forum_id_list); +		$redirect = $request->variable('redirect', build_url(array('quickmod'))); +		$success_msg = $topic_url = ''; +		$approve_log = array(); -		$messenger = new messenger(); +		$s_hidden_fields = build_hidden_fields(array( +			'i'				=> $id, +			'mode'			=> $mode, +			'topic_id_list'	=> $topic_id_list, +			'action'		=> $action, +			'redirect'		=> $redirect, +		)); -		// Notify Poster? -		if ($notify_poster) -		{ -			foreach ($post_info as $post_id => $post_data) -			{ -				if ($post_data['poster_id'] == ANONYMOUS) -				{ -					continue; -				} +		$topic_info = get_topic_data($topic_id_list, 'm_approve'); -				$email_template = ($post_data['post_id'] == $post_data['topic_first_post_id'] && $post_data['post_id'] == $post_data['topic_last_post_id']) ? 'topic_approved' : 'post_approved'; - -				$messenger->template($email_template, $post_data['user_lang']); +		if (confirm_box(true)) +		{ +			$notify_poster = ($action == 'approve' && isset($_REQUEST['notify_poster'])) ? true : false; -				$messenger->to($post_data['user_email'], $post_data['username']); -				$messenger->im($post_data['user_jabber'], $post_data['username']); +			$phpbb_content_visibility = $phpbb_container->get('content.visibility'); +			foreach ($topic_info as $topic_id => $topic_data) +			{ +				$phpbb_content_visibility->set_topic_visibility(ITEM_APPROVED, $topic_id, $topic_data['forum_id'], $user->data['user_id'], time(), ''); -				$messenger->assign_vars(array( -					'USERNAME'		=> htmlspecialchars_decode($post_data['username']), -					'POST_SUBJECT'	=> htmlspecialchars_decode(censor_text($post_data['post_subject'])), -					'TOPIC_TITLE'	=> htmlspecialchars_decode(censor_text($post_data['topic_title'])), +				$topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f={$topic_data['forum_id']}&t={$topic_id}"); -					'U_VIEW_TOPIC'	=> generate_board_url() . "/viewtopic.$phpEx?f={$post_data['forum_id']}&t={$post_data['topic_id']}&e=0", -					'U_VIEW_POST'	=> generate_board_url() . "/viewtopic.$phpEx?f={$post_data['forum_id']}&t={$post_data['topic_id']}&p=$post_id&e=$post_id") +				$approve_log[] = array( +					'forum_id'		=> $topic_data['forum_id'], +					'topic_id'		=> $topic_data['topic_id'], +					'topic_title'	=> $topic_data['topic_title'],  				); - -				$messenger->send($post_data['user_notify_type']);  			} -		} - -		$messenger->save_queue(); -		// Send out normal user notifications -		$email_sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']); - -		foreach ($post_info as $post_id => $post_data) -		{ -			if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id']) +			if (sizeof($topic_info) >= 1)  			{ -				// Forum Notifications -				user_notification('post', $post_data['topic_title'], $post_data['topic_title'], $post_data['forum_name'], $post_data['forum_id'], $post_data['topic_id'], $post_id); +				$success_msg = (sizeof($topic_info) == 1) ? 'TOPIC_' . strtoupper($action) . 'D_SUCCESS' : 'TOPICS_' . strtoupper($action) . 'D_SUCCESS';  			} -			else + +			foreach ($approve_log as $log_data)  			{ -				// Topic Notifications -				user_notification('reply', $post_data['post_subject'], $post_data['topic_title'], $post_data['forum_name'], $post_data['forum_id'], $post_data['topic_id'], $post_id); +				add_log('mod', $log_data['forum_id'], $log_data['topic_id'], 'LOG_TOPIC_' . strtoupper($action) . 'D', $log_data['topic_title']);  			} -		} -		if (sizeof($post_id_list) == 1) -		{ -			$post_data = $post_info[$post_id_list[0]]; -			$post_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f={$post_data['forum_id']}&t={$post_data['topic_id']}&p={$post_data['post_id']}") . '#p' . $post_data['post_id']; -		} -		unset($post_info); +			// Only send out the mails, when the posts are being approved +			if ($action == 'approve') +			{ +				// Handle notifications +				$phpbb_notifications = $phpbb_container->get('notification_manager'); -		if ($total_topics) -		{ -			$success_msg = ($total_topics == 1) ? 'TOPIC_APPROVED_SUCCESS' : 'TOPICS_APPROVED_SUCCESS'; +				foreach ($topic_info as $topic_id => $topic_data) +				{ +					$phpbb_notifications->delete_notifications('topic_in_queue', $post_data['topic_id']); +					$phpbb_notifications->add_notifications(array( +						'quote', +						'topic', +					), $post_data); + +					$phpbb_notifications->mark_notifications_read('quote', $post_data['post_id'], $user->data['user_id']); +					$phpbb_notifications->mark_notifications_read('topic', $post_data['topic_id'], $user->data['user_id']); + +					if ($notify_poster) +					{ +						$phpbb_notifications->add_notifications('approve_topic', $post_data); +					} +				} +			}  		}  		else  		{ -			$success_msg = (sizeof($post_id_list) + sizeof($post_approved_list) == 1) ? 'POST_APPROVED_SUCCESS' : 'POSTS_APPROVED_SUCCESS'; -		} -	} -	else -	{ -		$show_notify = false; +			$show_notify = false; -		if ($config['email_enable'] || $config['jab_enable']) -		{ -			foreach ($post_info as $post_data) +			if ($action == 'approve')  			{ -				if ($post_data['poster_id'] == ANONYMOUS) -				{ -					continue; -				} -				else +				foreach ($topic_info as $topic_data)  				{ -					$show_notify = true; -					break; +					if ($topic_data['topic_poster'] == ANONYMOUS) +					{ +						continue; +					} +					else +					{ +						$show_notify = true; +						break; +					}  				}  			} -		} -		$template->assign_vars(array( -			'S_NOTIFY_POSTER'	=> $show_notify, -			'S_APPROVE'			=> true) -		); +			$template->assign_vars(array( +				'S_NOTIFY_POSTER'			=> $show_notify, +				'S_' . strtoupper($action)	=> true, +			)); -		confirm_box(false, 'APPROVE_POST' . ((sizeof($post_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html'); -	} +			confirm_box(false, strtoupper($action) . '_TOPIC' . ((sizeof($topic_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html'); +		} -	$redirect = request_var('redirect', "index.$phpEx"); -	$redirect = reapply_sid($redirect); +		$redirect = $request->variable('redirect', "index.$phpEx"); +		$redirect = reapply_sid($redirect); -	if (!$success_msg) -	{ -		redirect($redirect); -	} -	else -	{ -		meta_refresh(3, $redirect); - -		// If approving one post, also give links back to post... -		$add_message = ''; -		if (sizeof($post_id_list) == 1 && !empty($post_url)) +		if (!$success_msg)  		{ -			$add_message = '<br /><br />' . sprintf($user->lang['RETURN_POST'], '<a href="' . $post_url . '">', '</a>'); +			redirect($redirect);  		} +		else +		{ +			meta_refresh(3, $redirect); -		trigger_error($user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>') . $add_message); -	} -} - -/** -* Disapprove Post/Topic -*/ -function disapprove_post($post_id_list, $id, $mode) -{ -	global $db, $template, $user, $config; -	global $phpEx, $phpbb_root_path; - -	if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve'))) -	{ -		trigger_error('NOT_AUTHORISED'); -	} +			// If approving one topic, also give links back to topic... +			$add_message = ''; +			if (sizeof($topic_info) == 1 && $topic_url) +			{ +				$add_message = '<br /><br />' . sprintf($user->lang['RETURN_TOPIC'], '<a href="' . $topic_url . '">', '</a>'); +			} -	$redirect = request_var('redirect', build_url(array('t', 'mode', 'quickmod')) . "&mode=$mode"); -	$reason = utf8_normalize_nfc(request_var('reason', '', true)); -	$reason_id = request_var('reason_id', 0); -	$success_msg = $additional_msg = ''; +			$message = $user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>') . $add_message; -	$s_hidden_fields = build_hidden_fields(array( -		'i'				=> $id, -		'mode'			=> $mode, -		'post_id_list'	=> $post_id_list, -		'action'		=> 'disapprove', -		'redirect'		=> $redirect) -	); +			if ($request->is_ajax()) +			{ +				$json_response = new phpbb_json_response; +				$json_response->send(array( +					'MESSAGE_TITLE'		=> $user->lang['INFORMATION'], +					'MESSAGE_TEXT'		=> $message, +					'REFRESH_DATA'		=> null, +					'visible'			=> true, +				)); +			} -	$notify_poster = (isset($_REQUEST['notify_poster'])) ? true : false; -	$disapprove_reason = ''; +			trigger_error($message); +		} +	} -	if ($reason_id) +	/** +	* Disapprove Post +	* +	* @param $post_id_list	array	IDs of the posts to disapprove/delete +	* @param $id			mixed	Category of the current active module +	* @param $mode			string	Active module +	* @return null +	*/ +	static public function disapprove_posts($post_id_list, $id, $mode)  	{ -		$sql = 'SELECT reason_title, reason_description -			FROM ' . REPORTS_REASONS_TABLE . " -			WHERE reason_id = $reason_id"; -		$result = $db->sql_query($sql); -		$row = $db->sql_fetchrow($result); -		$db->sql_freeresult($result); - -		if (!$row || (!$reason && strtolower($row['reason_title']) == 'other')) +		global $db, $template, $user, $config, $phpbb_container; +		global $phpEx, $phpbb_root_path, $request; + +		if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))  		{ -			$additional_msg = $user->lang['NO_REASON_DISAPPROVAL']; -			unset($_REQUEST['confirm_key']); -			unset($_POST['confirm_key']); -			unset($_POST['confirm']); +			trigger_error('NOT_AUTHORISED');  		} -		else -		{ -			// If the reason is defined within the language file, we will use the localized version, else just use the database entry... -			$disapprove_reason = (strtolower($row['reason_title']) != 'other') ? ((isset($user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])])) ? $user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])] : $row['reason_description']) : ''; -			$disapprove_reason .= ($reason) ? "\n\n" . $reason : ''; -			if (isset($user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])])) +		$redirect = $request->variable('redirect', build_url(array('t', 'mode', 'quickmod')) . "&mode=$mode"); +		$reason = $request->variable('reason', '', true); +		$reason_id = $request->variable('reason_id', 0); +		$success_msg = $additional_msg = ''; + +		$s_hidden_fields = build_hidden_fields(array( +			'i'				=> $id, +			'mode'			=> $mode, +			'post_id_list'	=> $post_id_list, +			'action'		=> 'disapprove', +			'redirect'		=> $redirect, +		)); + +		$notify_poster = $request->is_set('notify_poster'); +		$disapprove_reason = ''; + +		if ($reason_id) +		{ +			$sql = 'SELECT reason_title, reason_description +				FROM ' . REPORTS_REASONS_TABLE . " +				WHERE reason_id = $reason_id"; +			$result = $db->sql_query($sql); +			$row = $db->sql_fetchrow($result); +			$db->sql_freeresult($result); + +			if (!$row || (!$reason && strtolower($row['reason_title']) == 'other'))  			{ -				$disapprove_reason_lang = strtoupper($row['reason_title']); +				$additional_msg = $user->lang['NO_REASON_DISAPPROVAL']; + +				$request->overwrite('confirm', null, phpbb_request_interface::POST); +				$request->overwrite('confirm_key', null, phpbb_request_interface::POST); +				$request->overwrite('confirm_key', null, phpbb_request_interface::REQUEST);  			} +			else +			{ +				// If the reason is defined within the language file, we will use the localized version, else just use the database entry... +				$disapprove_reason = (strtolower($row['reason_title']) != 'other') ? ((isset($user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])])) ? $user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])] : $row['reason_description']) : ''; +				$disapprove_reason .= ($reason) ? "\n\n" . $reason : ''; -			$email_disapprove_reason = $disapprove_reason; +				if (isset($user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])])) +				{ +					$disapprove_reason_lang = strtoupper($row['reason_title']); +				} +			}  		} -	} -	$post_info = get_post_data($post_id_list, 'm_approve'); +		$post_info = get_post_data($post_id_list, 'm_approve'); -	if (confirm_box(true)) -	{ -		$disapprove_log = $disapprove_log_topics = $disapprove_log_posts = array(); -		$topic_replies_real = $post_disapprove_list = array(); - -		// Build a list of posts to be unapproved and get the related topics real replies count +		$is_disapproving = false;  		foreach ($post_info as $post_id => $post_data)  		{ -			$post_disapprove_list[$post_id] = $post_data['topic_id']; -			if (!isset($topic_replies_real[$post_data['topic_id']])) +			if ($post_data['post_visibility'] == ITEM_DELETED)  			{ -				$topic_replies_real[$post_data['topic_id']] = $post_data['topic_replies_real']; +				continue;  			} + +			$is_disapproving = true;  		} -		// Now we build the log array -		foreach ($post_disapprove_list as $post_id => $topic_id) +		if (confirm_box(true))  		{ -			// If the count of disapproved posts for the topic is greater -			// than topic's real replies count, the whole topic is disapproved/deleted -			if (sizeof(array_keys($post_disapprove_list, $topic_id)) > $topic_replies_real[$topic_id]) +			$disapprove_log = $disapprove_log_topics = $disapprove_log_posts = array(); +			$topic_posts_unapproved = $post_disapprove_list = $topic_information = array(); + +			// Build a list of posts to be disapproved and get the related topics real replies count +			foreach ($post_info as $post_id => $post_data)  			{ -				// Don't write the log more than once for every topic -				if (!isset($disapprove_log_topics[$topic_id])) +				$post_disapprove_list[$post_id] = $post_data['topic_id']; +				if (!isset($topic_posts_unapproved[$post_data['topic_id']]))  				{ -					// Build disapproved topics log -					$disapprove_log_topics[$topic_id] = array( -						'type'			=> 'topic', -						'post_subject'	=> $post_info[$post_id]['topic_title'], -						'forum_id'		=> $post_info[$post_id]['forum_id'], -						'topic_id'		=> 0, // useless to log a topic id, as it will be deleted -					); +					$topic_information[$post_data['topic_id']] = $post_data; +					$topic_posts_unapproved[$post_data['topic_id']] = 0;  				} +				$topic_posts_unapproved[$post_data['topic_id']]++;  			} -			else + +			// Now we build the log array +			foreach ($post_disapprove_list as $post_id => $topic_id)  			{ -				// Build disapproved posts log -				$disapprove_log_posts[] = array( -					'type'			=> 'post', -					'post_subject'	=> $post_info[$post_id]['post_subject'], -					'forum_id'		=> $post_info[$post_id]['forum_id'], -					'topic_id'		=> $post_info[$post_id]['topic_id'], -				); +				// If the count of disapproved posts for the topic is equal +				// to the number of unapproved posts in the topic, and there are no different +				// posts, we disapprove the hole topic +				if ($topic_information[$topic_id]['topic_posts_approved'] == 0 && +					$topic_information[$topic_id]['topic_posts_softdeleted'] == 0 && +					$topic_information[$topic_id]['topic_posts_unapproved'] == $topic_posts_unapproved[$topic_id]) +				{ +					// Don't write the log more than once for every topic +					if (!isset($disapprove_log_topics[$topic_id])) +					{ +						// Build disapproved topics log +						$disapprove_log_topics[$topic_id] = array( +							'type'			=> 'topic', +							'post_subject'	=> $post_info[$post_id]['topic_title'], +							'forum_id'		=> $post_info[$post_id]['forum_id'], +							'topic_id'		=> 0, // useless to log a topic id, as it will be deleted +							'post_username'	=> ($post_info[$post_id]['poster_id'] == ANONYMOUS && !empty($post_info[$post_id]['post_username'])) ? $post_info[$post_id]['post_username'] : $post_info[$post_id]['username'], +						); +					} +				} +				else +				{ +					// Build disapproved posts log +					$disapprove_log_posts[] = array( +						'type'			=> 'post', +						'post_subject'	=> $post_info[$post_id]['post_subject'], +						'forum_id'		=> $post_info[$post_id]['forum_id'], +						'topic_id'		=> $post_info[$post_id]['topic_id'], +						'post_username'	=> ($post_info[$post_id]['poster_id'] == ANONYMOUS && !empty($post_info[$post_id]['post_username'])) ? $post_info[$post_id]['post_username'] : $post_info[$post_id]['username'], +					); +				}  			} -		} -		// Get disapproved posts/topics counts separately -		$num_disapproved_topics = sizeof($disapprove_log_topics); -		$num_disapproved_posts = sizeof($disapprove_log_posts); +			// Get disapproved posts/topics counts separately +			$num_disapproved_topics = sizeof($disapprove_log_topics); +			$num_disapproved_posts = sizeof($disapprove_log_posts); -		// Build the whole log -		$disapprove_log = array_merge($disapprove_log_topics, $disapprove_log_posts); +			// Build the whole log +			$disapprove_log = array_merge($disapprove_log_topics, $disapprove_log_posts); -		// Unset unneeded arrays -		unset($post_data, $disapprove_log_topics, $disapprove_log_posts); +			// Unset unneeded arrays +			unset($post_data, $disapprove_log_topics, $disapprove_log_posts); -		// Let's do the job - delete disapproved posts -		if (sizeof($post_disapprove_list)) -		{ -			if (!function_exists('delete_posts')) +			// Let's do the job - delete disapproved posts +			if (sizeof($post_disapprove_list))  			{ -				include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx); -			} +				if (!function_exists('delete_posts')) +				{ +					include($phpbb_root_path . 'includes/functions_admin.' . $phpEx); +				} -			// We do not check for permissions here, because the moderator allowed approval/disapproval should be allowed to delete the disapproved posts -			// Note: function delete_posts triggers related forums/topics sync, -			// so we don't need to call update_post_information later and to adjust real topic replies or forum topics count manually -			delete_posts('post_id', array_keys($post_disapprove_list)); +				// We do not check for permissions here, because the moderator allowed approval/disapproval should be allowed to delete the disapproved posts +				// Note: function delete_posts triggers related forums/topics sync, +				// so we don't need to call update_post_information later and to adjust real topic replies or forum topics count manually +				delete_posts('post_id', array_keys($post_disapprove_list)); -			foreach ($disapprove_log as $log_data) -			{ -				add_log('mod', $log_data['forum_id'], $log_data['topic_id'], ($log_data['type'] == 'topic') ? 'LOG_TOPIC_DISAPPROVED' : 'LOG_POST_DISAPPROVED', $log_data['post_subject'], $disapprove_reason); +				foreach ($disapprove_log as $log_data) +				{ +					if ($is_disapproving) +					{ +						$l_log_message = ($log_data['type'] == 'topic') ? 'LOG_TOPIC_DISAPPROVED' : 'LOG_POST_DISAPPROVED'; +						add_log('mod', $log_data['forum_id'], $log_data['topic_id'], $l_log_message, $log_data['post_subject'], $disapprove_reason); +					} +					else +					{ +						$l_log_message = ($log_data['type'] == 'topic') ? 'LOG_DELETE_TOPIC' : 'LOG_DELETE_POST'; +						add_log('mod', $log_data['forum_id'], $log_data['topic_id'], $l_log_message, $log_data['post_subject'], $log_data['post_username']); +					} +				}  			} -		} -		$messenger = new messenger(); +			$phpbb_notifications = $phpbb_container->get('notification_manager'); -		// Notify Poster? -		if ($notify_poster) -		{  			$lang_reasons = array();  			foreach ($post_info as $post_id => $post_data)  			{ -				if ($post_data['poster_id'] == ANONYMOUS) +				$disapprove_all_posts_in_topic = $topic_information[$topic_id]['topic_posts_approved'] == 0 && +					$topic_information[$topic_id]['topic_posts_softdeleted'] == 0 && +					$topic_information[$topic_id]['topic_posts_unapproved'] == $topic_posts_unapproved[$topic_id]; + +				$phpbb_notifications->delete_notifications('post_in_queue', $post_id); + +				// Do we disapprove the whole topic? Remove potential notifications +				if ($disapprove_all_posts_in_topic)  				{ -					continue; +					$phpbb_notifications->delete_notifications('topic_in_queue', $post_data['topic_id']);  				} -				if (isset($disapprove_reason_lang)) +				// Notify Poster? +				if ($notify_poster)  				{ -					// Okay we need to get the reason from the posters language -					if (!isset($lang_reasons[$post_data['user_lang']])) +					if ($post_data['poster_id'] == ANONYMOUS)  					{ -						// Assign the current users translation as the default, this is not ideal but getting the board default adds another layer of complexity. -						$lang_reasons[$post_data['user_lang']] = $user->lang['report_reasons']['DESCRIPTION'][$disapprove_reason_lang]; +						continue; +					} -						// Only load up the language pack if the language is different to the current one -						if ($post_data['user_lang'] != $user->lang_name && file_exists($phpbb_root_path . '/language/' . $post_data['user_lang'] . '/mcp.' . $phpEx)) +					$post_data['disapprove_reason'] = ''; +					if (isset($disapprove_reason_lang)) +					{ +						// Okay we need to get the reason from the posters language +						if (!isset($lang_reasons[$post_data['user_lang']]))  						{ -							// Load up the language pack -							$lang = array(); -							@include($phpbb_root_path . '/language/' . basename($post_data['user_lang']) . '/mcp.' . $phpEx); +							// Assign the current users translation as the default, this is not ideal but getting the board default adds another layer of complexity. +							$lang_reasons[$post_data['user_lang']] = $user->lang['report_reasons']['DESCRIPTION'][$disapprove_reason_lang]; -							// If we find the reason in this language pack use it -							if (isset($lang['report_reasons']['DESCRIPTION'][$disapprove_reason_lang])) +							// Only load up the language pack if the language is different to the current one +							if ($post_data['user_lang'] != $user->lang_name && file_exists($phpbb_root_path . '/language/' . $post_data['user_lang'] . '/mcp.' . $phpEx))  							{ -								$lang_reasons[$post_data['user_lang']] = $lang['report_reasons']['DESCRIPTION'][$disapprove_reason_lang]; -							} +								// Load up the language pack +								$lang = array(); +								@include($phpbb_root_path . '/language/' . basename($post_data['user_lang']) . '/mcp.' . $phpEx); + +								// If we find the reason in this language pack use it +								if (isset($lang['report_reasons']['DESCRIPTION'][$disapprove_reason_lang])) +								{ +									$lang_reasons[$post_data['user_lang']] = $lang['report_reasons']['DESCRIPTION'][$disapprove_reason_lang]; +								} -							unset($lang); // Free memory +								unset($lang); // Free memory +							}  						} -					} -					$email_disapprove_reason = $lang_reasons[$post_data['user_lang']]; -					$email_disapprove_reason .= ($reason) ? "\n\n" . $reason : ''; -				} +						$post_data['disapprove_reason'] = $lang_reasons[$post_data['user_lang']]; +						$post_data['disapprove_reason'] .= ($reason) ? "\n\n" . $reason : ''; +					} -				$email_template = ($post_data['post_id'] == $post_data['topic_first_post_id'] && $post_data['post_id'] == $post_data['topic_last_post_id']) ? 'topic_disapproved' : 'post_disapproved'; -				$messenger->template($email_template, $post_data['user_lang']); +					if ($disapprove_all_posts_in_topic && $topic_information[$topic_id]['topic_posts_unapproved'] == 1) +					{ +						// If there is only 1 post when disapproving the topic, +						// we send the user a "disapprove topic" notification... +						$phpbb_notifications->add_notifications('disapprove_topic', $post_data); +					} +					else +					{ +						// ... otherwise there are multiple unapproved posts and +						// all of them are disapproved as posts. +						$phpbb_notifications->add_notifications('disapprove_post', $post_data); +					} +				} +			} -				$messenger->to($post_data['user_email'], $post_data['username']); -				$messenger->im($post_data['user_jabber'], $post_data['username']); +			unset($lang_reasons, $post_info, $disapprove_reason, $disapprove_reason_lang); -				$messenger->assign_vars(array( -					'USERNAME'		=> htmlspecialchars_decode($post_data['username']), -					'REASON'		=> htmlspecialchars_decode($email_disapprove_reason), -					'POST_SUBJECT'	=> htmlspecialchars_decode(censor_text($post_data['post_subject'])), -					'TOPIC_TITLE'	=> htmlspecialchars_decode(censor_text($post_data['topic_title']))) -				); -				$messenger->send($post_data['user_notify_type']); +			if ($num_disapproved_topics) +			{ +				$success_msg = ($num_disapproved_topics == 1) ? 'TOPIC' : 'TOPICS'; +			} +			else +			{ +				$success_msg = ($num_disapproved_posts == 1) ? 'POST' : 'POSTS';  			} -			unset($lang_reasons); -		} -		unset($post_info, $disapprove_reason, $email_disapprove_reason, $disapprove_reason_lang); - -		$messenger->save_queue(); - -		if ($num_disapproved_topics) -		{ -			$success_msg = ($num_disapproved_topics == 1) ? 'TOPIC_DISAPPROVED_SUCCESS' : 'TOPICS_DISAPPROVED_SUCCESS'; +			if ($is_disapproving) +			{ +				$success_msg .= '_DISAPPROVED_SUCCESS'; +			} +			else +			{ +				$success_msg .= '_DELETED_SUCCESS'; +			}  		}  		else  		{ -			$success_msg = ($num_disapproved_posts == 1) ? 'POST_DISAPPROVED_SUCCESS' : 'POSTS_DISAPPROVED_SUCCESS'; -		} -	} -	else -	{ -		include_once($phpbb_root_path . 'includes/functions_display.' . $phpEx); +			if (!function_exists('display_reasons')) +			{ +				include($phpbb_root_path . 'includes/functions_display.' . $phpEx); +			} -		display_reasons($reason_id); +			$show_notify = false; -		$show_notify = false; +			foreach ($post_info as $post_data) +			{ +				if ($post_data['poster_id'] == ANONYMOUS) +				{ +					continue; +				} +				else +				{ +					$show_notify = true; +					break; +				} +			} -		foreach ($post_info as $post_data) -		{ -			if ($post_data['poster_id'] == ANONYMOUS) +			$l_confirm_msg = 'DISAPPROVE_POST'; +			$confirm_template = 'mcp_approve.html'; +			if ($is_disapproving)  			{ -				continue; +				display_reasons($reason_id);  			}  			else  			{ -				$show_notify = true; -				break; +				$user->add_lang('posting'); + +				$l_confirm_msg = 'DELETE_POST_PERMANENTLY'; +				$confirm_template = 'confirm_delete_body.html';  			} +			$l_confirm_msg .= ((sizeof($post_id_list) == 1) ? '' : 'S'); + +			$template->assign_vars(array( +				'S_NOTIFY_POSTER'	=> $show_notify, +				'S_APPROVE'			=> false, +				'REASON'			=> ($is_disapproving) ? $reason : '', +				'ADDITIONAL_MSG'	=> $additional_msg, +			)); + +			confirm_box(false, $l_confirm_msg, $s_hidden_fields, $confirm_template);  		} -		$template->assign_vars(array( -			'S_NOTIFY_POSTER'	=> $show_notify, -			'S_APPROVE'			=> false, -			'REASON'			=> $reason, -			'ADDITIONAL_MSG'	=> $additional_msg) -		); +		$redirect = $request->variable('redirect', "index.$phpEx"); +		$redirect = reapply_sid($redirect); -		confirm_box(false, 'DISAPPROVE_POST' . ((sizeof($post_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html'); -	} +		if (!$success_msg) +		{ +			redirect($redirect); +		} +		else +		{ +			$message = $user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>'); -	$redirect = request_var('redirect', "index.$phpEx"); -	$redirect = reapply_sid($redirect); +			if ($request->is_ajax()) +			{ +				$json_response = new phpbb_json_response; +				$json_response->send(array( +					'MESSAGE_TITLE'		=> $user->lang['INFORMATION'], +					'MESSAGE_TEXT'		=> $message, +					'REFRESH_DATA'		=> null, +					'visible'			=> false, +				)); +			} -	if (!$success_msg) -	{ -		redirect($redirect); -	} -	else -	{ -		meta_refresh(3, $redirect); -		trigger_error($user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>')); +			meta_refresh(3, $redirect); +			trigger_error($message); +		}  	}  } - -?>
\ No newline at end of file | 
