Changeset 2591 for trunk/workflow/inc/smarty

Timestamp:

04/19/10 18:18:22 (14 years ago)

Author:

viani

Message:

Ticket #609 - Reconstrução da classe factory do workflow

Location:

trunk/workflow/inc/smarty/wf_plugins

Files:

• function.wf_generic_select.php (modified) (1 diff)
• function.wf_redir_menu.php (modified) (1 diff)
• function.wf_select_city.php (modified) (2 diffs)
• function.wf_select_ldap_users.php (modified) (1 diff)
• function.wf_select_state.php (modified) (1 diff)
• function.wf_select_user.php (modified) (1 diff)
• function.wf_select_users.php (modified) (1 diff)
• prefilter.wf_default_template.php (modified) (1 diff)

trunk/workflow/inc/smarty/wf_plugins/function.wf_generic_select.php

@@ -53 +53 @@
 EOF;
 
-        $templateServer = &$GLOBALS['workflow']['factory']->getInstance('TemplateServer');
+        $templateServer = &Factory::getInstance('TemplateServer');
         $imageAdd = $templateServer->generateImageLink('add.png');
         $imageRemove = $templateServer->generateImageLink('close.png');

trunk/workflow/inc/smarty/wf_plugins/function.wf_redir_menu.php

@@ -53 +53 @@
         $select_tag .= "<option value=\"og\">Organograma</option>";
 
-        $user_is_admin = $GLOBALS['workflow']['factory']->getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']);
+        $user_is_admin = Factory::getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']);
         if ($user_is_admin || ($GLOBALS['phpgw']->acl->check('admin_workflow',1,'workflow'))) {
                 $select_tag .= "<option value=\"ad\">Administração</option>";

trunk/workflow/inc/smarty/wf_plugins/function.wf_select_city.php

@@ -37 +37 @@
                 if (!array_key_exists($required, $params) || (empty($params[$required])))
                         $smarty->trigger_error("[wf_select_city] missing required parameter(s): $required", E_USER_ERROR);
-        
+
         /* atribui valores default para os parâmetros não passados */
         foreach ($defaultValues as $key => $value)
                 if (!isset($params[$key]))
                         $params[$key] = $value;
-        
+
         /* extrai alguns parâmetros da matriz de parâmetros */
         foreach ($extractParams as $extract)
                 $$extract = $params[$extract];
-        
+
         /* parâmetros extras são "acumulados" em uma única variável */
         $extraParams = array();
@@ -53 +53 @@
                         $extraParams[$key] = $value_params;
 
-        $db = &$GLOBALS['workflow']['workflowObjects']->getDBExpresso()->Link_ID;
+        $db = &Factory::getInstance('WorkflowObjects')->getDBExpresso()->Link_ID;
         if (isset($params['value']))
         {

trunk/workflow/inc/smarty/wf_plugins/function.wf_select_ldap_users.php

@@ -25 +25 @@
 {
     require_once $smarty->_get_plugin_filepath('function','html_options');
-        $imagesPath = substr($GLOBALS['workflow']['factory']->getInstance('TemplateServer')->generateImageLink(''), 0, -1);
+        $imagesPath = substr(Factory::getInstance('TemplateServer')->generateImageLink(''), 0, -1);
 
         $requiredParams = array(

trunk/workflow/inc/smarty/wf_plugins/function.wf_select_state.php

@@ -46 +46 @@
         $sql = "SELECT id_state, state_name FROM phpgw_cc_state WHERE id_country = 'BR' ORDER BY state_name";
 
-        $result = $GLOBALS['workflow']['workflowObjects']->getDBExpresso()->Link_ID->query($sql);
+        $result = Factory::getInstance('WorkflowObjects')->getDBExpresso()->Link_ID->query($sql);
         $estados = array();
         while ($row = $result->fetchRow(DB_FETCHMODE_ASSOC))

trunk/workflow/inc/smarty/wf_plugins/function.wf_select_user.php

@@ -94 +94 @@
                 $extraParams .= "&hideSectors=1";
 
-        $image = $GLOBALS['workflow']['factory']->getInstance('TemplateServer')->generateImageLink('add_user.png');
+        $image = Factory::getInstance('TemplateServer')->generateImageLink('add_user.png');
 
 $output .= <<<EOF

trunk/workflow/inc/smarty/wf_plugins/function.wf_select_users.php

@@ -16 +16 @@
 {
     require_once $smarty->_get_plugin_filepath('function','html_options');
-        $imagesPath = substr($GLOBALS['workflow']['factory']->getInstance('TemplateServer')->generateImageLink(''), 0, -1);
+        $imagesPath = substr(Factory::getInstance('TemplateServer')->generateImageLink(''), 0, -1);
         $requiredParams = array(
                 'name');

trunk/workflow/inc/smarty/wf_plugins/prefilter.wf_default_template.php

@@ -31 +31 @@
         {
                 /* get the header and footer location */
-                $templateServer = &$GLOBALS['workflow']['factory']->getInstance('TemplateServer');
+                $templateServer = &Factory::getInstance('TemplateServer');
                 $header = $templateServer->getSystemFile('processes/header.tpl');
                 $footer = $templateServer->getSystemFile('processes/footer.tpl');