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

Merge pull request #20032 from nextcloud/bugfix/19878/allow-video-player-on-hide-download 

Allow the video player on the hide download
This commit is contained in:
Roeland Jago Douma 2020-03-20 08:45:15 +01:00 committed by GitHub
parent 61a02b89c5 6edb93fc4a
commit 010b075c2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/files_sharing/lib/Controller/ShareController.php
View File

@ -55,6 +55,7 @@ use OCP\AppFramework\Http\Template\PublicTemplateResponse;
use OCP\AppFramework\Http\Template\SimpleMenuAction; use OCP\AppFramework\Http\Template\SimpleMenuAction;
use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Http\TemplateResponse;
use OCP\Defaults; use OCP\Defaults;
use OCP\Files\Folder;
use OCP\Files\IRootFolder; use OCP\Files\IRootFolder;
use OCP\Files\NotFoundException; use OCP\Files\NotFoundException;
use OCP\IConfig; use OCP\IConfig;
@ -582,16 +583,16 @@ class ShareController extends AuthPublicShareController {
// Single file download // Single file download
$this->singleFileDownloaded($share, $share->getNode()); $this->singleFileDownloaded($share, $share->getNode());
} else { } else {
if ($share->getHideDownload()) { try {
return new NotFoundResponse();
}
if (!empty($files_list)) { if (!empty($files_list)) {
$this->fileListDownloaded($share, $files_list, $node); $this->fileListDownloaded($share, $files_list, $node);
} else { } else {
// The folder is downloaded // The folder is downloaded
$this->singleFileDownloaded($share, $share->getNode()); $this->singleFileDownloaded($share, $share->getNode());
} }
} catch (NotFoundException $e) {
return new NotFoundResponse();
}
} }
} }
@ -643,8 +644,13 @@ class ShareController extends AuthPublicShareController {
* @param Share\IShare $share * @param Share\IShare $share
* @param array $files_list * @param array $files_list
* @param \OCP\Files\Folder $node * @param \OCP\Files\Folder $node
* @throws NotFoundException when trying to download a folder or multiple files of a "hide download" share
*/ */
protected function fileListDownloaded(Share\IShare $share, array $files_list, \OCP\Files\Folder $node) { protected function fileListDownloaded(Share\IShare $share, array $files_list, \OCP\Files\Folder $node) {
if ($share->getHideDownload() && count($files_list) > 1) {
throw new NotFoundException('Downloading more than 1 file');
}
foreach ($files_list as $file) { foreach ($files_list as $file) {
$subNode = $node->get($file); $subNode = $node->get($file);
$this->singleFileDownloaded($share, $subNode); $this->singleFileDownloaded($share, $subNode);
@ -656,8 +662,12 @@ class ShareController extends AuthPublicShareController {
* create activity if a single file was downloaded from a link share * create activity if a single file was downloaded from a link share
* *
* @param Share\IShare $share * @param Share\IShare $share
* @throws NotFoundException when trying to download a folder of a "hide download" share
*/ */
protected function singleFileDownloaded(Share\IShare $share, \OCP\Files\Node $node) { protected function singleFileDownloaded(Share\IShare $share, \OCP\Files\Node $node) {
if ($share->getHideDownload() && $node instanceof Folder) {
throw new NotFoundException('Downloading a folder');
}
$fileId = $node->getId(); $fileId = $node->getId();