[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/inc class.common.inc.php, 1.123.2.9.2.15, 1
|
From: |
Mark A Peters <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] phpgwapi/inc class.common.inc.php, 1.123.2.9.2.15, 1.123.2.9.2.16 class.nextmatchs.inc.php, 1.43.2.6.2.4, 1.43.2.6.2.5 class.sessions_db.inc.php, 1.2.2.10.2.7, 1.2.2.10.2.8 class.sessions_php4.inc.php, 1.6.2.10.2.7, 1.6.2.10.2.8 footer.inc.php, 1.17.2.2.2.4, 1.17.2.2.2.5 functions.inc.php, 1.121.2.13.2.12, 1.121.2.13.2.13 |
|
Date: |
Mon, 29 Sep 2003 00:13:17 +0000 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv32274
Modified Files:
Tag: Version-0_9_16-branch
class.common.inc.php class.nextmatchs.inc.php
class.sessions_db.inc.php class.sessions_php4.inc.php
footer.inc.php functions.inc.php
Log Message:
Fixes a few issues of changing ['HTTP_GET_VARS'] to the correct method of
acquiring variables.
Index: class.sessions_php4.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.sessions_php4.inc.php,v
retrieving revision 1.6.2.10.2.7
retrieving revision 1.6.2.10.2.8
diff -C2 -d -r1.6.2.10.2.7 -r1.6.2.10.2.8
*** class.sessions_php4.inc.php 28 Sep 2003 04:15:50 -0000 1.6.2.10.2.7
--- class.sessions_php4.inc.php 29 Sep 2003 00:13:15 -0000 1.6.2.10.2.8
***************
*** 72,78 ****
function update_dla()
{
! if (@isset($_GET['menuaction']))
{
! $action = $_GET['menuaction'];
}
else
--- 72,78 ----
function update_dla()
{
! if (@isset($GLOBALS['phpgw_info']['menuaction']))
{
! $action = $GLOBALS['phpgw_info']['menuaction'];
}
else
Index: class.nextmatchs.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.nextmatchs.inc.php,v
retrieving revision 1.43.2.6.2.4
retrieving revision 1.43.2.6.2.5
diff -C2 -d -r1.43.2.6.2.4 -r1.43.2.6.2.5
*** class.nextmatchs.inc.php 8 Sep 2003 13:26:38 -0000 1.43.2.6.2.4
--- class.nextmatchs.inc.php 29 Sep 2003 00:13:14 -0000 1.43.2.6.2.5
***************
*** 66,72 ****
}
! if(isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
{
! $this->action =
$GLOBALS['HTTP_GET_VARS']['menuaction'];
}
}
--- 66,72 ----
}
! if(isset($GLOBALS['phpgw_info']['menuaction']))
{
! $this->action =
$GLOBALS['phpgw_info']['menuaction'];
}
}
Index: footer.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/footer.inc.php,v
retrieving revision 1.17.2.2.2.4
retrieving revision 1.17.2.2.2.5
diff -C2 -d -r1.17.2.2.2.4 -r1.17.2.2.2.5
*** footer.inc.php 1 Jun 2003 09:23:16 -0000 1.17.2.2.2.4
--- footer.inc.php 29 Sep 2003 00:13:15 -0000 1.17.2.2.2.5
***************
*** 37,41 ****
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' &&
--- 37,41 ----
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['phpgw_info']['menuaction'])) &&
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'home' &&
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'login' &&
***************
*** 43,49 ****
address@hidden'phpgw_info']['flags']['noappfooter'])
{
! if ($GLOBALS['HTTP_GET_VARS']['menuaction'])
{
! list($app,$class,$method) =
explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']);
if (is_array($GLOBALS[$class]->public_functions) &&
$GLOBALS[$class]->public_functions['footer'])
{
--- 43,49 ----
address@hidden'phpgw_info']['flags']['noappfooter'])
{
! if ($GLOBALS['phpgw_info']['menuaction'])
{
! list($app,$class,$method) =
explode('.',$GLOBALS['phpgw_info']['menuaction']);
if (is_array($GLOBALS[$class]->public_functions) &&
$GLOBALS[$class]->public_functions['footer'])
{
Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.123.2.9.2.15
retrieving revision 1.123.2.9.2.16
diff -C2 -d -r1.123.2.9.2.15 -r1.123.2.9.2.16
*** class.common.inc.php 23 Sep 2003 00:37:44 -0000 1.123.2.9.2.15
--- class.common.inc.php 29 Sep 2003 00:13:14 -0000 1.123.2.9.2.16
***************
*** 1158,1164 ****
$tpl->set_var($GLOBALS['phpgw_info']['theme']);
$app_css = '';
! if(@isset($_GET['menuaction']))
{
! list($app,$class,$method) =
explode('.',$_GET['menuaction']);
if(is_array($GLOBALS[$class]->public_functions)
&&
$GLOBALS[$class]->public_functions['css'])
--- 1158,1164 ----
$tpl->set_var($GLOBALS['phpgw_info']['theme']);
$app_css = '';
! if(@isset($GLOBALS['phpgw_info']['menuaction']))
{
! list($app,$class,$method) =
explode('.',$GLOBALS['phpgw_info']['menuaction']);
if(is_array($GLOBALS[$class]->public_functions)
&&
$GLOBALS[$class]->public_functions['css'])
***************
*** 1193,1199 ****
}
! if(@isset($_GET['menuaction']))
{
! list($app,$class,$method) =
explode('.',$_GET['menuaction']);
if(is_array($GLOBALS[$class]->public_functions)
&&
$GLOBALS[$class]->public_functions['java_script'])
--- 1193,1199 ----
}
! if(@isset($GLOBALS['phpgw_info']['menuaction']))
{
! list($app,$class,$method) =
explode('.',$GLOBALS['phpgw_info']['menuaction']);
if(is_array($GLOBALS[$class]->public_functions)
&&
$GLOBALS[$class]->public_functions['java_script'])
Index: class.sessions_db.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.sessions_db.inc.php,v
retrieving revision 1.2.2.10.2.7
retrieving revision 1.2.2.10.2.8
diff -C2 -d -r1.2.2.10.2.7 -r1.2.2.10.2.8
*** class.sessions_db.inc.php 17 Jul 2003 22:23:50 -0000 1.2.2.10.2.7
--- class.sessions_db.inc.php 29 Sep 2003 00:13:15 -0000 1.2.2.10.2.8
***************
*** 64,70 ****
function update_dla()
{
! if (@isset($_GET['menuaction']))
{
! $action = $_GET['menuaction'];
}
else
--- 64,70 ----
function update_dla()
{
! if (@isset($GLOBALS['phpgw_info']['menuaction']))
{
! $action = $GLOBALS['phpgw_info']['menuaction'];
}
else
Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.121.2.13.2.12
retrieving revision 1.121.2.13.2.13
diff -C2 -d -r1.121.2.13.2.12 -r1.121.2.13.2.13
*** functions.inc.php 23 Sep 2003 01:56:31 -0000 1.121.2.13.2.12
--- functions.inc.php 29 Sep 2003 00:13:15 -0000 1.121.2.13.2.13
***************
*** 206,209 ****
--- 206,218 ----
/************************************************************************\
+ * Load the menuaction
*
+
\************************************************************************/
+ $GLOBALS['phpgw_info']['menuaction'] =
get_var('menuaction',Array('GET','POST'));
+ if(!$GLOBALS['phpgw_info']['menuaction'])
+ {
+ unset($GLOBALS['phpgw_info']['menuaction']);
+ }
+
+
/************************************************************************\
* Required classes
*
\************************************************************************/
***************
*** 432,436 ****
\*************************************************************************/
/* Then the include file */
! if (! preg_match ("/phpgwapi/i", PHPGW_APP_INC) &&
file_exists(PHPGW_APP_INC . '/functions.inc.php') &&
!isset($_GET['menuaction']))
{
include_once(PHPGW_APP_INC . '/functions.inc.php');
--- 441,445 ----
\*************************************************************************/
/* Then the include file */
! if (! preg_match ("/phpgwapi/i", PHPGW_APP_INC) &&
file_exists(PHPGW_APP_INC . '/functions.inc.php') &&
!isset($GLOBALS['phpgw_info']['menuaction']))
{
include_once(PHPGW_APP_INC . '/functions.inc.php');
***************
*** 438,442 ****
if (address@hidden'phpgw_info']['flags']['noheader'] &&
address@hidden'phpgw_info']['flags']['noappheader'] &&
! file_exists(PHPGW_APP_INC . '/header.inc.php') &&
!isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
{
include_once(PHPGW_APP_INC . '/header.inc.php');
--- 447,451 ----
if (address@hidden'phpgw_info']['flags']['noheader'] &&
address@hidden'phpgw_info']['flags']['noappheader'] &&
! file_exists(PHPGW_APP_INC . '/header.inc.php') &&
!isset($GLOBALS['phpgw_info']['menuaction']))
{
include_once(PHPGW_APP_INC . '/header.inc.php');
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] phpgwapi/inc class.common.inc.php, 1.123.2.9.2.15, 1.123.2.9.2.16 class.nextmatchs.inc.php, 1.43.2.6.2.4, 1.43.2.6.2.5 class.sessions_db.inc.php, 1.2.2.10.2.7, 1.2.2.10.2.8 class.sessions_php4.inc.php, 1.6.2.10.2.7, 1.6.2.10.2.8 footer.inc.php, 1.17.2.2.2.4, 1.17.2.2.2.5 functions.inc.php, 1.121.2.13.2.12, 1.121.2.13.2.13,
Mark A Peters <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] property/inc class.soreport.inc.php, 1.9, 1.10 class.soinvoice.inc.php, 1.38, 1.39
- Next by Date:
[Phpgroupware-cvs] phpgwapi/inc functions.inc.php, 1.121.2.13.2.13, 1.121.2.13.2.14
- Previous by thread:
[Phpgroupware-cvs] property/inc class.soreport.inc.php, 1.9, 1.10 class.soinvoice.inc.php, 1.38, 1.39
- Next by thread:
[Phpgroupware-cvs] phpgwapi/inc functions.inc.php, 1.121.2.13.2.13, 1.121.2.13.2.14
- Index(es):