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

Removed object $obj, which was then copied to $GLOBALS[$class] for some reason

Browse Source
This commit is contained in:
Miles Lott 2003-11-14 02:37:20 +00:00
parent 0d250b0c82
commit 8f480344e0
1 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
index.php
View File

@ -12,26 +12,26 @@
/* $Id$ */ /* $Id$ */
$phpgw_info = array(); $phpgw_info = array();
if (!file_exists('header.inc.php')) if(!file_exists('header.inc.php'))
{ {
Header('Location: setup/index.php'); Header('Location: setup/index.php');
exit; exit;
} }
$GLOBALS['sessionid'] = isset($_GET['sessionid']) ? $_GET['sessionid'] : $_COOKIE['sessionid']; $GLOBALS['sessionid'] = isset($_GET['sessionid']) ? $_GET['sessionid'] : $_COOKIE['sessionid'];
if (! $GLOBALS['sessionid']) if(!$GLOBALS['sessionid'])
{ {
Header('Location: login.php'); Header('Location: login.php');
exit; exit;
} }
/* /*
This is the preliminary menuaction driver for the new multi-layered design This is the menuaction driver for the multi-layered design
*/ */
if (@isset($_GET['menuaction'])) if(@isset($_GET['menuaction']))
{ {
list($app,$class,$method) = explode('.',$_GET['menuaction']); list($app,$class,$method) = explode('.',$_GET['menuaction']);
if (! $app || ! $class || ! $method) if(! $app || ! $class || ! $method)
{ {
$invalid_data = True; $invalid_data = True;
} }
@ -45,7 +45,7 @@
$invalid_data = True; $invalid_data = True;
} }
if ($app == 'phpgwapi') if($app == 'phpgwapi')
{ {
$app = 'home'; $app = 'home';
$api_requested = True; $api_requested = True;
@ -58,24 +58,21 @@
); );
include('./header.inc.php'); include('./header.inc.php');
if ($app == 'home' && ! $api_requested) if($app == 'home' && !$api_requested)
{ {
Header('Location: ' . $GLOBALS['phpgw']->link('/home.php')); Header('Location: ' . $GLOBALS['phpgw']->link('/home.php'));
} }
if ($api_requested) if($api_requested)
{ {
$app = 'phpgwapi'; $app = 'phpgwapi';
} }
$GLOBALS['obj'] = CreateObject(sprintf('%s.%s',$app,$class)); $GLOBALS[$class] = CreateObject(sprintf('%s.%s',$app,$class));
$GLOBALS[$class] = $GLOBALS['obj']; if((is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions[$method]) && ! $invalid_data)
if ((is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions[$method]) && ! $invalid_data)
{ {
// eval("\$GLOBALS['obj']->$method();");
execmethod($_GET['menuaction']); execmethod($_GET['menuaction']);
unset($app); unset($app);
unset($obj);
unset($class); unset($class);
unset($method); unset($method);
unset($invalid_data); unset($invalid_data);
@ -83,7 +80,9 @@
} }
else else
{ {
if (! $app || ! $class || ! $method) if(!$app || !$class || !$method)
{
if(@is_object($GLOBALS['phpgw']->log))
{ {
$GLOBALS['phpgw']->log->message(array( $GLOBALS['phpgw']->log->message(array(
'text' => 'W-BadmenuactionVariable, menuaction missing or corrupt: %1', 'text' => 'W-BadmenuactionVariable, menuaction missing or corrupt: %1',
@ -92,8 +91,11 @@
'file' => __FILE__ 'file' => __FILE__
)); ));
} }
}
if (! is_array($obj->public_functions) || ! $obj->public_functions[$method] && $method) if(!is_array($GLOBALS[$class]->public_functions) || ! $$GLOBALS[$class]->public_functions[$method] && $method)
{
if(@is_object($GLOBALS['phpgw']->log))
{ {
$GLOBALS['phpgw']->log->message(array( $GLOBALS['phpgw']->log->message(array(
'text' => 'W-BadmenuactionVariable, attempted to access private method: %1', 'text' => 'W-BadmenuactionVariable, attempted to access private method: %1',
@ -102,16 +104,16 @@
'file' => __FILE__ 'file' => __FILE__
)); ));
} }
}
if(@is_object($GLOBALS['phpgw']->log))
{
$GLOBALS['phpgw']->log->commit(); $GLOBALS['phpgw']->log->commit();
$GLOBALS['phpgw']->redirect_link('/home.php');
/*
$_obj = CreateObject('home.home');
$_obj->get_list();
*/
} }
if (!isset($GLOBALS['phpgw_info']['nofooter'])) $GLOBALS['phpgw']->redirect_link('/home.php');
}
if(!isset($GLOBALS['phpgw_info']['nofooter']))
{ {
$GLOBALS['phpgw']->common->phpgw_footer(); $GLOBALS['phpgw']->common->phpgw_footer();
} }