Changeset 3167 for branches/2.2/workflow/inc/class.ui_adminprocesses.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_adminprocesses.inc.php (modified) (5 diffs)

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

@@ -54 +54 @@
                 parent::bo_workflow_forms('admin_processes');
 
-                $this->workflow_acl = CreateObject('workflow.workflow_acl');
+                $this->workflow_acl = Factory::getInstance('workflow_acl');
                 $denyAccess = true;
                 if ($this->workflow_acl->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']))
@@ -83 +83 @@
                 }
 
-                $this->process_manager  = CreateObject('workflow.workflow_processmanager');
-                $this->activity_manager = CreateObject('workflow.workflow_activitymanager');
+                $this->process_manager  = Factory::getInstance('workflow_processmanager');
+                $this->activity_manager = Factory::getInstance('workflow_activitymanager');
 
                 $this->form_action = $GLOBALS['phpgw']->link('/index.php', 'menuaction=workflow.ui_adminprocesses.form');
@@ -127 +127 @@
                 }
 
-                if (!$GLOBALS['workflow']['factory']->getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']))
+                if (!Factory::getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']))
                 {
                         $proc_ids = $this->workflow_acl->get_granted_processes($GLOBALS['phpgw_info']['user']['account_id']);
@@ -190 +190 @@
                 $known_config_items = array_merge($known_config_items, array('Log Options' => 'title', 'log_level' => $log_levels));
 
-                $bo_agent = CreateObject('workflow.bo_agent_mail_smtp');
+                $bo_agent = Factory::getInstance('bo_agent_mail_smtp');
                 $known_config_items = array_merge($known_config_items, $bo_agent->listProcessConfigurationFields());
 
@@ -589 +589 @@
 
                         $myp_id = $item['wf_p_id'];
-                        $templateServer = &$GLOBALS['workflow']['factory']->getInstance('TemplateServer');
+                        $templateServer = &Factory::getInstance('TemplateServer');
                         $this->t->set_var(array(
                                 'item_wf_p_id'          => $myp_id,