fix for bug #529576

[squirrelmail.git] / src / load_prefs.php

diff --git a/src/load_prefs.php b/src/load_prefs.php
index 4c9a0b2e7d83662af13e50ef2da24aea1a13096c..eedc53b7fabb6e8798b42ef2ed5350350dc6ed71 100644 (file)
--- a/src/load_prefs.php
+++ b/src/load_prefs.php
@@ -132,6 +132,9 @@ $editor_size = getPref($data_dir, $username, 'editor_size', 76 );
 $use_signature = getPref($data_dir, $username, 'use_signature', SMPREF_OFF );
 $prefix_sig = getPref($data_dir, $username, 'prefix_sig');
 
+/* Load timezone preferences */
+$timezone = getPref($data_dir, $username, 'timezone', SMPREF_NONE );
+
 /* Load preferences for reply citation style. */
 
 $reply_citation_style =
@@ -139,15 +142,14 @@ $reply_citation_style =
 $reply_citation_start = getPref($data_dir, $username, 'reply_citation_start');
 $reply_citation_end = getPref($data_dir, $username, 'reply_citation_end');
 
+/* left refresh rate, strtolower makes 1.0.6 prefs compatible */
 $left_refresh = getPref($data_dir, $username, 'left_refresh', SMPREF_NONE );
+$left_refresh = strtolower($left_refresh);
+
 $sort = getPref($data_dir, $username, 'sort', 6 );
 
 /** Load up the Signature file **/
-if ($use_signature) {
-    $signature_abs = $signature = getSig($data_dir, $username);
-} else {
-    $signature_abs = getSig($data_dir, $username);
-}
+$signature_abs = $signature = getSig($data_dir, $username, "g");
 
 /* Highlight comes in with the form: name, color, header, value. */
 for ($i = 0; $hlt = getPref($data_dir, $username, "highlight$i"); ++$i) {
@@ -208,6 +210,9 @@ $hour_format = getPref($data_dir, $username, 'hour_format', 2);
 /*  compose in new window setting */
 $compose_new_win = getPref($data_dir, $username, 'compose_new_win', 0);
 
+/* signature placement settings */
+$sig_first = getPref($data_dir, $username, 'sig_first', 0);
+
 /* Load the javascript settings. */
 $javascript_setting =
     getPref($data_dir, $username, 'javascript_setting', SMPREF_JS_AUTODETECT);