Merge branch '10.0/bugfixes'

Author: cedric-anne

.github/workflows/audit_dependencies.yml

@@ -19,7 +19,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - {branch: "9.5/bugfixes", php-version: "7.2"}
           - {branch: "10.0/bugfixes", php-version: "7.4"}
     env:
       COMPOSE_FILE: ".github/actions/docker-compose-app.yml"

.webpack.config.js

@@ -183,7 +183,7 @@ var filesToCopy = [
     // SCSS files
     {
         package: '@fontsource/inter',
-        from: '{scss/mixins.scss,files/*[0-9]00*.woff2}',
+        from: '{scss/mixins.scss,files/*all-[0-9]00*.woff,files/*[0-9]00*.woff2}',
         to: scssOutputPath,
     },
     {

ajax/knowbase.php

@@ -47,6 +47,8 @@
     exit;
 }
 
+$_SESSION['kb_cat_id'] = $_REQUEST['cat_id'] ?? 0;
+
 switch ($_REQUEST['action']) {
     case "getItemslist":
         header("Content-Type: application/json; charset=UTF-8");

ajax/reservations.php

@@ -35,7 +35,7 @@
 
 include('../inc/includes.php');
 
-Session::checkRight('reservation', ReservationItem::RESERVEANITEM);
+Session::checkRightsOr('reservation', [READ, ReservationItem::RESERVEANITEM]);
 
 if (!isset($_REQUEST["action"])) {
     exit;
@@ -47,6 +47,8 @@
     exit;
 }
 
+Session::checkRight('reservation', ReservationItem::RESERVEANITEM);
+
 if ($_REQUEST["action"] == "get_resources") {
     header("Content-Type: application/json; charset=UTF-8");
     echo json_encode(Reservation::getResources());

composer.lock

@@ -39,11 +39,14 @@
         box-shadow: none;
     }
 
-    .debug-toolbar-widgets .debug-toolbar-widget > button {
-        box-shadow: none;
+    .debug-toolbar-widgets .debug-toolbar-widget {
+        &.active, &:hover {
+            border-top: 3px solid $primary !important;
+            margin-top : -3px;
+        }
 
-        &.active {
-            color: $primary;
+        button {
+            box-shadow: none;
         }
     }
 

css/includes/components/_debug-toolbar.scss

@@ -47,10 +47,11 @@
 include_once GLPI_ROOT . "/inc/db.function.php";
 include_once GLPI_ROOT . '/inc/config.php';
 
-if (Toolbox::getMemoryLimit() < (128 * 1024 * 1024)) {
-    // Main CSS compilation requires about 90MB of memory.
-    // Increase it a bit to ensure it will not reach memory limit.
-    ini_set('memory_limit', '128M');
+// Main CSS compilation requires about 140MB of memory on PHP 7.4 (110MB on PHP 8.2).
+// Ensure to have enough memory to not reach memory limit.
+$max_memory = 192;
+if (Toolbox::getMemoryLimit() < ($max_memory * 1024 * 1024)) {
+    ini_set('memory_limit', sprintf('%dM', $max_memory));
 }
 
 // Ensure warnings will not break CSS output.

front/css.php

@@ -83,7 +83,7 @@
         ])
     ) {
         Html::redirect($CFG_GLPI['root_doc'] . "/front/ticket.php");
-    } else if (Session::haveRight('reservation', ReservationItem::RESERVEANITEM)) {
+    } else if (Session::haveRightsOr('reservation', [READ, ReservationItem::RESERVEANITEM])) {
         Html::redirect($CFG_GLPI['root_doc'] . "/front/reservationitem.php");
     } else if (Session::haveRight('knowbase', KnowbaseItem::READFAQ)) {
         Html::redirect($CFG_GLPI['root_doc'] . "/front/helpdesk.faq.php");

front/helpdesk.public.php

@@ -117,6 +117,7 @@
     ksort($dates_to_add);
     if (
         count($dates_to_add)
+        && isset($_POST['items'])
         && count($_POST['items'])
         && isset($_POST['users_id'])
     ) {

front/reservation.form.php

@@ -1049,7 +1049,7 @@
     ],
 
     'glpi_operatingsystems' => [
-        '_glpi_items_operatingsystems' => 'operatingsystems_id',
+        'glpi_items_operatingsystems' => 'operatingsystems_id',
         'glpi_softwareversions'        => 'operatingsystems_id',
     ],