fix for wrong file infos

diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index eb1cb45871c847cc434b869645c9dda6b84eb40a..c2b13b00b24503c7b4f648901a9faeac853dd08a 100644 (file)
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -513,7 +513,7 @@ class Stream {
             \OC_FileProxy::$enabled = $proxyStatus;
 
             // get file info
-            $fileInfo = \OC\Files\Filesystem::getFileInfo($this->rawPath);
+            $fileInfo = $view->getFileInfo($this->rawPath);
             if(!is_array($fileInfo)) {
                 $fileInfo = array();
             }
@@ -524,7 +524,7 @@ class Stream {
             $fileInfo['unencrypted_size'] = $this->unencryptedSize;
 
             // set fileinfo
-                       \OC\Files\Filesystem::putFileInfo( $this->rawPath, $fileInfo);
+            $view->putFileInfo( $this->rawPath, $fileInfo);
                }
 
                return fclose( $this->handle );

diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 2e8e2af683b9c3b8df17678631b1b4123ce4fd7b..5ab5ea6425f7ed4e3f58b8bac2bab04d3b21803c 100644 (file)
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -1040,7 +1040,8 @@ class Util {
         */
        public function getUidAndFilename( $path ) {
 
-               $fileOwnerUid = \OC\Files\Filesystem::getOwner( $path );
+        $view = new \OC\Files\View($this->userFilesDir);
+               $fileOwnerUid = $view->getOwner( $path );
                
                // Check that UID is valid
                if ( ! \OCP\User::userExists( $fileOwnerUid ) ) {
@@ -1060,7 +1061,7 @@ class Util {
                        
                } else {
                
-                       $info = \OC\Files\Filesystem::getFileInfo( $path );
+                       $info = $view->getFileInfo( $path );
                        $ownerView = new \OC\Files\View( '/' . $fileOwnerUid . '/files' );
                        
                        // Fetch real file path from DB
@@ -1069,7 +1070,7 @@ class Util {
                }
                
                // Make path relative for use by $view
-               $relpath = $fileOwnerUid . '/' . $this->fileFolderName . '/' . $filename;
+               $relpath = \OC\Files\Filesystem::normalizePath($fileOwnerUid . '/' . $this->fileFolderName . '/' . $filename);
                
                // Check that the filename we're using is working
                if ( $this->view->file_exists( $relpath ) ) {