Index: vhConsistency/Checks/PrijzenVhizie.cls.xml
===================================================================
diff -u -r1119 -r1264
--- vhConsistency/Checks/PrijzenVhizie.cls.xml (.../PrijzenVhizie.cls.xml) (revision 1119)
+++ vhConsistency/Checks/PrijzenVhizie.cls.xml (.../PrijzenVhizie.cls.xml) (revision 1264)
@@ -2,7 +2,7 @@
-JBL + 2011-05-05
+JBL + 2011-05-05 recompile
1
vhConsistency.Check
0
Index: DOM/common/impl/DataM/DataMPersoonBase.cls.xml
===================================================================
diff -u
--- DOM/common/impl/DataM/DataMPersoonBase.cls.xml (revision 0)
+++ DOM/common/impl/DataM/DataMPersoonBase.cls.xml (revision 1264)
@@ -0,0 +1,394 @@
+
+
+
+
+JBL + 2011-03-29
+TECH.Error
+1
+DOM.common.Persoon,%RegisteredObject
+0
+
+
+%Integer
+1
+
+
+
+%Integer
+1
+
+
+
+%String
+1
+
+
+
+Nummer:%Integer,VolgNummer:%Integer
+%Status
+
+
+
+
+
+
+
+
+%Integer
+
+
+
+
+%String
+
+
+
+
+%String
+
+
+
+
+%String
+
+
+
+
+%ListOfDataTypes
+
+
+
+
+
+Lijst van DOM.CRM.enu.VoorkeurDocument
+%ListOfDataTypes
+
+
+
+
+
+Een lijst van DOM.CRM.enu.PrivacyToelating
+%ListOfDataTypes
+
+
+
+
+
+Waarde van 1 tot 4 (waarbij 1 TOPBESLISSER en 4 MEDEWERKER VAN DE BESLISSER)
+%Integer
+
+
+
+
+%String
+
+
+
+
+%String
+
+
+
+
+%String
+
+
+
+
+%String
+
+
+
+
+%String
+
+
+
+
+%String
+
+
+
+
+
+
+
+
+Piece:%Integer,Waarde:%String
+1
+
+
+
+
+Nummer:%Integer
+
+
+
+
+Naam:%String
+
+
+
+
+Voornaam:%String
+
+
+
+
+Aanspreking:%String
+
+
+
+
+VerantwoordelijkheidTypes:%ListOfDataTypes
+
+
+
+
+VoorkeurDocumenten:%ListOfDataTypes
+
+
+
+
+PrivacyToelatingen:%ListOfDataTypes
+%ListOfDataTypes
+
+
+
+
+
+Waarde van 1 tot 4 (waarbij 1 TOPBESLISSER en 4 MEDEWERKER VAN DE BESLISSER)
+BeslissingNiveau:%Integer
+%Integer
+
+
+
+
+Opmerking:%String
+
+
+
+
+Telefoon:%String
+
+
+
+
+PriveTelefoon:%String
+
+
+
+
+Fax:%String
+
+
+
+
+GSM:%String
+
+
+
+
+Email:%String
+
+
+
+
+Tijdstip:%Date
+1
+
+
+
+
+
+
+
+
+1
+
+
+
+
+
+
+
+
+
+GetConnect met als input
+T = Telefoon
+F = Fax
+G = GSM
+E = Email
+P = PrivéTelefoon
+Type:%String
+1
+DOM.CRM.dto.PersoonConnect
+
+
+
+
+
+GetConnect met als input
+T = Telefoon
+F = Fax
+G = GSM
+E = Email
+P = PrivéTelefoon
+Type:%String,Waarde:%String
+1
+
+
+
+
+Piece:%Integer,Lijst:%ListOfDataTypes
+1
+
+
+
+
+GlobalData:%String
+1
+%ListOfDataTypes
+
+
+
+
Index: DOM/common/impl/DataM/DataMPersoon.cls.xml
===================================================================
diff -u
--- DOM/common/impl/DataM/DataMPersoon.cls.xml (revision 0)
+++ DOM/common/impl/DataM/DataMPersoon.cls.xml (revision 1264)
@@ -0,0 +1,115 @@
+
+
+
+1
+DOM.common.impl.DataM.DataMPersoonBase
+0
+
+
+%Integer
+0
+
+
+
+%String
+
+
+
+%Boolean
+"0"
+1
+
+
+
+%Boolean
+1
+
+
+
+%Boolean
+1
+
+
+
+Nummer:%Integer,VolgNummer:%Integer
+%Status
+
+
+
+
+%Status
+
+
+
+
+%Status
+
+
+
+
+
+
+
+
+1
+%String
+
+
+
+
Index: DOM/LEV/impl/DataM/DataMPersoon.cls.xml
===================================================================
diff -u
--- DOM/LEV/impl/DataM/DataMPersoon.cls.xml (revision 0)
+++ DOM/LEV/impl/DataM/DataMPersoon.cls.xml (revision 1264)
@@ -0,0 +1,20 @@
+
+
+
+
+JBL + 2011-05-18
+1
+DOM.common.impl.DataM.DataMPersoon
+0
+
+
+LeverancierNummer:%Integer,VolgNummer:%Integer
+%Status
+
+
+
+
Index: DOM/common/Persoon.cls.xml
===================================================================
diff -u
--- DOM/common/Persoon.cls.xml (revision 0)
+++ DOM/common/Persoon.cls.xml (revision 1264)
@@ -0,0 +1,203 @@
+
+
+
+1
+1
+
+
+1
+%Status
+
+
+
+
+1
+%Status
+
+
+
+
+
+
+
+
+1
+%Integer
+
+
+
+
+1
+%String
+
+
+
+
+1
+%String
+
+
+
+
+1
+%String
+
+
+
+
+1
+%ListOfDataTypes
+
+
+
+
+
+Lijst van DOM.CRM.enu.VoorkeurDocument
+1
+%ListOfDataTypes
+
+
+
+
+
+Een lijst van DOM.CRM.enu.PrivacyToelating
+1
+%ListOfDataTypes
+
+
+
+
+
+Waarde van 1 tot 4 (waarbij 1 TOPBESLISSER en 4 MEDEWERKER VAN DE BESLISSER)
+1
+%Integer
+
+
+
+
+1
+%String
+
+
+
+
+1
+%String
+
+
+
+
+1
+%String
+
+
+
+
+1
+%String
+
+
+
+
+1
+%String
+
+
+
+
+1
+%String
+
+
+
+
+
+
+
+
+1
+Naam:%String
+
+
+
+
+1
+Voornaam:%String
+
+
+
+
+1
+Aanspreking:%String
+
+
+
+
+1
+VerantwType:%ListOfDataTypes
+
+
+
+
+1
+PrivacyToelatingen:%ListOfDataTypes
+%ListOfDataTypes
+
+
+
+
+
+Waarde van 1 tot 4 (waarbij 1 TOPBESLISSER en 4 MEDEWERKER VAN DE BESLISSER)
+1
+BeslissingNiveau:%Integer
+%Integer
+
+
+
+
+1
+Opmerking:%String
+
+
+
+
+1
+Telefoon:%String
+
+
+
+
+1
+PriveTelefoon:%String
+
+
+
+
+1
+Fax:%String
+
+
+
+
+1
+GSM:%String
+
+
+
+
+1
+Email:%String
+
+
+
+
Index: DOM/LEV/Leverancier.cls.xml
===================================================================
diff -u -r1240 -r1264
--- DOM/LEV/Leverancier.cls.xml (.../Leverancier.cls.xml) (revision 1240)
+++ DOM/LEV/Leverancier.cls.xml (.../Leverancier.cls.xml) (revision 1264)
@@ -8,7 +8,7 @@
1
-DOM.CRM.impl.DataM.DataMPersoonBase
+DOM.common.impl.DataM.DataMPersoon
0
-
-%Integer
-0
-
-
-
-%Boolean
-"0"
-1
-
-
-
-%Boolean
-1
-
-
-
-%Boolean
-1
-
-
KlantNummer:%Integer,VolgNummer:%Integer
%Status
-
-
-%Status
-
-
-
-
-%Status
-
-
-
-
-
-
-
-
-1
-%String
-
-
Index: vhConsistency/Checks/Email.cls.xml
===================================================================
diff -u
--- vhConsistency/Checks/Email.cls.xml (revision 0)
+++ vhConsistency/Checks/Email.cls.xml (revision 1264)
@@ -0,0 +1,173 @@
+
+
+
+
+JBL + 2011-05-18
+1
+vhConsistency.Check
+0
+
+
+%Boolean
+0
+
+
+
+%Status
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ResultSet:%String,Titel:%String,Teller:%Integer,TellerNotValid:%Integer
+W")
+ Set Teller = Teller + 1
+ If ('##class(TECH.Mail).Check(Email, ..#DoeNsLookUp)){
+ Set TellerNotValid = TellerNotValid + 1
+ Do ..VoegMeldingToe($C(9)_Email_" niet correct voor : "_rset.Data("Melding"))
+ Set Status = $$$ERROR($$$GeneralError,"Geen correct email"_Email)
+ }
+ }
+ If ('Status){
+ Do ..VoegMeldingToe($C(9)_"Email "_Titel_" fouten : "_TellerNotValid_" / "_Teller)
+ }Else{
+ Do ..VoegMeldingToe($C(9)_"OK")
+ }
+ Quit Status
+]]>
+
+
+
+Iterator:TECH.ListIterator,Teller:%Integer,TellerNotValid:%Integer
+%Status
+W")
+ If ('##class(TECH.Mail).Check(Mail,..#DoeNsLookUp)){
+ Do ..VoegMeldingToe($C(9)_KlantLev.GeefNummer()_":"_$C(9)_"'"_$$LCVT^vhLib(Mail)_"'")
+ Set TellerNotValid = TellerNotValid + 1
+ Set Status = $$$ERROR($$$GeneralError,"Geen correct email"_KlantLev.GeefNummer()_": "_Mail)
+ }Else{
+ Set $ZTRAP = "GeenZetEmail"
+ Do KlantLev.ZetEmail(Mail)
+ Do ..VoegMeldingToe($C(9)_"Aangepast mailadres : '"_$$LCVT^vhLib(Mail)_"'")
+ Do KlantLev.Save()
+GeenZetEmail
+ }
+ }
+ Set Teller = Teller + 1
+ }
+ Set PersonenIt = ##class(TECH.ListIterator).%New(KlantLev.GeefPersonen())
+ While PersonenIt.HasNext(){
+ Set Persoon = PersonenIt.Next()
+ Set Mail = Persoon.GeefEmail()
+ If (Mail'= "")
+ {
+ If ('##class(TECH.Mail).Check(Mail, ..#DoeNsLookUp)){
+ Do ..VoegMeldingToe($C(9)_KlantLev.GeefNummer()_":"_$C(9)_"'"_$$LCVT^vhLib(Mail)_"' ( Persoon : "_Persoon.GeefNaam()_" "_Persoon.GeefVoornaam()_" )")
+ Set TellerNotValid = TellerNotValid + 1
+ Set Status = $$$ERROR($$$GeneralError,"Geen correct email"_KlantLev.GeefNummer()_": "_Mail)
+ }
+ Set Teller = Teller + 1
+ }
+ }
+ }
+ Quit Status
+]]>
+
+
+
+%SQLQuery
+ Select ID || " " || UserNaam AS Melding, EmailAdres AS Email From Derde_EC.Toegang where EmailAdres IS NOT NULL
+
+
+
+%SQLQuery
+ Select eMail AS Email,ID || " " || Naam As Melding From Res.InternePersoon where eMail IS NOT NULL
+
+
+
+%SQLQuery
+ Select EmailAdres As Email, ID || " " || Adres_Naam As Melding From Derde_Agenda.Eindgebruiker where EmailAdres IS NOT NULL
+
+
+
Index: vhConsistency/Check.cls.xml
===================================================================
diff -u -r1187 -r1264
--- vhConsistency/Check.cls.xml (.../Check.cls.xml) (revision 1187)
+++ vhConsistency/Check.cls.xml (.../Check.cls.xml) (revision 1264)
@@ -8,6 +8,11 @@
%RegisteredObject
0
+
+%Boolean
+0
+
+
%String
Index: DOM/CRM/impl/ConsOLNieuwsbriefReg.cls.xml
===================================================================
diff -u -r1075 -r1264
--- DOM/CRM/impl/ConsOLNieuwsbriefReg.cls.xml (.../ConsOLNieuwsbriefReg.cls.xml) (revision 1075)
+++ DOM/CRM/impl/ConsOLNieuwsbriefReg.cls.xml (.../ConsOLNieuwsbriefReg.cls.xml) (revision 1264)
@@ -39,6 +39,10 @@
1
%Status
+
+Om te opereren van uit verschillende persoonlijkheden in onze software.
+Normalerwijs opereren we vanuit de personality 'VanHoecke' maar voor klantspecifieke vragen zoals een webshop
+of naar Halux toe kan dit veranderen waardoor er aparte klantbestand of prijzen kunnen worden gegenereerd.
persistent
1
%Persistent
Index: vhConsistency/ConsistencyCheck.cls.xml
===================================================================
diff -u -r1133 -r1264
--- vhConsistency/ConsistencyCheck.cls.xml (.../ConsistencyCheck.cls.xml) (revision 1133)
+++ vhConsistency/ConsistencyCheck.cls.xml (.../ConsistencyCheck.cls.xml) (revision 1264)
@@ -3,7 +3,7 @@
JBL + 2011-05-05
-Do ##class(vhConsistency.ConsistencyCheck).VoerUit()
+Do ##class(vhConsistency.ConsistencyCheck).VoerUit(1,0)
vhLib.Macro
1
%RegisteredObject
@@ -15,16 +15,16 @@
1
-ToonAlles:%Boolean=0
+ToonAlles:%Boolean=0,StuurMail:%Boolean=1
%String
-ToonAlles:%Boolean=0
+ToonAlles:%Boolean=0,StuurMail:%Boolean
@@ -72,11 +72,17 @@
%Status
Index: TECH/Mail.cls.xml
===================================================================
diff -u
--- TECH/Mail.cls.xml (revision 0)
+++ TECH/Mail.cls.xml (revision 1264)
@@ -0,0 +1,150 @@
+
+
+
+
+JBL + 2011-05-17
+1
+%RegisteredObject
+0
+
+
+
+Do ##class(TECH.Mail).CheckDummy()
+1
+
+
+
+
+
+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)
+1
+Mail:%String,NsLookUp:%Boolean=0
+1
+%Status
+
+
+
+
+
+Eerste en laatste teken van local part mogen geen punt zijn.
+Er mogen geen twee of meer opeenvolgende punten achter elkaar staan.
+1
+MailPart
+1
+
+
+
+
+1
+MailDomainPart:%String
+%Status
+
+
+
+
+1
+MailDomainPart:%String
+1
+%Status
+ c:\"_FileName
+ s Ok=$ZF(-1,Exec)
+ Set %NsLookUp=0
+ Set FileName=$$READ^vhDEV("c:\",FileName,"D`##class("_..%ClassName(1)_").GetNsLookUpLine","M")
+ Set Status = %NsLookUp
+ Do DELFILE^vhDEV("c:\",FileName)
+ Kill %NsLookUp
+ Quit Status
+]]>
+
+
+
+1
+Rec
+
+
+
+
Index: FaxMail.mac.rou
===================================================================
diff -u -r948 -r1264
--- FaxMail.mac.rou (.../FaxMail.mac.rou) (revision 948)
+++ FaxMail.mac.rou (.../FaxMail.mac.rou) (revision 1264)
@@ -317,21 +317,39 @@
Do CheckText(.Data),MERGSLOT
Kill ^HULP(%J,"T")
Merge ^HULP(%J,"T")=Data("Tekst")
- Set Data("Datum")=$$EXTDATE^vhDTyp(Data("Datum"),"DC",Taal)_", "_$$EXTDATE^vhDTyp(Data("Datum"),"DL",Taal)
- If $G(Data("BackGround")) Set SendMail=1
- Else Do
- . Set Body=0,R=Data("em")
- . If $L(R) For I=1:1:$L(R,";") Set Body=Body+1,Body(Body)=$S(I=1:"to: ",1:" ")_$P(R,";",I)
- . Set R=Data("cc")
- . If $L(R) For I=1:1:$L(R,";") Set Body=Body+1,Body(Body)=$S(I=1:"cc: ",1:" ")_$P(R,";",I)
- . Set R=Data("bcc")
- . If $L(R) For I=1:1:$L(R,";") Set Body=Body+1,Body(Body)=$S(I=1:"bcc: ",1:" ")_$P(R,";",I)
- . Set Body="Body"
- . Set SendMail=$$^vhTXTPOP("FAXMAIL","SENDMAIL")
- Do:SendMail
- . Set sc=$$CreateAndSend(.Data)
- . Do LogPrintDoc(.Data,"M")
- . If '$G(Data("BackGround")),$$$ISERR(sc) Do WARN^vhTXTPOP($$ParseStatus^vhLib(sc),"")
+ Set Data(" Datum")=$$EXTDATE^vhDTyp(Data("Datum"),"DC",Taal)_", "_$$EXTDATE^vhDTyp(Data("Datum"),"DL",Taal)
+
+ Set Emails = Data("em")
+ Set EmailIt = ##class(TECH.PiecesIterator).%New(Emails,";")
+ While(EmailIt.HasNext()){
+ Set Email = EmailIt.Next()
+ Set ValidMail = ##class(TECH.Mail).Check(Email,0)
+ If ('ValidMail){
+ /// ValidMail kan geforceerd worden.
+ Set ValidMail=$$^vhTXTPOP("TECH.MAIL","CHECKMAIL","",Email)
+ }
+ If (ValidMail) {
+ If $G(Data("BackGround")){
+ Set SendMail=1
+ } Else {
+ Set Body=0,R=Data("em")
+ If $L(R) For I=1:1:$L(R,";") Set Body=Body+1,Body(Body)=$S(I=1:"to: ",1:" ")_$P(R,";",I)
+ Set R=Data("cc")
+ If $L(R) For I=1:1:$L(R,";") Set Body=Body+1,Body(Body)=$S(I=1:"cc: ",1:" ")_$P(R,";",I)
+ Set R=Data("bcc")
+ If $L(R) For I=1:1:$L(R,";") Set Body=Body+1,Body(Body)=$S(I=1:"bcc: ",1:" ")_$P(R,";",I)
+ Set Body="Body"
+ Set SendMail=$$^vhTXTPOP("FAXMAIL","SENDMAIL")
+ }
+ } Else {
+ Do WARN^vhTXTPOP("De email is niet verzonden!","")
+ }
+ If (SendMail){
+ Set sc=$$CreateAndSend(.Data)
+ Do LogPrintDoc(.Data,"M")
+ If '$G(Data("BackGround")),$$$ISERR(sc) Do WARN^vhTXTPOP($$ParseStatus^vhLib(sc),"")
+ }
+ }
Quit
;
; Algemene initialisatie
Index: vhEMAIL.mac.rou
===================================================================
diff -u -r734 -r1264
--- vhEMAIL.mac.rou (.../vhEMAIL.mac.rou) (revision 734)
+++ vhEMAIL.mac.rou (.../vhEMAIL.mac.rou) (revision 1264)
@@ -9,9 +9,25 @@
Do BLDIAM^vhEMAIL3
Quit
;
+
CHECK(EMAdres)
- Quit $$CHECK^vhEMAIL2($G(EMAdres))
- ;
+ Set Check = 1
+ Set Emails = $G(EMAdres)
+ Set EmailIt = ##class(TECH.PiecesIterator).%New(Emails,";")
+ While(EmailIt.HasNext()){
+ Set Email = EmailIt.Next()
+ Set ValidMail = ##class(TECH.Mail).Check(Email,1)
+ If ('ValidMail){
+ /// ValidMail kan geforceerd worden.
+ If ($Get(%ShowMailPopup)){
+ Set ValidMail=$$^vhTXTPOP("TECH.MAIL","CHECKMAIL","",Email)
+ }
+ Set:'ValidMail Check = ValidMail
+ }
+ }
+ Quit Check
+ /// JBL : oorspronkelijke check was : Quit $$CHECK^vhEMAIL2($G(EMAdres))
+ /// Deze is vervangen door bovenstaande check.
EMAILCTR
Goto JOB^EMAILCTR
FishEye: Tag 1264 refers to a dead (removed) revision in file `DOM/CRM/Persoon.cls.xml'.
FishEye: No comparison available. Pass `N' to diff?
Index: vhLib/Logger.cls.xml
===================================================================
diff -u -r1074 -r1264
--- vhLib/Logger.cls.xml (.../Logger.cls.xml) (revision 1074)
+++ vhLib/Logger.cls.xml (.../Logger.cls.xml) (revision 1264)
@@ -97,7 +97,8 @@
Index: CHUI/Derde/EC/Toegang/MainForm.cls.xml
===================================================================
diff -u -r1074 -r1264
--- CHUI/Derde/EC/Toegang/MainForm.cls.xml (.../MainForm.cls.xml) (revision 1074)
+++ CHUI/Derde/EC/Toegang/MainForm.cls.xml (.../MainForm.cls.xml) (revision 1264)
@@ -465,6 +465,12 @@
If ..txtEmail.Value="" Do Quit 0
. Do ..txtEmail.SetFocus()
. Do $$$ShowMsgBoxSimple(..Caption,"Er is geen emailadres opgegeven.")
+
+ If ((..txtEmail.Value '= "") && ('##class(TECH.Mail).Check(..txtEmail.Value,1))){
+ Do ..txtEmail.SetFocus()
+ Do $$$ShowMsgBoxSimple(..Caption,"Het opgegeven emailadres is niet geldig.")
+ Quit 0
+ }
If ..txtUserName.Value="" Do Quit 0
. Do ..txtUserName.SetFocus()
@@ -493,7 +499,6 @@
Quit:('..FrVALIDATE()) 0
Do ..FrWRITE()
-
Set Result=..objToegang.SaveAndLog()
If $$$ISERR(Result) Do Quit 0
Index: vhConsistency/Checks/PrijzenOrgalux.cls.xml
===================================================================
diff -u -r1133 -r1264
--- vhConsistency/Checks/PrijzenOrgalux.cls.xml (.../PrijzenOrgalux.cls.xml) (revision 1133)
+++ vhConsistency/Checks/PrijzenOrgalux.cls.xml (.../PrijzenOrgalux.cls.xml) (revision 1264)
@@ -2,7 +2,7 @@
-JBL + 2011-05-05
+JBL + 2011-05-05 recompile
1
vhConsistency.Check
0
Index: BL/EC/pxDerdeInfo.cls.xml
===================================================================
diff -u -r1074 -r1264
--- BL/EC/pxDerdeInfo.cls.xml (.../pxDerdeInfo.cls.xml) (revision 1074)
+++ BL/EC/pxDerdeInfo.cls.xml (.../pxDerdeInfo.cls.xml) (revision 1264)
@@ -128,6 +128,10 @@
Set ..Telefoon2=Derde.Telefoon2
Set ..GSMNr=Derde.GSMnr
Set ..Telefax=Derde.Telefax
+ 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: BL/EC/pxDerdeInfoPersoon.cls.xml
===================================================================
diff -u -r1074 -r1264
--- BL/EC/pxDerdeInfoPersoon.cls.xml (.../pxDerdeInfoPersoon.cls.xml) (revision 1074)
+++ BL/EC/pxDerdeInfoPersoon.cls.xml (.../pxDerdeInfoPersoon.cls.xml) (revision 1264)
@@ -143,6 +143,10 @@
oPers:Derde.Klant.Persoon