Changeset 02548b9 in github

Timestamp:

Jun 3, 2008 8:23:55 AM (5 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

68217c5

Parents:

e47aadc

Message:

• imap.inc: Fixed iil_MultLine(): use iil_ReadBytes() instead of iil_ReadLine()
• imap.inc: Fixed iil_C_FetchStructureString() to handle many literal strings in response (#1484969)
• imap.inc: Removed hardcoded data size in iil_ReadLine()

Files:

• CHANGELOG (modified) (1 diff)
• program/lib/imap.inc (modified) (5 diffs)

CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2008/06/03 (alec)
+----------
+- imap.inc: Fixed iil_MultLine(): use iil_ReadBytes() instead of iil_ReadLine()
+- imap.inc: Fixed iil_C_FetchStructureString() to handle many 
+  literal strings in response (#1484969)
+- imap.inc: Removed hardcoded data size in iil_ReadLine()
 
 2008/05/30 (alec)

program/lib/imap.inc

@@ -58 +58 @@
                 - added iil_Escape() with support for " and \ in folder names
                 - support \ character in username in iil_C_Login()
+                - fixed iil_MultLine(): use iil_ReadBytes() instead of iil_ReadLine()
+                - fixed iil_C_FetchStructureString() to handle many literal strings in response
+                - removed hardcoded data size in iil_ReadLine() 
 
 ********************************************************/
@@ -172 +175 @@
         return $line;
     }
+    
+    if (!$size) {
+        $size = 1024;
+    }
+    
     do {
-        // FIXME: hardcode size?
-        $buffer = fgets($fp, 2048);
+        $buffer = fgets($fp, $size);
         if ($buffer === false) {
             break;
@@ -191 +198 @@
                 $bytes = $a[2][0];
                 while (strlen($out) < $bytes) {
-                    $line = iil_ReadLine($fp, 1024); 
-                        $out .= chop($line);
+                    $line = iil_ReadBytes($fp, $bytes); 
+                    $out .= $line;
                 }
                 $line = $a[1][0] . "\"$out\"";
@@ -2551 +2558 @@
         $fp     = $conn->fp;
         $result = false;
+        
         if (iil_C_Select($conn, $folder)) {
                 $key = 'F1247';
@@ -2556 +2564 @@
                 if (fputs($fp, "$key FETCH $id (BODYSTRUCTURE)\r\n")) {
                         do {
-                                $line=chop(iil_ReadLine($fp, 5000));
-                                if ($line[0] == '*') {
-                                        if (ereg("\}$", $line)) {
-                                                preg_match('/(.+)\{([0-9]+)\}/', $line, $match);  
-                                                $result = $match[1];
-                                                do {
-                                                        $line = chop(iil_ReadLine($fp, 100));
-                                                        if (!preg_match("/^$key/", $line)) {
-                                                            $result .= $line;
-                            } else {
-                                $done = true;
-                            }
-                                                } while (!$done);
-                                        } else {
-                                                $result = $line;
-                                        }
-                                        list($pre, $post) = explode('BODYSTRUCTURE ', $result);
-                                        
-                                        //truncate last ')' and return
-                                        $result = substr($post, 0, strlen($post)-1);
-                                }
+                                $line = iil_ReadLine($fp, 5000);
+                                $line = iil_MultLine($fp, $line);
+                                $result .= $line;
                         } while (!preg_match("/^$key/", $line));
+
+                        $result = trim(substr($result, strpos($result, 'BODYSTRUCTURE')+13, -(strlen($result)-strrpos($result, ')')-1)));
                 }
         }