[mms] Fix parsing mailbox name from STATUS response on servers that h…

…ave the UTF8 extension enabled.
horde · Apr 27, 2015 · 12b0542 · 12b0542
1 parent 62b549f
commit 12b0542
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php b/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php
@@ -1670,9 +1670,12 @@ protected function _status($mboxes, $flags)
      */
     protected function _parseStatus(Horde_Imap_Client_Tokenize $data)
     {
-        // Mailbox name is in UTF7-IMAP
+        // Mailbox name is in UTF7-IMAP (unless UTF8 has been enabled).
         $mbox_ob = $this->_mailboxOb(
-            Horde_Imap_Client_Mailbox::get($data->next(), true)
+            Horde_Imap_Client_Mailbox::get(
+                $data->next(),
+                !$this->_capability()->isEnabled('UTF8=ACCEPT')
+            )
         );
 
         $data->next();

diff --git a/framework/Imap_Client/package.xml b/framework/Imap_Client/package.xml
@@ -21,6 +21,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
+* [mms] Fix parsing mailbox name from STATUS response on servers that have the UTF8 extension enabled.
 * [jan] Fix searching with non-ASCII strings in AND/OR-combined searches.
 * [jan] Fix issues with certain locales like Turkish.
 * [mms] Pipeline ID command with other commands, if possible.
@@ -2860,6 +2861,7 @@
    <date>2015-03-25</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
+* [mms] Fix parsing mailbox name from STATUS response on servers that have the UTF8 extension enabled.
 * [jan] Fix searching with non-ASCII strings in AND/OR-combined searches.
 * [jan] Fix issues with certain locales like Turkish.
 * [mms] Pipeline ID command with other commands, if possible.

diff --git a/framework/Imap_Client/test/Horde/Imap/Client/Live/Imap.php b/framework/Imap_Client/test/Horde/Imap/Client/Live/Imap.php
@@ -323,6 +323,16 @@ public function testStatus()
             Horde_Imap_Client::STATUS_FIRSTUNSEEN | Horde_Imap_Client::STATUS_FLAGS | Horde_Imap_Client::STATUS_PERMFLAGS | Horde_Imap_Client::STATUS_HIGHESTMODSEQ | Horde_Imap_Client::STATUS_UIDNOTSTICKY
         );
         $this->assertInternalType('array', $s);
+
+        // Github Issue #134 (UTF8 mailbox)
+        $s = self::$live->status(
+            self::$test_mbox_utf8,
+            Horde_Imap_Client::STATUS_MESSAGES
+        );
+        $this->assertEquals(
+            0,
+            $s['messages']
+        );
     }
 
     /**