wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

only force re-login if server-side encryption is enabled

Browse source
This commit is contained in:
Bjoern Schiessle 2012-08-03 11:59:32 +02:00
parent d5808f07ca
commit bed05f0302
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/files_encryption/appinfo/app.php
View file

@ -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();