not logging blocked ips requests

Author: degami

app/App.php

@@ -184,12 +184,12 @@ public function bootstrap()
             switch ($routeInfo->getStatus()) {
                 case Dispatcher::NOT_FOUND:
                     // ... 404 Not Found
-                    $this->getUtils()->errorPage(404)->send();
+                    $this->getUtils()->errorPage(404, $request)->send();
                     break;
                 case Dispatcher::METHOD_NOT_ALLOWED:
                     $allowedMethods = $this->getRouteInfo()->getAllowedMethods();
                     // ... 405 Method Not Allowed
-                    $this->getUtils()->errorPage(405, ['allowedMethods' => $allowedMethods])->send();
+                    $this->getUtils()->errorPage(405, $request, ['allowedMethods' => $allowedMethods])->send();
                     break;
                 case Dispatcher::FOUND:
                     $handler = $this->getRouteInfo()->getHandler();
@@ -222,11 +222,11 @@ public function bootstrap()
                     break;
             }
         } catch (OfflineException $e) {
-            $response = $this->getUtils()->offlinePage();
+            $response = $this->getUtils()->offlinePage($request);
         } catch (BlockedIpException $e) {
             $response = $this->getUtils()->blockedIpPage($request);
         } catch (Exception $e) {
-            $response = $this->getUtils()->exceptionPage($e);
+            $response = $this->getUtils()->exceptionPage($e, $request);
         }
 
         // dispatch "before_send" event
@@ -257,7 +257,7 @@ protected function isSiteOffline()
      *
      * @return boolean
      */
-    protected function isBlocked($ip_address)
+    public function isBlocked($ip_address)
     {
         return in_array($ip_address, $this->blocked_ips);
     }

app/base/abstracts/Controllers/AdminFormPage.php

@@ -59,7 +59,7 @@ protected function getFormId()
     private function processFormSubmit()
     {
         if (!$this->checkCredentials()) {
-            $this->templateData['form']->setSubmitResults(get_class($this).'::formSubmitted', $this->getUtils()->errorPage(403));
+            $this->templateData['form']->setSubmitResults(get_class($this).'::formSubmitted', $this->getUtils()->errorPage(403, $this->getRequest()));
         } else {
             $this->getApp()->event('before_form_process', ['form' => $this->templateData['form']]);
             $this->templateData['form']->process();

app/base/abstracts/Controllers/AdminJsonPage.php

@@ -28,7 +28,7 @@ abstract class AdminJsonPage extends BaseJsonPage
     protected function beforeRender()
     {
         if (!$this->checkCredentials() || !$this->checkPermission($this->getAccessPermission())) {
-            return $this->getUtils()->errorPage(403);
+            return $this->getUtils()->errorPage(403, $this->getRequest());
         }
 
         return parent::beforeRender();

app/base/abstracts/Controllers/AdminPage.php

@@ -74,7 +74,7 @@ public static function getRouteVerbs()
     protected function beforeRender()
     {
         if (!$this->checkCredentials() || !$this->checkPermission($this->getAccessPermission())) {
-            return $this->getUtils()->errorPage(403);
+            return $this->getUtils()->errorPage(403, $this->getRequest());
         }
 
         return parent::beforeRender();

app/base/abstracts/Controllers/AdminRestPage.php

@@ -37,7 +37,7 @@ abstract class AdminRestPage extends BaseRestPage
     protected function beforeRender()
     {
         if (!$this->checkCredentials() || !$this->checkPermission($this->getAccessPermission())) {
-            return $this->getUtils()->errorPage(403);
+            return $this->getUtils()->errorPage(403, $this->getRequest());
         }
 
         return parent::beforeRender();

app/base/abstracts/Controllers/BaseHtmlPage.php

@@ -103,7 +103,7 @@ public function process(RouteInfo $route_info = null, $route_data = [])
                 ->prepare($this->getRequest())
                 ->setContent($template_html);
         } catch (Exception $e) {
-            return $this->getUtils()->exceptionPage($e);
+            return $this->getUtils()->exceptionPage($e, $this->getRequest());
         }
     }
 

app/base/abstracts/Controllers/BasePage.php

@@ -151,7 +151,7 @@ protected function beforeRender()
         if (method_exists($this, 'getAccessPermission') && method_exists($this, 'getCurrentUser')) {
             try {
                 if (!$this->checkPermission($this->getAccessPermission())) {
-                    return $this->getUtils()->errorPage(403);
+                    return $this->getUtils()->errorPage(403, $this->getRequest());
                 }
             } catch (\Exception $e) {
                 $this->getUtils()->logException($e);

app/base/abstracts/Controllers/BaseRestPage.php

@@ -61,7 +61,7 @@ protected function beforeRender()
         if ($this->getRequest()->headers->get('Content-Type') != 'application/json' &&
             $this->getRequest()->getContentType() != 'json'
         ) {
-            return $this->getUtils()->errorPage(403);
+            return $this->getUtils()->errorPage(403, $this->getRequest());
         }
 
         return $this;

app/base/abstracts/Controllers/FrontendPage.php

@@ -168,7 +168,7 @@ protected function prepareTemplate()
     protected function beforeRender()
     {
         if (!$this->getRouteInfo()->isAdminRoute() && !$this->checkPermission('view_site')) {
-            return $this->getUtils()->errorPage(403);
+            return $this->getUtils()->errorPage(403, $this->getRequest());
         }
 
         return parent::beforeRender();

app/base/abstracts/Controllers/FrontendPageWithObject.php

@@ -45,7 +45,7 @@ public function process(RouteInfo $route_info = null, $route_data = [])
             is_a($this->getObject(), $this->getObjectClass()) &&
             $this->getObject()->isLoaded())
         ) {
-            return $this->getUtils()->errorPage(404);
+            return $this->getUtils()->errorPage(404, $this->getRequest());
         }
 
         return $return;