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

Timestamp:

Jul 11, 2009 10:34:48 AM (4 years ago)

Author:

alec

Message:

• Performance improvements by use UID commands (#1485690)

File:

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

trunk/roundcubemail/program/lib/imap.inc

@@ -2191 +2191 @@
 }
 
-function iil_C_FetchPartHeader(&$conn, $mailbox, $id, $part) {
+function iil_C_FetchPartHeader(&$conn, $mailbox, $id, $is_uid=false, $part=NULL) {
 
         $part = empty($part) ? 'HEADER' : $part.'.MIME';
 
-        return iil_C_HandlePartBody($conn, $mailbox, $id, $part);
-}
-
-function iil_C_HandlePartBody(&$conn, $mailbox, $id, $part='', $encoding=NULL, $print=NULL, $file=NULL) {
+        return iil_C_HandlePartBody($conn, $mailbox, $id, $is_uid, $part);
+}
+
+function iil_C_HandlePartBody(&$conn, $mailbox, $id, $is_uid=false, $part='', $encoding=NULL, $print=NULL, $file=NULL) {
         
         $fp     = $conn->fp;
@@ -2225 +2225 @@
                 // format request
                 $key     = 'ftch0';
-                $request = $key . " FETCH $id (BODY.PEEK[$part])";
+                $request = $key . ($is_uid ? ' UID' : '') . " FETCH $id (BODY.PEEK[$part])";
                 // send request
                 if (!iil_PutLine($fp, $request)) {
@@ -2347 +2347 @@
 }
 
-function iil_C_FetchPartBody(&$conn, $mailbox, $id, $part, $file=NULL) {
-        return iil_C_HandlePartBody($conn, $mailbox, $id, $part, NULL, NULL, $file);
-}
-
-function iil_C_PrintPartBody(&$conn, $mailbox, $id, $part) {
-        iil_C_HandlePartBody($conn, $mailbox, $id, $part, NULL, true, NULL);
-}
-
 function iil_C_CreateFolder(&$conn, $folder) {
         $fp = $conn->fp;
@@ -2478 +2470 @@
 }
 
-function iil_C_FetchStructureString(&$conn, $folder, $id) {
+function iil_C_FetchStructureString(&$conn, $folder, $id, $is_uid=false) {
         $fp     = $conn->fp;
         $result = false;
@@ -2485 +2477 @@
                 $key = 'F1247';
 
-                if (iil_PutLine($fp, "$key FETCH $id (BODYSTRUCTURE)")) {
+                if (iil_PutLine($fp, $key . ($is_uid ? ' UID' : '') ." FETCH $id (BODYSTRUCTURE)")) {
                         do {
                                 $line = iil_ReadLine($fp, 5000);