extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 09:09:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixing the fix ;-)

Browse Source
This commit is contained in:
Ralf Becker 2015-10-21 14:36:18 +00:00
parent 2f5b40d2d9
commit 804d558e68
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -505,13 +505,25 @@ class egw_mailer extends Horde_Mime_Mail
} }
try { try {
// no flowed for encrypted messages
$flowed = $this->_body && $this->_body->getType() != 'multipart/encrypted';
// handling of alternativ body // handling of alternativ body
if (!empty($this->_alternateBody)) if (!empty($this->_alternativBody))
{ {
$body = new Horde_Mime_Part(); $body = new Horde_Mime_Part();
$body->setType('multipart/alternative'); $body->setType('multipart/alternative');
if (!empty($this->_body)) if (!empty($this->_body))
{ {
// Send in flowed format.
if ($flowed)
{
$text_flowed = new Horde_Text_Flowed($this->_body->getContents(), $this->_body->getCharset());
$text_flowed->setDelSp(true);
$this->_body->setContentTypeParameter('format', 'flowed');
$this->_body->setContentTypeParameter('DelSp', 'Yes');
$this->_body->setContents($text_flowed->toFlowed());
}
$body[] = $this->_body; $body[] = $this->_body;
} }
if (!empty($this->_htmlBody)) if (!empty($this->_htmlBody))
@ -521,11 +533,9 @@ class egw_mailer extends Horde_Mime_Mail
} }
$body[] = $this->_alternativBody; $body[] = $this->_alternativBody;
unset($this->_alternativBody); unset($this->_alternativBody);
$this->setBody($body); $this->_body = $body;
$flowed = false;
} }
// no flowed for encrypted messages
$flowed = $this->_body && $this->_body->getType() != 'multipart/encrypted';
parent::send($this->account->smtpTransport(), true, $flowed); // true: keep Message-ID parent::send($this->account->smtpTransport(), true, $flowed); // true: keep Message-ID
} }
catch (Exception $e) { catch (Exception $e) {