===================================================================
RCS file: /cvs/cvs/draft/form.min.js,v
retrieving revision 1.13
retrieving revision 1.104
diff -u -p -r1.13 -r1.104
--- draft/form.min.js	2024/03/27 23:42:32	1.13
+++ draft/form.min.js	2024/04/02 18:32:59	1.104
@@ -1,92 +1 @@
-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);
-};
-
-function validateSubject(subject) {
-	return (subject.length>5);
-}
-
-function validateMsg(msg) {
-	return (msg.length>5);
-}
-
-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");
-	
-	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"),
-			bt = document.querySelector("#wpcf7-button");
-		ii.textContent="All good.";
-		fc.forEach((f) => {
-    		f.disabled=true;
-			console.log(f.getElementById());
-			l=f;
-		});
-		l.style.visibility="hidden";
-	}
-};
-
-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;
-//		});
-				
-//		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
+const form=document.querySelector("#cform");function parseString(e){return e.replace(/[!~`%&^{}\[\]<>|\\\/"'@#$;]/g,"_")}function parseMail(e){return e.toLowerCase().slice(0,96)}function validateMail(e){return/^[a-z0-9._%+-]+@[a-z0-9.-]+(\.[a-z]{2,})+$/.test(e)}function parseSubj(e){return parseString(e).slice(0,96)}function validateSubj(e){return e.length>3}function parseMess(e){return parseString(e).slice(0,3904)}function validateMess(e){return e.length>3}async function sendData(){var e=0,t=document.getElementById("cfinfo"),n=parseMail(document.getElementById("cfem").value),r=parseSubj(document.getElementById("cfsu").value),a=parseMess(document.getElementById("cfme").value);if(e=validateMail(n)?e:++e,e=validateSubj(r)?e:++e,e=validateMess(a)?e:++e)t.textContent="One or more fields have an error. Please check and try again.";else{var i=document.querySelectorAll(".wpcf7-form-control");t.textContent="Verifying...",i.forEach(e=>{e.disabled=!0,l=e}),l.style.visibility="hidden",turnstile.ready(function(){turnstile.render("#cfcontainer",{retry:"never",theme:"light","response-field":!1,sitekey:"0x4AAAAAAAVpXFEy152AON1L","error-callback":function(e){t.textContent="Verification error. Try again later.",turnstile.remove()},callback:function(e){let i=JSON.stringify({add:n,sub:r,msg:a,tok:e});t.textContent="Sending...",fetch("/feedbk/",{headers:{"Content-Type":"application/json"},credentials:"same-origin",mode:"same-origin",method:"post",body:i}).then(e=>e.json()).then(e=>t.textContent=e.msg).then(turnstile.remove())}})})}}form.addEventListener("submit",e=>{e.preventDefault(),sendData()});
\ No newline at end of file