fix for bug #554886

[squirrelmail.git] / src / load_prefs.php

diff --git a/src/load_prefs.php b/src/load_prefs.php
index a7b539ddbe294ef72472ac784c4d24d77a4060d6..fb2dd9e51dc4a29645a9061eca4b683cfc869006 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,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 **/
@@ -189,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 =
@@ -203,6 +210,18 @@ $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);
+$compose_height = getPref($data_dir, $username, 'compose_height', 550);
+$compose_width = getPref($data_dir, $username, 'compose_width', 640);
+
+
+/* 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 server sorting is enabled/disabled */
+$sort_by_ref = getPref($data_dir, $username, 'sort_by_ref', 1);
 
 /* Load the javascript settings. */
 $javascript_setting =
@@ -212,6 +231,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');
 
 ?>