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

handling mail display problem with dovecot server: retrieval of a subpart of a message (attached email) will fail if the message structure is not actively queried from the server, but used from cache. Now we ignore the structure cache on getMessageBody

Browse Source
This commit is contained in:
Klaus Leithoff 2012-07-02 09:47:09 +00:00
parent fcf313e900
commit 10c28ee720
1 changed files with 9 additions and 4 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

@ -1127,18 +1127,22 @@ class felamimail_bo
return $folderStatus[$this->icServer->ImapServerId][$folderName];
}
function _getStructure($_uid, $byUid=true)
function _getStructure($_uid, $byUid=true, $_ignoreCache=false)
{
static $structure;
$_folder = $this->sessionData['mailbox'];
if (is_null($structure)) $structure = egw_cache::getCache(egw_cache::INSTANCE,'email','structureCache'.trim($GLOBALS['egw_info']['user']['account_id']),$callback=null,$callback_params=array(),$expiration=60*60*1);
if (isset($structure[$this->icServer->ImapServerId][$_folder][$_uid]))
{
//error_log(__METHOD__.__LINE__.' Using cache for structure on Server:'.$this->icServer->ImapServerId.' for uid:'.$_uid);
return $structure[$this->icServer->ImapServerId][$_folder][$_uid];
if ($_ignoreCache===false)
{
error_log(__METHOD__.__LINE__.' Using cache for structure on Server:'.$this->icServer->ImapServerId.' for uid:'.$_uid." in Folder:".$_folder.'->'.array2string($structure[$this->icServer->ImapServerId][$_folder][$_uid]));
return $structure[$this->icServer->ImapServerId][$_folder][$_uid];
}
}
$structure[$this->icServer->ImapServerId][$_folder][$_uid] = $this->icServer->getStructure($_uid, $byUid);
egw_cache::setCache(egw_cache::INSTANCE,'email','structureCache'.trim($GLOBALS['egw_info']['user']['account_id']),$structure,$expiration=60*60*1);
//error_log(__METHOD__.__LINE__.' Using query for structure on Server:'.$this->icServer->ImapServerId.' for uid:'.$_uid." in Folder:".$_folder.'->'.array2string($structure[$this->icServer->ImapServerId][$_folder][$_uid]));
return $structure[$this->icServer->ImapServerId][$_folder][$_uid];
}
@ -2218,6 +2222,7 @@ class felamimail_bo
function getTextPart($_uid, $_structure, $_htmlMode = '', $_preserveSeen = false)
{
//error_log(__METHOD__.__LINE__.'->'.$_uid.array2string($_structure).' '.function_backtrace());
$bodyPart = array();
if (self::$debug) _debug_array(array($_structure,function_backtrace()));
$partID = $_structure->partID;
@ -3069,7 +3074,7 @@ class felamimail_bo
if(is_object($_structure)) {
$structure = $_structure;
} else {
$structure = $this->_getStructure($_uid, true);
$structure = $this->_getStructure($_uid, true, true);
if($_partID != '') {
$structure = $this->_getSubStructure($structure, $_partID);
}