Clean code - phase 1

core/class/icon.class.php

@@ -73,10 +73,10 @@ class icon
                 return "bi bi-link-45deg";
                 break;
             // Menu Parametres
-            case 'parametre-users':
+            case 'parametres-users':
                 return "bi bi-person-lines-fill";
                 break;
-            case 'parametre-teams':
+            case 'parametres-teams':
                 return "bi bi-person-fill-gear";
                 break;
             case 'historique':

core/class/maj.class.php

@@ -158,11 +158,11 @@ class maj {
         self::printSeparateur();
 
         if($gitReturn == TRUE AND $sqlReturn == TRUE){
-            historique::recRef("/parametres.html");
+            historique::recRef("/parametres-maj.html");
             historique::add(array(
                 "idType" => historique::getIdRef("ACTION"),
                 "idUser" => session::getId(),
-                "idPage" => historique::getIdRef("/parametres.html"),
+                "idPage" => historique::getIdRef("/parametres-maj.html"),
                 "log" => "Mise à jour [" . MAJ_TARGET . " - " . git::getCommitHash(MAJ_TARGET) . "] terminée"
             ));
 

core/submit/cms.client-add.php → core/submit/cms.parametres-client-add.php

@@ -6,15 +6,15 @@ if (core::ifPost("from")) {
 
     alert::recSuccess("Ajout du client : ". core::getPost("client"));
 
-    historique::recRef("/clients.html");
+    historique::recRef("/parametres-clients.html");
     historique::add(array(
         "idType" => historique::getIdRef("ACTION"),
         "idUser" => session::getId(),
-        "idPage" => historique::getIdRef("/clients.html"),
+        "idPage" => historique::getIdRef("/parametres-clients.html"),
         "log" => "Ajout du client : " . core::getPost("client")
     ));
 
-    header("Location: /clients.html");
+    header("Location: /parametres-clients.html");
     exit();
 } else {
     header('HTTP/1.0 401 Unauthorized');

core/submit/cms.client-change.php → core/submit/cms.parametres-client-change.php

@@ -6,11 +6,11 @@ if (core::ifPost("from")) {
     json::create("documents");
     json::create("documents-limited");
 
-    historique::recRef("/clients.html");
+    historique::recRef("/parametres-clients.html");
     historique::add(array(
         "idType" => historique::getIdRef("ACTION"),
         "idUser" => session::getId(),
-        "idPage" => historique::getIdRef("/clients.html"),
+        "idPage" => historique::getIdRef("/parametres-clients.html"),
         "log" => "Modification du client : " . core::getPost("value")
     ));
 } else {

core/submit/cms.tag-change.php → core/submit/cms.parametres-tag-change.php

@@ -6,11 +6,11 @@ if (core::ifPost("from")) {
     json::create("documents");
     json::create("documents-limited");
 
-    historique::recRef("/tags.html");
+    historique::recRef("/parametres-tags.html");
     historique::add(array(
         "idType" => historique::getIdRef("ACTION"),
         "idUser" => session::getId(),
-        "idPage" => historique::getIdRef("/tags.html"),
+        "idPage" => historique::getIdRef("/parametres-tags.html"),
         "log" => "Modification du tag : " . core::getPost("value")
     ));
 } else {

core/submit/cms.tag-merge.php → core/submit/cms.parametres-tag-merge.php

@@ -12,17 +12,17 @@ if (core::ifPost("from")) {
     json::create("documents");
     json::create("documents-limited");
 
-    historique::recRef("/tags.html");
+    historique::recRef("/parametres-tags.html");
     historique::add(array(
         "idType" => historique::getIdRef("ACTION"),
         "idUser" => session::getId(),
-        "idPage" => historique::getIdRef("/tags.html"),
+        "idPage" => historique::getIdRef("/parametres-tags.html"),
         "log" => "Merge du tag " . $nameSlave["label"] . " remplacé par " . $nameMaster["label"]
     ));
 
     alert::recSuccess("Merge du tag " . $nameSlave["label"] . " remplacé par " . $nameMaster["label"]);
 
-    header("Location: /tags.html");
+    header("Location: /parametres-tags.html");
     exit();
 
 } else {

core/submit/cms.user-delete.php → core/submit/cms.parametres-user-delete.php

@@ -15,5 +15,5 @@ if(core::ifGet("id")) {
     alert::recSuccess("Suppression du compte de ". user::getNameById(core::getGet("id")));
 }
 
-header("Location: /parametre-users.html");
+header("Location: /parametres-users.html");
 exit();

core/views/_cms.menu.php

@@ -74,17 +74,17 @@
                 core::elementMenuLink("pratique", "https://sender.cse-invent.com", "SendPortal CSE");
             echo '</ul>';
 
-            $temp_accordion = array("user", "parametres", "maj", "parametre-users", "parametre-teams", "tags", "historique");
+            $temp_accordion = array("user", "parametres", "maj", "parametres-users", "parametres-teams", "tags", "historique");
             (in_array(core::getGet("p"), $temp_accordion) or get::isDefautMenu($temp_accordion)) ? $_show = "show" : $_show = NULL;
                 core::elementMenuH6("parametres", "Administration", NULL, "col-admin");
             echo '<ul class="collapse ' . $_show . ' list-unstyled" id="col-admin" data-parent="#accordion">';
-                core::elementMenu("parametre-users", "/parametre-users.html", "Admin : Utilisateurs");
-                core::elementMenu("parametre-teams", "/parametre-teams.html", "Admin : Groupes & Droits");
-                core::elementMenu("clients", "/clients.html", "Admin : Clients");
-                core::elementMenu("tags", "/tags.html", "Admin : Tags");
-                core::elementMenu("historique", "/historique.html", "Admin : Historique");
+                core::elementMenu("parametres-users", "/parametres-users.html", "Admin : Utilisateurs");
+                core::elementMenu("parametres-teams", "/parametres-teams.html", "Admin : Groupes & Droits");
+                core::elementMenu("clients", "/parametres-clients.html", "Admin : Clients");
+                core::elementMenu("tags", "/parametres-tags.html", "Admin : Tags");
+                core::elementMenu("historique", "/parametres-historique.html", "Admin : Historique");
                 core::elementMenu("parametres", "/parametres.html", "Admin : Paramètres");
-                core::elementMenu("maj", "/maj.html", "Admin : Mise à jour");
+                core::elementMenu("maj", "/parametres-maj.html", "Admin : Mise à jour");
             echo '</ul>';
             ?>
         </ul>

core/views/pages/cms.clients.php → core/views/pages/cms.parametres-clients.php

@@ -8,7 +8,7 @@ echo core::filAriane(array(
     "current" => "Clients",
     "arbo" => array(
         "Administration" => NULL,
-        "Clients" => "/clients.html"
+        "Clients" => "/parametres-clients.html"
     )
 ));
 
@@ -25,7 +25,7 @@ $allClients = clients::getAll();
         </tr>
         <tr>
             <form method="post" action="/submit.php">
-            <th scope="row"><input type="hidden" name="from" value="client-add"></th>
+            <th scope="row"><input type="hidden" name="from" value="parametres-client-add"></th>
             <td><input type="text" name="client" class="form-control form-control-sm" value=""></td>
             <td><button type="submit" class="btn btn-success btn-sm">Ajouter</button></td>
             </form>
@@ -37,7 +37,7 @@ $allClients = clients::getAll();
         echo "  <tr>
                     <th scope=\"row\">" . $value["id"] . "</th>
                     <td><input type=\"text\" class=\"form-control form-control-sm\" id=\"clients-".$value["id"]."\" value=\"" . $value["label"] . "\"></td>
-                    <td><button type=\"button\" class=\"btn btn-primary btn-sm\" onclick=\"majClients(".$value["id"].");\">Modifier</button></td>
+                    <td><button type=\"button\" class=\"btn btn-primary btn-sm\" onclick=\"majClients(".$value["id"].");\">Renommer</button></td>
                 </tr>";
     }
 ?>
@@ -50,7 +50,7 @@ $allClients = clients::getAll();
             url: '/submit.php',
             type: 'POST',
             data: {
-                from: "client-change",
+                from: "parametres-client-change",
                 id: id,
                 value: $('#clients-'+id).val()
             },

core/views/pages/cms.historique.php → core/views/pages/cms.parametres-historique.php

@@ -15,7 +15,7 @@
             "current" => "Historique", 
             "arbo" => array( 
                 "Administration" => NULL,
-                "Historique" => "/historique.html")
+                "Historique" => "/parametres-historique.html")
         )); 
 ?>
 <div>

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

@@ -1,23 +1,3 @@
-<?php
-maj::bashFetch();
-$checkMaintenance = debug::isFile("maintenance");
-$checkDebug = debug::isFile("debug");
-?>
-
-<header class="d-flex flex-column flex-md-row align-items-md-center p-3 bg-light ">
-    <h2 class="bd-title" id="content">
-        <span>Administration : Mise à jour</span>
-    </h2>
-</header>
-<?php
-echo core::filAriane(array(
-    "current" => "Mise à jour",
-    "arbo" => array(
-        "Administration" => NULL,
-        "Mise à jour" => "/maj.html"
-    )
-));
-?>
 <?php 
     $majAJour = maj::compareHash();
 ?>

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

@@ -1,3 +1,23 @@
+<?php
+maj::bashFetch();
+$checkMaintenance = debug::isFile("maintenance");
+$checkDebug = debug::isFile("debug");
+?>
+
+<header class="d-flex flex-column flex-md-row align-items-md-center p-3 bg-light ">
+    <h2 class="bd-title" id="content">
+        <span>Administration : Mise à jour</span>
+    </h2>
+</header>
+<?php
+echo core::filAriane(array(
+    "current" => "Mise à jour",
+    "arbo" => array(
+        "Administration" => NULL,
+        "Mise à jour" => "/parametres-maj.html"
+    )
+));
+?>
 <?php 
     $majAJour = maj::compareHash();
 ?>

core/views/pages/cms.tags.php → core/views/pages/cms.parametres-tags.php

@@ -8,7 +8,7 @@ echo core::filAriane(array(
     "current" => "Tags",
     "arbo" => array(
         "Administration" => NULL,
-        "Tags" => "/tags.html"
+        "Tags" => "/parametres-tags.html"
     )
 ));
 
@@ -48,7 +48,7 @@ $allTags = tags::getAll(2);
 
 <div class="modal fade" id="mergeModal" tabindex="-1" role="dialog" aria-labelledby="mergeModalLabel" aria-hidden="true">
     <form id="mergeFormTag" method="post" action="/submit.php">
-        <input type="hidden" name="from" value="tag-merge">
+        <input type="hidden" name="from" value="parametres-tag-merge">
         <div class="modal-dialog modal-lg" role="document">
             <div class="modal-content">
                 <input type="hidden" name="idMaster" value="">
@@ -76,7 +76,7 @@ $allTags = tags::getAll(2);
             url: '/submit.php',
             type: 'POST',
             data: {
-                from: "tag-change",
+                from: "parametres-tag-change",
                 id: id,
                 value: $('#tags-' + id).val()
             },

core/views/pages/cms.parametre-teams.php → core/views/pages/cms.parametres-teams.php

@@ -14,7 +14,7 @@ echo core::filAriane(array(
     "current" => "Groupes & Droits",
     "arbo" => array(
         "Administration" => NULL,
-        "Groupes & Droits" => "/parametre-teams.html"
+        "Groupes & Droits" => "/parametres-teams.html"
     )
 ));
 ?>

core/views/pages/cms.parametre-users.php → core/views/pages/cms.parametres-users.php

@@ -14,7 +14,7 @@ echo core::filAriane(array(
     "current" => "Utilisateurs",
     "arbo" => array(
         "Administration" => NULL,
-        "Utilisateurs" => "/parametre-users.html"
+        "Utilisateurs" => "/parametres-users.html"
     )
 ));
 ?>

core/views/pages/cms.user.php

@@ -46,13 +46,13 @@ if(core::ifGet("add") AND access::ifAccesss("add-user")) {
         </h2>        
         <?php if (isset($user["id"]) && session::getId() != $user["id"] && $protect != 2): ?>
             <div class="fix-container-button-nav">
-                <a href="/submit.php?from=user-delete&id=<?= $user['id']; ?>" onclick="return confirm('Voulez-vous supprimer le compte de <?= $user["prenom"] . " " . $user["nom"]; ?> ?')">
+                <a href="/submit.php?from=parametres-user-delete&id=<?= $user['id']; ?>" onclick="return confirm('Voulez-vous supprimer le compte de <?= $user["prenom"] . " " . $user["nom"]; ?> ?')">
                     <button type="submit" class="btn btn-outline-danger btn-sm"><?= icon::getFont(["icon" => "bi-trash-fill"]); ?> Supprimer</button>
                 </a>
             </div>
         <?php elseif ($protect == 2): ?>
             <div class="fix-container-button-nav">
-                <a href="/submit.php?from=user-restore&id=<?= $user['id']; ?>" onclick="return confirm('Voulez-vous restaurer le compte de <?= $user["prenom"] . " " . $user["nom"]; ?> ?')">
+                <a href="/submit.php?from=parametres-user-restore&id=<?= $user['id']; ?>" onclick="return confirm('Voulez-vous restaurer le compte de <?= $user["prenom"] . " " . $user["nom"]; ?> ?')">
                     <button type="submit" class="btn btn-outline-danger btn-sm"><?= icon::getFont(["icon" => "bi bi-box2-fill"]); ?> Restaurer</button>
                 </a>
             </div>
@@ -65,7 +65,7 @@ if(core::ifGet("add") AND access::ifAccesss("add-user")) {
             "current" => $titre, 
             "arbo" => array( 
                 "Administration" => NULL,
-                "Utilisateurs" => "/parametre-users.html",
+                "Utilisateurs" => "/parametres-users.html",
                 $titre => "#")
         ));
     }