Index: _vhisie/TBX/MainOrderDtl.csp
===================================================================
diff -u -r1571 -r1626
--- _vhisie/TBX/MainOrderDtl.csp	(.../MainOrderDtl.csp)	(revision 1571)
+++ _vhisie/TBX/MainOrderDtl.csp	(.../MainOrderDtl.csp)	(revision 1626)
@@ -274,7 +274,7 @@
 						<CSP:IF condition='$L($G(arShow("Submit","HREF")))'>
 							<SCRIPT language="Cache" runat="server">
 								Set jsSubmitAction="javascript:ShowMailWin();"
-								If (blnSFS||blnMBHO||blnHFLB)&&($G(blnWSErrors,0)) Set jsSubmitAction="javascript:alert("_$$$QuoteJS($G(arShow("WSErrorsInfo","TEXT"),"ERROR: see above."))_");"
+								If (TBXContext.KlantGegevensViaDataOpt())&&($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/WizKleur.csp
===================================================================
diff -u -r1358 -r1626
--- _vhisie/TBX/WizKleur.csp	(.../WizKleur.csp)	(revision 1358)
+++ _vhisie/TBX/WizKleur.csp	(.../WizKleur.csp)	(revision 1626)
@@ -112,7 +112,7 @@
 	;Set arVTL("KLR_NoDFL_TOOLTIP")=..WebTextValue("DFL_KLR_SystemDfl",Taal,"L")
 	
 	If $L(Taal) Do
-	. Set arVTL("KLR_INFO","MC")=..WebTextValue("MogelijkeCombinaties_"_DCM,Taal,"L")_"&nbsp;<A href=""media/BonTBX"_$S(DCM="A":"antaro",DCM="I":"intivo", 0&&(blnLMC):" LMC", 1:"")_"_"_Taal_".pdf"" target=""_blank"" class=""clsInfo"">pdf</A>&nbsp;!"
+	. Set arVTL("KLR_INFO","MC")=..WebTextValue("MogelijkeCombinaties_"_DCM,Taal,"L")_"&nbsp;<A href=""media/BonTBX"_$S(DCM="A":"antaro",DCM="I":"intivo", 1:"")_"_"_Taal_".pdf"" target=""_blank"" class=""clsInfo"">pdf</A>&nbsp;!"
 	. ;Set arVTL("KLR_INFO","MC-IMG")="<IMG src=""media/new.gif"" border=""0"">"
 	. Set arVTL("KLR_RK_TOOLTIP")=..WebTextValue("Relingen",Taal,"L")_" + "_..WebTextValue("KleurBinFront",Taal,"L")
 	
@@ -189,7 +189,7 @@
 				<CSP:IF condition='arDCShow("I")'>
 			<TD class="clsKleurItems BorderAll">
 				<DIV id="divDS_WI" class="clsLadeKlr" onclick="ClickButtonObj(this,'DS');" onmouseover="ToggleButtonObj(this,'ON','DS');" onmouseout="ToggleButtonObj(this,'OFF','DS');">#(arVTL("KLR","DS_WI"))#</DIV>
-						<CSP:IF condition='$$$Not(blnSFS||blnHEIN)'>
+						<CSP:IF condition='TBXContext.ToonDesignGrijsIntivo()'>
 				<DIV id="divDS_GI" class="clsLadeKlr" onclick="ClickButtonObj(this,'DS');" onmouseover="ToggleButtonObj(this,'ON','DS');" onmouseout="ToggleButtonObj(this,'OFF','DS');">#(arVTL("KLR","DS_GI"))#</DIV>
 						</CSP:IF>
 				<DIV id="divDS_II" class="clsLadeKlr" onclick="ClickButtonObj(this,'DS');" onmouseover="ToggleButtonObj(this,'ON','DS');" onmouseout="ToggleButtonObj(this,'OFF','DS');">#(arVTL("KLR","DS_II"))#</DIV>
Index: WV GAProduct WWW.prj.xml
===================================================================
diff -u -r1573 -r1626
--- WV GAProduct WWW.prj.xml	(.../WV GAProduct WWW.prj.xml)	(revision 1573)
+++ WV GAProduct WWW.prj.xml	(.../WV GAProduct WWW.prj.xml)	(revision 1626)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
-<Project name="WV GAProduct WWW" LastModified="2011-06-30 15:36:27" Target="ophSendAlertMail^csp" TargetType="2" HttpServer="http://192.168.1.67:1972">
+<Project name="WV GAProduct WWW" LastModified="2011-06-30 16:47:21" 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,7 +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.TBXContext" 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: PRGACNTs.inc.rou
===================================================================
diff -u -r1571 -r1626
--- PRGACNTs.inc.rou	(.../PRGACNTs.inc.rou)	(revision 1571)
+++ PRGACNTs.inc.rou	(.../PRGACNTs.inc.rou)	(revision 1626)
@@ -125,7 +125,7 @@
 	#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"))
+	#define AccessTestPageDataOptHFLB(%ip)          (%ip?1(1"194.78.193.29",1"195.110.61.246"))
  
  
  ; Munt pariteit voor vreemde munten 
Index: _vhisie/TBX/TestRequest.csp
===================================================================
diff -u -r1133 -r1626
--- _vhisie/TBX/TestRequest.csp	(.../TestRequest.csp)	(revision 1133)
+++ _vhisie/TBX/TestRequest.csp	(.../TestRequest.csp)	(revision 1626)
@@ -5,18 +5,15 @@
 <SCRIPT method="OnPreHTTP" language="Cache" arguments="" returntype="%Boolean">
 	Set %RemoteIP=$G(%request.CgiEnvs("REMOTE_ADDR"))
 	//   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 blnVHEPN=(sDomVERW="VHEPN")
-	Set blnHEIN=(sDomVERW="HEIN")
-	Set blnLMC=(sDomVERW="LMC")
-	Set blnDUPO=(sDomVERW="DUPO")
-	Set blnHELMY=(sDomVERW="HELMY")
-	Set blnSFS=(sDomVERW="SFS")
-	Set blnMBHO=(sDomVERW="MBHO")
+	;Set sDomain=$$GetURLDomain^cspBasis.Library
+	;Set sDomCVT=$$TBXDomainCVT^cspBasis.Library(sDomain)
+	;Set lbDomLU=##class(WS.TBX.Order).DomainLookUp(sDomCVT,$LB("VERW","KLNR"))   ; $$TBXDomainLU^cspBasis.Library(sDomCVT,$LB("VERW","KLNR"))
+	;Set sDomVERW=$LG(lbDomLU,1)
+	;Set sDomKLNr=$LG(lbDomLU,2)
+	;Set blnVHEPN=(sDomVERW="VHEPN")
+	Set TBXContext=##class(APPS.TBXWeb.TBXContext).InitFromHttpRequest()
+	Set sDomain=TBXContext.GeefHttpRequestDomein()
+	
 	Set VERW="VHEPN"
 	Set KLNr=$$SesDataFromRq^cspBasis.Library("KLNR",,"")
 	Set wsID=""
@@ -43,7 +40,7 @@
 </SCRIPT>
 
 <HEAD>
-	<TITLE>#($S(blnVHEPN:"Van Hoecke - ",1:"")_"TandemBox - Test REQUEST")#</TITLE>
+	<TITLE>#($S(TBXContext.IsDomeinVHEPN():"Van Hoecke - ",1:"")_"TandemBox - Test REQUEST")#</TITLE>
 	<META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 
 	<STYLE type="text/css">
Index: cspBasis/TBX/DecodeURL/tmpDev.mac.rou
===================================================================
diff -u -r1571 -r1626
--- cspBasis/TBX/DecodeURL/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 1571)
+++ cspBasis/TBX/DecodeURL/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 1626)
@@ -19,11 +19,18 @@
     Set Ref=$G(%request.Data("REF",1))
     Set blnSubmit=%request.IsDefined("SUBMIT")
 	Set RefNew=$S('$D(%request.Data):$$$RefStartNew, 1:"")
-	Set sDomain=$$GetURLDomain^cspBasis.Library
-	Set sDomCVT=$$TBXDomainCVT^cspBasis.Library(sDomain)
-	Set lbDomLU=##class(WS.TBX.Order).DomainLookUp(sDomCVT,$LB("VERW","KLNR"))   ; $$TBXDomainLU^cspBasis.Library(sDomCVT,$LB("VERW","KLNR"))
-	Set sDomVERW=$LG(lbDomLU,1)
-	Set sDomKLNr=$LG(lbDomLU,2)
+ 
+	Set TBXContext=##class(APPS.TBXWeb.TBXContext).InitFromHttpRequest()
+	Set sDomain=TBXContext.GeefHttpRequestDomein()
+	Set sDomCVT=TBXContext.GeefWebDomein()
+	Set sDomVERW=TBXContext.GeefDomeinVerwerker()
+	Set sDomKLNr=TBXContext.GeefDomeinKlantNummer()
+	Set lbDomLU=$LB(sDomVERW,sDomKLNr)
+	;Set sDomain=$$GetURLDomain^cspBasis.Library
+	;Set sDomCVT=$$TBXDomainCVT^cspBasis.Library(sDomain)
+	;Set lbDomLU=##class(WS.TBX.Order).DomainLookUp(sDomCVT,$LB("VERW","KLNR"))   ; $$TBXDomainLU^cspBasis.Library(sDomCVT,$LB("VERW","KLNR"))
+	;Set sDomVERW=$LG(lbDomLU,1)
+	;Set sDomKLNr=$LG(lbDomLU,2)
 	Set blnVHEPN=(sDomVERW="VHEPN")
 	Set blnHEIN=(sDomVERW="HEIN")
 	Set blnLMC=(sDomVERW="LMC")
Index: csp/vhisie/TBX/Wizard/tmpDev.mac.rou
===================================================================
diff -u -r1571 -r1626
--- csp/vhisie/TBX/Wizard/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 1571)
+++ csp/vhisie/TBX/Wizard/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 1626)
@@ -6,7 +6,6 @@
  */
  
 OnPreHTTP()
-#define TaalDfl   $S(blnHEIN:"D", blnLMC:"F", blnSFS:"D", 1:"N")
 	New name,tmpRq,RefArray,OutPage,Ref,luSafe,luTBX,lbDomLU
 	New blnSubmit,blnRedir,PSW,i
 	  s:('$D(%ClientIP)) %ClientIP="192.168.1.97"
@@ -22,11 +21,18 @@
 	Kill %session.Data("UserType")
 	Kill %session.Data("QSDATA")
 	//   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 sDomain=$$GetURLDomain^cspBasis.Library
+	;Set sDomCVT=$$TBXDomainCVT^cspBasis.Library(sDomain)
+	;Set lbDomLU=##class(WS.TBX.Order).DomainLookUp(sDomCVT,$LB("VERW","KLNR"))   ; $$TBXDomainLU^cspBasis.Library(sDomCVT,$LB("VERW","KLNR"))
+	;Set sDomVERW=$LG(lbDomLU,1)
+	;Set sDomKLNr=$LG(lbDomLU,2)
+	Set TBXContext=##class(APPS.TBXWeb.TBXContext).InitFromHttpRequest()
+	Set sDomVERW=TBXContext.GeefDomeinVerwerker()
+	/***   volgende vars mogen weg na testen :   ***/
+	Set sDomain=TBXContext.GeefHttpRequestDomein()
+	Set sDomCVT=TBXContext.GeefWebDomein()
+	Set sDomKLNr=TBXContext.GeefDomeinKlantNummer()
+	
 	Set blnVHEPN=(sDomVERW="VHEPN")
 	Set blnHEIN=(sDomVERW="HEIN")
 	Set blnLMC=(sDomVERW="LMC")
@@ -36,8 +42,8 @@
 	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:('$D(%session.Data("BeursUser"))) %session.Data("BeursUser")=(TBXContext.IsDomeinVHEPN())&&##class(cspBasis.GAProdTBox).IsBeursUser()
+	Set %session.Data("DOMAIN")=TBXContext.GeefWebDomein()
 	Set %session.Data("URL")=%request.URL
 	Set %session.Data("REFMN")=$system.Encryption.Base64Decode($TR($G(%request.Data("REFMN",1)),"_-","+="))
 	Merge %session.Data("QSDATA")=%request.Data
@@ -46,13 +52,13 @@
 	Set KLNr=$$SesDataFromRq^cspBasis.Library("KLNR",,"")
 	Set wsID=$$SesDataFromRq^cspBasis.Library("WSID",,"")
 	Set sMode=$$SesDataFromRq^cspBasis.Library("MODE",,"")
-	Set Taal=$$SesDataFromRq^cspBasis.Library("Taal",,$$$TaalDfl)
+	Set Taal=$$SesDataFromRq^cspBasis.Library("Taal",,TBXContext.GeefDefaultTaal())
 	// Als toch niet correcte URL, dan redirect naar "Aanvraag Anonymous" 
 	If (sMode'?1(1"A",1"W",1"P")) Do  Quit 1
-	. Set %response.Redirect="/VHISIE/TBX/Access.csp?Taal="_Taal_"&REF="_$$CreateHashedRef^cspBasis.TBX.DecodeURL.tmpDev($LB(,sDomVERW,,"A"))   ; ServerSideRedirect
+	. Set %response.Redirect="/VHISIE/TBX/Access.csp?Taal="_Taal_"&REF="_$$CreateHashedRef^cspBasis.TBX.DecodeURL.tmpDev($LB(,TBXContext.GeefDomeinVerwerker(),,"A"))   ; ServerSideRedirect
 	// Else 
-    Set:($G(VERW)="") VERW=sDomVERW   ;d WL^vhDBG("VERW="_VERW_"   domain="_sDomCVT_"   sDomVERW="_sDomVERW)
-	Set UserType=$$ophGetUserType(KLNr,sDomCVT,VERW,sMode)
+    Set:($G(VERW)="") VERW=TBXContext.GeefDomeinVerwerker()   ;d WL^vhDBG("VERW="_VERW_"   domain="_TBXContext.GeefWebDomein()_"   sDomVERW="_TBXContext.GeefDomeinVerwerker())
+	Set UserType=$$ophGetUserType(KLNr,TBXContext.GeefWebDomein(),VERW,sMode)
 	Set %session.Data("UserType")=UserType
 	;Set UserTypeTxt=$CASE(UserType, $$$utKlantAnon:"KlantAnon", $$$utKlantKnown:"KlantKnown", $$$utVerwSub:"VerwSub", $$$utVerwDomain:"VerwDomain", $$$utVerwAdmin:"VerwAdmin", "":"?", :UserType)
 	If (wsID="")&&(KLNr>0) Do
@@ -76,11 +82,11 @@
 	Set blnPriceAvail=(blnCalcPrices)||($$ophGetPriceAvail(wsID))
 	Set blnCalcOFFAV=(blnCalcPrices)&&($$ophGetBonType(wsID)="OFFAV")
 	Set Munt="EUR"
-	Set Munt=$$GetUserMunt^cspBasis.Library(sDomVERW,)
+	Set Munt=$$GetUserMunt^cspBasis.Library(TBXContext.GeefDomeinVerwerker(),)
 	Set lbShowFT=""
 	Set:('blnCalcPrices)||(sMode'="A") lbShowFT=lbShowFT_$LB("OFFAV")
 	Set:(blnPriceAvail )||(sMode'="A") lbShowFT=lbShowFT_$LB("OFF")
-	Set:(blnHEIN)||(sMode'="A")||((wsID>0)&&(sMode'="A")) lbShowFT=lbShowFT_$LB("BBON")
+	Set:(TBXContext.IsDomeinHEIN())||(sMode'="A")||((wsID>0)&&(sMode'="A")) lbShowFT=lbShowFT_$LB("BBON")
 	Set BTWInputMode=$S($$$NSpace="DEMO":0, 'blnVHEPN:0, blnCalcPrices:1, 1:3)   ; 0=hidden, 1=shown but optional, 3=shown+obligatory
 	Set:(blnVHEPN)&&(KLNr>0) BTWInputMode=0   ; Overrules previous line 
 	Set blnShowDynSpace=(blnVHEPN)&&(KLNr?1(1"4645x",1"6821"))
@@ -89,32 +95,16 @@
 	Set:(wsIDFrom>0) DCM=##class(WS.TBX.Order).DCMCalc(wsIDFrom)   ; wsID or wsIDFrom 
 	Set:(DCM="") DCM=$G(%request.Data("DCM",1))
 	Set:(DCM="") DCM="S"   ; default 
-	Set lbDesignChoices=##class(cspBasis.GAProdTBox).GetDesignChoices(DCM,KLNr,sDomVERW,sDomKLNr)
+	Set lbDesignChoices=##class(cspBasis.GAProdTBox).GetDesignChoices(DCM,KLNr,TBXContext.GeefDomeinVerwerker(),TBXContext.GeefDomeinKlantNummer())
 	Set HeaderLogo = DCM
 	//Set:(DCM="I") HeaderLogo="I"
 	// Bulk Settings 
-	If (blnVHEPN)&&(KLNr>0) Do
-	. Set KLMiniWS=##class(cspBasis.GAProdTBox).GetKlantData(sDomVERW,KLNr)
-	. If KLMiniWS.BulkVPKCode'="" Do
-	. . Set lbBulkConfig=$LB(KLMiniWS.BulkVPKCode,KLMiniWS.BulkMinQty,"checked")
-	. Else  Do
-	. . Set lbBulkConfig=##class(cspBasis.GAProdTBox).GetKlantBulk(sDomVERW,KLNr)
-	.   ;d WL^vhDBG("lbBulkConfig: "_$$$LCVT(lbBulkConfig))
-	. Quit:(lbBulkConfig="")||($LG(lbBulkConfig,1)_$LG(lbBulkConfig,2)="")
-	. Set:($LG(lbBulkConfig,1)="") $LI(lbBulkConfig,1)="O"
-	. Set:($LG(lbBulkConfig,2)<1) $LI(lbBulkConfig,2)=20
-	Else  If blnLMC Do
-	. ;Set lbBulkConfig=$LB("O",20)
-	. Set lbBulkConfig=""   ; ##class(cspBasis.GAProdTBox).GetKlantBulk("VHEPN",sDomKLNr)
-	Else  If blnSFS||blnMBHO||blnHFLB Do
-	. Set lbBulkConfig=""
-	Else  Do
-	. Set lbBulkConfig=""
+	Set lbBulkConfig=TBXContext.GeefBulkConfigOpties(KLNr)
 	Set lbAllowVPK=$S($LG(lbBulkConfig,1)'?1(1"",1"S"):$LB("S")_$LB($LG(lbBulkConfig,1)), 1:"")   ; _$LB("O","C","A","B","P","X","Y","Z")   ; Indien alleen Stukverpakking, dan leeg,  anders $LB("S")_$LB(...) 
  
 	// BL voor Defaults 
 	Set blTBoxDfl=##class(cspBasis.GAProdDfls).Instantiate()
-	Do blTBoxDfl.Init(KLNr,sDomVERW,DCM,Taal,lbAllowVPK)
+	Do blTBoxDfl.Init(KLNr,TBXContext.GeefDomeinVerwerker(),DCM,Taal,lbAllowVPK)
 	Do blTBoxDfl.BuildMatenDefaultsJS()      ;Set sc=blTBoxDfl.ErrorStatus 
 	Do blTBoxDfl.BuildKleurDefaultsJS("*")   ;Set sc=blTBoxDfl.ErrorStatus 
 	Do:DCM="I" blTBoxDfl.BuildInschfElmntJS()
@@ -126,11 +116,7 @@
 	Quit 1
 ophGetUserType(KLNr,Domain,Verw,Mode)
 	  ;d WL^vhDBG("KLNr"_KLNr_"   Mode="_Mode_"   wsID="_wsID_"   Verw="_Verw_"   Domain="_Domain)
-#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 : $$$utKlantKnown 
-#EndIf
+	Quit:(Mode="A") $S(TBXContext.AlleenToegangZonderLogin():$$$utKlantAnonWP, KLNr>0:$$$utKlantKnown, 1:$$$utKlantAnon)
 	Quit:(Mode="W") $$ophGetVERWType(Domain,Verw)
 	Quit:(Mode="P") $$$utKlantAnon                        ; Temporary: fixed value
 	;Else
@@ -144,7 +130,7 @@
 	Set WSOrd=##class(WS.TBX.Order).%OpenId(FromOrdID)
 	Quit:('$IsObject(WSOrd)) 0
 	Set OrdDomVERW=$LG(##class(WS.TBX.Order).DomainLookUp($$TBXDomainCVT^cspBasis.Library(WSOrd.WebDomain),$LB("VERW")),1)
-	Quit:(OrdDomVERW'=sDomVERW) 0   ; Onbekend of foutief domein
+	Quit:(OrdDomVERW'=TBXContext.GeefDomeinVerwerker()) 0   ; Onbekend of foutief domein
 	Quit (WSOrd.KLNummer>0)&&(WSOrd.KLNummer=MatchKLNr)
 ophInschfElmntInfo(wsID)
 	// bepalen of InschuifElement reeds gekozen is kan adhv bestaand order.
@@ -180,5 +166,5 @@
 	&SQL(SELECT BonType into :sBonType FROM WS_TBX.WebOrder WHERE ID=:wsID)
 	Quit sBonType
 ophAddToLog
-	Do ##class(cspBasis.GAProdTBox).AddToLog($S((sMode="A")&&(wsID'>0):$S($G(blnNewFromOrd):"WIZARD_COPY",1:"WIZARD_NEW"), 1:"WIZARD_OPEN"),sDomain,KLNr,sMode_$S(DCM'?1(1"S",1""):" - "_DCM,1:""),wsID,VERW,Taal,"")
+	Do ##class(cspBasis.GAProdTBox).AddToLog($S((sMode="A")&&(wsID'>0):$S($G(blnNewFromOrd):"WIZARD_COPY",1:"WIZARD_NEW"), 1:"WIZARD_OPEN"),TBXContext.GeefHttpRequestDomein(),KLNr,sMode_$S(DCM'?1(1"S",1""):" - "_DCM,1:""),wsID,VERW,Taal,"")
 	Quit
\ No newline at end of file
Index: _vhisie/TBX/DecodeURL.csp
===================================================================
diff -u -r757 -r1626
--- _vhisie/TBX/DecodeURL.csp	(.../DecodeURL.csp)	(revision 757)
+++ _vhisie/TBX/DecodeURL.csp	(.../DecodeURL.csp)	(revision 1626)
@@ -60,9 +60,10 @@
 	URL Redir    : #($G(msgRedir))#
 	LoginState   : #($G(LoginState))#
 	
-	Domain       : #($G(sDomain))#
-	DomainCVTed  : #($G(sDomCVT))#
-	DomLU        : #($$LCVT^vhLib($G(lbDomLU)))#
+	Domain       : #(TBXContext.GeefHttpRequestDomein())#
+	DomainCVTed  : #(TBXContext.GeefWebDomein())#
+	sDomVERW     : #(TBXContext.GeefDomeinVerwerker())#
+	sDomKLNr     : #(TBXContext.GeefDomeinKlantNummer())#
 
 	UserType     : #($G(UserType)_" - "_$G(UserTypeTxt))#
 		</PRE>
Index: _vhisie/TBX/Help/HowTo.csp
===================================================================
diff -u -r757 -r1626
--- _vhisie/TBX/Help/HowTo.csp	(.../HowTo.csp)	(revision 757)
+++ _vhisie/TBX/Help/HowTo.csp	(.../HowTo.csp)	(revision 1626)
@@ -5,9 +5,10 @@
 <SCRIPT language="cache" runat="server">
 	Set %session.AppTimeout = 905
 	  s:('$D(ClientIP)) ClientIP="192.168.1.97"
-	New arConfig
-	Do ##class(cspBasis.GAProdTBox).GetDomainDefaults(.arConfig)
-	Set Taal=$$SesDataFromRq^cspBasis.Library("Taal",,$G(arConfig("Taal")))
+	New TBXContext,DefaultTaal
+	Set TBXContext=##class(APPS.TBXWeb.TBXContext).InitFromHttpRequest()
+	Set DefaultTaal=TBXContext.GeefDefaultTaal()
+	Set Taal=$$SesDataFromRq^cspBasis.Library("Taal",,DefaultTaal)
 </SCRIPT>
 <HTML>
 <HEAD>
@@ -29,9 +30,9 @@
 	<LINK REL="stylesheet" TYPE="text/css" HREF="../tbx.css"/>
 </HEAD>
 <SCRIPT language="Cache" runat="server">
-	Set UrlGeneralInfo=$CASE(sDomVERW, "HEIN":"http://www.tandem-box.de/01Startseite/Startseite.html", "LMC":"http://www.optimapack.fr/France/TbxPresentation.asp", "DUPO":"", "HELMY":"", "SFS":"", "HFLE":"", "MBHO":$$$TBoxInfoPageMBHO, :"http://www.vanhoecke.be/"_$S(Taal="F":"fr/produits",1:"nl/producten")_"/tandem-box/")
+	Set UrlGeneralInfo=TBXContext.GeefLokalePaginaTBoxInfoURL(Taal)
+	Set TargetGeneralInfo=$S(TBXContext.IsDomeinHEIN():"Main", (UrlGeneralInfo=""):"_self", 1:"_blank")
 	Set:(UrlGeneralInfo="") UrlGeneralInfo="javascript:;"
-	Set TargetGeneralInfo=$S(sDomVERW="HEIN":"Main", (sDomVERW="DUPO")||(sDomVERW="HELMY")||(sDomVERW="HFLE")||(sDomVERW="MBHO"):"_self", 1:"_blank")
 	/*
 							<A href="http://www.tandem-box.de/01Startseite/Startseite.html" target="Main" class="clsInfo">#(..WebTextValue("Help",Taal,"L"))#</A>
 							<A href="http://www.optimapack.fr/France/TbxPresentation.asp" target="_blank" class="clsInfo">#(..WebTextValue("Help",Taal,"L"))#</A>
@@ -55,7 +56,7 @@
 					</TR>
 					<TR>
 						<TD>
-						<CSP:IF condition='sDomVERW?1(1"HEIN",1"MBHO")'>
+						<CSP:IF condition='(TBXContext.ToonHelppaginaIndex())'>
 							<A name="Index"></A>
 							<SPAN class="clsSectionHdr">INDEX:</SPAN><BR>
 							<UL class="clsIndex">
@@ -72,7 +73,7 @@
 			</TD>
 		</TR>
 	</TABLE>
-<CSP:IF condition='sDomVERW?1(1"HEIN",1"SFS",1"MBHO")'>
+<CSP:IF condition='(TBXContext.ToonContactInfo())'>
 	<A name="ContactInfo"></A>
 	<TABLE width="610" class="clsMainTbl" cellspacing="0" cellpadding="5" border="0">
 		<TR>
@@ -86,15 +87,15 @@
 					<TR>
 						<TD>
 							<BR>
-				<CSP:IF condition='sDomVERW="HEIN"'>
+				<CSP:IF condition='(TBXContext.GeefDomeinVerwerker()="HEIN")'>
 							<SPAN class="clsItemHead">Hein:</SPAN> Sie erreichen uns zu den �blichen B�rozeiten unter:<BR>
 							<UL class="clsIndex">
 								<LI><U>Tel.:</U> +49 (0) 7034-9270-0 <BR>
 								<LI><U>Fax :</U> +49 (0) 7034-9270-70<BR>
 								<LI><U>E-mail:</U> <A href="mailto:#($$$EMailTBXInfo2Hein)#">#($$$EMailTBXInfo2Hein)#</A><BR>
 							</UL>
 				</CSP:IF>
-				<CSP:IF condition='sDomVERW="SFS"'>
+				<CSP:IF condition='(TBXContext.GeefDomeinVerwerker()="SFS")'>
 							<SPAN class="clsItemHead">SFS unimarket:</SPAN> Sie erreichen uns zu den �blichen B�rozeiten unter:<BR>
 							<UL class="clsIndex">
 								<LI><U>Tel.:</U> +41 71 727 52 50<BR>
@@ -106,7 +107,7 @@
 								</CSP:IF>
 							</UL>							
 				</CSP:IF>
-				<CSP:IF condition='sDomVERW="MBHO"'>
+				<CSP:IF condition='(TBXContext.GeefDomeinVerwerker()="MBHO")'>
 							<SPAN class="clsItemHead">Meubelbeslag Holland:</SPAN> U kan ons bereiken tijdens onze kantooruren via:<BR>
 							<UL class="clsIndex">
 								<LI><U>Tel.:</U> 0031 492 52 93 55<BR>
@@ -177,12 +178,12 @@
 --></CSP:COMMENT>
 						</TD>
 					</TR>
-			<CSP:IF condition='(sDomVERW?1(1"VHEPN",1"LMC",1"SFS",1"MBHO"))'>
+			<CSP:IF condition='(TBXContext.HeeftToegangMetLogin())'>
 					<TR>
 						<TD>
 							<BR>
 							<A name="IHT_HistoriekTonen"></A>
-							<SPAN class="clsItemHead">#(..WebTextValue("HistoriekTonen",Taal,"L"))#:</SPAN>#($S(sDomVERW="VHEPN":"&nbsp;&nbsp;("_..WebTextValue("IHT_LoginVerplicht_VH",Taal,"L")_")",1:""))#<BR>
+							<SPAN class="clsItemHead">#(..WebTextValue("HistoriekTonen",Taal,"L"))#:</SPAN>#($S(TBXContext.IsDomeinVHEPN():"&nbsp;&nbsp;("_..WebTextValue("IHT_LoginVerplicht_VH",Taal,"L")_")",1:""))#<BR>
 							#(..WebTextValue("IHT_HistoriekTonen",Taal,"O"))#
 <CSP:COMMENT><!--
 				<SPAN class="clsItemHead"><VH:TAAL intern="HistoriekTonen">Historiek Tonen</VH:TAAL>:</SPAN><BR>
@@ -234,14 +235,14 @@
 							<SPAN class="clsItemHead">#(..WebTextValue("IHT_LadeBeperkingen",Taal,"L"))#:</SPAN> (#(..WebTextValue("IHT_FoutOplossen",Taal,"O"))#)<BR>
 							<SCRIPT language="cache" runat="server">
 								Set OmsLadeBeperkingen=..WebTextValue("IHT_LadeBeperkingen",Taal,"O")
-								Set:(sDomVERW="LMC") OmsLadeBeperkingen=$$$Replace(OmsLadeBeperkingen,"BonTBX_","BonTBX LMC_")
+								Set:(TBXContext.GeefDomeinVerwerker()="LMC") OmsLadeBeperkingen=$$$Replace(OmsLadeBeperkingen,"BonTBX_","BonTBX LMC_")
 								Set OmsContactUs=..WebTextValue("IHT_LadeBeperkingen2",Taal,"O")
 								Set OmsContactInfo=..WebTextValue("ContactInfo",Taal,"L")
-								Set OmsContactURL=..WebTextValue("ContactInfoURL_"_$CASE(sDomVERW, "HEIN":"HEIN", "LMC":"OPTIMA", "DUPO":"DUPO", "HELMY":"DESTIL", "HFLE":"HFLE", "SFS":"SFS", "MBHO":"MBHO", :"VH"),Taal,"L")
+								Set OmsContactURL=TBXContext.GeefContactInfoURL(Taal)
 								;Set OmsContactFull=OmsContactUs_"&nbsp;<A href="""_OmsContactURL_""""_$S(sDomVERW="HEIN":"",1:" target=""_blank""")_">"_OmsContactInfo_"</A>."
 							</SCRIPT>
 							#(OmsLadeBeperkingen)#<BR>
-							&#8594;&nbsp;#(OmsContactUs)#&nbsp;#("<A href="""_OmsContactURL_""""_$S(sDomVERW?1(1"HEIN",1"SFS",1"MBHO"):"",1:" target=""_blank""")_">"_OmsContactInfo_"</A>")#.
+							&#8594;&nbsp;#(OmsContactUs)#&nbsp;#("<A href="""_OmsContactURL_""""_$S(TBXContext.ToonContactInfo():"",1:" target=""_blank""")_">"_OmsContactInfo_"</A>")#.
 <CSP:COMMENT><!--
 				<SPAN class="clsItemHead"><VH:TAAL intern="IHT_LadeBeperkingen">Lade correct defini�ren</VH:TAAL>:</SPAN><BR>
 				<VH:TAAL intern="IHT_LadeBeperkingen" opties="O">Bij het ingeven van een lade zijn veel combinaties mogelijk tussen de afmetingen, specifieke kenmerken en toebehoren.
Index: _vhisie/TBX/MailResult.csp
===================================================================
diff -u -r757 -r1626
--- _vhisie/TBX/MailResult.csp	(.../MailResult.csp)	(revision 757)
+++ _vhisie/TBX/MailResult.csp	(.../MailResult.csp)	(revision 1626)
@@ -45,11 +45,17 @@
 	. New WSOrdDomain
  	. &SQL(SELECT WebDomain INTO :WSOrdDomain FROM WS_TBX.WebOrder WHERE ID=:wsID)
 	. Set Domain=WSOrdDomain
- 	Set lbDomLU=##class(WS.TBX.Order).DomainLookUp(Domain,$LB("VERW","KLNR"))   ; $$TBXDomainLU^cspBasis.Library(sDomCVT,$LB("VERW","KLNR"))
-	Set sDomVERW=$LG(lbDomLU,1)
-	Set sDomKLNr=$LG(lbDomLU,2)
+ 
+	;Set lbDomLU=##class(WS.TBX.Order).DomainLookUp(Domain,$LB("VERW","KLNR"))   ; $$TBXDomainLU^cspBasis.Library(sDomCVT,$LB("VERW","KLNR"))
+	;Set sDomVERW=$LG(lbDomLU,1)
+	;Set sDomKLNr=$LG(lbDomLU,2)
+	Set HttpRequestDomein=$$GetURLDomain^cspBasis.Library
+	Set TBXContext=##class(APPS.TBXWeb.TBXContext).%New(Domain,HttpRequestDomein)
+	Set sDomVERW=TBXContext.GeefDomeinVerwerker()
+	Set sDomKLNr=TBXContext.GeefDomeinKlantNummer()
+	
 	If (%request.IsDefined("RESULT")) Do  Quit 1
-	. Set AttrOnLoad=$S($G(%request.Data("RESULT",1))=1:"onload=""window.opener.location.replace('Main.csp?REF="_$$CreateHashedRef^cspBasis.TBX.DecodeURL.tmpDev($LB(KLNr,sDomVERW,wsID,$S(sMode="PROCESS":"PROCESS",1:"COMPLETE")))_$S($L(Taal):"&Taal="_Taal, 1:"")_"');""", 1:"")
+	. Set AttrOnLoad=$S($G(%request.Data("RESULT",1))=1:"onload=""window.opener.location.replace('Main.csp?REF="_$$CreateHashedRef^cspBasis.TBX.DecodeURL.tmpDev($LB(KLNr,TBXContext.GeefDomeinVerwerker(),wsID,$S(sMode="PROCESS":"PROCESS",1:"COMPLETE")))_$S($L(Taal):"&Taal="_Taal, 1:"")_"');""", 1:"")
 	Quit:('%request.IsDefined("SUBMIT")) 1
 	; Else 
     Do ..TBoxSendMail(.ok,.errmsg,Taal)
@@ -118,7 +124,7 @@
 				</SCRIPT>
 				</UL>
 				<P>#(errmsg)# <BR/>
-				Contact Administrator: #($CASE($G(sDomVERW), "HEIN":"info@tandem-box.de", "LMC":" ??? ", "DUPO":"du.pont@skynet.be", "HELMY":"info@destil.nl", "HFLE":"info@hafele.nl", "SFS":"info.u@sfsunimarket.biz", "MBHO":$$$EMailICTAdminMbho, :"ICT_SOAPSysOp@vanhoecke.be"))#</P>
+				Contact Administrator: #(TBXContext.GeefAdministratorEmail())#</P>
 			</CSP:IF>
 		<CSP:ELSE>
 			<BR/>
Index: _vhisie/TBX/WizOvz.csp
===================================================================
diff -u -r757 -r1626
--- _vhisie/TBX/WizOvz.csp	(.../WizOvz.csp)	(revision 757)
+++ _vhisie/TBX/WizOvz.csp	(.../WizOvz.csp)	(revision 1626)
@@ -165,8 +165,6 @@
 	</TABLE>
 	</P>
 <SCRIPT language="cache" runat="server">
-	;Set blnShowXMLButton=((KLNr=4682)||(KLNr=7833)||(UserType'<$$$utVerwSub))
-	;Set blnShowSubmitButton=((sMode="A")||((blnHEIN)&&(sMode="W")))
 	Set UrlHowTo="Help/HowTo.csp?Taal="_Taal
 </SCRIPT>
 	<DIV id="divOvzWSErrorMsg" style="visibility:hidden; height:1px; overflow-y:hidden;">
@@ -175,12 +173,12 @@
 		<A href="#(UrlHowTo_"#IHT_LadeBeperkingen")#" target="winInfoPage" onclick="WindowFocus('winInfoPage');" style="font-weight:normal;">#(..WebTextValue("MeerInfo",Taal,"L"))#</A><FONT style="font-weight:normal; color:#FF460A;">&nbsp;...</FONT>
 	</P>
 	</DIV>
-<CSP:IF condition="blnHEIN">
+<CSP:IF condition='(TBXContext.GeefDomeinVerwerker()="HEIN")'>
 	<P style="font-weight:bold; margin:10px; margin-right:30px;">
 		Die Bruttopreise verstehen sich ab Werk, zuz�glich der gesetzlichen Mehrwertsteuer.
 	</P>
 </CSP:IF>
-<CSP:IF condition='(KLNr="")&&(blnVHEPN)'>
+<CSP:IF condition='(KLNr="")&&(TBXContext.IsDomeinVHEPN())'>
 	<P style="font-weight:bold; margin:10px; margin-right:30px;">
 		#(..WebTextValue("NotRegUserInfo",Taal,"O"))#
 	</P>
Index: APPS/TBXWeb/TBXContext.cls.xml
===================================================================
diff -u -r1573 -r1626
--- APPS/TBXWeb/TBXContext.cls.xml	(.../TBXContext.cls.xml)	(revision 1573)
+++ APPS/TBXWeb/TBXContext.cls.xml	(.../TBXContext.cls.xml)	(revision 1626)
@@ -4,14 +4,15 @@
 <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 TBXContext=##class(APPS.TBXWeb.TBXContext).InitFromHttpRequest()
 
 	Set sDomain=TBXContext.GeefHttpRequestDomein()
 	Set sDomCVT=TBXContext.GeefWebDomein()
@@ -26,10 +27,9 @@
 
 TBXContext.KlantGegevensViaDataOpt()
 TBXContext.GeefDefaultTaal()
-##class(APPS.TBXWeb.XXXContext).GeefDefaultTaalVoorVerwerker(sDomVERW)
+##class(APPS.TBXWeb.TBXContext).GeefDefaultTaalVoorVerwerker(sDomVERW)
 
 /***   ***/
-
 ]]></Content>
 </UDLText>
 
@@ -147,15 +147,14 @@
 	; ... 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>
+  Set TBXContext=##class(APPS.TBXWeb.TBXContext).InitFromHttpRequest() ]]></Description>
 <ClassMethod>1</ClassMethod>
 <Implementation><![CDATA[
 	Set HttpRequestDomein=$$GetURLDomain^cspBasis.Library
@@ -170,14 +169,23 @@
 	Set Taal=TBXContext.GeefDefaultTaal()
 	*/
 	Quit TBXContext
-
 ]]></Implementation>
 </Method>
 
+<UDLText name="T">
+<Content><![CDATA[
+/***                  *** /
+/***   ClassMethods   *** /
+/***   ============   *** /
+/***   --> te verplaaten naar een Utils-klasse   *** /
+/***                  ***/
+]]></Content>
+</UDLText>
+
 <Method name="GeefDomeinData">
 <Description>
 Oproepen via : 
-   w ##class(APPS.TBXWeb.XXXContext).GeefDomeinData(Domain,lbFieldNames) </Description>
+   w ##class(APPS.TBXWeb.TBXContext).GeefDomeinData(Domain,lbFieldNames) </Description>
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Domain:%String,lbFieldNames:%List</FormalSpec>
 <ProcedureBlock>1</ProcedureBlock>
@@ -238,14 +246,13 @@
 		Set arLookupTBX=""	
 	}
 	Quit
-
 ]]></Implementation>
 </Method>
 
 <Method name="GeefWebDomeinVoorKlant">
 <Description>
 Oproepen via : 
-   w ##class(APPS.TBXWeb.XXXContext).GeefWebDomeinVoorKlant(KLNr) </Description>
+   w ##class(APPS.TBXWeb.TBXContext).GeefWebDomeinVoorKlant(KLNr) </Description>
 <ClassMethod>1</ClassMethod>
 <FormalSpec>KLNr:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
@@ -262,14 +269,13 @@
 							$$$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>
+   w ##class(APPS.TBXWeb.TBXContext).GeefDomeinKort(WebDomein) </Description>
 <ClassMethod>1</ClassMethod>
 <FormalSpec>WebDomein:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
@@ -287,14 +293,13 @@
 			 				$$$TBoxWebDomeinDEMO   : "demo", 
 			 				 : WebDomein )
 	Quit DomeinKort
-
 ]]></Implementation>
 </Method>
 
 <Method name="GeefWebDomeinVoorAfkorting">
 <Description>
 Oproepen via : 
-   w ##class(APPS.TBXWeb.XXXContext).GeefWebDomeinVoorAfkorting(DomeinKort) </Description>
+   w ##class(APPS.TBXWeb.TBXContext).GeefWebDomeinVoorAfkorting(DomeinKort) </Description>
 <ClassMethod>1</ClassMethod>
 <FormalSpec>DomeinKort:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
@@ -313,88 +318,85 @@
 			 				"demo"    : $$$TBoxWebDomeinDEMO, 
 			 				 : DomeinKort )
 	Quit WebDomein
-
 ]]></Implementation>
 </Method>
 
-<Method name="GeefWebDomein">
+<Method name="WebTextValue">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Intern:%String,Taal:%String="N",TextType:%String="L",lbFlags:%List=""</FormalSpec>
+<ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Quit ..WebDomein
+	#define WEBTYPE         "TBW"
+ 	Quit $$WebTextValue^cspBasis.Library($$$WEBTYPE,Intern,Taal,TextType,,.lbFlags)
+]]></Implementation>
+</Method>
 
+<UDLText name="T">
+<Content><![CDATA[
+/***             *** /
+/***   Methods   *** /
+/***   =======   *** /
+/***             ****/
+]]></Content>
+</UDLText>
+
+<Method name="GeefWebDomein">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..WebDomein
 ]]></Implementation>
 </Method>
 
 <Method name="GeefHttpRequestDomein">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	Quit ..HttpRequestDomein
-
+<Implementation><![CDATA[	Quit ..HttpRequestDomein
 ]]></Implementation>
 </Method>
 
 <Method name="IsDomeinVHEPN">
-<Implementation><![CDATA[
-	Quit ..IsVHEPN
-
+<Implementation><![CDATA[	Quit ..IsVHEPN
 ]]></Implementation>
 </Method>
 
 <Method name="IsDomeinHEIN">
-<Implementation><![CDATA[
-	Quit ..IsHEIN
-
+<Implementation><![CDATA[	Quit ..IsHEIN
 ]]></Implementation>
 </Method>
 
 <Method name="IsDomeinSFS">
-<Implementation><![CDATA[
-	Quit ..IsSFS
-
+<Implementation><![CDATA[	Quit ..IsSFS
 ]]></Implementation>
 </Method>
 
 <Method name="GeefDomeinVerwerker">
-<Implementation><![CDATA[
-	Quit ..DomeinVerwerker
-
+<Implementation><![CDATA[	Quit ..DomeinVerwerker
 ]]></Implementation>
 </Method>
 
 <Method name="GeefDomeinKlantNummer">
-<Implementation><![CDATA[
-	Quit ..DomeinKlantNummer
-
+<Implementation><![CDATA[	Quit ..DomeinKlantNummer
 ]]></Implementation>
 </Method>
 
 <Method name="IsOngeldigDomein">
-<Implementation><![CDATA[
-	Quit (..DomeinVerwerker="")||(..DomeinKlantNummer'>0)
-
+<Implementation><![CDATA[	Quit (..DomeinVerwerker="")||(..DomeinKlantNummer'>0)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefDefaultTaal">
-<Implementation><![CDATA[
-	Quit ..GeefDefaultTaalVoorVerwerker(..DomeinVerwerker)
-
+<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><![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><![CDATA[	Quit (..IsVHEPN||..IsSFS||..IsHFLB)
 ]]></Implementation>
 </Method>
 
@@ -403,9 +405,7 @@
 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><![CDATA[	Quit (..DomeinVerwerker?1(1"HEIN",1"HFLE",1"HELMY",1"DUPO"))
 ]]></Implementation>
 </Method>
 
@@ -414,33 +414,26 @@
 <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><![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><![CDATA[	Quit (..KlantGegevensViaDataOpt())
 ]]></Implementation>
 </Method>
 
 <Method name="KlantGegevensViaDataOpt">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	Quit (..IsLMC||..IsSFS||..IsMBHO||..IsHFLB)
-
+<Implementation><![CDATA[	Quit (..IsLMC||..IsSFS||..IsMBHO||..IsHFLB)
 ]]></Implementation>
 </Method>
 
@@ -449,9 +442,7 @@
 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><![CDATA[	Quit IP?1(1"77.59.193.234",1"195.141.221.1")
 ]]></Implementation>
 </Method>
 
@@ -460,9 +451,7 @@
 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><![CDATA[	Quit IP?1(1"217.21.251.83")
 ]]></Implementation>
 </Method>
 
@@ -471,9 +460,7 @@
 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><![CDATA[	Quit $$$AccessTestPageDataOptHFLB(IP)   ; IP?1(1"194.78.193.29")
 ]]></Implementation>
 </Method>
 
@@ -482,9 +469,7 @@
 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><![CDATA[	Quit IP?1(1"92.103.129.165",1"212.103.4.85")
 ]]></Implementation>
 </Method>
 
@@ -496,7 +481,6 @@
 <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>
 
@@ -508,25 +492,20 @@
 <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><![CDATA[	Quit (..IsVHEPN)
 ]]></Implementation>
 </Method>
 
 <Method name="ToonAlgemeneVoorwaarden">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	Quit (..IsVHEPN)||(..IsHEIN)||(..IsSFS)   ; $$$Not(..IsLMC||..IsDUPO||..IsHELMY||..IsHFLE||..IsMBHO)
-
+<Implementation><![CDATA[	Quit (..IsVHEPN)||(..IsHEIN)||(..IsSFS)   ; $$$Not(..IsLMC||..IsDUPO||..IsHELMY||..IsHFLE||..IsMBHO)
 ]]></Implementation>
 </Method>
 
@@ -535,7 +514,6 @@
 <Implementation><![CDATA[
 	// Nieuwere domeinen toevoegen 
 	Quit (..DomeinVerwerker'?1(1"HFLB"))
-
 ]]></Implementation>
 </Method>
 
@@ -553,7 +531,6 @@
 		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>
 
@@ -562,9 +539,7 @@
 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><![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>
 
@@ -575,19 +550,15 @@
 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><![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><![CDATA[	Quit $S(..DomeinVerwerker="SFS":"CHF", 1:"EUR")
 ]]></Implementation>
 </Method>
 
@@ -597,9 +568,7 @@
 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><![CDATA[	Quit $S(VERW="VHEPN":"EUR", 1:..GeefMuntEenheid())
 ]]></Implementation>
 </Method>
 
@@ -610,7 +579,6 @@
 <Implementation><![CDATA[
 	Set ToonKnop=$$$Not( (..IsHEIN)||(..IsDUPO)||(..IsHELMY)||(..IsHFLE) )   ; DupliceerEnWijzig is momenteel nog niet mogelijk voor Anonymous accounts 
  	Quit ToonKnop
-
 ]]></Implementation>
 </Method>
 
@@ -629,10 +597,113 @@
 	 	}
 	}
  	Quit ToonKnop
+]]></Implementation>
+</Method>
 
+<Method name="ToonDesignGrijsIntivo">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ..DomeinVerwerker'?1(1"HEIN",1"SFS")
 ]]></Implementation>
 </Method>
 
+<Method name="GeefLokalePaginaTBoxInfoURL">
+<Description>
+Geeft een URL naar de TBox-info pagina in het eigen (lokale) webdomein van de handel 
+Deze wordt getoond op de helppagina (HowTo.csp) </Description>
+<FormalSpec>Taal:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set UrlGeneralInfo=$CASE(..DomeinVerwerker, "HEIN" : "http://www.tandem-box.de/01Startseite/Startseite.html", 
+												"LMC"  : "http://www.optimapack.fr/France/TbxPresentation.asp", 
+												"DUPO" : "", 
+												"HELMY": "", 
+												"SFS"  : "", 
+												"HFLE" : "", 
+												"MBHO" : $$$TBoxInfoPageMBHO, 
+												       : "http://www.vanhoecke.be/"_$S(Taal="F":"fr/produits",1:"nl/producten")_"/tandem-box/" )
+	Quit UrlGeneralInfo
+]]></Implementation>
+</Method>
+
+<Method name="ToonHelppaginaIndex">
+<Description>
+Toon de sectie Index op de helppagina (HowTo.csp) </Description>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ..DomeinVerwerker?1(1"HEIN",1"HFLE",1"SFS",1"MBHO",1"HFLB")
+]]></Implementation>
+</Method>
+
+<Method name="ToonContactInfo">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ..DomeinVerwerker?1(1"HEIN",1"SFS",1"MBHO",1"HFLB")
+]]></Implementation>
+</Method>
+
+<Method name="GeefContactInfoURL">
+<Description>
+Geeft een taal-afhankelijke URL naar de contactinfo pagina van de handel.
+Dit kan een pagina zijn op het eigen (lokale) domein of een verwijzing naar de sectie "ContactInfo" op de helppagina (HowTo.csp) 
+Maakt gebruik van Res.Vertaling</Description>
+<FormalSpec>Taal:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	;Set TBoxWebContactInfoURL="/VHISIE/TBX/Help/HowTo.csp?Taal="_Taal_"#ContactInfo"
+	;Set Lokale_ContactInfoURL="..." 
+	;
+	; of : via vertaling zoals hieronder 
+
+	Set vtlIntern="ContactInfoURL_"_$CASE(..DomeinVerwerker, "VHEPN":"VH", "LMC":"OPTIMA", "DUPO":"DUPO", "HELMY":"DESTIL", "HFLE":"HFLE", :"HowTo")   ; Indien <> HowTo, dan specifieke contactinfo pagina op eigen website. 
+	Quit ..WebTextValue(vtlIntern,Taal,"L")
+]]></Implementation>
+</Method>
+
+<Method name="GeefAdministratorEmail">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Quit $CASE(..DomeinVerwerker, "HEIN" : "info@tandem-box.de", 
+								  "LMC"  : " ??? ", 
+								  "DUPO" : "du.pont@skynet.be", 
+								  "HELMY": "info@destil.nl", 
+								  "HFLE" : "info@hafele.nl", 
+								  "SFS"  : "info.u@sfsunimarket.biz", 
+								  "MBHO" : $$$EMailICTAdminMbho, 
+								         : "ICT_SOAPSysOp@vanhoecke.be" )
+]]></Implementation>
+</Method>
+
+<Method name="GeefBulkConfigOpties">
+<FormalSpec>KLNr:%String</FormalSpec>
+<ReturnType>%List</ReturnType>
+<Implementation><![CDATA[
+	If (..IsVHEPN)&&(KLNr>0) {
+		Set KLMiniWS=##class(cspBasis.GAProdTBox).GetKlantData(..GeefDomeinVerwerker(),KLNr)
+		If KLMiniWS.BulkVPKCode'="" {
+			Set lbBulkConfig=$LB(KLMiniWS.BulkVPKCode,KLMiniWS.BulkMinQty,"checked")
+		}
+		Else {
+			Set lbBulkConfig=##class(cspBasis.GAProdTBox).GetKlantBulk(..GeefDomeinVerwerker(),KLNr)
+		}
+		 ;d WL^vhDBG("lbBulkConfig: "_$$$LCVT(lbBulkConfig))
+		If (lbBulkConfig'="")&&($LG(lbBulkConfig,1)_$LG(lbBulkConfig,2)'="") {
+			Set:($LG(lbBulkConfig,1)="") $LI(lbBulkConfig,1)="O"
+			Set:($LG(lbBulkConfig,2)<1) $LI(lbBulkConfig,2)=20
+		}
+	}
+	ElseIf (..IsLMC) {
+		;Set lbBulkConfig=$LB("O",20)
+		Set lbBulkConfig=""   ; ##class(cspBasis.GAProdTBox).GetKlantBulk("VHEPN",..GeefDomeinKlantNummer())
+	}
+	ElseIf (..IsSFS||..IsMBHO||..IsHFLB) {
+		Set lbBulkConfig=""
+	}
+	Else {
+		Set lbBulkConfig=""
+	}
+
+	Quit lbBulkConfig
+]]></Implementation>
+</Method>
+
 <UDLText name="T">
 <Content><![CDATA[
 /*
@@ -653,7 +724,6 @@
 
 
 */
-
 ]]></Content>
 </UDLText>
 </Class>
Index: _vhisie/TBX/WizMaten.csp
===================================================================
diff -u -r757 -r1626
--- _vhisie/TBX/WizMaten.csp	(.../WizMaten.csp)	(revision 757)
+++ _vhisie/TBX/WizMaten.csp	(.../WizMaten.csp)	(revision 1626)
@@ -45,7 +45,7 @@
 	Set arVTL("TH","DIV") =..WebTextValue("DiverseTH",Taal,"L")
 	Set arVTL("TH","Aant")=..WebTextValue("AantalTH",Taal,"L")
 	
-	Set KLNrStdL=sDomKLNr
+	Set KLNrStdL=TBXContext.GeefDomeinKlantNummer()
 	Set wsIDStdL=##class(cspBasis.GAProdTBox).WSOrderIDStdLadeViaKLNr(KLNrStdL)
 	Set blnShowStdLField=$S(wsIDStdL="":0, 1:##class(WS.TBX.Order).%ExistsId(wsIDStdL))
 	Set blnAllowBulk=($LL(blTBoxDfl.lbAllowVPK)>1)   ; $LG(lbBulkConfig,1)'?1(1"",1"S") 
@@ -76,9 +76,9 @@
  			<TD width="170" align="right" rowspan="#($S(blnShowStdLField:"4", 1:"5"))#"><div class="clsInputLadeDiv"><img ID="imgLadeType" src="media/spacer.gif" class="clsInputLadeImg"></div></TD>
 		</TR>
 		<TR>
-			<TD align="right"><A href="javascript:;" onclick="ShowInfoLT('#($S(0 && blnLMC:" LMC", 1:""))#');" class="clsInfo" tabindex="-1" title="#(vtlMeerInfo)#">#(arVTL("LBL","LT"))#:</A><img id="imgInputErr_LT" src="media/exclam_orange.gif" class="clsExclamHideImg" onclick="ShowErrDlg(this);" title="#(vtlMeerInfo)#"></TD>
+			<TD align="right"><A href="javascript:;" onclick="ShowInfoLT('#($S(0:" LMC", 1:""))#');" class="clsInfo" tabindex="-1" title="#(vtlMeerInfo)#">#(arVTL("LBL","LT"))#:</A><img id="imgInputErr_LT" src="media/exclam_orange.gif" class="clsExclamHideImg" onclick="ShowErrDlg(this);" title="#(vtlMeerInfo)#"></TD>
 			<TD align="left" colspan="2">
-				<CSP:QUERY name="qryLCodes" classname="Prod.GAMeta.BT.LadeCode" queryname="ExtentSortExtra" p1="#($S(blnHEIN:"CL", 0 && blnLMC:"I", 1:""))#">
+				<CSP:QUERY name="qryLCodes" classname="Prod.GAMeta.BT.LadeCode" queryname="ExtentSortExtra" p1="#($S(TBXContext.GeefDomeinVerwerker()="HEIN":"CL", 1:""))#">
 				<SELECT id="cboLadeType" class="clsInputField" size="1" style="text-align:left;" onchange="cboLadeTypeChange();" onblur="cboLadeTypeOnExit();"#($$$LabelAttrib("Ladetype"))#>
 					<OPTION value='' SELECTED></OPTION>
 					<CSP:WHILE condition=qryLCodes.Next()>
Index: _vhisie/TBX/SelectSPZK.csp
===================================================================
diff -u -r900 -r1626
--- _vhisie/TBX/SelectSPZK.csp	(.../SelectSPZK.csp)	(revision 900)
+++ _vhisie/TBX/SelectSPZK.csp	(.../SelectSPZK.csp)	(revision 1626)
@@ -11,18 +11,18 @@
  
 #define jsVTLAddVtl(%i,%tl,%tt,%vtl)       $C(9)_"jsArVTL["""_%i_"#"_%tl_"-"_%tt_"""]="""_%vtl_""";"_$C(13,10) 
 
-
-#define TaalDfl   $S(sDomVERW="HEIN":"D", sDomVERW="LMC":"F", sDomVERW="SFS":"D", 1:"N")
-	Set %session.AppTimeout = 905
+	;Set %session.AppTimeout = 905
 	  s:('$D(ClientIP)) ClientIP="192.168.1.97"
 	
 	//   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=$$SesDataFromRq^cspBasis.Library("Taal",,$$$TaalDfl)
+	;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 TBXContext=##class(APPS.TBXWeb.TBXContext).InitFromHttpRequest()
+	
+	Set Taal=$$SesDataFromRq^cspBasis.Library("Taal",,TBXContext.GeefDefaultTaal())
 	Set blnDemo=(''$G(%request.Data("DEMO",1)))
 	Set DC=$G(%request.Data("DC",1),"S")
 	Set LT=$G(%request.Data("LCODE",1),"MS2")
Index: _vhisie/TBX/WizPData.csp
===================================================================
diff -u -r1571 -r1626
--- _vhisie/TBX/WizPData.csp	(.../WizPData.csp)	(revision 1571)
+++ _vhisie/TBX/WizPData.csp	(.../WizPData.csp)	(revision 1626)
@@ -18,9 +18,9 @@
 	. ;Quit:('WSOrd)
 	. ; ...
 	. ;Set WSOrd=""
-	Else  If (blnVHEPN) Do
+	Else  If (TBXContext.IsDomeinVHEPN()) Do
 	. ; VHEPN  Nieuw order, klantgegevens ophalen
-	. Set KLMini=$S($IsObject($G(KLMiniWS)):KLMiniWS, 1:..GetKlantData(sDomVERW,KLNr))
+	. Set KLMini=$S($IsObject($G(KLMiniWS)):KLMiniWS, 1:..GetKlantData(TBXContext.GeefDomeinVerwerker(),KLNr))
 	. Quit:(KLNr'>0)
 	. If '$IsObject(KLMini) Do  Quit
 	..  Quit:($G(%objlasterror,1))
@@ -46,47 +46,45 @@
 	. . Set arPDT("TEL")=" "
 	. ;Set arPDT("PKLASSE")=KLMini.PrijsKlasse   ; In HTML/JavaScript genaamd: AfdrukCode
 	. Set KLMini=""
-	Else  If (blnLMC||blnSFS||blnMBHO||blnHFLB)&&(wsID>0) Do
-	. ; OPTIMA / SFS / MBHO  Bestaand order
+	Else  If (TBXContext.KlantGegevensViaDataOpt())&&(wsID>0) Do
+	. ; OPTIMA / SFS / MBHO / HFLB  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||blnHFLB) Do
-	. ; OPTIMA / SFS / MBHO  Nieuw order, klantgegevens ophalen
-	. Set KLMini=..GetKlantData(sDomVERW,KLNr)
+	Else  If (TBXContext.KlantGegevensViaDataOpt()) Do
+	. ; OPTIMA / SFS / MBHO / HFLB  Nieuw order, klantgegevens ophalen
+	. Set KLMini=..GetKlantData(TBXContext.GeefDomeinVerwerker(),KLNr)
 	. Quit:('KLMini)
 	. Set arPDT("NAAM")=KLMini.Naam
 	. Set arPDT("NR")=KLMini.Nummer
 	. Set arPDT("KORTING")=KLMini.Korting
 	. Set arPDT("EMAIL")=KLMini.EMail
-	Else  If (blnHFLE) Do
+	Else  If (TBXContext.GeefDomeinVerwerker()="HFLE") Do
 	. Quit:(wsID>0)
 	. ; HAEFELE  Nieuw order, klantgegevens ophalen
-	. Set KLMini=..GetKlantData(sDomVERW,"DFL01")
+	. Set KLMini=..GetKlantData(TBXContext.GeefDomeinVerwerker(),"DFL01")
 	. Quit:('KLMini)
 	. Set arPDT("NAAM")=KLMini.Naam
 	. Set arPDT("EMAIL")=KLMini.EMail
-	Else  If (blnHEIN||blnDUPO||blnHELMY) Do   ; ||blnSFS
+	Else  If (TBXContext.AlleenToegangZonderLogin())&&(TBXContext.GeefDomeinVerwerker()'="HFLE") Do   ; (blnHEIN||blnDUPO||blnHELMY) Do
 	. ; Nothing special
 	
 	If $G(blnBeursUser)&&($G(arPDT("NAAM"))="") Do
 	. Set arPDT("NAAM")="DEMO - Hout 2006"
 	. ;Set arPDT("TEL")="0"
 	
 	Set blnKLNaamFixed=0
-	If blnVHEPN Do
+	If TBXContext.IsDomeinVHEPN() 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||blnHFLB Do
+	If TBXContext.KlantGegevensViaDataOpt() Do
 	. Set arPDT("NAAM+NR")=$G(arPDT("NR"))_" "_$G(arPDT("NAAM"))
 	Set LevertijdInfoVTL=$$$GetVertalingJS("LevertijdInfo",Taal,"O")
 
-	;Set ITypeKLNaam=$S(blnLMC:"hidden", 1:"text")
-	;Set ITypeKLOther=$S(blnLMC:"hidden", 1:"text")
-	Set blnShowAfdrukCode=0   ; (blnVHEPN)&&(sMode="W")&&(UserType'<$$$utVerwDomain)
+	Set blnShowAfdrukCode=0   ; (TBXContext.IsDomeinVHEPN())&&(sMode="W")&&(UserType'<$$$utVerwDomain)
 	Set blnEnableAfdrukCode=(blnShowAfdrukCode)&&($G(arPDT("PKLASSE"))="")
 	
 	
@@ -107,7 +105,7 @@
 			<TD>&nbsp;</TD>
 		</TR>
 --></CSP:COMMENT>
-	<CSP:IF condition="'blnLMC">
+	<CSP:IF condition='($$$Not(TBXContext.GeefDomeinVerwerker()="LMC"))'>
 		<TR valign="middle" height="40px">
 			<TD colspan="2" align="left" style="padding-left:50px; font-weight:bold;">#(..WebTextValue("VeldenInvullen",Taal,"L"))#</TD>
 			<TD>&nbsp;</TD>
@@ -117,7 +115,7 @@
 			<TD colspan="2">&nbsp;</TD>
 		</TR>
 	</CSP:IF>
-	<CSP:IF condition="blnLMC">
+	<CSP:IF condition='(TBXContext.GeefDomeinVerwerker()="LMC")'>
 		<TR valign="middle">
 			<TD><DIV class="clsKlantData">#(..WebTextValue("KLNaamOPTIMA",Taal,"L"))# :</DIV></TD>
 			<TD><input type="text" class="clsFieldsData" id="txtKL_NaamNr" readonly style="text-align:left; width:100%;"#($$$InitVal("NAAM+NR"))#></TD>
@@ -180,7 +178,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||blnHFLB">
+		<CSP:ELSEIF condition='((TBXContext.KlantGegevensViaDataOpt())&&($$$Not(TBXContext.GeefDomeinVerwerker()="LMC")))'>
 		<input type="hidden" id="txtKL_Korting" #($$$ReadOnlyAttrib(IsKLDataReadOnly)_$$$InitVal("KORTING"))#>
 		<CSP:ELSE>
 		<input type="hidden" id="txtKL_BTWNr" #($$$ReadOnlyAttrib(IsKLDataReadOnly)_$$$InitVal("KLBTWNr"))#>
@@ -234,19 +232,8 @@
 			<TD>&nbsp;</TD>
 			<TD colspan="2" align="left">
 				<DIV class="clsKlantData" style="text-align:left;">
-				<SPAN>*</SPAN> #(..WebTextValue("jsDVerplichtGegeven",Taal,"O"))#<CSP:IF condition="('blnLMC)">,&nbsp;&nbsp;<SPAN>(*)</SPAN> : #(..WebTextValue("Minstens1Verplicht",Taal,"O"))#</CSP:IF>
+				<SPAN>*</SPAN> #(..WebTextValue("jsDVerplichtGegeven",Taal,"O"))#<CSP:IF condition='($$$Not(TBXContext.GeefDomeinVerwerker()="LMC"))'>,&nbsp;&nbsp;<SPAN>(*)</SPAN> : #(..WebTextValue("Minstens1Verplicht",Taal,"O"))#</CSP:IF>
 				</DIV>
 			</TD>
 		</TR>
-<CSP:COMMENT><!--
-		<TR height="20">
-			<TD colspan="3">
-<PRE>
-	Domain   : #(sDomain)# - #(sDomCVT)#   	 DomDefs : #(sDomVERW)# - #(sDomKLNr)#
-	VERW     : #(VERW)# 
-	KLNr     : #(KLNr)#   	 wsID : #(wsID)#   	 Taal : #(Taal)#    	 UserType : #(UserType)#  
-</PRE>
-			</TD>
-		</TR>
---></CSP:COMMENT>
 	</TABLE>
Index: _vhisie/TBX/SelectStdLade.csp
===================================================================
diff -u -r757 -r1626
--- _vhisie/TBX/SelectStdLade.csp	(.../SelectStdLade.csp)	(revision 757)
+++ _vhisie/TBX/SelectStdLade.csp	(.../SelectStdLade.csp)	(revision 1626)
@@ -2,17 +2,17 @@
 <CSP:CLASS super="%CSP.Page,cspBasis.GAProdTBox" encoded="0" private="0">
 <CSP:Include page="PRGACNTs.INC">
 <SCRIPT language="cache" runat="server">
-#define TaalDfl   $S(sDomVERW="HEIN":"D", sDomVERW="LMC":"F", sDomVERW="SFS":"D", 1:"N")
-	Set %session.AppTimeout = 905
+	;Set %session.AppTimeout = 905
 	  s:('$D(ClientIP)) ClientIP="192.168.1.97"
 	
 	//   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 Taal=$$SesDataFromRq^cspBasis.Library("Taal",,$$$TaalDfl)
+	;Set sDomain=$$GetURLDomain^cspBasis.Library
+	;Set sDomCVT=$$TBXDomainCVT^cspBasis.Library(sDomain)
+	;Set lbDomLU=##class(WS.TBX.Order).DomainLookUp(sDomCVT,$LB("VERW","KLNR"))   ; $$TBXDomainLU^cspBasis.Library(sDomCVT,$LB("VERW","KLNR"))
+	;Set sDomVERW=$LG(lbDomLU,1)
+	;Set sDomKLNr=$LG(lbDomLU,2)
+	Set TBXContext=##class(APPS.TBXWeb.TBXContext).InitFromHttpRequest()
+	Set Taal=$$SesDataFromRq^cspBasis.Library("Taal",,TBXContext.GeefDefaultTaal())
 	;Set KLNr=$$SesDataFromRq^cspBasis.Library("KLNR",,"")
 	;Set VERW=$$SesDataFromRq^cspBasis.Library("VERW",,"")
 	
@@ -22,7 +22,7 @@
 	  ;d WL^vhDBG("klnr:"_KLNr_"  kleur:"_KleurKeuze_"  mdata:"_MData)
 	Do ..FullDataFromPDLs(.arInits, , KleurKeuze, MData)
 	  ;d WL^vhDBG($$ArrayToText^vhLib("arInits"))
-	Set KLNrStdL=sDomKLNr
+	Set KLNrStdL=TBXContext.GeefDomeinKlantNummer()
 	Do StdLadeArray^cspBasis.GAProdTBox.tmpDev(KLNrStdL,.arStdL)
 	  ;d WL^vhDBG($$ArrayToText^vhLib("arStdL"))
 </SCRIPT>
Index: _vhisie/TBX/MailSend.csp
===================================================================
diff -u -r757 -r1626
--- _vhisie/TBX/MailSend.csp	(.../MailSend.csp)	(revision 757)
+++ _vhisie/TBX/MailSend.csp	(.../MailSend.csp)	(revision 1626)
@@ -5,17 +5,20 @@
 <SCRIPT language="cache" runat="server">
 	Set %session.AppTimeout = 905
 
-	Set sDomain=$$GetURLDomain^cspBasis.Library
-	Set sDomCVT=$$TBXDomainCVT^cspBasis.Library(sDomain)
-	Set sDomVERW=$LG(##class(WS.TBX.Order).DomainLookUp(sDomCVT,$LB("VERW")),1)   ; $$TBXDomainLU^cspBasis.Library(sDomCVT,$LB("VERW","KLNR"))
-	Set blnVHEPN=(sDomVERW="VHEPN")
+	;Set sDomain=$$GetURLDomain^cspBasis.Library
+	;Set sDomCVT=$$TBXDomainCVT^cspBasis.Library(sDomain)
+	;Set sDomVERW=$LG(##class(WS.TBX.Order).DomainLookUp(sDomCVT,$LB("VERW")),1)   ; $$TBXDomainLU^cspBasis.Library(sDomCVT,$LB("VERW","KLNR"))
+	;Set blnVHEPN=(sDomVERW="VHEPN")
 	
+	Set TBXContext=##class(APPS.TBXWeb.TBXContext).InitFromHttpRequest()
+	Set sDomain=TBXContext.GeefHttpRequestDomein()
+	
 	Set Taal=$$DataFromRqOrSes^cspBasis.Library("Taal",,"N")
 	Set wsID=$$DataFromRqOrSes^cspBasis.Library("WSID",,"")
 	Set:($L(wsID)) %session.Data("WSID")=wsID
 	Set KLNr=$$DataFromRqOrSes^cspBasis.Library("KLNR",,"")
 	If KLNr>0 Do
-	. Set SubmitMsg=##class(cspBasis.GAProdTBox).GetKlantSubmitMsg(sDomVERW,KLNr)
+	. Set SubmitMsg=##class(cspBasis.GAProdTBox).GetKlantSubmitMsg(TBXContext.GeefDomeinVerwerker(),KLNr)
 	; LeverTijd is verplicht gegeven in geval van Bestelbon
 	
 	;Do ##class(cspBasis.GAProdTBox).AddToLog("MAIL_DLGSEND",$$GetURLDomain^cspBasis.Library,$G(KLNr),,$G(wsID),$G(%session.Data("VERW")),$G(Taal),,"")
@@ -27,7 +30,7 @@
 	. Set blnValidate=((WSOrd.BonType="BBON")||((WSOrd.BonType="OFF")&&($G(%request.Data("OFFTOBBON",1))))||(WSOrd.BonType="INKP"))
 	. Set blnError=0
 	. Set:($L(WSOrd.Opmerking1))&&(WSOrd.BonType'="OFF") SubmitMsg=WSOrd.Opmerking1
-	. Set blnShowOrderBCombo=(blnVHEPN)
+	. Set blnShowOrderBCombo=(TBXContext.IsDomeinVHEPN())
 	. If blnShowOrderBCombo Do
 	. . Set lbOrderbevEmails = ..GetEmailAdressenLB(WSOrd.KLNummer)
 	Else  Do
@@ -36,10 +39,10 @@
 	. ; For debugging reason: log OnOpen event of the MailSend.csp page
 	. Do ##class(cspBasis.GAProdTBox).AddToLog("MAIL_DLGERR",sDomain,$G(KLNr),,$G(wsID),$G(%session.Data("VERW")),$G(Taal),,"")
 
-	Set blnShowLevTCombo=(blnVHEPN)   ; only for VHEPN domain
+	Set blnShowLevTCombo=(TBXContext.IsDomeinVHEPN())   ; only for VHEPN domain
 	If blnShowLevTCombo Do
 	. Set LevTFieldName="cboLeverTijd"
-	. Set lbLevT=..GetLeverWekenLB(sDomVERW,Taal)
+	. Set lbLevT=..GetLeverWekenLB(TBXContext.GeefDomeinVerwerker(),Taal)
 	Else  Do
 	. Set LevTFieldName="txtLeverTijd"
 	
Index: _vhisie/TBX/Header.csp
===================================================================
diff -u -r1571 -r1626
--- _vhisie/TBX/Header.csp	(.../Header.csp)	(revision 1571)
+++ _vhisie/TBX/Header.csp	(.../Header.csp)	(revision 1626)
@@ -3,21 +3,22 @@
 <CSP:Include page="APPS.TBXWeb.INC">
 
 <SCRIPT language="Cache" runat="server">
+	If $IsObject($G(TBXContext)) {
+		// Nieuwe implementatie via TBXContext    ; added by WimV on 05/07/2011 
+		Set DomeinVerwerker=TBXContext.GeefDomeinVerwerker()
+	}	
+	Else {
+		// Tijdelijk, om backward-compatible te zijn nog volgens oude werkijze (i.e. met variabele sDomVERW en sDomKLNr)
+		Set DomeinVerwerker=sDomVERW
+	}
 	Set UrlHowTo="Help/HowTo.csp?Taal="_Taal
 	Set imgTBoxLogo="media/LogoTBox_h38.gif"   ; "media/LogoTBox_103.jpg"
 	Set:($G(HeaderLogo)="S") imgTBoxLogo="media/LogoTBoxPlus_h38.gif"
 	Set:($G(HeaderLogo)="I") imgTBoxLogo="media/LogoTBoxIntivo_h38.gif"
 	Set:($G(HeaderLogo)="A") imgTBoxLogo="media/LogoTBoxAntaro_h38.gif"
-	
-	;Set:($G(HeaderLogo)="I") imgTBoxLogo="media/TBoxIntivo_Hoofden_50px.gif"
-	/*
-			<TD width="25%" align="right" valign="bottom"><A href="http://www.tandem-box.de/01Startseite/Startseite.html" target="Main" class="clsInfo">#(..WebTextValue("Help",Taal,"L"))#</A></TD>
-			<TD width="25%" align="right" valign="bottom"><A href="http://www.optimapack.fr/France/TbxPresentation.asp" target="_blank" class="clsInfo">#(..WebTextValue("Help",Taal,"L"))#</A></TD>
-			<TD width="25%" align="right" valign="bottom"><A href="http://www.vanhoecke.be/#($S(Taal="F":"fr/produits",1:"nl/producten"))#/tandem-box/" target="_blank" class="clsInfo">#(..WebTextValue("Help",Taal,"L"))#</A></TD>
-	*/
 </SCRIPT>
 
-<CSP:IF condition="sDomKLNr=7833">                 <!-- HEIN  (DU) -->
+<CSP:IF condition='(DomeinVerwerker="HEIN")'>                 <!-- HEIN  (DU) -->
 	<table border="0" width="740" height="50" style="border-collapse:collapse;">
  		<TR height="50" valign="middle">
 			<TD width="15px">&nbsp;</TD>
@@ -29,7 +30,7 @@
 			<TD width="15px">&nbsp;</TD>
 		</TR>
 	</table>
-<CSP:ELSEIF condition="sDomKLNr=6279">             <!-- LMC - MASSON  (FR) -->
+<CSP:ELSEIF condition='(DomeinVerwerker="LMC")'>             <!-- LMC - MASSON  (FR) -->
 	<table border="0" width="740" height="50" style="border-collapse:collapse;">
  		<TR height="50" valign="middle">
 			<TD width="15px">&nbsp;</TD>
@@ -41,7 +42,7 @@
 			<TD width="15px">&nbsp;</TD>
 		</TR>
 	</table>
-<CSP:ELSEIF condition="sDomKLNr=1736">             <!-- DU PONT  (BE) -->
+<CSP:ELSEIF condition='(DomeinVerwerker="DUPO")'>             <!-- DU PONT  (BE) -->
 	<table border="0" width="740" height="50" style="border-collapse:collapse;">
  		<TR height="50" valign="middle">
 			<TD width="15px">&nbsp;</TD>
@@ -53,7 +54,7 @@
 			<TD width="15px">&nbsp;</TD>
 		</TR>
 	</table>
-<CSP:ELSEIF condition="sDomKLNr=4598">             <!-- DESTIL (NL)   prevKLNr=2127 HELMONDSE IJZERHANDEL -->
+<CSP:ELSEIF condition='(DomeinVerwerker="HELMY")'>             <!-- DESTIL (NL)   prevKLNr=2127 HELMONDSE IJZERHANDEL -->
 	<table border="0" width="740" height="50" style="border-collapse:collapse;">
  		<TR height="50" valign="middle">
 			<TD width="15px">&nbsp;</TD>
@@ -65,7 +66,7 @@
 			<TD width="15px">&nbsp;</TD>
 		</TR>
 	</table>
-<CSP:ELSEIF condition='sDomVERW="HFLE"'>             <!-- HAEFELE (NL)   - OPGELET: ER IS OOK EEN Hafele BELGIE !!!   -->
+<CSP:ELSEIF condition='(DomeinVerwerker="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>
@@ -77,7 +78,7 @@
 			<TD width="15px">&nbsp;</TD>
 		</TR>
 	</table>
-<CSP:ELSEIF condition='sDomVERW="SFS"'>             <!-- SFS UNIMARKET (CH) -->
+<CSP:ELSEIF condition='(DomeinVerwerker="SFS")'>             <!-- SFS UNIMARKET (CH) -->
 	<table border="0" width="740" height="50" style="border-collapse:collapse;">
  		<TR height="50" valign="middle">
 			<TD width="15px">&nbsp;</TD>
@@ -89,7 +90,7 @@
 			<TD width="15px">&nbsp;</TD>
 		</TR>
 	</table>
-<CSP:ELSEIF condition='sDomVERW="MBHO"'>             <!-- MEUBELBESLAG HOLLAND (NL) -->
+<CSP:ELSEIF condition='(DomeinVerwerker="MBHO")'>             <!-- MEUBELBESLAG HOLLAND (NL) -->
 	<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>
@@ -101,7 +102,7 @@
 			<TD width="15px">&nbsp;</TD>
 		</TR>
 	</table>
-<CSP:ELSEIF condition='sDomVERW="HFLB"'>             <!-- HAEFELE (BE)   - OPGELET: ER IS OOK EEN Hafele NEDERLAND !!!    -->
+<CSP:ELSEIF condition='(DomeinVerwerker="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>
Index: _vhisie/TBX/SelectVulstukKleur.csp
===================================================================
diff -u -r900 -r1626
--- _vhisie/TBX/SelectVulstukKleur.csp	(.../SelectVulstukKleur.csp)	(revision 900)
+++ _vhisie/TBX/SelectVulstukKleur.csp	(.../SelectVulstukKleur.csp)	(revision 1626)
@@ -13,18 +13,17 @@
 
 #define MaxItemsPerRow  4
 
-#define TaalDfl   $S(sDomVERW="HEIN":"D", sDomVERW="LMC":"F", sDomVERW="SFS":"D", 1:"N")
-
 	Set %session.AppTimeout = 905
 	Set:('$D(%ClientIP)) %ClientIP="192.168.1.195"
 	
 	//   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=$$SesDataFromRq^cspBasis.Library("Taal",,$$$TaalDfl)
+	;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 TBXContext=##class(APPS.TBXWeb.TBXContext).InitFromHttpRequest()
+	Set Taal=$$SesDataFromRq^cspBasis.Library("Taal",,TBXContext.GeefDefaultTaal())
 	;Set Taal="N"
 	Set blnDemo=(''$G(%request.Data("DEMO",1)))
 	
Index: _vhisie/TBX/Wizard.csp
===================================================================
diff -u -r900 -r1626
--- _vhisie/TBX/Wizard.csp	(.../Wizard.csp)	(revision 900)
+++ _vhisie/TBX/Wizard.csp	(.../Wizard.csp)	(revision 1626)
@@ -385,13 +385,6 @@
  		<TR height="70">
 			<TD>
 				<CSP:Include Page="Header.csp">
-<CSP:COMMENT><!--
-<PRE>
-	Domain   : #(sDomain)# - #(sDomCVT)#   	 DomDefs : #(sDomVERW)# - #(sDomKLNr)#
-	VERW     : #(VERW)# 
-	KLNr     : #(KLNr)#   	 wsID : #(wsID)#   	 Taal : #(Taal)#    	 UserType : #(UserType)#  
-</PRE>
---></CSP:COMMENT>
 			</TD>
 		</TR>
  		<TR height="30">