diff --git a/core/templates/login.php b/core/templates/login.php
index 3e736f164ec..06f64d41e39 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -32,7 +32,7 @@
t('Lost your password?')); ?>
-
+
diff --git a/lib/base.php b/lib/base.php
index b4e12bc7ebb..d0aed230dd0 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -760,7 +760,7 @@ class OC {
|| !isset($_COOKIE["oc_token"])
|| !isset($_COOKIE["oc_username"])
|| !$_COOKIE["oc_remember_login"]
- || OC_App::isEnabled('files_encryption')
+ || !OC_Util::rememberLoginAllowed()
) {
return false;
}
diff --git a/lib/util.php b/lib/util.php
index ef42ff2aea9..e12f753d5ae 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -467,7 +467,7 @@ class OC_Util {
}
$parameters['alt_login'] = OC_App::getAlternativeLogIns();
- $parameters['encryption_enabled'] = OC_App::isEnabled('files_encryption');
+ $parameters['rememberLoginAllowed'] = self::rememberLoginAllowed();
OC_Template::printGuestPage("", "login", $parameters);
}
@@ -509,6 +509,17 @@ class OC_Util {
}
}
+ /**
+ * Check if it is allowed to remember login.
+ * E.g. if encryption is enabled the user needs to log-in every time he visites
+ * ownCloud in order to decrypt the private key.
+ *
+ * @return bool
+ */
+ public static function rememberLoginAllowed() {
+ return !OC_App::isEnabled('files_encryption');
+ }
+
/**
* @brief Check if the user is a subadmin, redirects to home if not
* @return array $groups where the current user is subadmin