bugfixes

[squirrelmail.git] / src / load_prefs.php

diff --git a/src/load_prefs.php b/src/load_prefs.php
index 68d583065346d9eddbf67f10267923d2cd6f3fd2..6d8dcfb6a628debe63bd7d94ae6a587c14908a62 100644 (file)
--- a/src/load_prefs.php
+++ b/src/load_prefs.php
@@ -24,12 +24,38 @@
       }
    }
 
+   $folder_prefix = getPref($data_dir, $username, "folder_prefix");
+   if ($folder_prefix == "")
+      $folder_prefix = $default_folder_prefix;
+
+       /** Load special folders **/
+       $new_trash_folder = getPref($data_dir, $username, "trash_folder");
+       if (($new_trash_folder == "") && ($move_to_trash == true))
+               $trash_folder = $folder_prefix . $trash_folder;
+       else
+               $trash_folder = $new_trash_folder;
+
+       /** Load special folders **/
+       $new_sent_folder = getPref($data_dir, $username, "sent_folder");
+       if (($new_sent_folder == "") && ($move_to_sent == true))
+               $sent_folder = $folder_prefix . $sent_folder;
+       else
+               $sent_folder = $new_sent_folder;
+       
+   /** Load the user's sent folder preferences **/
+   $move_to_sent = getPref($data_dir, $username, "move_to_sent");
+   if ($move_to_sent == "")
+      $move_to_sent = $default_move_to_sent;
 
    /** Load the user's trash folder preferences **/
    $move_to_trash = getPref($data_dir, $username, "move_to_trash");
    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;
@@ -42,10 +68,6 @@
          $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;