controllers

config/config.php

@@ -1,8 +1,6 @@
 <?php
 $rep = __DIR__ . '/../';
 
-//$location = "Location : http://londres.uca.local/"       Finir le chemin du public_html
-
 
 $login="root";
 $password="root";

controllers/UserController.php

@@ -14,10 +14,6 @@ class UserController {
         try {
             $action = $_REQUEST['action'];
             switch($action) {
-                case NULL:
-                    $this->Reinit();
-                    break;
-
                 case "delete":
                     $this->Delete();
                     break;
@@ -26,28 +22,12 @@ class UserController {
                     $this->Update();
                     break;
                 
-                case "ajouterListeU":
+                case "deconnection":
-                    $this->AddList();
+                    $this->deconnection($dVueEreur);
                     break;
                 
-                case "supprimerListeU":
+                case "ajouterListePrivee":
-                    $this->DelList();
+                    $this->AddListPrivate();
-                    break;
-
-                case "modifierListeU":
-                    $this->UpdateList();
-                    break;
-                
-                case "ajouterTacheU":
-                    $this->AddTask();
-                    break;
-
-                case "supprimerTacheU":
-                    $this->DelTask();
-                    break;
-
-                case "modifierTacheU":
-                    $this->UpdateTask();
                     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() {
+    function AddListPrivate($dVueEreur) {
-        if(isset($_SESSION['username'])){
+        global $rep, $vues, $dataView;
-            $results = $this->$mdlUsr->addList($user); //changer arguments
-            require ($rep.$vues['addTask']);
-        } 
-    }
 
-    function DelList() {
+        $name=$_POST['name'];
-        if(isset($_SESSION['username'])){
+        $private=$_POST['private'];
-            $results = $this->$mdlUsr->delList($user); //aa
-            require ($rep.$vues['accueil']);
-        }
-    }
 
-    function UpdateList() {
+        Validation::val_creation_Liste_PV($nomListe, $arrayErrorViews);
-        if(isset($_SESSION['username'])){
-            $results = $this->$mdlUsr->updateList($user); //changer arguments
-            require ($rep.$vues['...']); // Appel vue à changer
-        } 
-    }
 
-    function AddTask() {
+        try {
-        if(isset($_SESSION['username'])){
+            MdlListe::insert($name, $private, $_SESSION['login']);
-            $results = $this->$mdlUsr->addList($user); //changer arguments
-            require ($rep.$vues['...']); // Appel vue à changer
-        } 
         } 
-
+        catch (PDOException $e) {
-    function DelTask() {
+            $dataView[]="Erreur inatendue";
-        if(isset($_SESSION['username'])){
+            require($rep.$vues['erreur']);
-            $results = $this->$mdlUsr->delTask($user); //aa
-            require ($rep.$vues['...']); // apegffo,
         }
     }
 
-    function UpdateTask() {
+    function PrivateList($dVueEreur){
-        if(isset($_SESSION['username'])){
+        global $rep, $vues, $dataView;
-            $results = $this->$mdlUsr->updateTask($user); //aa
+        $model = new MdlListe();
-            require ($rep.$vues['.']); // apegffo,
+        $dataView = $model->pullListesPrivees($_SESSION['login']);
+        require($rep.$vues['accueilPrivate']);
     }
+
+    function deconnection($dVueEreur){
+        global $rep, $vues;
+        $model = new MdlUser();
+        $retour = $model->deconnection();
+        $_REQUEST['action']=null;
+        $control= new VisitorController();
+        $dVueEreur = array();
     }
 }
 

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);
+        $dVueEreur=Validation::val_connexion($username,$password,$dVueEreur);
-        if(!empty($vues_erreur)){
+        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();
+    }
 }
 ?>

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)));