From 04ca3d8f2fdeed8c11bba5bc451075e1c7d7c59f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim=20D=C3=BCsterhus?= <duesterhus@woltlab.com>
Date: Wed, 18 Nov 2020 12:50:22 +0100
Subject: [PATCH] Show the one time code within the mail's subject

---
 .../system/user/multifactor/EmailMultifactorMethod.class.php  | 4 +++-
 wcfsetup/install/lang/de.xml                                  | 2 +-
 wcfsetup/install/lang/en.xml                                  | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

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 21054dc293..b487ed442b 100644
--- 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 cfc9c3af01..e5764a96e8 100644
--- 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 47a8624f49..5d3a984cfb 100644
--- 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>
-- 
2.20.1