=================================================================== RCS file: /cvs/cvs/draft/form.min.js,v retrieving revision 1.66 retrieving revision 1.82 diff -u -p -r1.66 -r1.82 --- draft/form.min.js 2024/03/30 17:08:44 1.66 +++ draft/form.min.js 2024/03/31 15:03:43 1.82 @@ -1,32 +1,45 @@ const form = document.querySelector("#cform"); function validateEmail(email) { - const regex = /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/; +/* + const regex = /^[a-z0-9._%+-]+@[a-z0-9.-]+(\.[a-z]{2,})+$/; return regex.test(email); + */ }; function validateSubject(subject) { - return (subject.length>5); +/* + return (subject.length>3); + */ } function validateMsg(msg) { - return (msg.length>5); +/* + return (msg.length>3); + */ } async function sendData() { + var error = 0, + info = document.getElementById("cfinfo"); + + if(error) { + info.textContent="One or more fields have an error. Please check and try again." + } else { + info.textContent="Please wait..." + } +/* var er = 0; - em = document.getElementById("cfem").value, - su = document.getElementById("cfsu").value, - ms = document.getElementById("cfme").value, - ii = document.getElementById("cfinfo"); + em = document.getElementById("cfem").value), + su = document.getElementById("cfsu").value), + ms = document.getElementById("cfme").value), + er=validateEmail(em)?er:++er; er=validateSubject(su)?er:++er; er=validateMsg(ms)?er:++er; if(er){ - 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."; fc.forEach((f) => { f.disabled=true; l=f; @@ -39,12 +52,11 @@ async function sendData() { '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}); - console.log(`JSON: ${dataToSend}`); - ii.textContent="Sending"; + ii.textContent="Sending..."; @@ -56,17 +68,17 @@ fetch("/feedbk/", { body: dataToSend }) .then(response => response.json()) - .then(json => console.log(json)) - + .then(json => ii.textContent=json['msg']) - - - }, }); + }); + turnstile.remove(); + turnstile.close(); } + */ }; form.addEventListener("submit", (event) => {