Fix capability retrieval for "double" cases in server capability response, for instan...

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11162 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index f64500bc1ed2614611a1d1c06b81d6c36bcd5831..f713329fec716e68c8953956f4f4cd439cd66a09 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -59,6 +59,8 @@ Version 1.5.2 - CVS
   - Take X-Forwarded-Host HTTP header in consideration when constructing
     base_uri for redirects; reduces problems with transparent proxies
     (#1488590).
+  - Fixed server capability retrieval for "double" cases in capability
+    response, like "FOO FOO=bar".
 
 Version 1.5.1 (branched on 2006-02-12)
 --------------------------------------

diff --git a/functions/imap_general.php b/functions/imap_general.php
index 01d51f347500a116f1b4ce0983ad36e8b843d864..a4820491378a0bc77d75d5497ca6ec62705f9186 100755 (executable)
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -954,9 +954,18 @@ function sqimap_capability($imap_stream, $capability='', $bUseCache=true) {
         for ($i=2; $i < count($c); $i++) {
             $cap_list = explode('=', $c[$i]);
             if (isset($cap_list[1])) {
+                if(isset($sqimap_capabilities[trim($cap_list[0])]) &&
+                 !is_array($sqimap_capabilities[trim($cap_list[0])])) {
+                    // Remove array key that was added in 'else' block below
+                    // This is to accomodate for capabilities like:
+                    // SORT SORT=MODSEQ
+                    unset($sqimap_capabilities[trim($cap_list[0])]);
+                }
                 $sqimap_capabilities[trim($cap_list[0])][] = $cap_list[1];
             } else {
-                $sqimap_capabilities[trim($cap_list[0])] = TRUE;
+                if(!isset($sqimap_capabilities[trim($cap_list[0])])) {
+                    $sqimap_capabilities[trim($cap_list[0])] = TRUE;
+                }
             }
         }
     }