From 13bd53b32670baa46db4a53d8c76e74a9650fd8e Mon Sep 17 00:00:00 2001
From: Sam Mousa <sam@mousa.nl>
Date: Mon, 12 Nov 2018 17:46:44 +0100
Subject: [PATCH] Removed some more includes; restore loading controller groups
 manually

---
 server/controllers/article.php              |  8 ------
 server/controllers/staff.php                | 13 ----------
 server/controllers/system.php               | 28 ---------------------
 server/controllers/system/init-database.php |  1 -
 server/controllers/ticket.php               | 15 -----------
 server/controllers/user.php                 | 19 --------------
 server/data/InitialMails.php                |  2 --
 server/index.php                            |  5 ++++
 server/libs/Controller.php                  |  3 ---
 server/libs/DataStoreList.php               |  2 --
 server/libs/Validator.php                   |  2 --
 11 files changed, 5 insertions(+), 93 deletions(-)

diff --git a/server/controllers/article.php b/server/controllers/article.php
index e2079885..6d8b6285 100755
--- a/server/controllers/article.php
+++ b/server/controllers/article.php
@@ -1,12 +1,4 @@
 <?php
-include 'article/add-topic.php';
-include 'article/edit-topic.php';
-include 'article/delete-topic.php';
-include 'article/add.php';
-include 'article/edit.php';
-include 'article/delete.php';
-include 'article/get-all.php';
-
 $articleControllers = new ControllerGroup();
 $articleControllers->setGroupPath('/article');
 
diff --git a/server/controllers/staff.php b/server/controllers/staff.php
index 9967e9db..997c5f25 100755
--- a/server/controllers/staff.php
+++ b/server/controllers/staff.php
@@ -1,17 +1,4 @@
 <?php
-require_once 'staff/get.php';
-require_once 'staff/assign-ticket.php';
-require_once 'staff/un-assign-ticket.php';
-require_once 'staff/get-tickets.php';
-require_once 'staff/get-new-tickets.php';
-require_once 'staff/get-all-tickets.php';
-require_once 'staff/search-tickets.php';
-require_once 'staff/add.php';
-require_once 'staff/get-all.php';
-require_once 'staff/delete.php';
-require_once 'staff/edit.php';
-require_once 'staff/last-events.php';
-
 $systemControllerGroup = new ControllerGroup();
 $systemControllerGroup->setGroupPath('/staff');
 
diff --git a/server/controllers/system.php b/server/controllers/system.php
index 458dd036..733f6810 100755
--- a/server/controllers/system.php
+++ b/server/controllers/system.php
@@ -1,32 +1,4 @@
 <?php
-require_once 'system/check-requirements.php';
-require_once 'system/init-database.php';
-require_once 'system/init-settings.php';
-require_once 'system/init-admin.php';
-require_once 'system/installation-done.php';
-require_once 'system/get-settings.php';
-require_once 'system/edit-settings.php';
-require_once 'system/add-department.php';
-require_once 'system/edit-department.php';
-require_once 'system/delete-department.php';
-require_once 'system/get-logs.php';
-require_once 'system/get-mail-templates.php';
-require_once 'system/edit-mail-template.php';
-require_once 'system/recover-mail-template.php';
-require_once 'system/disable-registration.php';
-require_once 'system/enable-registration.php';
-require_once 'system/disable-user-system.php';
-require_once 'system/enable-user-system.php';
-require_once 'system/add-api-key.php';
-require_once 'system/delete-api-key.php';
-require_once 'system/get-api-keys.php';
-require_once 'system/get-stats.php';
-require_once 'system/delete-all-users.php';
-require_once 'system/csv-import.php';
-require_once 'system/backup-database.php';
-require_once 'system/download.php';
-require_once 'system/test-smtp.php';
-
 $systemControllerGroup = new ControllerGroup();
 $systemControllerGroup->setGroupPath('/system');
 
diff --git a/server/controllers/system/init-database.php b/server/controllers/system/init-database.php
index 67aefd8c..3d5a8793 100755
--- a/server/controllers/system/init-database.php
+++ b/server/controllers/system/init-database.php
@@ -1,5 +1,4 @@
 <?php
-//include '../../config.php';
 use RedBeanPHP\Facade as RedBean;
 
 /**
diff --git a/server/controllers/ticket.php b/server/controllers/ticket.php
index 2cce64c5..3648e604 100755
--- a/server/controllers/ticket.php
+++ b/server/controllers/ticket.php
@@ -1,19 +1,4 @@
 <?php
-include 'ticket/create.php';
-include 'ticket/comment.php';
-include 'ticket/get.php';
-include 'ticket/check.php';
-include 'ticket/add-custom-response.php';
-include 'ticket/delete-custom-response.php';
-include 'ticket/edit-custom-response.php';
-include 'ticket/get-custom-responses.php';
-include 'ticket/change-department.php';
-include 'ticket/close.php';
-include 'ticket/re-open.php';
-include 'ticket/change-priority.php';
-include 'ticket/seen.php';
-include 'ticket/delete.php';
-
 $ticketControllers = new ControllerGroup();
 $ticketControllers->setGroupPath('/ticket');
 
diff --git a/server/controllers/user.php b/server/controllers/user.php
index 7d10b549..d65541f7 100755
--- a/server/controllers/user.php
+++ b/server/controllers/user.php
@@ -1,23 +1,4 @@
 <?php
-include 'user/login.php';
-include 'user/signup.php';
-include 'user/logout.php';
-include 'user/check-session.php';
-include 'user/recover-password.php';
-include 'user/send-recover-password.php';
-include 'user/edit-password.php';
-include 'user/edit-email.php';
-include 'user/get.php';
-include 'user/get-users.php';
-include 'user/get-user.php';
-include 'user/delete.php';
-include 'user/ban.php';
-include 'user/un-ban.php';
-include 'user/list-ban.php';
-include 'user/verify.php';
-include 'user/enable.php';
-include 'user/disable.php';
-
 $userControllers = new ControllerGroup();
 $userControllers->setGroupPath('/user');
 
diff --git a/server/data/InitialMails.php b/server/data/InitialMails.php
index 70030839..61a396a1 100755
--- a/server/data/InitialMails.php
+++ b/server/data/InitialMails.php
@@ -1,6 +1,4 @@
 <?php
-require_once 'data/MailTexts.php';
-
 class InitialMails {
 
     public static function getBody($templateCode, $texts) {
diff --git a/server/index.php b/server/index.php
index 0702f045..9f038796 100644
--- a/server/index.php
+++ b/server/index.php
@@ -15,5 +15,10 @@ if(defined('MYSQL_HOST') && defined('MYSQL_DATABASE') && defined('MYSQL_USER') &
 \Slim\Slim::registerAutoLoader();
 $app = new \Slim\Slim();
 
+// LOAD CONTROLLERS
+foreach (glob('controllers/*.php') as $controller) {
+    include_once $controller;
+}
+
 Controller::init();
 $app->run();
diff --git a/server/libs/Controller.php b/server/libs/Controller.php
index 246e3e6f..15df8c85 100755
--- a/server/libs/Controller.php
+++ b/server/libs/Controller.php
@@ -1,7 +1,4 @@
 <?php
-require_once 'libs/Validator.php';
-require_once 'models/Session.php';
-
 use RedBeanPHP\Facade as RedBean;
 
 abstract class Controller {
diff --git a/server/libs/DataStoreList.php b/server/libs/DataStoreList.php
index da995595..1586ae1a 100755
--- a/server/libs/DataStoreList.php
+++ b/server/libs/DataStoreList.php
@@ -1,6 +1,4 @@
 <?php
-require_once 'models/DataStore.php';
-
 class DataStoreList implements IteratorAggregate {
     private $list = [];
     
diff --git a/server/libs/Validator.php b/server/libs/Validator.php
index 5ac3fbee..0f107c9a 100755
--- a/server/libs/Validator.php
+++ b/server/libs/Validator.php
@@ -1,6 +1,4 @@
 <?php
-require_once 'libs/Controller.php';
-
 use Respect\Validation\Validator as DataValidator;
 
 class ValidationException extends Exception {}