X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fimap_mailbox.php;h=670c119588bf8c666f3dd5bcf0d4b8162e3d9cb2;hp=ef129876bd0776b445487ff3f1bf19a0acb199bf;hb=1da22cdaed17748bf201cc6eb0dc22f4c21280ca;hpb=6c37eea1bec6fc35f32129fddbe20ba96af81529

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index ef129876..670c1195 100755
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -1,319 +1,634 @@
 <?php
-   /**
-    **  imap_mailbox.php
-    **
-    **  This impliments all functions that manipulate mailboxes
-    **/
-
-   /******************************************************************************
-    **  Expunges a mailbox 
-    ******************************************************************************/
-   function sqimap_mailbox_expunge ($imap_stream, $mailbox) {
-      sqimap_mailbox_select ($imap_stream, $mailbox);
-      fputs ($imap_stream, "a001 EXPUNGE\r\n");
-      $read = sqimap_read_data($imap_stream, "a001", true, $response, $message);
-   }
-
-
-   /******************************************************************************
-    **  Checks whether or not the specified mailbox exists 
-    ******************************************************************************/
-   function sqimap_mailbox_exists ($imap_stream, $mailbox) {
-      $boxes = sqimap_mailbox_list ($imap_stream);
-      $found = false;
-      for ($i = 0; $i < count ($boxes); $i++) {
-         if ($boxes[$i]["unformatted"] == $mailbox)
-            $found = true;
-      }
-      return $found;
-   }
-
-
-   
-   /******************************************************************************
-    **  Selects a 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);
-   }
-
-   
-
-   /******************************************************************************
-    **  Creates a folder 
-    ******************************************************************************/
-   function sqimap_mailbox_create ($imap_stream, $mailbox, $type) {
-      if (strtolower($type) == "noselect") {
-         $dm = sqimap_get_delimiter($imap_stream);
-         $mailbox = $mailbox.$dm;
-      }
-      fputs ($imap_stream, "a001 CREATE \"$mailbox\"\r\n");
-      $read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
-
-      sqimap_subscribe ($imap_stream, $mailbox);
-   }
-
-
-
-   /******************************************************************************
-    **  Subscribes to an existing folder 
-    ******************************************************************************/
-   function sqimap_subscribe ($imap_stream, $mailbox) {
-      fputs ($imap_stream, "a001 SUBSCRIBE \"$mailbox\"\r\n");
-      $read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
-   }
-
-
-
-
-   /******************************************************************************
-    **  Unsubscribes to an existing folder 
-    ******************************************************************************/
-   function sqimap_unsubscribe ($imap_stream, $mailbox) {
-		global $imap_server_type;
-
-		/** This is a hack for UW server
-		 **    Sometimes a folder will have a / at the end.  If that's the case,
-		 **    the unsubscribe doesn't work for a box named "mailbox/".  We have
-		 **    to strip off the / at the end.  There may be a better way of doing
-		 **    this, but this is the best I've found so far.  (lme - April 26, 2000)
-		 **/
-		if ($imap_server_type == "uw") {
-			if (substr($mailbox, -1) == "/") {
-				$mailbox = substr($mailbox, 0, strlen($mailbox)-1);
-			}
-		}	
-
-      fputs ($imap_stream, "a001 UNSUBSCRIBE \"$mailbox\"\r\n");
-      $read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
-   }
-
-
-
-   
-   /******************************************************************************
-    **  This function simply deletes the given folder
-    ******************************************************************************/
-   function sqimap_mailbox_delete ($imap_stream, $mailbox) {
-      fputs ($imap_stream, "a001 DELETE \"$mailbox\"\r\n");
-      $read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
-      sqimap_unsubscribe ($imap_stream, $mailbox);
-   }
-
-
-   /******************************************************************************
-    **  Formats a mailbox into 4 parts for the $boxes array
-    ******************************************************************************/
-   function sqimap_mailbox_parse ($line, $dm) {
-		global $folder_prefix;
-      for ($g=0; $g < count($line); $g++) {
-         $boxes[$g]["raw"] = $line[$g];
-            
-         $mailbox = find_mailbox_name($line[$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"] . "  ";
-         $boxes[$g]["formatted"] .= readShortMailboxName($mailbox, $dm);
-            
-         $boxes[$g]["unformatted-dm"] = $mailbox;
-         if (substr($mailbox, -1) == $dm)
+
+/**
+ * imap_mailbox.php
+ *
+ * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * This impliments all functions that manipulate mailboxes
+ *
+ * $Id$
+ */
+
+GLOBAL $boxesnew;
+
+function isBoxBelow( $box2, $box1 ) {
+
+    global $delimiter, $folder_prefix, $imap_server_type;
+
+    if ( $imap_server_type == 'uw' ) {
+        $boxs = $box2;
+        $i = strpos( $box1, $delimiter, strlen( $folder_prefix ) );
+        if ( $i === FALSE ) {
+            $i = strlen( $box2 );
+        }
+    } else {
+        $boxs = $box2 . $delimiter;
+        // Skip next second delimiter
+        $i = strpos( $box1, $delimiter );
+        $i = strpos( $box1, $delimiter, $i + 1  );
+        if ( $i === FALSE ) {
+            $i = strlen( $box2 );
+        } else {
+            $i++;
+        }
+    }
+
+    return( substr( $box1, 0, $i ) == substr( $boxs, 0, $i ) );
+
+}
+
+/*
+    Defines Special Mail Boxes
+*/
+function isSpecialMailbox( $box ) {
+
+    global $trash_folder, $sent_folder, $draft_folder,
+           $move_to_trash, $move_to_sent, $save_as_draft;
+
+    $ret = ( (strtolower($box) == 'inbox') ||
+             ( $move_to_trash && isBoxBelow( $box, $trash_folder ) ) ||
+             ( $move_to_sent && isBoxBelow( $box, $sent_folder )) ||
+             ($save_as_draft && $box == $draft_folder ) );
+
+    if ( !$ret ) {
+        $ret = do_hook_function( 'special_mailbox', $box );
+    }
+
+    return( $ret );
+
+}
+
+/*************************
+ **  Expunges a mailbox **
+ *************************/
+function sqimap_mailbox_expunge ($imap_stream, $mailbox,$handle_errors = TRUE) {
+    $read = sqimap_run_command($imap_stream, 'EXPUNGE',
+                               $handle_errors, $response, $message);
+}
+
+
+/******************************************************************************
+ **  Checks whether or not the specified mailbox exists 
+ ******************************************************************************/
+function sqimap_mailbox_exists ($imap_stream, $mailbox) {
+    if (! isset($mailbox)) {
+        return false;
+    }
+    $mbx = sqimap_run_command($imap_stream, "LIST \"\" \"$mailbox\"",
+                              TRUE, $response, $message);
+    return isset($mbx[0]);
+}
+
+/******************************************************************************
+ **  Selects a mailbox
+ ******************************************************************************/
+function sqimap_mailbox_select ($imap_stream, $mailbox,
+                                $hide=TRUE, $recent=false, $extrainfo=false) {
+    global $auto_expunge;
+
+    if ( $mailbox == 'None' ) {
+        return;
+    }
+
+    $read = sqimap_run_command($imap_stream, "SELECT \"$mailbox\"",
+                               TRUE, $response, $message);
+    if ($recent) {
+        for ($i=0; $i<count($read); $i++) {
+            if (strpos(strtolower($read[$i]), 'recent')) {
+                $r = explode(' ', $read[$i]);
+            }
+        }
+        return $r[1];
+    } else {
+        if ($auto_expunge) {
+            $tmp = sqimap_run_command($imap_stream, 'EXPUNGE',
+                                  false, $a, $b);
+        }
+        if (isset( $extrainfo ) && $extrainfo) {
+            $result = array();
+            for ($i=0; $i<count($read); $i++) {
+                if (preg_match("/PERMANENTFLAGS(.*)/i",$read[$i], $regs)) {
+                    $regs[1]=trim(preg_replace (  array ("/\(/","/\)/","/\]/") ,'', $regs[1])) ;
+                    $result['PERMANENTFLAGS'] = $regs[1];
+                }
+                else if (preg_match("/FLAGS(.*)/i",$read[$i], $regs)) {
+                    $regs[1]=trim(preg_replace (  array ("/\(/","/\)/") ,'', $regs[1])) ;
+                    $result['FLAGS'] = $regs[1];
+                }
+                else if (preg_match("/(.*)EXISTS/i",$read[$i], $regs)) {
+                    $result['EXISTS']=trim($regs[1]);
+                }
+                else if (preg_match("/(.*)RECENT/i",$read[$i], $regs)) {
+                    $result['RECENT']=trim($regs[1]);
+                }
+                else if (preg_match("/\[UNSEEN(.*)\]/i",$read[$i], $regs)) {
+                    $result['UNSEEN']=trim($regs[1]);
+                }
+
+            }
+            return( $result );
+        }
+    }
+}
+
+
+
+/******************************************************************************
+ **  Creates a folder
+ ******************************************************************************/
+function sqimap_mailbox_create ($imap_stream, $mailbox, $type)
+{
+    global $delimiter;
+    if (strtolower($type) == 'noselect') {
+        $mailbox = $mailbox.$delimiter;
+    }
+    $read_ary = sqimap_run_command($imap_stream, "CREATE \"$mailbox\"",
+                                   TRUE, $response, $message);
+
+    sqimap_subscribe ($imap_stream, $mailbox);
+}
+
+
+
+/******************************************************************************
+ **  Subscribes to an existing folder 
+ ******************************************************************************/
+function sqimap_subscribe ($imap_stream, $mailbox)
+{
+    $read_ary = sqimap_run_command($imap_stream, "SUBSCRIBE \"$mailbox\"",
+                                 TRUE, $response, $message);
+}
+
+
+
+/******************************************************************************
+ **  Unsubscribes to an existing folder 
+ ******************************************************************************/
+function sqimap_unsubscribe ($imap_stream, $mailbox)
+{
+    global $imap_server_type;
+    
+    $read_ary = sqimap_run_command($imap_stream, "UNSUBSCRIBE \"$mailbox\"",
+                                 TRUE, $response, $message);
+}
+
+
+
+/******************************************************************************
+ **  This function simply deletes the given folder
+ ******************************************************************************/
+function sqimap_mailbox_delete ($imap_stream, $mailbox)
+{
+    $read_ary = sqimap_run_command($imap_stream, "DELETE \"$mailbox\"",
+                                 TRUE, $response, $message);
+    sqimap_unsubscribe ($imap_stream, $mailbox);
+}
+
+/***********************************************************************
+ ** Determines if the user is subscribed to the folder or not
+ **********************************************************************/
+function sqimap_mailbox_is_subscribed($imap_stream, $folder) {
+
+    $boxesall = sqimap_mailbox_list ($imap_stream);
+    foreach ($boxesall as $ref) {
+        if ($ref['unformatted'] == $folder) {
+            return TRUE;
+        }
+    }
+    return false;
+}
+
+/*
+    Renames a mailbox
+*/
+function sqimap_mailbox_rename( $imap_stream, $old_name, $new_name ) {
+
+    if ( $old_name <> $new_name ) {
+
+        global $delimiter;
+
+        if ( substr( $old_name, -1 ) == $delimiter  ) {
+            $old_name = substr( $old_name, 0, strlen( $old_name ) - 1 );
+            $new_name = substr( $new_name, 0, strlen( $new_name ) - 1 );
+            $postfix = $delimiter;
+            $boxesall = sqimap_mailbox_list($imap_stream);
+        } else {
+            $postfix = '';
+            $boxesall = FALSE;
+        }
+
+        $cmd = 'RENAME "' . quoteIMAP($old_name) . '" "' .  quoteIMAP($new_name) . '"';
+        $data = sqimap_run_command($imap_stream, $cmd,
+                                 TRUE, $response, $message);
+        sqimap_unsubscribe($imap_stream, $old_name.$postfix);
+        sqimap_subscribe($imap_stream, $new_name.$postfix);
+
+        if ( $boxesall ) {
+            // Sub-unsub subfolders
+            $l = strlen( $old_name ) + 1;
+            $p = 'unformatted';
+            foreach ( $boxesall as $box ) {
+                if ( substr( $box[$p], 0, $l ) == $old_name . $delimiter ) {
+                    sqimap_unsubscribe($imap_stream, $box[$p]);
+                    sqimap_subscribe($imap_stream,
+                                     $new_name . $delimiter . substr( $box[$p], $l ) );
+                }
+            }
+        }
+
+    }
+
+}
+
+/******************************************************************************
+ **  Formats a mailbox into 4 parts for the $boxesall 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)
+{
+    global $folder_prefix, $delimiter;
+    
+    /* Process each folder line */
+    for ($g=0; $g < count($line); $g++) {
+        
+        /* Store the raw IMAP reply */
+        if (isset($line[$g])) {
+            $boxesall[$g]["raw"] = $line[$g];
+        }
+        else {
+            $boxesall[$g]["raw"] = "";
+        }
+        
+        
+        /* Count number of delimiters ($delimiter) in folder name */
+        $mailbox = trim($line_lsub[$g]);
+        $dm_count =  substr_count($mailbox, $delimiter);
+        if (substr($mailbox, -1) == $delimiter) {
+            /* If name ends in delimiter - decrement count by one */
+            $dm_count--;  
+        }
+        
+        /* Format folder name, but only if it's a INBOX.* or have */
+        /* a parent. */
+        $boxesallbyname[$mailbox] = $g;
+        $parentfolder = readMailboxParent($mailbox, $delimiter);
+        if ( (strtolower(substr($mailbox, 0, 5)) == "inbox") ||
+             (substr($mailbox, 0, strlen($folder_prefix)) == $folder_prefix) ||
+             ( isset($boxesallbyname[$parentfolder]) &&
+               (strlen($parentfolder) > 0) ) ) {
+            $indent = $dm_count - ( substr_count($folder_prefix, $delimiter));
+            if ($indent > 0) {
+                $boxesall[$g]['formatted']  = str_repeat("&nbsp;&nbsp;", $indent);
+            }
+            else {
+                $boxesall[$g]['formatted'] = '';
+            }
+            $boxesall[$g]['formatted'] .= readShortMailboxName($mailbox, $delimiter);
+        }
+        else {
+            $boxesall[$g]['formatted']  = $mailbox;
+        }
+
+        $boxesall[$g]['unformatted-dm'] = $mailbox;
+        if (substr($mailbox, -1) == $delimiter) {
             $mailbox = substr($mailbox, 0, strlen($mailbox) - 1);
-         $boxes[$g]["unformatted"] = $mailbox;
-         $boxes[$g]["id"] = $g;
-
-         $flags = substr($line[$g], strpos($line[$g], "(")+1);
-         $flags = substr($flags, 0, strpos($flags, ")"));
-         $flags = str_replace("\\", "", $flags);
-         $flags = trim(strtolower($flags));
-         if ($flags) {
-            $boxes[$g]["flags"] = explode(" ", $flags);
-         }
-			/****  I'm not sure why this was even in here to begin with..  (lme)
-			for ($i=0; $i < count($boxes[$g]["flags"]); $i++) {
-				if ($boxes[$g]["flags"][$i] == "noselect") {
-					$boxes[$g]["unformatted-dm"] = $boxes[$g]["unformatted-dm"].$dm;
-//					echo $boxes[$g]["unformatted-dm"]." - debug<br>";
-				}
-			}
-			****/
-      }
-      return $boxes;
-   }
-   
-   /******************************************************************************
-    **  Returns sorted mailbox lists in several different ways.
-    **  The array returned looks like this:
-    ******************************************************************************/
-   function sqimap_mailbox_list ($imap_stream) {
-      global $load_prefs_php, $prefs_php, $config_php, $data_dir, $username, $list_special_folders_first;
-		global $trash_folder, $sent_folder;
-		global $move_to_trash, $move_to_sent;
-
-      $inbox_in_list = false;
-      $inbox_subscribed = false;
-
-      if (!isset($load_prefs_php)) include "../src/load_prefs.php";
-      else global $folder_prefix;
-      if (!function_exists ("ary_sort")) include "../functions/array.php";
-
-      $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");
-      $lsub_ary = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
-      for ($i=0;$i < count($lsub_ary); $i++) {
-         $sorted_lsub_ary[$i] = find_mailbox_name($lsub_ary[$i]);
-         if (substr($sorted_lsub_ary[$i], -1) == $dm)
-            $sorted_lsub_ary[$i] = substr($sorted_lsub_ary[$i], 0, strlen($sorted_lsub_ary[$i])-1);
-         if ($sorted_lsub_ary[$i] == "INBOX")
-            $inbox_subscribed = true;
-      }
-      if (isset($sorted_lsub_ary)) {
-         sort($sorted_lsub_ary);
-      }   
-
-      
-      /** 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;
-      }
-
-      $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 (isset($sorted_lsub_ary[$i]) && isset($list_sorted[$key]) && $sorted_lsub_ary[$i] < $list_sorted[$key]) {
-	            $i++;
-	         } else {
-	            next($list_sorted);
-	         }
-	      }
-      }
-		$boxes = sqimap_mailbox_parse ($merged, $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 = 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;
+        }
+        $boxesall[$g]['unformatted'] = $mailbox;
+        if (substr($mailbox,0,strlen($folder_prefix))==$folder_prefix) {
+            $mailbox = substr($mailbox, strlen($folder_prefix));
+        }
+        $boxesall[$g]['unformatted-disp'] = $mailbox;
+        $boxesall[$g]['id'] = $g;
+
+        $boxesall[$g]['flags'] = array();
+        if (isset($line[$g])) {
+            ereg("\(([^)]*)\)",$line[$g],$regs);
+            $flags = trim(strtolower(str_replace('\\', '',$regs[1])));
+            if ($flags) {
+                $boxesall[$g]['flags'] = explode(' ', $flags);
             }
-				else if (($boxes[$i]["unformatted"] == $sent_folder) && ($move_to_sent)) {	
-               $pos = count($boxesnew);
-               $boxesnew[$pos] = $boxes[$i];
-               $boxes[$i]["used"] = true;
-					$sent_found = true;
+        }
+    }
+
+    return $boxesall;
+}
+
+/**
+ * Sorting function used to sort mailbox names.
+ *   + Original patch from dave_michmerhuizen@yahoo.com
+ *   + Allows case insensitivity when sorting folders
+ *   + Takes care of the delimiter being sorted to the end, causing
+ *     subfolders to be listed in below folders that are prefixed
+ *     with their parent folders name.
+ *        For example: INBOX.foo, INBOX.foobar, and INBOX.foo.bar
+ *        Without special sort function: foobar between foo and foo.bar
+ *        With special sort function: foobar AFTER foo and foo.bar :)
+ */
+function user_strcasecmp($a, $b) {
+    global $delimiter;
+
+    /* Calculate the length of some strings. */
+    $a_length = strlen($a);
+    $b_length = strlen($b);
+    $min_length = min($a_length, $b_length);
+    $delimiter_length = strlen($delimiter);
+
+    /* Set the initial result value. */
+    $result = 0;
+
+    /* Check the strings... */
+    for ($c = 0; $c < $min_length; ++$c) {
+        $a_del = substr($a, $c, $delimiter_length);
+        $b_del = substr($b, $c, $delimiter_length);
+
+        if (($a_del == $delimiter) && ($b_del == $delimiter)) {
+            $result = 0;
+        } else if (($a_del == $delimiter) && ($b_del != $delimiter)) {
+            $result = -1;
+        } else if (($a_del != $delimiter) && ($b_del == $delimiter)) {
+            $result = 1;
+        } else {
+            $result = strcasecmp($a{$c}, $b{$c});
+        }
+
+        if ($result != 0) {
+            break;
+        }
+    }
+
+    /* If one string is a prefix of the other... */
+    if ($result == 0) {
+        if ($a_length < $b_length) {
+            $result = -1;
+        } else if ($a_length > $b_length) {
+            $result = 1;
+        }
+    }
+
+    return ($result);
+}
+
+
+/******************************************************************************
+ **  Returns sorted mailbox lists in several different ways.
+ **  See comment on sqimap_mailbox_parse() for info about the returned array.
+ ******************************************************************************/
+function sqimap_mailbox_list($imap_stream) {
+
+	GLOBAL $boxesnew;
+
+	if ( !isset( $boxesnew ) ) {
+
+	    GLOBAL $data_dir, $username, $list_special_folders_first,
+	           $folder_prefix, $trash_folder, $sent_folder, $draft_folder,
+	           $move_to_trash, $move_to_sent, $save_as_draft,
+	           $delimiter;
+	
+	    $inbox_in_list = $inbox_subscribed = FALSE;
+	
+	    require_once('../src/load_prefs.php');
+	    require_once('../functions/array.php');
+	
+	    /** LSUB array **/
+	    $lsub_ary = sqimap_run_command ($imap_stream, "LSUB \"$folder_prefix\" \"*\"",
+	                                  TRUE, $response, $message);
+	
+	    /* Section about removing the last element was removed */
+	    /* We don't return "* OK" anymore from sqimap_read_data */
+	
+	    $sorted_lsub_ary = array();
+	    for ($i=0;$i < count($lsub_ary); $i++) {
+	        /* Workaround for EIMS */
+	        /* Doesn't work if the mailbox name is multiple lines */
+	        if (isset($lsub_ary[$i + 1]) &&
+	            ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$",
+	                 $lsub_ary[$i], $regs)) {
+	            $i ++;
+	            $lsub_ary[$i] = $regs[1] . '"' . addslashes(trim($lsub_ary[$i])) .
+	                '"' . $regs[2];
+	        }
+	        $temp_mailbox_name = find_mailbox_name($lsub_ary[$i]);
+	        $sorted_lsub_ary[] = $temp_mailbox_name;
+	        if (strtoupper($temp_mailbox_name) == 'INBOX') {
+	            $inbox_subscribed = TRUE;
+	        }
+	    }
+	    $new_ary = array();
+	    for ($i=0; $i < count($sorted_lsub_ary); $i++) {
+	        if (!in_array($sorted_lsub_ary[$i], $new_ary)) {
+	            $new_ary[] = $sorted_lsub_ary[$i];
+	        }
+	    }
+	    $sorted_lsub_ary = $new_ary;
+	    if (isset($sorted_lsub_ary)) {
+	        usort($sorted_lsub_ary, 'user_strcasecmp');
+	    }
+	
+	    /** LIST array **/
+	    $sorted_list_ary = array();
+	    for ($i=0; $i < count($sorted_lsub_ary); $i++) {
+	        if (substr($sorted_lsub_ary[$i], -1) == $delimiter) {
+	            $mbx = substr($sorted_lsub_ary[$i], 0, strlen($sorted_lsub_ary[$i])-1);
+	        }
+	        else {
+	            $mbx = $sorted_lsub_ary[$i];
+	        }
+	
+	        $read = sqimap_run_command ($imap_stream, "LIST \"\" \"$mbx\"",
+	                                  TRUE, $response, $message);
+	        /* Another workaround for EIMS */
+	        if (isset($read[1]) &&
+	            ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$",
+	                 $read[0], $regs)) {
+	            $read[0] = $regs[1] . '"' . addslashes(trim($read[1])) .
+	                       '"' . $regs[2];
+	        }
+	
+	        if (isset($sorted_list_ary[$i])) {
+	            $sorted_list_ary[$i] = '';
+	        }
+	
+	        if (isset($read[0])) {
+	            $sorted_list_ary[$i] = $read[0];
+	        }
+	        else {
+	            $sorted_list_ary[$i] = '';
+	        }
+	
+	        if (isset($sorted_list_ary[$i]) &&
+	            strtoupper(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) {
+	        $inbox_ary = sqimap_run_command ($imap_stream, "LIST \"\" \"INBOX\"",
+	                                       TRUE, $response, $message);
+	        /* Another workaround for EIMS */
+	        if (isset($inbox_ary[1]) &&
+	            ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$",
+	                 $inbox_ary[0], $regs)) {
+	            $inbox_ary[0] = $regs[1] . '"' . addslashes(trim($inbox_ary[1])) .
+	                '"' . $regs[2];
+	        }
+	
+	        $sorted_list_ary[] = $inbox_ary[0];
+	        $sorted_lsub_ary[] = find_mailbox_name($inbox_ary[0]);
+	    }
+	
+	    $boxesall = sqimap_mailbox_parse ($sorted_list_ary, $sorted_lsub_ary);
+	
+	    /** Now, lets sort for special folders **/
+	    $boxesnew = $used = array();
+	
+	    /* Find INBOX */
+	    foreach ( $boxesall as $k => $box ) {
+	        if ( strtolower($box['unformatted']) == 'inbox') {
+	            $boxesnew[] = $box;
+	            $used[$k] = TRUE;
+	        } else {
+	            $used[$k] = FALSE;
+	        }
+	    }
+	
+	    /* List special folders and their subfolders, if requested. */
+	    if ($list_special_folders_first == TRUE) {
+	
+	        foreach ( $boxesall as $k => $box ) {
+	            if ( !$used[$k] &&
+	                 isSpecialMailbox( $box['unformatted'] ) ) {
+	                $boxesnew[] = $box;
+	                $used[$k] = TRUE;
+	            }
+	        }
+	
+	    }
+	
+	    /* Rest of the folders */
+	    foreach ( $boxesall as $k => $box ) {
+	        if ( !$used[$k] ) {
+	            $boxesnew[] = $box;
+	        }
+	    }
+    }
+
+    return( $boxesnew );
+
+}
+
+/*
+ *  Returns a list of all folders, subscribed or not
+ */
+function sqimap_mailbox_list_all($imap_stream) {
+
+
+    GLOBAL $list_special_folders_first, $folder_prefix,
+           $delimiter;
+
+    require_once('../functions/array.php');
+
+    $ssid = sqimap_session_id();
+    $lsid = strlen( $ssid );
+    fputs ($imap_stream, $ssid . " LIST \"$folder_prefix\" *\r\n");
+    $read_ary = sqimap_read_data ($imap_stream, $ssid, TRUE, $response, $message);
+    $g = 0;
+    $phase = 'inbox';
+
+    for ($i = 0; $i < count($read_ary); $i++) {
+        /* Another workaround for EIMS */
+        if (isset($read_ary[$i + 1]) &&
+            ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$",
+                 $read_ary[$i], $regs)) {
+            $i ++;
+            $read_ary[$i] = $regs[1] . '"' .
+                            addslashes(trim($read_ary[$i])) .
+                            '"' . $regs[2];
+        }
+        if (substr($read_ary[$i], 0, $lsid) != $ssid ) {
+
+            /* Store the raw IMAP reply */
+            $boxes[$g]['raw'] = $read_ary[$i];
+
+            /* Count number of delimiters ($delimiter) in folder name */
+            $mailbox = find_mailbox_name($read_ary[$i]);
+            $dm_count =  substr_count($mailbox, $delimiter);
+            if (substr($mailbox, -1) == $delimiter) {
+                /* If name ends in delimiter - decrement count by one */
+                $dm_count--;
             }
 
-				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))  {
-            $pos = count($boxesnew);
-            $boxesnew[$pos] = $boxes[$i];
-            $boxes[$i]["used"] = true;
-         }
-      }
-
-      return $boxesnew;
-   }
-   
-   /******************************************************************************
-    **  Returns a list of all folders, subscribed or not
-    ******************************************************************************/
-   function sqimap_mailbox_list_all ($imap_stream) {
-      global $list_special_folders_first, $folder_prefix;
-      
-      if (!function_exists ("ary_sort"))
-         include ("../functions/array.php");
-      
-      $dm = sqimap_get_delimiter ($imap_stream);
-
-      fputs ($imap_stream, "a001 LIST \"$folder_prefix\" *\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];
+            /* Format folder name, but only if it's a INBOX.* or have */
+            /* a parent. */
+            $boxesallbyname[$mailbox] = $g;
+            $parentfolder = readMailboxParent($mailbox, $delimiter);
+            if((eregi('^inbox'.quotemeta($delimiter), $mailbox)) ||
+               (ereg('^'.$folder_prefix, $mailbox)) ||
+               ( isset($boxesallbyname[$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, $delimiter);
+            }
+            else {
+                $boxes[$g]['formatted']  = $mailbox;
+            }
 
-            $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;
+            $boxes[$g]['unformatted-dm'] = $mailbox;
+            if (substr($mailbox, -1) == $delimiter) {
+                $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 **/
-            fputs ($imap_stream, "a002 LIST \"\" \"$mailbox\"\r\n"); 
-            $read_mlbx = sqimap_read_data ($imap_stream, "a002", true, $response, $message);
+            $read_mlbx = sqimap_run_command ($imap_stream, "LIST \"\" \"$mailbox\"",
+                                           TRUE, $response, $message);
+
+            /* Another workaround for EIMS */
+            if (isset($read_mlbx[1]) &&
+                ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$",
+                     $read_mlbx[0], $regs)) {
+                $read_mlbx[0] = $regs[1] . '"' .
+                                addslashes(trim($read_mlbx[1])) .
+                                '"' . $regs[2];
+            }
 
-            $flags = substr($read_mlbx[0], strpos($read_mlbx[0], "(")+1);
-            $flags = substr($flags, 0, strpos($flags, ")"));
-            $flags = str_replace("\\", "", $flags);
+            $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);
+                $boxes[$g]['flags'] = explode(' ', $flags);
+            } else {
+                $boxes[$g]['flags'] = array();
             }
-         }
-         $g++;
-      }
-      $boxes = ary_sort ($boxes, "unformatted", 1);
-      return $boxes;
-   }
-   
-?>
+        }
+        $g++;
+    }
+    if(is_array($boxes)) {
+        $boxes = ary_sort ($boxes, 'unformatted', 1);
+    }
+
+    return $boxes;
+}
+
+?>
\ No newline at end of file