makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/15609] MCP Queue and Report forum and topic identifiers

Browse source 
PHPBB3-15609
This commit is contained in:
mrgoldy 2020-03-09 23:33:59 +01:00
parent 0a089c8656
commit 5881a24faa
3 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/includes/mcp/mcp_queue.php
View file

@ -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);

7
phpBB/includes/mcp/mcp_reports.php
View file

@ -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);

8
phpBB/styles/prosilver/template/mcp_reports.html
View file

@ -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}