modif page, création d'un bloc

31 files changed, 214 insertions, 20 deletions

diff --git a/public/css/main.css b/public/css/main.css
index c5289f0..93a7bcf 100644
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -57,7 +57,7 @@ article .logo2
 }
 article img
 {
-        max-width: 100%;
+        width: 100%;
         height: auto;
 }
 
@@ -131,4 +131,54 @@ main button:hover
 article a:hover
 {
         cursor: pointer;
+}
+
+
+
+/* -- mode modification d'une page -- */
+/*.modif_page_explanations
+{
+        background-color: white;
+        padding: 10px;
+        margin: 10px 20px;
+}
+.modif_page_explanations div
+{
+        display: flex;
+        flex-wrap: wrap;
+        font-size: smaller;
+}*/
+.new_bloc
+{
+        background-color: white;
+        padding: 10px;
+        margin: 10px 20px;
+
+}
+.new_bloc p
+{
+        margin: 5px;
+}
+.new_bloc #bloc_title
+{
+        width: 100%;
+        max-width: 300px;
+}
+.new_bloc form select, .new_bloc form input[type=submit]
+{
+        color: #ff1d04;
+        font-size: medium;
+        border-radius: 4px;
+        background-color: white;
+        border: lightgrey 2px outset;
+}
+select:hover
+{
+        cursor: pointer;
+}
+.new_bloc form input[type=submit]:hover
+{
+        background-color: #ffff00;
+        border-radius: 4px;
+        cursor: pointer;
 }
\ No newline at end of file
diff --git a/public/css/menu.css b/public/css/menu.css
index 3294c2b..61e8a01 100644
--- a/public/css/menu.css
+++ b/public/css/menu.css
@@ -37,19 +37,15 @@
 {
         display: flex;
         flex-wrap: wrap;
-}
-.menu aside .controls_explanations p
-{
         font-size: smaller;
 }
-.menu aside img
+.menu aside img, .menu aside input
 {
         vertical-align: bottom;
 }
 .menu aside input
 {
         pointer-events: none; /* case non clicable, sauf action au clavier... */
-        vertical-align: bottom;
 }
 .menu #location, .menu input[type=submit]
 {
diff --git a/public/index.php b/public/index.php
index abdac71..9f930fd 100644
--- a/public/index.php
+++ b/public/index.php
@@ -60,6 +60,12 @@ elseif(isset($_GET['action']) && $_GET['action'] === 'modif_mdp')
 {
     changePassword($entityManager);
 }
+elseif($_SESSION['admin'] && isset($_GET['page']) && isset($_GET['action']) && $_GET['action'] === 'modif_page'
+    && $_GET['page'] !== 'connexion' && $_GET['page'] !== 'article' && $_GET['page'] !== 'menu_chemins')
+{
+    // les contrôles de la 2è ligne devraient utiliser un tableau
+    MainBuilder::$modif_mode = true;
+}
 
 // -- contrôleurs --
 $director = new Director($entityManager, true);
diff --git a/src/controller/Director.php b/src/controller/Director.php
index a2528ed..56a90cb 100644
--- a/src/controller/Director.php
+++ b/src/controller/Director.php
@@ -16,11 +16,11 @@ class Director
         private Node $node;
     private Node $article;
 
-        public function __construct(EntityManager $entityManager, bool $for_display = false)
+        public function __construct(EntityManager $entityManager, bool $get_menu = false)
         {
                 $this->entityManager = $entityManager;
-        if($for_display){
-            self::$menu_data = new Menu($entityManager); // Menu est un modèle mais pas une entité
+        if($get_menu){
+            self::$menu_data = new Menu($entityManager);
             self::$page_path = new Path();
             $this->page = self::$page_path->getLast();
         }
@@ -137,4 +137,24 @@ class Director
         $this->node = $section;
         return true;
     }
+
+    public function findNodeByName(string $name): void
+    {
+        $bulk_data = $this->entityManager
+            ->createQuery('SELECT n FROM App\Entity\Node n WHERE n.name_node = :name')
+            ->setParameter('name', $name)
+            ->getResult();
+        $this->node = $bulk_data[0];
+        echo $this->page->getPageName() . ' ';
+
+        $bulk_data = $this->entityManager
+            ->createQuery('SELECT n FROM App\Entity\Node n WHERE n.parent = :parent AND n.page = :page')
+            ->setParameter('parent', $this->node)
+            ->setParameter('page', $this->page)
+            ->getResult();
+        foreach($bulk_data as $child){
+            $this->node->addChild($child);
+            echo $child->getName() . ' ';
+        }
+    }
 }
diff --git a/src/controller/Security.php b/src/controller/Security.php
index f9092e2..7d592e9 100644
--- a/src/controller/Security.php
+++ b/src/controller/Security.php
@@ -3,6 +3,8 @@
 //
 // htmlawed nettoie les entrées de l'utilisateur, en particulier le html de l'éditeur
 
+declare(strict_types=1);
+
 class Security
 {
         private static $configHtmLawed = array(
@@ -14,10 +16,10 @@ class Security
             // liste noire d'attributs HTML
             'deny_attribute'=> 'id, class' // on garde 'style'
         );
-
         // faire qu'un certain élément puisse n'avoir que certains attributs, regarder la doc
         private static $specHtmLawed = '';
 
+        // ATTENTION, n'applique pas htmlspecialchars() !!
         public static function secureString(string $chaine): string
         {
             return trim(htmLawed($chaine, self::$configHtmLawed, self::$specHtmLawed));;
diff --git a/src/controller/post.php b/src/controller/post.php
index d2e4477..76ac72b 100644
--- a/src/controller/post.php
+++ b/src/controller/post.php
@@ -3,6 +3,8 @@
 
 declare(strict_types=1);
 
+use App\Entity\Node;
+use App\Entity\NodeData;
 use App\Entity\Page;
 
 if($_SERVER['REQUEST_METHOD'] === 'POST' && $_SESSION['admin'] === true)
@@ -10,17 +12,48 @@ if($_SERVER['REQUEST_METHOD'] === 'POST' && $_SESSION['admin'] === true)
     /* -- formulaires HTML classiques -- */
     if($_SERVER['CONTENT_TYPE'] === 'application/x-www-form-urlencoded')
     {
-        // création d'une entrée de menu avec une URL
-        if(isset($_POST["label_input"]) && isset($_POST["url_input"]) && isset($_POST["location"])){
-            echo $_POST["label_input"] . '<br>';
-            echo $_POST["url_input"] . '<br>';
-            echo $_POST["location"] . '<br>'; // id entrée précédente
+        /* -- mode Modification d'une page -- */
+
+        // ajout d'un bloc dans une page
+        if(isset($_POST['bloc_title']) && isset($_POST['bloc_select'])){
+            $director = new Director($entityManager, true); // on a besoin de page_path qui dépend de menu_data
+            $page = Director::$page_path->getLast();
+            $director->findNodeByName('main');
+            $main = $director->getNode();
+            $position = count($main->getChildren()) + 1; // position dans la fraterie
+
+            $bloc = new Node(
+                trim(htmlspecialchars($_POST["bloc_select"])),
+                null, [],
+                $position,
+                $main,
+                $page);
+            $data = new NodeData(
+                ['title' => trim(htmlspecialchars($_POST["bloc_title"]))],
+                $bloc);
+
+            $entityManager->persist($bloc);
+            $entityManager->persist($data);
+            $entityManager->flush();
+            header("Location: " . new URL(['page' => $_GET['page'], 'action' => 'modif_page']));
+        }
 
+
+        /* -- page Menu et chemins -- */
+
+        // création d'une entrée de menu avec une URL
+        elseif(isset($_POST["label_input"]) && isset($_POST["url_input"]) && isset($_POST["location"])){
             Director::$menu_data = new Menu($entityManager);
             $previous_page = Director::$menu_data->findPageById((int)$_POST["location"]); // (int) à cause de declare(strict_types=1);
             $parent = $previous_page->getParent();
 
-            $page = new Page($_POST["label_input"], $_POST["url_input"], true, true, false, $previous_page->getPosition(), $parent);
+            $page = new Page(
+                trim(htmlspecialchars($_POST["label_input"])),
+                filter_var($_POST["url_input"], FILTER_VALIDATE_URL),
+                true, true, false,
+                $previous_page->getPosition(),
+                $parent);
+
             // on indique pour la nouvelle entrée la même position que la précédente, puis addChild l'ajoute à la fin du tableau "children" avant de déclencher un tri
             // exemple avec 2 comme position demandée: 1 2 3 4 2 devient 1 2 3 4 5 et la nouvelle entrée sera en 3è position
             if($parent == null){
@@ -31,7 +64,6 @@ if($_SERVER['REQUEST_METHOD'] === 'POST' && $_SESSION['admin'] === true)
 
             $entityManager->persist($page);
             $entityManager->flush();
-
             header("Location: " . new URL(['page' => $_GET['from']]));
         }
         // suppression d'une entrée de menu avec une URL
@@ -54,6 +86,7 @@ if($_SERVER['REQUEST_METHOD'] === 'POST' && $_SESSION['admin'] === true)
             header("Location: " . new URL(['error' => 'paramètres inconnus']));
         }
     }
+
     /* -- requêtes AJAX -- */
     else{
         require '../src/controller/ajax.php';
diff --git a/src/model/Menu.php b/src/model/Menu.php
index 10cf3d5..9fb8562 100644
--- a/src/model/Menu.php
+++ b/src/model/Menu.php
@@ -1,5 +1,5 @@
 <?php
-// src/controller/Menu.php
+// src/model/Menu.php
 
 declare(strict_types=1);
 
diff --git a/src/model/Path.php b/src/model/Path.php
index 11be6fe..ad44fd9 100644
--- a/src/model/Path.php
+++ b/src/model/Path.php
@@ -1,5 +1,7 @@
 <?php
-// src/controller/Path.php
+// src/model/Path.php
+//
+// attention, cette classe dépend de src/model/Menu.php
 
 declare(strict_types=1);
 
@@ -14,6 +16,7 @@ class Path extends Page
         {
         $path_array = explode('/', CURRENT_PAGE);
         try{
+                // parcourir le menu de haut en bas pour obtenir un ou plusieurs objets Page
                 $this->findPage(Director::$menu_data, $path_array); // remplit $this->current_page
         }
                 catch(Exception $e){}
diff --git a/src/view/AbstractBuilder.php b/src/view/AbstractBuilder.php
index 285ebc3..76c51ed 100644
--- a/src/view/AbstractBuilder.php
+++ b/src/view/AbstractBuilder.php
@@ -1,6 +1,8 @@
 <?php
 // src/view/AbstractBuilder.php
 
+declare(strict_types=1);
+
 use App\Entity\Node;
 
 abstract class AbstractBuilder
diff --git a/src/view/ArticleBuilder.php b/src/view/ArticleBuilder.php
index 1f5dbb8..3b9de87 100644
--- a/src/view/ArticleBuilder.php
+++ b/src/view/ArticleBuilder.php
@@ -1,6 +1,8 @@
 <?php
 // src/view/ArticleBuilder.php
 
+declare(strict_types=1);
+
 use App\Entity\Node;
 
 class ArticleBuilder extends AbstractBuilder
diff --git a/src/view/BlogBuilder.php b/src/view/BlogBuilder.php
index ca020b2..d646d5f 100644
--- a/src/view/BlogBuilder.php
+++ b/src/view/BlogBuilder.php
@@ -1,6 +1,8 @@
 <?php
 // src/view/BlogBuilder.php
 
+declare(strict_types=1);
+
 use App\Entity\Node;
 
 class BlogBuilder extends AbstractBuilder
diff --git a/src/view/BreadcrumbBuilder.php b/src/view/BreadcrumbBuilder.php
index 77f4c4c..fcdcd41 100644
--- a/src/view/BreadcrumbBuilder.php
+++ b/src/view/BreadcrumbBuilder.php
@@ -1,6 +1,8 @@
 <?php
 // src/view/BreadcrumbBuilder.php
 
+declare(strict_types=1);
+
 use App\Entity\Node;
 
 class BreadcrumbBuilder extends AbstractBuilder
diff --git a/src/view/FooterBuilder.php b/src/view/FooterBuilder.php
index 7abdb90..8678f56 100644
--- a/src/view/FooterBuilder.php
+++ b/src/view/FooterBuilder.php
@@ -1,6 +1,8 @@
 <?php
 // src/view/FooterBuilder.php
 
+declare(strict_types=1);
+
 use App\Entity\Node;
 
 class FooterBuilder extends AbstractBuilder
diff --git a/src/view/GaleryBuilder.php b/src/view/GaleryBuilder.php
index a895d70..f2dafc2 100644
--- a/src/view/GaleryBuilder.php
+++ b/src/view/GaleryBuilder.php
@@ -1,6 +1,8 @@
 <?php
 // src/view/GaleryBuilder.php
 
+declare(strict_types=1);
+
 use App\Entity\Node;
 
 class GaleryBuilder extends AbstractBuilder
diff --git a/src/view/GridBuilder.php b/src/view/GridBuilder.php
index fdc5426..6845c49 100644
--- a/src/view/GridBuilder.php
+++ b/src/view/GridBuilder.php
@@ -1,6 +1,8 @@
 <?php
 // src/view/GridBuilder.php
 
+declare(strict_types=1);
+
 use App\Entity\Node;
 
 class GridBuilder extends AbstractBuilder
diff --git a/src/view/HeadBuilder.php b/src/view/HeadBuilder.php
index c31c930..2cca757 100644
--- a/src/view/HeadBuilder.php
+++ b/src/view/HeadBuilder.php
@@ -1,6 +1,8 @@
 <?php
 // src/view/HeadBuilder.php
 
+declare(strict_types=1);
+
 use App\Entity\Node;
 
 class HeadBuilder extends AbstractBuilder
diff --git a/src/view/HeaderBuilder.php b/src/view/HeaderBuilder.php
index 28aae13..1c45d59 100644
--- a/src/view/HeaderBuilder.php
+++ b/src/view/HeaderBuilder.php
@@ -1,6 +1,8 @@
 <?php
 // src/view/HeaderBuilder.php
 
+declare(strict_types=1);
+
 use App\Entity\Node;
 
 class HeaderBuilder extends AbstractBuilder
diff --git a/src/view/LoginBuilder.php b/src/view/LoginBuilder.php
index ac9910f..532f054 100644
--- a/src/view/LoginBuilder.php
+++ b/src/view/LoginBuilder.php
@@ -1,6 +1,8 @@
 <?php
 // src/view/LoginBuilder.php
 
+declare(strict_types=1);
+
 use App\Entity\Node;
 
 class LoginBuilder extends AbstractBuilder
diff --git a/src/view/MainBuilder.php b/src/view/MainBuilder.php
index e73b298..fbdfbdd 100644
--- a/src/view/MainBuilder.php
+++ b/src/view/MainBuilder.php
@@ -1,15 +1,20 @@
 <?php
 // src/view/MainBuilder.php
 
+declare(strict_types=1);
+
 use App\Entity\Article;
 use App\Entity\Node;
 
 class MainBuilder extends AbstractBuilder
 {
+    static bool $modif_mode = false;
+
     public function __construct(Node $node)
     {
         $this->html .= "<main>\n";
 
+        // cas particulier de la page article où l'article est greffé sur main
         if(Director::$page_path->getLast()->getEndOfPath() === 'article'){
             // pas censé arriver
             if(!isset($_GET['id'])){
@@ -31,9 +36,53 @@ class MainBuilder extends AbstractBuilder
             $this->html .= $builder->render();
         }
         else{
+            // si action = "modif_page", affiche des commandes pour modifier
+            if($_SESSION['admin'] && self::$modif_mode){
+                // ajouter un contrôle du champ in_menu
+                $this->viewEditBlocks($node);
+            }
+
             $this->useChildrenBuilder($node);
         }
 
         $this->html .= "</main>\n";
     }
+
+    private function viewEditBlocks($node): void
+    {
+        // blocs disponibles
+        $blocs = ['Blog', 'Grille', 'Calendrier', 'Galerie']; // générer ça dynamiquement!
+        $blocs_true_names = ['blog', 'grid', 'calendar', 'galery'];
+
+        $options = '';
+        for($i = 0; $i < count($blocs); $i++){
+            $options .= '<option value= "' . $blocs_true_names[$i] . '">' . $blocs[$i] . "</option>\n";
+        }
+
+        // blabla
+        /*$this->html .= '<aside class="modif_page_explanations">
+            <p>Modification de la structure d\'une page:</p>
+            <div>
+                <p><img></p>
+                <p><img></p>
+            </div>
+        </aside>' . "\n";*/
+
+        // ajout d'un nouveau bloc
+        $this->html .= '<div class="new_bloc">
+            <p>Ajouter un bloc dans la page:</p>
+            <form method="post" action="' . new URL(['page' => CURRENT_PAGE]) . '">
+                <p><label for="bloc_title">Titre</label>
+                <input type="text" id="bloc_title" name="bloc_title" required></p>
+                <p><label for="bloc_select">Type</label>
+                <select id="bloc_select" name="bloc_select" required>'
+                . $options . 
+                '</select>
+                <input type="submit" value="Valider"></p>
+            </form>
+        </div>' . "\n";
+        foreach($node->getChildren() as $child_node){
+            //$this->html .=
+        }
+    }
 }
diff --git a/src/view/MenuBuilder.php b/src/view/MenuBuilder.php
index 780ca7e..3b96af1 100644
--- a/src/view/MenuBuilder.php
+++ b/src/view/MenuBuilder.php
@@ -3,6 +3,8 @@
 //
 // page Menu et chemins en mode admin, fonctionne avec menu.js
 
+declare(strict_types=1);
+
 use App\Entity\Node;
 use App\Entity\Page;
 
@@ -84,7 +86,7 @@ class MenuBuilder extends AbstractBuilder
     private function unfoldOptions(Page $page): void
     {
         foreach($page->getChildren() as $entry){
-            $this->options .= '<option value="' . $entry->getId() . '">' . $entry->getPageName() . "</options>\n";
+            $this->options .= '<option value="' . $entry->getId() . '">' . $entry->getPageName() . "</option>\n";
             if(count($entry->getChildren()) > 0){
                 $this->unfoldOptions($entry);
             }
diff --git a/src/view/NewBuilder.php b/src/view/NewBuilder.php
index ac2cf9a..c410eb7 100644
--- a/src/view/NewBuilder.php
+++ b/src/view/NewBuilder.php
@@ -1,6 +1,8 @@
 <?php
 // src/view/NewBuilder.php
 
+declare(strict_types=1);
+
 use App\Entity\Node;
 
 class NewBuilder extends AbstractBuilder
diff --git a/src/view/password.php b/src/view/password.php
index 0ff717c..aadfbae 100644
--- a/src/view/password.php
+++ b/src/view/password.php
@@ -7,6 +7,8 @@
 //
 // rajouter la page "créationn du mot de passe"?
 
+declare(strict_types=1);
+
 // insertion du captcha
 ob_start();
 ?>
diff --git a/src/view/templates/article.php b/src/view/templates/article.php
index c57c1cb..5cf35c2 100644
--- a/src/view/templates/article.php
+++ b/src/view/templates/article.php
@@ -1,3 +1,4 @@
+<?php declare(strict_types=1); ?>
 <article>
     <div class="article_content">
         <div class="article_title_zone">
diff --git a/src/view/templates/blog.php b/src/view/templates/blog.php
index e2066c8..dfb65b5 100644
--- a/src/view/templates/blog.php
+++ b/src/view/templates/blog.php
@@ -1,3 +1,4 @@
+<?php declare(strict_types=1); ?>
 <section class="blog" id="<?= $this->id_node ?>">
         <h3><?= $title ?></h3>
 <?= $new_article ?>
diff --git a/src/view/templates/footer.php b/src/view/templates/footer.php
index a4e3544..52cb1b5 100644
--- a/src/view/templates/footer.php
+++ b/src/view/templates/footer.php
@@ -1,3 +1,4 @@
+<?php declare(strict_types=1); ?>
             <footer>
 <?= $breadcrumb ?>
                 <div>
diff --git a/src/view/templates/galery.php b/src/view/templates/galery.php
index 246c4dd..97f8cd8 100644
--- a/src/view/templates/galery.php
+++ b/src/view/templates/galery.php
@@ -1,3 +1,4 @@
+<?php declare(strict_types=1); ?>
 <section class="galery" id="<?= $this->id_node ?>">
         <h3><?= $title ?></h3>
 <?= $new_article ?>
diff --git a/src/view/templates/grid.php b/src/view/templates/grid.php
index f9e441d..71c052b 100644
--- a/src/view/templates/grid.php
+++ b/src/view/templates/grid.php
@@ -1,3 +1,4 @@
+<?php declare(strict_types=1); ?>
 <section class="grid" id="<?= $this->id_node ?>">
         <h3><?= $title ?></h3>
 <?= $new_article ?>
diff --git a/src/view/templates/head.php b/src/view/templates/head.php
index 1ebb17e..b74335e 100644
--- a/src/view/templates/head.php
+++ b/src/view/templates/head.php
@@ -1,3 +1,4 @@
+<?php declare(strict_types=1); ?>
 <!DOCTYPE html>
 <html lang="fr">
     <head>
diff --git a/src/view/templates/header.php b/src/view/templates/header.php
index 4b633a6..1855741 100644
--- a/src/view/templates/header.php
+++ b/src/view/templates/header.php
@@ -1,3 +1,4 @@
+<?php declare(strict_types=1); ?>
 <body>
     <div>
            <header>
diff --git a/src/view/templates/menu.php b/src/view/templates/menu.php
index d62b78b..55c9ff9 100644
--- a/src/view/templates/menu.php
+++ b/src/view/templates/menu.php
@@ -1,3 +1,4 @@
+<?php declare(strict_types=1); ?>
 <section class="menu">
         <h3>Menu et chemins</h3>
         <div class="new_page_button">
diff --git a/src/view/templates/new.php b/src/view/templates/new.php
index fce0702..6533913 100644
--- a/src/view/templates/new.php
+++ b/src/view/templates/new.php
@@ -1,3 +1,4 @@
+<?php declare(strict_types=1); ?>
 <article>
     <div class="new_content">
         <div class="article_title_zone">