diff options
| author | alecpl <alec@alec.pl> | 2009-01-28 10:52:02 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2009-01-28 10:52:02 +0000 |
| commit | 5c771cb25e62494cba263097175d9b718acb8aba (patch) | |
| tree | 411f253b70d79f66511116a5edec77f7d0a8f16d /program/steps | |
| parent | 3866fd4681577010011494275580516f7b29f970 (diff) | |
- Fix MDNSent flag checking, use arbitrary keywords (asterisk) flag (#1485706)
Diffstat (limited to 'program/steps')
| -rw-r--r-- | program/steps/mail/func.inc | 3 | ||||
| -rw-r--r-- | program/steps/mail/show.inc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 06d949838..0ccc2cc13 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1296,7 +1296,8 @@ function rcmail_send_mdn($uid) $message = new rcube_message($uid); - if ($message->headers->mdn_to && !$message->headers->mdn_sent && $IMAP->check_permflag('MDNSENT')) + if ($message->headers->mdn_to && !$message->headers->mdn_sent && + ($IMAP->check_permflag('MDNSENT') || $IMAP->check_permflag('*'))) { $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 091a7a10a..7ae0ae000 100644 --- a/program/steps/mail/show.inc +++ b/program/steps/mail/show.inc @@ -91,7 +91,7 @@ if ($_GET['_uid']) { // check for unset disposition notification if ($MESSAGE->headers->mdn_to && !$MESSAGE->headers->mdn_sent && !$MESSAGE->headers->seen && - $IMAP->check_permflag('MDNSENT') && + ($IMAP->check_permflag('MDNSENT') || $IMAP->check_permflag('*')) && $mbox_name != $CONFIG['drafts_mbox'] && $mbox_name != $CONFIG['sent_mbox']) { |