=================================================================== RCS file: /cvs/cvs/draft/form.min.js,v retrieving revision 1.67 retrieving revision 1.88 diff -u -p -r1.67 -r1.88 --- draft/form.min.js 2024/03/30 17:57:24 1.67 +++ draft/form.min.js 2024/03/31 16:20:10 1.88 @@ -1,73 +1,84 @@ const form = document.querySelector("#cform"); -function validateEmail(email) { - const regex = /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/; +function parseString(str) { + return str.replace(/[~`!@#$%^&*(){}\[\];:"'<,.>?\/\\|+=-]/g, '_'); +} + +function parseMail(email) { + return email.toLowerCase().slice(0,96); +} + +function validateMail(email) { + const regex = /^[a-z0-9._%+-]+@[a-z0-9.-]+(\.[a-z]{2,})+$/; return regex.test(email); }; -function validateSubject(subject) { - return (subject.length>5); +function parseSubj(subject) { + return parseString(subject).slice(0,96); } -function validateMsg(msg) { - return (msg.length>5); +function validateSubj(subject) { + return (subject.length>3); } +function parseMess(msg) { + return parseString(msg).slice(0,3904); +} + +function validateMess(msg) { + 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, - ii = document.getElementById("cfinfo"); - 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."; + var erro = 0, + info = document.getElementById("cfinfo"), + mail = parseMail(document.getElementById("cfem").value), + subj = parseSubj(document.getElementById("cfsu").value), + mess = parseMess(document.getElementById("cfme").value); + + erro=validateMail(mail)?erro:++erro; + erro=validateSubj(subj)?erro:++erro; + erro=validateMess(mess)?erro:++erro; + + if(erro) { + info.textContent="One or more fields have an error. Please check and try again." } else { - var fc = document.querySelectorAll(".wpcf7-form-control"); - ii.textContent="Checking..."; - fc.forEach((f) => { + var fcon = document.querySelectorAll(".wpcf7-form-control"); + + info.textContent="Please wait..." + fcon.forEach((f) => { f.disabled=true; l=f; }); l.style.visibility="hidden"; turnstile.ready(function() { turnstile.render('#cfcontainer', { + retry: 'never', theme: 'light', - sitekey: '0x4AAAAAAAVpXFEy152AON1L', 'response-field': false, - retry: 'never', + sitekey: '0x4AAAAAAAVpXFEy152AON1L', 'error-callback': function(e) { - turnstile.remove(); + info.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..."; - - - -fetch("/feedbk/", { - credentials: "same-origin", - mode: "same-origin", - method: "post", - headers: { "Content-Type": "application/json" }, - body: dataToSend -}) - .then(response => response.json()) - .then(json => console.log(json)) - - - - - - - }, + const data = JSON.stringify({"add": mail, "sub": subj, "msg": mess, "tok": token}); + info.textContent="Sending..."; + fetch("/feedbk/", { + headers: { "Content-Type": "application/json" }, + credentials: "same-origin", + mode: "same-origin", + method: "post", + body: data + }) + .then(response => response.json()) + .then(json => info.textContent=json['msg']) + } }); }); - } -}; + turnstile.remove(); + turnstile.close(); + }; +} form.addEventListener("submit", (event) => { event.preventDefault();