sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix some confusion about paths relative to the files dir and to the data dir

remotes/origin/stable6
Björn Schießle 2013-04-12 14:30:02 +07:00
parent f87229ddaf
commit 02d1f86a53
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/files_encryption/lib/stream.php
Unescape Escape View File

@ -51,7 +51,7 @@ class Stream {
// TODO: make all below properties private again once unit testing is
// configured correctly
public $rawPath; // The raw path received by stream_open
public $rawPath; // The raw path relative to the data dir
public $relPath; // rel path to users file dir
private $userId;
private $handle; // Resource returned by fopen
@ -77,12 +77,11 @@ class Stream {
}
// Strip identifier text from path
$this->rawPath = str_replace( 'crypt://', '', $path );
// Strip identifier text from path, this gives us the path relative to data/<user>/files
$this->relPath = str_replace( 'crypt://', '', $path );
// Set file path relative to user files dir (7 = string length of '/files/')
$this->relPath = substr($this->rawPath, strlen($this->userId)+7);
//$this->relPath = $this->userId . '/files/' . $this->rawPath;
// rawPath is relative to the data directory
$this->rawPath = $this->userId . '/files/' . $this->relPath;
if (
dirname( $this->rawPath ) == 'streams'

2
apps/files_encryption/lib/util.php
Unescape Escape View File

@ -344,7 +344,7 @@ class Util {
// If the file is not encrypted
} else {
$found['plain'][] = array( 'name' => $file, 'path' => $filePath );
$found['plain'][] = array( 'name' => $file, 'path' => $relPath );
}