hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-10 19:43:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow to specify a filename on permalink usage

Browse Source
This commit is contained in:
aina-esokia
2018-02-21 11:43:53 +04:00
parent 66fbf03be6
commit 6fd11b630b
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Alchemy/Phrasea/Controller/AbstractDelivery.php
View File

@@ -34,11 +34,14 @@ abstract class AbstractDelivery
{ {
$mediaSubdefinition = $record->get_subdef($subdef); $mediaSubdefinition = $record->get_subdef($subdef);
$filename = $request->get("filename") ?: $mediaSubdefinition->get_file();
$pathOut = $this->tamperProofSubDefinition($mediaSubdefinition, $watermark, $stamp); $pathOut = $this->tamperProofSubDefinition($mediaSubdefinition, $watermark, $stamp);
$disposition = $request->query->get('download') ? DeliverDataInterface::DISPOSITION_ATTACHMENT : DeliverDataInterface::DISPOSITION_INLINE; $disposition = $request->query->get('download') ? DeliverDataInterface::DISPOSITION_ATTACHMENT : DeliverDataInterface::DISPOSITION_INLINE;
$response = $this->deliverFile($pathOut, $mediaSubdefinition->get_file(), $disposition, $mediaSubdefinition->get_mime()); // nb: $filename will be sanitized, no need to do it here
$response = $this->deliverFile($pathOut, $filename, $disposition, $mediaSubdefinition->get_mime());
if (in_array($subdef, array('document', 'preview'))) { if (in_array($subdef, array('document', 'preview'))) {
$response->setPrivate(); $response->setPrivate();