From 11f6f685916051e54fb7b728d76fdd6f5a62fe18 Mon Sep 17 00:00:00 2001
From: ullgren <ullgren@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sun, 3 Mar 2002 13:39:39 +0000
Subject: [PATCH] Made SquirrelMail display \Noselect nodes in Cyrus also made
 it impossible to try to delete \Noselect nodes. (patch #452178)

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2538 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 ChangeLog                  | 2 ++
 functions/imap_mailbox.php | 2 +-
 src/folders.php            | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c9d6a18d..cf041d9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@ Version 1.2.6 -- CVS
   - Filtering now happens on folder list refresh (filters plugin)
   - Added checking of input of the folders page
   - Made erronous deleting of folders harder (patch #514208)
+  - Made SquirrelMail display \Noselect nodes in Cyrus also made it 
+    impossible to try to delete \Noselect nodes. (patch #452178)
 	
 Version 1.2.5 -- 22 February 2002
 ---------------------------------
diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index d6168629..dadcbad8 100755
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -400,7 +400,7 @@ function sqimap_mailbox_list($imap_stream) {
         require_once('../functions/array.php');
 
         /** LSUB array **/
-        $lsub_ary = sqimap_run_command ($imap_stream, "LSUB \"$folder_prefix\" \"*\"",
+        $lsub_ary = sqimap_run_command ($imap_stream, "LSUB \"$folder_prefix\" \"*%\"",
                                       TRUE, $response, $message);
 
         /* Section about removing the last element was removed */
diff --git a/src/folders.php b/src/folders.php
index 5abf8b26..63562be7 100644
--- a/src/folders.php
+++ b/src/folders.php
@@ -183,6 +183,7 @@ if ($count_special_folders < count($boxes)) {
             ($boxes[$i]['unformatted'] != $trash_folder) &&
             ($boxes[$i]['unformatted'] != $sent_folder) &&
             ($boxes[$i]['unformatted'] != $draft_folder) &&
+            (!in_array('noselect', $boxes[$i]['flags'])) &&
             ((strtolower($imap_server_type) != 'courier') ||
              (strtolower($boxes[$i]['unformatted']) != 'inbox.trash'))) {
             $box = $boxes[$i]['unformatted-dm'];
-- 
2.25.1