[mxbb-commits] mx_contact/admin admin_mass_newsletter.php, 1.12, 1.13

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

Update of /cvsroot/mxbb/mx_contact/admin
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19487/admin

Modified Files:
	admin_mass_newsletter.php 
Log Message:
fixing

Index: admin_mass_newsletter.php
===================================================================
RCS file: /cvsroot/mxbb/mx_contact/admin/admin_mass_newsletter.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** admin_mass_newsletter.php	7 Jan 2009 11:39:33 -0000	1.12
--- admin_mass_newsletter.php	15 Dec 2009 09:03:45 -0000	1.13
***************
*** 231,242 ****
  	
  		$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";
! 		$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
--- 231,239 ----
  	
  		$email_antetes = "From: " . $userdata['username'] . " <" . $userdata['user_email'] . ">" . "\n";
! 		$email_antetes .= "To: " . $board_config['board_email'] . "\n";
  		$email_antetes .= "Bcc: " . ($def_size == 1) ? '' : $bcc_list . "\n";		
! 		$email_antetes .= "Return-Path: ". $board_config['board_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
***************
*** 254,259 ****
  		$email_antetes .= "X-AntiAbuse: User_id - " . $userdata['user_id'] . "\n";
  		$email_antetes .= "X-AntiAbuse: UserName - " . $userdata['username'] . "\n";
! 		$email_antetes .= "X-AntiAbuse: User_IP - " . contact_decode_ip($user_ip) . "\n";
! 		$email_antetes .= "X-AntiAbuse: User_Level - " . ($userdata['user_level'] == ADMIN) ? "Portal Admin" : "User Level: " . $userdata['user_level'] . "\n";
  		$email_antetes .= "\n";
  		
--- 251,255 ----
  		$email_antetes .= "X-AntiAbuse: User_id - " . $userdata['user_id'] . "\n";
  		$email_antetes .= "X-AntiAbuse: UserName - " . $userdata['username'] . "\n";
! 		$email_antetes .= "X-AntiAbuse: User_IP - " . contact_decode_ip($user_ip) . "\n"; //$email_antetes .= "X-AntiAbuse: User_Level - " . ($userdata['user_level'] == ADMIN) ? "Portal Admin" : "User Level: " . $userdata['user_level'] . "\n";
  		$email_antetes .= "\n";