Index: csp/vhisie/TBX/BuildRef/tmpDev.mac.rou =================================================================== diff -u -r22 -r96 --- csp/vhisie/TBX/BuildRef/tmpDev.mac.rou (.../tmpDev.mac.rou) (revision 22) +++ csp/vhisie/TBX/BuildRef/tmpDev.mac.rou (.../tmpDev.mac.rou) (revision 96) @@ -137,10 +137,10 @@ Set blnNoAccess=0 If 0 Set blnNoAccess=1 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 If sDomVERW="SFS" Set blnNoAccess=$$$Not($$$AccessTestPageDataOptSFS(%RemoteIP)||($$IsInternIPAdres^cspBasis.Library(%RemoteIP))) + Else If sDomVERW="LMC" Set blnNoAccess=$$$Not($$$AccessTestPageDataOptLMC(%RemoteIP)||($$IsInternIPAdres^cspBasis.Library(%RemoteIP))) || 1 ; blocked for all IP + Else If sDomVERW="MBHO" Set blnNoAccess=$$$Not($$$AccessTestPageDataOptMBHO(%RemoteIP)||($$IsInternIPAdres^cspBasis.Library(%RemoteIP))) + Else If sDomVERW="HFLB" Set blnNoAccess=$$$Not($$$AccessTestPageDataOptHFLB(%RemoteIP)||($$IsInternIPAdres^cspBasis.Library(%RemoteIP))) Else Set blnNoAccess=1 d WLIP^vhDBG(97,"blnNoAccess="_blnNoAccess_"") @@ -286,7 +286,7 @@ Merge arDataOpt=tmpAr Set:($G(arDataOpt("Taal"))="") arDataOpt("Taal")="F" Set:($G(arDataOpt("EMail"))="") arDataOpt("EMail")="tandembox@lmc.tm.fr" - If ($G(arDataOpt("KLNummer"))="")&&($IsValidNum($G(%OptimaVar("KLNr")))) Do + If ($G(arDataOpt("KLNummer"))="")&&($IsValidNum($G(%OptimaVar("KLNr")))) Do ; TBXContext.IsKlantIDIngevuld(...) . Set arDataOpt("KLNummer")=%OptimaVar("KLNr") . Set msgVerifyKLNr="!!! Verifiez le Num�ro de client !!!" Index: cspBasis/Library.mac.rou =================================================================== diff -u -r18 -r96 --- cspBasis/Library.mac.rou (.../Library.mac.rou) (revision 18) +++ cspBasis/Library.mac.rou (.../Library.mac.rou) (revision 96) @@ -18,6 +18,8 @@ GetUserMunt(sDomVERW,VERW) Quit $S($G(VERW)="VHEPN":"EUR", sDomVERW="SFS":"CHF", 1:"EUR") +IsInternIPAdres(IPAdres) + Quit (IPAdres?1(1"192.168."1.3N1"."1.3N,1"127.0.0.1")) AppIsEnabled(App,SubApp,IPAddress) #define IP4 $P(IPAddress,".",4) Index: csp/vhisie/TBX/Main/tmpDev.mac.rou =================================================================== diff -u -r91 -r96 --- csp/vhisie/TBX/Main/tmpDev.mac.rou (.../tmpDev.mac.rou) (revision 91) +++ csp/vhisie/TBX/Main/tmpDev.mac.rou (.../tmpDev.mac.rou) (revision 96) @@ -289,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.3N1"."1.3N)&&(MatchKLNr=1000) 1 + Quit:($$IsInternIPAdres^cspBasis.Library(%RemoteIP))&&(MatchKLNr=1000) 1 Set OrdKLNr=WSOrd.KLNummer Set blnOK=0 If TBXContext.IsDomeinVHEPN() Do Quit blnOK @@ -546,9 +546,9 @@ ; Button Process --> SubmitToVHEPN / SubmitToAdmin) If blnProcessVH Do . ; Button SubmitToAdmin - . Do:(%RemoteIP?1(1"192.168.".E,1"127.0.0.1")) MShowSubmitAdminVerw(TBXContext.IsDomeinVHEPN()||(VERW="VHEPN"),WSOrd) + . Do:($$IsInternIPAdres^cspBasis.Library(%RemoteIP)) MShowSubmitAdminVerw(TBXContext.IsDomeinVHEPN()||(VERW="VHEPN"),WSOrd) . ; Button ChangeBulk - . Set arShow("ChangeBulk","BTN")=(%RemoteIP?1(1"192.168.".E,1"127.0.0.1")) + . Set arShow("ChangeBulk","BTN")=($$IsInternIPAdres^cspBasis.Library(%RemoteIP)) . If arShow("ChangeBulk","BTN") Do . . Do ophOrdToAdminSetSesData . . ;Set arShow("ChangeBulk","EXPAND")=0 @@ -1097,7 +1097,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.",1"192.168.2.")) Do + Else If 0 && $$IsInternIPAdres^cspBasis.Library($G(%RemoteIP)) Do . Set MinShowH=$$$shShownForVHEPN &SQL(DECLARE crsHist CURSOR FOR Index: WS/TBX/Order.cls.xml =================================================================== diff -u -r66 -r96 --- WS/TBX/Order.cls.xml (.../Order.cls.xml) (revision 66) +++ WS/TBX/Order.cls.xml (.../Order.cls.xml) (revision 96) @@ -903,9 +903,9 @@ } Else { - Set blnIsExternIP=(ClientHostIP'?1"192.168.1.".E) + Set blnIsExternIP=$$$Not($$IsInternIPAdres^cspBasis.Library(ClientHostIP)) } - + ;d WL^vhDBG("Old Hist :"_..ShowInHist_" IsExternIP:"_blnIsExternIP) If ..ShowInHist="" { Set ..ShowInHist=$S(blnIsExternIP:$$$shShownForKlant, 'IsDomeinVHEPN:$$$shShownForVERW, 1:$$$shShownForVHEPN) @@ -934,7 +934,7 @@ Quit:('$IsObject(WSOrd)) "" Quit:(NewStatusH>$$$shShownForAll) "" If $G(NewStatusH)="" Do Quit:(ClientHostIP="") "" - . Set blnIsExternIP=(ClientHostIP'?1(1"192.168.1.".E,1"127.0.0.1")) + . Set blnIsExternIP=$$$Not($$IsInternIPAdres^cspBasis.Library(ClientHostIP)) . Set NewStatusH=$S(blnIsExternIP:$$$shShownForKlant, 1:$$$shShownForVHEPN) Set WSOrd.ShowInHist=NewStatusH If blnSaveObj Do