From 5ee8c4c753d1878b7877a53cd73d7b8be1df5c67 Mon Sep 17 00:00:00 2001
From: Thomas Rubini <74205383+ThomasRubini@users.noreply.github.com>
Date: Sun, 22 Jan 2023 22:26:20 +0100
Subject: [PATCH 1/3] add autoloaded "Modules" directory

---
 Kernel/Constants.php |  6 ++++
 Kernel/Session.php   | 84 --------------------------------------------
 Modules/AutoLoad.php | 28 +++++++++++++++
 index.php            |  1 +
 4 files changed, 35 insertions(+), 84 deletions(-)
 delete mode 100644 Kernel/Session.php
 create mode 100644 Modules/AutoLoad.php

diff --git a/Kernel/Constants.php b/Kernel/Constants.php
index ac075eb..f42583d 100644
--- a/Kernel/Constants.php
+++ b/Kernel/Constants.php
@@ -14,6 +14,8 @@ final class Constants
 
     const CONTROLLERS_DIR = '/Controllers/';
 
+    const MODULES_DIR = '/Modules/';
+
 
     public static function rootDir() {
         return realpath(__DIR__ . '/../');
@@ -39,4 +41,8 @@ final class Constants
         return self::rootDir() . self::CONTROLLERS_DIR;
     }
 
+    public static function modulesDir() {
+        return self::rootDir() . self::MODULES_DIR;
+    }
+
 }
diff --git a/Kernel/Session.php b/Kernel/Session.php
deleted file mode 100644
index 8712087..0000000
--- a/Kernel/Session.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-final class Session
-{
-    public static function start_session()
-    {
-        if (session_status() !== PHP_SESSION_ACTIVE) {
-            session_start();
-        }
-    }
-
-    public static function resume_session()
-    {
-        if(self::has_session_cookie()){
-            self::start_session();
-            return true;
-        }
-        return false;
-    }
-
-    public static function destroy_session()
-    {
-        self::start_session();
-        session_destroy();
-    }
-
-    /*
-        Reason: start_session() automatically sets a cookie,
-        we want a way to know if the user have a session without setting a cookie
-        (e.g to not set a cookie on every page to set the header, which change if you are logged-in)
-    */
-    public static function has_session_cookie()
-    {
-        return isset($_COOKIE[session_name()]);
-    }
-    
-    public static function is_login()
-    {
-        if (!self::resume_session()) {
-            return false;
-        }
-        if (!isset($_SESSION)) {
-            return false;
-        }
-        if (!isset($_SESSION["ID"])) {
-            return False;
-        }
-        
-        // ensure account has not been deleted/disabled in the meantime
-        $O_userModel = new UserModel();
-        $B_userActive = $O_userModel->isUserActive($_SESSION["ID"]);
-        return $B_userActive;
-    }
-
-    public static function set_login($I_id){
-        self::start_session();
-        $_SESSION["ID"] = $I_id;
-    }
-
-    public static function login_or_die()
-    {
-        if (!self::is_login()) {
-            header("Location: /user/login?return_uri=".$_SERVER["REQUEST_URI"]);
-            die();
-        }
-    }
-
-    public static function is_admin(){
-        if (!self::is_login()) return false;
-
-        $O_userModel = new UserModel();
-        return $O_userModel->isUserAdmin($_SESSION["ID"]);
-    }
-    
-    public static function admin_or_die(){
-        Session::login_or_die();
-
-        if (!self::is_admin()) {
-            header("Location: /");
-            die();
-        }
-    }
-
-}
diff --git a/Modules/AutoLoad.php b/Modules/AutoLoad.php
new file mode 100644
index 0000000..9645721
--- /dev/null
+++ b/Modules/AutoLoad.php
@@ -0,0 +1,28 @@
+<?php
+
+class ModulesAutoLoad
+{
+    public static function loadModuleClass($S_className)
+    {
+        $dir = Constants::modulesDir();
+        foreach (scandir($dir) as $path) {
+            if($path === ".." || $path === ".") continue;
+            $subdir = "$dir/$path";
+            if (is_dir($subdir)) {
+                static::_load("$subdir/$S_className.php");
+            }
+        }
+
+    }
+
+    private static function _load($S_path)
+    {
+        if (is_readable($S_path))
+        {
+            require $S_path;
+        }
+    }
+    
+}
+
+spl_autoload_register('ModulesAutoLoad::loadModuleClass');
\ No newline at end of file
diff --git a/index.php b/index.php
index 2d13d2d..27c2fe2 100644
--- a/index.php
+++ b/index.php
@@ -3,6 +3,7 @@
 
     require 'vendor/autoload.php';
     require 'Kernel/AutoLoad.php';
+    require 'Modules/AutoLoad.php';
 
     $dotenv = Dotenv\Dotenv::createImmutable(Constants::rootDir());
     $dotenv->load();

From 92075f4b39776960ddce83d5e859322cd9f7ab7c Mon Sep 17 00:00:00 2001
From: Thomas Rubini <74205383+ThomasRubini@users.noreply.github.com>
Date: Sun, 22 Jan 2023 22:26:25 +0100
Subject: [PATCH 2/3] move Session.php to Modules

---
 Modules/Session/Session.php | 84 +++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 Modules/Session/Session.php

diff --git a/Modules/Session/Session.php b/Modules/Session/Session.php
new file mode 100644
index 0000000..8712087
--- /dev/null
+++ b/Modules/Session/Session.php
@@ -0,0 +1,84 @@
+<?php
+
+final class Session
+{
+    public static function start_session()
+    {
+        if (session_status() !== PHP_SESSION_ACTIVE) {
+            session_start();
+        }
+    }
+
+    public static function resume_session()
+    {
+        if(self::has_session_cookie()){
+            self::start_session();
+            return true;
+        }
+        return false;
+    }
+
+    public static function destroy_session()
+    {
+        self::start_session();
+        session_destroy();
+    }
+
+    /*
+        Reason: start_session() automatically sets a cookie,
+        we want a way to know if the user have a session without setting a cookie
+        (e.g to not set a cookie on every page to set the header, which change if you are logged-in)
+    */
+    public static function has_session_cookie()
+    {
+        return isset($_COOKIE[session_name()]);
+    }
+    
+    public static function is_login()
+    {
+        if (!self::resume_session()) {
+            return false;
+        }
+        if (!isset($_SESSION)) {
+            return false;
+        }
+        if (!isset($_SESSION["ID"])) {
+            return False;
+        }
+        
+        // ensure account has not been deleted/disabled in the meantime
+        $O_userModel = new UserModel();
+        $B_userActive = $O_userModel->isUserActive($_SESSION["ID"]);
+        return $B_userActive;
+    }
+
+    public static function set_login($I_id){
+        self::start_session();
+        $_SESSION["ID"] = $I_id;
+    }
+
+    public static function login_or_die()
+    {
+        if (!self::is_login()) {
+            header("Location: /user/login?return_uri=".$_SERVER["REQUEST_URI"]);
+            die();
+        }
+    }
+
+    public static function is_admin(){
+        if (!self::is_login()) return false;
+
+        $O_userModel = new UserModel();
+        return $O_userModel->isUserAdmin($_SESSION["ID"]);
+    }
+    
+    public static function admin_or_die(){
+        Session::login_or_die();
+
+        if (!self::is_admin()) {
+            header("Location: /");
+            die();
+        }
+    }
+
+}

From a8bba121075acec877328a09420b7a0a7b860f56 Mon Sep 17 00:00:00 2001
From: Thomas Rubini <74205383+ThomasRubini@users.noreply.github.com>
Date: Sun, 22 Jan 2023 22:29:43 +0100
Subject: [PATCH 3/3] use a separate UserSessionModel in Session

---
 Models/UserModel.php                 | 26 +-----------------------
 Modules/Session/Session.php          |  8 ++++----
 Modules/Session/UserSessionModel.php | 30 ++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 29 deletions(-)
 create mode 100644 Modules/Session/UserSessionModel.php

diff --git a/Models/UserModel.php b/Models/UserModel.php
index 55c9f10..a7ef0f5 100644
--- a/Models/UserModel.php
+++ b/Models/UserModel.php
@@ -1,6 +1,6 @@
 <?php
 
-final class UserModel
+final class UserModel extends UserSessionModel
 {
 
     public function createUser($S_email, $S_username, $S_password_hash){
@@ -57,30 +57,6 @@ final class UserModel
         if ($row === false) return null;
         return $row["USERNAME"];
     }
-
-    public function isUserActive($I_id)
-    {
-        $O_model = Model::get();
-        $stmt = $O_model->prepare("SELECT DISABLED FROM USER WHERE ID=:id");
-        $stmt->bindParam("id", $I_id);
-        $stmt->execute();
-        
-        $row = $stmt->fetch();
-        if ($row === false) return false;
-        return $row["DISABLED"] !== 1;
-    }
-
-    public function isUserAdmin($I_id)
-    {
-        $O_model = Model::get();
-        $stmt = $O_model->prepare("SELECT ADMIN FROM USER WHERE ID=:id");
-        $stmt->bindParam("id", $I_id);
-        $stmt->execute();
-        
-        $row = $stmt->fetch();
-        if ($row === false) return false;
-        return $row["ADMIN"] === 1;
-    }
     
     public function updateEmailByID($I_id, $S_newEmail){
         $O_model = Model::get();
diff --git a/Modules/Session/Session.php b/Modules/Session/Session.php
index 8712087..828e00b 100644
--- a/Modules/Session/Session.php
+++ b/Modules/Session/Session.php
@@ -47,8 +47,8 @@ final class Session
         }
         
         // ensure account has not been deleted/disabled in the meantime
-        $O_userModel = new UserModel();
-        $B_userActive = $O_userModel->isUserActive($_SESSION["ID"]);
+        $O_userSessionModel = new UserSessionModel();
+        $B_userActive = $O_userSessionModel->isUserActive($_SESSION["ID"]);
         return $B_userActive;
     }
 
@@ -68,8 +68,8 @@ final class Session
     public static function is_admin(){
         if (!self::is_login()) return false;
 
-        $O_userModel = new UserModel();
-        return $O_userModel->isUserAdmin($_SESSION["ID"]);
+        $O_userSessionModel = new UserSessionModel();
+        return $O_userSessionModel->isUserAdmin($_SESSION["ID"]);
     }
     
     public static function admin_or_die(){
diff --git a/Modules/Session/UserSessionModel.php b/Modules/Session/UserSessionModel.php
new file mode 100644
index 0000000..2f666f5
--- /dev/null
+++ b/Modules/Session/UserSessionModel.php
@@ -0,0 +1,30 @@
+<?php
+
+class UserSessionModel
+{
+
+    public function isUserActive($I_id)
+    {
+        $O_model = Model::get();
+        $stmt = $O_model->prepare("SELECT DISABLED FROM USER WHERE ID=:id");
+        $stmt->bindParam("id", $I_id);
+        $stmt->execute();
+        
+        $row = $stmt->fetch();
+        if ($row === false) return false;
+        return $row["DISABLED"] !== 1;
+    }
+
+    public function isUserAdmin($I_id)
+    {
+        $O_model = Model::get();
+        $stmt = $O_model->prepare("SELECT ADMIN FROM USER WHERE ID=:id");
+        $stmt->bindParam("id", $I_id);
+        $stmt->execute();
+        
+        $row = $stmt->fetch();
+        if ($row === false) return false;
+        return $row["ADMIN"] === 1;
+    }
+
+}