Changeset 6771

Timestamp:

07/12/12 15:11:27 (12 years ago)

Author:

eduardow

Message:

Ticket #2956 - Inconsistência em filtros com critério por assunto/contem a frase.

File:

• branches/2.4/prototype/modules/filters/interceptors/FilterMapping.php (modified) (6 diffs)

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

@@ -94 +94 @@
     {
                 $require_fileinto = $require_flag = $require_reject = $require_vacation = $require_body = $require_imapflag = $vacation = $startswith = $endswith = false;
-
                 $script_rules = $script_header = $script_criteria = $vacation_action = "";
-
                 $i = 0;
                 
@@ -104 +102 @@
                                 continue;
                                 
-                        if(array_key_exists("block", $data)) {
+                        if(array_key_exists("block", $data)) 
+                        {
                                 /* Usado na opção Bloquear usuário do ExpressoMail */
                                 if($data['block']) {
@@ -130 +129 @@
                         {                                       
                                 
-                                switch($criteria[$j]['field']) {
-                                        case 'To':    
-                                        case 'to':    
+                                switch(strtoupper($criteria[$j]['field'])) { 
+                        case 'TO':         
                                         case 'CC':
-                                        case 'Cc':
                                                 $criteria[$j]['field'] = "[\"To\", \"TO\", \"Cc\", \"CC\"]"; 
                                                 $script_criteria .= "address :";
                                                 break;
-                                        case 'from':
+                                        case 'FROM':
                                                 $criteria[$j]['field'] = "\"" . $criteria[$j]['field'] . "\"";
                                                 $script_criteria .= "address :";
                                                 break;
-                                        case 'size':    
+                                        case 'SIZE':    
                                                 $criteria[$j]['field'] = '';
                                                 $script_criteria .= "size :";
                                                 break;
-                                        case 'subject':
+                                        case 'SUBJECT':
                                                 $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;
-                                        case 'body':
+                                                if($criteria[$j]['operator'] == "$") { 
+                                $criteria[$j]['value'] = "" . imap_8bit($criteria[$j]['value']) . "\", \"*" . base64_encode($criteria[$j]['value']) . ""; 
+                                break; 
+                        } 
+                        if($criteria[$j]['operator'] == "^") { 
+                                $criteria[$j]['value'] = "" . imap_8bit($criteria[$j]['value']) . "*\", \"" . base64_encode($criteria[$j]['value']) . ""; 
+                                break; 
+                        } 
+                        $criteria[$j]['value'] = "" . imap_8bit($criteria[$j]['value']) . "\", \"" . base64_encode($criteria[$j]['value']) . ""; 
+                        break; 
+                case 'BODY':
                                                 $criteria[$j]['field'] = '';
                                                 $script_criteria .= "body :";
                                                 $require_body = true;
                                                 break;
-                                        case 'vacation':
+                                        case 'VACATION':
                                                 continue;
-                                        case 'hasAttachment':
+                                        case 'HASATTACHMENT':
                                                 $criteria[$j]['field'] = '';
                                                 $script_criteria .= "body :";
@@ -221 +225 @@
                         }
                         $script_criteria = substr($script_criteria,0,-2);
-                        /* if ($vacation == false) */ 
                         $script_criteria .= ")"; 
 
-                        //$script_action = " {\r\n ";
-                        /* Somente para controlar que o addFlag virá antes de qualquer ação. Modificar isso depois */
                         $action_addFlag = '';
                         
@@ -291 +292 @@
 
                 if( $vacation_action )
-                {
                   $script_rules .= "vacation" . $vacation_action . "\r\n";
-                }
 
                 foreach ($rules as &$values) {                                          
@@ -302 +301 @@
 
                 $json_data = json_encode($rules);
-                
                 $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;