From 329de2771e40fe7550d4453375a6de7943a3857d Mon Sep 17 00:00:00 2001
From: Philipp Dieter <philipp.dieter@attic-media.net>
Date: Fri, 9 Dec 2022 01:42:02 +0100
Subject: [PATCH 1/2] [TASK] Mail: Add hr, right aligned table, debugging
 output

---
 Classes/Utility/MailUtility.php               | 21 ++++++++++++++++++
 .../Private/Partials/Mails/DefaultHtml.html   | 22 ++++++++++++++++---
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/Classes/Utility/MailUtility.php b/Classes/Utility/MailUtility.php
index 48149b2..79293dd 100644
--- a/Classes/Utility/MailUtility.php
+++ b/Classes/Utility/MailUtility.php
@@ -223,6 +223,7 @@ class MailUtility
             switch($row['type']) {
                 case 'text':
                 case 'table':
+                case 'tablelr':
                 case 'tableLayout':
                 case 'list':
                 case 'textbold':
@@ -233,6 +234,7 @@ class MailUtility
                 case 'buttonleft':
                 case 'buttoncenter':
                 case 'buttonright':
+                case 'hr':
                     $row['data'] = str_replace(
                         "\\\n",
                         '',
@@ -457,4 +459,23 @@ class MailUtility
             }
         }
     }
+
+    /**
+     * Debug print
+     */
+    public static function printMaildata($maildata)
+    {
+        foreach ($maildata as $row) {
+            if (!is_array($row['data'])) {
+                print($row['data']);
+            } else {
+                print($row['data'][0]);
+                print(PHP_EOL);
+                print($row['data'][1]);
+            }
+            print(PHP_EOL);
+        }
+        print(PHP_EOL);
+    }
+
 }
diff --git a/Resources/Private/Partials/Mails/DefaultHtml.html b/Resources/Private/Partials/Mails/DefaultHtml.html
index a704f4d..94da85e 100644
--- a/Resources/Private/Partials/Mails/DefaultHtml.html
+++ b/Resources/Private/Partials/Mails/DefaultHtml.html
@@ -30,6 +30,7 @@
         || {row.type} == 'buttonleft'
         || {row.type} == 'buttoncenter'
         || {row.type} == 'buttonright'
+        || {row.type} == 'hr'
       ">
         <!--[if mso | IE]>
           <table align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:{width}px;" width="{width}" >
@@ -101,6 +102,10 @@
                                           {row.data -> f:format.nl2br() -> f:format.raw()}
                                         </span>
                                       </f:case>
+                                      <f:case value="hr">
+                                        <p style="border-top:solid 1px #bababa;font-size:1px;margin:13px auto;width:100%;">
+                                        </p>
+                                      </f:case>
                                       <f:defaultCase>
                                         <p>{row.data -> f:format.nl2br() -> f:format.raw()}</p>
                                       </f:defaultCase>
@@ -137,6 +142,9 @@
         <f:case value="table">
           <f:variable name="type" value="table" />
         </f:case>
+        <f:case value="tablelr">
+          <f:variable name="type" value="table" />
+        </f:case>
         <f:case value="tableLayout">
           <f:variable name="type" value="table" />
         </f:case>
@@ -178,11 +186,19 @@
                       </td>
                       <td class="" style="vertical-align:top;width:{widthTableColumn}px;">
                     <![endif]-->
-                    <div class="mj-column-per-50 outlook-group-fix" style="font-size:13px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                    <f:switch expression="{row.type}">
+                      <f:case value="tablelr">
+                        <f:variable name="align" value="right" />
+                      </f:case>
+                      <f:defaultCase>
+                        <f:variable name="align" value="left" />
+                      </f:defaultCase>
+                    </f:switch>
+                    <div class="mj-column-per-50 outlook-group-fix" style="font-size:13px;text-align:{align};direction:ltr;display:inline-block;vertical-align:top;width:100%;">
                       <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
                         <tr>
-                          <td align="left" style="font-size:0px;padding:0px 4px;word-break:break-word;">
-                            <div style="font-family:Arial, sans-serif;font-size:16px;line-height:1.4;text-align:left;color:#000000;">
+                          <td align="{align}" style="font-size:0px;padding:0px 4px;word-break:break-word;">
+                            <div style="font-family:Arial, sans-serif;font-size:16px;line-height:1.4;text-align:{align};color:#000000;">
                               <div>{row.data.1 -> f:format.nl2br() -> f:format.raw()}</div>
                             </div>
                           </td>

From 0f3e88ac961fbffa82f2bb3d34e5df495b8c22c4 Mon Sep 17 00:00:00 2001
From: Philipp Dieter <philipp.dieter@attic-media.net>
Date: Fri, 4 Aug 2023 14:11:20 +0200
Subject: [PATCH 2/2] [BUGFIX] Fix hr layout in outlook

---
 .../Private/Partials/Mails/DefaultHtml.html   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/Resources/Private/Partials/Mails/DefaultHtml.html b/Resources/Private/Partials/Mails/DefaultHtml.html
index 94da85e..d3c4520 100644
--- a/Resources/Private/Partials/Mails/DefaultHtml.html
+++ b/Resources/Private/Partials/Mails/DefaultHtml.html
@@ -105,6 +105,25 @@
                                       <f:case value="hr">
                                         <p style="border-top:solid 1px #bababa;font-size:1px;margin:13px auto;width:100%;">
                                         </p>
+                                        <!--[if mso | IE]>
+                                          &nbsp;
+                                          <table
+                                            align="center"
+                                            border="0"
+                                            cellpadding="0"
+                                            cellspacing="0"
+                                            style="border-top:solid 1px #bababa;font-size:1px;margin:13px auto;width:100%;"
+                                            role="presentation"
+                                            width="550px"
+                                          >
+                                            <tr>
+                                              <td style="height:0;line-height:0;">
+                                                &nbsp;
+                                              </td>
+                                            </tr>
+                                          </table>
+                                          &nbsp;
+                                        <![endif]-->
                                       </f:case>
                                       <f:defaultCase>
                                         <p>{row.data -> f:format.nl2br() -> f:format.raw()}</p>