Skip to content
Snippets Groups Projects
Commit f8f3c9ec authored by Joas Schilling's avatar Joas Schilling
Browse files

Remove password reset when the user can not change the password

parent e44b164f
No related branches found
No related tags found
No related merge requests found
...@@ -56,11 +56,15 @@ script('core', [ ...@@ -56,11 +56,15 @@ script('core', [
<input type="submit" id="submit" class="login primary icon-confirm svg" title="<?php p($l->t('Log in')); ?>" value="" disabled="disabled"/> <input type="submit" id="submit" class="login primary icon-confirm svg" title="<?php p($l->t('Log in')); ?>" value="" disabled="disabled"/>
</p> </p>
<?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?> <?php if (!empty($_['invalidpassword']) && !empty($_['canResetPassword'])) { ?>
<a id="lost-password" class="warning" href=""> <a id="lost-password" class="warning" href="">
<?php p($l->t('Wrong password. Reset it?')); ?> <?php p($l->t('Wrong password. Reset it?')); ?>
</a> </a>
<?php endif; ?> <?php } else if (!empty($_['invalidpassword'])) { ?>
<p class="warning">
<?php p($l->t('Wrong password.')); ?>
</p>
<?php } ?>
<?php if ($_['rememberLoginAllowed'] === true) : ?> <?php if ($_['rememberLoginAllowed'] === true) : ?>
<div class="remember-login-container"> <div class="remember-login-container">
<input type="checkbox" name="remember_login" value="1" id="remember_login" class="checkbox checkbox--white"> <input type="checkbox" name="remember_login" value="1" id="remember_login" class="checkbox checkbox--white">
......
...@@ -947,6 +947,12 @@ class OC_Util { ...@@ -947,6 +947,12 @@ class OC_Util {
$parameters['redirect_url'] = $_REQUEST['redirect_url']; $parameters['redirect_url'] = $_REQUEST['redirect_url'];
} }
$parameters['canResetPassword'] = true;
$user = \OC::$server->getUserManager()->get($_REQUEST['user']);
if ($user instanceof IUser) {
$parameters['canResetPassword'] = $user->canChangePassword();
}
$parameters['alt_login'] = OC_App::getAlternativeLogIns(); $parameters['alt_login'] = OC_App::getAlternativeLogIns();
$parameters['rememberLoginAllowed'] = self::rememberLoginAllowed(); $parameters['rememberLoginAllowed'] = self::rememberLoginAllowed();
\OC_Hook::emit('OC_Util', 'pre_displayLoginPage', array('parameters' => $parameters)); \OC_Hook::emit('OC_Util', 'pre_displayLoginPage', array('parameters' => $parameters));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment