From 80f5d52bcdb16bd67d3bd48b149ba7df997aba08 Mon Sep 17 00:00:00 2001
From: Jean-Laurent DUZANT <jean-laurent.duzant@xelians.fr>
Date: Tue, 31 Oct 2023 14:34:10 +0100
Subject: [PATCH] FEAT #20347 TIME 0:10 fix
DocserverController::removeDecryptedFile(): Argument #2 () must be of type
bool, null given, called in ConvertPdfController.php on line 308
---
src/app/convert/controllers/ConvertPdfController.php | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/app/convert/controllers/ConvertPdfController.php b/src/app/convert/controllers/ConvertPdfController.php
index 939856db2df..2ec79da678e 100755
--- a/src/app/convert/controllers/ConvertPdfController.php
+++ b/src/app/convert/controllers/ConvertPdfController.php
@@ -245,6 +245,7 @@ class ConvertPdfController
$convertedDocument = null;
$pathToDocument = null;
+ $isDocserverEncrypted = false;
if ($args['collId'] == 'letterbox_coll') {
$resource = ResModel::getById(['resId' => $args['resId'], 'select' => ['version']]);
@@ -268,6 +269,7 @@ class ConvertPdfController
return ['errors' => $getDecryptedFilePath['errors']];
}
$pathToDocument = $getDecryptedFilePath['path'];
+ $isDocserverEncrypted = $docserver['is_encrypted'];
if (is_file($pathToDocument)) {
$docserverType = DocserverTypeModel::getById(['id' => $docserver['docserver_type_id'], 'select' => ['fingerprint_mode']]);
@@ -294,6 +296,7 @@ class ConvertPdfController
return ['errors' => $getDecryptedFilePath['errors']];
}
$pathToDocument = $getDecryptedFilePath['path'];
+ $isDocserverEncrypted = $docserver['is_encrypted'];
if (is_file($pathToDocument)) {
$docserverType = DocserverTypeModel::getById(['id' => $docserver['docserver_type_id'], 'select' => ['fingerprint_mode']]);
@@ -305,7 +308,7 @@ class ConvertPdfController
}
//Remove decrypted file
- DocserverController::removeDecryptedFile($pathToDocument, $docserver['is_encrypted']);
+ DocserverController::removeDecryptedFile($pathToDocument, $isDocserverEncrypted);
if (empty($convertedDocument)) {
$convertedDocument = ConvertPdfController::convert([
--
GitLab