diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-03-28 22:10:03 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-03-28 22:10:03 +0200 |
| commit | 2edf7056f0ebb797dd82896eb08ad6ccb8906a45 (patch) | |
| tree | 0488048e377af56c478d9880ab9fb347b47d7541 /phpBB/includes | |
| parent | 827ded82b8110fd2c587d9d7c84731ee7215b166 (diff) | |
| download | forums-2edf7056f0ebb797dd82896eb08ad6ccb8906a45.tar forums-2edf7056f0ebb797dd82896eb08ad6ccb8906a45.tar.gz forums-2edf7056f0ebb797dd82896eb08ad6ccb8906a45.tar.bz2 forums-2edf7056f0ebb797dd82896eb08ad6ccb8906a45.tar.xz forums-2edf7056f0ebb797dd82896eb08ad6ccb8906a45.zip | |
[ticket/8116] Add pagination for IP tables on post info
Diff from previous patch by nickvergessen.
PHPBB3-8116
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/mcp/mcp_post.php | 128 |
1 files changed, 121 insertions, 7 deletions
diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php index 2dcfcd608b..88f6381023 100644 --- a/phpBB/includes/mcp/mcp_post.php +++ b/phpBB/includes/mcp/mcp_post.php @@ -24,10 +24,13 @@ if (!defined('IN_PHPBB')) */ function mcp_post_details($id, $mode, $action) { - global $phpEx, $phpbb_root_path, $config; - global $template, $db, $user, $auth, $cache; + global $phpEx, $phpbb_root_path, $config, $request; + global $template, $db, $user, $auth, $cache, $phpbb_container; global $phpbb_dispatcher; + /** @var \phpbb\pagination $pagination */ + $pagination = $phpbb_container->get('pagination'); + $user->add_lang('posting'); $post_id = request_var('p', 0); @@ -355,7 +358,8 @@ function mcp_post_details($id, $mode, $action) // Get IP if ($auth->acl_get('m_info', $post_info['forum_id'])) { - $rdns_ip_num = request_var('rdns', ''); + $rdns_ip_num = $request->variable('rdns', ''); + $start_users = $request->variable('start_users', 0); if ($rdns_ip_num != 'all') { @@ -364,16 +368,26 @@ function mcp_post_details($id, $mode, $action) ); } + $num_users = false; + if ($start_users) + { + $num_users = phpbb_get_num_posters_for_ip($db, $post_info['poster_ip']); + $start_users = $pagination->validate_start($start_users, $config['posts_per_page'], $num_users); + } + // Get other users who've posted under this IP $sql = 'SELECT poster_id, COUNT(poster_id) as postings FROM ' . POSTS_TABLE . " WHERE poster_ip = '" . $db->sql_escape($post_info['poster_ip']) . "' GROUP BY poster_id - ORDER BY postings DESC"; - $result = $db->sql_query($sql); + ORDER BY postings DESC, poster_id ASC"; + $result = $db->sql_query_limit($sql, $config['posts_per_page'], $start_users); + $users = 0; while ($row = $db->sql_fetchrow($result)) { + $users++; + // Fill the user select list with users who have posted under this IP if ($row['poster_id'] != $post_info['poster_id']) { @@ -382,6 +396,23 @@ function mcp_post_details($id, $mode, $action) } $db->sql_freeresult($result); + if ($users == $config['posts_per_page'] || $start_users) + { + if ($num_users === false) + { + $num_users = phpbb_get_num_posters_for_ip($db, $post_info['poster_ip']); + } + + $pagination->generate_template_pagination( + $url . '&i=main&mode=post_details', + 'pagination', + 'start_users', + $num_users, + $config['posts_per_page'], + $start_users + ); + } + if (sizeof($users_ary)) { // Get the usernames @@ -415,16 +446,26 @@ function mcp_post_details($id, $mode, $action) // A compound index on poster_id, poster_ip (posts table) would help speed up this query a lot, // but the extra size is only valuable if there are persons having more than a thousands posts. // This is better left to the really really big forums. + $start_ips = $request->variable('start_ips', 0); + + $num_ips = false; + if ($start_ips) + { + $num_ips = phpbb_get_num_ips_for_poster($db, $post_info['poster_id']); + $start_ips = $pagination->validate_start($start_ips, $config['posts_per_page'], $num_ips); + } $sql = 'SELECT poster_ip, COUNT(poster_ip) AS postings FROM ' . POSTS_TABLE . ' WHERE poster_id = ' . $post_info['poster_id'] . " GROUP BY poster_ip - ORDER BY postings DESC"; - $result = $db->sql_query($sql); + ORDER BY postings DESC, poster_ip ASC"; + $result = $db->sql_query_limit($sql, $config['posts_per_page'], $start_ips); + $ips = 0; while ($row = $db->sql_fetchrow($result)) { + $ips++; $hostname = (($rdns_ip_num == $row['poster_ip'] || $rdns_ip_num == 'all') && $row['poster_ip']) ? @gethostbyaddr($row['poster_ip']) : ''; $template->assign_block_vars('iprow', array( @@ -439,6 +480,23 @@ function mcp_post_details($id, $mode, $action) } $db->sql_freeresult($result); + if ($ips == $config['posts_per_page'] || $start_ips) + { + if ($num_ips === false) + { + $num_ips = phpbb_get_num_ips_for_poster($db, $post_info['poster_id']); + } + + $pagination->generate_template_pagination( + $url . '&i=main&mode=post_details', + 'pagination_ips', + 'start_ips', + $num_ips, + $config['posts_per_page'], + $start_ips + ); + } + $user_select = ''; if (sizeof($usernames_ary)) @@ -457,6 +515,62 @@ function mcp_post_details($id, $mode, $action) } /** + * Get the number of posters for a given ip + * + * @param \phpbb\db\driver\driver_interface $db + * @param string $poster_ip + * @return int + */ +function phpbb_get_num_posters_for_ip(\phpbb\db\driver\driver_interface $db, $poster_ip) +{ + if ($db->get_sql_layer() == 'sqlite' || $db->get_sql_layer() == 'sqlite3') + { + $sql = 'SELECT COUNT(poster_id) as num_users + FROM (SELECT DISTINCT poster_id'; + } + else + { + $sql = 'SELECT COUNT(DISTINCT poster_id) as num_users'; + } + + $sql .= ' FROM ' . POSTS_TABLE . " + WHERE poster_ip = '" . $db->sql_escape($poster_ip) . "'"; + $result = $db->sql_query($sql); + $num_users = (int) $db->sql_fetchfield('num_users'); + $db->sql_freeresult($result); + + return $num_users; +} + +/** + * Get the number of ips for a given poster + * + * @param \phpbb\db\driver\driver_interface $db + * @param int $poster_id + * @return int + */ +function phpbb_get_num_ips_for_poster(\phpbb\db\driver\driver_interface $db, $poster_id) +{ + if ($db->get_sql_layer() == 'sqlite' || $db->get_sql_layer() == 'sqlite3') + { + $sql = 'SELECT COUNT(poster_ip) as num_ips + FROM (SELECT DISTINCT poster_ip'; + } + else + { + $sql = 'SELECT COUNT(DISTINCT poster_ip) as num_ips'; + } + + $sql .= ' FROM ' . POSTS_TABLE . ' + WHERE poster_id = ' . (int) $poster_id; + $result = $db->sql_query($sql); + $num_ips = (int) $db->sql_fetchfield('num_ips'); + $db->sql_freeresult($result); + + return $num_ips; +} + +/** * Change a post's poster */ function change_poster(&$post_info, $userdata) |