Changeset 2372 for sandbox/workflow/trunk/inc/local/classes/class.wf_role.php

Timestamp:

03/29/10 14:46:01 (14 years ago)

Author:

pedroerp

Message:

Ticket #609 - Merged 2197:2356 /sandbox/workflow/branches/609/ em /sandbox/workflow/trunk.

File:

• sandbox/workflow/trunk/inc/local/classes/class.wf_role.php (modified) (4 diffs)

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

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