From b693b5085c3da7a3242c1efe9251c2f579027d76 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 24 Sep 2013 13:08:55 +0200
Subject: [PATCH] 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

---
 core/templates/login.php |  3 ++-
 lib/base.php             |  1 +
 lib/util.php             | 13 +++++++------
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/templates/login.php b/core/templates/login.php
index ee761f0aa5..3e736f164e 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -32,9 +32,10 @@
 			<?php p($l->t('Lost your password?')); ?>
 		</a>
 		<?php endif; ?>
-
+		<?php if ($_['encryption_enabled'] === false) : ?>
 		<input type="checkbox" name="remember_login" value="1" id="remember_login" checked />
 		<label for="remember_login"><?php p($l->t('remember')); ?></label>
+		<?php endif; ?>
 		<input type="hidden" name="timezone-offset" id="timezone-offset"/>
 		<input type="submit" id="submit" class="login primary" value="<?php p($l->t('Log in')); ?>"/>
 	</fieldset>
diff --git a/lib/base.php b/lib/base.php
index 395d8486a5..b4e12bc7eb 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -760,6 +760,7 @@ class OC {
 			|| !isset($_COOKIE["oc_token"])
 			|| !isset($_COOKIE["oc_username"])
 			|| !$_COOKIE["oc_remember_login"]
+			|| OC_App::isEnabled('files_encryption')
 		) {
 			return false;
 		}
diff --git a/lib/util.php b/lib/util.php
index 41f5f1d16b..ef42ff2aea 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -414,10 +414,10 @@ class OC_Util {
 				$encryptedFiles = true;
 			}
 		}
-		
+
 		return $encryptedFiles;
 	}
-	
+
 	/**
 	 * @brief Check for correct file permissions of data directory
 	 * @paran string $dataDirectory
@@ -467,6 +467,7 @@ class OC_Util {
 		}
 
 		$parameters['alt_login'] = OC_App::getAlternativeLogIns();
+		$parameters['encryption_enabled'] = OC_App::isEnabled('files_encryption');
 		OC_Template::printGuestPage("", "login", $parameters);
 	}
 
@@ -654,16 +655,16 @@ class OC_Util {
 		}
 		return $value;
 	}
-	
+
 	/**
 	 * @brief Public function to encode url parameters
 	 *
 	 * This function is used to encode path to file before output.
 	 * Encoding is done according to RFC 3986 with one exception:
-	 * Character '/' is preserved as is. 
+	 * Character '/' is preserved as is.
 	 *
 	 * @param string $component part of URI to encode
-	 * @return string 
+	 * @return string
 	 */
 	public static function encodePath($component) {
 		$encoded = rawurlencode($component);
@@ -810,7 +811,7 @@ class OC_Util {
 			}
 		}
 	}
-	
+
 	/**
 	 * @brief Check if the connection to the internet is disabled on purpose
 	 * @return bool