Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2/includes emailer.php,1.15.2.2,1.15.2.3 functions_post.php,1.9.2.6,1.9.2.7 usercp_activate.php,1.6.2.2,1.6.2.3 usercp_email.php,1.7.2.2,1.7.2.3 usercp_register.php,1.20.2.10,1.20.2.11 usercp_sendpasswd.php,1.6.2.3,1.6.2.4
|
From: Paul S. O. <ps...@us...> - 2002-05-20 00:23:12
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv5901/includes
Modified Files:
Tag: phpBB-2_0_0
emailer.php functions_post.php usercp_activate.php
usercp_email.php usercp_register.php usercp_sendpasswd.php
Log Message:
Send only a newline for email headers ... breaks RFC but appears to work with mail() ... will undoubtedly lead to some problems for some users ...
Index: emailer.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/emailer.php,v
retrieving revision 1.15.2.2
retrieving revision 1.15.2.3
diff -C2 -r1.15.2.2 -r1.15.2.3
*** emailer.php 17 May 2002 13:13:34 -0000 1.15.2.2
--- emailer.php 20 May 2002 00:21:38 -0000 1.15.2.3
***************
*** 177,181 ****
// Add date and encoding type
//
! $universal_extra = "MIME-Version: 1.0\r\nContent-type: text/plain; charset=" . $this->encoding . "\r\nContent-transfer-encoding: 8bit\r\nDate: " . gmdate('D, d M Y H:i:s', time()) . " UT\r\n";
$this->extra_headers = $universal_extra . $this->extra_headers;
--- 177,181 ----
// Add date and encoding type
//
! $universal_extra = "MIME-Version: 1.0\nContent-type: text/plain; charset=" . $this->encoding . "\nContent-transfer-encoding: 8bit\nDate: " . gmdate('D, d M Y H:i:s', time()) . " UT\n";
$this->extra_headers = $universal_extra . $this->extra_headers;
Index: functions_post.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_post.php,v
retrieving revision 1.9.2.6
retrieving revision 1.9.2.7
diff -C2 -r1.9.2.6 -r1.9.2.7
*** functions_post.php 17 May 2002 18:22:36 -0000 1.9.2.6
--- functions_post.php 20 May 2002 00:21:38 -0000 1.9.2.7
***************
*** 631,635 ****
$server_port = ( $board_config['server_port'] <> 80 ) ? ':' . trim($board_config['server_port']) . '/' : '/';
! $email_headers = 'From: ' . $board_config['board_email'] . "\r\nReturn-Path: " . $board_config['board_email'] . "\r\n";
$update_watched_sql = '';
--- 631,635 ----
$server_port = ( $board_config['server_port'] <> 80 ) ? ':' . trim($board_config['server_port']) . '/' : '/';
! $email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\n";
$update_watched_sql = '';
Index: usercp_activate.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_activate.php,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -C2 -r1.6.2.2 -r1.6.2.3
*** usercp_activate.php 12 May 2002 17:57:34 -0000 1.6.2.2
--- usercp_activate.php 20 May 2002 00:21:38 -0000 1.6.2.3
***************
*** 63,67 ****
$emailer = new emailer($board_config['smtp_delivery']);
! $email_headers = 'From: ' . $board_config['board_email'] . "\r\nReturn-Path: " . $board_config['board_email'] . "\r\n";
$emailer->use_template('admin_welcome_activated', $row['user_lang']);
--- 63,67 ----
$emailer = new emailer($board_config['smtp_delivery']);
! $email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\n";
$emailer->use_template('admin_welcome_activated', $row['user_lang']);
Index: usercp_email.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_email.php,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -C2 -r1.7.2.2 -r1.7.2.3
*** usercp_email.php 17 May 2002 13:13:35 -0000 1.7.2.2
--- usercp_email.php 20 May 2002 00:21:38 -0000 1.7.2.3
***************
*** 95,103 ****
$emailer = new emailer($board_config['smtp_delivery']);
! $email_headers = 'Return-Path: ' . $userdata['user_email'] . "\r\nFrom: " . $userdata['user_email'] . "\r\n";
! $email_headers .= 'X-AntiAbuse: Board servername - ' . $server_name . "\r\n";
! $email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\r\n";
! $email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\r\n";
! $email_headers .= 'X-AntiAbuse: User IP - ' . decode_ip($user_ip) . "\r\n";
$emailer->use_template('profile_send_email', $user_lang);
--- 95,103 ----
$emailer = new emailer($board_config['smtp_delivery']);
! $email_headers = 'Return-Path: ' . $userdata['user_email'] . "\nFrom: " . $userdata['user_email'] . "\n";
! $email_headers .= 'X-AntiAbuse: Board servername - ' . $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 - ' . decode_ip($user_ip) . "\n";
$emailer->use_template('profile_send_email', $user_lang);
***************
*** 118,122 ****
if ( !empty($HTTP_POST_VARS['cc_email']) )
{
! $email_headers = 'Return-Path: ' . $userdata['user_email'] . "\r\nFrom: " . $userdata['user_email'] . "\r\n";
$emailer->use_template('profile_send_email');
$emailer->email_address($userdata['user_email']);
--- 118,122 ----
if ( !empty($HTTP_POST_VARS['cc_email']) )
{
! $email_headers = 'Return-Path: ' . $userdata['user_email'] . "\nFrom: " . $userdata['user_email'] . "\n";
$emailer->use_template('profile_send_email');
$emailer->email_address($userdata['user_email']);
Index: usercp_register.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_register.php,v
retrieving revision 1.20.2.10
retrieving revision 1.20.2.11
diff -C2 -r1.20.2.10 -r1.20.2.11
*** usercp_register.php 19 May 2002 13:20:16 -0000 1.20.2.10
--- usercp_register.php 20 May 2002 00:21:38 -0000 1.20.2.11
***************
*** 425,429 ****
$emailer = new emailer($board_config['smtp_delivery']);
! $email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
$emailer->use_template('user_activate', stripslashes($user_lang));
--- 425,429 ----
$emailer = new emailer($board_config['smtp_delivery']);
! $email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\n";
$emailer->use_template('user_activate', stripslashes($user_lang));
***************
*** 544,548 ****
$emailer = new emailer($board_config['smtp_delivery']);
! $email_headers = "From: " . $board_config['board_email'] . "\r\nReturn-Path: " . $board_config['board_email'] . "\r\n";
$emailer->use_template($email_template, stripslashes($user_lang));
--- 544,548 ----
$emailer = new emailer($board_config['smtp_delivery']);
! $email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\n";
$emailer->use_template($email_template, stripslashes($user_lang));
Index: usercp_sendpasswd.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_sendpasswd.php,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -C2 -r1.6.2.3 -r1.6.2.4
*** usercp_sendpasswd.php 19 May 2002 13:20:17 -0000 1.6.2.3
--- usercp_sendpasswd.php 20 May 2002 00:21:38 -0000 1.6.2.4
***************
*** 66,70 ****
$emailer = new emailer($board_config['smtp_delivery']);
! $email_headers = 'From: ' . $board_config['board_email'] . "\r\nReturn-Path: " . $board_config['board_email'] . "\r\n";
$emailer->use_template('user_activate_passwd', $row['user_lang']);
--- 66,70 ----
$emailer = new emailer($board_config['smtp_delivery']);
! $email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\n";
$emailer->use_template('user_activate_passwd', $row['user_lang']);
|
