From 6c6bb09b1556d176d3e0bfafd014e1e78eb6184b Mon Sep 17 00:00:00 2001 From: alecpl Date: Wed, 6 Oct 2010 07:23:17 +0000 Subject: - Add mdn_request=4 --- program/steps/mail/show.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'program/steps/mail/show.inc') 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); -- cgit v1.2.3