Index: vhLib/Mail.mac.rou =================================================================== diff -u -r2323 -r2330 --- vhLib/Mail.mac.rou (.../Mail.mac.rou) (revision 2323) +++ vhLib/Mail.mac.rou (.../Mail.mac.rou) (revision 2330) @@ -1,16 +1,24 @@ #include vhLib.Macro + /// Forceer mail naar de orig. recipients, m.a.w. negeer de waarde van het ConfigItem "vhLib.Mail_RedirectMailToDevelopment" + /// Added by WimV on 12/10/2011 +SendMiniMailForced(From,To,Subject,Body,BodyIsStream,IsHTML,AuthUser,AuthPwd,lbAttachments,ReplyTo,ccTo,BccTo) + Quit $$SendMiniMail(From,To,Subject,.Body,.BodyIsStream,.IsHTML,.AuthUser,.AuthPwd,.lbAttachments,.ReplyTo,.ccTo,.BccTo, 1) + // ========================================================================================================================================== // Name : SendMiniMail // Author : Tom Rombaut // Function: Stuurt een minimail // ========================================================================================================================================== -SendMiniMail(From,To,Subject,Body,BodyIsStream,IsHTML,AuthUser,AuthPwd,lbAttachments,ReplyTo,ccTo,BccTo) +SendMiniMail(From,To,Subject,Body,BodyIsStream,IsHTML,AuthUser,AuthPwd,lbAttachments,ReplyTo,ccTo,BccTo, ForceToOrigRcpts) #Include %occOptions #Include %occStatus + // Default param value + Set ForceToOrigRcpts=$G(ForceToOrigRcpts,0) + If (##class(TECH.Config.ConfigMgr).Instance().GetBoolean("MiniMail_VoegServerPrefixToe")) { Set:($$$UCase(Subject)'[($$$Server)) Subject = "["_$$$Server_"]"_" "_Subject @@ -57,7 +65,7 @@ // Added by WimV on 11/10/2011 New RecipientsInfo,RedirectTo Set RecipientsInfo="" - If ##class(TECH.Config.ConfigMgr).Instance().GetBoolean("vhLib.Mail_RedirectMailToDevelopment") { + If ($$$Not(ForceToOrigRcpts)) && (##class(TECH.Config.ConfigMgr).Instance().GetBoolean("vhLib.Mail_RedirectMailToDevelopment")) { // Override mail recipients, stuur mail naar de actieve gebruiker (bedoeld voor test- en development-omgevingen) Set RecipientsInfo=$$GeefRecipientsInfo(MM) Set RedirectTo=$$GeefMailAdresFromRuntimeContext()