#439 [ODT] fix: improve check array signatory

Evarisk · Jul 24, 2023 · 9963529 · 9963529
1 parent e19602a
commit 9963529
Showing 1 changed file with 21 additions and 19 deletions.
diff --git a/...es/dolisirh/dolisirhdocuments/certificatedocument/doc_certificatedocument_odt.modules.php b/...es/dolisirh/dolisirhdocuments/certificatedocument/doc_certificatedocument_odt.modules.php
@@ -108,35 +108,37 @@ public function write_file(SaturneDocuments $objectDocument, Translate $outputLa
         if (is_array($signatory) && !empty($signatory)) {
             $signatory = array_shift($signatory);
             $tmpArray['attendant_fullname'] = strtoupper($signatory->lastname) . ' ' . ucfirst($signatory->firstname);
-        } else {
-            $tmpArray['attendant_fullname'] = '';
-        }
-
-        if (dol_strlen($signatory->signature) > 0 && $signatory->signature != $langs->transnoentities('FileGenerated')) {
-            if ($moreParam['specimen'] == 0 || ($moreParam['specimen'] == 1 && $conf->global->DOLISIRH_SHOW_SIGNATURE_SPECIMEN == 1)) {
-                $tempDir      = $conf->dolisirh->multidir_output[$object->entity ?? 1] . '/temp/';
-                $encodedImage = explode(',', $signatory->signature)[1];
-                $decodedImage = base64_decode($encodedImage);
-                file_put_contents($tempDir . 'signature.png', $decodedImage);
-                $tmpArray['attendant_signature'] = $tempDir . 'signature.png';
+            if (dol_strlen($signatory->signature) > 0 && $signatory->signature != $langs->transnoentities('FileGenerated')) {
+                if ($moreParam['specimen'] == 0 || ($moreParam['specimen'] == 1 && $conf->global->DOLISIRH_SHOW_SIGNATURE_SPECIMEN == 1)) {
+                    $tempDir      = $conf->dolisirh->multidir_output[$object->entity ?? 1] . '/temp/';
+                    $encodedImage = explode(',', $signatory->signature)[1];
+                    $decodedImage = base64_decode($encodedImage);
+                    file_put_contents($tempDir . 'signature.png', $decodedImage);
+                    $tmpArray['attendant_signature'] = $tempDir . 'signature.png';
+                } else {
+                    $tmpArray['attendant_signature'] = '';
+                }
             } else {
                 $tmpArray['attendant_signature'] = '';
             }
         } else {
+            $tmpArray['attendant_fullname']  = '';
             $tmpArray['attendant_signature'] = '';
         }
 
         $signatory = $signatory->fetchSignatory('Responsible', $object->id, $object->element);
         if (is_array($signatory) && !empty($signatory)) {
             $signatory = array_shift($signatory);
-        }
-        if (dol_strlen($signatory->signature) > 0 && $signatory->signature != $langs->transnoentities('FileGenerated')) {
-            if ($moreParam['specimen'] == 0 || ($moreParam['specimen'] == 1 && $conf->global->DOLISIRH_SHOW_SIGNATURE_SPECIMEN == 1)) {
-                $tempDir      = $conf->dolisirh->multidir_output[$object->entity ?? 1] . '/temp/';
-                $encodedImage = explode(',', $signatory->signature)[1];
-                $decodedImage = base64_decode($encodedImage);
-                file_put_contents($tempDir . 'signature2.png', $decodedImage);
-                $tmpArray['responsible_signature'] = $tempDir . 'signature2.png';
+            if (dol_strlen($signatory->signature) > 0 && $signatory->signature != $langs->transnoentities('FileGenerated')) {
+                if ($moreParam['specimen'] == 0 || ($moreParam['specimen'] == 1 && $conf->global->DOLISIRH_SHOW_SIGNATURE_SPECIMEN == 1)) {
+                    $tempDir      = $conf->dolisirh->multidir_output[$object->entity ?? 1] . '/temp/';
+                    $encodedImage = explode(',', $signatory->signature)[1];
+                    $decodedImage = base64_decode($encodedImage);
+                    file_put_contents($tempDir . 'signature2.png', $decodedImage);
+                    $tmpArray['responsible_signature'] = $tempDir . 'signature2.png';
+                } else {
+                    $tmpArray['responsible_signature'] = '';
+                }
             } else {
                 $tmpArray['responsible_signature'] = '';
             }