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

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

@@ -40 +40 @@
                 require dirname(__FILE__) . '/../setup/setup.inc.php'; /* DO NOT USE require_once */
                 $GLOBALS['phpgw_info']['apps']['workflow'] = $setup_info['workflow'];
-                $row = $GLOBALS['workflow']['workflowObjects']->getDBExpresso()->Link_ID->query('SELECT config_value FROM phpgw_config WHERE config_app = ? AND config_name = ?', array('phpgwapi', 'files_dir'))->fetchRow();
+                $row = Factory::getInstance('WorkflowObjects')->getDBExpresso()->Link_ID->query('SELECT config_value FROM phpgw_config WHERE config_app = ? AND config_name = ?', array('phpgwapi', 'files_dir'))->fetchRow();
                 $_SESSION['phpgw_info']['workflow']['vfs_basedir'] = ($row !== false) ? $row['config_value'] : '/home/expressolivre';
                 $_SESSION['phpgw_info']['workflow']['phpgw_api_inc'] = PHPGW_API_INC;
@@ -48 +48 @@
                 require_once PHPGW_API_INC . '/functions.inc.php';
                 require_once 'engine/class.ajax_config.inc.php';
-                require_once 'engine/class.ajax_ldap.inc.php';
                 require_once 'engine/config.ajax.inc.php';
-                $GLOBALS['ajax']->ldap = new ajax_ldap();
+                $GLOBALS['ajax']->ldap = &Factory::getInstance('ajax_ldap');
 
                 /* definição de algumas constantes */
@@ -64 +63 @@
         public function prepareProcessEnvironment($processID)
         {
-                require_once GALAXIA_LIBRARY . '/src/common/WfRuntime.php';
                 require_once PHPGW_SERVER_ROOT . '/workflow/inc/local/functions/local.functions.php';
 
-                $runtime = new WfRuntime($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);
+                $runtime = &Factory::getInstance('WfRuntime');
                 $runtime->loadProcess($processID);