Changeset 3c5489b in github for program/include/rcube_imap.php

Timestamp:

May 21, 2012 3:25:51 AM (13 months ago)

Author:

Aleksander Machniak <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo

Children:

19cc5b9

Parents:

e95f13e

Message:

Add option imap_force_ns to make buggy servers support optional

File:

• program/include/rcube_imap.php (modified) (2 diffs)

program/include/rcube_imap.php

@@ -2540 +2540 @@
         }
 
-        // #1486796: some server configurations doesn't
-        // return folders in all namespaces, we'll try to detect that situation
-        // and ask for these namespaces separately
-        // @TODO: make this optional
-        if ($root == '' && $name == '*') {
+        // #1486796: some server configurations doesn't return folders in all namespaces
+        if ($root == '' && $name == '*' && $config->get('imap_force_ns')) {
             $this->list_folders_update($a_folders, ($list_extended ? 'ext-' : '') . 'subscribed');
         }
@@ -2674 +2671 @@
         }
 
-        // #1486796: some server configurations doesn't
-        // return folders in all namespaces, we'll try to detect that situation
-        // and ask for these namespaces separately
-        // @TODO: make this optional
-        if ($root == '' && $name == '*') {
+        // #1486796: some server configurations doesn't return folders in all namespaces
+        if ($root == '' && $name == '*' && $config->get('imap_force_ns')) {
             $this->list_folders_update($result);
         }