[Phpbb-checkins] CVS: phpBB2 groupcp.php,1.49,1.50

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

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

Modified Files:
	groupcp.php 
Log Message:
Fix lack of display if no groups exist, bug #520902

Index: groupcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/groupcp.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -r1.49 -r1.50
*** groupcp.php	2 Mar 2002 18:12:03 -0000	1.49
--- groupcp.php	3 Mar 2002 23:32:36 -0000	1.50
***************
*** 554,562 ****
  	}
  
! 	if( !$db->sql_numrows($result) )
  	{
  		message_die(GENERAL_MESSAGE, $lang['Group_not_exist']); 
  	}
- 	$group_info = $db->sql_fetchrow($result);
  
  	//
--- 554,561 ----
  	}
  
! 	if( !($group_info = $db->sql_fetchrow($result)) )
  	{
  		message_die(GENERAL_MESSAGE, $lang['Group_not_exist']); 
  	}
  
  	//
***************
*** 1065,1070 ****
  	$sql = "SELECT g.group_id, g.group_name, g.group_type, ug.user_pending 
  		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 . "
--- 1064,1068 ----
  	$sql = "SELECT g.group_id, g.group_name, g.group_type, ug.user_pending 
  		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 . "
***************
*** 1075,1093 ****
  	}
  
! 	$in_group = array();
! 	$s_member_groups_opt = "";
! 	$s_pending_groups_opt = "";
! 	while( $row = $db->sql_fetchrow($result) )
  	{
! 		$in_group[] = $row['group_id'];
! 		if ( $row['user_pending'] )
! 		{
! 			$s_pending_groups_opt .= '<option value="' . $row['group_id'] . '">' . $row['group_name'] . '</option>';
! 		}
! 		else
  		{
! 			$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>";
--- 1073,1101 ----
  	}
  
! 	if ( $row = $db->sql_fetchrow($result) )
  	{
! 		$in_group = array();
! 		$s_member_groups_opt = "";
! 		$s_pending_groups_opt = "";
! 
! 		do
  		{
! 			$in_group[] = $row['group_id'];
! 			if ( $row['user_pending'] )
! 			{
! 				$s_pending_groups_opt .= '<option value="' . $row['group_id'] . '">' . $row['group_name'] . '</option>';
! 			}
! 			else
! 			{
! 				$s_member_groups_opt .= '<option value="' . $row['group_id'] . '">' . $row['group_name'] . '</option>';
! 			}
  		}
+ 		while( $row = $db->sql_fetchrow($result) );
+ 	}
+ 	else
+ 	{
+ 		message_die(GENERAL_MESSAGE, $lang['No_groups_exist']);
  	}
+ 
  	$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>";