mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix for wrong file infos

This commit is contained in:
Florin Peter 2013-05-07 13:42:49 +02:00
parent a9649713d3
commit 8b54553872
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files_encryption/lib/stream.php
View File

@ -513,7 +513,7 @@ class Stream {
\OC_FileProxy::$enabled = $proxyStatus; \OC_FileProxy::$enabled = $proxyStatus;
// get file info // get file info
$fileInfo = \OC\Files\Filesystem::getFileInfo($this->rawPath); $fileInfo = $view->getFileInfo($this->rawPath);
if(!is_array($fileInfo)) { if(!is_array($fileInfo)) {
$fileInfo = array(); $fileInfo = array();
} }
@ -524,7 +524,7 @@ class Stream {
$fileInfo['unencrypted_size'] = $this->unencryptedSize; $fileInfo['unencrypted_size'] = $this->unencryptedSize;
// set fileinfo // set fileinfo
\OC\Files\Filesystem::putFileInfo( $this->rawPath, $fileInfo); $view->putFileInfo( $this->rawPath, $fileInfo);
} }
return fclose( $this->handle ); return fclose( $this->handle );

7
apps/files_encryption/lib/util.php
View File

@ -1040,7 +1040,8 @@ class Util {
*/ */
public function getUidAndFilename( $path ) { 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 // Check that UID is valid
if ( ! \OCP\User::userExists( $fileOwnerUid ) ) { if ( ! \OCP\User::userExists( $fileOwnerUid ) ) {
@ -1060,7 +1061,7 @@ class Util {
} else { } else {
$info = \OC\Files\Filesystem::getFileInfo( $path ); $info = $view->getFileInfo( $path );
$ownerView = new \OC\Files\View( '/' . $fileOwnerUid . '/files' ); $ownerView = new \OC\Files\View( '/' . $fileOwnerUid . '/files' );
// Fetch real file path from DB // Fetch real file path from DB
@ -1069,7 +1070,7 @@ class Util {
} }
// Make path relative for use by $view // 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 // Check that the filename we're using is working
if ( $this->view->file_exists( $relpath ) ) { if ( $this->view->file_exists( $relpath ) ) {