forked from extern/egroupware
return full mime message as stream without any conversation and without caching it, as this probably caused high memory usage when syncing with Outlook
This commit is contained in:
Ralf Becker
parent
6085e9fb67
commit
1b4bef13f5
@ -5456,15 +5456,16 @@ class Mail
|
|||||||
* @param string/int $_uid the messageuid,
|
* @param string/int $_uid the messageuid,
|
||||||
* @param string/int $_partID = '' , the partID, may be omitted
|
* @param string/int $_partID = '' , the partID, may be omitted
|
||||||
* @param string $_folder folder to work on
|
* @param string $_folder folder to work on
|
||||||
|
* @param boolean $_stream =false true: return a stream, false: return string, stream suppresses any caching
|
||||||
* @return string the message body
|
* @return string the message body
|
||||||
*/
|
*/
|
||||||
function getMessageRawBody($_uid, $_partID = '', $_folder='')
|
function getMessageRawBody($_uid, $_partID = '', $_folder='', $_stream=false)
|
||||||
{
|
{
|
||||||
//TODO: caching einbauen static!
|
//TODO: caching einbauen static!
|
||||||
static $rawBody;
|
static $rawBody;
|
||||||
if (is_null($rawBody)) $rawBody = array();
|
if (is_null($rawBody)) $rawBody = array();
|
||||||
if (empty($_folder)) $_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
|
if (empty($_folder)) $_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
|
||||||
if (isset($rawBody[$this->icServer->ImapServerId][$_folder][$_uid][(empty($_partID)?'NIL':$_partID)]))
|
if (!$_stream && isset($rawBody[$this->icServer->ImapServerId][$_folder][$_uid][(empty($_partID)?'NIL':$_partID)]))
|
||||||
{
|
{
|
||||||
//error_log(__METHOD__.' ('.__LINE__.') '." Using Cache for raw Body $_uid, $_partID in Folder $_folder");
|
//error_log(__METHOD__.' ('.__LINE__.') '." Using Cache for raw Body $_uid, $_partID in Folder $_folder");
|
||||||
return $rawBody[$this->icServer->ImapServerId][$_folder][$_uid][(empty($_partID)?'NIL':$_partID)];
|
return $rawBody[$this->icServer->ImapServerId][$_folder][$_uid][(empty($_partID)?'NIL':$_partID)];
|
||||||
@ -5487,7 +5488,7 @@ class Mail
|
|||||||
));
|
));
|
||||||
if (is_object($headersNew)) {
|
if (is_object($headersNew)) {
|
||||||
foreach($headersNew as &$_headerObject) {
|
foreach($headersNew as &$_headerObject) {
|
||||||
$body = $_headerObject->getFullMsg();
|
$body = $_headerObject->getFullMsg($_stream);
|
||||||
if ($_partID != '')
|
if ($_partID != '')
|
||||||
{
|
{
|
||||||
$mailStructureObject = $_headerObject->getStructure();
|
$mailStructureObject = $_headerObject->getStructure();
|
||||||
@ -5496,14 +5497,17 @@ class Mail
|
|||||||
{
|
{
|
||||||
if ($mime_id==$_partID)
|
if ($mime_id==$_partID)
|
||||||
{
|
{
|
||||||
$body = $_headerObject->getBodyPart($mime_id);
|
$body = $_headerObject->getBodyPart($mime_id, $_stream);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//error_log(__METHOD__.' ('.__LINE__.') '."[$this->icServer->ImapServerId][$_folder][$_uid][".(empty($_partID)?'NIL':$_partID)."]");
|
//error_log(__METHOD__.' ('.__LINE__.') '."[$this->icServer->ImapServerId][$_folder][$_uid][".(empty($_partID)?'NIL':$_partID)."]");
|
||||||
$rawBody[$this->icServer->ImapServerId][$_folder][$_uid][(empty($_partID)?'NIL':$_partID)] = $body;
|
if (!$_stream)
|
||||||
|
{
|
||||||
|
$rawBody[$this->icServer->ImapServerId][$_folder][$_uid][(empty($_partID)?'NIL':$_partID)] = $body;
|
||||||
|
}
|
||||||
return $body;
|
return $body;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -905,126 +905,130 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
|
|||||||
ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." getBodyPreferenceBestMatch: ".array2string($bpReturnType));
|
ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." getBodyPreferenceBestMatch: ".array2string($bpReturnType));
|
||||||
// set the protocoll class
|
// set the protocoll class
|
||||||
$output->asbody = new SyncBaseBody();
|
$output->asbody = new SyncBaseBody();
|
||||||
// fetch the body (try to gather data only once)
|
|
||||||
$css ='';
|
// return full mime-message without any (charset) conversation directly as stream
|
||||||
$bodyStruct = $this->mail->getMessageBody($id, 'html_only', '', null, true,$_folderName);
|
if ($bpReturnType==SYNC_BODYPREFERENCE_MIME)
|
||||||
if ($this->debugLevel>2) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only Struct:'.array2string($bodyStruct));
|
|
||||||
$body = $this->mail->getdisplayableBody($this->mail,$bodyStruct,true,false);
|
|
||||||
if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only:'.$body);
|
|
||||||
if ($body != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
|
|
||||||
// may be html
|
|
||||||
if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG, "MIME Body".' Type:html (fetched with html_only)');
|
|
||||||
$css = $this->mail->getStyles($bodyStruct);
|
|
||||||
$output->nativebodytype=2;
|
|
||||||
} else {
|
|
||||||
// plain text Message
|
|
||||||
if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG, "MIME Body".' Type:plain, fetch text (HTML, if no text available)');
|
|
||||||
$output->nativebodytype=1;
|
|
||||||
$bodyStruct = $this->mail->getMessageBody($id,'never_display', '', null, true,$_folderName); //'only_if_no_text');
|
|
||||||
if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' plain text Struct:'.array2string($bodyStruct));
|
|
||||||
$body = $this->mail->getdisplayableBody($this->mail,$bodyStruct,false,false);
|
|
||||||
if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' never display html(plain text only):'.$body);
|
|
||||||
}
|
|
||||||
// whatever format decode (using the correct encoding)
|
|
||||||
if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__."MIME Body".' Type:'.($output->nativebodytype==2?' html ':' plain ').$body);
|
|
||||||
//$body = html_entity_decode($body,ENT_QUOTES,$this->mail->detect_encoding($body));
|
|
||||||
// prepare plaintextbody
|
|
||||||
$plainBody='';
|
|
||||||
if ($output->nativebodytype == 2)
|
|
||||||
{
|
|
||||||
$bodyStructplain = $this->mail->getMessageBody($id,'never_display', '', null, true,$_folderName); //'only_if_no_text');
|
|
||||||
if(isset($bodyStructplain[0])&&isset($bodyStructplain[0]['error'])&&$bodyStructplain[0]['error']==1)
|
|
||||||
{
|
|
||||||
$plainBody = Api\Mail\Html::convertHTMLToText($body); // always display with preserved HTML
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$plainBody = $this->mail->getdisplayableBody($this->mail,$bodyStructplain,false,false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG, "MIME Body".$body);
|
|
||||||
$plainBody = preg_replace("/<style.*?<\/style>/is", "", (strlen($plainBody)?$plainBody:$body));
|
|
||||||
// remove all other html
|
|
||||||
$plainBody = preg_replace("/<br.*>/is","\r\n",$plainBody);
|
|
||||||
$plainBody = strip_tags($plainBody);
|
|
||||||
if ($this->debugLevel>3 && $output->nativebodytype==1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Plain Text:'.$plainBody);
|
|
||||||
//$body = str_replace("\n","\r\n", str_replace("\r","",$body)); // do we need that?
|
|
||||||
if ($bpReturnType==SYNC_BODYPREFERENCE_MIME)//4)//$mimesupport==2 || $mimesupport ==1 && stristr($headers['CONTENT-TYPE'],'signed') !== false)
|
|
||||||
{
|
{
|
||||||
//SYNC_BODYPREFERENCE_MIME
|
//SYNC_BODYPREFERENCE_MIME
|
||||||
ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." bodypreference 4 requested");
|
$output->asbody->type = SYNC_BODYPREFERENCE_MIME;
|
||||||
$output->asbody->type = SYNC_BODYPREFERENCE_MIME;//4;
|
$stream = $this->mail->getMessageRawBody($id, '', $_folderName, true);
|
||||||
// use Api\Mailer::convert to convert charset of all text parts to utf-8, which is a z-push or AS requirement!
|
$fstat = fstat($stream);
|
||||||
// ToDo: check if above is true for mime-message, otherwise with could use a stream without conversion
|
fseek($stream, 0, SEEK_SET);
|
||||||
$Body = Api\Mailer::convert($this->mail->getMessageRawBody($id, '', $_folderName));
|
$output->asbody->data = $stream;
|
||||||
if ($this->debugLevel>2) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." Setting Mailobjectcontent to output:".$Body);
|
$output->asbody->estimatedDataSize = $fstat['size'];
|
||||||
if ((string)$Body === '') $Body = ' ';
|
ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." bodypreference 4=SYNC_BODYPREFERENCE_MIME=full mime message requested, size=$fstat[size]");
|
||||||
$output->asbody->data = StringStreamWrapper::Open($Body);
|
|
||||||
$output->asbody->estimatedDataSize = strlen($Body);
|
|
||||||
}
|
|
||||||
else if ($bpReturnType==2) //SYNC_BODYPREFERENCE_HTML
|
|
||||||
{
|
|
||||||
if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG, "HTML Body with requested pref 2");
|
|
||||||
// Send HTML if requested and native type was html
|
|
||||||
$output->asbody->type = 2;
|
|
||||||
$htmlbody = '<html>'.
|
|
||||||
'<head>'.
|
|
||||||
'<meta name="Generator" content="Z-Push">'.
|
|
||||||
'<meta http-equiv="Content-Type" content="text/html; charset=utf-8">'.
|
|
||||||
$css.
|
|
||||||
'</head>'.
|
|
||||||
'<body>';
|
|
||||||
if ($output->nativebodytype==2)
|
|
||||||
{
|
|
||||||
// as we fetch html, and body is HTML, we may not need to handle this
|
|
||||||
$htmlbody .= $body;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// html requested but got only plaintext, so fake html
|
|
||||||
$htmlbody .= str_replace("\n","<BR>",str_replace("\r","<BR>", str_replace("\r\n","<BR>",$plainBody)));
|
|
||||||
}
|
|
||||||
$htmlbody .= '</body>'.
|
|
||||||
'</html>';
|
|
||||||
|
|
||||||
if(isset($truncsize) && strlen($htmlbody) > $truncsize)
|
|
||||||
{
|
|
||||||
$htmlbody = Utils::Utf8_truncate($htmlbody,$truncsize);
|
|
||||||
$output->asbody->truncated = 1;
|
|
||||||
}
|
|
||||||
// output->nativebodytype is used as marker that the original message was of type ... but is now converted to, as type 2 is requested.
|
|
||||||
$output->nativebodytype = 2;
|
|
||||||
$output->asbody->data = StringStreamWrapper::Open($htmlbody);
|
|
||||||
$output->asbody->estimatedDataSize = strlen($htmlbody);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Send Plaintext as Fallback or if original body is plainttext
|
// fetch the body (try to gather data only once)
|
||||||
if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG, "Plaintext Body:".$plainBody);
|
$css ='';
|
||||||
/* we use plainBody (set above) instead
|
$bodyStruct = $this->mail->getMessageBody($id, 'html_only', '', null, true,$_folderName);
|
||||||
$bodyStruct = $this->mail->getMessageBody($id,'only_if_no_text'); //'never_display');
|
if ($this->debugLevel>2) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only Struct:'.array2string($bodyStruct));
|
||||||
$plain = $this->mail->getdisplayableBody($this->mail,$bodyStruct);
|
$body = $this->mail->getdisplayableBody($this->mail,$bodyStruct,true,false);
|
||||||
$plain = html_entity_decode($plain,ENT_QUOTES,$this->mail->detect_encoding($plain));
|
if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only:'.$body);
|
||||||
$plain = strip_tags($plain);
|
if ($body != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
|
||||||
//$plain = str_replace("\n","\r\n",str_replace("\r","",$plain));
|
// may be html
|
||||||
*/
|
if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG, "MIME Body".' Type:html (fetched with html_only)');
|
||||||
$output->asbody->type = 1;
|
$css = $this->mail->getStyles($bodyStruct);
|
||||||
$output->nativebodytype = 1;
|
$output->nativebodytype=2;
|
||||||
if(isset($truncsize) &&
|
} else {
|
||||||
strlen($plainBody) > $truncsize)
|
// plain text Message
|
||||||
{
|
if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG, "MIME Body".' Type:plain, fetch text (HTML, if no text available)');
|
||||||
$plainBody = Utils::Utf8_truncate($plainBody, $truncsize);
|
$output->nativebodytype=1;
|
||||||
$output->asbody->truncated = 1;
|
$bodyStruct = $this->mail->getMessageBody($id,'never_display', '', null, true,$_folderName); //'only_if_no_text');
|
||||||
|
if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' plain text Struct:'.array2string($bodyStruct));
|
||||||
|
$body = $this->mail->getdisplayableBody($this->mail,$bodyStruct,false,false);
|
||||||
|
if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' never display html(plain text only):'.$body);
|
||||||
|
}
|
||||||
|
// whatever format decode (using the correct encoding)
|
||||||
|
if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__."MIME Body".' Type:'.($output->nativebodytype==2?' html ':' plain ').$body);
|
||||||
|
//$body = html_entity_decode($body,ENT_QUOTES,$this->mail->detect_encoding($body));
|
||||||
|
// prepare plaintextbody
|
||||||
|
$plainBody='';
|
||||||
|
if ($output->nativebodytype == 2)
|
||||||
|
{
|
||||||
|
$bodyStructplain = $this->mail->getMessageBody($id,'never_display', '', null, true,$_folderName); //'only_if_no_text');
|
||||||
|
if(isset($bodyStructplain[0])&&isset($bodyStructplain[0]['error'])&&$bodyStructplain[0]['error']==1)
|
||||||
|
{
|
||||||
|
$plainBody = Api\Mail\Html::convertHTMLToText($body); // always display with preserved HTML
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$plainBody = $this->mail->getdisplayableBody($this->mail,$bodyStructplain,false,false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG, "MIME Body".$body);
|
||||||
|
$plainBody = preg_replace("/<style.*?<\/style>/is", "", (strlen($plainBody)?$plainBody:$body));
|
||||||
|
// remove all other html
|
||||||
|
$plainBody = preg_replace("/<br.*>/is","\r\n",$plainBody);
|
||||||
|
$plainBody = strip_tags($plainBody);
|
||||||
|
if ($this->debugLevel>3 && $output->nativebodytype==1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Plain Text:'.$plainBody);
|
||||||
|
//$body = str_replace("\n","\r\n", str_replace("\r","",$body)); // do we need that?
|
||||||
|
|
||||||
|
if ($bpReturnType==2) //SYNC_BODYPREFERENCE_HTML
|
||||||
|
{
|
||||||
|
if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG, "HTML Body with requested pref 2");
|
||||||
|
// Send HTML if requested and native type was html
|
||||||
|
$output->asbody->type = 2;
|
||||||
|
$htmlbody = '<html>'.
|
||||||
|
'<head>'.
|
||||||
|
'<meta name="Generator" content="Z-Push">'.
|
||||||
|
'<meta http-equiv="Content-Type" content="text/html; charset=utf-8">'.
|
||||||
|
$css.
|
||||||
|
'</head>'.
|
||||||
|
'<body>';
|
||||||
|
if ($output->nativebodytype==2)
|
||||||
|
{
|
||||||
|
// as we fetch html, and body is HTML, we may not need to handle this
|
||||||
|
$htmlbody .= $body;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// html requested but got only plaintext, so fake html
|
||||||
|
$htmlbody .= str_replace("\n","<BR>",str_replace("\r","<BR>", str_replace("\r\n","<BR>",$plainBody)));
|
||||||
|
}
|
||||||
|
$htmlbody .= '</body>'.
|
||||||
|
'</html>';
|
||||||
|
|
||||||
|
if(isset($truncsize) && strlen($htmlbody) > $truncsize)
|
||||||
|
{
|
||||||
|
$htmlbody = Utils::Utf8_truncate($htmlbody,$truncsize);
|
||||||
|
$output->asbody->truncated = 1;
|
||||||
|
}
|
||||||
|
// output->nativebodytype is used as marker that the original message was of type ... but is now converted to, as type 2 is requested.
|
||||||
|
$output->nativebodytype = 2;
|
||||||
|
$output->asbody->data = StringStreamWrapper::Open($htmlbody);
|
||||||
|
$output->asbody->estimatedDataSize = strlen($htmlbody);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Send Plaintext as Fallback or if original body is plainttext
|
||||||
|
if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG, "Plaintext Body:".$plainBody);
|
||||||
|
/* we use plainBody (set above) instead
|
||||||
|
$bodyStruct = $this->mail->getMessageBody($id,'only_if_no_text'); //'never_display');
|
||||||
|
$plain = $this->mail->getdisplayableBody($this->mail,$bodyStruct);
|
||||||
|
$plain = html_entity_decode($plain,ENT_QUOTES,$this->mail->detect_encoding($plain));
|
||||||
|
$plain = strip_tags($plain);
|
||||||
|
//$plain = str_replace("\n","\r\n",str_replace("\r","",$plain));
|
||||||
|
*/
|
||||||
|
$output->asbody->type = 1;
|
||||||
|
$output->nativebodytype = 1;
|
||||||
|
if(isset($truncsize) &&
|
||||||
|
strlen($plainBody) > $truncsize)
|
||||||
|
{
|
||||||
|
$plainBody = Utils::Utf8_truncate($plainBody, $truncsize);
|
||||||
|
$output->asbody->truncated = 1;
|
||||||
|
}
|
||||||
|
$output->asbody->data = StringStreamWrapper::Open((string)$plainBody !== '' ? $plainBody : ' ');
|
||||||
|
$output->asbody->estimatedDataSize = strlen($plainBody);
|
||||||
|
}
|
||||||
|
// In case we have nothing for the body, send at least a blank...
|
||||||
|
// dw2412 but only in case the body is not rtf!
|
||||||
|
if ($output->asbody->type != 3 && !isset($output->asbody->data))
|
||||||
|
{
|
||||||
|
$output->asbody->data = StringStreamWrapper::Open(" ");
|
||||||
|
$output->asbody->estimatedDataSize = 1;
|
||||||
}
|
}
|
||||||
$output->asbody->data = StringStreamWrapper::Open((string)$plainBody !== '' ? $plainBody : ' ');
|
|
||||||
$output->asbody->estimatedDataSize = strlen($plainBody);
|
|
||||||
}
|
|
||||||
// In case we have nothing for the body, send at least a blank...
|
|
||||||
// dw2412 but only in case the body is not rtf!
|
|
||||||
if ($output->asbody->type != 3 && !isset($output->asbody->data))
|
|
||||||
{
|
|
||||||
$output->asbody->data = StringStreamWrapper::Open(" ");
|
|
||||||
$output->asbody->estimatedDataSize = 1;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// end AS12 Stuff
|
// end AS12 Stuff
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user