[Phpgroupware-cvs] phpgwapi/templates/verdilak navbar.inc.php

[Caeies]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Changes by:     Caeies <Caeies> 06/09/25 14:23:47

Modified files:
        templates/verdilak: navbar.inc.php 

Log message:
        Some E_ALL fixes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/verdilak/navbar.inc.php?cvsroot=phpgwapi&r1=1.33&r2=1.34

Patches:
Index: navbar.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/templates/verdilak/navbar.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- navbar.inc.php      5 Sep 2006 13:08:38 -0000       1.33
+++ navbar.inc.php      25 Sep 2006 14:23:47 -0000      1.34
@@ -5,7 +5,7 @@
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage gui
-       * @version $Id: navbar.inc.php,v 1.33 2006/09/05 13:08:38 sigurdne Exp $
+       * @version $Id: navbar.inc.php,v 1.34 2006/09/25 14:23:47 Caeies Exp $
        */
 
 
@@ -95,7 +95,8 @@
                }
 
                $var['home_link'] = 
$GLOBALS['phpgw_info']['navbar']['home']['url'];
-               $var['preferences_link'] = 
$GLOBALS['phpgw_info']['navbar']['preferences']['url'];
+               //XXX Caeies not sure of that :(
+               $var['preferences_link'] = 
isset($GLOBALS['phpgw_info']['navbar']['preferences']) && 
isset($GLOBALS['phpgw_info']['navbar']['preferences']['url']) ? 
$GLOBALS['phpgw_info']['navbar']['preferences']['url'] : '' ;
                $var['logout_link'] = 
$GLOBALS['phpgw_info']['navbar']['logout']['url'];
                $var['help_link'] = 
$GLOBALS['phpgw_info']['navbar']['about']['url'];
 
@@ -135,7 +136,7 @@
 
                // Maybe we should create a common function in the 
phpgw_accounts_shared.inc.php file
                // to get rid of duplicate code.
-               if ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] == 0)
+               if (!isset($GLOBALS['phpgw_info']['user']['lastpasswd_change']) 
|| $GLOBALS['phpgw_info']['user']['lastpasswd_change'] == 0)
                {
                        $api_messages = lang('You are required to change your 
password during your first login')
                       . '<br> Click this image on the navbar: <img src="'
@@ -163,7 +164,7 @@
                }
                $tpl->set_var($var);
                // check if user is allowed to change his prefs
-               if ($GLOBALS['phpgw_info']['user']['apps']['preferences'])
+               if 
(isset($GLOBALS['phpgw_info']['user']['apps']['preferences']) && 
$GLOBALS['phpgw_info']['user']['apps']['preferences'])
                {
                        $tpl->parse('preferences_icon','preferences');
                }