[Phpbb-checkins] CVS: phpBB2/includes smtp.php,1.12,1.13

[Jonathan H. <the...@us...>]

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

Modified Files:
	smtp.php 
Log Message:
Fix for various smtp issues reported in bugtracker


Index: smtp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/smtp.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** smtp.php	10 Feb 2002 13:04:14 -0000	1.12
--- smtp.php	12 Mar 2002 17:36:08 -0000	1.13
***************
*** 154,158 ****
  	// From this point onward most server response codes should be 250
  	// Specify who the mail is from....
! 	fputs($socket, "MAIL FROM: " . $board_config['board_email'] . "\r\n");
  	server_parse($socket, "250");
  
--- 154,158 ----
  	// From this point onward most server response codes should be 250
  	// Specify who the mail is from....
! 	fputs($socket, "MAIL FROM: <" . $board_config['board_email'] . ">\r\n");
  	server_parse($socket, "250");
  
***************
*** 166,172 ****
  		//
  		$mail_to_address = trim($mail_to_address);
! 		if ( preg_match('/.+\@.+/', $mail_to_address) )
  		{
! 			fputs( $socket, "RCPT TO: $mail_to_address\r\n" );
  			server_parse( $socket, "250" );
  		}
--- 166,172 ----
  		//
  		$mail_to_address = trim($mail_to_address);
! 		if ( preg_match('/[^ ]+\@[^ ]+/', $mail_to_address) )
  		{
! 			fputs( $socket, "RCPT TO: <$mail_to_address>\r\n" );
  			server_parse( $socket, "250" );
  		}
***************
*** 181,187 ****
  		//
  		$bcc_address = trim( $bcc_address );
! 		if ( preg_match('/.+\@.+/', $bcc_address) )
  		{
! 			fputs( $socket, "RCPT TO: $bcc_address\r\n" );
  			server_parse( $socket, "250" );
  		}
--- 181,187 ----
  		//
  		$bcc_address = trim( $bcc_address );
! 		if ( preg_match('/[^ ]+\@[^ ]+/', $bcc_address) )
  		{
! 			fputs( $socket, "RCPT TO: <$bcc_address>\r\n" );
  			server_parse( $socket, "250" );
  		}
***************
*** 194,200 ****
  		//
  		$cc_address = trim( $cc_address );
! 		if ( preg_match('/.+\@.+/', $cc_address) )
  		{
! 			fputs($socket, "RCPT TO: $cc_address\r\n");
  			server_parse($socket, "250");
  		}
--- 194,200 ----
  		//
  		$cc_address = trim( $cc_address );
! 		if ( preg_match('/[^ ]+\@[^ ]+/', $cc_address) )
  		{
! 			fputs($socket, "RCPT TO: <$cc_address>\r\n");
  			server_parse($socket, "250");
  		}
***************
*** 229,231 ****
  }
  
! ?>
\ No newline at end of file
--- 229,231 ----
  }
  
! ?>