better plain text emails

JanST123 · Jun 24, 2019 · f1b208a · f1b208a
1 parent 2d92510
commit f1b208a
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/Email.php b/src/Email.php
@@ -59,10 +59,19 @@ public static function send(string $to, string $subject, string $body, array $ad
     );
 
     if ($isHtml) {
-      $tmp = imap_8bit(nl2br($body));
+      $tmp = imap_8bit(
+        preg_replace('/^\h+/m', '',
+          html_entity_decode(
+            strip_tags(
+              preg_replace('/^\s*(<[^>]+>\s*)+\r?\n/m', '', $body)
+            )
+          )
+        )
+      );
+
       $tmpHTML = $nl2brforHTML ? imap_8bit(nl2br($body)) : imap_8bit($body);
       $body = "This is a MIME encoded message.";
-      $body.="\r\n\r\n--" . $boundary ."\r\nContent-Type: text/plain; charset=" . self::$charset . "\r\nContent-Transfer-Encoding: quoted-printable\r\n\r\n" . strip_tags($tmp);
+      $body.="\r\n\r\n--" . $boundary ."\r\nContent-Type: text/plain; charset=" . self::$charset . "\r\nContent-Transfer-Encoding: quoted-printable\r\n\r\n" . $tmp;
       $body.="\r\n\r\n--" . $boundary ."\r\nContent-Type: text/html; charset=" . self::$charset . "\r\nContent-Transfer-Encoding: quoted-printable\r\n\r\n" . $tmpHTML;
       $body.="\r\n\r\n--" . $boundary ."--";
     }