mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-07 08:34:29 +01:00
Removed object $obj, which was then copied to $GLOBALS[$class] for some reason
This commit is contained in:
parent
0d250b0c82
commit
8f480344e0
68
index.php
68
index.php
@ -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,35 +80,40 @@
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (! $app || ! $class || ! $method)
|
if(!$app || !$class || !$method)
|
||||||
{
|
{
|
||||||
$GLOBALS['phpgw']->log->message(array(
|
if(@is_object($GLOBALS['phpgw']->log))
|
||||||
'text' => 'W-BadmenuactionVariable, menuaction missing or corrupt: %1',
|
{
|
||||||
'p1' => $menuaction,
|
$GLOBALS['phpgw']->log->message(array(
|
||||||
'line' => __LINE__,
|
'text' => 'W-BadmenuactionVariable, menuaction missing or corrupt: %1',
|
||||||
'file' => __FILE__
|
'p1' => $menuaction,
|
||||||
));
|
'line' => __LINE__,
|
||||||
|
'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)
|
||||||
{
|
{
|
||||||
$GLOBALS['phpgw']->log->message(array(
|
if(@is_object($GLOBALS['phpgw']->log))
|
||||||
'text' => 'W-BadmenuactionVariable, attempted to access private method: %1',
|
{
|
||||||
'p1' => $method,
|
$GLOBALS['phpgw']->log->message(array(
|
||||||
'line' => __LINE__,
|
'text' => 'W-BadmenuactionVariable, attempted to access private method: %1',
|
||||||
'file' => __FILE__
|
'p1' => $method,
|
||||||
));
|
'line' => __LINE__,
|
||||||
|
'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']))
|
||||||
{
|
{
|
||||||
$GLOBALS['phpgw']->common->phpgw_footer();
|
$GLOBALS['phpgw']->common->phpgw_footer();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user