if no date is sent in the header of a message, it takes the IMAP server's

internal date for that message.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@755 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index 32ab26e99fe74f5858638f50673308ff25d1dc1d..9af572e9fb907efecee8fa80428abfe3fa1cb52b 100755 (executable)
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -77,6 +77,21 @@
          }
       }
 
          }
       }
 

+      // If there isn't a date, it takes the internal date and uses
+      // that as the normal date.
+      if (trim($date) == "") {
+         fputs ($imap_stream, "a002 FETCH $id INTERNALDATE\r\n");
+         $internal_read = sqimap_read_data ($imap_stream, "a002", true, $r, $m);
+
+         // * 22 FETCH (INTERNALDATE " 8-Sep-2000 13:17:07 -0500")
+         $date = $internal_read[0];
+         $date = eregi_replace(".*internaldate \"", "", $date);
+         $date = eregi_replace("\".*", "", $date);
+         $date_ary = explode(" ", trim($date));
+         $date_ary[0] = str_replace("-", " ", $date_ary[0]);
+         $date = implode (" ", $date_ary);
+      }
+

       $header = new small_header;
       if ($sent == true)
          $header->from = $to;
       $header = new small_header;
       if ($sent == true)
          $header->from = $to;

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index e4d3c6816d33eb1502c9d31f175e74fec830a8ab..14cf003f87c81f49e44ded73c85149bd345275b1 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -20,6 +20,9 @@
       $senderName = sqimap_find_displayable_name($msg["FROM"]);
       $urlMailbox = urlencode($mailbox);
       $subject = trim($msg["SUBJECT"]);
       $senderName = sqimap_find_displayable_name($msg["FROM"]);
       $urlMailbox = urlencode($mailbox);
       $subject = trim($msg["SUBJECT"]);

+      if ($subject == "")
+         $subject = _("(no subject)");
+    

       echo "<TR>\n";
       
       if ($msg["FLAG_FLAGGED"] == true) { $flag = "<font color=$color[2]>"; $flag_end = "</font>"; }
       echo "<TR>\n";
       
       if ($msg["FLAG_FLAGGED"] == true) { $flag = "<font color=$color[2]>"; $flag_end = "</font>"; }