extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-02 19:39:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

try to handle possible errors when retrieving folderStatus

Browse Source
This commit is contained in:
Klaus Leithoff 2013-01-11 10:54:59 +00:00
parent 2e44b80d07
commit 94a04fb4c4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
felamimail/inc/class.felamimail_bo.inc.php
View File

@ -1657,6 +1657,7 @@ class felamimail_bo
{ {
$retval = true; $retval = true;
if($folderToSelect && ($folderStatus = $this->getFolderStatus($folderToSelect,false,true))) { if($folderToSelect && ($folderStatus = $this->getFolderStatus($folderToSelect,false,true))) {
if ($folderStatus instanceof PEAR_Error) return false;
if (stripos(array2string($folderStatus['attributes']),'noselect')!==false) if (stripos(array2string($folderStatus['attributes']),'noselect')!==false)
{ {
$retval = false; $retval = false;
@ -1731,7 +1732,7 @@ class felamimail_bo
{ {
$retValue['displayName'] = $retValue['shortDisplayName'] = lang($retValue['shortName']); $retValue['displayName'] = $retValue['shortDisplayName'] = lang($retValue['shortName']);
} }
$folderBasicInfo[$this->profileID][$_folderName]=$retValue; if (!($folderInfo instanceof PEAR_Error)) $folderBasicInfo[$this->profileID][$_folderName]=$retValue;
egw_cache::setCache(egw_cache::INSTANCE,'email','folderBasicInfo'.trim($GLOBALS['egw_info']['user']['account_id']),$folderBasicInfo,$expiration=60*60*1); egw_cache::setCache(egw_cache::INSTANCE,'email','folderBasicInfo'.trim($GLOBALS['egw_info']['user']['account_id']),$folderBasicInfo,$expiration=60*60*1);
if ($basicInfoOnly || stripos(array2string($retValue['attributes']),'noselect')!==false) if ($basicInfoOnly || stripos(array2string($retValue['attributes']),'noselect')!==false)
{ {