***************
*** 6,12 ****
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: groupcp.php,v 1.58.2.5 2002/05/20 00:21:09 psotfx Exp $
   *
   *
   ***************************************************************************/
--- 6,12 ----
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: groupcp.php,v 1.58.2.18 2003/06/10 17:18:13 acydburn Exp $
   *
   *
   ***************************************************************************/
***************
*** 127,133 ****
  
  if ( isset($HTTP_GET_VARS[POST_GROUPS_URL]) || isset($HTTP_POST_VARS[POST_GROUPS_URL]) )
  {
! 	$group_id = ( isset($HTTP_GET_VARS[POST_GROUPS_URL]) ) ? intval($HTTP_GET_VARS[POST_GROUPS_URL]) : intval($HTTP_POST_VARS[POST_GROUPS_URL]);
  }
  else
  {
--- 127,133 ----
  
  if ( isset($HTTP_GET_VARS[POST_GROUPS_URL]) || isset($HTTP_POST_VARS[POST_GROUPS_URL]) )
  {
! 	$group_id = ( isset($HTTP_POST_VARS[POST_GROUPS_URL]) ) ? intval($HTTP_POST_VARS[POST_GROUPS_URL]) : intval($HTTP_GET_VARS[POST_GROUPS_URL]);
  }
  else
  {
***************
*** 151,165 ****
  //
  // Default var values
  //
- $header_location = ( @preg_match('/Microsoft|WebSTAR/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
  $is_moderator = FALSE;
  
  if ( isset($HTTP_POST_VARS['groupstatus']) && $group_id )
  {
  	if ( !$userdata['session_logged_in'] )
  	{
! 		header($header_location . append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
! 		exit;
  	}
  
  	$sql = "SELECT group_moderator 
--- 151,163 ----
  //
  // Default var values
  //
  $is_moderator = FALSE;
  
  if ( isset($HTTP_POST_VARS['groupstatus']) && $group_id )
  {
  	if ( !$userdata['session_logged_in'] )
  	{
! 		redirect(append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
  	}
  
  	$sql = "SELECT group_moderator 
***************
*** 208,215 ****
  	//
  	if ( !$userdata['session_logged_in'] )
  	{
! 		header($header_location . append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
! 		exit;
  	}
  
  	$sql = "SELECT ug.user_id, g.group_type
--- 206,212 ----
  	//
  	if ( !$userdata['session_logged_in'] )
  	{
! 		redirect(append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
  	}
  
  	$sql = "SELECT ug.user_id, g.group_type
***************
*** 277,293 ****
  	include($phpbb_root_path . 'includes/emailer.'.$phpEx);
  	$emailer = new emailer($board_config['smtp_delivery']);
  
! 	$email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\n";
  
  	$emailer->use_template('group_request', $moderator['user_lang']);
  	$emailer->email_address($moderator['user_email']);
! 	$emailer->set_subject();//$lang['Group_request']
! 	$emailer->extra_headers($email_headers);
  
  	$emailer->assign_vars(array(
  		'SITENAME' => $board_config['sitename'], 
  		'GROUP_MODERATOR' => $moderator['username'],
! 		'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']), 
  
  		'U_GROUPCP' => $server_url . '?' . POST_GROUPS_URL . "=$group_id&validate=true")
  	);
--- 274,290 ----
  	include($phpbb_root_path . 'includes/emailer.'.$phpEx);
  	$emailer = new emailer($board_config['smtp_delivery']);
  
! 	$emailer->from($board_config['board_email']);
! 	$emailer->replyto($board_config['board_email']);
  
  	$emailer->use_template('group_request', $moderator['user_lang']);
  	$emailer->email_address($moderator['user_email']);
! 	$emailer->set_subject($lang['Group_request']);
  
  	$emailer->assign_vars(array(
  		'SITENAME' => $board_config['sitename'], 
  		'GROUP_MODERATOR' => $moderator['username'],
! 		'EMAIL_SIG' => (!empty($board_config['board_email_sig'])) ? str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']) : '', 
  
  		'U_GROUPCP' => $server_url . '?' . POST_GROUPS_URL . "=$group_id&validate=true")
  	);
***************
*** 310,322 ****
  	//
  	if ( $cancel )
  	{
! 		header($header_location . append_sid("groupcp.$phpEx", true));
! 		exit;
  	}
  	elseif ( !$userdata['session_logged_in'] )
  	{
! 		header($header_location . append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
! 		exit;
  	}
  
  	if ( $confirm )
--- 307,317 ----
  	//
  	if ( $cancel )
  	{
! 		redirect(append_sid("groupcp.$phpEx", true));
  	}
  	elseif ( !$userdata['session_logged_in'] )
  	{
! 		redirect(append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
  	}
  
  	if ( $confirm )
***************
*** 357,363 ****
  			'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid("index.$phpEx") . '">')
  		);
  
! 		$message = $lang['Usub_success'] . '<br /><br />' . sprintf($lang['Click_return_group'], '<a href="' . append_sid("groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>');
  
  		message_die(GENERAL_MESSAGE, $message);
  	}
--- 352,358 ----
  			'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid("index.$phpEx") . '">')
  		);
  
! 		$message = $lang['Unsub_success'] . '<br /><br />' . sprintf($lang['Click_return_group'], '<a href="' . append_sid("groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>');
  
  		message_die(GENERAL_MESSAGE, $message);
  	}
***************
*** 399,406 ****
  	{
  		if ( !$userdata['session_logged_in'] )
  		{
! 			header($header_location . append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
! 			exit;
  		}
  	}
  
--- 394,400 ----
  	{
  		if ( !$userdata['session_logged_in'] )
  		{
! 			redirect(append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
  		}
  	}
  
***************
*** 461,468 ****
  		{
  			if ( !$userdata['session_logged_in'] )
  			{
! 				header($header_location . append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
! 				exit;
  			}
  
  			if ( !$is_moderator )
--- 455,461 ----
  		{
  			if ( !$userdata['session_logged_in'] )
  			{
! 				redirect(append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
  			}
  
  			if ( !$is_moderator )
***************
*** 478,484 ****
  
  			if ( isset($HTTP_POST_VARS['add']) )
  			{
! 				$username = ( isset($HTTP_POST_VARS['username']) ) ? $HTTP_POST_VARS['username'] : "";
  				
  				$sql = "SELECT user_id, user_email, user_lang, user_level  
  					FROM " . USERS_TABLE . " 
--- 471,477 ----
  
  			if ( isset($HTTP_POST_VARS['add']) )
  			{
! 				$username = ( isset($HTTP_POST_VARS['username']) ) ? htmlspecialchars($HTTP_POST_VARS['username']) : '';
  				
  				$sql = "SELECT user_id, user_email, user_lang, user_level  
  					FROM " . USERS_TABLE . " 
***************
*** 559,575 ****
  					include($phpbb_root_path . 'includes/emailer.'.$phpEx);
  					$emailer = new emailer($board_config['smtp_delivery']);
  
! 					$email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\n";
  
  					$emailer->use_template('group_added', $row['user_lang']);
  					$emailer->email_address($row['user_email']);
! 					$emailer->set_subject();//$lang['Group_added']
! 					$emailer->extra_headers($email_headers);
  
  					$emailer->assign_vars(array(
  						'SITENAME' => $board_config['sitename'], 
  						'GROUP_NAME' => $group_name,
! 						'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']), 
  
  						'U_GROUPCP' => $server_url . '?' . POST_GROUPS_URL . "=$group_id")
  					);
--- 552,568 ----
  					include($phpbb_root_path . 'includes/emailer.'.$phpEx);
  					$emailer = new emailer($board_config['smtp_delivery']);
  
! 					$emailer->from($board_config['board_email']);
! 					$emailer->replyto($board_config['board_email']);
  
  					$emailer->use_template('group_added', $row['user_lang']);
  					$emailer->email_address($row['user_email']);
! 					$emailer->set_subject($lang['Group_added']);
  
  					$emailer->assign_vars(array(
  						'SITENAME' => $board_config['sitename'], 
  						'GROUP_NAME' => $group_name,
! 						'EMAIL_SIG' => (!empty($board_config['board_email_sig'])) ? str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']) : '', 
  
  						'U_GROUPCP' => $server_url . '?' . POST_GROUPS_URL . "=$group_id")
  					);
***************
*** 691,700 ****
  							message_die(GENERAL_ERROR, 'Could not get user email information', '', __LINE__, __FILE__, $sql);
  						}
  
! 						$email_addresses = '';
! 						while( $row = $db->sql_fetchrow($result) )
  						{
! 							$email_addresses .= ( ( $email_addresses != '' ) ? ', ' : '' ) . $row['user_email'];
  						}
  
  						//
--- 684,693 ----
  							message_die(GENERAL_ERROR, 'Could not get user email information', '', __LINE__, __FILE__, $sql);
  						}
  
! 						$bcc_list = array();
! 						while ($row = $db->sql_fetchrow($result))
  						{
! 							$bcc_list[] = $row['user_email'];
  						}
  
  						//
***************
*** 714,730 ****
  						include($phpbb_root_path . 'includes/emailer.'.$phpEx);
  						$emailer = new emailer($board_config['smtp_delivery']);
  
! 						$email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\nBcc: " . $email_addresses . "\n";
  
  						$emailer->use_template('group_approved');
! 						$emailer->email_address($userdata['user_email']);
! 						$emailer->set_subject();//$lang['Group_approved']
! 						$emailer->extra_headers($email_headers);
  
  						$emailer->assign_vars(array(
  							'SITENAME' => $board_config['sitename'], 
  							'GROUP_NAME' => $group_name,
! 							'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']), 
  
  							'U_GROUPCP' => $server_url . '?' . POST_GROUPS_URL . "=$group_id")
  						);
--- 707,727 ----
  						include($phpbb_root_path . 'includes/emailer.'.$phpEx);
  						$emailer = new emailer($board_config['smtp_delivery']);
  
! 						$emailer->from($board_config['board_email']);
! 						$emailer->replyto($board_config['board_email']);
! 
! 						for ($i = 0; $i < count($bcc_list); $i++)
! 						{
! 							$emailer->bcc($bcc_list[$i]);
! 						}
  
  						$emailer->use_template('group_approved');
! 						$emailer->set_subject($lang['Group_approved']);
  
  						$emailer->assign_vars(array(
  							'SITENAME' => $board_config['sitename'], 
  							'GROUP_NAME' => $group_name,
! 							'EMAIL_SIG' => (!empty($board_config['board_email_sig'])) ? str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']) : '', 
  
  							'U_GROUPCP' => $server_url . '?' . POST_GROUPS_URL . "=$group_id")
  						);
***************
*** 1242,1248 ****
  			$template->assign_block_vars('switch_groups_remaining', array() );
  		}
  
! 		$s_hidden_fields = '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
  
  		$template->assign_vars(array(
  			'L_GROUP_MEMBERSHIP_DETAILS' => $lang['Group_member_details'],
--- 1241,1247 ----
  			$template->assign_block_vars('switch_groups_remaining', array() );
  		}
  
! 		$s_hidden_fields = '';
  
  		$template->assign_vars(array(
  			'L_GROUP_MEMBERSHIP_DETAILS' => $lang['Group_member_details'],