EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
Filename quote
Yurii034a4bc49296
diff --git a/application/Espo/EntryPoints/Image.php b/application/Espo/EntryPoints/Image.phpindex e86c66c63b..f2edfee252 100644--- a/application/Espo/EntryPoints/Image.php+++ b/application/Espo/EntryPoints/Image.php@@ -150,6 +150,8 @@ class Image implements EntryPoint$response->setHeader('Content-Type', $fileType);}+ $fileName = str_replace("\"", "\\\"", $fileName ?? '');+$response->setHeader('Content-Disposition', 'inline;filename="' . $fileName . '"')->setHeader('Content-Length', (string) $fileSize)diff --git a/application/Espo/EntryPoints/Pdf.php b/application/Espo/EntryPoints/Pdf.phpindex 90702b80ee..e471bb1b16 100644--- a/application/Espo/EntryPoints/Pdf.php+++ b/application/Espo/EntryPoints/Pdf.php@@ -73,13 +73,14 @@ class Pdf implements EntryPoint$result = $this->service->generate($entityType, $entityId, $templateId);$fileName = $result->getFilename() ?? $this->composeFileName($entity);+ $fileName = Util::sanitizeFileName($fileName);$response->setHeader('Content-Type', 'application/pdf')->setHeader('Cache-Control', 'private, must-revalidate, post-check=0, pre-check=0, max-age=1')->setHeader('Expires', 'Sat, 26 Jul 1997 05:00:00 GMT')->setHeader('Last-Modified', gmdate('D, d M Y H:i:s') . ' GMT')- ->setHeader('Content-Disposition', 'inline; filename="' . basename($fileName) . '"');+ ->setHeader('Content-Disposition', 'inline; filename="' . $fileName . '"');if (!$request->getServerParam('HTTP_ACCEPT_ENCODING')) {$response->setHeader('Content-Length', (string) $result->getStream()->getSize());@@ -90,8 +91,8 @@ class Pdf implements EntryPointprivate function composeFileName(Entity $entity): string{- $defaultName = $entity->get(Field::NAME) ?? $entity->getId();+ $name = $entity->get(Field::NAME) ?? $entity->getId();- return Util::sanitizeFileName($defaultName) . '.pdf';+ return $name . '.pdf';}}diff --git a/application/Espo/Tools/Attachment/Api/GetFile.php b/application/Espo/Tools/Attachment/Api/GetFile.phpindex fe4199f2b1..f097283ce5 100644--- a/application/Espo/Tools/Attachment/Api/GetFile.php+++ b/application/Espo/Tools/Attachment/Api/GetFile.php@@ -53,8 +53,10 @@ class GetFile implements ActionAlias$fileData = $this->service->getFileData($id);+ $fileName = str_replace("\"", "\\\"", $fileData->getName() ?? '');+$response = ResponseComposer::empty()- ->setHeader('Content-Disposition', 'attachment; filename="' . $fileData->getName() . '"')+ ->setHeader('Content-Disposition', 'attachment; filename="' . $fileName . '"')->setHeader('Content-Length', (string) $fileData->getSize())->setBody($fileData->getStream());