Index: cspBasis/Library.mac.rou
===================================================================
diff -u -r135 -r320
--- cspBasis/Library.mac.rou	(.../Library.mac.rou)	(revision 135)
+++ cspBasis/Library.mac.rou	(.../Library.mac.rou)	(revision 320)
@@ -82,55 +82,14 @@
 	Quit ServName
  
 TBXDomainCVT(Domain)
-  #define DefaultDomain   $G(^Settings("TBX","DefaultDomain"),"www.tandem-box.com")
-  #define OtherDomain     $G(^Settings("TBX","OtherDomain"),"www.optima-tbx.fr")
- ;#define OtherDomain     $G(^Settings("TBX","OtherDomain"),"www.tandem-box.com")
- 
-	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="testtandembox.hafele.be"                 ) $$$TBoxWebDomeinHFLB
- 
-		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="localdev-tandembox.kisch.nl"              ) $$$TBoxWebDomeinKISCH
-	
-		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
-		;Quit $$$DefaultDomain
+ 	if ##class(TECH.Config.ConfigMgr).Instance().GetBoolean("cspBasis.Library_TestDomeinenOmzetten") {
+	 	set TBXDomainCVT = ##class(APPS.TBXWeb.TestUtils).GeefDomeinNaam(Domain)
+	} else {
+		set TBXDomainCVT = $piece(Domain,":",1)
 	}
-	Else {
-		Quit $P(Domain,":",1)   ; 2e piece is de HTTP-poort (indien aanwezig) 
-	}
+	Quit TBXDomainCVT
  
-	Quit ""
  
- 
 	// SendMiniMail eXtended :
 	// Replace the domain "vanhoecke.be" in <From> if <lbTo> also contains "vanhoecke.be" domain(s)
 SendMiniMailXtd(From,lbTo,Subject,Body,BodyIsStream,Args6,Args7,Args8,lbAttachments,Args10)   ; ,Args11,Args12)
@@ -168,4 +127,4 @@
 	Else  If '$$$IsList(FlgItem)  Quit
 	Else  If ($LG(FlgItem,1)="X")&&($L($LG(FlgItem,2))) Do
 	. X "Set Val="_$$$Replace($LI(FlgItem,2),"%v","Val")
-	Quit
\ No newline at end of file
+	Quit