Changeset 2540 in subversion for trunk/roundcubemail/program/lib/imap.inc

Timestamp:

May 26, 2009 4:50:10 AM (4 years ago)

Author:

alec

Message:

• Support UID EXPUNGE: remove only moved/deleted messages

File:

• trunk/roundcubemail/program/lib/imap.inc (modified) (3 diffs)

trunk/roundcubemail/program/lib/imap.inc

@@ -83 +83 @@
                 - removed caching functions
                 - handling connection startup response
+                - added UID EXPUNGE support
 
 ********************************************************/
@@ -1864 +1865 @@
 }
 
-function iil_C_Expunge(&$conn, $mailbox) {
+function iil_C_Expunge(&$conn, $mailbox, $messages=NULL) {
 
         if (iil_C_Select($conn, $mailbox)) {
                 $c = 0;
-                iil_PutLine($conn->fp, "exp1 EXPUNGE");
+                $command = $messages ? "UID EXPUNGE $messages" : "EXPUNGE";
+
+                iil_PutLine($conn->fp, "exp1 $command");
                 do {
                         $line=chop(iil_ReadLine($conn->fp, 100));
@@ -2031 +2034 @@
 
 function iil_C_Move(&$conn, $messages, $from, $to) {
-    $fp = $conn->fp;
 
     if (!$from || !$to) {
         return -1;
     }
-    $r = iil_C_Copy($conn, $messages, $from,$to);
+    
+    $r = iil_C_Copy($conn, $messages, $from, $to);
+
     if ($r==0) {
         return iil_C_Delete($conn, $from, $messages);