[feature/pagination-as-list] Updates for nils comments

Re-remove deprecated functions, change on_page to phpbb_on_page,
add null returns, remove globals and pass as params.

PHPBB3-10968

phpBB/includes/acp/acp_attachments.php

@@ -1223,13 +1223,13 @@ class acp_attachments
 				$db->sql_freeresult($result);
 
 				$base_url = $this->u_action . "&$u_sort_param";
-				phpbb_generate_template_pagination($base_url, 'pagination', $num_files, $attachments_per_page, $start);
+				phpbb_generate_template_pagination($template, $base_url, 'pagination', $num_files, $attachments_per_page, $start);
 				
 				$template->assign_vars(array(
 					'TOTAL_FILES'		=> $num_files,
 					'TOTAL_SIZE'		=> get_formatted_filesize($total_size),
 
-					'S_ON_PAGE'			=> on_page($base_url, $num_files, $attachments_per_page, $start),
+					'S_ON_PAGE'			=> phpbb_on_page($template, $user, $base_url, $num_files, $attachments_per_page, $start),
 					'S_LIMIT_DAYS'		=> $s_limit_days,
 					'S_SORT_KEY'		=> $s_sort_key,
 					'S_SORT_DIR'		=> $s_sort_dir)

phpBB/includes/acp/acp_groups.php

@@ -683,14 +683,14 @@ class acp_groups
 				}
 
 				$base_url = $this->u_action . "&action=$action&g=$group_id";
-				phpbb_generate_template_pagination($base_url, 'pagination', $total_members, $config['topics_per_page'], $start);				
+				phpbb_generate_template_pagination($template, $base_url, 'pagination', $total_members, $config['topics_per_page'], $start);				
 				
 				$template->assign_vars(array(
 					'S_LIST'			=> true,
 					'S_GROUP_SPECIAL'	=> ($group_row['group_type'] == GROUP_SPECIAL) ? true : false,
 					'S_ACTION_OPTIONS'	=> $s_action_options,
 
-					'S_ON_PAGE'		=> on_page($base_url, $total_members, $config['topics_per_page'], $start),
+					'S_ON_PAGE'		=> phpbb_on_page($template, $user, $base_url, $total_members, $config['topics_per_page'], $start),
 					'GROUP_NAME'	=> ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name'],
 
 					'U_ACTION'			=> $this->u_action . "&g=$group_id",

phpBB/includes/acp/acp_icons.php

@@ -928,7 +928,7 @@ class acp_icons
 		}
 		$db->sql_freeresult($result);
 		
-		phpbb_generate_template_pagination($this->u_action, 'pagination', $item_count, $config['smilies_per_page'], $pagination_start);		
+		phpbb_generate_template_pagination($template, $this->u_action, 'pagination', $item_count, $config['smilies_per_page'], $pagination_start);		
 	}
 
 	/**

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";
-		phpbb_generate_template_pagination($base_url, 'pagination', $inactive_count, $per_page, $start);		
+		phpbb_generate_template_pagination($template, $base_url, 'pagination', $inactive_count, $per_page, $start);		
 		
 		$template->assign_vars(array(
 			'S_INACTIVE_USERS'		=> true,
@@ -298,7 +298,7 @@ class acp_inactive
 			'S_LIMIT_DAYS'	=> $s_limit_days,
 			'S_SORT_KEY'	=> $s_sort_key,
 			'S_SORT_DIR'	=> $s_sort_dir,
-			'S_ON_PAGE'		=> on_page($base_url, $inactive_count, $per_page, $start),
+			'S_ON_PAGE'		=> phpbb_on_page($template, $user, $base_url, $inactive_count, $per_page, $start),
 			
 			'USERS_PER_PAGE'	=> $per_page,
 

phpBB/includes/acp/acp_logs.php

@@ -130,14 +130,14 @@ 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";
-		phpbb_generate_template_pagination($base_url, 'pagination', $log_count, $config['topics_per_page'], $start);
+		phpbb_generate_template_pagination($template, $base_url, 'pagination', $log_count, $config['topics_per_page'], $start);
 		
 		$template->assign_vars(array(
 			'L_TITLE'		=> $l_title,
 			'L_EXPLAIN'		=> $l_title_explain,
 			'U_ACTION'		=> $this->u_action . "&$u_sort_param$keywords_param&start=$start",
 
-			'S_ON_PAGE'		=> on_page($base_url, $log_count, $config['topics_per_page'], $start),
+			'S_ON_PAGE'		=> phpbb_on_page($template, $user, $base_url, $log_count, $config['topics_per_page'], $start),
 
 			'S_LIMIT_DAYS'	=> $s_limit_days,
 			'S_SORT_KEY'	=> $s_sort_key,

phpBB/includes/acp/acp_users.php

@@ -1121,11 +1121,11 @@ 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";
-				phpbb_generate_template_pagination($base_url, 'pagination', $log_count, $config['topics_per_page'], $start);
+				phpbb_generate_template_pagination($template, $base_url, 'pagination', $log_count, $config['topics_per_page'], $start);
 				
 				$template->assign_vars(array(
 					'S_FEEDBACK'	=> true,
-					'S_ON_PAGE'		=> on_page($base_url, $log_count, $config['topics_per_page'], $start),
+					'S_ON_PAGE'		=> phpbb_on_page($template, $user, $base_url, $log_count, $config['topics_per_page'], $start),
 
 					'S_LIMIT_DAYS'	=> $s_limit_days,
 					'S_SORT_KEY'	=> $s_sort_key,
@@ -2038,11 +2038,11 @@ class acp_users
 				$db->sql_freeresult($result);
 
 				$base_url = $this->u_action . "&u=$user_id&sk=$sort_key&sd=$sort_dir";
-				phpbb_generate_template_pagination($base_url, 'pagination', $num_attachments, $config['topics_per_page'], $start);
+				phpbb_generate_template_pagination($template, $base_url, 'pagination', $num_attachments, $config['topics_per_page'], $start);
 				
 				$template->assign_vars(array(
 					'S_ATTACHMENTS'		=> true,
-					'S_ON_PAGE'			=> on_page($base_url, $num_attachments, $config['topics_per_page'], $start),
+					'S_ON_PAGE'			=> phpbb_on_page($template, $user, $base_url, $num_attachments, $config['topics_per_page'], $start),
 					'S_SORT_KEY'		=> $s_sort_key,
 					'S_SORT_DIR'		=> $s_sort_dir,
 				));

phpBB/includes/functions.php

@@ -1880,102 +1880,11 @@ function tracking_unserialize($string, $max_depth = 3)
 
 // Pagination functions
 
-/**
-* Pagination routine, generates page number sequence
-* 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
-* @param int $per_page the number of items, posts, topics, etc. to display per page, used to determine the number of pages to produce
-* @param int $start_item the item which should be considered currently active, used to determine the page we're on
-* @param bool $add_prevnext_text appends and prepends next and previous links (true) or not (false)
-* @param string $tpl_prefix is for using different pagination blocks at one page
-*/
-function generate_pagination($base_url, $num_items, $per_page, $start_item, $add_prevnext_text = false, $tpl_prefix = '')
-{
-	global $template, $user;
-
-	// Make sure $per_page is a valid value
-	$per_page = ($per_page <= 0) ? 1 : $per_page;
-
-	$separator = '<span class="page-sep">' . $user->lang['COMMA_SEPARATOR'] . '</span>';
-	$total_pages = ceil($num_items / $per_page);
-
-	if ($total_pages == 1 || !$num_items)
-	{
-		return false;
-	}
-
-	$on_page = floor($start_item / $per_page) + 1;
-	$url_delim = (strpos($base_url, '?') === false) ? '?' : ((strpos($base_url, '?') === strlen($base_url) - 1) ? '' : '&amp;');
-
-	$page_string = ($on_page == 1) ? '<strong>1</strong>' : '<a href="' . $base_url . '">1</a>';
-
-	if ($total_pages > 5)
-	{
-		$start_cnt = min(max(1, $on_page - 4), $total_pages - 5);
-		$end_cnt = max(min($total_pages, $on_page + 4), 6);
-
-		$page_string .= ($start_cnt > 1) ? '<span class="page-dots"> ... </span>' : $separator;
-
-		for ($i = $start_cnt + 1; $i < $end_cnt; $i++)
-		{
-			$page_string .= ($i == $on_page) ? '<strong>' . $i . '</strong>' : '<a href="' . $base_url . "{$url_delim}start=" . (($i - 1) * $per_page) . '">' . $i . '</a>';
-			if ($i < $end_cnt - 1)
-			{
-				$page_string .= $separator;
-			}
-		}
-
-		$page_string .= ($end_cnt < $total_pages) ? '<span class="page-dots"> ... </span>' : $separator;
-	}
-	else
-	{
-		$page_string .= $separator;
-
-		for ($i = 2; $i < $total_pages; $i++)
-		{
-			$page_string .= ($i == $on_page) ? '<strong>' . $i . '</strong>' : '<a href="' . $base_url . "{$url_delim}start=" . (($i - 1) * $per_page) . '">' . $i . '</a>';
-			if ($i < $total_pages)
-			{
-				$page_string .= $separator;
-			}
-		}
-	}
-
-	$page_string .= ($on_page == $total_pages) ? '<strong>' . $total_pages . '</strong>' : '<a href="' . $base_url . "{$url_delim}start=" . (($total_pages - 1) * $per_page) . '">' . $total_pages . '</a>';
-
-	if ($add_prevnext_text)
-	{
-		if ($on_page != 1)
-		{
-			$page_string = '<a href="' . $base_url . "{$url_delim}start=" . (($on_page - 2) * $per_page) . '">' . $user->lang['PREVIOUS'] . '</a>&nbsp;&nbsp;' . $page_string;
-		}
-
-		if ($on_page != $total_pages)
-		{
-			$page_string .= '&nbsp;&nbsp;<a href="' . $base_url . "{$url_delim}start=" . ($on_page * $per_page) . '">' . $user->lang['NEXT'] . '</a>';
-		}
-	}
-
-	$template->assign_vars(array(
-		$tpl_prefix . 'BASE_URL'		=> $base_url,
-		'A_' . $tpl_prefix . 'BASE_URL'	=> addslashes($base_url),
-		$tpl_prefix . 'PER_PAGE'		=> $per_page,
-
-		$tpl_prefix . 'PREVIOUS_PAGE'	=> ($on_page == 1) ? '' : $base_url . "{$url_delim}start=" . (($on_page - 2) * $per_page),
-		$tpl_prefix . 'NEXT_PAGE'		=> ($on_page == $total_pages) ? '' : $base_url . "{$url_delim}start=" . ($on_page * $per_page),
-		$tpl_prefix . 'TOTAL_PAGES'		=> $total_pages,
-		$tpl_prefix . 'CURRENT_PAGE'	=> $on_page,
-	));
-
-	return $page_string;
-}
-
 /**
 * Generate template rendered pagination
 * Allows full control of rendering of pagination with the template
 *
+* @param object $template the template object
 * @param string $base_url is url prepended to all links generated within the function
 * @param string $block_var_name is the name assigned to the pagination data block within the template (example: <!-- BEGIN pagination -->)
 * @param int $num_items the total number of items, posts, etc., used to determine the number of pages to produce
@@ -1983,12 +1892,10 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add
 * @param int $start_item the item which should be considered currently active, used to determine the page we're on
 * @param bool $reverse_count determines whether we weight display of the list towards the start (false) or end (true) of the list
 * @param bool $ignore_on_page decides whether we enable an active (unlinked) item, used primarily for embedded lists
-* 
+* @return null
 */
-function phpbb_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($template, $base_url, $block_var_name, $num_items, $per_page, $start_item = 1, $reverse_count = false, $ignore_on_page = false)
 {
-	global $template;
-
 	// Make sure $per_page is a valid value
 	$per_page = ($per_page <= 0) ? 1 : $per_page;
 	$total_pages = ceil($num_items / $per_page);
@@ -2098,16 +2005,16 @@ function phpbb_generate_template_pagination($base_url, $block_var_name, $num_ite
 * Return current page 
 * This function also sets certain specific template variables
 *
+* @param object $template the template object
+* @param object $user the user object
 * @param string $base_url the base url used to call this page, used by Javascript for popup jump to page
 * @param int $num_items the total number of items, posts, topics, etc.
 * @param int $per_page the number of items, posts, etc. per page
 * @param int $start the item which should be considered currently active, used to determine the page we're on
-* 
+* @return null
 */
-function on_page($base_url, $num_items, $per_page, $start)
+function phpbb_on_page($template, $user, $base_url, $num_items, $per_page, $start)
 {
-	global $template, $user;
-
 	// Make sure $per_page is a valid value
 	$per_page = ($per_page <= 0) ? 1 : $per_page;
 

phpBB/includes/functions_display.php

@@ -639,49 +639,6 @@ function get_forum_parents(&$forum_data)
 	return $forum_parents;
 }
 
-/**
-* 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 ? '' : '&amp;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
 */

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 : '');
-	phpbb_generate_template_pagination($base_url, 'pagination', $forum_topics, $topics_per_page, $start);
+	phpbb_generate_template_pagination($template, $base_url, 'pagination', $forum_topics, $topics_per_page, $start);
 	
 	$template->assign_vars(array(
 		'ACTION'				=> $action,
@@ -132,7 +132,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 
 		'S_MCP_ACTION'			=> $url . "&i=$id&forum_action=$action&mode=$mode&start=$start" . (($merge_select) ? $selected_ids : ''),
 
-		'PAGE_NUMBER'			=> on_page($base_url, $forum_topics, $topics_per_page, $start),
+		'PAGE_NUMBER'			=> phpbb_on_page($template, $user, $base_url, $forum_topics, $topics_per_page, $start),
 		'TOTAL_TOPICS'			=> $user->lang('VIEW_FORUM_TOPICS', (int) $forum_topics),
 	));
 

phpBB/includes/mcp/mcp_logs.php

@@ -172,10 +172,10 @@ 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";
-		phpbb_generate_template_pagination($base_url, 'pagination', $log_count, $config['topics_per_page'], $start);		
+		phpbb_generate_template_pagination($template, $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),
+			'PAGE_NUMBER'		=> phpbb_on_page($template, $user, $base_url, $log_count, $config['topics_per_page'], $start),
 			'TOTAL'				=> $user->lang('TOTAL_LOGS', (int) $log_count),
 
 			'L_TITLE'			=> $user->lang['MCP_LOGS'],

phpBB/includes/mcp/mcp_notes.php

@@ -216,7 +216,7 @@ class mcp_notes
 		}
 
 		$base_url = $this->u_action . "&$u_sort_param$keywords_param";
-		phpbb_generate_template_pagination($base_url, 'pagination', $log_count, $config['topics_per_page'], $start);
+		phpbb_generate_template_pagination($template, $base_url, 'pagination', $log_count, $config['topics_per_page'], $start);
 		
 		$template->assign_vars(array(
 			'U_POST_ACTION'			=> $this->u_action,
@@ -228,7 +228,7 @@ class mcp_notes
 
 			'L_TITLE'			=> $user->lang['MCP_NOTES_USER'],
 
-			'PAGE_NUMBER'		=> on_page($base_url, $log_count, $config['topics_per_page'], $start),
+			'PAGE_NUMBER'		=> phpbb_on_page($template, $user, $base_url, $log_count, $config['topics_per_page'], $start),
 			'TOTAL_REPORTS'		=> $user->lang('LIST_REPORTS', (int) $log_count),
 
 			'RANK_TITLE'		=> $rank_title,

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";
-				phpbb_generate_template_pagination($base_url, 'pagination', $total, $config['topics_per_page'], $start);
+				phpbb_generate_template_pagination($template, $base_url, 'pagination', $total, $config['topics_per_page'], $start);
 				
 				// Now display the page
 				$template->assign_vars(array(
@@ -310,7 +310,7 @@ class mcp_pm_reports
 					'S_MCP_ACTION'			=> $this->u_action,
 					'S_CLOSED'				=> ($mode == 'pm_reports_closed') ? true : false,
 
-					'PAGE_NUMBER'			=> on_page($base_url, $total, $config['topics_per_page'], $start),
+					'PAGE_NUMBER'			=> phpbb_on_page($template, $user, $base_url, $total, $config['topics_per_page'], $start),
 					'TOTAL'					=> $total,
 					'TOTAL_REPORTS'			=> $user->lang('LIST_REPORTS', (int) $total),
 					)

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";
-				phpbb_generate_template_pagination($base_url, 'pagination', $total, $config['topics_per_page'], $start);
+				phpbb_generate_template_pagination($template, $base_url, 'pagination', $total, $config['topics_per_page'], $start);
 				
 				// Now display the page
 				$template->assign_vars(array(
@@ -433,7 +433,7 @@ class mcp_queue
 					'S_MCP_ACTION'			=> build_url(array('t', 'f', 'sd', 'st', 'sk')),
 					'S_TOPICS'				=> ($mode == 'unapproved_posts') ? false : true,
 
-					'PAGE_NUMBER'			=> on_page($base_url, $total, $config['topics_per_page'], $start),
+					'PAGE_NUMBER'			=> phpbb_on_page($template, $user, $base_url, $total, $config['topics_per_page'], $start),
 					'TOPIC_ID'				=> $topic_id,
 					'TOTAL'					=> $user->lang((($mode == 'unapproved_posts') ? 'VIEW_TOPIC_POSTS' : 'VIEW_FORUM_TOPICS'), (int) $total),
 				));

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";
-				phpbb_generate_template_pagination($base_url, 'pagination', $total, $config['topics_per_page'], $start);
+				phpbb_generate_template_pagination($template, $base_url, 'pagination', $total, $config['topics_per_page'], $start);
 				
 				// Now display the page
 				$template->assign_vars(array(
@@ -424,7 +424,7 @@ class mcp_reports
 					'S_FORUM_OPTIONS'		=> $forum_options,
 					'S_CLOSED'				=> ($mode == 'reports_closed') ? true : false,
 
-					'PAGE_NUMBER'			=> on_page($base_url, $total, $config['topics_per_page'], $start),
+					'PAGE_NUMBER'			=> phpbb_on_page($template, $user, $base_url, $total, $config['topics_per_page'], $start),
 					'TOPIC_ID'				=> $topic_id,
 					'TOTAL'					=> $total,
 					'TOTAL_REPORTS'			=> $user->lang('LIST_REPORTS', (int) $total),

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)
 	{
-		phpbb_generate_template_pagination($base_url, 'pagination', $total, $posts_per_page, $start);
+		phpbb_generate_template_pagination($template, $base_url, 'pagination', $total, $posts_per_page, $start);
 	}
 	
 	$template->assign_vars(array(
@@ -350,7 +350,7 @@ function mcp_topic_view($id, $mode, $action)
 		'RETURN_TOPIC'		=> sprintf($user->lang['RETURN_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f={$topic_info['forum_id']}&amp;t={$topic_info['topic_id']}&amp;start=$start") . '">', '</a>'),
 		'RETURN_FORUM'		=> sprintf($user->lang['RETURN_FORUM'], '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", "f={$topic_info['forum_id']}&amp;start=$start") . '">', '</a>'),
 
-		'PAGE_NUMBER'		=> on_page($base_url, $total, $posts_per_page, $start),
+		'PAGE_NUMBER'		=> phpbb_on_page($template, $user, $base_url, $total, $posts_per_page, $start),
 		'TOTAL_POSTS'		=> $user->lang('VIEW_TOPIC_POSTS', (int) $total),
 	));
 }

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");
-		phpbb_generate_template_pagination($base_url, 'pagination', $user_count, $config['topics_per_page'], $start);
+		phpbb_generate_template_pagination($template, $base_url, 'pagination', $user_count, $config['topics_per_page'], $start);
 		
 		$template->assign_vars(array(
 			'U_POST_ACTION'			=> $this->u_action,
@@ -185,7 +185,7 @@ class mcp_warn
 			'S_SELECT_SORT_KEY'		=> $s_sort_key,
 			'S_SELECT_SORT_DAYS'	=> $s_limit_days,
 
-			'PAGE_NUMBER'		=> on_page($base_url, $user_count, $config['topics_per_page'], $start),
+			'PAGE_NUMBER'		=> phpbb_on_page($template, $user, $base_url, $user_count, $config['topics_per_page'], $start),
 			'TOTAL_USERS'		=> $user->lang('LIST_USERS', (int) $user_count),
 		));
 	}

phpBB/includes/ucp/ucp_attachments.php

@@ -171,10 +171,10 @@ class ucp_attachments
 		$db->sql_freeresult($result);
 
 		$base_url = $this->u_action . "&sk=$sort_key&sd=$sort_dir";
-		phpbb_generate_template_pagination($base_url, 'pagination', $num_attachments, $config['topics_per_page'], $start);		
+		phpbb_generate_template_pagination($template, $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),
+			'PAGE_NUMBER'			=> phpbb_on_page($template, $user, $base_url, $num_attachments, $config['topics_per_page'], $start),
 			'TOTAL_ATTACHMENTS'		=> $num_attachments,
 
 			'L_TITLE'				=> $user->lang['UCP_ATTACHMENTS'],

phpBB/includes/ucp/ucp_groups.php

@@ -845,12 +845,12 @@ class ucp_groups
 						}
 
 						$base_url = $this->u_action . "&action=$action&g=$group_id";
-						phpbb_generate_template_pagination($base_url, 'pagination', $total_members, $config['topics_per_page'], $start);
+						phpbb_generate_template_pagination($template, $base_url, 'pagination', $total_members, $config['topics_per_page'], $start);
 						
 						$template->assign_vars(array(
 							'S_LIST'			=> true,
 							'S_ACTION_OPTIONS'	=> $s_action_options,
-							'S_ON_PAGE'			=> on_page($base_url, $total_members, $config['topics_per_page'], $start),
+							'S_ON_PAGE'			=> phpbb_on_page($template, $user, $base_url, $total_members, $config['topics_per_page'], $start),
 
 							'U_ACTION'			=> $this->u_action . "&g=$group_id",
 							'S_UCP_ACTION'		=> $this->u_action . "&g=$group_id",

phpBB/includes/ucp/ucp_main.php

@@ -670,10 +670,10 @@ class ucp_main
 
 		if ($topics_count)
 		{
-			phpbb_generate_template_pagination($this->u_action, 'pagination', $topics_count, $config['topics_per_page'], $start);
+			phpbb_generate_template_pagination($template, $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),
+				'PAGE_NUMBER'	=> phpbb_on_page($template, $user, $this->u_action, $topics_count, $config['topics_per_page'], $start),
 				'TOTAL_TOPICS'	=> $user->lang('VIEW_FORUM_TOPICS', (int) $topics_count),
 			));
 		}
@@ -838,7 +838,7 @@ class ucp_main
 				'U_VIEW_FORUM'			=> append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id),
 			));
 			
-			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);
+			phpbb_generate_template_pagination($template, 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/includes/ucp/ucp_pm_viewfolder.php

@@ -452,10 +452,10 @@ 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");
-	phpbb_generate_template_pagination($base_url, 'pagination', $pm_count, $config['topics_per_page'], $start);
+	phpbb_generate_template_pagination($template, $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),
+		'PAGE_NUMBER'		=> phpbb_on_page($template, $user, $base_url, $pm_count, $config['topics_per_page'], $start),
 		'TOTAL_MESSAGES'	=> $user->lang('VIEW_PM_MESSAGES', (int) $pm_count),
 
 		'POST_IMG'		=> (!$auth->acl_get('u_sendpm')) ? $user->img('button_topic_locked', 'POST_PM_LOCKED') : $user->img('button_pm_new', 'POST_NEW_PM'),

phpBB/memberlist.php

@@ -1572,11 +1572,11 @@ switch ($mode)
 			}
 		}
 
-		phpbb_generate_template_pagination($pagination_url, 'pagination', $total_users, $config['topics_per_page'], $start);
+		phpbb_generate_template_pagination($template, $pagination_url, 'pagination', $total_users, $config['topics_per_page'], $start);
 		
 		// Generate page
 		$template->assign_vars(array(
-			'PAGE_NUMBER'	=> on_page($pagination_url, $total_users, $config['topics_per_page'], $start),
+			'PAGE_NUMBER'	=> phpbb_on_page($template, $user, $pagination_url, $total_users, $config['topics_per_page'], $start),
 			'TOTAL_USERS'	=> $user->lang('LIST_USERS', (int) $total_users),
 
 			'PROFILE_IMG'	=> $user->img('icon_user_profile', $user->lang['PROFILE']),

phpBB/search.php

@@ -603,7 +603,7 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 		$phrase_search_disabled = $search->supports_phrase_search() ? false : true;
 	}
 
-	phpbb_generate_template_pagination($u_search, 'pagination', $total_match_count, $per_page, $start);
+	phpbb_generate_template_pagination($template, $u_search, 'pagination', $total_match_count, $per_page, $start);
 	
 	$template->assign_vars(array(
 		'SEARCH_TITLE'		=> $l_search_title,
@@ -611,7 +611,7 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 		'SEARCH_WORDS'		=> $keywords,
 		'SEARCHED_QUERY'	=> $search->search_query,
 		'IGNORED_WORDS'		=> (sizeof($search->common_words)) ? implode(' ', $search->common_words) : '',
-		'PAGE_NUMBER'		=> on_page($u_search, $total_match_count, $per_page, $start),
+		'PAGE_NUMBER'		=> phpbb_on_page($template, $user, $u_search, $total_match_count, $per_page, $start),
 
 		'PHRASE_SEARCH_DISABLED'		=> $phrase_search_disabled,
 
@@ -1006,7 +1006,7 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 			
 			if ($show_results == 'topics')
 			{
-				phpbb_generate_template_pagination($view_topic_url, 'searchresults.pagination', $replies + 1, $config['posts_per_page'], 1, true, true);
+				phpbb_generate_template_pagination($template, $view_topic_url, 'searchresults.pagination', $replies + 1, $config['posts_per_page'], 1, true, true);
 			}
 		}
 

phpBB/viewforum.php

@@ -591,10 +591,10 @@ 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" : ''));
-phpbb_generate_template_pagination($base_url, 'pagination', $topics_count, $config['topics_per_page'], $start);
+phpbb_generate_template_pagination($template, $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),
+	'PAGE_NUMBER'	=> phpbb_on_page($template, $user, $base_url, $topics_count, $config['topics_per_page'], $start),
 	'TOTAL_TOPICS'	=> ($s_display_active) ? false : $user->lang('VIEW_FORUM_TOPICS', (int) $total_topic_count),
 ));
 
@@ -745,7 +745,7 @@ if (sizeof($topic_list))
 			'S_TOPIC_TYPE_SWITCH'	=> ($s_type_switch == $s_type_switch_test) ? -1 : $s_type_switch_test)
 		);
 
-		phpbb_generate_template_pagination($view_topic_url, 'topicrow.pagination', $replies + 1, $config['posts_per_page'], 1, true, true);
+		phpbb_generate_template_pagination($template, $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;
 

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");
-phpbb_generate_template_pagination($base_url, 'pagination', $counter, $config['topics_per_page'], $start);
+phpbb_generate_template_pagination($template, $base_url, 'pagination', $counter, $config['topics_per_page'], $start);
 
 // Send data to template
 $template->assign_vars(array(
@@ -393,7 +393,7 @@ $template->assign_vars(array(
 	'TOTAL_GUEST_USERS_ONLINE'		=> $user->lang('GUEST_USERS_ONLINE', (int) $guest_counter),
 	'LEGEND'						=> $legend,
 	'PAGINATION'					=> $pagination,
-	'PAGE_NUMBER'					=> on_page($base_url, $counter, $config['topics_per_page'], $start),
+	'PAGE_NUMBER'					=> phpbb_on_page($template, $user, $base_url, $counter, $config['topics_per_page'], $start),
 
 	'U_SORT_USERNAME'		=> append_sid("{$phpbb_root_path}viewonline.$phpEx", 'sk=a&sd=' . (($sort_key == 'a' && $sort_dir == 'a') ? 'd' : 'a') . '&sg=' . ((int) $show_guests)),
 	'U_SORT_UPDATED'		=> append_sid("{$phpbb_root_path}viewonline.$phpEx", 'sk=b&sd=' . (($sort_key == 'b' && $sort_dir == 'a') ? 'd' : 'a') . '&sg=' . ((int) $show_guests)),

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" : ''));
-phpbb_generate_template_pagination($base_url, 'pagination', $total_posts, $config['posts_per_page'], $start);
+phpbb_generate_template_pagination($template, $base_url, 'pagination', $total_posts, $config['posts_per_page'], $start);
 
 // Send vars to template
 $template->assign_vars(array(
@@ -599,7 +599,7 @@ $template->assign_vars(array(
 	'TOPIC_AUTHOR_COLOUR'	=> get_username_string('colour', $topic_data['topic_poster'], $topic_data['topic_first_poster_name'], $topic_data['topic_first_poster_colour']),
 	'TOPIC_AUTHOR'			=> get_username_string('username', $topic_data['topic_poster'], $topic_data['topic_first_poster_name'], $topic_data['topic_first_poster_colour']),
 
-	'PAGE_NUMBER' 	=> on_page($base_url, $total_posts, $config['posts_per_page'], $start),
+	'PAGE_NUMBER' 	=> phpbb_on_page($template, $user, $base_url, $total_posts, $config['posts_per_page'], $start),
 	'TOTAL_POSTS'	=> $user->lang('VIEW_TOPIC_POSTS', (int) $total_posts),
 	'U_MCP' 		=> ($auth->acl_get('m_', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&mode=topic_view&f=$forum_id&t=$topic_id" . (($start == 0) ? '' : "&start=$start") . ((strlen($u_sort_param)) ? "&$u_sort_param" : ''), true, $user->session_id) : '',
 	'MODERATORS'	=> (isset($forum_moderators[$forum_id]) && sizeof($forum_moderators[$forum_id])) ? implode(', ', $forum_moderators[$forum_id]) : '',