[Phpbb-checkins] r10081 - in /branches/phpBB-3_0_0/phpBB: adm/style/acp_main.html includes/acp/acp_main.php

[Meik S. <acy...@ph...>]

Author: acydburn
Date: Tue Sep  1 12:21:42 2009
New Revision: 10081

Log:
adjust inactive users list on ACP index to act like the new inactive users list from r9845

Modified:
    branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html
    branches/phpBB-3_0_0/phpBB/includes/acp/acp_main.php

Modified: branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html Tue Sep  1 12:21:42 2009
***************
*** 214,232 ****
  			<th>{L_USERNAME}</th>
  			<th>{L_JOINED}</th>
  			<th>{L_INACTIVE_DATE}</th>
- 			<th>{L_INACTIVE_REASON}</th>
  			<th>{L_LAST_VISIT}</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>
  			</tr>
  		<!-- BEGINELSE -->
  			<tr>
--- 214,237 ----
  			<th>{L_USERNAME}</th>
  			<th>{L_JOINED}</th>
  			<th>{L_INACTIVE_DATE}</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 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>

Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_main.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_main.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_main.php Tue Sep  1 12:21:42 2009
***************
*** 540,545 ****
--- 540,547 ----
  
  		if ($auth->acl_get('a_user'))
  		{
+ 			$user->add_lang('memberlist');
+ 
  			$inactive = array();
  			$inactive_count = 0;
  
***************
*** 549,561 ****
  			{
  				$template->assign_block_vars('inactive', array(
  					'INACTIVE_DATE'	=> $user->format_date($row['user_inactive_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']}"))
! 				);
  			}
  
  			$option_ary = array('activate' => 'ACTIVATE', 'delete' => 'DELETE');
--- 551,574 ----
  			{
  				$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'],
! 					'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');