From 5db78467942d523077e5f4b08fb85e2659ac45b6 Mon Sep 17 00:00:00 2001
From: thchazot1 <thchazot1@IUTCLINFB2003>
Date: Fri, 23 Dec 2022 11:21:24 +0100
Subject: [PATCH] ca  march

---
 controllers/VisitorController.php | 12 +++++-------
 gateway/ListeGateway.php          | 13 +------------
 gateway/UserGateway.php           | 10 +++++-----
 modeles/MdlUser.php               |  6 ++++--
 4 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/controllers/VisitorController.php b/controllers/VisitorController.php
index 723c2f5..04caf37 100644
--- a/controllers/VisitorController.php
+++ b/controllers/VisitorController.php
@@ -90,21 +90,19 @@ class VisitorController {
         $this->reinit();
     }
 
-    public function Connexion(array $dVueEreur){
+    public function Connection(array $dVueEreur){
         global $rep,$vues,$dataView;
-        $username=$_POST['login']; 
-        $password=$_POST['mdp'];
+        $username=$_POST['username']; 
+        $password=$_POST['password'];
         $dVueEreur=Validation::val_connexion($username,$password,$dVueEreur);
         if(!empty($dVueEreur)){
 
             require($rep.$vues['signIn']);
         }
         $model= new MdlUser();
-        $model->insert("wesh", "wesh");
         if($model->existUser($username)){
-            echo $model->getPasswordHash($username);
+
             if(password_verify($password,$model->getPasswordHash($username))){
-                echo "wesh";
                 $model->connexion($username);
                 $_REQUEST['action']=null;
                 $this->reinit();
@@ -116,7 +114,7 @@ class VisitorController {
             }
         }
         else{
-            $dVueEreur =array('username'=>$usrname,'password'=>$pwd);
+            $dVueEreur =array('username'=>$username,'password'=>$password);
             require($rep.$vues['signIn']);
         }
     }
diff --git a/gateway/ListeGateway.php b/gateway/ListeGateway.php
index a73849f..74d494a 100644
--- a/gateway/ListeGateway.php
+++ b/gateway/ListeGateway.php
@@ -92,18 +92,7 @@ class ListeGateway
                 }
                 $listes[] = new Liste($row['id'], $row['name'],false, null, $taches);
                 $taches = array();
-<<<<<<< HEAD
-                
-                /*$queryBug = "SELECT count(*) FROM Liste WHERE idCreator IS NULL";
-                $this->con->executeQuery($queryBug, array(':idListe' => array($idListe, PDO::PARAM_INT)));
-                $resultsBug = $this->con->getResults();
-                echo "$resultsBug[0][0]";
-                if (sizeof($listes)===$resultsBug[0][0]){
-                    break;
-                }
-                */
-=======
->>>>>>> cd1b36dfd8a0767bdf2fe5ed8a1c4626e0921507
+
 
             }
         }
diff --git a/gateway/UserGateway.php b/gateway/UserGateway.php
index 5ce6b3a..2ff6089 100644
--- a/gateway/UserGateway.php
+++ b/gateway/UserGateway.php
@@ -9,10 +9,10 @@ class UserGateway
         $this->con = $con; 
     } 
 
-    public function insert(User $u){
+    public function insert($login, $mdp){
         try{
-            $query = "INSERT INTO Utilisateur VALUES (null, :username, PASSWORD(:password))";
-            $this->con->executeQuery($query, array(':username' => array($u->getUsername(), PDO::PARAM_STR), ':password' => array($u->getPassword(), PDO::PARAM_STR)));
+            $query = "INSERT INTO Utilisateur VALUES (null, :username, :password)";
+            $this->con->executeQuery($query, array(':username' => array($login, PDO::PARAM_STR), ':password' => array($mdp, PDO::PARAM_STR)));
         }
         catch(PDOException $Exception){
             echo 'erreur';
@@ -51,9 +51,9 @@ class UserGateway
     function getHashedPassword(string $usrname):?string{
         $truePasswd=null;
 
-        $query="SELECT PASSWORD(`password`) FROM Utilisateur WHERE username=:username";
+        $query="SELECT password FROM Utilisateur WHERE username=:username";
         $this->con->executeQuery($query,array('username'=>array($usrname,PDO::PARAM_STR)));
-        $results=$co->getResults();
+        $results=$this->con->getResults();
         foreach($results as $row){
             $truePasswd=$row['password'];
         }
diff --git a/modeles/MdlUser.php b/modeles/MdlUser.php
index 191422f..b9b2c44 100644
--- a/modeles/MdlUser.php
+++ b/modeles/MdlUser.php
@@ -17,10 +17,12 @@ class MdlUser{
     }
 
     public function signUp($login, $mdp){
-        $result=$this->con->insert($login, $mdp);
+        $gate=new UserGateway($this->con);
+
+        $result=$gate->insert($login, $mdp);
         if ($result==true){
             $_SESSION['role'] = 'Utilisateur';
-            $_SESSION['login'] = $login;
+            $_SESSION['username'] = $login;
         }
     }