diff options
25 files changed, 72 insertions, 29 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index 62533b376f..db462c4010 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -1223,7 +1223,7 @@ class acp_attachments $db->sql_freeresult($result); $base_url = $this->u_action . "&$u_sort_param"; - generate_template_pagination($base_url, 'pagination', $num_files, $attachments_per_page, $start); + phpbb_generate_template_pagination($base_url, 'pagination', $num_files, $attachments_per_page, $start); $template->assign_vars(array( 'TOTAL_FILES' => $num_files, diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index 2407137012..918b9263e5 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -683,7 +683,7 @@ class acp_groups } $base_url = $this->u_action . "&action=$action&g=$group_id"; - generate_template_pagination($base_url, 'pagination', $total_members, $config['topics_per_page'], $start); + phpbb_generate_template_pagination($base_url, 'pagination', $total_members, $config['topics_per_page'], $start); $template->assign_vars(array( 'S_LIST' => true, diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php index b6f7ce18c4..e04899987c 100644 --- a/phpBB/includes/acp/acp_icons.php +++ b/phpBB/includes/acp/acp_icons.php @@ -928,7 +928,7 @@ class acp_icons } $db->sql_freeresult($result); - generate_template_pagination($this->u_action, 'pagination', $item_count, $config['smilies_per_page'], $pagination_start); + phpbb_generate_template_pagination($this->u_action, 'pagination', $item_count, $config['smilies_per_page'], $pagination_start); } /** diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index a62490f052..e2863b953e 100644 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -289,7 +289,7 @@ class acp_inactive } $base_url = $this->u_action . "&$u_sort_param&users_per_page=$per_page"; - generate_template_pagination($base_url, 'pagination', $inactive_count, $per_page, $start); + phpbb_generate_template_pagination($base_url, 'pagination', $inactive_count, $per_page, $start); $template->assign_vars(array( 'S_INACTIVE_USERS' => true, diff --git a/phpBB/includes/acp/acp_logs.php b/phpBB/includes/acp/acp_logs.php index 1ba4dfbc08..8525a28880 100644 --- a/phpBB/includes/acp/acp_logs.php +++ b/phpBB/includes/acp/acp_logs.php @@ -130,7 +130,7 @@ class acp_logs $start = view_log($mode, $log_data, $log_count, $config['topics_per_page'], $start, $forum_id, 0, 0, $sql_where, $sql_sort, $keywords); $base_url = $this->u_action . "&$u_sort_param$keywords_param"; - generate_template_pagination($base_url, 'pagination', $log_count, $config['topics_per_page'], $start); + phpbb_generate_template_pagination($base_url, 'pagination', $log_count, $config['topics_per_page'], $start); $template->assign_vars(array( 'L_TITLE' => $l_title, diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 227d566155..d73fa46fdc 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1121,7 +1121,7 @@ class acp_users $start = view_log('user', $log_data, $log_count, $config['topics_per_page'], $start, 0, 0, $user_id, $sql_where, $sql_sort); $base_url = $this->u_action . "&u=$user_id&$u_sort_param"; - generate_template_pagination($base_url, 'pagination', $log_count, $config['topics_per_page'], $start); + phpbb_generate_template_pagination($base_url, 'pagination', $log_count, $config['topics_per_page'], $start); $template->assign_vars(array( 'S_FEEDBACK' => true, @@ -2038,7 +2038,7 @@ class acp_users $db->sql_freeresult($result); $base_url = $this->u_action . "&u=$user_id&sk=$sort_key&sd=$sort_dir"; - generate_template_pagination($base_url, 'pagination', $num_attachments, $config['topics_per_page'], $start); + phpbb_generate_template_pagination($base_url, 'pagination', $num_attachments, $config['topics_per_page'], $start); $template->assign_vars(array( 'S_ATTACHMENTS' => true, diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 33b009307e..91c2242d4f 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1882,7 +1882,7 @@ function tracking_unserialize($string, $max_depth = 3) /** * Pagination routine, generates page number sequence -* To generate pagination which is rendered fully within the template use generate_template_pagination +* To generate pagination which is rendered fully within the template use phpbb_generate_template_pagination * * @param string $base_url the base url is prepended to all links generated within the function * @param int $num_items the total number of items, posts, topics, etc., used to determine the number of pages to produce @@ -1985,7 +1985,7 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add * @param bool $ignore_on_page decides whether we enable an active (unlinked) item, used primarily for embedded lists * */ -function generate_template_pagination($base_url, $block_var_name, $num_items, $per_page, $start_item = 1, $reverse_count = false, $ignore_on_page = false) +function phpbb_generate_template_pagination($base_url, $block_var_name, $num_items, $per_page, $start_item = 1, $reverse_count = false, $ignore_on_page = false) { global $template; diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 00efd281c0..15e20ab541 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -640,6 +640,49 @@ function get_forum_parents(&$forum_data) } /** +* Generate topic pagination +* @deprecated - Use phpbb_generate_template_pagination +*/ +function topic_generate_pagination($replies, $url) +{ + global $config, $user; + + // Make sure $per_page is a valid value + $per_page = ($config['posts_per_page'] <= 0) ? 1 : $config['posts_per_page']; + + if (($replies + 1) > $per_page) + { + $total_pages = ceil(($replies + 1) / $per_page); + $pagination = ''; + + $times = 1; + for ($j = 0; $j < $replies + 1; $j += $per_page) + { + $pagination .= '<a href="' . $url . ($j == 0 ? '' : '&start=' . $j) . '">' . $times . '</a>'; + if ($times == 1 && $total_pages > 5) + { + $pagination .= '<span class="page-dots"> ... </span>'; + + // Display the last three pages + $times = $total_pages - 3; + $j += ($total_pages - 4) * $per_page; + } + else if ($times < $total_pages) + { + $pagination .= '<span class="page-sep">' . $user->lang['COMMA_SEPARATOR'] . '</span>'; + } + $times++; + } + } + else + { + $pagination = ''; + } + + return $pagination; +} + +/** * Obtain list of moderators of each forum */ function get_moderators(&$forum_moderators, $forum_id = false) diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index eda8455361..c0ae8c5784 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -102,7 +102,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info) $limit_time_sql = ($sort_days) ? 'AND t.topic_last_post_time >= ' . (time() - ($sort_days * 86400)) : ''; $base_url = $url . "&i=$id&action=$action&mode=$mode&sd=$sort_dir&sk=$sort_key&st=$sort_days" . (($merge_select) ? $selected_ids : ''); - generate_template_pagination($base_url, 'pagination', $forum_topics, $topics_per_page, $start); + phpbb_generate_template_pagination($base_url, 'pagination', $forum_topics, $topics_per_page, $start); $template->assign_vars(array( 'ACTION' => $action, diff --git a/phpBB/includes/mcp/mcp_logs.php b/phpBB/includes/mcp/mcp_logs.php index 26305734ee..d8e06d9470 100644 --- a/phpBB/includes/mcp/mcp_logs.php +++ b/phpBB/includes/mcp/mcp_logs.php @@ -172,7 +172,7 @@ class mcp_logs $start = view_log('mod', $log_data, $log_count, $config['topics_per_page'], $start, $forum_list, $topic_id, 0, $sql_where, $sql_sort, $keywords); $base_url = $this->u_action . "&$u_sort_param$keywords_param"; - generate_template_pagination($base_url, 'pagination', $log_count, $config['topics_per_page'], $start); + phpbb_generate_template_pagination($base_url, 'pagination', $log_count, $config['topics_per_page'], $start); $template->assign_vars(array( 'PAGE_NUMBER' => on_page($base_url, $log_count, $config['topics_per_page'], $start), diff --git a/phpBB/includes/mcp/mcp_notes.php b/phpBB/includes/mcp/mcp_notes.php index f83db17003..02d0bd0bd8 100644 --- a/phpBB/includes/mcp/mcp_notes.php +++ b/phpBB/includes/mcp/mcp_notes.php @@ -216,7 +216,7 @@ class mcp_notes } $base_url = $this->u_action . "&$u_sort_param$keywords_param"; - generate_template_pagination($base_url, 'pagination', $log_count, $config['topics_per_page'], $start); + phpbb_generate_template_pagination($base_url, 'pagination', $log_count, $config['topics_per_page'], $start); $template->assign_vars(array( 'U_POST_ACTION' => $this->u_action, diff --git a/phpBB/includes/mcp/mcp_pm_reports.php b/phpBB/includes/mcp/mcp_pm_reports.php index b7cd2edb85..0db03681ab 100644 --- a/phpBB/includes/mcp/mcp_pm_reports.php +++ b/phpBB/includes/mcp/mcp_pm_reports.php @@ -299,7 +299,7 @@ class mcp_pm_reports } $base_url = $this->u_action . "&st=$sort_days&sk=$sort_key&sd=$sort_dir"; - generate_template_pagination($base_url, 'pagination', $total, $config['topics_per_page'], $start); + phpbb_generate_template_pagination($base_url, 'pagination', $total, $config['topics_per_page'], $start); // Now display the page $template->assign_vars(array( diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index c1998c73d3..8e06728332 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -420,7 +420,7 @@ class mcp_queue unset($rowset, $forum_names); $base_url = $this->u_action . "&f=$forum_id&st=$sort_days&sk=$sort_key&sd=$sort_dir"; - generate_template_pagination($base_url, 'pagination', $total, $config['topics_per_page'], $start); + phpbb_generate_template_pagination($base_url, 'pagination', $total, $config['topics_per_page'], $start); // Now display the page $template->assign_vars(array( diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index dd03e23380..de1f861395 100644 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -412,7 +412,7 @@ class mcp_reports } $base_url = $this->u_action . "&f=$forum_id&t=$topic_id&st=$sort_days&sk=$sort_key&sd=$sort_dir"; - generate_template_pagination($base_url, 'pagination', $total, $config['topics_per_page'], $start); + phpbb_generate_template_pagination($base_url, 'pagination', $total, $config['topics_per_page'], $start); // Now display the page $template->assign_vars(array( diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php index e4f796f781..d8a66f9a04 100644 --- a/phpBB/includes/mcp/mcp_topic.php +++ b/phpBB/includes/mcp/mcp_topic.php @@ -309,7 +309,7 @@ function mcp_topic_view($id, $mode, $action) $base_url = append_sid("{$phpbb_root_path}mcp.$phpEx", "i=$id&t={$topic_info['topic_id']}&mode=$mode&action=$action&to_topic_id=$to_topic_id&posts_per_page=$posts_per_page&st=$sort_days&sk=$sort_key&sd=$sort_dir"); if ($posts_per_page) { - generate_template_pagination($base_url, 'pagination', $total, $posts_per_page, $start); + phpbb_generate_template_pagination($base_url, 'pagination', $total, $posts_per_page, $start); } $template->assign_vars(array( diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php index eba300f664..b65c05202c 100644 --- a/phpBB/includes/mcp/mcp_warn.php +++ b/phpBB/includes/mcp/mcp_warn.php @@ -176,7 +176,7 @@ class mcp_warn } $base_url = append_sid("{$phpbb_root_path}mcp.$phpEx", "i=warn&mode=list&st=$st&sk=$sk&sd=$sd"); - generate_template_pagination($base_url, 'pagination', $user_count, $config['topics_per_page'], $start); + phpbb_generate_template_pagination($base_url, 'pagination', $user_count, $config['topics_per_page'], $start); $template->assign_vars(array( 'U_POST_ACTION' => $this->u_action, diff --git a/phpBB/includes/ucp/ucp_attachments.php b/phpBB/includes/ucp/ucp_attachments.php index 56a87f616f..406866a141 100644 --- a/phpBB/includes/ucp/ucp_attachments.php +++ b/phpBB/includes/ucp/ucp_attachments.php @@ -171,7 +171,7 @@ class ucp_attachments $db->sql_freeresult($result); $base_url = $this->u_action . "&sk=$sort_key&sd=$sort_dir"; - generate_template_pagination($base_url, 'pagination', $num_attachments, $config['topics_per_page'], $start); + phpbb_generate_template_pagination($base_url, 'pagination', $num_attachments, $config['topics_per_page'], $start); $template->assign_vars(array( 'PAGE_NUMBER' => on_page($base_url, $num_attachments, $config['topics_per_page'], $start), diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php index a72c7fb023..fc09307ffb 100644 --- a/phpBB/includes/ucp/ucp_groups.php +++ b/phpBB/includes/ucp/ucp_groups.php @@ -845,7 +845,7 @@ class ucp_groups } $base_url = $this->u_action . "&action=$action&g=$group_id"; - generate_template_pagination($base_url, 'pagination', $total_members, $config['topics_per_page'], $start); + phpbb_generate_template_pagination($base_url, 'pagination', $total_members, $config['topics_per_page'], $start); $template->assign_vars(array( 'S_LIST' => true, diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php index d07d838227..0c28fbecf1 100644 --- a/phpBB/includes/ucp/ucp_main.php +++ b/phpBB/includes/ucp/ucp_main.php @@ -670,7 +670,7 @@ class ucp_main if ($topics_count) { - generate_template_pagination($this->u_action, 'pagination', $topics_count, $config['topics_per_page'], $start); + phpbb_generate_template_pagination($this->u_action, 'pagination', $topics_count, $config['topics_per_page'], $start); $template->assign_vars(array( 'PAGE_NUMBER' => on_page($this->u_action, $topics_count, $config['topics_per_page'], $start), @@ -838,7 +838,7 @@ class ucp_main 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id), )); - generate_template_pagination(append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id'] . "&t=$topic_id"), 'topicrow.pagination', $replies + 1, $config['posts_per_page'], 1, true, true); + phpbb_generate_template_pagination(append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id'] . "&t=$topic_id"), 'topicrow.pagination', $replies + 1, $config['posts_per_page'], 1, true, true); } } } diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/includes/ucp/ucp_pm_viewfolder.php index 2775dc3eca..c6fd5fbea0 100644 --- a/phpBB/includes/ucp/ucp_pm_viewfolder.php +++ b/phpBB/includes/ucp/ucp_pm_viewfolder.php @@ -452,7 +452,7 @@ function get_pm_from($folder_id, $folder, $user_id) } $base_url = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=pm&mode=view&action=view_folder&f=$folder_id&$u_sort_param"); - generate_template_pagination($base_url, 'pagination', $pm_count, $config['topics_per_page'], $start); + phpbb_generate_template_pagination($base_url, 'pagination', $pm_count, $config['topics_per_page'], $start); $template->assign_vars(array( 'PAGE_NUMBER' => on_page($base_url, $pm_count, $config['topics_per_page'], $start), diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 0957763873..c11aefcc99 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1572,7 +1572,7 @@ switch ($mode) } } - generate_template_pagination($pagination_url, 'pagination', $total_users, $config['topics_per_page'], $start); + phpbb_generate_template_pagination($pagination_url, 'pagination', $total_users, $config['topics_per_page'], $start); // Generate page $template->assign_vars(array( diff --git a/phpBB/search.php b/phpBB/search.php index ac2289295c..940eb52153 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -603,7 +603,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) $phrase_search_disabled = $search->supports_phrase_search() ? false : true; } - generate_template_pagination($u_search, 'pagination', $total_match_count, $per_page, $start); + phpbb_generate_template_pagination($u_search, 'pagination', $total_match_count, $per_page, $start); $template->assign_vars(array( 'SEARCH_TITLE' => $l_search_title, @@ -1006,7 +1006,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) if ($show_results == 'topics') { - generate_template_pagination($view_topic_url, 'searchresults.pagination', $replies + 1, $config['posts_per_page'], 1, true, true); + phpbb_generate_template_pagination($view_topic_url, 'searchresults.pagination', $replies + 1, $config['posts_per_page'], 1, true, true); } } diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 676e0cae3b..71b0aa0f6b 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -591,7 +591,7 @@ if ($s_display_active) $total_topic_count = $topics_count - sizeof($global_announce_forums); $base_url = append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id" . ((strlen($u_sort_param)) ? "&$u_sort_param" : '')); -generate_template_pagination($base_url, 'pagination', $topics_count, $config['topics_per_page'], $start); +phpbb_generate_template_pagination($base_url, 'pagination', $topics_count, $config['topics_per_page'], $start); $template->assign_vars(array( 'PAGE_NUMBER' => on_page($base_url, $topics_count, $config['topics_per_page'], $start), @@ -745,7 +745,7 @@ if (sizeof($topic_list)) 'S_TOPIC_TYPE_SWITCH' => ($s_type_switch == $s_type_switch_test) ? -1 : $s_type_switch_test) ); - generate_template_pagination($view_topic_url, 'topicrow.pagination', $replies + 1, $config['posts_per_page'], 1, true, true); + phpbb_generate_template_pagination($view_topic_url, 'topicrow.pagination', $replies + 1, $config['posts_per_page'], 1, true, true); $s_type_switch = ($row['topic_type'] == POST_ANNOUNCE || $row['topic_type'] == POST_GLOBAL) ? 1 : 0; diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index 33f42a657e..2db7fa6edd 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -385,7 +385,7 @@ $db->sql_freeresult($result); meta_refresh(60, append_sid("{$phpbb_root_path}viewonline.$phpEx", "sg=$show_guests&sk=$sort_key&sd=$sort_dir&start=$start")); $base_url = append_sid("{$phpbb_root_path}viewonline.$phpEx", "sg=$show_guests&sk=$sort_key&sd=$sort_dir"); -generate_template_pagination($base_url, 'pagination', $counter, $config['topics_per_page'], $start); +phpbb_generate_template_pagination($base_url, 'pagination', $counter, $config['topics_per_page'], $start); // Send data to template $template->assign_vars(array( diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 969f6fb63e..2e197932af 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -584,7 +584,7 @@ if (!empty($_EXTRA_URL)) // If we've got a hightlight set pass it on to pagination. $base_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id" . ((strlen($u_sort_param)) ? "&$u_sort_param" : '') . (($highlight_match) ? "&hilit=$highlight" : '')); -generate_template_pagination($base_url, 'pagination', $total_posts, $config['posts_per_page'], $start); +phpbb_generate_template_pagination($base_url, 'pagination', $total_posts, $config['posts_per_page'], $start); // Send vars to template $template->assign_vars(array( |