From a28479d0fcb41955fe5381371261e9109f339d89 Mon Sep 17 00:00:00 2001
From: polo <ordipolo@gmx.fr>
Date: Wed, 1 Oct 2025 10:24:31 +0200
Subject: =?UTF-8?q?visibilit=C3=A9=20bouton=20Modifier=20la=20page,=20s?=
 =?UTF-8?q?=C3=A9curit=C3=A9=20si=20&mode=3Dpage=5Fmodif=20est=20utilis?=
 =?UTF-8?q?=C3=A9=20de=20mani=C3=A8re=20non=20attendue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controller/ViewController.php | 17 ++++++++++-------
 src/model/entities/Node.php       |  2 +-
 src/view/AbstractBuilder.php      |  2 +-
 src/view/FooterBuilder.php        |  3 ++-
 4 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/controller/ViewController.php b/src/controller/ViewController.php
index f66baff..9117f0f 100644
--- a/src/controller/ViewController.php
+++ b/src/controller/ViewController.php
@@ -5,7 +5,6 @@
 
 declare(strict_types=1);
 
-use App\Entity\Article;
 use App\Entity\Node;
 use Doctrine\ORM\EntityManager;
 use Symfony\Component\HttpFoundation\Request;
@@ -19,21 +18,24 @@ class ViewController extends AbstractBuilder // ViewController est aussi le prem
 
     public function buildView(EntityManager $entityManager, Request $request): Response
     {
-        // accès au modèle
+        /* 1/ accès au modèle */
         $director = new Director($entityManager, true);
         $director->makeRootNode(htmlspecialchars($request->query->get('id') ?? ''));
         self::$root_node = $director->getNode();
 
+
+        /* 2/ traitement de quelques paramètres */
+
         // mode modification d'une page activé
-        if($_SESSION['admin'] && $request->query->has('page')
+        if($_SESSION['admin']
             && $request->query->has('mode') && $request->query->get('mode') === 'page_modif'
-            && $request->query->get('page') !== 'connexion' && $request->query->get('page') !== 'article' && $request->query->get('page') !== 'nouvelle_page' && $request->query->get('page') !== 'menu_chemins'){
-            // les contrôles de la 2è ligne devraient utiliser un tableau
+            && !in_array(CURRENT_PAGE, ['article', 'nouvelle_page', 'menu_chemins', 'user_edit', 'connection']))
+        {
             MainBuilder::$modif_mode = true;
         }
 
         // page article: mode création et erreurs d'id
-        if($request->query->has('page') && $request->query->get('page') === 'article'){
+        if(CURRENT_PAGE === 'article'){
             if($_SESSION['admin']){
                 if(!$request->query->has('id')){
                     return new Response($this->html, 302);
@@ -54,7 +56,8 @@ class ViewController extends AbstractBuilder // ViewController est aussi le prem
             }
         }
 
-        //début de la construction de la page
+
+        /* 3/ construction de la page avec builders et vues */
         $this->useChildrenBuilder(self::$root_node);
 
         return new Response($this->html, 200);
diff --git a/src/model/entities/Node.php b/src/model/entities/Node.php
index 08961e0..f7af6de 100644
--- a/src/model/entities/Node.php
+++ b/src/model/entities/Node.php
@@ -32,7 +32,7 @@ class Node
     private int $position;
 
     #[ORM\ManyToOne(targetEntity: self::class)]
-    //#[ORM\ManyToOne(targetEntity: self::class, fetch: 'EAGER')] // À TESTER
+    //#[ORM\ManyToOne(targetEntity: self::class, fetch: 'EAGER')] // fetch: 'eager' désactive le mode fainéant de doctrine
     #[ORM\JoinColumn(name: "parent_id", referencedColumnName: "id_node", onDelete: "SET NULL", nullable: true)]
     private ?self $parent = null;
 
diff --git a/src/view/AbstractBuilder.php b/src/view/AbstractBuilder.php
index 7b53010..dd83a42 100644
--- a/src/view/AbstractBuilder.php
+++ b/src/view/AbstractBuilder.php
@@ -7,7 +7,7 @@ use App\Entity\Node;
 
 abstract class AbstractBuilder
 {
-	protected const VIEWS_PATH = '../src/view/templates/';
+	protected const string VIEWS_PATH = '../src/view/templates/';
 	protected string $html = '';
     protected int $id_node;
 
diff --git a/src/view/FooterBuilder.php b/src/view/FooterBuilder.php
index cf88476..f20dd2e 100644
--- a/src/view/FooterBuilder.php
+++ b/src/view/FooterBuilder.php
@@ -72,7 +72,8 @@ class FooterBuilder extends AbstractBuilder
     private function makePageModifModeButton(): string
     {
         $link_edit_page = new URL(['page' => CURRENT_PAGE]);
-        if(CURRENT_PAGE !== 'article'){
+        if(!in_array(CURRENT_PAGE, ['article', 'nouvelle_page', 'menu_chemins'])) // ajouter 'user_edit' et 'connection' le jour où ces pages auront un footer
+        {
             if(MainBuilder::$modif_mode){
                 $link_edit_label = 'Sortir du mode modification';
             }
-- 
cgit v1.2.3