[Phpbb-php5mod-cvs-checkins] phpbb-php5/admin admin_ug_auth.php,1.8,1.9 admin_users.php,1.2,1.3

[Josh <jel...@us...>]

Update of /cvsroot/phpbb-php5mod/phpbb-php5/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21914/admin

Modified Files:
	admin_ug_auth.php admin_users.php 
Log Message:
2.0.17.5

Index: admin_ug_auth.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/admin_ug_auth.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** admin_ug_auth.php	14 May 2005 17:48:38 -0000	1.8
--- admin_ug_auth.php	19 Jul 2005 23:31:24 -0000	1.9
***************
*** 419,422 ****
--- 419,423 ----
  			WHERE ug.group_id = aa.group_id 
  				AND u.user_id = ug.user_id 
+ 				AND ug.user_pending = 0
  				AND u.user_level NOT IN (" . MOD . ", " . ADMIN . ") 
  			GROUP BY u.user_id 
***************
*** 584,590 ****
  	// Front end
  	//
! 	$sql = "SELECT * 
! 		FROM " . FORUMS_TABLE . " f
! 		ORDER BY forum_order";
  	if ( !($result = $db->sql_query($sql)) )
  	{
--- 585,592 ----
  	// Front end
  	//
! 	$sql = "SELECT f.* 
! 		FROM " . FORUMS_TABLE . " f, " . CATEGORIES_TABLE . " c
! 		WHERE c.cat_id = f.cat_id
! 		ORDER BY c.cat_order, f.forum_order";
  	if ( !($result = $db->sql_query($sql)) )
  	{
***************
*** 610,614 ****
  
  
! 	$sql = "SELECT u.user_id, u.username, u.user_level, g.group_id, g.group_name, g.group_single_user FROM " . USERS_TABLE . " u, " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug WHERE ";
  	$sql .= ( $mode == 'user' ) ? "u.user_id = $user_id AND ug.user_id = u.user_id AND g.group_id = ug.group_id" : "g.group_id = $group_id AND ug.group_id = g.group_id AND u.user_id = ug.user_id";
  	if ( !($result = $db->sql_query($sql)) )
--- 612,616 ----
  
  
! 	$sql = "SELECT u.user_id, u.username, u.user_level, g.group_id, g.group_name, g.group_single_user, ug.user_pending FROM " . USERS_TABLE . " u, " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug WHERE ";
  	$sql .= ( $mode == 'user' ) ? "u.user_id = $user_id AND ug.user_id = u.user_id AND g.group_id = ug.group_id" : "g.group_id = $group_id AND ug.group_id = g.group_id AND u.user_id = ug.user_id";
  	if ( !($result = $db->sql_query($sql)) )
***************
*** 838,847 ****
  	if( count($name) )
  	{
! 		$t_usergroup_list = '';
  		for($i = 0; $i < count($ug_info); $i++)
  		{
  			$ug = ( $mode == 'user' ) ? 'group&amp;' . POST_GROUPS_URL : 'user&amp;' . POST_USERS_URL;
  
! 			$t_usergroup_list .= ( ( $t_usergroup_list != '' ) ? ', ' : '' ) . '<a href="' . append_sid("admin_ug_auth.$phpEx?mode=$ug=" . $id[$i]) . '">' . $name[$i] . '</a>';
  		}
  	}
--- 840,856 ----
  	if( count($name) )
  	{
! 		$t_usergroup_list = $t_pending_list = '';
  		for($i = 0; $i < count($ug_info); $i++)
  		{
  			$ug = ( $mode == 'user' ) ? 'group&amp;' . POST_GROUPS_URL : 'user&amp;' . POST_USERS_URL;
  
! 			if (!$ug_info[$i]['user_pending'])
! 			{
! 				$t_usergroup_list .= ( ( $t_usergroup_list != '' ) ? ', ' : '' ) . '<a href="' . append_sid("admin_ug_auth.$phpEx?mode=$ug=" . $id[$i]) . '">' . $name[$i] . '</a>';
! 			}
! 			else
! 			{
! 				$t_pending_list .= ( ( $t_pending_list != '' ) ? ', ' : '' ) . '<a href="' . append_sid("admin_ug_auth.$phpEx?mode=$ug=" . $id[$i]) . '">' . $name[$i] . '</a>';
! 			}
  		}
  	}
***************
*** 906,910 ****
  		$template->assign_vars(array(
  			'USERNAME' => $t_groupname,
! 			'GROUP_MEMBERSHIP' => $lang['Usergroup_members'] . ' : ' . $t_usergroup_list)
  		);
  	}
--- 915,919 ----
  		$template->assign_vars(array(
  			'USERNAME' => $t_groupname,
! 			'GROUP_MEMBERSHIP' => $lang['Usergroup_members'] . ' : ' . $t_usergroup_list . '<br />' . $lang['Pending_members'] . ' : ' . $t_pending_list)
  		);
  	}

Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/admin_users.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** admin_users.php	30 Jul 2004 02:12:37 -0000	1.2
--- admin_users.php	19 Jul 2005 23:31:24 -0000	1.3
***************
*** 87,91 ****
  			
  			$sql = "UPDATE " . POSTS_TABLE . "
! 				SET poster_id = " . DELETED . ", post_username = '$username' 
  				WHERE poster_id = $user_id";
  			if( !$db->sql_query($sql) )
--- 87,91 ----
  			
  			$sql = "UPDATE " . POSTS_TABLE . "
! 				SET poster_id = " . DELETED . ", post_username = '" . str_replace("\\'", "''", addslashes($this_userdata['username'])) . "'
  				WHERE poster_id = $user_id";
  			if( !$db->sql_query($sql) )