Changeset 8013 for trunk/expressoMail1_2/inc/class.imap_functions.inc.php

Timestamp:

03/14/13 16:25:01 (11 years ago)

Author:

gustavo

Message:

Ticket #3349 - Corrigido problema ao pesquisar com o corpo ativado quando havia ascentos

File:

• trunk/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (3 diffs)

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -5228 +5228 @@
         if(isset($params['size'])) $rr['size'] = array();
 
+        //$params['search'] = mb_convert_encoding($params['search'], 'UTF-8',mb_detect_encoding($params['search'].'x', 'UTF-8, ISO-8859-1'));
+
                 foreach ($msgs as $i => $v)
                 {
@@ -5273 +5275 @@
                                         
                                 }
-                                
+
                                 if($this->filterCheck( $val , $params['to']['criteria'] , $params['to']['filter'] ))
                                         $rr['to'][] = $v;
@@ -5293 +5295 @@
                                 $this->mbox = $this->open_mbox( $params['folder']['criteria'] ? $params['folder']['criteria'] : 'INBOX' );
                                 $b = $this->get_body_msg( $v , $params['folder']['criteria'] ? $params['folder']['criteria'] : 'INBOX' );
-                                
-                                if( $this->filterCheck( $b['body'] , $params['body']['criteria'] , $params['body']['filter'] ))
+
+                                if( $this->filterCheck( mb_convert_encoding(html_entity_decode($b['body']), 'UTF-8',mb_detect_encoding(html_entity_decode($b['body']).'x', 'UTF-8, ISO-8859-1')) , $params['body']['criteria'] , $params['body']['filter'] ))
                                         $rr['body'][] = $v;
-                                
+
                                 unset($b);
                         }