Show the one time code within the mail's subject

diff --git a/wcfsetup/install/files/lib/system/user/multifactor/EmailMultifactorMethod.class.php b/wcfsetup/install/files/lib/system/user/multifactor/EmailMultifactorMethod.class.php
index 21054dc293cc687767be3c3f52a8f8e2d6ae0033..b487ed442b9462610d198746dc325de0f83193bc 100644 (file)
--- a/wcfsetup/install/files/lib/system/user/multifactor/EmailMultifactorMethod.class.php
+++ b/wcfsetup/install/files/lib/system/user/multifactor/EmailMultifactorMethod.class.php
@@ -101,7 +101,9 @@ class EmailMultifactorMethod implements IMultifactorMethod {
                $email->setRecipient($setup->getUser());
                
                $email->setSubject(
-                       WCF::getLanguage()->getDynamicVariable('wcf.user.security.multifactor.email.subject')
+                       WCF::getLanguage()->getDynamicVariable('wcf.user.security.multifactor.email.subject', [
+                               'code' => $code,
+                       ])
                );
                $email->setHtmlMessage(
                        WCF::getLanguage()->getDynamicVariable('wcf.user.security.multifactor.email.body.html', [

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index cfc9c3af01ba46540136adc26dc55eec7b9bcc3b..e5764a96e80d368d4e9627e56780646764a67bf1 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -4884,7 +4884,7 @@ Die E-Mail-Adresse des neuen Benutzers lautet: {@$user->email}
                <item name="wcf.user.security.multifactor.email.success"><![CDATA[Die Bestätigung via E-Mail wurde erfolgreich aktiviert.]]></item>
                <item name="wcf.user.security.multifactor.email.code"><![CDATA[Einmalcode]]></item>
                <item name="wcf.user.security.multifactor.email.code.description"><![CDATA[Der Einmalcode wurde um <strong>{$lastCode|date:'H:i:s'}</strong> an {if LANGUAGE_USE_INFORMAL_VARIANT}deine{else}Ihre{/if} E-Mail-Adresse bei <strong>{$emailDomain}</strong> gesendet.]]></item>
-               <item name="wcf.user.security.multifactor.email.subject"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Dein{else}Ihr{/if} Einmalcode for {@PAGE_TITLE|language}]]></item>
+               <item name="wcf.user.security.multifactor.email.subject"><![CDATA[{$code} ist {if LANGUAGE_USE_INFORMAL_VARIANT}dein{else}ihr{/if} Einmalcode for {@PAGE_TITLE|language}]]></item>
                <item name="wcf.user.security.multifactor.email.body.html"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Dein{else}Ihr{/if} Einmalcode lautet: <pre>{$code}</pre>]]></item>
                <item name="wcf.user.security.multifactor.email.body.plain"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Dein{else}Ihr{/if} Einmalcode lautet: {$code}]]></item>
        </category>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 47a8624f4938893ff2ce19a9016202ad296329f4..5d3a984cfb6ad886cc69692ffb463bfd03cda95f 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -4881,7 +4881,7 @@ Open the link below to access the user profile:
                <item name="wcf.user.security.multifactor.email.success"><![CDATA[The confirmation via email has successfully been enabled.]]></item>
                <item name="wcf.user.security.multifactor.email.code"><![CDATA[One Time Code]]></item>
                <item name="wcf.user.security.multifactor.email.code.description"><![CDATA[The one time code was sent at <strong>{$lastCode|date:'g:i:s a'}</strong> to your email address at <strong>{$emailDomain}</strong>.]]></item>
-               <item name="wcf.user.security.multifactor.email.subject"><![CDATA[Your One Time Code for {@PAGE_TITLE|language}]]></item>
+               <item name="wcf.user.security.multifactor.email.subject"><![CDATA[{$code} is your one time code for {@PAGE_TITLE|language}]]></item>
                <item name="wcf.user.security.multifactor.email.body.html"><![CDATA[Your one time code is: <pre>{$code}</pre>]]></item>
                <item name="wcf.user.security.multifactor.email.body.plain"><![CDATA[Your one time code is: {$code}]]></item>
        </category>