Skip to content
Snippets Groups Projects
Commit 2f1bd34d authored by Jean-Laurent DUZANT's avatar Jean-Laurent DUZANT
Browse files

FEAT #20347 TIME 0:10 fix DocserverController::removeDecryptedFile(): Argument...

FEAT #20347 TIME 0:10 fix DocserverController::removeDecryptedFile(): Argument #2 () must be of type bool, null given, called in ConvertPdfController.php on line 308
parent 238c7191
No related branches found
No related tags found
No related merge requests found
...@@ -245,6 +245,7 @@ class ConvertPdfController ...@@ -245,6 +245,7 @@ class ConvertPdfController
$convertedDocument = null; $convertedDocument = null;
$pathToDocument = null; $pathToDocument = null;
$isDocserverEncrypted = false;
if ($args['collId'] == 'letterbox_coll') { if ($args['collId'] == 'letterbox_coll') {
$resource = ResModel::getById(['resId' => $args['resId'], 'select' => ['version']]); $resource = ResModel::getById(['resId' => $args['resId'], 'select' => ['version']]);
...@@ -268,6 +269,7 @@ class ConvertPdfController ...@@ -268,6 +269,7 @@ class ConvertPdfController
return ['errors' => $getDecryptedFilePath['errors']]; return ['errors' => $getDecryptedFilePath['errors']];
} }
$pathToDocument = $getDecryptedFilePath['path']; $pathToDocument = $getDecryptedFilePath['path'];
$isDocserverEncrypted = $docserver['is_encrypted'];
if (is_file($pathToDocument)) { if (is_file($pathToDocument)) {
$docserverType = DocserverTypeModel::getById(['id' => $docserver['docserver_type_id'], 'select' => ['fingerprint_mode']]); $docserverType = DocserverTypeModel::getById(['id' => $docserver['docserver_type_id'], 'select' => ['fingerprint_mode']]);
...@@ -294,6 +296,7 @@ class ConvertPdfController ...@@ -294,6 +296,7 @@ class ConvertPdfController
return ['errors' => $getDecryptedFilePath['errors']]; return ['errors' => $getDecryptedFilePath['errors']];
} }
$pathToDocument = $getDecryptedFilePath['path']; $pathToDocument = $getDecryptedFilePath['path'];
$isDocserverEncrypted = $docserver['is_encrypted'];
if (is_file($pathToDocument)) { if (is_file($pathToDocument)) {
$docserverType = DocserverTypeModel::getById(['id' => $docserver['docserver_type_id'], 'select' => ['fingerprint_mode']]); $docserverType = DocserverTypeModel::getById(['id' => $docserver['docserver_type_id'], 'select' => ['fingerprint_mode']]);
...@@ -305,7 +308,7 @@ class ConvertPdfController ...@@ -305,7 +308,7 @@ class ConvertPdfController
} }
//Remove decrypted file //Remove decrypted file
DocserverController::removeDecryptedFile($pathToDocument, $docserver['is_encrypted']); DocserverController::removeDecryptedFile($pathToDocument, $isDocserverEncrypted);
if (empty($convertedDocument)) { if (empty($convertedDocument)) {
$convertedDocument = ConvertPdfController::convert([ $convertedDocument = ConvertPdfController::convert([
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment