Changeset 3722 for branches/2.2/expressoMail1_2/inc/class.imap_functions.inc.php

Timestamp:

01/26/11 11:10:08 (13 years ago)

Author:

eduardoalex

Message:

Ticket #1392 - Corrigindo a busca por mensagens com ## e -- no assunto

File:

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

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

@@ -3426 +3426 @@
                                         imap_reopen($mbox_stream, "{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".$name_box);
 
-                                if (preg_match("/^.?\bALL\b/", $filter)){ // Quick Search, note: this ALL isn't the same ALL from imap_search
+                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");
@@ -3439 +3439 @@
                                                 {
                                                         foreach($search_criteria as $new_search){
-                                                                if ($search_result_number != '65536' && $sum == $search_result_number)
-                                                                {
-                                                                  return $retorno ? $sum . "=sumResults=" . $retorno : "none";
-                                                                }
+                                if ($search_result_number != '65536' && $sum == $search_result_number)
+                                {
+                                  return $retorno ? $sum . "=sumResults=" . $retorno : "none";
+                                }
 
                                                                 $m_token = trim("##". mb_convert_encoding( $folder_name, "ISO_8859-1", "UTF7-IMAP" ) . "--" . 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++;
-                                                                }
+                                {
+                                    $retorno .= $m_token;
+                                    $sum++;
+                                }
                                                         }
                                                 }
@@ -3540 +3540 @@
                 if($header->from[0]->personal != "")
                         $from = $header->from[0]->personal;
-                $ret_msg = $this->decode_string($from) . "--" . $subject . "--". gmdate("d/m/Y",$header ->udate + $this->functions->CalculateDateOffset())."--". $this->size_msg($header->Size) ."--". $flag;
+                $ret_msg = $this->decode_string($from) . "--" . htmlentities(rawurlencode($subject)) . "--". gmdate("d/m/Y",$header ->udate + $this->functions->CalculateDateOffset())."--". $this->size_msg($header->Size) ."--". $flag;
                 return $ret_msg;
         }