Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled

don't remember login if the encrypion app is enabled

2 files changed, 23 insertions, 0 deletions

diff --git a/lib/base.php b/lib/base.php
index 58894be03ee..036051119de 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -770,6 +770,7 @@ class OC {
 			|| !isset($_COOKIE["oc_token"])
 			|| !isset($_COOKIE["oc_username"])
 			|| !$_COOKIE["oc_remember_login"]
+			|| !OC_Util::rememberLoginAllowed()
 		) {
 			return false;
 		}
diff --git a/lib/util.php b/lib/util.php
index 6be56d07c9a..1fb867d3ac8 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -471,6 +471,7 @@ class OC_Util {
 		}
 
 		$parameters['alt_login'] = OC_App::getAlternativeLogIns();
+		$parameters['rememberLoginAllowed'] = self::rememberLoginAllowed();
 		OC_Template::printGuestPage("", "login", $parameters);
 	}
 
@@ -513,6 +514,27 @@ class OC_Util {
 	}
 
 	/**
+	 * Check if it is allowed to remember login.
+	 *
+	 * @note Every app can set 'rememberlogin' to 'false' to disable the remember login feature
+	 *
+	 * @return bool
+	 */
+	public static function rememberLoginAllowed() {
+
+		$apps = OC_App::getEnabledApps();
+
+		foreach ($apps as $app) {
+			$appInfo = OC_App::getAppInfo($app);
+			if (isset($appInfo['rememberlogin']) && $appInfo['rememberlogin'] === 'false') {
+				return false;
+			}
+
+		}
+		return true;
+	}
+
+	/**
 	 * @brief Check if the user is a subadmin, redirects to home if not
 	 * @return array $groups where the current user is subadmin
 	 */