added folder_prefix option

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@386 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/load_prefs.php b/src/load_prefs.php
index 88ff33416d2ac52b55eff2d553c5e90769666d27..27e3c13c89ca72a310b6db520b55b4f81207954a 100644 (file)
--- a/src/load_prefs.php
+++ b/src/load_prefs.php
@@ -1,9 +1,10 @@
 <?
-   include("../config/config.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");
@@ -41,6 +42,10 @@
          $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;

diff --git a/src/options.php b/src/options.php
index a32ac0b442254262e4d0fd736253f02bbe950e6a..6ef3accf4252bb1f4608b82e0e0f690b66e3caea 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -65,6 +65,20 @@
    echo "         <INPUT TYPE=TEXT NAME=reply_to VALUE=\"$replyto\" SIZE=50><BR>";
    echo "      </TD>";
    echo "   </TR>";
+   // DEFAULT FOLDERS 
+       if ($show_prefix_option == true) {
+      echo "   <TR>";
+          echo "      <TD WIDTH=20% ALIGN=RIGHT>";
+          echo           _("Folder path:");
+          echo "      </TD>";
+          echo "      <TD WIDTH=80% ALIGN=LEFT>";
+          if (isset ($folder_prefix))
+             echo "         <INPUT TYPE=TEXT NAME=folderprefix VALUE=\"$folder_prefix\" SIZE=50><BR>";
+          else   
+             echo "         <INPUT TYPE=TEXT NAME=folderprefix VALUE=\"$default_folder_prefix\" SIZE=50><BR>";
+          echo "      </TD>";
+          echo "   </TR>";
+   }   
    // THEME
    echo "   <TR>";
    echo "      <TD WIDTH=20% ALIGN=RIGHT>";

diff --git a/src/options_submit.php b/src/options_submit.php
index 8960281fd261820b1917275445221dc5252cbb8a..193cf262be42afcfe494dbf1d1e2c4c21cf246c7 100644 (file)
--- a/src/options_submit.php
+++ b/src/options_submit.php
@@ -26,6 +26,7 @@
    setPref($data_dir, $username, "left_refresh", $leftrefresh);
    setPref($data_dir, $username, "language", $language);
    setPref($data_dir, $username, "left_size", $leftsize);
+   setPref($data_dir, $username, "folder_prefix", $folderprefix);
 
    setSig($data_dir, $username, stripslashes($signature_edit));