[Phpgroupware-cvs] phpgwapi/inc/common_functions.inc.php, 1.16.2.11

[nomail]

Update of /phpgwapi/inc
Modified Files:
        Branch: Version-0_9_16-branch
          common_functions.inc.php

date: 2004/09/04 05:53:37;  author: skwashd;  state: Exp;  lines: +7 -17

Log Message:
error reporting fix - remove unneeded evals
=====================================================================
Index: phpgwapi/inc/common_functions.inc.php
diff -u phpgwapi/inc/common_functions.inc.php:1.16.2.10 
phpgwapi/inc/common_functions.inc.php:1.16.2.11
--- phpgwapi/inc/common_functions.inc.php:1.16.2.10     Thu Feb 26 21:49:22 2004
+++ phpgwapi/inc/common_functions.inc.php       Sat Sep  4 05:53:37 2004
@@ -624,36 +624,26 @@
                                }
                        }
                        unset($GLOBALS['methodparts']);
-                       $code = '$isobject = 
is_object('.$parentobject.'->'.$classname.');';
-                       eval ($code);
-                       if (!$isobject)
+                       
+                       if (! @is_object($$parentobject->$classname) )
                        {
                                if ($classparams != '_UNDEF_' && ($classparams 
|| $classparams != 'True'))
                                {
-                                       if (is_string($classparams))
-                                       {
-                                               
eval($parentobject.'->'.$classname.' = 
CreateObject("'.$appname.'.'.$classname.'", "'.$classparams.'");');
-                                       }
-                                       else
-                                       {
-                                               
eval($parentobject.'->'.$classname.' = 
CreateObject("'.$appname.'.'.$classname.'", '.$classparams.');');
-                                       }
+                                       $$parentobject->$classname = 
CreateObject($appname.'.'.$classname, $classparams);
                                }
                                else
                                {
-                                       eval($parentobject.'->'.$classname.' = 
CreateObject("'.$appname.'.'.$classname.'");');
+                                       $$parentobject->$classname = 
CreateObject($appname.'.'.$classname);
                                }
                        }
 
                        if ($functionparams != '_UNDEF_' && ($functionparams || 
$functionparams != 'True'))
                        {
-                               eval('$returnval = 
'.$parentobject.'->'.$classname.'->'.$functionname.'('.$functionparams.');');
-                               return $returnval;
+                               return 
$$parentobject->$classname->$functionname($functionparams);
                        }
                        else
                        {
-                               eval('$returnval = 
'.$parentobject.'->'.$classname.'->'.$functionname.'();');
-                               return $returnval;
+                               return $returnval = 
$$parentobject->$classname->$functionname();
                        }
                }
                else