Index: FaxMail.mac.rou
===================================================================
diff -u -r1264 -r1298
--- FaxMail.mac.rou	(.../FaxMail.mac.rou)	(revision 1264)
+++ FaxMail.mac.rou	(.../FaxMail.mac.rou)	(revision 1298)
@@ -326,7 +326,8 @@
 	  Set ValidMail = ##class(TECH.Mail).Check(Email,0)
 	  If ('ValidMail){
 	 	 /// ValidMail kan geforceerd worden.
-	 	 Set ValidMail=$$^vhTXTPOP("TECH.MAIL","CHECKMAIL","",Email)
+	 	 Set Feedback = $P($$ParseStatus^vhLib(ValidMail),":",2)
+	 	 Set ValidMail=$$^vhTXTPOP("TECH.MAIL","CHECKMAIL","",Email,Feedback)
 	  }
 	  If (ValidMail) {
 		   If $G(Data("BackGround")){
Index: DOM/CRM/impl/ConsOLNieuwsbriefReg.cls.xml
===================================================================
diff -u -r1264 -r1298
--- DOM/CRM/impl/ConsOLNieuwsbriefReg.cls.xml	(.../ConsOLNieuwsbriefReg.cls.xml)	(revision 1264)
+++ DOM/CRM/impl/ConsOLNieuwsbriefReg.cls.xml	(.../ConsOLNieuwsbriefReg.cls.xml)	(revision 1298)
@@ -39,8 +39,10 @@
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	If ('##class(TECH.Mail).Check(Email,1)){
-		Set Exception = ##class(TECH.Exceptions.BaseException).%New(##class(TECH.enu.ExceptionCode).ParameterInvalid(),"Het email adres "_Email_" is niet geldig.")
+	Set ValidMail = ##class(TECH.Mail).Check(Email,1)
+	If ('ValidMail){
+		Set Feedback = $P($$ParseStatus^vhLib(ValidMail),":",2)
+		Set Exception = ##class(TECH.Exceptions.BaseException).%New(##class(TECH.enu.ExceptionCode).ParameterInvalid(),"Het email adres "_Email_" is niet geldig. "_Feedback)
 		Do ##class(TECH.ExceptionHandler).Throw(Exception)
 	}
 	Set ..Email = Email
Index: TECH/Mail.cls.xml
===================================================================
diff -u -r1292 -r1298
--- TECH/Mail.cls.xml	(.../Mail.cls.xml)	(revision 1292)
+++ TECH/Mail.cls.xml	(.../Mail.cls.xml)	(revision 1298)
@@ -12,7 +12,12 @@
 Check een email adres adhv pattern-match, en afzonderlijke controles.
 Tevens kan een nslookup van het domein gedaan worden, aan te geven via parameter.
 Write ##class(TECH.Mail).Check("jbl@vanhoecke.be")
-Write ##class(TECH.Mail).Check("jbl@nietbestaand.be",1)</Description>
+Write ##class(TECH.Mail).Check("jbl@nietbestaand.be",1)
+
+Return 
+1 = OK
+0 = Foutieve syntax
+-1 = NSLookup niet geslaagd.</Description>
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Mail:%String,NsLookUp:%Boolean=0,CacheNsLookUp:%Boolean=0</FormalSpec>
 <Private>1</Private>
@@ -45,8 +50,11 @@
 		
 	}
 	
-	If (NsLookUp){
-		Set:IsValid IsValid = ..NsLookUp(DomainPart)	
+	Set:('IsValid) IsValid =  $$$ERROR($$$GeneralError,"Syntax fout.")	
+	
+	/// NsLookUp gedeelte 
+	If (NsLookUp && IsValid){
+		Set IsValid = ..NsLookUp(DomainPart)	
 	}
 	If ('CacheNsLookUp){
 		Kill %NsLookUps	
@@ -76,13 +84,34 @@
 	If ($Data(%NsLookUps(MailDomainPart))){
 	  Set Status = %NsLookUps(MailDomainPart)
 	}Else {
-		Set Status = ..NsLookUpCheck(MailDomainPart)
+		Set Status = ..NsLookUpCheckMX(MailDomainPart)
+		Set:'Status Status = ..NsLookUpCheck(MailDomainPart)
 		Set:'Status Status = ..NsLookUpCheck("www."_MailDomainPart)
 	}
 	Quit Status
 ]]></Implementation>
 </Method>
 
+<Method name="NsLookUpCheckMX">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>MailDomainPart:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set FileName = "NSLOOKUP"_$zd(##class(TECH.DateTime).CurrentDate(),3)
+	Set Exec="NSLOOKUP -q=mx "_MailDomainPart_" > c:\"_FileName
+	s Ok=$ZF(-1,Exec)
+	Set %NsLookUp=0
+	Set FileName=$$READ^vhDEV("c:\",FileName,"D`##class("_..%ClassName(1)_").GetNsLookUpLineMX","M")
+	Set Status = %NsLookUp
+	Set:'Status Status = $$$ERROR($$$GeneralError,"Niet bestaand domein.")
+	Do DELFILE^vhDEV("c:\",FileName)
+	Kill %NsLookUp	
+	Set %NsLookUps(MailDomainPart) = Status
+	Quit Status
+]]></Implementation>
+</Method>
+
 <Method name="NsLookUpCheck">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>MailDomainPart:%String</FormalSpec>
@@ -95,6 +124,7 @@
 	Set %NsLookUp=0
 	Set FileName=$$READ^vhDEV("c:\",FileName,"D`##class("_..%ClassName(1)_").GetNsLookUpLine","M")
 	Set Status = %NsLookUp
+	Set:'Status Status = $$$ERROR($$$GeneralError,"Niet bestaand domein.")
 	Do DELFILE^vhDEV("c:\",FileName)
 	Kill %NsLookUp	
 	Set %NsLookUps(MailDomainPart) = Status
@@ -106,9 +136,18 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Rec</FormalSpec>
 <Implementation><![CDATA[
-	If Rec["Name" Set %NsLookUp=1
+	If (Rec["Name") Set %NsLookUp=1
 	Quit
 ]]></Implementation>
 </Method>
+
+<Method name="GetNsLookUpLineMX">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Rec</FormalSpec>
+<Implementation><![CDATA[
+	If (Rec["mail exchanger") Set %NsLookUp=1
+	Quit
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: DOM/CRM/impl/KlantImpl.cls.xml
===================================================================
diff -u -r1292 -r1298
--- DOM/CRM/impl/KlantImpl.cls.xml	(.../KlantImpl.cls.xml)	(revision 1292)
+++ DOM/CRM/impl/KlantImpl.cls.xml	(.../KlantImpl.cls.xml)	(revision 1298)
@@ -261,8 +261,10 @@
 <Method name="ZetEmail">
 <FormalSpec>Email:%String</FormalSpec>
 <Implementation><![CDATA[
-	If ('##class(TECH.Mail).Check(Email,1)){
-		Set Exception = ##class(TECH.Exceptions.BaseException).%New(##class(TECH.enu.ExceptionCode).ParameterInvalid(),"Het email adres "_Email_" is niet geldig.")
+	Set ValidMail = ##class(TECH.Mail).Check(Email,1)
+	If ('ValidMail){
+		Set Feedback = $P($$ParseStatus^vhLib(ValidMail),":",2)
+		Set Exception = ##class(TECH.Exceptions.BaseException).%New(##class(TECH.enu.ExceptionCode).ParameterInvalid(),"Het email adres "_Email_" is niet geldig. "_Feedback)
 		Do ##class(TECH.ExceptionHandler).Throw(Exception)
 	}
 	Do ..Klant.ZetEmail(Email)
Index: vhConsistency/Checks/Email.cls.xml
===================================================================
diff -u -r1292 -r1298
--- vhConsistency/Checks/Email.cls.xml	(.../Email.cls.xml)	(revision 1292)
+++ vhConsistency/Checks/Email.cls.xml	(.../Email.cls.xml)	(revision 1298)
@@ -21,7 +21,7 @@
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	
-	Set ..SkipCheck = 0
+	Set ..SkipCheck = 1
 	Set Status = $$$OK
 	If ('..SkipCheck){
 		Set:'..CheckKlanten() Status = $$$ERROR($$$GeneralError,"Check klanten email gefaald")
@@ -102,10 +102,12 @@
 	While (rset.Next(.sc)){
 		Set Email = $ZSTRIP(rset.Data("Email"),"<>W")		
 		Set Teller = Teller + 1
-		If ('##class(TECH.Mail).Check(Email, ..#DoeNsLookUp,..#CacheNsLookUp)){
+		Set ValidMail = ##class(TECH.Mail).Check(Email, ..#DoeNsLookUp,..#CacheNsLookUp)
+		If ('ValidMail){
+			Set Feedback = $P($$ParseStatus^vhLib(ValidMail),":",2)
 			Set TellerNotValid = TellerNotValid + 1
-			Do ..VoegMeldingToe($C(9)_Email_" niet correct voor : "_rset.Data("Melding"))
-			Set Status = $$$ERROR($$$GeneralError,"Geen correct email"_Email)
+			Do ..VoegMeldingToe($C(9)_Email_" niet correct door "_Feedback_" voor : "_rset.Data("Melding"))
+			Set Status = $$$ERROR($$$GeneralError,"Geen correct email door "_Feedback_": "_Email)
 		}		
 	}
 	If ('Status){
@@ -126,12 +128,15 @@
 		Set KlantLev = Iterator.Next()
 		Set Mail = KlantLev.GeefEmail()
 		If (Mail'= ""){
-			If ('##class(TECH.Mail).Check(Mail, ..#DoeNsLookUp,..#CacheNsLookUp)){
+			Set ValidMail = ##class(TECH.Mail).Check(Mail, ..#DoeNsLookUp,..#CacheNsLookUp)
+			If ('ValidMail){
 				Set Mail = $ZSTRIP(Mail,"<>W")
-				If ('##class(TECH.Mail).Check(Mail,..#DoeNsLookUp,..#CacheNsLookUp)){
-					Do ..VoegMeldingToe($C(9)_KlantLev.GeefNummer()_":"_$C(9)_"'"_$$LCVT^vhLib(Mail)_"'")
+				Set ValidMail = ##class(TECH.Mail).Check(Mail, ..#DoeNsLookUp,..#CacheNsLookUp)
+				If ('ValidMail){
+					Set Feedback = $P($$ParseStatus^vhLib(ValidMail),":",2)
+					Do ..VoegMeldingToe($C(9)_KlantLev.GeefNummer()_":"_$C(9)_"'"_$$LCVT^vhLib(Mail)_"' door "_Feedback)
 					Set TellerNotValid = TellerNotValid + 1			
-					Set Status = $$$ERROR($$$GeneralError,"Geen correct email"_KlantLev.GeefNummer()_": "_Mail)
+					Set Status = $$$ERROR($$$GeneralError,"Geen correct email "_KlantLev.GeefNummer()_" door "_Feedback_" : "_Mail)
 				}Else{
 					Set $ZTRAP = "GeenZetEmail"
 					Do KlantLev.ZetEmail(Mail)
@@ -148,10 +153,12 @@
 			Set Mail = Persoon.GeefEmail()
 			If (Mail'= "")
 			{
-				If ('##class(TECH.Mail).Check(Mail, ..#DoeNsLookUp,..#CacheNsLookUp)){
-					Do ..VoegMeldingToe($C(9)_KlantLev.GeefNummer()_":"_$C(9)_"'"_$$LCVT^vhLib(Mail)_"' ( Persoon : "_Persoon.GeefNaam()_" "_Persoon.GeefVoornaam()_" )")
+				Set ValidMail = ##class(TECH.Mail).Check(Mail, ..#DoeNsLookUp,..#CacheNsLookUp)
+				If ('ValidMail){
+					Set Feedback = $P($$ParseStatus^vhLib(ValidMail),":",2)
+					Do ..VoegMeldingToe($C(9)_KlantLev.GeefNummer()_":"_$C(9)_"'"_$$LCVT^vhLib(Mail)_"' door "_Feedback_" ( Persoon : "_Persoon.GeefNaam()_" "_Persoon.GeefVoornaam()_" )")
 					Set TellerNotValid = TellerNotValid + 1			
-					Set Status = $$$ERROR($$$GeneralError,"Geen correct email"_KlantLev.GeefNummer()_": "_Mail)
+					Set Status = $$$ERROR($$$GeneralError,"Geen correct email "_KlantLev.GeefNummer()_" door "_Feedback_": "_Mail)
 				}
 				Set Teller = Teller + 1
 			}
Index: CHUI/Derde/EC/Toegang/MainForm.cls.xml
===================================================================
diff -u -r1280 -r1298
--- CHUI/Derde/EC/Toegang/MainForm.cls.xml	(.../MainForm.cls.xml)	(revision 1280)
+++ CHUI/Derde/EC/Toegang/MainForm.cls.xml	(.../MainForm.cls.xml)	(revision 1298)
@@ -466,9 +466,11 @@
 	. Do ..txtEmail.SetFocus()
 	. Do $$$ShowMsgBoxSimple(..Caption,"Er is geen emailadres opgegeven.")
 	
-	If ((..txtEmail.Value '= "")  && ('##class(TECH.Mail).Check(..txtEmail.Value,1))){
+	Set ValidMail = ##class(TECH.Mail).Check(..txtEmail.Value,1)
+	If ((..txtEmail.Value '= "")  && 'ValidMail){
 		Do ..txtEmail.SetFocus()
-		Do $$$ShowMsgBoxSimple(..Caption,"Het opgegeven emailadres is niet geldig.")
+		Set Feedback = $P($$ParseStatus^vhLib(ValidMail),":",2)
+		Do $$$ShowMsgBoxSimple(..Caption,"Het opgegeven emailadres is niet geldig. "_Feedback)
 		Quit 0
 	}	
 
Index: vhDeploy/Deploy0003.cls.xml
===================================================================
diff -u -r1294 -r1298
--- vhDeploy/Deploy0003.cls.xml	(.../Deploy0003.cls.xml)	(revision 1294)
+++ vhDeploy/Deploy0003.cls.xml	(.../Deploy0003.cls.xml)	(revision 1298)
@@ -20,7 +20,7 @@
 	
 	Set ^RES("TECH.MAIL","TP","CHECKMAIL" )= "```1```OPGELET"
 	Set ^RES("TECH.MAIL","TP","CHECKMAIL","B",1) = "Nee&`Ja&1"
-	Set ^RES("TECH.MAIL","TP","CHECKMAIL","T",1) = "Het emailadres º1 is niet geldig`Wenst u toch dit emailadres te gebruiken?`&S`&B"
+	Set ^RES("TECH.MAIL","TP","CHECKMAIL","T",1) = "Het emailadres º1 is niet geldig :º2`Wenst u toch dit emailadres te gebruiken?`&S`&B"
 ]]></Implementation>
 </Method>
 </Class>
Index: BL/EC/pxDerdeInfoPersoon.cls.xml
===================================================================
diff -u -r1264 -r1298
--- BL/EC/pxDerdeInfoPersoon.cls.xml	(.../pxDerdeInfoPersoon.cls.xml)	(revision 1264)
+++ BL/EC/pxDerdeInfoPersoon.cls.xml	(.../pxDerdeInfoPersoon.cls.xml)	(revision 1298)
@@ -143,10 +143,12 @@
 <FormalSpec>oPers:Derde.Klant.Persoon</FormalSpec>
 <Implementation><![CDATA[
  	
- 	If ((oPers.eMail'= "") && ('##class(TECH.Mail).Check(oPers.eMail,1))){
+ 	/*
+ 	/ JBL : pas actief zetten als alle mail adressen gecorrigeerd zijn.
+ 	/If ((oPers.eMail'= "") && ('##class(TECH.Mail).Check(oPers.eMail,1))){
 		Set Exception = ##class(TECH.Exceptions.BaseException).%New(##class(TECH.enu.ExceptionCode).ParameterInvalid(),"Het email adres "_oPers.eMail_" is niet geldig.")
 		Do ##class(TECH.ExceptionHandler).Throw(Exception)
-	}
+	}*/
  	Set pxPersoon=..%New()
     Do pxPersoon.Fill(oPers.Aanspreking,oPers.Naam,oPers.VoorNaam,oPers.eMail,oPers.Fax,oPers.Tel,oPers.GSM)
     Do pxPersoon.FillKlantSpecifiek(oPers.VerantwType,oPers.BeslisNiveau,oPers.PrivacyToelating,oPers.VoorkeurDocument)
Index: BL/EC/pxDerdeInfo.cls.xml
===================================================================
diff -u -r1264 -r1298
--- BL/EC/pxDerdeInfo.cls.xml	(.../pxDerdeInfo.cls.xml)	(revision 1264)
+++ BL/EC/pxDerdeInfo.cls.xml	(.../pxDerdeInfo.cls.xml)	(revision 1298)
@@ -128,10 +128,13 @@
 	Set ..Telefoon2=Derde.Telefoon2
 	Set ..GSMNr=Derde.GSMnr
 	Set ..Telefax=Derde.Telefax
-	If ('##class(TECH.Mail).Check(Derde.EmailAdres,1)){
+	/*
+ 	/ JBL : pas actief zetten als alle mail adressen gecorrigeerd zijn.
+	/If ('##class(TECH.Mail).Check(Derde.EmailAdres,1)){
 		Set Exception = ##class(TECH.Exceptions.BaseException).%New(##class(TECH.enu.ExceptionCode).InvalidInput(),"Het email adres "_Derde.EmailAdres_" is niet geldig.")
 		Do ##class(TECH.ExceptionHandler).Throw(Exception)
 	}
+	*/
 	Set ..EmailAdres=Derde.EmailAdres
 	If Options["FIN" Do 
 	. If Derde.KortingKontant, Derde.TermijnKortingKontant Do
Index: vhEMAIL.mac.rou
===================================================================
diff -u -r1264 -r1298
--- vhEMAIL.mac.rou	(.../vhEMAIL.mac.rou)	(revision 1264)
+++ vhEMAIL.mac.rou	(.../vhEMAIL.mac.rou)	(revision 1298)
@@ -20,7 +20,8 @@
 	  If ('ValidMail){
 	 	 /// ValidMail kan geforceerd worden.
 	 	 If ($Get(%ShowMailPopup)){
-	 	 	Set ValidMail=$$^vhTXTPOP("TECH.MAIL","CHECKMAIL","",Email)
+		 	Set Feedback = $P($$ParseStatus^vhLib(ValidMail),":",2)
+	 	 	Set ValidMail=$$^vhTXTPOP("TECH.MAIL","CHECKMAIL","",Email,Feedback)
 	 	 }	
 	 	 Set:'ValidMail Check = ValidMail 	 
 	  }