don't remember login if the encrypion app is enabled because the user
needs to log-in again in order to decrypt his private key with his password
This commit is contained in:
parent
40871bab88
commit
b693b5085c
|
@ -32,9 +32,10 @@
|
||||||
<?php p($l->t('Lost your password?')); ?>
|
<?php p($l->t('Lost your password?')); ?>
|
||||||
</a>
|
</a>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
|
<?php if ($_['encryption_enabled'] === false) : ?>
|
||||||
<input type="checkbox" name="remember_login" value="1" id="remember_login" checked />
|
<input type="checkbox" name="remember_login" value="1" id="remember_login" checked />
|
||||||
<label for="remember_login"><?php p($l->t('remember')); ?></label>
|
<label for="remember_login"><?php p($l->t('remember')); ?></label>
|
||||||
|
<?php endif; ?>
|
||||||
<input type="hidden" name="timezone-offset" id="timezone-offset"/>
|
<input type="hidden" name="timezone-offset" id="timezone-offset"/>
|
||||||
<input type="submit" id="submit" class="login primary" value="<?php p($l->t('Log in')); ?>"/>
|
<input type="submit" id="submit" class="login primary" value="<?php p($l->t('Log in')); ?>"/>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
|
@ -760,6 +760,7 @@ class OC {
|
||||||
|| !isset($_COOKIE["oc_token"])
|
|| !isset($_COOKIE["oc_token"])
|
||||||
|| !isset($_COOKIE["oc_username"])
|
|| !isset($_COOKIE["oc_username"])
|
||||||
|| !$_COOKIE["oc_remember_login"]
|
|| !$_COOKIE["oc_remember_login"]
|
||||||
|
|| OC_App::isEnabled('files_encryption')
|
||||||
) {
|
) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -467,6 +467,7 @@ class OC_Util {
|
||||||
}
|
}
|
||||||
|
|
||||||
$parameters['alt_login'] = OC_App::getAlternativeLogIns();
|
$parameters['alt_login'] = OC_App::getAlternativeLogIns();
|
||||||
|
$parameters['encryption_enabled'] = OC_App::isEnabled('files_encryption');
|
||||||
OC_Template::printGuestPage("", "login", $parameters);
|
OC_Template::printGuestPage("", "login", $parameters);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue