=================================================================== RCS file: /cvs/cvs/draft/form.min.js,v retrieving revision 1.76 retrieving revision 1.85 diff -u -p -r1.76 -r1.85 --- draft/form.min.js 2024/03/31 14:40:51 1.76 +++ draft/form.min.js 2024/03/31 15:56:57 1.85 @@ -1,51 +1,62 @@ const form = document.querySelector("#cform"); -function parseEmail(email) { - return email.slice(0,96); +function parseString(str) { + return str.replace(/[~`!@#$%^&*(){}\[\];:"'<,.>?\/\\|+=-]/g, '_'); } -function validateEmail(email) { +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 parseSubject(subject) { - // 1. remove special chars - return subject.slice(0,96); +function parseSubj(subject) { + return parseString(subject).slice(0,96); } -function validateSubject(subject) { +function validateSubj(subject) { return (subject.length>3); } -function parseMsg(msg) { - // 1. remove special chars - return msg.slice(0,3904); +function parseMass(msg) { + return parseString(msg).slice(0,10); } -function validateMsg(msg) { +function validateMass(msg) { return (msg.length>3); } async function sendData() { - var er = 0; - em = parseEmail(document.getElementById("cfem").value.toLowerCase()), - 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; - 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), + mass = parseMass(document.getElementById("cfme").value); + + erro=validateMail(mail)?erro:++erro; + erro=validateSubj(subj)?erro:++erro; + erro=validateMass(mass)?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="Please wait..."; - 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', { theme: 'light', @@ -53,7 +64,6 @@ 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) { @@ -80,6 +90,7 @@ fetch("/feedbk/", { turnstile.remove(); turnstile.close(); } + */ }; form.addEventListener("submit", (event) => {