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

Timestamp:

05/11/12 09:41:38 (12 years ago)

Author:

airton

Message:

Ticket #2717 - Inconsistencia em filtros com o criterio configurado com a opcao 'comeca com'

File:

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

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

@@ -93 +93 @@
         public function formatSieveScript( $rules )
     {
-        
                 $require_fileinto = $require_flag = $require_reject = $require_vacation = $require_body = $require_imapflag = $vacation = $startswith = $endswith = false;
 
@@ -151 +150 @@
                                         case 'subject':
                                                 $criteria[$j]['field'] = "\"" . $criteria[$j]['field'] . "\"";
-                                                $criteria[$j]['value'] = "" . imap_8bit($criteria[$j]['value']) . "\", \"" . base64_encode($criteria[$j]['value']) . "";
+                                                $criteria[$j]['value'] = "" . imap_8bit($criteria[$j]['value']) . "*\", \"" . base64_encode($criteria[$j]['value']) . "";
                                                 $script_criteria .= "header :";
                                                 break;
@@ -160 +159 @@
                                                 break;
                                         case 'vacation':
+                                                continue;
+                                        case 'hasAttachment':
+                                                //$hasAttach = true;
                                                 continue;
                                         default:
@@ -247 +249 @@
                         $script_action .= "}";
                         
-                        if($vacation != true)
+                        if($vacation == false)
                                 $script_rules .= $script_match . $script_criteria . $script_action . "\r\n";
 
@@ -497 +499 @@
                         */
                         $imap = Controller::service( 'Imap' );
-                        $imap->apliSieveFilter($messages , $actions); 
+                        $imap->apliSieveFilter($messages, $actions); 
                         return $result;
                 //}