===================================================================
RCS file: /cvs/cvs/draft/form.min.js,v
retrieving revision 1.1.1.1
retrieving revision 1.91
diff -u -p -r1.1.1.1 -r1.91
--- draft/form.min.js	2024/03/27 20:37:50	1.1.1.1
+++ draft/form.min.js	2024/03/31 16:26:26	1.91
@@ -1,87 +1,86 @@
 const form = document.querySelector("#cform");
 
-function validateEmail(email) {
-	const regex = /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
+function parseString(str) {
+	return str.replace(/[~`!@#$%^&*(){}\[\];:"'<,.>?\/\\|+=-]/g, '_');
+}
+
+function parseMail(email) {
+	return email.toLowerCase().slice(0,96);
+}
+
+function validateMail(email) {
+	const regex = /^[a-z0-9._%+-]+@[a-z0-9.-]+(\.[a-z]{2,})+$/;
 	return regex.test(email);
 };
 
-function validateSubject(subject) {
-	return (subject.length>5);
+function parseSubj(subject) {
+	return parseString(subject).slice(0,96);
 }
 
-function validateMsg(msg) {
-	return (msg.length>5);
+function validateSubj(subject) {
+	return (subject.length>3);
 }
 
+function parseMess(msg) {
+	return parseString(msg).slice(0,3904);
+}
+
+function validateMess(msg) {
+	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,
-		ii = document.getElementById("cfinfo");
+	var erro = 0,
+		info = document.getElementById("cfinfo"),
+		mail = parseMail(document.getElementById("cfem").value),
+		subj = parseSubj(document.getElementById("cfsu").value),
+		mess = parseMess(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.";
+	erro=validateMail(mail)?erro:++erro;
+	erro=validateSubj(subj)?erro:++erro;
+	erro=validateMess(mess)?erro:++erro;
+	
+	if(erro) {
+		info.textContent="One or more fields have an error. Please check and try again."
 	} else {
-		ii.textContent="All good."
-	}
-};
+		var fcon = document.querySelectorAll(".wpcf7-form-control");
 
+		info.textContent="Please wait..."
+		fcon.forEach((f) => {
+    		f.disabled=true;
+			l=f;
+		});
+		l.style.visibility="hidden";
+		turnstile.ready(function() {
+			turnstile.render('#cfcontainer', {
+				retry: 'never',
+				theme: 'light',
+				'response-field': false,
+				sitekey: '0x4AAAAAAAVpXFEy152AON1L',
+				'error-callback': function(e) {
+					info.textContent="Cloudflare Turnstile verification error. Try again later."
+					turnstile.remove();
+				},
+				callback: function(token) {
+					const data = JSON.stringify({"add": mail, "sub": subj, "msg": mess, "tok": token});
+					info.textContent="Sending...";
+					fetch("/feedbk/", {
+						headers: { "Content-Type": "application/json" },
+						credentials: "same-origin",
+						mode: "same-origin",
+						method: "post",
+						body: data
+					})
+					.then(response => response.json())
+					.then(json => info.textContent=json['msg'])
+				}
+			});
+			turnstile.remove();
+		});
+	};
+}
+
 form.addEventListener("submit", (event) => {
 	event.preventDefault();
 	sendData();
-});
-
-//	turnstile.ready(function() {		
-//		var e = document.querySelectorAll(".wpcf7-form-control"),
-//			b = document.getElementById("wpcf7-button");
-//		e.forEach((f) => {
- //   		f.disabled=true;
-//		});
-//		b.value="ONE OR MORE FIELDS HAVE AN ERROR. PLEASE CHECK AND TRY AGAIN";
-		
-		// ONE OR MORE FIELDS HAVE AN ERROR. PLEASE CHECK AND TRY AGAIN.
-		
-//		document.getElementById("wp1").disabled=true;
-		
-//		document.getElementById("wpcf7-button").disabled=true;
-//		document.getElementById("wpcf7-button").value="Please wait..."
-		
- //   	turnstile.render('#cfcontainer', {
-//		theme: 'light',
- //       sitekey: '0x4AAAAAAAVpXFEy152AON1L',
-//		'error-callback': function(e) {
-//			turnstile.remove();
-//			b.value=e;
-//		},
- //       callback: function(token) {
-//			b.value="Sending...";
-//           console.log(`Challenge Success ${token}`);
-			
-//		   document.getElementById("wpcf7-button").disabled=true;
-//		   document.getElementById("wpcf7-button").type="hidden";
-		
- //       },
- //   	});
-		
-//});
-	
-  // 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