extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-16 18:31:26 +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

22
index.php
View File

@ -26,7 +26,7 @@
} }
/* /*
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']))
{ {
@ -68,14 +68,11 @@
$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);
@ -84,6 +81,8 @@
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,13 +104,13 @@
'file' => __FILE__ 'file' => __FILE__
)); ));
} }
}
if(@is_object($GLOBALS['phpgw']->log))
{
$GLOBALS['phpgw']->log->commit(); $GLOBALS['phpgw']->log->commit();
}
$GLOBALS['phpgw']->redirect_link('/home.php'); $GLOBALS['phpgw']->redirect_link('/home.php');
/*
$_obj = CreateObject('home.home');
$_obj->get_list();
*/
} }
if(!isset($GLOBALS['phpgw_info']['nofooter'])) if(!isset($GLOBALS['phpgw_info']['nofooter']))