Getting ready for 1.2.0 release.

[squirrelmail.git] / src / load_prefs.php

diff --git a/src/load_prefs.php b/src/load_prefs.php
index 377338e6105d38cb5f2bddf083c2004d7806631b..b6e796371af65e79c5fa8c49a04a580a0e80030b 100644 (file)
--- a/src/load_prefs.php
+++ b/src/load_prefs.php
@@ -1,23 +1,34 @@
 <?php
-    /**
-     * load_prefs.php
-     *
-     * Copyright (c) 1999-2001 The SquirrelMail Development 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$
-     **/
-
-    require_once('../src/validate.php');
-
-    /**************************************************************/
-    /* Following code should be removed in the next foo_once step */
-    if (defined('load_prefs_php')) { return; }
-    define('load_prefs_php', true);
-    /**************************************************************/
+
+/**
+ * load_prefs.php
+ *
+ * Copyright (c) 1999-2002 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$
+ */
+
+/*****************************************************************/
+/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!!           ***/
+/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION.             ***/
+/***    + Base level indent should begin at left margin, as    ***/
+/***      the require_once below looks.                        ***/
+/***    + All identation should consist of four space blocks   ***/
+/***    + Tab characters are evil.                             ***/
+/***    + all comments should use "slash-star ... star-slash"  ***/
+/***      style -- no pound characters, no slash-slash style   ***/
+/***    + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD      ***/
+/***      ALWAYS USE { AND } CHARACTERS!!!                     ***/
+/***    + Please use ' instead of ", when possible. Note "     ***/
+/***      should always be used in _( ) function calls.        ***/
+/*** Thank you for your help making the SM code more readable. ***/
+/*****************************************************************/
+
+require_once('../src/validate.php');
 
     global $theme, $chosen_theme, $color;
     if (! isset($theme)) { $theme = array(); }
@@ -27,7 +38,6 @@
     require_once('../functions/constants.php');
       
     if (!isset($username)) { $username = ''; }
-    checkForPrefs($data_dir, $username);
 
     $chosen_theme = getPref($data_dir, $username, "chosen_theme");
     $in_ary = false;
@@ -188,12 +198,17 @@
     $location_of_bar = getPref($data_dir, $username, 'location_of_bar', SMPREF_LOC_LEFT);
     $location_of_buttons = getPref($data_dir, $username, 'location_of_buttons', SMPREF_LOC_BETWEEN);
 
-    global $collapse_folders, $show_html_default, $show_xmailer_default;
+    global $collapse_folders, $show_html_default, $show_xmailer_default,
+           $attachment_common_show_images, $pf_subtle_link, $pf_cleandisplay;
     $collapse_folders = getPref($data_dir, $username, 'collapse_folders', SMPREF_ON);
 
     /* show_html_default is a int value. */
     $show_html_default = intval(getPref($data_dir, $username, 'show_html_default', SMPREF_ON));
-    $show_xmailer_default = intval(getPref($data_dir, $username, 'show_xmailer_default', SMPREF_OFF ) );
+
+    $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_subtle_link = getPref($data_dir, $username, 'pf_subtle_link', SMPREF_ON);
+    $pf_cleandisplay = getPref($data_dir, $username, 'pf_cleandisplay', SMPREF_OFF);
 
     global $include_self_reply_all;
     $include_self_reply_all = getPref($data_dir, $username, 'include_self_reply_all', SMPREF_ON);