Changeset 2249 for sandbox/workflow/branches/609/inc/local

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.

Location:

sandbox/workflow/branches/609/inc/local/classes

Files:

• class.JobBase.php (modified) (2 diffs)
• class.wf_ldap.php (modified) (1 diff)
• class.wf_role.php (modified) (3 diffs)

sandbox/workflow/branches/609/inc/local/classes/class.JobBase.php

@@ -89 +89 @@
         {
                 require_once 'common.inc.php';
-                $GLOBALS['workflow']['factory']->getInstance('WorkflowMacro')->prepareEnvironment();
+                Factory::getInstance('WorkflowMacro')->prepareEnvironment();
                 $this->jobID = $jobID;
                 $this->processID = $processID;
                 $this->currentDate = $currentDate;
-                $this->jobManager = &$GLOBALS['workflow']['factory']->getInstance('WorkflowJobManager');
+                $this->jobManager = Factory::getInstance('WorkflowJobManager');
                 $this->testMode = $testMode;
                 $this->maximumExecutionTime = $maximumExecutionTime;
@@ -148 +148 @@
         final private function prepareEnvironment()
         {
-                $GLOBALS['workflow']['factory']->getInstance('WorkflowMacro')->prepareProcessEnvironment($this->processID);
-
-                require_once PHPGW_SERVER_ROOT . '/workflow/inc/class.process_factory.inc.php';
+                Factory::getInstance('WorkflowMacro')->prepareProcessEnvironment($this->processID);
 
                 $this->environment = array();
-                $this->environment['factory']  = &new ProcessFactory();
+                $this->environment['factory']  = &Factory::newInstance('ProcessWrapperFactory');
         }
 

sandbox/workflow/branches/609/inc/local/classes/class.wf_ldap.php

@@ -41 +41 @@
         function wf_ldap()
         {
-                $tmpLDAP = &$GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');
+                $tmpLDAP = Factory::getInstance('WorkflowLDAP');
                 $this->user_context  = $tmpLDAP->getUserContext();
                 $this->group_context = $tmpLDAP->getGroupContext();

sandbox/workflow/branches/609/inc/local/classes/class.wf_role.php

@@ -186 +186 @@
                         $users = array((int) $users);
                 $roleID = $this->roleManager->get_role_id($this->processID, $roleName);
-                $ldap = &$GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');
+                $ldap = Factory::getInstance('WorkflowLDAP');
                 foreach ($users as $user)
                 {
@@ -212 +212 @@
                 $users = $this->roleManager->list_mapped_users($this->processID, false, array('wf_role_name' => $roleName));
 
-                $ldap = &$GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');
+                $ldap = Factory::getInstance('WorkflowLDAP');
                 $output = array();
                 foreach ($users as $id => $login)
@@ -367 +367 @@
 
                 /* get the roles */
-                $userGroups = $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getUserGroups($userID);
+                $userGroups = Factory::getInstance('WorkflowLDAP')->getUserGroups($userID);
                 $query = 'SELECT DISTINCT role.wf_role_id, role.wf_name, role.wf_description FROM egw_wf_roles role, egw_wf_user_roles user_role WHERE (user_role.wf_role_id = role.wf_role_id) AND (role.wf_p_id = ?) AND (role.wf_role_id = ANY (?))';
                 $query .= ' AND (((user_role.wf_user = ?) AND (user_role.wf_account_type = ?))';