===================================================================
RCS file: /cvs/cvs/draft/form.min.js,v
retrieving revision 1.19
retrieving revision 1.74
diff -u -p -r1.19 -r1.74
--- draft/form.min.js	2024/03/28 18:57:11	1.19
+++ draft/form.min.js	2024/03/31 14:17:27	1.74
@@ -1,21 +1,27 @@
 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);
 }
 
 async function sendData() {
-	const form = document.querySelector("#cform");
-	const formData = new FormData(form);
 	var er = 0;
 		em = document.getElementById("cfem").value,
 		su = document.getElementById("cfsu").value,
@@ -28,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;
@@ -38,31 +44,33 @@ async function sendData() {
 			turnstile.render('#cfcontainer', {
 				theme: 'light',
 				sitekey: '0x4AAAAAAAVpXFEy152AON1L',
+				'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}`);
-/* ---------- */
-  try {
-	  console.log(`TRY`);
-    const response = await fetch("https://draft.hgk.global/feedbk/", {
-      method: "POST",
-      body: formData,
-    });
-	console.log(`AWAIT`);
-    console.log(await response.text());
-	  console.log(`RESPONSE`);
-  } catch (e) {
-	  					console.log(`ERROR`);
-    console.error(e);
-  }
-}
-/* ---------- */
+					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();
 		});
 	}
 };