From a9a48a21d7dbd7d022e252c473e9e123cd5e2be0 Mon Sep 17 00:00:00 2001
From: Thomas Chazot <tchazot63@gmail.com>
Date: Fri, 23 Dec 2022 22:14:45 +0100
Subject: [PATCH] aled bug chelou mais presque fini

---
 Vues/addListPriv.php              |  6 +++
 Vues/addListVis.php               |  6 +++
 Vues/addTask.php                  |  6 +++
 Vues/modifyListPriv.php           |  6 +++
 Vues/modifyListPub.php            |  5 +++
 Vues/modifyTask.php               |  4 ++
 Vues/signIn.php                   |  5 +++
 Vues/signUp.php                   |  5 +++
 controllers/UserController.php    | 43 +++++++++++--------
 controllers/VisitorController.php | 71 +++++++++++++++++++++----------
 modeles/MdlUser.php               |  6 +--
 11 files changed, 119 insertions(+), 44 deletions(-)

diff --git a/Vues/addListPriv.php b/Vues/addListPriv.php
index 19c2bcd..7cb5b91 100644
--- a/Vues/addListPriv.php
+++ b/Vues/addListPriv.php
@@ -27,6 +27,12 @@
       <input type="checkbox" name="private"/>
     </div>
 
+    <?php
+    if(!empty($dVueEreur)){
+        echo '<h4 id="error">'.$dVueEreur[0].'</h4>';
+    }
+    ?>
+
     <input type="submit" value="Submit"/>
     <input type="hidden" name="action" value="addPrivateList"/>
   </form>
diff --git a/Vues/addListVis.php b/Vues/addListVis.php
index 1265c67..6df2dec 100644
--- a/Vues/addListVis.php
+++ b/Vues/addListVis.php
@@ -20,6 +20,12 @@
       <span class="bar"></span>
     </div>   
 
+    <?php
+    if(!empty($dVueEreur)){
+        echo '<h4 id="error">'.$dVueEreur[0].'</h4>';
+    }
+    ?>
+
     <input type="submit" value="Submit"/>
     <input type="hidden" name="action" value="addListVis"/>
   </form>
diff --git a/Vues/addTask.php b/Vues/addTask.php
index 7886a81..376dfb5 100644
--- a/Vues/addTask.php
+++ b/Vues/addTask.php
@@ -33,6 +33,12 @@
       <input type="checkbox" name="completed"></input>
     </div>
 
+    <?php
+      if(!empty($dVueEreur)){
+        echo '<h4 id="error">'.$dVueEreur[0].'</h4>';
+      }
+      ?>
+
     <input type="submit" value="Submit"/>
     <input type="hidden" name="action" value="addTask"/>
     <input type="hidden" name="list" value="<?=$dataView?>"/>
diff --git a/Vues/modifyListPriv.php b/Vues/modifyListPriv.php
index ff97b3f..4d7fb6e 100644
--- a/Vues/modifyListPriv.php
+++ b/Vues/modifyListPriv.php
@@ -41,6 +41,12 @@
     }
     ?>
 
+    <?php
+    if(!empty($dVueEreur)){
+        echo '<h4 id="error">'.$dVueEreur[0].'</h4>';
+    }
+    ?>
+
     <input type="submit" value="Submit"/>
     <input type="hidden" name='list' value="<?=$dataView->getId()?>"/>
     <input type="hidden" name="action" value="modifyPrivateList"/>
diff --git a/Vues/modifyListPub.php b/Vues/modifyListPub.php
index bc1e8e5..45808ca 100644
--- a/Vues/modifyListPub.php
+++ b/Vues/modifyListPub.php
@@ -21,6 +21,11 @@
       <span class="highlight"></span>
       <span class="bar"></span>
     </div>     
+    <?php
+    if(!empty($dVueEreur)){
+        echo '<h4 id="error">'.$dVueEreur[0].'</h4>';
+    }
+    ?>
 
     <input type="submit" value="Submit"/>
     <input type="hidden" name='list' value="<?=$dataView->getId()?>"/>
diff --git a/Vues/modifyTask.php b/Vues/modifyTask.php
index 69c7c94..9ce9836 100644
--- a/Vues/modifyTask.php
+++ b/Vues/modifyTask.php
@@ -45,6 +45,10 @@
     </div>
     <?php 
     }
+
+    if(!empty($dVueEreur)){
+        echo '<h4 id="error">'.$dVueEreur[0].'</h4>';
+    }
     ?>
     
 
diff --git a/Vues/signIn.php b/Vues/signIn.php
index c120d6b..141d565 100644
--- a/Vues/signIn.php
+++ b/Vues/signIn.php
@@ -28,6 +28,11 @@
 					<i class="login__icon fas fa-lock"></i>
 					<input type="password" class="login__input" name="password" placeholder="Password" required>
 				</div>
+				<?php
+                if(!empty($dVueEreur)){
+                    echo '<h4 id="error">Incorrect Username or Password</h4>';
+                }
+                ?>
 
                 <button class="button login__submit" type="submit">
 					<span class="button__text">Sign in now</span>
diff --git a/Vues/signUp.php b/Vues/signUp.php
index 2201aba..cd13daf 100644
--- a/Vues/signUp.php
+++ b/Vues/signUp.php
@@ -32,6 +32,11 @@
 					<i class="login__icon fas fa-lock"></i>
 					<input type="password" class="login__input" name="passwordconf" placeholder="Password confirmation">
 				</div>
+				<?php
+                if(!empty($dVueEreur)){
+                    echo '<h4 id="error">'.$dVueEreur[0].'</h4>';
+                }
+                ?>
 				<button class="button login__submit">
 					<span class="button__text">Sign up now</span>
 					<input type="hidden" name="action" value="signUp"/>
diff --git a/controllers/UserController.php b/controllers/UserController.php
index 98413a4..9306bf2 100644
--- a/controllers/UserController.php
+++ b/controllers/UserController.php
@@ -92,12 +92,17 @@ class UserController {
             } else {
                 $private = $_POST['private'];
             }
-
-            $list=[];
-            $user=$mdlUsr->findByName($_SESSION['login']);
-            $list[]=$mdlListe->insert($name, $private, $user);
-            $dataView=$list;
-            require($rep.$vues['seeList']);
+            $dVueEreur = Validation::val_intitule($name, $dVueEreur);
+            if(!empty($dVueEreur)){
+                require($rep.$vues['modifyTask']);
+            }
+            else{
+                $list=[];
+                $user=$mdlUsr->findByName($_SESSION['login']);
+                $list[]=$mdlListe->insert($name, $private, $user);
+                $dataView=$list;
+                require($rep.$vues['seeList']);
+            }
         } 
         catch (PDOException $e) {
             $dataView[]="Erreur inatendue";
@@ -129,20 +134,24 @@ class UserController {
         $name=$_POST['name'];
         $model = new MdlListe();
         $mdlUsr = new MdlUser();
-        if(!isset($_POST['private']))
-        {
+        if(!isset($_POST['private'])){
             $private = false;
-        } else {
+        }
+        else{
             $private = $_POST['private'];
         }
-        $list=$model->findById($_POST['list']);
-        $model->update($list[0], $name, $private);
-        $user=$mdlUsr->findByName($_SESSION['login']);
-        $dataView = $model->findByUser($user);
-        $dVueEreur= array();
-
-        require($rep.$vues['accueilPrivate']);
-
+        $dVueEreur = Validation::val_intitule($name, $dVueEreur);
+        if(!empty($dVueEreur)){
+            require($rep.$vues['modifyTask']);
+        }
+        else{
+            $list=$model->findById($_POST['list']);
+            $model->update($list[0], $name, $private);
+            $user=$mdlUsr->findByName($_SESSION['login']);
+            $dataView = $model->findByUser($user);
+            $dVueEreur= array();
+            require($rep.$vues['accueilPrivate']);
+        }
         
     }
 
diff --git a/controllers/VisitorController.php b/controllers/VisitorController.php
index 5d59be6..5a254ee 100644
--- a/controllers/VisitorController.php
+++ b/controllers/VisitorController.php
@@ -139,12 +139,12 @@ class VisitorController {
             $hash= password_hash($password,PASSWORD_DEFAULT);
             $model->signUp($username,$hash);
             $dVueEreur= array();
+            $_REQUEST['action']=null;
+            $this->reinit();
         }
         else{
             require($rep.$vues['signUp']);
         }
-        $_REQUEST['action']=null;
-        $this->reinit();
     }
 
     public function Connection(array $dVueEreur){
@@ -153,7 +153,6 @@ class VisitorController {
         $password=$_POST['password'];
         $dVueEreur=Validation::val_connexion($username,$password,$dVueEreur);
         if(!empty($dVueEreur)){
-
             require($rep.$vues['signIn']);
         }
         $model= new MdlUser();
@@ -191,17 +190,24 @@ class VisitorController {
         $idListe=$_POST['liste'];
         $name=$_POST['name'];
         $private=$_POST['private'];
-        $model = new MdlListe();
-        $model->update($idListe, $name, $private);
-        $_REQUEST['action']=null;
-        $this->reinit();  
-        $dVueEreur= array();
+        $dVueEreur = Validation::val_intitule($name, $dVueEreur);
+        if(!empty($dVueEreur)){
+            require($rep.$vues['modifyTask']);
+        }
+        else{
+            $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['list'];
+        echo "$idList";
         $content=$_POST['content'];
         if(!isset($_POST['completed']))
         {
@@ -209,7 +215,11 @@ class VisitorController {
         } else {
             $completed = $_POST['completed'];
         }
+
         $dVueEreur = Validation::val_intitule($nom, $dVueEreur);
+        if (empty($dVueEreur)){
+            $dVueEreur = Validation::val_intitule($content, $dVueEreur);
+        }
         if(!empty($dVueEreur)){
             require($rep.$vues['addTask']);
         }
@@ -218,8 +228,8 @@ class VisitorController {
             $model->insert($nom, $content, $completed, $idListe);
             $_REQUEST['action']="accessListInfos";
             $this->accessListInfos($dVueEreur);
-            $dVueEreur= array();
         }
+        $dVueEreur= array();
     }
 
     function accessListInfos($dVueEreur){
@@ -247,7 +257,6 @@ class VisitorController {
         $tache=$_POST['task'];
         $name=$_POST['name'];
         $content=$_POST['content'];
-
         $model = new MdlTache();
         if(!isset($_POST['completed']))
         {
@@ -255,25 +264,41 @@ class VisitorController {
         } else {
             $completed = $_POST['completed'];
         }
-        $tache=$model->findById($_POST['task']);
-        $model->update($tache, $name, $content, $completed);
-        $_REQUEST['action']="accessListInfos";
-        $this->accessListInfos($dVueEreur);
-        $dVueEreur= array();
+
+        $dVueEreur = Validation::val_intitule($name, $dVueEreur);
+        if (empty($dVueEreur)){
+            $dVueEreur = Validation::val_intitule($content, $dVueEreur);
+        }
+        if(!empty($dVueEreur)){
+            require($rep.$vues['modifyListPub']);
+        }
+        else{
+            $tache=$model->findById($_POST['task']);
+            $model->update($tache, $name, $content, $completed);
+            $_REQUEST['action']="accessListInfos";
+            $this->accessListInfos($dVueEreur);
+            $dVueEreur= array();
+        }
+
     }
 
     function ModifyListPub($dVueEreur){
         global $rep,$vues,$dataView;
         $list=$_POST['list'];
         $name=$_POST['name'];
-        $model = new MdlListe();
-        $mdlUsr = new MdlUser();
-        $list=$model->findById($list);
-        $model->update($list[0], $name, false);
-        $_REQUEST['action']="accessListInfos";
-        $this->accessListInfos($dVueEreur);
-        $dVueEreur= array();
-
+        $dVueEreur = Validation::val_intitule($name, $dVueEreur);
+        if(!empty($dVueEreur)){
+            require($rep.$vues['modifyListPub']);
+        }
+        else{
+            $model = new MdlListe();
+            $mdlUsr = new MdlUser();
+            $list=$model->findById($list);
+            $model->update($list[0], $name, false);
+            $_REQUEST['action']="accessListInfos";
+            $this->accessListInfos($dVueEreur);
+            $dVueEreur= array();
+        }
         
     }
 }
diff --git a/modeles/MdlUser.php b/modeles/MdlUser.php
index 4d636a2..5de07d5 100644
--- a/modeles/MdlUser.php
+++ b/modeles/MdlUser.php
@@ -20,10 +20,8 @@ class MdlUser{
         $gate=new UserGateway($this->con);
 
         $result=$gate->insert($login, $mdp);
-        if ($result==true){
-            $_SESSION['role'] = 'Utilisateur';
-            $_SESSION['username'] = $login;
-        }
+        $_SESSION['role'] = 'Utilisateur';
+        $_SESSION['username'] = $login;
     }
 
     public function delete(User $user){