extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-22 21:30:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

* email/tracker: fix bug regarding the manual transformation of emails to tracker, if tracker is set to htmledit

Browse Source
This commit is contained in:
Klaus Leithoff 2012-08-27 12:22:30 +00:00
parent 16de40a9ee
commit 88179025b0
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
felamimail/inc/class.felamimail_bo.inc.php
View File

@ -82,6 +82,13 @@ class felamimail_bo
// what type of mimeTypes do we want from the body(text/html, text/plain)
var $htmlOptions;
/**
* Active mimeType
*
* @var string
*/
var $activeMimeType;
var $sessionData;
// the current selected user profile
@ -4295,7 +4302,8 @@ class felamimail_bo
//echo __METHOD__." called for $uid,$partid <br>";
$headers = $bofelamimail->getMessageHeader($uid,$partid,true);
// dont force retrieval of the textpart, let felamimail preferences decide
$bodyParts = $bofelamimail->getMessageBody($uid,'',$partid);
$bodyParts = $bofelamimail->getMessageBody($uid,($preserveHTML?'always_display':'only_if_no_text'),$partid);
//error_log(array2string($bodyParts));
$attachments = $bofelamimail->getMessageAttachments($uid,$partid);
if ($bofelamimail->isSentFolder($mailbox)) $mailaddress = $headers['TO'];
@ -4306,6 +4314,7 @@ class felamimail_bo
$subject = $headers['SUBJECT'];
$message = self::getdisplayableBody($bofelamimail, $bodyParts, $preserveHTML);
if ($preserveHTML && $bofelamimail->activeMimeType == 'text/plain') $message = '<pre>'.$message.'</pre>';
$headdata = self::createHeaderInfoSection($headers, '',$preserveHTML);
$message = $headdata.$message;
//echo __METHOD__.'<br>';
@ -4578,7 +4587,9 @@ class felamimail_bo
}
*/
//error_log(__METHOD__.__LINE__.' before purify:'.$newBody);
$bofelamimail->activeMimeType = 'text/plain';
if ($bodyParts[$i]['mimeType'] == 'text/html') {
$bofelamimail->activeMimeType = $bodyParts[$i]['mimeType'];
// as translation::convert reduces \r\n to \n and purifier eats \n -> peplace it with a single space
$newBody = str_replace("\n"," ",$newBody);
// convert HTML to text, as we dont want HTML in infologs