[Phpbb-checkins] CVS: phpBB2/admin admin_ug_auth.php,1.4,1.5

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

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

Modified Files:
	admin_ug_auth.php 
Log Message:
Fix HAVING clause error for MSSQL/MySQL/et al., bug #524336

Index: admin_ug_auth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_ug_auth.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** admin_ug_auth.php	1 Mar 2002 12:06:49 -0000	1.4
--- admin_ug_auth.php	1 Mar 2002 17:22:15 -0000	1.5
***************
*** 396,400 ****
  		// Update user level to mod 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 
--- 396,400 ----
  		// Update user level to mod for appropriate users
  		// 
! 		$sql = "SELECT u.user_id 
  			FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . USERS_TABLE . " u  
  			WHERE ug.group_id = aa.group_id 
***************
*** 402,406 ****
  				AND u.user_level NOT IN (" . MOD . ", " . ADMIN . ") 
  			GROUP BY u.user_id 
! 			HAVING mod > 0";
  		if ( !($result = $db->sql_query($sql)) )
  		{
--- 402,406 ----
  				AND u.user_level NOT IN (" . MOD . ", " . ADMIN . ") 
  			GROUP BY u.user_id 
! 			HAVING SUM(aa.auth_mod) > 0";
  		if ( !($result = $db->sql_query($sql)) )
  		{
***************
*** 421,425 ****
  		{
  			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 
--- 421,425 ----
  		{
  			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 
***************
*** 442,446 ****
  				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(+)
--- 442,446 ----
  				break;
  			case 'oracle':
! 				$sql = "SELECT u.user_id 
  					FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug, " . AUTH_ACCESS_TABLE . " aa 
  					WHERE ug.user_id = u.user_id(+)
***************
*** 448,455 ****
  						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 ) 
--- 448,455 ----
  						AND u.user_level NOT IN (" . USER . ", " . ADMIN . ")
  					GROUP BY u.user_id 
! 					HAVING SUM(aa.auth_mod) = 0";
  				break;
  			default:
! 				$sql = "SELECT u.user_id 
  					FROM ( ( " . USERS_TABLE . " u  
  					LEFT JOIN " . USER_GROUP_TABLE . " ug ON ug.user_id = u.user_id ) 
***************
*** 457,461 ****
  					WHERE u.user_level NOT IN (" . USER . ", " . ADMIN . ")
  					GROUP BY u.user_id 
! 					HAVING mod = 0";
  				break;
  		}
--- 457,461 ----
  					WHERE u.user_level NOT IN (" . USER . ", " . ADMIN . ")
  					GROUP BY u.user_id 
! 					HAVING SUM(aa.auth_mod) = 0";
  				break;
  		}