===================================================================
RCS file: /cvs/cvs/draft/form.min.js,v
retrieving revision 1.15
retrieving revision 1.78
diff -u -p -r1.15 -r1.78
--- draft/form.min.js	2024/03/27 23:49:44	1.15
+++ draft/form.min.js	2024/03/31 14:47:49	1.78
@@ -1,25 +1,41 @@
 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("yemail").value,
-		su = document.getElementById("ysub").value,
-		ms = document.getElementById("ymsg").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;
 	er=validateMsg(ms)?er:++er;
@@ -27,48 +43,49 @@ 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;
 		});
 		l.style.visibility="hidden";
+		turnstile.ready(function() {
+			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) {
+					const dataToSend = JSON.stringify({"add": em, "sub": su, "msg": ms, "tok": token});
+					ii.textContent="Sending...";
+					
 
-	turnstile.ready(function() {						
-   	turnstile.render('#cfcontainer', {
-		theme: 'light',
-        sitekey: '0x4AAAAAAAVpXFEy152AON1L',
-		'error-callback': function(e) {
-			turnstile.remove();
-		},
-        callback: function(token) {
-			ii.textContent="Sent";
-           console.log(`Challenge Success ${token}`);
-       },
-   	});	
-});			
-		
+
+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) => {
 	event.preventDefault();
 	sendData();
-});
-	
-  // Associate the FormData object with the form element
- // const formData = new FormData(form);
-
- // try {
- //   const response = await fetch("https://example.org/post", {
- //     method: "POST",
-      // Set the FormData instance as the request body
-//      body: formData,
- //   });
- //   console.log(await response.json());
-//  } catch (e) {
-//    console.error(e);
-//  }
-//}
-
-// Take over form submission
+});
\ No newline at end of file