From 7097c008e2530dce0d6ce40b729b54bc6c469f3e Mon Sep 17 00:00:00 2001
From: Synox <synox@users.noreply.github.com>
Date: Thu, 18 Jan 2018 21:52:47 +0100
Subject: [PATCH] cleanup

---
 src/frontend.template.php | 43 +++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/src/frontend.template.php b/src/frontend.template.php
index 857ddbd..59c8e03 100644
--- a/src/frontend.template.php
+++ b/src/frontend.template.php
@@ -215,35 +215,30 @@ $purifier = new HTMLPurifier($purifier_config);
                             ?>
 
                             <div class="mt-2 card-text">
-                                <div>
-                                    <?php
-                                    $safeHtml = $purifier->purify($email->textHtml);
+                                <?php
+                                $safeHtml = $purifier->purify($email->textHtml);
 
-                                    $safeText = $purifier->purify($email->textPlain);
-                                    $safeText = nl2br($safeText);
-                                    $safeText = \AutoLinkExtension::auto_link_text($safeText);
+                                $safeText = $purifier->purify($email->textPlain);
+                                $safeText = nl2br($safeText);
+                                $safeText = \AutoLinkExtension::auto_link_text($safeText);
 
-                                    $hasHtml = strlen(trim($safeHtml)) > 0;
-                                    $hasText = strlen(trim($safeText)) > 0;
+                                $hasHtml = strlen(trim($safeHtml)) > 0;
+                                $hasText = strlen(trim($safeText)) > 0;
 
-                                    if ($config['prefer_plaintext']) {
-                                        if ($hasText) {
-                                            echo $safeText;
-                                        } else {
-                                            echo $safeHtml;
-                                        }
+                                if ($config['prefer_plaintext']) {
+                                    if ($hasText) {
+                                        echo $safeText;
                                     } else {
-                                        if ($hasHtml) {
-                                            echo $safeHtml;
-                                        } else {
-                                            echo $safeText;
-                                        }
+                                        echo $safeHtml;
                                     }
-                                    ?>
-                                </div>
-                                <div>
-                                    <?php ?>
-                                </div>
+                                } else {
+                                    if ($hasHtml) {
+                                        echo $safeHtml;
+                                    } else {
+                                        echo $safeText;
+                                    }
+                                }
+                                ?>
                             </div>
 
                         </div>