upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-24 07:39:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 42

Fix shared cache getFolderContents

Browse source
This commit is contained in:
Robin Appelman 2014-10-16 15:17:12 +02:00
parent 6ed9f53fcd
commit 4438c7de1d
1 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
apps/files_sharing/lib/cache.php
View file

@ -145,26 +145,23 @@ class Shared_Cache extends Cache {
/**
* get the metadata of all files stored in $folder
*
* @param string $folder
* @param string $folderId
* @return array
*/
public function getFolderContents($folder) {
if ($folder === false) {
$folder = '';
}
$dir = ($folder !== '') ? $folder . '/' : '';
$cache = $this->getSourceCache($folder);
public function getFolderContentsById($folderId) {
$cache = $this->getSourceCache('');
if ($cache) {
$parent = $this->storage->getFile($folder);
$sourceFolderContent = $cache->getFolderContents($this->files[$folder]);
foreach ($sourceFolderContent as $key => $c) {
$sourceFolderContent[$key]['path'] = $dir . $c['name'];
$sourceFolderContent[$key]['uid_owner'] = $parent['uid_owner'];
$sourceFolderContent[$key]['displayname_owner'] = \OC_User::getDisplayName($parent['uid_owner']);
$sourceFolderContent[$key]['permissions'] = $sourceFolderContent[$key]['permissions'] & $this->storage->getPermissions($dir . $c['name']);
$owner = $this->storage->getSharedFrom();
$parentPath = $this->getPathById($folderId);
if ($parentPath !== '') {
$parentPath .= '/';
}
$sourceFolderContent = $cache->getFolderContentsById($folderId);
foreach ($sourceFolderContent as &$c) {
$c['path'] = ltrim($parentPath . $c['name'], '/');
$c['uid_owner'] = $owner;
$c['displayname_owner'] = \OC_User::getDisplayName($owner);
$c['permissions'] = $c['permissions'] & $this->storage->getPermissions(false);
}
return $sourceFolderContent;