diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2012-08-03 11:59:32 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2012-08-03 11:59:32 +0200 |
| commit | bed05f030280087ae73f78acd38c1b797f9776c0 (patch) | |
| tree | bfda92510449d8c4928b4956333ab26c57f39054 | |
| parent | d5808f07ca729c99482a44aa3e320ad5060cb86a (diff) | |
| download | nextcloud-server-bed05f030280087ae73f78acd38c1b797f9776c0.tar.gz nextcloud-server-bed05f030280087ae73f78acd38c1b797f9776c0.zip | |
only force re-login if server-side encryption is enabled
| -rw-r--r-- | apps/files_encryption/appinfo/app.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php index 1c2fafa8da6..4fd9c37ed30 100644 --- a/apps/files_encryption/appinfo/app.php +++ b/apps/files_encryption/appinfo/app.php @@ -14,10 +14,7 @@ OCP\Util::connectHook('OC_Webdav_Properties', 'update', 'OCA_Encryption\Hooks', stream_wrapper_register('crypt','OC_CryptStream'); -if( -!isset( $_SESSION['enckey'] ) -and OCP\User::isLoggedIn() -) { +if( !isset( $_SESSION['enckey'] ) && OCP\User::isLoggedIn() && OCA_Encryption\Crypt::mode() == 'server' ) { // Force the user to re-log in if the encryption key isn't unlocked (happens when a user is logged in before the encryption app is enabled) OCP\User::logout(); |