From 50dc4c505a68638ac377e22d264cca74fbe253f9 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Fri, 14 Sep 2018 22:28:03 +0200
Subject: [PATCH] FEAT #8346 fix some errors
---
src/app/attachment/controllers/AttachmentController.php | 4 ++++
src/app/resource/controllers/ResController.php | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/src/app/attachment/controllers/AttachmentController.php b/src/app/attachment/controllers/AttachmentController.php
index ad7e12215bd..e0603da2f6f 100644
--- a/src/app/attachment/controllers/AttachmentController.php
+++ b/src/app/attachment/controllers/AttachmentController.php
@@ -181,6 +181,10 @@ class AttachmentController
$pathToDocument = $docserver['path_template'] . str_replace('#', DIRECTORY_SEPARATOR, $document['path']) . $document['filename'];
+ if (!file_exists($pathToDocument)) {
+ return $response->withStatus(404)->withJson(['errors' => 'Attachment not found on docserver']);
+ }
+
$loadedXml = CoreConfigModel::getXmlLoaded(['path' => 'modules/attachments/xml/config.xml']);
if ($loadedXml) {
$watermark = (array)$loadedXml->CONFIG->watermark;
diff --git a/src/app/resource/controllers/ResController.php b/src/app/resource/controllers/ResController.php
index a5c007e1206..9852bc50188 100755
--- a/src/app/resource/controllers/ResController.php
+++ b/src/app/resource/controllers/ResController.php
@@ -335,6 +335,10 @@ class ResController
$pathToDocument = $docserver['path_template'] . str_replace('#', DIRECTORY_SEPARATOR, $document['path']) . $document['filename'];
+ if (!file_exists($pathToDocument)) {
+ return $response->withStatus(404)->withJson(['errors' => 'Document not found on docserver']);
+ }
+
$loadedXml = CoreConfigModel::getXmlLoaded(['path' => 'apps/maarch_entreprise/xml/features.xml']);
if ($loadedXml) {
$watermark = (array)$loadedXml->FEATURES->watermark;
--
GitLab