makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11327] Move html output to reset password html file

Browse source 
PHPBB3-11327
This commit is contained in:
Marc Alexander 2019-08-30 09:44:10 +02:00
parent 454ea081f1
commit 8048d817ca
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/phpbb/ucp/controller/reset_password.php
View file

@ -206,7 +206,7 @@ class reset_password
{ {
$message = $this->language->lang('PASSWORD_RESET_LINK_SENT') . '<br /><br />' . $this->language->lang('RETURN_INDEX', '<a href="' . append_sid("{$this->root_path}index.{$this->php_ext}") . '">', '</a>'); $message = $this->language->lang('PASSWORD_RESET_LINK_SENT') . '<br /><br />' . $this->language->lang('RETURN_INDEX', '<a href="' . append_sid("{$this->root_path}index.{$this->php_ext}") . '">', '</a>');
if ($rowset === false) if (empty($rowset))
{ {
return $this->helper->message($message); return $this->helper->message($message);
} }
@ -420,9 +420,13 @@ class reset_password
} }
} }
if (!empty($errors))
{
$this->template->assign_block_vars_array('PASSWORD_RESET_ERRORS', array_map([$this->language, 'lang'], $errors));
}
$this->template->assign_vars([ $this->template->assign_vars([
'S_IS_PASSWORD_RESET' => true, 'S_IS_PASSWORD_RESET' => true,
'ERROR' => !empty($errors) ? implode('<br />', array_map([$this->language, 'lang'], $errors)) : '',
'U_RESET_PASSWORD_ACTION' => $this->helper->route('phpbb_ucp_reset_password_controller'), 'U_RESET_PASSWORD_ACTION' => $this->helper->route('phpbb_ucp_reset_password_controller'),
'S_HIDDEN_FIELDS' => build_hidden_fields([ 'S_HIDDEN_FIELDS' => build_hidden_fields([
'u' => $user_id, 'u' => $user_id,

2
phpBB/styles/prosilver/template/ucp_reset_password.html
View file

@ -10,7 +10,7 @@
<fieldset> <fieldset>
{% if S_IS_PASSWORD_RESET %} {% 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> <dl>
<dt><label for="new_password">{{ lang('NEW_PASSWORD') ~ lang('COLON') }}</label></dt> <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> <dd><input type="password" name="new_password" id="new_password" size="25" maxlength="255" title="{{ lang('CHANGE_PASSWORD') }}" autocomplete="off" /></dd>