diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-10 17:25:34 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-10 17:25:34 +0100 |
| commit | 39e6a1897b82b3433b5ed6437f14e2739ba26d32 (patch) | |
| tree | 93ce20545db5c7f47e276fb8c7b08adcebaaf990 | |
| parent | 10613f7265ea9f47ff8f7d96b2f1b86288dee29f (diff) | |
| parent | 06b2f11e57ca893e963bfac8a0b051f4aa88a1ce (diff) | |
| download | nextcloud-server-39e6a1897b82b3433b5ed6437f14e2739ba26d32.tar.gz nextcloud-server-39e6a1897b82b3433b5ed6437f14e2739ba26d32.zip | |
Merge pull request #22271 from owncloud/remember-login-state
Remember previous state of remember login checkbox
| -rw-r--r-- | core/templates/login.php | 4 | ||||
| -rw-r--r-- | lib/private/util.php | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/core/templates/login.php b/core/templates/login.php index e87b871c67e..a12008295c4 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -67,7 +67,11 @@ script('core', [ <?php } ?> <?php if ($_['rememberLoginAllowed'] === true) : ?> <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 endif; ?> diff --git a/lib/private/util.php b/lib/private/util.php index 6e15d742bed..6ad668dedaa 100644 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -969,6 +969,7 @@ class OC_Util { $parameters['alt_login'] = OC_App::getAlternativeLogIns(); $parameters['rememberLoginAllowed'] = self::rememberLoginAllowed(); + $parameters['rememberLoginState'] = isset($_POST['remember_login']) ? $_POST['remember_login'] : 0; \OC_Hook::emit('OC_Util', 'pre_displayLoginPage', array('parameters' => $parameters)); OC_Template::printGuestPage("", "login", $parameters); } |