Changeset 3167 for branches/2.2/workflow/inc/smarty

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

Location:

branches/2.2/workflow/inc/smarty

Files:

• plugins/function.html_options.php (modified) (1 diff)
• wf_plugins/function.wf_autocomplete_input.php (modified) (3 diffs)
• wf_plugins/function.wf_generic_select.php (modified) (1 diff)
• wf_plugins/function.wf_redir_menu.php (modified) (1 diff)
• wf_plugins/function.wf_select_city.php (modified) (2 diffs)
• wf_plugins/function.wf_select_ldap_users.php (modified) (4 diffs)
• wf_plugins/function.wf_select_state.php (modified) (1 diff)
• wf_plugins/function.wf_select_user.php (modified) (4 diffs)
• wf_plugins/function.wf_select_users.php (modified) (5 diffs)
• wf_plugins/prefilter.wf_default_template.php (modified) (1 diff)

branches/2.2/workflow/inc/smarty/plugins/function.html_options.php

@@ -96 +96 @@
 }
 
+function smarty_function_html_boxoptions($params, &$smarty)
+{
+    require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
+    
+    $name = null;
+    $values = null;
+    $options = null;
+    $selected = array();
+    $output = null;
+    
+    $extra = '';
+    
+    foreach($params as $_key => $_val) {
+        switch($_key) {
+            case 'name':
+                $$_key = (string)$_val;
+                break;
+            
+            case 'options':
+                $$_key = (array)$_val;
+                break;
+                
+            case 'values':
+            case 'output':
+                $$_key = array_values((array)$_val);
+                break;
+
+            case 'selected':
+                $$_key = array_map('strval', array_values((array)$_val));
+                break;
+
+            default:
+                if(!is_array($_val)) {
+                    $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
+                } else {
+                    $smarty->trigger_error("html_options: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+                }
+                break;
+        }
+    }
+
+    if (!isset($options) && !isset($values))
+        return ''; /* raise error here? */
+
+    $_html_result = '';
+
+    if (isset($options)) {
+
+        foreach ($options as $_key=>$_val)
+            $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected);
+
+    } else {
+
+        foreach ($values as $_i=>$_key) {
+            $_val = isset($output[$_i]) ? $output[$_i] : '';
+            $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected);
+        }
+
+    }
+
+    if(!empty($name)) {
+        $_html_result = '<select name="' . $name . '"' . $extra . ' style="height: 100px;" size="5">' . "\n" . $_html_result . '</select>' . "\n";
+    }
+
+    return $_html_result;
+
+}
 function smarty_function_html_options_optoutput($key, $value, $selected) {
     if(!is_array($value)) {

branches/2.2/workflow/inc/smarty/wf_plugins/function.wf_autocomplete_input.php

@@ -28 +28 @@
         $defaultValues = array(
                 'minLength'     => 1,
-                'style'         => "width: 200px"
+                'style'         => "width: 200px",
+                'mode'          => "POPULATE_ON_LOAD"
         );
         $extractParams = array(
@@ -38 +39 @@
                 'idValue',
                 'textValue',
-                'style'
+                'style',
+                'mode'
         );
 
@@ -79 +81 @@
         $extraParams = json_encode($extraParams);
 
+        /* se o componente for do tipo padrão (POPULATE_ON_LOAD), não necessita de função para onkeyup */
+        if ($mode == 'POPULATE_ON_LOAD'){
+                $inputElement = <<<EOF
+                <input id="$name_input" name="$name_input" type="text" value="$textValue" style="$style" onfocus="checkDataLoaded('$name');" onblur="setTimeout('selectAutocompleteElement(\'$name\')', 500);"/>
+EOF;
+        }
+        elseif ($mode == 'REPOPULATE_ON_CHANGE'){
+                $inputElement = <<<EOF
+                <input id="$name_input" name="$name_input" type="text" value="$textValue" style="$style" onblur="setTimeout('selectAutocompleteElement(\'$name\')', 500);" onkeyup="updateCacheRequestsTimeout('$name', '$ajaxClass', '$ajaxMethod', this.value, '$mode')"/>
+EOF;
+        }
+
+        /* Cria todos os elementos HTML necessários para o componente */
         $output = <<<EOF
         <input id="$name" name="$name" type="hidden"/>
-        <input id="$name_input" name="$name_input" type="text" value="$textValue" style="$style" onfocus="checkDataLoaded('$name');" onblur="setTimeout('selectAutocompleteElement(\'$name\')', 500);"/>
+        $inputElement
         <span id="$name_response"></span>
         <div id="$name_list" class="autocomplete" style="display: none;"></div>
-        <script>autocompleteSelect('$name', '$ajaxClass', '$ajaxMethod', $sep$methodParam$sep, $extraParams);</script>
+        <script>autocompleteSelect('$name', '$ajaxClass', '$ajaxMethod', $sep$methodParam$sep, '$mode', $extraParams);</script>
 EOF;
         return $output;

branches/2.2/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');

branches/2.2/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>";

branches/2.2/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']))
         {

branches/2.2/workflow/inc/smarty/wf_plugins/function.wf_select_ldap_users.php

@@ -23 +23 @@
  */
 function smarty_function_wf_select_ldap_users($params, &$smarty)
-{
+{ 
     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(
@@ -34 +34 @@
                 'size_input'            => '20',
                 'opt_id'                => 'dn',
-                'opt_name'              => 'cn');
+                'opt_name'              => 'cn',
+                'opt_complement'        => '');
         $extractParams = array(
                 'name',
@@ -42 +43 @@
                 'class_btn',
                 'opt_id',
-                'opt_name');
+                'opt_name',
+                'opt_complement');
 
         /* verifica se todos os parâmetros obrigatórios foram passados */
@@ -78 +80 @@
         $output = <<<EOF
                 <input type="text" id="$name_input" name="$name_input" size="$size_input" />
-                <input type="button" class="$class_btn" value="$value_btn" onclick="search_ldap_users_by_cn(document.getElementById('$name_input').value, '$name', '$opt_id', '$opt_name', $handleExpiredSessions)" />
+                <input type="button" class="$class_btn" value="$value_btn" onclick="search_ldap_users_by_cn(document.getElementById('$name_input').value, '$name', '$opt_id', '$opt_name', $handleExpiredSessions, '$opt_complement')" />
                 &nbsp;<img id="$name_img" border="0" src="$imagesPath/loading.gif" style="display:none">
-                <span id="$name_span" style="display:none">&nbsp;&nbsp;&nbsp;&nbsp;<b>Selecione o nome: </b>
+                <span id="$name_span" style="display:none"><br><br><b>Selecione um nome abaixo: </b><br><br>
 EOF;
 
-        $output .= smarty_function_html_options(array_merge(array(
+        $output .= smarty_function_html_boxoptions(array_merge(array(
                                                                                         'name'    => $name,
                                                                                         'id'      => $name,

branches/2.2/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))

branches/2.2/workflow/inc/smarty/wf_plugins/function.wf_select_user.php

@@ -12 +12 @@
  * - email_as_textarea : indica se o campo que receberá os emails deve ser um textarea (valor true) ou input type text (valor false). Este parâmetro só tem validade se get_email for true.
  * - hide_groups : indica se deve-se omitir os grupos na tela de seleção.
+ * - onlyVisibleAccounts : indica se devem ser recuperadas apenas as contas visíveis, ou se as ocultas também devem ser listadas.
  * - organization : nome da organização que estará previamente selecionada.
  * - title : texto da tooltip que aparecerá quando o usuário colocar o mouse sobre o ícone para adicionar usuário.
@@ -35 +36 @@
                 'hide_organizations' => false,
                 'hide_sectors' => false,
+                'onlyVisibleAccounts' => true,
                 'rows'=> 2);
         $extractParams = array(
@@ -42 +44 @@
                 'title',
                 'cols',
-                'rows');
+                'rows',
+                'onlyVisibleAccounts');
 
         /* verifica se todos os parâmetros obrigatórios foram passados */
@@ -93 +96 @@
         if ($params['hide_sectors'] == true)
                 $extraParams .= "&hideSectors=1";
+        if (empty($onlyVisibleAccounts) || $onlyVisibleAccounts === 'false')
+                $extraParams .= "&onlyVisibleAccounts=false";
+        else
+                $extraParams .= "&onlyVisibleAccounts=true";
 
-        $image = $GLOBALS['workflow']['factory']->getInstance('TemplateServer')->generateImageLink('add_user.png');
+        $image = Factory::getInstance('TemplateServer')->generateImageLink('add_user.png');
 
-$output .= <<<EOF
-        <a alt="$title" title="$title" href="javascript:void(0)" onclick="openParticipants('$name', '$extraParams');"><img border="0" alt="" src="$image" /></a>
+        $output .= <<<EOF
+                <a alt="$title" title="$title" href="javascript:void(0)" onclick="openParticipants('$name', '$extraParams');"><img border="0" alt="" src="$image" /></a>
 EOF;
         return $output;

branches/2.2/workflow/inc/smarty/wf_plugins/function.wf_select_users.php

@@ -8 +8 @@
  * - value : usuários e grupos previamente selecionados. Deve estar no formato de matriz, seguindo o seguinte padrão: ::$matriz["u123"]="Nome do usuário 123" ; $matriz["g321"]="Nome do grupo 321" e, assim por diante.
  * - hide_groups : indica se deve-se omitir os grupos na tela de seleção.
+ * - onlyVisibleAccounts : indica se devem ser recuperadas apenas as contas visíveis, ou se as ocultas também devem ser listadas.
  * - organization : nome da organização que estará previamente selecionada.
  * @param object &$smarty Instância do objeto smarty em uso
@@ -16 +17 @@
 {
     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');
@@ -24 +25 @@
                 'hide_organizations' => false,
                 'hide_sectors' => false,
+                'onlyVisibleAccounts' => true,
                 'value' => array());
         $extractParams = array(
                 'name',
-                'value');
+                'value',
+                'onlyVisibleAccounts');
 
         /* verifica se todos os parâmetros obrigatórios foram passados */
@@ -54 +57 @@
         if ($params['hide_sectors'] == true)
                 $extraParams .= "&hideSectors=1";
+        if (empty($onlyVisibleAccounts) || $onlyVisibleAccounts === 'false')
+                $extraParams .= "&onlyVisibleAccounts=false";
+        else
+                $extraParams .= "&onlyVisibleAccounts=true";
 
         $output = '<table border="0"><tr><td>';
@@ -66 +73 @@
         $output .= "</td><td>";
         $output .= <<<EOF
-                <a href='javascript:void(0)' onclick="openParticipants(500, 270, '$name', '$extraParams');"><img border="0" src="$imagesPath/add_group.png"></a>
+                <a href='javascript:void(0)' onclick="openParticipants(500, 315, '$name', '$extraParams');"><img border="0" src="$imagesPath/add_group.png"></a>
                 <br />
-                <a href='javascript:void(0)' onclick="openParticipants(500, 270, '$name', '$extraParams');">Adicionar</a>
+                <a href='javascript:void(0)' onclick="openParticipants(500, 315, '$name', '$extraParams');">Adicionar</a>
                 <br /><br />
                 <a href='javascript:void(0)' onclick="delUsers('$name');"><img border="0" src="$imagesPath/delete_group.png"></a>

branches/2.2/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');