Changeset 5363 in subversion

Timestamp:

Oct 24, 2011 2:08:53 PM (19 months ago)

Author:

alec

Message:

• Improve handling of situation when FETCH returns OK, but no data

Location:

trunk/roundcubemail/program/include

Files:

• rcube_imap.php (modified) (2 diffs)
• rcube_imap_generic.php (modified) (1 diff)

trunk/roundcubemail/program/include/rcube_imap.php

@@ -1963 +1963 @@
         $headers = $this->get_headers($uid, $mailbox);
 
+        // message doesn't exist?
+        if (empty($headers))
+            return null; 
+
         // structure might be cached
         if (!empty($headers->structure))
@@ -2383 +2387 @@
         }
 
-        // TODO: Add caching for message parts
-
-        if (!$part) {
-            $part = 'TEXT';
-        }
-
-        $body = $this->conn->handlePartBody($this->mailbox, $uid, true, $part,
-            $o_part->encoding, $print, $fp);
+        if ($o_part && $o_part->size) {
+            $body = $this->conn->handlePartBody($this->mailbox, $uid, true,
+                $part ? $part : 'TEXT', $o_part->encoding, $print, $fp);
+        }
 
         if ($fp || $print) {

trunk/roundcubemail/program/include/rcube_imap_generic.php

@@ -2394 +2394 @@
         $result = false;
 
+        if ($a[2] != 'FETCH') {
+        }
         // handle empty "* X FETCH ()" response
-        if ($line[$len-1] == ')' && $line[$len-2] != '(') {
+        else if ($line[$len-1] == ')' && $line[$len-2] != '(') {
             // one line response, get everything between first and last quotes
             if (substr($line, -4, 3) == 'NIL') {