R47811 - /branches/14.1/emailadmin/inc/class.emailadmin_imap.inc.php

Author: hnategh
New Revision: 47811

URL: http://svn.stylite.de/viewvc/egroupware?rev=47811&view=rev
Log:
Try to catch exceptions in sieve connection

Modified:
branches/14.1/emailadmin/inc/class.emailadmin_imap.inc.php

Modified: branches/14.1/emailadmin/inc/class.emailadmin_imap.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.1/emailadmin/inc/class.emailadmin_imap.inc.php?rev=47811&r1=47810&r2=47811&view=diff

— branches/14.1/emailadmin/inc/class.emailadmin_imap.inc.php (original)
+++ branches/14.1/emailadmin/inc/class.emailadmin_imap.inc.php Mon Jul 21 17:25:48 2014
@@ -1107,13 +1107,18 @@
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;
    
  •   		}
    
  •   		$ret = call_user_func_array(array($this->sieve,$name),$params);
    
  •   		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);
    
  •   		}
      		//error_log(__CLASS__.'->'.$name.'('.array2string($params).') returns '.array2string($ret));
      		return $ret;
      }
    

Want fast and easy access to all the code in your enterprise? Index and
search up to 200,000 lines of code with a free copy of Black Duck
Code Sight - the same software that powers the world’s largest code
search on Ohloh, the Black Duck Open Hub! Try it now.
http://p.sf.net/sfu/bds


eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs