[Phpgroupware-cvs] phpgwapi/inc class.object_factory.inc.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Changes by:     Dave Hall <skwashd>     06/09/22 03:00:06

Modified files:
        inc            : class.object_factory.inc.php 

Log message:
        code cleanup

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.object_factory.inc.php?cvsroot=phpgwapi&r1=1.4&r2=1.5

Patches:
Index: class.object_factory.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.object_factory.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- class.object_factory.inc.php        3 Sep 2006 06:15:27 -0000       1.4
+++ class.object_factory.inc.php        22 Sep 2006 03:00:05 -0000      1.5
@@ -7,7 +7,7 @@
        * @license http://www.fsf.org/licenses/gpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage application
-       * @version $Id: class.object_factory.inc.php,v 1.4 2006/09/03 06:15:27 
skwashd Exp $
+       * @version $Id: class.object_factory.inc.php,v 1.5 2006/09/22 03:00:05 
skwashd Exp $
        */
 
        /**
@@ -41,44 +41,45 @@
                        
$p9='_UNDEF_',$p10='_UNDEF_',$p11='_UNDEF_',$p12='_UNDEF_',
                        
$p13='_UNDEF_',$p14='_UNDEF_',$p15='_UNDEF_',$p16='_UNDEF_')
                {
-                       global $phpgw_info, $phpgw;
-       
-                       if ( isset($GLOBALS['phpgw']->log) && 
is_object($GLOBALS['phpgw']->log) && $class != 'phpgwapi.error' && $class != 
'phpgwapi.errorlog')
+                       if ( $class != 'phpgwapi.log' && $class != 
'phpgwapi.error' && $class != 'phpgwapi.errorlog')
                        {
-                               
//$GLOBALS['phpgw']->log->write(array('text'=>'D-Debug, dbg: %1','p1'=>'This 
class was run: '.$class,'file'=>__FILE__,'line'=>__LINE__));
+                               phpgw_handle_error(PHPGW_E_DEBUG, 'This class 
was run: ' . $class, __LINE__, __FILE__);
                        }
        
                        list($appname,$classname) = explode('.', $class);
                        $is_included = include_class($appname, $classname);
                        if($is_included)
                        {
-                               if ($p1 == '_UNDEF_' && $p1 != 1)
+                               if ($p1 == '_UNDEF_')
                                {
                                        $obj = new $classname;
                                }
                                else
                                {
                                        $input = 
array($p1,$p2,$p3,$p4,$p5,$p6,$p7,$p8,$p9,$p10,$p11,$p12,$p13,$p14,$p15,$p16);
-                                       $i = 1;
                                        $code = '$obj = new ' . $classname . 
'(';
-                                       while (list($x,$test) = each($input))
+                                       $i = 0;
+                                       for ( $i = 1; $i < 17; ++$i )
                                        {
-                                               if (($test == '_UNDEF_' && 
$test != 1 ) || $i == 17)
+                                               $arg = "p$i";
+                                               if ( $$arg == '_UNDEF_' && $i 
!= 1 )
                                                {
                                                        break;
                                                }
                                                else
                                                {
-                                                       $code .= '$p' . $i . 
',';
+                                                       $code .= "\$$arg,";
                                                }
-                                               $i++;
                                        }
                                        $code = substr($code,0,-1) . ');';
                                        eval($code);
                                }
-                               /* error_reporting(E_ERROR | E_WARNING | 
E_PARSE); */
                                return $obj;
                        }
+                       else
+                       {
+                               trigger_error("Can not createObject($class), 
file does not exist", E_USER_ERROR);
+                       }
                }
        
                /**