Put multiple capability options in an array.

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

diff --git a/functions/imap_general.php b/functions/imap_general.php
index ce8720f4ddefd96fe170b5b74a3a6e8165192700..0224ce67fbe0f4171d02ef889f6bac6adfa849fc 100755 (executable)
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -873,11 +873,9 @@ function sqimap_capability($imap_stream, $capability='') {
         for ($i=2; $i < count($c); $i++) {
             $cap_list = explode('=', $c[$i]);
             if (isset($cap_list[1])) {
-                // FIX ME. capabilities can occure multiple times.
-                // THREAD=REFERENCES THREAD=ORDEREDSUBJECT
-                $sqimap_capabilities[$cap_list[0]] = $cap_list[1];
+                $sqimap_capabilities[trim($cap_list[0])][] = $cap_list[1];
             } else {
-                $sqimap_capabilities[$cap_list[0]] = TRUE;
+                $sqimap_capabilities[trim($cap_list[0])] = TRUE;
             }
         }
     }
@@ -1167,4 +1165,4 @@ function map_yp_alias($username) {
    return chop(substr($yp, strlen($username)+1));
 }
 
-?>
\ No newline at end of file
+?>