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

attempt to handle connection failed errors more convieniently

Browse Source
This commit is contained in:
leithoff 2016-06-07 15:25:33 +02:00
parent 93853cbfe0
commit 0bd975927f
2 changed files with 81 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
api/src/Mail.php
View File

@ -182,6 +182,7 @@ class Mail
* @var array
*/
private static $instances = array();
private static $profileDefunct = array();
/**
* Singleton for Mail
@ -201,6 +202,10 @@ class Mail
if (is_null($_reuseCache)) $_reuseCache = $_restoreSession;
//error_log(__METHOD__.' ('.__LINE__.') '.' RestoreSession:'.$_restoreSession.' ProfileId:'.$_profileID.'/'.Mail\Account::get_default_acc_id().' for user:'.$GLOBALS['egw_info']['user']['account_lid'].' called from:'.function_backtrace());
//error_log(__METHOD__.' ('.__LINE__.') '.array2string($_oldImapServerObject));
if (isset(self::$profileDefunct[$_profileID]) && self::$profileDefunct[$_profileID]===true)
{
throw new Exception(__METHOD__." failed to instanciate Mail for $_profileID / ".$this->profileID." with error:".$e->getMessage().($e->details?', '.$e->details:''));
}
if ($_oldImapServerObject instanceof Mail\Imap)
{
if (!is_object(self::$instances[$_profileID]))
@ -277,7 +282,7 @@ class Mail
}
else
{
throw $e;
throw new Exception(__METHOD__." failed to load the Profile for ProfileID for $_profileID / ".$this->profileID." with error:".$e->getMessage().($e->details?', '.$e->details:''));
}
}
self::storeActiveProfileIDToPref(self::$instances[$_profileID]->icServer, $_profileID, $_validate );
@ -409,7 +414,7 @@ class Mail
}
catch (\Exception $e)
{
throw new Exception(__METHOD__." failed to instanciate Mail for $_profileID / ".$this->profileID." with error:".$e->getMessage());;
throw new Exception(__METHOD__." failed to instanciate Mail for $_profileID / ".$this->profileID." with error:".$e->getMessage());
}
//error_log(__METHOD__.' ('.__LINE__.') '.array2string($acc->imapServer()));
$this->icServer = ($_oldImapServerObject?$acc->oldImapServer():$acc->imapServer());
@ -904,12 +909,30 @@ class Mail
{
static $quota;
if (isset($quota)) return $quota;
$this->icServer->getCurrentMailbox();
if(!$this->icServer->hasCapability('QUOTA')) {
$quota = false;
if (isset(self::$profileDefunct[$this->profileID]) && self::$profileDefunct[$this->profileID]===true)
{
// something is wrong. Do not proceed. either no folder or profile is marked as defunct for this request
return false;
}
$quota = $this->icServer->getStorageQuotaRoot('INBOX');
try
{
$this->icServer->getCurrentMailbox();
if(!$this->icServer->hasCapability('QUOTA')) {
$quota = false;
return false;
}
$quota = $this->icServer->getStorageQuotaRoot('INBOX');
}
catch (Exception $e)
{
//error_log(__METHOD__.array2string($e));
//error_log(__METHOD__." failed to fetch quota on ".$this->profileID.' Reason:'.$e->getMessage().($e->details?', '.$e->details:'')/*.function_backtrace()*/);
if ($e->getCode()==102)
{
self::$profileDefunct[$this->profileID]=true;
throw new Exception(__METHOD__." failed to fetch quota on ".$this->profileID.' Reason:'.$e->getMessage().($e->details?', '.$e->details:''));
}
}
//error_log(__METHOD__.' ('.__LINE__.') '.array2string($quota));
if(is_array($quota)) {
$quota = array(
@ -1024,6 +1047,7 @@ class Mail
}
catch(\Exception $e)
{
if ($e->getCode()==102) self::$profileDefunct[$this->profileID]=true;
unset($e);
$HierarchyDelimiter[$this->icServer->ImapServerId] = '/';
}
@ -1110,7 +1134,7 @@ class Mail
}
catch (\Exception $e)
{
throw new Exception(__METHOD__.' ('.__LINE__.') '." failed for $folderName with error:".$e->getMessage());
throw new Exception(__METHOD__.' ('.__LINE__.') '." failed for $folderName with error:".$e->getMessage().($e->details?', '.$e->details:''));
}
return $folderStatus[$this->icServer->ImapServerId][$folderName];
}
@ -1129,8 +1153,9 @@ class Mail
function getFolderStatus($_folderName,$ignoreStatusCache=false,$basicInfoOnly=false,$fetchSubscribedInfo=true)
{
if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '." called with:$_folderName,$ignoreStatusCache,$basicInfoOnly");
if (!is_string($_folderName) || empty($_folderName)) // something is wrong. Do not proceed
if (!is_string($_folderName) || empty($_folderName)||(isset(self::$profileDefunct[$this->profileID]) && self::$profileDefunct[$this->profileID]===true))
{
// something is wrong. Do not proceed. either no folder or profile is marked as defunct for this request
return false;
}
static $folderInfoCache = null; // reduce traffic on single request
@ -1152,7 +1177,17 @@ class Mail
// does the folder exist???
if (is_null($folderInfoCache) || !isset($folderInfoCache[$_folderName]))
{
$ret = $this->icServer->getMailboxes($_folderName, 1, true);
try
{
$ret = $this->icServer->getMailboxes($_folderName, 1, true);
}
catch (\Exception $e)
{
//error_log(__METHOD__.array2string($e));
//error_log(__METHOD__." failed to fetch Mailbox $_folderName on ".$this->profileID.' Reason:'.$e->getMessage().($e->details?', '.$e->details:'')/*.function_backtrace()*/);
self::$profileDefunct[$this->profileID]=true;
throw new Exception(__METHOD__." failed to fetch Mailbox $_folderName on ".$this->profileID.' Reason:'.$e->getMessage().($e->details?', '.$e->details:''));
}
//error_log(__METHOD__.' ('.__LINE__.') '.$_folderName.' '.array2string($ret));
if (is_array($ret))
{
@ -1173,6 +1208,10 @@ class Mail
}
catch (\Exception $e)
{
//error_log(__METHOD__.array2string($e));
error_log(__METHOD__." failed to fetch status for $_folderName on ".$this->profileID.' Reason:'.$e->getMessage().($e->details?', '.$e->details:'')/*.function_backtrace()*/);
self::$profileDefunct[$this->profileID]=true;
//throw new Exception(__METHOD__." failed to fetch status for $_folderName on ".$this->profileID.' Reason:'.$e->getMessage().($e->details?', '.$e->details:''));
$folderInfo=null;
}
if (!is_array($folderInfo))
@ -3662,7 +3701,8 @@ class Mail
}
catch (\Exception $e)
{
//error_log(__METHOD__.__LINE__.$e->getMessage());
error_log(__METHOD__.__LINE__.$e->getMessage().($e->details?', '.$e->details:''));
self::$profileDefunct[$this->profileID]=true;
$folderInfo[$this->profileID][$_folder] = false;
}
//error_log(__METHOD__.' ('.__LINE__.') '.' Folder Exists:'.$folderInfo[$this->profileID][$_folder].function_backtrace());

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

@ -449,7 +449,17 @@ class mail_ui
// These must always be set, even if $content is an array
$content[self::$nm_index]['cat_is_select'] = true; // Category select is just a normal selectbox
$content[self::$nm_index]['no_filter2'] = false; // Disable second filter
$content[self::$nm_index]['actions'] = self::get_actions();
try
{
$content[self::$nm_index]['actions'] = self::get_actions();
}
catch (Exception $e)
{
// do not exit here. mail-tree should be build. if we exit here, we never get there
self::callWizard($e->getMessage().($e->details?', '.$e->details:''),false, 'error');
unset($e);
//return false;
}
$content[self::$nm_index]['row_id'] = 'row_id'; // is a concatenation of trim($GLOBALS['egw_info']['user']['account_id']):profileID:base64_encode(FOLDERNAME):uid
$content[self::$nm_index]['placeholder_actions'] = array('composeasnew');
$content[self::$nm_index]['get_rows'] = 'mail_ui::get_rows';
@ -752,7 +762,10 @@ class mail_ui
}
catch (Exception $e)
{
self::callWizard($e->getMessage(),true, 'error');
// do not exit here. mail-tree should be build. if we exit here, we never get there
error_log(__METHOD__.__LINE__.$e->getMessage().($e->details?', '.$e->details:''));
self::callWizard(__METHOD__.$e->getMessage().$e->getMessage().($e->details?', '.$e->details:''),false, 'error');
//return false;
}
// Check preview pane is enabled, then show spliter
if ($this->mail_bo->mailPreferences['previewPane']) $etpl->setElementAttribute('mail.index.spliter', 'template', 'mail.index.nospliter');
@ -3485,7 +3498,13 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
//error_log(__METHOD__.__LINE__.array2string($_folder));
if ($_folder)
{
$this->mail_bo->getHierarchyDelimiter(false);
try
{
$this->mail_bo->getHierarchyDelimiter(false);
} catch (Exception $e)
{
continue;
}
$oA = array();
foreach ($_folder as $_folderName)
{
@ -3495,7 +3514,14 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
if ($profileID != $this->mail_bo->profileID) continue; // only current connection
if ($folderName)
{
$fS = $this->mail_bo->getFolderStatus($folderName,false,false,false);
try
{
$fS = $this->mail_bo->getFolderStatus($folderName,false,false,false);
}
catch (Exception $e)
{
continue;
}
if (in_array($fS['shortDisplayName'],Mail::$autoFolders)) $fS['shortDisplayName']=lang($fS['shortDisplayName']);
//error_log(__METHOD__.__LINE__.array2string($fS));
if ($fS['unseen'])
@ -4253,6 +4279,7 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
} catch (Exception $e) {
$quota['limit'] = 'NOT SET';
error_log(__METHOD__.__LINE__." ".$e->getMessage());
unset($e);
}
if($quota !== false && $quota['limit'] != 'NOT SET') {