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

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

@@ -45 +45 @@
                 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['workflow']['title'];
                 $GLOBALS['phpgw_info']['flags'] = array('noheader' => false, 'nonavbar' => false, 'currentapp' => 'workflow');
-                $smarty = CreateObject('workflow.workflow_smarty');
+                $smarty = Factory::getInstance('workflow_smarty');
 
                 // Check if workflow config is ok
@@ -114 +114 @@
 
                 // Get a connection to db workflow and galaxia (module)
-                if ($GLOBALS['workflow']['workflowObjects']->getDBWorkflow()->Error)
+                if (Factory::getInstance('WorkflowObjects')->getDBWorkflow()->Error)
                         $errors[] = 'Unable to connect to database Workflow';
 
-                if ($errormsg = $GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Error)
+                if ($errormsg = Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Error)
                         $errors[] = 'Unable to connect to database Galaxia';
 
@@ -129 +129 @@
 
                 /* create some objects */
-                require_once 'class.so_userinterface.inc.php';
-                $so = new so_userinterface();
-                $smarty = CreateObject('workflow.workflow_smarty');
+                $so = &Factory::getInstance('so_userinterface');
+                $smarty = &Factory::getInstance('workflow_smarty');
 
                 /* get the user's organization */
@@ -202 +201 @@
 
                 /* pass variables to smarty */
-                $smarty->assign('areasInfo', $flatAreas);
+                $smarty->assign('areasJson', json_encode($flatAreas));
                 $smarty->assign('javaScripts', $javaScripts);
                 $smarty->assign('css', $css);