diff --git a/business/ListTask.php b/business/ListTask.php index 6b696ba..f5e3a8a 100644 --- a/business/ListTask.php +++ b/business/ListTask.php @@ -6,12 +6,15 @@ private $owner; private int $dc; // done counter # juste visuelle?? - function __construct($id, $nom, $owner="", $dc = 0) { - $this->id = $id; + function __construct($nom, $owner="",$dc=0,$id=0) { + if($id=0) + $this->id = (int)null; + else + $this->id = $id; $this->nom = $nom; $this->taches = []; $this->owner = $owner; - $this->dc = $dc; + $this->dc = 0; } diff --git a/business/Task.php b/business/Task.php index d3d85c6..73e88b4 100644 --- a/business/Task.php +++ b/business/Task.php @@ -10,8 +10,14 @@ private string $idlist; // # id associating task to list private bool $isDone; // # si la tache est complete - function __construct($id,$titre,$description,$priorite,$idl,$dateDeb="",$dateFin="",$isDone=false) { - $this->set_id($id); + function __construct($titre,$description,$priorite,$idl,$dateDeb="",$dateFin="",$isDone=false,$id=0) { + # if id = 0, on veut donc creer une nouvelle tache + # qui n'est pas encore dans la base de donnée et donc + # le id sera fait avec le auto increment + if($id=0) + $this->set_id((int)null); + else + $this->set_id($id); $this->set_titre($titre); $this->set_description($description); $this->set_priorite($priorite); diff --git a/controller/VisitorCtrl.php b/controller/VisitorCtrl.php index 3061db2..8807105 100644 --- a/controller/VisitorCtrl.php +++ b/controller/VisitorCtrl.php @@ -3,9 +3,11 @@ require_once("../model/TaskModel.php"); class VisitorCtrl { private $taskModel; + private $userModel; function __construct($con){ $dvueErreur = array(); $taskModel = new TaskModel($con); + $userModel = new UserModel($con); try{ $action = $_REQUEST['action']; switch($action){ @@ -77,11 +79,11 @@ class VisitorCtrl } function go_connection(){ - + # rediriger vers la page de connection } function connection(){ - + $this->userModel->connexion($user,$mdp); } function go_list(){ diff --git a/dal/TaskGateway.php b/dal/TaskGateway.php index 5c7f374..efc0dfa 100644 --- a/dal/TaskGateway.php +++ b/dal/TaskGateway.php @@ -71,8 +71,8 @@ class TaskGateway $results=$this->con->getResults(); foreach($results as $row) { - $tabTaches[]=new Task($row['id'],$row['titre'],$row['description'],$row['priorite'], - $row['idList'],$row['dateDebut'],$row['dateFin'],$row['isDone']); + $tabTaches[]=new Task($row['titre'],$row['description'],$row['priorite'], + $row['idList'],$row['dateDebut'],$row['dateFin'],$row['isDone'],$row['id']); } return $tabTaches; @@ -92,7 +92,7 @@ class TaskGateway $results=$this->con->getResults(); foreach($results as $row) { - $tabList[]=new ListTask($row['id'],$row['nom'],$row['user'],$row['dc']); + $tabList[]=new ListTask($row['nom'],$row['user'],$row['dc'],$row['id']); } return $tabList; } @@ -121,7 +121,7 @@ class TaskGateway $results = $this->con->getResults(); foreach($results as $row){ - $tabLists[]= new ListTask($row[0],$row[1],$row[2],$row[3]); + $tabLists[]= new ListTask($row[1],$row[2],$row[3],$row[0]); } return $tabLists; } @@ -136,8 +136,8 @@ class TaskGateway $results = $this->con->getResults(); foreach($results as $row){ - $taches[]= new Task($row['id'],$row['titre'],$row['description'],$row['priorite'], - $row['idList'],$row['dateDebut'],$row['dateFin'],$row['isDone']); + $taches[]= new Task($row['titre'],$row['description'],$row['priorite'], + $row['idList'],$row['dateDebut'],$row['dateFin'],$row['isDone'],$row['id']); } if(!empty($taches)) $list->set_taches($taches); @@ -150,7 +150,7 @@ class TaskGateway $results = $this->con->getResults(); foreach($results as $row){ - $tabLists[]= new ListTask($row[0],$row[1],$row[2],$row[3]); + $tabLists[]= new ListTask($row[1],$row[2],$row[3],$row[0]); } return $tabLists; } diff --git a/dal/UserGateway.php b/dal/UserGateway.php index 0308978..9046375 100644 --- a/dal/UserGateway.php +++ b/dal/UserGateway.php @@ -47,7 +47,8 @@ $query = 'SELECT mdp FROM User WHERE login = :login'; $this->con->executeQuery($query, array(':login'=>array($login, PDO::PARAM_STR))); $result = $this->con->getResults(); - if(password_verify($mdp, $result[0]['mdp'])) + $hash = password_hash($result[0]['mdp'], PASSWORD_BCRYPT, array("cost" => 12)); + if(password_verify($mdp, $hash)) return $login; } } diff --git a/model/TaskModel.php b/model/TaskModel.php index 17ba664..245228c 100644 --- a/model/TaskModel.php +++ b/model/TaskModel.php @@ -13,9 +13,9 @@ class TaskModel $this->gtw= new TaskGateway($con); } - public function addTask($id,$titre,$desc,$priorite,$idList,$dateDeb="",$dateFin="",$isDone=false) + public function addTask($titre,$desc,$priorite,$idList,$dateDeb="",$dateFin="",$isDone=false,$id=0) { - $t = new Task($id,$titre,$desc,$priorite,$idList,$dateDeb,$dateFin,$isDone); + $t = new Task($titre,$desc,$priorite,$idList,$dateDeb,$dateFin,$isDone,$id); $this->gtw->insertT($t); // retourne quoi? con->lastInsertId() ?? } @@ -41,9 +41,9 @@ class TaskModel } /* LIST FUNCTIONS */ - public function addList($id,$nom,$owner="",$dc=0) + public function addList($nom,$owner="",$dc=0,$id=0) { - $l = new ListTask($id,$nom,$owner="",$dc=0); + $l = new ListTask($nom,$owner,$dc); $this->gtw->insertL($l); // retourne quoi? con->lastInsertId() ?? } diff --git a/model/UserModel.php b/model/UserModel.php index 5641258..71f4904 100644 --- a/model/UserModel.php +++ b/model/UserModel.php @@ -11,11 +11,11 @@ function connexion($login, $mdp){ $result = $this->gat->findUser($login, $mdp); - if (isset($result)) - { - $_SESSION['login'] = $result; - } - echo $_SESSION['login']; + if(!isset($result)) echo 'not set works'; + // if (isset($result)) + // { + // $_SESSION['login'] = $result; + // } } function deconnexion(){ diff --git a/tests/test.php b/tests/test.php index 4cfcabb..c3e8750 100644 --- a/tests/test.php +++ b/tests/test.php @@ -30,6 +30,7 @@ foreach($tasks as $i) # Test LOAD PRIVATE TASKS $mt= new TaskModel($con); +$mt->addList('private','nifranco'); // $lists = $mt->loadPublicLists(); // foreach($lists as $l){ @@ -44,8 +45,8 @@ $mt= new TaskModel($con); // $mt->modifList('2','nom','22do'); //mt->supList('2'); $public_lists = $mt->loadPrivateLists('nifranco'); -$user = false; -require("../view/home.php"); +$user = true; +//require("../view/home.php"); //require("../view/register.php"); //require("../view/connection.php"); /* ------------- @@ -67,7 +68,9 @@ require('../controller/UserCtrl.php'); // Test Modèle User -// $mdl = new UserModel($con); +//$mu = new UserModel($con); +//$res = $mu->connexion('nifranco','achanger'); +//var_dump($res); // $mdl->ajouter('Anna', 'unmdptrescomplique'); // $mdl->modifLogin('Anna', 'Aeryn'); // $mdl->modifMdp('Aeryn', 'wtfmec');