Changeset 2249 for sandbox/workflow/branches/609/inc/class.run_activity.inc.php

Timestamp:

03/15/10 14:41:49 (14 years ago)

Author:

pedroerp

Message:

Ticket #609 - Adaptando os processos do workflow para utilizar o nova factory.

File:

• sandbox/workflow/branches/609/inc/class.run_activity.inc.php (modified) (6 diffs)

sandbox/workflow/branches/609/inc/class.run_activity.inc.php

@@ -13 +13 @@
         require_once(dirname(__FILE__) . SEP . 'class.basecontroller.inc.php' ); /* module controller            */
         require_once(dirname(__FILE__) . SEP . 'class.basemodel.inc.php'      ); /* module logic                 */
-        require_once(dirname(__FILE__) . SEP . 'class.process_factory.inc.php'); /* module process factory class */
+        //require_once(dirname(__FILE__) . SEP . 'class.process_factory.inc.php'); /* module process factory class */
         require_once(dirname(__FILE__) . SEP . 'class.utils.security.php'     ); /* sanitizes input data         */
 
@@ -301 +301 @@
                         $this->process_version  = $this->process->getVersion();
                         $this->activity_name    = $activity->getName();
-                        $this->user_name        = Factory::getForeignInstance('phpgwapi', 'phpgw')->accounts->id2name($GLOBALS['user']);
+                        $this->user_name                = $GLOBALS['phpgw']->accounts->id2name($GLOBALS['user']);
                         $this->view_activity    = $this->GUI->gui_get_process_view_activity($this->process_id);
 
@@ -440 +440 @@
                         $security             =& new SecurityUtils();              //input sanitizer class
                         $env['request']       =& $security->process($_REQUEST);    //sanitizes input data from client
-                        $env['factory']       =& new ProcessFactory();             //instantiation controller class
+                        //$env['factory']       =& new ProcessFactory();             //instantiation controller class
+                        $env['factory']       =& Factory::getInstance('ProcessWrapperFactory');  //instantiation controller class
                         $env['natural']           =& wf_create_object('wf_natural');   //data access object instance for mainframe
                         /* END WORKFLOW MVC SETTINGS */
@@ -473 +474 @@
                         /* activate the security policy */
                         Factory::getInstance('WorkflowSecurity')->enableSecurityPolicy();
+
+                        /**
+                         * XXX
+                         * here we are going to use our new Security static class.
+                         * From now, the factory frontend (static) will forward
+                         * the messages for the process factory instead of Workflow
+                         * factory.
+                         * XXX
+                        */
+                        Security::enable();
 
                         /* include the files */
@@ -701 +712 @@
                         $security             =& new SecurityUtils();              //input sanitizer class
                         $env['request']       =& $security->process($_REQUEST); //sanitizes input data from client
-                        $env['factory']       =& new ProcessFactory();                     //instantiation controller class
+                        //$env['factory']       =& new ProcessFactory();                           //instantiation controller class
+                        $env['factory']       =& Factory::newInstance('ProcessWrapperFactory');  //instantiation controller class
                         $env['natural']           =& wf_create_object('wf_natural');   //data access object instance for mainframe
                         /* END WORKFLOW MVC SETTINGS */
@@ -713 +725 @@
                         /* activate the security policy */
                         Factory::getInstance('WorkflowSecurity')->enableSecurityPolicy();
+
+                        /**
+                         * XXX
+                         * here we are going to use our new Security static class.
+                         * From now, the factory frontend (static) will forward
+                         * the messages for the process factory instead of Workflow
+                         * factory. Note that this is the same comment as the previous
+                         * function... boooring.. =}
+                         * XXX
+                        */
+                        Security::enable();
 
                         $GLOBALS['workflow_env'] = &$env;