=================================================================== RCS file: /cvs/cvs/draft/form.min.js,v retrieving revision 1.63 retrieving revision 1.75 diff -u -p -r1.63 -r1.75 --- draft/form.min.js 2024/03/29 21:30:03 1.63 +++ draft/form.min.js 2024/03/31 14:37:54 1.75 @@ -1,23 +1,37 @@ const form = document.querySelector("#cform"); +function parseEmail(email) { + return email.toLowerCase().slice(0,96); +} + 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 parseSubject(subject) { + // 1. remove special chars + return subject.slice(0,96); +} + function validateSubject(subject) { - return (subject.length>5); + return (subject.length>3); } +function parseMsg(msg) { + // 1. remove special chars + return msg.slice(0,3904); +} + 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 = parseEmail(document.getElementById("cfem").value), + su = parseSubject(document.getElementById("cfsu").value), + ms = parseMsg(document.getElementById("cfme").value), ii = document.getElementById("cfinfo"); er=validateEmail(em)?er:++er; er=validateSubject(su)?er:++er; @@ -26,7 +40,7 @@ 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; @@ -39,50 +53,15 @@ async function sendData() { 'response-field': false, retry: 'never', 'error-callback': function(e) { - turnstile.remove(); +// turnstile.remove(); + ii.textContent="Cloudflare Turnstile verification error. Try again later." }, callback: function(token) { - ii.textContent="Sent"; - console.log(`Challenge Success ${token}`); -/* --------------------- */ -//const ob = {mail: em, sub: su, msg: ms, id: token }; -//var data="", -// status="", -// feed=JSON.stringify(ob); -//$.post("/feedbk/", feed, function(data, status){ -// console.log("Data: " + data + "\nStatus: " + status); -// console.log(data); -// console.log("JSON: " + JSON.parse(data) ); -// -//}); -/* --------------------- */ -//ovar re=""; -const dataToSend = JSON.stringify({"email": "hey@mail.com", "password": "101010"}); -//let dataReceived = ""; -//fetch("/feedbk/", { -// credentials: "same-origin", -// mode: "same-origin", -// method: "post", -// headers: { "Content-Type": "application/json" }, -// body: dataToSend -//}) - // .then(resp => { -// if (resp.status === 200) { -// return resp.json() -// } else { -// console.log("Status: " + resp.status) -// return Promise.reject("server") -// } -// }) -// .then(dataJson => { -// dataReceived = JSON.parse(dataJson.getJSON); -// }) -// .catch(err => { -// if (err === "server") return -// console.log(err) -// }) -//console.log(`Received: ${dataReceived}`) + const dataToSend = JSON.stringify({"add": em, "sub": su, "msg": ms, "tok": token}); + ii.textContent="Sending..."; + + fetch("/feedbk/", { credentials: "same-origin", mode: "same-origin", @@ -91,13 +70,15 @@ fetch("/feedbk/", { body: dataToSend }) .then(response => response.json()) - .then(json => console.log(json)) + .then(json => ii.textContent=json['msg']) - }, }); + }); + turnstile.remove(); + turnstile.close(); } };