===================================================================
RCS file: /cvs/cvs/draft/form.min.js,v
retrieving revision 1.46
retrieving revision 1.84
diff -u -p -r1.46 -r1.84
--- draft/form.min.js	2024/03/29 19:05:01	1.46
+++ draft/form.min.js	2024/03/31 15:52:49	1.84
@@ -1,32 +1,59 @@
 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 parseMass(msg) {
+	return parseString(msg).slice(0,10);
+}
+
+function validateMass(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),
+		mass = parseMass(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;
+	
+	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");
-		ii.textContent="All good.";
 		fc.forEach((f) => {
     		f.disabled=true;
 			l=f;
@@ -39,54 +66,33 @@ 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) {
-					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);
-//});	
-/* --------------------- */
-//ovar re="";
+					const dataToSend = JSON.stringify({"add": em, "sub": su, "msg": ms, "tok": token});
+					ii.textContent="Sending...";
+					
 
-const dataToSend = JSON.stringify({"email": "hey@mail.com", "password": "101010", "fribble": "input / output"});
-let dataReceived = ""; 
+
 fetch("/feedbk/", {
-    credentials: "same-origin",
-    mode: "same-origin",
-    method: "post",
-    headers: { "Content-Type": "application/json" },
-    body: dataToSend
+	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)
-    })
-    .catch(err => {
-        if (err === "server") return
-        console.log(err)
-    })
-
-console.log(`Received: ${dataReceived}`) 
-										
+      .then(response => response.json())
+	  .then(json => ii.textContent=json['msg'])
 					
+					
 				},
 			});
+			
 		});
+		turnstile.remove();
+		turnstile.close();
 	}
+	*/
 };
 
 form.addEventListener("submit", (event) => {