Additional split fix

zoonru · May 19, 2023 · d94de10 · d94de10
1 parent 701d3d4
commit d94de10
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/bounce_driver.class.php b/bounce_driver.class.php
@@ -113,9 +113,9 @@ public function get_the_facts($eml) {
         if (!empty($mime_sections['returned_message_body_part'])) {
             list($ct, $this->original_letter) = $this->splitHeadAndBody($mime_sections['returned_message_body_part']);
         } elseif (strpos($body, '------ This is a copy of your message, including all the headers. ------') !== false) {
-            list($_, $this->original_letter) = preg_split("/\s{4}------ This is a copy of your message, including all the headers. ------\s{4}/", $body, 2);
+            list($_, $this->original_letter) = preg_split("/\s{4}------ This is a copy of your message, including all the headers. ------[\s\S]*?\s{4}/", $body, 2);
         } elseif (strpos($body, '------ This is a copy of the message, including all the headers. ------') !== false) {
-            list($_, $this->original_letter) = preg_split("/\s{4}------ This is a copy of the message, including all the headers. ------\s{4}/", $body, 2);
+            list($_, $this->original_letter) = preg_split("/\s{4}------ This is a copy of the message, including all the headers. ------[\s\S]*?\s{4}/", $body, 2);
         } else {
             $letters = preg_split("/\nReturn-path:[^\n]*\n/i", $bounce, 3, PREG_SPLIT_NO_EMPTY);
             if (!empty($letters[2])) {