mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
Little MCP bug fixes
git-svn-id: file:///svn/phpbb/trunk@5531 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
b356ad1765
commit
ff0d7f45d7
3 changed files with 6 additions and 5 deletions
|
@ -182,8 +182,8 @@ function mcp_notes_user_view($id, $mode, $action)
|
||||||
$sort_by_text = array('a' => $user->lang['SORT_USERNAME'], 'b' => $user->lang['SORT_DATE'], 'c' => $user->lang['SORT_IP'], 'd' => $user->lang['SORT_ACTION']);
|
$sort_by_text = array('a' => $user->lang['SORT_USERNAME'], 'b' => $user->lang['SORT_DATE'], 'c' => $user->lang['SORT_IP'], 'd' => $user->lang['SORT_ACTION']);
|
||||||
$sort_by_sql = array('a' => 'l.user_id', 'b' => 'l.log_time', 'c' => 'l.log_ip', 'd' => 'l.log_operation');
|
$sort_by_sql = array('a' => 'l.user_id', 'b' => 'l.log_time', 'c' => 'l.log_ip', 'd' => 'l.log_operation');
|
||||||
|
|
||||||
$s_limit_days = $s_sort_key = $s_sort_dir = '';
|
$s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
|
||||||
gen_sort_selects($limit_days, $sort_by_text, $st, $sk, $sd, $s_limit_days, $s_sort_key, $s_sort_dir);
|
gen_sort_selects($limit_days, $sort_by_text, $st, $sk, $sd, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param);
|
||||||
|
|
||||||
// Define where and sort sql for use in displaying logs
|
// Define where and sort sql for use in displaying logs
|
||||||
$sql_where = ($st) ? (time() - ($st * 86400)) : 0;
|
$sql_where = ($st) ? (time() - ($st * 86400)) : 0;
|
||||||
|
|
|
@ -164,8 +164,8 @@ function mcp_warn_list_view($id, $mode, $action)
|
||||||
$sort_by_text = array('a' => $user->lang['SORT_USERNAME'], 'b' => $user->lang['SORT_DATE'], 'c' => $user->lang['SORT_WARNINGS']);
|
$sort_by_text = array('a' => $user->lang['SORT_USERNAME'], 'b' => $user->lang['SORT_DATE'], 'c' => $user->lang['SORT_WARNINGS']);
|
||||||
$sort_by_sql = array('a' => 'username', 'b' => 'user_last_warning', 'c' => 'user_warnings');
|
$sort_by_sql = array('a' => 'username', 'b' => 'user_last_warning', 'c' => 'user_warnings');
|
||||||
|
|
||||||
$s_limit_days = $s_sort_key = $s_sort_dir = '';
|
$s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
|
||||||
gen_sort_selects($limit_days, $sort_by_text, $st, $sk, $sd, $s_limit_days, $s_sort_key, $s_sort_dir);
|
gen_sort_selects($limit_days, $sort_by_text, $st, $sk, $sd, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param);
|
||||||
|
|
||||||
// Define where and sort sql for use in displaying logs
|
// Define where and sort sql for use in displaying logs
|
||||||
$sql_where = ($st) ? (time() - ($st * 86400)) : 0;
|
$sql_where = ($st) ? (time() - ($st * 86400)) : 0;
|
||||||
|
@ -196,7 +196,7 @@ function mcp_warn_list_view($id, $mode, $action)
|
||||||
'S_SELECT_SORT_KEY' => $s_sort_key,
|
'S_SELECT_SORT_KEY' => $s_sort_key,
|
||||||
'S_SELECT_SORT_DAYS' => $s_limit_days,
|
'S_SELECT_SORT_DAYS' => $s_limit_days,
|
||||||
|
|
||||||
'PAGE_NUMBER' => on_page($user_count, $config['topic_per_page'], $start),
|
'PAGE_NUMBER' => on_page($user_count, $config['topics_per_page'], $start),
|
||||||
'PAGINATION' => generate_pagination("mcp.$phpEx$SID&i=$id&mode=$mode&st=$st&sk=$sk&sd=$sd", $user_count, $config['topics_per_page'], $start),
|
'PAGINATION' => generate_pagination("mcp.$phpEx$SID&i=$id&mode=$mode&st=$st&sk=$sk&sd=$sd", $user_count, $config['topics_per_page'], $start),
|
||||||
'TOTAL_USERS' => ($user_count == 1) ? $user->lang['LIST_USER'] : sprintf($user->lang['LIST_USERS'], $user_count),
|
'TOTAL_USERS' => ($user_count == 1) ? $user->lang['LIST_USER'] : sprintf($user->lang['LIST_USERS'], $user_count),
|
||||||
)
|
)
|
||||||
|
|
|
@ -231,6 +231,7 @@ $lang = array_merge($lang, array(
|
||||||
'SORT_ACTION' => 'Log action',
|
'SORT_ACTION' => 'Log action',
|
||||||
'SORT_DATE' => 'Date',
|
'SORT_DATE' => 'Date',
|
||||||
'SORT_IP' => 'IP address',
|
'SORT_IP' => 'IP address',
|
||||||
|
'SORT_WARNINGS' => 'Warnings',
|
||||||
'SPLIT_AFTER' => 'Split from selected post',
|
'SPLIT_AFTER' => 'Split from selected post',
|
||||||
'SPLIT_FORUM' => 'Forum for new topic',
|
'SPLIT_FORUM' => 'Forum for new topic',
|
||||||
'SPLIT_POSTS' => 'Split selected posts',
|
'SPLIT_POSTS' => 'Split selected posts',
|
||||||
|
|
Loading…
Add table
Reference in a new issue