mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-18 12:41:10 +01:00
Try to catch exceptions in sieve connection
This commit is contained in:
parent
623a6ed5f7
commit
ff1878f6cf
@ -1107,13 +1107,18 @@ class emailadmin_imap extends Horde_Imap_Client_Socket implements defaultimap
|
||||
case 'retrieveRules':
|
||||
case 'getVacation':
|
||||
case 'setVacation':
|
||||
if (is_null($this->sieve))
|
||||
{
|
||||
PEAR::setErrorHandling(PEAR_ERROR_EXCEPTION);
|
||||
$this->sieve = new emailadmin_sieve($this);
|
||||
$this->error =& $this->sieve->error;
|
||||
try {
|
||||
if (is_null($this->sieve))
|
||||
{
|
||||
PEAR::setErrorHandling(PEAR_ERROR_EXCEPTION);
|
||||
$this->sieve = new emailadmin_sieve($this);
|
||||
$this->error =& $this->sieve->error;
|
||||
}
|
||||
$ret = call_user_func_array(array($this->sieve,$name),$params);
|
||||
}
|
||||
catch(Exception $e) {
|
||||
throw new PEAR_Exception('Error in Sieve: '.$e->getMessage(), $e);
|
||||
}
|
||||
$ret = call_user_func_array(array($this->sieve,$name),$params);
|
||||
//error_log(__CLASS__.'->'.$name.'('.array2string($params).') returns '.array2string($ret));
|
||||
return $ret;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user