Changeset 3167 for branches/2.2/workflow/inc/class.ui_ajaxinterface.inc.php

Timestamp:

08/17/10 16:17:12 (14 years ago)

Author:

viani

Message:

Ticket #1135 - Merged r1990:3166 from /trunk/workflow into /branches/2.2/workflow

File:

• branches/2.2/workflow/inc/class.ui_ajaxinterface.inc.php (modified) (4 diffs)

branches/2.2/workflow/inc/class.ui_ajaxinterface.inc.php

@@ -11 +11 @@
 \**************************************************************************/
 
-require_once 'class.workflow_acl.inc.php';
 require_once 'common.inc.php';
 require_once 'engine/class.ajax_config.inc.php';
@@ -50 +49 @@
         function set_wf_session()
         {
-                $acl = new workflow_acl();
+                $acl = Factory::getInstance('workflow_acl');
                 $_SESSION['phpgw_info']['workflow']['server_root'] = PHPGW_SERVER_ROOT;
                 $_SESSION['phpgw_info']['workflow']['phpgw_api_inc'] = PHPGW_API_INC;
@@ -56 +55 @@
                 $vfs = createobject('phpgwapi.vfs');
                 $_SESSION['phpgw_info']['workflow']['vfs_basedir'] = $vfs->basedir;
-                $_SESSION['phpgw_info']['workflow']['server'] = $GLOBALS['phpgw_info']['server'];                       
+                $_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'] = $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getUserGroups($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']['user_is_admin'] = $user_is_admin; 
+                $_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'))); 
+                $_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']);
@@ -118 +117 @@
         {
                 $CSSName = "css/{$CSSName}.css";
-                $templateServer = &$GLOBALS['workflow']['factory']->getInstance('TemplateServer');
+                $templateServer = &Factory::getInstance('TemplateServer');
                 $CSSLink = $templateServer->getWebFile($CSSName);
                 $CSSFile = $templateServer->getSystemFile($CSSName);