From 326e87a5d66f0e9a2cd5f34a6e27cd056b9746ad Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 1 May 2006 18:07:17 +0000
Subject: [PATCH] Pimped search function

---
 CHANGELOG                            |   3 +++
 program/include/rcube_imap.inc       |   4 ++--
 skins/default/images/icons/reset.gif | Bin 156 -> 164 bytes
 skins/default/images/searchfield.gif | Bin 0 -> 484 bytes
 skins/default/mail.css               |  23 +++++++++++++++++++----
 skins/default/templates/mail.html    |   2 +-
 6 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 skins/default/images/searchfield.gif

diff --git a/CHANGELOG b/CHANGELOG
index a23a22115..a0cab461d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
 
+2006/05/01
+----------
+- Pimped search function
 - Applied prev/next patch by Leonard Bouchet
 - Applied patches by Mark Bucciarelli
 - Applied patch for requesting receipts by Salvatore Ansani
diff --git a/program/include/rcube_imap.inc b/program/include/rcube_imap.inc
index 5450f07e7..30e6eb8d2 100644
--- a/program/include/rcube_imap.inc
+++ b/program/include/rcube_imap.inc
@@ -55,7 +55,7 @@ class rcube_imap
   var $default_folders = array('inbox', 'drafts', 'sent', 'junk', 'trash');
   var $cache = array();
   var $cache_keys = array();  
-  var $cache_changes = array();  
+  var $cache_changes = array();
   var $uid_id_map = array();
   var $msg_headers = array();
   var $capabilities = array();
@@ -856,7 +856,7 @@ class rcube_imap
     $mailbox = $mbox ? $this->_mod_mailbox($mbox) : $this->mailbox;
     if ($str && $criteria)
       {
-      $criteria .= " \"$str\"";
+      $criteria .= ' CHARSET UTF-8 "'.UTF7EncodeString($str).'"';
       return $this->_search_index($mailbox, $criteria);
       }
     else
diff --git a/skins/default/images/icons/reset.gif b/skins/default/images/icons/reset.gif
index 1bdbc5b2aa3574e06358c351faea55bd37c7049c..a9a53d569c35ffd789f118c10fa13087aa442710 100644
GIT binary patch
literal 164
zcmV;V09*e@Nk%w1VGRHc0J9GOxw*N!ySwJ*=J4?F#Kgqz?(X{f`u_g@@9*!$#l_j#
z*~iDn+}zy%|NpwWy8r+GA^8LW000jFEC2ui01W^Q000D0@X2?oF>^MgR#-}bNsW*=
zD4Gc4aHc3g6i=f7PQy4%gDQu{0@W*`7QsNuhzc}>M4b+|cq&jjp3k9ZJP<FKgD@bO
S#49g};{hSmnWsDx0RTIh@=o#q

literal 156
zcmV;N0Av40Nk%w1VG;lk0HOu}xw*Oe`ufMm$NT&H*Voto|Nr&%^}4#cA^8LW000I6
zEC2ui01^NY000AFXu2^TD@I7fIf57{&8WZ;h8f2YVtTEF30c@0W6>uH1$qz#+$sau
zF2~bh28x1gm|GT-OI}m<^azW^l>q6{;dDG7_jM7*00K$CxV-#ol_i?MRU6_Mjj7WZ
K6bcR<2>?6qsX^-i

diff --git a/skins/default/images/searchfield.gif b/skins/default/images/searchfield.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b1dc9389ee863978757c6bbdbb0f2ea11557abd0
GIT binary patch
literal 484
zcmV<A0UQ2DNk%w1VYUDh0J8u9qobqU-QD{7`qI+U<KyG$>FI}uhrqzVw6wJL_V&le
z$9H#k@$vE4*x3I5{{R2~A^8LV00000EC2ui0JZ=V000F4Fv&R(Fe~fLyZ>M)j$~<`
zC};pkGrbdmtjKXFc&_h!@BhG{a7Zi~k3E~kfFQsm4FKTKAQTwbtai)odcWYXcuX#v
z&)))}age%R1lFLC5C|OjJpRG&`~QG}f`f#GhKGoWiiLWA2?Z4ZP7@Xl3<3o+3rq!z
zo}ZwhqNAb=Q3w-J1D6E=8~~l9va__cwtNf&0B;8f1$PLW2mzW1x5voI%6ynL5(onc
zco+u^2@D6D4$Iu#-iiqo5&!{r0vW##m>B}!?(gsd0RZFa0@Quk2JP_u{>Yf<CGgcw
zKrjOe5-7j`fZxA|5JfeUaDYHN2lG5Ih{&;HA^`-E4oDc#;Ep<C7*=T5=&_~CJ`Myl
zh?anW0tVY+GEh^XK!6MeSiT$@(E$SmlfsqD8Pkq{1V0zVB1*Mi%m6ecK>D@qj{~SB
ztBQ3Ob1RHB7Wa%@3l9&-Do-9YXmI6@p1XMS>fOt?uiw9b0}CDuSisJ?bmD3aFt@Se
a$B-jSo=my2<;$2eYu=1GK;jn>0027;%h^!?

literal 0
HcmV?d00001

diff --git a/skins/default/mail.css b/skins/default/mail.css
index 8cfb954b1..6d1d221ee 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -468,15 +468,18 @@ body.messagelist
   position: absolute;
   top: 60px;
   right: 40px;
-  width: 200px;
+  width: 182px;
   height: 20px;
   text-align: right;
+  background: url('images/searchfield.gif') top left no-repeat;
 }
 
 #quicksearchbar a
 {
+  position: absolute;
+  top: 3px;
+  right: 4px;
   text-decoration: none;
-  padding-left: 5px;
 }
 
 #quicksearchbar img
@@ -486,11 +489,23 @@ body.messagelist
 
 #quicksearchbox
 {
-  width: 150px;
-  border: 1px solid #999999;
+  position: absolute;
+  top: 2px;
+  left: 20px;
+  width: 140px;
+  font-size: 11px;
+  padding: 0px;
+  border: none;
 }
 
 
+/*\*/
+html>body*#quicksearchbar { background-image: none; }
+html>body*#quicksearchbar a { top: 5px; }
+html>body*#quicksearchbar #quicksearchbox { width: 180px; top:0px; right: 1px; left: auto; }
+/**/
+
+
 #rcversion
 {
   position: absolute;
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index 7cb7efc12..e866baa07 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -20,7 +20,7 @@
 </div>
 
 <div id="quicksearchbar">
-<roundcube:object name="searchform" id="quicksearchbox" /><roundcube:button command="reset-search" image="/images/icons/reset.gif" title="resetsearch" />
+<roundcube:object name="searchform" type="search" results="5" id="quicksearchbox" /><roundcube:button command="reset-search" id="searchreset" image="/images/icons/reset.gif" title="resetsearch" />
 </div>
 
 <div id="messagecountbar">