Index: cspBasis/TBX/DecodeURL/tmpDev.mac.rou
===================================================================
diff -u -r2 -r18
--- cspBasis/TBX/DecodeURL/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 2)
+++ cspBasis/TBX/DecodeURL/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 18)
@@ -19,11 +19,18 @@
     Set Ref=$G(%request.Data("REF",1))
     Set blnSubmit=%request.IsDefined("SUBMIT")
 	Set RefNew=$S('$D(%request.Data):$$$RefStartNew, 1:"")
-	Set sDomain=$$GetURLDomain^cspBasis.Library
-	Set sDomCVT=$$TBXDomainCVT^cspBasis.Library(sDomain)
-	Set lbDomLU=##class(WS.TBX.Order).DomainLookUp(sDomCVT,$LB("VERW","KLNR"))   ; $$TBXDomainLU^cspBasis.Library(sDomCVT,$LB("VERW","KLNR"))
-	Set sDomVERW=$LG(lbDomLU,1)
-	Set sDomKLNr=$LG(lbDomLU,2)
+ 
+	Set TBXContext=##class(APPS.TBXWeb.TBXContext).InitFromHttpRequest()
+	Set sDomain=TBXContext.GeefHttpRequestDomein()
+	Set sDomCVT=TBXContext.GeefWebDomein()
+	Set sDomVERW=TBXContext.GeefDomeinVerwerker()
+	Set sDomKLNr=TBXContext.GeefDomeinKlantNummer()
+	Set lbDomLU=$LB(sDomVERW,sDomKLNr)
+	;Set sDomain=$$GetURLDomain^cspBasis.Library
+	;Set sDomCVT=$$TBXDomainCVT^cspBasis.Library(sDomain)
+	;Set lbDomLU=##class(WS.TBX.Order).DomainLookUp(sDomCVT,$LB("VERW","KLNR"))   ; $$TBXDomainLU^cspBasis.Library(sDomCVT,$LB("VERW","KLNR"))
+	;Set sDomVERW=$LG(lbDomLU,1)
+	;Set sDomKLNr=$LG(lbDomLU,2)
 	Set blnVHEPN=(sDomVERW="VHEPN")
 	Set blnHEIN=(sDomVERW="HEIN")
 	Set blnLMC=(sDomVERW="LMC")
@@ -32,6 +39,7 @@
 	Set blnHFLE=(sDomVERW="HFLE")
 	Set blnSFS=(sDomVERW="SFS")
 	Set blnMBHO=(sDomVERW="MBHO")
+	Set blnHFLB=(sDomVERW="HFLB")
  
     Set Flow=$S(blnSubmit:"SUBMIT", $L(Ref)||$L(RefNew):"REF", 1:"")
     Set (UrlOut,LoginState,PSW)=""
@@ -120,7 +128,7 @@
 	. If blnRedir  Set %session.Data("UserType")=UserType
 	. Else  Kill %session.Data("UserType")
 	
-	If (blnLMC||blnSFS||blnMBHO)&&($G(RefArray("KLNR"))'>0) Do
+	If (blnLMC||blnSFS||blnMBHO||blnHFLB)&&($G(RefArray("KLNR"))'>0) Do
 	. Set blnRedir=0
 	. Set LoginState="ERR"
 	
@@ -202,6 +210,7 @@
 	Set luSafe($$$TBoxWebDomeinMBHO,"MBHO","ENC")="meubelgeheimMBHO"
 	Set luSafe($$$TBoxWebDomeinMBHO,"VHEPN","PSW")="auftrage"   ; "pwd4682VH"
 	Set luSafe($$$TBoxWebDomeinMBHO,"VHEPN","ENC")="meubelgeheimMBHO"
+	Set luSafe($$$TBoxWebDomeinHFLB,"?","?")=""   ; Wordt niet meer aangevuld, want wordt nauwelijks nog gebruikt 
 	; luTBX
 	; Temporary copied local values from (class(WS.TBX.Order).DomaimLookup/cdtFillArrayLU):
 	Set luTBX("www.tandem-box.com","UserType","VHEPN")=$$$utVerwAdmin
@@ -222,12 +231,14 @@
 	Set luTBX("demo.sfsunimarket.biz","UserType","SFS")=$$$utVerwDomain
 	Set luTBX($$$TBoxWebDomeinMBHO,"UserType","VHEPN")=$$$utVerwAdmin
 	Set luTBX($$$TBoxWebDomeinMBHO,"UserType","MBHO")=$$$utVerwDomain
+	Set luTBX($$$TBoxWebDomeinHFLB,"UserType","VHEPN")=$$$utVerwAdmin
+	Set luTBX($$$TBoxWebDomeinHFLB,"UserType","HFLB")=$$$utVerwDomain
 	Quit
 ophGetUserType(KLNr,Domain,Verw,Mode)
 #If $$$NSpace="xDEMO" 
 	Quit:(Mode="A") $S(1:$$$utKlantAnon)
 #Else
-	Quit:(Mode="A") $S(blnHEIN||blnDUPO||blnHELMY||blnHFLE:$$$utKlantAnonWP, KLNr>0:$$$utKlantKnown, 1:$$$utKlantAnon)   ; blnLMC,blnSFS,blnMBHO : $$$utKlantKnown 
+	Quit:(Mode="A") $S(blnHEIN||blnDUPO||blnHELMY||blnHFLE:$$$utKlantAnonWP, KLNr>0:$$$utKlantKnown, 1:$$$utKlantAnon)   ; blnLMC,blnSFS,blnMBHO, : $$$utKlantKnown 
 #EndIf
 	Quit:(Mode="W") $$ophGetVERWType(Domain,Verw)
 	Quit:(Mode="P") $$$utKlantAnon                        ; Temporary: fixed value
@@ -355,7 +366,7 @@
 	New OptimaKey,Data
 	Kill arData
 	Quit:($G(encData)="") ""
-	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)
 	If ($G(%blnBuildRef))&&($$$NotEncrypted(encData))  Set Data=encData
 	Else  Set Data=$$ophDecryptHashedRef(encData,OptimaKey)
 	Do OPTIMAAnalyseCommon(.Data,,.encData)
@@ -397,6 +408,6 @@
 OPTIMAEncryptData(Data,sDomVERW)
 	New OptimaKey,encData
 	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 encData=$$ophEncryptRefHashed(Data,.OptimaKey)
 	Quit encData
\ No newline at end of file