[Fmsystem-commits] [7021] felamimail: errorhandling

[Sigurd Nes]

Revision: 7021
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7021
Author:   sigurdne
Date:     2011-02-18 14:34:46 +0000 (Fri, 18 Feb 2011)
Log Message:
-----------
felamimail: errorhandling

Modified Paths:
--------------
    trunk/emailadmin/inc/class.defaultimap.inc.php
    trunk/emailadmin/inc/class.emailadmin_bo.inc.php

Modified: trunk/emailadmin/inc/class.defaultimap.inc.php
===================================================================
--- trunk/emailadmin/inc/class.defaultimap.inc.php      2011-02-18 14:34:01 UTC 
(rev 7020)
+++ trunk/emailadmin/inc/class.defaultimap.inc.php      2011-02-18 14:34:46 UTC 
(rev 7021)
@@ -11,7 +11,10 @@
        
\***************************************************************************/
        /* $Id$ */
 
-       require_once PHPGW_INCLUDE_ROOT.'/felamimail/inc/egw-pear/Net/IMAP.php';
+       if(!include_once 
PHPGW_INCLUDE_ROOT.'/felamimail/inc/egw-pear/Net/IMAP.php')
+       {
+               throw new Exception('missing egw-pear package');
+       }
 
        define('IMAP_NAMESPACE_PERSONAL', 'personal');
        define('IMAP_NAMESPACE_OTHERS'  , 'others');

Modified: trunk/emailadmin/inc/class.emailadmin_bo.inc.php
===================================================================
--- trunk/emailadmin/inc/class.emailadmin_bo.inc.php    2011-02-18 14:34:01 UTC 
(rev 7020)
+++ trunk/emailadmin/inc/class.emailadmin_bo.inc.php    2011-02-18 14:34:46 UTC 
(rev 7021)
@@ -488,7 +488,16 @@
                                // fetch the IMAP / incomming server data
                                $icClass = 
isset($this->IMAPServerType[$data['imapType']]) ? 
$this->IMAPServerType[$data['imapType']]['classname'] : 'defaultimap';
 
-                               $icServer =& 
CreateObject('emailadmin.'.$icClass);
+                               try
+                               {
+                                       $icServer =& 
CreateObject('emailadmin.'.$icClass);
+                               }
+                               catch(Exception $e)
+                               {
+                                       
phpgwapi_cache::message_set($e->getMessage(), 'error');
+                                       return false;
+                               }
+
                                $icServer->encryption   = 
($data['imapTLSEncryption'] == 'yes' ? 1 : (int)$data['imapTLSEncryption']);
                                $icServer->host         = $data['imapServer'];
                                $icServer->port         = $data['imapPort'];