X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fimap_mailbox.php;h=8e2600f059f6e70d70a553fc68377e1cc43a8291;hp=48bd446cfba7ccfea71fbd955a80cf63562aa8fb;hb=31955c984edc93138173af5f592f58f50e39693d;hpb=a7f3c40d541b7c780b28ba45a9f46a8460ebab6c;ds=sidebyside

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index 48bd446c..8e2600f0 100755
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -12,7 +12,6 @@
       sqimap_mailbox_select ($imap_stream, $mailbox);
       fputs ($imap_stream, "a001 EXPUNGE\r\n");
       $read = sqimap_read_data($imap_stream, "a001", $handle_errors, $response, $message);
-      sqimap_mailbox_close ($imap_stream);
    }
 
 
@@ -27,14 +26,6 @@
       }
    }
 
-   /******************************************************************************
-    **  Closes an open mailbox 
-    ******************************************************************************/
-   function sqimap_mailbox_close ($imap_stream) {
-      fputs ($imap_stream, "a001 CLOSE\r\n");
-      $tmp = sqimap_read_data($imap_stream, "a001", false, $response, $message);
-   }
-
    /******************************************************************************
     **  Selects a mailbox
     ******************************************************************************/
@@ -42,7 +33,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 +81,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);
@@ -111,25 +102,53 @@
 
    /******************************************************************************
     **  Formats a mailbox into 4 parts for the $boxes array
+    **
+    **  The four parts are:
+    **
+    **    raw            - Raw LIST/LSUB response from the IMAP server
+    **    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) {
-		global $folder_prefix;
+      global $folder_prefix;
+     
+      // Process each folder line
       for ($g=0; $g < count($line); $g++) {
+
+         // Store the raw IMAP reply
          $boxes[$g]["raw"] = $line[$g];
-            
+
+         // 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--;
-            
-         for ($j = 0; $j < $dm_count - (countCharInString($folder_prefix, $dm)); $j++)
-            $boxes[$g]["formatted"] = $boxes[$g]["formatted"] . "&nbsp;&nbsp;";
-         $boxes[$g]["formatted"] .= readShortMailboxName($mailbox, $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)) || 
+	    (ereg("^".$folder_prefix, $mailbox)) ||
+            ( isset($boxesbyname[$parentfolder]) && (strlen($parentfolder) > 0) ) ) {
+            $indent = $dm_count - (countCharInString($folder_prefix, $dm));
+            if ($indent)
+                $boxes[$g]["formatted"]  = str_repeat("&nbsp;&nbsp;", $indent);
+            else
+                $boxes[$g]["formatted"] = '';
+            $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);
@@ -138,15 +157,24 @@
             $boxes[$g]["flags"] = explode(" ", $flags);
          }
       }
+
       return $boxes;
    }
+
+   /* patch from dave_michmerhuizen@yahoo.com
+    * allows case insensativity when sorting folders
+    */
+   function _icmp ($a, $b) {
+      return strcasecmp($a, $b);
+   }
    
    /******************************************************************************
     **  Returns sorted mailbox lists in several different ways.
-    **  The array returned looks like this:
+    **  See comment on sqimap_mailbox_parse() for info about the returned array.
     ******************************************************************************/
    function sqimap_mailbox_list ($imap_stream) {
-      global $load_prefs_php, $prefs_php, $config_php, $data_dir, $username, $list_special_folders_first;
+      global $load_prefs_php, $prefs_php, $config_php;
+      global $data_dir, $username, $list_special_folders_first;
       global $trash_folder, $sent_folder;
       global $move_to_trash, $move_to_sent;
 
@@ -164,6 +192,9 @@
       fputs ($imap_stream, "a001 LSUB \"\" \"*\"\r\n");
       $lsub_ary = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
 
+	  /** OS: we don't want to parse last element of array, 'cause it is OK command, so we unset it **/
+	  unset($lsub_ary[count($lsub_ary)-1]);
+
       for ($i=0;$i < count($lsub_ary); $i++) {
          $sorted_lsub_ary[$i] = find_mailbox_name($lsub_ary[$i]);
          if ($sorted_lsub_ary[$i] == "INBOX")
@@ -177,7 +208,8 @@
       }
       $sorted_lsub_ary = $new_ary;
       if (isset($sorted_lsub_ary)) {
-         sort($sorted_lsub_ary);
+         usort($sorted_lsub_ary, "_icmp");
+         //sort($sorted_lsub_ary);
       }   
 
       /** LIST array **/
@@ -193,7 +225,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");
@@ -208,40 +240,54 @@
 
       $boxes = sqimap_mailbox_parse ($sorted_list_ary, $sorted_lsub_ary, $dm);
 
+
       /** Now, lets sort for special folders **/
+
+      $boxesnew = Array();
+
+      // Find INBOX
       for ($i = 0; $i < count($boxes); $i++) {
          if (strtolower($boxes[$i]["unformatted"]) == "inbox") {
-            $boxesnew[0] = $boxes[$i];
+            $boxesnew[] = $boxes[$i];
             $boxes[$i]["used"] = true;
-				$i = count($boxes);
+            $i = count($boxes);
          }
       }
 
       if ($list_special_folders_first == true) {
-         for ($i = count($boxes)-1; $i >= 0 ; $i--) {
-				if (($boxes[$i]["unformatted"] == $trash_folder) && ($move_to_trash)) {	
-               $pos = count($boxesnew);
-               $boxesnew[$pos] = $boxes[$i];
+
+         // Then list special folders and their subfolders
+         for ($i = 0 ; $i <= count($boxes) ; $i++) {
+            if((eregi("^".quotemeta($trash_folder).'$', $boxes[$i]["unformatted"]) ||
+                eregi("^".quotemeta($trash_folder).quotemeta($dm), $boxes[$i]["unformatted"]) )  &&
+               ($move_to_trash)) {        
+               $boxesnew[] = $boxes[$i];
                $boxes[$i]["used"] = true;
-					$trash_found = true;
             }
-				else if (($boxes[$i]["unformatted"] == $sent_folder) && ($move_to_sent)) {	
-               $pos = count($boxesnew);
-               $boxesnew[$pos] = $boxes[$i];
+            else if((eregi("^".quotemeta($sent_folder).'$', $boxes[$i]["unformatted"]) ||
+                     eregi("^".quotemeta($sent_folder).quotemeta($dm), $boxes[$i]["unformatted"]) )  &&
+                    ($move_to_sent)) {        
+               $boxesnew[] = $boxes[$i];
                $boxes[$i]["used"] = true;
-					$sent_found = true;
             }
+         }
 
-				if (($sent_found && $trash_found) || ($sent_found && !$move_to_trash) || ($trash_found && !$move_to_sent) || (!$move_to_sent && !$move_to_trash))
-					$i = -1;
+         // 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;
+            }
          }
+
       }
 
+      // Rest of the folders
       for ($i = 0; $i < count($boxes); $i++) {
          if ((strtolower($boxes[$i]["unformatted"]) != "inbox") &&
              ($boxes[$i]["used"] == false))  {
-            $pos = count($boxesnew);
-            $boxesnew[$pos] = $boxes[$i];
+            $boxesnew[] = $boxes[$i];
             $boxes[$i]["used"] = true;
          }
       }
@@ -264,23 +310,40 @@
       $read_ary = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
       $g = 0;
       $phase = "inbox"; 
+
       for ($i = 0; $i < count($read_ary); $i++) {
          if (substr ($read_ary[$i], 0, 4) != "a001") {
+
+            // Store the raw IMAP reply
             $boxes[$g]["raw"] = $read_ary[$i];
 
+            // 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--;
-               
-            for ($j = 0; $j < $dm_count; $j++)
-               $boxes[$g]["formatted"] = $boxes[$g]["formatted"] . "  ";
-            $boxes[$g]["formatted"] .= readShortMailboxName($mailbox, $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)) || 
+               (ereg("^".$folder_prefix, $mailbox)) ||
+               ( isset($boxesbyname[$parentfolder]) && (strlen($parentfolder) > 0) ) ) {
+               if ($dm_count)
+                   $boxes[$g]["formatted"]  = str_repeat("&nbsp;&nbsp;", $dm_count);
+               else
+                   $boxes[$g]["formatted"] = '';
+               $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 **/
@@ -297,9 +360,10 @@
          }
          $g++;
       }
-      if ($boxes) {
+      if(is_array($boxes)) {
          $boxes = ary_sort ($boxes, "unformatted", 1);
       }
+
       return $boxes;
    }