diff --git a/controller/FrontCtrl.php b/controller/FrontCtrl.php index 1a4defa..e81ab76 100644 --- a/controller/FrontCtrl.php +++ b/controller/FrontCtrl.php @@ -13,7 +13,7 @@ class FrontCtrl session_start(); $this->TabVues = $TabVues; $this->usrMdl = new UserModel($con); - $this->action_User = array('deconnexion','loadListePriv','newListPrivate'); + $this->action_User = array('deconnecter','loadListePriv','newListPrivate'); try{ $this->isUser = $this->usrMdl->isConnected(); @@ -23,12 +23,12 @@ class FrontCtrl if(!$this->isUser){ # si pas conncter # appel controlleur visiteur avec action connecter require("VisitorCtrl.php"); - $visitCtrl = new VisitorCtrl($con, $this->TabVues); - $visitCtrl->goconnexion(); + $visitCtrl = new VisitorCtrl($con, $this->TabVues,$this->isUser); + $visitCtrl->go_connection(); } else { # sinon # handle action avec controlleur user require("UserCtrl.php"); - $userCtrl = new UserCtrl(); + $userCtrl = new UserCtrl($con, $this->TabVues); } } else { # sinon forcement action visiteur diff --git a/controller/UserCtrl.php b/controller/UserCtrl.php index f7150f9..3419cac 100644 --- a/controller/UserCtrl.php +++ b/controller/UserCtrl.php @@ -1,5 +1,5 @@ deconnexion(); - loadHome(); + $this->userModel->deconnexion(); + header("Location:index.php"); } } ?> diff --git a/controller/VisitorCtrl.php b/controller/VisitorCtrl.php index 8c3d756..8105396 100644 --- a/controller/VisitorCtrl.php +++ b/controller/VisitorCtrl.php @@ -89,7 +89,16 @@ class VisitorCtrl } function loadHome(){ $public_lists = $this->taskModel->loadPublicLists(); - $user = $this->isUser; + + # le if suivant est nécéssaire dans le cas ou l'action + # connection a été appeller. Dans ce cas, loadHome doit + # prendre en compte le user qui vient d'être ajouter a + # $_SESSION['login'] + if(isset($_SESSION['login']) && $_SESSION['login'] != "") + $user = $_SESSION['login']; + else + $user = $this->isUser; + require($this->TabVues["home"]); } diff --git a/dal/UserGateway.php b/dal/UserGateway.php index e9573ed..4bee498 100644 --- a/dal/UserGateway.php +++ b/dal/UserGateway.php @@ -47,7 +47,7 @@ $query = 'SELECT mdp FROM User WHERE login = :login'; $this->con->executeQuery($query, array(':login'=>array($login, PDO::PARAM_STR))); $result = $this->con->getResults(); - echo var_dump($result[0][0])."
"; + if(password_verify($mdp, $result[0][0])) return $login; } diff --git a/model/UserModel.php b/model/UserModel.php index 5cf0fad..3f12220 100644 --- a/model/UserModel.php +++ b/model/UserModel.php @@ -16,6 +16,7 @@ Validation::val_form_texte($login, $TMessage); Validation::val_form_mdp($mdp, $TMessage); $result = $this->gat->findUser($login, $mdp); + if(!isset($result)) echo 'not set works'; else { @@ -26,7 +27,6 @@ function deconnexion(){ session_unset(); session_destroy(); - $_SESSION = array(); } function isConnected(){ //teste rôle dans la session, retourne instance d’objet ou booleen