mode maintenance, optimisation moins de contrôles en mode run, dossier service et déplacement fichiers, sessions et entité User préparées à l'implémentation hypothétique des rôles, entité AppMetadata, meilleure sécurité de fillStartingDatabase

20 files changed, 48 insertions, 24 deletions

diff --git a/src/view/CalendarBuilder.php b/src/view/CalendarBuilder.php
index bdabcd2..0c0006d 100644
--- a/src/view/CalendarBuilder.php
+++ b/src/view/CalendarBuilder.php
@@ -12,7 +12,7 @@ class CalendarBuilder extends AbstractBuilder
         parent::__construct($node);
         $viewFile = self::VIEWS_PATH . $node->getName() . '.php';
 
-        $calendar_js_file = $_SESSION['admin'] ? 'calendar_admin' : 'calendar';
+        $calendar_js_file = IS_ADMIN ? 'calendar_admin' : 'calendar';
         
         if(file_exists($viewFile))
         {
diff --git a/src/view/FooterBuilder.php b/src/view/FooterBuilder.php
index 8d24f25..f1623e7 100644
--- a/src/view/FooterBuilder.php
+++ b/src/view/FooterBuilder.php
@@ -27,7 +27,7 @@ class FooterBuilder extends AbstractBuilder
             $breadcrumb = $this->html;
 
             $empty_admin_zone = '';
-            if($_SESSION['admin'])
+            if(IS_ADMIN)
             {
                 // données du footer
                 $admin_footer_name = '<input type="text" id="footer_name_input" class="hidden" value="' . htmlspecialchars($name ?? '') . '" placeholder="raison sociale" size="30">
diff --git a/src/view/FormBuilder.php b/src/view/FormBuilder.php
index 6986dea..9a900ce 100644
--- a/src/view/FormBuilder.php
+++ b/src/view/FormBuilder.php
@@ -9,12 +9,10 @@ class FormBuilder extends AbstractBuilder
 {
     static private ?Captcha $captcha = null;
 
-    public function __construct(Node $node)
-    {
+    public function __construct(Node $node){
         parent::__construct($node);
         
-        if(!empty($node->getNodeData()->getData()))
-        {
+        if(!empty($node->getNodeData()->getData())){
             extract($node->getNodeData()->getData());
         }
 
@@ -34,8 +32,7 @@ class FormBuilder extends AbstractBuilder
         $retention_period_sensible = $this->getRetentionPeriod($retention_period_sensible ?? null, App\Entity\Email::DEFAULT_RETENTION_PERIOD_SENSITIVE);
 
         $admin_content = '';
-        if($_SESSION['admin'])
-        {
+        if(IS_ADMIN){
             ob_start();
             require self::VIEWS_PATH . 'form_admin.php';
             $admin_content = ob_get_clean();
diff --git a/src/view/GaleryBuilder.php b/src/view/GaleryBuilder.php
index 749cb30..019a2c7 100644
--- a/src/view/GaleryBuilder.php
+++ b/src/view/GaleryBuilder.php
@@ -21,7 +21,7 @@ class GaleryBuilder extends AbstractBuilder
 
             // ajouter un article
             $new_article = '';
-            if($_SESSION['admin'])
+            if(IS_ADMIN)
             {
                 $id = 'n' . $this->id_node;
                 $js = 'onclick="openEditor(\'' . $id . '\')"';
diff --git a/src/view/HeadBuilder.php b/src/view/HeadBuilder.php
index 76d8d9d..fe57b55 100644
--- a/src/view/HeadBuilder.php
+++ b/src/view/HeadBuilder.php
@@ -32,7 +32,7 @@ class HeadBuilder extends AbstractBuilder
                 $js .= self::insertJS('modif_page');
             }
 
-            if($_SESSION['admin']){
+            if(IS_ADMIN){
                 // édition éléments sur toutes les pages (header, footer et favicon)
                 $js .= self::insertJS('Input');
 
diff --git a/src/view/HeaderBuilder.php b/src/view/HeaderBuilder.php
index 6934e10..bfd5963 100644
--- a/src/view/HeaderBuilder.php
+++ b/src/view/HeaderBuilder.php
@@ -52,7 +52,7 @@ class HeaderBuilder extends AbstractBuilder
             $social_networks = '';
             
             // boutons mode admin
-            if($_SESSION['admin']){
+            if(IS_ADMIN){
                 // assets dans classe header_additional_inputs
                 $admin_head_favicon = '<input type="file" id="head_favicon_input" class="hidden" accept="image/png, image/jpeg, image/gif, image/webp, image/tiff, image/x-icon, image/bmp">
                     <button id="head_favicon_open" onclick="head_favicon.open()"><img id="head_favicon_content" class="action_icon"> Favicon</button>
diff --git a/src/view/LoginBuilder.php b/src/view/LoginBuilder.php
index 639f953..479398c 100644
--- a/src/view/LoginBuilder.php
+++ b/src/view/LoginBuilder.php
@@ -10,7 +10,7 @@ class LoginBuilder extends AbstractBuilder
     public function __construct(Node $node)
     {
         // déjà connecté?
-        if($_SESSION['admin'])
+        if(IS_ADMIN)
         {
             header('Location: ' . new URL);
             die;
diff --git a/src/view/MainBuilder.php b/src/view/MainBuilder.php
index 332efa5..b488703 100644
--- a/src/view/MainBuilder.php
+++ b/src/view/MainBuilder.php
@@ -40,7 +40,7 @@ class MainBuilder extends AbstractBuilder
         }
         else{
             // si action = "modif_page", affiche des commandes supplémentaires
-            if($_SESSION['admin'] && self::$modif_mode){
+            if(IS_ADMIN && self::$modif_mode){
                 // ajouter un contrôle du champ in_menu
                 $this->viewEditBlocks($node);
             }
diff --git a/src/view/MenuBuilder.php b/src/view/MenuBuilder.php
index b8e9396..41ee189 100644
--- a/src/view/MenuBuilder.php
+++ b/src/view/MenuBuilder.php
@@ -20,7 +20,7 @@ class MenuBuilder extends AbstractBuilder
         
         if(file_exists($viewFile))
         {
-            if($_SESSION['admin']){
+            if(IS_ADMIN){
                 $this->unfoldMenu(Model::$menu);
                 
                 if($template){
diff --git a/src/view/NewBuilder.php b/src/view/NewBuilder.php
index a31a1c4..7459cc8 100644
--- a/src/view/NewBuilder.php
+++ b/src/view/NewBuilder.php
@@ -75,7 +75,7 @@ class NewBuilder extends AbstractBuilder
             $article_buttons = '';
             $date_buttons = '';
             $admin_buttons = '';
-            if($_SESSION['admin']){
+            if(IS_ADMIN){
                 if(CURRENT_PAGE === 'article'){
                     $title_js = 'onclick="openEditor(\'' . $id_title . '\')"';
                     $modify_title = '<p id="edit-' . $id_title . '"><button ' . $title_js . '><img class="action_icon" src="assets/edit.svg">Titre</button></p>' . "\n";
diff --git a/src/view/NewPageBuilder.php b/src/view/NewPageBuilder.php
index d519a22..0a3a137 100644
--- a/src/view/NewPageBuilder.php
+++ b/src/view/NewPageBuilder.php
@@ -18,7 +18,7 @@ class NewPageBuilder extends AbstractBuilder
         //parent::__construct($node);
         $viewFile = self::VIEWS_PATH . $node->getName() . '.php';
         
-        if(isset($_SESSION['admin']) && $_SESSION['admin'] && file_exists($viewFile))
+        if(IS_ADMIN && file_exists($viewFile))
         {
             /*if(!empty($node->getNodeData()->getData()))
             {
diff --git a/src/view/NewsBlockBuilder.php b/src/view/NewsBlockBuilder.php
index 4c7c4ec..f1fe12b 100644
--- a/src/view/NewsBlockBuilder.php
+++ b/src/view/NewsBlockBuilder.php
@@ -32,7 +32,7 @@ class NewsBlockBuilder extends AbstractBuilder
 
             // ajouter un article
             $new_article = '';
-            if($_SESSION['admin'])
+            if(IS_ADMIN)
             {
                 $id = 'n' . $this->id_node;
 
diff --git a/src/view/PostBlockBuilder.php b/src/view/PostBlockBuilder.php
index ba4de12..c6094e8 100644
--- a/src/view/PostBlockBuilder.php
+++ b/src/view/PostBlockBuilder.php
@@ -33,7 +33,7 @@ class PostBlockBuilder extends AbstractBuilder
             // ajouter un article
             // => fait un peu double emploi avec PostBuilder
             $new_article = '';
-            if($_SESSION['admin'])
+            if(IS_ADMIN)
             {
                 $id = 'n' . $this->id_node;
 
diff --git a/src/view/PostBuilder.php b/src/view/PostBuilder.php
index de7a818..e0bf985 100644
--- a/src/view/PostBuilder.php
+++ b/src/view/PostBuilder.php
@@ -26,7 +26,7 @@ class PostBuilder extends AbstractBuilder
             // modifier un article
             // => fait un peu double emploi avec PostBlockBuilder
             $admin_buttons = '';
-            if($_SESSION['admin'])
+            if(IS_ADMIN)
             {
                 $modify_js = 'onclick="openEditor(\'' . $id . '\')"';
                 $modify_article = '<p id="edit-' . $id . '"><img class="action_icon" src="assets/edit.svg" ' . $modify_js . '></p>' . "\n";
diff --git a/src/view/UserEditBuilder.php b/src/view/UserEditBuilder.php
index 3604e91..0a347d4 100644
--- a/src/view/UserEditBuilder.php
+++ b/src/view/UserEditBuilder.php
@@ -12,7 +12,7 @@ class UserEditBuilder extends AbstractBuilder
         public function __construct(Node $node)
         {
                 // pour éviter les arnaques
-                if(!$_SESSION['admin'])
+                if(!IS_ADMIN)
         {
             header('Location: ' . new URL);
             die;
diff --git a/src/view/templates/footer.php b/src/view/templates/footer.php
index 7809818..6450e21 100644
--- a/src/view/templates/footer.php
+++ b/src/view/templates/footer.php
@@ -20,7 +20,7 @@
                         <a href="<?= new URL ?>"><img id="footer_logo_content" src="<?= $footer_logo ?? '' ?>" alt=""></a>
                         <?= $admin_footer_logo ?>
                     </div>
-<?php if($_SESSION['admin']){ ?>
+<?php if(IS_ADMIN){ ?>
                     <script>
                         let footer_name = new InputText('footer_name');
                         let footer_address = new InputText('footer_address');
diff --git a/src/view/templates/header.php b/src/view/templates/header.php
index 8d58dc0..400c7c0 100644
--- a/src/view/templates/header.php
+++ b/src/view/templates/header.php
@@ -42,7 +42,7 @@
                     <?= $breadcrumb ?? '' ?>
                 </div>
             </div>
-<?php if($_SESSION['admin']){ ?>
+<?php if(IS_ADMIN){ ?>
             <script>
                 document.getElementById("head_favicon_content").src = window.Config.favicon;
                 let head_favicon = new InputFileFavicon('head_favicon');
diff --git a/src/view/templates/maintenance.php b/src/view/templates/maintenance.php
new file mode 100644
index 0000000..217dcb7
--- /dev/null
+++ b/src/view/templates/maintenance.php
@@ -0,0 +1,27 @@
+<?php declare(strict_types=1); ?>
+<!DOCTYPE html>
+<html lang="fr">
+    <head>
+        <meta charset="utf-8">
+        <title>Site en maintenance</title>
+        <link rel="icon" type="" href="">
+        <meta name="description" content="site en maintenance">
+        <meta name="viewport" content="width=device-width">
+        <link rel="stylesheet" href="css/head.css">
+        <link rel="stylesheet" href="css/body.css">
+        <link rel="stylesheet" href="css/foot.css">
+    </head>
+    <body>
+        <main>
+                <p>Le site est en cours de maintenance.</p>
+                <p>Il devrait être de nouveau accessible très bientôt.</p>
+        </main>
+        <footer>
+            <div class="logged_out">
+                <button>
+                    <a href="<?= new URL(['page' => 'connection']) ?>">Mode admin</a>
+                </button>
+            </div>
+        </footer>
+    </body>
+</html>
\ No newline at end of file
diff --git a/src/view/templates/user_create.php b/src/view/templates/user_create.php
index 8572efe..870b904 100644
--- a/src/view/templates/user_create.php
+++ b/src/view/templates/user_create.php
@@ -27,7 +27,7 @@ $_SESSION['captcha'] = $captcha->getSolution(); // enregistrement de la réponse
         <main>
             <section>
                 <h3>Bienvenue.</h3>
-                <p style="text-align: center;">Veuillez choisir les codes que vous utiliserez pour gérer le site.</p>
+                <p style="text-align: center;">Pour commencer, veuillez créer un compte administrateur.</p>
                 <div class="basic_div">
                     <p style="color: red; font-style: italic;"><?= $error ?></p>
                     <form method="post" action="index.php?action=create_user" >
diff --git a/src/view/templates/user_edit.php b/src/view/templates/user_edit.php
index 28caac4..9191e7d 100644
--- a/src/view/templates/user_edit.php
+++ b/src/view/templates/user_edit.php
@@ -5,7 +5,7 @@
                                 <h3>Mon compte</h3>
                                 <div>
                                         <img class="user_icon" src="assets/user_hollow.svg">
-                                        <div><?= $_SESSION['user'] ?></div>
+                                        <div><?= $_SESSION['user']['username'] ?></div>
                                 </div>
                         </div>
                         <div class="user_edit_flex">