From eee18f3747592eb17ea1a16184c19e5cda1f500e Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 10 Aug 2019 15:11:43 +0200
Subject: [ticket/11327] Rename UCP reset password template

PHPBB3-11327
---
 .../prosilver/template/ucp_reset_password.html     | 37 ++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 phpBB/styles/prosilver/template/ucp_reset_password.html

(limited to 'phpBB/styles/prosilver/template/ucp_reset_password.html')

diff --git a/phpBB/styles/prosilver/template/ucp_reset_password.html b/phpBB/styles/prosilver/template/ucp_reset_password.html
new file mode 100644
index 0000000000..8b700de430
--- /dev/null
+++ b/phpBB/styles/prosilver/template/ucp_reset_password.html
@@ -0,0 +1,37 @@
+<!-- INCLUDE overall_header.html -->
+
+<form action="{S_PROFILE_ACTION}" method="post" id="remind">
+
+<div class="panel">
+	<div class="inner">
+
+	<div class="content">
+		<h2>{L_SEND_PASSWORD}</h2>
+
+		<fieldset>
+			{% if USERNAME_REQUIRED %}
+				<p class="error">{{ lang('EMAIL_NOT_UNIQUE') }}</p>
+			{% endif %}
+		<dl>
+			<dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label><br /><span>{L_EMAIL_REMIND}</span></dt>
+			<dd><input class="inputbox narrow" type="email" name="email" id="email" size="25" maxlength="100" value="{{ EMAIL }}" autofocus /></dd>
+		</dl>
+		{% if USERNAME_REQUIRED %}
+		<dl>
+			<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>
+			<dd><input class="inputbox narrow" type="text" name="username" id="username" size="25" /></dd>
+		</dl>
+		{% endif %}
+		<dl>
+			<dt>&nbsp;</dt>
+			<dd>{S_HIDDEN_FIELDS}<input type="submit" name="submit" id="submit" class="button1" value="{L_SUBMIT}" tabindex="2" />&nbsp; <input type="reset" value="{L_RESET}" name="reset" class="button2" /></dd>
+		</dl>
+		{S_FORM_TOKEN}
+		</fieldset>
+	</div>
+
+	</div>
+</div>
+</form>
+
+<!-- INCLUDE overall_footer.html -->
-- 
cgit v1.2.1


From cefdf8bf19d764b7fef3d04383a41ed856af5503 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 10 Aug 2019 17:18:39 +0200
Subject: [ticket/11327] Finish up initial version of password reset system

PHPBB3-11327
---
 .../prosilver/template/ucp_reset_password.html     | 38 ++++++++++++++--------
 1 file changed, 25 insertions(+), 13 deletions(-)

(limited to 'phpBB/styles/prosilver/template/ucp_reset_password.html')

diff --git a/phpBB/styles/prosilver/template/ucp_reset_password.html b/phpBB/styles/prosilver/template/ucp_reset_password.html
index 8b700de430..3f9ffce519 100644
--- a/phpBB/styles/prosilver/template/ucp_reset_password.html
+++ b/phpBB/styles/prosilver/template/ucp_reset_password.html
@@ -1,32 +1,44 @@
 <!-- INCLUDE overall_header.html -->
 
-<form action="{S_PROFILE_ACTION}" method="post" id="remind">
+<form action="{{ S_PROFILE_ACTION }}" method="post" id="remind">
 
 <div class="panel">
 	<div class="inner">
 
 	<div class="content">
-		<h2>{L_SEND_PASSWORD}</h2>
+		<h2>{{ lang('RESET_PASSWORD') }}</h2>
 
 		<fieldset>
+		{% if S_IS_PASSWORD_RESET %}
+			{% if ERROR %}<p class="error">{{ ERROR }}</p>{% endif %}
+			<dl>
+				<dt><label for="new_password">{{ lang('NEW_PASSWORD') ~ lang('COLON') }}</label></dt>
+				<dd><input type="password" name="new_password" id="new_password" size="25" maxlength="255" title="{{ lang('CHANGE_PASSWORD') }}" autocomplete="off" /></dd>
+			</dl>
+			<dl>
+				<dt><label for="new_password_confirm">{{ lang('CONFIRM_PASSWORD') ~ lang('COLON') }}</label></dt>
+				<dd><input type="password" name="new_password_confirm" id="new_password_confirm" size="25" maxlength="255" title="{{ lang('CONFIRM_PASSWORD') }}" autocomplete="off" /></dd>
+			</dl>
+		{% else %}
 			{% if USERNAME_REQUIRED %}
 				<p class="error">{{ lang('EMAIL_NOT_UNIQUE') }}</p>
 			{% endif %}
-		<dl>
-			<dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label><br /><span>{L_EMAIL_REMIND}</span></dt>
-			<dd><input class="inputbox narrow" type="email" name="email" id="email" size="25" maxlength="100" value="{{ EMAIL }}" autofocus /></dd>
-		</dl>
-		{% if USERNAME_REQUIRED %}
-		<dl>
-			<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>
-			<dd><input class="inputbox narrow" type="text" name="username" id="username" size="25" /></dd>
-		</dl>
+			<dl>
+				<dt><label for="email">{{ lang('EMAIL_ADDRESS') ~ lang('COLON') }}</label><br /><span>{{ lang('EMAIL_REMIND') }}</span></dt>
+				<dd><input class="inputbox narrow" type="email" name="email" id="email" size="25" maxlength="100" value="{{ EMAIL }}" autofocus /></dd>
+			</dl>
+			{% if USERNAME_REQUIRED %}
+			<dl>
+				<dt><label for="username">{{ lang('USERNAME') ~ lang('COLON') }}</label></dt>
+				<dd><input class="inputbox narrow" type="text" name="username" id="username" size="25" /></dd>
+			</dl>
+			{% endif %}
 		{% endif %}
 		<dl>
 			<dt>&nbsp;</dt>
-			<dd>{S_HIDDEN_FIELDS}<input type="submit" name="submit" id="submit" class="button1" value="{L_SUBMIT}" tabindex="2" />&nbsp; <input type="reset" value="{L_RESET}" name="reset" class="button2" /></dd>
+			<dd>{{ S_HIDDEN_FIELDS }}<input type="submit" name="submit" id="submit" class="button1" value="{{ lang('SUBMIT') }}" tabindex="2" />&nbsp; <input type="reset" value="{{ lang('RESET') }}" name="reset" class="button2" /></dd>
 		</dl>
-		{S_FORM_TOKEN}
+		{{ S_FORM_TOKEN }}
 		</fieldset>
 	</div>
 
-- 
cgit v1.2.1


From ba92e7d2d6fa946de715e3ff6b72275374824f8d Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 10 Aug 2019 21:23:54 +0200
Subject: [ticket/11327] Clean up code a bit

PHPBB3-11327
---
 phpBB/styles/prosilver/template/ucp_reset_password.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/prosilver/template/ucp_reset_password.html')

diff --git a/phpBB/styles/prosilver/template/ucp_reset_password.html b/phpBB/styles/prosilver/template/ucp_reset_password.html
index 3f9ffce519..8003a5646a 100644
--- a/phpBB/styles/prosilver/template/ucp_reset_password.html
+++ b/phpBB/styles/prosilver/template/ucp_reset_password.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<form action="{{ S_PROFILE_ACTION }}" method="post" id="remind">
+<form action="{{ S_PROFILE_ACTION }}" method="post" id="reset_password">
 
 <div class="panel">
 	<div class="inner">
-- 
cgit v1.2.1


From 454ea081f17c0dfb9eb75287698a301e5c5d275b Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 26 Aug 2019 18:14:39 +0200
Subject: [ticket/11327] Use U_ prefix for reset password URL template variable

PHPBB3-11327
---
 phpBB/styles/prosilver/template/ucp_reset_password.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/prosilver/template/ucp_reset_password.html')

diff --git a/phpBB/styles/prosilver/template/ucp_reset_password.html b/phpBB/styles/prosilver/template/ucp_reset_password.html
index 8003a5646a..fffaa1b59e 100644
--- a/phpBB/styles/prosilver/template/ucp_reset_password.html
+++ b/phpBB/styles/prosilver/template/ucp_reset_password.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<form action="{{ S_PROFILE_ACTION }}" method="post" id="reset_password">
+<form action="{{ U_RESET_PASSWORD_ACTION }}" method="post" id="reset_password">
 
 <div class="panel">
 	<div class="inner">
-- 
cgit v1.2.1


From 8048d817ca0198b214457066a549db6f92b85bc0 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 30 Aug 2019 09:44:10 +0200
Subject: [ticket/11327] Move html output to reset password html file

PHPBB3-11327
---
 phpBB/styles/prosilver/template/ucp_reset_password.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/prosilver/template/ucp_reset_password.html')

diff --git a/phpBB/styles/prosilver/template/ucp_reset_password.html b/phpBB/styles/prosilver/template/ucp_reset_password.html
index fffaa1b59e..0a05f69aed 100644
--- a/phpBB/styles/prosilver/template/ucp_reset_password.html
+++ b/phpBB/styles/prosilver/template/ucp_reset_password.html
@@ -10,7 +10,7 @@
 
 		<fieldset>
 		{% if S_IS_PASSWORD_RESET %}
-			{% if ERROR %}<p class="error">{{ ERROR }}</p>{% endif %}
+			{% if PASSWORD_RESET_ERRORS %}<p class="error">{{ PASSWORD_RESET_ERRORS | join('<br>') }}</p>{% endif %}
 			<dl>
 				<dt><label for="new_password">{{ lang('NEW_PASSWORD') ~ lang('COLON') }}</label></dt>
 				<dd><input type="password" name="new_password" id="new_password" size="25" maxlength="255" title="{{ lang('CHANGE_PASSWORD') }}" autocomplete="off" /></dd>
-- 
cgit v1.2.1