extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-24 14:58:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

more finetunig and debug, as of garbled content / contenttypes

Browse Source
This commit is contained in:
Klaus Leithoff 2015-04-30 13:37:20 +00:00
parent 9ce25811e5
commit e2ee8b9771
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mail/inc/class.mail_activesync.inc.php
View File

@ -502,6 +502,7 @@ class mail_activesync implements activesync_plugin_write, activesync_plugin_send
{ {
$bodyObj = $mailObject->findBody(preg_match("/html/i", $ContentType) ? 'html' : 'plain'); $bodyObj = $mailObject->findBody(preg_match("/html/i", $ContentType) ? 'html' : 'plain');
$body = $bodyObj ?$bodyObj->getContents() : null; $body = $bodyObj ?$bodyObj->getContents() : null;
translation::replaceEmailAdresses($body);
$simpleBodyType = (preg_match("/html/i", $ContentType)?'text/html':'text/plain'); $simpleBodyType = (preg_match("/html/i", $ContentType)?'text/html':'text/plain');
if ($this->debugLevel>1) debugLog("IMAP-Sendmail: fetched simple body as ".(preg_match("/html/i", $ContentType)?'html':'text').'=>'.$body); if ($this->debugLevel>1) debugLog("IMAP-Sendmail: fetched simple body as ".(preg_match("/html/i", $ContentType)?'html':'text').'=>'.$body);
} }
@ -511,6 +512,7 @@ class mail_activesync implements activesync_plugin_write, activesync_plugin_send
$AltBody = ($html_body = $mailObject->findBody('html')) ? $html_body->getContents() : null; $AltBody = ($html_body = $mailObject->findBody('html')) ? $html_body->getContents() : null;
// prefer plain over html // prefer plain over html
$body = $Body ?$Body : $AltBody; $body = $Body ?$Body : $AltBody;
translation::replaceEmailAdresses($body);
if ($this->debugLevel>1) debugLog("IMAP-Sendmail: fetched body as ".(strlen(strip_tags($body)) == strlen($body)?'text':'html').'=>'.$body); if ($this->debugLevel>1) debugLog("IMAP-Sendmail: fetched body as ".(strlen(strip_tags($body)) == strlen($body)?'text':'html').'=>'.$body);
} }
//error_log(__METHOD__.__LINE__.array2string($mailObject)); //error_log(__METHOD__.__LINE__.array2string($mailObject));
@ -731,18 +733,23 @@ class mail_activesync implements activesync_plugin_write, activesync_plugin_send
//debugLog(__METHOD__.__LINE__.' -> '.$body); //debugLog(__METHOD__.__LINE__.' -> '.$body);
// remove carriage-returns from body, set the body of the mailObject // remove carriage-returns from body, set the body of the mailObject
if (trim($body) =='' /*&& trim($mailObject->getMessageBody())=='' && $attachmentNames*/) $body .= ($attachmentNames?$attachmentNames:lang('no text body supplied, check attachments for message text'));// to avoid failure on empty messages with attachments if (trim($body) =='' /*&& trim($mailObject->getMessageBody())=='' && $attachmentNames*/) $body .= ($attachmentNames?$attachmentNames:lang('no text body supplied, check attachments for message text'));// to avoid failure on empty messages with attachments
//debugLog(__METHOD__.__LINE__.' -> '.$body);
if (preg_match("^text/html^i", $ContentType) || preg_match("^multipart^i", $ContentType)) if (preg_match("^text/html^i", $ContentType) || preg_match("^multipart^i", $ContentType))
{ {
if ($html_body = $mailObject->findBody('html')) if ($html_body = $mailObject->findBody('html'))
{ {
if (strlen(strip_tags($body)) == strlen($body)) $body = "<pre>".$body."</pre>"; if (strlen(strip_tags($body)) == strlen($body)) $body = "<pre>".$body."</pre>";
if ($this->debugLevel>1) debugLog(__METHOD__.__LINE__.' -> '.$body);
$html_body->setContents($body,array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING)); $html_body->setContents($body,array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
} }
if ($text_body = $mailObject->findBody('plain')) $text_body->setContents(translation::convertHTMLToText($body),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING)); if ($text_body = $mailObject->findBody('plain'))
{
if ($this->debugLevel>1) debugLog(__METHOD__.__LINE__.' -> '.translation::convertHTMLToText($body));
$text_body->setContents(translation::convertHTMLToText($body),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
}
} }
else else
{ {
if ($this->debugLevel>1) debugLog(__METHOD__.__LINE__.' -> '.translation::convertHTMLToText($body));
if ($text_body = $mailObject->findBody('plain')) $text_body->setContents(translation::convertHTMLToText($body),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING)); if ($text_body = $mailObject->findBody('plain')) $text_body->setContents(translation::convertHTMLToText($body),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
} }
//advanced debugging //advanced debugging