Changeset 2233 for sandbox/workflow/branches/609/lib

Timestamp:

03/12/10 10:59:32 (14 years ago)

Author:

pedroerp

Message:

Ticket #609 - Migração das classes do módulo workflow para a nova factory.

Location:

sandbox/workflow/branches/609/lib/factory

Files:

• BaseFactory.php (modified) (1 diff)
• Factory.php (modified) (2 diffs)
• WorkflowFactory.php (modified) (1 diff)

sandbox/workflow/branches/609/lib/factory/BaseFactory.php

@@ -154 +154 @@
                 /* not found */
                 if (!($entry = $this->_getEntry($className)))
-                        throw new Exception('You are not allowed to instantiate '.$className.' class.');
+                        throw new Exception('You are not allowed to instantiate \''.$className.'\' class.');
 
-                $fullPath = $entry['basePath'] . SEP . $entry['path'] . SEP . $entry['filename'];
+                $fullPath = $entry['basePath'] . '/' . $entry['path'] . '/' . $entry['filename'];
 
                 /* file not found */

sandbox/workflow/branches/609/lib/factory/Factory.php

@@ -64 +64 @@
          * @static
          */
-        public static function getInstance() {
+        public static function &getInstance() {
 
                 /* oops. we are in the process space. */
@@ -93 +93 @@
          * Just forward this call to the correct class.
          *
-         * @todo I must implement it!
          * @access public
          * @retun object
          * @static
          */
-        public static function newInstance() {
+        public static function &newInstance() {
+
+                /* oops. we are in the process space. */
+                if (Security::isEnabled()) {
+
+                        /* must instatiate it */
+                        if (is_null(self::$_securedFactory))
+                                self::$_securedFactory = new ProcessFactory();
+
+                        $args = func_get_args();
+                        return call_user_func_array(array(self::$_securedFactory, "newInstance"), $args);
+
+                }
+                /* regular module space */
+                else {
+
+                        /* must instatiate it */
+                        if (is_null(self::$_unsecuredFactory))
+                                self::$_unsecuredFactory = new WorkflowFactory();
+
+                        $args = func_get_args();
+                        return call_user_func_array(array(self::$_unsecuredFactory, "newInstance"), $args);
+                }
         }
 }

sandbox/workflow/branches/609/lib/factory/WorkflowFactory.php

@@ -49 +49 @@
                 /* registering allowed classes */
                 $this->registerFileInfo('WorkflowObjects', 'class.WorkflowObjects.inc.php', 'inc');
+                $this->registerFileInfo('WorkflowWatcher', 'class.WorkflowWatcher.inc.php', 'inc');
+                $this->registerFileInfo('WorkflowLDAP', 'class.WorkflowLDAP.inc.php', 'inc');
+                $this->registerFileInfo('WorkflowSecurity', 'class.WorkflowSecurity.inc.php', 'inc');
+                $this->registerFileInfo('ResourcesRedirector', 'class.ResourcesRedirector.inc.php', 'inc');
                 $this->registerFileInfo('TemplateServer', 'class.TemplateServer.inc.php', 'inc');
+                $this->registerFileInfo('CachedLDAP', 'class.CachedLDAP.inc.php', 'inc');
+                $this->registerFileInfo('BrowserInfo', 'class.BrowserInfo.inc.php', 'inc');
+
                 $this->registerFileInfo('workflow_smarty', 'class.workflow_smarty.inc.php', 'inc');
+                $this->registerFileInfo('workflow_acl', 'class.workflow_acl.inc.php', 'inc');
+                $this->registerFileInfo('workflow_processmanager', 'class.workflow_processmanager.inc.php', 'inc');
+
+                $this->registerFileInfo('bo_participants', 'class.bo_participants.inc.php', 'inc');
 
                 /* registering egw class example */
-                //$this->registerFileInfo('db', 'x', 'inc', PHPGW_API_INC);
+                $this->registerFileInfo('phpgw', 'class.phpgw.inc.php', '', EGW_INC_ROOT);
+                $this->registerFileInfo('db', 'class.db.inc.php', '', EGW_INC_ROOT);
+                $this->registerFileInfo('accounts', 'class.accounts.inc.php', '', EGW_INC_ROOT);
 
                 /* ok. no more instances of this class.. */