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

Ok, this goes back to the way it was with one change to make everything work well... It may not be RFC-compliant, but it works...

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@2843 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
dougk_ff7 2002-08-07 22:36:33 +00:00
parent b71f0c9400
commit 8b0f0905ef
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/emailer.php
View file

@ -130,6 +130,7 @@ class emailer
function parse_email() function parse_email()
{ {
global $lang;
@reset($this->vars); @reset($this->vars);
while (list($key, $val) = @each($this->vars)) while (list($key, $val) = @each($this->vars))
{ {
@ -147,7 +148,7 @@ class emailer
// do this here because the subject may contain a variable // do this here because the subject may contain a variable
// //
$match = array(); $match = array();
preg_match("/^(Subject:(.*?)(?:\r\n)+?)?(Charset:(.*?)(?:\r\n)+?)?(.*?)$/is", $this->msg, $match); preg_match("/^(Subject:(.*?)[\r\n]+?)?(Charset:(.*?)[\r\n]+?)?(.*?)$/is", $this->msg, $match);
$this->msg = ( isset($match[5]) ) ? trim($match[5]) : ''; $this->msg = ( isset($match[5]) ) ? trim($match[5]) : '';
$this->subject = ( $this->subject != '' ) ? $this->subject : trim($match[2]); $this->subject = ( $this->subject != '' ) ? $this->subject : trim($match[2]);
@ -207,6 +208,7 @@ class emailer
// //
function attachFile($filename, $mimetype = "application/octet-stream", $szFromAddress, $szFilenameToDisplay) function attachFile($filename, $mimetype = "application/octet-stream", $szFromAddress, $szFilenameToDisplay)
{ {
global $lang;
$mime_boundary = "--==================_846811060==_"; $mime_boundary = "--==================_846811060==_";
$this->mailMsg = '--' . $mime_boundary . "\nContent-Type: text/plain;\n\tcharset=\"" . $lang['ENCODING'] . "\"\n\n" . $this->mailMsg; $this->mailMsg = '--' . $mime_boundary . "\nContent-Type: text/plain;\n\tcharset=\"" . $lang['ENCODING'] . "\"\n\n" . $this->mailMsg;