From 146b46ac549c53a1137d0151ec9b367371e0162c Mon Sep 17 00:00:00 2001 From: stekkel Date: Wed, 16 Nov 2005 16:35:57 +0000 Subject: [PATCH] * Support for LIST-SUBSCRIBED capability. * Do not do an individual LIST call for each mailbox if all mailboxes are displayed instead of only the subscribed ones. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@10371 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/imap_mailbox.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php index a1a00fa2..a5e50c7f 100755 --- a/functions/imap_mailbox.php +++ b/functions/imap_mailbox.php @@ -744,7 +744,7 @@ function sqimap_mailbox_list($imap_stream, $force=false) { * in other words, we cannot rely on it. */ $sorted_list_ary = array(); - // if (!$listsubscribed) { + if (!$listsubscribed && $show_only_subscribed_folders) { 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); @@ -764,7 +764,9 @@ function sqimap_mailbox_list($imap_stream, $force=false) { $sorted_list_ary[$i] = ''; } } - // } + } else { + $sorted_list_ary = $sorted_lsub_ary; + } /* * Just in case they're not subscribed to their inbox, * we'll get it for them anyway -- 2.25.1