We have to know when there is attachment with size 0 and when there is no size (...

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1707 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/imap_general.php b/functions/imap_general.php
index 674896fbb40f8307886169e96963b92229cde955..d4c61c3490ccf2f5fdef0fcd6dbbab9ce26fc9f9 100755 (executable)
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -56,11 +56,11 @@ $imap_general_debug = false;
                 flush();
             }
 
                 flush();
             }
 

-            $size = 0;
+            $size = -1;

             $data[] = $read;
             $read = fgets($imap_stream, 9096);
          } else {
             $data[] = $read;
             $read = fgets($imap_stream, 9096);
          } else {

-            $size = 0;
+            $size = -1;

          }
          while (1) {
             while (strpos($read, "\n") === false) {
          }
          while (1) {
             while (strpos($read, "\n") === false) {


@@ -95,7 +95,7 @@ $imap_general_debug = false;
                $total_size += strlen($read);
             } else {
                if (ereg("^$pre (OK|BAD|NO)(.*)", $read, $regs) ||
                $total_size += strlen($read);
             } else {
                if (ereg("^$pre (OK|BAD|NO)(.*)", $read, $regs) ||

-                   ereg("^\\* [0-9]+ FETCH.*", $read, $regs)) {
+                   (($size == -1) && ereg("^\\* [0-9]+ FETCH.*", $read, $regs))) {

                   break;
                } else {
                   $data[] = $read;
                   break;
                } else {
                   $data[] = $read;