From 6707e4187e4c1186eff8dfe06999c4539ab80de7 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 21 Jun 2012 18:35:12 +0200 Subject: [PATCH] only use 1 fsview when initializing encryption --- apps/files_encryption/lib/crypt.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php index 1c90954cec..849e88ee0b 100644 --- a/apps/files_encryption/lib/crypt.php +++ b/apps/files_encryption/lib/crypt.php @@ -44,18 +44,16 @@ class OC_Crypt { } public static function init($login,$password) { - $view1=new OC_FilesystemView('/'); - if(!$view1->file_exists('/'.$login)){ - $view1->mkdir('/'.$login); + $view=new OC_FilesystemView('/'); + if(!$view->file_exists('/'.$login)){ + $view->mkdir('/'.$login); } - $view=new OC_FilesystemView('/'.$login); - OC_FileProxy::$enabled=false; - if(!$view->file_exists('/encryption.key')){// does key exist? + if(!$view->file_exists('/'.$login.'/encryption.key')){// does key exist? OC_Crypt::createkey($login,$password); } - $key=$view->file_get_contents('/encryption.key'); + $key=$view->file_get_contents('/'.$login.'/encryption.key'); OC_FileProxy::$enabled=true; $_SESSION['enckey']=OC_Crypt::decrypt($key, $password); }