extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-06 10:02:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

stuff to try to fix problems on header retrieval

Browse Source
This commit is contained in:
Klaus Leithoff 2014-01-20 08:55:07 +00:00
parent f6420e9572
commit bb12e99a8b
3 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -681,7 +681,7 @@ class mail_activesync implements activesync_plugin_write, activesync_plugin_send
$this->mail->reopen($folder); $this->mail->reopen($folder);
// not needed, as the original header is always transmitted // not needed, as the original header is always transmitted
/* /*
$headers = $this->mail->getMessageEnvelope($uid, $_partID, true); $headers = $this->mail->getMessageEnvelope($uid, $_partID, true, $folder);
if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__." Headers of Message with UID:$uid ->".array2string($headers)); if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__." Headers of Message with UID:$uid ->".array2string($headers));
$body .= $this->mail->createHeaderInfoSection($headers,lang("original message")); $body .= $this->mail->createHeaderInfoSection($headers,lang("original message"));
*/ */
@ -737,7 +737,7 @@ class mail_activesync implements activesync_plugin_write, activesync_plugin_send
$this->mail->reopen($folder); $this->mail->reopen($folder);
// receive entire mail (header + body) // receive entire mail (header + body)
// get message headers for specified message // get message headers for specified message
$headers = $this->mail->getMessageEnvelope($uid, $_partID, true); $headers = $this->mail->getMessageEnvelope($uid, $_partID, true, $folder);
// build a new mime message, forward entire old mail as file // build a new mime message, forward entire old mail as file
if ($preferencesArray['message_forwarding'] == 'asmail') if ($preferencesArray['message_forwarding'] == 'asmail')

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

@ -1665,6 +1665,7 @@ class mail_bo
else else
{ {
$_string = translation::decodeMailHeader($_string,self::$displayCharset); $_string = translation::decodeMailHeader($_string,self::$displayCharset);
//$_tryIDNConversion=false;
if ($_tryIDNConversion===true && stripos($_string,'@')!==false) if ($_tryIDNConversion===true && stripos($_string,'@')!==false)
{ {
$rfcAddr = imap_rfc822_parse_adrlist(str_replace(',','\,',$_string),''); $rfcAddr = imap_rfc822_parse_adrlist(str_replace(',','\,',$_string),'');
@ -3975,12 +3976,15 @@ class mail_bo
* @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 boolean $decode flag to do the decoding on the fly * @param boolean $decode flag to do the decoding on the fly
* @param string $_folder folder to work on
* @return array the message header * @return array the message header
*/ */
function getMessageEnvelope($_uid, $_partID = '',$decode=false) function getMessageEnvelope($_uid, $_partID = '',$decode=false, $_folder='')
{ {
if($_partID == '') { //error_log(__METHOD__.__LINE__.":$_uid,$_partID,$decode,$_folder".function_backtrace());
$_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox()); if (empty($_folder)) $_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
//error_log(__METHOD__.__LINE__.":$_uid,$_partID,$decode,$_folder");
if(empty($_partID)) {
$uidsToFetch = new Horde_Imap_Client_Ids(); $uidsToFetch = new Horde_Imap_Client_Ids();
$uidsToFetch->add((array)$_uid); $uidsToFetch->add((array)$_uid);
@ -4034,8 +4038,10 @@ class mail_bo
//error_log(__METHOD__.__LINE__.array2string($envelope)); //error_log(__METHOD__.__LINE__.array2string($envelope));
return ($decode ? self::decode_header($envelope,true): $envelope); return ($decode ? self::decode_header($envelope,true): $envelope);
} else { } else {
$headers = $this->getMessageHeader($_uid, $_partID, true,true);
//error_log(__METHOD__.__LINE__.array2string($headers)); $headers = $this->getMessageHeader($_uid, $_partID, true,true,$_folder);
//print_r(__METHOD__.__LINE__.':'.array2string($headers),true);
//_debug_array($headers); //_debug_array($headers);
$newData = array( $newData = array(
'DATE' => $headers['DATE'], 'DATE' => $headers['DATE'],
@ -4083,10 +4089,12 @@ class mail_bo
* @param string/int $_partID='' , the partID, may be omitted * @param string/int $_partID='' , the partID, may be omitted
* @param boolean $decode flag to do the decoding on the fly * @param boolean $decode flag to do the decoding on the fly
* @param boolean $preserveUnSeen flag to preserve the seen flag where applicable * @param boolean $preserveUnSeen flag to preserve the seen flag where applicable
* @param string $_folder folder to work on
* @return array the message header * @return array the message header
*/ */
function getMessageHeader($_uid, $_partID = '',$decode=false, $preserveUnSeen=false, $_folder='') function getMessageHeader($_uid, $_partID = '',$decode=false, $preserveUnSeen=false, $_folder='')
{ {
//error_log(__METHOD__.__LINE__.':'.$_uid.', '.$_partID.', '.$decode.', '.$preserveUnSeen.', '.$_folder);
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());
$uidsToFetch = new Horde_Imap_Client_Ids(); $uidsToFetch = new Horde_Imap_Client_Ids();
$uidsToFetch->add((array)$_uid); $uidsToFetch->add((array)$_uid);
@ -4120,6 +4128,7 @@ class mail_bo
{ {
$retValue['SUBJECT'] = $retValue['SUBJECT'][count($retValue['SUBJECT'])-1]; $retValue['SUBJECT'] = $retValue['SUBJECT'][count($retValue['SUBJECT'])-1];
} }
//error_log(__METHOD__.__LINE__.':'.array2string($decode ? self::decode_header($retValue,true):$retValue));
return ($decode ? self::decode_header($retValue,true):$retValue); return ($decode ? self::decode_header($retValue,true):$retValue);
} }
@ -4128,19 +4137,20 @@ class mail_bo
* get messages raw header data * get messages raw header data
* @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
* @return string the message header * @return string the message header
*/ */
function getMessageRawHeader($_uid, $_partID = '') function getMessageRawHeader($_uid, $_partID = '', $_folder = '')
{ {
static $rawHeaders; static $rawHeaders;
$_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox()); if (empty($_folder)) $_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
//error_log(__METHOD__.__LINE__." Try Using Cache for raw Header $_uid, $_partID in Folder $_folder"); //error_log(__METHOD__.__LINE__." Try Using Cache for raw Header $_uid, $_partID in Folder $_folder");
if (is_null($rawHeaders)) $rawHeaders = egw_cache::getCache(egw_cache::INSTANCE,'email','rawHeadersCache'.trim($GLOBALS['egw_info']['user']['account_id']),$callback=null,$callback_params=array(),$expiration=60*60*1); if (is_null($rawHeaders)) $rawHeaders = egw_cache::getCache(egw_cache::INSTANCE,'email','rawHeadersCache'.trim($GLOBALS['egw_info']['user']['account_id']),$callback=null,$callback_params=array(),$expiration=60*60*1);
if (isset($rawHeaders[$this->icServer->ImapServerId][$_folder][$_uid][($_partID==''?'NIL':$_partID)])) if (isset($rawHeaders[$this->icServer->ImapServerId][$_folder][$_uid][(empty($_partID)?'NIL':$_partID)]))
{ {
//error_log(__METHOD__.__LINE__." Using Cache for raw Header $_uid, $_partID in Folder $_folder"); //error_log(__METHOD__.__LINE__." Using Cache for raw Header $_uid, $_partID in Folder $_folder");
return $rawHeaders[$this->icServer->ImapServerId][$_folder][$_uid][($_partID==''?'NIL':$_partID)]; return $rawHeaders[$this->icServer->ImapServerId][$_folder][$_uid][(empty($_partID)?'NIL':$_partID)];
} }
$uidsToFetch = new Horde_Imap_Client_Ids(); $uidsToFetch = new Horde_Imap_Client_Ids();
$uidsToFetch->add((array)$_uid); $uidsToFetch->add((array)$_uid);
@ -4167,7 +4177,7 @@ class mail_bo
} }
} }
} }
$rawHeaders[$this->icServer->ImapServerId][$_folder][$_uid][($_partID==''?'NIL':$_partID)]=$retValue; $rawHeaders[$this->icServer->ImapServerId][$_folder][$_uid][(empty($_partID)?'NIL':$_partID)]=$retValue;
egw_cache::setCache(egw_cache::INSTANCE,'email','rawHeadersCache'.trim($GLOBALS['egw_info']['user']['account_id']),$rawHeaders,$expiration=60*60*1); egw_cache::setCache(egw_cache::INSTANCE,'email','rawHeadersCache'.trim($GLOBALS['egw_info']['user']['account_id']),$rawHeaders,$expiration=60*60*1);
return $retValue; return $retValue;
} }
@ -4250,10 +4260,10 @@ class mail_bo
if (is_null($rawBody)) $rawBody = array(); if (is_null($rawBody)) $rawBody = array();
$_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox()); $_folder = ($this->sessionData['mailbox']? $this->sessionData['mailbox'] : $this->icServer->getCurrentMailbox());
if (isset($rawBody[$this->icServer->ImapServerId][$_folder][$_uid][($_partID==''?'NIL':$_partID)])) if (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][($_partID==''?'NIL':$_partID)]; return $rawBody[$this->icServer->ImapServerId][$_folder][$_uid][(empty($_partID)?'NIL':$_partID)];
} }
$uidsToFetch = new Horde_Imap_Client_Ids(); $uidsToFetch = new Horde_Imap_Client_Ids();
@ -4317,7 +4327,7 @@ class mail_bo
} }
} }
$rawBody[$this->icServer->ImapServerId][$_folder][$_uid][($_partID==''?'NIL':$_partID)] = $body; $rawBody[$this->icServer->ImapServerId][$_folder][$_uid][(empty($_partID)?'NIL':$_partID)] = $body;
return $body; return $body;
} }

4
mail/inc/class.mail_ui.inc.php
View File

@ -1777,8 +1777,8 @@ unset($query['actions']);
$error_msg[] = array2string($headers->backtrace[0]); $error_msg[] = array2string($headers->backtrace[0]);
} }
if (!empty($uid)) $flags = $this->mail_bo->getFlags($uid); if (!empty($uid)) $flags = $this->mail_bo->getFlags($uid);
$envelope = $this->mail_bo->getMessageEnvelope($uid, $partID,true); $envelope = $this->mail_bo->getMessageEnvelope($uid, $partID,true,$mailbox);
$rawheaders = $this->mail_bo->getMessageRawHeader($uid, $partID); $rawheaders = $this->mail_bo->getMessageRawHeader($uid, $partID,$mailbox);
$fetchEmbeddedImages = false; $fetchEmbeddedImages = false;
if ($htmlOptions !='always_display') $fetchEmbeddedImages = true; if ($htmlOptions !='always_display') $fetchEmbeddedImages = true;
$attachments = $this->mail_bo->getMessageAttachments($uid, $partID, null, $fetchEmbeddedImages); $attachments = $this->mail_bo->getMessageAttachments($uid, $partID, null, $fetchEmbeddedImages);