Menu
▾
▴
[mxbb-commits] mx_contact/admin admin_mass_mail.php, 1.4, 1.5 admin_mass_newsletter.php, 1.5, 1.6
|
From: FlorinCB <ory...@us...> - 2008-12-18 04:04:45
|
Update of /cvsroot/mxbb/mx_contact/admin In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv6382 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.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** admin_mass_mail.php 18 Dec 2008 03:49:01 -0000 1.4 --- admin_mass_mail.php 18 Dec 2008 04:04:41 -0000 1.5 *************** *** 230,253 **** $email_headers = "From: " . $board_config['board_email'] . "\n"; ! ! $email_headers .= 'Reply-To: ' . $userdata['board_email']; ! $email_headers .= 'Return-Path: <' . $board_config['board_email'] . '>' . "\n"; ! $email_headers .= 'Sender: <' . $userdata['board_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"; --- 230,252 ---- $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"; Index: admin_mass_newsletter.php =================================================================== RCS file: /cvsroot/mxbb/mx_contact/admin/admin_mass_newsletter.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** admin_mass_newsletter.php 18 Dec 2008 03:49:01 -0000 1.5 --- admin_mass_newsletter.php 18 Dec 2008 04:04:41 -0000 1.6 *************** *** 232,255 **** $email_headers = "From: " . $board_config['board_email'] . "\n"; ! ! $email_headers .= 'Reply-To: ' . $userdata['board_email']; ! $email_headers .= 'Return-Path: <' . $board_config['board_email'] . '>' . "\n"; ! $email_headers .= 'Sender: <' . $userdata['board_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"; --- 232,254 ---- $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"; |
