Changeset 2828331

Timestamp:

12/04/2022 10:21:03 AM (3 years ago)

Author:

eideasy

Message:

Version 3.2

Location:

eid-easy-qualified-electonic-signature/trunk

Files:

• EidEasySigner.php (modified) (3 diffs)
• EidEasySignerAdmin.php (modified) (3 diffs)
• cf7-eideasy-attachment-signer.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)

eid-easy-qualified-electonic-signature/trunk/EidEasySigner.php

@@ -113 +113 @@
         error_log("Starting to sign files: " . json_encode($fileLocations));
 
+        // Make sure PDF generated from form fields is in the top, before other uploaded files
+        $fileLocations = array_reverse($fileLocations);
+
         if (is_string($fileLocations)) {
             $fileLocations = [$fileLocations];
@@ -132 +135 @@
         }
 
-        $files = [];
+        $files         = [];
+        $counter       = 1;
+        $usedFileNames = [];
         foreach ($fileLocations as $filePath) {
+            if (is_array($filePath)) {
+                $filePath = reset($filePath);
+            }
             $pathParts = explode(DIRECTORY_SEPARATOR, $filePath);
             $fileName  = $pathParts[count($pathParts) - 1];
-            $contents  = base64_encode(file_get_contents($filePath));
-            $files[]   = [
+
+            // Handle duplicate file names
+            while (isset($usedFileNames[$fileName])) {
+                $fileName = $counter . "_" . $fileName;
+                $counter++;
+            }
+            $usedFileNames[$fileName] = $fileName;
+
+            $contents = base64_encode(file_get_contents($filePath));
+
+            $files[] = [
                 'fileName'    => $fileName,
-                'mimeType'    => 'application/pdf',
+                'mimeType'    => mime_content_type($filePath),
                 'fileContent' => $contents,
             ];
@@ -241 +258 @@
     }
 }
-
-

eid-easy-qualified-electonic-signature/trunk/EidEasySignerAdmin.php

@@ -112 +112 @@
                 <th>eID Easy client ID</th>
                 <td>
-                    <input name="eideasy_client_id" size="50"
+                    <input name="eideasy_client_id" size="50" required
                            value="<?php echo esc_attr(get_option('eideasy_client_id')); ?>"/>
                 </td>
@@ -119 +119 @@
                 <th>eID Easy secret</th>
                 <td>
-                    <input name="eideasy_secret" size="50" type="password"
+                    <input name="eideasy_secret" size="50" type="password" required
                            value="<?php echo esc_attr(get_option('eideasy_secret')); ?>"/>
                 </td>
@@ -137 +137 @@
                 <th>Redirect after signing</th>
                 <td>
-                    <input name="eideasy_signature_redirect" size="50" placeholder="https://example.com/thank-you"
+                    <input name="eideasy_signature_redirect" size="50" placeholder="https://example.com/thank-you" required
                            value="<?php echo esc_attr(get_option('eideasy_signature_redirect')); ?>"/>
                     <br>

eid-easy-qualified-electonic-signature/trunk/cf7-eideasy-attachment-signer.php

@@ -4 +4 @@
  * Plugin URI: https://eideasy.com
  * Description: Add Qualified Electronic Signatures to Contact Form 7 or Fluent Forms email PDF attachments.
- * Version: 3.1.1
+ * Version: 3.2
  * Author: eID Easy
  * Text Domain: eid-easy

eid-easy-qualified-electonic-signature/trunk/readme.txt

@@ -5 +5 @@
 Tags: fluent forms, qualified signature, electonicsignature, digitalsignature, esignature, signature, electronic signature, digital signature, qes, asice, bdoc, pades, xades, cades, eidas
 Requires at least: 4.5
-Tested up to: 5.9
+Tested up to: 6.1.1
 Stable tag: trunk
 License: GPLv3
@@ -41 +41 @@
 == Changelog ==
 
+= 3.2 =
+Support for signing uploaded files together with the generated PDF
+
 = 3.1.1 =
 Tested with WP 5.9