disable thread sort from search page output, not compatible with the search page...

[squirrelmail.git] / src / load_prefs.php

diff --git a/src/load_prefs.php b/src/load_prefs.php
index cce035433f7312d898dfefa2a89c1aed9849b17c..c0a7a913a8cfed12e7666b0dbf629b5ed2d082b6 100644 (file)
--- a/src/load_prefs.php
+++ b/src/load_prefs.php
@@ -142,7 +142,10 @@ $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 **/
@@ -192,6 +195,7 @@ $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 =
@@ -207,6 +211,16 @@ $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);
+
+/* if thread sorting is enabled/disabled */
+$thread_sort_messages = getPref($data_dir, $username, 'thread_sort_messages', 0);
+$sort_by_ref = getPref($data_dir, $username, 'sort_by_ref', 1);
+
 /* Load the javascript settings. */
 $javascript_setting =
     getPref($data_dir, $username, 'javascript_setting', SMPREF_JS_AUTODETECT);
@@ -215,6 +229,8 @@ $javascript_on = getPref($data_dir, $username, 'javascript_on', SMPREF_ON);
 
 $search_memory = getPref($data_dir, $username, 'search_memory', 0);
 
+$forward_cc = getPref($data_dir, $username, 'forward_cc', 0);
+
 do_hook('loading_prefs');
 
 ?>