[Fmsystem-commits] [7020] felamimail: errorhandling

[Sigurd Nes]

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

Modified Paths:
--------------
    trunk/felamimail/inc/class.bopreferences.inc.php
    trunk/felamimail/inc/class.uifelamimail.inc.php
    trunk/felamimail/index.php

Modified: trunk/felamimail/inc/class.bopreferences.inc.php
===================================================================
--- trunk/felamimail/inc/class.bopreferences.inc.php    2011-02-18 12:32:27 UTC 
(rev 7019)
+++ trunk/felamimail/inc/class.bopreferences.inc.php    2011-02-18 14:34:01 UTC 
(rev 7020)
@@ -156,6 +156,7 @@
 
                                if(!is_a($profileData, 'ea_preferences') || 
!is_a($profileData->ic_server[0], 'defaultimap')) {
 
+       //                              throw new Exception('No preferences or 
Incoming server defined');
                                        return false;
                                }
                                if($profileData->userDefinedAccounts) {

Modified: trunk/felamimail/inc/class.uifelamimail.inc.php
===================================================================
--- trunk/felamimail/inc/class.uifelamimail.inc.php     2011-02-18 12:32:27 UTC 
(rev 7019)
+++ trunk/felamimail/inc/class.uifelamimail.inc.php     2011-02-18 14:34:01 UTC 
(rev 7020)
@@ -11,6 +11,10 @@
        * Free Software Foundation; version 2 of the License.                   
    *
        
\***************************************************************************/
        /* $Id$ */
+       if(! 
is_file(PHPGW_INCLUDE_ROOT.'/felamimail/inc/egw-pear/Net/IMAP.php'))
+       {
+               throw new Exception('missing egw-pear package');
+       }
 
        class uifelamimail
        {

Modified: trunk/felamimail/index.php
===================================================================
--- trunk/felamimail/index.php  2011-02-18 12:32:27 UTC (rev 7019)
+++ trunk/felamimail/index.php  2011-02-18 14:34:01 UTC (rev 7020)
@@ -26,5 +26,13 @@
                                                                
        include('../header.inc.php');
 
-       execmethod('felamimail.uifelamimail.viewMainScreen');
+       try
+       {
+               execmethod('felamimail.uifelamimail.viewMainScreen');
+       }
+       catch(Exception $e)
+       {
+               phpgwapi_cache::message_set($e->getMessage(), 'error');
+               $GLOBALS['phpgw']->redirect_link('/home.php');
+       }
 ?>