瀏覽代碼

* 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.

stekkel 19 年之前
父節點
當前提交
3d851be854
共有 1 個文件被更改,包括 4 次插入2 次删除
  1. 4 2
      functions/imap_mailbox.php

+ 4 - 2
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