From 6f31b356b2b21882b439324d233aceec413f4737 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 31 Mar 2010 07:14:32 +0000
Subject: - fix save/delete draft message with enabled threading (#1486596) -
 performance improvement using UID SEARCH intead of SEARCH + FETCH - re-fix
 r3445

---
 program/include/rcube_imap.php         | 21 +++++++++++++++++++++
 program/include/rcube_imap_generic.php |  9 +++++----
 2 files changed, 26 insertions(+), 4 deletions(-)

(limited to 'program/include')

diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 26d0ef48a..7dc70df32 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -1414,6 +1414,27 @@ class rcube_imap
         return $a_messages;
     }
     
+
+    /**
+     * Direct (real and simple) SEARCH request to IMAP server,
+     * without result sorting and caching
+     *
+     * @param  string  Mailbox name to search in
+     * @param  string  Search string
+     * @param  boolean True if UIDs should be returned
+     * @return array   Search results as list of message IDs or UIDs
+     * @access public
+     */
+    function search_once($mbox_name='', $str=NULL, $ret_uid=false)
+    {
+        if (!$str)
+            return false;
+    
+        $mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
+
+        return $this->conn->search($mailbox, $str, $ret_uid);
+    }
+
   
     /**
      * Sort thread
diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php
index ed2788a02..41c053da2 100644
--- a/program/include/rcube_imap_generic.php
+++ b/program/include/rcube_imap_generic.php
@@ -366,7 +366,7 @@ class rcube_imap_generic
         }
     
         // generate hash
-        $hash  = md5($this->xor($pass,$opad) . pack("H*", md5($this->xor($pass, $ipad) . base64_decode($encChallenge))));
+        $hash  = md5($this->_xor($pass,$opad) . pack("H*", md5($this->_xor($pass, $ipad) . base64_decode($encChallenge))));
     
         // generate reply
         $reply = base64_encode($user . ' ' . $hash);
@@ -1553,18 +1553,19 @@ class rcube_imap_generic
 	    return false;	
     }
 
-    function search($folder, $criteria)
+    function search($folder, $criteria, $return_uid=false)
     {
 	    if (!$this->select($folder)) {
     		return false;
 	    }
 
     	$data = '';
-	    $query = "srch1 SEARCH " . chop($criteria);
+	    $query = 'srch1 ' . ($return_uid ? 'UID ' : '') . 'SEARCH ' . chop($criteria);
 
 	    if (!$this->putLineC($query)) {
 		    return false;
 	    }
+
     	do {
 	    	$line = trim($this->readLine());
 		    if ($this->startsWith($line, '* SEARCH')) {
@@ -2150,7 +2151,7 @@ class rcube_imap_generic
 	    return $result;
     }
 
-    private function xor($string, $string2)
+    private function _xor($string, $string2)
     {
 	    $result = '';
 	    $size = strlen($string);
-- 
cgit v1.2.3