From d3523ec710d000b17440071e12819b38ee345123 Mon Sep 17 00:00:00 2001
From: Olivier Legat <olivier.legat@ldc.fr>
Date: Thu, 1 Dec 2022 09:51:59 +0100
Subject: [PATCH 1/2] usage de recaptcha V3 vanilla

---
 content/themes/regalette/footer.php           |  2 +-
 .../themes/regalette/template-contacts.php    | 53 ++++++++++---------
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/content/themes/regalette/footer.php b/content/themes/regalette/footer.php
index 55fc0b4..f21b3ee 100644
--- a/content/themes/regalette/footer.php
+++ b/content/themes/regalette/footer.php
@@ -184,7 +184,7 @@
                     (function(d, t) {
                         let g = d.createElement(t),
                             s = d.getElementsByTagName(t)[0];
-                        g.src = 'https://www.google.com/recaptcha/api.js?render=<?php esc_js(GOOGLE_RECAPTCHA_PUBLIC); ?>';
+                        g.src = 'https://www.google.com/recaptcha/api.js?render=<?= esc_js(GOOGLE_RECAPTCHA_PUBLIC); ?>';
                         s.parentNode.insertBefore(g, s)
                     }(document, 'script'));
                 }
diff --git a/content/themes/regalette/template-contacts.php b/content/themes/regalette/template-contacts.php
index d647a59..6380e30 100644
--- a/content/themes/regalette/template-contacts.php
+++ b/content/themes/regalette/template-contacts.php
@@ -318,35 +318,40 @@ if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'POST' &
 </div>
 </div>
 <script>
-    let files = $("input[name=files]");
+    document.addEventListener("DOMContentLoaded", function() {
+        let files = document.querySelector("input[name=files]");
 
-    files.on('change', function(e) {
-        let file = $(this).prop('files')[0];
-        if ($(this).prop('files').length > 0) {
+        files.addEventListener('change', function(e) {
+            let file = this.files[0];
+            if (this.files.length > 0) {
 
-            let filesize = ((file.size / 1024) / 1024).toFixed(4); // MB
+                let filesize = ((file.size / 1024) / 1024).toFixed(4); // MB
 
-            if (filesize > 2) {
-                alert("Poids de la pièce jointe supérieur à 2Mo.");
-                files.val('');
-                $(".contact-filename").html("Télécharger votre fichier...");
-            } else {
-                $(".contact-filename").html(file.name);
+                if (filesize > 2) {
+                    alert("Poids de la pièce jointe supérieur à 2Mo.");
+                    files.val('');
+                    document.querySelector(".contact-filename").innerHTML = "Télécharger votre fichier...";
+                } else {
+                    document.querySelector(".contact-filename").innerHTML = file.name;
+                }
             }
-        }
-    });
-
-    $("#contact-form").on('submit', function(e) {
-        e.preventDefault();
-        grecaptcha.ready(function() {
-            grecaptcha.execute('<?= esc_attr(GOOGLE_RECAPTCHA_PUBLIC); ?>', {
-                action: 'contact'
-            }).then(function(token) {
-                let recaptchaResponse = document.getElementById('recaptchaResponse');
-                recaptchaResponse.value = token;
-                $("#contact-form").unbind('submit').submit();
-            });
         });
+
+        contactSubmitEventHandler = function(e) {
+            e.preventDefault();
+            grecaptcha.ready(function() {
+                grecaptcha.execute('<?= esc_attr(GOOGLE_RECAPTCHA_PUBLIC); ?>', {
+                    action: 'contact'
+                }).then(function(token) {
+                    let recaptchaResponse = document.getElementById('recaptchaResponse');
+                    recaptchaResponse.value = token;
+                    document.querySelector("#contact-form").removeEventListener('submit', contactSubmitEventHandler);
+                    document.querySelector("#contact-form").submit();
+                });
+            });
+        };
+
+        document.querySelector("#contact-form").addEventListener('submit', contactSubmitEventHandler);
     });
 </script>
 

From 11cc1a506b3e89f5ba09059c279153c68cc36919 Mon Sep 17 00:00:00 2001
From: Olivier Legat <olivier.legat@ldc.fr>
Date: Fri, 2 Dec 2022 16:22:55 +0100
Subject: [PATCH 2/2] retour review - 1

---
 .../themes/regalette/template-contacts.php    | 35 +++++++++++--------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/content/themes/regalette/template-contacts.php b/content/themes/regalette/template-contacts.php
index 6380e30..9671594 100644
--- a/content/themes/regalette/template-contacts.php
+++ b/content/themes/regalette/template-contacts.php
@@ -319,23 +319,28 @@ if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'POST' &
 </div>
 <script>
     document.addEventListener("DOMContentLoaded", function() {
-        let files = document.querySelector("input[name=files]");
+        /** @type HTMLInputElement files */
+        const files = document.querySelector("input[name=files]");
+        if (files !== null) {
+            files.addEventListener('change', function(e) {
+                /** @type HTMLInputElement input */
+                const input = this;
+                const file = input.files[0];
+                if (input.files.length > 0) {
 
-        files.addEventListener('change', function(e) {
-            let file = this.files[0];
-            if (this.files.length > 0) {
+                    let filesize = ((file.size / 1024) / 1024).toFixed(4); // MB
 
-                let filesize = ((file.size / 1024) / 1024).toFixed(4); // MB
-
-                if (filesize > 2) {
-                    alert("Poids de la pièce jointe supérieur à 2Mo.");
-                    files.val('');
-                    document.querySelector(".contact-filename").innerHTML = "Télécharger votre fichier...";
-                } else {
-                    document.querySelector(".contact-filename").innerHTML = file.name;
+                    if (filesize > 2) {
+                        alert("Poids de la pièce jointe supérieur à 2Mo.");
+                        files.value = '';
+                        document.querySelector(".contact-filename").innerHTML = "Télécharger votre fichier...";
+                    } else {
+                        document.querySelector(".contact-filename").innerHTML = file.name;
+                    }
                 }
-            }
-        });
+            });
+        }
+
 
         contactSubmitEventHandler = function(e) {
             e.preventDefault();
@@ -343,7 +348,7 @@ if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'POST' &
                 grecaptcha.execute('<?= esc_attr(GOOGLE_RECAPTCHA_PUBLIC); ?>', {
                     action: 'contact'
                 }).then(function(token) {
-                    let recaptchaResponse = document.getElementById('recaptchaResponse');
+                    const recaptchaResponse = document.getElementById('recaptchaResponse');
                     recaptchaResponse.value = token;
                     document.querySelector("#contact-form").removeEventListener('submit', contactSubmitEventHandler);
                     document.querySelector("#contact-form").submit();