Index: csp/vhisie/TBX/Main/tmpDev.mac.rou
===================================================================
diff -u -r46 -r79
--- csp/vhisie/TBX/Main/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 46)
+++ csp/vhisie/TBX/Main/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 79)
@@ -83,7 +83,7 @@
 	. . Set:($L($G(tmpRq("REF")))) tmpRq("REF")=$$CreateHashedRef^cspBasis.TBX.DecodeURL.tmpDev($LB(KLNr,VERW,wsID,$G(RefArray("MODE"))))
 	. . Kill tmpRq("DATAOPT")
 	. . ;Do ophBuildSwitchTLArray   ; Once again, but with the NEW QueryString-values 
-	. Else  If ($IsValidNum(KLNr))&&($G(%request.Data("Taal",1))="") Do
+	. Else  If (TBXContext.IsKlantIDIngevuld(KLNr))&&($G(%request.Data("Taal",1))="") Do
 	. . 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=""
@@ -141,7 +141,11 @@
 	. Set blnAllowedBrowser=$$$IsAllowedMacBrowser(%request.UserAgent)
 	Else  Do
 	. Set blnAllowedBrowser=$$$IsAllowedBrowser(%request.UserAgent)      ; Browser list : MSIE, Firefox, Opera, Chrome, Safari 
- 
+ 	
+	If (TBXContext.IsDomeinSFS())&&($G(KLNr)=10001) {
+		Set blnAllowedBrowser=1
+ 	}
+ 	
 	// Placed in comment by WimV on 02/08/2011  --> universele oplossing in klasse %CSP.UserAgent 
  ;	If $$$IsRecentBrowser(%request.UserAgent) Do   ; Added by WimV on 28/03/2011 
  ;	. Set %session.BrokerImplementation=2          ; use XMLHTTPRequest method 
@@ -220,7 +224,7 @@
 	; 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(TBXContext.GeefDomeinVerwerker(),KLNr,$LB("Stg","NoAction"))
+	. Set:(TBXContext.IsKlantIDIngevuld(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"))
@@ -285,7 +289,7 @@
 	. // 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
+	Quit:(%RemoteIP?1(1"192.168.")1.3N1"."1.3N)&&(MatchKLNr=1000) 1
 	Set OrdKLNr=WSOrd.KLNummer
 	Set blnOK=0
 	If TBXContext.IsDomeinVHEPN() Do  Quit blnOK
@@ -469,7 +473,7 @@
 	; Button PrintPage
 	Do MShowPrintPage(1,blnOFFVervallen||blnDynaplugERR||$$$Not(IsDesignBeschikbaar))
 	; Button BookmarkPage
-	Do MShowBookmarkPage('$IsValidNum(KLNr),WSOrd)
+	Do MShowBookmarkPage((KLNr=""),WSOrd)
 	; Button Show XML
 	Do MShowExportXML((TBXContext.IsBeschikbaarExportXML())&&((KLNr=$$$TBoxWebKlantNrVHEPN)||(KLNr=$$$TBoxWebKlantNrHEIN)) )
 	; Button Submit
@@ -665,7 +669,7 @@
 	Quit
 	
 MShowNewOrder(Visible)
-	Quit:((TBXContext.AlleenToegangMetLogin())&&(KLNr'>0))
+	Quit:((TBXContext.AlleenToegangMetLogin())&&('TBXContext.IsKlantIDIngevuld(KLNr)))
 	Quit:(KLNr=$$$KLNrListAll)&&($$$Not((sMode="START")&&(TBXContext.AlleenToegangZonderLogin())))
 	Quit:('$G(blnValidKlant,1))
 	New tmpAr