From c6e5acbe06e48d5eece386b5295972fc46cce556 Mon Sep 17 00:00:00 2001
From: lebozec <nicolas.lebozec@xelians.fr>
Date: Fri, 16 Jun 2023 12:35:00 +0200
Subject: [PATCH] FEAT #24548 TIME 0:10 added a check for parser and formFiller
folder names
---
src/app/resource/controllers/WatermarkController.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/resource/controllers/WatermarkController.php b/src/app/resource/controllers/WatermarkController.php
index 3a2b62bff91..b0113e1d6fd 100644
--- a/src/app/resource/controllers/WatermarkController.php
+++ b/src/app/resource/controllers/WatermarkController.php
@@ -159,7 +159,7 @@ class WatermarkController
}
$libDir = CoreConfigModel::getLibrariesDirectory();
- if (!empty($libDir) && is_file($libDir . 'SetaPDF-FormFiller-Full/library/SetaPDF/Autoload.php')) {
+ if (!empty($libDir) && is_file($libDir . 'SetaPDF-FormFiller-Full/library/SetaPDF/Autoload.php') || is_file($libDir . 'setapdf-formfiller-full/library/SetaPDF/Autoload.php')) {
require_once($libDir . 'SetaPDF-FormFiller-Full/library/SetaPDF/Autoload.php');
$flattenedFile = CoreConfigModel::getTmpPath() . "tmp_file_{$GLOBALS['id']}_" . rand() . "_watermark.pdf";
@@ -174,7 +174,7 @@ class WatermarkController
$args['path'] = $flattenedFile;
}
- if (!empty($libDir) && is_file($libDir . 'FPDI-PDF-Parser/src/autoload.php')) {
+ if (!empty($libDir) && is_file($libDir . 'FPDI-PDF-Parser/src/autoload.php') || is_file($libDir . 'setapdf-fpdi-pdf-parser/src/autoload.php')) {
require_once($libDir . 'FPDI-PDF-Parser/src/autoload.php');
}
--
GitLab