[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/inc footer.inc.php,1.17.2.2,1.17.2.3
From: |
Ralf Becker <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc footer.inc.php,1.17.2.2,1.17.2.3 |
Date: |
Thu, 03 Apr 2003 15:06:08 -0500 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv18759
Modified Files:
Tag: Version-0_9_14-branch
footer.inc.php
Log Message:
fixed the endless inclusion of the /phpgwapi/inc/footer.inc.php by itself on
the homepage
Index: footer.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/footer.inc.php,v
retrieving revision 1.17.2.2
retrieving revision 1.17.2.3
diff -C2 -r1.17.2.2 -r1.17.2.3
*** footer.inc.php 22 Mar 2003 09:00:36 -0000 1.17.2.2
--- footer.inc.php 3 Apr 2003 20:06:06 -0000 1.17.2.3
***************
*** 35,39 ****
* Include the apps footer files if it exists
*
\**************************************************************************/
! if ((file_exists (PHPGW_APP_INC . '/footer.inc.php') ||
isset($GLOBALS['HTTP_GET_VARS']['menuaction'])) &&
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'home' &&
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'login' &&
--- 35,41 ----
* Include the apps footer files if it exists
*
\**************************************************************************/
! if (PHPGW_APP_INC != PHPGW_API_INC && // this prevents an endless
inclusion on the homepage
! // (some apps set
currentapp in hook_home => it's not releyable)
! (file_exists (PHPGW_APP_INC . '/footer.inc.php') ||
isset($GLOBALS['HTTP_GET_VARS']['menuaction'])) &&
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'home' &&
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'login' &&
***************
*** 41,44 ****
--- 43,47 ----
address@hidden'phpgw_info']['flags']['noappfooter'])
{
+ echo "<p>footer:
currentapp='".$GLOBALS['phpgw_info']['flags']['currentapp']."'</p>\n";
if ($GLOBALS['HTTP_GET_VARS']['menuaction'])
{
***************
*** 47,54 ****
--- 50,59 ----
{
// eval("\$GLOBALS[$class]->footer();");
+ echo "<p>footer via
menuaction='$_GET[menuaction]' and footer method</p>\n";
$GLOBALS[$class]->footer();
}
elseif(file_exists(PHPGW_APP_INC.'/footer.inc.php'))
{
+ echo "<p>footer via
menuaction='$_GET[menuaction]' and footer-file:
'".PHPGW_APP_INC."/footer.inc.php'</p>\n";
include(PHPGW_APP_INC . '/footer.inc.php');
}
***************
*** 56,63 ****
elseif(file_exists(PHPGW_APP_INC.'/footer.inc.php'))
{
include(PHPGW_APP_INC . '/footer.inc.php');
}
}
-
if(function_exists('parse_navbar_end'))
{
--- 61,68 ----
elseif(file_exists(PHPGW_APP_INC.'/footer.inc.php'))
{
+ echo "<p>footer via footer-file:
'".PHPGW_APP_INC."/footer.inc.php'</p>\n";
include(PHPGW_APP_INC . '/footer.inc.php');
}
}
if(function_exists('parse_navbar_end'))
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc footer.inc.php,1.17.2.2,1.17.2.3,
Ralf Becker <address@hidden> <=