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

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

@@ -1 +1 @@
 <?php
+        require_once 'common.inc.php';
+
         //set here the global DEBUG level which is actually 0 (nothing) or 1 (all)
         if (!defined('_DEBUG')) define('_DEBUG', 0);
@@ -102 +104 @@
                         $this->start            = (int)get_var('start', 'any', 0);
                         $this->search_str       = get_var('find', 'any', '');
-                        $this->nextmatchs       = CreateObject('phpgwapi.nextmatchs');
+                        $this->nextmatchs       = Factory::getInstance('nextmatchs');
                 }
 
                 /**
                  * Fill the process bar
-                 * 
+                 *
                  * @param array $proc_info
                  * @access public
@@ -116 +118 @@
                         //echo "proc_info: <pre>";print_r($proc_info);echo "</pre>";
                         $this->t->set_file('proc_bar_tpl', 'proc_bar.tpl');
-                        $templateServer = &$GLOBALS['workflow']['factory']->getInstance('TemplateServer');
+                        $templateServer = &Factory::getInstance('TemplateServer');
 
                         if ($proc_info['wf_is_valid'] == 'y')
@@ -170 +172 @@
                 /**
                  * Select activity representation icon
-                 *  
+                 *
                  * @var string $type type of activity
                  * @var bool   $interactive interactive?
@@ -207 +209 @@
                                         $ic="no-activity.gif";
                         }
-                        return '<img src="'. $GLOBALS['workflow']['factory']->getInstance('TemplateServer')->generateImageLink($ic) .'" alt="'. lang($type) .'" title="'. lang($type) .'" />';
-                }
-        
+                        return '<img src="'. Factory::getInstance('TemplateServer')->generateImageLink($ic) .'" alt="'. lang($type) .'" title="'. lang($type) .'" />';
+                }
+
                 /**
                  * Translate template file
-                 * @param string $template_name template name 
+                 * @param string $template_name template name
                  * @return void
                  * @access public
@@ -359 +361 @@
                 function export()
                 {
-                        $this->process_manager  = CreateObject('workflow.workflow_processmanager');
+                        $this->process_manager  = Factory::getInstance('workflow_processmanager');
 
                         // retrieve process info
@@ -387 +389 @@
                 {
                         $file = "css/$css_name" . (($print_mode !== false) ? '_print' : '') . '.css';
-                        return $GLOBALS['workflow']['factory']->getInstance('TemplateServer')->getWebFile($file);
-                }
-                
+                        return Factory::getInstance('TemplateServer')->getWebFile($file);
+                }
+
                 /**
                  * Return a given duration in human readable form, usefull for workitems duration
                  * @param int $to given duration
                  * @return string given duration in human readable form
-                 * @access public 
+                 * @access public
                  */
                 function time_diff($to) {