Bug #18667 ยป 8199.patch
t3lib/class.t3lib_htmlmail.php (working copy) | ||
---|---|---|
$this->add_message("This is a multi-part message in MIME format.\n");
|
||
$this->constructMixed($boundary);
|
||
} elseif ($this->theParts['html']['content']) { // Generate plain/HTML mail
|
||
$this->add_header('Content-Type: '.$this->getHTMLContentType());
|
||
$this->add_header('Content-Type: '.$this->getHTMLContentType().';');
|
||
$this->add_header(' boundary="'.$boundary.'"');
|
||
$this->add_message("This is a multi-part message in MIME format.\n");
|
||
$this->constructHTML($boundary);
|
||
... | ... | |
if ($this->theParts['html']['content']) { // HTML and plain is added
|
||
$newBoundary = $this->getBoundary();
|
||
$this->add_message("Content-Type: ".$this->getHTMLContentType());
|
||
$this->add_message('Content-Type: '.$this->getHTMLContentType().';');
|
||
$this->add_message(' boundary="'.$newBoundary.'"');
|
||
$this->add_message('');
|
||
$this->constructHTML($newBoundary);
|
||
... | ... | |
// attachments are added
|
||
if (is_array($this->theParts['attach'])) {
|
||
foreach($this->theParts['attach'] as $media) {
|
||
$this->add_message("--".$boundary);
|
||
$this->add_message("Content-Type: ".$media['content_type']);
|
||
$this->add_message('--'.$boundary);
|
||
$this->add_message('Content-Type: '.$media['content_type'].';');
|
||
$this->add_message(' name="'.$media['filename'].'"');
|
||
$this->add_message('Content-Transfer-Encoding: base64');
|
||
$this->add_message('Content-Disposition: attachment;');
|
||
... | ... | |
case 'swf':
|
||
$res['content_type'] = 'application/x-shockwave-flash';
|
||
break;
|
||
case 'pdf':
|
||
$res['content_type'] = 'application/pdf';
|
||
break;
|
||
default:
|
||
$res['content_type'] = $this->getMimeType($url);
|
||
}
|