[Phpbb-checkins] CVS: phpBB2/adm admin_groups.php,1.22,1.23 admin_profile.php,1.11,1.12 admin_viewlogs.php,1.15,1.16 index.php,1.29,1.30

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

Update of /cvsroot/phpbb/phpBB2/adm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24638/adm

Modified Files:
	admin_groups.php admin_profile.php admin_viewlogs.php 
	index.php 
Log Message:
- only bugfixes
- use usergroup function to activate users at admin index

Index: admin_groups.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/adm/admin_groups.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** admin_groups.php	31 May 2005 18:53:59 -0000	1.22
--- admin_groups.php	19 Aug 2005 10:52:06 -0000	1.23
***************
*** 605,609 ****
  					WHERE ug.group_id = $group_id 
  						AND u.user_id = ug.user_id 
! 					ORDER BY ug.group_leader DESC, ug.user_pending DESC, u.username 
  					LIMIT $start, " . $config['topics_per_page'];
  				$result = $db->sql_query($sql);
--- 605,609 ----
  					WHERE ug.group_id = $group_id 
  						AND u.user_id = ug.user_id 
! 					ORDER BY ug.group_leader DESC, ug.user_pending ASC, u.username 
  					LIMIT $start, " . $config['topics_per_page'];
  				$result = $db->sql_query($sql);
***************
*** 675,688 ****
  	</tr>
  <?php
  				if (sizeof($group_data['member']))
  				{
- 					$pending = $group_data['member'][0]['user_pending'];
- 
  					$row_class = '';
  					foreach ($group_data['member'] as $row)
  					{
! 						if ($pending)
! 						{
  
  ?>
  	<tr>
--- 675,690 ----
  	</tr>
  <?php
+ 
  				if (sizeof($group_data['member']))
  				{
  					$row_class = '';
+ 					$pending = false;
+ 
  					foreach ($group_data['member'] as $row)
  					{
! 						$row_class = ($row_class == 'row1') ? 'row2' : 'row1';
  
+ 						if ($row['user_pending'] && !$pending)
+ 						{
  ?>
  	<tr>
***************
*** 690,698 ****
  	</tr>
  <?php
! 
  						}
  
- 						$row_class = ($row_class == 'row1') ? 'row2' : 'row1';
- 
  ?>
  	<tr class="<?php echo $row_class; ?>">
--- 692,698 ----
  	</tr>
  <?php
! 							$pending = true;
  						}
  
  ?>
  	<tr class="<?php echo $row_class; ?>">

Index: admin_profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/adm/admin_profile.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** admin_profile.php	30 Apr 2005 14:12:21 -0000	1.11
--- admin_profile.php	19 Aug 2005 10:52:06 -0000	1.12
***************
*** 402,406 ****
  		}
  
! 		$s_hidden_fields .= build_hidden_fields($key_ary);
  	}
  
--- 402,406 ----
  		}
  
! 		$s_hidden_fields .= build_hidden_keys($key_ary);
  	}
  
***************
*** 1295,1299 ****
  }
  
! function build_hidden_fields($key_ary)
  {
  	$hidden_fields = '';
--- 1295,1299 ----
  }
  
! function build_hidden_keys($key_ary)
  {
  	$hidden_fields = '';

Index: admin_viewlogs.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/adm/admin_viewlogs.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** admin_viewlogs.php	9 Apr 2005 12:26:32 -0000	1.15
--- admin_viewlogs.php	19 Aug 2005 10:52:06 -0000	1.16
***************
*** 44,48 ****
  $deletemark = (isset($_POST['delmarked'])) ? true : false;
  $deleteall	= (isset($_POST['delall'])) ? true : false;
! $marked		= request_var('mark', 0);
  
  // Sort keys
--- 44,48 ----
  $deletemark = (isset($_POST['delmarked'])) ? true : false;
  $deleteall	= (isset($_POST['delall'])) ? true : false;
! $marked		= request_var('mark', array(0));
  
  // Sort keys

Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/adm/index.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** index.php	30 May 2005 06:42:48 -0000	1.29
--- index.php	19 Aug 2005 10:52:06 -0000	1.30
***************
*** 157,162 ****
  				if ($action == 'activate')
  				{
! 					$sql = 'UPDATE ' . USERS_TABLE . ' SET user_type = ' . USER_NORMAL . " WHERE user_id IN ($mark)";
! 					$db->sql_query($sql);
  				}
  				else if ($action == 'delete')
--- 157,167 ----
  				if ($action == 'activate')
  				{
! 					include($phpbb_root_path . 'includes/functions_user.php');
! 					$mark_ary = explode(', ', $mark);
! 
! 					foreach ($mark_ary as $user_id)
! 					{
! 						user_active_flip($user_id, USER_INACTIVE);
! 					}
  				}
  				else if ($action == 'delete')
***************
*** 166,169 ****
--- 171,176 ----
  					$sql = 'DELETE FROM ' . USERS_TABLE . " WHERE user_id IN ($mark)";
  					$db->sql_query($sql);
+ 	
+ 					add_log('admin', 'LOG_INDEX_' . strtoupper($action), implode(', ', $user_affected));
  				}
  
***************
*** 173,177 ****
  				}
  
- 				add_log('admin', 'LOG_INDEX_' . strtoupper($action), implode(', ', $user_affected));
  				break;
  
--- 180,183 ----