diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-09-01 11:21:42 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-09-01 11:21:42 +0000 |
| commit | d65ccbde11efe8dba2b4cdf838903938399cd045 (patch) | |
| tree | 6ec0976ec8ef9653ac82f1c1d6b9b139675b1538 | |
| parent | 139f1d35302fc675b5e972e55c62d36cbc42af5c (diff) | |
| download | forums-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
| -rw-r--r-- | phpBB/adm/style/acp_main.html | 17 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_main.php | 19 |
2 files changed, 27 insertions, 9 deletions
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 @@ <th>{L_USERNAME}</th> <th>{L_JOINED}</th> <th>{L_INACTIVE_DATE}</th> - <th>{L_INACTIVE_REASON}</th> <th>{L_LAST_VISIT}</th> + <th>{L_INACTIVE_REASON}</th> </tr> </thead> <tbody> <!-- BEGIN inactive --> <!-- IF inactive.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> - <td><a href="{inactive.U_USER_ADMIN}">{inactive.USERNAME}</a></td> - <td>{inactive.JOINED}</td> - <td>{inactive.INACTIVE_DATE}</td> - <td>{inactive.REASON}</td> - <td>{inactive.LAST_VISIT}</td> + <td style="vertical-align: top;"> + {inactive.USERNAME_FULL} + <!-- IF inactive.POSTS --><br />{L_POSTS}: <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF --> + </td> + <td style="vertical-align: top;">{inactive.JOINED}</td> + <td style="vertical-align: top;">{inactive.INACTIVE_DATE}</td> + <td style="vertical-align: top;">{inactive.LAST_VISIT}</td> + <td style="vertical-align: top;"> + {inactive.REASON} + <!-- IF inactive.REMINDED --><br />{inactive.REMINDED_EXPLAIN}<!-- ENDIF --> </tr> <!-- BEGINELSE --> <tr> 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'); |