===================================================================
RCS file: /cvs/cvs/draft/form.min.js,v
retrieving revision 1.45
retrieving revision 1.74
diff -u -p -r1.45 -r1.74
--- draft/form.min.js	2024/03/29 19:00:10	1.45
+++ 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,52 +47,30 @@ 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);
-//});	
-/* --------------------- */
-//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", "input": "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();
 		});
 	}
 };