Changeset 4137 in subversion

Timestamp:

Oct 26, 2010 4:43:23 AM (3 years ago)

Author:

alec

Message:

• Improve pre-auth and auth capabilities handling

File:

• trunk/roundcubemail/program/include/rcube_imap_generic.php (modified) (8 diffs)

trunk/roundcubemail/program/include/rcube_imap_generic.php

@@ -513 +513 @@
             // optional CAPABILITY response
                 if ($line && preg_match('/\[CAPABILITY ([^]]+)\]/i', $line, $matches)) {
-                        $this->parseCapability($matches[1]);
+                        $this->parseCapability($matches[1], true);
                 }
             return $this->fp;
@@ -539 +539 @@
         // re-set capabilities list if untagged CAPABILITY response provided
             if (preg_match('/\* CAPABILITY (.+)/i', $response, $matches)) {
-                    $this->parseCapability($matches[1]);
+                    $this->parseCapability($matches[1], true);
             }
 
@@ -747 +747 @@
             // RFC3501 [7.1] optional CAPABILITY response
             if (preg_match('/\[CAPABILITY ([^]]+)\]/i', $line, $matches)) {
-                    $this->parseCapability($matches[1]);
-            $this->capability_readed = true;
+                    $this->parseCapability($matches[1], true);
             }
 
@@ -796 +795 @@
         }
 
+        // pre-login capabilities can be not complete
+        $this->capability_readed = false;
+
         // Authenticate
         foreach ($auth_methods as $method) {
@@ -819 +821 @@
             if (is_resource($result)) {
             if ($this->prefs['force_caps']) {
-                // forget current capabilities
                             $this->clearCapability();
-            } else {
-                // pre-login capabilities can be not complete
-                $this->capability_readed = false;
             }
                     $this->getRootDir();
@@ -2859 +2857 @@
             && preg_match('/\[CAPABILITY ([^]]+)\]/i', $line, $matches)
         ) {
-                    $this->parseCapability($matches[1]);
+                    $this->parseCapability($matches[1], true);
             }
 
@@ -3000 +2998 @@
     }
 
-    private function parseCapability($str)
+    private function parseCapability($str, $trusted=false)
     {
         $str = preg_replace('/^\* CAPABILITY /i', '', $str);
@@ -3008 +3006 @@
         if (!isset($this->prefs['literal+']) && in_array('LITERAL+', $this->capability)) {
             $this->prefs['literal+'] = true;
+        }
+
+        if ($trusted) {
+            $this->capability_readed = true;
         }
     }