Index: csp/vhisie/TBX/BuildRef/tmpDev.mac.rou
===================================================================
diff -u -r1155 -r1571
--- csp/vhisie/TBX/BuildRef/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 1155)
+++ csp/vhisie/TBX/BuildRef/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 1571)
@@ -48,7 +48,7 @@
 	Do
 	. Set %blnBuildRef=1
     . Set DataOpt=$G(%request.Data("DATAOPT",1))
-    . Set DataOptOut=$$OPTIMADecryptData^cspBasis.TBX.DecodeURL.tmpDev(DataOpt,,$S(VERW="SFS":"SFS", VERW="LMC":"LMC", VERW="MBHO":"MBHO", 1:""))
+    . Set DataOptOut=$$OPTIMADecryptData^cspBasis.TBX.DecodeURL.tmpDev(DataOpt,,$S(VERW="SFS":"SFS", VERW="LMC":"LMC", VERW="MBHO":"MBHO", VERW="HFLB":"HFLB", 1:""))
 	. Kill %blnBuildRef
 	
 	If ($G(%request.Data("SUBMIT",1))="Encrypt") Do
@@ -59,7 +59,7 @@
 	. ;If $L($G(%request.Data("DATAOPT",1))) Do
 	. If $L(DataOpt) Do
 	..  Set DataOptCheck=DataOpt
-	..  Set EncDataOptOut=$$OPTIMAEncryptData^cspBasis.TBX.DecodeURL.tmpDev(DataOpt,$S(VERW="SFS":"SFS", VERW="LMC":"LMC", VERW="MBHO":"MBHO", 1:""))
+	..  Set EncDataOptOut=$$OPTIMAEncryptData^cspBasis.TBX.DecodeURL.tmpDev(DataOpt,$S(VERW="SFS":"SFS", VERW="LMC":"LMC", VERW="MBHO":"MBHO", VERW="HFLB":"HFLB", 1:""))
 	..  ;Set EncDataOptOut=$system.Encryption.Base64Decode($TR(EncDataOptOut,"_-","+="))
 	. ;New Page,UrlTaal
 	. Set Page=$G(%request.Data("PAGE",1))
@@ -87,22 +87,30 @@
  
  
  
-	// Specific Test Page for testing DataOpt Parameter in URL (for OPTIMA / SFS / MBHO)
+	// Specific Test Page for testing DataOpt Parameter in URL (for OPTIMA / SFS / MBHO / HFLB)
 OnPreHTTPTestDataOpt(TestVERW)
 #define CSPPage          ##class(%CSP.Page)
-#define TaalDfl          $S(sDomVERW="HEIN":"D", sDomVERW="LMC":"F", sDomVERW="SFS":"D", 1:"N")
 	  s:('$D(ClientIP)) ClientIP="192.168.1.97"
 	  ;d WL^vhDBG($C(13,10))
 	New Ref,RefNew,RefArray,tmpRq,tmpAr,tmpTaal
 	Set %RemoteIP=$G(%request.CgiEnvs("REMOTE_ADDR"))
 	Do ophInitLookups^cspBasis.TBX.DecodeURL.tmpDev
+ 
+	New TBXContext,DefaultTaal
+	Set TBXContext=##class(APPS.TBXWeb.XXXContext).InitFromHttpRequest()
+	Set sDomain=TBXContext.GeefHttpRequestDomein()
+	Set sDomCVT=TBXContext.GeefWebDomein()
+	Set sDomVERW=TBXContext.GeefDomeinVerwerker()
+	Set sDomKLNr=TBXContext.GeefDomeinKlantNummer()
+	Set DefaultTaal=TBXContext.GeefDefaultTaal()
+ 
 	//   URL --> domain / sDomVERW / sDomKLNr
-	Set sDomain=$$GetURLDomain^cspBasis.Library
-	Set sDomCVT=$S(TestVERW="LMC":"www.optima-tbx.fr", TestVERW="SFS":"tbx.sfsunimarket.biz", TestVERW="MBHO":$$$TBoxWebDomeinMBHO, 1:$$TBXDomainCVT^cspBasis.Library(sDomain))
-	Set lbDomLU=##class(WS.TBX.Order).DomainLookUp(sDomCVT,$LB("VERW","KLNR"))
-	Set sDomVERW=$LG(lbDomLU,1)
-	Set sDomKLNr=$LG(lbDomLU,2)
-	Set Taal=$G(%request.Data("Taal",1),$$$TaalDfl)
+	;Set sDomain=$$GetURLDomain^cspBasis.Library
+	;Set sDomCVT=$S(TestVERW="LMC":"www.optima-tbx.fr", TestVERW="SFS":"tbx.sfsunimarket.biz", TestVERW="MBHO":$$$TBoxWebDomeinMBHO, TestVERW="HFLB":$$$TBoxWebDomeinHFLB, 1:$$TBXDomainCVT^cspBasis.Library(sDomain))
+	;Set lbDomLU=##class(WS.TBX.Order).DomainLookUp(sDomCVT,$LB("VERW","KLNR"))
+	;Set sDomVERW=$LG(lbDomLU,1)
+	;Set sDomKLNr=$LG(lbDomLU,2)
+	Set Taal=$G(%request.Data("Taal",1),DefaultTaal)
 	Set QS=$G(%request.CgiEnvs("QUERY_STRING"))
     Set Ref=$G(%request.Data("REF",1))
 	Set RefNew=$G(%request.Data("REF",1),$$$RefStartNew)   ; Als REF niet meegegeven is, StartNew (dfl) gebruiken
@@ -124,20 +132,23 @@
 	. Set wsID=$G(RefArray("WSID"))
 	. Set sMode=$G(RefArray("MODE"))
 	Set:($G(VERW)="") VERW=sDomVERW
+		d WLIP^vhDBG(97,"sDomVERW="_sDomVERW_"  VERW="_VERW_"   TestVERW="_TestVERW_"")
+ 
 	Set blnNoAccess=0
 	If 0  Set blnNoAccess=1
-	;Else  If sDomVERW="SFS"  Set blnNoAccess=(%RemoteIP'?1(1"192.168.1."1.3N,1"77.59.193.234",1"195.141.221.1"))
-	;Else  If sDomVERW="LMC"  Set blnNoAccess=(%RemoteIP'?1(1"192.168.1."1.3N,1"92.103.129.165",1"212.103.4.85"))  || 1    ; blocked for all IP 
-	Else  If sDomVERW="SFS"  Set blnNoAccess=$$$Not($$$AccessTestPageDataOptSFS(%RemoteIP)||(%RemoteIP?1(1"192.168.1."1.3N)))
-	Else  If sDomVERW="LMC"  Set blnNoAccess=$$$Not($$$AccessTestPageDataOptLMC(%RemoteIP)||(%RemoteIP?1(1"192.168.1."1.3N)))  || 1    ; blocked for all IP 
-	Else  If sDomVERW="MBHO" Set blnNoAccess=$$$Not($$$AccessTestPageDataOptMBHO(%RemoteIP)||(%RemoteIP?1(1"192.168.1."1.3N)))
+	If (TestVERW'=sDomVERW) Set blnNoAccess=1
+	Else  If sDomVERW="SFS"  Set blnNoAccess=$$$Not($$$AccessTestPageDataOptSFS(%RemoteIP)||(%RemoteIP?1(1"192.168.1."1.3N,1"127.0.0.1")))
+	Else  If sDomVERW="LMC"  Set blnNoAccess=$$$Not($$$AccessTestPageDataOptLMC(%RemoteIP)||(%RemoteIP?1(1"192.168.1."1.3N,1"127.0.0.1")))  || 1    ; blocked for all IP 
+	Else  If sDomVERW="MBHO" Set blnNoAccess=$$$Not($$$AccessTestPageDataOptMBHO(%RemoteIP)||(%RemoteIP?1(1"192.168.1."1.3N,1"127.0.0.1")))
+	Else  If sDomVERW="HFLB" Set blnNoAccess=$$$Not($$$AccessTestPageDataOptHFLB(%RemoteIP)||(%RemoteIP?1(1"192.168.1."1.3N,1"127.0.0.1")))
 	Else  Set blnNoAccess=1
 	
+		d WLIP^vhDBG(97,"blnNoAccess="_blnNoAccess_"")
 	Set RefOut=Ref
 	If 'blnNoAccess Do
 	. Set %blnBuildRef=1
     . Set DataOpt=$G(%request.Data("DATAOPT",1))
-    . Set DataOptOut=$$OPTIMADecryptData^cspBasis.TBX.DecodeURL.tmpDev(DataOpt,.tmpAr,$S(sDomVERW="SFS":"SFS", sDomVERW="MBHO":"MBHO",1:"LMC"))
+    . Set DataOptOut=$$OPTIMADecryptData^cspBasis.TBX.DecodeURL.tmpDev(DataOpt,.tmpAr,$S(sDomVERW="SFS":"SFS", sDomVERW="MBHO":"MBHO", sDomVERW="HFLB":"HFLB", 1:"LMC"))
     . Kill %blnBuildRef
 	Set tmpTaal=$G(tmpAr("Taal"))
 	Set:(tmpTaal?1(1"N",1"F",1"E",1"D")) Taal=tmpTaal
@@ -148,6 +159,8 @@
 	. Set wsID=$G(%request.Data("WSID",1))
 	. Set sMode=$G(%request.Data("MODE",1))
  
+		d WLIP^vhDBG(97,"blnNoAccess="_blnNoAccess_"   DataOptOut="_$G(DataOptOut))
+ 
 	If (sDomVERW="SFS")&&(blnNoAccess) Do  Quit 1              ; Block access to this page.  Only enable it when requested
 	. ;Set blnNoAccess=1
 	. Set msg="TestPage voor SFS is geblokkeerd (/VHISIE/TBX/TestDataOptSFS.csp). "_$$$CRLF_"Toegang enkel mogelijk op aanvraag."_$$$CRLF
@@ -158,6 +171,11 @@
 	. Set msg="TestPage voor MBHO is geblokkeerd (/VHISIE/TBX/TestDataOptMBHO.csp). "_$$$CRLF_"Toegang enkel mogelijk op aanvraag."_$$$CRLF
 	. Do ophSendAlertMail^csp.vhisie.TBX.Main.tmpDev(msg)
 	. Do ophAddToLog("!TESTOPTMBHO!")
+	Else  If (sDomVERW="HFLB")&&(blnNoAccess) Do  Quit 1       ; Block access to this page.  Only enable it when requested
+	. ;Set blnNoAccess=1
+	. Set msg="TestPage voor HFLB is geblokkeerd (/VHISIE/TBX/TestDataOptHFLB.csp). "_$$$CRLF_"Toegang enkel mogelijk op aanvraag."_$$$CRLF
+	. Do ophSendAlertMail^csp.vhisie.TBX.Main.tmpDev(msg)
+	. Do ophAddToLog("!TESTOPTHFLB!")
 	Else  If blnNoAccess Do  Quit 1                            ; Block access to this page.  Only enable it when requested
 	. ;Set blnNoAccess=1
 	. Set msg="TestPage voor Optima is geblokkeerd (/VHISIE/TBX/TestDataOptLMC.csp). "_$$$CRLF_"Toegang enkel mogelijk op aanvraag."_$$$CRLF
@@ -172,19 +190,19 @@
 	. ;If $L($G(%request.Data("DATAOPT",1))) Do
 	. If $L(DataOpt) Do
 	..  Set DataOptCheck=DataOpt
-	..  Set EncDataOptOut=$$OPTIMAEncryptData^cspBasis.TBX.DecodeURL.tmpDev(DataOpt,$S(sDomVERW="SFS":"SFS", sDomVERW="MBHO":"MBHO", 1:"LMC"))
+	..  Set EncDataOptOut=$$OPTIMAEncryptData^cspBasis.TBX.DecodeURL.tmpDev(DataOpt,$S(sDomVERW="SFS":"SFS", sDomVERW="MBHO":"MBHO", sDomVERW="HFLB":"HFLB", 1:"LMC"))
 	..  ;Set EncDataOptOut=$system.Encryption.Base64Decode($TR(EncDataOptOut,"_-","+="))
 	..  If blnKeySteps Do ophOPTIMAIntermediates(DataOpt,sDomVERW)
 	. ;New Page,UrlTaal
 	. Set Page=$G(%request.Data("PAGE",1))
 	. Set UrlTaal=$G(%request.Data("URLTAAL",1))
 	. Set UrlOut=$S($L(Page):Page_"?REF="_EncRefOut_$S($L(UrlTaal):"&Taal="_UrlTaal,1:""), 1:"")
-	Do ophAddToLog($S(sDomVERW="LMC":"TESTOPTIMA", sDomVERW="SFS":"TESTOPTSFS", sDomVERW="MBHO":"TESTOPTMBHO", 1:"TESTDATAOPT"))
+	Do ophAddToLog($S(sDomVERW="LMC":"TESTOPTIMA", sDomVERW="SFS":"TESTOPTSFS", sDomVERW="MBHO":"TESTOPTMBHO", sDomVERW="HFLB":"TESTOPTHFLB", 1:"TESTDATAOPT"))
 	Quit 1
 ophOPTIMAIntermediates(Data,sDomVERW)
 	New OptimaKey,encData,Step1,Step2,Step3,Step4,Step2Hex
 	Quit:($G(Data)="") ""
-	Set OptimaKey=$S(sDomVERW="LMC":$$$OptimaKey, sDomVERW="SFS":$$$SfsOptKey, sDomVERW="MBHO":$$$MBHollandOptKey, 1:ERROR)
+	Set OptimaKey=$S(sDomVERW="LMC":$$$OptimaKey, sDomVERW="SFS":$$$SfsOptKey, sDomVERW="MBHO":$$$MBHollandOptKey, sDomVERW="HFLB":$$$HafeleBEOptKey, 1:ERROR)
 	Set Step1=Data
 	Set Step2=$system.Encryption.AESEncode(Step1,OptimaKey)
 	Set Step3=$TR($system.Encryption.Base64Encode(Step2),$$$CRLF,"")