From 3f9fb4899d12cb4371805c1daa088b20e73dca89 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Thu, 17 Sep 2009 15:13:42 -0600
Subject: [PATCH] Add To to the list of quicksearch criteria

---
 imp/js/DimpBase.js                 |  1 +
 imp/lib/Views/ListMessages.php     | 17 +++++++++++++----
 imp/templates/index/index-dimp.inc |  1 +
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/imp/js/DimpBase.js b/imp/js/DimpBase.js
index eb770d05e..fd622a1e5 100644
--- a/imp/js/DimpBase.js
+++ b/imp/js/DimpBase.js
@@ -788,6 +788,7 @@ var DimpBase = {
         case 'ctx_qsearchopts_all':
         case 'ctx_qsearchopts_body':
         case 'ctx_qsearchopts_from':
+        case 'ctx_qsearchopts_to':
         case 'ctx_qsearchopts_subject':
             DIMP.conf.qsearchfield = id.substring(16);
             this._updatePrefs('dimp_qsearch_field', DIMP.conf.qsearchfield);
diff --git a/imp/lib/Views/ListMessages.php b/imp/lib/Views/ListMessages.php
index 8105947a3..2df269929 100644
--- a/imp/lib/Views/ListMessages.php
+++ b/imp/lib/Views/ListMessages.php
@@ -32,17 +32,26 @@ class IMP_Views_ListMessages
             /* Create the search query. */
             $query = new Horde_Imap_Client_Search_Query();
 
-            switch ($GLOBALS['prefs']->getValue('dimp_qsearch_field')) {
+            $field = $GLOBALS['prefs']->getValue('dimp_qsearch_field');
+            switch ($field) {
             case 'body':
                 $query->text($args['qsearch'], true);
                 break;
 
             case 'from':
-                $query->headerText('From', $args['qsearch']);
+            case 'subject':
+                $query->headerText($field, $args['qsearch']);
                 break;
 
-            case 'subject':
-                $query->headerText('Subject', $args['qsearch']);
+            case 'to':
+                $query2 = new Horde_Imap_Client_Search_Query();
+                $query2->headerText('cc', $args['qsearch']);
+
+                $query3 = new Horde_Imap_Client_Search_Query();
+                $query3->headerText('bcc', $args['qsearch']);
+
+                $query->headerText('to', $args['qsearch']);
+                $query->orSearch(array($query2, $query3));
                 break;
 
             case 'all':
diff --git a/imp/templates/index/index-dimp.inc b/imp/templates/index/index-dimp.inc
index e84524cd7..0b4d2e072 100644
--- a/imp/templates/index/index-dimp.inc
+++ b/imp/templates/index/index-dimp.inc
@@ -451,6 +451,7 @@ function _simpleButton($id, $text, $image, $imagedir = null)
  <a id="ctx_qsearchopts_all"><?php echo _("Entire Message") ?></a>
  <a id="ctx_qsearchopts_body"><?php echo _("Body") ?></a>
  <a id="ctx_qsearchopts_from"><?php echo _("From") ?></a>
+ <a id="ctx_qsearchopts_to"><?php echo _("To") ?></a>
  <a id="ctx_qsearchopts_subject"><?php echo _("Subject") ?></a>
 </div>
 <?php endif; ?>
-- 
2.11.0