From 670df4002c32596b1ad02a8e2709d32be179e1a5 Mon Sep 17 00:00:00 2001 From: "anthony.richard" Date: Tue, 14 Nov 2023 19:03:33 +0100 Subject: [PATCH] pouf --- Project/php/config/Validation.php | 2 +- Project/php/gateway/TranslationGateway.php | 0 Project/php/model/AbsModel.php | 8 +++++--- Project/php/model/MdlAdmin.php | 17 ++++++----------- Project/php/model/MdlStudent.php | 18 ++++++------------ Project/php/model/MdlTeacher.php | 16 ++++++---------- Project/php/model/Translation.php | 0 7 files changed, 24 insertions(+), 37 deletions(-) mode change 100644 => 100755 Project/php/gateway/TranslationGateway.php mode change 100644 => 100755 Project/php/model/Translation.php diff --git a/Project/php/config/Validation.php b/Project/php/config/Validation.php index 819a35f..4ad3dd8 100755 --- a/Project/php/config/Validation.php +++ b/Project/php/config/Validation.php @@ -10,7 +10,7 @@ class Validation public static function val_action($action): string { $safeAction = htmlspecialchars($action, ENT_QUOTES); if ($safeAction != $action) - throw new \Exception("tentative d'injection sql détectée"); + throw new Exception("tentative d'injection sql détectée"); else return $safeAction; } diff --git a/Project/php/gateway/TranslationGateway.php b/Project/php/gateway/TranslationGateway.php old mode 100644 new mode 100755 diff --git a/Project/php/model/AbsModel.php b/Project/php/model/AbsModel.php index 440d78b..cec8f28 100755 --- a/Project/php/model/AbsModel.php +++ b/Project/php/model/AbsModel.php @@ -4,7 +4,7 @@ namespace model; use gateway\UserGateway; -class AbsModel +abstract class AbsModel { private string $role; @@ -16,7 +16,7 @@ class AbsModel $this->role = $role; } - public function connection($login, $password){ + public function connection(string $login, string $password){ $cleanedLogin = strip_tags($login); $cleanedPassword = strip_tags($password); $gtw = new UserGateway(); @@ -31,9 +31,11 @@ class AbsModel else return false; } - public function deconnexion(){ + public function deconnection(){ session_unset(); session_destroy(); $_SESSION = array(); } + + public abstract function is(); } \ No newline at end of file diff --git a/Project/php/model/MdlAdmin.php b/Project/php/model/MdlAdmin.php index 1cebab2..aceb76a 100755 --- a/Project/php/model/MdlAdmin.php +++ b/Project/php/model/MdlAdmin.php @@ -12,16 +12,6 @@ class MdlAdmin extends AbsModel parent::__construct("admin"); } - /*public function isAdmin(){ - if( isset ($_SESSION['login'])){ - $login = strip_tags($_SESSION['login']); - $user = $this->gtw->findUserByEmail($login); - if ($user && $this->gtw->isAdmin($user->getId())) return $user; - else return null; - } - else return null; - }*/ - public function getAllUsers(): array { $gtw = new UserGateway(); return $gtw->findAll(); @@ -72,7 +62,7 @@ class MdlAdmin extends AbsModel return $gtw->add(array($num, $year, $sector)); } - public function addUserToGroup($user, $group): void { + public function addUserToGroup(int $user, int $group): void { $gtw = new UserGateway(); $gtw->modifyGroup($user, $group); } @@ -81,4 +71,9 @@ class MdlAdmin extends AbsModel $gtw = new UserGateway(); return $gtw->findUnassignedUsers(); } + + public function is() + { + // TODO: Implement is() method. + } } \ No newline at end of file diff --git a/Project/php/model/MdlStudent.php b/Project/php/model/MdlStudent.php index 1d8efd0..3b8e6ac 100755 --- a/Project/php/model/MdlStudent.php +++ b/Project/php/model/MdlStudent.php @@ -12,17 +12,6 @@ class MdlStudent extends AbsModel parent::__construct("student"); } -/* - public function isStudent(){ - if( isset ($_SESSION['login']) && isset ($_SESSION['role'])){ - //Créer une classe nettoyer - $login=Nettoyer::nettoyer_string($_SESSION['login']); - $role=Nettoyer::nettoyer_string($_SESSION['role']); - return self::$gtw->findUserByEmail($login); - } - else return null; - } -*/ public function getAll():array{ global $twig; $gtw = new VocabularyGateway(); @@ -35,7 +24,7 @@ class MdlStudent extends AbsModel */ } - public function getVocabByName($name):array{ + public function getVocabByName(string $name):array{ $gtw = new VocabularyGateway(); $res = $gtw->findByName($name); return $res; @@ -55,5 +44,10 @@ class MdlStudent extends AbsModel $gtw = new UserGateway(); $gtw->modifyPassword($id, $newPassword); } + + public function is() + { + // TODO: Implement is() method. + } } diff --git a/Project/php/model/MdlTeacher.php b/Project/php/model/MdlTeacher.php index f683bf5..6ccabe6 100755 --- a/Project/php/model/MdlTeacher.php +++ b/Project/php/model/MdlTeacher.php @@ -15,12 +15,6 @@ class MdlTeacher extends AbsModel public function getAll():array{ $gtw = new VocabularyGateway(); return $gtw->findAll(); - /* - foreach ($data as $row){ - $AllStudent[] = User($row['id'],$row['password'],$row['email'],$row['name'],$row['surname'],$row['nickname'],$row['image'],$row['extraTime'],$row['group'],$row['roles']); - } - return $AllStudent; - */ } public function getAllStudent():array { @@ -28,18 +22,20 @@ class MdlTeacher extends AbsModel return $gtw->findAll(); } - public function getVocabByName($name):array{ + public function getVocabByName(string $name):array{ $gtw = new VocabularyGateway(); $res = $gtw->findByName($name); return $res; } - public function RemoveVocById($id):void{ + public function RemoveVocById(int $id):void{ $gtw = new VocabularyGateway(); $res = $gtw->remove($id); } - - + public function is() + { + // TODO: Implement is() method. + } } \ No newline at end of file diff --git a/Project/php/model/Translation.php b/Project/php/model/Translation.php old mode 100644 new mode 100755