From 5881a24faa95adad2016840b7ead66c1564d36a6 Mon Sep 17 00:00:00 2001
From: mrgoldy <gijsmartens1@gmail.com>
Date: Mon, 9 Mar 2020 23:33:59 +0100
Subject: [PATCH] [ticket/15609] MCP Queue and Report forum and topic
 identifiers

PHPBB3-15609
---
 phpBB/includes/mcp/mcp_queue.php                 | 8 ++++++--
 phpBB/includes/mcp/mcp_reports.php               | 7 ++++++-
 phpBB/styles/prosilver/template/mcp_reports.html | 8 +++++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index dec583f6f4..7f8719c392 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -370,8 +370,9 @@ class mcp_queue
 				$topic_id = $request->variable('t', 0);
 				$forum_info = array();
 
-				/* @var $pagination \phpbb\pagination */
-				$pagination = $phpbb_container->get('pagination');
+				// If 'sort' is set, "Go" was pressed which is located behind the forums <select> box
+				// Then, unset the topic id so it does not override the forum id
+				$topic_id = $request->is_set_post('sort') ? 0 : $topic_id;
 
 				if ($topic_id)
 				{
@@ -651,6 +652,9 @@ class mcp_queue
 				}
 				unset($rowset, $forum_names);
 
+				/* @var \phpbb\pagination $pagination */
+				$pagination = $phpbb_container->get('pagination');
+
 				$base_url = $this->u_action . "&amp;f=$forum_id&amp;st=$sort_days&amp;sk=$sort_key&amp;sd=$sort_dir";
 				$pagination->generate_template_pagination($base_url, 'pagination', 'start', $total, $config['topics_per_page'], $start);
 
diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index 4600257344..273d029cac 100644
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -337,6 +337,11 @@ class mcp_reports
 			case 'reports_closed':
 				$topic_id = $request->variable('t', 0);
 
+				if ($request->is_set_post('t'))
+				{
+					$topic_id = $request->variable('t', 0, false, \phpbb\request\request_interface::POST);
+				}
+
 				$forum_info = array();
 				$forum_list_reports = get_forum_list('m_report', false, true);
 				$forum_list_read = array_flip(get_forum_list('f_read', true, true)); // Flipped so we can isset() the forum IDs
@@ -412,7 +417,7 @@ class mcp_reports
 				$forum_options = '<option value="0"' . (($forum_id == 0) ? ' selected="selected"' : '') . '>' . $user->lang['ALL_FORUMS'] . '</option>';
 				foreach ($forum_list_reports as $row)
 				{
-					$forum_options .= '<option value="' . $row['forum_id'] . '"' . (($forum_id == $row['forum_id']) ? ' selected="selected"' : '') . '>' . str_repeat('&nbsp; &nbsp;', $row['padding']) . $row['forum_name'] . '</option>';
+					$forum_options .= '<option value="' . $row['forum_id'] . '"' . (($forum_id == $row['forum_id']) ? ' selected="selected"' : '') . '>' . str_repeat('&nbsp; &nbsp;', $row['padding']) . truncate_string($row['forum_name'], 30, 255, false, $user->lang('ELLIPSIS')) . '</option>';
 					$forum_data[$row['forum_id']] = $row;
 				}
 				unset($forum_list_reports);
diff --git a/phpBB/styles/prosilver/template/mcp_reports.html b/phpBB/styles/prosilver/template/mcp_reports.html
index e7e0a5c9ba..9777ed76d0 100644
--- a/phpBB/styles/prosilver/template/mcp_reports.html
+++ b/phpBB/styles/prosilver/template/mcp_reports.html
@@ -81,7 +81,13 @@
 
 		<div class="action-bar bottom">
 			<!-- INCLUDE display_options.html -->
-			<!-- IF TOPIC_ID --><label><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" onClick="document.getElementById('mcp').submit()" /> <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF -->
+			<!-- IF TOPIC_ID -->
+				<label>
+					<input type="hidden" name="t" value="0">
+					<input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" onClick="document.getElementById('mcp').submit()" />
+					<strong>{L_ONLY_TOPIC}</strong>
+				</label>
+			<!-- ENDIF -->
 
 			<div class="pagination">
 				{TOTAL_REPORTS}