Changeset 2758 for branches/2.0/expressoMail1_2/inc/class.imap_functions.inc.php

Timestamp:

05/12/10 09:23:03 (14 years ago)

Author:

rodsouza

Message:

Ticket #1073 - Resultado da busca corrigindo com caracteres nao permitidos

File:

• branches/2.0/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (5 diffs)

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

@@ -3022 +3022 @@
 
         function search_msg($params = ''){              
-                $retorno = "";
                 $mbox_stream = "";
                 if(strpos($params['condition'],"#")===false) { //local messages
@@ -3076 +3075 @@
                                                 {
                                                         foreach($search_criteria as $new_search){
-                                                                $m_token = trim("##".mb_convert_encoding( $name_box, "ISO_8859-1", "UTF7-IMAP" ) . "--" . $this->get_msg($new_search,$name_box,$mbox_stream) . "--".$new_search."##"."\n");
-                                                                if(!@strstr($retorno,$m_token))
-                                                                        $retorno .= $m_token;
+                                                                $elem = $this->get_msg_detail($new_search,$name_box,$mbox_stream);
+                                                                $elem['boxname'] = mb_convert_encoding( $name_box, "ISO_8859-1", "UTF7-IMAP" );
+                                                                $elem['uid'] = $new_search;
+                                                                $retorno[] = $elem;
                                                         }
                                                 }                                               
@@ -3090 +3090 @@
                                         {
                                                 foreach($search_criteria as $new_search)
-                                                        $retorno .= trim("##".mb_convert_encoding( $name_box, "ISO_8859-1", "UTF7-IMAP" ) . "--" . $this->get_msg($new_search,$name_box,$mbox_stream) . "--" . $new_search."##"."\n");
+                                                {
+                                                        $elem = $this->get_msg_detail($new_search,$name_box,$mbox_stream);
+                                                        $elem['boxname'] = mb_convert_encoding( $name_box, "ISO_8859-1", "UTF7-IMAP" );
+                                                        $elem['uid'] = $new_search;
+                                                        $retorno[] = $elem;
+                                                }
                                         }
                                 }
@@ -3097 +3102 @@
                 if($mbox_stream)
                         imap_close($mbox_stream);               
-                                                
                 return $retorno ? $retorno : "none";
         }
         
-        function get_msg($uid_msg,$name_box, $mbox_stream )
+        function get_msg_detail($uid_msg,$name_box, $mbox_stream )
         {
                 $header = $this->get_header($uid_msg);
-                include_once("class.imap_attachment.inc.php");
+                require_once("class.imap_attachment.inc.php");
                 $imap_attachment = new imap_attachment();
                 $attachments =  $imap_attachment->get_attachment_headerinfo($mbox_stream, $uid_msg);
@@ -3121 +3125 @@
                 if($header->from[0]->personal != "")
                         $from = $header->from[0]->personal;
-                $ret_msg = $this->decode_string($from) . "--" . $subject . "--". gmdate("d/m/Y",$header ->udate)."--". $this->size_msg($header->Size) ."--". $flag;
+                $ret_msg['from'] = $this->decode_string($from);
+                $ret_msg['subject'] = $subject;
+                $ret_msg['udate'] = $header ->udate;
+                $ret_msg['size'] = $header->Size;
+                $ret_msg['flag'] = $flag;
                 return $ret_msg;                    
         }       
-
-        function size_msg($size){
-                $var = floor($size/1024);
-                if($var >= 1){
-                        return $var." kb";      
-                }else{
-                        return $size ." b";     
-                }
-        }
 
         function ob_array($the_object)