Changeset 2010 in subversion

Timestamp:

Oct 25, 2008 12:29:34 PM (5 years ago)

Author:

alec

Message:

• Don't send disposition notification receipts for messages marked as 'read' (#1485523)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/steps/mail/show.inc (modified) (3 diffs)

trunk/roundcubemail/CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2008/10/25 (alec)
+----------
+- Don't send disposition notification receipts for messages marked as 'read' (#1485523)
 
 2008/10/24 (alec)

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

@@ -70 +70 @@
   $OUTPUT->set_pagetitle($MESSAGE->subject);
   
-  // mark message as read
-  if (!$MESSAGE->headers->seen)
-    $IMAP->set_flag($MESSAGE->uid, 'SEEN');
-
   // give message uid to the client
   $OUTPUT->set_env('uid', $MESSAGE->uid);
@@ -88 +84 @@
   // check for unset disposition notification
   if ($MESSAGE->headers->mdn_to &&
-      !$MESSAGE->headers->mdn_sent &&
+      !$MESSAGE->headers->mdn_sent && !$MESSAGE->headers->seen &&
       $IMAP->check_permflag('MDNSENT') &&
       $mbox_name != $CONFIG['drafts_mbox'] &&
@@ -141 +137 @@
   if ($last >0)
     $OUTPUT->set_env('last_uid', $last);
+
+  // mark message as read
+  if (!$MESSAGE->headers->seen)
+    $IMAP->set_flag($MESSAGE->uid, 'SEEN');
   }