Add option for HTML based email signature

Resolves #3224

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index a5ef30fe65ed46a7e77fe678d163487a72f9aa16..85db633bdb74eb1822e40db4963f2c9b1c598128 100644 (file)
--- 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 c637e5ec64376491f78d46c0c408341d604b9860..af2d6276a7d0509cc6be3b1f00a7f72d963aba89 100644 (file)
--- 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 81965a12cde5b69fba23017c80dcab08d4d36d1c..7c526ea94000ac97fe8ab386aeca377f8947e93c 100644 (file)
--- 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 47205e236069da825a28631ea50276a9b8774b5c..cae905be83d234b430713d93ca10766f0c52aef4 100644 (file)
--- 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 6e28519c9483b83e9c7e93ae325b5b59fd756e2d..9bea2cb1f377c31e50b38480dda143923f05ad4a 100644 (file)
--- 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>