Changeset 2761 for trunk/expressoMail1_2/inc

Timestamp:

05/12/10 17:11:46 (14 years ago)

Author:

rodsouza

Message:

Ticket #1073 - Aplica a correção do ticket em questão no trunk

File:

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

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

@@ -3309 +3309 @@
 
         function search_msg($params = ''){
-            $retorno = "";
             $mbox_stream = "";
             if(strpos($params['condition'],"#")===false) { //local messages
@@ -3374 +3373 @@
                         }
 
-                    if (preg_match("/^.?\bALL\b/", $filter))
-                    { // Quick Search, note: this ALL isn't the same ALL from imap_search
-
-                        $all_criterias = array ("TO","SUBJECT","FROM","CC");
-                        foreach($all_criterias as $criteria_fixed)
-                        {
-                            $_filter = $criteria_fixed . substr($filter,4);
-
-                            $search_criteria = imap_search($mbox_stream, $_filter, SE_UID);
-
-                            if($search_criteria) //&& count($search_criteria) < 50)
-                            {
-                                foreach($search_criteria as $new_search)
-                                {
-                                    if ($search_result_number != '65536' && $sum == $search_result_number)
-                                    {
-                                        return $retorno ? $sum . "=sumResults=" . $retorno : "none";
-                                    }
-
-                                    $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;
-                                        $sum ++;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    else {
-                        $search_criteria = imap_search($mbox_stream, $filter, SE_UID);
-                        if( is_array( $search_criteria) )
-                        {
-                            foreach($search_criteria as $new_search)
-                            {
-                                if ($search_result_number != '65536' && $sum == $search_result_number)
-                                {
-                                    return $retorno ? $sum . "=sumResults=" . $retorno : "none";
-                                }
-                                $retorno .= trim("##".mb_convert_encoding( $name_box, "ISO_8859-1", "UTF7-IMAP" ) . "--" . $this->get_msg($new_search,$name_box,$mbox_stream) . "--" . $new_search."##"."\n");
-                                $sum++;
-                            }
-                        }
-                    }
-                }
-            }
+                    if (preg_match("/^.?\bALL\b/", $filter))
+                    { // Quick Search, note: this ALL isn't the same ALL from imap_search
+
+                            $all_criterias = array ("TO","SUBJECT","FROM","CC");
+                            foreach($all_criterias as $criteria_fixed)
+                            {
+                                    $_filter = $criteria_fixed . substr($filter,4);
+
+                                    $search_criteria = imap_search($mbox_stream, $_filter, SE_UID);
+
+                                    if($search_criteria) //&& count($search_criteria) < 50)
+                                    {
+                                            foreach($search_criteria as $new_search)
+                                            {
+                                                    if ($search_result_number != '65536' && $sum == $search_result_number)
+                                                    {
+                                                            return $retorno['sum'] = $sum;
+                                                    }
+                                                    $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; 
+                                                    $sum ++;
+
+                                            }
+                                    }
+                            }
+                    }
+                    else {
+                            $search_criteria = imap_search($mbox_stream, $filter, SE_UID);
+                            if( is_array( $search_criteria) )
+                            {
+                                    foreach($search_criteria as $new_search)
+                                    {
+                                            if ($search_result_number != '65536' && $sum == $search_result_number)
+                                            {
+                                                          return $retorno['sum'] = $sum;
+                                            }
+                                            $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; 
+                                            $sum++;
+                                    }
+                            }
+                    }
+                }
+            }
             if($mbox_stream)
             {
@@ -3435 +3436 @@
         }
 
-        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);
@@ -3455 +3456 @@
                 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";
-                }
         }