Changeset 6824

Timestamp:

07/19/12 17:07:48 (12 years ago)

Author:

eduardow

Message:

Ticket #2959 - Considerar mais de uma regra para uma mesma msg no filtro de msgs.

Location:

branches/2.4

Files:

• expressoMail1_2/setup/phpgw_pt-br.lang (modified) (1 diff)
• prototype/modules/filters/edit-filter.ejs (modified) (1 diff)
• prototype/modules/filters/filters.js (modified) (2 diffs)
• prototype/modules/filters/interceptors/FilterMapping.php (modified) (2 diffs)

branches/2.4/expressoMail1_2/setup/phpgw_pt-br.lang

@@ -94 +94 @@
 Config for ExpressoMail expressoMail1_2 pt-br   Configurações para o ExpressoMail
 Contact added successfully.     expressoMail1_2 pt-br   Contato adicionado com sucesso.
+Continue checking other rules if the criteria is met?   expressoMail1_2 pt-br   Continuar verificando outras regras caso o critério seja encontrado?
 Connection failed with %1 Server. Try later.    expressoMail1_2 pt-br   Ocorreu uma falha de comunicação com o servidor de %1. Tente mais tarde.
 Convert this message into plain text can make parts of it are removed. Continue?        expressoMail1_2 pt-br   Converter esta mensagem para texto sem formatação pode fazer com que partes dela sejam removidas. Deseja continuar?

branches/2.4/prototype/modules/filters/edit-filter.ejs

@@ -82 +82 @@
                                 <input type="hidden" name="criteriaType[]" value="hasAttachment"/>
                                 <label><%= get_lang("The message has attachment")%></label>
+                        </fieldset> 
+                    <fieldset> 
+                                <input type="checkbox" name="verifyNextRule" value="verifyNextRule" class="verifyNextRule"/> 
+                                <label><%= get_lang("Continue checking other rules if the criteria is met?")%></label>
                         </fieldset>
                         <fieldset class="fields-isexact">

branches/2.4/prototype/modules/filters/filters.js

@@ -232 +232 @@
         
         if (filter.alertMessage == 'true') $('.alertMessage').attr('checked', 'True');
+        if (filter.verifyNextRule == 'true') $('.verifyNextRule').attr('checked', 'True');
 }
 
@@ -308 +309 @@
                 enabled : true,
                 alertMessage: $('.alertMessage').is(':checked'),
+                verifyNextRule: $('.verifyNextRule').is(':checked'),
                 //applyMessages: allMessages? !$.isEmptyObject( selectedMessages ) ?
                 //keys( selectedMessages ) : allMessages : ""
                 applyMessages: apply_messages_ 
-                //applyMessages: ""
     };
   },

branches/2.4/prototype/modules/filters/interceptors/FilterMapping.php

@@ -122 +122 @@
                         $action   = $data['actions'];
                         
-                        ($i >0) ? $script_match = 'els' : $script_match = '';
+                        ($i >0 && $verifyNextRule == 'false') ? $script_match = 'els' : $script_match = ''; 
                         $data['isExact'] == 'false' ?  $script_match .= 'if anyof (' : $script_match .= 'if allof (';
+
+                        $verifyNextRule = 'false';
 
                         if( is_array($criteria) )
@@ -275 +277 @@
                         $script_criteria = "";  
                         $script_action = "";
-                        $data['applyMessages'] = "";                                                    
+                        $data['applyMessages'] = "";     
+        
+                $verifyNextRule = $data['verifyNextRule'];                                                      
                 }