=================================================================== RCS file: /cvs/cvs/draft/form.min.js,v retrieving revision 1.72 retrieving revision 1.80 diff -u -p -r1.72 -r1.80 --- draft/form.min.js 2024/03/30 18:13:27 1.72 +++ draft/form.min.js 2024/03/31 14:58:32 1.80 @@ -1,24 +1,32 @@ 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 er = 0; - em = document.getElementById("cfem").value, - su = document.getElementById("cfsu").value, - ms = document.getElementById("cfme").value, + em = document.getElementById("cfem").value), + 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; @@ -39,12 +47,10 @@ 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..."; @@ -57,18 +63,17 @@ fetch("/feedbk/", { body: dataToSend }) .then(response => response.json()) -// .then(json => console.log(json)) .then(json => ii.textContent=json['msg']) - -// ii.textContent=json['msg']; - - }, }); + }); + turnstile.remove(); + turnstile.close(); } + */ }; form.addEventListener("submit", (event) => {