From 2752bb169cb1a9406493d7177953e7c915374272 Mon Sep 17 00:00:00 2001
From: lkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Wed, 13 Dec 2000 20:36:39 +0000
Subject: [PATCH] Updated folder displaying code with changes we discussed on
 list

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@883 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 ChangeLog                     |   1 +
 functions/imap_mailbox.php    | 103 ++++++++++++++++++----------------
 functions/mailbox_display.php |   2 +-
 src/folders.php               |  16 +++---
 4 files changed, 64 insertions(+), 58 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 52430ef8..df707cf4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 Version 1.0pre1 -- DEVELOPMENT
 ------------------------------
+- Folder displays have been changed to be more readable in drop-down lists
 - For security, login verification happens, then we're redirected to webmail.php
 - Folder sorting now case insensative
 - added config option to set IMAP folder delimiter rather than always detecting it
diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index b7ae6032..21ee5a80 100755
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -42,7 +42,7 @@
       global $auto_expunge;
       
       fputs ($imap_stream, "a001 SELECT \"$mailbox\"\r\n");
-     	$read = sqimap_read_data($imap_stream, "a001", true, $response, $message);
+             $read = sqimap_read_data($imap_stream, "a001", true, $response, $message);
       if ($recent) {
          for ($i=0; $i<count($read); $i++) {
             if (strpos(strtolower($read[$i]), "recent")) {
@@ -90,7 +90,7 @@
     **  Unsubscribes to an existing folder 
     ******************************************************************************/
    function sqimap_unsubscribe ($imap_stream, $mailbox) {
-		global $imap_server_type;
+                global $imap_server_type;
 
       fputs ($imap_stream, "a001 UNSUBSCRIBE \"$mailbox\"\r\n");
       $read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
@@ -118,6 +118,7 @@
     **    formatted      - nicely formatted folder name
     **    unformatted    - unformatted, but with delimiter at end removed
     **    unformatted-dm - folder name as it appears in raw response
+	**    unformatted-disp - unformatted without $folder_prefix
     **
     ******************************************************************************/
    function sqimap_mailbox_parse ($line, $line_lsub, $dm) {
@@ -126,32 +127,34 @@
       // Process each folder line
       for ($g=0; $g < count($line); $g++) {
 
-	 // Store the raw IMAP reply
+         // Store the raw IMAP reply
          $boxes[$g]["raw"] = $line[$g];
 
-	 // Count number of delimiters ($dm) in folder name
+         // Count number of delimiters ($dm) in folder name
          $mailbox = trim($line_lsub[$g]);
          $dm_count = countCharInString($mailbox, $dm);
          if (substr($mailbox, -1) == $dm)
             $dm_count--;  // If name ends in delimiter - decrement count by one
 
-	 // Format folder name, but only if it's a INBOX.* or have
-	 // a parent.
-	 $boxesbyname[$mailbox] = $g;
-	 $parentfolder = readMailboxParent($mailbox, $dm);
-	 if((eregi("^inbox".quotemeta($dm), $mailbox)) || 
-	    ( isset($boxesbyname[$parentfolder]) && (strlen($parentfolder) > 0) ) ) {
-	    $indent = $dm_count - (countCharInString($folder_prefix, $dm));
-	    $boxes[$g]["formatted"]  = str_repeat("&nbsp;&nbsp;", $indent);
-	    $boxes[$g]["formatted"] .= readShortMailboxName($mailbox, $dm);
-	 } else {
-	    $boxes[$g]["formatted"]  = $mailbox;
-	 }
+         // Format folder name, but only if it's a INBOX.* or have
+         // a parent.
+         $boxesbyname[$mailbox] = $g;
+         $parentfolder = readMailboxParent($mailbox, $dm);
+         if((eregi("^inbox".quotemeta($dm), $mailbox)) || 
+	    (ereg("^".$folder_prefix, $mailbox)) ||
+            ( isset($boxesbyname[$parentfolder]) && (strlen($parentfolder) > 0) ) ) {
+            $indent = $dm_count - (countCharInString($folder_prefix, $dm));
+            $boxes[$g]["formatted"]  = str_repeat("&nbsp;&nbsp;", $indent);
+            $boxes[$g]["formatted"] .= readShortMailboxName($mailbox, $dm);
+         } else {
+            $boxes[$g]["formatted"]  = $mailbox;
+         }
             
          $boxes[$g]["unformatted-dm"] = $mailbox;
          if (substr($mailbox, -1) == $dm)
             $mailbox = substr($mailbox, 0, strlen($mailbox) - 1);
          $boxes[$g]["unformatted"] = $mailbox;
+         $boxes[$g]["unformatted-disp"] = ereg_replace("^" . $folder_prefix, "", $mailbox);
          $boxes[$g]["id"] = $g;
 
          ereg("\(([^)]*)\)",$line[$g],$regs);
@@ -208,7 +211,7 @@
       }
       $sorted_lsub_ary = $new_ary;
       if (isset($sorted_lsub_ary)) {
-	 usort($sorted_lsub_ary, "_icmp");
+         usort($sorted_lsub_ary, "_icmp");
          //sort($sorted_lsub_ary);
       }   
 
@@ -225,7 +228,7 @@
          if (find_mailbox_name($sorted_list_ary[$i]) == "INBOX")
             $inbox_in_list = true;
       }
-		
+                
       /** Just in case they're not subscribed to their inbox, we'll get it for them anyway **/
       if ($inbox_subscribed == false || $inbox_in_list == false) {
          fputs ($imap_stream, "a001 LIST \"\" \"INBOX\"\r\n");
@@ -250,36 +253,36 @@
          if (strtolower($boxes[$i]["unformatted"]) == "inbox") {
             $boxesnew[] = $boxes[$i];
             $boxes[$i]["used"] = true;
-	    $i = count($boxes);
+            $i = count($boxes);
          }
       }
 
       if ($list_special_folders_first == true) {
 
-	 // Then list special folders and their subfolders
-	 for ($i = 0 ; $i <= count($boxes) ; $i++) {
-	    if((eregi("^".$trash_folder.'$', $boxes[$i]["unformatted"]) ||
-		eregi("^".$trash_folder.quotemeta($dm), $boxes[$i]["unformatted"]) )  &&
-	       ($move_to_trash)) {	
+         // Then list special folders and their subfolders
+         for ($i = 0 ; $i <= count($boxes) ; $i++) {
+            if((eregi("^".$trash_folder.'$', $boxes[$i]["unformatted"]) ||
+                eregi("^".$trash_folder.quotemeta($dm), $boxes[$i]["unformatted"]) )  &&
+               ($move_to_trash)) {        
                $boxesnew[] = $boxes[$i];
                $boxes[$i]["used"] = true;
             }
-	    else if((eregi("^".$sent_folder.'$', $boxes[$i]["unformatted"]) ||
-		     eregi("^".$sent_folder.quotemeta($dm), $boxes[$i]["unformatted"]) )  &&
-		    ($move_to_sent)) {	
+            else if((eregi("^".$sent_folder.'$', $boxes[$i]["unformatted"]) ||
+                     eregi("^".$sent_folder.quotemeta($dm), $boxes[$i]["unformatted"]) )  &&
+                    ($move_to_sent)) {        
                $boxesnew[] = $boxes[$i];
                $boxes[$i]["used"] = true;
             }
          }
 
-	 // Put INBOX.* folders ahead of the rest
-	 for ($i = 0; $i <= count($boxes); $i++) {
-	    if (eregi("^inbox\.", $boxes[$i]["unformatted"]) &&
-		($boxes[$i]["used"] == false)) {
-	       $boxesnew[] = $boxes[$i];
-	       $boxes[$i]["used"] = true;
-	    }
-	 }
+         // Put INBOX.* folders ahead of the rest
+         for ($i = 0; $i <= count($boxes); $i++) {
+            if (eregi("^inbox\.", $boxes[$i]["unformatted"]) &&
+                ($boxes[$i]["used"] == false)) {
+               $boxesnew[] = $boxes[$i];
+               $boxes[$i]["used"] = true;
+            }
+         }
 
       }
 
@@ -314,31 +317,33 @@
       for ($i = 0; $i < count($read_ary); $i++) {
          if (substr ($read_ary[$i], 0, 4) != "a001") {
 
-	    // Store the raw IMAP reply
+            // Store the raw IMAP reply
             $boxes[$g]["raw"] = $read_ary[$i];
 
-	    // Count number of delimiters ($dm) in folder name
+            // Count number of delimiters ($dm) in folder name
             $mailbox = find_mailbox_name($read_ary[$i]);
             $dm_count = countCharInString($mailbox, $dm);
             if (substr($mailbox, -1) == $dm)
                $dm_count--;  // If name ends in delimiter - decrement count by one
-	    
-	    // Format folder name, but only if it's a INBOX.* or have
-	    // a parent.
-	    $boxesbyname[$mailbox] = $g;
-	    $parentfolder = readMailboxParent($mailbox, $dm);
-	    if((eregi("^inbox".quotemeta($dm), $mailbox)) || 
-	       ( isset($boxesbyname[$parentfolder]) && (strlen($parentfolder) > 0) ) ) {
-	       $boxes[$g]["formatted"]  = str_repeat("&nbsp;&nbsp;", $dm_count);
-	       $boxes[$g]["formatted"] .= readShortMailboxName($mailbox, $dm);
-	    } else {
-	       $boxes[$g]["formatted"]  = $mailbox;
-	    }
+            
+            // Format folder name, but only if it's a INBOX.* or have
+            // a parent.
+            $boxesbyname[$mailbox] = $g;
+            $parentfolder = readMailboxParent($mailbox, $dm);
+            if((eregi("^inbox".quotemeta($dm), $mailbox)) || 
+               (ereg("^".$folder_prefix, $mailbox)) ||
+               ( isset($boxesbyname[$parentfolder]) && (strlen($parentfolder) > 0) ) ) {
+               $boxes[$g]["formatted"]  = str_repeat("&nbsp;&nbsp;", $dm_count);
+               $boxes[$g]["formatted"] .= readShortMailboxName($mailbox, $dm);
+            } else {
+               $boxes[$g]["formatted"]  = $mailbox;
+            }
                
             $boxes[$g]["unformatted-dm"] = $mailbox;
             if (substr($mailbox, -1) == $dm)
                $mailbox = substr($mailbox, 0, strlen($mailbox) - 1);
             $boxes[$g]["unformatted"] = $mailbox;
+            $boxes[$g]["unformatted-disp"] = ereg_replace("^" . $folder_prefix, "", $mailbox);
             $boxes[$g]["id"] = $g;
 
             /** Now lets get the flags for this mailbox **/
diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 97b0a2c4..0599282b 100644
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -462,7 +462,7 @@
             $boxes[$i]["flags"][1] != "noselect" &&
             $boxes[$i]["flags"][2] != "noselect") {
             $box = $boxes[$i]["unformatted"];
-            $box2 = replace_spaces($boxes[$i]["formatted"]);
+            $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
             echo "         <OPTION VALUE=\"$box\">$box2</option>\n";
     }
       }
diff --git a/src/folders.php b/src/folders.php
index ad9c7232..9699514d 100644
--- a/src/folders.php
+++ b/src/folders.php
@@ -128,7 +128,7 @@
 	      strtolower($boxes[$i]["unformatted"]) != "inbox.trash"))
 	    {
 	       $box = $boxes[$i]["unformatted-dm"];
-	       $box2 = replace_spaces($boxes[$i]["formatted"]);
+	       $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
 	       echo "         <OPTION VALUE=\"$box\">$box2\n";
 	    }
       }
@@ -172,11 +172,11 @@
          if ($noinf == false) {
             if ((strtolower($boxes[$i]["unformatted"]) == "inbox") && ($default_sub_of_inbox == true)) {
                $box = $boxes[$i]["unformatted"];
-               $box2 = replace_spaces($boxes[$i]["formatted"]);
+               $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
                echo "<OPTION SELECTED VALUE=\"$box\">$box2\n";
             } else {
                $box = $boxes[$i]["unformatted"];
-               $box2 = replace_spaces($boxes[$i]["formatted"]);
+               $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
                if (strtolower($imap_server_type) != "courier" ||
                   strtolower($box) != "inbox.trash")
                 echo "<OPTION VALUE=\"$box\">$box2\n";
@@ -185,11 +185,11 @@
       } else {
          if ((strtolower($boxes[$i]["unformatted"]) == "inbox") && ($default_sub_of_inbox == true)) {
             $box = $boxes[$i]["unformatted"];
-            $box2 = replace_spaces($boxes[$i]["formatted"]);
+            $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
             echo "<OPTION SELECTED VALUE=\"$box\">$box2\n";
          } else {
             $box = $boxes[$i]["unformatted"];
-            $box2 = replace_spaces($boxes[$i]["formatted"]);
+            $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
            if (strtolower($imap_server_type) != "courier" ||
                strtolower($box) != "inbox.trash")
              echo "<OPTION VALUE=\"$box\">$box2\n";
@@ -223,7 +223,7 @@
 	     ($boxes[$i]["unformatted"] != $sent_folder)) 
 	    {	
 	       $box = $boxes[$i]["unformatted-dm"];
-	       $box2 = replace_spaces($boxes[$i]["formatted"]);
+	       $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
 	       if (strtolower($imap_server_type) != "courier" || strtolower($box) != "inbox.trash")
 		  echo "<OPTION VALUE=\"$box\">$box2\n";
 	    }
@@ -256,7 +256,7 @@
 	     ($boxes[$i]["unformatted"] != $sent_folder)) 
 	    {	
 	       $box = $boxes[$i]["unformatted-dm"];
-	       $box2 = replace_spaces($boxes[$i]["formatted"]);
+	       $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
 	       echo "         <OPTION VALUE=\"$box\">$box2\n";
 	    }
       }
@@ -291,7 +291,7 @@
       }
       if ($use_folder == true) {	
 	 $box[$q] = $boxes_all[$i]["unformatted-dm"];
-	 $box2[$q] = $boxes_all[$i]["unformatted"];
+	 $box2[$q] = $boxes_all[$i]["unformatted-disp"];
 	 $q++;
       }
    }
-- 
2.25.1