[Phpbb-checkins] r9950 - in /branches/phpBB-3_0_0/phpBB/includes: acp/acp_logs.php mcp/mcp_logs.php mcp/mcp_notes.php

[Jim W. <ter...@ph...>]

Author: terrafrost
Date: Mon Aug 10 17:04:44 2009
New Revision: 9950

Log:
- filtered logs weren't correctly paginated

Modified:
    branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php
    branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_logs.php
    branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_notes.php

Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php Mon Aug 10 17:04:44 2009
***************
*** 106,111 ****
--- 106,112 ----
  		$sql_sort = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
  
  		$log_operation = request_var('log_operation', '');
+ 		$log_operation_param = !empty($log_operation) ? '&log_operation=' . urlencode(htmlspecialchars_decode($log_operation)) : '';
  		$s_lang_keys = '<option value="">' . $user->lang['SHOW_ALL_OPERATIONS'] . '</option>';
  
  		switch ($mode)
***************
*** 213,219 ****
  			'U_ACTION'		=> $this->u_action,
  
  			'S_ON_PAGE'		=> on_page($log_count, $config['topics_per_page'], $start),
! 			'PAGINATION'	=> generate_pagination($this->u_action . "&amp;$u_sort_param", $log_count, $config['topics_per_page'], $start, true),
  
  			'S_LIMIT_DAYS'	=> $s_limit_days,
  			'S_SORT_KEY'	=> $s_sort_key,
--- 214,220 ----
  			'U_ACTION'		=> $this->u_action,
  
  			'S_ON_PAGE'		=> on_page($log_count, $config['topics_per_page'], $start),
! 			'PAGINATION'	=> generate_pagination($this->u_action . "&amp;$u_sort_param$log_operation_param", $log_count, $config['topics_per_page'], $start, true),
  
  			'S_LIMIT_DAYS'	=> $s_limit_days,
  			'S_SORT_KEY'	=> $s_sort_key,

Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_logs.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_logs.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_logs.php Mon Aug 10 17:04:44 2009
***************
*** 165,170 ****
--- 165,171 ----
  		$sql_sort = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
  
  		$log_operation = request_var('log_operation', '');
+ 		$log_operation_param = !empty($log_operation) ? '&amp;log_operation=' . urlencode(htmlspecialchars_decode($log_operation)) : '';
  		$s_lang_keys = '<option value="">' . $user->lang['SHOW_ALL_OPERATIONS'] . '</option>';
  
  		if ($topic_id)
***************
*** 223,229 ****
  		$template->assign_vars(array(
  			'PAGE_NUMBER'		=> on_page($log_count, $config['topics_per_page'], $start),
  			'TOTAL'				=> ($log_count == 1) ? $user->lang['TOTAL_LOG'] : sprintf($user->lang['TOTAL_LOGS'], $log_count),
! 			'PAGINATION'		=> generate_pagination($this->u_action . "&amp;$u_sort_param", $log_count, $config['topics_per_page'], $start),
  
  			'L_TITLE'			=> $user->lang['MCP_LOGS'],
  
--- 224,230 ----
  		$template->assign_vars(array(
  			'PAGE_NUMBER'		=> on_page($log_count, $config['topics_per_page'], $start),
  			'TOTAL'				=> ($log_count == 1) ? $user->lang['TOTAL_LOG'] : sprintf($user->lang['TOTAL_LOGS'], $log_count),
! 			'PAGINATION'		=> generate_pagination($this->u_action . "&amp;$u_sort_param$log_operation_param", $log_count, $config['topics_per_page'], $start),
  
  			'L_TITLE'			=> $user->lang['MCP_LOGS'],
  

Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_notes.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_notes.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_notes.php Mon Aug 10 17:04:44 2009
***************
*** 194,199 ****
--- 194,200 ----
  		$sql_sort = $sort_by_sql[$sk] . ' ' . (($sd == 'd') ? 'DESC' : 'ASC');
  
  		$log_operation = request_var('log_operation', '');
+ 		$log_operation_param = !empty($log_operation) ? '&amp;log_operation=' . urlencode(htmlspecialchars_decode($log_operation)) : '';
  		$s_lang_keys = '<option value="">' . $user->lang['SHOW_ALL_OPERATIONS'] . '</option>';
  
  		$sql = "SELECT DISTINCT log_operation
***************
*** 243,249 ****
  			'L_TITLE'			=> $user->lang['MCP_NOTES_USER'],
  
  			'PAGE_NUMBER'		=> on_page($log_count, $config['posts_per_page'], $start),
! 			'PAGINATION'		=> generate_pagination($this->u_action . "&amp;st=$st&amp;sk=$sk&amp;sd=$sd", $log_count, $config['posts_per_page'], $start),
  			'TOTAL_REPORTS'		=> ($log_count == 1) ? $user->lang['LIST_REPORT'] : sprintf($user->lang['LIST_REPORTS'], $log_count),
  
  			'RANK_TITLE'		=> $rank_title,
--- 244,250 ----
  			'L_TITLE'			=> $user->lang['MCP_NOTES_USER'],
  
  			'PAGE_NUMBER'		=> on_page($log_count, $config['posts_per_page'], $start),
! 			'PAGINATION'		=> generate_pagination($this->u_action . "&amp;st=$st&amp;sk=$sk&amp;sd=$sd$log_operation_param", $log_count, $config['posts_per_page'], $start),
  			'TOTAL_REPORTS'		=> ($log_count == 1) ? $user->lang['LIST_REPORT'] : sprintf($user->lang['LIST_REPORTS'], $log_count),
  
  			'RANK_TITLE'		=> $rank_title,