From 2f245faee4db0cae360da23397d9860f44f57258 Mon Sep 17 00:00:00 2001 From: Billy Noah Date: Wed, 6 Jan 2021 09:19:59 -0500 Subject: [PATCH 1/2] [ticket/16679] Respect "allow password reset" setting on login PHPBB3-16679 --- phpBB/includes/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 7341a24e16..8f139cb036 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2484,7 +2484,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa 'LOGIN_ERROR' => $err, 'LOGIN_EXPLAIN' => $l_explain, - 'U_SEND_PASSWORD' => ($config['email_enable']) ? $controller_helper->route('phpbb_ucp_forgot_password_controller') : '', + 'U_SEND_PASSWORD' => ($config['email_enable'] && $config['allow_password_reset']) ? $controller_helper->route('phpbb_ucp_forgot_password_controller') : '', 'U_RESEND_ACTIVATION' => ($config['require_activation'] == USER_ACTIVATION_SELF && $config['email_enable']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=resend_act') : '', 'U_TERMS_USE' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'), 'U_PRIVACY' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy'), From c76fef342d3f734c379af34f012af6ac02efe0ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1t=C3=A9=20Bartus?= Date: Thu, 7 Jan 2021 19:23:45 +0100 Subject: [PATCH 2/2] [ticket/16679] Hide password reset link if disabled on the index page PHPBB3-16679 --- phpBB/index.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/index.php b/phpBB/index.php index 5622bc37c7..c41de04b4d 100644 --- a/phpBB/index.php +++ b/phpBB/index.php @@ -211,6 +211,7 @@ if ($show_birthdays) $template->assign_block_vars_array('birthdays', $birthdays); } +$controller_helper = $phpbb_container->get('controller.helper'); // Assign index specific vars $template->assign_vars(array( 'TOTAL_POSTS' => $user->lang('TOTAL_POSTS_COUNT', (int) $config['num_posts']), @@ -222,7 +223,7 @@ $template->assign_vars(array( 'BIRTHDAY_LIST' => (empty($birthday_list)) ? '' : implode($user->lang['COMMA_SEPARATOR'], $birthday_list), 'S_LOGIN_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login'), - 'U_SEND_PASSWORD' => ($config['email_enable']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=sendpassword') : '', + 'U_SEND_PASSWORD' => ($config['email_enable'] && $config['allow_password_reset']) ? $controller_helper->route('phpbb_ucp_forgot_password_controller') : '', 'S_DISPLAY_BIRTHDAY_LIST' => $show_birthdays, 'S_INDEX' => true,