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

Timestamp:

11/08/11 15:30:53 (12 years ago)

Author:

wmerlotto

Message:

Ticket #2305 - Enviando alteracoes, desenvolvidas internamente na Prognus. Ultimas sincronizacoes

File:

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

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

@@ -1759 +1759 @@
                 $image['cid'] = eregi_replace("<", "", $image['cid']);
                 $image['cid'] = eregi_replace(">", "", $image['cid']);
-                                //if is Draft Ticket #1256
-                                $image['cid'] = str_replace("@localhost", "@prognus.org", $image['cid']);
-                                $body = eregi_replace("<br/>", "", $body);
                                 
                 $body = str_replace("src=\"cid:".$image['cid']."\"", " src=\"./inc/get_archive.php?msgFolder=$msg_folder&msgNumber=$msgno&indexPart=".$image['pid']."\" ", $body);
@@ -2091 +2088 @@
                 $msgs_in_the_server = $this->get_msgs($folder, $sort_box_type, $search_box_type, $sort_box_reverse,$msg_range_begin,$msg_range_end);
                 $msgs_in_the_server = array_keys($msgs_in_the_server);
-                if(!count($msgs_in_the_server))
-                        return array();
-
+
+                $num_msgs = (count($msgs_in_the_server) - imap_num_recent($this->mbox));
+
+                $dif = ($params['msg_range_end'] - $params['msg_range_begin']) +1;
+                if(!count($msgs_in_the_server)){
+                        $msg_range_begin -= $dif;
+                        $msg_range_end -= $dif;
+                        $msgs_in_the_server = $this->get_msgs($folder, $sort_box_type, $search_box_type, $sort_box_reverse,$msg_range_begin,$msg_range_end);
+                        $msgs_in_the_server = array_keys($msgs_in_the_server);  
+                        $num_msgs = NULL;
+                        $return['msg_range_begin'] = $msg_range_begin;
+                        $return['msg_range_end'] = $msg_range_end;
+                }               
                 $return['new_msgs'] = imap_num_recent($this->mbox);
-                $num_msgs = (count($msgs_in_the_server) - imap_num_recent($this->mbox));
-
+                
                 $msgs_in_the_client = explode(",", $msgs_existent);
 
@@ -2117 +2123 @@
                                 $aux++;
                         }
-                }else if($num_msgs < $msg_range_end && $return['new_msgs'] == 0 && count($msg_to_insert) > 0){
+                }else if($num_msgs < $msg_range_end && $return['new_msgs'] == 0 && count($msg_to_insert) > 0 && $msg_range_end == $dif){
                         $return['tot_msgs'] = $num_msgs;
                 }
                 
+                if(!count($msgs_in_the_server)){
+                        return Array();
+                }       
+
                 $msg_to_delete = array_diff($msgs_in_the_client, $msgs_in_the_server);
                 $msgs_to_exec = array();
@@ -3217 +3227 @@
         {               
                         $cid = base_convert(microtime().$j, 10, 36); //Gera um cid
-                        $body = str_replace($cid_imgs[1][$j], '"cid:'.$cid.'@'.$_SESSION['phpgw_info']['expressomail']['server']['domain_name'].'"', $body ); //tira o src da imagem e coloca o cid, ele e concatenado com o domain do servidor por que a biblioteaca mime faz isso na hora de gerar o mime.
+                        $body = str_replace($cid_imgs[1][$j], '"cid:'.$cid.'"', $body ); //tira o src da imagem e coloca o cid.
                         $count    = strlen($cid_imgs[6][$j]);