holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

supplement folder status Info with delimiter

Browse Source
This commit is contained in:
Klaus Leithoff 2013-10-25 10:23:36 +00:00
parent 57f45fe5f0
commit 49bacaef69
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -956,8 +956,8 @@ class mail_bo
static $folderBasicInfo; static $folderBasicInfo;
if (is_null($folderBasicInfo)) if (is_null($folderBasicInfo))
{ {
$folderBasicInfo = egw_cache::getCache(egw_cache::INSTANCE,'email','folderBasicInfo'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),$expiration=60*60*1); // $folderBasicInfo = egw_cache::getCache(egw_cache::INSTANCE,'email','folderBasicInfo'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),$expiration=60*60*1);
$folderInfoCache = $folderBasicInfo[$this->profileID]; // $folderInfoCache = $folderBasicInfo[$this->profileID];
} }
if (isset($folderInfoCache[$_folderName]) && $ignoreStatusCache==false && $basicInfoOnly) return $folderInfoCache[$_folderName]; if (isset($folderInfoCache[$_folderName]) && $ignoreStatusCache==false && $basicInfoOnly) return $folderInfoCache[$_folderName];
$retValue = array(); $retValue = array();
@ -971,27 +971,27 @@ class mail_bo
if (is_null($folderInfoCache) || !isset($folderInfoCache[$_folderName])) $folderInfoCache[$_folderName] = $this->icServer->getMailboxes('', $_folderName, true); if (is_null($folderInfoCache) || !isset($folderInfoCache[$_folderName])) $folderInfoCache[$_folderName] = $this->icServer->getMailboxes('', $_folderName, true);
$folderInfo = $folderInfoCache[$_folderName]; $folderInfo = $folderInfoCache[$_folderName];
//error_log(__METHOD__.__LINE__.array2string($folderInfo).'->'.function_backtrace()); //error_log(__METHOD__.__LINE__.array2string($folderInfo).'->'.function_backtrace());
if(($folderInfo instanceof PEAR_Error) || !is_array($folderInfo[0])) { if(($folderInfo instanceof PEAR_Error) || !is_array($folderInfo)) {
if (self::$debug||$folderInfo instanceof PEAR_Error) error_log(__METHOD__." returned Info for folder $_folderName:".print_r($folderInfo->message,true)); if (self::$debug||$folderInfo instanceof PEAR_Error) error_log(__METHOD__." returned Info for folder $_folderName:".print_r($folderInfo->message,true));
if ( ($folderInfo instanceof PEAR_Error) || PEAR::isError($r = $this->_getStatus($_folderName)) || $r == 0) return false; if ( ($folderInfo instanceof PEAR_Error) || PEAR::isError($r = $this->_getStatus($_folderName)) || $r == 0) return false;
if (!is_array($folderInfo[0])) if (!is_array($folderInfo))
{ {
// no folder info, but there is a status returned for the folder: something is wrong, try to cope with it // no folder info, but there is a status returned for the folder: something is wrong, try to cope with it
$folderInfo = array(0 => (is_array($folderInfo)?$folderInfo:array('HIERACHY_DELIMITER'=>$this->getHierarchyDelimiter(), $folderInfo = is_array($folderInfo)?$folderInfo:array('HIERACHY_DELIMITER'=>$this->getHierarchyDelimiter(),
'ATTRIBUTES' => ''))); 'ATTRIBUTES' => '');
if (empty($folderInfo[0]['HIERACHY_DELIMITER']) || (isset($folderInfo[0]['delimiter']) && empty($folderInfo[0]['delimiter']))) if (empty($folderInfo['HIERACHY_DELIMITER']) || (isset($folderInfo['delimiter']) && empty($folderInfo['delimiter'])))
{ {
//error_log(__METHOD__.__LINE__.array2string($folderInfo)); //error_log(__METHOD__.__LINE__.array2string($folderInfo));
$folderInfo[0]['HIERACHY_DELIMITER'] = $this->getHierarchyDelimiter(); $folderInfo['HIERACHY_DELIMITER'] = $this->getHierarchyDelimiter();
} }
} }
} }
#if(!is_array($folderInfo[0])) { #if(!is_array($folderInfo[0])) {
# return false; # return false;
#} #}
error_log(__METHOD__.__LINE__.$folderInfo);
$retValue['delimiter'] = ($folderInfo[0]['HIERACHY_DELIMITER']?$folderInfo[0]['HIERACHY_DELIMITER']:$folderInfo[0]['delimiter']); $retValue['delimiter'] = ($folderInfo['HIERACHY_DELIMITER']?$folderInfo['HIERACHY_DELIMITER']:$folderInfo['delimiter']);
$retValue['attributes'] = ($folderInfo[0]['ATTRIBUTES']?$folderInfo[0]['ATTRIBUTES']:$folderInfo[0]['attributes']); $retValue['attributes'] = ($folderInfo['ATTRIBUTES']?$folderInfo['ATTRIBUTES']:$folderInfo['attributes']);
$shortNameParts = explode($retValue['delimiter'], $_folderName); $shortNameParts = explode($retValue['delimiter'], $_folderName);
$retValue['shortName'] = array_pop($shortNameParts); $retValue['shortName'] = array_pop($shortNameParts);
$retValue['displayName'] = $this->encodeFolderName($_folderName); $retValue['displayName'] = $this->encodeFolderName($_folderName);
@ -1114,7 +1114,7 @@ class mail_bo
$total = $_sortResult['count']; $total = $_sortResult['count'];
#_debug_array($sortResult); #_debug_array($sortResult);
#_debug_array(array_slice($sortResult, -5, -2)); #_debug_array(array_slice($sortResult, -5, -2));
error_log("REVERSE: $reverse"); //error_log("REVERSE: $reverse");
if($reverse === true) { if($reverse === true) {
if ($_startMessage<=$total) if ($_startMessage<=$total)
{ {