From ae1cb0316e6c19d62f0579e9cef52f11df081bcf Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 24 Dec 2006 13:11:54 +0000
Subject: some fixes today - most important change is the consolidation of the
 display attachment functions; merging them together to have one function we
 need to call.

git-svn-id: file:///svn/phpbb/trunk@6803 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/mcp/mcp_queue.php | 12 ++++++------
 phpBB/includes/mcp/mcp_topic.php | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes/mcp')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 3fd7e6d856..48756c640e 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -50,11 +50,11 @@ class mcp_queue
 
 				if ($action == 'approve')
 				{
-					approve_post($post_id_list, $mode);
+					approve_post($post_id_list, 'queue', $mode);
 				}
 				else
 				{
-					disapprove_post($post_id_list, $mode);
+					disapprove_post($post_id_list, 'queue', $mode);
 				}
 
 			break;
@@ -372,7 +372,7 @@ class mcp_queue
 /**
 * Approve Post/Topic
 */
-function approve_post($post_id_list, $mode)
+function approve_post($post_id_list, $id, $mode)
 {
 	global $db, $template, $user, $config;
 	global $phpEx, $phpbb_root_path;
@@ -386,7 +386,7 @@ function approve_post($post_id_list, $mode)
 	$success_msg = '';
 
 	$s_hidden_fields = build_hidden_fields(array(
-		'i'				=> 'queue',
+		'i'				=> $id,
 		'mode'			=> $mode,
 		'post_id_list'	=> $post_id_list,
 		'action'		=> 'approve',
@@ -617,7 +617,7 @@ function approve_post($post_id_list, $mode)
 /**
 * Disapprove Post/Topic
 */
-function disapprove_post($post_id_list, $mode)
+function disapprove_post($post_id_list, $id, $mode)
 {
 	global $db, $template, $user, $config;
 	global $phpEx, $phpbb_root_path;
@@ -633,7 +633,7 @@ function disapprove_post($post_id_list, $mode)
 	$success_msg = $additional_msg = '';
 
 	$s_hidden_fields = build_hidden_fields(array(
-		'i'				=> 'queue',
+		'i'				=> $id,
 		'mode'			=> $mode,
 		'post_id_list'	=> $post_id_list,
 		'action'		=> 'disapprove',
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index bc0d18afbd..4ad8efeda3 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -57,6 +57,21 @@ function mcp_topic_view($id, $mode, $action)
 		$subject = $topic_info['topic_title'];
 	}
 
+	// Approve posts?
+	if ($action == 'approve' && $auth->acl_get('m_approve', $topic_info['forum_id']))
+	{
+		include($phpbb_root_path . 'includes/mcp/mcp_queue.' . $phpEx);
+		include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
+		include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
+
+		if (!sizeof($post_id_list))
+		{
+			trigger_error('NO_POST_SELECTED');
+		}
+
+		approve_post($post_id_list, $id, $mode);
+	}
+
 	// Jumpbox, sort selects and that kind of things
 	make_jumpbox($url . "&amp;i=$id&amp;mode=forum_view", $topic_info['forum_id'], false, 'm_');
 	$where_sql = ($action == 'reports') ? 'WHERE post_reported = 1 AND ' : 'WHERE';
-- 
cgit v1.2.1