Fix returning all mailboxes when not using subscriptions when using I…

…MP >= 6.2. Bug: 13177
horde · May 10, 2014 · 82ca72e · 82ca72e
1 parent 135b0e1
commit 82ca72e
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/framework/Core/lib/Horde/Core/ActiveSync/Imap/Factory.php b/framework/Core/lib/Horde/Core/ActiveSync/Imap/Factory.php
@@ -64,10 +64,19 @@ public function getImapOb()
      */
     public function getMailboxes($force = false)
     {
+        global $registry;
+
         if (empty($this->_mailboxlist) || $force) {
+            $subscriptions = $registry->horde->getPreference(
+                $registry->hasInterface('mail'),
+                'subscribe'
+            );
             try {
-                foreach ($GLOBALS['registry']->mail->mailboxList() as $mbox) {
-                    if ($mbox['a'] & self::MASK_SUBSCRIBED && strpos($mbox['ob']->utf8, "impsearch\000") === false) {
+                foreach ($registry->mail->mailboxList() as $mbox) {
+                    // @HACK. Don't like having to check for imp specific
+                    //        mailbox strings here but don't see anyway around it.
+                    if (strpos($mbox['ob']->utf8, "impsearch\000") === false &&
+                        (!$subscriptions  || ($mbox['a'] & self::MASK_SUBSCRIBED))) {
                         $this->_mailboxlist[$mbox['ob']->utf8] = $mbox;
                     }
                 }