[mxbb-commits] mx_contact/admin admin_mass_mail.php,1.10,1.11

[FlorinCB <ory...@us...>]

Update of /cvsroot/mxbb/mx_contact/admin
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23497/mx_contact/admin

Modified Files:
	admin_mass_mail.php 
Log Message:
some fixed here and there not comitted

Index: admin_mass_mail.php
===================================================================
RCS file: /cvsroot/mxbb/mx_contact/admin/admin_mass_mail.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** admin_mass_mail.php	1 Jan 2009 07:30:51 -0000	1.10
--- admin_mass_mail.php	23 Oct 2009 07:46:42 -0000	1.11
***************
*** 227,233 ****
  
  		$emailer = new emailer($board_config['smtp_delivery']);
! 	
  		$email_antetes = "From: " . $userdata['username'] . " <" . $userdata['user_email'] . ">" . "\n";
! 		$email_antetes .= "To: " . ($def_size == 1) ? $bcc_list : $board_config['board_email'] . "\n";
  		$email_antetes .= "Bcc: " . ($def_size == 1) ? '' : $bcc_list . "\n";		
  		$email_antetes .= "In-Reply-To: " . $userdata['user_email'] . "\n";
--- 227,237 ----
  
  		$emailer = new emailer($board_config['smtp_delivery']);
! 		
! 		$emailer_from = $userdata['user_email'];
! 		$emailer_to = $board_config['board_email'];
! 		$emailer_skip = ($emailer_to == $emailer_from) ? $emailer_to : false;
! 
  		$email_antetes = "From: " . $userdata['username'] . " <" . $userdata['user_email'] . ">" . "\n";
! 		$email_antetes .= "To: " . ($def_size == 1) ? $bcc_list : $emailer_to . "\n";
  		$email_antetes .= "Bcc: " . ($def_size == 1) ? '' : $bcc_list . "\n";		
  		$email_antetes .= "In-Reply-To: " . $userdata['user_email'] . "\n";
***************
*** 258,261 ****
--- 262,266 ----
  		$emailer->set_mail_html(true);	
  		$emailer->use_template('contact_send_email');
+ 		$emailer->email_skip($emailer_skip);		
  		$emailer->email_address($board_config['board_email']);
  		$emailer->set_subject(htmlspecialchars_decode($subject));