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>