Changeset 2233 for sandbox/workflow/branches/609/inc/engine

Timestamp:

03/12/10 10:59:32 (14 years ago)

Author:

pedroerp

Message:

Ticket #609 - Migração das classes do módulo workflow para a nova factory.

Location:

sandbox/workflow/branches/609/inc/engine

Files:

• class.ajax_config.inc.php (modified) (2 diffs)
• class.ajax_ldap.inc.php (modified) (3 diffs)
• config.ajax.inc.php (modified) (2 diffs)
• config.egw.inc.php (modified) (7 diffs)
• src/ProcessManager/RoleManager.php (modified) (1 diff)

sandbox/workflow/branches/609/inc/engine/class.ajax_config.inc.php

@@ -45 +45 @@
                 }
 
-                $this->db      = &$GLOBALS['workflow']['workflowObjects']->getDBExpresso();
+                $this->db      =& Factory::getInstance('WorkflowObjects')->getDBExpresso();
                 $this->appname = $appname;
         }
@@ -51 +51 @@
         /**
         * Reads the whole repository for $this->appname, appname has to be set via the constructor
-        * 
+        *
         * @return array the whole config-array for that app
         * @access public

sandbox/workflow/branches/609/inc/engine/class.ajax_ldap.inc.php

@@ -29 +29 @@
         function ajax_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();
         }
 
@@ -83 +83 @@
         function id2fullname($account_id)
     {
-                return $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getName($account_id);
+                return Factory::getInstance('WorkflowLDAP')->getName($account_id);
     }
 
@@ -107 +107 @@
                         $accountID = $_SESSION['phpgw_info']['workflow']['account_id'];
 
-                $ldap = &$GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');
+                $ldap =& Factory::getInstance('WorkflowLDAP');
                 if (count($output = $ldap->getUserGroups($accountID)) == 0)
                         return false;

sandbox/workflow/branches/609/inc/engine/config.ajax.inc.php

@@ -170 +170 @@
                 if ($loadGroups)
                 {
-                        $memberships = $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getUserGroups($user);
+                        $memberships = Factory::getInstance('WorkflowLDAP')->getUserGroups($user);
                         if ($user == $_SESSION['phpgw_info']['workflow']['account_id'])
                                 $_SESSION['phpgw_info']['workflow']['user_groups'] = $memberships;
@@ -196 +196 @@
                 {
                         /* get information regarding the members of the group */
-                        $ldap = &$GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');
+                        $ldap = &Factory::getInstance('WorkflowLDAP');
                         $members = $ldap->getGroupUsers($group);
 

sandbox/workflow/branches/609/inc/engine/config.egw.inc.php

@@ -151 +151 @@
         function galaxia_user_can_admin_process()
         {
-                return ($GLOBALS['workflow']['factory']->getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']) || $GLOBALS['phpgw']->acl->check('admin_workflow', 1, 'workflow'));
+                return (Factory::getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']) || $GLOBALS['phpgw']->acl->check('admin_workflow', 1, 'workflow'));
         }
 }
@@ -165 +165 @@
         function galaxia_user_can_admin_instance()
         {
-                return ($GLOBALS['workflow']['factory']->getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']) || $GLOBALS['phpgw']->acl->check('admin_instance_workflow', 1, 'workflow'));
+                return (Factory::getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']) || $GLOBALS['phpgw']->acl->check('admin_instance_workflow', 1, 'workflow'));
         }
 }
@@ -179 +179 @@
         function galaxia_user_can_clean_instances()
         {
-                return ($GLOBALS['workflow']['factory']->getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']) || $GLOBALS['phpgw']->acl->check('cleanup_workflow', 1, 'workflow'));
+                return (Factory::getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']) || $GLOBALS['phpgw']->acl->check('cleanup_workflow', 1, 'workflow'));
         }
 }
@@ -191 +191 @@
         function galaxia_user_can_clean_aborted_instances()
         {
-                return ($GLOBALS['workflow']['factory']->getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']) || $GLOBALS['phpgw']->acl->check('cleanup_aborted_workflow', 1, 'workflow'));
+                return (Factory::getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']) || $GLOBALS['phpgw']->acl->check('cleanup_aborted_workflow', 1, 'workflow'));
         }
 }
@@ -203 +203 @@
         function galaxia_user_can_monitor()
         {
-                return ($GLOBALS['workflow']['factory']->getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']) || $GLOBALS['phpgw']->acl->check('monitor_workflow', 1, 'workflow'));
+                return (Factory::getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']) || $GLOBALS['phpgw']->acl->check('monitor_workflow', 1, 'workflow'));
         }
 }
@@ -221 +221 @@
                                 $user = $GLOBALS['phpgw_info']['user']['account_id'];
 
-                        $memberships = $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getUserGroups($user);
+                        $memberships = Factory::getInstance('WorkflowLDAP')->getUserGroups($user);
 
                         if ($memberships === false)
@@ -245 +245 @@
                 {
                         /* get information regarding the members of the group */
-                        $members = &$GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getGroupUsers($group);
+                        $members = &Factory::getInstance('WorkflowLDAP')->getGroupUsers($group);
 
                         /* checl for error in the LDAP query */

sandbox/workflow/branches/609/inc/engine/src/ProcessManager/RoleManager.php

@@ -247 +247 @@
     $result = $this->query($query,$bindvars);
     $ret = Array();
-    $ldap = &$GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');
+    $ldap = &Factory::getInstance('WorkflowLDAP');
     if (!(empty($result)))
     {