mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Send only a newline for email headers ... breaks RFC but appears to work with mail() ... will undoubtedly lead to some problems for some users ...

Browse Source 
git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@2605 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen
2002-05-20 00:21:38 +00:00
parent f489b53ddb
commit a30a2969f2
8 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
phpBB/includes/usercp_email.php
View File

@@ -94,11 +94,11 @@ if ( $result = $db->sql_query($sql) )
include($phpbb_root_path . 'includes/emailer.'.$phpEx);
$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";
$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);
$emailer->email_address($user_email);
@@ -117,7 +117,7 @@ if ( $result = $db->sql_query($sql) )
if ( !empty($HTTP_POST_VARS['cc_email']) )
{
$email_headers = 'Return-Path: ' . $userdata['user_email'] . "\r\nFrom: " . $userdata['user_email'] . "\r\n";
$email_headers = 'Return-Path: ' . $userdata['user_email'] . "\nFrom: " . $userdata['user_email'] . "\n";
$emailer->use_template('profile_send_email');
$emailer->email_address($userdata['user_email']);
$emailer->set_subject($subject);