Changeset d8c440c in github

Timestamp:

Mar 24, 2010 10:45:49 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

13540e0

Parents:

02e2b43

Message:

• Added 'imap_force_caps' option for after-login CAPABILITY checking (#1485750)

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (1 diff)
• program/include/rcmail.php (modified) (1 diff)
• program/lib/imap.inc (modified) (6 diffs)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Added 'imap_force_caps' option for after-login CAPABILITY checking (#1485750)
 - Password: Support dovecotpw encryption
 - TinyMCE 3.3.1

config/main.inc.php.dist

@@ -75 +75 @@
 $rcmail_config['imap_root'] = null;
 $rcmail_config['imap_delimiter'] = null;
+
+// By default IMAP capabilities are readed after connection to IMAP server
+// In some cases, e.g. when using IMAP proxy, there's a need to refresh the list
+// after login. Set to True if you've got this case.
+$rcmail_config['imap_force_caps'] = false;
 
 // ----------------------------------

program/include/rcmail.php

@@ -427 +427 @@
       'rootdir' => isset($_SESSION['imap_root']) ? $_SESSION['imap_root'] : $this->config->get('imap_root'),
       'debug_mode' => (bool) $this->config->get('imap_debug', 0),
+      'force_caps' => (bool) $this->config->get('imap_force_caps'),
     );
 

program/lib/imap.inc

@@ -390 +390 @@
 }
 
-function iil_ClearCapability()
+function iil_C_ClearCapability($conn)
 {
         $conn->capability = array();
@@ -551 +551 @@
         $iil_errornum = 0;
 
-        // set some imap options
+        // set options
         if (is_array($options)) {
-                foreach($options as $optkey => $optval) {
-                        if ($optkey == 'auth_method') {
-                                $auth_method = strtoupper($optval);
-                        } else if ($optkey == 'rootdir') {
-                                $my_prefs['rootdir'] = $optval;
-                        } else if ($optkey == 'delimiter') {
-                                $my_prefs['delimiter'] = $optval;
-                        } else if ($optkey == 'debug_mode') {
-                                $my_prefs['debug_mode'] = $optval;
-                        }
-                }
-        }
-
-        if (empty($auth_method))
+        $my_prefs = $options;
+    }
+    // set auth method
+    if (!empty($my_prefs['auth_method'])) {
+            $auth_method = strtoupper($my_prefs['auth_method']);
+        } else {
                 $auth_method = 'CHECK';
-                
+    }
+
         $message = "INITIAL: $auth_method\n";
-                
+
         $result = false;
         
@@ -580 +573 @@
         $conn->user        = $user;
         $conn->host        = $host;
-        
+
         if ($my_prefs['sort_field'] == 'INTERNALDATE') {
                 $IMAP_USE_INTERNAL_DATE = true;
@@ -586 +579 @@
                 $IMAP_USE_INTERNAL_DATE = false;
         }
-        
+
         //check input
         if (empty($host)) {
@@ -661 +654 @@
                         
                         // Now we're authenticated, capabilities need to be reread
-                        iil_ClearCapability();
+                        iil_C_ClearCapability($conn);
                 }
         }
@@ -706 +699 @@
 
         if (is_resource($result)) {
+        if ($my_prefs['force_caps']) {
+                        iil_C_ClearCapability($conn);
+        }
                 iil_C_Namespace($conn);
                 return $conn;