From 8a0f138fede018ce1ea8b52749cad6d000e3ac05 Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Fri, 7 Jan 2022 20:11:57 +0100
Subject: [PATCH] Updated the engine.

---
 HEADS                    |  2 +-
 app/ccms_application.cpp |  6 +++---
 app/ccms_application.h   |  4 ++--
 main.cpp                 | 19 ++++++++++---------
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/HEADS b/HEADS
index e06c271..3ef9533 100644
--- a/HEADS
+++ b/HEADS
@@ -1 +1 @@
-{"engine": {"master": "37d5c0fec8b6d0428daca36dff10b65e262408ef"}}
\ No newline at end of file
+{"engine": {"master": "2133be9254088521e03c5a3b2923dc611261d223"}}
\ No newline at end of file
diff --git a/app/ccms_application.cpp b/app/ccms_application.cpp
index 94a1513..3313afc 100644
--- a/app/ccms_application.cpp
+++ b/app/ccms_application.cpp
@@ -226,7 +226,7 @@ void CCMSApplication::user_page_func(Object *instance, Request *request) {
 }
 
 void CCMSApplication::setup_routes() {
-	DWebApplication::setup_routes();
+	WebRoot::setup_routes();
 
 	index_func = HandlerInstance(index);
 	main_route_map["admin"] = HandlerInstance(admin_page_func);
@@ -239,7 +239,7 @@ void CCMSApplication::setup_middleware() {
 	//middlewares.push_back(HandlerInstance(::RBACUserController::rbac_user_session_setup_middleware));
 	middlewares.push_back(HandlerInstance(::RBACUserController::rbac_default_user_session_middleware));
 
-	DWebApplication::setup_middleware();
+	WebRoot::setup_middleware();
 }
 
 void CCMSApplication::migrate() {
@@ -272,7 +272,7 @@ void CCMSApplication::compile_menu() {
 }
 
 CCMSApplication::CCMSApplication() :
-		DWebApplication() {
+		WebRoot() {
 
 	_rbac_controller = new RBACController();
 	_rbac_controller->initialize();
diff --git a/app/ccms_application.h b/app/ccms_application.h
index a9b8fa9..6a7f312 100644
--- a/app/ccms_application.h
+++ b/app/ccms_application.h
@@ -3,7 +3,7 @@
 
 //#include "core/http/web_application.h"
 #include "core/object.h"
-#include "modules/drogon/web_application.h"
+#include "core/http/web_root.h"
 
 #undef LOG_TRACE
 #undef LOG_WARN
@@ -23,7 +23,7 @@ class RBACModel;
 		return;                                \
 	}
 
-class CCMSApplication : public DWebApplication {
+class CCMSApplication : public WebRoot {
 public:
 	enum MenuEntries {
 		MENUENTRY_NEWS = 0,
diff --git a/main.cpp b/main.cpp
index e77f122..d75d1d7 100644
--- a/main.cpp
+++ b/main.cpp
@@ -2,9 +2,8 @@
 #include <iostream>
 #include <string>
 
-#include "core/bry_http/http_server.h"
 #include "core/file_cache.h"
-#include "core/http/web_application.h"
+#include "core/http/web_root.h"
 
 #include "app/ccms_application.h"
 
@@ -15,8 +14,6 @@
 
 #include "core/http/session_manager.h"
 
-#define MAIN_CLASS CCMSApplication
-
 #include "modules/drogon/web_application.h"
 
 // Backends
@@ -66,11 +63,14 @@ int main(int argc, char **argv, char **envp) {
 
 	create_databases();
 
-	DWebApplication *app = new MAIN_CLASS();
+	DWebApplication *app = new DWebApplication();
+	CCMSApplication *app_root = new CCMSApplication();
 
-	app->load_settings();
-	app->setup_routes();
-	app->setup_middleware();
+	app->set_root(app_root);
+
+	app_root->load_settings();
+	app_root->setup_routes();
+	app_root->setup_middleware();
 
 	app->add_listener("127.0.0.1", 8080);
 	LOG_INFO << "Server running on 127.0.0.1:8080";
@@ -96,10 +96,11 @@ int main(int argc, char **argv, char **envp) {
 			user_controller->create_test_users();
 		}
 
-		app->migrate();
+		app_root->migrate();
 	}
 
 	delete app;
+	delete app_root;
 	delete dbm;
 	delete file_cache;
 	delete settings;