Index: _vhisie/TBX/Header.csp
===================================================================
diff -u -r757 -r1571
--- _vhisie/TBX/Header.csp	(.../Header.csp)	(revision 757)
+++ _vhisie/TBX/Header.csp	(.../Header.csp)	(revision 1571)
@@ -65,11 +65,11 @@
 			<TD width="15px">&nbsp;</TD>
 		</TR>
 	</table>
-<CSP:ELSEIF condition='sDomVERW="HFLE"'>             <!-- HAEFELE (NL) -->
+<CSP:ELSEIF condition='sDomVERW="HFLE"'>             <!-- HAEFELE (NL)   - OPGELET: ER IS OOK EEN Hafele BELGIE !!!   -->
 	<table border="0" width="740" height="50" cellpadding="0" cellspacing="0" style="border-collapse:collapse;">
  		<TR height="50" valign="middle">
 			<TD width="15px">&nbsp;</TD>
-			<TD width="25%" align="left"><a href="http://www.hafele.nl" target="_blank"><img src="media/LogoHafele_Trans.gif" border="0"></a></TD>
+			<TD width="25%" align="left"><a href="http://www.hafele.nl" target="_blank"><img src="media/LogoHafeleNL_Trans.gif" border="0"></a></TD>
 			<TD width="">&nbsp;</TD>
 			<TD width="30%" align="center"><img src="#(imgTBoxLogo)#"></TD>
 			<TD width="">&nbsp;</TD>
@@ -101,6 +101,18 @@
 			<TD width="15px">&nbsp;</TD>
 		</TR>
 	</table>
+<CSP:ELSEIF condition='sDomVERW="HFLB"'>             <!-- HAEFELE (BE)   - OPGELET: ER IS OOK EEN Hafele NEDERLAND !!!    -->
+	<table border="0" width="740" height="50" cellpadding="0" cellspacing="0" style="border-collapse:collapse;">
+ 		<TR height="50" valign="middle">
+			<TD width="15px">&nbsp;</TD>
+			<TD width="25%" align="left"><a href="http://www.hafele.be" target="_blank"><img src="media/LogoHafeleBE_Trans.gif" border="0"></a></TD>
+			<TD width="">&nbsp;</TD>
+			<TD width="30%" align="center"><img src="#(imgTBoxLogo)#"></TD>
+			<TD width="">&nbsp;</TD>
+			<TD width="25%" align="right" valign="bottom"><A href="#(UrlHowTo)#" target="winInfoPage" onclick="WindowFocus('winInfoPage');" class="clsInfo">#(..WebTextValue("Help",Taal,"L"))#</A></TD>
+			<TD width="15px">&nbsp;</TD>
+		</TR>
+	</table>
 <!--<CSP:ELSEIF condition="sDomKLNr=">             <!- -  - ->
     Verwerker:   -->
 <CSP:ELSE>                                     <!-- (default) VAN HOECKE -->
Index: BL/PR/GA/TB/tmpDev2.mac.rou
===================================================================
diff -u -r1358 -r1571
--- BL/PR/GA/TB/tmpDev2.mac.rou	(.../tmpDev2.mac.rou)	(revision 1358)
+++ BL/PR/GA/TB/tmpDev2.mac.rou	(.../tmpDev2.mac.rou)	(revision 1571)
@@ -428,6 +428,8 @@
 	Quit:(sDomVERW="HFLE" ) $P($$KLANTPR^KPRIJS(KLNrPrs,GenPRNr,,$J(KPrijsVH,0,2)),"\",$$$PcLijstPrs)
 	Quit:(sDomVERW="HELMY") $P($$KLANTPR^KPRIJS(KLNrPrs,GenPRNr,,$J(KPrijsVH,0,2)),"\",$$$PcLijstPrs)
  
+	Quit:(sDomVERW="HFLB" ) $P($$KLANTPR^KPRIJS(KLNrPrs,GenPRNr,,$J(KPrijsVH,0,2)),"\",$$$PcLijstPrs)
+ 
 	// BENELUX handels met korting, i.e. met klantinfo 
 	New HandelVKPrijs,KPrijsData,HandelVKPrijs
 	If (sDomVERW="MBHO") {
Index: cspBasis/TBX/DecodeURL/tmpDev.mac.rou
===================================================================
diff -u -r1155 -r1571
--- cspBasis/TBX/DecodeURL/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 1155)
+++ cspBasis/TBX/DecodeURL/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 1571)
@@ -32,6 +32,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 +121,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 +203,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 +224,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 +359,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 +401,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
Index: cspBasis/GAProdDfls.cls.xml
===================================================================
diff -u -r1358 -r1571
--- cspBasis/GAProdDfls.cls.xml	(.../GAProdDfls.cls.xml)	(revision 1358)
+++ cspBasis/GAProdDfls.cls.xml	(.../GAProdDfls.cls.xml)	(revision 1571)
@@ -107,7 +107,7 @@
 <Method name="Init">
 <FormalSpec>KLNr:%String,sDomVERW:%String,DCM:%String,Taal:%String="",lbAllowVPK:%List=""</FormalSpec>
 <Implementation><![CDATA[
-	#define TaalDfl   $S(sDomVERW="HEIN":"D", sDomVERW="LMC":"F", sDomVERW="SFS":"D", 1:"N")
+	#define TaalDfl   ##class(APPS.TBXWeb.XXXContext).GeefDefaultTaalVoorVerwerker(sDomVERW)
 
 	Set ..KLNr=KLNr
 	Set ..sDomVERW=sDomVERW
Index: csp/vhisie/TBX/Main/tmpDev.mac.rou
===================================================================
diff -u -r1410 -r1571
--- csp/vhisie/TBX/Main/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 1410)
+++ csp/vhisie/TBX/Main/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 1571)
@@ -11,10 +11,8 @@
  
 OnPreHTTP()
 #define CSPPage          ##class(%CSP.Page)
-#define TaalDfl          $S(blnHEIN:"D", blnLMC:"F", blnSFS:"D", 1:"N")
-#define VerwHasAccess    (VERW="VHEPN")||('blnVHEPN&&(VERW=sDomVERW))
  
-	New Ref,RefNew,RefArray,tmpRq,tmpTransfStatus,tmpBadQS,blnValidKlant
+	New Ref,RefNew,RefArray,tmpRq,tmpTransfStatus,tmpBadQS,blnValidKlant,DefaultTaal
 	Set %RemoteIP=$G(%request.CgiEnvs("REMOTE_ADDR"))
 	Set %ClientIP=%RemoteIP   ; IP voor DebugWindow 
 	
@@ -25,15 +23,19 @@
 	Kill %session.Data
 	  ;d:($D(tmpTransfStatus)) WL^vhDBG("tmpTransfStatus: "_tmpTransfStatus)
 	Set:($D(tmpTransfStatus)) %session.Data("TransfStatus")=tmpTransfStatus
-	//   URL --> domain / 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 TBXContext=##class(APPS.TBXWeb.XXXContext).InitFromHttpRequest()
+	Set sDomain=TBXContext.GeefHttpRequestDomein()
+	Set sDomCVT=TBXContext.GeefWebDomein()
+	Set sDomVERW=TBXContext.GeefDomeinVerwerker()
+	Set sDomKLNr=TBXContext.GeefDomeinKlantNummer()
+	
 	Set Taal="E"
-	Set blnNoAccess=(sDomVERW="")   ; ONBEKEND DOMEIN - NIET TOEGELATEN !!!
+	Set DefaultTaal=TBXContext.GeefDefaultTaal()
+	;Set blnNoAccess=(sDomVERW="")   ; ONBEKEND DOMEIN - NIET TOEGELATEN !!!
+	Set blnNoAccess=TBXContext.IsOngeldigDomein()   ; ONBEKEND DOMEIN - NIET TOEGELATEN !!!
 	Quit:(blnNoAccess) 1
+	
 	Set blnVHEPN=(sDomVERW="VHEPN")
 	Set blnHEIN=(sDomVERW="HEIN")
 	Set blnLMC=(sDomVERW="LMC")
@@ -42,7 +44,8 @@
 	Set blnHFLE=(sDomVERW="HFLE")
 	Set blnSFS=(sDomVERW="SFS")
 	Set blnMBHO=(sDomVERW="MBHO")
-	Set Taal=$G(%request.Data("Taal",1),$$$TaalDfl)
+	Set blnHFLB=(sDomVERW="HFLB")
+	Set Taal=$G(%request.Data("Taal",1),DefaultTaal)
 	If ($$$LCase(Taal)?1"http:".E) Do   ; attempt to hack the website
 	. Set tmpBadQS="Taal="_Taal
 	. Set Taal="E"
@@ -53,7 +56,7 @@
 	;Set MainMode=$G(MainMode,$$$mmAllowTogether)
     Set Ref=$G(%request.Data("REF",1))
 	Set RefNew=$G(%request.Data("REF",1),$$$RefStartNew)   ; Als REF niet meegegeven is, StartNew (dfl) gebruiken
-	Set %session.Data("BeursUser")=(blnVHEPN)&&##class(cspBasis.GAProdTBox).IsBeursUser()
+	Set %session.Data("BeursUser")=(TBXContext.IsDomeinVHEPN())&&##class(cspBasis.GAProdTBox).IsBeursUser()
 	If 1,($$$LCase(Ref)?1"http:".E) Do   ; attempt to hack the website
 	. Set tmpBadQS="Ref="_Ref
 	
@@ -68,12 +71,13 @@
     ;Set:(Ref="")&&($L(RefNew)) Ref=RefNew
     If $L(Ref) Do
     . Do ophRefToArray^cspBasis.TBX.DecodeURL.tmpDev(Ref,.RefArray)
-    . Set:($G(RefArray("VERW"))="") RefArray("VERW")=sDomVERW
+    . Set:($G(RefArray("VERW"))="") RefArray("VERW")=TBXContext.GeefDomeinVerwerker()
     . Set VERW=RefArray("VERW")
 	. Set KLNr=$G(RefArray("KLNR"))
 	. Set wsID=$G(RefArray("WSID"))
 	. 
-	. Quit:($$$Not(blnLMC||blnSFS||blnMBHO))
+	. Quit:($$$Not(TBXContext.KlantGegevensViaDataOpt()))   ; :($$$Not(blnLMC||blnSFS||blnMBHO))
+	. 
 	. ; Alleen voor OPTIMA / SFS --> KlantNr from Data/Storage
 	. If $L($G(KLNrOptima)) Do
 	. . Set KLNr=KLNrOptima
@@ -83,7 +87,7 @@
 	. . Kill tmpRq("DATAOPT")
 	. . ;Do ophBuildSwitchTLArray   ; Once again, but with the NEW QueryString-values 
 	. Else  If ($IsValidNum(KLNr))&&($G(%request.Data("Taal",1))="") Do
-	. . Set KLMini=##class(cspBasis.GAProdTBox).GetKlantData(sDomVERW,KLNr,$LB("Stg","NoAction"))
+	. . Set KLMini=##class(cspBasis.GAProdTBox).GetKlantData(TBXContext.GeefDomeinVerwerker(),KLNr,$LB("Stg","NoAction"))
 	. . Set:($IsObject(KLMini))&&(KLMini.Taal?1(1"N",1"F",1"E",1"D")) Taal=KLMini.Taal
 	. . Set KLMini=""
  	Else  Do
@@ -102,7 +106,7 @@
 	. Set KLNr=$G(KLNr)
 	. Set sMode=$G(sMode,"START")
 	. Set wsID=$G(wsID)
-	. Set VERW=$G(sDomVERW,sDomVERW)
+	. Set VERW=TBXContext.GeefDomeinVerwerker()   ; $G(VERW,sDomVERW)
 	. Do ophAddToLog("!MAINPAGE!")
 	. Set msg="Invalid request URL parameter."_$$$CRLF_"Bad QueryString: "_tmpBadQS_$$$CRLF_"Ref="_$G(%request.Data("REF",1))_$$$CRLF_"Taal="_$G(%request.Data("Taal",1))_$$$CRLF_"!!! Page blocked - No access !!!"
 	. Do ophSendAlertMail(msg)
@@ -118,7 +122,7 @@
 		Do ophSendAlertMail(msg)
 	}
  
-	Set:($G(VERW)="") VERW=sDomVERW
+	Set:($G(VERW)="") VERW=TBXContext.GeefDomeinVerwerker()
 	Kill arShow
 	; Analyse REF (part 2)
 	Set blnNoAccess=0
@@ -143,7 +147,7 @@
  
 	If $$$IsRecentBrowser(%request.UserAgent) Do   ; Added by WimV on 28/03/2011 
 	. Set %session.BrokerImplementation=2          ; use XMLHTTPRequest method 
-	
+ 
 	If 'blnAllowedBrowser Do
 	. Set blnNoAccess=1
 	. New sUserAgent
@@ -167,12 +171,11 @@
 	. Set NoAccessMsg=NoAccessMsg_$$$CRLF_"&nbsp; Please use ""<B>Internet Explorer</B>"", ""<B>Firefox v3</B>"" or ""<B>Opera</B>"" as web browser."
 	. Do ophAddToLog("!MAINPAGE!")
 	. 
-	. 
-	Else  If (blnLMC||blnSFS||blnMBHO)&&($L($G(%request.Data("DATAOPT",1))))&&($G(KLNrOptima)="") Do   ; Bad encryption for Optima/SFS customer 
+	Else  If (TBXContext.KlantGegevensViaDataOpt())&&($L($G(%request.Data("DATAOPT",1))))&&($G(KLNrOptima)="") Do   ; Bad encryption for Optima/SFS customer 
 	. Set blnNoAccess=1
 	. Do ophAddToLog("!MAINPAGE!")
 	Quit:(blnNoAccess) 1
-	Set blnNoAccess=$$$Not($$$VerwHasAccess)
+	Set blnNoAccess=$$$Not(TBXContext.IsVerwerkerToegelaten(VERW))
 	Quit:(blnNoAccess) 1
 	Do ophAnalyseWSOrdKLNr(WSOrd,KLNr,.blnNoAccess,.NoAccessMsg)   ; andere parameters globaal doorgeven
 	Set:($L($G(NoAccessMsg)))&&(sMode'="PROCESS") NoAccessMsg=""   ; Enkel tonen indien sMode="PROCESS"
@@ -189,7 +192,7 @@
 	Do ##class(cspBasis.GAProdTBox).AddToLog(Actie,sDomain,KLNr,sMode,wsID,VERW,Taal,"",lbExtras)   ; Actie="MAINPAGE"
 	Quit
 ophWebSiteBlocked()
-	If '$$AppIsEnabled^cspBasis.Library("WWW-TBX","MAIN"_$S(blnSFS:"-SFS",1:""),%RemoteIP) Do  Quit 1
+	If '$$AppIsEnabled^cspBasis.Library("WWW-TBX","MAIN"_$S(TBXContext.IsDomeinSFS():"-SFS",1:""),%RemoteIP) Do  Quit 1
 	. Set KLNr=$G(KLNr), sMode=$G(sMode), wsID=$G(wsID), VERW=$G(VERW)
 	. Do ophAddToLog("#MAINPAGE#")
 	. Do RedirectPage^cspBasis.Library("/Under_Construction.htm")
@@ -210,19 +213,20 @@
 	Set:($IsObject(WSLn))&&(##class(BL.PR.GA.TandemBox).DesignCodeFromDS(WSLn.ItemDS)="I") HeaderLogo=""   ; "I" 
 	Quit
 ophDataOPTIMA
-	Quit:(sDomVERW'?1(1"LMC",1"SFS",1"MBHO"))
+	Quit:('TBXContext.KlantGegevensViaDataOpt())
 	Quit:($G(%request.Data("DATAOPT",1))="")
 	;Quit:(sDomVERW'="LMC")||($G(%request.Data("DATAOPT",1))="")
-	New KLMini,tmpTaal,msg
+	New KLMini,tmpTaal,msg,sDomVERW
 	Kill %OptimaMsg
-	Set KLMini=##class(cspBasis.GAProdTBox).GetKlantData(sDomVERW,"",$LB("Ext","CleanSave"))
+	Set KLMini=##class(cspBasis.GAProdTBox).GetKlantData(TBXContext.GeefDomeinVerwerker(),"",$LB("Ext","CleanSave"))
 	; In case of "Bad Encryption", try getting KLData from storage
 	If '$IsObject(KLMini) Do   
 	. Set KLNr=$G(%OptimaVar("KLNr"))
-	. Set:($IsValidNum(KLNr)) KLMini=##class(cspBasis.GAProdTBox).GetKlantData(sDomVERW,KLNr,$LB("Stg","NoAction"))
+	. Set:($IsValidNum(KLNr)) KLMini=##class(cspBasis.GAProdTBox).GetKlantData(TBXContext.GeefDomeinVerwerker(),KLNr,$LB("Stg","NoAction"))
+	. Set sDomVERW=TBXContext.GeefDomeinVerwerker()
 	. Set msg="WARNING : Bad encryption for "_$S(sDomVERW="LMC":"Optima",1:sDomVERW)_" customer (n� "_$G(KLNr)_")"
 	. Set msg=msg_$$$CRLF_"Ref            : "_($$ophGetRef^cspBasis.TBX.DecodeURL.tmpDev(Ref))_$$$CRLF_"Enc. Data      : "_$G(%OptimaVar("EncData"))_$$$CRLF_"Decrypted Data : "_$G(%OptimaVar("Data"))_$$$CRLF_"KLNr via Lookup: "_$G(%OptimaVar("KLNrViaLookup"))
-	. Set msg=msg_$$$CRLF_"Client IP      : "_$G(%RemoteIP)_$S($G(%RemoteIP)?1(1"92.103.129.165",1"212.103.4.85"):" (Optima)", 1:"")
+	. Set msg=msg_$$$CRLF_"Client IP      : "_$G(%RemoteIP)_$S(TBXContext.IsIPvanOptima($G(%RemoteIP)):" (Optima)", 1:"")
 	. Set msg=msg_$$$CRLF_$$$CRLF_"Data retrieved from storage: "_$S($IsObject(KLMini):"YES", 1:"NO")
 	. Do ophSendAlertMail(msg_$$$CRLF,$S($IsObject(KLMini):$LB("ICT_Meldingen@vanhoecke.be"), 1:$LB("wv@vanhoecke.be")))
 	. Set KLNr=$S($IsObject(KLMini):KLMini.Nummer, 1:"")
@@ -231,7 +235,7 @@
 	. Set KLNrOptima=KLMini.Nummer
 	. Set tmpTaal=KLMini.Taal
 	Else  Do
-	. Set blnShow=$$$OptimaAccess
+	. Set blnShow=TBXContext.HeeftToegangTotFixOptimaPage($G(%RemoteIP))   ; $$$OptimaAccess
 	. Do MShowFixOptima(blnShow)
 	Set:($G(tmpTaal)?1(1"N",1"F",1"E",1"D")) Taal=tmpTaal
 	Set KLMini=""
@@ -270,35 +274,35 @@
 	Set arValues("WSOrder","ID")=WSOrd.%Id()
 	Set arValues("WSOrder","IngaveTS")=WSOrd.IngaveTijdStip
 	Set arValues("REF","Domain")=sDomain
-	Set arValues("REF","DomVERW")=sDomVERW_"  ("_sDomKLNr_")"
+	Set arValues("REF","DomVERW")=TBXContext.GeefDomeinVerwerker()_"  ("_TBXContext.GeefDomeinKlantNummer()_")"
 	Set arValues("REF","KLNr")=MatchKLNr
 	Set arValues("REF","WSID")=wsID
 	Set arValues("REF","MODE")=sMode
 	Set arValues("REF","VERW")=VERW
 	Set arValues("REF","RqData")=$G(%request.Data("REF",1))
 	Set arValues(1,"ClientIP")=$G(%RemoteIP)
 	Set arValues(1,"blnHist")=$G(blnHist)
-	 ;d WL^vhDBG($$$LCVT($LB(WSOrd.WebDomain,$$TBXDomainCVT^cspBasis.Library(WSOrd.WebDomain),OrdDomVERW,sDomVERW)))
-	If sDomVERW'=OrdDomVERW Do  Quit 0
+	 ;d WL^vhDBG($$$LCVT($LB(WSOrd.WebDomain,$$TBXDomainCVT^cspBasis.Library(WSOrd.WebDomain),OrdDomVERW,TBXContext.GeefDomeinVerwerker())))
+	If TBXContext.GeefDomeinVerwerker()'=OrdDomVERW Do  Quit 0
 	. // Onbekend of foutief domein - GEEN TOEGANG !!!    WSOrder moet steeds binnen WebDomein blijven !!!
 	. Set arValues(0,"ERROR")="Onbekend of foutief domein"
 	; Else   ; ==> sDomVERW=OrdDomVERW
 	Quit:(%RemoteIP?1(1"192.168.1.")1.3N)&&(MatchKLNr=1000) 1
 	Set OrdKLNr=WSOrd.KLNummer
 	Set blnOK=0
-	If blnVHEPN Do  Quit blnOK
+	If TBXContext.IsDomeinVHEPN() Do  Quit blnOK
 	. If OrdKLNr>0 Do
 	. . Set blnOK=$S(MatchKLNr>0:(OrdKLNr=MatchKLNr),1:(sMode="PROCESS")&&(VERW="VHEPN"))
 	. Else  Do   ; OrdKLNr=""
 	. . Set blnOK=$S(MatchKLNr>0:((sMode="PROCESS")&&(VERW="VHEPN")), 1:1)
 	. Set arValues(0,"ERROR")="KlantNummers komen niet overeen."
-	Else  If blnLMC||blnSFS||blnMBHO Do  Quit blnOK
+	Else  If TBXContext.KlantGegevensViaDataOpt() Do  Quit blnOK
 	. Set blnOK=(OrdKLNr=MatchKLNr)||(MatchKLNr="")
 	. Set arValues(0,"ERROR")="KlantNummers komen niet overeen."
-	Else  If blnHEIN Do  Quit blnOK
+	Else  If TBXContext.IsDomeinHEIN() Do  Quit blnOK
 	. Set blnOK=(OrdKLNr=MatchKLNr)
 	. Set arValues(0,"ERROR")="KlantNummers komen niet overeen."
-	Else  If blnHELMY||blnHFLE||blnDUPO Do  Quit blnOK
+	Else  If TBXContext.AlleenToegangZonderLogin() Do  Quit blnOK
 	. Set blnOK=(OrdKLNr=MatchKLNr)
 	. Set arValues(0,"ERROR")="KlantNummers komen niet overeen."
 	; Else
@@ -432,8 +436,8 @@
 	Do ophBuildToggleHistAndOrder()
 	Quit
 MShowNotRegUser
-	Set arShow("NotRegUserInfo","INFO")=((blnVHEPN)&&(KLNr=""))
-	Set arShow("NotRegUserInfoOPTIMA","INFO")=((blnLMC||blnSFS||blnMBHO)&&(KLNr=""))   ; &&('$D(%session.Data("DA TAOPT"))))
+	Set arShow("NotRegUserInfo","INFO")=(TBXContext.IsDomeinVHEPN())&&(KLNr="")
+	Set arShow("NotRegUserInfoOPTIMA","INFO")=(TBXContext.KlantGegevensViaDataOpt())&&(KLNr="")   ; &&('$D(%session.Data("DA TAOPT"))))
 	Quit
 ophMMComplete
 	New WSOrd,blnDynaplugERR
@@ -443,7 +447,7 @@
 	Set arShow("DisplayOrder","DTL")=$IsObject(WSOrd)
 	Do MShowKnownCustomer(1)
 	; Info BrutoPrijsHein / NotRegUserInfo
-	Set arShow("BrutoPrijsHein","INFO")=(blnHEIN)
+	Set arShow("BrutoPrijsHein","INFO")=(TBXContext.IsDomeinHEIN())
  
 	Set blnDynaplug=($IsObject(WSOrd))&&(WSOrd.WebURL="DYNAPLUG IMPORT") 
 	If blnDynaplug Do
@@ -469,7 +473,7 @@
 	; Button BookmarkPage
 	Do MShowBookmarkPage('$IsValidNum(KLNr),WSOrd)
 	; Button Show XML
-	Do MShowExportXML((blnVHEPN)&&((KLNr=$$$TBoxWebKlantNrVHEPN)||(KLNr=$$$TBoxWebKlantNrHEIN)) )
+	Do MShowExportXML((TBXContext.IsBeschikbaarExportXML())&&((KLNr=$$$TBoxWebKlantNrVHEPN)||(KLNr=$$$TBoxWebKlantNrHEIN)) )
 	; Button Submit
 	Do MShowSubmit(1,WSOrd,blnOFFVervallen||blnDynaplugERR)
 	; Button Modify Order
@@ -510,7 +514,7 @@
  
 ophMMProcess
 	New WSOrd,blnProcessVH,blnQuit,blnAllowBulk
-	Set blnProcessVH=(blnVHEPN)||(VERW="VHEPN")
+	Set blnProcessVH=(TBXContext.IsDomeinVHEPN())||(VERW="VHEPN")
 	If blnProcessVH Do  Quit:($G(blnQuit,0))
 	. Set blnQuit=$$ophMMProcessFlowVHEPN
 	;Else : prepare buttons/info 
@@ -524,10 +528,10 @@
 	Do MShowVervaldagOFFText
 	; Positie van de tekst t.o.v. de buttons
 	Set TextPos="RIGHT"   ; $S($IsObject(WSOrd)&&(WSOrd.IsSubmitted()):"LEFT", 1:"RIGHT")
-	Set lbBulkConfig=##class(cspBasis.GAProdTBox).GetKlantBulk(sDomVERW,KLNr)
+	Set lbBulkConfig=##class(cspBasis.GAProdTBox).GetKlantBulk(TBXContext.GeefDomeinVerwerker(),KLNr)
 	Set blnAllowBulk=($LG(lbBulkConfig,1)'="")&&($LG(lbBulkConfig,1)'="S")
 	; Button SwitchToViewMode
-	Do MShowSwitchToViewMode(('blnVHEPN)&& 1)   ; &&(WSOrd.BonType="INKP")
+	Do MShowSwitchToViewMode(('TBXContext.IsDomeinVHEPN())&& 1)   ; &&(WSOrd.BonType="INKP")
 	; Button PrintPage
 	Do MShowPrintPage(1)  ;VERW="VHEPN")
 	; Button Show XML
@@ -539,7 +543,7 @@
 	; Button Process  -->  SubmitToVHEPN / SubmitToAdmin)
 	If blnProcessVH Do
 	. ; Button SubmitToAdmin
-	. Do:(%RemoteIP?1"192.168.".E) MShowSubmitAdminVerw(blnVHEPN||(VERW="VHEPN"),WSOrd)
+	. Do:(%RemoteIP?1(1"192.168.".E,1"127.0.0.1")) MShowSubmitAdminVerw(TBXContext.IsDomeinVHEPN()||(VERW="VHEPN"),WSOrd)
 	. ; Button ChangeBulk
 	. Set arShow("ChangeBulk","BTN")=(%RemoteIP?1"192.168.".E)
 	. If arShow("ChangeBulk","BTN") Do
@@ -550,7 +554,7 @@
 	. ;. Set arShow("ChangeBulk","BTN")=1
 	Else  Do
 	. ; Button SubmitToVHEPN
-	. Do MShowSubmitToVHEPN(sDomVERW'?1(1"VHEPN",1"HEIN",1"LMC"),WSOrd)   ; ,1"SFS"
+	. Do MShowSubmitToVHEPN(TBXContext.SubmitToVHviaCspPage(),WSOrd)
 	. ; URL voor overzichtslijst AANKOOP:
 	. ;  - http://www.tandem-box.com/VHISIE/TBX/Main.csp?Taal=N&HIST=1&REF=qF8LH5lEjVrpq_S/iFYEjapyttl87p0Y2mRRqi9B3i4-
 	. ;  - http://tbx.destil.nl/VHISIE/TBX/Main.csp?Taal=N&HIST=1&REF=_KoQNXLGoSL1UjEAean5dapyttl87p0Y2mRRqi9B3i4-
@@ -588,7 +592,7 @@
 	. . 
 	. 
 	. Do ophOrdToAdminSetSesData
-	. Set OFFToAdmin=$S(sDomVERW?1(1"VHEPN",1"HEIN",1"LMC"):"BBON", 1:"INKP")   ; Set:(WSOrd.BonType="OFF") ...
+	. Set OFFToAdmin=$S('TBXContext.StatusInkoopAlsOrderToVH():"BBON", 1:"INKP")   ; Set:(WSOrd.BonType="OFF") ...
 	. Set blnBusy=##class(WS.TBX.Order).TransfStatusCheckBusy(wsID)
 	. If (blnBusy) Do  Quit   ; ($G(%session.Data("TransfStatus"))'="")
 	. .  ;d WL^vhDBG("Msg: transfert not allowed. status="_$G(%session.Data("TransfStatus")))
@@ -621,7 +625,7 @@
 	Quit:('$IsObject(WSOrd))
 	; Show Order Details
 	Set arShow("DisplayOrder","DTL")=$IsObject(WSOrd)
-	Set arShow("BrutoPrijsHein","INFO")=(blnHEIN)
+	Set arShow("BrutoPrijsHein","INFO")=(TBXContext.IsDomeinHEIN())
 	Do MShowVervaldagOFFText
 	; Button PrintPage
 	Do MShowPrintPage(1)
@@ -640,39 +644,37 @@
 	Set sMode=$LG(lbRefNew,4,$G(tmpRefAr("MODE")))
 	Merge tmpRq=%request.Data
     Kill tmpRq("CSPToken")
-    Kill:(blnLMC||blnSFS||blnMBHO) tmpRq("DATAOPT")
+    Kill:(TBXContext.KlantGegevensViaDataOpt()) tmpRq("DATAOPT")
 	Kill tmpRq("HIST")
 	Kill tmpRq("REF")
 	Set tmpRq("REF")=$$CreateHashedRef^cspBasis.TBX.DecodeURL.tmpDev($LB(KLNr,VERW,wsID,sMode))
 	Set QS=##class(cspBasis.GAProdTBox).CQueryString(.tmpRq)   ; $$$CSPPage.Link("Main.csp",.tmpRq)
 	Quit $TR($TR($system.Encryption.Base64Encode(QS),$$$CRLF,""),"+=","_-")
 ophAlgVoorw
-	Quit:(blnLMC||blnDUPO||blnHELMY||blnHFLE||blnMBHO)
+	Quit:('TBXContext.ToonAlgemeneVoorwaarden())
 	New Intern,VTL
-	Set Intern="AlgVoorw"_$CASE(sDomVERW, "HEIN":"HEIN", "SFS":"SFS", :"VH")
+	Set Intern="AlgVoorw"_$CASE(TBXContext.GeefDomeinVerwerker(), "HEIN":"HEIN", "SFS":"SFS", :"VH")
 	Set arShow("AlgVoorw","INFO")=##class(cspBasis.GAProdTBox).WebTextValue(Intern,Taal,"L")
 	Quit
 ophOrdToAdminSetSesData
-	Set %session.Data("DOMAIN")=sDomCVT
+	Set %session.Data("DOMAIN")=sDomCVT   ; TBXContext.GeefWebDomein() 
 	Set %session.Data("VERW")=VERW
 	Set %session.Data("KLNR")=KLNr
 	Set %session.Data("WSID")=wsID
 	Set %session.Data("MODE")=sMode
 	Quit
 	
 MShowNewOrder(Visible)
-	Quit:((blnLMC)&&(KLNr'>0))
-	Quit:((blnSFS)&&(KLNr'>0))
-	Quit:((blnMBHO)&&(KLNr'>0))
-	Quit:(KLNr=$$$KLNrListAll)&&($$$Not((sDomVERW?1(1"HFLE",1"HELMY",1"DUPO"))&&(sMode="START")))
+	Quit:((TBXContext.AlleenToegangMetLogin())&&(KLNr'>0))
+	Quit:(KLNr=$$$KLNrListAll)&&($$$Not((sMode="START")&&(TBXContext.AlleenToegangZonderLogin())))
 	Quit:('$G(blnValidKlant,1))
 	New tmpAr
 	Merge tmpAr=tmpRq
 	Kill tmpAr("HIST")
 	Kill tmpAr("REF")
 	Set tmpAr("REF")=$$CreateHashedRef^cspBasis.TBX.DecodeURL.tmpDev($LB($S(KLNr=$$$KLNrListAll:"", 1:KLNr),VERW,,"A"))
 	Set tmpAr("REFMN")=$$ophBuildQS($S(KLNr=$$$KLNrListAll:$LB(""),1:$LB())_$LB(,,"COMPLETE"))   ; Create REFMN (to pass to Wizard.csp)
-    Kill:(blnLMC||blnSFS||blnMBHO) tmpAr("DATAOPT")
+    Kill:(TBXContext.KlantGegevensViaDataOpt()) tmpAr("DATAOPT")
 	Set arShow("NewOrder","BTN")=Visible
 	  ;d WL^vhDBG("NewOrder tmpAr:"_$$$ArrayTT("tmpAr"))
 	Set arShow("NewOrder","HREF")="Access.csp?"_##class(cspBasis.GAProdTBox).CQueryString(.tmpAr)
@@ -711,7 +713,7 @@
 	Kill tmpAr("HIST")
 	Kill tmpAr("REF")
 	Set tmpAr("REF")=$$CreateHashedRef^cspBasis.TBX.DecodeURL.tmpDev($LB(KLNr,VERW,wsID,"P"))
-	Set blnShowAKP=(sMode="PROCESS")&&('blnVHEPN)&&(VERW'?1(1"HEIN",1"LMC"))
+	Set blnShowAKP=(sMode="PROCESS")&&('TBXContext.IsDomeinVHEPN())&&(VERW'?1(1"HEIN",1"LMC"))
 	Set %session.Data("ALLOWAKP")=blnShowAKP
 	Set:(blnShowAKP) tmpAr("SHAKP")=1
 	If $L($G(Taal)) Do
@@ -745,7 +747,7 @@
 	Set tmpAr("Taal")=Taal
 	Set tmpAr("KLNR")=KLNr
 	Set tmpAr("WSID")=wsID
-	Set:(WSOrd.BonType="OFF")&&(sDomVERW'="HEIN") tmpAr("OFFTOBBON")=1   ; OFFTOBBON  in de betekenis van "Goed voor order" 
+	Set:(WSOrd.BonType="OFF")&&('TBXContext.VerzendOfferteAlsAanvraag()) tmpAr("OFFTOBBON")=1   ; OFFTOBBON  in de betekenis van "Goed voor order" 
 	Set %session.Data("Taal")=Taal
 	Set %session.Data("WSID")=wsID
 	Set %session.Data("KLNR")=KLNr
@@ -756,8 +758,8 @@
 	Set arShow("SubmitAgain","BTN")=(Visible)&&(blnIsSubmitted)
 	Quit:('Visible)
 	Set arShow("Submit","HREF")="MailSend.csp?"_##class(cspBasis.GAProdTBox).CQueryString(.tmpAr)
-	Set InternText=$S((WSOrd.BonType="OFF")&&(sDomVERW'="HEIN"):"VerzendenBBON", 1:"Verzenden"_WSOrd.BonType)
-	Set InternInfo=$S((WSOrd.BonType="OFF")&&(sDomVERW'="HEIN"):"VerzendInfoBBON", 1:"VerzendInfo"_WSOrd.BonType)
+	Set InternText=$S((WSOrd.BonType="OFF")&&('TBXContext.VerzendOfferteAlsAanvraag()):"VerzendenBBON", 1:"Verzenden"_WSOrd.BonType)
+	Set InternInfo=$S((WSOrd.BonType="OFF")&&('TBXContext.VerzendOfferteAlsAanvraag()):"VerzendInfoBBON", 1:"VerzendInfo"_WSOrd.BonType)
 	Set arShow("Submit","TEXT")=##class(cspBasis.GAProdTBox).WebTextValue(InternText,Taal,"L")
 	Set arShow("Submit","INFO")=##class(cspBasis.GAProdTBox).WebTextValue(InternInfo,Taal,"L")
 	Set:(arShow("Submit","INFO")="~") arShow("Submit","INFO")=""
@@ -804,10 +806,7 @@
 	Set arShow("ModifyOrder","HREF")="Access.csp?"_##class(cspBasis.GAProdTBox).CQueryString(.tmpAr)
 	Quit
 MShowNewFromOrder(Visible)
- 
-	 s blnShow=$$$Not(blnHEIN||blnDUPO||blnHELMY||blnHFLE)      ; (sDomVERW="SFS")||((sDomVERW="VHEPN")&&(KLNr?1(1"12486",1"4645")))
-	 q:('blnShow)    ; until completed  and released to ALL
- 
+	Quit:('TBXContext.ToonKnopDupliceerEnWijzig())
 	Quit:('$G(blnValidKlant,1))
 	Quit:('$IsObject(WSOrd))
 	New tmpAr
@@ -837,7 +836,7 @@
 	Set tmpAr("KLNR")=KLNr
 	Set tmpAr("WSID")=wsID
 	Set tmpAr("MODE")=sMode
-	Set:(WSOrd.BonType="OFF")&&(sDomVERW'="HEIN") tmpAr("OFFTOBBON")=1   ; OFFTOBBON  in de betekenis van "Goed voor order" 
+	Set:(WSOrd.BonType="OFF")&&('TBXContext.VerzendOfferteAlsAanvraag()) tmpAr("OFFTOBBON")=1   ; OFFTOBBON  in de betekenis van "Goed voor order" 
 	Set %session.Data("Taal")=Taal
 	Set %session.Data("WSID")=wsID
 	Set %session.Data("KLNR")=KLNr
@@ -872,7 +871,7 @@
 	If ($L(lbLog))&&($LG(lbLog,2)>0) Do
 	. Set tmpAr("TRANSF")="AGAIN;ADM"
 	. Set arShow("SubmitAdminAgain","HREF")="main.csp?"_##class(cspBasis.GAProdTBox).CQueryString(.tmpAr)
-	. Set arShow("SubmitAdminAgain","INFO")="<U>offerte</U>: "_$LG(lbLog,2)_"  "_$$mssSubmitAdminTime($LG(lbLog,1))_"    +++klantnr "_$S(blnVHEPN:KLNr, 1:sDomKLNr)_"+++"
+	. Set arShow("SubmitAdminAgain","INFO")="<U>offerte</U>: "_$LG(lbLog,2)_"  "_$$mssSubmitAdminTime($LG(lbLog,1))_"    +++klantnr "_$S(TBXContext.IsDomeinVHEPN():KLNr, 1:TBXContext.GeefDomeinKlantNummer())_"+++"
 	. Set arShow("SubmitAdminAgain","INFO")=$$$Replace(arShow("SubmitAdminAgain","INFO")," ","&nbsp;")
 	Else  Do
 	. Set arShow("SubmitAdminAgain","INFO")=""
@@ -904,9 +903,9 @@
 MShowKnownCustomer(Visible)
 #define KLNrClean   $S(KLNr=$$$KLNrListAll:"", 1:KLNr)
 	New KLNaam,KLMini
-	If (blnVHEPN)||(blnLMC)||(blnSFS)||(blnMBHO) Do
+	If TBXContext.HeeftToegangMetLogin() Do
 	. Quit:($$$KLNrClean="")
-	. Set KLMini=##class(cspBasis.GAProdTBox).GetKlantData(sDomVERW,KLNr)
+	. Set KLMini=##class(cspBasis.GAProdTBox).GetKlantData(TBXContext.GeefDomeinVerwerker(),KLNr)
 	. ; If KLMini Do
 	. ;.  Set KLNaam=KLMini.Naam
 	. Set:(KLMini) KLNaam=KLMini.Naam
@@ -963,14 +962,15 @@
 #define pg   ##class(cspBasis.GAProdTBox)
 	Kill arWSVTL
 	Quit:('$IsObject($G(WSOrd)))
-	New i,WSLn,SomAKPrijs,BonType,Munt,MuntCalc
+	New i,WSLn,SomAKPrijs,BonType,Munt,MuntCalc,blnIsBeursUser
 	Set Munt="EUR"
-	Set Munt=$$GetUserMunt^cspBasis.Library(sDomVERW,$G(VERW))   ; if sMode=PROCESS, then enable switch between EUR and CHF, by setting VERW="SFS" or VERW="VHEPN" 
+	Set Munt=TBXContext.GeefUserMuntEenheid($G(VERW))   ; $$GetUserMunt^cspBasis.Library(TBXContext.GeefDomeinVerwerker(),$G(VERW))   ; if sMode=PROCESS, then enable switch between EUR and CHF, by setting VERW="SFS" or VERW="VHEPN" 
+	Set blnIsBeursUser=(''$G(%session.Data("BeursUser")))
 	Set BonType=$$$pg.ConvertBonType(WSOrd.BonType,VERW,sMode)
 	Set arWSVTL("BonType")=$S($L(BonType):$$$pg.WebTextValue("FT_"_BonType,Taal,"L",$LB("U")), 1:"")
 	Set arWSVTL("NietMee")=$$pwoTransNietMee(WSOrd.NietMeeleveren)   ; $S($L(WSOrd.NietMeeleveren):"corpusprofielen, afdekkappen", 1:"")   ; "De corpusprofielen / afdekkappen worden niet meegeleverd.", 1:"")
-	Set blnShowAKPrijs=(sMode="PROCESS")&&('blnVHEPN)   ; &&(BonType="INKP")
-	If sDomVERW="SFS" Do
+	Set blnShowAKPrijs=(sMode="PROCESS")&&('TBXContext.IsDomeinVHEPN())   ; &&(BonType="INKP")
+	If TBXContext.GeefDomeinVerwerker()="SFS" Do
 	. ; Aankoopprijzen in EUR berekend en getoond 
 	. ; Verkoopprijzen in CHF berekend en getoond 
 	. ; ==> m.a.w.  Munt moet correct ingevuld worden (EUR of CHF);  prijzen van WSOrd niet meer omrekenen, dus MuntCalc="EUR" 
@@ -1010,15 +1010,15 @@
 	. . Set arWSVTL("LN",i,Key)=$$pwoTransItemValue($zobjproperty(WSLn,"Item"_Key),Key)
 	. Set arWSVTL("LN",i,"DIV")=$$pwoTransItemValue(WSLn.ItemDIVToLB(),"DIV")   ; ..ItemDIVToLB()   ; Returns $LB()
 	. Set arWSVTL("LN",i,"AANT")=$$pwoTransItemValue(WSLn.Qty,"AANT")   ; _$$pwoTransItemValue(WSLn.ItemVPK,"VPK")
-	. Set arWSVTL("LN",i,"PRIJS")=$$pwoTransItemValue($S($G(%session.Data("BeursUser")):99.99, blnShowAKPrijs:WSLn.AKPrijs, 1:WSLn.KostPrijs),"PRIJS")
+	. Set arWSVTL("LN",i,"PRIJS")=$$pwoTransItemValue($S(blnIsBeursUser:99.99, blnShowAKPrijs:WSLn.AKPrijs, 1:WSLn.KostPrijs),"PRIJS")
 	. Set blnContainsGlas=(blnContainsGlas)||(WSLn.ItemBX?1(1"BG",1"COV"))||(WSLn.ItemBGRP?1(1"V"))
 	. Set:(WSLn.KostPrijs["ERROR") blnWSErrors=1
 	. Set:(blnShowAKPrijs) SomAKPrijs=SomAKPrijs+(WSLn.AKPrijs*WSLn.Qty)
  
 	If 'blnContainsGlas Set arWSVTL("KLR_KV")=""
 	;Set:(blnShowAKPrijs) arWSVTL("AKPrijsTot")=$S($G(%session.Data("BeursUser")):99.99, 1:SomAKPrijs)
 	;Set arWSVTL("TotPrijs")=$$pwoTransTotPrijs($S($G(%session.Data("BeursUser")):99.99, blnShowAKPrijs:arWSVTL("AKPrijsTot"),1:WSOrd.TotPrijs))
-	If $G(%session.Data("BeursUser")) Do
+	If blnIsBeursUser Do
 	. Set:(blnShowAKPrijs) arWSVTL("AKPrijsTot")=99.99
 	. Set arWSVTL("TotPrijs")=$$pwoTransTotPrijs(99.99)
 	Else  Do
@@ -1060,39 +1060,15 @@
 	. Set:($L(NietMeeKey)) str=str_$S($L(str):", ", 1:"")_$$$pg.WebTextValue(NietMeeKey,Taal,"L",$$$LowerCaseExceptBS)
 	Quit str
 	
-	
- /*
-	VORIGE VERSIE: 
-	====== ======= 
- * /
- #If ($ZCVT($ZUTIL(110),"U")="WWW01")&&($$$NSpace'="DEMO")
-	Set ClientHostIP=$S((VERW="VHEPN")&&('blnVHEPN):"192.168.1x.", 1:"192.168.1.")
- #Else 
-	Set ClientHostIP="192.168.1x."
- #EndIf
-	
-	&SQL(DECLARE crsHist CURSOR FOR 
-			SELECT Top 1000  KLNummer, KLNaam, BonType, ID, IngaveTijdStip, TotAantal Qty, TotPrijs Prijs, Commissie, SubmitTS
-			  INTO :tmpAr("KLNr"), :tmpAr("KLNaam"), :tmpAr("BonType"), :tmpAr("wsID"), :tmpAr("OrdTime"), :tmpAr("TotQty"), :tmpAr("TotPrs"), :tmpAr("Commissie"), :tmpAr("SubmitTS")
-			  FROM WS_TBX.WebOrder OrdHfd
-			  WHERE  (WebDomain=:sDomain2) AND ((KLNummer=:KLNrSel)OR(:blnListALL=1)) AND (IngaveTijdStip > '2004-01-24') AND ID in 
-			  (
-			    SELECT  DISTINCT (LogT.WSOrderID)
-			      FROM DW_WWW.SysLogTBX LogT  
-			      WHERE (LogT.Actie ='WIZARD_CALC') AND (NOT LogT.ClientHost %STARTSWITH :ClientHostIP)
-			  )
-			  ORDER BY IngaveTijdStip DESC, ID
-	)
- /*   */
  
 PrepareHistVTL
 #define KLNrClean   $S(KLNr=$$$KLNrListAll:"", 1:KLNr)
 	  ;s:('$D(ClientIP)) ClientIP="192.168.1.97"
-	New tmpAr,KLNrSel,i,wsID,Ref,WizMode,sDomain2,tmpKLNr,blnListALL,tmpNaam,BonType,Munt,ClientHostIP,MinShowH,MaxShowH,blnListHidden,blnListHiddenOnly,KLNrIsTestKlant
+	New tmpAr,KLNrSel,i,wsID,Ref,WizMode,sDomain2,tmpKLNr,blnListALL,tmpNaam,BonType,Munt,ClientHostIP,MinShowH,MaxShowH,blnListHidden,blnListHiddenOnly,KLNrIsTestKlant,blnIsBeursUser
 	Kill arHistVTL
  
 	Set KLNrIsTestKlant=0
-	If (sDomVERW="VHEPN") && ( (KLNr?1(1"4682",1"1000",1"4645"))||($$$ValIsBetween(KLNr,15827,15836)) )  { Set KLNrIsTestKlant=1 }
+	If (TBXContext.IsDomeinVHEPN()) && ( (KLNr?1(1"4682",1"1000",1"4645"))||($$$ValIsBetween(KLNr,15827,15836)) )  { Set KLNrIsTestKlant=1 }
  
 	Set blnListHidden=($G(%request.Data("SHOWALL",1))="1")
 	If (##class(TECH.Config.ConfigMgr).Instance().GetBoolean("csp.vhisie.TBX.Main_ToonHistoriekVoorTestklanten"))
@@ -1101,11 +1077,12 @@
 	}
 	Set blnListHiddenOnly=0
 	Set blnListALL=(KLNr=$$$KLNrListAll)
+	Set blnIsBeursUser=(''$G(%session.Data("BeursUser")))
 	Set KLNrSel=$$$KLNrClean   ;  $S(KLNr=$$$KLNrListAll:"", 1:KLNr)
 	Set WizMode=$S(sMode?1(1"VIEW",1"PROCESS",1"COMPLETE"):sMode, 1:"COMPLETE")
 	Set sDomain2=$$TBXDomainCVT^cspBasis.Library(sDomain)
 	Set Munt="EUR"
-	Set Munt=$$GetUserMunt^cspBasis.Library(sDomVERW,)
+	Set Munt=TBXContext.GeefUserMuntEenheid()
 	Do phvBuildColHeader
 	
 	Set MinShowH=$$$shShownForKlant
@@ -1117,7 +1094,7 @@
 	. Set MinShowH=$S(VERW'="VHEPN":$$$shShownForVERW, 1:$$$shShownForVHEPN)
 	Else  If KLNrIsTestKlant Do
 	. Set MinShowH=$$$shShownForVHEPN
-	Else  If 0  && ($G(%RemoteIP)?1(1"192.168.1.")) Do
+	Else  If 0  && ($G(%RemoteIP)?1(1"192.168.1.",1"192.168.2.")) Do
 	. Set MinShowH=$$$shShownForVHEPN
  
 	&SQL(DECLARE crsHist CURSOR FOR 
@@ -1156,15 +1133,15 @@
 	Quit
 phvBuildHistArray
 	Set i=i+1
-	Set:($G(%session.Data("BeursUser")))&&(tmpAr("TotPrs")) tmpAr("TotPrs")=99.99
+	Set:(blnIsBeursUser)&&(tmpAr("TotPrs")) tmpAr("TotPrs")=99.99
 	Merge arHistVTL("LN",i)=tmpAr
 	Set wsID=$G(tmpAr("wsID"))
 	Set tmpKLNr=$S(KLNr=$$$KLNrListAll:$G(tmpAr("KLNr")), 1:KLNr)
 	Set arHistVTL("LN",i,"KLNr")=$G(tmpAr("KLNr"))
 	Set arHistVTL("LN",i,"KLNaam")=$G(tmpAr("KLNaam"))
 	Set arHistVTL("LN",i,"Munt")=$S($G(tmpAr("Munt"))="":"EUR", 1:tmpAr("Munt"))
 	Set arHistVTL("LN",i,"MuntCalc")=arHistVTL("LN",i,"Munt")
-	If sDomVERW="SFS" Do
+	If TBXContext.IsDomeinSFS() Do
 	. Set arHistVTL("LN",i,"Munt")="CHF"
 	. Set arHistVTL("LN",i,"MuntCalc")="EUR"
 	/*
@@ -1186,6 +1163,6 @@
 	Quit
 phvManageBonType
 	Set BonType=$$$pg.ConvertBonType(arHistVTL("LN",i,"BonType"),VERW,WizMode)
-	Set:(blnLMC||blnSFS||blnMBHO) arHistVTL("LN",i,"BonType")=BonType
+	Set:(TBXContext.KlantGegevensViaDataOpt()) arHistVTL("LN",i,"BonType")=BonType
 	Set arHistVTL("LN",i,"BonTypeVTL")=$$$pg.WebTextValue("FT_"_BonType,Taal,"L")
 	Quit
\ No newline at end of file
Index: APPS/TBXWeb/DomeinNamen.inc.rou
===================================================================
diff -u -r760 -r1571
--- APPS/TBXWeb/DomeinNamen.inc.rou	(.../DomeinNamen.inc.rou)	(revision 760)
+++ APPS/TBXWeb/DomeinNamen.inc.rou	(.../DomeinNamen.inc.rou)	(revision 1571)
@@ -23,6 +23,7 @@
 	#define TBoxWebDomeinHFLE                    "hafele.tandem-box.com"
 	#define TBoxWebDomeinSFS                     "tbx.sfsunimarket.biz"
 	#define TBoxWebDomeinMBHO                    "tandembox.meubelbeslagholland.nl"
+	#define TBoxWebDomeinHFLB                    "tandembox.hafele.be"
 	#define TBoxWebDomeinDEMO                    "demo.tandem-box.com"
  
 	; === Bijhorende Klantnummers === 
@@ -35,6 +36,7 @@
 	#define TBoxWebKlantNrHFLE                    "2671"
 	#define TBoxWebKlantNrSFS                     "12486"
 	#define TBoxWebKlantNrMBHO                    "2999"
+	#define TBoxWebKlantNrHFLB                    "4875"
 	#define TBoxWebKlantNrVHEPNDEMO               "6819"
  
  
@@ -45,4 +47,7 @@
 	#define HomePageMBHO                          "http://www.meubelbeslagholland.nl"
  ;	#define TBoxInfoPageMBHO                      "http://www.meubelbeslagholland.nl/servodrive"
 	#define TBoxInfoPageMBHO                      ""	
+ 
+	#define HomePageHFLB                          "http://www.hafele.be"
+	#define TBoxInfoPageHFLB                      ""	
  
\ No newline at end of file
Index: vhDeploy/WV/Deploy20110630x1132.cls.xml
===================================================================
diff -u
--- vhDeploy/WV/Deploy20110630x1132.cls.xml	(revision 0)
+++ vhDeploy/WV/Deploy20110630x1132.cls.xml	(revision 1571)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhDeploy.WV.Deploy20110630x1132">
+<Description>
+Added by WimV </Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>svn.Deploy</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	Write "Setting ConfigMgr Items ... "
+	
+	If ##class(TECH.Config.ConfigMgr).Instance().GetOmgeving()["DEV" {
+		Set Sleutel="APPS.TBXWeb.BackgroudImageName"
+		Do:('(##class(TECH.Config.ConfigMgr).Instance().BestaatSleutel(Sleutel))) ##class(TECH.Config.ConfigMgr).Instance().SetString(Sleutel,"BG_TBX_C02.bmp")
+	}
+	
+	Write " Done. ",!
+	Quit
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: WV GAProduct WWW.prj.xml
===================================================================
diff -u -r1381 -r1571
--- WV GAProduct WWW.prj.xml	(.../WV GAProduct WWW.prj.xml)	(revision 1381)
+++ WV GAProduct WWW.prj.xml	(.../WV GAProduct WWW.prj.xml)	(revision 1571)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
-<Project name="WV GAProduct WWW" LastModified="2011-06-08 10:51:13" Target="ophSendAlertMail^csp" TargetType="2" HttpServer="http://192.168.1.67:1972">
+<Project name="WV GAProduct WWW" LastModified="2011-06-14 18:22:50" Target="ophSendAlertMail^csp" TargetType="2" HttpServer="http://192.168.1.67:1972">
   <Items>
     <ProjectItem name="/csp/httplog/DLGqueryVH.csp" type="CSP"/>
     <ProjectItem name="/csp/httplog/queryVH.csp" type="CSP"/>
@@ -37,6 +37,7 @@
     <ProjectItem name="APPS.TBXWeb.EMailAdressen.INC" type="MAC"/>
     <ProjectItem name="APPS.TBXWeb.INC" type="MAC"/>
     <ProjectItem name="APPS.TBXWeb.OrderChecker" type="CLS"/>
+    <ProjectItem name="APPS.TBXWeb.XXXContext" type="CLS"/>
     <ProjectItem name="APPS.TBXWeb.enu.RedenOfferteVervallen" type="CLS"/>
     <ProjectItem name="APPS.TBXWeb.impl.ActieSFSCorpusProfielen" type="CLS"/>
     <ProjectItem name="BL.Flow.Offerte.LijnProductGA" type="CLS"/>
Index: WS/TBX/Order.cls.xml
===================================================================
diff -u -r1309 -r1571
--- WS/TBX/Order.cls.xml	(.../Order.cls.xml)	(revision 1309)
+++ WS/TBX/Order.cls.xml	(.../Order.cls.xml)	(revision 1571)
@@ -589,23 +589,18 @@
 <Implementation><![CDATA[
 	#define DateH(%v)   $S(%v?5N1","1.5N:%v, 1:$ZDTH(%v,3))
 	
-	Set sDomVERW=$LG(..DomainLookUp(..WebDomain,$LB("VERW")),1)
+	Set sDomVERW=$LG(##class(APPS.TBXWeb.XXXContext).GeefDomeinData(..WebDomain,$LB("VERW")),1)
 	If sDomVERW="" {
 		$$$ThrowError($$$errGeneralError,"Ongeldig waarde voor WebDomain. De verwerker kan niet bepaald worden.")
 	}
 	ElseIf sDomVERW="VHEPN" {
 		Set SubmitTS=$$$DateH(..SubmitTS)
 	}
 	Else {
+
 		Set HandelSubmitsToVH=(sDomVERW'?1(1"HEIN",1"LMC"))
 		If HandelSubmitsToVH {
 			Set SubmitTS=$LG($LG(..SubmitToVHLog,1),1)
-
-			; -------------- 
-			; Temp FIX,  bij SFS wordt de SubmitToVHLog nog niet ingevuld. 
-			;If (sDomVERW?1(1"SFS",1"MBHO"))&&(SubmitTS="") Set SubmitTS=$$$DateH(..SubmitTS)
-			; -------------- 
-
 		}
 		Else {
 			Set SubmitTS=$$$DateH(..SubmitTS)
@@ -665,7 +660,7 @@
 <FormalSpec>RefDatum:%String=$H</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	Set sDomVERW=$LG(..DomainLookUp(..WebDomain,$LB("VERW","KLNR")),1)
+	Set sDomVERW=$LG(##class(APPS.TBXWeb.XXXContext).GeefDomeinData(..WebDomain,$LB("VERW","KLNR")),1)
 	Set Shop=sDomVERW
 	Set NieuweActies = 0
 	If (Shop '= "")
@@ -808,15 +803,29 @@
 <ReturnType>WS.TBX.Order</ReturnType>
 <Implementation><![CDATA[
 	Set WSOrd=..%OpenId(wsID)
-	Quit:('$IsObject(WSOrd)) ""
-	Quit:(WSOrd.BonType'="BBON") WSOrd
-	;Quit:(WSOrd.BonType'?1(1"BBON",1"INKP")) WSOrd
-	Quit:(WSOrd.TransferLog="") WSOrd
-	Set WSOrd.TransferLog=""
-	;Set WSOrd.BonType="BBON"
-	If blnSaveObj Do
-	. Set scSave=WSOrd.%Save()
-	. w:$$$ISERR($G(scSave)) "SaveObj status"_$$ParseStatus^vhLib(scSave),!
+	If ('$IsObject(WSOrd)) {
+		Set WSOrd=""
+	}
+	Else {
+		Set blnResetFromINKP=(WSOrd.WebDomain'?1(1"www.tandem-box.com"))
+		Set ExpectedBonType=$S(blnResetFromINKP:"INKP", 1:"BBON")
+		If (WSOrd.BonType=ExpectedBonType)&&(WSOrd.TransferLog'="") {
+			Set:(blnResetFromINKP) WSOrd.BonType="BBON"
+			Set WSOrd.TransferLog=""
+			Write "WSOrd has been reset to BBON.",!
+			If blnSaveObj {
+				Set scSave=WSOrd.%Save()
+				Write $S($$$ISERR($G(scSave)):"SaveObj status"_$$ParseStatus^vhLib(scSave), 1:"WSOrd saved."),!
+			}
+			Else {
+				Write "WSOrd not yet saved.",!
+			}
+			Write !
+		}
+		Else {
+			Write "WSOrd cannot be reset to BBON.",!
+		}
+	}
 	Quit WSOrd
 ]]></Implementation>
 </Method>
@@ -835,7 +844,7 @@
 	Quit:('$IsObject(WSOrd)) ""
 	Quit:(NewStatusH>$$$shShownForAll) ""
 	If $G(NewStatusH)="" Do  Quit:(ClientHostIP="") ""
-	. Set blnIsExternIP=(ClientHostIP'?1"192.168.1.".E)
+	. Set blnIsExternIP=(ClientHostIP'?1(1"192.168.1.".E,1"127.0.0.1"))
 	. Set NewStatusH=$S(blnIsExternIP:$$$shShownForKlant, 1:$$$shShownForVHEPN)
 	Set WSOrd.ShowInHist=NewStatusH
 	If blnSaveObj Do
@@ -919,7 +928,7 @@
 <Method name="OrderNrGet">
 <ProcedureBlock>0</ProcedureBlock>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[ Quit ..OrderNrCalc(..mID)
+<Implementation><![CDATA[	Quit ..OrderNrCalc(..mID)
 ]]></Implementation>
 </Method>
 
@@ -929,8 +938,8 @@
 <ProcedureBlock>0</ProcedureBlock>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
- Set:($G(Nr,0)=0) Nr=""   ; %this.mID
- Quit $S($IsValidNum(Nr):1000000+Nr , 1:Nr)
+	Set:($G(Nr,0)=0) Nr=""   ; %this.mID
+	Quit $S($IsValidNum(Nr):1000000+Nr , 1:Nr)
 ]]></Implementation>
 </Method>
 
@@ -939,9 +948,9 @@
 <FormalSpec>EDINr:%String,blnCheckID:%Boolean=1</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
- Quit:($G(EDINr)="") ""
- Set ID=$S($IsValidNum(EDINr)&&(EDINr>1000000):(EDINr-1000000), 1:EDINr)
- Quit $S('$G(blnCheckID,1):ID, ..%ExistsId(ID):ID, 1:"")
+	Quit:($G(EDINr)="") ""
+	Set ID=$S($IsValidNum(EDINr)&&(EDINr>1000000):(EDINr-1000000), 1:EDINr)
+	Quit $S('$G(blnCheckID,1):ID, ..%ExistsId(ID):ID, 1:"")
 ]]></Implementation>
 </Method>
 
@@ -951,35 +960,8 @@
 <ProcedureBlock>0</ProcedureBlock>
 <ReturnType>%List</ReturnType>
 <Implementation><![CDATA[
-	// the value of Domain must be all lowercase !!!
-	Quit:($G(Domain)="") ""
-	New luTBX,lbVal,i
-	Set lbVal=""
-	Do cdtFillArrayLU
-	For i=1:1:$LL(lbFieldName) Set:($L($LG(lbFieldName,i))) lbVal=lbVal_$LB(luTBX(Domain,$LI(lbFieldName,i)))
-	Quit lbVal
-cdtFillArrayLU
-	Set luTBX("www.tandem-box.com","VERW")="VHEPN"
-	Set luTBX("www.tandem-box.com","KLNR")="4682"
-	Set luTBX("tbx.tandem-box.de","VERW")="HEIN"
-	Set luTBX("tbx.tandem-box.de","KLNR")="7833"
-	Set luTBX("www.optima-tbx.fr","VERW")="LMC"
-	Set luTBX("www.optima-tbx.fr","KLNR")="6279"
-	Set luTBX("tbx.du-pont.be","VERW")="DUPO"
-	Set luTBX("tbx.du-pont.be","KLNR")="1736"
-	Set luTBX("tbx.destil.nl","VERW")="HELMY"
-	Set luTBX("tbx.destil.nl","KLNR")="4598"   ; Old="2127"  New="4598" (by WimV on 17/01/2006)
-	Set luTBX("hafele.tandem-box.com","VERW")="HFLE"
-	Set luTBX("hafele.tandem-box.com","KLNR")="2671"
-	Set luTBX("tbx.sfsunimarket.biz","VERW")="SFS"
-	Set luTBX("tbx.sfsunimarket.biz","KLNR")="12486"
-	Set luTBX("demo.tandem-box.com","VERW")="VHEPN"
-	Set luTBX("demo.tandem-box.com","KLNR")="6819"
-	Set luTBX("demo.sfsunimarket.biz","VERW")="SFS"
-	Set luTBX("demo.sfsunimarket.biz","KLNR")="12486"
-	Set luTBX($$$TBoxWebDomeinMBHO,"VERW")="MBHO"
-	Set luTBX($$$TBoxWebDomeinMBHO,"KLNR")=$$$TBoxWebKlantNrMBHO
-	Quit
+	// Method implementation has been moved to class  APPS.TBXWeb.Context   (by WimV on 29/06/2011) 
+	Quit ##class(APPS.TBXWeb.XXXContext).GeefDomeinData($G(Domain),lbFieldName)
 ]]></Implementation>
 </Method>
 
@@ -998,7 +980,7 @@
 	 
 	Set KLNr = ..KLNummer
 	Set:'$L(Taal) Taal = ..Taal
-	Set:'$L(VERW) VERW = $LG(..DomainLookUp(..WebDomain,$LB("VERW")),1)
+	Set:'$L(VERW) VERW = $LG(##class(APPS.TBXWeb.XXXContext).GeefDomeinData(..WebDomain,$LB("VERW")),1)
 	
 	Set arParam("REF")=$$CreateHashedRef^cspBasis.TBX.DecodeURL.tmpDev($LB(KLNr,VERW,wsID,"P"))
 	Set arParam("Taal")= $S($L(Taal):Taal,1:"N")
Index: cspBasis/Library.mac.rou
===================================================================
diff -u -r762 -r1571
--- cspBasis/Library.mac.rou	(.../Library.mac.rou)	(revision 762)
+++ cspBasis/Library.mac.rou	(.../Library.mac.rou)	(revision 1571)
@@ -11,6 +11,10 @@
 	Quit:(Munt="")||(Munt="EUR") Prijs
 	Quit Prijs/$$GetMuntPar(Munt)
  
+	// GetUserMunt is DEPRECATED.  
+	// Use method TBXContext.GeefUserMuntEenheid(VERW) 
+	// 
+	// Deze implementatie blijft enkel staan voor Backward compatibility 
 GetUserMunt(sDomVERW,VERW)
 	Quit $S($G(VERW)="VHEPN":"EUR", sDomVERW="SFS":"CHF", 1:"EUR")
  
@@ -69,22 +73,37 @@
 	Set Domain=$$$LCase(Domain)
 	Set TestDomeinenOmzetten=##class(TECH.Config.ConfigMgr).Instance().GetBoolean("cspBasis.Library_TestDomeinenOmzetten")
 	If TestDomeinenOmzetten {
-		Quit:($$$Server="CACHE01"               ) $S(Domain="cache01":$$$OtherDomain, 1:$$$DefaultDomain)   // Alleen voor Cache01 (Uitzondering) 
-		Quit:(Domain="test.tandem-box.com"      ) "www.tandem-box.com"
-		Quit:(Domain="test.optima-tbx.fr"       ) "www.optima-tbx.fr"
-		Quit:(Domain="test.tandem-box.de"       ) "tbx.tandem-box.de"
-		Quit:(Domain="test.du-pont.be"          ) "tbx.du-pont.be"
-		Quit:(Domain="test.destil.nl"           ) "tbx.destil.nl"
-		Quit:(Domain="testhafele.tandem-box.com") "hafele.tandem-box.com"
-		Quit:(Domain="test.sfsunimarket.biz"    ) "tbx.sfsunimarket.biz"
-		Quit:(Domain="testtandembox.meubelbeslagholland.nl") $$$TBoxWebDomeinMBHO
-		Quit:(Domain="demo.tandem-box.com"      ) "demo.tandem-box.com"
-		Quit:(Domain="demo.sfsunimarket.biz"    ) "demo.sfsunimarket.biz"
-		Quit:(Domain="192.168.1.67"             ) $$$DefaultDomain
-		Quit:(Domain="cache02"                  ) $$$OtherDomain
+ 
+		Quit:($$$Server="CACHE01"                               ) $S(Domain="cache01":$$$OtherDomain, 1:$$$DefaultDomain)   // Alleen voor Cache01 (Uitzondering) 
+	
+		Quit:(Domain="test.tandem-box.com"                      ) "www.tandem-box.com"
+		Quit:(Domain="test.optima-tbx.fr"                       ) "www.optima-tbx.fr"
+		Quit:(Domain="test.tandem-box.de"                       ) "tbx.tandem-box.de"
+		Quit:(Domain="test.du-pont.be"                          ) "tbx.du-pont.be"
+		Quit:(Domain="test.destil.nl"                           ) "tbx.destil.nl"
+		Quit:(Domain="testhafele.tandem-box.com"                ) "hafele.tandem-box.com"
+		Quit:(Domain="test.sfsunimarket.biz"                    ) "tbx.sfsunimarket.biz"
+		Quit:(Domain="testtandembox.meubelbeslagholland.nl"     ) $$$TBoxWebDomeinMBHO
+		;Quit:(Domain="testtandembox.hafele.be"                 ) $$$TBoxWebDomeinHFLB
+		Quit:(Domain="testtbxhafele.tandem-box.com"             ) $$$TBoxWebDomeinHFLB   ; Tijdelijk, totdat het definitieve domein van Hafele.be bekend is.  Vermoedelijk dan de lijn hierboven actief 
+ 
+		Quit:(Domain="localdev.tandem-box.com"                  ) "www.tandem-box.com"
+		Quit:(Domain="localdev.optima-tbx.fr"                   ) "www.optima-tbx.fr"
+		Quit:(Domain="localdev.tandem-box.de"                   ) "tbx.tandem-box.de"
+		Quit:(Domain="localdev.du-pont.be"                      ) "tbx.du-pont.be"
+		Quit:(Domain="localdev.destil.nl"                       ) "tbx.destil.nl"
+		Quit:(Domain="localdev-hafele.tandem-box.com"           ) "hafele.tandem-box.com"
+		Quit:(Domain="localdev.sfsunimarket.biz"                ) "tbx.sfsunimarket.biz"
+		Quit:(Domain="localdev-tandembox.meubelbeslagholland.nl") $$$TBoxWebDomeinMBHO
+		Quit:(Domain="localdev-tandembox.hafele.be"             ) $$$TBoxWebDomeinHFLB
+	
+		Quit:(Domain="demo.tandem-box.com"                      ) "demo.tandem-box.com"
+		Quit:(Domain="demo.sfsunimarket.biz"                    ) "demo.sfsunimarket.biz"
+		Quit:(Domain="192.168.1.67"                             ) $$$DefaultDomain
+		Quit:(Domain="cache02"                                  ) $$$OtherDomain
 	 
-		Quit:(Domain="test.tandem-box.eu"       ) "www.tandem-box.com"
-		Quit:(Domain="195.130.157.3"            ) "www.tandem-box.com"
+		Quit:(Domain="test.tandem-box.eu"                       ) "www.tandem-box.com"
+		Quit:(Domain="195.130.157.3"                            ) "www.tandem-box.com"
 	 
 		Quit Domain
 		;Quit $$$DefaultDomain
Index: _vhisie/TBX/MainOrderDtl.csp
===================================================================
diff -u -r1012 -r1571
--- _vhisie/TBX/MainOrderDtl.csp	(.../MainOrderDtl.csp)	(revision 1012)
+++ _vhisie/TBX/MainOrderDtl.csp	(.../MainOrderDtl.csp)	(revision 1571)
@@ -274,7 +274,7 @@
 						<CSP:IF condition='$L($G(arShow("Submit","HREF")))'>
 							<SCRIPT language="Cache" runat="server">
 								Set jsSubmitAction="javascript:ShowMailWin();"
-								If (blnSFS||blnMBHO)&&($G(blnWSErrors,0)) Set jsSubmitAction="javascript:alert("_$$$QuoteJS($G(arShow("WSErrorsInfo","TEXT"),"ERROR: see above."))_");"
+								If (blnSFS||blnMBHO||blnHFLB)&&($G(blnWSErrors,0)) Set jsSubmitAction="javascript:alert("_$$$QuoteJS($G(arShow("WSErrorsInfo","TEXT"),"ERROR: see above."))_");"
 							</SCRIPT>
 							<A href="#(jsSubmitAction)#"><SPAN class="clsWizardBtn"><NOBR>#($G(arShow("Submit","TEXT"),"Verzenden"))#</NOBR></SPAN></A>
 						<CSP:ELSE>
Index: _vhisie/TBX/Main.csp
===================================================================
diff -u -r1133 -r1571
--- _vhisie/TBX/Main.csp	(.../Main.csp)	(revision 1133)
+++ _vhisie/TBX/Main.csp	(.../Main.csp)	(revision 1571)
@@ -17,9 +17,10 @@
 	If $IsObject(WSOrd) Set HeaderLogo = WSOrd.GetDC()
 	Set:($G(sMode)="START") HeaderLogo=""
 	
-	Set BGImage = "BG_TBX.bmp"
-	If $$$NSpace="DEMO" Set BGImage="BG_TBX_DEMO.bmp"
-	If $$$Server="CACHE02" Set BGImage="BG_TBX_C02.bmp"
+	Set BGImage = ##class(TECH.Config.ConfigMgr).Instance().GetString("APPS.TBXWeb.BackgroudImageName")
+	;Set BGImage = "BG_TBX.bmp"
+	;If $$$NSpace="DEMO" Set BGImage="BG_TBX_DEMO.bmp"
+	;If $$$Server="CACHE02" Set BGImage="BG_TBX_C02.bmp"
 </SCRIPT>
 
 <HEAD>
@@ -142,10 +143,10 @@
 			<TD>&nbsp;</TD>
 			<TD>&nbsp;</TD>
 	</CSP:IF>
-	<CSP:IF condition='blnLMC||blnDUPO||blnHELMY||blnHFLE||blnMBHO'>
+	<CSP:IF condition='(TBXContext.MagAndereTaalKiezen()=0)'>
 			<TD>&nbsp;</TD>
 			<TD>&nbsp;</TD>
-	<CSP:ELSEIF condition='blnSFS'>
+	<CSP:ELSEIF condition='TBXContext.IsDomeinSFS()'>
 			<TD align="right"><SPAN style="color:#FF460A">#(..WebTextValue("Taal",Taal,"L"))#:&nbsp;</SPAN></TD>
 			<TD align="left">#(arUrl("SwitchTL","D")_$S(1:" - "_arUrl("SwitchTL","F"), 1:""))#</TD>
 	<CSP:ELSE>
@@ -214,7 +215,7 @@
 	Set arVerlof("MSG","DisplayMsg")=$CASE(Taal, "F":"Pour placer des commandes: cong�s annuels, nous sommes ferm�s de", "E":"For placing orders: the company is closed", "D":"For placing orders: the company is closed", :"Voor bestellingen: gesloten wegens jaarlijks verlof")
 	;Set arVerlof("MSG","DisplayMsg")=$CASE(Taal, "F":"Pour placer des commandes: nous sommes ferm�s de",                "E":"For placing orders: the company is closed", "D":"For placing orders: the company is closed", :"Voor bestellingen: gesloten wegens verlof")
 	</SCRIPT>
-	<CSP:IF condition='($G(arVerlof("MSG","ShowTime"))=1) && blnVHEPN'>
+	<CSP:IF condition='($G(arVerlof("MSG","ShowTime"))=1) && TBXContext.IsDomeinVHEPN()'>
 		<TR>
 			<TD colspan="5" align="center">
 				<BR>
@@ -275,9 +276,8 @@
 	</CSP:IF>
 	
 	
-	<CSP:IF condition='($G(KLNr)=999999)&&(sMode="START")&&(blnHist=0)'>
+	<CSP:IF condition='(TBXContext.ToonKnopHttpRequestTestpage($G(KLNr)))&&(sMode="START")&&(blnHist=0)'>
 		<CSP:COMMENT><!--  SPECIALE TEST-FORM  --></CSP:COMMENT>
-		<CSP:COMMENT><!--  KLNr=999999 / 14937 / 12848 / 14484 / 3524 / 8575 / 5977 / 10096 /10939 / 4137 / 10547 / 5872 / 8537 / 4874 / 1093 / 8537 / 2118 --></CSP:COMMENT>
 		<TR>
 			<TD colspan="5"><B>Klantspecifiek:<B> <SPAN style="color:blue; font-weight:bold;">TEST DE VERBINDING MET ONZE SERVER</SPAN><BR></TD>
 		</TR>
@@ -292,7 +292,7 @@
 	</CSP:IF>
 
 
-	<CSP:IF condition='(KLNr=$$$KLNrListAll)&&(blnLMC||blnSFS||blnMBHO)'>   
+	<CSP:IF condition='(KLNr=$$$KLNrListAll)&&(TBXContext.KlantGegevensViaDataOpt())'>
 		<CSP:COMMENT><!--   Nieuwe ingave niet mogelijk, want domein laat Anonymous niet toe   --></CSP:COMMENT>
 	<CSP:ELSEIF condition='($G(arShow("SwitchStartMode","BTN")))'>      <!--   TextPos="RIGHT"   -->
 		<TR>
@@ -324,15 +324,15 @@
 			<TD width="200" align="center" style="padding:5px;">
 				<A href="#($G(arShow("NewOrder","HREF")))#"><SPAN class="clsWizardBtn"><NOBR>TANDEMBOX plus</NOBR></SPAN></A>
 			</TD>
-		<CSP:IF condition='(blnHEIN=0)'>
+		<CSP:IF condition='(TBXContext.IsDomeinHEIN()=0)'>
 			<TD width="200" align="center" style="padding:5px;">
 			    <A href="#($G(arShow("NewOrder","HREF"))_"&DCM=A")#"><SPAN class="clsWizardBtn"><NOBR>TANDEMBOX antaro</NOBR></SPAN></A>
 			</TD>
 		</CSP:IF>
 			<TD width="200" align="center" style="padding:5px;">
 			    <A href="#($G(arShow("NewOrder","HREF"))_"&DCM=I")#"><SPAN class="clsWizardBtn"><NOBR>TANDEMBOX intivo</NOBR></SPAN></A>
 			</TD>
-		<CSP:IF condition='(blnHEIN=1)'>
+		<CSP:IF condition='(TBXContext.IsDomeinHEIN()=1)'>
 		     <TD width="200">&nbsp;</TD>
 		</CSP:IF>
 		     <TD width="20">&nbsp;</TD>
@@ -343,7 +343,7 @@
 				<A href="#($G(arShow("NewOrder","HREF")))#"><img src="media/tbxplus_50.gif" border="0"></A>
 				<BR><DIV style="point:help; cursor:help;" onClick="ShowInfo('DC_plus','');"><NOBR><A>info</A></NOBR></DIV>&nbsp;
 			</TD>
-		<CSP:IF condition='(blnHEIN=0)'>
+		<CSP:IF condition='(TBXContext.IsDomeinHEIN()=0)'>
 			<TD align="center" style="padding:5px;">
 			    <A href="#($G(arShow("NewOrder","HREF"))_"&DCM=A")#"><img src="media/tbxantaro_50.gif" border="0"></A>				
 				<BR><DIV style="point:help; cursor:help;" onClick="ShowInfo('DC_A','');"><NOBR><A>info</A></NOBR></DIV>&nbsp;
@@ -353,7 +353,7 @@
 			    <A href="#($G(arShow("NewOrder","HREF"))_"&DCM=I")#"><img src="media/tbxintivo_50.gif" border="0"></A>
 				<BR><DIV style="point:help; cursor:help;" onClick="ShowInfo('DC_I','');"><NOBR><A>info</A></NOBR></DIV>&nbsp;
 			</TD>
-		<CSP:IF condition='(blnHEIN=1)'>
+		<CSP:IF condition='(TBXContext.IsDomeinHEIN()=1)'>
 		     <TD>&nbsp;</TD>
 		</CSP:IF>
      		<TD>&nbsp;</TD>
@@ -362,7 +362,7 @@
 			<BR>			 
 			</TD>
 		</TR>
-			<CSP:IF condition='($G(KLNr)=4645)&&(blnVHEPN)'>
+			<CSP:IF condition='($G(KLNr)=4645)&&(TBXContext.IsDomeinVHEPN())'>
 		<TR>
 			<TD>&nbsp;</TD>
 			<TD colspan="2" align="left" style="padding:5px;">
@@ -399,69 +399,7 @@
 		</CSP:IF>
 	</CSP:IF>
 
-<CSP:COMMENT><!--
 
-		<TR>
-			<TD>&nbsp;</TD>
-			<CSP:IF condition='(TextPos="RIGHT")'>
-			<TD align="left" style="padding:5px;"><A href="#($G(arShow("NewFromOrder","HREF")))#"><SPAN class="clsWizardBtn"><NOBR>#(..WebTextValue("BtnNewFromOrder",Taal,"L"))#</NOBR></SPAN></A></TD>
-			<TD colspan="3">&nbsp;: #(..WebTextValue("NewFromOrder",Taal,"O"))#</TD>
-			<CSP:ELSE>		
-			<TD align="left" style="padding:5px;" colspan="2"><A href="#($G(arShow("NewFromOrder","HREF")))#"><SPAN class="clsWizardBtn"><NOBR>#(..WebTextValue("BtnNewFromOrder",Taal,"L"))#</NOBR></SPAN></A></TD>
-			<TD colspan="2">&nbsp;</TD>
-			</CSP:IF>
-		</TR>
-
---></CSP:COMMENT>
-
-
-
-<CSP:COMMENT><!--
-	<CSP:IF condition='$G(arShow("NewOrder","BTN"))'>
-		<CSP:IF condition='(TextPos="RIGHT")'>
-		<TR>
-			<TD colspan="5">&nbsp;<BR><BR></TD>
-		</TR>	
-		<CSP:ELSE>
-		<TR>
-			<TD colspan="5">#($S(sMode="COMPLETE":"<BR><BR><BR>", 1:"")_..WebTextValue($S((sMode="COMPLETE")&&(KLNr'=$$$KLNrListAll):"VolgendeIngave", 1:"NieuweIngave"),Taal,"O",$LB("F")))#<BR></TD>
-		</TR>	
-		</CSP:IF>
-		<TR>
-			<TD>&nbsp;</TD>
-			<CSP:IF condition='(TextPos="RIGHT")'>
-			<TD align="left" style="padding:5px;"><A href="#($G(arShow("NewOrder","HREF")))#"><SPAN class="clsWizardBtn"><NOBR>#(..WebTextValue("NieuweIngave",Taal,"L")_" - TANDEMBOX plus>")#</NOBR</SPAN></A></TD>
-			<TD colspan="3">&nbsp;: #($P(..WebTextValue("VolgendeIngave",Taal,"O"),",",1))#</TD>
-			<CSP:ELSE>		
-			<TD align="left" style="padding:5px;" colspan="2"><A href="#($G(arShow("NewOrder","HREF")))#"><SPAN class="clsWizardBtn"><NOBR>#(..WebTextValue("NieuweIngave",Taal,"L")_" - TANDEMBOX plus")#</NOBR></SPAN></A></TD>
-			<TD colspan="2">&nbsp;</TD>
-			</CSP:IF>
-		</TR>
-		<TR>
-			<TD>&nbsp;</TD>
-			<CSP:IF condition='(TextPos="RIGHT")'>
-			<TD align="left" style="padding:5px;"><A href="#($G(arShow("NewOrder","HREF"))_"&DCM=I")#"><SPAN class="clsWizardBtn"><NOBR>#(..WebTextValue("NieuweIngave",Taal,"L")_" - TANDEMBOX intivo")#</NOBR></SPAN></A></TD>
-			<TD colspan="3">&nbsp;: #($P(..WebTextValue("VolgendeIngave",Taal,"O"),",",1)_" intivo")#</TD>
-			<CSP:ELSE>		
-			<TD align="left" style="padding:5px;" colspan="2"><A href="#($G(arShow("NewOrder","HREF"))_"&DCM=I")#"><SPAN class="clsWizardBtn"><NOBR>#(..WebTextValue("NieuweIngave",Taal,"L")_" - TANDEMBOX intivo")#</NOBR></SPAN></A></TD>
-			<TD colspan="2">&nbsp;</TD>
-			</CSP:IF>
-		</TR>
-		
-			<CSP:IF condition='($G(KLNr)=4645)&&(blnVHEPN)'>
-		<TR>
-			<TD>&nbsp;</TD>
-			<TD align="left" style="padding:5px;"><A href="#($G(arShow("NewOrder","HREF"))_"&DCM=X")#"><SPAN class="clsWizardBtn"><NOBR>#(..WebTextValue("NieuweIngave",Taal,"L")_" - expert")#</NOBR></SPAN></A></TD>
-			<CSP:IF condition='(TextPos="RIGHT")'>
-			<TD colspan="3">&nbsp;: #($P(..WebTextValue("VolgendeIngave",Taal,"O"),",",1)_" expert")#</TD>
-			<CSP:ELSE>		
-			<TD colspan="3">&nbsp;</TD>
-			</CSP:IF>
-		</TR>
-			</CSP:IF>
-	</CSP:IF>
---></CSP:COMMENT>
-
 	<CSP:IF condition='($L($G(arUrl("ToggleHist"))))&&(blnHist=0)'>   <CSP:COMMENT><!-- &&(MainMode=$$$mmToggleHistOrd) --></CSP:COMMENT>
 		<CSP:IF condition='(TextPos="RIGHT")'>
 		<CSP:ELSE>
@@ -491,7 +429,7 @@
 	</TABLE>
 	<BR>			
 
-	<CSP:IF condition='(($$$Not(KLNr=$$$KLNrListAll))||(sMode="START"))&&($$$Not(sMode?1(1"PROCESS",1"VIEW",1"CONFIRM")))'>
+	<CSP:IF condition='(($$$Not(KLNr=$$$KLNrListAll))||(sMode="START"))&&($$$Not(sMode?1(1"PROCESS",1"VIEW",1"CONFIRM")))&&(TBXContext.ToonInfoAppTesterPagina())'>
 	<BR>
 	<TABLE width="730" border="0" cellpadding="1" style="margin:9px; border-collapse:collapse;">
 		<TR>
Index: APPS/TBXWeb/XXXContext.cls.xml
===================================================================
diff -u
--- APPS/TBXWeb/XXXContext.cls.xml	(revision 0)
+++ APPS/TBXWeb/XXXContext.cls.xml	(revision 1571)
@@ -0,0 +1,596 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.TBXWeb.XXXContext">
+<IncludeCode>APPS.TBXWeb,PRGACNTs</IncludeCode>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<UDLText name="T">
+<Content><![CDATA[
+/***   *** /
+
+Oproepen via :
+
+	Set TBXContext=##class(APPS.TBXWeb.XXXContext).InitFromHttpRequest()
+
+	Set sDomain=TBXContext.GeefHttpRequestDomein()
+	Set sDomCVT=TBXContext.GeefWebDomein()
+	Set sDomVERW=TBXContext.GeefDomeinVerwerker()
+	Set sDomKLNr=TBXContext.GeefDomeinKlantNummer()
+	Set Taal=TBXContext.GeefDefaultTaal()
+
+Copy-Paste template-jes:
+========================
+TBXContext.GeefDomeinVerwerker()
+TBXContext.IsDomeinVHEPN()
+
+TBXContext.KlantGegevensViaDataOpt()
+TBXContext.GeefDefaultTaal()
+##class(APPS.TBXWeb.XXXContext).GeefDefaultTaalVoorVerwerker(sDomVERW)
+
+/***   ***/
+]]></Content>
+</UDLText>
+
+<Property name="HttpRequestDomein">
+<Description>
+Is het domein letterlijk uit de URL  (kan dus bijvoorbeeld test.tandem-box.com zijn) </Description>
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="WebDomein">
+<Description>
+Bevat de conversie van het HttpRequestDomein 
+i.e. de correcte naam van het officiele domein in de productie-omgeving (bvb www.tandem-box.com) </Description>
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="DomeinVerwerker">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="DomeinKlantNummer">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="IsVHEPN">
+<Description>
+Van Hoecke : domein voor de klanten van Van Hoecke </Description>
+<Type>%Boolean</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="IsHEIN">
+<Description>
+Hein (Duitsland) </Description>
+<Type>%Boolean</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="IsLMC">
+<Description>
+LMC / Optima Pack (Frankrijk) </Description>
+<Type>%Boolean</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="IsDUPO">
+<Description>
+Dupont (Alain Leyssens, BE)</Description>
+<Type>%Boolean</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="IsHELMY">
+<Description>
+Destil,  ex: Helmondse Yzerhandel  (NL) </Description>
+<Type>%Boolean</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="IsHFLE">
+<Description>
+Haefele NL  (anonymous ingave) </Description>
+<Type>%Boolean</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="IsSFS">
+<Description>
+SFS unimarket (Zwitserland) </Description>
+<Type>%Boolean</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="IsMBHO">
+<Description>
+Meubelbeslag Holland  (NL) </Description>
+<Type>%Boolean</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="IsHFLB">
+<Description>
+Haefele BE  (met login) </Description>
+<Type>%Boolean</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>WebDomein:%String,HttpRequestDomein:%String=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..WebDomein=WebDomein
+	Set ..HttpRequestDomein=HttpRequestDomein   // HttpRequestDomein is optional 
+	
+	;Set lbDomLU=##class(WS.TBX.Order).DomainLookUp(WebDomein,$LB("VERW","KLNR"))   ; $$TBXDomainLU^cspBasis.Library(sDomCVT,$LB("VERW","KLNR"))
+	Set lbDomLU=..GeefDomeinData(WebDomein,$LB("VERW","KLNR"))
+	Set ..DomeinVerwerker=$LG(lbDomLU,1)
+	Set ..DomeinKlantNummer=$LG(lbDomLU,2)
+	
+	Set ..IsVHEPN=(..DomeinVerwerker="VHEPN")
+	Set ..IsHEIN=(..DomeinVerwerker="HEIN")
+	Set ..IsLMC=(..DomeinVerwerker="LMC")
+	Set ..IsDUPO=(..DomeinVerwerker="DUPO")
+	Set ..IsHELMY=(..DomeinVerwerker="HELMY")
+	Set ..IsHFLE=(..DomeinVerwerker="HFLE")
+	Set ..IsSFS=(..DomeinVerwerker="SFS")
+	Set ..IsMBHO=(..DomeinVerwerker="MBHO")
+	Set ..IsHFLB=(..DomeinVerwerker="HFLB")
+	; ... uit te breiden voor nieuwe domeinen 
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="InitFromHttpRequest">
+<Description><![CDATA[
+URL --> domain / sDomVERW / sDomKLNr
+Oproepen via :
+  Set TBXContext=##class(APPS.TBXWeb.XXXContext).InitFromHttpRequest() ]]></Description>
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	Set HttpRequestDomein=$$GetURLDomain^cspBasis.Library
+	Set WebDomein=$$TBXDomainCVT^cspBasis.Library(HttpRequestDomein)
+ 
+	Set TBXContext=##class(APPS.TBXWeb.XXXContext).%New(WebDomein,HttpRequestDomein)
+	/*
+	Set sDomain=TBXContext.GeefHttpRequestDomein()
+	Set sDomCVT=TBXContext.GeefWebDomein()
+	Set sDomVERW=TBXContext.GeefDomeinVerwerker()
+	Set sDomKLNr=TBXContext.GeefDomeinKlantNummer()
+	Set Taal=TBXContext.GeefDefaultTaal()
+	*/
+	Quit TBXContext
+]]></Implementation>
+</Method>
+
+<Method name="GeefDomeinData">
+<Description>
+Oproepen via : 
+   w ##class(APPS.TBXWeb.XXXContext).GeefDomeinData(Domain,lbFieldNames) </Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Domain:%String,lbFieldNames:%List</FormalSpec>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%List</ReturnType>
+<Implementation><![CDATA[
+	// the value of Domain must be all lowercase !!!
+	Quit:(Domain="") ""
+	Set lbVal=""
+	Do cdtFillArrayLU(.arLookupTBX,Domain)
+	For i=1:1:$LL(lbFieldNames) Set:($L($LG(lbFieldNames,i))) lbVal=lbVal_$LB(arLookupTBX($LI(lbFieldNames,i)))
+	Quit lbVal
+cdtFillArrayLU(arLookupTBX,Domain)
+	If Domain="www.tandem-box.com" {
+		Set arLookupTBX("VERW")="VHEPN"
+		Set arLookupTBX("KLNR")="4682"
+	}
+	ElseIf Domain="tbx.tandem-box.de" {
+		Set arLookupTBX("VERW")="HEIN"
+		Set arLookupTBX("KLNR")="7833"
+	}
+	ElseIf Domain="www.optima-tbx.fr" {
+		Set arLookupTBX("VERW")="LMC"
+		Set arLookupTBX("KLNR")="6279"
+	}
+	ElseIf Domain="tbx.du-pont.be" {
+		Set arLookupTBX("VERW")="DUPO"
+		Set arLookupTBX("KLNR")="1736"
+	}
+	ElseIf Domain="tbx.destil.nl" {
+		Set arLookupTBX("VERW")="HELMY"
+		Set arLookupTBX("KLNR")="4598"   ; Old="2127"  New="4598" (by WimV on 17/01/2006)
+	}
+	ElseIf Domain="hafele.tandem-box.com" {
+		Set arLookupTBX("VERW")="HFLE"
+		Set arLookupTBX("KLNR")="2671"
+	}
+	ElseIf Domain="tbx.sfsunimarket.biz" {
+		Set arLookupTBX("VERW")="SFS"
+		Set arLookupTBX("KLNR")="12486"
+	}
+	ElseIf Domain="demo.tandem-box.com" {
+		Set arLookupTBX("VERW")="VHEPN"
+		Set arLookupTBX("KLNR")="6819"
+	}
+	ElseIf Domain="demo.sfsunimarket.biz" {
+		Set arLookupTBX("VERW")="SFS"
+		Set arLookupTBX("KLNR")="12486"
+	}
+	ElseIf Domain=$$$TBoxWebDomeinMBHO {
+		Set arLookupTBX("VERW")="MBHO"
+		Set arLookupTBX("KLNR")=$$$TBoxWebKlantNrMBHO
+	}
+	ElseIf Domain=$$$TBoxWebDomeinHFLB {
+		Set arLookupTBX("VERW")="HFLB"
+		Set arLookupTBX("KLNR")=$$$TBoxWebKlantNrHFLB
+	}
+	Else {
+		Set arLookupTBX=""	
+	}
+	Quit
+]]></Implementation>
+</Method>
+
+<Method name="GeefWebDomeinVoorKlant">
+<Description>
+Oproepen via : 
+   w ##class(APPS.TBXWeb.XXXContext).GeefWebDomeinVoorKlant(KLNr) </Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>KLNr:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set WebDomein = $CASE(KLNr,
+							"4682"  : $$$TBoxWebDomeinVHEPN, 
+							"7833"  : $$$TBoxWebDomeinHEIN, 
+							"6279"  : $$$TBoxWebDomeinOPTIMA, 
+							"1736"  : $$$TBoxWebDomeinDUPONT, 
+							"4598"  : $$$TBoxWebDomeinHELMY, 
+							"2671"  : $$$TBoxWebDomeinHFLE, 
+							"12486" : $$$TBoxWebDomeinSFS, 
+							$$$TBoxWebKlantNrMBHO : $$$TBoxWebDomeinMBHO, 
+							$$$TBoxWebKlantNrHFLB : $$$TBoxWebDomeinHFLB, 
+							        : "" )   ; niet naar demo verwijzen ($$$TBoxWebDomeinDEMO)
+	Quit WebDomein
+]]></Implementation>
+</Method>
+
+<Method name="GeefDomeinKort">
+<Description>
+Oproepen via : 
+   w ##class(APPS.TBXWeb.XXXContext).GeefDomeinKort(WebDomein) </Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>WebDomein:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set DomeinKort = $CASE(WebDomein, 
+			 				$$$TBoxWebDomeinVHEPN  : "vh", 
+			 				$$$TBoxWebDomeinHEIN   : "hein", 
+			 				$$$TBoxWebDomeinOPTIMA : "optima", 
+			 				$$$TBoxWebDomeinDUPONT : "dupont", 
+			 				$$$TBoxWebDomeinHELMY  : "destil", 
+			 				$$$TBoxWebDomeinHFLE   : "hfle.nl", 
+			 				$$$TBoxWebDomeinSFS    : "sfs", 
+			 				$$$TBoxWebDomeinMBHO   : "mbho", 
+			 				$$$TBoxWebDomeinHFLB   : "hfle.be", 
+			 				$$$TBoxWebDomeinDEMO   : "demo", 
+			 				 : WebDomein )
+	Quit DomeinKort
+]]></Implementation>
+</Method>
+
+<Method name="GeefWebDomeinVoorAfkorting">
+<Description>
+Oproepen via : 
+   w ##class(APPS.TBXWeb.XXXContext).GeefWebDomeinVoorAfkorting(DomeinKort) </Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>DomeinKort:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set WebDomein = $CASE(DomeinKort, 
+			 				"vh"      : $$$TBoxWebDomeinVHEPN, 
+			 				"hein"    : $$$TBoxWebDomeinHEIN,
+			 				"optima"  : $$$TBoxWebDomeinOPTIMA,
+			 				"dupont"  : $$$TBoxWebDomeinDUPONT,
+			 				"destil"  : $$$TBoxWebDomeinHELMY,
+			 				"hf"      : $$$TBoxWebDomeinHFLE,
+			 				"sfs"     : $$$TBoxWebDomeinSFS,
+			 				"mbho"    : $$$TBoxWebDomeinMBHO,
+			 				"hfle.nl" : $$$TBoxWebDomeinHFLE,
+			 				"hfle.be" : $$$TBoxWebDomeinHFLB,
+			 				"demo"    : $$$TBoxWebDomeinDEMO, 
+			 				 : DomeinKort )
+	Quit WebDomein
+]]></Implementation>
+</Method>
+
+<Method name="GeefWebDomein">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..WebDomein
+]]></Implementation>
+</Method>
+
+<Method name="GeefHttpRequestDomein">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..HttpRequestDomein
+]]></Implementation>
+</Method>
+
+<Method name="IsDomeinVHEPN">
+<Implementation><![CDATA[	Quit ..IsVHEPN
+]]></Implementation>
+</Method>
+
+<Method name="IsDomeinHEIN">
+<Implementation><![CDATA[	Quit ..IsHEIN
+]]></Implementation>
+</Method>
+
+<Method name="IsDomeinSFS">
+<Implementation><![CDATA[	Quit ..IsSFS
+]]></Implementation>
+</Method>
+
+<Method name="GeefDomeinVerwerker">
+<Implementation><![CDATA[	Quit ..DomeinVerwerker
+]]></Implementation>
+</Method>
+
+<Method name="GeefDomeinKlantNummer">
+<Implementation><![CDATA[	Quit ..DomeinKlantNummer
+]]></Implementation>
+</Method>
+
+<Method name="IsOngeldigDomein">
+<Implementation><![CDATA[	Quit (..DomeinVerwerker="")||(..DomeinKlantNummer'>0)
+]]></Implementation>
+</Method>
+
+<Method name="GeefDefaultTaal">
+<Implementation><![CDATA[	Quit ..GeefDefaultTaalVoorVerwerker(..DomeinVerwerker)
+]]></Implementation>
+</Method>
+
+<Method name="GeefDefaultTaalVoorVerwerker">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>sDomVERW:%String</FormalSpec>
+<Implementation><![CDATA[	Quit $S(sDomVERW="HEIN":"D", sDomVERW="LMC":"F", sDomVERW="SFS":"D", 1:"N")
+]]></Implementation>
+</Method>
+
+<Method name="MagAndereTaalKiezen">
+<Implementation><![CDATA[	Quit (..IsVHEPN||..IsSFS)
+]]></Implementation>
+</Method>
+
+<Method name="AlleenToegangZonderLogin">
+<Description>
+De domeinen die voorzien dat enkel via anonymous kan worden ingegeven. 
+D.w.z. klanten hebben niet de mogelijkheid om via de WebShop (van de betreffende handel) in te loggen </Description>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (..DomeinVerwerker?1(1"HFLE",1"HELMY",1"DUPO"))
+]]></Implementation>
+</Method>
+
+<Method name="HeeftToegangZonderLogin">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	// Op tandem-box.com (VHEPN) is zowel toegang MET login als toegang ZONDER login mogelijk 
+	Quit (..IsVHEPN) || (..AlleenToegangZonderLogin())
+]]></Implementation>
+</Method>
+
+<Method name="HeeftToegangMetLogin">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (..IsVHEPN) || (..IsLMC||..IsSFS||..IsMBHO||..IsHFLB)
+]]></Implementation>
+</Method>
+
+<Method name="AlleenToegangMetLogin">
+<Description>
+is doorverwijzing naar de method ..KlantGegevensViaDataOpt() </Description>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (..KlantGegevensViaDataOpt())
+]]></Implementation>
+</Method>
+
+<Method name="KlantGegevensViaDataOpt">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (..IsLMC||..IsSFS||..IsMBHO||..IsHFLB)
+]]></Implementation>
+</Method>
+
+<Method name="IsIPvanSFS">
+<Description>
+Toegang voor de TestDataOpt page : beperkt via controle op IP-adres </Description>
+<FormalSpec>IP:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit IP?1(1"77.59.193.234",1"195.141.221.1")
+]]></Implementation>
+</Method>
+
+<Method name="IsIPvanMBHO">
+<Description>
+Toegang voor de TestDataOpt page : beperkt via controle op IP-adres </Description>
+<FormalSpec>IP:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit IP?1(1"217.21.251.83")
+]]></Implementation>
+</Method>
+
+<Method name="IsIPvanHFLB">
+<Description>
+Toegang voor de TestDataOpt page : beperkt via controle op IP-adres </Description>
+<FormalSpec>IP:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit $$$AccessTestPageDataOptHFLB(IP)   ; IP?1(1"194.78.193.29")
+]]></Implementation>
+</Method>
+
+<Method name="IsIPvanOptima">
+<Description>
+Toegang voor de TestDataOpt page : beperkt via controle op IP-adres </Description>
+<FormalSpec>IP:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit IP?1(1"92.103.129.165",1"212.103.4.85")
+]]></Implementation>
+</Method>
+
+<Method name="HeeftToegangTotFixOptimaPage">
+<Description>
+Toegang voor OptimaFIX page : beperkt via controle op IP-adres </Description>
+<FormalSpec>IP:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Quit (..IsLMC)&&(IP?1(1"92.103.129.165",1"92.103.129.172",1"92.103.129.174",1"192.168.1."1.3N))
+	// PREVIOUS IP's(IP?1(1"212.103.4.85")           ; No longer in use by Optima
+]]></Implementation>
+</Method>
+
+<Method name="IsVerwerkerToegelaten">
+<Description>
+De button "ExportXML" voor een bestelling is beschikbaar </Description>
+<FormalSpec>VERW:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Quit:(..IsVHEPN) (VERW="VHEPN")
+	Quit:('..IsVHEPN) ((VERW="VHEPN")||(VERW=..DomeinVerwerker))
+]]></Implementation>
+</Method>
+
+<Method name="IsBeschikbaarExportXML">
+<Description>
+De button "ExportXML" voor een bestelling is beschikbaar </Description>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (..IsVHEPN)
+]]></Implementation>
+</Method>
+
+<Method name="ToonAlgemeneVoorwaarden">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (..IsVHEPN)||(..IsHEIN)||(..IsSFS)   ; $$$Not(..IsLMC||..IsDUPO||..IsHELMY||..IsHFLE||..IsMBHO)
+]]></Implementation>
+</Method>
+
+<Method name="ToonInfoAppTesterPagina">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	// Nieuwere domeinen toevoegen 
+	Quit (..DomeinVerwerker'?1(1"HFLB"))
+]]></Implementation>
+</Method>
+
+<Method name="SubmitToVHviaCspPage">
+<Description>
+Bestelling verzenden naar VH via de mainpage (csp) mogelijk. 
+(is enkel voor externe domeinen) </Description>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Set Result=0
+	If ..DomeinVerwerker="SFS" {
+		Set Result=1   ; voor SFS geldt in de eerste plaats: Submit via WebService, maar als backup kunnen ze nog steeds submitten vanuit de mainpage (csp) 
+	}
+	Else {
+		Set Result=(..DomeinVerwerker?1(1"DUPO",1"HELMY",1"HFLE",1"MBHO",1"HFLB"))    ; ..DomeinVerwerker'?1(1"VHEPN",1"HEIN",1"LMC")   ; 1"SFS"
+	}
+	Quit Result
+]]></Implementation>
+</Method>
+
+<Method name="StatusInkoopAlsOrderToVH">
+<Description>
+Bij bestelling verzenden naar VH wijzigt het BonType van BBON naar INKP 
+(is enkel voor externe domeinen) </Description>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ..DomeinVerwerker?1(1"DUPO",1"HELMY",1"HFLE",1"SFS",1"MBHO",1"HFLB")   ; ..DomeinVerwerker'?1(1"VHEPN",1"HEIN",1"LMC")
+]]></Implementation>
+</Method>
+
+<Method name="VerzendOfferteAlsAanvraag">
+<Description><![CDATA[
+Offerte (OFF) verzenden als prijsaanvraag. 
+Voorlopig enkel voor HEIN. 
+Bij de andere domeinen wordt een ingave (offerte) verzonden als bestelbon, wat overeenkomt met "Goed voor Order" --> OFFTOBBON=1 
+Een prijsaanvraag voor 'Anonymous' gebruikers loopt via een OfferteAanvraag, i.e. BonType="OFFAV" ]]></Description>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ..DomeinVerwerker="HEIN"
+]]></Implementation>
+</Method>
+
+<Method name="GeefMuntEenheid">
+<Description>
+Geeft de munteenheid van het domein</Description>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit $S(..DomeinVerwerker="SFS":"CHF", 1:"EUR")
+]]></Implementation>
+</Method>
+
+<Method name="GeefUserMuntEenheid">
+<Description>
+Geeft de munteenheid van het domein of voor verwerker VHEPN op extern domein 
+Zie ook routine  GetUserMunt^cspBasis.Library.MAC  voor de oude implementatie </Description>
+<FormalSpec>VERW:%String=""</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit $S(VERW="VHEPN":"EUR", 1:..GeefMuntEenheid())
+]]></Implementation>
+</Method>
+
+<Method name="ToonKnopDupliceerEnWijzig">
+<Description>
+De button voor het dupliceren van een order/offerte tonen. </Description>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Set ToonKnop=$$$Not( (..IsHEIN)||(..IsDUPO)||(..IsHELMY)||(..IsHFLE) )   ; DupliceerEnWijzig is momenteel nog niet mogelijk voor Anonymous accounts 
+ 	Quit ToonKnop
+]]></Implementation>
+</Method>
+
+<Method name="ToonKnopHttpRequestTestpage">
+<Description>
+De button voor de Testpage van HttpRequest kan hier geactiveerd worden.  Is meestal tijdelijk. </Description>
+<FormalSpec>KLNr:%String=""</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Set ToonKnop=0
+	If ..IsVHEPN {
+		// Reeds eerder toegelaten klanten :  (nieuwe KLNr's vooraan toevoegen  --> historiek) 
+		//   KLNr= 999999 / 14937 / 12848 / 14484 / 3524 / 8575 / 5977 / 10096 /10939 / 4137 / 10547 / 5872 / 8537 / 4874 / 1093 / 8537 / 2118     --> 999999 = disabled 
+	 	If KLNr=999999 {
+		 	Set ToonKnop=1
+	 	}
+	}
+ 	Quit ToonKnop
+]]></Implementation>
+</Method>
+
+<UDLText name="T">
+<Content><![CDATA[
+/*
+Method Geef() As %Boolean
+{
+	Quit 0
+}
+
+Method Geef() As %Boolean
+{
+	Quit 0
+}
+
+Method Geef() As %Boolean
+{
+	Quit 0
+}
+
+
+*/
+]]></Content>
+</UDLText>
+</Class>
+</Export>
Index: cspBasis/GAProdTBox.cls.xml
===================================================================
diff -u -r1204 -r1571
--- cspBasis/GAProdTBox.cls.xml	(.../GAProdTBox.cls.xml)	(revision 1204)
+++ cspBasis/GAProdTBox.cls.xml	(.../GAProdTBox.cls.xml)	(revision 1571)
@@ -44,7 +44,7 @@
 #define smCleanSave     "CleanSave"
 	  ;s:('$D(%ClientIP)) %ClientIP="192.168.1.97"
 	  ;d WLIP^vhDBG(97,$G(sDomVERW)_" - "_$G(KLNr)_" - "_$$$LCVT(lbFlags))
-	New blnVHEPN,blnLMC,blnHFLE,blnSFS,blnMBHO,flgGetFrom,flgStorageMode,lbGetData,i,KLMini
+	New blnVHEPN,blnLMC,blnHFLE,blnSFS,blnMBHO,blnHFLB,flgGetFrom,flgStorageMode,lbGetData,i,KLMini
 	Do gkdInitialize 
 	Set KLMini=""
 	For i=1:1:$LL(lbGetData) Do  Quit:($IsObject(KLMini))
@@ -57,6 +57,7 @@
 	Set blnHFLE=(sDomVERW="HFLE")
 	Set blnSFS=(sDomVERW="SFS")
 	Set blnMBHO=(sDomVERW="MBHO")
+	Set blnHFLB=(sDomVERW="HFLB")
 	If blnVHEPN Do
 	. Set flgGetFrom=$LG(lbFlags,$$$liGetFrom,"Ext")
 	. Set flgStorageMode=$LG(lbFlags,$$$liStorageMode,$$$smNoAction)
@@ -78,7 +79,7 @@
 	Set KLData=$G($$$GlobalKLData(sDomVERW,KLNr))
 	Quit:(KLData="")
 	; Else 
-	If blnLMC||blnSFS||blnMBHO Do
+	If blnLMC||blnSFS||blnMBHO||blnHFLB Do
 	. Do OPTIMAAnalyseData^cspBasis.TBX.DecodeURL.tmpDev(KLData,.tmpAr)   ; Analyse only, KLData already decrypted
 	. Set KLMini=##class(WS.TBX.KlantMini).%New()
 	. Set KLMini.Taal  =$G(tmpAr("Taal"))
@@ -95,7 +96,7 @@
 	Quit 
 gkdDataFromExternal
 	New KLData
-	If blnLMC||blnSFS||blnMBHO Do
+	If blnLMC||blnSFS||blnMBHO||blnHFLB Do
 	. Set KLMini=$$GetKlantDataViaQS(.KLData)
 	. Set:(KLMini) KLNr=KLMini.Nummer
 	Else  If blnVHEPN Do
@@ -112,7 +113,7 @@
 	Quit:(flgStorageMode=$$$smClean)
 	Quit:('$IsObject(KLMini))
 	; Else : Save the data
-	If blnLMC||blnSFS||blnMBHO Do
+	If blnLMC||blnSFS||blnMBHO||blnHFLB Do
 	. Set $$$GlobalKLData(sDomVERW,KLNr)=KLData
 	Quit
 
@@ -134,6 +135,10 @@
 	. Set Data=$G(%request.Data("DATAOPT",1))
 	. Set Data=$$OPTIMADecryptData^cspBasis.TBX.DecodeURL.tmpDev(Data,.tmpAr,"MBHO")
 	. Quit:(Data="")
+	If blnHFLB Do
+	. Set Data=$G(%request.Data("DATAOPT",1))
+	. Set Data=$$OPTIMADecryptData^cspBasis.TBX.DecodeURL.tmpDev(Data,.tmpAr,"HFLB")
+	. Quit:(Data="")
 	If Data'="" Do
 	. Set KLMini=##class(WS.TBX.KlantMini).%New()
 	. Set KLMini.Taal  =$$$ReplaceBackQuote($G(tmpAr("Taal")))
@@ -1005,14 +1010,18 @@
 <FormalSpec><![CDATA[&arConfig:%String]]></FormalSpec>
 <ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
-#define TaalDfl   $S(sDomVERW="HEIN":"D", sDomVERW="LMC":"F", sDomVERW="SFS":"D", 1:"N")
-	//   URL --> domain / sDomVERW / sDomKLNr
-	Set sDomain=$$GetURLDomain^cspBasis.Library
-	Set sDomCVT=$$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=$$$TaalDfl
+	// Modified by WimV on 23/06/2011 : 
+	// Implementatie met TBXContext-object   i.p.v. ##class(WS.TBX.Order).DomainLookUp(sDomCVT,$LB("VERW","KLNR"))
+	Set TBXContext=##class(APPS.TBXWeb.XXXContext).InitFromHttpRequest()
+
+	Set sDomain=TBXContext.GeefHttpRequestDomein()
+	Set sDomCVT=TBXContext.GeefWebDomein()
+ ;	Set lbDomLU=##class(WS.TBX.Order).DomainLookUp(sDomCVT,$LB("VERW","KLNR"))
+	Set sDomVERW=TBXContext.GeefDomeinVerwerker()
+	Set sDomKLNr=TBXContext.GeefDomeinKlantNummer()
+	Set Taal=TBXContext.GeefDefaultTaal()
+	
+	// arConfig als .local doorgeven.   OPGELET: de andere variabelen niet opkuisen, want kunnen mogelijk nog via  [ProcebureBlock = 0]  opgevraagd worden   :-( 
 	Set arConfig("sDomain")=sDomain
 	Set arConfig("sDomCVT")=sDomCVT
 	Set arConfig("sDomVERW")=sDomVERW
@@ -1050,7 +1059,7 @@
 	; New Domain,UrlBase,WSOrdID,RefEnc, VERW
 	Set Domain=""
 	If SwitchDomain Do
-	. Set Domain=$$ltwTranslateDomain(KLNr)
+	. Set Domain=##class(APPS.TBXWeb.XXXContext).GeefWebDomeinVoorKlant(KLNr)
 	. Set:(Domain'="") KLNr=""
 	Set:(Domain="") Domain="www.tandem-box.com"
 	Set UrlBase="http://"_Domain_"/VHISIE/TBX/main.csp"
@@ -1062,19 +1071,6 @@
 	Set VERW="VHEPN"
 	Set RefEnc=$$CreateHashedRef^cspBasis.TBX.DecodeURL.tmpDev($LB(KLNr,VERW,WSOrdID,sMode))
 	Quit UrlBase_"?REF="_$$$EscapeURL(RefEnc)
-ltwTranslateDomain(KLNr)
-	; Temporary lookup method!
-	; Should be replaced by a lookup in Config-Global
-#define DomVHEPN     $$$TBoxWebDomeinVHEPN
-#define DomHEIN      $$$TBoxWebDomeinHEIN
-#define DomOPTIMA    $$$TBoxWebDomeinOPTIMA
-#define DomDUPONT    $$$TBoxWebDomeinDUPONT
-#define DomHELMY     $$$TBoxWebDomeinHELMY
-#define DomHFLE      $$$TBoxWebDomeinHFLE
-#define DomSFS       $$$TBoxWebDomeinSFS
-#define DomMBHO      $$$TBoxWebDomeinMBHO
-#define DomDEMO      $$$TBoxWebDomeinDEMO
-	Quit $CASE(KLNr,  "7833":$$$DomHEIN, "6279":$$$DomOPTIMA, "1736":$$$DomDUPONT, "4598":$$$DomHELMY, "2671":$$$DomHFLE, "12486":$$$DomSFS, $$$TBoxWebKlantNrMBHO:$$$DomMBHO, :"")   ; niet naar demo verwijzen ($$$DomDEMO)
 ]]></Implementation>
 </Method>
 
Index: csp/vhisie/TBX/MailResult/tmpDev.mac.rou
===================================================================
diff -u -r1300 -r1571
--- csp/vhisie/TBX/MailResult/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 1300)
+++ csp/vhisie/TBX/MailResult/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 1571)
@@ -48,7 +48,7 @@
 	Set:($L(sComments)) WSOrd.Opmerking1=sComments
 	Set sc=WSOrd.%Save()
 	Set blnOFFToBBON=(WSOrd.BonType="OFF")&&($G(%request.Data("OFFTOBBON",1))=1)
-	Set blnViaNewImplementation=(sDomVERW?1(1"SFS",1"MBHO"))   ; SFS en MBHolland gebruiken de nieuwe implementatie van APPS.TBXWeb.OrderHandling 
+	Set blnViaNewImplementation=(sDomVERW?1(1"SFS",1"MBHO",1"HFLB"))   ; SFS en MBHolland gebruiken de nieuwe implementatie van APPS.TBXWeb.OrderHandling 
 	If (blnOFFToBBON)&&('blnViaNewImplementation) Do   ; Status OFF change to BBON
 	. Set WSOrd.BonType="BBON"
 	
@@ -72,6 +72,8 @@
 	. Do tsmMailFldsSFS
 	Else  If sDomVERW="MBHO" Do
 	. ;Do tsmMailFldsMBHO
+	Else  If sDomVERW="HFLB" Do
+	. ;Do tsmMailFldsHFLB
 	Else  Do
 	. Do tsmMailFldsVHEPN
 	Set BodyIsStream=0
@@ -291,7 +293,11 @@
 	$$$ThrowError($$$errGeneralError,"OrderHandling via Old method is disabled. OrderHandling must use new implementation.")
 	Quit
  
+tsmMailFldsHFLB
+	$$$ThrowError($$$errGeneralError,"OrderHandling via Old method is disabled. OrderHandling must use new implementation.")
+	Quit
  
+ 
 tsmMailFldsVHEPN
 	;Set From=$S($$$EMailValid(WSOrd.KLEMail):$S($L(WSOrd.KLNaam):""""_WSOrd.KLNaam_""" ", 1:"")_"<"_WSOrd.KLEMail_">", 1:""""_$S($L(WSOrd.KLNaam):WSOrd.KLNaam, 1:"Anonymous")_""" <AdminTBX@vanhoecke.be>")
     Set From=""""_$S($L(WSOrd.KLNaam):WSOrd.KLNaam, 1:"Anonymous")_""" <"_$$$EMailFrom2Any_">"
@@ -431,6 +437,8 @@
     . Do tsmMailFldsSFS
     Else  If sDomVERW="MBHO" Do
     . Do tsmMailFldsMBHO
+    Else  If sDomVERW="HFLB" Do
+    . Do tsmMailFldsHFLB
     Else  Do
     . Do tsmMailFldsVHEPN
 	Set BodyIsStream=0
Index: PRGACNTs.inc.rou
===================================================================
diff -u -r1029 -r1571
--- PRGACNTs.inc.rou	(.../PRGACNTs.inc.rou)	(revision 1029)
+++ PRGACNTs.inc.rou	(.../PRGACNTs.inc.rou)	(revision 1571)
@@ -110,6 +110,7 @@
 	#define OptimaKey                  "vanhoeckeOPTIMAL"
 	#define SfsOptKey                  "SFS.unimarket2VH"
 	#define MBHollandOptKey            "NL_MeuHo.VH!lAdE"
+	#define HafeleBEOptKey             "BE-tbx.H@fele&VH"
 	
 	; Toegang voor OptimaFIX page : beperkt via controle op IP-adres 
 	;   !!! Te compileren in routines :           
@@ -124,9 +125,9 @@
 	#define AccessTestPageDataOptLMC(%ip)           (%ip?1(1"92.103.129.165",1"212.103.4.85"))
 	#define AccessTestPageDataOptSFS(%ip)           (%ip?1(1"77.59.193.234",1"195.141.221.1"))
 	#define AccessTestPageDataOptMBHO(%ip)          (%ip?1(1"217.21.251.83"))
+	#define AccessTestPageDataOptHFLB(%ip)          (%ip?1(1"194.78.193.29"))
  
  
- 
  ; Munt pariteit voor vreemde munten 
  ; --------------------------------- 
 	//      CHF : Zwitserse Frank (voor SFS)   1 EUR = 1.513 CHF 
Index: DW/WWW/SysLogTBX.cls.xml
===================================================================
diff -u -r1247 -r1571
--- DW/WWW/SysLogTBX.cls.xml	(.../SysLogTBX.cls.xml)	(revision 1247)
+++ DW/WWW/SysLogTBX.cls.xml	(.../SysLogTBX.cls.xml)	(revision 1571)
@@ -203,18 +203,7 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Domein:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-#define DomVHEPN     $$$TBoxWebDomeinVHEPN
-#define DomHEIN      $$$TBoxWebDomeinHEIN
-#define DomOPTIMA    $$$TBoxWebDomeinOPTIMA
-#define DomDUPONT    $$$TBoxWebDomeinDUPONT
-#define DomHELMY     $$$TBoxWebDomeinHELMY
-#define DomHFLE      $$$TBoxWebDomeinHFLE
-#define DomSFS       $$$TBoxWebDomeinSFS
-#define DomMBHO      $$$TBoxWebDomeinMBHO
-#define DomDEMO      $$$TBoxWebDomeinDEMO
-
- Quit $CASE(Domein, $$$DomVHEPN:"vh", $$$DomHEIN:"hein", $$$DomOPTIMA:"optima", $$$DomDUPONT:"dupont", $$$DomHELMY:"destil", $$$DomHFLE:"hafele", $$$DomSFS:"sfs", $$$DomMBHO:"mbho", $$$DomDEMO:"demo", :Domein)
+<Implementation><![CDATA[	Quit ##class(APPS.TBXWeb.XXXContext).GeefDomeinKort(Domein)
 ]]></Implementation>
 </Method>
 
Index: _csp/httplog/queryVH.csp
===================================================================
diff -u -r1254 -r1571
--- _csp/httplog/queryVH.csp	(.../queryVH.csp)	(revision 1254)
+++ _csp/httplog/queryVH.csp	(.../queryVH.csp)	(revision 1571)
@@ -236,24 +236,14 @@
 <SCRIPT method="BuildHRef" language="Cache" arguments="query" returntype="%String">
 #include APPS.TBXWeb
 #include PRGACNTs
-#define DomVHEPN     $$$TBoxWebDomeinVHEPN
-#define DomHEIN      $$$TBoxWebDomeinHEIN
-#define DomOPTIMA    $$$TBoxWebDomeinOPTIMA
-#define DomDUPONT    $$$TBoxWebDomeinDUPONT
-#define DomHELMY     $$$TBoxWebDomeinHELMY
-#define DomHFLE      $$$TBoxWebDomeinHFLE
-#define DomSFS       $$$TBoxWebDomeinSFS
-#define DomMBHO      $$$TBoxWebDomeinMBHO
-#define DomDEMO      $$$TBoxWebDomeinDEMO
 
 #define BldRefPg     "http://cache02/VHISIE/TBX/BuildRef.csp"
 #define BldRefPgIP   "http://192.168.1.67/VHISIE/TBX/BuildRef.csp"
-#define DomainDFL    $$$DomVHEPN
 #define QryVal(%v)   query.GetDataByName(%v)
 
 	New sDomain,sDomFull,sRef
-	Set sDomain=query.GetDataByName("Domein")
-	Set sDomain=$CASE(sDomain, "vh":$$$DomVHEPN, "hein":$$$DomHEIN, "optima":$$$DomOPTIMA, "dupont":$$$DomDUPONT, "destil":$$$DomHELMY, "hafele":$$$DomHFLE, "sfs":$$$DomSFS, "mbho":$$$DomMBHO, "demo":$$$DomDEMO, "":$$$DomainDFL, :sDomain)
+	Set sDomain=query.GetDataByName("Domein")   ; Geeft eigenlijk DomeinKort
+	Set sDomain=##class(APPS.TBXWeb.XXXContext).GeefWebDomeinVoorAfkorting(sDomain)   ; $CASE(sDomain, "vh":$$$DomVHEPN, "hein":$$$DomHEIN, "optima":$$$DomOPTIMA, "dupont":$$$DomDUPONT, "destil":$$$DomHELMY, "hafele":$$$DomHFLE, "sfs":$$$DomSFS, "mbho":$$$DomMBHO, "demo":$$$DomDEMO, "":$$$DomainDFL, :sDomain)
 	Set sDomFull="http://"_sDomain_"/"_"VHISIE/TBX/"
 	Set sRef=$$$URL($$$QryVal("VERW")_"\"_$$$QryVal("KLNr")_"\"_$$$QryVal("OrdID")_"\"_"VIEW")   ; $$$QryVal("Mode")   ; "VHEPN\2009\2835\COMPLETE"
 	Quit $$$BldRefPg_"?"_"REF="_sRef_"&"_"PAGE="_sDomFull_"main.csp"_"&"_"URLTAAL="_$$$QryVal("Taal")_$S($$$QryVal("KLNr")=$$$KLNrListAll:"&HIST=1",1:"")_"&"_"SUBMIT="_"Encrypt"
Index: _vhisie/TBX/WizPData.csp
===================================================================
diff -u -r1133 -r1571
--- _vhisie/TBX/WizPData.csp	(.../WizPData.csp)	(revision 1133)
+++ _vhisie/TBX/WizPData.csp	(.../WizPData.csp)	(revision 1571)
@@ -46,15 +46,15 @@
 	. . Set arPDT("TEL")=" "
 	. ;Set arPDT("PKLASSE")=KLMini.PrijsKlasse   ; In HTML/JavaScript genaamd: AfdrukCode
 	. Set KLMini=""
-	Else  If (blnLMC||blnSFS||blnMBHO)&&(wsID>0) Do
+	Else  If (blnLMC||blnSFS||blnMBHO||blnHFLB)&&(wsID>0) Do
 	. ; OPTIMA / SFS / MBHO  Bestaand order
 	. New WSOrd
 	. Set WSOrd=##class(WS.TBX.Order).%OpenId(wsID)
 	. Quit:('WSOrd)
 	. Set arPDT("NAAM")=WSOrd.KLNaam
 	. Set arPDT("NR")=WSOrd.KLNummer
 	. Set WSOrd=""
-	Else  If (blnLMC||blnSFS||blnMBHO) Do
+	Else  If (blnLMC||blnSFS||blnMBHO||blnHFLB) Do
 	. ; OPTIMA / SFS / MBHO  Nieuw order, klantgegevens ophalen
 	. Set KLMini=..GetKlantData(sDomVERW,KLNr)
 	. Quit:('KLMini)
@@ -80,7 +80,7 @@
 	If blnVHEPN Do
 	. Set blnKLNaamFixed=($G(KLNr)>0)&&(KLNr'?1(1"1000",1"4645",1"4682"))
 	. ;Set %session.Data("KLPrijsKlasse")=$G(arPDT("PKLASSE"))
-	If blnLMC||blnSFS||blnMBHO Do
+	If blnLMC||blnSFS||blnMBHO||blnHFLB Do
 	. Set arPDT("NAAM+NR")=$G(arPDT("NR"))_" "_$G(arPDT("NAAM"))
 	Set LevertijdInfoVTL=$$$GetVertalingJS("LevertijdInfo",Taal,"O")
 
@@ -180,7 +180,7 @@
 			<TD><input type="text" class="clsFieldsData" id="txtKL_BTWNr" style="text-align:left; width:100%;"#($$$ReadOnlyAttrib(IsKLDataReadOnly)_$$$LabelAttrib("BTWNummer"))#></TD>
 			<TD>&nbsp;</TD>
 		</TR>
-		<CSP:ELSEIF condition="blnSFS||blnMBHO">
+		<CSP:ELSEIF condition="blnSFS||blnMBHO||blnHFLB">
 		<input type="hidden" id="txtKL_Korting" #($$$ReadOnlyAttrib(IsKLDataReadOnly)_$$$InitVal("KORTING"))#>
 		<CSP:ELSE>
 		<input type="hidden" id="txtKL_BTWNr" #($$$ReadOnlyAttrib(IsKLDataReadOnly)_$$$InitVal("KLBTWNr"))#>
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,"")
Index: _vhisie/TBX/BuildRef.csp
===================================================================
diff -u -r757 -r1571
--- _vhisie/TBX/BuildRef.csp	(.../BuildRef.csp)	(revision 757)
+++ _vhisie/TBX/BuildRef.csp	(.../BuildRef.csp)	(revision 1571)
@@ -136,7 +136,7 @@
 		<TR>
 			<TD align="right">VERW: </TD>
 			<TD><NOBR><INPUT type="text" name="VERW" style="width:90px;" value="#(VERW)#">&nbsp;&nbsp;<SPAN class="clsPreset"
-				>#($$$txtFillV(v,VHEPN)_""_$$$txtFillV(o,LMC)_$$$txtFillV(h,HEIN)_$$$txtFillV(d,HELMY)_$$$txtFillV(hf,HFLE)_$$$txtFillV(s,SFS)_$$$txtFillV(mh,MBHO))#</SPAN></NOBR></TD>    <!-- _$$$txtFillV(du,DUPO) -->
+				>#($$$txtFillV(v,VHEPN)_""_$$$txtFillV(o,LMC)_$$$txtFillV(h,HEIN)_$$$txtFillV(d,HELMY)_$$$txtFillV(hf,HFLE)_$$$txtFillV(s,SFS)_$$$txtFillV(mh,MBHO)_$$$txtFillV(hfb,HFLB))#</SPAN></NOBR></TD>    <!-- _$$$txtFillV(du,DUPO) -->
 			<TD align="right">DATAOPT: </TD>
 			<TD colspan="2"><INPUT type="text" name="DATAOPT" value="#(DataOptOut)#" style="width:200px;"></TD>
 		</TR>
Index: _vhisie/TBX/TestDataOptHFLB.csp
===================================================================
diff -u
--- _vhisie/TBX/TestDataOptHFLB.csp	(revision 0)
+++ _vhisie/TBX/TestDataOptHFLB.csp	(revision 1571)
@@ -0,0 +1,229 @@
+<HTML>
+
+<CSP:CLASS super="%CSP.Page,cspBasis.GAProdTBox" encoded="0" private="0">
+<CSP:Include page="PRGACNTs.INC">
+
+<SCRIPT method="OnPreHTTP" language="Cache" arguments="" returntype="%Boolean">
+	Quit $$OnPreHTTPTestDataOpt^csp.vhisie.TBX.BuildRef.tmpDev("HFLB")
+</SCRIPT>
+
+<SCRIPT method="CustomEHandlerInit" language="Cache" arguments="lbErrTypes" returntype="">
+	Do ##class(cspBasis.GAProdTBox).CustomEHandlerInitTBX(.lbErrTypes)
+	Quit
+</SCRIPT>
+
+<SCRIPT language="cache" runat="server">
+	Set %session.AppTimeout = 905
+	// Session Data is set in the OnPreHTTP-method
+	Set WSOrd=$S($G(wsID)="":0, 1:##class(WS.TBX.Order).%OpenId(wsID))
+</SCRIPT>
+
+<HEAD>
+	<TITLE>TEST DATAOPT Hafele.be</TITLE>
+	<STYLE type="text/css">
+	BODY               { margin:0; font-family:Arial; }
+	INPUT              { font-family:Courier New,Courier,mono; color:blue; vertical-align:middle; }
+	TEXTAREA           { font-family:Courier New,Courier,mono; color:blue; }
+	PRE                { margin:0; margin-left:10px; font-family:Courier New; }
+	.clsButtonSubmit   { font-family:Arial; color:black; margin:5px; }
+	.clsButtonGo       { background-color:#FF460A; color:#FFFFFF; font-family:Arial; font-weight:bold; border:solid black 1px; cursor:pointer; cursor:hand }
+	.clsRefCheck       { font-family:Courier New,Courier,mono; color:blue; }
+	.clsTmrSkeleton	   { position:relative; height:auto; width:100%; color:#FFFFFF; background-color:#AAAAAA; border:none; padding:2px; }
+    </STYLE>
+	<LINK REL="stylesheet" TYPE="text/css" HREF="TBoxMain.css"/>
+	<LINK REL="stylesheet" TYPE="text/css" HREF="tbx.css"/>
+	<SCRIPT src="TBoxBuildRef.js"></SCRIPT>
+
+	<SCRIPT language="javascript">
+	var ActiveTaal = "#(Taal)#";
+
+	function cspRenewSession ()  {
+		window.location.reload(true);
+	}
+	</SCRIPT>
+</HEAD>
+
+<BODY onload="init();" style="background-color:#FFFFFF;">
+	<TABLE border="0" width="750" style="border-collapse:collapse; background-color:#E4E4E4;">
+ 		<TR height="70">
+			<TD>
+				<CSP:Include Page="Header.csp">
+			</TD>
+		</TR>
+ 		<TR height="1px">
+			<TD class="BorderTop BorderBottom"><img src="media/Spacer.gif" border="0"/></TD>
+		</TR>
+		<TR height="500" valign="top">
+			<TD height="500">
+
+<CSP:IF condition="$G(blnNoAccess)">
+	<TABLE width="730" border="0" cellpadding="1" class="clsTableInput" style="border-collapse:collapse;">
+ 		<TR height="50">
+			<TD>
+				<SPAN style="color:red; font-weight:bold">
+					&nbsp;#(..WebTextValue("MainBadCode",Taal,"O"))#
+				</SPAN>
+			</TD>
+		</TR>
+	</TABLE>
+<CSP:ELSE>
+	<FORM name="frmDecryptRef" action="TestDataOptHFLB.csp" method="post">
+	<TABLE width="730" border="0" cellpadding="1" class="" style="margin:10px; border-collapse:collapse;">
+		<COLGROUP>
+			<COL align="left"  width="20%"/>
+			<COL align="left"  width="20%"/>
+			<COL align="left"  width="20%"/>
+			<COL align="left"  width="20%"/>
+			<COL align="right" width="20%"/>
+		</COLGROUP>
+		<TR>
+			<TD>&nbsp;</TD>
+			<TD>&nbsp;</TD>
+			<TD>&nbsp;</TD>
+			<TD align="right"><SPAN style="color:#FF460A">#(..WebTextValue("Taal",Taal,"L"))#:&nbsp;</SPAN></TD>
+			<TD align="left">#(arSwitchTL("N")_" - "_arSwitchTL("F")_" - "_arSwitchTL("E")_" - "_arSwitchTL("D"))#</TD>
+		</TR>
+		<TR>
+			<TD colspan="5"><SPAN class="clsOvzHeading1">Analyse QueryString:</SPAN></TD>
+		</TR>
+		<TR>
+			<TD align="right">QueryString: </TD>
+			<TD colspan="4"><TEXTAREA rows="2" cols="60" style="width:550px;">#(QS)#</TEXTAREA></TD>
+		</TR>
+		<TR>
+			<TD align="right">DATAOPT: </TD>
+			<TD colspan="4"><INPUT name="DATAOPT" type="text" value='#($G(%request.Data("DATAOPT",1)))#' style="width:400px;"/></TD>
+		</TR>
+		<TR>
+			<TD>&nbsp;</TD>
+			<TD colspan="4" Xalign="center"><INPUT name="SUBMIT" type="SUBMIT" class="clsButtonSubmit" value="Decrypt"></TD>
+		</TR>
+	</TABLE>
+	</FORM>
+	<FORM name="frmEncryptRef" action="TestDataOptHFLB.csp" method="post">
+	<TABLE width="730" border="0" cellpadding="1" class="" style="margin:10px; border-collapse:collapse;">
+		<COLGROUP>
+			<COL align="left"  width="20%"/>
+			<COL align="left"  width="20%"/>
+			<COL align="left"  width="20%"/>
+			<COL align="left"  width="20%"/>
+			<COL align="right" width="20%"/>
+		</COLGROUP>
+		<TR>
+			<TD colspan="2"><SPAN class="clsOvzHeading1">Decrypted values:</SPAN></TD>
+			<TD>&nbsp;</TD>
+			<TD>&nbsp;</TD>
+			<TD><INPUT type="hidden" name="KeySteps" value="#(blnKeySteps)#"></TD>
+		</TR>
+		<TR>
+			<TD align="right">DATAOPT: </TD>
+			<TD colspan="4"><INPUT type="text" name="DATAOPT" value="#(DataOptOut)#" style="width:400px;"/></TD>
+		</TR>
+		<TR>
+			<TD align="right">#(..WebTextValue("Taal",Taal,"L"))#: </TD>
+			<TD colspan="4"><INPUT type="text" style="width:90px;" value="#($G(arDataOpt("Taal")))#" readonly/></TD>
+		</TR>
+		<TR>
+			<TD align="right">Client Number: </TD>
+			<TD><INPUT type="text" style="width:90px;" value="#($G(arDataOpt("KLNummer")))#" readonly/></TD>
+			<TD align="right">Client Name: </TD>
+			<TD colspan="2"><INPUT type="text" style="width:200px;" value="#($G(arDataOpt("KLNaam")))#" readonly/></TD>
+		</TR>
+		<TR>
+			<TD align="right">Reduction: </TD>
+			<TD><INPUT type="text" style="width:90px;" value="#($G(arDataOpt("Korting")))#" readonly/></TD>
+			<TD align="right">E-mail: </TD>
+			<TD colspan="2"><INPUT type="text" style="width:200px;" value="#($G(arDataOpt("EMail")))#" readonly/></TD>
+		</TR>
+		<TR>
+			<TD colspan="5">&nbsp;</TD>
+		</TR>
+		<TR>
+			<TD>&nbsp;</TD>
+			<TD colspan="4" Xalign="center"><INPUT name="SUBMIT" type="SUBMIT" class="clsButtonSubmit" value="Encrypt"></TD>
+		</TR>
+	</TABLE>
+	</FORM>
+	<TABLE width="730" border="0" cellpadding="1" class="" style="margin:10px; border-collapse:collapse;">
+		<COLGROUP>
+			<COL align="left"  width="20%"/>
+			<COL align="left"  width="20%"/>
+			<COL align="left"  width="20%"/>
+			<COL align="left"  width="20%"/>
+			<COL align="right" width="20%"/>
+		</COLGROUP>
+		<TR>
+			<TD colspan="2"><SPAN class="clsOvzHeading1">Encrypted URL:</SPAN></TD>
+			<TD>&nbsp;</TD>
+			<TD>&nbsp;</TD>
+			<TD>&nbsp;</TD>
+		</TR>
+		<TR>
+			<TD align="right">DATAOPT: </TD>
+			<TD colspan="4" id="UrlOutCell">
+				<INPUT type="text" value="#($G(EncDataOptOut))#" style="width:400px;"/><BR>
+				&nbsp;&nbsp;Check:&nbsp;<SPAN class="clsRefCheck">#($G(DataOptCheck))#</SPAN>
+			</TD>
+		</TR>
+<CSP:IF condition="$G(blnKeySteps)">
+		<TR>
+			<TD colspan="5">&nbsp;</TD>
+		</TR>
+		<TR valign="top">
+			<TD align="right">Step 1:&nbsp;</TD>
+			<TD colspan="4" id="">
+				<PRE>#($G(arStepsOPT(1)))#</PRE>
+			</TD>
+		</TR>
+		<TR height="5"><TD colspan="5"></TD></TR>
+		<TR valign="top">
+			<TD align="right">Step 2:&nbsp;</TD>
+			<TD colspan="4" id="">
+				<PRE>#($G(arStepsOPT(2)))#</PRE>
+			</TD>
+		</TR>
+		<TR valign="top">
+			<TD align="right">-->&nbsp;Hex:&nbsp;</TD>
+			<TD colspan="4" id="">
+				<PRE>#($G(arStepsOPT("2Hex")))#</PRE>
+			</TD>
+		</TR>
+		<TR height="5"><TD colspan="5"></TD></TR>
+		<TR valign="top">
+			<TD align="right">Step 3:&nbsp;</TD>
+			<TD colspan="4" id="">
+				<PRE>#($G(arStepsOPT(3)))#</PRE>
+			</TD>
+		</TR>
+		<TR height="5"><TD colspan="5"></TD></TR>
+		<TR valign="top">
+			<TD align="right">Step 4:&nbsp;</TD>
+			<TD colspan="4" id="">
+				<PRE>#($G(arStepsOPT(4)))#</PRE>
+			</TD>
+		</TR>
+</CSP:IF>
+		<TR>
+			<TD colspan="5">&nbsp;</TD>
+		</TR>
+		<TR>
+			<TD colspan="5" align="center"><INPUT type="button" class="clsButtonSubmit" value="Clear All" onclick="window.location.href='TestDataOptHFLB.csp';"/></TD>
+		</TR>
+	</TABLE>
+	<BR>			
+</CSP:IF>				
+			</TD>
+		</TR>
+		<TR height="20" valign="top">
+			<TD height="20" style="padding:3px;">
+				<TIMERX message="Time remaining until session timeout. <a href=javascript:cspRenewSession()>Renew Session</a>" timeoutcode='OnAppTimeOut();' style="clsTmrSkeleton">
+			</TD>
+		</TR>
+	</TABLE>
+
+	<SCRIPT language="Cache" runat="server">
+		Set %response.TraceDump=($G(%request.Data("DBG",1))'="" && $G(%request.Data("DBG",1))'="0")
+	</SCRIPT>
+
+</BODY>
+</HTML>
\ No newline at end of file
Index: BL/Prod/GAData/TBXLadeXML.cls.xml
===================================================================
diff -u -r1074 -r1571
--- BL/Prod/GAData/TBXLadeXML.cls.xml	(.../TBXLadeXML.cls.xml)	(revision 1074)
+++ BL/Prod/GAData/TBXLadeXML.cls.xml	(.../TBXLadeXML.cls.xml)	(revision 1571)
@@ -110,7 +110,7 @@
 	Set ..sDomVERW=$LG(lbDomLU,1)
 	
 	Set Taal=""
-	If ..sDomVERW?1(1"SFS",1"MBHO") Do   ; Added by WimV on 12/04/2010 
+	If ..sDomVERW?1(1"SFS",1"MBHO",1"HFLB") Do   ; Added by WimV on 12/04/2010 
 	. Set KLMini=##class(cspBasis.GAProdTBox).GetKlantData(..sDomVERW,WSOrd.KLNummer)   ; ,$LB("Stg","NoAction"))
 	. Set:($IsObject(KLMini)) Taal=KLMini.Taal
 	. Set KLMini=""
Index: csp/vhisie/TBX/Wizard/tmpDev.mac.rou
===================================================================
diff -u -r1358 -r1571
--- csp/vhisie/TBX/Wizard/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 1358)
+++ csp/vhisie/TBX/Wizard/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 1571)
@@ -35,6 +35,7 @@
 	Set blnHFLE=(sDomVERW="HFLE")
 	Set blnSFS=(sDomVERW="SFS")
 	Set blnMBHO=(sDomVERW="MBHO")
+	Set blnHFLB=(sDomVERW="HFLB")
 	Set:('$D(%session.Data("BeursUser"))) %session.Data("BeursUser")=(blnVHEPN)&&##class(cspBasis.GAProdTBox).IsBeursUser()
 	Set %session.Data("DOMAIN")=sDomCVT
 	Set %session.Data("URL")=%request.URL
@@ -105,7 +106,7 @@
 	Else  If blnLMC Do
 	. ;Set lbBulkConfig=$LB("O",20)
 	. Set lbBulkConfig=""   ; ##class(cspBasis.GAProdTBox).GetKlantBulk("VHEPN",sDomKLNr)
-	Else  If blnSFS||blnMBHO Do
+	Else  If blnSFS||blnMBHO||blnHFLB Do
 	. Set lbBulkConfig=""
 	Else  Do
 	. Set lbBulkConfig=""