From 9e2ccd976daa8646b2b86f4d27e52d3f226ff94e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim=20D=C3=BCsterhus?= <duesterhus@woltlab.com>
Date: Tue, 30 Jun 2020 13:57:31 +0200
Subject: [PATCH] Add option for HTML based email signature

Resolves #3224
---
 com.woltlab.wcf/option.xml               |  5 +++++
 com.woltlab.wcf/templates/email_html.tpl | 12 +++++++-----
 constants.php                            |  1 +
 wcfsetup/install/lang/de.xml             |  4 +++-
 wcfsetup/install/lang/en.xml             |  4 +++-
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index a5ef30fe65..85db633bdb 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -919,6 +919,11 @@ physical:wcf.acp.option.google_maps_type.physical</selectoptions>
 				<optiontype>textareaI18n</optiontype>
 				<supporti18n>1</supporti18n>
 			</option>
+			<option name="mail_signature_html">
+				<categoryname>general.mail.general</categoryname>
+				<optiontype>textareaI18n</optiontype>
+				<supporti18n>1</supporti18n>
+			</option>
 			<!-- /general.mail.general -->
 			<!-- general.mail.send -->
 			<option name="mail_send_method">
diff --git a/com.woltlab.wcf/templates/email_html.tpl b/com.woltlab.wcf/templates/email_html.tpl
index c637e5ec64..af2d6276a7 100644
--- a/com.woltlab.wcf/templates/email_html.tpl
+++ b/com.woltlab.wcf/templates/email_html.tpl
@@ -155,11 +155,13 @@
 	{capture assign='footer'}
 	{hascontent}
 	<span style="font-size: 0;">-- <br></span>
-	{content}
-	{@MAIL_SIGNATURE|language|newlineToBreak}
-	{/content}
-	{/hascontent}
-	{/capture}
+{content}
+{if MAIL_SIGNATURE_HTML|language}
+{@MAIL_SIGNATURE_HTML|language}
+{else}
+{@MAIL_SIGNATURE|language|newlineToBreak}
+{/if}
+{/content}{/hascontent}{/capture}
 	{include file='email_paddingHelper' block=true class='footer' content=$footer sandbox=true}
 	
 	<table>{* Do not remove: This table is needed by certain less able email clients to properly support background colors. Don't ask. *}</table>
diff --git a/constants.php b/constants.php
index 81965a12cd..7c526ea940 100644
--- a/constants.php
+++ b/constants.php
@@ -109,6 +109,7 @@ define('MAIL_FROM_NAME', '');
 define('MAIL_FROM_ADDRESS', '');
 define('MAIL_ADMIN_ADDRESS', '');
 define('MAIL_SIGNATURE', '');
+define('MAIL_SIGNATURE_HTML', '');
 define('MAIL_SEND_METHOD', 'php');
 define('MAIL_SMTP_HOST', '');
 define('MAIL_SMTP_PORT', 25);
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 47205e2360..cae905be83 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1337,8 +1337,10 @@ ACHTUNG: Die oben genannten Meldungen sind stark gekürzt. Sie können Details z
 		<item name="wcf.acp.option.mail_send_method.debugFolder"><![CDATA[Debug (Ordner mit .eml-Dateien)]]></item>
 		<item name="wcf.acp.option.mail_send_method.php"><![CDATA[PHP]]></item>
 		<item name="wcf.acp.option.mail_send_method.smtp"><![CDATA[SMTP]]></item>
-		<item name="wcf.acp.option.mail_signature"><![CDATA[Signatur]]></item>
+		<item name="wcf.acp.option.mail_signature"><![CDATA[Signatur (Text)]]></item>
 		<item name="wcf.acp.option.mail_signature.description"><![CDATA[Die Signatur wird an jede automatisch generierte E-Mail angehängt.]]></item>
+		<item name="wcf.acp.option.mail_signature_html"><![CDATA[Signatur (HTML)]]></item>
+		<item name="wcf.acp.option.mail_signature_html.description"><![CDATA[Die Signatur für die HTML-Version der versendeten E-Mails. Wenn keine HTML-Variante angegeben ist, dann wird die Text-Signatur verwendet.]]></item>
 		<item name="wcf.acp.option.mail_smtp_host"><![CDATA[SMTP-Server]]></item>
 		<item name="wcf.acp.option.mail_smtp_host.description"><![CDATA[Bei SMTP-Port 465 muss zusätzlich der Präfix <kbd>ssl://</kbd> angegeben werden, etwa <kbd>ssl://mail.example.com</kbd> statt nur <kbd>mail.woltlab.com</kbd>.]]></item>
 		<item name="wcf.acp.option.mail_smtp_port"><![CDATA[SMTP-Port]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 6e28519c94..9bea2cb1f3 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1314,8 +1314,10 @@ ATTENTION: The messages listed above are greatly shortened. You can view details
 		<item name="wcf.acp.option.mail_send_method.debugFolder"><![CDATA[Use Debug (Folder with .eml files)]]></item>
 		<item name="wcf.acp.option.mail_send_method.php"><![CDATA[Use PHP]]></item>
 		<item name="wcf.acp.option.mail_send_method.smtp"><![CDATA[Use SMTP]]></item>
-		<item name="wcf.acp.option.mail_signature"><![CDATA[Sender’s Signature]]></item>
+		<item name="wcf.acp.option.mail_signature"><![CDATA[Sender’s Signature (Text)]]></item>
 		<item name="wcf.acp.option.mail_signature.description"><![CDATA[The signature that will be appended to every message.]]></item>
+		<item name="wcf.acp.option.mail_signature"><![CDATA[Sender’s Signature (HTML)]]></item>
+		<item name="wcf.acp.option.mail_signature.description"><![CDATA[HTML formatted version of the Sender’s Signature. If this field is left empty the text based signature will be used.]]></item>
 		<item name="wcf.acp.option.mail_smtp_host"><![CDATA[SMTP Server]]></item>
 		<item name="wcf.acp.option.mail_smtp_host.description"><![CDATA[The SMTP port 465 requires the host to be prefixed with <kbd>ssl://</kbd>, for example, <kbd>ssl://mail.example.com</kbd> instead of <kbd>mail.woltlab.com</kbd>.]]></item>
 		<item name="wcf.acp.option.mail_smtp_port"><![CDATA[SMTP Port]]></item>
-- 
2.20.1