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

diff --git a/include/load_prefs.php b/include/load_prefs.php
index ace9d8ee..618c64fa 100644
--- a/include/load_prefs.php
+++ b/include/load_prefs.php
@@ -3,13 +3,13 @@
 /**
  * load_prefs.php
  *
- * Copyright (c) 1999-2003 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 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
  * every other script in the source directory and alswhere.
  *
- * $Id$
+ * @version $Id$
  * @package squirrelmail
  */
 
@@ -77,7 +77,11 @@ if (!defined('download_php')) {
     sqsession_register($theme_css, 'theme_css'); 
 }
 
-$use_javascript_addr_book = getPref($data_dir, $username, 'use_javascript_addr_book', $default_use_javascript_addr_book);
+// user's icon theme, if using icons
+$icon_theme = getPref($data_dir, $username, 'icon_theme', 'none' );
+
+// show (or not) flag and unflag buttons on mailbox list screen
+$show_flag_buttons = getPref($data_dir, $username, 'show_flag_buttons', SMPREF_OFF );
 
 /* Load the user's special folder preferences */
 $move_to_sent =
@@ -143,6 +147,7 @@ if ($left_size == '') {
 }
 
 $editor_size = getPref($data_dir, $username, 'editor_size', 76 );
+$editor_height = getPref($data_dir, $username, 'editor_height', 20 );
 $use_signature = getPref($data_dir, $username, 'use_signature', SMPREF_OFF );
 $prefix_sig = getPref($data_dir, $username, 'prefix_sig');
 
@@ -156,6 +161,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
@@ -209,7 +217,6 @@ $alt_index_colors =
     getPref($data_dir, $username, 'alt_index_colors', SMPREF_ON );
 
 /* Folder List Display Format */
-$use_javascript_folder_list = getPref($data_dir, $username, 'use_javascript_folder_list');
 $location_of_bar =
     getPref($data_dir, $username, 'location_of_bar', SMPREF_LOC_LEFT);
 $location_of_buttons =
@@ -261,10 +268,15 @@ $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);
-$javascript_on = getPref($data_dir, $username, 'javascript_on', SMPREF_ON);
-
+$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');
+  $use_javascript_addr_book = getPref($data_dir, $username, 'use_javascript_addr_book', $default_use_javascript_addr_book);
+} else {
+  $use_javascript_folder_list = false;
+  $use_javascript_addr_book = false;
+}
 
 $search_memory = getPref($data_dir, $username, 'search_memory', 0);