[Phpbb-checkins] CVS: phpBB2/admin admin_mass_email.php,1.11,1.12

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

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

Modified Files:
	admin_mass_email.php 
Log Message:
Hopefully some fixes for the mass email bugs on win32 Systems... We'll Know soon :D


Index: admin_mass_email.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_mass_email.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** admin_mass_email.php	2002/01/24 02:51:00	1.11
--- admin_mass_email.php	2002/01/29 16:01:04	1.12
***************
*** 92,97 ****
  	{
  		include($phpbb_root_path . 'includes/emailer.'.$phpEx);
  		$emailer = new emailer($board_config['smtp_delivery']);
! 
  		$email_headers = "From: " . $board_config['board_email'] . "\n";
  
--- 92,108 ----
  	{
  		include($phpbb_root_path . 'includes/emailer.'.$phpEx);
+ 		//
+ 		// Let's do some checking to make sure that mass mail functions
+ 		// are working in win32 versions of php.
+ 		//
+ 		if( preg_match('/[c-z]:\\\.*/i', getenv('PATH')) && !$board_config['smtp_delivery'])
+ 		{
+ 			// We are running on windows, force delivery to use
+ 			// our smtp functions since php's are broken by default
+ 			$board_config['smtp_delivery'] = 1;
+ 			$board_config['smtp_host'] = get_cfg_var('SMTP');
+ 		}
  		$emailer = new emailer($board_config['smtp_delivery']);
! 	
  		$email_headers = "From: " . $board_config['board_email'] . "\n";
  
***************
*** 182,184 ****
  include('page_footer_admin.'.$phpEx);
  
! ?>
\ No newline at end of file
--- 193,195 ----
  include('page_footer_admin.'.$phpEx);
  
! ?>