[mxbb-commits] mx_contact/admin admin_contact.php, 1.2, 1.3 admin_mass_mail.php, 1.5, 1.6 admin_mas

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	admin_contact.php 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** admin_mass_mail.php	18 Dec 2008 04:04:41 -0000	1.5
--- admin_mass_mail.php	25 Dec 2008 08:49:37 -0000	1.6
***************
*** 20,25 ****
   *
   ***************************************************************************/
! $def_wait = 5;
! $def_size = 2;
  
  define('IN_PHPBB', 1);
--- 20,25 ----
   *
   ***************************************************************************/
! $def_wait = 2;
! $def_size = 1;
  
  define('IN_PHPBB', 1);
***************
*** 226,259 ****
  		}
  
  		
  		$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);	
  		$emailer->use_template('contact_send_email');
  		$emailer->email_address($board_config['board_email']);
  		$emailer->set_subject(htmlspecialchars_decode($subject));
! 		$emailer->extra_headers($email_headers);
  	
  		$emailer->assign_vars(array(
--- 226,265 ----
  		}
  
+ 		$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);	
  		$emailer->use_template('contact_send_email');
  		$emailer->email_address($board_config['board_email']);
  		$emailer->set_subject(htmlspecialchars_decode($subject));
! 		$emailer->extra_headers($email_antetes);
  	
  		$emailer->assign_vars(array(

Index: admin_mass_newsletter.php
===================================================================
RCS file: /cvsroot/mxbb/mx_contact/admin/admin_mass_newsletter.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** admin_mass_newsletter.php	18 Dec 2008 04:04:41 -0000	1.6
--- admin_mass_newsletter.php	25 Dec 2008 08:49:37 -0000	1.7
***************
*** 21,25 ****
   *
   ***************************************************************************/
! $def_wait = 5;
  $def_size = 1;
  
--- 21,25 ----
   *
   ***************************************************************************/
! $def_wait = 2;
  $def_size = 1;
  

Index: admin_contact.php
===================================================================
RCS file: /cvsroot/mxbb/mx_contact/admin/admin_contact.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** admin_contact.php	4 Oct 2008 07:44:53 -0000	1.2
--- admin_contact.php	25 Dec 2008 08:49:37 -0000	1.3
***************
*** 205,208 ****
--- 205,209 ----
  	'L_MOD' => $lang['auth_mods'],
  	'L_ADMIN' => $lang['auth_admins'],
+ 	'L_DOMAINKEY_SIG' => $lang['domainkey_signature'],
  
  	'L_FORM_ENABLE' => $lang['Form_Enable'],
***************
*** 244,247 ****
--- 245,249 ----
  	'FILE_ROOT' => $contact_config['contact_file_root'],
  	'CHAR_LIMIT' => $contact_config['contact_char_limit'],
+ 	'DOMAINKEY_SIG' => $contact_config['domainkey_signature'],	
  
  	'COPYRIGHT' => $lang['Copyright'],

[mxbb-commits] mx_contact/admin admin_contact.php, 1.2, 1.3 admin_mass_mail.php, 1.5, 1.6 admin_mas

[mxbb-commits] mx_contact/admin admin_contact.php, 1.2, 1.3 admin_mass_mail.php, 1.5, 1.6 admin_mass_newsletter.php, 1.6, 1.7