summaryrefslogtreecommitdiffstats
path: root/core/Controller
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2018-11-20 13:28:40 +0100
committerBackportbot <backportbot-noreply@rullzer.com>2018-11-20 14:53:19 +0000
commitb776c3b89f4d772c9ed478acd0d998c0cda52971 (patch)
treee19dcd5e76c6739e4982804e4d5ca11fbe076f07 /core/Controller
parentb4a410e5025a47f17e87fd1a1cd4f9b0692e2cf6 (diff)
downloadnextcloud-server-b776c3b89f4d772c9ed478acd0d998c0cda52971.tar.gz
nextcloud-server-b776c3b89f4d772c9ed478acd0d998c0cda52971.zip
Respect the disabled setting for lost_password_link
Fixes #11146 As documented when it is set to disabled the user can't request a lost password. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'core/Controller')
-rw-r--r--core/Controller/LoginController.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index 182d2bc106d..c30206ff3d5 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -224,7 +224,9 @@ class LoginController extends Controller {
$parameters['resetPasswordLink'] = $this->config
->getSystemValue('lost_password_link', '');
- if (!$parameters['resetPasswordLink'] && $userObj !== null) {
+ if ($parameters['resetPasswordLink'] === 'disabled') {
+ $parameters['canResetPassword'] = false;
+ } else if (!$parameters['resetPasswordLink'] && $userObj !== null) {
$parameters['canResetPassword'] = $userObj->canChangePassword();
} else if ($userObj !== null && $userObj->isEnabled() === false) {
$parameters['canResetPassword'] = false;