Merge pull request #89 from intersystems-community/revert-88-updateAnalytics

Revert "check ip"

Author: nsolov

src/cls/ZPM/REST/Base.cls

@@ -9,44 +9,36 @@ Parameter HandleCorsRequest = 1;
 
 Parameter PAGESIZE As INTEGER = 20;
 
-Parameter HTTP451LEGAL = "451 Unavailable For Legal Reasons";
-
 ClassMethod OnPreDispatch(pUrl As %String, pMethod As %String, ByRef pContinue As %Boolean) As %Status
 {
-  Set tSC = $$$OK
-  Try {
+  SET tSC = $$$OK
+  TRY {
+    
     // Set the return type according to the Accept type in the request. Default is application/json.
-    If ('..AcceptsContentType(..#CONTENTTYPEJSON)) {
-      Set tSC = ..ReportHttpStatusCode(..#HTTP406NOTACCEPTABLE)
-      Set pContinue = 0
-      Quit 
-    } Else {   
+    IF ('..AcceptsContentType(..#CONTENTTYPEJSON)) {
+      SET tSC = ..ReportHttpStatusCode(..#HTTP406NOTACCEPTABLE), pContinue=0
+      QUIT 
+        } ELSE {   
       // This always returns json
-      Set %response.ContentType=..#CONTENTTYPEJSON
-    }
-    
-    If (##class(%Dictionary.CompiledClass).%ExistsId("ZPM.Analytics.IP")) {
-      If ('##class(ZPM.Analytics.IP).ValidateIP(..GetRemoteAddr())) {
-        Set tSC = ..ReportHttpStatusCode(..#HTTP451LEGAL)
-        Set pContinue = 0
-        Quit
-      }
-    }    
+      SET %response.ContentType=..#CONTENTTYPEJSON
+        }
+        
 
-    // read request object into %DynamicObject format
-    If ((pMethod'="POST") && (pMethod'="PUT")) || (%request.Content="") {
-      Set %request.Content = {}
-    } Else {
-      If ($IsObject(%request.Content))&&('%request.Content.Size) {
-        Set %request.Content = {}
-      } Else {
-        Set %request.Content = ##class(%Library.DynamicObject).%FromJSON(%request.Content)
+        // read request object into %DynamicObject format
+    IF ((pMethod'="POST") && (pMethod'="PUT")) || (%request.Content="") {
+      SET %request.Content = {}
+    } ELSE {
+      IF ($IsObject(%request.Content))&&('%request.Content.Size) {
+        SET %request.Content = {}
+      } ELSE {
+        SET %request.Content = ##class(%Library.DynamicObject).%FromJSON(%request.Content)
       }
-    } 
-  } Catch ex {
-    Set tSC = ex.AsStatus()
+    }
+        
+  } CATCH ex {
+    SET tSC = ex.AsStatus()
   }
-  Quit ##class(%iKnow.REST.Base).%ErrorHandler(tSC, .pContinue)
+  QUIT ##class(%iKnow.REST.Base).%ErrorHandler(tSC, .pContinue)
 }
 
 ClassMethod %ProcessResult(pStatus As %Status = {$$$OK}, pResult As %DynamicObject = "") As %Status [ Internal ]