From 15bc35ab0ab9c3cd6466e81e5de4af174ce0628b Mon Sep 17 00:00:00 2001
From: Anna BOUDOUL <Anna.BOUDOUL@etu.uca.fr>
Date: Thu, 22 Dec 2022 23:21:42 +0100
Subject: [PATCH] correcting bugs TabVues

---
 config/config.php          | 16 ++++++++--------
 controller/FrontCtrl.php   | 11 +++++++----
 controller/UserCtrl.php    | 12 +++++++-----
 controller/VisitorCtrl.php | 17 ++++++++++-------
 index.php                  |  8 ++++----
 5 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/config/config.php b/config/config.php
index 69a4402..d192ac5 100644
--- a/config/config.php
+++ b/config/config.php
@@ -8,12 +8,12 @@
 
     $TMessage = array();
 
-    $TabVues = array(
-        "erreur" => "view/erreur.php",
-        "home" => "view/home.php",
-        "connection" => "view/connection.php",
-        "register" => "view/register.php",
-        "newList" => "view/newList.php",
-        "liste" => "view/liste.php",
-    )
+    $TabVues = array();
+    $TabVues["erreur"] = "view/erreur.php";
+    $TabVues["home"] = "view/home.php";
+    $TabVues["connection"] = "view/connection.php";
+    $TabVues["register"] = "view/register.php";
+    $TabVues["newList"] = "view/newList.php";
+    $TabVues["liste"] = "view/liste.php";
+    
 ?>
\ No newline at end of file
diff --git a/controller/FrontCtrl.php b/controller/FrontCtrl.php
index 769327d..c5040b8 100644
--- a/controller/FrontCtrl.php
+++ b/controller/FrontCtrl.php
@@ -1,4 +1,5 @@
 <?php
+require_once("config/config.php");
 require("model/UserModel.php");
 
 class FrontCtrl
@@ -6,9 +7,11 @@ class FrontCtrl
     private UserModel $usrMdl;
     private $action_User;
     private bool $isUser;
+    private $TabVues;
 
-    function __construct(&$con){
+    function __construct(&$con, $TabVues){
         session_start();
+        $this->TabVues = $TabVues;
         $this->usrMdl = new UserModel($con);
         $this->action_User = array('deconnexion','loadListePriv','newListPrivate');
         try{
@@ -19,7 +22,7 @@ class FrontCtrl
                 if(!$this->isUser){ # si pas conncter
                     # appel controlleur visiteur avec action connecter
                     require("VisitorCtrl.php");
-                    $visitCtrl = new VisitorCtrl($con);
+                    $visitCtrl = new VisitorCtrl($con, $this->TabVues);
                     $visitCtrl->goconnexion();
                 } else { # sinon
                     # handle action avec controlleur user
@@ -30,10 +33,10 @@ class FrontCtrl
             } else { # sinon forcement action visiteur
                 # appel controlleur visiteur avec l'action
                 require("VisitorCtrl.php"); 
-                $visitCtrl = new VisitorCtrl($con,$this->isUser);
+                $visitCtrl = new VisitorCtrl($con, $this->TabVues, $this->isUser);
             }
         } catch (Exception $e){ // verifier si catch bon
-            require($TabVues["erreur"]); 
+            require($this->TabVues["erreur"]); 
         }
     }
 }
diff --git a/controller/UserCtrl.php b/controller/UserCtrl.php
index 9d4f000..f7150f9 100644
--- a/controller/UserCtrl.php
+++ b/controller/UserCtrl.php
@@ -7,8 +7,10 @@ class UserCtrl
     private $con;
     private $taskModel;
     private $userModel;
+    private $TabVues;
 
-    public function __construct(Connection $con){
+    public function __construct(Connection $con, $TabVues){
+        $this->TabVues = $TabVues;
         $this->con = $con;
         $this->userModel = new UserModel($this->con);
         $this->taskModel = new TaskModel($this->con);
@@ -30,12 +32,12 @@ class UserCtrl
                     break;
                 default:
                 $TMessage[] = 'Unexpected error';
-                require($TabVues["erreur"]); 
+                require($this->TabVues["erreur"]); 
                 break;
     
             }
         } catch(Exception $e) {
-            require($TabVues["erreur"]); 
+            require($this->TabVues["erreur"]); 
         }
     }
 
@@ -44,7 +46,7 @@ class UserCtrl
         // $TabList[] = new ListTask(0, "Projet PHP");
         // $TabList[] = new ListTask(1, "Projet Blazor");
         $TabList = $this->taskModel->loadPrivateLists($_SESSION['login']);
-        require($TabVues["liste"]); 
+        require($this->TabVues["liste"]); 
     }
 
     public function newListPrivate(){
@@ -56,7 +58,7 @@ class UserCtrl
     function loadHome(){
         $user = false;
         $public_lists = $this->taskModel->loadPublicLists();
-        require($TabVues["home"]); 
+        require($this->TabVues["home"]); 
     }
 
     public function deconnexion(){
diff --git a/controller/VisitorCtrl.php b/controller/VisitorCtrl.php
index 5d177dd..8dabfda 100644
--- a/controller/VisitorCtrl.php
+++ b/controller/VisitorCtrl.php
@@ -1,12 +1,15 @@
 <?php
 require("model/TaskModel.php");
+
 class VisitorCtrl
 {
     private $taskModel;
     private $userModel;
     private $isUser;
+    private $TabVues;
 
-    function __construct($con,$isUser){
+    function __construct($con, $TabVues, $isUser){
+        $this->TabVues = $TabVues;
         $this->isUser = $isUser;
         $dvueErreur = array();
         $this->taskModel = new TaskModel($con);
@@ -72,23 +75,23 @@ class VisitorCtrl
                 default:
                     # 
                     $TMessage[] = 'Unexpected error';
-                    require($TabVues["erreur"]); 
+                    require($this->TabVues["erreur"]); 
                     break;
             }
             
         } catch (Exception $e) {
-            require($TabVues["erreur"]); 
+            require($this->TabVues["erreur"]); 
         }
     }
     function loadHome(){
         $public_lists = $this->taskModel->loadPublicLists();
         $user = $this->isUser;
-        require($TabVues["home"]); 
+        require($this->TabVues["home"]); 
     }
 
     function go_connection(){
         $user = $this->isUser;
-        require($TabVues["connection"]);
+        require($this->TabVues["connection"]);
     }
 
     function connection(){
@@ -97,7 +100,7 @@ class VisitorCtrl
 
     function go_register(){
         $user = $this->isUser;
-        require($TabVues["register"]);
+        require($this->TabVues["register"]);
     }
 
     function register(){
@@ -106,7 +109,7 @@ class VisitorCtrl
     
     function go_list(){
         $user = $this->isUser;
-        require($TabVues["newList"]);
+        require($this->TabVues["newList"]);
     }
 
     function makeList(){
diff --git a/index.php b/index.php
index 18e9f7d..8cec805 100644
--- a/index.php
+++ b/index.php
@@ -1,9 +1,9 @@
 <?php
-    require_once("config/config.php");
-    require_once("controller/FrontCtrl.php");
-    require("view/erreur.php");
+    require("config/config.php");
     require('config/Validation.php');
+    require("view/erreur.php");
+    require_once("controller/FrontCtrl.php");
     
-    $fc = new FrontCtrl($con);
+    $fc = new FrontCtrl($con, $TabVues);
 ?>