Changeset fab43d2 in github

Timestamp:

Aug 18, 2008 8:33:26 AM (5 years ago)

Author:

thomascube <thomas@…>

Branches:

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

Children:

b469a19

Parents:

e223df7

Message:

Better fix for bodystructure parsing (#1485280)

File:

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

program/lib/imap.inc

@@ -2577 +2577 @@
                                 $line = iil_MultLine($fp, $line);
                                 list(, $index, $cmd, $rest) = explode(' ', $line);
-                                if ($cmd != 'FETCH' || $index == $id)
+                                if ($cmd != 'FETCH' || $index == $id || preg_match("/^$key/", $line))
                                         $result .= $line;
                         } while (!preg_match("/^$key/", $line));
 
-                        $result = trim(substr($result, strpos($result, 'BODYSTRUCTURE')+13));
+                        $result = trim(substr($result, strpos($result, 'BODYSTRUCTURE')+13, -(strlen($result)-strrpos($result, $key)+1)));
                 }
         }