Fix bug & optim maj

core/class/core.class.php

@@ -465,7 +465,7 @@ class core
 
     static public function menu(array $_navInfos){
         $badge = self::ifbadge();
-        echo '<a href="/" style="box-shadow: none;" class="navbar-brand '. $_navInfos["color"] .'">' . $_navInfos["title"] . '</a>' . debug::getBadges();
+        echo '<a href="/" style="box-shadow: none; background-color:'. $_navInfos["color"] .';" class="navbar-brand">' . $_navInfos["title"] . '</a>' . debug::getBadges();
         echo '<div id="navbarCollapse" class="collapse navbar-collapse p-0">';
         echo '<ul class="nav navbar-nav ms-auto">';
         echo '<li class="nav-item dropdown">';

core/class/maj.class.php

@@ -233,7 +233,7 @@ class maj {
     }
 
     public static function initMaj(){
-        if(access::ifAccesss("parametres") AND empty($_SESSION["MAJ"]) OR $_SESSION["MAJ"] == FALSE){
+        if(session::isConnect() AND (access::ifAccesss("parametres") AND empty($_SESSION["MAJ"]) OR $_SESSION["MAJ"] == FALSE)){
             self::setMaj(maj::compareHash() == TRUE ? FALSE : TRUE);
         }
     }

core/views/_cms.nav.php

@@ -2,18 +2,18 @@
 
     if(ENVIRONNEMENT != "PROD"){
         $navInfos = [
-            "color" => "bg-dark",
+            "color" => "#0a71af",
             "title" => '<small class="border rounded-2" style="padding:5px 5px 2px 5px; color:orange; margin-right:5px;">' . ENVIRONNEMENT . '</small> CSE Invent : CMS'
         ];
     } else {
         $navInfos = [
-            "color" => "bg-dark",
+            "color" => "#0a71af",
             "title" => "CSE Invent : CMS"
         ];
     }
     
 ?>
-<header class="navbar sticky-top <?php echo $navInfos["color"] ?> navbar-expand-sm navbar-dark flex-md-nowrap p-0 shadow">
+<header class="navbar sticky-top navbar-expand-sm navbar-dark flex-md-nowrap p-0 shadow" style="background-color:<?php echo $navInfos["color"] ?>;">
     <div class="container-fluid">
         <?php core::menu($navInfos) ?>
     </div>

core/views/pages/cms.parametres-maj.php

@@ -1,7 +1,3 @@
-<?php 
-    $majAJour = maj::compareHash();
-?>
-
 <div class="row">
     <div class="col-sm-6 mb-3 mb-sm-0">
         <div class="card">
@@ -16,7 +12,7 @@
                 </li>
                 <li class="list-group-item">
                     <?php
-                        if($majAJour == TRUE){
+                        if(!maj::ifMaj()){
                             echo '<button type="button" class="btn btn-success btn-sm" disabled>Le site est à jour</button>';
                         } else {
                             echo '<button type="button" class="btn btn-warning btn-sm" disabled>Le site n\'est pas à jour</button>';
@@ -39,11 +35,11 @@
                     </div>
                 </li>
                 <li class="list-group-item">
-                <?php if($majAJour == FALSE) : ?>
+                <?php if(maj::ifMaj()) : ?>
                     <button type="submit" id="startMaj" class="btn btn-outline-danger btn-sm">Mettre à jour le site</button>
                     <button type="button" id="progressMaj" class="btn btn-primary btn-sm" style="display:none;" disabled>Mise à jour en cours</button>
                 <?php endif; ?>
-                    <button type="button" id="endMaj" class="btn btn-secondary btn-sm" style="<?php echo ($majAJour == FALSE)? "display:none" : ""; ?>" disabled>Mise à jour terminée</button>
+                    <button type="button" id="endMaj" class="btn btn-secondary btn-sm" style="<?php echo maj::ifMaj() ? "display:none" : ""; ?>" disabled>Mise à jour terminée</button>
                 </li>
             </ul>
         </div>
@@ -51,7 +47,7 @@
 
 </div>
 
-<?php if($majAJour == FALSE) : ?>
+<?php if(maj::ifMaj()) : ?>
 
 <div id="alertMajSuccess" class="alert alert-success" role="alert" style="margin:20px 0; display:none;">
     La mise à jour s'est réalisée avec succès.