diff options
| author | thomascube <thomas@roundcube.net> | 2008-07-15 16:48:20 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2008-07-15 16:48:20 +0000 |
| commit | 5b3dd412d2e28f80fb2d12dbdcab992cc6f219a5 (patch) | |
| tree | 14d76abe90c8906039cc1fbe6d48408d97f1014b /program/steps/mail | |
| parent | e3e597e3b6c9ae10e5c7c1e5592726c71793cfe7 (diff) | |
Check PERMANENTFLAGS before saving MDNSent flag (#1484963, #1485163)
Diffstat (limited to 'program/steps/mail')
| -rw-r--r-- | program/steps/mail/func.inc | 2 | ||||
| -rw-r--r-- | program/steps/mail/show.inc | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 02419bea8..6ba3d1664 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1069,7 +1069,7 @@ function rcmail_send_mdn($uid) $message = new rcube_message($uid); - if ($message->headers->mdn_to && !$message->headers->mdn_sent) + if ($message->headers->mdn_to && !$message->headers->mdn_sent && $IMAP->check_permflag('MDNSENT')) { $identity = $RCMAIL->user->get_identity(); $sender = format_email_recipient($identity['email'], $identity['name']); diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc index bff4e6861..ef88c7baf 100644 --- a/program/steps/mail/show.inc +++ b/program/steps/mail/show.inc @@ -82,8 +82,11 @@ if ($_GET['_uid']) { $OUTPUT->set_env('sender', $MESSAGE->sender['string']); // check for unset disposition notification - if ($MESSAGE->headers->mdn_to && !$MESSAGE->headers->mdn_sent && - $mbox_name != $CONFIG['drafts_mbox'] && $mbox_name != $CONFIG['sent_mbox']) + if ($MESSAGE->headers->mdn_to && + !$MESSAGE->headers->mdn_sent && + $IMAP->check_permflag('MDNSENT') && + $mbox_name != $CONFIG['drafts_mbox'] && + $mbox_name != $CONFIG['sent_mbox']) { if (intval($CONFIG['mdn_requests']) === 1) { |