Changeset 6348 for trunk/prototype/modules/filters/interceptors/FilterMapping.php

Timestamp:

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

Author:

airton

Message:

Ticket #2815 - Inconsistencia com filtros de mensagens com anexos

File:

• trunk/prototype/modules/filters/interceptors/FilterMapping.php (modified) (7 diffs)

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;