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

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

@@ -1 +1 @@
 <?php
 
-        /**************************************************************************\
+/**************************************************************************\
 * eGroupWare                                                 *
 * http://www.egroupware.org                                                *
@@ -12 +12 @@
 
 require_once(dirname(__FILE__) . SEP . 'class.ui_ajaxinterface.inc.php');
-require_once(dirname(__FILE__) . SEP . 'class.workflow_acl.inc.php');
+
 /**
  * @package Workflow
@@ -47 +47 @@
         function draw($tab_index = "")
         {
-                $this->workflow_acl = CreateObject('workflow.workflow_acl');
+                $this->workflow_acl = Factory::getInstance('workflow_acl');
 
                 $isAdmin = $this->workflow_acl->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']);
@@ -63 +63 @@
 
                 $GLOBALS['phpgw_info']['flags'] = array('noheader' => false, 'nonavbar' => false, 'currentapp' => 'workflow');
-                $smarty = CreateObject('workflow.workflow_smarty');
+                $smarty = Factory::getInstance('workflow_smarty');
 
                 $this->set_wf_session();
@@ -104 +104 @@
                         die();
 
-                require_once(dirname(__FILE__) . SEP . 'engine' . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'GraphViz.php');
-
-                $config_values = CreateObject('phpgwapi.config','workflow');
+                $config_values = Factory::getInstance('config', 'workflow');
                 $config_values->read_repository();
-                $conf_db = $config_values->config_data; 
-                $db = CreateObject('phpgwapi.db');
+                $conf_db = $config_values->config_data;
+                $db = Factory::getInstance('db');
                 $db->connect(
                         $conf_db['database_name'],
@@ -122 +120 @@
                 $attributes['ranksep'] = '1.5 equally';
                 $attributes['rankdir'] = 'LR';
-                $graph = new Process_GraphViz(true, $attributes);
+                $graph = &Factory::getInstance('Process_GraphViz', true, $attributes);
 
 
@@ -153 +151 @@
                                 return false;
 
-                        $ldap = &$GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');
+                        $ldap = &Factory::getInstance('WorkflowLDAP');
                         for ($i = 0; $i < count($output); $i++)
                         {