From 1fbdc3ce8fc4c5430b9fd85a95e984a317c75778 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Wed, 15 May 2013 14:32:50 +0200
Subject: [PATCH] fix for previous workaround
---
apps/files_encryption/appinfo/app.php | 41 ++++++++++++++-------------
1 file changed, 21 insertions(+), 20 deletions(-)
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index ec594fd19f..e56d012fee 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -26,26 +26,27 @@ OCA\Encryption\Helper::registerFilesystemHooks();
stream_wrapper_register( 'crypt', 'OCA\Encryption\Stream' );
-$view = new OC_FilesystemView( '/' );
-
-//$session = new \OCA\Encryption\Session( $view );
-//
-//if (
-// ! $session->getPrivateKey( \OCP\USER::getUser() )
-// && OCP\User::isLoggedIn()
-// && 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();
-//
-//}
+// check if we are logged in
+if (OCP\User::isLoggedIn()) {
+ $view = new OC_FilesystemView('/');
+ $session = new \OCA\Encryption\Session($view);
+
+ // check if user has a private key
+ if (
+ !$session->getPrivateKey(\OCP\USER::getUser())
+ && 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();
+ }
+}
// Register settings scripts
OCP\App::registerAdmin( 'files_encryption', 'settings-admin' );
--
GitLab