aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-09-01 11:21:42 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-09-01 11:21:42 +0000
commitd65ccbde11efe8dba2b4cdf838903938399cd045 (patch)
tree6ec0976ec8ef9653ac82f1c1d6b9b139675b1538 /phpBB/includes
parent139f1d35302fc675b5e972e55c62d36cbc42af5c (diff)
downloadforums-d65ccbde11efe8dba2b4cdf838903938399cd045.tar
forums-d65ccbde11efe8dba2b4cdf838903938399cd045.tar.gz
forums-d65ccbde11efe8dba2b4cdf838903938399cd045.tar.bz2
forums-d65ccbde11efe8dba2b4cdf838903938399cd045.tar.xz
forums-d65ccbde11efe8dba2b4cdf838903938399cd045.zip
adjust inactive users list on ACP index to act like the new inactive users list from r9845
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10081 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/acp/acp_main.php19
1 files changed, 16 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php
index 815a55b5a9..cd83c52e01 100644
--- a/phpBB/includes/acp/acp_main.php
+++ b/phpBB/includes/acp/acp_main.php
@@ -540,6 +540,8 @@ class acp_main
if ($auth->acl_get('a_user'))
{
+ $user->add_lang('memberlist');
+
$inactive = array();
$inactive_count = 0;
@@ -549,13 +551,24 @@ class acp_main
{
$template->assign_block_vars('inactive', array(
'INACTIVE_DATE' => $user->format_date($row['user_inactive_time']),
+ 'REMINDED_DATE' => $user->format_date($row['user_reminded_time']),
'JOINED' => $user->format_date($row['user_regdate']),
'LAST_VISIT' => (!$row['user_lastvisit']) ? ' - ' : $user->format_date($row['user_lastvisit']),
+
'REASON' => $row['inactive_reason'],
'USER_ID' => $row['user_id'],
- 'USERNAME' => $row['username'],
- 'U_USER_ADMIN' => append_sid("{$phpbb_admin_path}index.$phpEx", "i=users&amp;mode=overview&amp;u={$row['user_id']}"))
- );
+ 'POSTS' => ($row['user_posts']) ? $row['user_posts'] : 0,
+ 'REMINDED' => $row['user_reminded'],
+
+ 'REMINDED_EXPLAIN' => $user->lang('USER_LAST_REMINDED', (int) $row['user_reminded'], $user->format_date($row['user_reminded_time'])),
+
+ 'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour'], false, append_sid("{$phpbb_admin_path}index.$phpEx", 'i=users&amp;mode=overview')),
+ 'USERNAME' => get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']),
+ 'USER_COLOR' => get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']),
+
+ 'U_USER_ADMIN' => append_sid("{$phpbb_admin_path}index.$phpEx", "i=users&amp;mode=overview&amp;u={$row['user_id']}"),
+ 'U_SEARCH_USER' => ($auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", "author_id={$row['user_id']}&amp;sr=posts") : '',
+ ));
}
$option_ary = array('activate' => 'ACTIVATE', 'delete' => 'DELETE');