Changeset 1296 in subversion for trunk/roundcubemail/program/steps/mail/show.inc

Timestamp:

Apr 13, 2008 5:15:39 AM (5 years ago)

Author:

alec

Message:

• reverted r1295
• disable caching for unseen messages to allow marking as read remarked messages

File:

• trunk/roundcubemail/program/steps/mail/show.inc (modified) (3 diffs)

trunk/roundcubemail/program/steps/mail/show.inc

@@ -31 +31 @@
   if (!empty($MESSAGE['headers']->charset))
     $IMAP->set_charset($MESSAGE['headers']->charset);
-  
+
   // go back to list if message not found (wrong UID)
   if (!$MESSAGE['headers'])
@@ -54 +54 @@
   
   // calculate Etag for this request
-  $etag = md5($MESSAGE['UID'].$mbox_name.session_id().intval($MESSAGE['headers']->mdn_sent).intval($MESSAGE['headers']->seen).intval($MESSAGE['is_safe']).intval($PRINT_MODE));
+  $etag = md5($MESSAGE['UID'].$mbox_name.session_id().intval($MESSAGE['headers']->mdn_sent).intval($MESSAGE['is_safe']).intval($PRINT_MODE));
 
   // allow caching, unless remote images are present
@@ -60 +60 @@
     send_nocacheing_headers();
   else if (empty($CONFIG['devel_mode']))
-    send_modified_header($_SESSION['login_time'], $etag);
+    send_modified_header($_SESSION['login_time'], $etag, !$MESSAGE['headers']->seen);
 
   $MESSAGE['subject'] = rcube_imap::decode_mime_string($MESSAGE['headers']->subject, $MESSAGE['headers']->charset);