summaryrefslogtreecommitdiff
path: root/program/steps/mail
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-10-06 07:23:17 +0000
committeralecpl <alec@alec.pl>2010-10-06 07:23:17 +0000
commit6c6bb09b1556d176d3e0bfafd014e1e78eb6184b (patch)
treedaeac98875608a444bbe12622ed6ffb18df77f71 /program/steps/mail
parent50baa6c0c139a09e66d0b8c56c1e320a8d37989a (diff)
- Add mdn_request=4
Diffstat (limited to 'program/steps/mail')
-rw-r--r--program/steps/mail/show.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 3b357ac88..328e9d0c7 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -76,16 +76,16 @@ if ($uid = get_input_value('_uid', RCUBE_INPUT_GET)) {
{
$mdn_cfg = intval($CONFIG['mdn_requests']);
- if ($mdn_cfg == 1 || ($mdn_cfg == 3 && rcmail_contact_exists($MESSAGE->sender['mailto']))) {
+ if ($mdn_cfg == 1 || (($mdn_cfg == 3 || $mdn_cfg == 4) && rcmail_contact_exists($MESSAGE->sender['mailto']))) {
// Send MDN
if (rcmail_send_mdn($MESSAGE, $smtp_error))
$OUTPUT->show_message('receiptsent', 'confirmation');
else if ($smtp_error)
$OUTPUT->show_message($smtp_error['label'], 'error', $smtp_error['vars']);
- else
+ else
$OUTPUT->show_message('errorsendingreceipt', 'error');
}
- else if ($mdn_cfg != 2) {
+ else if ($mdn_cfg != 2 && $mdn_cfg != 4) {
// Ask user
$OUTPUT->add_label('mdnrequest');
$OUTPUT->set_env('mdn_request', true);