=================================================================== RCS file: /cvs/cvs/draft/form.min.js,v retrieving revision 1.74 retrieving revision 1.79 diff -u -p -r1.74 -r1.79 --- draft/form.min.js 2024/03/31 14:17:27 1.74 +++ draft/form.min.js 2024/03/31 14:55:18 1.79 @@ -1,32 +1,25 @@ const form = document.querySelector("#cform"); function validateEmail(email) { - var em = email.toLowerCase(); - // 1. max len = 96 - const regex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+(\.[a-zA-Z]{2,})+$/; - return regex.test(em); + const regex = /^[a-z0-9._%+-]+@[a-z0-9.-]+(\.[a-z]{2,})+$/; + return regex.test(email); }; function validateSubject(subject) { - // 1. remove special chars - // 2. min len = 4 - // 3. max len = 96 - return (subject.length>5); + return (subject.length>3); } function validateMsg(msg) { - // 1. remove special chars - // 2. min len = 4 - // 3. max len = 2048 - 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"); + return; er=validateEmail(em)?er:++er; er=validateSubject(su)?er:++er; er=validateMsg(ms)?er:++er; @@ -65,13 +58,14 @@ fetch("/feedbk/", { }) .then(response => response.json()) .then(json => ii.textContent=json['msg']) - }, }); - turnstile.remove(); + }); + turnstile.remove(); + turnstile.close(); } };