[Phpbb-checkins] CVS: phpBB2 groupcp.php,1.40,1.41

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

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

Modified Files:
	groupcp.php 
Log Message:
Fix problem where groups for which user is member appear in the Join Group dropbox

Index: groupcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/groupcp.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** groupcp.php	28 Jan 2002 14:18:52 -0000	1.40
--- groupcp.php	13 Feb 2002 00:37:27 -0000	1.41
***************
*** 1101,1104 ****
--- 1101,1105 ----
  	}
  
+ 	$in_group = array();
  	$s_member_groups_opt = "";
  	$s_pending_groups_opt = "";
***************
*** 1113,1125 ****
  			$s_member_groups_opt .= '<option value="' . $row['group_id'] . '">' . $row['group_name'] . '</option>';
  		}
  	}
  	$s_pending_groups = '<select name="' . POST_GROUPS_URL . '">' . $s_pending_groups_opt . "</select>";
  	$s_member_groups = '<select name="' . POST_GROUPS_URL . '">' . $s_member_groups_opt . "</select>";
  
! 	$sql = "SELECT DISTINCT g.group_id, g.group_name  
! 		FROM " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug
! 		WHERE ug.user_id <> " . $userdata['user_id'] . "  
! 			AND ug.group_id = g.group_id
! 			AND g.group_single_user <> " . TRUE . " 
  		ORDER BY g.group_name";
  	if ( !($result = $db->sql_query($sql)) )
--- 1114,1126 ----
  			$s_member_groups_opt .= '<option value="' . $row['group_id'] . '">' . $row['group_name'] . '</option>';
  		}
+ 		$in_group[] = $row['group_id'];
  	}
  	$s_pending_groups = '<select name="' . POST_GROUPS_URL . '">' . $s_pending_groups_opt . "</select>";
  	$s_member_groups = '<select name="' . POST_GROUPS_URL . '">' . $s_member_groups_opt . "</select>";
  
! 	$sql = "SELECT group_id, group_name  
! 		FROM " . GROUPS_TABLE . " g 
! 		WHERE group_single_user <> " . TRUE . " 
! 			AND group_id NOT IN (" . implode(", ", $in_group) . ") 
  		ORDER BY g.group_name";
  	if ( !($result = $db->sql_query($sql)) )