[Phpbb-checkins] CVS: phpBB2/admin admin_groups.php,1.10,1.11

[Doug K. <dou...@us...>]

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

Modified Files:
	admin_groups.php 
Log Message:
A few minor bug fixes in the group control panel.

Index: admin_groups.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_groups.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** admin_groups.php	2001/10/14 15:46:53	1.10
--- admin_groups.php	2001/10/15 00:38:30	1.11
***************
*** 133,136 ****
--- 133,139 ----
  		"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'],
+ 		"L_YES" => $lang['Yes'],
  
  		"S_SELECT_MODERATORS" => $select_list,
***************
*** 162,169 ****
  	else
  	{
! 		$group_type = isset($HTTP_POST_VARS['group_type']) ? $HTTP_POST_VARS['group_type'] : "";
! 		$group_name = isset($HTTP_POST_VARS['group_name']) ? $HTTP_POST_VARS['group_name'] : "";
! 		$group_description = isset($HTTP_POST_VARS['group_description']) ? $HTTP_POST_VARS['group_description'] : "";
  		$group_moderator = isset($HTTP_POST_VARS['group_moderator']) ? intval($HTTP_POST_VARS['group_moderator']) : "";
  
  		if( $group_name == "" )
--- 165,173 ----
  	else
  	{
! 		$group_type = isset($HTTP_POST_VARS['group_type']) ? trim(addslashes($HTTP_POST_VARS['group_type'])) : "";
! 		$group_name = isset($HTTP_POST_VARS['group_name']) ? trim(addslashes($HTTP_POST_VARS['group_name'])) : "";
! 		$group_description = isset($HTTP_POST_VARS['group_description']) ? trim(addslashes($HTTP_POST_VARS['group_description'])) : "";
  		$group_moderator = isset($HTTP_POST_VARS['group_moderator']) ? intval($HTTP_POST_VARS['group_moderator']) : "";
+ 		$delete_old_moderator = isset($HTTP_POST_VARS['delete_old_moderator']) ? intval($HTTP_POST_VARS['delete_old_moderator']) : "";
  
  		if( $group_name == "" )
***************
*** 182,187 ****
  		if( $mode == "editgroup" )
  		{
! 
! 			echo $sql = "UPDATE " . GROUPS_TABLE . "
  				SET group_type = $group_type, group_name = '" . $group_name . "', group_description = '" . $group_description . "', group_moderator = $group_moderator 
  				WHERE group_id = $group_id";
--- 186,222 ----
  		if( $mode == "editgroup" )
  		{
! 			$sql = "SELECT *
! 				FROM " . GROUPS_TABLE . "
! 				WHERE group_single_user <> " . TRUE . "
! 				AND group_id = " . $group_id;
! 			if(!$result = $db->sql_query($sql))
! 			{
! 				message_die(GENERAL_ERROR, "Error getting group information", "", __LINE__, __FILE__, $sql);
! 			}
! 			if( !$db->sql_numrows($result) )
! 			{
! 				message_die(GENERAL_MESSAGE, "That user group does not exist");
! 			}
! 			$group_info = $db->sql_fetchrow($result);		
! 		
! 			if ( $group_info['group_moderator'] != $group_moderator )
! 			{
! 				if ( $delete_old_moderator != "" )
! 				{
! 					$sql = "DELETE FROM " . USER_GROUP_TABLE . "
! 						WHERE user_id = " . $group_info['group_moderator'] . " AND group_id = " . $group_id;
! 					if ( !$result = $db->sql_query($sql) )
! 					{
! 						message_die(GENERAL_ERROR, "Couldn't update group moderator", "", __LINE__, __FILE__, $sql);
! 					}
! 				}
! 				$sql = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id, user_pending)
! 					VALUES (" . $group_id . ", " . $group_moderator . ", 0)";
! 				if ( !$result = $db->sql_query($sql) )
! 				{
! 					message_die(GENERAL_ERROR, "Couldn't update group moderator", "", __LINE__, __FILE__, $sql);
! 				}
! 			}
! 			$sql = "UPDATE " . GROUPS_TABLE . "
  				SET group_type = $group_type, group_name = '" . $group_name . "', group_description = '" . $group_description . "', group_moderator = $group_moderator 
  				WHERE group_id = $group_id";
***************
*** 197,201 ****
  
  			$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) )
  			{
--- 232,236 ----
  
  			$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) )
  			{