Changeset 2372 for sandbox/workflow/trunk/inc/class.ui_adminactivities.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/class.ui_adminactivities.inc.php (modified) (10 diffs)

sandbox/workflow/trunk/inc/class.ui_adminactivities.inc.php

@@ -2 +2 @@
 
 require_once dirname(__FILE__) . SEP . 'class.WorkflowUtils.inc.php';
-require_once dirname(__FILE__) . SEP . 'class.fsutils.inc.php'; /* toolkit for filesystem handling */
 require_once 'engine' . SEP . 'config.egw.inc.php';
 /**
@@ -73 +72 @@
                 parent::WorkflowUtils();
 
-                $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']))
@@ -106 +105 @@
                 }
 
-                $this->process_manager  = CreateObject('workflow.workflow_processmanager');
-                $this->activity_manager = CreateObject('workflow.workflow_activitymanager');
-                $this->role_manager     = CreateObject('workflow.workflow_rolemanager');
-                $this->fs = new FsUtils(); /* gets instance */
+                $this->process_manager  = Factory::getInstance('workflow_processmanager');
+                $this->activity_manager = Factory::getInstance('workflow_activitymanager');
+                $this->role_manager     = Factory::getInstance('workflow_rolemanager');
+                $this->fs = &Factory::newInstance('FsUtils'); /* gets instance */
 
         }
@@ -374 +373 @@
                 // fill proc_bar
                 $this->t->set_var('proc_bar', $this->fill_proc_bar($proc_info));
-                
+
                 //collect some messages from used objects
                 $this->message[] = $this->activity_manager->get_error(false, _DEBUG);
@@ -380 +379 @@
                 $this->message[] = $this->role_manager->get_error(false, _DEBUG);
 
-                $templateServer = &$GLOBALS['workflow']['factory']->getInstance('TemplateServer');
+                $templateServer = &Factory::getInstance('TemplateServer');
 
                 // fill the general variables of the template
@@ -732 +731 @@
                         $this->translate_template('block_process_activities_header');
                         $this->t->parse('process_activities_header', 'block_process_activities_header', True);
-                        $templateServer = &$GLOBALS['workflow']['factory']->getInstance('TemplateServer');
+                        $templateServer = &Factory::getInstance('TemplateServer');
                         foreach ($process_activities_data as $activity)
                         {
@@ -792 +791 @@
                                 'trans_href_from'       => $GLOBALS['phpgw']->link('/index.php', 'menuaction=workflow.ui_adminactivities.form&where2='. $where2 .'&sort_mode2='. $sort_mode2 .'&p_id='. $this->wf_p_id .'&find='. $find .'&where='. $where .'&sort_mode='. $this->sort_mode .'&activity_id='. $transition['wf_act_from_id']),
                                 'trans_actFromName'     => $transition['wf_act_from_name'],
-                                'trans_arrow'           => $GLOBALS['workflow']['factory']->getInstance('TemplateServer')->generateImageLink('next.gif'),
+                                'trans_arrow'           => Factory::getInstance('TemplateServer')->generateImageLink('next.gif'),
                                 'trans_href_to'         => $GLOBALS['phpgw']->link('/index.php', 'menuaction=workflow.ui_adminactivities.form&where2='. $where2 .'&sort_mode2='. $sort_mode2 .'&p_id='. $this->wf_p_id .'&find='. $find .'&where='. $where .'&sort_mode='. $this->sort_mode .'&activity_id='. $transition['wf_act_to_id']),
                                 'trans_actToName'       => $transition['wf_act_to_name'],
@@ -1036 +1035 @@
                 $image_name = $proc_info['wf_normalized_name'] . SEP . 'graph' . SEP . $proc_info['wf_normalized_name'] . '.png';
                 $image = GALAXIA_PROCESSES . SEP . $image_name;
-                if ($GLOBALS['workflow']['factory']->getInstance('BrowserInfo')->isOpera())
+                if (Factory::getInstance('BrowserInfo')->isOpera())
                         $maximumDimension = 1000000;
                 else
@@ -1069 +1068 @@
                 }
         }
-        
+
         /**
          * Dislays the activity agents config rows
@@ -1090 +1089 @@
                         }
                         $this->translate_template('admin_agents');
-                                                                                                $this->t->parse('agents_config_rows', 'admin_agents');
+                        $this->t->parse('agents_config_rows', 'admin_agents');
                 }
         }