|
From: Jim W. <ter...@ph...> - 2009-08-21 21:48:09
|
Author: terrafrost
Date: Fri Aug 21 22:47:19 2009
New Revision: 10041
Log:
- replaced the drop down menu log filter thing with log searching
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/acp_logs.html
branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php
branches/phpBB-3_0_0/phpBB/includes/db/dbal.php
branches/phpBB-3_0_0/phpBB/includes/functions_admin.php
branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_logs.php
branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_notes.php
branches/phpBB-3_0_0/phpBB/includes/utf/utf_tools.php
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_logs.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_notes_user.html
branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_logs.html
branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_notes_user.html
Modified: branches/phpBB-3_0_0/phpBB/adm/style/acp_logs.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/acp_logs.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/acp_logs.html Fri Aug 21 22:47:19 2009
***************
*** 9,15 ****
<form id="list" method="post" action="{U_ACTION}">
<fieldset class="display-options" style="float: left">
! {L_SELECT_LANG_KEY}: <select name="log_operation">{S_LANG_KEYS}</select> <input type="submit" class="button2" name="filter" value="{L_FILTER}" />
</fieldset>
<!-- IF PAGINATION -->
--- 9,15 ----
<form id="list" method="post" action="{U_ACTION}">
<fieldset class="display-options" style="float: left">
! {L_SEARCH_KEYWORDS}: <input type="text" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
</fieldset>
<!-- IF PAGINATION -->
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 Fri Aug 21 22:47:19 2009
***************
*** 105,191 ****
$sql_where = ($sort_days) ? (time() - ($sort_days * 86400)) : 0;
$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)
! {
! case 'admin':
! $log_type = LOG_ADMIN;
! $sql_forum = '';
! break;
!
! case 'mod':
! $log_type = LOG_MOD;
!
! if ($topic_id)
! {
! $sql_forum = 'AND topic_id = ' . intval($topic_id);
! }
! else if (is_array($forum_id))
! {
! $sql_forum = 'AND ' . $db->sql_in_set('forum_id', array_map('intval', $forum_id));
! }
! else
! {
! $sql_forum = ($forum_id) ? 'AND forum_id = ' . intval($forum_id) : '';
! }
! break;
!
! case 'user':
! $log_type = LOG_USERS;
! $sql_forum = 'AND reportee_id = ' . (int) $user_id;
! break;
!
! case 'users':
! $log_type = LOG_USERS;
! $sql_forum = '';
! break;
!
! case 'critical':
! $log_type = LOG_CRITICAL;
! $sql_forum = '';
! break;
!
! default:
! return;
! }
!
! $sql = "SELECT DISTINCT log_operation
! FROM " . LOG_TABLE . "
! WHERE log_type = $log_type
! " . (($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);
$l_title = $user->lang['ACP_' . strtoupper($mode) . '_LOGS'];
$l_title_explain = $user->lang['ACP_' . strtoupper($mode) . '_LOGS_EXPLAIN'];
--- 105,112 ----
$sql_where = ($sort_days) ? (time() - ($sort_days * 86400)) : 0;
$sql_sort = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
! $keywords = utf8_normalize_nfc(request_var('keywords', '', true));
! $keywords_param = !empty($keywords) ? '&keywords=' . urlencode(htmlspecialchars_decode($keywords)) : '';
$l_title = $user->lang['ACP_' . strtoupper($mode) . '_LOGS'];
$l_title_explain = $user->lang['ACP_' . strtoupper($mode) . '_LOGS_EXPLAIN'];
***************
*** 206,212 ****
// Grab log data
$log_data = array();
$log_count = 0;
! view_log($mode, $log_data, $log_count, $config['topics_per_page'], $start, $forum_id, 0, 0, $sql_where, $sql_sort, $log_operation);
$template->assign_vars(array(
'L_TITLE' => $l_title,
--- 127,133 ----
// Grab log data
$log_data = array();
$log_count = 0;
! view_log($mode, $log_data, $log_count, $config['topics_per_page'], $start, $forum_id, 0, 0, $sql_where, $sql_sort, $keywords);
$template->assign_vars(array(
'L_TITLE' => $l_title,
***************
*** 214,226 ****
'U_ACTION' => $this->u_action,
'S_ON_PAGE' => on_page($log_count, $config['topics_per_page'], $start),
! 'PAGINATION' => generate_pagination($this->u_action . "&$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,
'S_SORT_DIR' => $s_sort_dir,
'S_LANG_KEYS' => $s_lang_keys,
'S_CLEARLOGS' => $auth->acl_get('a_clearlogs'),
)
);
--- 135,148 ----
'U_ACTION' => $this->u_action,
'S_ON_PAGE' => on_page($log_count, $config['topics_per_page'], $start),
! 'PAGINATION' => generate_pagination($this->u_action . "&$u_sort_param$keywords_param", $log_count, $config['topics_per_page'], $start, true),
'S_LIMIT_DAYS' => $s_limit_days,
'S_SORT_KEY' => $s_sort_key,
'S_SORT_DIR' => $s_sort_dir,
'S_LANG_KEYS' => $s_lang_keys,
'S_CLEARLOGS' => $auth->acl_get('a_clearlogs'),
+ 'S_KEYWORDS' => $keywords,
)
);
Modified: branches/phpBB-3_0_0/phpBB/includes/db/dbal.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/db/dbal.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/db/dbal.php Fri Aug 21 22:47:19 2009
***************
*** 235,242 ****
*/
function sql_like_expression($expression)
{
! $expression = str_replace(array('_', '%'), array("\_", "\%"), $expression);
! $expression = str_replace(array(chr(0) . "\_", chr(0) . "\%"), array('_', '%'), $expression);
return $this->_sql_like_expression('LIKE \'' . $this->sql_escape($expression) . '\'');
}
--- 235,242 ----
*/
function sql_like_expression($expression)
{
! $expression = utf8_str_replace(array('_', '%'), array("\_", "\%"), $expression);
! $expression = utf8_str_replace(array(chr(0) . "\_", chr(0) . "\%"), array('_', '%'), $expression);
return $this->_sql_like_expression('LIKE \'' . $this->sql_escape($expression) . '\'');
}
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_admin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_admin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_admin.php Fri Aug 21 22:47:19 2009
***************
*** 338,350 ****
return false;
}
! // Check if source forum exists
$sql = 'SELECT forum_name
FROM ' . FORUMS_TABLE . '
WHERE forum_id = ' . $src_forum_id;
$result = $db->sql_query($sql);
$src_forum_name = $db->sql_fetchfield('forum_name');
- $db->sql_freeresult($result);
// Source forum doesn't exist
if (empty($src_forum_name))
--- 338,349 ----
return false;
}
! // Check if source forums exists
$sql = 'SELECT forum_name
FROM ' . FORUMS_TABLE . '
WHERE forum_id = ' . $src_forum_id;
$result = $db->sql_query($sql);
$src_forum_name = $db->sql_fetchfield('forum_name');
// Source forum doesn't exist
if (empty($src_forum_name))
***************
*** 358,364 ****
WHERE ' . $db->sql_in_set('forum_id', $dest_forum_ids);
$result = $db->sql_query($sql);
- $dest_forum_ids = $dest_forum_names = array();
while ($row = $db->sql_fetchrow($result))
{
$dest_forum_ids[] = (int) $row['forum_id'];
--- 357,362 ----
***************
*** 2497,2503 ****
/**
* View log
*/
! function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $limit_days = 0, $sort_by = 'l.log_time DESC', $log_operation = '')
{
global $db, $user, $auth, $phpEx, $phpbb_root_path, $phpbb_admin_path;
--- 2495,2501 ----
/**
* View log
*/
! function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $limit_days = 0, $sort_by = 'l.log_time DESC', $keywords = '')
{
global $db, $user, $auth, $phpEx, $phpbb_root_path, $phpbb_admin_path;
***************
*** 2548,2559 ****
return;
}
$sql = "SELECT l.*, u.username, u.username_clean, u.user_colour
FROM " . LOG_TABLE . " l, " . USERS_TABLE . " u
WHERE l.log_type = $log_type
AND u.user_id = l.user_id
! " . (($limit_days) ? "AND l.log_time >= $limit_days" : '') .
! (!empty($log_operation) ? " AND l.log_operation = '" . $db->sql_escape($log_operation) . "'" : '') . "
$sql_forum
ORDER BY $sort_by";
$result = $db->sql_query_limit($sql, $limit, $offset);
--- 2546,2585 ----
return;
}
+ $keywords = preg_split('#[\s+\-|*()]+#u', utf8_strtolower(preg_quote($keywords, '#')), 0, PREG_SPLIT_NO_EMPTY);
+ $sql_keywords = '';
+
+ if (!empty($keywords))
+ {
+ $keywords_pattern = '#' . implode('|', $keywords) . '#ui';
+ for ($i = 0, $num_keywords = sizeof($keywords); $i < $num_keywords; $i++)
+ {
+ $keywords[$i] = $db->sql_like_expression($db->any_char . $keywords[$i] . $db->any_char);
+ }
+
+ $operations = array();
+ foreach ($user->lang as $key=>$value)
+ {
+ if (substr($key, 0, 4) == 'LOG_' && preg_match($keywords_pattern, $value))
+ {
+ $operations[] = $key;
+ }
+ }
+
+ $sql_keywords = 'AND (';
+ if (!empty($operations))
+ {
+ $sql_keywords.= $db->sql_in_set('l.log_operation', $operations) . ' OR ';
+ }
+ $sql_keywords.= 'LOWER(l.log_data) ' . implode(' OR LOWER(l.log_data) ', $keywords) . ')';
+ }
+
$sql = "SELECT l.*, u.username, u.username_clean, u.user_colour
FROM " . LOG_TABLE . " l, " . USERS_TABLE . " u
WHERE l.log_type = $log_type
AND u.user_id = l.user_id
! " . (($limit_days) ? "AND l.log_time >= $limit_days" : '') . "
! $sql_keywords
$sql_forum
ORDER BY $sort_by";
$result = $db->sql_query_limit($sql, $limit, $offset);
***************
*** 2718,2725 ****
$sql = 'SELECT COUNT(l.log_id) AS total_entries
FROM ' . LOG_TABLE . " l
WHERE l.log_type = $log_type
! AND l.log_time >= $limit_days " .
! (!empty($log_operation) ? "AND l.log_operation = '" . $db->sql_escape($log_operation) . "'" : '') . "
$sql_forum";
$result = $db->sql_query($sql);
$log_count = (int) $db->sql_fetchfield('total_entries');
--- 2744,2751 ----
$sql = 'SELECT COUNT(l.log_id) AS total_entries
FROM ' . LOG_TABLE . " l
WHERE l.log_type = $log_type
! AND l.log_time >= $limit_days
! $sql_keywords
$sql_forum";
$result = $db->sql_query($sql);
$log_count = (int) $db->sql_fetchfield('total_entries');
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 Fri Aug 21 22:47:19 2009
***************
*** 164,230 ****
$sql_where = ($sort_days) ? (time() - ($sort_days * 86400)) : 0;
$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>';
!
! if ($topic_id)
! {
! $sql_forum = 'AND topic_id = ' . intval($topic_id);
! }
! else if (is_array($forum_id))
! {
! $sql_forum = 'AND ' . $db->sql_in_set('forum_id', array_map('intval', $forum_id));
! }
! else
! {
! $sql_forum = ($forum_id) ? 'AND forum_id = ' . intval($forum_id) : '';
! }
!
! $sql = "SELECT DISTINCT log_operation
! FROM " . LOG_TABLE . '
! WHERE log_type = ' . LOG_MOD . '
! ' . (($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);
// Grab log data
$log_data = array();
$log_count = 0;
! view_log('mod', $log_data, $log_count, $config['topics_per_page'], $start, $forum_list, $topic_id, 0, $sql_where, $sql_sort, $log_operation);
$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 . "&$u_sort_param$log_operation_param", $log_count, $config['topics_per_page'], $start),
'L_TITLE' => $user->lang['MCP_LOGS'],
--- 164,181 ----
$sql_where = ($sort_days) ? (time() - ($sort_days * 86400)) : 0;
$sql_sort = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
! $keywords = utf8_normalize_nfc(request_var('keywords', '', true));
! $keywords_param = !empty($keywords) ? '&keywords=' . urlencode(htmlspecialchars_decode($keywords)) : '';
// Grab log data
$log_data = array();
$log_count = 0;
! view_log('mod', $log_data, $log_count, $config['topics_per_page'], $start, $forum_list, $topic_id, 0, $sql_where, $sql_sort, $keywords);
$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 . "&$u_sort_param$log_operation_param$keywords_param", $log_count, $config['topics_per_page'], $start, true),
'L_TITLE' => $user->lang['MCP_LOGS'],
***************
*** 235,240 ****
--- 186,192 ----
'S_SELECT_SORT_DAYS' => $s_limit_days,
'S_LANG_KEYS' => $s_lang_keys,
'S_LOGS' => ($log_count > 0),
+ 'S_KEYWORDS' => $keywords,
)
);
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 Fri Aug 21 22:47:19 2009
***************
*** 193,221 ****
$sql_where = ($st) ? (time() - ($st * 86400)) : 0;
$sql_sort = $sort_by_sql[$sk] . ' ' . (($sd == '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>';
!
! $sql = "SELECT DISTINCT log_operation
! FROM " . LOG_TABLE . '
! WHERE log_type = ' . LOG_USERS .
! (($limit_days) ? " AND log_time >= $sql_where" : '');
! $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);
$log_data = array();
$log_count = 0;
! view_log('user', $log_data, $log_count, $config['posts_per_page'], $start, 0, 0, $user_id, $sql_where, $sql_sort, $log_operation);
if ($log_count)
{
--- 193,204 ----
$sql_where = ($st) ? (time() - ($st * 86400)) : 0;
$sql_sort = $sort_by_sql[$sk] . ' ' . (($sd == 'd') ? 'DESC' : 'ASC');
! $keywords = utf8_normalize_nfc(request_var('keywords', '', true));
! $keywords_param = !empty($keywords) ? '&keywords=' . urlencode(htmlspecialchars_decode($keywords)) : '';
$log_data = array();
$log_count = 0;
! view_log('user', $log_data, $log_count, $config['posts_per_page'], $start, 0, 0, $user_id, $sql_where, $sql_sort, $keywords);
if ($log_count)
{
***************
*** 240,250 ****
'S_SELECT_SORT_KEY' => $s_sort_key,
'S_SELECT_SORT_DAYS' => $s_limit_days,
'S_LANG_KEYS' => $s_lang_keys,
'L_TITLE' => $user->lang['MCP_NOTES_USER'],
'PAGE_NUMBER' => on_page($log_count, $config['posts_per_page'], $start),
! 'PAGINATION' => generate_pagination($this->u_action . "&st=$st&sk=$sk&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,
--- 223,234 ----
'S_SELECT_SORT_KEY' => $s_sort_key,
'S_SELECT_SORT_DAYS' => $s_limit_days,
'S_LANG_KEYS' => $s_lang_keys,
+ 'S_KEYWORDS' => $keywords,
'L_TITLE' => $user->lang['MCP_NOTES_USER'],
'PAGE_NUMBER' => on_page($log_count, $config['posts_per_page'], $start),
! 'PAGINATION' => generate_pagination($this->u_action . "&$u_sort_param$keywords_param", $log_count, $config['topics_per_page'], $start, true),
'TOTAL_REPORTS' => ($log_count == 1) ? $user->lang['LIST_REPORT'] : sprintf($user->lang['LIST_REPORTS'], $log_count),
'RANK_TITLE' => $rank_title,
Modified: branches/phpBB-3_0_0/phpBB/includes/utf/utf_tools.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/utf/utf_tools.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/utf/utf_tools.php Fri Aug 21 22:47:19 2009
***************
*** 1945,1948 ****
--- 1945,1995 ----
return $filename;
}
+ /**
+ * UTF8-safe str_replace() function
+ *
+ * @param string $search The value to search for
+ * @param string $replace The replacement string
+ * @param string $subject The target string
+ * @return string The resultant string
+ */
+ function utf8_str_replace($search, $replace, $subject)
+ {
+ if (!is_array($search))
+ {
+ $search = array($search);
+ if (is_array($replace))
+ {
+ $replace = (string) $replace;
+ trigger_error('Array to string conversion', E_USER_NOTICE);
+ }
+ }
+
+ $length = sizeof($search);
+
+ if (!is_array($replace))
+ {
+ $replace = array_fill(0, $length, $replace);
+ }
+ else
+ {
+ $replace = array_pad($replace, $length, '');
+ }
+
+ for ($i = 0; $i < $length; $i++)
+ {
+ $search_length = utf8_strlen($search[$i]);
+ $replace_length = utf8_strlen($replace[$i]);
+
+ $offset = 0;
+ while (($start = utf8_strpos($subject, $search[$i], $offset)) !== false)
+ {
+ $subject = utf8_substr($subject, 0, $start) . $replace[$i] . utf8_substr($subject, $start + $search_length);
+ $offset = $start + $replace_length;
+ }
+ }
+
+ return $subject;
+ }
+
?>
\ No newline at end of file
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_logs.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_logs.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_logs.html Fri Aug 21 22:47:19 2009
***************
*** 9,15 ****
<ul class="linklist">
<li class="leftside">
! {L_SELECT_LANG_KEY}: <select name="log_operation">{S_LANG_KEYS}</select> <input type="submit" class="button2" name="filter" value="{L_FILTER}" />
</li>
<li class="rightside pagination">
<!-- IF TOTAL -->{TOTAL} <!-- ENDIF -->
--- 9,15 ----
<ul class="linklist">
<li class="leftside">
! {L_SEARCH_KEYWORDS}: <input type="text" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
</li>
<li class="rightside pagination">
<!-- IF TOTAL -->{TOTAL} <!-- ENDIF -->
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_notes_user.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_notes_user.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_notes_user.html Fri Aug 21 22:47:19 2009
***************
*** 52,58 ****
<ul class="linklist">
<li class="leftside">
! {L_SELECT_LANG_KEY}: <select name="log_operation">{S_LANG_KEYS}</select> <input type="submit" class="button2" name="filter" value="{L_FILTER}" />
</li>
<li class="rightside pagination">
<!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS} <!-- ENDIF -->
--- 52,58 ----
<ul class="linklist">
<li class="leftside">
! {L_SEARCH_KEYWORDS}: <input type="text" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
</li>
<li class="rightside pagination">
<!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS} <!-- ENDIF -->
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_logs.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_logs.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_logs.html Fri Aug 21 22:47:19 2009
***************
*** 22,28 ****
</tr>
<!-- END log -->
<tr align="center">
! <td class="row3" colspan="<!-- IF S_CLEAR_ALLOWED -->5<!-- ELSE -->4<!-- ENDIF -->"><span class="gensmall">{L_SELECT_LANG_KEY}:</span> <select name="log_operation">{S_LANG_KEYS}</select> <input type="submit" class="button2" name="filter" value="{L_FILTER}" /></td>
</tr>
<tr align="center">
<td class="row3" colspan="<!-- IF S_CLEAR_ALLOWED -->5<!-- ELSE -->4<!-- ENDIF -->"><span class="gensmall">{L_DISPLAY_LOG}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" value="{L_GO}" name="sort" /></td>
--- 22,28 ----
</tr>
<!-- END log -->
<tr align="center">
! <td class="row3" colspan="<!-- IF S_CLEAR_ALLOWED -->5<!-- ELSE -->4<!-- ENDIF -->"><span class="gensmall">{L_SEARCH_KEYWORDS}:</span> <input type="text" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" /></td>
</tr>
<tr align="center">
<td class="row3" colspan="<!-- IF S_CLEAR_ALLOWED -->5<!-- ELSE -->4<!-- ENDIF -->"><span class="gensmall">{L_DISPLAY_LOG}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" value="{L_GO}" name="sort" /></td>
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_notes_user.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_notes_user.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_notes_user.html Fri Aug 21 22:47:19 2009
***************
*** 55,61 ****
<!-- IF S_USER_NOTES -->
<tr align="center">
! <td colspan="5" class="row3"><span class="gensmall">{L_SELECT_LANG_KEY}:</span> <select name="log_operation">{S_LANG_KEYS}</select> <input type="submit" class="button2" name="filter" value="{L_FILTER}" /></td>
</tr>
<tr align="center">
<td colspan="5" class="row3"><span class="gensmall">{L_DISPLAY_LOG}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}:</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" value="{L_GO}" name="sort" /></td>
--- 55,61 ----
<!-- IF S_USER_NOTES -->
<tr align="center">
! <td colspan="5" class="row3"><span class="gensmall">{L_SEARCH_KEYWORDS}:</span> <input type="text" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" /></td>
</tr>
<tr align="center">
<td colspan="5" class="row3"><span class="gensmall">{L_DISPLAY_LOG}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}:</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" value="{L_GO}" name="sort" /></td>
|