From d495f061f439986a3dff5cf7c81ee1cbe4ecdec9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim=20D=C3=BCsterhus?= <duesterhus@woltlab.com>
Date: Wed, 18 Nov 2020 12:16:30 +0100
Subject: [PATCH] Add information box to multifactorAuthentication.tpl

---
 .../templates/multifactorAuthentication.tpl   | 20 ++++++++++++++++++-
 wcfsetup/install/lang/de.xml                  |  3 +++
 wcfsetup/install/lang/en.xml                  |  3 +++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/com.woltlab.wcf/templates/multifactorAuthentication.tpl b/com.woltlab.wcf/templates/multifactorAuthentication.tpl
index 5beef7e7c1..35c057353c 100644
--- a/com.woltlab.wcf/templates/multifactorAuthentication.tpl
+++ b/com.woltlab.wcf/templates/multifactorAuthentication.tpl
@@ -21,7 +21,25 @@
 
 {include file='header' __disableAds=true __disableLoginLink=true __sidebarLeftHasMenu=true}
 
-{$user->username}
+<div class="section box48">
+	{@$userProfile->getAvatar()->getImageTag(48)}
+	
+	<div>
+		<div class="containerHeadline">
+			<h3>
+				{lang}wcf.user.security.multifactor.authentication.user.headline{/lang}
+			</h3>
+		</div>
+		<div class="containerContent">
+			{lang}wcf.user.security.multifactor.authentication.user.content{/lang}
+		</div>
+		
+		<form action="{link controller='MultifactorAuthenticationAbort'}{/link}" method="post">
+			<button type="submit">{lang}wcf.user.security.multifactor.authentication.logout{/lang}</button>
+			{csrfToken}
+		</form>
+	</div>
+</div>
 
 {@$form->getHtml()}
 
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 34b2e0f280..4f27322e67 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -4892,6 +4892,9 @@ Die E-Mail-Adresse des neuen Benutzers lautet: {@$user->email}
 		<item name="wcf.user.security.multifactor.backup.code"><![CDATA[Notfall-Code]]></item>
 		<item name="wcf.user.security.multifactor.backup.code.description"><![CDATA[Ein Notfall-Code besteht aus 20 Ziffern und ist nur einmal gültig.]]></item>
 		<item name="wcf.user.security.multifactor.totp.deviceName.description.auth"><![CDATA[Das Gerät, das den genutzten Éinmalcode generiert hat.]]></item>
+		<item name="wcf.user.security.multifactor.authentication.user.headline"><![CDATA[Hallo {$user->username}!]]></item>
+		<item name="wcf.user.security.multifactor.authentication.user.content"><![CDATA[Die eingegebenen Zugangsdaten sind korrekt, aber {if LANGUAGE_USE_INFORMAL_VARIANT}dein{else}Ihr{/if} Benutzerkonto ist mit der Mehrfaktor-Authentifizierung geschützt. Bitte {if LANGUAGE_USE_INFORMAL_VARIANT}verwende deinen{else}verwenden Sie Ihren{/if} zweiten Faktor, um den Login abzuschließen.]]></item>
+		<item name="wcf.user.security.multifactor.authentication.logout"><![CDATA[Abbrechen und Abmelden]]></item>
 		<item name="wcf.user.security.multifactor.authentication.logout.success"><![CDATA[Die Mehrfaktor-Authentifizierung wurde erfolgreich abgebrochen.]]></item>
 	</category>
 	<category name="wcf.user.trophy">
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index a3013bb108..3ff599b178 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -4889,6 +4889,9 @@ Open the link below to access the user profile:
 		<item name="wcf.user.security.multifactor.backup.code"><![CDATA[Emergency Code]]></item>
 		<item name="wcf.user.security.multifactor.backup.code.description"><![CDATA[An emergency code consists of 20 digits and may only be used once.]]></item>
 		<item name="wcf.user.security.multifactor.totp.deviceName.description.auth"><![CDATA[The device that generated the used one time code.]]></item>
+		<item name="wcf.user.security.multifactor.authentication.user.headline"><![CDATA[Hello {$user->username}!]]></item>
+		<item name="wcf.user.security.multifactor.authentication.user.content"><![CDATA[The provided credentials are correct, but your account is protected with multi-factor authentication. Please use your second factor to complete the login process.]]></item>
+		<item name="wcf.user.security.multifactor.authentication.logout"><![CDATA[Abort and Logout]]></item>
 		<item name="wcf.user.security.multifactor.authentication.logout.success"><![CDATA[The multi-factor authentication has successfully been aborted.]]></item>
 	</category>
 	<category name="wcf.user.trophy">
-- 
2.20.1