Changeset 1713 in subversion

Timestamp:

Sep 2, 2008 8:29:31 AM (5 years ago)

Author:

alec

Message:

• fixed and re-enabled (RFC3501 [7.1]) CAPABILITY optional response use

Location:

trunk/roundcubemail/program

Files:

• include/rcube_imap.php (modified) (4 diffs)
• lib/imap.inc (modified) (6 diffs)

trunk/roundcubemail/program/include/rcube_imap.php

@@ -60 +60 @@
   var $uid_id_map = array();
   var $msg_headers = array();
-  var $capabilities = array();
   var $skip_deleted = FALSE;
   var $search_set = NULL;
@@ -132 +131 @@
     if ($this->conn)
       {
-      $this->_parse_capability($this->conn->capability);
-      
       if (!empty($this->conn->delimiter))
         $this->delimiter = $this->conn->delimiter;
@@ -330 +327 @@
   function get_capability($cap)
     {
-    $cap = strtoupper($cap);
-    return $this->capabilities[$cap];
+    return iil_C_GetCapability($this->conn, strtoupper($cap));
     }
 
@@ -2579 +2575 @@
     
     return $uid;
-    }
-
-
-  /**
-   * Parse string or array of server capabilities and put them in internal array
-   * @access private
-   */
-  function _parse_capability($caps)
-    {
-    if (!is_array($caps))
-      $cap_arr = explode(' ', $caps);
-    else
-      $cap_arr = $caps;
-    
-    foreach ($cap_arr as $cap)
-      {
-      if ($cap=='CAPABILITY')
-        continue;
-
-      if (strpos($cap, '=')>0)
-        {
-        list($key, $value) = explode('=', $cap);
-        if (!is_array($this->capabilities[$key]))
-          $this->capabilities[$key] = array();
-          
-        $this->capabilities[$key][] = $value;
-        }
-      else
-        $this->capabilities[$cap] = TRUE;
-      }
     }
 

trunk/roundcubemail/program/lib/imap.inc

@@ -53 +53 @@
                 - Removed some debuggers (echo ...)
                 File altered by Aleksander Machniak <alec@alec.pl>
-                - RFC3501 [7.1] don't call CAPABILITY if was returned in server 
-                  optional resposne in iil_Connect()
                 - trim(chop()) replaced by trim()
                 - added iil_Escape() with support for " and \ in folder names
@@ -65 +63 @@
                 - removed flush() calls in iil_C_HandlePartBody() to prevent from memory leak (#1485187)
                 - don't return "??" from iil_C_GetQuota()
+                - RFC3501 [7.1] don't call CAPABILITY if was returned in server 
+                  optional resposne in iil_Connect(), added iil_C_GetCapability()
 
 ********************************************************/
@@ -127 +127 @@
         var $capability = array();
         var $permanentflags = array();
+        var $capability_readed = false;
 }
 
@@ -295 +296 @@
 }
 
+function iil_C_GetCapability(&$conn, $name)
+{
+        if (in_array($name, $conn->capability)) {
+                return $conn->capability[$name];
+        }
+        else if ($conn->capability_readed) {
+                return false;
+        }
+
+        // get capabilities (only once) because initial 
+        // optional CAPABILITY response may differ
+        $conn->capability = array();
+
+        iil_PutLine($conn->fp, "cp01 CAPABILITY");
+        do {
+                $line = trim(iil_ReadLine($conn->fp, 1024));
+                $a = explode(' ', $line);
+                if ($line[0] == '*') {
+                        while (list($k, $w) = each($a)) {
+                                if ($w != '*' && $w != 'CAPABILITY')
+                                        $conn->capability[] = strtoupper($w);
+                        }
+                }
+        } while ($a[0] != 'cp01');
+        
+        $conn->capability_readed = true;
+
+        if (in_array($name, $conn->capability)) {
+                return $conn->capability[$name];
+        }
+
+        return false;
+}
+
 function iil_C_Authenticate(&$conn, $user, $pass, $encChallenge) {
     
@@ -399 +434 @@
         global $my_prefs;
         
-        if (!in_array('NAMESPACE', $conn->capability)) {
+        if (!iil_C_GetCapability($conn, 'NAMESPACE')) {
             return false;
         }
@@ -517 +552 @@
 
         // RFC3501 [7.1] optional CAPABILITY response
-        // commented out, because it's not working always as should
-//      if (preg_match('/\[CAPABILITY ([^]]+)\]/i', $line, $matches)) {
-//              $conn->capability = explode(' ', $matches[1]);
-//      } else {
-                iil_PutLine($conn->fp, "cp01 CAPABILITY");
-                do {
-                        $line = trim(iil_ReadLine($conn->fp, 1024));
-
-                        $conn->message .= "$line\n";
-
-                        $a = explode(' ', $line);
-                        if ($line[0] == '*') {
-                                while (list($k, $w) = each($a)) {
-                                        if ($w != '*' && $w != 'CAPABILITY')
-                                        $conn->capability[] = $w;
-                                }
-                        }
-                } while ($a[0] != 'cp01');
-//      }
+        if (preg_match('/\[CAPABILITY ([^]]+)\]/i', $line, $matches)) {
+                $conn->capability = explode(' ', strtoupper($matches[1]));
+        }
 
         if (strcasecmp($auth_method, "check") == 0) {
                 //check for supported auth methods
-                
-                //default to plain text auth
-                $auth_method = 'plain';
-                        
-                //check for CRAM-MD5
-                foreach ($conn->capability as $c)
-                        if (strcasecmp($c, 'AUTH=CRAM_MD5') == 0 ||
-                                strcasecmp($c, 'AUTH=CRAM-MD5') == 0) {
-                                $auth_method = 'auth';
-                                break;
-                        }
+                if (iil_C_GetCapability($conn, 'AUTH=CRAM-MD5') || iil_C_GetCapability($conn, 'AUTH=CRAM_MD5')) {
+                        $auth_method = 'auth';
+                }
+                else {
+                        //default to plain text auth
+                        $auth_method = 'plain';
+                }
         }