X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=include%2Fload_prefs.php;h=a55aaf248bf6abc5285d6b9fae0e43d9ccf48894;hb=4eefb12fa341803111dd6b7c5a2bc56f9d479027;hp=618c64fa90c6e22000d2d6292683e9a25634cb92;hpb=a46ecf666765455b3030130111a6156ea582fd63;p=squirrelmail.git

diff --git a/include/load_prefs.php b/include/load_prefs.php
index 618c64fa..a55aaf24 100644
--- a/include/load_prefs.php
+++ b/include/load_prefs.php
@@ -3,7 +3,7 @@
 /**
  * load_prefs.php
  *
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Loads preferences from the $username.pref file used by almost
@@ -15,7 +15,6 @@
 
 /** SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/prefs.php');
 require_once(SM_PATH . 'functions/plugin.php');
 require_once(SM_PATH . 'functions/constants.php');
 
@@ -73,8 +72,8 @@ if (isset($chosen_theme) && $found_theme && (file_exists($chosen_theme))) {
 }
 
 
-if (!defined('download_php')) { 
-    sqsession_register($theme_css, 'theme_css'); 
+if (!defined('download_php')) {
+    sqsession_register($theme_css, 'theme_css');
 }
 
 // user's icon theme, if using icons
@@ -91,11 +90,11 @@ $move_to_trash =
 $save_as_draft =
     getPref($data_dir, $username, 'save_as_draft', $default_save_as_draft);
 
-if ($default_unseen_type == '') { 
-    $default_unseen_type = 1; 
+if ($default_unseen_type == '') {
+    $default_unseen_type = 1;
 }
-if ($default_unseen_notify == '') { 
-    $default_unseen_notify = 2; 
+if ($default_unseen_notify == '') {
+    $default_unseen_notify = 2;
 }
 $unseen_type =
     getPref($data_dir, $username, 'unseen_type', $default_unseen_type);
@@ -171,12 +170,10 @@ if ($body_quote == 'NONE') $body_quote = '';
 $reply_focus = getPref($data_dir, $username, 'reply_focus', '');
 
 /* left refresh rate, strtolower makes 1.0.6 prefs compatible */
-$left_refresh = getPref($data_dir, $username, 'left_refresh', SMPREF_NONE );
+$left_refresh = getPref($data_dir, $username, 'left_refresh', 600 );
 $left_refresh = strtolower($left_refresh);
 
-$sort = getPref($data_dir, $username, 'sort', 6 );
-
-/** Load up the Signature file **/
+/* Load up the Signature file */
 $signature_abs = $signature = getSig($data_dir, $username, 'g');
 
 /* Message Highlighting Rules */
@@ -226,7 +223,7 @@ $collapse_folders =
     getPref($data_dir, $username, 'collapse_folders', SMPREF_ON);
 
 $show_html_default =
-   getPref($data_dir, $username, 'show_html_default', SMPREF_OFF);
+   getPref($data_dir, $username, 'show_html_default', SMPREF_ON);
 
 $enable_forward_as_attachment =
    getPref($data_dir, $username, 'enable_forward_as_attachment', SMPREF_ON);
@@ -234,7 +231,6 @@ $enable_forward_as_attachment =
 $show_xmailer_default =
     getPref($data_dir, $username, 'show_xmailer_default', SMPREF_OFF );
 $attachment_common_show_images = getPref($data_dir, $username, 'attachment_common_show_images', SMPREF_OFF );
-$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);
@@ -242,12 +238,14 @@ $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);
 
+/* Page selector options */
 $page_selector = getPref($data_dir, $username, 'page_selector', SMPREF_ON);
+$compact_paginator = getPref($data_dir, $username, 'compact_paginator', SMPREF_OFF);
 $page_selector_max = getPref($data_dir, $username, 'page_selector_max', 10);
 
 /* SqClock now in the core */
 $date_format = getPref($data_dir, $username, 'date_format', 3);
-$hour_format = getPref($data_dir, $username, 'hour_format', 2);
+$hour_format = getPref($data_dir, $username, 'hour_format', SMPREF_TIME_12HR);
 
 /*  compose in new window setting */
 $compose_new_win = getPref($data_dir, $username, 'compose_new_win', 0);
@@ -256,16 +254,16 @@ $compose_width = getPref($data_dir, $username, 'compose_width', 640);
 
 
 /* signature placement settings */
-$sig_first = getPref($data_dir, $username, 'sig_first', 0);
+$sig_first = getPref($data_dir, $username, 'sig_first', SMPREF_OFF);
 
 /* Strip signature when replying */
-$strip_sigs = getPref($data_dir, $username, 'strip_sigs', 0);
+$strip_sigs = getPref($data_dir, $username, 'strip_sigs', SMPREF_ON);
 
 /* 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);
+$sort_by_ref = getPref($data_dir, $username, 'sort_by_ref', SMPREF_ON);
 
 /* Load the javascript settings. */
 $javascript_setting = getPref($data_dir, $username, 'javascript_setting', SMPREF_JS_AUTODETECT);
@@ -278,24 +276,29 @@ if ( checkForJavascript() )
   $use_javascript_addr_book = false;
 }
 
-$search_memory = getPref($data_dir, $username, 'search_memory', 0);
+$search_memory = getPref($data_dir, $username, 'search_memory', SMPREF_OFF);
+
+$show_only_subscribed_folders =
+    getPref($data_dir, $username, 'show_only_subscribed_folders', SMPREF_ON);
 
-$forward_cc = getPref($data_dir, $username, 'forward_cc', 0);
+$forward_cc = getPref($data_dir, $username, 'forward_cc', SMPREF_OFF);
 
-$mailbox_select_style = getPref($data_dir, $username, 'mailbox_select_style', 0);
+/* How are mailbox select lists displayed: 0. full names, 1. indented (default),
+ * 3. delimited) */
+$mailbox_select_style = getPref($data_dir, $username, 'mailbox_select_style', 1);
 
 /* Allow user to customize, and display the full date, instead of day, or time based
    on time distance from date of message */
-$show_full_date = getPref($data_dir, $username, 'show_full_date', 0);
+$show_full_date = getPref($data_dir, $username, 'show_full_date', SMPREF_OFF);
 
 /* Allow user to customize length of from field */
-$truncate_sender = getPref($data_dir, $username, 'truncate_sender', 0);
+$truncate_sender = getPref($data_dir, $username, 'truncate_sender', 50);
 /* Allow user to customize length of subject field */
 $truncate_subject = getPref($data_dir, $username, 'truncate_subject', 50);
 /* Allow user to show recipient name if the message is from default identity */
-$show_recipient_instead = getPref($data_dir, $username, 'show_recipient_instead', 0);
+$show_recipient_instead = getPref($data_dir, $username, 'show_recipient_instead', SMPREF_OFF);
 
-$delete_prev_next_display = getPref($data_dir, $username, 'delete_prev_next_display', 1);
+$delete_prev_next_display = getPref($data_dir, $username, 'delete_prev_next_display', SMPREF_ON);
 
 do_hook('loading_prefs');