Changeset 2492 for sandbox/workflow/branches/993/inc/class.ui_ajaxinterface.inc.php

Timestamp:

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

Author:

pedroerp

Message:

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

File:

• sandbox/workflow/branches/993/inc/class.ui_ajaxinterface.inc.php (modified) (3 diffs)

sandbox/workflow/branches/993/inc/class.ui_ajaxinterface.inc.php

@@ -57 +57 @@
                 $_SESSION['phpgw_info']['workflow']['server'] = $GLOBALS['phpgw_info']['server'];
                 $_SESSION['phpgw_info']['workflow']['lang'] = $GLOBALS['lang'];
-                $_SESSION['phpgw_info']['workflow']['account_id'] = $GLOBALS['phpgw_info']['user']['account_id'];
-                $_SESSION['phpgw_info']['workflow']['user_groups'] = Factory::getInstance('WorkflowLDAP')->getUserGroups($GLOBALS['phpgw_info']['user']['account_id']);
-                $user_is_admin = $acl->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']);
+                $_SESSION['phpgw_info']['workflow']['account_id'] = Settings::get('expresso', 'user', 'account_id');
+                $_SESSION['phpgw_info']['workflow']['user_groups'] = Factory::getInstance('WorkflowLDAP')->getUserGroups(Settings::get('expresso', 'user', 'account_id'));
+                $user_is_admin = $acl->checkWorkflowAdmin(Settings::get('expresso', 'user', 'account_id'));
                 $_SESSION['phpgw_info']['workflow']['user_is_admin'] = $user_is_admin;
                 $_SESSION['phpgw_info']['workflow']['user_can_admin_process'] = ($user_is_admin || ($GLOBALS['phpgw']->acl->check('admin_workflow',1,'workflow')));
                 $_SESSION['phpgw_info']['workflow']['user_can_admin_instance'] = ($user_is_admin || ($GLOBALS['phpgw']->acl->check('admin_instance_workflow',1,'workflow')));
 
-                $can_monitor = $acl->checkUserGroupAccessToType('MON', $GLOBALS['phpgw_info']['user']['account_id']);
+                $can_monitor = $acl->checkUserGroupAccessToType('MON', Settings::get('expresso', 'user', 'account_id'));
                 $_SESSION['phpgw_info']['workflow']['user_can_monitor'] = ($user_is_admin || $can_monitor);
                 $_SESSION['phpgw_info']['workflow']['user_can_clean_instances'] = $_SESSION['phpgw_info']['workflow']['user_can_monitor'];
                 $_SESSION['phpgw_info']['workflow']['user_can_clean_aborted_instances'] = $_SESSION['phpgw_info']['workflow']['user_can_monitor'];
-                $_SESSION['phpgw_info']['workflow']['user']['preferences'] = $GLOBALS['phpgw_info']['user']['preferences']['workflow'];
+                $_SESSION['phpgw_info']['workflow']['user']['preferences'] = Settings::get('workflow', 'preferences');
                 $_SESSION['phpgw_info']['workflow']['voip_groups'] = $GLOBALS['phpgw_info']['server']['voip_groups'];
         }
@@ -80 +80 @@
         function get_common_js()
         {
-                $result = "<script language='javascript'>var _web_server_url = '" . $GLOBALS['phpgw_info']['server']['webserver_url'] . "';</script>";
+                $result = "<script language='javascript'>var _web_server_url = '" . EGW_BASE_URL . "';</script>";
                 $result = $result . $this->get_js_link('workflow','jscode', 'globals');                 
                 $result = $result . $this->get_js_link('workflow','jscode', 'common_functions');
@@ -147 +147 @@
                 else
                         $params[] = $this->num_version;
-                $js_file = $GLOBALS['phpgw_info']['server']['webserver_url'].SEP.$module.SEP.'js'.SEP.$js_package.SEP.$js_name.'.js';
+                $js_file = EGW_BASE_URL . SEP . $module . SEP . 'js' . SEP . $js_package . SEP . $js_name . '.js';
                 return '<script src="'.$js_file.'?'.implode('&', $params).'" type="text/javascript"></script>';
         }