mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-08 17:56:52 +02:00
Code Issues Releases Wiki Activity

The original functions_post notifications "fix" was absolute tosh ... this is my second attempt which remembers that emails may be in different languages ... also significant altered the email class subject/charset match ... hopefully fixes the various issues seen with this.

Browse Source 
git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@3134 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen
2002-11-28 01:46:43 +00:00
parent d51c358ddb
commit 0ea2745777
3 changed files with 48 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
phpBB/includes/emailer.php
View File

@@ -148,12 +148,24 @@ class emailer
// We now try and pull a subject from the email body ... if it exists,
// do this here because the subject may contain a variable
//
$drop_header = "";
$match = array();
preg_match("/^(Subject:(.*?)[\r\n]+?)?(Charset:(.*?)[\r\n]+?)?(.*?)$/is", $this->msg, $match);
if (preg_match('#^(Subject:(.*?))$#m', $this->msg, $match))
{
$this->subject = ( $this->subject != '' ) ? $this->subject : trim($match[2]);
$drop_header .= '[\r\n]*?' . $match[1];
}
$this->msg = ( isset($match[5]) ) ? trim($match[5]) : '';
$this->subject = ( $this->subject != '' ) ? $this->subject : trim($match[2]);
$this->encoding = ( trim($match[4]) != '' ) ? trim($match[4]) : $lang['ENCODING'];
if (preg_match('#^(Charset:(.*?))$#m', $this->msg, $match))
{
$this->encoding = (trim($match[2]) != '') ? trim($match[2]) : $lang['ENCODING'];
$drop_header .= '[\r\n]*?' . $match[1];
}
if ($drop_header != '')
{
$this->msg = trim(preg_replace('#' . $drop_header . '#s', '', $this->msg));
}
return true;
}
@@ -179,7 +191,7 @@ class emailer
// 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;
$this->extra_headers = $universal_extra . $this->extra_headers . " ---\n\n";
if ( $this->use_smtp )
{