From 77c28206a14b5bee3f3091f10cffd531bce5649c Mon Sep 17 00:00:00 2001
From: yllar <yllar.pajus@gmail.com>
Date: Sat, 16 Dec 2006 13:25:16 -0500
Subject: [PATCH] updated ja and fr translations
---
program/steps/settings/save_prefs.inc | 48 ++++++++++++++++++++++--------------------------
1 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc
index 1524b9e..fd254f9 100644
--- a/program/steps/settings/save_prefs.inc
+++ b/program/steps/settings/save_prefs.inc
@@ -6,7 +6,7 @@
| |
| This file is part of the RoundCube Webmail client |
| Copyright (C) 2005, RoundCube Dev. - Switzerland |
- | All rights reserved. |
+ | Licensed under the GNU GPL |
| |
| PURPOSE: |
| Save user preferences to DB and to the current session |
@@ -19,35 +19,31 @@
*/
-$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']) ? (int)$_POST['_timezone'] : $CONFIG['timezone'];
-$a_user_prefs['pagesize'] = is_numeric($_POST['_pagesize']) ? (int)$_POST['_pagesize'] : $CONFIG['pagesize'];
-$a_user_prefs['prefer_html'] = isset($_POST['_prefer_html']) ? TRUE : FALSE;
-
+// switch UI language
if (isset($_POST['_language']))
- $sess_user_lang = $_SESSION['user_lang'] = $_POST['_language'];
-
-
-$DB->query(sprintf("UPDATE %s
- SET preferences='%s',
- language='%s'
- WHERE user_id=%d",
- get_table_name('users'),
- addslashes(serialize($a_user_prefs)),
- $sess_user_lang,
- $_SESSION['user_id']));
-
-if ($DB->affected_rows())
{
- show_message('successfullysaved', 'confirmation');
-
- $_SESSION['user_prefs'] = $a_user_prefs;
- $CONFIG = array_merge($CONFIG, $a_user_prefs);
+ $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');
// go to next step
@@ -56,4 +52,4 @@
// overwrite action variable
$OUTPUT->add_script(sprintf("\n%s.set_env('action', '%s');", $JS_OBJECT_NAME, $_action));
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1