Changeset 2372 for sandbox/workflow/trunk/inc/engine/config.egw.inc.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/engine/config.egw.inc.php (modified) (9 diffs)

sandbox/workflow/trunk/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 */
@@ -305 +305 @@
                 {
                         // This way we create a new run_activity instance for the next activity
-                        $run_activity = CreateObject('workflow.run_activity.go');
+                        $run_activity = Factory::getInstance('run_activity');
                         $data = $run_activity->go($activityId, $iid, $auto);
                         return $data;
@@ -325 +325 @@
         function galaxia_get_config_values($parameters=array())
         {
-                        $config = CreateObject('phpgwapi.config');
+                        $config = Factory::getInstance('config');
                         $config->read_repository();