[mms] Only refresh quota information when switching to a mailbox the …

…first time. see Bug #12907
horde · Feb 27, 2014 · c2049df · c2049df
1 parent 5d93ee4
commit c2049df
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
@@ -2,6 +2,8 @@
 v6.2.0-git
 ----------
 
+[mms] Only refresh quota information when switching to a mailbox the first
+      time.
 [mms] More efficiently store mailbox cache information in the session.
 [mms] Load copy/move mailbox selection list on-demand in smartmobile view.
 [mms] Cache results of inline image view status.

diff --git a/imp/lib/Ajax/Application/Handler/Common.php b/imp/lib/Ajax/Application/Handler/Common.php
@@ -37,8 +37,6 @@ public function poll()
          * separate poll action because there are other tasks done when
          * specifically requesting a poll. */
 
-        $this->_base->queue->quota($this->_base->indices->mailbox);
-
         if ($this->_base->changed()) {
             $this->_base->addTask('viewport', $this->_base->viewPortData(true));
         }
@@ -122,6 +120,10 @@ public function viewPort()
             $this->_base->addTask('viewport', $vp);
         }
 
+        if ($vp_vars->checkcache) {
+            $this->_base->queue->quota($this->_base->indices->mailbox);
+        }
+
         return $result;
     }
 

diff --git a/imp/lib/Ajax/Application/Handler/Dynamic.php b/imp/lib/Ajax/Application/Handler/Dynamic.php
@@ -392,8 +392,6 @@ public function listMailboxes()
             array_unique(iterator_to_array($iterator, false))
         );
 
-        $this->_base->queue->quota($this->_base->indices->mailbox);
-
         if ($this->vars->initial) {
             $session->start();
         }

diff --git a/imp/lib/Ajax/Application/ListMessages.php b/imp/lib/Ajax/Application/ListMessages.php
@@ -175,6 +175,9 @@ public function listMessages($args)
 
         /* Actions only done on 'initial' request. */
         if ($args['initial']) {
+            /* Load queue information on original request. */
+            $injector->getInstance('IMP_Ajax_Queue')->quota($mbox);
+
             if (!$mbox->is_imap) {
                 $result->setMetadata('pop3', 1);
             }

diff --git a/imp/package.xml b/imp/package.xml
@@ -33,6 +33,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
+* [mms] Only refresh quota information when switching to a mailbox the first time.
 * [mms] More efficiently store mailbox cache information in the session.
 * [mms] Load copy/move mailbox selection list on-demand in smartmobile view.
 * [mms] Cache results of inline image view status.