From 9a2b3a0b48ba61ac0e591400fb0f99e38130da5a Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Fri, 23 Dec 2022 10:28:25 +0100 Subject: [PATCH] controllers --- config/config.php | 2 - controllers/UserController.php | 108 +++++++-------------------- controllers/VisitorController.php | 119 +++++++++++++++++++++++++++--- gateway/ListeGateway.php | 4 +- 4 files changed, 136 insertions(+), 97 deletions(-) diff --git a/config/config.php b/config/config.php index 57325d4..7728366 100644 --- a/config/config.php +++ b/config/config.php @@ -1,8 +1,6 @@ Reinit(); - break; - case "delete": $this->Delete(); break; @@ -26,28 +22,12 @@ class UserController { $this->Update(); break; - case "ajouterListeU": - $this->AddList(); - break; - - case "supprimerListeU": - $this->DelList(); - break; - - case "modifierListeU": - $this->UpdateList(); + case "deconnection": + $this->deconnection($dVueEreur); break; - case "ajouterTacheU": - $this->AddTask(); - break; - - case "supprimerTacheU": - $this->DelTask(); - break; - - case "modifierTacheU": - $this->UpdateTask(); + case "ajouterListePrivee": + $this->AddListPrivate(); break; case "viewPrivateList": @@ -72,31 +52,6 @@ class UserController { exit(0); } - function Reinit() { - global $rep,$vues; - $dVue = array ( - 'username' => "", - 'password' => "", - ); - require ($rep.$vues['accueil']); - } - - - function ValidationFormulaire(array $dVueEreur){ - - global $rep, $vues; - $username = $_POST['username']; - $mdp = $_POST['password']; - - Validation::val_form($username, $mdp, $dVueEreur); - - $dVue = array ( - 'username' => $username, - 'password' => $mdp, - ); - require ($rep.$vues['accueil']); - } - function Delete() { if(isset($_SESSION['username'])) { $results = $this->$mdlUsr->delete(); //A compléter avec bons arguments @@ -113,46 +68,37 @@ class UserController { } } - function AddList() { - if(isset($_SESSION['username'])){ - $results = $this->$mdlUsr->addList($user); //changer arguments - require ($rep.$vues['addTask']); - } - } + function AddListPrivate($dVueEreur) { + global $rep, $vues, $dataView; - function DelList() { - if(isset($_SESSION['username'])){ - $results = $this->$mdlUsr->delList($user); //aa - require ($rep.$vues['accueil']); - } - } + $name=$_POST['name']; + $private=$_POST['private']; - function UpdateList() { - if(isset($_SESSION['username'])){ - $results = $this->$mdlUsr->updateList($user); //changer arguments - require ($rep.$vues['...']); // Appel vue à changer - } - } + Validation::val_creation_Liste_PV($nomListe, $arrayErrorViews); - function AddTask() { - if(isset($_SESSION['username'])){ - $results = $this->$mdlUsr->addList($user); //changer arguments - require ($rep.$vues['...']); // Appel vue à changer + try { + MdlListe::insert($name, $private, $_SESSION['login']); } + catch (PDOException $e) { + $dataView[]="Erreur inatendue"; + require($rep.$vues['erreur']); + } } - function DelTask() { - if(isset($_SESSION['username'])){ - $results = $this->$mdlUsr->delTask($user); //aa - require ($rep.$vues['...']); // apegffo, - } + function PrivateList($dVueEreur){ + global $rep, $vues, $dataView; + $model = new MdlListe(); + $dataView = $model->pullListesPrivees($_SESSION['login']); + require($rep.$vues['accueilPrivate']); } - function UpdateTask() { - if(isset($_SESSION['username'])){ - $results = $this->$mdlUsr->updateTask($user); //aa - require ($rep.$vues['.']); // apegffo, - } + function deconnection($dVueEreur){ + global $rep, $vues; + $model = new MdlUser(); + $retour = $model->deconnection(); + $_REQUEST['action']=null; + $control= new VisitorController(); + $dVueEreur = array(); } } diff --git a/controllers/VisitorController.php b/controllers/VisitorController.php index 16a4fae..14a4e4c 100644 --- a/controllers/VisitorController.php +++ b/controllers/VisitorController.php @@ -27,6 +27,26 @@ class VisitorController { $this->Inscription($login, $mdp); break; + case "supprimerListe": + $this->DelList(); + break; + + case "modifierListe": + $this->UpdateList(); + break; + + case "ajouterTache": + $this->AddTask(); + break; + + case "supprimerTache": + $this->DelTask(); + break; + + case "modifierTache": + $this->UpdateTask(); + break; + default: $dVueEreur[] = "Erreur d'appel php"; require ($rep.$vues['accueil']); @@ -42,24 +62,24 @@ class VisitorController { $model = new MdlListe(); $dataView = $model->getPublicList(); require($rep.$vues['accueil']); - $vues_erreur= array(); + $dVueEreur= array(); } - public function Inscription(array $vues_erreur){ + public function Inscription(array $dVueEreur){ global $rep,$vues,$dataView; $username=$_POST['username']; $password=$_POST['password']; $confirm=$_POST['passwordconf']; $model = new MdlUser(); - $vues_erreur=Validation::val_inscription($username,$password,$confirm,$vues_erreur); + $dVueEreur=Validation::val_inscription($username,$password,$confirm,$dVueEreur); if($model->existUser($username)){ - $vues_erreur[]="Username already taken"; + $dVueEreur[]="Username already taken"; } - if(empty($vues_erreur)){ + if(empty($dVueEreur)){ $hash= password_hash($password,PASSWORD_DEFAULT); $model->singUp($username,$hash); - $vues_erreur= array(); + $dVueEreur= array(); } else{ require($rep.$vues['singUp']); @@ -69,12 +89,12 @@ class VisitorController { } - public function Connexion(array $vues_erreur){ + public function Connexion(array $dVueEreur){ global $rep,$vues,$dataView; $username=$_POST['login']; $password=$_POST['mdp']; - $vues_erreur=Validation::val_connexion($username,$password,$vues_erreur); - if(!empty($vues_erreur)){ + $dVueEreur=Validation::val_connexion($username,$password,$dVueEreur); + if(!empty($dVueEreur)){ require($rep.$vues['signIn']); } $model= new MdlUser(); @@ -83,17 +103,92 @@ class VisitorController { $model->connexion($username); $_REQUEST['action']=null; $this->reinit(); - $vues_erreur= array(); + $dVueEreur= array(); } else{ - $vues_erreur =array('username'=>$username,'password'=>$password); + $dVueEreur =array('username'=>$username,'password'=>$password); require($rep.$vues['signIn']); } } else{ - $vues_erreur =array('username'=>$usrname,'password'=>$pwd); + $dVueEreur =array('username'=>$usrname,'password'=>$pwd); require($rep.$vues['signIn']); } } + + function DelList($dVueEreur) { + global $rep, $vues; + $idListe=$_POST['liste']; + $name=$_POST['name']; + $private=$_POST['private']; + $model = new MdlListe(); + $model->delete($idListe, $name, $private); + $_REQUEST['action']=null; + $this->reinit(); + $dVueEreur= array(); + } + + function UpdateList($dVueEreur) { + global $rep, $vues; + $idListe=$_POST['liste']; + $name=$_POST['name']; + $private=$_POST['private']; + $model = new MdlListe(); + $model->update($idListe, $name, $private); + $_REQUEST['action']=null; + $this->reinit(); + $dVueEreur= array(); + } + + function AddTask($dVueEreur) { + global $rep,$vues,$dataView; + $nom=$_POST['name']; + $idListe=$_POST['liste']; + $content=$_POST['content']; + $completed=$_POST['completed']; + $dVueEreur = Validation::val_intitule($nom, $dVueEreur); + if(!empty($dVueEreur)){ + require($rep.$vues['addTask']); + } + else{ + $model = new MdlTache(); + $model->insert($nom, $content, $completed, $idListe); + $_REQUEST['action']="accessListInfos"; + $this->accessListInfos($dVueEreur); + $dVueEreur= array(); + } + } + + function accessListInfos($dVueEreur){ + global $rep,$vues,$dataView; + $idListe=$_POST['liste']; + $model = new MdlListe(); + $dataView = $model->findById($idListe); + require($rep.$vues['seeList']); + $dVueEreur= array(); + } + + function DelTask($dVueEreur) { + global $rep,$vues,$dataView; + $idTache=$_POST['tache']; + $model= new MdlTache(); + $model->delete($idTache); + $_REQUEST['action']="accessListInfos"; + $this->accessListInfos($dVueEreur); + $dVueEreur= array(); + } + + function UpdateTask($dVueEreur) { + global $rep,$vues,$dataView; + $idTache=$_POST['tache']; + $name=$_POST['name']; + $content=$_POST['content']; + $completed=$_POST['completed']; + $model = new MdlTache(); + $model->update($idTache, $name, $content, $completed); + $_REQUEST['action']="accessListInfos"; + $this->accessListInfos($dVueEreur); + $dVueEreur= array(); + } } ?> \ No newline at end of file diff --git a/gateway/ListeGateway.php b/gateway/ListeGateway.php index ea1ec88..7630987 100644 --- a/gateway/ListeGateway.php +++ b/gateway/ListeGateway.php @@ -70,7 +70,7 @@ class ListeGateway public function getPublicLists():array{ $listes = []; - $taches = null; + $taches = array(); try { $query = "SELECT * FROM Liste WHERE idCreator IS NULL"; @@ -91,7 +91,7 @@ class ListeGateway } } $listes[] = new Liste($row['id'], $row['name'],false, null, $taches); - $taches = null; + $taches = array(); /*$queryBug = "SELECT count(*) FROM Liste WHERE idCreator IS NULL"; $this->con->executeQuery($queryBug, array(':idListe' => array($idListe, PDO::PARAM_INT)));