Browse Source

Always remember me

Fixes #8004

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
tags/v14.0.0beta1
Roeland Jago Douma 6 years ago
parent
commit
caee215120
No account linked to committer's email address
2 changed files with 1 additions and 13 deletions
  1. 1
    3
      core/Controller/LoginController.php
  2. 0
    10
      core/templates/login.php

+ 1
- 3
core/Controller/LoginController.php View File

@@ -184,8 +184,6 @@ class LoginController extends Controller {
}

$parameters['alt_login'] = OC_App::getAlternativeLogIns();
$parameters['rememberLoginState'] = !empty($remember_login) ? $remember_login : 0;
$parameters['hideRemeberLoginState'] = !empty($redirect_url) && $this->session->exists('client.flow.state.token');

if ($user !== null && $user !== '') {
$parameters['loginName'] = $user;
@@ -240,7 +238,7 @@ class LoginController extends Controller {
* @param string $timezone_offset
* @return RedirectResponse
*/
public function tryLogin($user, $password, $redirect_url, $remember_login = false, $timezone = '', $timezone_offset = '') {
public function tryLogin($user, $password, $redirect_url, $remember_login = true, $timezone = '', $timezone_offset = '') {
if(!is_string($user)) {
throw new \InvalidArgumentException('Username must be string');
}

+ 0
- 10
core/templates/login.php View File

@@ -76,16 +76,6 @@ script('core', 'merged-login');
<?php } ?>

<div class="login-additional">
<?php if (!$_['hideRemeberLoginState']) { ?>
<div class="remember-login-container">
<?php if ($_['rememberLoginState'] === 0) { ?>
<input type="checkbox" name="remember_login" value="1" id="remember_login" class="checkbox checkbox--white">
<?php } else { ?>
<input type="checkbox" name="remember_login" value="1" id="remember_login" class="checkbox checkbox--white" checked="checked">
<?php } ?>
<label for="remember_login"><?php p($l->t('Stay logged in')); ?></label>
</div>
<?php } ?>
<?php if (!empty($_['canResetPassword'])) { ?>
<div class="lost-password-container">
<a id="lost-password" href="<?php p($_['resetPasswordLink']); ?>">

Loading…
Cancel
Save