=================================================================== RCS file: /cvs/cvs/draft/form.min.js,v retrieving revision 1.84 retrieving revision 1.101 diff -u -p -r1.84 -r1.101 --- draft/form.min.js 2024/03/31 15:52:49 1.84 +++ draft/form.min.js 2024/04/02 07:14:55 1.101 @@ -1,7 +1,8 @@ const form = document.querySelector("#cform"); function parseString(str) { - return str.replace(/[~`!@#$%^&*(){}\[\];:"'<,.>?\/\\|+=-]/g, '_'); +// return str.replace(/[~`!@#$%^&*(){}\[\];:"'<,.>?\/\\|+=-]/g, '_'); + return str.replace(/[~]/g, '_'); } function parseMail(email) { @@ -21,11 +22,11 @@ function validateSubj(subject) { return (subject.length>3); } -function parseMass(msg) { - return parseString(msg).slice(0,10); +function parseMess(msg) { + return parseString(msg).slice(0,3904); } -function validateMass(msg) { +function validateMess(msg) { return (msg.length>3); } @@ -34,66 +35,51 @@ async function sendData() { info = document.getElementById("cfinfo"), mail = parseMail(document.getElementById("cfem").value), subj = parseSubj(document.getElementById("cfsu").value), - mass = parseMass(document.getElementById("cfme").value); + mess = parseMess(document.getElementById("cfme").value); -// ============================================================= // - console.log("sendData().validate("+mail+")"); - console.log("sendData().validate("+subj+")"); - console.log("sendData().validate("+mass+")"); - // validate() erro=validateMail(mail)?erro:++erro; erro=validateSubj(subj)?erro:++erro; - erro=validateMass(mass)?erro:++erro; + erro=validateMess(mess)?erro:++erro; - console.log("sendData().checkErr()") if(erro) { info.textContent="One or more fields have an error. Please check and try again." } else { - info.textContent="Please wait..." - } -/* - } else { - var fc = document.querySelectorAll(".wpcf7-form-control"); - fc.forEach((f) => { + var fcon = document.querySelectorAll(".wpcf7-form-control"); + + info.textContent="Verifying..." + 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) { - ii.textContent="Cloudflare Turnstile verification error. Try again later." + info.textContent="Verification error. Try again later."; + turnstile.remove(); }, callback: function(token) { - const dataToSend = JSON.stringify({"add": em, "sub": su, "msg": ms, "tok": token}); - 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 => ii.textContent=json['msg']) - - - }, + 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']) + .then(turnstile.remove()); + } }); - }); - turnstile.remove(); - turnstile.close(); - } - */ -}; + }; +} form.addEventListener("submit", (event) => { event.preventDefault();