Changeset 6348

Timestamp:

05/30/12 01:20:05 (12 years ago)

Author:

airton

Message:

Ticket #2815 - Inconsistencia com filtros de mensagens com anexos

Location:

trunk

Files:

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

trunk/expressoMail1_2/setup/phpgw_pt-br.lang

@@ -337 +337 @@
 messages        expressoMail1_2 pt-br   mensagens
 messages found in folder:       expressoMail1_2 pt-br   mensagens encontradas na pasta:
+Message has attachment  expressoMail1_2 pt-br   Mensagem tem anexo
 Message signed by:      expressoMail1_2 pt-br   Mensagem assinada por:
 Messages saved in %1 folder.    expressoMail1_2 pt-br   Mensagens salvas na pasta %1.

trunk/prototype/modules/filters/edit-filter.ejs

@@ -10 +10 @@
 %>
 <form action="filter:detail" method="POST">
+        <input type="hidden" class="imapDelimiter" value="<%= data.delimiter %>"></input>
         <div class="rule-details-container">
                 <h3><a href="#"><%= get_lang("Criteria")%></a></h3>
@@ -77 +78 @@
                         </fieldset>
                         <fieldset>
-                                <input type="checkbox" value="hasAttachment" name="hasAttachment" />
+                                <input type="hidden" name="criteriaOperator[]" value="^"></input>
+                                <input type="checkbox" name="criteriaValue[]" value="*.*" class="hasAttachment"/>
+                                <input type="hidden" name="criteriaType[]" value="hasAttachment"/>
                                 <label><%= get_lang("The message has attachment")%></label>
                         </fieldset>

trunk/prototype/modules/filters/filter-list.ejs

@@ -19 +19 @@
                                         if(data.rules[i].id != "vacation"){
                                                 for (var j=0; j<data.rules[i].criteria.length; j++) {
+                                                        if(data.rules[i].criteria[j].field == 'hasAttachment') {
+                                        %>        
+                                                <li><strong><%= get_lang("Message has attachment") %></strong></li>
+                                        <%      }
+                                                        else {
                                         %>
-                                                <li><strong><%= get_lang(data.rules[i].criteria[j].field) %>:</strong> <%= data.rules[i].criteria[j].value %></li>
-                                        <%
+                                                                <li><strong><%= get_lang(data.rules[i].criteria[j].field) %>:</strong> <%= data.rules[i].criteria[j].value %></li>
+                                        <%               }
+                                        
                                                 }
                                         } else {

trunk/prototype/modules/filters/filters.js

@@ -151 +151 @@
         nameObj.attr("disabled", "disabled");
     for( var i = 0; i < filter.criteria.length; i++ ){
+                if(filter.criteria[i].field == 'hasAttachment') {
+                        $(".hasAttachment").attr("checked", "True");
+                        continue;
+                }
                 criterias.filter( '[value="' + filter.criteria[i].field + '"]' )
                 .siblings( '[name="criteriaOperator[]"]' ).val( filter.criteria[i].operator ).end()
@@ -167 +171 @@
     }
     //isExact.val( filter.isExact != "false"? "and" : "or" );
-        isExact.filter('[value="'+(filter.isExact != "false"? "and" : "or")+'"]').attr("checked", "True");
+        isExact.filter('[value="'+(filter.isExact != "false"? "and" : "or")+'"]').attr("checked", "True");      
 }
 

trunk/prototype/modules/filters/init.ejs

@@ -3 +3 @@
         <div class="expresso-window-container filter-manager-window rule-edit-container" title="<% get_lang("Rules for message classification")%>"></div>
 </div>
-

trunk/prototype/modules/filters/interceptors/FilterMapping.php

@@ -118 +118 @@
                                 }
                         }
-                        //if( $data['enabled'] == 'false' )
-                                //continue;
                                 
                         $vacation = false;
@@ -151 +149 @@
                                                 $criteria[$j]['field'] = "\"" . $criteria[$j]['field'] . "\"";
                                                 $criteria[$j]['value'] = "" . imap_8bit($criteria[$j]['value']) . "*\", \"" . base64_encode($criteria[$j]['value']) . "";
+                                                $criteria[$j]['operator'] = "^";  //temporary
                                                 $script_criteria .= "header :";
                                                 break;
@@ -161 +160 @@
                                                 continue;
                                         case 'hasAttachment':
-                                                //$hasAttach = true;
-                                                continue;
+                                                $criteria[$j]['field'] = '';
+                                                $script_criteria .= "body :";
+                                                $criteria[$j]['operator'] = "^^";
+                                                $require_body = true;
+                                                break;
                                         default:
                                                 $script_criteria .= "header :";
@@ -188 +190 @@
                                                 $criteria[$j]['operator'] = "matches";
                                                 $criteria[$j]['value'] = "[\"" . $criteria[$j]['value'] . "*\"]";
+                                                $startswith = true;
+                                                break;
+                                        case '^^':
+                                                $criteria[$j]['operator'] = "raw :matches";
+                                                $criteria[$j]['value'] = "[\"*filename=*\"]";
                                                 $startswith = true;
                                                 break;
@@ -261 +268 @@
                 if($require_reject || $require_fileinto || $require_vacation || $require_body || $require_flag)
                 {
+                        /* Para habilitar as funções desejadas, edite a diretiva sieve_extensions no arquivo de configuração "/etc/imapd.conf" */
                         $script_header .= "require [";
                         $require_reject ? $script_header .= "\"reject\", " : ""; 
@@ -266 +274 @@
                         $require_vacation? $script_header .= "\"vacation\", " : "";  
                         $require_flag ? $script_header .= "\"imapflags\", " : "";  
-                        $require_body ? $script_header .= "\"body\", " : "";  /* tem que instalar as extensões no Cyrus */
+                        $require_body ? $script_header .= "\"body\", " : "";  
                         $script_header = substr($script_header,0,-2);
                         $script_header .= "];\r\n";
@@ -278 +286 @@
                 $json_data = json_encode($rules);
                 
-                $script_begin = "#Filtro gerado por Expresso Livre versão 2.4\r\n\r\n";
+                $script_begin = "#Filtro gerado por Expresso Livre\r\n\r\n";
 
                 $content = $script_begin . $script_header . $script_rules . "\r\n\r\n#PseudoScript#" . "\r\n#" . $json_data;