[mxbb-commits] mx_contact/admin admin_mass_mail.php, 1.6, 1.7 admin_mass_newsletter.php, 1.7, 1.8

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

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

Modified Files:
	admin_mass_mail.php admin_mass_newsletter.php 
Log Message:
fix

Index: admin_mass_mail.php
===================================================================
RCS file: /cvsroot/mxbb/mx_contact/admin/admin_mass_mail.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** admin_mass_mail.php	25 Dec 2008 08:49:37 -0000	1.6
--- admin_mass_mail.php	25 Dec 2008 13:08:01 -0000	1.7
***************
*** 231,236 ****
  	
  		$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) ? $board_config['board_email'] : . $bcc_list . "\n";		
  		$email_antetes .= "In-Reply-To: " . $userdata['user_email'] . "\n";
  		$email_antetes .= "Return-Path: <" . $board_config['board_email'] . ">" . "\n";
--- 231,236 ----
  	
  		$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) ? $board_config['board_email'] : $bcc_list . "\n";		
  		$email_antetes .= "In-Reply-To: " . $userdata['user_email'] . "\n";
  		$email_antetes .= "Return-Path: <" . $board_config['board_email'] . ">" . "\n";

Index: admin_mass_newsletter.php
===================================================================
RCS file: /cvsroot/mxbb/mx_contact/admin/admin_mass_newsletter.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** admin_mass_newsletter.php	25 Dec 2008 08:49:37 -0000	1.7
--- admin_mass_newsletter.php	25 Dec 2008 13:08:01 -0000	1.8
***************
*** 227,255 ****
  		}
  
! 
! 		$emailer = new emailer($board_config['smtp_delivery']);
  		
  		
! 		$email_headers = "From: " . $board_config['board_email'] . "\n";
! 		$email_headers .= "Reply-To: " . $userdata['user_email'] . "\n";
! 		$email_headers .= "Return-Path: <" . $board_config['board_email'] . ">" . "\n";
! 		$email_headers .= "Sender: <" . $userdata["user_email"] . ">" . "\n";
! 		$email_headers .= "MIME-Version: 1.0" . "\n";
! 		$email_headers .= "Message-ID: <" . md5(phpBB3::unique_id(time())) . "@" . $board_config['server_name'] . ">" . "\n";
! 		$email_headers .= "Date: " . date("r", time()) . "\n";
! 		$email_headers .= "Content-Type: text/html; charset=UTF-8" . "\n"; // format=flowed
! 		$email_headers .= "Content-Transfer-Encoding: 8bit" . "\n"; // 7bit
  
! 		$email_headers .= "X-Priority: 3" . "\n";
! 		$email_headers .= "X-MSMail-Priority: Normal" . "\n";
! 		$email_headers .= "X-Mailer: MXP3" . "\n";
! 		$email_headers .= "X-MimeOLE: Produced By Mx-Publisher " . PORTAL_VERSION . "\n";
! 		$email_headers .= "X-phpBB-Origin: phpbb://" . str_replace(array('http://', 'https://'), array('', ''), generate_contact_url()) . "\n";
   
! 		$email_headers .= "X-AntiAbuse: Board servername - " . $board_config['server_name'] . "\n";
! 		$email_headers .= "X-AntiAbuse: User_id - " . $userdata['user_id'] . "\n";
! 		$email_headers .= "X-AntiAbuse: Username - " . $userdata['username'] . "\n";
! 		$email_headers .= "X-AntiAbuse: User IP - " . contact_decode_ip($user_ip) . "\n";
! 		$email_headers .= "Bcc: $bcc_list\n";
  		
  		$emailer->set_mail_html(true);
--- 227,260 ----
  		}
  
! 		$domainkey_signature = $contact_config['domainkey_signature'];
  		
+ 		$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) ? $board_config['board_email'] : $bcc_list . "\n";		
+ 		$email_antetes .= "In-Reply-To: " . $userdata['user_email'] . "\n";
+ 		$email_antetes .= "Return-Path: <" . $board_config['board_email'] . ">" . "\n";
+ 		//$email_antetes .= "Sender: <" . $userdata["user_email"] . ">" . "\n";
+ 		$email_antetes .= "MIME-Version: 1.0" . "\n";
+ 		//$email_antetes .= $dkim_signature . "\n";					 
+ 		$email_antetes .= "Message-ID: <" . md5(phpBB3::unique_id(time())) . "@" . $board_config['server_name'] . ">" . "\n";
+ 		$email_antetes .= "Date: " . date("r", time()) . "\n";
+ 		$email_antetes .= "Content-Type: text/html; charset=UTF-8" . "\n"; // format=flowed
+ 		$email_antetes .= "Content-Transfer-Encoding: 8bit" . "\n"; // 7bit
  		
! 		$email_antetes .= "DomainKey-Signature: a=rsa-sha1; c=nofws; d=" . $portal_config['server_name'] . "; s=gamma; h=message-id:date:from:to:subject:cc:bcc:in-reply-to:return-path:mime-version:message-id:date:content-type:content-transfer-encoding:references;b=" . $domainkey_signature . "\n";		
  
! 		$email_antetes .= "X-Priority: 3" . "\n";
! 		$email_antetes .= "X-MSMail-Priority: Normal" . "\n";
! 		$email_antetes .= "X-Mailer: MXP3" . "\n";
! 		$email_antetes .= "X-MimeOLE: Produced By Mx-Publisher CMS" . PORTAL_VERSION . "\n";
! 		$email_antetes .= "X-MXP-Origin: mxp://" . str_replace(array('http://', 'https://'), array('', ''), generate_contact_url()) . "\n";
   
! 		$email_antetes .= "X-AntiAbuse: Board ServerName - " . $board_config['server_name'] . "\n";
! 		$email_antetes .= "X-AntiAbuse: User_id - " . $userdata['user_id'] . "\n";
! 		$email_antetes .= "X-AntiAbuse: UserName - " . $userdata['username'] . "\n";
! 		$email_antetes .= "X-AntiAbuse: User_Level - " . ($userdata['user_level'] == ADMIN) ? "Portal Admin" : "User Level: " . $userdata['user_level'] . "\n";		
! 		$email_antetes .= "X-AntiAbuse: User_IP - " . contact_decode_ip($user_ip) . "\n";
  		
  		$emailer->set_mail_html(true);