Ticket #1484577: bad_date_display.patch

program/lib/imap.inc

@@ -1240 +1240 @@
         /* FETCH date,from,subject headers */
         $key="fh".($c++);
         $prefix=$uidfetch?" UID":"";
-        $request=$key.$prefix." FETCH $message_set (BODY.PEEK[HEADER.FIELDS (DATE FROM TO SUBJECT REPLY-TO IN-REPLY-TO CC BCC CONTENT-TRANSFER-ENCODING CONTENT-TYPE MESSAGE-ID REFERENCE)])\r\n";
+        $request=$key.$prefix." FETCH $message_set (BODY.PEEK[HEADER.FIELDS (DATE FROM TO SUBJECT REPLY-TO IN-REPLY-TO CC BCC CONTENT-TRANSFER-ENCODING CONTENT-TYPE MESSAGE-ID REFERENCE RECEIVED)])\r\n";
 
         if (!fputs($fp, $request)) return false;
         do{
@@ -1284 +1284 @@
                                 $field = strtolower($field);
                                 $headers[$field] = $string;
                         }
-                        $result[$id]->date = $headers["date"];
-                        $result[$id]->timestamp = iil_StrToTime($headers["date"]);
+                        if (isset($headers["date"])) {
+                                $result[$id]->date = $headers["date"];
+                                $result[$id]->timestamp = iil_StrToTime($headers["date"]);
+                        } elseif (isset($headers["received"])) {
+                                $result[$id]->date = str_replace("\n","",substr(strstr(str_replace("\n","",$headers["received"]),"; "),2));
+                                $result[$id]->timestamp = iil_StrToTime(substr(strstr(str_replace("\n","",$headers["received"]), "; "), 2));
+                        }
                         $result[$id]->from = $headers["from"];
                         $result[$id]->to = str_replace("\n", " ", $headers["to"]);
                         $result[$id]->subject = str_replace("\n", "", $headers["subject"]);