X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=include%2Fload_prefs.php;h=869c5edfee59411af07476a7d9b13df358b0bdf2;hp=69e2724bdfe6f3391d1e3a07f1fc02be2ed36d1a;hb=33cb35616692db173dceea0fbc6d1ee1ad5e25c3;hpb=1a531551726e16fe9ccbd8de06731c1730d8fce2

diff --git a/include/load_prefs.php b/include/load_prefs.php
index 69e2724b..869c5edf 100644
--- a/include/load_prefs.php
+++ b/include/load_prefs.php
@@ -9,13 +9,12 @@
  * Loads preferences from the $username.pref file used by almost
  * every other script in the source directory and alswhere.
  *
- * $Id$
+ * @version $Id$
  * @package squirrelmail
  */
 
 /** 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);
@@ -161,6 +160,9 @@ $reply_citation_style =
 $reply_citation_start = getPref($data_dir, $username, 'reply_citation_start');
 $reply_citation_end = getPref($data_dir, $username, 'reply_citation_end');
 
+$body_quote = getPref($data_dir, $username, 'body_quote', '>');
+if ($body_quote == 'NONE') $body_quote = '';
+
 // who is using those darn block comments?  poo!
 
 // Load preference for cursor behavior for replies
@@ -171,9 +173,7 @@ $reply_focus = getPref($data_dir, $username, 'reply_focus', '');
 $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 **/
+/* Load up the Signature file */
 $signature_abs = $signature = getSig($data_dir, $username, 'g');
 
 /* Message Highlighting Rules */
@@ -265,6 +265,7 @@ $internal_date_sort = getPref($data_dir, $username, 'internal_date_sort', SMPREF
 $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);
 if ( checkForJavascript() )
 {
   $use_javascript_folder_list = getPref($data_dir, $username, 'use_javascript_folder_list');
@@ -295,4 +296,4 @@ $delete_prev_next_display = getPref($data_dir, $username, 'delete_prev_next_disp
 
 do_hook('loading_prefs');
 
-?>
+?>
\ No newline at end of file