From 111a88617be52d1969261118392ea6d5c1a960fc Mon Sep 17 00:00:00 2001 From: angles Date: Wed, 12 Dec 2001 19:34:29 +0000 Subject: [PATCH] add globals to naked php_self in function redirect, comment out some broken code in template linux-at-work --- phpgwapi/inc/class.phpgw.inc.php | 2 +- phpgwapi/templates/linux-at-work.de/navbar.inc.php | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/phpgwapi/inc/class.phpgw.inc.php b/phpgwapi/inc/class.phpgw.inc.php index e5dd73b0f9..50f92f001e 100644 --- a/phpgwapi/inc/class.phpgw.inc.php +++ b/phpgwapi/inc/class.phpgw.inc.php @@ -122,7 +122,7 @@ if ( !$url ) { - $url = $PHP_SELF; + $url = $GLOBALS['PHP_SELF']; } if ( $iis ) { diff --git a/phpgwapi/templates/linux-at-work.de/navbar.inc.php b/phpgwapi/templates/linux-at-work.de/navbar.inc.php index ff66afcd5d..71b7e95c9f 100644 --- a/phpgwapi/templates/linux-at-work.de/navbar.inc.php +++ b/phpgwapi/templates/linux-at-work.de/navbar.inc.php @@ -143,8 +143,13 @@ { $tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR); $tpl->set_unknowns('remove'); - + $tpl->set_file(array('footer' => 'footer.tpl')); + + // as of Dec 10, 2001 this powered by code is somewhat broken + // can cause a loop of error message about power bottom being invalid + // needs repair (ed: Angles) + /* $tpl->set_block('footer','B_powered_bottom','V_powered_bottom'); if ($GLOBALS['phpgw_info']['server']['showpoweredbyon'] == 'bottom') @@ -163,7 +168,8 @@ { $tpl->set_var('V_powered_bottom',''); } - + */ + $GLOBALS['phpgw']->common->hook('navbar_end'); $tpl->pfp('out','footer'); }