Index: _vhisie/TBX/MailSend.csp
===================================================================
diff -u -r757 -r1626
--- _vhisie/TBX/MailSend.csp	(.../MailSend.csp)	(revision 757)
+++ _vhisie/TBX/MailSend.csp	(.../MailSend.csp)	(revision 1626)
@@ -5,17 +5,20 @@
 <SCRIPT language="cache" runat="server">
 	Set %session.AppTimeout = 905
 
-	Set sDomain=$$GetURLDomain^cspBasis.Library
-	Set sDomCVT=$$TBXDomainCVT^cspBasis.Library(sDomain)
-	Set sDomVERW=$LG(##class(WS.TBX.Order).DomainLookUp(sDomCVT,$LB("VERW")),1)   ; $$TBXDomainLU^cspBasis.Library(sDomCVT,$LB("VERW","KLNR"))
-	Set blnVHEPN=(sDomVERW="VHEPN")
+	;Set sDomain=$$GetURLDomain^cspBasis.Library
+	;Set sDomCVT=$$TBXDomainCVT^cspBasis.Library(sDomain)
+	;Set sDomVERW=$LG(##class(WS.TBX.Order).DomainLookUp(sDomCVT,$LB("VERW")),1)   ; $$TBXDomainLU^cspBasis.Library(sDomCVT,$LB("VERW","KLNR"))
+	;Set blnVHEPN=(sDomVERW="VHEPN")
 	
+	Set TBXContext=##class(APPS.TBXWeb.TBXContext).InitFromHttpRequest()
+	Set sDomain=TBXContext.GeefHttpRequestDomein()
+	
 	Set Taal=$$DataFromRqOrSes^cspBasis.Library("Taal",,"N")
 	Set wsID=$$DataFromRqOrSes^cspBasis.Library("WSID",,"")
 	Set:($L(wsID)) %session.Data("WSID")=wsID
 	Set KLNr=$$DataFromRqOrSes^cspBasis.Library("KLNR",,"")
 	If KLNr>0 Do
-	. Set SubmitMsg=##class(cspBasis.GAProdTBox).GetKlantSubmitMsg(sDomVERW,KLNr)
+	. Set SubmitMsg=##class(cspBasis.GAProdTBox).GetKlantSubmitMsg(TBXContext.GeefDomeinVerwerker(),KLNr)
 	; LeverTijd is verplicht gegeven in geval van Bestelbon
 	
 	;Do ##class(cspBasis.GAProdTBox).AddToLog("MAIL_DLGSEND",$$GetURLDomain^cspBasis.Library,$G(KLNr),,$G(wsID),$G(%session.Data("VERW")),$G(Taal),,"")
@@ -27,7 +30,7 @@
 	. Set blnValidate=((WSOrd.BonType="BBON")||((WSOrd.BonType="OFF")&&($G(%request.Data("OFFTOBBON",1))))||(WSOrd.BonType="INKP"))
 	. Set blnError=0
 	. Set:($L(WSOrd.Opmerking1))&&(WSOrd.BonType'="OFF") SubmitMsg=WSOrd.Opmerking1
-	. Set blnShowOrderBCombo=(blnVHEPN)
+	. Set blnShowOrderBCombo=(TBXContext.IsDomeinVHEPN())
 	. If blnShowOrderBCombo Do
 	. . Set lbOrderbevEmails = ..GetEmailAdressenLB(WSOrd.KLNummer)
 	Else  Do
@@ -36,10 +39,10 @@
 	. ; For debugging reason: log OnOpen event of the MailSend.csp page
 	. Do ##class(cspBasis.GAProdTBox).AddToLog("MAIL_DLGERR",sDomain,$G(KLNr),,$G(wsID),$G(%session.Data("VERW")),$G(Taal),,"")
 
-	Set blnShowLevTCombo=(blnVHEPN)   ; only for VHEPN domain
+	Set blnShowLevTCombo=(TBXContext.IsDomeinVHEPN())   ; only for VHEPN domain
 	If blnShowLevTCombo Do
 	. Set LevTFieldName="cboLeverTijd"
-	. Set lbLevT=..GetLeverWekenLB(sDomVERW,Taal)
+	. Set lbLevT=..GetLeverWekenLB(TBXContext.GeefDomeinVerwerker(),Taal)
 	Else  Do
 	. Set LevTFieldName="txtLeverTijd"