From c0839699bb15902fcfef844c71f0f2d77ed3ff1c Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Fri, 25 May 2012 13:45:38 +0200 Subject: Move messages forwarding mode setting into Preferences --- program/steps/settings/func.inc | 12 ++++++++++++ program/steps/settings/save_prefs.inc | 1 + 2 files changed, 13 insertions(+) (limited to 'program/steps/settings') diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index 5b9ad2601..2c2d17f21 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -614,6 +614,18 @@ function rcmail_user_prefs($current=null) ); } + if (!isset($no_override['forward_attachment'])) { + $field_id = 'rcmfd_forward_attachment'; + $select = new html_select(array('name' => '_forward_attachment', 'id' => $field_id)); + $select->add(rcube_label('inline'), 0); + $select->add(rcube_label('asattachment'), 1); + + $blocks['main']['options']['forward_attachment'] = array( + 'title' => html::label($field_id, Q(rcube_label('forwardmode'))), + 'content' => $select->show(intval($config['forward_attachment'])), + ); + } + if (!isset($no_override['default_font'])) { $field_id = 'rcmfd_default_font'; $fonts = rcube_fontdefs(); diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc index 797ffb615..88fa5298a 100644 --- a/program/steps/settings/save_prefs.inc +++ b/program/steps/settings/save_prefs.inc @@ -86,6 +86,7 @@ switch ($CURR_SECTION) 'strip_existing_sig' => isset($_POST['_strip_existing_sig']), 'sig_above' => !empty($_POST['_sig_above']) && !empty($_POST['_top_posting']), 'default_font' => get_input_value('_default_font', RCUBE_INPUT_POST), + 'forward_attachment' => !empty($_POST['_forward_attachment']), ); break; -- cgit v1.2.3