From cf85d6656172d88c8ae99b213a829698ebdcdf18 Mon Sep 17 00:00:00 2001
From: lkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Tue, 4 Apr 2000 01:22:42 +0000
Subject: [PATCH] added folder_prefix options

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@385 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 config/config_default.php  | 11 +++++++----
 functions/imap_mailbox.php |  7 ++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/config/config_default.php b/config/config_default.php
index 1cfe25d0..3768b822 100644
--- a/config/config_default.php
+++ b/config/config_default.php
@@ -36,18 +36,21 @@
     $use_special_folder_color = true;
 
 //  Many servers store mail in your home directory.  With this, they
-//  store them in a subdirectory: ~/mail or ~/Mail, etc.  If your
+//  store them in a subdirectory: mail/ or Mail/, etc.  If your
 //  server does this, please set this to what the default mail folder
 //  should be.  This is still a user preference, so they can change
 //  it if it is different for each user.
 //
 //  Example:
-//     $folder_prefix = "mail/";
+//     $default_folder_prefix = "mail/";
 //        -- or --
-//     $folder_prefix = "Mail/folders/";
+//     $default_folder_prefix = "Mail/folders/";
 //
 //  If you do not use this, please set it to "".
-    $folder_prefix = "";
+    $default_folder_prefix = "";
+//  If you do not wish to give them the option to change this, set it to false.
+//  Otherwise, if it is true, they can change the folder prefix to be anything.
+    $show_prefix_option = false;
 
 //  The following are related to deleting messages.
 //    $move_to_trash
diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index 18201584..b9f461c9 100755
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -94,7 +94,12 @@
     **  The array returned looks like this:
     ******************************************************************************/
    function sqimap_mailbox_list ($imap_stream) {
-      global $special_folders, $list_special_folders_first, $folder_prefix;
+      global $load_prefs_php, $prefs_php, $config_php, $data_dir, $username;
+      if (!isset($load_prefs_php))
+         include "../src/load_prefs.php";
+      else
+         global $folder_prefix;
+      global $special_folders, $list_special_folders_first, $default_folder_prefix;
       
       if (!function_exists ("ary_sort"))
          include ("../functions/array.php");
-- 
2.25.1