extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 16:48:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Small cleanups for warnings.

Browse Source
This commit is contained in:
skeeter 2001-05-15 04:21:16 +00:00
parent a141ef21be
commit 6c511bdf96
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
calendar/inc/class.calendar_icap.inc.php
View File

@ -12,7 +12,8 @@
/* $Id$ */ /* $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; return;
} }

3
calendar/inc/class.calendar_sql.inc.php
View File

@ -14,7 +14,8 @@
/* $Id$ */ /* $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; return;
} }

3
phpgwapi/inc/class.sessions.inc.php
View File

@ -140,7 +140,8 @@
$phpgw_info['user']['account_id'] = $this->account_id; $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'); $t = $this->appsession('phpgw_info_cache','phpgwapi');
$phpgw_info['server'] = $t['server']; $phpgw_info['server'] = $t['server'];

11
phpgwapi/templates/idsociety/navbar.inc.php
View File

@ -25,7 +25,8 @@
$tpl->set_var('img_root_roll',PHPGW_IMAGES_DIR . '/rollover'); $tpl->set_var('img_root_roll',PHPGW_IMAGES_DIR . '/rollover');
$tpl->set_var('table_bg_color',$phpgw_info['theme']['navbar_bg']); $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'])) while ($app = each($phpgw_info['navbar']))
{ {
if ($app[1]['title'] != 'Home' && $app[1]['title'] != 'preferences' && ! ereg('About',$app[1]['title']) && $app[1]['title'] != 'Logout') 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" // 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'] . '"'; $applications .= '<tr><td><a href="' . $app[1]['url'] . '"';
if (isset($phpgw_info['flags']['navbar_target']) && if (isset($phpgw_info['flags']['navbar_target']))
$phpgw_info['flags']['navbar_target'])
{ {
$applications .= ' target="' . $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 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']))
{ {
} }