diff --git a/controller/FrontCtrl.php b/controller/FrontCtrl.php index 352b578..bcbd2a4 100644 --- a/controller/FrontCtrl.php +++ b/controller/FrontCtrl.php @@ -9,11 +9,10 @@ class FrontCtrl private bool $isUser; private $TabVues; - function __construct(&$con, $TabVues, $TMessage){ + function __construct(&$con, $TabVues){ session_start(); - $this->TMessage = $TMessage; $this->TabVues = $TabVues; - $this->usrMdl = new UserModel($con, $this->TMessage); + $this->usrMdl = new UserModel($con); $this->action_User = array('deconnecter', 'voirListePriv', 'creerListePriv', 'supprimerListePriv'); try{ @@ -24,21 +23,21 @@ class FrontCtrl if(!$this->isUser){ # si pas conncter # appel controlleur visiteur avec action connecter require("VisitorCtrl.php"); - $visitCtrl = new VisitorCtrl($con, $this->TabVues, $this->TMessage, $this->isUser); + $visitCtrl = new VisitorCtrl($con, $this->TabVues, $this->isUser); $visitCtrl->goconnexion(); } else { # sinon # handle action avec controlleur user require("UserCtrl.php"); - $userCtrl = new UserCtrl($con, $this->TabVues, $this->TMessage); + $userCtrl = new UserCtrl($con, $this->TabVues); } } else { # sinon forcement action visiteur # appel controlleur visiteur avec l'action require("VisitorCtrl.php"); - $visitCtrl = new VisitorCtrl($con, $this->TabVues, $this->TMessage, $this->isUser); + $visitCtrl = new VisitorCtrl($con, $this->TabVues, $this->isUser); } } catch (Exception $e){ // verifier si catch bon - $this->TMessage[] = $e->getMessage(); + $TMessage[] = $e->getMessage(); require($this->TabVues["erreur"]); } } diff --git a/controller/UserCtrl.php b/controller/UserCtrl.php index 8c318a5..ea13ab8 100644 --- a/controller/UserCtrl.php +++ b/controller/UserCtrl.php @@ -9,11 +9,10 @@ class UserCtrl private $userModel; private $TabVues; - public function __construct(Connection $con, $TabVues, $TMessage){ + public function __construct(Connection $con, $TabVues){ $this->TabVues = $TabVues; - $this->TMessage = $TMessage; $this->con = $con; - $this->userModel = new UserModel($this->con, $this->TMessage); + $this->userModel = new UserModel($this->con); $this->taskModel = new TaskModel($this->con); try{ $action=$_REQUEST['action']; @@ -38,13 +37,13 @@ class UserCtrl $this->deconnexion(); break; default: - $this->TMessage[] = 'Unexpected error'; + $TMessage[] = 'Unexpected error'; require($this->TabVues["erreur"]); break; } } catch(Exception $e) { - $this->TMessage[] = $e->getMessage(); + $TMessage[] = $e->getMessage(); require($this->TabVues["erreur"]); } } diff --git a/controller/VisitorCtrl.php b/controller/VisitorCtrl.php index 4937113..54b6609 100644 --- a/controller/VisitorCtrl.php +++ b/controller/VisitorCtrl.php @@ -8,13 +8,12 @@ class VisitorCtrl private $isUser; private $TabVues; - function __construct($con, $TabVues, $TMessage, $isUser){ + function __construct($con, $TabVues, $isUser){ $this->TabVues = $TabVues; - $this->TMessage = $TMessage; $this->isUser = $isUser; $dvueErreur = array(); $this->taskModel = new TaskModel($con); - $this->userModel = new UserModel($con, $this->TMessage); + $this->userModel = new UserModel($con); try{ if(isset($_REQUEST['action'])) $action = $_REQUEST['action']; @@ -83,13 +82,13 @@ class VisitorCtrl default: # - $this->TMessage[] = 'Unexpected error'; + $TMessage[] = 'Unexpected error'; require($this->TabVues["erreur"]); break; } } catch (Exception $e) { - $this->TMessage[] = $e->getMessage(); + $TMessage[] = $e->getMessage(); require($this->TabVues["erreur"]); } } diff --git a/index.php b/index.php index 58fa1bc..a9c1ba2 100644 --- a/index.php +++ b/index.php @@ -2,7 +2,6 @@ require("config/config.php"); require('config/Validation.php'); require_once("controller/FrontCtrl.php"); - $fc = new FrontCtrl($con, $TabVues, $TMessage); - require("view/erreur.php"); + $fc = new FrontCtrl($con, $TabVues); ?> diff --git a/model/UserModel.php b/model/UserModel.php index de8734c..945f1b6 100644 --- a/model/UserModel.php +++ b/model/UserModel.php @@ -6,17 +6,15 @@ class UserModel{ private $con; private $gat; - private $TMessage; - public function __construct(Connection $con, $TMessage) { - $this->TMessage = $TMessage; + public function __construct(Connection $con) { $this->con = $con; $this->gat = new UserGateway($con); } function connexion($login, $mdp){ - Validation::val_form_texte($login, $this->TMessage); - Validation::val_form_mdp($mdp, $this->TMessage); + Validation::val_form_texte($login, $TMessage); + Validation::val_form_mdp($mdp, $TMessage); $result = $this->gat->findUser($login, $mdp); if(!isset($result)){ @@ -33,7 +31,7 @@ } function isConnected(){ //teste rôle dans la session, retourne instance d’objet ou booleen - Validation::val_form_texte($_SESSION['login'], $this->TMessage); + Validation::val_form_texte($_SESSION['login'], $TMessage); if(isset($_SESSION['login']) && $_SESSION['login']!="") return true; else @@ -41,26 +39,26 @@ } function ajouter($login, $mdp){ - Validation::val_form_texte($login, $this->TMessage); - Validation::val_form_mdp($mdp, $this->TMessage); + Validation::val_form_texte($login, $TMessage); + Validation::val_form_mdp($mdp, $TMessage); $user = $this->findByLogin($login); if (empty($user)) $this->gat->create($login, $mdp); } function supprimer($login){ - Validation::val_form_texte($login, $this->TMessage); + Validation::val_form_texte($login, $TMessage); $this->gat->delete($login); } function modifMdp($login, $mdp){ - Validation::val_form_texte($login, $this->TMessage); - Validation::val_form_mdp($mdp, $this->TMessage); + Validation::val_form_texte($login, $TMessage); + Validation::val_form_mdp($mdp, $TMessage); $this->gat->updateMdp($login, $mdp); } function findByLogin($login){ - Validation::val_form_texte($login, $this->TMessage); + Validation::val_form_texte($login, $TMessage); $user = null; if ($login !== " " && $login != null ) { @@ -73,8 +71,8 @@ } function modifLogin($oldLogin, $newLogin){ - Validation::val_form_texte($oldLogin, $this->TMessage); - Validation::val_form_texte($newLogin, $this->TMessage); + Validation::val_form_texte($oldLogin, $TMessage); + Validation::val_form_texte($newLogin, $TMessage); $user = $this->findByLogin($oldLogin); if (empty($user)) $this->gat->updateLogin($oldLogin, $newLogin); diff --git a/view/erreur.php b/view/erreur.php index 5998524..4d6a3e9 100644 --- a/view/erreur.php +++ b/view/erreur.php @@ -9,6 +9,7 @@
Error!' . $err . "";