extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 17:14:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed the way the and check for '_UNDEF_' in ExecMethod(). This was discussed with Seek3r and Milosch.

Browse Source
This commit is contained in:
skeeter 2001-08-08 11:13:32 +00:00
parent cb9c5a0d46
commit 8694494bff
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
phpgwapi/inc/functions.inc.php
View File

@ -105,16 +105,14 @@ function CreateObject($class,
*/
function ExecMethod($method, $functionparams = '_UNDEF_', $loglevel = 3, $classparams = '_UNDEF_')
{
/* Need to make sure this is working against a single dimensional object */
// $GLOBALS['phpgw']->log->write(array('text'=>'D-Debug, dbg: %1','p1'=>'This method was run: '.$method,'file'=>__FILE__,'line'=>__LINE__));
/* Need to make sure this is working against a single dimensional object */
$partscount = substr_count($method, '.');
if ($partscount == 2)
{
list($appname,$classname,$functionname) = explode(".", $method);
if (!is_object($GLOBALS[$classname]))
{
if ($classparams != '_UNDEF_' && $classparams != True)
if ($classparams != '_UNDEF_' && ($classparams || $classparams != 'True'))
{
$GLOBALS[$classname] = CreateObject($appname.'.'.$classname, $classparams);
}
@ -124,7 +122,7 @@ function ExecMethod($method, $functionparams = '_UNDEF_', $loglevel = 3, $classp
}
}
if ($functionparams != '_UNDEF_' && $functionparams != True)
if ($functionparams != '_UNDEF_' && ($functionparams || $functionparams != 'True'))
{
return $GLOBALS[$classname]->$functionname($functionparams);
}
@ -133,7 +131,7 @@ function ExecMethod($method, $functionparams = '_UNDEF_', $loglevel = 3, $classp
return $GLOBALS[$classname]->$functionname();
}
}
/* if the $method includes a parent class (multi-dimensional) then we have to work from it */
/* if the $method includes a parent class (multi-dimensional) then we have to work from it */
elseif ($partscount >= 3)
{
$GLOBALS['methodparts'] = explode(".", $method);
@ -141,8 +139,8 @@ function ExecMethod($method, $functionparams = '_UNDEF_', $loglevel = 3, $classp
$appname = $GLOBALS['methodparts'][0];
$classname = $GLOBALS['methodparts'][$classpartnum];
$functionname = $GLOBALS['methodparts'][$partscount];
/* Now I clear these out of the array so that I can do a proper */
/* loop and build the $parentobject */
/* Now I clear these out of the array so that I can do a proper */
/* loop and build the $parentobject */
unset ($GLOBALS['methodparts'][0]);
unset ($GLOBALS['methodparts'][$classpartnum]);
unset ($GLOBALS['methodparts'][$partscount]);
@ -164,7 +162,7 @@ function ExecMethod($method, $functionparams = '_UNDEF_', $loglevel = 3, $classp
eval ('$isobject = is_object('.$parentobject.'->'.$classname.');');
if (!$isobject)
{
if ($classparams != '_UNDEF_')
if ($classparams != '_UNDEF_' && ($classparams || $classparams != 'True'))
{
if (is_string($classparams))
{
@ -181,7 +179,7 @@ function ExecMethod($method, $functionparams = '_UNDEF_', $loglevel = 3, $classp
}
}
if ($functionparams != '_UNDEF_')
if ($functionparams != '_UNDEF_' && ($functionparams || $functionparams != 'True'))
{
eval('$returnval = '.$parentobject.'->'.$classname.'->'.$functionname.'('.$functionparams.');');
return $returnval;