From: Moritz Bunkus <m.bunkus@linet.de>
Date: Wed, 12 Jan 2022 10:58:46 +0000 (+0100)
Subject: E-Mails als HTML verschicken: im E-Mail-Journal als HTML anzeigen
X-Git-Tag: kivitendo-mebil_0.1-0~10^2~2^2~220^2~5
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=7b5a9b16107225417dd1b8451a5ed9bfa607aef2;p=kivitendo-erp.git

E-Mails als HTML verschicken: im E-Mail-Journal als HTML anzeigen
---

diff --git a/templates/webpages/email_journal/show.html b/templates/webpages/email_journal/show.html
index 20444a9c8..b484bc76c 100644
--- a/templates/webpages/email_journal/show.html
+++ b/templates/webpages/email_journal/show.html
@@ -1,4 +1,4 @@
-[% USE HTML %][% USE L %][% USE LxERP %]
+[% USE HTML %][% USE L %][% USE LxERP %][%- USE P -%]
 
  <h1>[% FORM.title %]</h1>
 
@@ -49,7 +49,13 @@
 
    <tr class="listrow">
     <th>[%- LxERP.t8("Body") %]</th>
-    <td><pre>[% HTML.escape(SELF.entry.body) %]</pre></td>
+    <td>
+     [%- IF SELF.entry.headers.match('(?i)content-type:.*text/html') %]
+      [% P.restricted_html(SELF.entry.body) %]
+     [%- ELSE %]
+      <pre>[% HTML.escape(SELF.entry.body) %]</pre>
+     [%- END %]
+    </td>
    </tr>
  </table>