Make list existence determination optional when getting message data

horde · Jan 14, 2015 · 0a72dd2 · 0a72dd2 · joaomachado · Jan 14, 2015
1 parent 98f6a93
commit 0a72dd2
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 10 deletions.
diff --git a/imp/js/smartmobile.js b/imp/js/smartmobile.js
@@ -717,7 +717,8 @@ var ImpMobile = {
             $.extend(ImpMobile.addViewportParams($.extend(params, {
                 view: purl.params.mbox
             })), {
-                buid: purl.params.buid
+                buid: purl.params.buid,
+                is_list: 1
             }),
             ImpMobile.messageLoaded
         );
@@ -810,7 +811,7 @@ var ImpMobile = {
             subject: data.subject,
             to: data.to
         };
-        ImpMobile.listmsg = (data.list_info && data.list_info.exists);
+        ImpMobile.listmsg = data.is_list;
         ImpMobile.rowid = r.buid;
 
         $.fn[cache.readonly ? 'hide' : 'show'].call($('#imp-message-delete'));

diff --git a/imp/lib/Ajax/Application/Handler/Common.php b/imp/lib/Ajax/Application/Handler/Common.php
@@ -654,6 +654,7 @@ public function redirectMessage()
      * See the list of variables needed for changed() and
      * checkUidvalidity(). Mailbox/indices form parameters needed. Additional
      * variables used:
+     *   - is_list: (boolean) If true, check for list existence.
      *   - peek: (integer) If set, don't set seen flag.
      *   - preview: (integer) If set, return preview data. Otherwise, return
      *              full data.
@@ -676,7 +677,14 @@ public function showMessage()
                 throw new IMP_Exception(_("Could not open mailbox."));
             }
 
-            $this->_base->queue->message($this->_base->indices, $this->vars->preview, $this->vars->peek);
+            $this->_base->queue->message(
+                $this->_base->indices,
+                array(
+                    'is_list' => (bool)$this->vars->is_list,
+                    'peek' => (bool)$this->vars->peek,
+                    'preview' => (bool)$this->vars->preview
+                )
+            );
 
             /* Explicitly load the message here; non-existent messages are
              * ignored when the Ajax queue is processed. Place the check AFTER

diff --git a/imp/lib/Ajax/Application/Handler/Dynamic.php b/imp/lib/Ajax/Application/Handler/Dynamic.php
@@ -935,7 +935,10 @@ public function stripAttachment()
         $result = new stdClass;
         $result->puids = $this->_base->previewUids();
 
-        $this->_base->queue->message($this->_base->indices, true);
+        $this->_base->queue->message(
+            $this->_base->indices,
+            array('preview' => true)
+        );
         $this->_base->addTask('viewport', $this->_base->viewPortData(true));
 
         return $result;

diff --git a/imp/lib/Ajax/Queue.php b/imp/lib/Ajax/Queue.php
@@ -441,19 +441,22 @@ public function flagConfig($view)
      * Add message data to output.
      *
      * @param IMP_Indices $indices  Index of the message.
-     * @param boolean $preview      Preview data?
-     * @param boolean $peek         Don't set seen flag?
+     * @param array $opts           Additional options:
+     * <pre>
+     *   - is_list: (boolean) Do list check?
+     *   - peek: (boolean) Don't set seen flag?
+     *   - preview: (boolean) Preview data?
+     * </pre>
      */
-    public function message(IMP_Indices $indices, $preview = false,
-                            $peek = false)
+    public function message(IMP_Indices $indices, array $opts = array())
     {
         global $page_output;
 
         try {
-            $show_msg = new IMP_Ajax_Application_ShowMessage($indices, $peek);
+            $show_msg = new IMP_Ajax_Application_ShowMessage($indices, !empty($opts['peek']));
             $msg = (object)$show_msg->showMessage();
 
-            if ($preview) {
+            if (!empty($opts['preview'])) {
                 /* Need to grab cached inline scripts. */
                 Horde::startBuffer();
                 $page_output->outputInlineScript(true);
@@ -465,6 +468,13 @@ public function message(IMP_Indices $indices, $preview = false,
                 $msg->headers = $show_msg->getUserHeaders();
             }
 
+            if (!empty($opts['is_list'])) {
+                $list_info = $show_msg->contents->getListInformation();
+                if (!empty($list_info['exists'])) {
+                    $msg->is_list = true;
+                }
+            }
+
             $msg->save_as = strval($msg->save_as);
 
             if ($indices instanceof IMP_Indices_Mailbox) {