extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-04 05:44:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

fall back to default timeout (=20) on felamimail_bo->openConnection, as a timeout set to 5 seemed to trigger too many unwanted timeouts

Browse Source
This commit is contained in:
Klaus Leithoff 2011-09-28 12:23:14 +00:00
parent 4e0ae73a73
commit 40708b49d1
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3426,7 +3426,7 @@ class felamimail_bo
//error_log(__METHOD__." using existing Connection ProfileID:".$_icServerID.' Status:'.print_r($this->icServer->_connected,true)); //error_log(__METHOD__." using existing Connection ProfileID:".$_icServerID.' Status:'.print_r($this->icServer->_connected,true));
} else { } else {
//error_log( "-------------------------->open connection for Server with profileID:".$_icServerID.function_backtrace()); //error_log( "-------------------------->open connection for Server with profileID:".$_icServerID.function_backtrace());
$tretval = $this->icServer->openConnection($_adminConnection,5); $tretval = $this->icServer->openConnection($_adminConnection);
if ( PEAR::isError($tretval) || $tretval===false) if ( PEAR::isError($tretval) || $tretval===false)
{ {
$isError[$_icServerID] = ($tretval?$tretval->message:$this->icServer->_connectionErrorObject->message); $isError[$_icServerID] = ($tretval?$tretval->message:$this->icServer->_connectionErrorObject->message);

3
notifications/inc/class.notifications_ajax.inc.php
View File

@ -165,8 +165,9 @@ class notifications_ajax {
$bufferFMailSession = $bofelamimail->sessionData; $bufferFMailSession = $bofelamimail->sessionData;
if( !$bofelamimail->openConnection($activeProfile) ) { if( !$bofelamimail->openConnection($activeProfile) ) {
// TODO: This is ugly. Log a bit nicer! // TODO: This is ugly. Log a bit nicer!
error_log(__METHOD__.__LINE__.' # '.$bofelamimail->getErrorMessage()); $error = $bofelamimail->getErrorMessage();
error_log(__METHOD__.__LINE__.' # '.self::_appname.' (user: '.$this->recipient->account_lid.'): cannot connect to mailbox with Profile:'.$activeProfile.'. Please check your prefs!'); error_log(__METHOD__.__LINE__.' # '.self::_appname.' (user: '.$this->recipient->account_lid.'): cannot connect to mailbox with Profile:'.$activeProfile.'. Please check your prefs!');
if (!empty($error)) error_log(__METHOD__.__LINE__.' # '.$error);
error_log(__METHOD__.__LINE__.' # Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid']); error_log(__METHOD__.__LINE__.' # Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid']);
return false; // cannot connect to mailbox return false; // cannot connect to mailbox
} }