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

Timestamp:

11/10/10 16:07:09 (13 years ago)

Author:

rafaelraymundo

Message:

Ticket #1322 - Data incorreta nas mensagens na caixa de entrada.

File:

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

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

@@ -109 +109 @@
                 $search_box_type = $params['search_box_type'] != "ALL" && $params['search_box_type'] != "" ? $params['search_box_type'] : false;
 
-                if(!$this->mbox || !is_resource($this->mbox))
+                if(!$this->mbox || !is_resource($this->mbox))
                         $this->mbox = $this->open_mbox($folder);
 
                 $return = array();
+                // Para enviar o offset entre o timezone definido pelo usuário e GMT
+                $return['offsetToGMT'] = $this->functions->CalculateDateOffset();
                 
                 if(!$search_box_type || $search_box_type=="UNSEEN" || $search_box_type=="SEEN") {
@@ -531 +533 @@
                         //return $return;
                 }else{
-            $return['body']             = $body;
-            $return['attachments']      = $return_get_body['attachments'];
-            $return['thumbs']           = $return_get_body['thumbs'];
-            $return['signature']        = $return_get_body['signature'];
+                    $return['body']             = $body;
+                    $return['attachments']      = $return_get_body['attachments'];
+                    $return['thumbs']           = $return_get_body['thumbs'];
+                    $return['signature']        = $return_get_body['signature'];
                 }
 
@@ -562 +564 @@
                 $return['msg_folder'] = $msg_folder;
 
-                $date_msg = gmdate("d/m/Y",$header->udate);
+                $offset = $this->functions->CalculateDateOffset();
+                $msgTimestamp = $header->udate + $offset;
+
+                $date_msg = gmdate("d/m/Y",$msgTimestamp);
                 if (date("d/m/Y") == $date_msg)
-                        $return['udate'] = gmdate("H:i",$header->udate);
+                        $return['udate'] = gmdate("H:i",$msgTimestamp);
                 else
                         $return['udate'] = $date_msg;
 
                 $return['msg_day'] = $date_msg;
-                $return['msg_hour'] = gmdate("H:i",$header->udate);
+                $return['msg_hour'] = gmdate("H:i",$msgTimestamp);
 
                 if (date("d/m/Y") == $date_msg) //no dia
                 {
-                        $return['fulldate'] = gmdate("d/m/Y H:i",$header->udate);
-                        $return['smalldate'] = gmdate("H:i",$header->udate);
+                        $return['fulldate'] = gmdate("d/m/Y H:i",$msgTimestamp);
+                        $return['smalldate'] = gmdate("H:i",$msgTimestamp);
 
                         $timestamp_now = strtotime("now");
-                        $timestamp_msg_time = $header->udate;
-                        // $timestamp_now is GMT and $timestamp_msg_time is MailDate TZ.
+                        $timestamp_msg_time = $msgTimestamp;
+                        // $timestamp_now and $timestamp_msg_time are GMT.
                         // The variable $timestamp_diff is calculated without MailDate TZ.
-                        $pdate = date_parse($header->MailDate);
-                        $timestamp_diff = $timestamp_now - $timestamp_msg_time  + ($pdate['zone']*(-60));
+                        $timestamp_diff = $timestamp_now - $timestamp_msg_time;
 
                         if (gmdate("H",$timestamp_diff) > 0)
@@ -601 +605 @@
                 }
                 else{
-                        $return['fulldate'] = gmdate("d/m/Y H:i",$header->udate);
-                        $return['smalldate'] = gmdate("d/m/Y",$header->udate);
+                        $return['fulldate'] = gmdate("d/m/Y H:i",$msgTimestamp);
+                        $return['smalldate'] = gmdate("d/m/Y",$msgTimestamp);
                 }
 
@@ -1620 +1624 @@
                 $return['new_msgs'] = imap_num_recent($this->mbox);
                 $return['msgs_to_delete'] = $msg_to_delete;
+                $return['offsetToGMT'] = $this->functions->CalculateDateOffset();
                 if($this->mbox && is_resource($this->mbox))
                         imap_close($this->mbox);
@@ -3293 +3298 @@
                 }
 
+                $offsetToGMT = $this->functions->CalculateDateOffset();
+
                 if($search){
                         $search_criteria = '';
@@ -3459 +3466 @@
                 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 = $this->decode_string($from) . "--" . $subject . "--". gmdate("d/m/Y",$header ->udate + $this->functions->CalculateDateOffset())."--". $this->size_msg($header->Size) ."--". $flag;
                 return $ret_msg;
         }
@@ -3706 +3713 @@
         }
         function get_header($msg_number){
-                $header = @imap_headerinfo($this->mbox, imap_msgno($this->mbox, $msg_number), 80, 255);
+                $header = @imap_headerinfo($this->mbox, imap_msgno($this->mbox, $msg_number), 80, 255);
                 if (!is_object($header))
                         return false;
-                // Prepare udate from mailDate (DateTime arrived with TZ) for fixing summertime problem.
-                $header->udate_original = $header->udate;
-                $pdate = date_parse($header->MailDate);
-                $header->udate +=  $pdate['zone']*(-60);
 
                 if($header->Flagged != "F" && $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_important_flag']) {