added folder_prefix options

[squirrelmail.git] / src / load_prefs.php

diff --git a/src/load_prefs.php b/src/load_prefs.php
index c714429a568adc5215b09e1c0a5f1199fd3fd614..88ff33416d2ac52b55eff2d553c5e90769666d27 100644 (file)
--- a/src/load_prefs.php
+++ b/src/load_prefs.php
@@ -1,6 +1,8 @@
 <?
    include("../config/config.php");
-   include("../functions/prefs.php");
+
+   if (!isset($prefs_php))
+      include("../functions/prefs.php");
 
    checkForPrefs($data_dir, $username);
 
@@ -12,8 +14,11 @@
       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;
       }
    }
@@ -28,6 +33,14 @@
    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;
@@ -36,11 +49,13 @@
    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 {
-      $signature = "";
    }
 ?>
-