[Phpbb-checkins] CVS: phpBB2/admin admin_ug_auth.php,1.1,1.2

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv9174/admin

Modified Files:
	admin_ug_auth.php 
Log Message:
Almost but not quite ... wouldn't update user levels for former mods who've been removed from auth_access ... doh

Index: admin_ug_auth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_ug_auth.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** admin_ug_auth.php	28 Feb 2002 23:50:15 -0000	1.1
--- admin_ug_auth.php	1 Mar 2002 01:15:39 -0000	1.2
***************
*** 418,428 ****
  		// Update user level to user for appropriate users
  		// 
! 		$sql = "SELECT u.user_id, SUM(aa.auth_mod) AS mod   
! 			FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . USERS_TABLE . " u  
! 			WHERE ug.group_id = aa.group_id 
! 				AND u.user_id = ug.user_id 
! 				AND u.user_level NOT IN (" . USER . ", " . ADMIN . ")
! 			GROUP BY u.user_id 
! 			HAVING mod = 0";
  		if ( !($result = $db->sql_query($sql)) )
  		{
--- 418,463 ----
  		// Update user level to user for appropriate users
  		// 
! 		switch ( SQL_LAYER )
! 		{
! 			case 'postgresql':
! 				$sql = "SELECT u.user_id    
! 					FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug, " . AUTH_ACCESS_TABLE . " aa
! 					WHERE ug.user_id = u.user_id 
! 						AND aa.group_id = ug.group_id 
! 						AND u.user_level NOT IN (" . USER . ", " . ADMIN . ")
! 					GROUP BY u.user_id 
! 					HAVING SUM(aa.auth_mod) = 0 
! 					UNION (
! 						SELECT u.user_id  
! 						FROM " . USERS_TABLE . " u 
! 						WHERE NOT EXISTS ( 
! 							SELECT aa.auth_mod 
! 							FROM " . USER_GROUP_TABLE . " ug, " . AUTH_ACCESS_TABLE . " aa 
! 							WHERE ug.user_id = u.user_id 
! 								AND aa.group_id = ug.group_id
! 						)
! 						AND u.user_level NOT IN (" . USER . ", " . ADMIN . ")  
! 						GROUP BY u.user_id
! 					)";
! 				break;
! 			case 'oracle':
! 				$sql = "SELECT u.user_id, SUM(aa.auth_mod) AS mod   
! 					FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug, " . AUTH_ACCESS_TABLE . " aa 
! 					WHERE ug.user_id = u.user_id(+)
! 						AND aa.group_id = ug.group_id(+) 
! 						AND u.user_level NOT IN (" . USER . ", " . ADMIN . ")
! 					GROUP BY u.user_id 
! 					HAVING mod = 0";
! 				break;
! 			default:
! 				$sql = "SELECT u.user_id, SUM(aa.auth_mod) AS mod   
! 					FROM ( ( " . USERS_TABLE . " u  
! 					LEFT JOIN " . USER_GROUP_TABLE . " ug ON ug.user_id = u.user_id ) 
! 					LEFT JOIN " . AUTH_ACCESS_TABLE . " aa ON aa.group_id = ug.group_id ) 
! 					WHERE u.user_level NOT IN (" . USER . ", " . ADMIN . ")
! 					GROUP BY u.user_id 
! 					HAVING mod = 0";
! 				break;
! 		}
  		if ( !($result = $db->sql_query($sql)) )
  		{
***************
*** 433,437 ****
  		while( $row = $db->sql_fetchrow($result) )
  		{
! 			$unset_mod .= ( ( $unset_mod != "" ) ? ", " : "" ) . $row['user_id'];
  		}
  		$db->sql_freeresult($result);
--- 468,472 ----
  		while( $row = $db->sql_fetchrow($result) )
  		{
! 			echo $unset_mod .= ( ( $unset_mod != "" ) ? ", " : "" ) . $row['user_id'];
  		}
  		$db->sql_freeresult($result);