[Phpbb-checkins] CVS: phpBB2 groupcp.php,1.58.2.4,1.58.2.5 privmsg.php,1.96.2.6,1.96.2.7

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

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

Modified Files:
      Tag: phpBB-2_0_0
	groupcp.php privmsg.php 
Log Message:
Send only a newline for email headers ... breaks RFC but appears to work with mail() ... will undoubtedly lead to some problems for some users ...

Index: groupcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/groupcp.php,v
retrieving revision 1.58.2.4
retrieving revision 1.58.2.5
diff -C2 -r1.58.2.4 -r1.58.2.5
*** groupcp.php	13 May 2002 13:18:17 -0000	1.58.2.4
--- groupcp.php	20 May 2002 00:21:09 -0000	1.58.2.5
***************
*** 278,282 ****
  	$emailer = new emailer($board_config['smtp_delivery']);
  
! 	$email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
  
  	$emailer->use_template('group_request', $moderator['user_lang']);
--- 278,282 ----
  	$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']);
***************
*** 560,564 ****
  					$emailer = new emailer($board_config['smtp_delivery']);
  
! 					$email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
  
  					$emailer->use_template('group_added', $row['user_lang']);
--- 560,564 ----
  					$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']);
***************
*** 715,719 ****
  						$emailer = new emailer($board_config['smtp_delivery']);
  
! 						$email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\nBcc: " . $email_addresses . "\r\n";
  
  						$emailer->use_template('group_approved');
--- 715,719 ----
  						$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');

Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.96.2.6
retrieving revision 1.96.2.7
diff -C2 -r1.96.2.6 -r1.96.2.7
*** privmsg.php	13 May 2002 13:18:17 -0000	1.96.2.6
--- privmsg.php	20 May 2002 00:21:10 -0000	1.96.2.7
***************
*** 1128,1132 ****
  			if ( $to_userdata['user_notify_pm'] && !empty($to_userdata['user_email']) && $to_userdata['user_active'] )
  			{
! 				$email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
  
  				$script_name = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($board_config['script_path']));
--- 1128,1132 ----
  			if ( $to_userdata['user_notify_pm'] && !empty($to_userdata['user_email']) && $to_userdata['user_active'] )
  			{
! 				$email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\n";
  
  				$script_name = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($board_config['script_path']));