makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

ok, this should work now for mail() and smtpmail. We also removed the newline from the spacer for mail_encode due to php's mail() function choking up on subjects with newlines.

Browse source 
git-svn-id: file:///svn/phpbb/trunk@6574 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-11-12 18:44:42 +00:00
parent adea08faef
commit 85ddd3ea84
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
phpBB/includes/functions_messenger.php
View file

@ -309,12 +309,15 @@ class messenger
$headers[] = 'X-MimeOLE: phpBB3'; $headers[] = 'X-MimeOLE: phpBB3';
$headers[] = 'X-phpBB-Origin: phpbb://' . str_replace(array('http://', 'https://'), array('', ''), generate_board_url()); $headers[] = 'X-phpBB-Origin: phpbb://' . str_replace(array('http://', 'https://'), array('', ''), generate_board_url());
// We use \n here instead of \r\n because our smtp mailer is adjusting it to \r\n automatically, whereby the php mail function only works
// if using \n.
if (sizeof($this->extra_headers)) if (sizeof($this->extra_headers))
{ {
$headers[] = implode("\r\n", $this->extra_headers); $headers[] = implode("\n", $this->extra_headers);
} }
return implode("\r\n", $headers); return implode("\n", $headers);
} }
/** /**
@ -752,7 +755,7 @@ function smtpmail($addresses, $subject, $message, &$err_msg, $headers = '')
{ {
if (is_array($headers)) if (is_array($headers))
{ {
$headers = (sizeof($headers) > 1) ? join("\r\n", $headers) : $headers[0]; $headers = (sizeof($headers) > 1) ? join("\n", $headers) : $headers[0];
} }
$headers = chop($headers); $headers = chop($headers);
@ -1379,9 +1382,7 @@ function mail_encode($str)
// define start delimimter, end delimiter and spacer // define start delimimter, end delimiter and spacer
$end = '?='; $end = '?=';
$start = '=?UTF-8?B?'; $start = '=?UTF-8?B?';
$spacer = "$end $start";
// It may sound strange, but within my tests using \n instead of \r\n seem to work better
$spacer = "$end\n $start";
// determine length of encoded text within chunks and ensure length is even // determine length of encoded text within chunks and ensure length is even
$length = 76 - strlen($start) - strlen($end); $length = 76 - strlen($start) - strlen($end);