Index: _vhisie/TBX/MailResult.csp
===================================================================
diff -u -r757 -r1626
--- _vhisie/TBX/MailResult.csp	(.../MailResult.csp)	(revision 757)
+++ _vhisie/TBX/MailResult.csp	(.../MailResult.csp)	(revision 1626)
@@ -45,11 +45,17 @@
 	. New WSOrdDomain
  	. &SQL(SELECT WebDomain INTO :WSOrdDomain FROM WS_TBX.WebOrder WHERE ID=:wsID)
 	. Set Domain=WSOrdDomain
- 	Set lbDomLU=##class(WS.TBX.Order).DomainLookUp(Domain,$LB("VERW","KLNR"))   ; $$TBXDomainLU^cspBasis.Library(sDomCVT,$LB("VERW","KLNR"))
-	Set sDomVERW=$LG(lbDomLU,1)
-	Set sDomKLNr=$LG(lbDomLU,2)
+ 
+	;Set lbDomLU=##class(WS.TBX.Order).DomainLookUp(Domain,$LB("VERW","KLNR"))   ; $$TBXDomainLU^cspBasis.Library(sDomCVT,$LB("VERW","KLNR"))
+	;Set sDomVERW=$LG(lbDomLU,1)
+	;Set sDomKLNr=$LG(lbDomLU,2)
+	Set HttpRequestDomein=$$GetURLDomain^cspBasis.Library
+	Set TBXContext=##class(APPS.TBXWeb.TBXContext).%New(Domain,HttpRequestDomein)
+	Set sDomVERW=TBXContext.GeefDomeinVerwerker()
+	Set sDomKLNr=TBXContext.GeefDomeinKlantNummer()
+	
 	If (%request.IsDefined("RESULT")) Do  Quit 1
-	. Set AttrOnLoad=$S($G(%request.Data("RESULT",1))=1:"onload=""window.opener.location.replace('Main.csp?REF="_$$CreateHashedRef^cspBasis.TBX.DecodeURL.tmpDev($LB(KLNr,sDomVERW,wsID,$S(sMode="PROCESS":"PROCESS",1:"COMPLETE")))_$S($L(Taal):"&Taal="_Taal, 1:"")_"');""", 1:"")
+	. Set AttrOnLoad=$S($G(%request.Data("RESULT",1))=1:"onload=""window.opener.location.replace('Main.csp?REF="_$$CreateHashedRef^cspBasis.TBX.DecodeURL.tmpDev($LB(KLNr,TBXContext.GeefDomeinVerwerker(),wsID,$S(sMode="PROCESS":"PROCESS",1:"COMPLETE")))_$S($L(Taal):"&Taal="_Taal, 1:"")_"');""", 1:"")
 	Quit:('%request.IsDefined("SUBMIT")) 1
 	; Else 
     Do ..TBoxSendMail(.ok,.errmsg,Taal)
@@ -118,7 +124,7 @@
 				</SCRIPT>
 				</UL>
 				<P>#(errmsg)# <BR/>
-				Contact Administrator: #($CASE($G(sDomVERW), "HEIN":"info@tandem-box.de", "LMC":" ??? ", "DUPO":"du.pont@skynet.be", "HELMY":"info@destil.nl", "HFLE":"info@hafele.nl", "SFS":"info.u@sfsunimarket.biz", "MBHO":$$$EMailICTAdminMbho, :"ICT_SOAPSysOp@vanhoecke.be"))#</P>
+				Contact Administrator: #(TBXContext.GeefAdministratorEmail())#</P>
 			</CSP:IF>
 		<CSP:ELSE>
 			<BR/>