diff options
| author | Björn Schießle <bjoern@schiessle.org> | 2013-10-04 13:28:18 +0400 |
|---|---|---|
| committer | Björn Schießle <bjoern@schiessle.org> | 2013-10-04 13:28:18 +0400 |
| commit | 5b7f76e7022f6d3c5cb4038a737df3870e56773b (patch) | |
| tree | 3fe96647523e99f7f30db2a619773f44aedb529c /apps/files_encryption/appinfo | |
| parent | 1992450b32da7953ff6bd493b8ec5cfbb23d8d92 (diff) | |
| parent | 9d2595a7c59048fc6ed3777a888e03d43a8f03f9 (diff) | |
Merge pull request #4691 from owncloud/encryption_improved_error_messages_4617
Encryption improved error messages
Diffstat (limited to 'apps/files_encryption/appinfo')
| -rw-r--r-- | apps/files_encryption/appinfo/app.php | 17 | ||||
| -rw-r--r-- | apps/files_encryption/appinfo/version | 2 |
2 files changed, 1 insertions, 18 deletions
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php index 5b62b84e223..c930ac9eca8 100644 --- a/apps/files_encryption/appinfo/app.php +++ b/apps/files_encryption/appinfo/app.php @@ -43,23 +43,6 @@ if (!OC_Config::getValue('maintenance', false)) { if($sessionReady) { $session = new \OCA\Encryption\Session($view); } - - $user = \OCP\USER::getUser(); - // check if user has a private key - if ($sessionReady === false - || (!$view->file_exists('/' . $user . '/files_encryption/' . $user . '.private.key') - && OCA\Encryption\Crypt::mode() === 'server') - ) { - - // Force the user to log-in again if the encryption key isn't unlocked - // (happens when a user is logged in before the encryption app is - // enabled) - OCP\User::logout(); - - header("Location: " . OC::$WEBROOT . '/'); - - exit(); - } } } else { // logout user if we are in maintenance to force re-login diff --git a/apps/files_encryption/appinfo/version b/apps/files_encryption/appinfo/version index bd73f47072b..2eb3c4fe4ee 100644 --- a/apps/files_encryption/appinfo/version +++ b/apps/files_encryption/appinfo/version @@ -1 +1 @@ -0.4 +0.5 |