From 67effe9904d62880ab5bdaaf58b97af7113ed97f Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sun, 15 Jun 2008 06:37:08 -0400
Subject: [PATCH] - actually we don't need default_skin option
---
program/steps/settings/save_prefs.inc | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc
index caa4a49..750b33b 100644
--- a/program/steps/settings/save_prefs.inc
+++ b/program/steps/settings/save_prefs.inc
@@ -22,12 +22,20 @@
$a_user_prefs = array(
'timezone' => isset($_POST['_timezone']) ? floatval($_POST['_timezone']) : $CONFIG['timezone'],
'dst_active' => isset($_POST['_dst_active']) ? TRUE : FALSE,
- 'pagesize' => is_numeric($_POST['_pagesize']) ? intval($_POST['_pagesize']) : $CONFIG['pagesize'],
+ 'pagesize' => is_numeric($_POST['_pagesize']) ? max(2, intval($_POST['_pagesize'])) : $CONFIG['pagesize'],
'prettydate' => isset($_POST['_pretty_date']) ? TRUE : FALSE,
'prefer_html' => isset($_POST['_prefer_html']) ? TRUE : FALSE,
+ 'addrbook_show_images' => isset($_POST['_addrbook_show_images']) ? TRUE : FALSE,
'htmleditor' => isset($_POST['_htmleditor']) ? TRUE : FALSE,
+ 'inline_images' => isset($_POST['_inline_images']) ? TRUE : FALSE,
'preview_pane' => isset($_POST['_preview_pane']) ? TRUE : FALSE,
- 'draft_autosave' => isset($_POST['_draft_autosave']) ? intval($_POST['_draft_autosave']) : 0
+ 'read_when_deleted' => isset($_POST['_read_when_deleted']) ? TRUE : FALSE,
+ 'flag_for_deletion' => isset($_POST['_flag_for_deletion']) ? TRUE : FALSE,
+ 'logout_purge' => isset($_POST['_logout_purge']) ? TRUE : FALSE,
+ 'logout_expunge' => isset($_POST['_logout_expunge']) ? TRUE : FALSE,
+ 'draft_autosave' => isset($_POST['_draft_autosave']) ? intval($_POST['_draft_autosave']) : 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'],
);
// don't override these parameters
@@ -36,11 +44,12 @@
// switch UI language
-if (isset($_POST['_language']))
- {
- $sess_user_lang = $_SESSION['user_lang'] = get_input_value('_language', RCUBE_INPUT_POST);
- rcmail_set_locale($sess_user_lang);
- }
+if (isset($_POST['_language'])) {
+ $RCMAIL->load_language(get_input_value('_language', RCUBE_INPUT_POST));
+}
+
+// switch skin
+$OUTPUT->set_skin($a_user_prefs['skin']);
// force min size
if ($a_user_prefs['pagesize'] < 1)
--
Gitblit v1.9.1