makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-29 06:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make some adjustments to the log filter. r9781, r9800

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9858 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Chris Smith 2009-07-26 14:54:02 +00:00
parent 1a0bd316e4
commit 68e2102f20
3 changed files with 40 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
phpBB/includes/acp/acp_logs.php
View file

@ -156,14 +156,32 @@ class acp_logs
" . (($limit_days) ? "AND log_time >= $sql_where " : ' ') . " . (($limit_days) ? "AND log_time >= $sql_where " : ' ') .
$sql_forum; $sql_forum;
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
if (empty($row['log_operation'])) if (empty($row['log_operation']))
{ {
continue; continue;
} }
$selected = ($log_operation == $row['log_operation']) ? ' selected="selected"' : ''; $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>';
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); $db->sql_freeresult($result);

20
phpBB/includes/mcp/mcp_logs.php
View file

@ -186,14 +186,32 @@ class mcp_logs
' . (($limit_days) ? "AND log_time >= $sql_where " : ' ') . ' . (($limit_days) ? "AND log_time >= $sql_where " : ' ') .
$sql_forum; $sql_forum;
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
if (empty($row['log_operation'])) if (empty($row['log_operation']))
{ {
continue; continue;
} }
$selected = ($log_operation == $row['log_operation']) ? ' selected="selected"' : ''; $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>';
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); $db->sql_freeresult($result);

2
phpBB/language/en/acp/common.php
View file

@ -307,6 +307,8 @@ $lang = array_merge($lang, array(
'DISPLAY_LOG' => 'Display entries from previous', 'DISPLAY_LOG' => 'Display entries from previous',
'LOGS_PLACEHOLDER' => '&lt;value&gt;',
'NO_ENTRIES' => 'No log entries for this period.', 'NO_ENTRIES' => 'No log entries for this period.',
'SORT_IP' => 'IP address', 'SORT_IP' => 'IP address',