===================================================================
RCS file: /cvs/cvs/draft/form.min.js,v
retrieving revision 1.64
retrieving revision 1.74
diff -u -p -r1.64 -r1.74
--- draft/form.min.js	2024/03/30 15:51:42	1.64
+++ draft/form.min.js	2024/03/31 14:17:27	1.74
@@ -1,15 +1,23 @@
 const form = document.querySelector("#cform");
 
 function validateEmail(email) {
-	const regex = /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
-	return regex.test(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);
 };
 
 function validateSubject(subject) {
+	// 1. remove special chars
+	// 2. min len = 4
+	// 3. max len = 96
 	return (subject.length>5);
 }
 
 function validateMsg(msg) {
+	// 1. remove special chars
+	// 2. min len = 4
+	// 3. max len = 2048
 	return (msg.length>5);
 }
 
@@ -26,7 +34,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,18 +47,15 @@ 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 dataToSend = JSON.stringify({"add": em, "sub": su, "msg": ms, "tok": token});
+					ii.textContent="Sending...";
 					
-					
 
-					
 
-const dataToSend = JSON.stringify({"email": "hey@mail.com", "password": "101010"});
 fetch("/feedbk/", {
 	credentials: "same-origin",
 	mode: "same-origin",
@@ -59,15 +64,13 @@ fetch("/feedbk/", {
 	body: dataToSend
 })
       .then(response => response.json())
-      .then(json => console.log(json))					
+	  .then(json => ii.textContent=json['msg'])
 				
 					
 					
-					
-					
-					
 				},
 			});
+			turnstile.remove();
 		});
 	}
 };