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