Changeset 2448 in subversion

Timestamp:

May 2, 2009 3:19:39 PM (4 years ago)

Author:

alec

Message:

• Use UID STORE/COPY commands

Location:

trunk/roundcubemail/program

Files:

• include/rcube_imap.php (modified) (7 diffs)
• lib/imap.inc (modified) (3 diffs)

trunk/roundcubemail/program/include/rcube_imap.php

@@ -1550 +1550 @@
     {
     $flag = strtoupper($flag);
-    $msg_ids = array();
     if (!is_array($uids))
       $uids = explode(',',$uids);
       
-    foreach ($uids as $uid) {
-      $msg_ids[$uid] = $this->_uid2id($uid);
-    }
-      
     if ($flag=='UNDELETED')
-      $result = iil_C_Undelete($this->conn, $this->mailbox, join(',', array_values($msg_ids)));
+      $result = iil_C_Undelete($this->conn, $this->mailbox, join(',', $uids));
     else if ($flag=='UNSEEN')
-      $result = iil_C_Unseen($this->conn, $this->mailbox, join(',', array_values($msg_ids)));
+      $result = iil_C_Unseen($this->conn, $this->mailbox, join(',', $uids));
     else if ($flag=='UNFLAGGED')
-      $result = iil_C_UnFlag($this->conn, $this->mailbox, join(',', array_values($msg_ids)), 'FLAGGED');
+      $result = iil_C_UnFlag($this->conn, $this->mailbox, join(',', $uids), 'FLAGGED');
     else
-      $result = iil_C_Flag($this->conn, $this->mailbox, join(',', array_values($msg_ids)), $flag);
+      $result = iil_C_Flag($this->conn, $this->mailbox, join(',', $uids), $flag);
 
     // reload message headers if cached
@@ -1571 +1566 @@
     if ($this->caching_enabled)
       {
-      foreach ($msg_ids as $uid => $id)
-        {
-        if ($cached_headers = $this->get_cached_message($cache_key, $uid))
+      foreach ($uids as $uid)
+        {
+        $id = $this->_uid2id($uid);
+        if ($cached_headers = $this->get_cached_message($cache_key, $id))
           {
           $this->remove_message_cache($cache_key, $id);
@@ -1586 +1582 @@
 
     // set nr of messages that were flaged
-    $count = count($msg_ids);
+    $count = count($uids);
 
     // clear message count cache
@@ -1651 +1647 @@
     
     // exit if no message uids are specified
-    if (!is_array($a_uids))
+    if (!is_array($a_uids) || empty($a_uids))
       return false;
 
-    // convert uids to message ids
-    $a_mids = array();
-    foreach ($a_uids as $uid)
-      $a_mids[] = $this->_uid2id($uid, $from_mbox);
-
-    $iil_move = iil_C_Move($this->conn, join(',', $a_mids), $from_mbox, $to_mbox);
+    $iil_move = iil_C_Move($this->conn, join(',', $a_uids), $from_mbox, $to_mbox);
     $moved = !($iil_move === false || $iil_move < 0);
     
@@ -1675 +1666 @@
     // moving failed
     else if (rcmail::get_instance()->config->get('delete_always', false)) {
-      return iil_C_Delete($this->conn, $from_mbox, join(',', $a_mids));
+      return iil_C_Delete($this->conn, $from_mbox, join(',', $a_uids));
     }
       
     // remove message ids from search set
-    if ($moved && $this->search_set && $from_mbox == $this->mailbox)
+    if ($moved && $this->search_set && $from_mbox == $this->mailbox) {
+      foreach ($a_uids as $uid)
+        $a_mids[] = $this->_uid2id($uid, $from_mbox);
       $this->search_set = array_diff($this->search_set, $a_mids);
-
+    }
     // update cached message headers
     $cache_key = $from_mbox.'.msg';
@@ -1716 +1709 @@
     
     // exit if no message uids are specified
-    if (!is_array($a_uids))
+    if (!is_array($a_uids) || empty($a_uids))
       return false;
 
-    // convert uids to message ids
-    $a_mids = array();
-    foreach ($a_uids as $uid)
-      $a_mids[] = $this->_uid2id($uid, $mailbox);
-        
-    $deleted = iil_C_Delete($this->conn, $mailbox, join(',', $a_mids));
+    $deleted = iil_C_Delete($this->conn, $mailbox, join(',', $a_uids));
     
     // send expunge command in order to have the deleted message
@@ -1736 +1724 @@
 
     // remove message ids from search set
-    if ($deleted && $this->search_set && $mailbox == $this->mailbox)
+    if ($deleted && $this->search_set && $mailbox == $this->mailbox) {
+      foreach ($a_uids as $uid)
+        $a_mids[] = $this->_uid2id($uid, $mailbox);
       $this->search_set = array_diff($this->search_set, $a_mids);
-
+    }
+    
     // remove deleted messages from cache
     $cache_key = $mailbox.'.msg';

trunk/roundcubemail/program/lib/imap.inc

@@ -2081 +2081 @@
         if (iil_C_Select($conn, $mailbox)) {
                 $c = 0;
-                iil_PutLine($fp, "flg STORE $messages " . $mod . "FLAGS (" . $flag . ")");
+                iil_PutLine($fp, "flg UID STORE $messages " . $mod . "FLAGS (" . $flag . ")");
                 do {
                         $line=chop(iil_ReadLine($fp, 100));
@@ -2130 +2130 @@
                 $c=0;
                 
-                iil_PutLine($fp, "cpy1 COPY $messages \"".iil_Escape($to)."\"");
+                iil_PutLine($fp, "cpy1 UID COPY $messages \"".iil_Escape($to)."\"");
                 $line=iil_ReadReply($fp);
                 return iil_ParseResult($line);
@@ -2844 +2844 @@
         $num_in_trash = iil_C_CountMessages($conn, $folder);
         if ($num_in_trash > 0) {
-                iil_C_Delete($conn, $folder, '1:' . $num_in_trash);
+                iil_C_Delete($conn, $folder, '1:*');
         }
         return (iil_C_Expunge($conn, $folder) >= 0);