From 88c591568c891f2e97cabe2e9c4a213dc76535fd Mon Sep 17 00:00:00 2001 From: Antoine Jourdain Date: Mon, 20 Nov 2023 10:37:43 +0100 Subject: [PATCH] Refractor AbsController -> UserController --- Project/php/controller/AdminController.php | 2 +- Project/php/controller/FrontController.php | 14 +++++++------- Project/php/controller/TeacherController.php | 2 +- .../{AbsController.php => UserController.php} | 2 +- Project/php/templates/home.html | 2 +- Project/php/templates/login.html | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) rename Project/php/controller/{AbsController.php => UserController.php} (99%) diff --git a/Project/php/controller/AdminController.php b/Project/php/controller/AdminController.php index c4a1474..43d7b39 100755 --- a/Project/php/controller/AdminController.php +++ b/Project/php/controller/AdminController.php @@ -6,7 +6,7 @@ use config\Validation; use model\MdlAdmin; use Exception; -class AdminController extends AbsController +class AdminController { public function showAllUsers(): void { global $twig; diff --git a/Project/php/controller/FrontController.php b/Project/php/controller/FrontController.php index 720edbd..cd24ccb 100755 --- a/Project/php/controller/FrontController.php +++ b/Project/php/controller/FrontController.php @@ -23,8 +23,8 @@ class FrontController $router->map('GET|POST', '/admin/[i:id]/[a:action]?', 'Admin'); $router->map('GET|POST', '/teacher/[i:id]/[a:action]?', 'Teacher'); $router->map('GET|POST', '/student/[i:id]/[a:action]?', 'Student'); - $router->map('GET|POST', '/abs/[a:action]?', 'Abs'); - $router->map('GET|POST', '/abs/[a:action]/[i:id]', 'Abs'); + $router->map('GET|POST', '/user/[a:action]?', 'User'); + $router->map('GET|POST', '/user/[a:action]/[i:id]', 'User'); $twig->addGlobal('base', $altorouterPath); @@ -38,10 +38,10 @@ class FrontController $action = Validation::val_action($match['params']['action'] ?? null); $id = $match['params']['id'] ?? null; - if ($target == 'Abs') { - $abs = new AbsController(); - if (is_callable(array($abs, $action))) - call_user_func_array(array($abs, $action), array($match['params'])); + if ($target == 'User') { + $userCtrl = new UserController(); + if (is_callable(array($userCtrl, $action))) + call_user_func_array(array($userCtrl, $action), array($match['params'])); } else { switch ($action) { @@ -75,7 +75,7 @@ class FrontController break; } - else (new AbsController())->login(); + else (new UserController())->login(); } } } diff --git a/Project/php/controller/TeacherController.php b/Project/php/controller/TeacherController.php index ed1fb94..da42c5e 100755 --- a/Project/php/controller/TeacherController.php +++ b/Project/php/controller/TeacherController.php @@ -6,7 +6,7 @@ use model\MdlTeacher; use gateway\VocabularyListGateway; use Exception; -class TeacherController extends AbsController +class TeacherController { public function affAllStudent(): void { diff --git a/Project/php/controller/AbsController.php b/Project/php/controller/UserController.php similarity index 99% rename from Project/php/controller/AbsController.php rename to Project/php/controller/UserController.php index bdca85a..8ba4a32 100644 --- a/Project/php/controller/AbsController.php +++ b/Project/php/controller/UserController.php @@ -10,7 +10,7 @@ use model\MdlStudent; use model\VocabularyList; use model\Translation; -class AbsController +class UserController { public function showAccountInfos(): void { diff --git a/Project/php/templates/home.html b/Project/php/templates/home.html index 26309bd..b82918c 100755 --- a/Project/php/templates/home.html +++ b/Project/php/templates/home.html @@ -34,7 +34,7 @@ diff --git a/Project/php/templates/login.html b/Project/php/templates/login.html index 13a432c..5c71d25 100755 --- a/Project/php/templates/login.html +++ b/Project/php/templates/login.html @@ -24,7 +24,7 @@

Log In

-
+