holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Mail: inline images were not shown in Thunderbird

Browse Source 
we need to send a multipart/related with html-body as first part and inline images as further parts
This commit is contained in:
Ralf Becker 2015-06-19 14:20:57 +00:00
parent a602dd3e86
commit 2d63cfb10d
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
phpgwapi/inc/class.egw_mailer.inc.php
View File

@ -452,6 +452,28 @@ class egw_mailer extends Horde_Mime_Mail
'message_id' => (string)$message_id, 'message_id' => (string)$message_id,
), array(), true); // true = call all apps ), array(), true); // true = call all apps
// check if we are sending an html mail with inline images
if (!empty($this->_htmlBody) && count($this->_parts))
{
$related = null;
foreach($this->_parts as $n => $part)
{
if ($part->getDisposition() == 'inline' && $part->getContentId())
{
// we need to send a multipart/related with html-body as first part and inline images as further parts
if (!isset($related))
{
$related = new Horde_Mime_Part();
$related->setType('multipart/related');
$related[] = $this->_htmlBody;
$this->_htmlBody = $related;
}
$related[] = $part;
unset($this->_parts[$n]);
}
}
}
try { try {
parent::send($this->account->smtpTransport(), true, // true: keep Message-ID parent::send($this->account->smtpTransport(), true, // true: keep Message-ID
$this->_body->getType() != 'multipart/encrypted'); // no flowed for encrypted messages $this->_body->getType() != 'multipart/encrypted'); // no flowed for encrypted messages