Now that I have seemed to have fixed the INBOX issue with courier/uw,

enabling this code actually does good in uw (it hides the mail/ non-select
folder), and makes the folders all line up.  In courier, folders no longer
appear (though they still are) subs of inbox... should we change this?

Retested code with exchange, cyrus, uw, and courier, all seem good now.

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

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index 73852cd9a5b8475d0dacf8aa451647d9ac03d282..0a376ce2318856fc07ef73b28dfbf7eebd78d633 100755 (executable)
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -814,10 +814,6 @@ function sqimap_fill_mailbox_tree($mbx_ary, $mbxs=false) {
     $trail_del = false;
     $start = 0;
 
     $trail_del = false;
     $start = 0;
 

-/* JA - Seems to really screw up folder displays, courier and uw both lose their INBOX when you
-        have a default_folder_prefix set on this
-
-

     if (isset($folder_prefix) && ($folder_prefix != '')) {
         $start = substr_count($folder_prefix,$delimiter);
         if (strrpos($folder_prefix, $delimiter) == (strlen($folder_prefix)-1)) {
     if (isset($folder_prefix) && ($folder_prefix != '')) {
         $start = substr_count($folder_prefix,$delimiter);
         if (strrpos($folder_prefix, $delimiter) == (strlen($folder_prefix)-1)) {


@@ -831,7 +827,6 @@ function sqimap_fill_mailbox_tree($mbx_ary, $mbxs=false) {
     } else {
         $start = 0;
     }
     } else {
         $start = 0;
     }

-*/

 
     $cnt =  count($mbx_ary);
     for ($i=0; $i < $cnt; $i++) {
 
     $cnt =  count($mbx_ary);
     for ($i=0; $i < $cnt; $i++) {