From fa14375a6513376e6a61588191a2ba800fade1ad Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Wed, 30 Sep 2020 13:34:03 +0200
Subject: [PATCH] [ticket/16562] Add password requirements to reset

Credits to thecoalman:
https://www.phpbb.com/community/viewtopic.php?p=15560491#p15560491

PHPBB3-16562
---
 phpBB/phpbb/ucp/controller/reset_password.php           | 1 +
 phpBB/styles/prosilver/template/ucp_reset_password.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpBB/phpbb/ucp/controller/reset_password.php b/phpBB/phpbb/ucp/controller/reset_password.php
index d20fafb2a8..cce76e3d48 100644
--- a/phpBB/phpbb/ucp/controller/reset_password.php
+++ b/phpBB/phpbb/ucp/controller/reset_password.php
@@ -428,6 +428,7 @@ class reset_password
 			'PASSWORD_RESET_ERRORS'		=> !empty($errors) ? array_map([$this->language, 'lang'], $errors) : '',
 			'S_IS_PASSWORD_RESET'		=> true,
 			'U_RESET_PASSWORD_ACTION'	=> $this->helper->route('phpbb_ucp_reset_password_controller'),
+			'L_CHANGE_PASSWORD_EXPLAIN'	=> $this->language->lang($this->config['pass_complex'] . '_EXPLAIN', $this->language->lang('CHARACTERS', (int) $this->config['min_pass_chars'])),
 			'S_HIDDEN_FIELDS'			=> build_hidden_fields([
 				'u'		=> $user_id,
 				'token'	=> $reset_token,
diff --git a/phpBB/styles/prosilver/template/ucp_reset_password.html b/phpBB/styles/prosilver/template/ucp_reset_password.html
index fc42164e11..ec19ff7958 100644
--- a/phpBB/styles/prosilver/template/ucp_reset_password.html
+++ b/phpBB/styles/prosilver/template/ucp_reset_password.html
@@ -12,7 +12,7 @@
 		{% if S_IS_PASSWORD_RESET %}
 			{% 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>
+				<dt><label for="new_password">{{ lang('NEW_PASSWORD') ~ lang('COLON') }}</label><br /><span>{{ lang('CHANGE_PASSWORD_EXPLAIN') }}</span></dt>
 				<dd><input class="inputbox autowidth" type="password" name="new_password" id="new_password" size="25" maxlength="255" title="{{ lang('CHANGE_PASSWORD') }}" autocomplete="off" /></dd>
 			</dl>
 			<dl>