===================================================================
RCS file: /cvs/cvs/draft/form.min.js,v
retrieving revision 1.22
retrieving revision 1.83
diff -u -p -r1.22 -r1.83
--- draft/form.min.js	2024/03/28 19:04:03	1.22
+++ draft/form.min.js	2024/03/31 15:45:02	1.83
@@ -1,45 +1,64 @@
 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);
 }
 
-async function postData() {
-  const formData = new FormData(form);
-  try {
-    const response = await fetch("/feedbk/", {
-      method: "POST",
-      body: formData,
-    });
-    console.log(await response.json());
-  } catch (e) {
-    console.error(e);
-  }
+// ============================================================= //
+
+function validateMsg(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;
+	var erro = 0,
+		info = document.getElementById("cfinfo"),
+		mail = parseMail(document.getElementById("cfem").value),
+		subj = parseSubj(document.getElementById("cfsu").value);
+	
+// ============================================================= //	
+	console.log("sendData().validate("+mail+")");
+	console.log("sendData().validate("+subj+")");
+	// validate()
+	erro=validateMail(mail)?erro:++erro;
+	erro=validateSubj(subj)?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..."
+	}
+/*
+	var 
+		su = ,
+		ms = document.getElementById("cfme").value),
 	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.";
 	} else {
 		var fc = document.querySelectorAll(".wpcf7-form-control");
-		ii.textContent="All good.";
 		fc.forEach((f) => {
     		f.disabled=true;
 			l=f;
@@ -49,17 +68,36 @@ async function sendData() {
 			turnstile.render('#cfcontainer', {
 				theme: 'light',
 				sitekey: '0x4AAAAAAAVpXFEy152AON1L',
+				'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}`);
-					postData();
+					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'])
+					
+					
 				},
 			});
+			
 		});
+		turnstile.remove();
+		turnstile.close();
 	}
+	*/
 };
 
 form.addEventListener("submit", (event) => {