mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-08 09:05:16 +01:00
Remove none existing mail connectionTimeout preference. Fixes warning of Undefined array key 'connectionTimeout'.
This commit is contained in:
parent
69782e833e
commit
e76ae2db32
@ -1000,9 +1000,7 @@ class Mail
|
|||||||
*/
|
*/
|
||||||
static function getTimeOut($_use='IMAP')
|
static function getTimeOut($_use='IMAP')
|
||||||
{
|
{
|
||||||
$timeout = $GLOBALS['egw_info']['user']['preferences']['mail']['connectionTimeout'];
|
return $_use=='SIEVE' ? 10 : 20; // this is the default value
|
||||||
if (empty($timeout)) $timeout = ($_use=='SIEVE'?10:20); // this is the default value
|
|
||||||
return $timeout;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -360,9 +360,7 @@ class Imap extends Horde_Imap_Client_Socket implements Imap\PushIface
|
|||||||
*/
|
*/
|
||||||
static function getTimeOut($_use='IMAP')
|
static function getTimeOut($_use='IMAP')
|
||||||
{
|
{
|
||||||
if (empty($timeout = $GLOBALS['egw_info']['user']['preferences']['mail']['connectionTimeout']) || !((int)$timeout > 0))
|
return $_use == 'SIEVE' ? 10 : 20; // this is the default value
|
||||||
$timeout = $_use == 'SIEVE' ? 10 : 20; // this is the default value
|
|
||||||
return $timeout;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user