Skip to content

[stable19] only return rich workspace when depth is 1 or greater #1003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusknorr merged 1 commit into from
Sep 10, 2020
Merged

[stable19] only return rich workspace when depth is 1 or greater #1003

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
do not return rich workspace when depth=0 
Signed-off-by: dassio <[email protected]>
  • Loading branch information
@dassio @backportbot
dassio authored and backportbot[bot] committed Sep 1, 2020
commit 88890d36fb4332a44cc3989f76f3141f07835f73
32 changes: 16 additions & 16 deletions lib/DAV/WorkspacePlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,24 +93,24 @@ public function propFind(PropFind $propFind, INode $node) {
if (!$workspaceAvailable || !$workspaceEnabled) {
return;
}

$propFind->handle(self::WORKSPACE_PROPERTY, function () use ($node) {
/** @var Folder[] $nodes */
$nodes = $this->rootFolder->getUserFolder($this->userId)->getById($node->getId());
if (count($nodes) > 0) {
/** @var File $file */
try {
$file = $this->workspaceService->getFile($nodes[0]);
if ($file instanceof File) {
return $file->getContent();
}
} catch (StorageNotAvailableException $e) {
if ($propFind->getDepth() > 0) {
$propFind->handle(self::WORKSPACE_PROPERTY, function () use ($node) {
/** @var Folder[] $nodes */
$nodes = $this->rootFolder->getUserFolder($this->userId)->getById($node->getId());
if (count($nodes) > 0) {
/** @var File $file */
try {
$file = $this->workspaceService->getFile($nodes[0]);
if ($file instanceof File) {
return $file->getContent();
}
} catch (StorageNotAvailableException $e) {
// If a storage is not available we can for the propfind response assume that there is no rich workspace present
}
}
}
return '';
});

return '';
});
}
}

}