1 files changed, 35 insertions, 34 deletions
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index 6b2e9266b3..9f6125f256 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package mcp
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* 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.
 *
 */
 
@@ -18,7 +22,6 @@ if (!defined('IN_PHPBB'))
 /**
 * mcp_main
 * Handling mcp actions
-* @package mcp
 */
 class mcp_main
 {
@@ -120,7 +123,7 @@ class mcp_main
 					trigger_error('NO_TOPIC_SELECTED');
 				}
 
-				mcp_delete_topic($topic_ids, $soft_delete, ($soft_delete) ? $request->variable('delete_reason', '', true) : '');
+				mcp_delete_topic($topic_ids, $soft_delete, $request->variable('delete_reason', '', true));
 			break;
 
 			case 'delete_post':
@@ -137,7 +140,7 @@ class mcp_main
 					trigger_error('NO_POST_SELECTED');
 				}
 
-				mcp_delete_post($post_ids, $soft_delete, ($soft_delete) ? $request->variable('delete_reason', '', true) : '');
+				mcp_delete_post($post_ids, $soft_delete, $request->variable('delete_reason', '', true));
 			break;
 
 			case 'restore_topic':
@@ -184,7 +187,7 @@ class mcp_main
 
 				$forum_id = request_var('f', 0);
 
-				$forum_info = get_forum_data($forum_id, 'm_', true);
+				$forum_info = phpbb_get_forum_data($forum_id, 'm_', true);
 
 				if (!sizeof($forum_info))
 				{
@@ -249,7 +252,7 @@ function lock_unlock($action, $ids)
 
 	$orig_ids = $ids;
 
-	if (!check_ids($ids, $table, $sql_id, array('m_lock')))
+	if (!phpbb_check_ids($ids, $table, $sql_id, array('m_lock')))
 	{
 		// Make sure that for f_user_lock only the lock action is triggered.
 		if ($action != 'lock')
@@ -259,7 +262,7 @@ function lock_unlock($action, $ids)
 
 		$ids = $orig_ids;
 
-		if (!check_ids($ids, $table, $sql_id, array('f_user_lock')))
+		if (!phpbb_check_ids($ids, $table, $sql_id, array('f_user_lock')))
 		{
 			return;
 		}
@@ -283,7 +286,7 @@ function lock_unlock($action, $ids)
 			WHERE ' . $db->sql_in_set($sql_id, $ids);
 		$db->sql_query($sql);
 
-		$data = ($action == 'lock' || $action == 'unlock') ? get_topic_data($ids) : get_post_data($ids);
+		$data = ($action == 'lock' || $action == 'unlock') ? phpbb_get_topic_data($ids) : phpbb_get_post_data($ids);
 
 		foreach ($data as $id => $row)
 		{
@@ -343,7 +346,7 @@ function change_topic_type($action, $topic_ids)
 		break;
 	}
 
-	$forum_id = check_ids($topic_ids, TOPICS_TABLE, 'topic_id', $check_acl, true);
+	$forum_id = phpbb_check_ids($topic_ids, TOPICS_TABLE, 'topic_id', $check_acl, true);
 
 	if ($forum_id === false)
 	{
@@ -385,7 +388,7 @@ function change_topic_type($action, $topic_ids)
 
 		if (sizeof($topic_ids))
 		{
-			$data = get_topic_data($topic_ids);
+			$data = phpbb_get_topic_data($topic_ids);
 
 			foreach ($data as $topic_id => $row)
 			{
@@ -419,7 +422,7 @@ function mcp_move_topic($topic_ids)
 	global $phpEx, $phpbb_root_path;
 
 	// Here we limit the operation to one forum only
-	$forum_id = check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_move'), true);
+	$forum_id = phpbb_check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_move'), true);
 
 	if ($forum_id === false)
 	{
@@ -439,7 +442,7 @@ function mcp_move_topic($topic_ids)
 
 	if ($to_forum_id)
 	{
-		$forum_data = get_forum_data($to_forum_id, 'f_post');
+		$forum_data = phpbb_get_forum_data($to_forum_id, 'f_post');
 
 		if (!sizeof($forum_data))
 		{
@@ -476,7 +479,7 @@ function mcp_move_topic($topic_ids)
 
 	if (confirm_box(true))
 	{
-		$topic_data = get_topic_data($topic_ids);
+		$topic_data = phpbb_get_topic_data($topic_ids);
 		$leave_shadow = (isset($_POST['move_leave_shadow'])) ? true : false;
 
 		$forum_sync_data = array();
@@ -493,11 +496,11 @@ function mcp_move_topic($topic_ids)
 			{
 				$topics_moved++;
 			}
-			elseif ($topic_info['topic_visibility'] == ITEM_UNAPPROVED || $topic_info['topic_visibility'] == ITEM_REAPPROVE)
+			else if ($topic_info['topic_visibility'] == ITEM_UNAPPROVED || $topic_info['topic_visibility'] == ITEM_REAPPROVE)
 			{
 				$topics_moved_unapproved++;
 			}
-			elseif ($topic_info['topic_visibility'] == ITEM_DELETED)
+			else if ($topic_info['topic_visibility'] == ITEM_DELETED)
 			{
 				$topics_moved_softdeleted++;
 			}
@@ -564,7 +567,7 @@ function mcp_move_topic($topic_ids)
 					'topic_last_poster_id'	=>	(int) $row['topic_last_poster_id'],
 					'topic_last_poster_colour'=>(string) $row['topic_last_poster_colour'],
 					'topic_last_poster_name'=>	(string) $row['topic_last_poster_name'],
-					'topic_last_post_subject'=>	(string)  $row['topic_last_post_subject'],
+					'topic_last_post_subject'=>	(string) $row['topic_last_post_subject'],
 					'topic_last_post_time'	=>	(int) $row['topic_last_post_time'],
 					'topic_last_view_time'	=>	(int) $row['topic_last_view_time'],
 					'topic_moved_id'		=>	(int) $row['topic_id'],
@@ -674,7 +677,7 @@ function mcp_restore_topic($topic_ids)
 {
 	global $auth, $user, $db, $phpEx, $phpbb_root_path, $request, $phpbb_container;
 
-	if (!check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_approve')))
+	if (!phpbb_check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_approve')))
 	{
 		return;
 	}
@@ -694,7 +697,7 @@ function mcp_restore_topic($topic_ids)
 	{
 		$success_msg = (sizeof($topic_ids) == 1) ? 'TOPIC_RESTORED_SUCCESS' : 'TOPICS_RESTORED_SUCCESS';
 
-		$data = get_topic_data($topic_ids);
+		$data = phpbb_get_topic_data($topic_ids);
 
 		$phpbb_content_visibility = $phpbb_container->get('content.visibility');
 		foreach ($data as $topic_id => $row)
@@ -747,7 +750,7 @@ function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = ''
 {
 	global $auth, $user, $db, $phpEx, $phpbb_root_path, $request, $phpbb_container;
 
-	if (!check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_delete')))
+	if (!phpbb_check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_delete')))
 	{
 		return;
 	}
@@ -767,7 +770,7 @@ function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = ''
 	{
 		$success_msg = (sizeof($topic_ids) == 1) ? 'TOPIC_DELETED_SUCCESS' : 'TOPICS_DELETED_SUCCESS';
 
-		$data = get_topic_data($topic_ids);
+		$data = phpbb_get_topic_data($topic_ids);
 
 		foreach ($data as $topic_id => $row)
 		{
@@ -784,12 +787,12 @@ function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = ''
 					$return = $phpbb_content_visibility->set_topic_visibility(ITEM_DELETED, $topic_id, $row['forum_id'], $user->data['user_id'], time(), $soft_delete_reason);
 					if (!empty($return))
 					{
-						add_log('mod', $row['forum_id'], $topic_id, 'LOG_SOFTDELETE_TOPIC', $row['topic_title'], $row['topic_first_poster_name']);
+						add_log('mod', $row['forum_id'], $topic_id, 'LOG_SOFTDELETE_TOPIC', $row['topic_title'], $row['topic_first_poster_name'], $soft_delete_reason);
 					}
 				}
 				else
 				{
-					add_log('mod', $row['forum_id'], $topic_id, 'LOG_DELETE_TOPIC', $row['topic_title'], $row['topic_first_poster_name']);
+					add_log('mod', $row['forum_id'], $topic_id, 'LOG_DELETE_TOPIC', $row['topic_title'], $row['topic_first_poster_name'], $soft_delete_reason);
 				}
 			}
 		}
@@ -823,7 +826,6 @@ function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = ''
 			'S_TOPIC_MODE'			=> true,
 			'S_ALLOWED_DELETE'		=> $auth->acl_get('m_delete', $forum_id),
 			'S_ALLOWED_SOFTDELETE'	=> $auth->acl_get('m_softdelete', $forum_id),
-			'S_DELETE_REASON'		=> $auth->acl_get('m_softdelete', $forum_id),
 		));
 
 		$l_confirm = (sizeof($topic_ids) == 1) ? 'DELETE_TOPIC' : 'DELETE_TOPICS';
@@ -876,7 +878,7 @@ function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '',
 {
 	global $auth, $user, $db, $phpEx, $phpbb_root_path, $request, $phpbb_container;
 
-	if (!check_ids($post_ids, POSTS_TABLE, 'post_id', array('m_softdelete')))
+	if (!phpbb_check_ids($post_ids, POSTS_TABLE, 'post_id', array('m_softdelete')))
 	{
 		return;
 	}
@@ -894,7 +896,7 @@ function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '',
 
 	if (confirm_box(true) && $is_soft)
 	{
-		$post_info = get_post_data($post_ids);
+		$post_info = phpbb_get_post_data($post_ids);
 
 		$topic_info = $approve_log = array();
 
@@ -944,7 +946,7 @@ function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '',
 		foreach ($approve_log as $row)
 		{
 			$post_username = ($row['poster_id'] == ANONYMOUS && !empty($row['post_username'])) ? $row['post_username'] : $row['username'];
-			add_log('mod', $row['forum_id'], $row['topic_id'], 'LOG_SOFTDELETE_POST', $row['post_subject'], $post_username);
+			add_log('mod', $row['forum_id'], $row['topic_id'], 'LOG_SOFTDELETE_POST', $row['post_subject'], $post_username, $soft_delete_reason);
 		}
 
 		$topic_id = $request->variable('t', 0);
@@ -982,12 +984,12 @@ function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '',
 		$affected_topics = sizeof($topic_id_list);
 		$db->sql_freeresult($result);
 
-		$post_data = get_post_data($post_ids);
+		$post_data = phpbb_get_post_data($post_ids);
 
 		foreach ($post_data as $id => $row)
 		{
 			$post_username = ($row['poster_id'] == ANONYMOUS && !empty($row['post_username'])) ? $row['post_username'] : $row['username'];
-			add_log('mod', $row['forum_id'], $row['topic_id'], 'LOG_DELETE_POST', $row['post_subject'], $post_username);
+			add_log('mod', $row['forum_id'], $row['topic_id'], 'LOG_DELETE_POST', $row['post_subject'], $post_username, $soft_delete_reason);
 		}
 
 		// Now delete the posts, topics and forums are automatically resync'ed
@@ -1060,7 +1062,6 @@ function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '',
 			'S_SOFTDELETED'			=> $only_softdeleted,
 			'S_ALLOWED_DELETE'		=> $auth->acl_get('m_delete', $forum_id),
 			'S_ALLOWED_SOFTDELETE'	=> $auth->acl_get('m_softdelete', $forum_id),
-			'S_DELETE_REASON'		=> $auth->acl_get('m_softdelete', $forum_id),
 		));
 
 		$l_confirm = (sizeof($post_ids) == 1) ? 'DELETE_POST' : 'DELETE_POSTS';
@@ -1104,7 +1105,7 @@ function mcp_fork_topic($topic_ids)
 	global $auth, $user, $db, $template, $config;
 	global $phpEx, $phpbb_root_path;
 
-	if (!check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_')))
+	if (!phpbb_check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_')))
 	{
 		return;
 	}
@@ -1123,7 +1124,7 @@ function mcp_fork_topic($topic_ids)
 
 	if ($to_forum_id)
 	{
-		$forum_data = get_forum_data($to_forum_id, 'f_post');
+		$forum_data = phpbb_get_forum_data($to_forum_id, 'f_post');
 
 		if (!sizeof($topic_ids))
 		{
@@ -1160,7 +1161,7 @@ function mcp_fork_topic($topic_ids)
 
 	if (confirm_box(true))
 	{
-		$topic_data = get_topic_data($topic_ids, 'f_post');
+		$topic_data = phpbb_get_topic_data($topic_ids, 'f_post');
 
 		$total_topics = $total_topics_unapproved = $total_topics_softdeleted = 0;
 		$total_posts = $total_posts_unapproved = $total_posts_softdeleted = 0;