Changeset 2492 for sandbox/workflow/branches/993/inc/engine

Timestamp:

04/12/10 16:21:32 (14 years ago)

Author:

pedroerp

Message:

Ticket #993 - Trocando acessos à GLOBALS por acessos à Settings.

Location:

sandbox/workflow/branches/993/inc/engine

Files:

• config.egw.inc.php (modified) (7 diffs)
• src/API/BaseActivity.php (modified) (1 diff)

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

@@ -151 +151 @@
         function galaxia_user_can_admin_process()
         {
-                return (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(Settings::get('expresso', 'user', 'account_id')) || $GLOBALS['phpgw']->acl->check('admin_workflow', 1, 'workflow'));
         }
 }
@@ -165 +165 @@
         function galaxia_user_can_admin_instance()
         {
-                return (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(Settings::get('expresso', 'user', 'account_id')) || $GLOBALS['phpgw']->acl->check('admin_instance_workflow', 1, 'workflow'));
         }
 }
@@ -179 +179 @@
         function galaxia_user_can_clean_instances()
         {
-                return (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(Settings::get('expresso', 'user', 'account_id')) || $GLOBALS['phpgw']->acl->check('cleanup_workflow', 1, 'workflow'));
         }
 }
@@ -191 +191 @@
         function galaxia_user_can_clean_aborted_instances()
         {
-                return (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(Settings::get('expresso', 'user', 'account_id')) || $GLOBALS['phpgw']->acl->check('cleanup_aborted_workflow', 1, 'workflow'));
         }
 }
@@ -203 +203 @@
         function galaxia_user_can_monitor()
         {
-                return (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(Settings::get('expresso', 'user', 'account_id')) || $GLOBALS['phpgw']->acl->check('monitor_workflow', 1, 'workflow'));
         }
 }
@@ -219 +219 @@
                 {
                         if ($user == '')
-                                $user = $GLOBALS['phpgw_info']['user']['account_id'];
+                                $user = Settings::get('expresso', 'user', 'account_id');
 
                         $memberships = Factory::getInstance('WorkflowLDAP')->getUserGroups($user);
@@ -271 +271 @@
         function galaxia_retrieve_running_user()
         {
-                        return ($GLOBALS['phpgw_info']['user']['account_id']);
+                        return Settings::get('expresso', 'user', 'account_id');
         }
 }

sandbox/workflow/branches/993/inc/engine/src/API/BaseActivity.php

@@ -242 +242 @@
     
     // retrieve user_groups information in an array containing all groups for this user
-    $user_groups = galaxia_retrieve_user_groups($GLOBALS['phpgw_info']['user']['account_id'] );
+    $user_groups = galaxia_retrieve_user_groups(Settings::get('expresso', 'user', 'account_id') );
     // and append it to query                      
     $query = 'select `wf_role_id` from `'.GALAXIA_TABLE_PREFIX."user_roles`