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

Timestamp:

11/11/10 16:01:01 (13 years ago)

Author:

rafaelraymundo

Message:

Ticket #1322 - Data incorreta nas mensagens na caixa de entrada (local e mobile).

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

@@ -210 +210 @@
                 $head_array['msg_number'] = $msg_number;
                 $head_array['udate'] = $header->udate;
+                $head_array['offsetToGMT'] = $this->functions->CalculateDateOffset();
+
+                $msgTimestamp = $header->udate + $head_array['offsetToGMT'];
+                $date_msg = gmdate("d/m/Y",$msgTimestamp);
+//              if (date("d/m/Y") == $date_msg)
+//                      $return['udate'] = $header->udate;
+//              else
+
+                if (date("d/m/Y") == $date_msg) //no dia
+                {
+                        $head_array['smalldate'] = gmdate("H:i",$msgTimestamp);
+                }
+                else
+                {
+                        $head_array['smalldate'] = gmdate("d/m/Y",$msgTimestamp);
+                }
 
                 $from = $header->from;
@@ -568 +584 @@
 
                 $date_msg = gmdate("d/m/Y",$msgTimestamp);
-                if (date("d/m/Y") == $date_msg)
-                        $return['udate'] = gmdate("H:i",$msgTimestamp);
-                else
-                        $return['udate'] = $date_msg;
+//              if (date("d/m/Y") == $date_msg)
+//                      $return['udate'] = $header->udate;
+//              else
+                $return['udate'] = $header->udate;
 
                 $return['msg_day'] = $date_msg;
@@ -771 +787 @@
                 //All this is to help in local messages
                 //$return['timestamp'] = $header->udate;
-                $return['timestamp'] = $header->udate_original;
+                $return['timestamp'] = $header->udate;
                 $return['login'] = $_SESSION['phpgw_info']['expressomail']['user']['account_id'];//$GLOBALS['phpgw_info']['user']['account_id'];
                 $return['reply_toaddress'] = $header->reply_toaddress;