bugfixes

[squirrelmail.git] / src / load_prefs.php

diff --git a/src/load_prefs.php b/src/load_prefs.php
index 5b5803551e6e90f6749445d219f4bb86dab996c8..6d8dcfb6a628debe63bd7d94ae6a587c14908a62 100644 (file)
--- a/src/load_prefs.php
+++ b/src/load_prefs.php
@@ -1,6 +1,11 @@
-<?
-   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");
 
@@ -10,9 +15,74 @@
       if (file_exists($theme[0]["PATH"])) {
          require($theme[0]["PATH"]);
       } else {
-         echo "Theme: " . $theme[0]["PATH"] . " was not found.<BR>";
-         echo "Exiting abnormally";
+         echo _("Theme: ");
+         echo $theme[0]["PATH"];
+         echo _(" was not found.");
+         echo "<BR>";
+         echo _("Exiting abnormally");
          exit;
       }
    }
-?>
\ No newline at end of file
+
+   $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;
+
+   $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;
+   }      
+
+   $editor_size = getPref($data_dir, $username, "editor_size");
+   if ($editor_size == "")
+      $editor_size = 76;
+
+   $use_signature = getPref($data_dir, $username, "use_signature");
+   if ($use_signature == "")
+      $use_signature = false;
+
+   $left_refresh = getPref($data_dir, $username, "left_refresh");
+   if ($left_refresh == "")
+      $left_refresh = false;
+   
+   /** Load up the Signature file **/
+   if ($use_signature == true) {
+      $signature = getSig($data_dir, $username);
+   } else {
+   }
+?>