diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 51cc1c8047..139dc825c1 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -214,19 +214,24 @@
{L_USERNAME} |
{L_JOINED} |
{L_INACTIVE_DATE} |
- {L_INACTIVE_REASON} |
{L_LAST_VISIT} |
+ {L_INACTIVE_REASON} |
|
- {inactive.USERNAME} |
- {inactive.JOINED} |
- {inactive.INACTIVE_DATE} |
- {inactive.REASON} |
- {inactive.LAST_VISIT} |
+
+ {inactive.USERNAME_FULL}
+ {L_POSTS}: {inactive.POSTS} [{L_SEARCH_USER_POSTS}]
+ |
+ {inactive.JOINED} |
+ {inactive.INACTIVE_DATE} |
+ {inactive.LAST_VISIT} |
+
+ {inactive.REASON}
+ {inactive.REMINDED_EXPLAIN}
|
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&mode=overview&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&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&mode=overview&u={$row['user_id']}"),
+ 'U_SEARCH_USER' => ($auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", "author_id={$row['user_id']}&sr=posts") : '',
+ ));
}
$option_ary = array('activate' => 'ACTIVATE', 'delete' => 'DELETE');