X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fimap_mailbox.php;h=6da2548a7d9151dead9d0d198b6cb6e29c623c18;hp=3b7ca6dd7c180a0dd42282909de25e8d59bae516;hb=38068e69b454693b06df1d4846bb76546b005c2e;hpb=2c617aa5d1e4a3ce976cbf7a9372c425bbe5d445

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index 3b7ca6dd..6da2548a 100755
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -3,82 +3,87 @@
 /**
  * imap_mailbox.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * This impliments all functions that manipulate mailboxes
  *
  * $Id$
  */
+require_once(SM_PATH . 'functions/imap_utf7_local.php');
 
 global $boxesnew;
 
 class mailboxes {
-  var $mailboxname_full = '', $mailboxname_sub= '', $is_noselect = false, 
-      $is_special = false, $is_root = false, $is_inbox = false, $is_sent = false,
-       $is_trash = false, $is_draft = false,  $mbxs = array(), 
-       $unseen = false, $total = false;
-
-  function addMbx($mbx, $delimiter, $start, $specialfirst) {
-      $ary = explode($delimiter, $mbx->mailboxname_full);
-      $mbx_parent = &$this;
-      for ($i=$start; $i < (count($ary) -1); $i++) {
-        $mbx_childs = &$mbx_parent->mbxs;
-	$found = false;
-        foreach ($mbx_childs as $key => $parent) {
-	    if ($parent->mailboxname_sub == $ary[$i]) {
-		$mbx_parent = &$mbx_parent->mbxs[$key];
-		$found = true;
-	    } 
-	}
-	if (!$found) {
-	    $no_select_mbx = new mailboxes();
-	    if (isset($mbx_parent->mailboxname_full) && $mbx_parent->mailboxname_full != '') {
-		$no_select_mbx->mailboxname_full = $mbx_parent->mailboxname_full.$delimiter.$ary[$i];
-	    } else {
-		$no_select_mbx->mailboxname_full = $ary[$i];
-	    }
-	    $no_select_mbx->mailboxname_sub = $ary[$i];
-	    $no_select_mbx->is_noselect = true;
-	    $mbx_parent->mbxs[] = $no_select_mbx;
-	    $i--;
-	}
-	
-     }
-     $mbx_parent->mbxs[] = $mbx;
-     if ($mbx->is_special && $specialfirst) {
-	usort($mbx_parent->mbxs, 'sortSpecialMbx');
-     }
-     
-  }
+    var $mailboxname_full = '', $mailboxname_sub= '', $is_noselect = false, 
+        $is_special = false, $is_root = false, $is_inbox = false, $is_sent = false,
+        $is_trash = false, $is_draft = false,  $mbxs = array(), 
+        $unseen = false, $total = false;
+
+    function addMbx($mbx, $delimiter, $start, $specialfirst) {
+        $ary = explode($delimiter, $mbx->mailboxname_full);
+        $mbx_parent = &$this;
+        for ($i = $start, $c = count($ary)-1; $i < $c; $i++) {
+            $mbx_childs = &$mbx_parent->mbxs;
+            $found = false;
+            if ($mbx_childs) {
+                foreach ($mbx_childs as $key => $parent) {
+                    if ($parent->mailboxname_sub == $ary[$i]) {
+                        $mbx_parent = &$mbx_parent->mbxs[$key];
+                        $found = true;
+                    }
+                }
+            }
+            if (!$found) {
+                $no_select_mbx = new mailboxes();
+                if (isset($mbx_parent->mailboxname_full) && $mbx_parent->mailboxname_full != '') {
+                    $no_select_mbx->mailboxname_full = $mbx_parent->mailboxname_full.$delimiter.$ary[$i];
+                } else {
+                    $no_select_mbx->mailboxname_full = $ary[$i];
+                }
+                $no_select_mbx->mailboxname_sub = $ary[$i];
+                $no_select_mbx->is_noselect = true;
+                $mbx_parent->mbxs[] = $no_select_mbx;
+                $i--;
+            }
+        }
+        $mbx_parent->mbxs[] = $mbx;
+        if ($mbx->is_special && $specialfirst) {
+            usort($mbx_parent->mbxs, 'sortSpecialMbx');
+        }
+    }
 }
 
 function sortSpecialMbx($a, $b) {
     if ($a->is_inbox) {
-	$acmp = '0'. $a->mailboxname_full;
+        $acmp = '0'. $a->mailboxname_full;
     } else if ($a->is_special) {
-	$acmp = '1'. $a->mailboxname_full;
+        $acmp = '1'. $a->mailboxname_full;
     } else {
-	$acmp = '2' . $a->mailboxname_full;
-    }	
+        $acmp = '2' . $a->mailboxname_full;
+    }
     if ($b->is_inbox) {
-	$bcmp = '0'. $b->mailboxname_full;
+        $bcmp = '0'. $b->mailboxname_full;
     }else if ($b->is_special) {
-	$bcmp = '1' . $b->mailboxname_full;
+        $bcmp = '1' . $b->mailboxname_full;
     } else {
-	$bcmp = '2' . $b->mailboxname_full;
+        $bcmp = '2' . $b->mailboxname_full;
     }
     if ($acmp == $bcmp) return 0;
-    return ($acmp>$bcmp) ? 1: -1;
-}     	
-
+    return ($acmp > $bcmp) ? 1: -1;
+}
 
 function find_mailbox_name ($mailbox) {
+    if (preg_match('/\*.+\"([^\r\n\"]*)\"[\s\r\n]*$/', $mailbox, $regs)) 
+        return $regs[1];
     if (ereg(" *\"([^\r\n\"]*)\"[ \r\n]*$", $mailbox, $regs))
         return $regs[1];
     ereg(" *([^ \r\n\"]*)[ \r\n]*$",$mailbox,$regs);
     return $regs[1];
-    
+}
+
+function check_is_noselect ($lsub_line) {
+    return preg_match("/^\* LSUB \([^\)]*\\Noselect[^\)]*\)/i", $lsub_line);
 }
 
 /**
@@ -87,7 +92,6 @@ function find_mailbox_name ($mailbox) {
  * mailbox name (i.e. the mailbox's parent mailbox)
  */
 function readMailboxParent($haystack, $needle) {
-
     if ($needle == '') {
         $ret = '';
     } else {
@@ -101,29 +105,27 @@ function readMailboxParent($haystack, $needle) {
     return( $ret );
 }
 
-
-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 );
+/** 
+ * Check if $subbox is below the specified $parentbox
+ */
+function isBoxBelow( $subbox, $parentbox ) {
+    global $delimiter;
+    /* 
+     * Eliminate the obvious mismatch, where the 
+     * subfolder path is shorter than that of the potential parent
+     */
+    if ( strlen($subbox) < strlen($parentbox) ) {
+      return false;
+    }
+    /* check for delimiter */
+        if (!substr($parentbox,-1) == $delimiter) {
+            $parentbox.=$delimiter;
         }
-    } else {
-        $boxs = $box2 . $delimiter;
-        /* Skip next second delimiter */
-        $i = strpos( $box1, $delimiter );
-        $i = strpos( $box1, $delimiter, $i + 1  );
-        if ( $i === false ) {
-            $i = strlen( $box2 );
+        if (substr($subbox,0,strlen($parentbox)) == $parentbox) {
+            return true;
         } else {
-            $i++;
+            return false;
         }
-    }
-
-    return ( substr( $box1, 0, $i ) == substr( $boxs, 0, $i ) );
 }
 
 /* Defines special mailboxes */
@@ -132,26 +134,61 @@ function isSpecialMailbox( $box ) {
            $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 ) );
+             isTrashMailbox($box) || isSentMailbox($box) || isDraftMailbox($box) );
 
     if ( !$ret ) {
         $ret = do_hook_function( 'special_mailbox', $box );
     }
-
     return $ret;
 }
 
+function isTrashMailbox ($box) {
+    global $trash_folder, $move_to_trash;
+    return $move_to_trash && $trash_folder &&
+           ( $box == $trash_folder || isBoxBelow($box, $trash_folder) );
+}
+
+function isSentMailbox($box) {
+   global $sent_folder, $move_to_sent;
+   return $move_to_sent && $sent_folder &&
+          ( $box == $sent_folder || isBoxBelow($box, $sent_folder) );
+}
+
+function isDraftMailbox($box) {
+   global $draft_folder, $save_as_draft;
+   return $save_as_draft &&
+          ( $box == $draft_folder || isBoxBelow($box, $draft_folder) );
+}
+
 /* Expunges a mailbox */
-function sqimap_mailbox_expunge ($imap_stream, $mailbox, $handle_errors = true) {
-    $read = sqimap_run_command($imap_stream, 'EXPUNGE', $handle_errors,
-                               $response, $message);
+function sqimap_mailbox_expunge ($imap_stream, $mailbox, $handle_errors = true, $id='') {
+    global $uid_support;
+    if ($id) {
+        if (is_array($id)) {
+            $id = sqimap_message_list_squisher($id);
+        }
+        $id = ' '.$id;
+        $uid = $uid_support;
+    } else {
+        $uid = false;
+    }
+    $read = sqimap_run_command($imap_stream, 'EXPUNGE'.$id, $handle_errors,
+                               $response, $message, $uid);
+    $cnt = 0;
+
+    if (is_array($read)) {
+        foreach ($read as $r) {
+            if (preg_match('/^\*\s[0-9]+\sEXPUNGE/AUi',$r,$regs)) {
+                $cnt++;
+            }
+        }
+    }
+    return $cnt;
 }
 
 /* Checks whether or not the specified mailbox exists */
 function sqimap_mailbox_exists ($imap_stream, $mailbox) {
-    if (! isset($mailbox)) {
+    if (!isset($mailbox) || empty($mailbox)) {
         return false;
     }
     $mbx = sqimap_run_command($imap_stream, "LIST \"\" \"$mailbox\"",
@@ -160,52 +197,39 @@ function sqimap_mailbox_exists ($imap_stream, $mailbox) {
 }
 
 /* Selects a mailbox */
-function sqimap_mailbox_select ($imap_stream, $mailbox,
-                                $hide = true, $recent = false, $extrainfo = false) {
+function sqimap_mailbox_select ($imap_stream, $mailbox) {
     global $auto_expunge;
 
-    if ( $mailbox == 'None' ) {
+    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]);
+    $result = array();
+    for ($i = 0, $cnt = count($read); $i < $cnt; $i++) {
+        if (preg_match('/^\*\s+OK\s\[(\w+)\s(\w+)\]/',$read[$i], $regs)) {
+            $result[strtoupper($regs[1])] = $regs[2];
+        } else if (preg_match('/^\*\s([0-9]+)\s(\w+)/',$read[$i], $regs)) {
+            $result[strtoupper($regs[2])] = $regs[1];
+        } else {
+            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];
             }
         }
-        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]);
-                }
+    }
+    if (preg_match('/^\[(.+)\]/',$message, $regs)) {
+        $result['RIGHTS']=$regs[1];
+    }
 
-            }
-            return( $result );
-        }
+    if ($auto_expunge) {
+        $tmp = sqimap_run_command($imap_stream, 'EXPUNGE', false, $a, $b);
     }
+    return $result;
 }
 
 /* Creates a folder */
@@ -214,6 +238,7 @@ function sqimap_mailbox_create ($imap_stream, $mailbox, $type) {
     if (strtolower($type) == 'noselect') {
         $mailbox .= $delimiter;
     }
+
     $read_ary = sqimap_run_command($imap_stream, "CREATE \"$mailbox\"",
                                    true, $response, $message);
     sqimap_subscribe ($imap_stream, $mailbox);
@@ -227,7 +252,6 @@ function sqimap_subscribe ($imap_stream, $mailbox) {
 
 /* 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);
 }
@@ -238,7 +262,7 @@ function sqimap_mailbox_delete ($imap_stream, $mailbox) {
     $read_ary = sqimap_run_command($imap_stream, "DELETE \"$mailbox\"",
                                    true, $response, $message);
     sqimap_unsubscribe ($imap_stream, $mailbox);
-    do_hook_function("rename_or_delete_folder", $args = array($mailbox, 'delete', ''));
+    do_hook_function('rename_or_delete_folder', $args = array($mailbox, 'delete', ''));
     removePref($data_dir, $username, "thread_$mailbox");
 }
 
@@ -264,31 +288,33 @@ function sqimap_mailbox_rename( $imap_stream, $old_name, $new_name ) {
         } else {
             $postfix = '';
         }
+
         $boxesall = sqimap_mailbox_list($imap_stream);
-        $cmd = 'RENAME "' . quoteIMAP($old_name) . '" "' .  quoteIMAP($new_name) . '"';
+        $cmd = 'RENAME "' . $old_name . '" "' . $new_name . '"';
         $data = sqimap_run_command($imap_stream, $cmd, true, $response, $message);
         sqimap_unsubscribe($imap_stream, $old_name.$postfix);
-        $oldpref = getPref($data_dir, $username, "thread_".$old_name.$postfix);
-        removePref($data_dir, $username, "thread_".$old_name.$postfix);
+        $oldpref = getPref($data_dir, $username, 'thread_'.$old_name.$postfix);
+        removePref($data_dir, $username, 'thread_'.$old_name.$postfix);
         sqimap_subscribe($imap_stream, $new_name.$postfix);
-        setPref($data_dir, $username, "thread_".$new_name.$postfix, $oldpref);
-        do_hook_function("rename_or_delete_folder",$args = array($old_name, 'rename', $new_name));
+        setPref($data_dir, $username, 'thread_'.$new_name.$postfix, $oldpref);
+        do_hook_function('rename_or_delete_folder',$args = array($old_name, 'rename', $new_name));
         $l = strlen( $old_name ) + 1;
         $p = 'unformatted';
-        foreach ( $boxesall as $box ) {
-            if ( substr( $box[$p], 0, $l ) == $old_name . $delimiter ) {
+
+        foreach ($boxesall as $box) {
+            if (substr($box[$p], 0, $l) == $old_name . $delimiter) {
                 $new_sub = $new_name . $delimiter . substr($box[$p], $l);
                 if ($imap_server_type == 'cyrus') {
-                    $cmd = 'RENAME "' . quoteIMAP($box[$p]) . '" "' .  quoteIMAP($new_sub) . '"';
+                    $cmd = 'RENAME "' . $box[$p] . '" "' . $new_sub . '"';
                     $data = sqimap_run_command($imap_stream, $cmd, true,
                                                $response, $message);
                 }
                 sqimap_unsubscribe($imap_stream, $box[$p]);
-                $oldpref = getPref($data_dir, $username, "thread_".$box[$p]);
-                removePref($data_dir, $username, "thread_".$box[$p]);
+                $oldpref = getPref($data_dir, $username, 'thread_'.$box[$p]);
+                removePref($data_dir, $username, 'thread_'.$box[$p]);
                 sqimap_subscribe($imap_stream, $new_sub);
-                setPref($data_dir, $username, "thread_".$new_sub, $oldpref);
-                do_hook_function("rename_or_delete_folder",
+                setPref($data_dir, $username, 'thread_'.$new_sub, $oldpref);
+                do_hook_function('rename_or_delete_folder',
                                  $args = array($box[$p], 'rename', $new_sub));
             }
         }
@@ -310,20 +336,17 @@ function sqimap_mailbox_parse ($line, $line_lsub) {
     global $folder_prefix, $delimiter;
 
     /* Process each folder line */
-    for ($g=0; $g < count($line); $g++) {
-
+    for ($g = 0, $cnt = count($line); $g < $cnt; ++$g) {
         /* Store the raw IMAP reply */
         if (isset($line[$g])) {
-            $boxesall[$g]["raw"] = $line[$g];
-        }
-        else {
-            $boxesall[$g]["raw"] = '';
+            $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);
+        $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--;
@@ -334,19 +357,17 @@ function sqimap_mailbox_parse ($line, $line_lsub) {
         $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));
+             (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'] = str_repeat('&nbsp;&nbsp;', $indent);
+            } else {
                 $boxesall[$g]['formatted'] = '';
             }
-            $boxesall[$g]['formatted'] .= readShortMailboxName($mailbox, $delimiter);
-        }
-        else {
-            $boxesall[$g]['formatted']  = $mailbox;
+            $boxesall[$g]['formatted'] .= imap_utf7_decode_local(readShortMailboxName($mailbox, $delimiter));
+        } else {
+            $boxesall[$g]['formatted']  = imap_utf7_decode_local($mailbox);
         }
 
         $boxesall[$g]['unformatted-dm'] = $mailbox;
@@ -369,7 +390,6 @@ function sqimap_mailbox_parse ($line, $line_lsub) {
             }
         }
     }
-
     return $boxesall;
 }
 
@@ -386,109 +406,128 @@ function sqimap_mailbox_parse ($line, $line_lsub) {
  *       With special sort function: foobar AFTER foo and foo.bar :)
  */
 function user_strcasecmp($a, $b) {
-    global $delimiter;
+    return  strnatcasecmp($a, $b);
+}
 
-    /* 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});
-        }
+/*
+ * Returns list of options (to be echoed into select statement
+ * based on available mailboxes and separators
+ * Caller should surround options with <SELECT..> </SELECT> and
+ * any formatting.
+ *   $imap_stream - $imapConnection to query for mailboxes
+ *   $show_selected - array containing list of mailboxes to pre-select (0 if none)
+ *   $folder_skip - array of folders to keep out of option list (compared in lower)
+ *   $boxes - list of already fetched boxes (for places like folder panel, where
+ *            you know these options will be shown 3 times in a row.. (most often unset).
+ *   $flag - flag to check for in mailbox flags, used to filter out mailboxes.
+ *           'noselect' by default to remove unselectable mailboxes.
+ *           'noinferiors' used to filter out folders that can not contain subfolders.
+ *           NULL to avoid flag check entirely.
+ *   $use_long_format - override folder display preference and always show full folder name.
+ */
+function sqimap_mailbox_option_list($imap_stream, $show_selected = 0, $folder_skip = 0, $boxes = 0, 
+                                    $flag = 'noselect', $use_long_format = false ) {
+    global $username, $data_dir;
+    $mbox_options = '';
 
-        if ($result != 0) {
-            break;
-        }
+    if ( $use_long_format ) {
+        $shorten_box_names = 0;
+    } else {
+        $shorten_box_names = getPref($data_dir, $username, 'mailbox_select_style', SMPREF_OFF);
     }
 
-    /* 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;
-        }
+    if ($boxes == 0) {
+        $boxes = sqimap_mailbox_list($imap_stream);
     }
 
-    return $result;
-}
+    foreach ($boxes as $boxes_part) {
+        if ($flag == NULL || !in_array($flag, $boxes_part['flags'])) {
+            $box = $boxes_part['unformatted'];
+            $lowerbox = strtolower($box);
 
+            if ($folder_skip != 0 && in_array($lowerbox, $folder_skip) ) {
+                continue;
+            }
+            if ($lowerbox == 'inbox'){
+                $box2 = _("INBOX");
+            } else if ( $shorten_box_names == 2 ) {  /* delimited, style = 2 */
+                $box2 = str_replace('&nbsp;&nbsp;', '.&nbsp;', $boxes_part['formatted']);
+            } else if ( $shorten_box_names == 1 ) {     /* indent, style = 1 */
+                $box2 = $boxes_part['formatted'];
+            } else  {                      /* default, long names, style = 0 */
+                $box2 = str_replace(' ', '&nbsp;', imap_utf7_decode_local($boxes_part['unformatted-disp']));
+            }
+            if ($show_selected != 0 && in_array($lowerbox, $show_selected) ) {
+                $mbox_options .= '<OPTION VALUE="'.$box.'" SELECTED>'.$box2.'</OPTION>' . "\n";
+            } else {
+                $mbox_options .= '<OPTION VALUE="'.$box.'">'.$box2.'</OPTION>' . "\n";
+            }
+        }
+    }
+    return $mbox_options;
+}
 
 /*
  * 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, $default_folder_prefix;
-
-    if ( !isset( $boxesnew ) ) {
+    global $default_folder_prefix;
 
+    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;
+               $delimiter, $noselect_fix_enable;
 
         $inbox_in_list = false;
         $inbox_subscribed = false;
 
-        require_once('../src/load_prefs.php');
-        require_once('../functions/array.php');
+        require_once(SM_PATH . 'include/load_prefs.php');
 
+        if ($noselect_fix_enable) {
+            $lsub_args = "LSUB \"$folder_prefix\" \"*%\"";
+        } else {
+            $lsub_args = "LSUB \"$folder_prefix\" \"*\"";
+        }
         /* LSUB array */
-        $lsub_ary = sqimap_run_command ($imap_stream, "LSUB \"$folder_prefix\" \"*%\"",
+        $lsub_ary = sqimap_run_command ($imap_stream, $lsub_args,
                                         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++) {
+        for ($i = 0, $cnt = count($lsub_ary);$i < $cnt; $i++) {
             /*
-             * Workaround for EIMS
-             * Doesn't work if the mailbox name is multiple lines
+             * Workaround for mailboxes returned as literal
+             * Doesn't work if the mailbox name is multiple lines 
+	     * (larger then fgets buffer)
              */
-            if (isset($lsub_ary[$i + 1]) &&
-                ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$",
+            if (isset($lsub_ary[$i + 1]) && substr($lsub_ary[$i],-3) == "}\r\n") {
+		if (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];
+            	    $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') {
+            if (!$inbox_subscribed && 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;
+	/* remove duplicates */
+	$sorted_lsub_ary = array_unique($sorted_lsub_ary);
+
+	/* natural sort mailboxes */
         if (isset($sorted_lsub_ary)) {
             usort($sorted_lsub_ary, 'user_strcasecmp');
         }
-
-        /* LIST array */
+	/*
+	 * The LSUB response doesn't provide us information about \Noselect
+	 * mail boxes. The LIST response does, that's why we need to do a LIST
+	 * call to retrieve the flags for the mailbox
+           * Note: according RFC2060 an imap server may provide \NoSelect flags in the LSUB response.
+           * in other words, we cannot rely on it.
+	 */
         $sorted_list_ary = array();
         for ($i=0; $i < count($sorted_lsub_ary); $i++) {
             if (substr($sorted_lsub_ary[$i], -1) == $delimiter) {
@@ -500,45 +539,38 @@ function sqimap_mailbox_list($imap_stream) {
 
             $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] = '';
+            /* Another workaround for literals */
+
+            if (isset($read[1]) && substr($read[1],-3) == "}\r\n") {
+		if (ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$",
+                     $read[0], $regs)) {
+            	    $read[0] = $regs[1] . '"' . addslashes(trim($read[1])) . '"' . $regs[2];
+		}
             }
 
             if (isset($read[0])) {
                 $sorted_list_ary[$i] = $read[0];
-            }
-            else {
+            } 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 || !$inbox_in_list) {
+        if (!$inbox_subscribed) {
             $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]*)$",
+            /* Another workaround for literals */
+            if (isset($inbox_ary[1]) && substr($inbox_ary[0],-3) == "}\r\n") {
+		if (ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$",
                      $inbox_ary[0], $regs)) {
-                $inbox_ary[0] = $regs[1] . '"' . addslashes(trim($inbox_ary[1])) .
-                    '"' . $regs[2];
+            	    $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]);
         }
@@ -549,38 +581,29 @@ function sqimap_mailbox_list($imap_stream) {
         $boxesnew = $used = array();
 
         /* Find INBOX */
-        foreach ( $boxesall as $k => $box ) {
-            if ( strtolower($box['unformatted']) == 'inbox') {
-                $boxesnew[] = $box;
+        $cnt = count($boxesall);
+	$used = array_pad($used,$cnt,false);
+        for($k = 0; $k < $cnt; ++$k) {
+            if (strtolower($boxesall[$k]['unformatted']) == 'inbox') {
+                $boxesnew[] = $boxesall[$k];
                 $used[$k] = true;
-            } else {
-                $used[$k] = false;
+		break;
             }
         }
         /* List special folders and their subfolders, if requested. */
         if ($list_special_folders_first) {
-            foreach ( $boxesall as $k => $box ) {
-                if ( !$used[$k] && isSpecialMailbox( $box['unformatted'] ) ) {
-                    $boxesnew[] = $box;
-                    $used[$k] = true;
-                }
-                $spec_sub = str_replace('&nbsp;', '', $box['formatted']);
-
-               /* In case of problems with preg
-                  here is a ereg version
-                 if (!$used[$k] && ereg("^$default_folder_prefix(Sent|Drafts|Trash).{1}$spec_sub$", $box['unformatted']) ) { */
-                 
-                if (!$used[$k] && preg_match("?^$default_folder_prefix(Sent|Drafts|Trash).{1}$spec_sub$?", $box['unformatted']) ) {
-                    $boxesnew[] = $box;
-                    $used[$k] = true;
+            for($k = 0; $k < $cnt; ++$k) {
+                if (!$used[$k] && isSpecialMailbox($boxesall[$k]['unformatted'])) {
+                    $boxesnew[] = $boxesall[$k];
+                    $used[$k]   = true;
                 }
-            }
+	    }
+	}
 
-        }
         /* Rest of the folders */
-        foreach ( $boxesall as $k => $box ) {
-            if ( !$used[$k] ) {
-                $boxesnew[] = $box;
+        for($k = 0; $k < $cnt; $k++) {
+            if (!$used[$k]) {
+                $boxesnew[] = $boxesall[$k];
             }
         }
     }
@@ -593,16 +616,15 @@ function sqimap_mailbox_list($imap_stream) {
 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';
+    $fld_pre_length = strlen($folder_prefix);
 
-    for ($i = 0; $i < count($read_ary); $i++) {
+    for ($i = 0, $cnt = count($read_ary); $i < $cnt; $i++) {
         /* Another workaround for EIMS */
         if (isset($read_ary[$i + 1]) &&
             ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$",
@@ -611,7 +633,6 @@ function sqimap_mailbox_list_all($imap_stream) {
             $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];
 
@@ -631,14 +652,12 @@ function sqimap_mailbox_list_all($imap_stream) {
                ( isset($boxesallbyname[$parentfolder]) && (strlen($parentfolder) > 0) ) ) {
                 if ($dm_count) {
                     $boxes[$g]['formatted']  = str_repeat('&nbsp;&nbsp;', $dm_count);
-                }
-                else {
+                } else {
                     $boxes[$g]['formatted'] = '';
                 }
-                $boxes[$g]['formatted'] .= readShortMailboxName($mailbox, $delimiter);
-            }
-            else {
-                $boxes[$g]['formatted']  = $mailbox;
+                $boxes[$g]['formatted'] .= imap_utf7_decode_local(readShortMailboxName($mailbox, $delimiter));
+            } else {
+                $boxes[$g]['formatted']  = imap_utf7_decode_local($mailbox);
             }
 
             $boxes[$g]['unformatted-dm'] = $mailbox;
@@ -646,20 +665,24 @@ function sqimap_mailbox_list_all($imap_stream) {
                 $mailbox = substr($mailbox, 0, strlen($mailbox) - 1);
             }
             $boxes[$g]['unformatted'] = $mailbox;
-            $boxes[$g]['unformatted-disp'] = ereg_replace('^' . $folder_prefix, '', $mailbox);
+            $boxes[$g]['unformatted-disp'] = substr($mailbox,$fld_pre_length);
+
             $boxes[$g]['id'] = $g;
 
             /* Now lets get the flags for this mailbox */
-            $read_mlbx = sqimap_run_command ($imap_stream, "LIST \"\" \"$mailbox\"",
-                                             true, $response, $message);
+            $read_mlbx = $read_ary[$i];
+
+//            $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];
-            }
+//            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];
+//            }
+//            echo  $read_mlbx[0] .' raw 2 <br>';
 
-            $flags = substr($read_mlbx[0], strpos($read_mlbx[0], '(')+1);
+            $flags = substr($read_mlbx, strpos($read_mlbx, '(')+1);
             $flags = substr($flags, 0, strpos($flags, ')'));
             $flags = str_replace('\\', '', $flags);
             $flags = trim(strtolower($flags));
@@ -672,7 +695,7 @@ function sqimap_mailbox_list_all($imap_stream) {
         $g++;
     }
     if(is_array($boxes)) {
-        $boxes = ary_sort ($boxes, 'unformatted', 1);
+        sort ($boxes);
     }
 
     return $boxes;
@@ -680,19 +703,16 @@ function sqimap_mailbox_list_all($imap_stream) {
 
 function sqimap_mailbox_tree($imap_stream) {
     global $boxesnew, $default_folder_prefix, $unseen_notify, $unseen_type;
-    if ( !isset( $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;
+               $folder_prefix, $delimiter, $trash_folder, $move_to_trash;
 
 
         $inbox_in_list = false;
         $inbox_subscribed = false;
 
-        require_once('../src/load_prefs.php');
-        require_once('../functions/array.php');
+        require_once(SM_PATH . 'include/load_prefs.php');
 
         /* LSUB array */
         $lsub_ary = sqimap_run_command ($imap_stream, "LSUB \"$folder_prefix\" \"*\"",
@@ -703,8 +723,8 @@ function sqimap_mailbox_tree($imap_stream) {
          * We don't return "* OK" anymore from sqimap_read_data
          */
         $sorted_lsub_ary = array();
-
-        for ($i=0;$i < count($lsub_ary); $i++) {
+        $cnt = count($lsub_ary);
+        for ($i = 0; $i < $cnt; $i++) {
             /*
              * Workaround for EIMS
              * Doesn't work if the mailbox name is multiple lines
@@ -712,24 +732,25 @@ function sqimap_mailbox_tree($imap_stream) {
             if (isset($lsub_ary[$i + 1]) &&
                 ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$",
                      $lsub_ary[$i], $regs)) {
-                $i ++;
+                $i++;
                 $lsub_ary[$i] = $regs[1] . '"' . addslashes(trim($lsub_ary[$i])) . '"' . $regs[2];
             }
 
-	    if (preg_match("/^\*\s+LSUB\s+\((.*)\)\s+\"(.*)\"\s+\"?(.+(?=\")|.+).*$/",$lsub_ary[$i],$regs)) {
-    		$flag = $regs[1];
-    		$mbx = trim($regs[3]);
-		$sorted_lsub_ary[] = array ('mbx' => $mbx, 'flag' => $flag); 
-	    }
+            $mbx = find_mailbox_name($lsub_ary[$i]);
+            $noselect = check_is_noselect($lsub_ary[$i]);
+            if (substr($mbx, -1) == $delimiter) {
+                $mbx = substr($mbx, 0, strlen($mbx) - 1);
+            }
+            $sorted_lsub_ary[] = array ('mbx' => $mbx, 'noselect' => $noselect); 
         }
-	array_multisort($sorted_lsub_ary, SORT_ASC, SORT_STRING);
+        array_multisort($sorted_lsub_ary, SORT_ASC, SORT_REGULAR);
 
-	foreach ($sorted_lsub_ary as $mbx) {
-	    if ($mbx['mbx'] == 'INBOX') {
+        for($i = 0; $i < $cnt; $i++) {
+            if ($sorted_lsub_ary[$i]['mbx'] == 'INBOX') {
                 $inbox_in_list = true;
-		break;
+                break;
             }
-	}
+        }
 
         /*
          * Just in case they're not subscribed to their inbox,
@@ -743,31 +764,44 @@ function sqimap_mailbox_tree($imap_stream) {
                 ereg("^(\\* [A-Z]+.*)\\{[0-9]+\\}([ \n\r\t]*)$",
                      $inbox_ary[0], $regs)) {
                 $inbox_ary[0] = $regs[1] . '"' . addslashes(trim($inbox_ary[1])) .
-                    '"' . $regs[2];
+                                '"' . $regs[2];
+            }
+            $mbx = find_mailbox_name($inbox_ary[0]);
+            if (substr($mbx, -1) == $delimiter) {
+                $mbx = substr($mbx, 0, strlen($mbx) - 1);
+            }
+            if ($mbx == 'INBOX') {
+                $sorted_lsub_ary[] = array ('mbx' => $mbx, 'noselect' => '0'); 
+                sqimap_subscribe($imap_stream, 'INBOX');
+                $cnt++;
             }
-	    if (preg_match("/^\*\s+LIST\s+\((.*)\)\s+\"(.*)\"\s+\"?(.+(?=\")|.+).*$/",$inbox_ary[0],$regs)) {
-    		$flag = $regs[1];
-    		$mbx = trim($regs[3]);
-		$sorted_lsub_ary[] = array ('mbx' => $mbx, 'flag' => $flag); 
-	    }
         }
 
-	for ($i=0 ; $i < count($sorted_lsub_ary); $i++) {
-	    if (($unseen_notify == 2 && $sorted_lsub_ary[$i]['mbx'] == 'INBOX') 
-		|| $unseen_notify == 3 
-		|| ($move_to_trash && ($sorted_lsub_ary[$i]['mbx'] == $trash_folder))) {
-    		$sorted_lsub_ary[$i]['unseen'] = sqimap_unseen_messages($imap_stream, $mbx['mbx']);
-		if ($unseen_type == 2 || ($move_to_trash 
-		    && ($sorted_lsub_ary[$i]['mbx'] == $trash_folder) )) {
-        	    $sorted_lsub_ary[$i]['nummessages'] = sqimap_get_num_messages($imap_stream, $mbx['mbx']);
-    		}
-		if ($unseen_notify != 3 && !($move_to_trash 
-		    && ($sorted_lsub_ary[$i]['mbx'] == $trash_folder) )) break;
-	    }
-	}
-
-	$boxesnew = sqimap_fill_mailbox_tree($sorted_lsub_ary);
-    return $boxesnew;
+        for ($i = 0 ; $i < $cnt; $i++) {
+            $mbx = $sorted_lsub_ary[$i]['mbx'];
+            if (($unseen_notify == 2 && $mbx == 'INBOX') ||
+                ($unseen_notify == 3) ||
+                ($move_to_trash && ($mbx == $trash_folder))) {
+                if( $sorted_lsub_ary[$i]['noselect'] ) {
+                    $sorted_lsub_ary[$i]['unseen'] = 0;
+                } else {
+                    $sorted_lsub_ary[$i]['unseen'] = 
+                        sqimap_unseen_messages($imap_stream, $mbx);
+                }
+                if (($unseen_type == 2) ||
+                    ($move_to_trash && ($mbx == $trash_folder)) ||
+                    ($mbx == $trash_folder)) {
+                    if($sorted_lsub_ary[$i]['noselect']) {
+                        $sorted_lsub_ary[$i]['nummessages'] = 0;
+                    } else {
+                        $sorted_lsub_ary[$i]['nummessages'] =
+                            sqimap_get_num_messages($imap_stream, $mbx);
+                    }
+                }
+            }
+        }
+        $boxesnew = sqimap_fill_mailbox_tree($sorted_lsub_ary);
+        return $boxesnew;
     }
 }
 
@@ -779,66 +813,76 @@ function sqimap_fill_mailbox_tree($mbx_ary, $mbxs=false) {
            $delimiter;
 
     $special_folders = array ('INBOX', $sent_folder, $draft_folder, $trash_folder);
-    	   
+
     /* create virtual root node */
     $mailboxes= new mailboxes();
     $mailboxes->is_root = true;
-    $trail_del = false;	   
+    $trail_del = false;
     if (isset($folder_prefix) && $folder_prefix != '') {
-	$start = substr_count($folder_prefix,$delimiter);
-	if (strrpos($folder_prefix, $delimiter) == (strlen($folder_prefix)-1)) {
-	    $trail_del = true;
-	    $mailboxes->mailboxname_full = substr($folder_prefix,0, (strlen($folder_prefix)-1));
-	} else {
-	    $mailboxes->mailboxname_full = $folder_prefix;
-	    $start++;
-	}
-	$mailboxes->mailboxname_sub = $mailboxes->mailboxname_full;
-    } else $start = 0;
-
-    for ($i=0; $i < count($mbx_ary); $i++) {
-       if ($mbx_ary[$i]['mbx'] !='' ) {
-	    $mbx = new mailboxes();
-	    $mailbox = $mbx_ary[$i]['mbx'];
-	    switch ($mailbox) {
-		case 'INBOX':
-		    $mbx->is_inbox = true;
-		    $mbx->is_special = true;
-		    break;
-		case $trash_folder:
-		    $mbx->is_trash = true;
-		    $mbx->is_special = true;
-		    break;
-		case $sent_folder:
-		    $mbx->is_sent = true;
-		    $mbx->is_special = true;
-		    break;
-		case $draft_folder:
-		    $mbx->is_draft = true;
-		    $mbx->is_special = true;
-		    break;
-	    }    
-			    
-	    if (isset($mbx_ary[$i]['unseen'])) {
-		$mbx->unseen = $mbx_ary[$i]['unseen'];
-	    }
-	    if (isset($mbx_ary[$i]['nummessages'])) {
-		$mbx->total = $mbx_ary[$i]['nummessages'];
-	    }
-	    
-            $r_del_pos = strrpos($mbx_ary[$i]['mbx'], $delimiter);
-	    if ($r_del_pos) {
-		$mbx->mailboxname_sub = substr($mbx_ary[$i]['mbx'],$r_del_pos+1);
-	    } else {   /* mailbox is root folder */
-		$mbx->mailboxname_sub = $mbx_ary[$i]['mbx'];
-	    }
-	    $mbx->mailboxname_full = $mbx_ary[$i]['mbx'];
-	    $mailboxes->addMbx($mbx, $delimiter, $start, $list_special_folders_first);
-	}
+        $start = substr_count($folder_prefix,$delimiter);
+        if (strrpos($folder_prefix, $delimiter) == (strlen($folder_prefix)-1)) {
+            $trail_del = true;
+            $mailboxes->mailboxname_full = substr($folder_prefix,0, (strlen($folder_prefix)-1));
+        } else {
+            $mailboxes->mailboxname_full = $folder_prefix;
+            $start++;
+        }
+        $mailboxes->mailboxname_sub = $mailboxes->mailboxname_full;
+    } else {
+        $start = 0;
     }
+    $cnt =  count($mbx_ary);
+    for ($i=0; $i < $cnt; $i++) {
+        if ($mbx_ary[$i]['mbx'] !='' ) {
+            $mbx = new mailboxes();
+            $mailbox = $mbx_ary[$i]['mbx'];
+            switch ($mailbox) {
+                case 'INBOX':
+                    // $mailboxes IS the INBOX, change $mbx to refer to $mailboxes
+                    // for unread count, attribute setting, etc.
+                    unset($mbx);
+                    $mbx =& $mailboxes;
+
+                    $mbx->is_inbox = true;
+                    $mbx->is_special = true;
+                    break;
+                case $trash_folder:
+                    $mbx->is_trash = true;
+                    $mbx->is_special = true;
+                    break;
+                case $sent_folder:
+                    $mbx->is_sent = true;
+                    $mbx->is_special = true;
+                    break;
+                case $draft_folder:
+                    $mbx->is_draft = true;
+                    $mbx->is_special = true;
+                    break;
+            }
 
+            if (isset($mbx_ary[$i]['unseen'])) {
+                $mbx->unseen = $mbx_ary[$i]['unseen'];
+            }
+            if (isset($mbx_ary[$i]['nummessages'])) {
+                $mbx->total = $mbx_ary[$i]['nummessages'];
+            }
+
+            $mbx->is_noselect = $mbx_ary[$i]['noselect'];
+
+            $r_del_pos = strrpos($mbx_ary[$i]['mbx'], $delimiter);
+            if ($r_del_pos) {
+                $mbx->mailboxname_sub = substr($mbx_ary[$i]['mbx'],$r_del_pos+1);
+            } else {   /* mailbox is root folder */
+                $mbx->mailboxname_sub = $mbx_ary[$i]['mbx'];
+            }
+            $mbx->mailboxname_full = $mbx_ary[$i]['mbx'];
+
+            // Don't add INBOX to itself
+            if ( $mailbox != 'INBOX' )
+                $mailboxes->addMbx($mbx, $delimiter, $start, $list_special_folders_first);
+        }
+    }
     return $mailboxes;
 }
 
-
 ?>