extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-27 05:11:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Changed the menuaction to GLOBALS['HTTP_GET_VARS']['menuaction']

Browse Source
This commit is contained in:
skeeter 2001-12-29 18:02:51 +00:00
parent 3e829d32ad
commit 30d0030b13
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -474,8 +474,8 @@
echo '<pre>'; print_r($array); echo '</pre>'; echo '<pre>'; print_r($array); echo '</pre>';
$contents = ob_get_contents(); $contents = ob_get_contents();
ob_end_clean(); ob_end_clean();
echo $contents; // echo $contents;
// return $contents; return $contents;
} }
else else
{ {
@ -514,7 +514,7 @@
/* This object does not exist yet. */ /* This object does not exist yet. */
/* $GLOBALS['phpgw']->log->write(array('text'=>'W-MissingFlags, currentapp flag not set'));*/ /* $GLOBALS['phpgw']->log->write(array('text'=>'W-MissingFlags, currentapp flag not set'));*/
echo '<b>!!! YOU DO NOT HAVE YOUR $phpgw_info["flags"]["currentapp"] SET !!!'; echo '<b>!!! YOU DO NOT HAVE YOUR $GLOBALS[\'phpgw_info\'][\'flags\'][\'currentapp\'] SET !!!';
echo '<br>!!! PLEASE CORRECT THIS SITUATION !!!</b>'; echo '<br>!!! PLEASE CORRECT THIS SITUATION !!!</b>';
} }
@ -878,13 +878,13 @@
* Load the app include files if the exists * * Load the app include files if the exists *
\*************************************************************************/ \*************************************************************************/
/* Then the include file */ /* Then the include file */
if (! preg_match ("/phpgwapi/i", PHPGW_APP_INC) && file_exists(PHPGW_APP_INC . '/functions.inc.php') && !isset($menuaction)) if (! preg_match ("/phpgwapi/i", PHPGW_APP_INC) && file_exists(PHPGW_APP_INC . '/functions.inc.php') && !isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
{ {
include(PHPGW_APP_INC . '/functions.inc.php'); include(PHPGW_APP_INC . '/functions.inc.php');
} }
if (!@$GLOBALS['phpgw_info']['flags']['noheader'] && if (!@$GLOBALS['phpgw_info']['flags']['noheader'] &&
!@$GLOBALS['phpgw_info']['flags']['noappheader'] && !@$GLOBALS['phpgw_info']['flags']['noappheader'] &&
file_exists(PHPGW_APP_INC . '/header.inc.php') && !isset($menuaction)) file_exists(PHPGW_APP_INC . '/header.inc.php') && !isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
{ {
include(PHPGW_APP_INC . '/header.inc.php'); include(PHPGW_APP_INC . '/header.inc.php');
} }