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

Merge pull request #19615 from owncloud/issue-15858-mount-points-return-wrong-paths-for-getusersharingfiles 

Fix Share::getUsersSharingFile() for mount points
This commit is contained in:
Morris Jobke 2016-04-14 11:49:11 +02:00
parent e396691712 79c17cdfa6
commit dfb98c31a3
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/private/share/share.php
View File

@ -137,7 +137,7 @@ class Share extends Constants {
$publicShare = false;
$remoteShare = false;
$source = -1;
$cache = false;
$cache = $mountPath = false;
$view = new \OC\Files\View('/' . $ownerUser . '/files');
$meta = $view->getFileInfo($path);
@ -151,8 +151,14 @@ class Share extends Constants {
if($meta !== false) {
$source = $meta['fileid'];
$cache = new \OC\Files\Cache\Cache($meta['storage']);
$mountPath = $meta->getMountPoint()->getMountPoint();
if ($mountPath !== false) {
$mountPath = substr($mountPath, strlen('/' . $ownerUser . '/files'));
}
}
$paths = [];
while ($source !== -1) {
// Fetch all shares with another user
if (!$returnUserPaths) {
@ -257,6 +263,7 @@ class Share extends Constants {
// let's get the parent for the next round
$meta = $cache->get((int)$source);
if ($recursive === true && $meta !== false) {
$paths[$source] = $meta['path'];
$source = (int)$meta['parent'];
} else {
$source = -1;
@ -285,9 +292,15 @@ class Share extends Constants {
} else {
while ($row = $result->fetchRow()) {
foreach ($fileTargets[$row['fileid']] as $uid => $shareData) {
$sharedPath = $shareData['file_target'];
$sharedPath .= substr($path, strlen($row['path']) -5);
$sharePaths[$uid] = $sharedPath;
if ($mountPath !== false) {
$sharedPath = $shareData['file_target'];
$sharedPath .= substr($path, strlen($mountPath) + strlen($paths[$row['fileid']]));
$sharePaths[$uid] = $sharedPath;
} else {
$sharedPath = $shareData['file_target'];
$sharedPath .= substr($path, strlen($row['path']) -5);
$sharePaths[$uid] = $sharedPath;
}
}
}
}