[Phpgroupware-cvs] phpgwapi/templates/probusiness head.inc.php nav...

[Sigurd Nes]

CVSROOT:        /sources/phpgwapi
Module name:    phpgwapi
Changes by:     Sigurd Nes <sigurdne>   06/11/25 16:25:56

Modified files:
        templates/probusiness: head.inc.php navbar.inc.php 

Log message:
        notices

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/probusiness/head.inc.php?cvsroot=phpgwapi&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/probusiness/navbar.inc.php?cvsroot=phpgwapi&r1=1.3&r2=1.4

Patches:
Index: head.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/templates/probusiness/head.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- head.inc.php        15 Oct 2006 11:09:45 -0000      1.6
+++ head.inc.php        25 Nov 2006 16:25:55 -0000      1.7
@@ -7,7 +7,7 @@
  * @license http://www.fsf.org/licenses/gpl.html GNU General Public License
  * @package phpgwapi
  * @subpackage gui
- * @version $Id: head.inc.php,v 1.6 2006/10/15 11:09:45 skwashd Exp $
+ * @version $Id: head.inc.php,v 1.7 2006/11/25 16:25:55 sigurdne Exp $
  */
        
        $app_css = $java_script = '';
@@ -36,8 +36,8 @@
        (
                'img_icon'      => PHPGW_IMAGES_DIR . '/favicon.ico',
                'img_shortcut'  => PHPGW_IMAGES_DIR . '/favicon.ico',
-               'font_family'   => $GLOBALS['phpgw_info']['theme']['font'],
-               'website_title' => 
$GLOBALS['phpgw_info']['server']['site_title'] . $app,
+               'font_family'   => 
(isset($GLOBALS['phpgw_info']['theme']['font'])?$GLOBALS['phpgw_info']['theme']['font']:''),
+               'website_title' => 
(isset($GLOBALS['phpgw_info']['server']['site_title'])?$GLOBALS['phpgw_info']['server']['site_title']:'')
 . $app,
                'theme_css'     => $css_ref,
                'css'           => $GLOBALS['phpgw']->common->get_css(),
                'java_script'   => $GLOBALS['phpgw']->common->get_java_script(),

Index: navbar.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/templates/probusiness/navbar.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- navbar.inc.php      28 Apr 2005 08:11:59 -0000      1.3
+++ navbar.inc.php      25 Nov 2006 16:25:55 -0000      1.4
@@ -7,7 +7,7 @@
  * @license http://www.fsf.org/licenses/gpl.html GNU General Public License
  * @package phpgwapi
  * @subpackage gui
- * @version $Id: navbar.inc.php,v 1.3 2005/04/28 08:11:59 powerstat Exp $
+ * @version $Id: navbar.inc.php,v 1.4 2006/11/25 16:25:55 sigurdne Exp $
  */
 
 
@@ -57,6 +57,7 @@
                        foreach($GLOBALS['phpgw_info']['navbar'] as $app => 
$app_data)
                        {
 
+                               $label = '';
                                if ( $navBarMode == 'text' OR $navBarMode == 
'icons_and_text' )
                                {
                                        $label = $app_data['title'];
@@ -100,7 +101,9 @@
                        $var['sideboxcontent'] = parseMenu();
                }
 
-               if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && 
$GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])
+               if (isset($GLOBALS['phpgw_info']['navbar']['admin'])
+                       && 
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])
+                       && 
$GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])
                {
                        $var['current_users'] = '<a href="' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions')
 .'">&nbsp;' .
                                        lang('Current users') . ': ' . 
$GLOBALS['phpgw']->session->total() . '</a>';
@@ -135,7 +138,7 @@
                if (address@hidden'phpgw_info']['flags']['noappheader'] && 
@isset($_GET['menuaction']))
                {
                        list($app,$class,$method) = 
explode('.',$_GET['menuaction']);
-                       if (is_array($GLOBALS[$class]->public_functions) && 
$GLOBALS[$class]->public_functions['header'])
+                       if (is_array($GLOBALS[$class]->public_functions) && 
isset($GLOBALS[$class]->public_functions['header']) && 
$GLOBALS[$class]->public_functions['header'])
                        {
                                $GLOBALS[$class]->header();
                        }
@@ -156,7 +159,9 @@
 
                $var['powered_by'] = '[ layout powered by <a target="_blank" 
href="http://www.probusiness.de";>pro|business AG</a> ]';
 
-               if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && 
$GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])
+               if (isset($GLOBALS['phpgw_info']['navbar']['admin'])
+                       && 
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])
+                       && 
$GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])
                {
                        $var['current_users'] = '<a href="' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions')
                                        . '">&nbsp;'
@@ -194,7 +199,7 @@
 
        function parseMenu()
        {
-               $content = 
$GLOBALS['phpgw_info']['user']['apps']['phpgw']['sidebox'];
+               $content = 
(isset($GLOBALS['phpgw_info']['user']['apps']['phpgw']['sidebox'])?$GLOBALS['phpgw_info']['user']['apps']['phpgw']['sidebox']:'');
 
                if (is_array($content) && 
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'admin')
                {