fixed the problem with us not being RFC complient for courier

[squirrelmail.git] / src / load_prefs.php

diff --git a/src/load_prefs.php b/src/load_prefs.php
index 8b251e8e36a0d36c342f049a458516137a07440d..964a6e8ceb0136fc5f05397790256e606779031e 100644 (file)
--- a/src/load_prefs.php
+++ b/src/load_prefs.php
@@ -1,7 +1,10 @@
-<?
-   include("../config/config.php");
-   include("../functions/prefs.php");
-
+<?php
+   if (!isset($config_php))
+      include("../config/config.php");
+   if (!isset($prefs_php))
+      include("../functions/prefs.php");
+      
+   $load_prefs_php = true;
    checkForPrefs($data_dir, $username);
 
    $chosen_theme = getPref($data_dir, $username, "chosen_theme");
@@ -27,10 +30,26 @@
    if ($move_to_trash == "")
       $move_to_trash = $default_move_to_trash;
 
+   $show_num = getPref($data_dir, $username, "show_num");
+   if ($show_num == "")
+      $show_num = 25;
+   
    $wrap_at = getPref($data_dir, $username, "wrap_at");
    if ($wrap_at == "")
       $wrap_at = 86;
 
+   $left_size = getPref($data_dir, $username, "left_size");
+   if ($left_size == "") {
+      if (isset($default_left_size))
+         $left_size = $default_left_size;
+      else  
+         $left_size = 200;
+   }      
+
+   $folder_prefix = getPref($data_dir, $username, "folder_prefix");
+   if ($folder_prefix == "")
+      $folder_prefix = $default_folder_prefix;
+
    $editor_size = getPref($data_dir, $username, "editor_size");
    if ($editor_size == "")
       $editor_size = 76;