Only send message id information to browser if there is a chance of f…

…inding sent message in search
horde · Mar 9, 2015 · 9f30856 · 9f30856
1 parent cc32c1c
commit 9f30856
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 6 deletions.
diff --git a/imp/js/core.js b/imp/js/core.js
@@ -296,9 +296,12 @@ var ImpCore = {
                     entry.m.escapeHTML()
                 );
             if (entry.s) {
-                li = li.wrap('A', {
-                    className: 'imp-maillog-sent'
-                }).store('msgid', entry.s);
+                li = li
+                    .wrap('A', {
+                        className: 'imp-maillog-sent'
+                    })
+                    .store('msgid', entry.s)
+                    .store('type', entry.t);
             }
             df.appendChild(li);
         });

diff --git a/imp/lib/Ajax/Queue.php b/imp/lib/Ajax/Queue.php
@@ -806,14 +806,14 @@ protected function _addMaillogInfo(IMP_Ajax_Application $ajax)
                     $tmp = array();
 
                     foreach ($l as $v3) {
-                        $tmp[] = array(
+                        $tmp[] = array_filter(array(
                             // 'm' = message
                             'm' => $v3->message,
                             // 's' = sent message-id
-                            's' => $v3->msg_id,
+                            's' => $v3->searchMailboxes() ? $v3->msg_id : null,
                             // 't' = type
                             't' => $v3->action
-                        );
+                        ));
                     }
 
                     if ($tmp) {

diff --git a/imp/lib/Maillog/Log/Sentmail.php b/imp/lib/Maillog/Log/Sentmail.php
@@ -70,4 +70,30 @@ public function addData()
         )));
     }
 
+    /**
+     * Return the mailboxes that can be searched to find the sent message.
+     *
+     * @return array  Array of arrays; each array is a group of mailboxes to
+     *                search in order of priority.
+     */
+    public function searchMailboxes()
+    {
+        $out = array();
+
+        $special = IMP_Mailbox::getSpecialMailboxes();
+
+        /* Check for sent-mail mailbox(es) first. */
+        if (!empty($special[IMP_Mailbox::SPECIAL_SENT])) {
+            $out[] = $special[IMP_Mailbox::SPECIAL_SENT];
+        }
+
+        /* Add trash mailbox as backup. */
+        if (!empty($special[IMP_Mailbox::SPECIAL_TRASH]) &&
+            !$special[IMP_Mailbox::SPECIAL_TRASH]->vtrash) {
+            $out[] = array($special[IMP_Mailbox::SPECIAL_TRASH]);
+        }
+
+        return $out;
+    }
+
 }