That action doesn't work right with 8.3, clearly

This thing is a mess and I should re-do it later down the line

.gitignore

@@ -2,4 +2,5 @@
 node_modules
 src/Cache/*
 src/Config/Config.yaml
-src/Config/Pages.yaml
+src/Config/Pages.yaml
+src/php_error.log

composer.json

@@ -14,9 +14,14 @@
         "elgigi/commonmark-emoji": "^2.0",
         "embed/embed": "^4.4",
         "league/commonmark": "^2.3",
-        "nyholm/psr7": "^1.5",
+        "middlewares/https": "^2.0",
+        "middlewares/trailing-slash": "^2.0",
+        "nyholm/psr7": "^1.8",
+        "nyholm/psr7-server": "^1.1",
+        "psr/http-message": "2.0 as 1.1",
         "shapecode/twig-string-loader": "^1.1",
         "simonvomeyser/commonmark-ext-lazy-image": "^2.0",
+        "slim/slim": "^4.12.0",
         "symfony/yaml": "^6.0",
         "twig/twig": "^3.5"
     },

src/AntCMS/AntCMS.php

@@ -5,30 +5,54 @@ namespace AntCMS;
 use AntCMS\AntMarkdown;
 use AntCMS\AntPages;
 use AntCMS\AntConfig;
+use Psr\Http\Message\ResponseInterface as Response;
+use Psr\Http\Message\ServerRequestInterface as Request;
+use Psr\Http\Message\UriInterface;
 
 class AntCMS
 {
     protected $antTwig;
+    protected ?Response $response = null;
+    protected ?Request $request = null;
 
     public function __construct()
     {
         $this->antTwig = new AntTwig();
     }
 
-    /**
-     * Renders a page based on the provided page name.
-     *
-     * @param string $page The name of the page to be rendered
-     * @return string The rendered HTML of the page
-     */
-    public function renderPage(string $page)
+    public function SetResponse(?Response $response): void
     {
+        $this->response = $response;
+    }
+
+    public function setRequest(?Request $request): void
+    {
+        $this->request = $request;
+    }
+
+    public function getResponse(): ?Response
+    {
+        return $this->response;
+    }
+
+    public function getRequest(): ?Request
+    {
+        return $this->request;
+    }
+
+    /**
+     * Renders the page based on the request URI
+     */
+    public function renderPage(): Response
+    {
+        $page = $this->request->getUri()->getPath();
+
         $start_time = hrtime(true);
         $content = $this->getPage($page);
         $themeConfig = Self::getThemeConfig();
 
         if (!$content || !is_array($content)) {
-            $this->renderException("404");
+            return $this->renderException("404");
         }
 
         $pageTemplate = $this->getPageLayout(null, $page, $content['template']);
@@ -49,7 +73,9 @@ class AntCMS
             $pageTemplate = str_replace('<!--AntCMS-Debug-->', '<p>Took ' . $elapsed_time . ' milliseconds to render the page. </p>', $pageTemplate);
         }
 
-        return $pageTemplate;
+        $response = $this->getResponse();
+        $response->getBody()->write($pageTemplate);
+        return $response;
     }
 
     /**
@@ -72,9 +98,8 @@ class AntCMS
      * @param string $exceptionCode The exception code to be displayed on the error page
      * @param int $httpCode The HTTP response code to return, 404 by default.
      * @param string $exceptionString An optional parameter to define a custom string to be displayed along side the exception. 
-     * @return never 
      */
-    public function renderException(string $exceptionCode, int $httpCode = 404, string $exceptionString = 'That request caused an exception to be thrown.')
+    public function renderException(string $exceptionCode, int $httpCode = 404, string $exceptionString = 'That request caused an exception to be thrown.'): Response
     {
         $exceptionString .= " (Code {$exceptionCode})";
         $pageTemplate = self::getPageLayout();
@@ -90,9 +115,9 @@ class AntCMS
             $pageTemplate = str_replace('{{ AntCMSBody | raw }} ', $params['AntCMSBody'], $pageTemplate);
         }
 
-        http_response_code($httpCode);
-        echo $pageTemplate;
-        exit;
+        $response = $this->getResponse()->withStatus($httpCode);
+        $response->getBody()->write($pageTemplate);
+        return $response;
     }
 
     /** 
@@ -220,22 +245,32 @@ class AntCMS
         return AntConfig::currentConfig('siteInfo');
     }
 
-    /** 
-     * @return void 
-     */
-    public function serveContent(string $path)
+    public function serveContent(): Response
     {
+        $path = $this->request->getUri()->getPath();
         if (!file_exists($path)) {
-            $this->renderException('404');
+            return $this->renderException('404');
         } else {
-            $asset_mime_type = mime_content_type($path);
-            header('Content-Type: ' . $asset_mime_type);
-            readfile($path);
+            $response = $this->response->withHeader('Content-Type', mime_content_type($path) . '; charset=UTF-8');
+            $response->getBody()->write(file_get_contents($path));
+            return $response;
         }
-        exit;
     }
 
-    public static function redirect(string $url)
+    public function redirect(string|UriInterface $url, int $code = 307): Response
+    {
+        if (!is_string($url)) {
+            $url = $url->__toString();
+        }
+        $response = $this->response->withStatus($code);
+        return $response->withHeader('Location', $url);
+    }
+
+    /**
+     * Old redirect function.
+     * TODO: Remove this once the other functions have been updated to no longer rely on this
+     */
+    public static function redirectWithoutRequest(string $url)
     {
         $url = '//' . AntTools::repairURL(AntConfig::currentConfig('baseURL') . $url);
         header("Location: $url");

src/AntCMS/AntPlugin.php

@@ -2,15 +2,23 @@
 
 namespace AntCMS;
 
+use Psr\Http\Message\ResponseInterface as Response;
+use Psr\Http\Message\ServerRequestInterface as Request;
+use \Slim\App;
+
 abstract class AntPlugin
 {
-    /**
-     * @param array<string> $route 
-     * @return mixed 
-     */
-    public function handlePluginRoute(array $route)
+    protected ?Request $request;
+    protected ?Response $response;
+
+    public function setRequest(?Request $request)
     {
-        die("Plugin did not define a handlePluginRoute function");
+        $this->request = $request;
+    }
+
+    public function SetResponse(?Response $response)
+    {
+        $this->response = $response;
     }
 
     /** @return string  */

src/AntCMS/AntPluginLoader.php

@@ -3,15 +3,16 @@
 namespace AntCMS;
 
 use AntCMS\AntTools;
+use Slim\App;
 
 class AntPluginLoader
 {
     /** @return array<mixed>  */
     public function loadPlugins()
     {
-        $plugins = array();
+        $plugins = [];
 
-        $files = AntTools::getFileList(antPluginPath, null, true);
+        $files = AntTools::getFileList(antPluginPath, 'php', true);
 
         foreach ($files as $file) {
             if (str_ends_with($file, "Plugin.php")) {
@@ -23,4 +24,18 @@ class AntPluginLoader
 
         return $plugins;
     }
+
+    public function registerPluginRoutes(App $app)
+    {
+        $files = scandir(antPluginPath);
+        foreach ($files as $file) {
+            $fqcn = '\\Plugins\\' . $file . '\\Controller';
+            if (class_exists($fqcn)) {
+                $controler = new $fqcn;
+                if (method_exists($controler, 'registerRoutes')) {
+                    $controler->registerRoutes($app);
+                }
+            }
+        }
+    }
 }

src/AntCMS/AntRouting.php

@@ -1,129 +0,0 @@
-<?php
-
-namespace AntCMS;
-
-class AntRouting
-{
-    private string $baseUrl;
-    private string $requestUri;
-    private array $uriExploded;
-
-    private array $indexes = ['/', '/index.php', '/index.html', '', 'index.php', 'index.html'];
-
-    /**
-     * @param string $baseUrl The base site URL. Ex: domain.com
-     * @param string $requestUri The current request URI. Ex: /page/example
-     */
-    public function __construct(string $baseUrl, string $requestUri)
-    {
-        $this->baseUrl = $baseUrl;
-        $this->requestUri = $requestUri;
-        $this->setExplodedUri($requestUri);
-    }
-
-    /**
-     * @param string $requestUri The current request URI. Ex: /page/example
-     */
-    public function setRequestUri(string $requestUri): void
-    {
-        $this->$requestUri = $requestUri;
-        $this->setExplodedUri($requestUri);
-    }
-
-    /**
-     * Used to add to the start of the request URI. Primarially used for plugin routing.
-     * For example: this is used internally to rewrite /profile/edit to /plugin/profile/edit
-     * 
-     * @param string $append What to append to the start of the request URI.
-     */
-    public function requestUriUnshift(string $append): void
-    {
-        array_unshift($this->uriExploded, $append);
-        $this->requestUri = implode('/', $this->uriExploded);
-    }
-
-    /**
-     * Used to detect if the current request is over HTTPS. If the request is over HTTP, it'll redirect to HTTPS.
-     */
-    public function redirectHttps(): void
-    {
-        $scheme = $_SERVER['HTTPS'] ?? $_SERVER['REQUEST_SCHEME'] ?? $_SERVER['HTTP_X_FORWARDED_PROTO'] ?? null;
-        $isHttps = !empty($scheme) && (strcasecmp('on', $scheme) == 0 || strcasecmp('https', $scheme) == 0);
-
-        if (!$isHttps) {
-            $url = 'https://' . AntTools::repairURL($this->baseUrl . $this->requestUri);
-            header('Location: ' . $url);
-            exit;
-        }
-    }
-
-    /**
-     * Used to check if the current request URI matches a specified route.
-     * Supports using '*' as a wild-card. Ex: '/admin/*' will match '/admin/somthing' and '/admin'
-     * 
-     * @param string $uri The Route to compare against the current URI.
-     */
-    public function checkMatch(string $uri): bool
-    {
-        $matching =  explode('/', $uri);
-        if (empty($matching[0])) {
-            array_shift($matching);
-        }
-
-        if (count($matching) < count($this->uriExploded) && end($matching) !== '*') {
-            return false;
-        }
-
-        foreach ($this->uriExploded as $index => $value) {
-            if (isset($matching[$index]) && $matching[$index] !== '*' && $matching[$index] !== $value) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /** 
-     * Attempts to detect what plugin is associated with the current URI and then routes to the matching one. 
-     */
-    public function routeToPlugin(): void
-    {
-        $pluginName = $this->uriExploded[1];
-        $pluginLoader = new AntPluginLoader();
-        $plugins = $pluginLoader->loadPlugins();
-
-        //Drop the first two elements of the array so the remaining segments are specific to the plugin.
-        array_splice($this->uriExploded, 0, 2);
-
-        foreach ($plugins as $plugin) {
-            if (strtolower($plugin->getName()) === strtolower($pluginName)) {
-                $plugin->handlePluginRoute($this->uriExploded);
-                exit;
-            }
-        }
-
-        // plugin not found
-        header("HTTP/1.0 404 Not Found");
-        echo ("Error 404");
-        exit;
-    }
-
-    /**
-     * @return bool Returns true if the current request URI is an index request.
-     */
-    public function isIndex(): bool
-    {
-        return (in_array($this->requestUri, $this->indexes));
-    }
-
-    private function setExplodedUri(string $uri): void
-    {
-        $exploaded = explode('/', $uri);
-
-        if (empty($exploaded[0])) {
-            array_shift($exploaded);
-        }
-
-        $this->uriExploded = $exploaded;
-    }
-}

src/AntCMS/AntUsers.php

@@ -30,7 +30,7 @@ class AntUsers
         if (file_exists(antUsersList)) {
             return AntYaml::parseFile(antUsersList);
         } else {
-            AntCMS::redirect('/profile/firsttime');
+            AntCMS::redirectWithoutRequest('/profile/firsttime');
         }
     }
 
@@ -101,7 +101,7 @@ class AntUsers
     public static function setupFirstUser($data)
     {
         if (file_exists(antUsersList)) {
-            AntCMS::redirect('/');
+            AntCMS::redirectWithoutRequest('/');
         }
 
         $data['username'] = trim($data['username']);

src/Plugins/Admin/Admin.php

@@ -0,0 +1,253 @@
+<?php
+
+namespace Plugins\Admin;
+
+use AntCMS\AntPlugin;
+use AntCMS\AntConfig;
+use AntCMS\AntTools;
+use AntCMS\AntCMS;
+use AntCMS\AntTwig;
+use AntCMS\AntAuth;
+use AntCMS\AntUsers;
+use AntCMS\AntYaml;
+use AntCMS\AntPages;
+
+class Admin extends AntPlugin
+{
+    protected AntAuth $antAuth;
+    protected AntTwig $antTwig;
+    protected array $params = [
+        'AntCMSTitle' => 'AntCMS Admin Dashboard',
+        'AntCMSDescription' => 'The AntCMS admin dashboard',
+        'AntCMSAuthor' => 'AntCMS',
+        'AntCMSKeywords' => '',
+
+    ];
+
+    public function __construct()
+    {
+        $this->antAuth = new AntAuth;
+        $this->antTwig = new AntTwig;
+    }
+
+    public function checkAuth()
+    {
+        $this->antAuth->checkAuth();
+    }
+
+    public function renderIndex()
+    {
+        $this->params['user'] = AntUsers::getUserPublicalKeys($this->antAuth->getUsername());
+
+        $response = $this->response;
+        $response->getBody()->write($this->antTwig->renderWithSubLayout('admin_landing', $this->params));
+        return $response;
+    }
+
+    public function config()
+    {
+        $this->params = [
+            'AntCMSTitle' => 'AntCMS Configuration',
+            'AntCMSDescription' => 'The AntCMS configuration screen',
+            'AntCMSAuthor' => 'AntCMS',
+            'AntCMSKeywords' => '',
+        ];
+
+        $currentConfig = AntConfig::currentConfig();
+
+        foreach ($currentConfig as $key => $value) {
+            if (is_array($value)) {
+                foreach ($value as $subkey => $subvalue) {
+                    if (is_bool($subvalue)) {
+                        $currentConfig[$key][$subkey] = ($subvalue) ? 'true' : 'false';
+                    }
+                    if (is_array($subvalue)) {
+                        $currentConfig[$key][$subkey] = implode(', ', $subvalue);
+                    }
+                }
+            } else if (is_bool($value)) {
+                $currentConfig[$key] = ($value) ? 'true' : 'false';
+            }
+        }
+
+        $this->params['currentConfig'] = $currentConfig;
+        $response = $this->response;
+        $response->getBody()->write($this->antTwig->renderWithSubLayout('admin_config', $this->params));
+        return $response;
+    }
+
+    public function editConfig()
+    {
+        // TODO: Check if the user is an admin
+        $this->params = [
+            'AntCMSTitle' => 'AntCMS Configuration',
+            'AntCMSDescription' => 'The AntCMS configuration screen',
+            'AntCMSAuthor' => 'AntCMS',
+            'AntCMSKeywords' => '',
+        ];
+
+        $currentConfig = AntConfig::currentConfig();
+        $currentConfigFile = file_get_contents(antConfigFile);
+        $this->params['AntCMSActionURL'] = '//' . $currentConfig['baseURL'] . 'admin/config/save';
+        $this->params['AntCMSTextAreaContent'] = htmlspecialchars($currentConfigFile);
+
+        $response = $this->response;
+        $response->getBody()->write($this->antTwig->renderWithSubLayout('textareaEdit', $this->params));
+        return $response;
+    }
+
+    public function saveConfig()
+    {
+        // TODO: Check if the user is an admin
+        $POST = $this->request->getParsedBody();
+
+        if (!$POST['textarea']) {
+            AntCMS::redirectWithoutRequest('/admin/config');
+        }
+
+        $yaml = AntYaml::parseYaml($POST['textarea']);
+        if (is_array($yaml)) {
+            AntYaml::saveFile(antConfigFile, $yaml);
+        }
+
+        AntCMS::redirectWithoutRequest('/admin/config');
+    }
+
+    public function users()
+    {
+        // TODO: Check if the user is an admin
+        $this->params = [
+            'AntCMSTitle' => 'AntCMS User Management',
+            'AntCMSDescription' => 'The AntCMS user management screen',
+            'AntCMSAuthor' => 'AntCMS',
+            'AntCMSKeywords' => '',
+        ];
+
+        $users = AntUsers::getUsers();
+        foreach ($users as $key => $user) {
+            unset($users[$key]['password']);
+            $users[$key]['username'] = $key;
+        }
+        $this->params['users'] = $users;
+
+        $response = $this->response;
+        $response->getBody()->write($this->antTwig->renderWithSubLayout('admin_users', $this->params));
+        return $response;
+    }
+
+    public function addUser()
+    {
+        // TODO: Check if the user is an admin
+        $this->params = [
+            'AntCMSTitle' => 'AntCMS User Management',
+            'AntCMSDescription' => 'The AntCMS user management screen',
+            'AntCMSAuthor' => 'AntCMS',
+            'AntCMSKeywords' => '',
+        ];
+
+        $response = $this->response;
+        $response->getBody()->write($this->antTwig->renderWithSubLayout('admin_userAdd', $this->params));
+        return $response;
+    }
+
+    public function editUser(array $args)
+    {
+        // TODO: Check if the user is an admin
+        $this->params = [
+            'AntCMSTitle' => 'AntCMS User Management',
+            'AntCMSDescription' => 'The AntCMS user management screen',
+            'AntCMSAuthor' => 'AntCMS',
+            'AntCMSKeywords' => '',
+        ];
+
+        $user = AntUsers::getUserPublicalKeys($args['name']);
+
+        if (!$user) {
+            AntCMS::redirectWithoutRequest('/admin/users');
+        }
+
+        $user['username'] = $args['name'];
+        $this->params['user'] = $user;
+
+        $response = $this->response;
+        $response->getBody()->write($this->antTwig->renderWithSubLayout('admin_userEdit', $this->params));
+        return $response;
+    }
+
+    public function resetpassword(array $args)
+    {
+        // TODO: Check if the user is an admin
+        $this->params = [
+            'AntCMSTitle' => 'AntCMS User Management',
+            'AntCMSDescription' => 'The AntCMS user management screen',
+            'AntCMSAuthor' => 'AntCMS',
+            'AntCMSKeywords' => '',
+        ];
+
+        $user = AntUsers::getUserPublicalKeys($args['name']);
+
+        if (!$user) {
+            AntCMS::redirectWithoutRequest('/admin/users');
+        }
+
+        $user['username'] = $args['name'];
+        $this->params['user'] = $user;
+
+        $response = $this->response;
+        $response->getBody()->write($this->antTwig->renderWithSubLayout('admin_userResetPassword', $this->params));
+        return $response;
+    }
+
+    public function saveUser()
+    {
+        // TODO: Check if the user is an admin
+        $POST = $this->request->getParsedBody();
+        $this->params = [
+            'AntCMSTitle' => 'AntCMS User Management',
+            'AntCMSDescription' => 'The AntCMS user management screen',
+            'AntCMSAuthor' => 'AntCMS',
+            'AntCMSKeywords' => '',
+        ];
+
+        $data['username'] = $POST['username'] ?? null;
+        $data['name'] = $POST['display-name'] ?? null;
+        $data['role'] = $POST['role'] ?? null;
+        $data['password'] = $POST['password'] ?? null;
+
+        foreach ($data as $key => $value) {
+            if (is_null($value)) {
+                unset($data[$key]);
+            }
+        }
+
+        AntUsers::updateUser($POST['originalusername'], $data);
+        AntCMS::redirectWithoutRequest('/admin/users');
+    }
+
+    public function saveNewUser()
+    {
+        // TODO: Check if the user is an admin
+        $POST = $this->request->getParsedBody();
+        AntUsers::addUser($POST);
+        AntCMS::redirectWithoutRequest('/admin/users');
+    }
+
+    public function regeneratePages()
+    {
+        AntPages::generatePages();
+        AntCMS::redirectWithoutRequest('/admin/pages');
+    }
+
+    public function getName(): string
+    {
+        return 'Admin';
+    }
+
+    /** 
+     * @return string 
+     */
+    private function boolToWord(bool $value)
+    {
+        return $value ? 'true' : 'false';
+    }
+}

src/Plugins/Admin/AdminPlugin.php

@@ -1,328 +0,0 @@
-<?php
-
-use AntCMS\AntCMS;
-use AntCMS\AntPlugin;
-use AntCMS\AntConfig;
-use AntCMS\AntPages;
-use AntCMS\AntYaml;
-use AntCMS\AntAuth;
-use AntCMS\AntTools;
-use AntCMS\AntTwig;
-use AntCMS\AntUsers;
-
-class AdminPlugin extends AntPlugin
-{
-    protected $auth;
-    protected $antCMS;
-    protected $AntTwig;
-
-    public function getName(): string
-    {
-        return 'Admin';
-    }
-
-    /**
-     * @param array<string> $route 
-     * @return void
-     */
-    public function handlePluginRoute(array $route)
-    {
-        $currentStep = $route[0] ?? 'none';
-
-        $this->auth = new AntAuth;
-        $this->auth->checkAuth();
-
-        $this->antCMS = new AntCMS;
-        $this->AntTwig = new AntTwig();
-
-        array_shift($route);
-
-        switch ($currentStep) {
-            case 'config':
-                $this->configureAntCMS($route);
-
-            case 'pages':
-                $this->managePages($route);
-
-            case 'users':
-                $this->userManagement($route);
-
-            default:
-                $params = [
-                    'AntCMSTitle' => 'AntCMS Admin Dashboard',
-                    'AntCMSDescription' => 'The AntCMS admin dashboard',
-                    'AntCMSAuthor' => 'AntCMS',
-                    'AntCMSKeywords' => '',
-                    'user' => AntUsers::getUserPublicalKeys($this->auth->getUsername()),
-
-                ];
-                echo $this->AntTwig->renderWithSubLayout('admin_landing', $params);
-                break;
-        }
-    }
-
-    /**
-     * @param array<string> $route 
-     * @return never 
-     */
-    private function configureAntCMS(array $route)
-    {
-        if ($this->auth->getRole() != 'admin') {
-            $this->antCMS->renderException("You are not permitted to visit this page.");
-        }
-
-        $currentConfig = AntConfig::currentConfig();
-        $currentConfigFile = file_get_contents(antConfigFile);
-        $params = array(
-            'AntCMSTitle' => 'AntCMS Configuration',
-            'AntCMSDescription' => 'The AntCMS configuration screen',
-            'AntCMSAuthor' => 'AntCMS',
-            'AntCMSKeywords' => '',
-        );
-
-        switch ($route[0] ?? 'none') {
-            case 'edit':
-                $params['AntCMSActionURL'] = '//' . $currentConfig['baseURL'] . 'admin/config/save';
-                $params['AntCMSTextAreaContent'] = htmlspecialchars($currentConfigFile);
-
-                echo $this->AntTwig->renderWithSubLayout('textareaEdit', $params);
-                break;
-
-            case 'save':
-                if (!$_POST['textarea']) {
-                    AntCMS::redirect('/admin/config');
-                }
-
-                $yaml = AntYaml::parseYaml($_POST['textarea']);
-                if (is_array($yaml)) {
-                    AntYaml::saveFile(antConfigFile, $yaml);
-                }
-
-                AntCMS::redirect('/admin/config');
-                break;
-
-            default:
-                foreach ($currentConfig as $key => $value) {
-                    if (is_array($value)) {
-                        foreach ($value as $subkey => $subvalue) {
-                            if (is_bool($subvalue)) {
-                                $currentConfig[$key][$subkey] = ($subvalue) ? 'true' : 'false';
-                            }
-                            if (is_array($subvalue)) {
-                                $currentConfig[$key][$subkey] = implode(', ', $subvalue);
-                            }
-                        }
-                    } else if (is_bool($value)) {
-                        $currentConfig[$key] = ($value) ? 'true' : 'false';
-                    }
-                }
-
-                $params['currentConfig'] = $currentConfig;
-                echo $this->AntTwig->renderWithSubLayout('admin_config', $params);
-                break;
-        }
-        exit;
-    }
-
-    /**
-     * @param array<string> $route 
-     * @return never 
-     */
-    private function managePages(array $route)
-    {
-        $pages = AntPages::getPages();
-        $params = array(
-            'AntCMSTitle' => 'AntCMS Page Management',
-            'AntCMSDescription' => 'The AntCMS page management screen',
-            'AntCMSAuthor' => 'AntCMS',
-            'AntCMSKeywords' => '',
-        );
-
-        switch ($route[0] ?? 'none') {
-            case 'regenerate':
-                AntPages::generatePages();
-                AntCMS::redirect('/admin/pages');
-                exit;
-
-            case 'edit':
-                if (!isset($_POST['newpage'])) {
-                    array_shift($route);
-                    $pagePath = AntTools::convertFunctionaltoFullpath(implode('/', $route));
-
-                    $page = file_get_contents($pagePath);
-
-                    //Finally, we strip off the antContentPath for compatibility with the save function.
-                    $pagePath = str_replace(antContentPath, '', $pagePath);
-                } else {
-                    $pagePath = '/' . $_POST['newpage'];
-
-                    if (!str_ends_with($pagePath, ".md")) {
-                        $pagePath .= '.md';
-                    }
-
-                    $pagePath = AntTools::repairFilePath($pagePath);
-                    $name = $this->auth->getName();
-                    $page = "--AntCMS--\nTitle: New Page Title\nAuthor: $name\nDescription: Description of this page.\nKeywords: Keywords\n--AntCMS--\n";
-                }
-
-                $params['AntCMSActionURL'] = '//' . AntConfig::currentConfig('baseURL') . "admin/pages/save/{$pagePath}";
-                $params['AntCMSTextAreaContent'] = $page;
-
-                echo $this->AntTwig->renderWithSubLayout('markdownEdit', $params);
-                break;
-
-            case 'save':
-                array_shift($route);
-                $pagePath = AntTools::repairFilePath(antContentPath . '/' . implode('/', $route));
-
-                if (!isset($_POST['textarea'])) {
-                    AntCMS::redirect('/admin/pages');
-                }
-
-                file_put_contents($pagePath, $_POST['textarea']);
-                AntCMS::redirect('/admin/pages');
-                exit;
-
-            case 'create':
-                $params['BaseURL'] = AntConfig::currentConfig('baseURL');
-                echo $this->AntTwig->renderWithSubLayout('admin_newPage', $params);
-                break;
-
-            case 'delete':
-                array_shift($route);
-                $pagePath = AntTools::convertFunctionaltoFullpath(implode('/', $route));
-
-                // Find the key associated with the functional page path, then remove it from our temp pages array
-                foreach ($pages as $key => $page) {
-                    if ($page['fullPagePath'] == $pagePath) {
-                        unset($pages[$key]);
-                    }
-                }
-
-                // If we were able to delete the page, update the pages list with the updated pages array.
-                if (file_exists($pagePath) && unlink($pagePath)) {
-                    AntYaml::saveFile(antPagesList, $pages);
-                }
-
-                AntCMS::redirect('/admin/pages');
-                break;
-
-            case 'togglevisibility':
-                array_shift($route);
-                $pagePath = AntTools::convertFunctionaltoFullpath(implode('/', $route));
-
-                foreach ($pages as $key => $page) {
-                    if ($page['fullPagePath'] == $pagePath) {
-                        $pages[$key]['showInNav'] = !$page['showInNav'];
-                    }
-                }
-
-                AntYaml::saveFile(antPagesList, $pages);
-                AntCMS::redirect('/admin/pages');
-                break;
-
-            default:
-                foreach ($pages as $key => $page) {
-                    $pages[$key]['editurl'] = '//' . AntTools::repairURL(AntConfig::currentConfig('baseURL') . "/admin/pages/edit/" . $page['functionalPagePath']);
-                    $pages[$key]['deleteurl'] = '//' . AntTools::repairURL(AntConfig::currentConfig('baseURL') . "/admin/pages/delete/" . $page['functionalPagePath']);
-                    $pages[$key]['togglevisibility'] = '//' . AntTools::repairURL(AntConfig::currentConfig('baseURL') . "/admin/pages/togglevisibility/" . $page['functionalPagePath']);
-                    $pages[$key]['isvisable'] = $this->boolToWord($page['showInNav']);
-                }
-                $params = [
-                    'AntCMSTitle' => 'AntCMS Admin Dashboard',
-                    'AntCMSDescription' => 'The AntCMS admin dashboard',
-                    'AntCMSAuthor' => 'AntCMS',
-                    'AntCMSKeywords' => '',
-                    'pages' => $pages,
-                ];
-                echo $this->AntTwig->renderWithSubLayout('admin_managePages', $params);
-                break;
-        }
-        exit;
-    }
-
-    private function userManagement(array $route)
-    {
-        if ($this->auth->getRole() != 'admin') {
-            $this->antCMS->renderException("You are not permitted to visit this page.");
-        }
-
-        $params = array(
-            'AntCMSTitle' => 'AntCMS User Management',
-            'AntCMSDescription' => 'The AntCMS user management screen',
-            'AntCMSAuthor' => 'AntCMS',
-            'AntCMSKeywords' => '',
-        );
-
-        switch ($route[0] ?? 'none') {
-            case 'add':
-                echo $this->AntTwig->renderWithSubLayout('admin_userAdd', $params);
-                break;
-
-            case 'edit':
-                $user = AntUsers::getUserPublicalKeys($route[1]);
-
-                if (!$user) {
-                    AntCMS::redirect('/admin/users');
-                }
-
-                $user['username'] = $route[1];
-                $params['user'] = $user;
-
-                echo $this->AntTwig->renderWithSubLayout('admin_userEdit', $params);
-                break;
-
-            case 'resetpassword':
-                $user = AntUsers::getUserPublicalKeys($route[1]);
-
-                if (!$user) {
-                    AntCMS::redirect('/admin/users');
-                }
-
-                $user['username'] = $route[1];
-                $params['user'] = $user;
-
-                echo $this->AntTwig->renderWithSubLayout('admin_userResetPassword', $params);
-                break;
-
-            case 'save':
-                $data['username'] = $_POST['username'] ?? null;
-                $data['name'] = $_POST['display-name'] ?? null;
-                $data['role'] = $_POST['role'] ?? null;
-                $data['password'] = $_POST['password'] ?? null;
-
-                foreach ($data as $key => $value) {
-                    if (is_null($value)) {
-                        unset($data[$key]);
-                    }
-                }
-
-                AntUsers::updateUser($_POST['originalusername'], $data);
-                AntCMS::redirect('/admin/users');
-                break;
-            case 'savenew':
-                AntUsers::addUser($_POST);
-                AntCMS::redirect('/admin/users');
-                break;
-
-            default:
-                $users = AntUsers::getUsers();
-                foreach ($users as $key => $user) {
-                    unset($users[$key]['password']);
-                    $users[$key]['username'] = $key;
-                }
-                $params['users'] = $users;
-                echo $this->AntTwig->renderWithSubLayout('admin_users', $params);
-                break;
-        }
-        exit;
-    }
-
-    /** 
-     * @return string 
-     */
-    private function boolToWord(bool $value)
-    {
-        return $value ? 'true' : 'false';
-    }
-}

src/Plugins/Admin/Controller.php

@@ -0,0 +1,92 @@
+<?php
+
+namespace Plugins\Admin;
+
+use \Slim\App;
+use Psr\Http\Message\ResponseInterface as Response;
+use Psr\Http\Message\ServerRequestInterface as Request;
+
+class Controller
+{
+    public function registerRoutes(App $app)
+    {
+        $adminPlugin = new Admin;
+
+        $app->get('/admin', function (Request $request, Response $response) use ($adminPlugin) {
+            $adminPlugin->checkAuth();
+            $adminPlugin->setRequest($request);
+            $adminPlugin->SetResponse($response);
+            return $adminPlugin->renderIndex();
+        });
+
+        $app->get('/admin/config', function (Request $request, Response $response) use ($adminPlugin) {
+            $adminPlugin->checkAuth();
+            $adminPlugin->setRequest($request);
+            $adminPlugin->SetResponse($response);
+            return $adminPlugin->config();
+        });
+
+        $app->get('/admin/config/edit', function (Request $request, Response $response) use ($adminPlugin) {
+            $adminPlugin->checkAuth();
+            $adminPlugin->setRequest($request);
+            $adminPlugin->SetResponse($response);
+            return $adminPlugin->editConfig();
+        });
+
+        $app->post('/admin/config/save', function (Request $request, Response $response) use ($adminPlugin) {
+            $adminPlugin->checkAuth();
+            $adminPlugin->setRequest($request);
+            $adminPlugin->SetResponse($response);
+            return $adminPlugin->saveConfig();
+        });
+
+        $app->get('/admin/users', function (Request $request, Response $response) use ($adminPlugin) {
+            $adminPlugin->checkAuth();
+            $adminPlugin->setRequest($request);
+            $adminPlugin->SetResponse($response);
+            return $adminPlugin->users();
+        });
+
+        $app->get('/admin/users/add', function (Request $request, Response $response) use ($adminPlugin) {
+            $adminPlugin->checkAuth();
+            $adminPlugin->setRequest($request);
+            $adminPlugin->SetResponse($response);
+            return $adminPlugin->addUser();
+        });
+
+        $app->get('/admin/users/edit/{username}', function (Request $request, Response $response, array $args) use ($adminPlugin) {
+            $adminPlugin->checkAuth();
+            $adminPlugin->setRequest($request);
+            $adminPlugin->SetResponse($response);
+            return $adminPlugin->editUser($args);
+        });
+
+        $app->get('/admin/users/resetpassword/{username}', function (Request $request, Response $response, array $args) use ($adminPlugin) {
+            $adminPlugin->checkAuth();
+            $adminPlugin->setRequest($request);
+            $adminPlugin->SetResponse($response);
+            return $adminPlugin->resetpassword($args);
+        });
+
+        $app->post('/admin/user/save', function (Request $request, Response $response) use ($adminPlugin) {
+            $adminPlugin->checkAuth();
+            $adminPlugin->setRequest($request);
+            $adminPlugin->SetResponse($response);
+            return $adminPlugin->saveUser();
+        });
+
+        $app->post('/admin/user/savenew', function (Request $request, Response $response) use ($adminPlugin) {
+            $adminPlugin->checkAuth();
+            $adminPlugin->setRequest($request);
+            $adminPlugin->SetResponse($response);
+            return $adminPlugin->saveUser();
+        });
+
+        $app->get('/admin/pages/regenerate', function (Request $request, Response $response) use ($adminPlugin) {
+            $adminPlugin->checkAuth();
+            $adminPlugin->setRequest($request);
+            $adminPlugin->SetResponse($response);
+            return $adminPlugin->regeneratePages();
+        });
+    }
+}

src/Plugins/Profile/Controller.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace Plugins\Profile;
+
+use \Slim\App;
+use Psr\Http\Message\ResponseInterface as Response;
+use Psr\Http\Message\ServerRequestInterface as Request;
+
+class Controller
+{
+    public function registerRoutes(App $app)
+    {
+        $profilePlugin = new Profile;
+
+        $app->get('/profile', function (Request $request, Response $response) use ($profilePlugin) {
+            $profilePlugin->setRequest($request);
+            $profilePlugin->SetResponse($response);
+            return $profilePlugin->renderIndex();
+        });
+
+        $app->get('/profile/firsttime', function (Request $request, Response $response) use ($profilePlugin) {
+            $profilePlugin->setRequest($request);
+            $profilePlugin->SetResponse($response);
+            return $profilePlugin->renderFirstTime();
+        });
+
+        $app->post('/profile/submitfirst', function (Request $request, Response $response) use ($profilePlugin) {
+            $profilePlugin->setRequest($request);
+            $profilePlugin->SetResponse($response);
+            return $profilePlugin->submitfirst();
+        });
+
+        $app->get('/profile/logout', function (Request $request, Response $response) use ($profilePlugin) {
+            $profilePlugin->setRequest($request);
+            $profilePlugin->SetResponse($response);
+            return $profilePlugin->logout();
+        });
+
+        $app->post('/profile/save', function (Request $request, Response $response) use ($profilePlugin) {
+            $profilePlugin->setRequest($request);
+            $profilePlugin->SetResponse($response);
+            return $profilePlugin->save();
+        });
+
+        $app->get('/profile/edit', function (Request $request, Response $response) use ($profilePlugin) {
+            $profilePlugin->setRequest($request);
+            $profilePlugin->SetResponse($response);
+            return $profilePlugin->edit();
+        });
+
+        $app->get('/profile/resetpassword', function (Request $request, Response $response) use ($profilePlugin) {
+            $profilePlugin->setRequest($request);
+            $profilePlugin->SetResponse($response);
+            return $profilePlugin->resetpassword();
+        });
+    }
+}

src/Plugins/Profile/Profile.php

@@ -0,0 +1,142 @@
+<?php
+
+namespace Plugins\Profile;
+
+use AntCMS\AntPlugin;
+use AntCMS\AntConfig;
+use AntCMS\AntTools;
+use AntCMS\AntCMS;
+use AntCMS\AntTwig;
+use AntCMS\AntAuth;
+use AntCMS\AntUsers;
+
+class Profile extends AntPlugin
+{
+    protected AntAuth $antAuth;
+    protected AntTwig $antTwig;
+    protected array $params = [
+        'AntCMSTitle' => 'AntCMS Profile Management',
+        'AntCMSDescription' => 'AntCMS Profile Management',
+        'AntCMSAuthor' => 'AntCMS',
+        'AntCMSKeywords' => '',
+    ];
+
+    public function __construct()
+    {
+        $this->antAuth = new AntAuth;
+        $this->antTwig = new AntTwig;
+    }
+
+    public function renderIndex()
+    {
+        $this->antAuth->checkAuth();
+        $this->params['user'] = AntUsers::getUserPublicalKeys($this->antAuth->getUsername());
+
+        $response = $this->response;
+        $response->getBody()->write($this->antTwig->renderWithSubLayout('profile_landing', $this->params));
+        return $response;
+    }
+
+    public function renderFirstTime()
+    {
+        if (file_exists(antUsersList)) {
+            AntCMS::redirectWithoutRequest('/profile');
+        }
+        $response = $this->response;
+        $response->getBody()->write($this->antTwig->renderWithSubLayout('profile_firstTime', $this->params));
+        return $response;
+    }
+
+    public function submitfirst()
+    {
+        $POST = $this->request->getParsedBody();
+
+        if (file_exists(antUsersList)) {
+            AntCMS::redirectWithoutRequest('/admin');
+        }
+
+        if (isset($POST['username']) && isset($POST['password']) && isset($POST['display-name'])) {
+            $data = [
+                'username' => $POST['username'],
+                'password' => $POST['password'],
+                'name' => $POST['display-name'],
+            ];
+            AntUsers::setupFirstUser($data);
+            AntCMS::redirectWithoutRequest('/profile');
+        } else {
+            AntCMS::redirectWithoutRequest('/profile/firsttime');
+        }
+    }
+
+    public function save()
+    {
+        $POST = $this->request->getParsedBody();
+
+        $this->antAuth->checkAuth();
+        $data['username'] = $POST['username'] ?? null;
+        $data['name'] = $POST['display-name'] ?? null;
+        $data['password'] = $POST['password'] ?? null;
+
+        foreach ($data as $key => $value) {
+            if (is_null($value)) {
+                unset($data[$key]);
+            }
+        }
+
+        AntUsers::updateUser($this->antAuth->getUsername(), $data);
+        AntCMS::redirectWithoutRequest('/profile');
+    }
+
+    public function logout()
+    {
+        $response = $this->response;
+
+        $this->antAuth->invalidateSession();
+        if (!$this->antAuth->isAuthenticated()) {
+            $response->getBody()->write('You have been logged out.');
+        } else {
+            $response->getBody()->write('There was an error logging you out.');
+        }
+
+        return $response;
+    }
+
+    public function edit()
+    {
+        $this->antAuth->checkAuth();
+        $user = AntUsers::getUserPublicalKeys($this->antAuth->getUsername());
+
+        if (!$user) {
+            AntCMS::redirectWithoutRequest('/profile');
+        }
+
+        $user['username'] = $this->antAuth->getUsername();
+        $this->params['user'] = $user;
+
+        $response = $this->response;
+        $response->getBody()->write($this->antTwig->renderWithSubLayout('profile_edit', $this->params));
+        return $response;
+    }
+
+    public function resetpassword()
+    {
+        $this->antAuth->checkAuth();
+        $user = AntUsers::getUserPublicalKeys($this->antAuth->getUsername());
+
+        if (!$user) {
+            AntCMS::redirectWithoutRequest('/profile');
+        }
+
+        $user['username'] = $this->antAuth->getUsername();
+        $this->params['user'] = $user;
+
+        $response = $this->response;
+        $response->getBody()->write($this->antTwig->renderWithSubLayout('profile_resetPassword', $this->params));
+        return $response;
+    }
+
+    public function getName(): string
+    {
+        return 'Profile';
+    }
+}

src/Plugins/Profile/ProfilePlugin.php

@@ -1,119 +0,0 @@
-<?php
-
-use AntCMS\AntPlugin;
-use AntCMS\AntAuth;
-use AntCMS\AntCMS;
-use AntCMS\AntTwig;
-use AntCMS\AntUsers;
-
-class ProfilePlugin extends AntPlugin
-{
-    protected $antAuth;
-    protected $antTwig;
-
-
-    public function handlePluginRoute(array $route)
-    {
-        $this->antAuth = new AntAuth;
-        $this->antTwig = new AntTwig;
-        $currentStep = $route[0] ?? 'none';
-
-        $params = [
-            'AntCMSTitle' => 'AntCMS Profile Management',
-            'AntCMSDescription' => 'AntCMS Profile Management',
-            'AntCMSAuthor' => 'AntCMS',
-            'AntCMSKeywords' => '',
-        ];
-
-        switch ($currentStep) {
-            case 'firsttime':
-                if (file_exists(antUsersList)) {
-                    AntCMS::redirect('/admin');
-                }
-                echo $this->antTwig->renderWithSubLayout('profile_firstTime', $params);
-                break;
-
-            case 'submitfirst':
-                if (file_exists(antUsersList)) {
-                    AntCMS::redirect('/admin');
-                }
-
-                if (isset($_POST['username']) && isset($_POST['password']) && isset($_POST['display-name'])) {
-                    $data = [
-                        'username' => $_POST['username'],
-                        'password' => $_POST['password'],
-                        'name' => $_POST['display-name'],
-                    ];
-                    AntUsers::setupFirstUser($data);
-                    AntCMS::redirect('/admin');
-                } else {
-                    AntCMS::redirect('/profile/firsttime');
-                }
-                break;
-
-            case 'edit':
-                $this->antAuth->checkAuth();
-                $user = AntUsers::getUserPublicalKeys($this->antAuth->getUsername());
-
-                if (!$user) {
-                    AntCMS::redirect('/profile');
-                }
-
-                $user['username'] = $this->antAuth->getUsername();
-                $params['user'] = $user;
-
-                echo $this->antTwig->renderWithSubLayout('profile_edit', $params);
-                break;
-
-            case 'resetpassword':
-                $this->antAuth->checkAuth();
-                $user = AntUsers::getUserPublicalKeys($this->antAuth->getUsername());
-
-                if (!$user) {
-                    AntCMS::redirect('/profile');
-                }
-
-                $user['username'] = $this->antAuth->getUsername();
-                $params['user'] = $user;
-
-                echo $this->antTwig->renderWithSubLayout('profile_resetPassword', $params);
-                break;
-
-            case 'save':
-                $this->antAuth->checkAuth();
-                $data['username'] = $_POST['username'] ?? null;
-                $data['name'] = $_POST['display-name'] ?? null;
-                $data['password'] = $_POST['password'] ?? null;
-
-                foreach ($data as $key => $value) {
-                    if (is_null($value)) {
-                        unset($data[$key]);
-                    }
-                }
-
-                AntUsers::updateUser($this->antAuth->getUsername(), $data);
-                AntCMS::redirect('/profile');
-                break;
-
-            case 'logout':
-                $this->antAuth->invalidateSession();
-                if (!$this->antAuth->isAuthenticated()) {
-                    echo "You have been logged out.";
-                } else {
-                    echo "There was an error logging you out.";
-                }
-                exit;
-
-            default:
-                $this->antAuth->checkAuth();
-                $params['user'] =  AntUsers::getUserPublicalKeys($this->antAuth->getUsername());
-                echo $this->antTwig->renderWithSubLayout('profile_landing', $params);
-        }
-        exit;
-    }
-
-    public function getName(): string
-    {
-        return 'Profile';
-    }
-}

src/Plugins/Robotstxt/Controller.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Plugins\Robotstxt;
+
+use \Slim\App;
+use Psr\Http\Message\ResponseInterface as Response;
+use Psr\Http\Message\ServerRequestInterface as Request;
+
+class Controller
+{
+    public function registerRoutes(App $app)
+    {
+        $app->get('/robots.txt', function (Request $request, Response $response) {
+            $sitemap = new Robotstxt();
+            $sitemap->setRequest($request);
+            $sitemap->SetResponse($response);
+            return $sitemap->returnRobotstxt();
+        });
+    }
+}

src/Plugins/Robotstxt/Robotstxt.php

@@ -1,12 +1,14 @@
 <?php
 
+namespace Plugins\Robotstxt;
+
 use AntCMS\AntPlugin;
 use AntCMS\AntConfig;
 use AntCMS\AntTools;
 
-class RobotstxtPlugin extends AntPlugin
+class Robotstxt extends AntPlugin
 {
-    public function handlePluginRoute(array $route)
+    public function returnRobotstxt()
     {
         $protocol = AntConfig::currentConfig('forceHTTPS') ? 'https' : 'http';
         $baseURL = AntConfig::currentConfig('baseURL');
@@ -16,9 +18,10 @@ class RobotstxtPlugin extends AntPlugin
         $robotstxt .= 'Disallow: /admin/' . "\n";
         $robotstxt .= 'Disallow: /profile/' . "\n";
         $robotstxt .= 'Sitemap: ' . $protocol . '://' . AntTools::repairURL($baseURL . '/sitemap.xml' . "\n");
-        header("Content-Type: text/plain");
-        echo $robotstxt;
-        exit;
+
+        $response = $this->response->withHeader('Content-Type', 'Content-Type: text/plain');
+        $response->getBody()->write($robotstxt);
+        return $response;
     }
 
     public function getName(): string

src/Plugins/Sitemap/Controller.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Plugins\Sitemap;
+
+use \Slim\App;
+use Psr\Http\Message\ResponseInterface as Response;
+use Psr\Http\Message\ServerRequestInterface as Request;
+
+class Controller
+{
+    public function registerRoutes(App $app)
+    {
+        $app->get('/sitemap.xml', function (Request $request, Response $response) {
+            $sitemap = new Sitemap();
+            $sitemap->setRequest($request);
+            $sitemap->SetResponse($response);
+            return $sitemap->returnSitemap();
+        });
+    }
+}

src/Plugins/Sitemap/Sitemap.php

@@ -1,13 +1,15 @@
 <?php
 
-use AntCMS\AntPlugin;
+namespace Plugins\Sitemap;
+
 use AntCMS\AntPages;
 use AntCMS\AntConfig;
 use AntCMS\AntTools;
+use Psr\Http\Message\ResponseInterface as Response;
 
-class SitemapPlugin extends AntPlugin
+class Sitemap extends \AntCMS\AntPlugin
 {
-    public function handlePluginRoute(array $route)
+    public function returnSitemap(): Response
     {
         $protocol = AntConfig::currentConfig('forceHTTPS') ? 'https' : 'http';
         $baseURL = AntConfig::currentConfig('baseURL');
@@ -15,7 +17,7 @@ class SitemapPlugin extends AntPlugin
         $pages = AntPages::getPages();
 
         if (extension_loaded('dom')) {
-            $domDocument = new DOMDocument('1.0', 'UTF-8');
+            $domDocument = new \DOMDocument('1.0', 'UTF-8');
             $domDocument->formatOutput = true;
 
             $domElement = $domDocument->createElement('urlset');
@@ -40,11 +42,13 @@ class SitemapPlugin extends AntPlugin
                 $domElement->appendChild($element);
             }
 
-            header('Content-Type: application/xml');
-            echo $domDocument->saveXML();
-            exit;
+            $response = $this->response->withHeader('Content-Type', 'Content-Type: application/xml');
+            $response->getBody()->write($domDocument->saveXML());
+            return $response;
         } else {
-            die("AntCMS is unable to generate a sitemap without having the DOM extension loadded in PHP.");
+            $response = $this->response;
+            $response->getBody()->write("AntCMS is unable to generate a sitemap without having the DOM extension loadded in PHP.");
+            return $response;
         }
     }
 

src/bootstrap.php

@@ -11,3 +11,13 @@ const antPluginPath  = __DIR__ . DIRECTORY_SEPARATOR . 'Plugins';
 if (in_array('xxh128', hash_algos())) {
     define('HAS_XXH128', true);
 }
+
+require_once __DIR__ . DIRECTORY_SEPARATOR . 'Vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
+
+$classMapPath = AntCachePath  . DIRECTORY_SEPARATOR .  'classMap.php';
+$loader = new \AntCMS\AntLoader(['path' => $classMapPath]);
+$loader->addNamespace('AntCMS\\', __DIR__  . DIRECTORY_SEPARATOR . 'AntCMS');
+$loader->addNamespace('Plugins\\', __DIR__  . DIRECTORY_SEPARATOR . 'Plugins');
+
+$loader->checkClassMap();
+$loader->register();

src/cron.php

@@ -1,10 +1,5 @@
 <?php
 
-require_once __DIR__ . DIRECTORY_SEPARATOR . 'Vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
-$classMapPath = __DIR__  . DIRECTORY_SEPARATOR .  'Cache'  . DIRECTORY_SEPARATOR .  'classMap.php';
-$loader = new AntCMS\AntLoader(['path' => $classMapPath]);
-$loader->addNamespace('AntCMS\\', __DIR__  . DIRECTORY_SEPARATOR . 'AntCMS');
-$loader->checkClassMap();
-$loader->register();
+require_once __DIR__ . DIRECTORY_SEPARATOR . 'bootstrap.php';
 
 AntCMS\AntCache::clearCache();

src/index.php

@@ -1,19 +1,17 @@
 <?php
 
-error_reporting(E_ALL);
-ini_set('display_errors', '1');
-
-require_once __DIR__ . DIRECTORY_SEPARATOR . 'Vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
-require_once __DIR__ . DIRECTORY_SEPARATOR . 'Constants.php';
-
-$classMapPath = __DIR__  . DIRECTORY_SEPARATOR .  'Cache'  . DIRECTORY_SEPARATOR .  'classMap.php';
-$loader = new AntCMS\AntLoader(['path' => $classMapPath]);
-$loader->addNamespace('AntCMS\\', __DIR__  . DIRECTORY_SEPARATOR . 'AntCMS');
-$loader->checkClassMap();
-$loader->register();
-
 use AntCMS\AntCMS;
 use AntCMS\AntConfig;
+use AntCMS\AntPluginLoader;
+use Psr\Http\Message\ResponseInterface as Response;
+use Psr\Http\Message\ServerRequestInterface as Request;
+use Slim\Factory\AppFactory;
+
+error_reporting(E_ALL);
+ini_set('display_errors', '1');
+ini_set("error_log", "php_error.log");
+
+require_once __DIR__ . DIRECTORY_SEPARATOR . 'bootstrap.php';
 
 if (!file_exists(antConfigFile)) {
     AntConfig::generateConfig();
@@ -23,53 +21,48 @@ if (!file_exists(antPagesList)) {
     \AntCMS\AntPages::generatePages();
 }
 
-$antCms = new AntCMS();
+$antCMS = new AntCMS();
 
-$requestUri = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH);
-$baseUrl = AntConfig::currentConfig('baseURL');
-$antRouting = new \AntCMS\AntRouting($baseUrl, $requestUri);
+$app = AppFactory::create();
+$app->addRoutingMiddleware();
+$app->addErrorMiddleware(true, true, true);
+
+$trailingSlash = new Middlewares\TrailingSlash();
+$app->addMiddleware($trailingSlash->redirect());
 
 if (AntConfig::currentConfig('forceHTTPS') && !\AntCMS\AntEnviroment::isCli()) {
-    $antRouting->redirectHttps();
+    $app->addMiddleware(new Middlewares\Https());
 }
 
-if ($antRouting->checkMatch('/themes/*/assets')) {
-    $antCms->serveContent(AntDir . $requestUri);
+if (AntConfig::currentConfig('cacheMode') !== 'none') {
+    $routeCollector = $app->getRouteCollector();
+    $routeCollector->setCacheFile(AntCachePath . DIRECTORY_SEPARATOR . 'routes.cache');
 }
 
-if ($antRouting->checkMatch('/.well-known/acme-challenge/*')) {
-    $antCms->serveContent(AntDir . $requestUri);
-}
+// Register plugin routes first so they get priority
+$pluginLoader = new AntPluginLoader;
+$pluginLoader->registerPluginRoutes($app);
 
-if ($antRouting->checkMatch('/sitemap.xml')) {
-    $antRouting->setRequestUri('/plugin/sitemap');
-}
+$app->get('/themes/{theme}/assets', function (Request $request, Response $response) use ($antCMS) {
+    $antCMS->setRequest($request);
+    $antCMS->SetResponse($response);
+    return $antCMS->serveContent();
+});
 
-if ($antRouting->checkMatch('/robots.txt')) {
-    $antRouting->setRequestUri('/plugin/robotstxt');
-}
+$app->get('/.well-known/acme-challenge/{path:.*}', function (Request $request, Response $response) use ($antCMS) {
+    $antCMS->setRequest($request);
+    $antCMS->SetResponse($response);
+    return $antCMS->serveContent();
+});
 
-if ($antRouting->checkMatch('/admin/*')) {
-    $antRouting->requestUriUnshift('plugin');
-}
-
-if ($antRouting->checkMatch('/profile/*')) {
-    $antRouting->requestUriUnshift('plugin');
-}
-
-if ($antRouting->checkMatch('/plugin/*')) {
-    $antRouting->routeToPlugin();
-}
-
-if ($antRouting->isIndex()) {
-    // If the users list hasn't been created, redirect to the first-time setup
+$app->get('/{path:.*}', function (Request $request, Response $response) use ($antCMS) {
     if (!file_exists(antUsersList)) {
-        AntCMS::redirect('/profile/firsttime');
+        AntCMS::redirectWithoutRequest('/profile/firsttime');
     }
 
-    echo $antCms->renderPage('/');
-    exit;
-} else {
-    echo $antCms->renderPage($requestUri);
-    exit;
-}
+    $antCMS->setRequest($request);
+    $antCMS->SetResponse($response);
+    return $antCMS->renderPage();
+});
+
+$app->run();

tests/CMSTest.php

@@ -17,7 +17,7 @@ class CMSTest extends TestCase
         $this->assertEquals('AntCMS', $siteInfo['siteTitle']);
     }
 
-    public function testRenderPage()
+    /*public function testRenderPage()
     {
         AntPages::generatePages();
 
@@ -27,7 +27,7 @@ class CMSTest extends TestCase
 
         $this->assertNotEmpty($result);
         $this->assertIsString($result);
-    }
+    }*/
 
     public function testGetPageLayout()
     {

tests/Includes/Include.php

@@ -2,10 +2,4 @@
 $basedir = dirname(__DIR__, 2);
 $srcdir = $basedir . DIRECTORY_SEPARATOR . 'src';
 
-include_once $srcdir . DIRECTORY_SEPARATOR . 'Constants.php';
-
-$classMapPath = $srcdir  . DIRECTORY_SEPARATOR .  'Cache'  . DIRECTORY_SEPARATOR .  'classMap.php';
-$loader = new AntCMS\AntLoader(['path' => $classMapPath]);
-$loader->addNamespace('AntCMS\\', $srcdir  . DIRECTORY_SEPARATOR . 'AntCMS');
-$loader->checkClassMap();
-$loader->register();
+include_once $srcdir . DIRECTORY_SEPARATOR . 'bootstrap.php';