diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-10-25 16:29:34 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-10-25 16:29:34 +0000 |
| commit | 68ef4a3a548ade731a4b46af3054fc6d6b8ece23 (patch) | |
| tree | 5f0e374dde7d2944e5f088aee162d1c798058558 | |
| parent | 80030847a6f3f1c373172d35de83653eaf44ae96 (diff) | |
- Don't send disposition notification receipts for messages marked as 'read' (#1485523)
git-svn-id: https://svn.roundcube.net/trunk@2010 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 4 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/show.inc | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 8fbff19d8..442bade0c 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,10 @@ CHANGELOG RoundCube Webmail --------------------------- +2008/10/25 (alec) +---------- +- Don't send disposition notification receipts for messages marked as 'read' (#1485523) + 2008/10/24 (alec) ---------- - Added option 'identities_level', removed 'multiple_identities' diff --git a/roundcubemail/program/steps/mail/show.inc b/roundcubemail/program/steps/mail/show.inc index 4f0a3b032..8b36c9acd 100644 --- a/roundcubemail/program/steps/mail/show.inc +++ b/roundcubemail/program/steps/mail/show.inc @@ -69,10 +69,6 @@ if ($_GET['_uid']) { $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); // set environement @@ -87,7 +83,7 @@ if ($_GET['_uid']) { // 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'] && $mbox_name != $CONFIG['sent_mbox']) @@ -140,6 +136,10 @@ if ($_GET['_uid']) { $OUTPUT->set_env('next_uid', $next); if ($last >0) $OUTPUT->set_env('last_uid', $last); + + // mark message as read + if (!$MESSAGE->headers->seen) + $IMAP->set_flag($MESSAGE->uid, 'SEEN'); } |