From 6c511bdf96249de69fb994660fa075a9e2dbdd27 Mon Sep 17 00:00:00 2001
From: skeeter <skeeter@alumni.egroupware.org>
Date: Tue, 15 May 2001 04:21:16 +0000
Subject: [PATCH] Small cleanups for warnings.

---
 calendar/inc/class.calendar_icap.inc.php    |  3 ++-
 calendar/inc/class.calendar_sql.inc.php     |  3 ++-
 phpgwapi/inc/class.sessions.inc.php         |  3 ++-
 phpgwapi/templates/idsociety/navbar.inc.php | 11 +++++++----
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/calendar/inc/class.calendar_icap.inc.php b/calendar/inc/class.calendar_icap.inc.php
index 7daf70f11f..fc1c1e9f9d 100755
--- a/calendar/inc/class.calendar_icap.inc.php
+++ b/calendar/inc/class.calendar_icap.inc.php
@@ -12,7 +12,8 @@
 
   /* $Id$ */
 
-if ($phpgw_info['flags']['included_classes']['calendar_'] == True)
+if (isset($phpgw_info['flags']['included_classes']['calendar_']) && 
+    $phpgw_info['flags']['included_classes']['calendar_'] == True)
 {
 	return;
 }
diff --git a/calendar/inc/class.calendar_sql.inc.php b/calendar/inc/class.calendar_sql.inc.php
index 7e6bdb2a0c..7f523d4a95 100755
--- a/calendar/inc/class.calendar_sql.inc.php
+++ b/calendar/inc/class.calendar_sql.inc.php
@@ -14,7 +14,8 @@
 
   /* $Id$ */
 
-if ($phpgw_info['flags']['included_classes']['calendar_'] == True)
+if (isset($phpgw_info['flags']['included_classes']['calendar_']) && 
+    $phpgw_info['flags']['included_classes']['calendar_'] == True)
 {
 	return;
 }
diff --git a/phpgwapi/inc/class.sessions.inc.php b/phpgwapi/inc/class.sessions.inc.php
index f972059e99..d075ef9245 100644
--- a/phpgwapi/inc/class.sessions.inc.php
+++ b/phpgwapi/inc/class.sessions.inc.php
@@ -140,7 +140,8 @@
 
 			$phpgw_info['user']['account_id'] = $this->account_id;
 			
-			if ($phpgw_info['server']['cache_phpgw_info'])
+			if (isset($phpgw_info['server']['cache_phpgw_info']) &&
+			    $phpgw_info['server']['cache_phpgw_info'])
 			{
 				$t = $this->appsession('phpgw_info_cache','phpgwapi');
 				$phpgw_info['server'] = $t['server'];
diff --git a/phpgwapi/templates/idsociety/navbar.inc.php b/phpgwapi/templates/idsociety/navbar.inc.php
index 2a51477ff4..011eb7c53f 100644
--- a/phpgwapi/templates/idsociety/navbar.inc.php
+++ b/phpgwapi/templates/idsociety/navbar.inc.php
@@ -25,7 +25,8 @@
 		$tpl->set_var('img_root_roll',PHPGW_IMAGES_DIR . '/rollover');
 		$tpl->set_var('table_bg_color',$phpgw_info['theme']['navbar_bg']);
 
-#  echo '<pre>'; print_r($phpgw_info['navbar']); echo '</pre>';  
+#  echo '<pre>'; print_r($phpgw_info['navbar']); echo '</pre>';
+		$applications = '';
 		while ($app = each($phpgw_info['navbar']))
 		{
 			if ($app[1]['title'] != 'Home' && $app[1]['title'] != 'preferences' && ! ereg('About',$app[1]['title']) && $app[1]['title'] != 'Logout')
@@ -38,8 +39,7 @@
 
 // onMouseOver="two.src='rollover/admin_over.gif'" onMouseOut="two.src='images/admin.gif'"><img src="images/admin.gif" border="0" name="two"
 				$applications .= '<tr><td><a href="' . $app[1]['url'] . '"';
-				if (isset($phpgw_info['flags']['navbar_target']) &&
-				    $phpgw_info['flags']['navbar_target'])
+				if (isset($phpgw_info['flags']['navbar_target']))
 				{
 					$applications .= ' target="' . $phpgw_info['flags']['navbar_target'] . '"';
 				}
@@ -118,7 +118,10 @@
 */
 
 		// If the application has a header include, we now include it
-		if ($phpgw_info['flags']['noheader'] && ! $phpgw_info['flags']['noappheader'])
+		if ((isset($phpgw_info['flags']['noheader']) && 
+		     $phpgw_info['flags']['noheader']) && 
+		    (!isset($phpgw_info['flags']['noappheader']) ||
+		     !$phpgw_info['flags']['noappheader']))
 		{
 
 		}