extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 00:13:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

add capability to skip header conversion on get_mailcontent ->converting mail to other app entries (used only for trackermailhandling as of now)

Browse Source
This commit is contained in:
Klaus Leithoff 2013-07-24 07:34:17 +00:00
parent 217ecc01e0
commit 29e2e36b7a
1 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
mail/inc/class.mail_bo.inc.php
View File

@ -1168,24 +1168,7 @@ class mail_bo
$retValue['header'][$sortOrder[$uid]]['uid'] = $headerObject['UID']; $retValue['header'][$sortOrder[$uid]]['uid'] = $headerObject['UID'];
$retValue['header'][$sortOrder[$uid]]['priority'] = ($headerObject['PRIORITY']?$headerObject['PRIORITY']:3); $retValue['header'][$sortOrder[$uid]]['priority'] = ($headerObject['PRIORITY']?$headerObject['PRIORITY']:3);
if (is_array($headerObject['FLAGS'])) { if (is_array($headerObject['FLAGS'])) {
$retValue['header'][$sortOrder[$uid]]['recent'] = in_array('\\Recent', $headerObject['FLAGS']); $retValue['header'][$sortOrder[$uid]] = array_merge($retValue['header'][$sortOrder[$uid]],self::prepareFlagsArray($headerObject));
$retValue['header'][$sortOrder[$uid]]['flagged'] = in_array('\\Flagged', $headerObject['FLAGS']);
$retValue['header'][$sortOrder[$uid]]['answered'] = in_array('\\Answered', $headerObject['FLAGS']);
$retValue['header'][$sortOrder[$uid]]['forwarded'] = in_array('$Forwarded', $headerObject['FLAGS']);
$retValue['header'][$sortOrder[$uid]]['deleted'] = in_array('\\Deleted', $headerObject['FLAGS']);
$retValue['header'][$sortOrder[$uid]]['seen'] = in_array('\\Seen', $headerObject['FLAGS']);
$retValue['header'][$sortOrder[$uid]]['draft'] = in_array('\\Draft', $headerObject['FLAGS']);
$retValue['header'][$sortOrder[$uid]]['mdnsent'] = in_array('MDNSent', $headerObject['FLAGS']);
$retValue['header'][$sortOrder[$uid]]['mdnnotsent'] = in_array('MDNnotSent', $headerObject['FLAGS']);
if (is_array($headerObject['FLAGS'])) $headerFlags = array_map('strtolower',$headerObject['FLAGS']);
if (!empty($headerFlags))
{
$retValue['header'][$sortOrder[$uid]]['label1'] = in_array('$label1', $headerFlags);
$retValue['header'][$sortOrder[$uid]]['label2'] = in_array('$label2', $headerFlags);
$retValue['header'][$sortOrder[$uid]]['label3'] = in_array('$label3', $headerFlags);
$retValue['header'][$sortOrder[$uid]]['label4'] = in_array('$label4', $headerFlags);
$retValue['header'][$sortOrder[$uid]]['label5'] = in_array('$label5', $headerFlags);
}
} }
if(is_array($headerObject['FROM']) && is_array($headerObject['FROM'][0])) { if(is_array($headerObject['FROM']) && is_array($headerObject['FROM'][0])) {
if($headerObject['FROM'][0]['HOST_NAME'] != 'NIL') { if($headerObject['FROM'][0]['HOST_NAME'] != 'NIL') {
@ -1268,6 +1251,36 @@ class mail_bo
} }
} }
/**
* static function prepareFlagsArray
* prepare headerObject to return some standardized array to tell which flags are set for a message
* @param array $headerObject - array to process, a full return array from icServer->getSummary
* @return array array of flags
*/
static function prepareFlagsArray($headerObject)
{
$retValue = array();
$retValue['recent'] = in_array('\\Recent', $headerObject['FLAGS']);
$retValue['flagged'] = in_array('\\Flagged', $headerObject['FLAGS']);
$retValue['answered'] = in_array('\\Answered', $headerObject['FLAGS']);
$retValue['forwarded'] = in_array('$Forwarded', $headerObject['FLAGS']);
$retValue['deleted'] = in_array('\\Deleted', $headerObject['FLAGS']);
$retValue['seen'] = in_array('\\Seen', $headerObject['FLAGS']);
$retValue['draft'] = in_array('\\Draft', $headerObject['FLAGS']);
$retValue['mdnsent'] = in_array('MDNSent', $headerObject['FLAGS']);
$retValue['mdnnotsent'] = in_array('MDNnotSent', $headerObject['FLAGS']);
if (is_array($headerObject['FLAGS'])) $headerFlags = array_map('strtolower',$headerObject['FLAGS']);
if (!empty($headerFlags))
{
$retValue['label1'] = in_array('$label1', $headerFlags);
$retValue['label2'] = in_array('$label2', $headerFlags);
$retValue['label3'] = in_array('$label3', $headerFlags);
$retValue['label4'] = in_array('$label4', $headerFlags);
$retValue['label5'] = in_array('$label5', $headerFlags);
}
return $retValue;
}
/** /**
* fetches a sorted list of messages from the imap server * fetches a sorted list of messages from the imap server
* private function * private function
@ -4565,13 +4578,14 @@ class mail_bo
* @param partid the partid of the email * @param partid the partid of the email
* @param mailbox the mailbox, that holds the message * @param mailbox the mailbox, that holds the message
* @param preserveHTML flag to pass through to getdisplayableBody * @param preserveHTML flag to pass through to getdisplayableBody
* @param addHeaderSection flag to be able to supress headersection
* @return array/bool with 'mailaddress'=>$mailaddress, * @return array/bool with 'mailaddress'=>$mailaddress,
* 'subject'=>$subject, * 'subject'=>$subject,
* 'message'=>$message, * 'message'=>$message,
* 'attachments'=>$attachments, * 'attachments'=>$attachments,
* 'headers'=>$headers,; boolean false on failure * 'headers'=>$headers,; boolean false on failure
*/ */
static function get_mailcontent(&$mailClass,$uid,$partid='',$mailbox='', $preserveHTML = false) static function get_mailcontent(&$mailClass,$uid,$partid='',$mailbox='', $preserveHTML = false, $addHeaderSection=true)
{ {
//echo __METHOD__." called for $uid,$partid <br>"; //echo __METHOD__." called for $uid,$partid <br>";
$headers = $mailClass->getMessageHeader($uid,$partid,true); $headers = $mailClass->getMessageHeader($uid,$partid,true);
@ -4590,7 +4604,7 @@ class mail_bo
$message = self::getdisplayableBody($mailClass, $bodyParts, $preserveHTML); $message = self::getdisplayableBody($mailClass, $bodyParts, $preserveHTML);
if ($preserveHTML && $mailClass->activeMimeType == 'text/plain') $message = '<pre>'.$message.'</pre>'; if ($preserveHTML && $mailClass->activeMimeType == 'text/plain') $message = '<pre>'.$message.'</pre>';
$headdata = self::createHeaderInfoSection($headers, '',$preserveHTML); $headdata = ($addHeaderSection ? self::createHeaderInfoSection($headers, '',$preserveHTML) : '');
$message = $headdata.$message; $message = $headdata.$message;
//echo __METHOD__.'<br>'; //echo __METHOD__.'<br>';
//_debug_array($attachments); //_debug_array($attachments);