[Phpgroupware-cvs] email/inc class.uiindex.inc.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgroupware
Module name:    email
Changes by:     Dave Hall <skwashd>     06/09/25 13:06:23

Modified files:
        inc            : class.uiindex.inc.php 

Log message:
        nicer error message

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.uiindex.inc.php?cvsroot=phpgroupware&r1=1.25&r2=1.26

Patches:
Index: class.uiindex.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.uiindex.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- class.uiindex.inc.php       11 May 2005 19:09:36 -0000      1.25
+++ class.uiindex.inc.php       25 Sep 2006 13:06:23 -0000      1.26
@@ -7,7 +7,7 @@
        * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package email
-       * @version $Id: class.uiindex.inc.php,v 1.25 2005/05/11 19:09:36 
powerstat Exp $
+       * @version $Id: class.uiindex.inc.php,v 1.26 2006/09/25 13:06:23 
skwashd Exp $
        * @internal Based on AngleMail http://www.anglemail.org/
        */
 
@@ -24,7 +24,8 @@
                var $widgets;
                var $tpl;
 
-               var $public_functions = array(
+               var $public_functions = array
+               (
                        'index' => True,
                        'mlist' => True
                );
@@ -43,8 +44,15 @@
                */
                function index()
                {
+                       if ( 
!isset($GLOBALS['phpgw_info']['user']['preferences']['email']) || 
!count($GLOBALS['phpgw_info']['user']['preferences']['email']) )
+                       {
+                               $GLOBALS['phpgw']->common->phpgw_header(true);
+                               echo '<h1><a href="' . 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'email.uipreferences.preferences')) . '">' . lang('Please set your 
preferences') . '</a></h1>';
+                               $GLOBALS['phpgw']->common->phpgw_exit(true);
+                       }
+                       
                        $GLOBALS['phpgw_info']['flags']['currentapp'] = 
'email';                        
-                       print_debug('relevant phpgw_info data', 
$GLOBALS['phpgw_info']['user']['preferences']['email']);
+                       phpgw_handle_error(PHPGW_E_DEBUG, 'relevant phpgw_info 
data ' . @print_r($GLOBALS['phpgw_info']['user']['preferences']['email'], 
true), __FILE__, __LINE__);
                        
                        $this->bo = CreateObject('email.boindex');
                        $this->bo->index_data();
@@ -78,7 +86,7 @@
                        unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
                        $GLOBALS['phpgw_info']['flags']['noappheader'] = True;
                        $GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
-                       $GLOBALS['phpgw']->common->phpgw_header();
+                       $GLOBALS['phpgw']->common->phpgw_header(true);
                        // HOWEVER still this class must NOT invoke 
$GLOBALS['phpgw']->common->phpgw_header()
                        // even though we had to output the header (go 
figure... :)
                        // later: What does that mean ?