mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-23 16:33:17 +01:00
* eMail: support multipart/mixed mails with html parts to display (apple mail does that kind of emails)
This commit is contained in:
parent
9c51baae56
commit
acbf3c4301
@ -2314,7 +2314,7 @@ class felamimail_bo
|
||||
if ($mimePart->subType == 'PLAIN') $partText = $mimePart;
|
||||
} elseif($mimePart->type == 'TEXT' && $mimePart->subType == 'HTML' && $mimePart->bytes > 0) {
|
||||
$partHTML = $mimePart;
|
||||
} elseif ($mimePart->type == 'MULTIPART' && $mimePart->subType == 'RELATED' && is_array($mimePart->subParts)) {
|
||||
} elseif ($mimePart->type == 'MULTIPART' && ($mimePart->subType == 'RELATED' || $mimePart->subType == 'MIXED') && is_array($mimePart->subParts)) {
|
||||
// in a multipart alternative we treat the multipart/related as html part
|
||||
#$partHTML = array($mimePart);
|
||||
if (self::$debug) error_log(__METHOD__." process MULTIPART/RELATED with array as subparts");
|
||||
@ -2331,6 +2331,8 @@ class felamimail_bo
|
||||
if(is_object($partHTML)) {
|
||||
if($partHTML->subType == 'RELATED') {
|
||||
return $this->getMultipartRelated($_uid, $partHTML, $_htmlMode, $_preserveSeen);
|
||||
} elseif($partHTML->subType == 'MIXED') {
|
||||
return $this->getMultipartMixed($_uid, $partHTML, $_htmlMode, $_preserveSeen);
|
||||
} else {
|
||||
return $this->getTextPart($_uid, $partHTML, $_htmlMode, $_preserveSeen);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user