diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-05-26 10:32:10 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-05-26 10:32:10 +0200 |
| commit | 6d3e53d2b8a24e594f7c7fe93a0632a8171cdab3 (patch) | |
| tree | 6e75f0e6afb61c8594d379ab47c7b3ee2e761285 /program/steps | |
| parent | 476fa983c0b8c64c8a28606a1897049e75f4e061 (diff) | |
| parent | fa5f3f26f938ec8ddf7db8e9401e0e4363decfb7 (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program/steps')
| -rw-r--r-- | program/steps/settings/func.inc | 12 | ||||
| -rw-r--r-- | program/steps/settings/save_prefs.inc | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index da60fea7b..7b5534e5d 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -617,6 +617,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; |