[Phpbb-checkins] CVS: phpBB2/includes smtp.php,1.7,1.8

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

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

Modified Files:
	smtp.php 
Log Message:
This should fix bug #500134 and adds some additional error checking on smtp email sends...


Index: smtp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/smtp.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** smtp.php	2002/01/28 21:03:25	1.7
--- smtp.php	2002/01/28 21:56:56	1.8
***************
*** 150,155 ****
  	while( list( , $mail_to_address ) = each( $mail_to_array ))
  	{
! 		fputs( $socket, "RCPT TO: $mail_to_address\r\n" );
! 		server_parse( $socket, "250" );
  		$to_header .= "<$mail_to_address>, ";
  	}
--- 150,162 ----
  	while( list( , $mail_to_address ) = each( $mail_to_array ))
  	{
! 		//
! 		// Add an additional bit of error checking to the To field.
! 		//
! 		$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" );
! 		}
  		$to_header .= "<$mail_to_address>, ";
  	}
***************
*** 158,169 ****
  	while( list( , $bcc_address ) = each( $bcc ))
  	{
! 		fputs( $socket, "RCPT TO: $bcc_address\r\n" );
! 		server_parse( $socket, "250" );
  	}
  	@reset( $cc );
  	while( list( , $cc_address ) = each( $cc ))
  	{
! 		fputs($socket, "RCPT TO: $cc_address\r\n");
! 		server_parse($socket, "250");
  	}
  	// Ok now we tell the server we are ready to start sending data
--- 165,190 ----
  	while( list( , $bcc_address ) = each( $bcc ))
  	{
! 		//
! 		// Add an additional bit of error checking to bcc header...
! 		//
! 		$bcc_address = trim( $bcc_address );
! 		if ( preg_match('/.+\@.+/', $bcc_address) )
! 		{
! 			fputs( $socket, "RCPT TO: $bcc_address\r\n" );
! 			server_parse( $socket, "250" );
! 		}
  	}
  	@reset( $cc );
  	while( list( , $cc_address ) = each( $cc ))
  	{
! 		//
! 		// Add an additional bit of error checking to cc header
! 		//
! 		$cc_address = trim( $cc_address );
! 		if ( preg_match('/.+\@.+/', $cc_address) )
! 		{
! 			fputs($socket, "RCPT TO: $cc_address\r\n");
! 			server_parse($socket, "250");
! 		}
  	}
  	// Ok now we tell the server we are ready to start sending data