X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=program%2Fsteps%2Fsettings%2Fsave_prefs.inc;h=2fefef193e1dec081f8c273a812e218f1e0c85ea;hb=76507f7c63a660742e76889ad6e3919f3dde3bb0;hp=0653d8f9ef997c3e11802b63bda2800372f12c96;hpb=b68022ca3782d5eb5a1a7ef6f8cf7abe1dc15bd6;p=roundcube.git diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc index 0653d8f..2fefef1 100644 --- a/program/steps/settings/save_prefs.inc +++ b/program/steps/settings/save_prefs.inc @@ -4,8 +4,8 @@ +-----------------------------------------------------------------------+ | program/steps/settings/save_prefs.inc | | | - | This file is part of the RoundCube Webmail client | - | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland | + | This file is part of the Roundcube Webmail client | + | Copyright (C) 2005-2009, The Roundcube Dev Team | | Licensed under the GNU GPL | | | | PURPOSE: | @@ -15,7 +15,7 @@ | Author: Thomas Bruederli | +-----------------------------------------------------------------------+ - $Id: save_prefs.inc 2873 2009-08-27 06:18:54Z thomasb $ + $Id: save_prefs.inc 5543 2011-12-05 07:24:36Z alec $ */ @@ -32,64 +32,99 @@ switch ($CURR_SECTION) 'timezone' => isset($_POST['_timezone']) ? (is_numeric($_POST['_timezone']) ? floatval($_POST['_timezone']) : get_input_value('_timezone', RCUBE_INPUT_POST)) : $CONFIG['timezone'], 'dst_active' => isset($_POST['_dst_active']) ? TRUE : FALSE, 'pagesize' => is_numeric($_POST['_pagesize']) ? max(2, intval($_POST['_pagesize'])) : $CONFIG['pagesize'], + 'date_format' => isset($_POST['_date_format']) ? get_input_value('_date_format', RCUBE_INPUT_POST) : $CONFIG['date_format'], + 'time_format' => isset($_POST['_time_format']) ? get_input_value('_time_format', RCUBE_INPUT_POST) : ($CONFIG['time_format'] ? $CONFIG['time_format'] : 'H:i'), 'prettydate' => isset($_POST['_pretty_date']) ? TRUE : FALSE, 'skin' => isset($_POST['_skin']) ? get_input_value('_skin', RCUBE_INPUT_POST) : $CONFIG['skin'], ); + + // compose derived date/time format strings + if ((isset($_POST['_date_format']) || isset($_POST['_time_format'])) && $a_user_prefs['date_format'] && $a_user_prefs['time_format']) { + $a_user_prefs['date_short'] = 'D ' . $a_user_prefs['time_format']; + $a_user_prefs['date_long'] = $a_user_prefs['date_format'] . ' ' . $a_user_prefs['time_format']; + } break; + case 'mailbox': $a_user_prefs = array( - 'focus_on_new_message' => isset($_POST['_focus_on_new_message']) ? TRUE : FALSE, - 'preview_pane' => isset($_POST['_preview_pane']) ? TRUE : FALSE, + 'preview_pane' => isset($_POST['_preview_pane']) ? TRUE : FALSE, + 'preview_pane_mark_read' => isset($_POST['_preview_pane_mark_read']) ? intval($_POST['_preview_pane_mark_read']) : $CONFIG['preview_pane_mark_read'], + 'autoexpand_threads' => isset($_POST['_autoexpand_threads']) ? intval($_POST['_autoexpand_threads']) : 0, 'mdn_requests' => isset($_POST['_mdn_requests']) ? intval($_POST['_mdn_requests']) : 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, ); break; + case 'mailview': $a_user_prefs = array( 'prefer_html' => isset($_POST['_prefer_html']) ? TRUE : FALSE, 'inline_images' => isset($_POST['_inline_images']) ? TRUE : FALSE, 'show_images' => isset($_POST['_show_images']) ? intval($_POST['_show_images']) : 0, 'display_next' => isset($_POST['_display_next']) ? TRUE : FALSE, + 'default_charset' => get_input_value('_default_charset', RCUBE_INPUT_POST), ); break; + case 'compose': $a_user_prefs = array( - 'htmleditor' => isset($_POST['_htmleditor']) ? TRUE : FALSE, + 'htmleditor' => intval($_POST['_htmleditor']), 'draft_autosave' => isset($_POST['_draft_autosave']) ? intval($_POST['_draft_autosave']) : 0, 'mime_param_folding' => isset($_POST['_mime_param_folding']) ? intval($_POST['_mime_param_folding']) : 0, + 'force_7bit' => isset($_POST['_force_7bit']) ? TRUE : FALSE, + 'mdn_default' => isset($_POST['_mdn_default']) ? TRUE : FALSE, + 'dsn_default' => isset($_POST['_dsn_default']) ? TRUE : FALSE, + 'reply_same_folder' => isset($_POST['_reply_same_folder']) ? TRUE : FALSE, + 'spellcheck_before_send' => isset($_POST['_spellcheck_before_send']) ? TRUE : FALSE, + 'spellcheck_ignore_syms' => isset($_POST['_spellcheck_ignore_syms']) ? TRUE : FALSE, + 'spellcheck_ignore_nums' => isset($_POST['_spellcheck_ignore_nums']) ? TRUE : FALSE, + 'spellcheck_ignore_caps' => isset($_POST['_spellcheck_ignore_caps']) ? TRUE : FALSE, + 'show_sig' => isset($_POST['_show_sig']) ? intval($_POST['_show_sig']) : 1, + 'top_posting' => !empty($_POST['_top_posting']), + 'strip_existing_sig' => isset($_POST['_strip_existing_sig']), + 'sig_above' => !empty($_POST['_sig_above']) && !empty($_POST['_top_posting']), + ); + + break; + + case 'addressbook': + $a_user_prefs = array( + 'default_addressbook' => get_input_value('_default_addressbook', RCUBE_INPUT_POST, true), + 'autocomplete_single' => isset($_POST['_autocomplete_single']) ? TRUE : FALSE, ); break; + case 'server': $a_user_prefs = array( 'read_when_deleted' => isset($_POST['_read_when_deleted']) ? TRUE : FALSE, 'skip_deleted' => isset($_POST['_skip_deleted']) ? TRUE : FALSE, 'flag_for_deletion' => isset($_POST['_flag_for_deletion']) ? TRUE : FALSE, + 'delete_always' => isset($_POST['_delete_always']) ? TRUE : FALSE, 'logout_purge' => isset($_POST['_logout_purge']) ? TRUE : FALSE, 'logout_expunge' => isset($_POST['_logout_expunge']) ? TRUE : FALSE, ); break; + case 'folders': $a_user_prefs = array( - 'drafts_mbox' => get_input_value('_drafts_mbox', RCUBE_INPUT_POST), - 'sent_mbox' => get_input_value('_sent_mbox', RCUBE_INPUT_POST), - 'junk_mbox' => get_input_value('_junk_mbox', RCUBE_INPUT_POST), - 'trash_mbox' => get_input_value('_trash_mbox', RCUBE_INPUT_POST), + 'drafts_mbox' => get_input_value('_drafts_mbox', RCUBE_INPUT_POST, true), + 'sent_mbox' => get_input_value('_sent_mbox', RCUBE_INPUT_POST, true), + 'junk_mbox' => get_input_value('_junk_mbox', RCUBE_INPUT_POST, true), + 'trash_mbox' => get_input_value('_trash_mbox', RCUBE_INPUT_POST, true), ); break; } - -$data = rcmail::get_instance()->plugins->exec_hook('save_preferences', +$plugin = rcmail::get_instance()->plugins->exec_hook('preferences_save', array('prefs' => $a_user_prefs, 'section' => $CURR_SECTION)); -$a_user_prefs = $data['prefs']; +$a_user_prefs = $plugin['prefs']; // don't override these parameters foreach ((array)$CONFIG['dont_override'] as $p) @@ -107,8 +142,11 @@ switch ($CURR_SECTION) $OUTPUT->command('reload', 500); } - // switch skin - $OUTPUT->set_skin($a_user_prefs['skin']); + // switch skin (if valid, otherwise unset the pref and fall back to default) + if (!$OUTPUT->set_skin($a_user_prefs['skin'])) + unset($a_user_prefs['skin']); + else if ($RCMAIL->config->get('skin') != $a_user_prefs['skin']) + $OUTPUT->command('reload', 500); // force min size if ($a_user_prefs['pagesize'] < 1) @@ -117,6 +155,8 @@ switch ($CURR_SECTION) if (isset($CONFIG['max_pagesize']) && ($a_user_prefs['pagesize'] > $CONFIG['max_pagesize'])) $a_user_prefs['pagesize'] = (int) $CONFIG['max_pagesize']; + $a_user_prefs['timezone'] = (string) $a_user_prefs['timezone']; + break; case 'mailbox': @@ -141,14 +181,21 @@ switch ($CURR_SECTION) $a_user_prefs['default_imap_folders'][] = $a_user_prefs[$p]; } } - + break; } -if ($USER->save_prefs($a_user_prefs)) +// Save preferences +if (!$plugin['abort']) + $saved = $USER->save_prefs($a_user_prefs); +else + $saved = $plugin['result']; + +if ($saved) $OUTPUT->show_message('successfullysaved', 'confirmation'); +else + $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error'); // display the form again rcmail_overwrite_action('edit-prefs'); -?>