Changeset 2588 for sandbox/workflow/branches/1015/inc/local/classes

Timestamp:

04/19/10 16:35:19 (14 years ago)

Author:

rufino

Message:

Ticket #1015 - Merged 2372:2466 /sandbox/workflow/trunk em /sandbox/workflow/branches/1015

Location:

sandbox/workflow/branches/1015/inc/local/classes

Files:

• class.wf_engine.php (modified) (2 diffs)
• class.wf_instance.php (modified) (1 diff)
• 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) (1 diff)
• class.wf_workitem.php (modified) (1 diff)

sandbox/workflow/branches/1015/inc/local/classes/class.wf_engine.php

@@ -282 +282 @@
                 /* 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));
 
@@ -310 +310 @@
                 /* 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/branches/1015/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 */

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

@@ -44 +44 @@
                 $this->group_context = $tmpLDAP->getGroupContext();
 
-                $this->ds = &$GLOBALS['workflow']['workflowObjects']->getLDAP();
+                $this->ds = &Factory::getInstance('WorkflowObjects')->getLDAP();
 
                 $this->cachedLDAP = &Factory::getInstance('wf_cached_ldap');

sandbox/workflow/branches/1015/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/branches/1015/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/branches/1015/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 = Factory::getInstance('workflow_rolemanager');
                 $this->activityManager = Factory::getInstance('workflow_activitymanager');

sandbox/workflow/branches/1015/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();
         }