Merge pull request #139 from joomlatools/feature/138-error

Custom error pages
joomlatools · Jun 20, 2019 · 10caf0d · 10caf0d
2 parents c2ce663 + 5173bcf
commit 10caf0d
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 9 deletions.
diff --git a/code/site/components/com_pages/controller/abstract.php b/code/site/components/com_pages/controller/abstract.php
@@ -20,13 +20,7 @@ protected function _initialize(KObjectConfig $config)
 
     public function getFormats()
     {
-        if($this->getObject('dispatcher')->getRouter()->resolve()) {
-            $formats = array($this->getRequest()->getFormat());
-        }  else {
-            $formats = array();
-        }
-
-        return $formats;
+        return  array($this->getRequest()->getFormat());
     }
 
     protected function _afterRender(KControllerContextInterface $context)

diff --git a/code/site/components/com_pages/dispatcher/http.php b/code/site/components/com_pages/dispatcher/http.php
@@ -106,6 +106,41 @@ protected function _actionDispatch(KDispatcherContextInterface $context)
         KDispatcherAbstract::_actionDispatch($context);
     }
 
+    protected function _renderError(KDispatcherContextInterface $context)
+    {
+        if(!JDEBUG && $this->getObject('request')->getFormat() == 'html')
+        {
+            //Get the exception object
+            if($context->param instanceof KEventException) {
+                $exception = $context->param->getException();
+            } else {
+                $exception = $context->param;
+            }
+
+            foreach([(int) $exception->getCode(), '500'] as $code)
+            {
+                if($page = $this->getObject('page.registry')->getPage($code))
+                {
+                    //Set the controller
+                    $this->setController('page', ['view' => $page->getType()]);
+
+                    //Set page in model
+                    $this->getController()->getModel()->setPage($page, $context->request->query->toArray());
+
+                    //Render the error
+                    $content = $this->getController()->render($exception);
+
+                    //Set error in the response
+                    $context->response->setContent($content);
+
+                    return true;
+                }
+            }
+        }
+
+        return parent::_renderError($context);
+    }
+
     public function getContext()
     {
         $context = new ComPagesDispatcherContext();

diff --git a/code/site/components/com_pages/event/subscriber/errorhandler.php b/code/site/components/com_pages/event/subscriber/errorhandler.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Joomlatools Pages
+ *
+ * @copyright   Copyright (C) 2018 Johan Janssens and Timble CVBA. (http://www.timble.net)
+ * @license     GNU GPLv3 <http://www.gnu.org/licenses/gpl.html>
+ * @link        https://github.com/joomlatools/joomlatools-pages for the canonical source repository
+ */
+
+class ComPagesEventSubscriberErrorhandler extends KEventSubscriberAbstract
+{
+    public function __construct( KObjectConfig $config)
+    {
+        parent::__construct($config);
+
+        //Exception Handling
+        $this->getObject('event.publisher')->addListener('onException', array($this, 'onException'));
+    }
+
+    public function onException(KEventException $event)
+    {
+        if(!JDEBUG && $this->getObject('request')->getFormat() == 'html')
+        {
+            if($this->getObject('com://site/pages.dispatcher.http')->fail($event)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
+
diff --git a/code/site/components/com_pages/page/registry.php b/code/site/components/com_pages/page/registry.php
@@ -302,7 +302,7 @@ public function loadCache($basedir, $refresh = true)
                                     }
 
                                     //Set the route
-                                    if (!$page->route) {
+                                    if (!$page->route && $page->route !== false) {
                                         $page->route = $route;
                                     }
 
@@ -347,8 +347,11 @@ public function loadCache($basedir, $refresh = true)
                                     //Page
                                     $pages[$file] = $page->toArray();
 
+
                                     //Route
-                                    $routes[$route] = (array) KObjectConfig::unbox($page->route);
+                                    if($page->route !== false) {
+                                        $routes[$route] = (array) KObjectConfig::unbox($page->route);
+                                    }
 
                                     //File (do not include index pages)
                                     if(strpos($file, '/index') === false) {

diff --git a/code/site/components/com_pages/resources/config/bootstrapper.php b/code/site/components/com_pages/resources/config/bootstrapper.php
@@ -50,6 +50,7 @@
         'event.subscriber.factory' => [
             'subscribers' => [
                 'com:pages.event.subscriber.pagedecorator',
+                'com:pages.event.subscriber.errorhandler',
             ]
         ],
         'lib:template.engine.markdown' => [