diff options
| author | Aleksander Machniak <alec@alec.pl> | 2015-01-09 11:25:53 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2015-01-09 11:25:53 +0100 |
| commit | f6502176f894940aa95c634510dabb2591d1eeb0 (patch) | |
| tree | 7f75990cd7bbd5ebbe04974e6806eeb3f2481161 /program/steps/mail/compose.inc | |
| parent | 9e26034801fe505a481d474e06bfc806cd548598 (diff) | |
Hide MDN and DSN options in compose if disabled by admin (#1490221)
Diffstat (limited to 'program/steps/mail/compose.inc')
| -rw-r--r-- | program/steps/mail/compose.inc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 92296e525..20a27ecb0 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -419,7 +419,8 @@ $OUTPUT->add_handlers(array( 'filedroparea' => 'compose_file_drop_area', 'priorityselector' => 'rcmail_priority_selector', 'editorselector' => 'rcmail_editor_selector', - 'receiptcheckbox' => 'rcmail_receipt_checkbox', + 'receiptcheckbox' => 'rcmail_mdn_checkbox', // deprecated + 'mdncheckbox' => 'rcmail_mdn_checkbox', 'dsncheckbox' => 'rcmail_dsn_checkbox', 'storetarget' => 'rcmail_store_target_selection', 'addressbooks' => 'rcmail_addressbook_list', @@ -1642,7 +1643,7 @@ function rcmail_priority_selector($attrib) } -function rcmail_receipt_checkbox($attrib) +function rcmail_mdn_checkbox($attrib) { global $RCMAIL, $MESSAGE, $compose_mode; @@ -1652,13 +1653,13 @@ function rcmail_receipt_checkbox($attrib) if (!isset($attrib['id'])) $attrib['id'] = 'receipt'; - $attrib['name'] = '_receipt'; + $attrib['name'] = '_mdn'; $attrib['value'] = '1'; $checkbox = new html_checkbox($attrib); - if (isset($_POST['_receipt'])) - $mdn_default = $_POST['_receipt']; + if (isset($_POST['_mdn'])) + $mdn_default = $_POST['_mdn']; else if (in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT))) $mdn_default = (bool) $MESSAGE->headers->mdn_to; else |