]> source.dussan.org Git - nextcloud-server.git/commitdiff
only use 1 fsview when initializing encryption
authorRobin Appelman <icewind@owncloud.com>
Thu, 21 Jun 2012 16:35:12 +0000 (18:35 +0200)
committerRobin Appelman <icewind@owncloud.com>
Thu, 21 Jun 2012 16:35:12 +0000 (18:35 +0200)
apps/files_encryption/lib/crypt.php

index 1c90954cec8840215d93bd605bd20c6a478f0f01..849e88ee0b2eb4fc521901121a17eabf5f7b0b92 100644 (file)
@@ -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);
        }