extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-26 09:53:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes a few warnings.

Browse Source
This commit is contained in:
skeeter 2001-05-13 04:08:01 +00:00
parent 3f0fc741fe
commit da47c29c24
4 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
phpgwapi/inc/class.common.inc.php
View File

@ -351,17 +351,24 @@
$a[] = $firstname;
}
switch(count($a))
if(isset($a))
{
case 0:
return $lid;
break;
case 1:
return '<' . $lid . '> ' . $a[0];
break;
case 2:
return '<' . $lid . '> ' . implode(', ',$a);
break;
switch(count($a))
{
case 0:
return $lid;
break;
case 1:
return '<' . $lid . '> ' . $a[0];
break;
case 2:
return '<' . $lid . '> ' . implode(', ',$a);
break;
}
}
else
{
return $lid;
}
}

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

@ -574,7 +574,8 @@
// Its up to the app to pass this value. (jengo)
// Putting it into the app requires a massive number of updates in email app.
// Until that happens this needs to stay here (seek3r)
if ($phpgw_info['flags']['newsmode'])
if (isset($phpgw_info['flags']['newsmode']) &&
$phpgw_info['flags']['newsmode'])
{
$url .= '&newsmode=on';
}

13
phpgwapi/inc/functions.inc.php
View File

@ -46,7 +46,8 @@
$classpart = explode (".", $classname);
$appname = $classpart[0];
$classname = $classpart[1];
if (!$phpgw_info["flags"]["included_classes"][$classname]){
if (!isset($phpgw_info['flags']['included_classes'][$classname])
|| !$phpgw_info["flags"]["included_classes"][$classname]){
$phpgw_info["flags"]["included_classes"][$classname] = True;
include(PHPGW_INCLUDE_ROOT."/".$appname."/inc/class.".$classname.".inc.php");
}
@ -424,7 +425,8 @@
/*************************************************************************\
* Load the header unless the developer turns it off *
\*************************************************************************/
if (! $phpgw_info["flags"]["noheader"]) {
if (!isset($phpgw_info['flags']['noheader']) ||
!$phpgw_info['flags']['noheader']) {
$phpgw->common->phpgw_header();
}
@ -435,8 +437,11 @@
if (! preg_match ("/phpgwapi/i", PHPGW_APP_INC) && file_exists(PHPGW_APP_INC."/functions.inc.php")){
include(PHPGW_APP_INC . "/functions.inc.php");
}
if (!$phpgw_info["flags"]["noheader"] && ! $phpgw_info["flags"]["noappheader"] &&
file_exists(PHPGW_APP_INC . "/header.inc.php")) {
if ((!isset($phpgw_info['flags']['noheader']) ||
!$phpgw_info["flags"]["noheader"]) &&
(!isset($phpgw_info['flags']['noappheader']) ||
!$phpgw_info["flags"]["noappheader"]) &&
file_exists(PHPGW_APP_INC . "/header.inc.php")) {
include(PHPGW_APP_INC . "/header.inc.php");
}
}

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

@ -25,11 +25,6 @@
$tpl->set_var('img_root_roll',PHPGW_IMAGES_DIR . '/rollover');
$tpl->set_var('table_bg_color',$phpgw_info['theme']['navbar_bg']);
if ($phpgw_info['flags']['navbar_target'])
{
$target = ' target="' . $phpgw_info['flags']['navbar_target'] . '"';
}
# echo '<pre>'; print_r($phpgw_info['navbar']); echo '</pre>';
while ($app = each($phpgw_info['navbar']))
{
@ -42,9 +37,14 @@
$img_src_out = $phpgw_info['server']['webserver_url'] . '/' . $app[0] . '/templates/idsociety/images/navbar.gif';
// 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'] . '"' . $target . ' onMouseOver="'
. $app[0] . '.src=\'' . $img_src_over . '\'" onMouseOut="' . $app[0] . '.src=\'' . $img_src_out . '\'">';
$applications .= '<tr><td><a href="' . $app[1]['url'] . '"';
if (isset($phpgw_info['flags']['navbar_target']) &&
$phpgw_info['flags']['navbar_target'])
{
$applications .= ' target="' . $phpgw_info['flags']['navbar_target'] . '"';
}
$applications .= 'onMouseOver="' . $app[0] . '.src=\'' . $img_src_over . '\'" onMouseOut="' . $app[0] . '.src=\'' . $img_src_out . '\'">';
$applications .= $title . '</a></td></tr>';
$applications .= "\n";
}