[Phpbb-checkins] CVS: phpBB2/admin admin_groups.php,1.16,1.17

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

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

Modified Files:
	admin_groups.php 
Log Message:
Backtrack on IDENTITY ... doh

Index: admin_groups.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_groups.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** admin_groups.php	2001/11/21 16:20:40	1.16
--- admin_groups.php	2001/12/01 01:20:10	1.17
***************
*** 137,142 ****
  		"L_GROUP_DELETE" => $lang['group_delete'],
  		"L_GROUP_DELETE_CHECK" => $lang['group_delete_check'],
! 		"L_SUBMIT" => $lang['submit_group_changes'],
! 		"L_RESET" => $lang['reset_group_changes'],
  		"L_DELETE_MODERATOR" => $lang['delete_group_moderator'],
  		"L_DELETE_MODERATOR_EXPLAIN" => $lang['delete_moderator_explain'],
--- 137,142 ----
  		"L_GROUP_DELETE" => $lang['group_delete'],
  		"L_GROUP_DELETE_CHECK" => $lang['group_delete_check'],
! 		"L_SUBMIT" => $lang['Submit'],
! 		"L_RESET" => $lang['Reset'],
  		"L_DELETE_MODERATOR" => $lang['delete_group_moderator'],
  		"L_DELETE_MODERATOR_EXPLAIN" => $lang['delete_moderator_explain'],
***************
*** 172,176 ****
  		}
  
! 		$message = $lang['Deleted_group'] . "<br /><br />" . sprintf($lang['return_group_admin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");;
  
  		message_die(GENERAL_MESSAGE, $message);
--- 172,176 ----
  		}
  
! 		$message = $lang['Deleted_group'] . "<br /><br />" . sprintf($lang['Click_return_groupsadmin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");;
  
  		message_die(GENERAL_MESSAGE, $message);
***************
*** 243,247 ****
  			}
  	
! 			$message = $lang['Updated_group'] . "<br /><br />" . sprintf($lang['return_group_admin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");;
  
  			message_die(GENERAL_MESSAGE, $message);
--- 243,247 ----
  			}
  	
! 			$message = $lang['Updated_group'] . "<br /><br />" . sprintf($lang['Click_return_groupsadmin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");;
  
  			message_die(GENERAL_MESSAGE, $message);
***************
*** 249,261 ****
  		else if( $mode == "newgroup" )
  		{
! 
! 			$sql = "INSERT INTO " . GROUPS_TABLE . " (group_type, group_name, group_description, group_moderator, group_single_user) 
! 				VALUES ('" . $group_type . "', '" . $group_name . "', '" . $group_description . "', '" . $group_moderator . "',	'0')";
  			if ( !$result = $db->sql_query($sql) )
  			{
  				message_die(GENERAL_ERROR, "Couldn't insert new group", "", __LINE__, __FILE__, $sql);
  			}
  
! 			$new_group_id = $db->sql_nextid($result);
  
  			$sql = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id, user_pending)
--- 249,268 ----
  		else if( $mode == "newgroup" )
  		{
! 			$sql = "SELECT MAX(group_id) AS new_group_id 
! 				FROM " . GROUPS_TABLE;
  			if ( !$result = $db->sql_query($sql) )
  			{
  				message_die(GENERAL_ERROR, "Couldn't insert new group", "", __LINE__, __FILE__, $sql);
  			}
+ 			$row = $db->sql_fetchrow($result);
+ 
+ 			$new_group_id = $row['new_group_id'] + 1;
  
! 			$sql = "INSERT INTO " . GROUPS_TABLE . " (group_id, group_type, group_name, group_description, group_moderator, group_single_user) 
! 				VALUES ($new_group_id, '" . $group_type . "', '" . $group_name . "', '" . $group_description . "', '" . $group_moderator . "',	'0')";
! 			if ( !$result = $db->sql_query($sql) )
! 			{
! 				message_die(GENERAL_ERROR, "Couldn't insert new group", "", __LINE__, __FILE__, $sql);
! 			}
  
  			$sql = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id, user_pending)
***************
*** 266,270 ****
  			}
  			
! 			$message = $lang['Added_new_group'] . "<br /><br />" . sprintf($lang['return_group_admin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");;
  
  			message_die(GENERAL_MESSAGE, $message);
--- 273,277 ----
  			}
  			
! 			$message = $lang['Added_new_group'] . "<br /><br />" . sprintf($lang['Click_return_groupsadmin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");;
  
  			message_die(GENERAL_MESSAGE, $message);