FEAT #14565 TIME 1:30 Improve text appearance in digital signature + config

config/config.xml.default

@@ -25,6 +25,7 @@
             <contactInfo>Maarch SAS, société du groupe Archiveco</contactInfo>
         </certInfo>
     </electronicSignature>
+    <textWithDigitalSignature>true</textWithDigitalSignature>
     <docaposteSignature>
         <enable>false</enable>
         <url>https://test.contralia.fr:443/Contralia/api/v2</url>

src/app/document/controllers/CertificateSignatureController.php

@@ -149,19 +149,20 @@ class CertificateSignatureController
             $imageXObject = $image->toXObject($document);
             $width = $signatureInfo['signWidth'];
             $height = $imageXObject->getHeight($width);
+            $signatureFieldWith = $width > 200 ? $width : 200;
 
             $fieldName = $signer->addSignatureField(
                 'Signature_' . rand(),
                 $signatureInfo['page'],
                 \SetaPDF_Signer_SignatureField::POSITION_LEFT_TOP,
                 ['x' => $signatureInfo['positionX'], 'y' => -$signatureInfo['positionY']],
-                $width,
+                $signatureFieldWith,
                 $height + 50
             )->getQualifiedName();
 
             $signer->setSignatureFieldName($fieldName);
 
-            $xObject = \SetaPDF_Core_XObject_Form::create($document, [0, 0, $width, $height + 50]);
+            $xObject = \SetaPDF_Core_XObject_Form::create($document, [0, 0, $signatureFieldWith, $height + 50]);
             $canvas = $xObject->getCanvas();
             $imageXObject->draw($canvas, 0, 50, $width, $height);
 
@@ -170,12 +171,15 @@ class CertificateSignatureController
                 __DIR__ . '/fonts/dejavu-fonts-ttf-2.37/ttf/DejaVuSans.ttf'
             );
 
-            $textBlock = new \SetaPDF_Core_Text_Block($font, 7);
-            $textBlock->setWidth($width);
-            $textBlock->setLineHeight(14);
-            $textBlock->setPadding(2);
-            $textBlock->setText("Signé électroniquement par : " . $user['firstname'] . ' ' . $user['lastname'] . "\nLe " . date('c'));
-            $textBlock->draw($canvas, 0, 30);
+            $loadedXml = CoreConfigModel::getConfig();
+            if ($loadedXml->textWithDigitalSignature == 'true') {
+                $textBlock = new \SetaPDF_Core_Text_Block($font, 6);
+                $textBlock->setWidth($signatureFieldWith);
+                $textBlock->setLineHeight(14);
+                $textBlock->setPadding(2);
+                $textBlock->setText("Signé électroniquement par : " . $user['firstname'] . ' ' . $user['lastname'] . "\nLe " . date('c'));
+                $textBlock->draw($canvas, 0, 30);
+            }
 
             $appearance = new \SetaPDF_Signer_Signature_Appearance_XObject($xObject);
             $signer->setAppearance($appearance);

src/app/document/controllers/DigitalSignatureController.php

@@ -196,19 +196,20 @@ class DigitalSignatureController
                 $imageXObject = $image->toXObject($document);
                 $width = $args['signatureInfo']['signWidth'];
                 $height = $imageXObject->getHeight($width);
+                $signatureFieldWith = $width > 200 ? $width : 200;
 
                 $fieldName = $signer->addSignatureField(
                     'Signature_' . rand(),
                     $args['signatureInfo']['page'],
                     \SetaPDF_Signer_SignatureField::POSITION_LEFT_TOP,
                     ['x' => $args['signatureInfo']['positionX'], 'y' => -$args['signatureInfo']['positionY']],
-                    $width,
+                    $signatureFieldWith,
                     $height + 50
                 )->getQualifiedName();
 
                 $signer->setSignatureFieldName($fieldName);
 
-                $xObject = \SetaPDF_Core_XObject_Form::create($document, [0, 0, $width, $height + 50]);
+                $xObject = \SetaPDF_Core_XObject_Form::create($document, [0, 0, $signatureFieldWith, $height + 50]);
                 $canvas = $xObject->getCanvas();
                 $imageXObject->draw($canvas, 0, 50, $width, $height);
 
@@ -217,12 +218,15 @@ class DigitalSignatureController
                     __DIR__ . '/fonts/dejavu-fonts-ttf-2.37/ttf/DejaVuSans.ttf'
                 );
     
-                $textBlock = new \SetaPDF_Core_Text_Block($font, 7);
-                $textBlock->setWidth($width);
-                $textBlock->setLineHeight(14);
-                $textBlock->setPadding(2);
-                $textBlock->setText("Signé électroniquement par : " . $user['firstname'] . ' ' . $user['lastname'] . "\nLe " . date('c'));
-                $textBlock->draw($canvas, 0, 30, $width, null);
+                $loadedXml = CoreConfigModel::getConfig();
+                if ($loadedXml->textWithDigitalSignature == 'true') {
+                    $textBlock = new \SetaPDF_Core_Text_Block($font, 7);
+                    $textBlock->setWidth($signatureFieldWith);
+                    $textBlock->setLineHeight(14);
+                    $textBlock->setPadding(2);
+                    $textBlock->setText("Signé électroniquement par : " . $user['firstname'] . ' ' . $user['lastname'] . "\nLe " . date('c'));
+                    $textBlock->draw($canvas, 0, 30);
+                }
 
                 $appearance = new \SetaPDF_Signer_Signature_Appearance_XObject($xObject);
                 $signer->setAppearance($appearance);