From 84ab8068ac1842e15cacdf0493dabeac5c922d24 Mon Sep 17 00:00:00 2001 From: Stanislas Kita Date: Fri, 19 Dec 2025 15:21:08 +0100 Subject: [PATCH 1/2] Fix(Reporting): Fix LIMIT clause --- CHANGELOG.md | 1 + inc/helpdeskplus.class.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c026f66..9fddbb0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - Fix SQL alias errors for reportVstackbarLifetime chart - Fix empty `WHERE` clause +- Fix `limit` clause ## [1.9.2] - 2025-12-02 diff --git a/inc/helpdeskplus.class.php b/inc/helpdeskplus.class.php index 0e6fb9e4..3d0ffc8f 100644 --- a/inc/helpdeskplus.class.php +++ b/inc/helpdeskplus.class.php @@ -664,7 +664,7 @@ public function reportHbarTopcategory($config = []) //Init delay value $delay = PluginMreportingCommon::getCriteriaDate('glpi_tickets.date', $config['delay'], $config['randname']); - $limit = isset($_SESSION['mreporting_values']['glpilist_limit']) ? '0, ' . $_SESSION['mreporting_values']['glpilist_limit'] : '0, 20'; + $limit = isset($_SESSION['mreporting_values']['glpilist_limit']) ? $_SESSION['mreporting_values']['glpilist_limit'] : 20; $query = [ "SELECT" => [ @@ -718,7 +718,7 @@ public function reportHbarTopapplicant($config = []) //Init delay value $delay = PluginMreportingCommon::getCriteriaDate('glpi_tickets.date', $config['delay'], $config['randname']); - $limit = isset($_SESSION['mreporting_values']['glpilist_limit']) ? '0, ' . $_SESSION['mreporting_values']['glpilist_limit'] : '0, 20'; + $limit = isset($_SESSION['mreporting_values']['glpilist_limit']) ? $_SESSION['mreporting_values']['glpilist_limit'] : 20; $query = [ "SELECT" => [ From b18f9bb4e2db29b986543d27a290fcec5108bc3a Mon Sep 17 00:00:00 2001 From: "Romain B." <8530352+Rom1-B@users.noreply.github.com> Date: Wed, 24 Dec 2025 13:52:20 +0100 Subject: [PATCH 2/2] Apply suggestions from code review --- inc/helpdeskplus.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/helpdeskplus.class.php b/inc/helpdeskplus.class.php index 3d0ffc8f..3aa26dd9 100644 --- a/inc/helpdeskplus.class.php +++ b/inc/helpdeskplus.class.php @@ -664,7 +664,7 @@ public function reportHbarTopcategory($config = []) //Init delay value $delay = PluginMreportingCommon::getCriteriaDate('glpi_tickets.date', $config['delay'], $config['randname']); - $limit = isset($_SESSION['mreporting_values']['glpilist_limit']) ? $_SESSION['mreporting_values']['glpilist_limit'] : 20; + $limit = $_SESSION['mreporting_values']['glpilist_limit'] ?? 20; $query = [ "SELECT" => [ @@ -718,7 +718,7 @@ public function reportHbarTopapplicant($config = []) //Init delay value $delay = PluginMreportingCommon::getCriteriaDate('glpi_tickets.date', $config['delay'], $config['randname']); - $limit = isset($_SESSION['mreporting_values']['glpilist_limit']) ? $_SESSION['mreporting_values']['glpilist_limit'] : 20; + $limit = $_SESSION['mreporting_values']['glpilist_limit'] ?? 20; $query = [ "SELECT" => [