made folder listing not dependent on $folder_list

[squirrelmail.git] / functions / imap_mailbox.php

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index 018f2737c74cdb8687e94a4da30f69d3841d0658..8a06f551afc2806e52ec0f06481f39151bedb69e 100755 (executable)
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -33,9 +33,9 @@
    /******************************************************************************
     **  Selects a mailbox
     ******************************************************************************/
-   function sqimap_mailbox_select ($imap_stream, $mailbox) {
+   function sqimap_mailbox_select ($imap_stream, $mailbox, $hide) {
       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);
    }
 
    
@@ -162,22 +162,6 @@
 
       $dm = sqimap_get_delimiter ($imap_stream);
 
-      /** LIST array **/
-      fputs ($imap_stream, "a001 LIST \"\" \"$folder_prefix*\"\r\n");
-      $list_ary = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
-
-      for ($i=0;$i < count($list_ary); $i++) {
-         $sorted_list_ary[$i]["name"] = find_mailbox_name($list_ary[$i]);
-         $sorted_list_ary[$i]["raw"]  = $list_ary[$i];
-         if ($sorted_list_ary[$i]["name"] == "INBOX")
-            $inbox_in_list = true;
-      }
-      if (isset($sorted_list_ary)) {
-         $list_sorted = array_cleave ($sorted_list_ary, "name");
-         asort($list_sorted);
-      }   
-
-
       /** LSUB array **/
       $inbox_subscribed = false;
       fputs ($imap_stream, "a001 LSUB \"\" \"*\"\r\n");
@@ -193,60 +177,58 @@
          sort($sorted_lsub_ary);
       }   
 
-      
+      /** LIST array **/
+               for ($i=0; $i < count($sorted_lsub_ary); $i++) {
+                       if (substr($sorted_lsub_ary[$i], -1) == $dm)
+                               $mbx = substr($sorted_lsub_ary[$i], 0, strlen($sorted_lsub_ary[$i])-1);
+                       else
+                               $mbx = $sorted_lsub_ary[$i];
+
+                       fputs ($imap_stream, "a001 LIST \"\" \"$mbx\"\r\n");
+                       $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
+                       $sorted_list_ary[$i] = $read[0];
+         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");
          $inbox_ary = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
-         $merged[0] = $inbox_ary[0];
-         $k = 1;
-      } else {
-         $k = 0;
+         $sorted_list_ary[count($sorted_list_ary)] = $inbox_ary[0];
       }
 
-      $i = $j = 0;
-      
-      if (isset($list_sorted) && isset($sorted_lsub_ary)) {
-             reset ($list_sorted);
-             for (reset($list_sorted); $key = key($list_sorted), isset($key);) {
-                if ($sorted_lsub_ary[$i] == $list_sorted[$key]) {
-                   $merged[$k] = $sorted_list_ary[$key]["raw"];
-                   $k++;
-                   $i++;
-                   next($list_sorted);
-                } else if ($sorted_lsub_ary[$i] < $list_sorted[$key]) {
-                   $i++;
-                } else {
-                   next($list_sorted);
-                }
-             }
-      }
-
-               $boxes = sqimap_mailbox_parse ($merged, $dm);
+               $boxes = sqimap_mailbox_parse ($sorted_list_ary, $dm);
                
                /** Now, lets sort for special folders **/
       for ($i = 0; $i < count($boxes); $i++) {
          if (strtolower($boxes[$i]["unformatted"]) == "inbox") {
             $boxesnew[0] = $boxes[$i];
             $boxes[$i]["used"] = true;
+                               $i = count($boxes);
          }
       }
 
       if ($list_special_folders_first == true) {
-         for ($i = 0; $i < count($boxes); $i++) {
+         for ($i = count($boxes)-1; $i >= 0 ; $i--) {
                                if (($boxes[$i]["unformatted"] == $trash_folder) && ($move_to_trash)) { 
                $pos = count($boxesnew);
                $boxesnew[$pos] = $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];
                $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;
          }
       }
-               
+
       for ($i = 0; $i < count($boxes); $i++) {
          if ((strtolower($boxes[$i]["unformatted"]) != "inbox") &&
              ($boxes[$i]["used"] == false))  {