Fix IMAP PARSE reponse matching. This should get rid of retrival errors

[squirrelmail.git] / src / load_prefs.php

diff --git a/src/load_prefs.php b/src/load_prefs.php
index 6be0208f976123f6dfbeca118326640ca77f8fa6..652bc192fa7bc31c3b08bd927841632e7ba16f9c 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) {
@@ -193,6 +195,9 @@ $attachment_common_show_images = getPref($data_dir, $username, 'attachment_commo
 $pf_subtle_link = getPref($data_dir, $username, 'pf_subtle_link', SMPREF_ON);
 $pf_cleandisplay = getPref($data_dir, $username, 'pf_cleandisplay', SMPREF_OFF);
 
+/* message disposition notification support setting */
+$mdn_user_support = getPref($data_dir, $username, 'mdn_user_support', SMPREF_ON);
+
 $include_self_reply_all =
     getPref($data_dir, $username, 'include_self_reply_all', SMPREF_ON);
 
@@ -203,6 +208,15 @@ $page_selector_max = getPref($data_dir, $username, 'page_selector_max', 10);
 $date_format = getPref($data_dir, $username, 'date_format', 3);
 $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);
+
+/* use the internal date of the message for sorting instead of the supplied header date */
+$internal_date_sort = getPref($data_dir, $username, 'internal_date_sort', SMPREF_ON);
+
 /* Load the javascript settings. */
 $javascript_setting =
     getPref($data_dir, $username, 'javascript_setting', SMPREF_JS_AUTODETECT);
@@ -213,4 +227,4 @@ $search_memory = getPref($data_dir, $username, 'search_memory', 0);
 
 do_hook('loading_prefs');
 
-?>
\ No newline at end of file
+?>