tweaking special folder sub folder fix

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2609 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index 351993c91c5421c6068abb9a13a754147fb8b5e3..90ef906d6e925f843296bd36a87b8d01fee43658 100755 (executable)
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -338,7 +338,7 @@ function user_strcasecmp($a, $b) {
  * See comment on sqimap_mailbox_parse() for info about the returned array.
  */
 function sqimap_mailbox_list($imap_stream) {
-    global $boxesnew, $default_folder_prefix;
+    global $boxesnew, $default_folder_prefix, $optional_delimiter;
 
     if ( !isset( $boxesnew ) ) {
 
@@ -467,14 +467,15 @@ function sqimap_mailbox_list($imap_stream) {
                     $boxesnew[] = $box;
                     $used[$k] = true;
                 }
-                if (!$used[$k] && preg_match("/$default_folder_prefix(Sent|Drafts|Trash)/", $box['unformatted']) ) {
+                $spec_sub =  $box['formatted'];
+                $spec_sub = str_replace(" ", "", $box['formatted']);
+                if (!$used[$k] && preg_match("/^$default_folder_prefix(Sent|Drafts|Trash).{1}$spec_sub$/", $box['unformatted']) ) {
                     $boxesnew[] = $box;
                     $used[$k] = true;
                 }
             }
 
         }
-
         /* Rest of the folders */
         foreach ( $boxesall as $k => $box ) {
             if ( !$used[$k] ) {