===================================================================
RCS file: /cvs/cvs/draft/form.min.js,v
retrieving revision 1.61
retrieving revision 1.78
diff -u -p -r1.61 -r1.78
--- draft/form.min.js	2024/03/29 21:25:18	1.61
+++ draft/form.min.js	2024/03/31 14:47:49	1.78
@@ -1,23 +1,40 @@
 const form = document.querySelector("#cform");
 
+function parseEmail(email) {
+	var tmp = email.slice(0,10);
+	return tmp;
+}
+
 function validateEmail(email) {
-	const regex = /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
+	const regex = /^[a-z0-9._%+-]+@[a-z0-9.-]+(\.[a-z]{2,})+$/;
 	return regex.test(email);
 };
 
+function parseSubject(subject) {
+	// 1. remove special chars
+	var tmp = subject.slice(0,10);
+	return tmp;
+}
+
 function validateSubject(subject) {
-	return (subject.length>5);
+	return (subject.length>3);
 }
 
+function parseMsg(msg) {
+	// 1. remove special chars
+	var tmp = msg.slice(0,10);
+	return tmp;
+}
+
 function validateMsg(msg) {
-	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 = 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;
@@ -26,7 +43,7 @@ async function sendData() {
 		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.";
+		ii.textContent="Please wait...";
 		fc.forEach((f) => {
     		f.disabled=true;
 			l=f;
@@ -39,41 +56,32 @@ async function sendData() {
 				'response-field': false,
 				retry: 'never',
 				'error-callback': function(e) {
-					turnstile.remove();
+//					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);
-//	console.log(data);
-//	console.log("JSON: " + JSON.parse(data) );
-//	
-//});	
-/* --------------------- */
-//ovar re="";
-const dataToSend = JSON.stringify({"email": "hey@mail.com", "password": "101010"});
-let dataReceived = ""; 
+					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
+	credentials: "same-origin",
+	mode: "same-origin",
+	method: "post",
+	headers: { "Content-Type": "application/json" },
+	body: dataToSend
 })
-      .then(dataRecieved => response.json())
-      .then(json => console.log(dataRecieved))					
+      .then(response => response.json())
+	  .then(json => ii.textContent=json['msg'])
 					
 					
-					
 				},
 			});
+			
 		});
+		turnstile.remove();
+		turnstile.close();
 	}
 };