Changeset 1293 for sandbox/workflow/2.0/inc/local/classes

Timestamp:

08/07/09 16:06:07 (15 years ago)

Author:

gbisotto

Message:

Ticket #609 - Modificada a classe Factory e ProcessFactory? para automatizaro acesso ao objetos

Location:

sandbox/workflow/2.0/inc/local/classes

Files:

• class.JobBase.php (modified) (2 diffs)
• class.wf_engine.php (modified) (2 diffs)
• class.wf_instance.php (modified) (2 diffs)
• class.wf_ldap.php (modified) (1 diff)
• class.wf_location.php (modified) (1 diff)
• class.wf_orgchart.php (modified) (1 diff)
• class.wf_role.php (modified) (4 diffs)
• class.wf_workitem.php (modified) (1 diff)

sandbox/workflow/2.0/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);
+                Factory::getInstance('WorkflowMacro')->prepareProcessEnvironment($this->processID);
 
                 require_once PHPGW_SERVER_ROOT . '/workflow/inc/class.process_factory.inc.php';

sandbox/workflow/2.0/inc/local/classes/class.wf_engine.php

@@ -291 +291 @@
                 /* build the SQL query */
                 $query = "SELECT wf_activity_id, wf_name, wf_normalized_name, wf_type, wf_description FROM egw_wf_activities WHERE (wf_activity_id = ?) AND (wf_p_id = ?)";
-                $db = &$GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID;
+                $db = &Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID;
                 $resultSet = $db->query($query, array($activityID, $processID));
 
@@ -319 +319 @@
                 /* build the SQL query */
                 $query = "SELECT wf_activity_id, wf_name, wf_normalized_name, wf_type, wf_description FROM egw_wf_activities WHERE (wf_name = ?) AND (wf_p_id = ?)";
-                $db = &$GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID;
+                $db = &Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID;
                 $resultSet = $db->query($query, array($activityName, $processID));
 

sandbox/workflow/2.0/inc/local/classes/class.wf_instance.php

@@ -92 +92 @@
         {
                 /* load the DB */
-                $this->db = &$GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID;
+                $this->db = &Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID;
 
                 /* load the process ID from the runtime */
@@ -420 +420 @@
                 /* load the required instance (for the required user) */
                 require_once GALAXIA_LIBRARY . SEP . 'src' . SEP . 'GUI' . SEP . 'GUI.php';
-                $GUI = new GUI($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);
+                $GUI = new GUI(Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID);
                 $userInstance = $GUI->gui_list_user_instances($userID, 0, -1, '', '', "(ga.wf_is_interactive = 'y') AND (gia.wf_activity_id = {$activityID}) AND (gia.wf_instance_id = {$instanceID})", false, $this->processID, true, false, true, false, false, false);
                 $userInstance = $userInstance['data'];

sandbox/workflow/2.0/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();
 
-                $this->ds = &$GLOBALS['workflow']['workflowObjects']->getLDAP();
+                $this->ds =& Factory::getInstance('WorkflowObjects')->getLDAP();
 
                 $this->cachedLDAP = new wf_cached_ldap();

sandbox/workflow/2.0/inc/local/classes/class.wf_location.php

@@ -36 +36 @@
         function initialize()
         {
-                $this->db = &$GLOBALS['workflow']['workflowObjects']->getDBExpresso()->Link_ID;
+                $this->db = &Factory::getInstance('WorkflowObjects')->getDBExpresso()->Link_ID;
                 $this->db->setFetchMode(ADODB_FETCH_ASSOC);
                 $this->cityInfo = array();

sandbox/workflow/2.0/inc/local/classes/class.wf_orgchart.php

@@ -24 +24 @@
         function wf_orgchart()
         {
-                $this->db = &$GLOBALS['workflow']['workflowObjects']->getDBWorkflow()->Link_ID;
+                $this->db = &Factory::getInstance('WorkflowObjects')->getDBWorkflow()->Link_ID;
                 $this->db->setFetchMode(ADODB_FETCH_ASSOC);
         }

sandbox/workflow/2.0/inc/local/classes/class.wf_role.php

@@ -57 +57 @@
                         $this->processID = (int) $GLOBALS['workflow']['job']['processID'];
 
-                $this->db = &$GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID;
+                $this->db = &Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID;
                 $this->roleManager = CreateObject('workflow.workflow_rolemanager');
                 $this->activityManager = CreateObject('workflow.workflow_activitymanager');
@@ -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 = ?))';

sandbox/workflow/2.0/inc/local/classes/class.wf_workitem.php

@@ -29 +29 @@
         public function wf_workitem()
         {
-                $this->db = &$GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID;
+                $this->db =& Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID;
                 $this->processID = (int) $GLOBALS['workflow']['wf_runtime']->activity->getProcessId();
         }