[Phpgroupware-cvs] felamimail/inc class.bofelamimail.inc.php class...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    felamimail
Changes by:     Sigurd Nes <sigurdne>   06/12/19 21:36:26

Modified files:
        inc            : class.bofelamimail.inc.php 
                         class.bopreferences.inc.php hook_admin.inc.php 

Log message:
        links, stop for no configdata set

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.bofelamimail.inc.php?cvsroot=phpgroupware&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.bopreferences.inc.php?cvsroot=phpgroupware&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.9&r2=1.10

Patches:
Index: class.bofelamimail.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.bofelamimail.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- class.bofelamimail.inc.php  19 Dec 2006 15:20:36 -0000      1.11
+++ class.bofelamimail.inc.php  19 Dec 2006 21:36:26 -0000      1.12
@@ -11,7 +11,7 @@
        * Free Software Foundation; either version 2 of the License, or (at 
your    *
        * option) any later version.                                            
    *
        
\***************************************************************************/
-       /* $Id: class.bofelamimail.inc.php,v 1.11 2006/12/19 15:20:36 sigurdne 
Exp $ */
+       /* $Id: class.bofelamimail.inc.php,v 1.12 2006/12/19 21:36:26 sigurdne 
Exp $ */
 
        class bofelamimail
        {
@@ -64,7 +64,7 @@
                                $this->saveSessionData();
                        }
                        
-                       $this->foldername       = $this->sessionData['mailbox'];
+                       $this->foldername       = 
isset($this->sessionData['mailbox'])?$this->sessionData['mailbox']:'';
                        $this->accountid        = 
$GLOBALS['phpgw_info']['user']['account_id'];
                        
                        $this->bopreferences    = 
CreateObject('felamimail.bopreferences');

Index: class.bopreferences.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.bopreferences.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- class.bopreferences.inc.php 19 Dec 2006 15:20:36 -0000      1.8
+++ class.bopreferences.inc.php 19 Dec 2006 21:36:26 -0000      1.9
@@ -11,7 +11,7 @@
        * Free Software Foundation; either version 2 of the License, or (at 
your    *
        * option) any later version.                                            
    *
        
\***************************************************************************/
-       /* $Id: class.bopreferences.inc.php,v 1.8 2006/12/19 15:20:36 sigurdne 
Exp $ */
+       /* $Id: class.bopreferences.inc.php,v 1.9 2006/12/19 21:36:26 sigurdne 
Exp $ */
 
        class bopreferences
        {
@@ -43,6 +43,13 @@
                        $config = CreateObject('phpgwapi.config','felamimail');
                        $config->read_repository();
                        $felamimailConfig = $config->config_data;
+                       if(!isset($felamimailConfig) || 
count($felamimailConfig)==0)
+                       {
+                               $GLOBALS['phpgw']->common->phpgw_header(true);
+                               echo "<center><h1>You have to configure 
felamimail in the admin section <br> please contakt the system 
administrator</h1></center>";
+                               die();
+                       }
+
                        #_debug_array($felamimailConfig);
                        unset($config);
                        

Index: hook_admin.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/hook_admin.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- hook_admin.inc.php  18 Dec 2006 20:03:32 -0000      1.9
+++ hook_admin.inc.php  19 Dec 2006 21:36:26 -0000      1.10
@@ -10,12 +10,12 @@
        *  option) any later version.                                           
   *
        
\**************************************************************************/
 
-  /* $Id: hook_admin.inc.php,v 1.9 2006/12/18 20:03:32 sigurdne Exp $ */
+  /* $Id: hook_admin.inc.php,v 1.10 2006/12/19 21:36:26 sigurdne Exp $ */
 {
 // Only Modify the $file and $title variables.....
        $title = $appname;
        $file = Array(
-               'Site Configuration'    => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' 
. $appname)
+               'Site Configuration'    => 
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'admin.uiconfig.index','appname'=>
 $appname))
                );
 //Do not modify below this line
        display_section($appname,$title,$file);