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

nicer implementation of CreateObject and some small fixes

Browse Source
This commit is contained in:
Ralf Becker 2021-04-01 18:48:48 +02:00
parent 42f8c9182e
commit 7135243d06
3 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/Etemplate.php
View File

@ -616,7 +616,7 @@ class Etemplate extends Etemplate\Widget\Template
/** /**
* disables all cells with name == $name * disables all cells with name == $name
* *
* @param sting $name cell-name * @param string $name cell-name
* @param boolean $disabled =true disable or enable a cell, default true=disable * @param boolean $disabled =true disable or enable a cell, default true=disable
* @return reference to attribute * @return reference to attribute
* @deprecated use disableElement($name, $disabled=true) * @deprecated use disableElement($name, $disabled=true)

5
api/src/autoload.php
View File

@ -11,15 +11,14 @@
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de> * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @package api * @package api
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id$
*/ */
// this is only neccessary, if header.inc.php is not included, but api/src/autoload.php directly // this is only necessary, if header.inc.php is not included, but api/src/autoload.php directly
if (!defined('EGW_SERVER_ROOT')) if (!defined('EGW_SERVER_ROOT'))
{ {
define('EGW_SERVER_ROOT', dirname(dirname(__DIR__))); define('EGW_SERVER_ROOT', dirname(dirname(__DIR__)));
define('EGW_INCLUDE_ROOT', EGW_SERVER_ROOT); define('EGW_INCLUDE_ROOT', EGW_SERVER_ROOT);
define('EGW_API_INC', EGW_SERVER_ROOT.'/phpgwapi/inc'); if (file_exists(EGW_SERVER_ROOT.'/phpgwapi/inc')) define('EGW_API_INC', EGW_SERVER_ROOT.'/phpgwapi/inc');
error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED); error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED);
} }

29
api/src/loader/deprecated_factory.php
View File

@ -61,33 +61,8 @@ function CreateObject($class)
require_once(EGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php'); require_once(EGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php');
} }
$args = func_get_args(); $args = func_get_args();
switch(count($args)) array_shift($args);
{ $obj = new $classname(...$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(array_keys($args) as $n)
{
if ($n)
{
$code .= ($n > 1 ? ',' : '') . '$args[' . $n . ']';
}
}
$code .= ');';
eval($code);
break;
}
if (!is_object($obj)) if (!is_object($obj))
{ {
echo "<p>CreateObject('$class'): Cant instanciate class!!!<br />\n".function_backtrace(1)."</p>\n"; echo "<p>CreateObject('$class'): Cant instanciate class!!!<br />\n".function_backtrace(1)."</p>\n";