major speed improvements

[squirrelmail.git] / functions / imap_mailbox.php

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index c5c8aced064586d7dbc40eedf27296c278092d67..997d65726144adbc27d9339f8c97652a85b5f84d 100755 (executable)
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -10,7 +10,7 @@
     ******************************************************************************/
    function sqimap_mailbox_expunge ($imap_stream, $mailbox) {
       sqimap_mailbox_select ($imap_stream, $mailbox);
-      fputs ($imap_stream, "a001 EXPUNGE\n");
+      fputs ($imap_stream, "a001 EXPUNGE\r\n");
       $read = sqimap_read_data($imap_stream, "a001", true, $response, $message);
    }
 
@@ -34,7 +34,7 @@
     **  Selects a mailbox
     ******************************************************************************/
    function sqimap_mailbox_select ($imap_stream, $mailbox) {
-      fputs ($imap_stream, "a001 SELECT \"$mailbox\"\n");
+      fputs ($imap_stream, "a001 SELECT \"$mailbox\"\r\n");
       $read = sqimap_read_data($imap_stream, "a001", true, $response, $message);
    }
 
@@ -48,7 +48,7 @@
          $dm = sqimap_get_delimiter($imap_stream);
          $mailbox = $mailbox.$dm;
       }
-      fputs ($imap_stream, "a001 CREATE \"$mailbox\"\n");
+      fputs ($imap_stream, "a001 CREATE \"$mailbox\"\r\n");
       $read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
 
       sqimap_subscribe ($imap_stream, $mailbox);
@@ -60,7 +60,7 @@
     **  Subscribes to an existing folder 
     ******************************************************************************/
    function sqimap_subscribe ($imap_stream, $mailbox) {
-      fputs ($imap_stream, "a001 SUBSCRIBE \"$mailbox\"\n");
+      fputs ($imap_stream, "a001 SUBSCRIBE \"$mailbox\"\r\n");
       $read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
    }
 
@@ -71,7 +71,7 @@
     **  Unsubscribes to an existing folder 
     ******************************************************************************/
    function sqimap_unsubscribe ($imap_stream, $mailbox) {
-      fputs ($imap_stream, "a001 UNSUBSCRIBE \"$mailbox\"\n");
+      fputs ($imap_stream, "a001 UNSUBSCRIBE \"$mailbox\"\r\n");
       $read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
    }
 
@@ -82,7 +82,7 @@
     **  This function simply deletes the given folder
     ******************************************************************************/
    function sqimap_mailbox_delete ($imap_stream, $mailbox) {
-      fputs ($imap_stream, "a001 DELETE \"$mailbox\"\n");
+      fputs ($imap_stream, "a001 DELETE \"$mailbox\"\r\n");
       $read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
       sqimap_unsubscribe ($imap_stream, $mailbox);
    }
@@ -101,7 +101,7 @@
       
       $dm = sqimap_get_delimiter ($imap_stream);
 
-      fputs ($imap_stream, "a001 LIST \"\" INBOX\n");
+      fputs ($imap_stream, "a001 LIST \"\" INBOX\r\n");
       $read_ary = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
       $g = 0;
       $phase = "inbox"; 
@@ -125,7 +125,7 @@
             $boxes[$g]["id"] = $g;
 
             /** Now lets get the flags for this mailbox **/
-            fputs ($imap_stream, "a002 LIST \"\" \"$mailbox\"\n"); 
+            fputs ($imap_stream, "a002 LIST \"\" \"$mailbox\"\r\n"); 
             $read_mlbx = sqimap_read_data ($imap_stream, "a002", true, $response, $message);
 
             $flags = substr($read_mlbx[0], strpos($read_mlbx[0], "(")+1);
@@ -140,7 +140,7 @@
 
          if (!$read_ary[$i+1]) {
             if ($phase == "inbox") {
-               fputs ($imap_stream, "a001 LSUB \"\" *\n");
+               fputs ($imap_stream, "a001 LSUB \"\" *\r\n");
                $read_ary = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
                $phase = "lsub";
                $i--;
@@ -198,5 +198,58 @@
 
       return $boxesnew;
    }
+
+   
+   /******************************************************************************
+    **  Returns a list of all folders, subscribed or not
+    ******************************************************************************/
+   function sqimap_mailbox_list_all ($imap_stream) {
+      global $special_folders, $list_special_folders_first;
+      
+      if (!function_exists ("ary_sort"))
+         include ("../functions/array.php");
+      
+      $dm = sqimap_get_delimiter ($imap_stream);
+
+      fputs ($imap_stream, "a001 LIST \"INBOX\" *\r\n");
+      $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") {
+            $boxes[$g]["raw"] = $read_ary[$i];
+
+            $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);
+               
+            $boxes[$g]["unformatted-dm"] = $mailbox;
+            if (substr($mailbox, -1) == $dm)
+               $mailbox = substr($mailbox, 0, strlen($mailbox) - 1);
+            $boxes[$g]["unformatted"] = $mailbox;
+            $boxes[$g]["id"] = $g;
+
+            /** Now lets get the flags for this mailbox **/
+            fputs ($imap_stream, "a002 LIST \"\" \"$mailbox\"\r\n"); 
+            $read_mlbx = sqimap_read_data ($imap_stream, "a002", true, $response, $message);
+
+            $flags = substr($read_mlbx[0], strpos($read_mlbx[0], "(")+1);
+            $flags = substr($flags, 0, strpos($flags, ")"));
+            $flags = str_replace("\\", "", $flags);
+            $flags = trim(strtolower($flags));
+            if ($flags) {
+               $boxes[$g]["flags"] = explode(" ", $flags);
+            }
+         }
+         $g++;
+      }
+      $boxes = ary_sort ($boxes, "unformatted", 1);
+      return $boxes;
+   }
    
 ?>