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

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2020-03-16 21:53:25 +01:00
commit b91dd633ae
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
phpBB/includes/mcp/mcp_post.php
View file

@ -363,14 +363,16 @@ function mcp_post_details($id, $mode, $action)
/** @var \phpbb\pagination $pagination */ /** @var \phpbb\pagination $pagination */
$pagination = $phpbb_container->get('pagination'); $pagination = $phpbb_container->get('pagination');
$rdns_ip_num = $request->variable('rdns', '');
$start_users = $request->variable('start_users', 0); $start_users = $request->variable('start_users', 0);
$rdns_ip_num = $request->variable('rdns', '');
$lookup_all = $rdns_ip_num === 'all';
if ($rdns_ip_num != 'all') $base_url = $url . '&i=main&mode=post_details';
$base_url .= $lookup_all ? '&rdns=all' : '';
if (!$lookup_all)
{ {
$template->assign_vars(array( $template->assign_var('U_LOOKUP_ALL', $base_url . '&rdns=all');
'U_LOOKUP_ALL' => "$url&i=main&mode=post_details&rdns=all")
);
} }
$num_users = false; $num_users = false;
@ -405,7 +407,7 @@ function mcp_post_details($id, $mode, $action)
} }
$pagination->generate_template_pagination( $pagination->generate_template_pagination(
$url . '&i=main&mode=post_details', $base_url,
'pagination', 'pagination',
'start_users', 'start_users',
$num_users, $num_users,
@ -475,7 +477,7 @@ function mcp_post_details($id, $mode, $action)
'NUM_POSTS' => $row['postings'], 'NUM_POSTS' => $row['postings'],
'L_POST_S' => ($row['postings'] == 1) ? $user->lang['POST'] : $user->lang['POSTS'], 'L_POST_S' => ($row['postings'] == 1) ? $user->lang['POST'] : $user->lang['POSTS'],
'U_LOOKUP_IP' => ($rdns_ip_num == $row['poster_ip'] || $rdns_ip_num == 'all') ? '' : "$url&i=$id&mode=post_details&rdns={$row['poster_ip']}#ip", 'U_LOOKUP_IP' => (!$lookup_all && $rdns_ip_num != $row['poster_ip']) ? "$base_url&start_ips={$start_ips}&rdns={$row['poster_ip']}#ip" : '',
'U_WHOIS' => append_sid("{$phpbb_root_path}mcp.$phpEx", "i=$id&mode=$mode&action=whois&p=$post_id&ip={$row['poster_ip']}")) 'U_WHOIS' => append_sid("{$phpbb_root_path}mcp.$phpEx", "i=$id&mode=$mode&action=whois&p=$post_id&ip={$row['poster_ip']}"))
); );
} }
@ -489,7 +491,7 @@ function mcp_post_details($id, $mode, $action)
} }
$pagination->generate_template_pagination( $pagination->generate_template_pagination(
$url . '&i=main&mode=post_details', $base_url,
'pagination_ips', 'pagination_ips',
'start_ips', 'start_ips',
$num_ips, $num_ips,

2
phpBB/styles/prosilver/template/mcp_post.html
View file

@ -329,9 +329,11 @@
</tbody> </tbody>
</table> </table>
{% if U_LOOKUP_ALL %}
<div class="buttons"> <div class="buttons">
<p><a href="{U_LOOKUP_ALL}#ip">{L_LOOKUP_ALL}</a></p> <p><a href="{U_LOOKUP_ALL}#ip">{L_LOOKUP_ALL}</a></p>
</div> </div>
{% endif %}
<div class="pagination"> <div class="pagination">
<ul> <ul>