phpbb-checkins

[Chris S. <too...@ph...>]

Author: toonarmy
Date: Sun Jul 26 15:54:02 2009
New Revision: 9858

Log:
Make some adjustments to the log filter. r9781, r9800

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/language/en/acp/common.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 Sun Jul 26 15:54:02 2009
***************
*** 156,169 ****
  				" . (($limit_days) ? "AND log_time >= $sql_where " : ' ') . 
  				$sql_forum;
  		$result = $db->sql_query($sql);
  		while ($row = $db->sql_fetchrow($result))
  		{
  			if (empty($row['log_operation']))
  			{
  				continue;
  			}
  			$selected = ($log_operation == $row['log_operation']) ? ' selected="selected"' : '';
! 			$s_lang_keys .= '<option value="' . $row['log_operation'] . '"' . $selected . '>' . htmlspecialchars(strip_tags($user->lang[$row['log_operation']]), ENT_COMPAT, 'UTF-8') . '</option>';
  		}
  		$db->sql_freeresult($result);
  
--- 156,187 ----
  				" . (($limit_days) ? "AND log_time >= $sql_where " : ' ') . 
  				$sql_forum;
  		$result = $db->sql_query($sql);
+ 
  		while ($row = $db->sql_fetchrow($result))
  		{
  			if (empty($row['log_operation']))
  			{
  				continue;
  			}
+ 
  			$selected = ($log_operation == $row['log_operation']) ? ' selected="selected"' : '';
! 
! 			if (isset($user->lang[$row['log_operation']]))
! 			{
! 				$text = htmlspecialchars(strip_tags(str_replace('<br />', ' ', $user->lang[$row['log_operation']])), ENT_COMPAT, 'UTF-8');
! 
! 				// Fill in sprintf placeholders with translated placeholder text
! 				if (substr_count($text, '%'))
! 				{
! 					$text = vsprintf($text, array_fill(0, substr_count($text, '%'), $user->lang['LOGS_PLACEHOLDER']));
! 				}
! 			}
! 			else
! 			{
! 				$text = ucfirst(str_replace('_', ' ', strtolower($row['log_operation'])));
! 			}
! 
! 			$s_lang_keys .= '<option value="' . $row['log_operation'] . '"' . $selected . '>' . $text . '</option>';
  		}
  		$db->sql_freeresult($result);
  

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 Sun Jul 26 15:54:02 2009
***************
*** 186,199 ****
  				' . (($limit_days) ? "AND log_time >= $sql_where " : ' ') . 
  				$sql_forum;
  		$result = $db->sql_query($sql);
  		while ($row = $db->sql_fetchrow($result))
  		{
  			if (empty($row['log_operation']))
  			{
  				continue;
  			}
  			$selected = ($log_operation == $row['log_operation']) ? ' selected="selected"' : '';
! 			$s_lang_keys .= '<option value="' . $row['log_operation'] . '"' . $selected . '>' . htmlspecialchars(strip_tags($user->lang[$row['log_operation']]), ENT_COMPAT, 'UTF-8') . '</option>';
  		}
  		$db->sql_freeresult($result);
  
--- 186,217 ----
  				' . (($limit_days) ? "AND log_time >= $sql_where " : ' ') . 
  				$sql_forum;
  		$result = $db->sql_query($sql);
+ 
  		while ($row = $db->sql_fetchrow($result))
  		{
  			if (empty($row['log_operation']))
  			{
  				continue;
  			}
+ 
  			$selected = ($log_operation == $row['log_operation']) ? ' selected="selected"' : '';
! 
! 			if (isset($user->lang[$row['log_operation']]))
! 			{
! 				$text = htmlspecialchars(strip_tags(str_replace('<br />', ' ', $user->lang[$row['log_operation']])), ENT_COMPAT, 'UTF-8');
! 
! 				// Fill in sprintf placeholders with translated placeholder text
! 				if (substr_count($text, '%'))
! 				{
! 					$text = vsprintf($text, array_fill(0, substr_count($text, '%'), $user->lang['LOGS_PLACEHOLDER']));
! 				}
! 			}
! 			else
! 			{
! 				$text = ucfirst(str_replace('_', ' ', strtolower($row['log_operation'])));
! 			}
! 
! 			$s_lang_keys .= '<option value="' . $row['log_operation'] . '"' . $selected . '>' . $text . '</option>';
  		}
  		$db->sql_freeresult($result);
  

Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/common.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/common.php Sun Jul 26 15:54:02 2009
***************
*** 307,312 ****
--- 307,314 ----
  
  	'DISPLAY_LOG'	=> 'Display entries from previous',
  
+ 	'LOGS_PLACEHOLDER'	=> '&lt;value&gt;',
+ 
  	'NO_ENTRIES'	=> 'No log entries for this period.',
  
  	'SORT_IP'		=> 'IP address',