diff options
Diffstat (limited to 'program/steps/settings')
| -rw-r--r-- | program/steps/settings/folders.inc | 2 | ||||
| -rw-r--r-- | program/steps/settings/func.inc | 25 | ||||
| -rw-r--r-- | program/steps/settings/save_prefs.inc | 1 |
3 files changed, 22 insertions, 6 deletions
diff --git a/program/steps/settings/folders.inc b/program/steps/settings/folders.inc index 6db0b17e8..443635fae 100644 --- a/program/steps/settings/folders.inc +++ b/program/steps/settings/folders.inc @@ -265,7 +265,7 @@ function rcmail_subscription_form($attrib) $js_folders = array(); $folders = array(); - $collapsed = $RCMAIL->config->get('collapsed_folders'); + $collapsed = (string) $RCMAIL->config->get('collapsed_folders'); // create list of available folders foreach ($list_folders as $i => $folder) { diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index 087b23610..c763dd39a 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -845,6 +845,20 @@ function rcmail_user_prefs($current = null) ); } + if (!isset($no_override['sig_below'])) { + if (!$current) { + continue 2; + } + + $field_id = 'rcmfd_sig_below'; + $input = new html_checkbox(array('name' => '_sig_below', 'id' => $field_id, 'value' => 1)); + + $blocks['sig']['options']['sig_below'] = array( + 'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('sigbelow'))), + 'content' => $input->show($RCMAIL->config->get('sig_below') ? 1 : 0), + ); + } + if (!isset($no_override['strip_existing_sig'])) { if (!$current) { continue 2; @@ -1261,13 +1275,14 @@ function rcmail_user_prefs($current = null) unset($sections[$idx]); else $sections[$idx]['blocks'] = $data['blocks']; - } - $data = $RCMAIL->plugins->exec_hook('preferences_section_header', - array('section' => $sect['id'], 'header' => '', 'current' => $current)); + // allow plugins to add a header to each section + $data = $RCMAIL->plugins->exec_hook('preferences_section_header', + array('section' => $sect['id'], 'header' => '', 'current' => $current)); - if(!empty($data['header'])) { - $sections[$idx]['header'] = $data['header']; + if(!empty($data['header'])) { + $sections[$idx]['header'] = $data['header']; + } } return array($sections, $plugin['cols']); diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc index f0ce9c9a3..4ecaa70e6 100644 --- a/program/steps/settings/save_prefs.inc +++ b/program/steps/settings/save_prefs.inc @@ -85,6 +85,7 @@ case 'compose': 'spellcheck_ignore_caps' => isset($_POST['_spellcheck_ignore_caps']) ? true : false, 'show_sig' => isset($_POST['_show_sig']) ? intval($_POST['_show_sig']) : 1, 'reply_mode' => isset($_POST['_reply_mode']) ? intval($_POST['_reply_mode']) : 0, + 'sig_below' => isset($_POST['_sig_below']) ? true : false, 'strip_existing_sig' => isset($_POST['_strip_existing_sig']), 'default_font' => rcube_utils::get_input_value('_default_font', rcube_utils::INPUT_POST), 'default_font_size' => rcube_utils::get_input_value('_default_font_size', rcube_utils::INPUT_POST), |