From 6d80952fe32db768ccd597f09e560241d5c4a4a7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim=20D=C3=BCsterhus?= <duesterhus@woltlab.com>
Date: Mon, 7 Dec 2020 11:24:56 +0100
Subject: [PATCH] Add explanatory texts to reauthentication

---
 com.woltlab.wcf/templates/__reauthenticationLoginAs.tpl    | 4 ++++
 com.woltlab.wcf/templates/reauthentication.tpl             | 2 ++
 syncTemplates.json                                         | 1 +
 .../files/acp/templates/__reauthenticationLoginAs.tpl      | 4 ++++
 wcfsetup/install/files/acp/templates/reauthentication.tpl  | 2 ++
 .../files/lib/form/MultifactorAuthenticationForm.class.php | 1 -
 .../install/files/lib/form/ReauthenticationForm.class.php  | 7 +++++--
 wcfsetup/install/lang/de.xml                               | 2 ++
 wcfsetup/install/lang/en.xml                               | 2 ++
 9 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 com.woltlab.wcf/templates/__reauthenticationLoginAs.tpl
 create mode 100644 wcfsetup/install/files/acp/templates/__reauthenticationLoginAs.tpl

diff --git a/com.woltlab.wcf/templates/__reauthenticationLoginAs.tpl b/com.woltlab.wcf/templates/__reauthenticationLoginAs.tpl
new file mode 100644
index 0000000000..e4e29a800b
--- /dev/null
+++ b/com.woltlab.wcf/templates/__reauthenticationLoginAs.tpl
@@ -0,0 +1,4 @@
+<dl>
+	<dt>{lang}wcf.user.reauthentication.loginAs{/lang}</dt>
+	<dd>{$__wcf->user->username}</dd>
+</dl>
diff --git a/com.woltlab.wcf/templates/reauthentication.tpl b/com.woltlab.wcf/templates/reauthentication.tpl
index 02b1ef733d..a00e19fe14 100644
--- a/com.woltlab.wcf/templates/reauthentication.tpl
+++ b/com.woltlab.wcf/templates/reauthentication.tpl
@@ -1,5 +1,7 @@
 {include file='header' __disableAds=true}
 
+<p class="info" role="status">{lang}wcf.user.reauthentication.explanation{/lang}</p>
+
 {@$form->getHtml()}
 
 {include file='footer' __disableAds=true}
diff --git a/syncTemplates.json b/syncTemplates.json
index 63a95e31a0..cc632327cb 100644
--- a/syncTemplates.json
+++ b/syncTemplates.json
@@ -38,6 +38,7 @@
     "__pollOptionsFormField",
     "__radioButtonFormField",
     "__ratingFormField",
+    "__reauthenticationLoginAs",
     "__rowFormContainer",
     "__rowFormFieldContainer",
     "__singleMediaSelectionFormField",
diff --git a/wcfsetup/install/files/acp/templates/__reauthenticationLoginAs.tpl b/wcfsetup/install/files/acp/templates/__reauthenticationLoginAs.tpl
new file mode 100644
index 0000000000..e4e29a800b
--- /dev/null
+++ b/wcfsetup/install/files/acp/templates/__reauthenticationLoginAs.tpl
@@ -0,0 +1,4 @@
+<dl>
+	<dt>{lang}wcf.user.reauthentication.loginAs{/lang}</dt>
+	<dd>{$__wcf->user->username}</dd>
+</dl>
diff --git a/wcfsetup/install/files/acp/templates/reauthentication.tpl b/wcfsetup/install/files/acp/templates/reauthentication.tpl
index 4a682a73b0..645830a59d 100644
--- a/wcfsetup/install/files/acp/templates/reauthentication.tpl
+++ b/wcfsetup/install/files/acp/templates/reauthentication.tpl
@@ -6,6 +6,8 @@
 	</div>
 </header>
 
+<p class="info" role="status">{lang}wcf.user.reauthentication.explanation{/lang}</p>
+
 {@$form->getHtml()}
 
 {include file='footer'}
diff --git a/wcfsetup/install/files/lib/form/MultifactorAuthenticationForm.class.php b/wcfsetup/install/files/lib/form/MultifactorAuthenticationForm.class.php
index 5e17a05130..f225565d45 100644
--- a/wcfsetup/install/files/lib/form/MultifactorAuthenticationForm.class.php
+++ b/wcfsetup/install/files/lib/form/MultifactorAuthenticationForm.class.php
@@ -121,7 +121,6 @@ class MultifactorAuthenticationForm extends AbstractFormBuilderForm {
 		
 		$this->form->appendChild(
 			TemplateFormNode::create('loginAs')
-				->application('wcf')
 				->templateName('__multifactorAuthenticationLoginAs')
 		);
 		
diff --git a/wcfsetup/install/files/lib/form/ReauthenticationForm.class.php b/wcfsetup/install/files/lib/form/ReauthenticationForm.class.php
index 2de11450e4..ee9c1f301e 100644
--- a/wcfsetup/install/files/lib/form/ReauthenticationForm.class.php
+++ b/wcfsetup/install/files/lib/form/ReauthenticationForm.class.php
@@ -4,6 +4,7 @@ use wcf\form\AbstractFormBuilderForm;
 use wcf\system\application\ApplicationHandler;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\form\builder\field\user\UserPasswordField;
+use wcf\system\form\builder\TemplateFormNode;
 use wcf\system\request\LinkHandler;
 use wcf\system\WCF;
 use wcf\util\HeaderUtil;
@@ -54,10 +55,12 @@ class ReauthenticationForm extends AbstractFormBuilderForm {
 	protected function createForm() {
 		parent::createForm();
 		
-		$this->form->appendChild(
+		$this->form->appendChildren([
+			TemplateFormNode::create('loginAs')
+				->templateName('__reauthenticationLoginAs'),
 			UserPasswordField::create()
 				->required(),
-		);
+		]);
 	}
 	
 	/**
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index f46ae2e503..6d8ed35bcc 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -4747,6 +4747,8 @@ sich{/if} nicht bei uns registriert {if LANGUAGE_USE_INFORMAL_VARIANT}hast{else}
 		<item name="wcf.user.status.isDisabled"><![CDATA[Der Benutzer ist nicht freigeschaltet.]]></item>
 		<item name="wcf.user.status.blacklistMatches"><![CDATA[Der Benutzer wurde aufgrund eines Treffers in der Datenbank von „Stop Forum Spam“ automatisch deaktiviert (Übereinstimmungen: {implode glue=', ' from=$user->getBlacklistMatchesTitle() item=matchLabel}{$matchLabel}{/implode}).]]></item>
 		<item name="wcf.user.reauthentication"><![CDATA[Erneute Authentifizierung]]></item>
+		<item name="wcf.user.reauthentication.explanation"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du betrittst einen besonders geschützten Bereich. Aus Sicherheitsgründen ist es notwendig, dass du dich durch Eingabe deines Kennworts erneut authentifizierst.{else}Sie betreten einen besonders geschützten Bereich. Aus Sicherheitsgründen ist es notwendig, dass Sie sich durch Eingabe Ihres Kenntworts erneut authentifizieren.{/if}]]></item>
+		<item name="wcf.user.reauthentication.loginAs"><![CDATA[Eingeloggt als]]></item>
 	</category>
 	<category name="wcf.user.menu">
 		<item name="wcf.user.menu.community"><![CDATA[Community]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index e2e45e7190..b51a604d25 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -4745,6 +4745,8 @@ not register with us.]]></item>
 		<item name="wcf.user.status.isDisabled"><![CDATA[The user has not been approved yet.]]></item>
 		<item name="wcf.user.status.blacklistMatches"><![CDATA[The user has been automatically disabled because of matches in the “Stop Forum Spam” database (Matches: {implode glue=', ' from=$user->getBlacklistMatchesTitle() item=matchLabel}{$matchLabel}{/implode}).]]></item>
 		<item name="wcf.user.reauthentication"><![CDATA[Re-authentication]]></item>
+		<item name="wcf.user.reauthentication.explanation"><![CDATA[You are entering a security-sensitive area. For security reasons it is required that you re-authenticate yourself by entering your password.]]></item>
+		<item name="wcf.user.reauthentication.loginAs"><![CDATA[Logged in as]]></item>
 	</category>
 	<category name="wcf.user.menu">
 		<item name="wcf.user.menu.community"><![CDATA[Community]]></item>
-- 
2.20.1