From bb972fe6792cf4aa833e3f3f28d0a7a6f9ca15af Mon Sep 17 00:00:00 2001
From: Tyler <tyler@pixelandtonic.com>
Date: Mon, 26 Mar 2018 13:46:02 -0700
Subject: [PATCH 1/2] fixed #104 for v2

---
 src/controllers/SendController.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/controllers/SendController.php b/src/controllers/SendController.php
index 97572d4..38e2f1a 100644
--- a/src/controllers/SendController.php
+++ b/src/controllers/SendController.php
@@ -7,6 +7,8 @@
 use craft\contactform\Plugin;
 use craft\web\Controller;
 use craft\web\UploadedFile;
+use yii\helpers\Html;
+use yii\helpers\Markdown;
 use yii\web\Response;
 
 class SendController extends Controller
@@ -40,6 +42,9 @@ public function actionIndex()
         $submission->subject = $request->getBodyParam('subject');
         $submission->message = $request->getBodyParam('message');
 
+        $htmlMessage = Html::encode($submission->message);
+        $submission->message = Markdown::process($htmlMessage);
+
         if ($settings->allowAttachments && isset($_FILES['attachment']) && isset($_FILES['attachment']['name'])) {
             if (is_array($_FILES['attachment']['name'])) {
                 $submission->attachment = UploadedFile::getInstancesByName('attachment');

From 41191f38ac7561fdd1ae5abd66793122ee08153b Mon Sep 17 00:00:00 2001
From: Tyler <tyler@pixelandtonic.com>
Date: Mon, 26 Mar 2018 14:09:12 -0700
Subject: [PATCH 2/2] Moved logic from controller to mailer

---
 src/Mailer.php                     | 4 +++-
 src/controllers/SendController.php | 5 -----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Mailer.php b/src/Mailer.php
index 5d63345..908f2ad 100644
--- a/src/Mailer.php
+++ b/src/Mailer.php
@@ -11,6 +11,7 @@
 use craft\mail\Message;
 use yii\base\Component;
 use yii\base\InvalidConfigException;
+use yii\helpers\Html;
 use yii\helpers\Markdown;
 
 class Mailer extends Component
@@ -207,7 +208,8 @@ public function compileTextBody(Submission $submission): string
      */
     public function compileHtmlBody(string $textBody): string
     {
-        $html = Markdown::process($textBody);
+        $html = Html::encode($textBody);
+        $html = Markdown::process($html);
 
         // Prevent Twig tags from getting parsed
         // TODO: probably safe to remove?
diff --git a/src/controllers/SendController.php b/src/controllers/SendController.php
index 38e2f1a..97572d4 100644
--- a/src/controllers/SendController.php
+++ b/src/controllers/SendController.php
@@ -7,8 +7,6 @@
 use craft\contactform\Plugin;
 use craft\web\Controller;
 use craft\web\UploadedFile;
-use yii\helpers\Html;
-use yii\helpers\Markdown;
 use yii\web\Response;
 
 class SendController extends Controller
@@ -42,9 +40,6 @@ public function actionIndex()
         $submission->subject = $request->getBodyParam('subject');
         $submission->message = $request->getBodyParam('message');
 
-        $htmlMessage = Html::encode($submission->message);
-        $submission->message = Markdown::process($htmlMessage);
-
         if ($settings->allowAttachments && isset($_FILES['attachment']) && isset($_FILES['attachment']['name'])) {
             if (is_array($_FILES['attachment']['name'])) {
                 $submission->attachment = UploadedFile::getInstancesByName('attachment');