Changeset 3c5489b in github

Timestamp:

May 21, 2012 3:25:51 AM (12 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

Files:

• config/main.inc.php.dist (modified) (1 diff)
• plugins/subscriptions_option/package.xml (modified) (1 diff)
• plugins/subscriptions_option/subscriptions_option.php (modified) (1 diff)
• program/include/rcube_imap.php (modified) (2 diffs)

config/main.inc.php.dist

@@ -106 +106 @@
 // Enable this option to force LSUB command usage instead.
 $rcmail_config['imap_force_lsub'] = false;
+
+// Some server configurations (e.g. Courier) doesn't list folders in all namespaces
+// Enable this option to force listing of folders in all namespaces
+$rcmail_config['imap_force_ns'] = false;
 
 // IMAP connection timeout, in seconds. Default: 0 (no limit)

plugins/subscriptions_option/package.xml

@@ -24 +24 @@
             <active>yes</active>
         </developer>
-        <date>2012-03-05</date>
+        <date>2012-05-21</date>
         <version>
-                <release>1.2</release>
+                <release>1.3</release>
                 <api>1.1</api>
         </version>

plugins/subscriptions_option/subscriptions_option.php

@@ -75 +75 @@
     function mailboxes_list($args)
     {
-        $rcmail  = rcmail::get_instance();
+        $rcmail = rcmail::get_instance();
         if (!$rcmail->config->get('use_subscriptions', true)) {
-            $storage = $rcmail->get_storage();
-            if ($storage->check_connection()) {
-                $args['folders'] = $storage->conn->listMailboxes($args['root'], $args['name']);
-            }
+            $args['folders'] = $rcmail->get_storage()->list_folders_direct();
         }
         return $args;

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);
         }