=================================================================== RCS file: /cvs/cvs/draft/form.min.js,v retrieving revision 1.16 retrieving revision 1.73 diff -u -p -r1.16 -r1.73 --- draft/form.min.js 2024/03/28 06:59:46 1.16 +++ draft/form.min.js 2024/03/31 14:15:20 1.73 @@ -1,15 +1,23 @@ const form = document.querySelector("#cform"); function validateEmail(email) { - const regex = /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/; - return regex.test(email); + var em = string.toLowerCase(); + // 1. max len = 96 + const regex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+(\.[a-zA-Z]{2,})+$/; + return regex.test(em); }; function validateSubject(subject) { + // 1. remove special chars + // 2. min len = 4 + // 3. max len = 96 return (subject.length>5); } function validateMsg(msg) { + // 1. remove special chars + // 2. min len = 4 + // 3. max len = 2048 return (msg.length>5); } @@ -19,7 +27,6 @@ async function sendData() { su = document.getElementById("cfsu").value, ms = document.getElementById("cfme").value, ii = document.getElementById("cfinfo"); - er=validateEmail(em)?er:++er; er=validateSubject(su)?er:++er; er=validateMsg(ms)?er:++er; @@ -27,48 +34,48 @@ async function sendData() { ii.textContent="One or more fields have an error. Please check and try again."; } else { var fc = document.querySelectorAll(".wpcf7-form-control"); - ii.textContent="All good."; + ii.textContent="Please wait..."; fc.forEach((f) => { f.disabled=true; l=f; }); l.style.visibility="hidden"; + turnstile.ready(function() { + turnstile.render('#cfcontainer', { + theme: 'light', + sitekey: '0x4AAAAAAAVpXFEy152AON1L', + 'response-field': false, + retry: 'never', + 'error-callback': function(e) { +// turnstile.remove(); + ii.textContent="Cloudflare Turnstile verification error. Try again later." + }, + callback: function(token) { + const dataToSend = JSON.stringify({"add": em, "sub": su, "msg": ms, "tok": token}); + ii.textContent="Sending..."; + - turnstile.ready(function() { - turnstile.render('#cfcontainer', { - theme: 'light', - sitekey: '0x4AAAAAAAVpXFEy152AON1L', - 'error-callback': function(e) { + +fetch("/feedbk/", { + credentials: "same-origin", + mode: "same-origin", + method: "post", + headers: { "Content-Type": "application/json" }, + body: dataToSend +}) + .then(response => response.json()) + .then(json => ii.textContent=json['msg']) + + + + }, + }); turnstile.remove(); - }, - callback: function(token) { - ii.textContent="Sent"; - console.log(`Challenge Success ${token}`); - }, - }); -}); - + }); } }; form.addEventListener("submit", (event) => { event.preventDefault(); sendData(); -}); - - // Associate the FormData object with the form element - // const formData = new FormData(form); - - // try { - // const response = await fetch("https://example.org/post", { - // method: "POST", - // Set the FormData instance as the request body -// body: formData, - // }); - // console.log(await response.json()); -// } catch (e) { -// console.error(e); -// } -//} - -// Take over form submission +}); \ No newline at end of file