Changeset 7863 for branches/2.5

Timestamp:

02/06/13 13:40:46 (11 years ago)

Author:

douglas

Message:

Ticket #3337 - Problema ao utilizar a opção Buscar na Caixa de Entrada

Location:

branches/2.5

Files:

• expressoMail1_2/inc/class.imap_functions.inc.php (modified) (3 diffs)
• prototype/modules/filters/filters.js (modified) (2 diffs)
• prototype/services/ImapServiceAdapter.php (modified) (1 diff)

branches/2.5/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -5196 +5196 @@
         function searchSieveRule( $params )
         {
-                
+ 
                 $imap = $this->open_mbox( 'INBOX' );
                 $msgs = imap_sort( $imap , SORTDATE , 0 , SE_UID);
                 
                 $rr = array();
-        
-        
+ 
+        if(isset($params['from']))  $rr['from'] = array();
+        if(isset($params['to']))  $rr['to'] = array();
+        if(isset($params['subject'])) $rr['subject'] = array();
+        if(isset($params['body'])) $rr['body'] = array(); 
+        if(isset($params['size'])) $rr['size'] = array(); 
+ 
                 foreach ($msgs as $i => $v)
                 {
@@ -5228 +5233 @@
                         
                         if(isset($params['to']))
-                        {       
+                        { 
                                 $tos = $msg->to;
                                 $val = '';
@@ -5290 +5295 @@
                         if(count($rrr) == 0 && $init === true)
                                 $rrr = $v;
-                        else if($params['isExact'] === true)
-                                $rrr = array_diff($rrr , $v);
+                        else if($params['isExact'] == 'yes')
+                                $rrr = array_intersect($rrr , $v);
                         else
                                 $rrr =  array_unique(array_merge($rrr , $v));

branches/2.5/prototype/modules/filters/filters.js

@@ -491 +491 @@
         var criterias_ = new Array();
 
+    var isExact = (list_container.find('[name="isExact"]:checked').val() == 'and') ? 'yes' : 'no'; 
+ 
         for (i in criteria_)
                 if(criteria_[i] != "")
@@ -514 +516 @@
                                                 });
 
-        var data = DataLayer.get( 'message', { filter: criterias_, criteria: { properties: { context: { folder: 'INBOX' } } } }, true );
+        var data = DataLayer.get( 'message', { filter: criterias_, criteria: { isExact: isExact , properties: { context: { folder: 'INBOX' } } } }, true );
         if(DataLayer.criterias['message:jqGrid']){
                 delete DataLayer.criterias['message:jqGrid'];   

branches/2.5/prototype/services/ImapServiceAdapter.php

@@ -174 +174 @@
                         {
                             if( count( $filter[$i] ) === 4 )
-                            $criteria['isExact'] = ( array_shift( $filter[$i] ) === 'AND' );
+                                array_shift( $filter[$i] ) ;
 
                             $criteria[ $filter[$i][0] ] = array( 'criteria' => $filter[$i][2], 'filter' => $filter[$i][1] );