diff options
| author | alecpl <alec@alec.pl> | 2010-10-06 07:23:17 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2010-10-06 07:23:17 +0000 |
| commit | 6c6bb09b1556d176d3e0bfafd014e1e78eb6184b (patch) | |
| tree | daeac98875608a444bbe12622ed6ffb18df77f71 /program/steps | |
| parent | 50baa6c0c139a09e66d0b8c56c1e320a8d37989a (diff) | |
- Add mdn_request=4
Diffstat (limited to 'program/steps')
| -rw-r--r-- | program/steps/mail/show.inc | 6 | ||||
| -rw-r--r-- | program/steps/settings/func.inc | 1 |
2 files changed, 4 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); diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index 00c2cf7b8..6717b2c09 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -324,6 +324,7 @@ function rcmail_user_prefs($current=null) $select_mdn_requests->add(rcube_label('askuser'), 0); $select_mdn_requests->add(rcube_label('autosend'), 1); $select_mdn_requests->add(rcube_label('autosendknown'), 3); + $select_mdn_requests->add(rcube_label('autosendknownignore'), 4); $select_mdn_requests->add(rcube_label('ignore'), 2); $blocks['main']['options']['mdn_requests'] = array( |