diff options
Diffstat (limited to 'program/steps/settings')
| -rw-r--r-- | program/steps/settings/func.inc | 9 | ||||
| -rw-r--r-- | program/steps/settings/save_prefs.inc | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index 980108ad9..6a158b9e9 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -181,7 +181,7 @@ function rcmail_user_prefs_form($attrib) foreach(array(1, 3, 5, 10, 15, 30, 60) as $min) if((!$config['min_keep_alive'] || $config['min_keep_alive'] <= $min * 60) - && (!$config['session_lifetime'] || $config['session_lifetime'] > $min)) { + && (!$config['session_lifetime'] || $config['session_lifetime'] > $min)) { $select_keep_alive->add(rcube_label(array('name' => 'keepaliveevery', 'vars' => array('n' => $min))), $min); } @@ -189,6 +189,13 @@ function rcmail_user_prefs_form($attrib) $table->add(null, $select_keep_alive->show($config['keep_alive']/60)); } + if (!isset($no_override['check_all_folders'])) { + $field_id = 'rcmfd_check_all_folders'; + $input_check_all = new html_checkbox(array('name' => '_check_all_folders', 'id' => $field_id, 'value' => 1)); + $table->add('title', html::label($field_id, Q(rcube_label('checkallfolders')))); + $table->add(null, $input_check_all->show($config['check_all_folders']?1:0)); + } + $out .= html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('mailboxview'))) . $table->show($attrib)); $table = new html_table(array('cols' => 2)); diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc index debd345e3..023ffff36 100644 --- a/program/steps/settings/save_prefs.inc +++ b/program/steps/settings/save_prefs.inc @@ -38,6 +38,7 @@ $a_user_prefs = array( 'logout_expunge' => isset($_POST['_logout_expunge']) ? TRUE : FALSE, 'draft_autosave' => isset($_POST['_draft_autosave']) ? intval($_POST['_draft_autosave']) : 0, 'keep_alive' => isset($_POST['_keep_alive']) ? intval($_POST['_keep_alive'])*60 : $CONFIG['keep_alive'], + 'check_all_folders' => isset($_POST['_check_all_folders']) ? TRUE : FALSE, 'mime_param_folding' => isset($_POST['_mime_param_folding']) ? intval($_POST['_mime_param_folding']) : 0, 'mdn_requests' => isset($_POST['_mdn_requests']) ? intval($_POST['_mdn_requests']) : 0, 'skin' => isset($_POST['_skin']) ? get_input_value('_skin', RCUBE_INPUT_POST) : $CONFIG['skin'], |