Index: vhConsistency/Checks/Email.cls.xml =================================================================== diff -u -r1314 -r1327 --- vhConsistency/Checks/Email.cls.xml (.../Email.cls.xml) (revision 1314) +++ vhConsistency/Checks/Email.cls.xml (.../Email.cls.xml) (revision 1327) @@ -2,14 +2,14 @@ -JBL + 2011-05-18 +JBL + 2011-05-18 1 vhConsistency.Check 0 %Boolean -1 +0 @@ -101,8 +101,7 @@ While (rset.Next(.sc)){ Set Email = $ZSTRIP(rset.Data("Email"),"<>W") Set Teller = Teller + 1 - if ($Piece(Teller/100,".",2)="") W Teller,! - ;w Email,! + if $p(Teller/100,".",2)="" w Teller,! Set ValidMail = ##class(TECH.Mail).Check(Email, ..#DoeNsLookUp,..#CacheNsLookUp) If ('ValidMail){ Set Feedback = $P($$ParseStatus^vhLib(ValidMail),":",2) @@ -125,20 +124,21 @@ %Status W") 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) + Do ..VoegMeldingToe($C(9)_Regio_$C(9)_KlantLev.GeefNummer()_$C(9)_$$LCVT^vhLib(Mail)_$C(9)_" door "_Feedback) Set TellerNotValid = TellerNotValid + 1 Set Status = $$$ERROR($$$GeneralError,"Geen correct email "_KlantLev.GeefNummer()_" door "_Feedback_" : "_Mail) }Else{ @@ -155,14 +155,13 @@ While PersonenIt.HasNext(){ Set Persoon = PersonenIt.Next() Set Mail = Persoon.GeefEmail() - if ($Piece(Teller/100,".",2)="") W Teller,! - ;w "'"_Mail_"'",! If (Mail'= "") { + if $p(Teller/100,".",2)="" w Teller,! 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()_" )") + Do ..VoegMeldingToe($C(9)_Regio_$C(9)_KlantLev.GeefNummer()_$C(9)_$$LCVT^vhLib(Mail)_$C(9)_" door "_Feedback_" ( Persoon : "_Persoon.GeefNaam()_" "_Persoon.GeefVoornaam()_" )") Set TellerNotValid = TellerNotValid + 1 Set Status = $$$ERROR($$$GeneralError,"Geen correct email "_KlantLev.GeefNummer()_" door "_Feedback_": "_Mail) } Index: CHUI/Derde/EC/Toegang/dlgOpen.cls.xml =================================================================== diff -u -r1074 -r1327 --- CHUI/Derde/EC/Toegang/dlgOpen.cls.xml (.../dlgOpen.cls.xml) (revision 1074) +++ CHUI/Derde/EC/Toegang/dlgOpen.cls.xml (.../dlgOpen.cls.xml) (revision 1327) @@ -541,6 +541,12 @@ ;Paswoord verzenden (emailadres valideren) Set EmailAddress=objToegang.EmailAdres Quit:($$$InputBox(..Caption,"Paswoord verzenden naar:",.EmailAddress)=$$$mrCancel) + + Set ValidMail = ##class(TECH.Mail).Check(EmailAddress,1) + If ('ValidMail) { + Set Feedback = $P($$ParseStatus^vhLib(ValidMail),":",2) + Quit:($$$InputBox(..Caption,"Email foutief :"_Feedback_" Toch verzenden ? ",.EmailAddress)=$$$mrCancel) + } Quit:(EmailAddress="") $$$blToegang Set FromEmailAddress=$S($IsObject(%Application.User):%Application.User.eMail,1:"unknown@vanhoecke.be") Index: TECH/Mail.cls.xml =================================================================== diff -u -r1318 -r1327 --- TECH/Mail.cls.xml (.../Mail.cls.xml) (revision 1318) +++ TECH/Mail.cls.xml (.../Mail.cls.xml) (revision 1327) @@ -2,7 +2,7 @@ -JBL + 2011-05-17 +JBL + 2011-05-17 1 %RegisteredObject 0 @@ -46,7 +46,7 @@ /// Check DomainPart - Set:IsValid IsValid = DomainPart?1.(1(.A.N)1(1".",1"-"))1(.A) + Set:IsValid IsValid = DomainPart?1.7(1.7(.A.N)1(1".",1"-"))1(.A) Set:IsValid IsValid = ..CheckPunten(DomainPart) @@ -100,18 +100,8 @@ 1 %Status 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 + Set NsLookUp = "NSLOOKUP -q=mx" + Quit ..NsLookUpCheckBase(NsLookUp,MailDomainPart,"GetNsLookUpLineMX") ]]> @@ -121,12 +111,23 @@ 1 %Status + + + +1 +NsLookUp:%String,MailDomainPart:%String,HandleMethod:%String +1 +%Status + c:\"_FileName + Set Exec = NsLookUp_ " "_MailDomainPart_" > c:\"_FileName s Ok=$ZF(-1,Exec) Set %NsLookUp=0 - Set FileName=$$READ^vhDEV("c:\",FileName,"D`##class("_..%ClassName(1)_").GetNsLookUpLine","M") + Set FileName=$$READ^vhDEV("c:\",FileName,"D`##class("_..%ClassName(1)_")."_HandleMethod_"","M") Set Status = %NsLookUp Set:'Status Status = $$$ERROR($$$GeneralError,"Niet bestaand domein.") Do DELFILE^vhDEV("c:\",FileName) Index: vhConsistency/ConsistencyCheck.cls.xml =================================================================== diff -u -r1314 -r1327 --- vhConsistency/ConsistencyCheck.cls.xml (.../ConsistencyCheck.cls.xml) (revision 1314) +++ vhConsistency/ConsistencyCheck.cls.xml (.../ConsistencyCheck.cls.xml) (revision 1327) @@ -2,7 +2,7 @@ -JBL + 2011-05-05 +JBL + 2011-05-05 Do ##class(vhConsistency.ConsistencyCheck).VoerUit(1,0) vhLib.Macro 1 @@ -82,7 +82,7 @@ If ('Check.SkipCheck){ If (Resultaat '= $$$OK){ - Do ..Meldingen.Write(Check.GeefMelding()) + Do ..Meldingen.CopyFrom(Check.GeefMelding()) }ElseIf(ToonAlles && Resultaat){ Do ..Meldingen.WriteLine(Classname_" : OK") } Index: vhConsistency/Check.cls.xml =================================================================== diff -u -r1314 -r1327 --- vhConsistency/Check.cls.xml (.../Check.cls.xml) (revision 1314) +++ vhConsistency/Check.cls.xml (.../Check.cls.xml) (revision 1327) @@ -2,7 +2,7 @@ -JBL + 2011-05-05 +JBL + 2011-05-05 1 1 %RegisteredObject Index: vhUnitTest/TECH/Mail.cls.xml =================================================================== diff -u -r1304 -r1327 --- vhUnitTest/TECH/Mail.cls.xml (.../Mail.cls.xml) (revision 1304) +++ vhUnitTest/TECH/Mail.cls.xml (.../Mail.cls.xml) (revision 1327) @@ -13,6 +13,8 @@ Set NsLookUp = 1 + Set mail = "sjonslutter@xs4all.nl" + Do $$$AssertTrue(##class(TECH.Mail).Check(mail,NsLookUp,CacheNsLookUp),"Emailadres "_mail_" is goed getest.") Set mail = "Joren.Blancquaert@skynet.12" Do $$$AssertTrue('##class(TECH.Mail).Check(mail,NsLookUp,CacheNsLookUp),"Emailadres "_mail_" is goed getest.") Set mail = "Joren" Index: CHUI/Derde/EC/Toegang/MainForm.cls.xml =================================================================== diff -u -r1298 -r1327 --- CHUI/Derde/EC/Toegang/MainForm.cls.xml (.../MainForm.cls.xml) (revision 1298) +++ CHUI/Derde/EC/Toegang/MainForm.cls.xml (.../MainForm.cls.xml) (revision 1327) @@ -515,6 +515,11 @@ .. Set EmailAddress=..objToegang.EmailAdres .. Quit:($$$InputBox(..Caption,"Paswoord verzenden naar:",.EmailAddress)=$$$mrCancel) .. Quit:(EmailAddress="") + .. Set ValidMail = ##class(TECH.Mail).Check(EmailAddress,1) + .. If ('ValidMail) Do + ... Set Feedback = $P($$ParseStatus^vhLib(ValidMail),":",2) + ... Quit:($$$InputBox(..Caption,"Email foutief : "_Feedback_" Toch verzenden ?",.EmailAddress)=$$$mrCancel) + .. Quit:(EmailAddress="") .. $$$blToegang .. Set FromEmailAddress=$S($IsObject(%Application.User):%Application.User.eMail,1:"unknown@vanhoecke.be") .. Set Status=%blToegang.MailWachtWoord(..objToegang,..FChangedPwd, EmailAddress,,FromEmailAddress)