holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"fixed CreateObject to not suppress the error, if it cant find a class file or there are eg. syntax errors in it

Browse Source 
--> now you can find the error in the error_log and dont get only a blank page
(also optimized it so far, that we first try to autoload the class and use the diverse \"magic\" only if that fails)"
This commit is contained in:
Ralf Becker 2009-03-13 12:47:53 +00:00
parent df134f3588
commit efb3189b49
1 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
phpgwapi/inc/common_functions.inc.php
View File

@ -675,56 +675,57 @@ function &CreateObject($class)
{
list($appname,$classname) = explode('.',$class);
if (!@include_once(EGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php'))
if (!class_exists($classname))
{
static $replace = array(
'datetime' => 'egw_datetime',
'uitimesheet' => 'timesheet_ui',
'uiinfolog' => 'infolog_ui',
'uiprojectmanager' => 'projectmanager_ui',
'uiprojectelements' => 'projectmanager_elements_ui',
'uiroles' => 'projectmanager_roles_ui',
'uimilestones' => 'projectmanager_milestones_ui',
'uipricelist' => 'projectmanager_pricelist_ui',
);
if (isset($replace[$classname]))
if (!file_exists(EGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php'))
{
//throw new Exception(__METHOD__."('$class') old classname '$classname' used in menuaction=$_GET[menuaction]!");
error_log(__METHOD__."('$class') old classname '$classname' used in menuaction=$_GET[menuaction]!");
$classname = $replace[$classname];
include_once(EGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php');
static $replace = array(
'datetime' => 'egw_datetime',
'uitimesheet' => 'timesheet_ui',
'uiinfolog' => 'infolog_ui',
'uiprojectmanager' => 'projectmanager_ui',
'uiprojectelements' => 'projectmanager_elements_ui',
'uiroles' => 'projectmanager_roles_ui',
'uimilestones' => 'projectmanager_milestones_ui',
'uipricelist' => 'projectmanager_pricelist_ui',
);
if (isset($replace[$classname]))
{
//throw new Exception(__METHOD__."('$class') old classname '$classname' used in menuaction=$_GET[menuaction]!");
error_log(__METHOD__."('$class') old classname '$classname' used in menuaction=$_GET[menuaction]!");
$classname = $replace[$classname];
}
}
// this will stop php with a 500, if the class does not exist or there are errors in it (syntax error go into the error_log)
require_once(EGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php');
}
if (class_exists($classname))
$args = func_get_args();
switch(count($args))
{
$args = func_get_args();
switch(count($args))
{
case 1:
$obj =& new $classname;
break;
case 2:
$obj =& new $classname($args[1]);
break;
case 3:
$obj =& new $classname($args[1],$args[2]);
break;
case 4:
$obj =& new $classname($args[1],$args[2],$args[3]);
break;
default:
$code = '$obj =& new ' . $classname . '(';
foreach($args as $n => $arg)
case 1:
$obj =& new $classname;
break;
case 2:
$obj =& new $classname($args[1]);
break;
case 3:
$obj =& new $classname($args[1],$args[2]);
break;
case 4:
$obj =& new $classname($args[1],$args[2],$args[3]);
break;
default:
$code = '$obj =& new ' . $classname . '(';
foreach($args as $n => $arg)
{
if ($n)
{
if ($n)
{
$code .= ($n > 1 ? ',' : '') . '$args[' . $n . ']';
}
$code .= ($n > 1 ? ',' : '') . '$args[' . $n . ']';
}
$code .= ');';
eval($code);
break;
}
}
$code .= ');';
eval($code);
break;
}
if (!is_object($obj))
{