wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #8771 from owncloud/enc_get_mount_from_mountmanager

Browse source 
get mount point from mount manager
This commit is contained in:
Robin McCorkell 2014-05-29 17:52:28 +01:00
commit 32a50563d3
2 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
apps/files_encryption/hooks/hooks.php
View file

@ -320,14 +320,9 @@ class Hooks {
$sharingEnabled = \OCP\Share::isEnabled();
// get the path including mount point only if not a shared folder
list($storage, ) = \OC\Files\Filesystem::resolvePath('/' . $userId . '/files' . $path);
if (!($storage instanceof \OC\Files\Storage\Local)) {
$mountPoint = 'files' . $storage->getMountPoint();
} else {
$mountPoint = '';
}
$mountManager = \OC\Files\Filesystem::getMountManager();
$mount = $mountManager->find('/' . $userId . '/files' . $path);
$mountPoint = $mount->getMountPoint();
// if a folder was shared, get a list of all (sub-)folders
if ($params['itemType'] === 'folder') {
@ -370,14 +365,9 @@ class Hooks {
}
}
// get the path including mount point only if not a shared folder
list($storage, ) = \OC\Files\Filesystem::resolvePath('/' . $userId . '/files' . $path);
if (!($storage instanceof \OC\Files\Storage\Local)) {
$mountPoint = 'files' . $storage->getMountPoint();
} else {
$mountPoint = '';
}
$mountManager = \OC\Files\Filesystem::getMountManager();
$mount = $mountManager->find('/' . $userId . '/files' . $path);
$mountPoint = $mount->getMountPoint();
// if we unshare a folder we need a list of all (sub-)files
if ($params['itemType'] === 'folder') {

5
apps/files_encryption/lib/util.php
View file

@ -1384,10 +1384,11 @@ class Util {
// getDirectoryContent() returns the paths relative to the mount points, so we need
// to re-construct the complete path
$path = ($mountPoint !== '') ? $mountPoint . '/' . $c['path'] : $c['path'];
$path = \OC\Files\Filesystem::normalizePath($path);
if ($c['type'] === 'dir') {
$dirList[] = substr($path, strlen("files"));
$dirList[] = substr($path, strlen('/' . \OCP\User::getUser() . "/files"));
} else {
$result[] = substr($path, strlen("files"));
$result[] = substr($path, strlen('/' . \OCP\User::getUser() . "/files"));
}
}