Changeset 3446 in subversion

Timestamp:

Mar 31, 2010 3:14:32 AM (3 years ago)

Author:

alec

Message:

• fix save/delete draft message with enabled threading (#1486596)
• performance improvement using UID SEARCH intead of SEARCH + FETCH
• re-fix r3445

Location:

trunk/roundcubemail/program

Files:

• include/rcube_imap.php (modified) (1 diff)
• include/rcube_imap_generic.php (modified) (4 diffs)
• steps/mail/sendmail.inc (modified) (2 diffs)

trunk/roundcubemail/program/include/rcube_imap.php

@@ -1415 +1415 @@
     }
     
+
+    /**
+     * 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);
+    }
+
   
     /**

trunk/roundcubemail/program/include/rcube_imap_generic.php

@@ -367 +367 @@
     
         // 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
@@ -1554 +1554 @@
     }
 
-    function search($folder, $criteria)
+    function search($folder, $criteria, $return_uid=false)
     {
             if (!$this->select($folder)) {
@@ -1561 +1561 @@
 
         $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());
@@ -2151 +2152 @@
     }
 
-    private function xor($string, $string2)
+    private function _xor($string, $string2)
     {
             $result = '';

trunk/roundcubemail/program/steps/mail/sendmail.inc

@@ -618 +618 @@
     {
     // delete previous saved draft
-    $a_deleteid = $IMAP->search($CONFIG['drafts_mbox'], 'HEADER Message-ID '.$olddraftmessageid);
-
-    $deleted = $IMAP->delete_message($IMAP->get_uid($a_deleteid[0], $CONFIG['drafts_mbox']), $CONFIG['drafts_mbox']);
+    $a_deleteid = $IMAP->search_once($CONFIG['drafts_mbox'],
+        'HEADER Message-ID '.$olddraftmessageid, true);
+    $deleted = $IMAP->delete_message($a_deleteid, $CONFIG['drafts_mbox']);
 
     // raise error if deletion of old draft failed
@@ -640 +640 @@
   
   // remember new draft-uid
-  $draftids = $IMAP->search($CONFIG['drafts_mbox'], 'HEADER Message-ID '.$msgid);
-  $_SESSION['compose']['param']['_draft_uid'] = $IMAP->get_uid($draftids[0], $CONFIG['drafts_mbox']);
+  $draftuids = $IMAP->search_once($CONFIG['drafts_mbox'], 'HEADER Message-ID '.$msgid, true);
+  $_SESSION['compose']['param']['_draft_uid'] = $draftuids[0];
 
   // display success