[Phpbb-php5mod-cvs-checkins] phpbb-php5/admin admin_ug_auth.php,1.6,1.7

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

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

Modified Files:
	admin_ug_auth.php 
Log Message:
stupid, stupid, stupid donut.

Tip: don't code while watching the Numa Numa dance

Index: admin_ug_auth.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/admin/admin_ug_auth.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** admin_ug_auth.php	8 May 2005 02:12:43 -0000	1.6
--- admin_ug_auth.php	12 May 2005 02:56:07 -0000	1.7
***************
*** 513,516 ****
--- 513,569 ----
  		}
  
+ 		if( empty($adv) )
+ 		{
+ 			for($i = 0; $i < count($forum_access); $i++)
+ 			{
+ 				$forum_id = $forum_access[$i]['forum_id'];
+ 
+ 				$forum_auth_level[$forum_id] = AUTH_ALL;
+ 
+ 				$sql = 'SELECT user_id FROM ' . USER_GROUP_TABLE . "
+ 					WHERE group_id = $group_id";
+ 				$result = $db->sql_query($sql);
+ 
+ 				$group_user = array();
+ 
+ 				while ($row = $db->sql_fetchrow($result))
+ 				{
+ 					$group_user[$row['user_id']] = $row['user_id'];
+ 				}
+ 				$db->sql_freeresult($result);
+ 
+ 				$sql = "SELECT ug.user_id, COUNT(auth_mod) AS is_auth_mod
+ 					FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug
+ 					WHERE ug.user_id IN (" . implode(', ', $group_user) . ")
+ 						AND aa.group_id = ug.group_id
+ 						AND aa.auth_mod = 1
+ 					GROUP BY ug.user_id";
+ 				if ( !($result = $db->sql_query($sql)) )
+ 				{
+ 					message_die(GENERAL_ERROR, 'Could not obtain moderator status', '', __LINE__, __FILE__, $sql);
+ 				}
+ 
+ 				while ($row = $db->sql_fetchrow($result))
+ 				{
+ 					if ($row['is_auth_mod'])
+ 					{
+ 						unset($group_user[$row['user_id']]);
+ 					}
+ 				}
+ 				$db->sql_freeresult($result);
+ 
+ 				if (sizeof($group_user))
+ 				{
+ 					$sql = "UPDATE " . USERS_TABLE . "
+ 						SET user_level = " . USER . "
+ 						WHERE user_id IN (" . implode(', ', $group_user) . ")";
+ 					if ( !($result = $db->sql_query($sql)) )
+ 					{
+ 						message_die(GENERAL_ERROR, 'Could not update user level', '', __LINE__, __FILE__, $sql);
+ 					}
+ 				}
+ 			}
+ 		}
+ 
  		message_die(GENERAL_MESSAGE, $message);
  	}
***************
*** 546,611 ****
  	$db->sql_freeresult($result);
  
! 	if( empty($adv) )
  	{
! 		for($i = 0; $i < count($forum_access); $i++)
  		{
! 			$forum_id = $forum_access[$i]['forum_id'];
! 
! 			$forum_auth_level[$forum_id] = AUTH_ALL;
! 
! 			$sql = 'SELECT user_id FROM ' . USER_GROUP_TABLE . "
! 				WHERE group_id = $group_id";
! 			$result = $db->sql_query($sql);
! 
! 			$group_user = array();
! 
! 			while ($row = $db->sql_fetchrow($result))
! 			{
! 				$group_user[$row['user_id']] = $row['user_id'];
! 			}
! 			$db->sql_freeresult($result);
! 
! 			$sql = "SELECT ug.user_id, COUNT(auth_mod) AS is_auth_mod
! 				FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug
! 				WHERE ug.user_id IN (" . implode(', ', $group_user) . ")
! 					AND aa.group_id = ug.group_id
! 					AND aa.auth_mod = 1
! 				GROUP BY ug.user_id";
!       if ( !($result = $db->sql_query($sql)) )
!       {
!          message_die(GENERAL_ERROR, 'Could not obtain moderator status', '', __LINE__, __FILE__, $sql);
!       }
! 
!       while ($row = $db->sql_fetchrow($result))
!       {
!          if ($row['is_auth_mod'])
!          {
!             unset($group_user[$row['user_id']]);
!          }
!       }
!       $db->sql_freeresult($result);
! 
!       if (sizeof($group_user))
!       {
!          $sql = "UPDATE " . USERS_TABLE . "
!             SET user_level = " . USER . "
!             WHERE user_id IN (" . implode(', ', $group_user) . ")";
!          if ( !($result = $db->sql_query($sql)) )
!          {
!             message_die(GENERAL_ERROR, 'Could not update user level', '', __LINE__, __FILE__, $sql);
!          }
!       }
! 			for($j = 0; $j < count($forum_auth_fields); $j++)
! 			{
! 				$forum_access[$i][$forum_auth_fields[$j]] . ' :: ';
! 				if ( $forum_access[$i][$forum_auth_fields[$j]] == AUTH_ACL )
! 				{
! 					$forum_auth_level[$forum_id] = AUTH_ACL;
! 					$forum_auth_level_fields[$forum_id][] = $forum_auth_fields[$j];
! 				}
! 			}
  		}
  	}
  
  	$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";
--- 599,613 ----
  	$db->sql_freeresult($result);
  
! 	for($j = 0; $j < count($forum_auth_fields); $j++)
  	{
! 		$forum_access[$i][$forum_auth_fields[$j]] . ' :: ';
! 		if ( $forum_access[$i][$forum_auth_fields[$j]] == AUTH_ACL )
  		{
! 			$forum_auth_level[$forum_id] = AUTH_ACL;
! 			$forum_auth_level_fields[$forum_id][] = $forum_auth_fields[$j];
  		}
  	}
  
+ 
  	$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";