===================================================================
RCS file: /cvs/cvs/draft/form.min.js,v
retrieving revision 1.48
retrieving revision 1.81
diff -u -p -r1.48 -r1.81
--- draft/form.min.js	2024/03/29 20:11:33	1.48
+++ draft/form.min.js	2024/03/31 15:02:32	1.81
@@ -1,32 +1,45 @@
 const form = document.querySelector("#cform");
 
 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 validateSubject(subject) {
-	return (subject.length>5);
+/*
+	return (subject.length>3);
+	*/
 }
 
 function validateMsg(msg) {
-	return (msg.length>5);
+/*	
+	return (msg.length>3);
+	*/
 }
 
 async function sendData() {
+	var error = 0,
+		info = document.getElementById("cfinfo");
+	
+	if(er) {
+		info.textContent="One or more fields have an error. Please check and try again."
+	} else {
+		info.textContent="Please wait..."
+	}
+/*
 	var er = 0;
-		em = document.getElementById("cfem").value,
-		su = document.getElementById("cfsu").value,
-		ms = document.getElementById("cfme").value,
-		ii = document.getElementById("cfinfo");
+		em = document.getElementById("cfem").value),
+		su = document.getElementById("cfsu").value),
+		ms = document.getElementById("cfme").value),
+	
 	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.";
 	} else {
 		var fc = document.querySelectorAll(".wpcf7-form-control");
-		ii.textContent="All good.";
 		fc.forEach((f) => {
     		f.disabled=true;
 			l=f;
@@ -39,53 +52,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);
-	console.log("JSON: " + JSON.parse(data));
-});	
-/* --------------------- */
-//ovar re="";
-//const dataToSend = JSON.stringify({"email": "hey@mail.com", "password": "101010"});
-//let dataReceived = ""; 
-//fetch("/feedbk/", {
-//   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}`) 
-										
+					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) => {