Imported Upstream version 0.1~rc1~dfsg

[roundcube.git] / program / steps / settings / save_prefs.inc

diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc
index f71254731dad491868b226c07d1b17a7ac51ef15..0f073b334ca21b1cebc4a6c374bf1a4f7d22d601 100644 (file)
--- a/program/steps/settings/save_prefs.inc
+++ b/program/steps/settings/save_prefs.inc
@@ -5,7 +5,7 @@
  | program/steps/settings/save_prefs.inc                                 |
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -15,37 +15,38 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: save_prefs.inc 194 2006-04-13 18:23:48Z roundcube $
+ $Id: save_prefs.inc 543 2007-04-28 18:07:12Z thomasb $
 
 */
 
-$a_user_prefs = $_SESSION['user_prefs'];
-if (!is_array($a_user_prefs))
-  $a_user_prefs = array();
+$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'],
+  'prettydate'   => isset($_POST['_pretty_date']) ? TRUE : FALSE,
+  'prefer_html'  => isset($_POST['_prefer_html']) ? TRUE : FALSE,
+  'htmleditor'   => isset($_POST['_htmleditor']) ? TRUE : FALSE,
+  'preview_pane' => isset($_POST['_preview_pane']) ? TRUE : FALSE,
+  'draft_autosave' => isset($_POST['_draft_autosave']) ? intval($_POST['_draft_autosave']) : 0
+  );
 
+// don't override these parameters
+foreach ((array)$CONFIG['dont_override'] as $p)
+  $a_user_prefs[$p] = $CONFIG[$p];
 
-$a_user_prefs['timezone'] = isset($_POST['_timezone']) ? floatval($_POST['_timezone']) : $CONFIG['timezone'];
-$a_user_prefs['dst_active'] = isset($_POST['_dst_active']) ? TRUE : FALSE;
-$a_user_prefs['pagesize'] = is_numeric($_POST['_pagesize']) ? (int)$_POST['_pagesize'] : $CONFIG['pagesize'];
-$a_user_prefs['prefer_html'] = isset($_POST['_prefer_html']) ? TRUE : FALSE;
-
-// MM: Date format toggle (Pretty / Standard)
-$a_user_prefs['prettydate'] = isset($_POST['_pretty_date']) ? TRUE : FALSE;
 
+// switch UI language
 if (isset($_POST['_language']))
   {
-  $sess_user_lang = $_SESSION['user_lang'] = $_POST['_language'];
+  $sess_user_lang = $_SESSION['user_lang'] = get_input_value('_language', RCUBE_INPUT_POST);
   rcmail_set_locale($sess_user_lang);
   }
 
 if (rcmail_save_user_prefs($a_user_prefs))
-  show_message('successfullysaved', 'confirmation');
+  $OUTPUT->show_message('successfullysaved', 'confirmation');
 
 
 // go to next step
-$_action = 'preferences';
-
-// overwrite action variable  
-$OUTPUT->add_script(sprintf("\n%s.set_env('action', '%s');", $JS_OBJECT_NAME, $_action));  
+rcmail_overwrite_action('preferences');
 
-?>
\ No newline at end of file
+?>