Index: csp/vhisie/TBX/Main/tmpDev.mac.rou
===================================================================
diff -u -r181 -r212
--- csp/vhisie/TBX/Main/tmpDev.mac.rou (.../tmpDev.mac.rou) (revision 181)
+++ csp/vhisie/TBX/Main/tmpDev.mac.rou (.../tmpDev.mac.rou) (revision 212)
@@ -2,9 +2,8 @@
#include APPS.TBXWeb
#define RefStartNew "\\\START"
-#define IsAllowedBrowser(%v) (%v?1(.E1"MSIE".E,.E1"Firefox".E,.E1"Opera".E))
+#define IsAllowedBrowser(%v) (%v?1(.E1"MSIE".E,.E1"Firefox".E,.E1"Opera".E,.E1"Chrome".E))
#define IsAllowedMacBrowser(%v) (%v?1(.E1"Safari".E,.E1"Firefox".E,.E1"Opera".E))
-#define IsFireFox4Browser(%v) (%v?1(.E1"Firefox/4".E))
OnPreHTTP()
#define CSPPage ##class(%CSP.Page)
@@ -140,19 +139,16 @@
;d WLIP^vhDBG(97,"%session.BrokerImplementation = "_%session.BrokerImplementation)
;d WLIP^vhDBG(97,"use UseXMLHTTP = "_UseXMLHTTP)
- If %request.UserAgent?1(1.E1"Macintosh".E,1.E1"iPad;".E,1.E1"iPhone;".E) Do
- . Set blnAllowedBrowser=$$$IsAllowedMacBrowser(%request.UserAgent)
- Else Do
- . Set blnAllowedBrowser=$$$IsAllowedBrowser(%request.UserAgent) ; Browser list : MSIE, Firefox, Opera, Chrome, Safari
-
+ If %request.UserAgent?1(1.E1"Macintosh".E,1.E1"iPad;".E,1.E1"iPhone;".E) {
+ Set blnAllowedBrowser=$$$IsAllowedMacBrowser(%request.UserAgent)
+ }
+ Else {
+ Set blnAllowedBrowser=$$$IsAllowedBrowser(%request.UserAgent) ; Browser list : MSIE, Firefox, Opera, Chrome, Safari
+ }
If (TBXContext.IsDomeinSFS())&&($G(KLNr)=10001) {
- Set blnAllowedBrowser=1
+ Set blnAllowedBrowser=1 ; Testklant van SFS
}
- // 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
-
If 'blnAllowedBrowser Do
. Set blnNoAccess=1
. New sUserAgent
@@ -164,18 +160,6 @@
. Set NoAccessMsg=NoAccessMsg_$$$CRLF_" Please use ""Internet Explorer"", ""Firefox"" or ""Opera"" as web browser."
. Do ophAddToLog("!MAINPAGE!")
.
- Else If 0 && $$$IsFireFox4Browser(%request.UserAgent) Do ; Added by WimV on 28/03/2011 - Firefox 4 heeft problemen met hyperevents
- . Set blnNoAccess=1
- . New sUserAgent
- . Set sUserAgent=%request.UserAgent
- . For iWB="Firefox/4" Set sUserAgent=$$$Replace(sUserAgent,iWB,""_iWB_"")
- . Set NoAccessMsg=""
- . Set NoAccessMsg=NoAccessMsg_" !!! TEMPORARY problems with the use of ""FireFox 4.0"" !!!
"_$$$CRLF
- . Set NoAccessMsg=NoAccessMsg_" The web browser you are using is:
"_sUserAgent_"
"_$$$CRLF
- . Set NoAccessMsg=NoAccessMsg_" We are looking for a fix to work around this situation as soon as possible.
"_$$$CRLF
- . Set NoAccessMsg=NoAccessMsg_$$$CRLF_" Please use ""Internet Explorer"", ""Firefox v3"" or ""Opera"" as web browser."
- . Do ophAddToLog("!MAINPAGE!")
- .
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!")