-
{% if item_id %}
@@ -206,37 +205,5 @@
});
updateSelectionCount(formId);
-
- function refreshCsrfToken(formId) {
- fetch(window.location.href, { credentials: 'same-origin' })
- .then(r => r.text())
- .then(html => {
- try {
- const newTokenInput = new DOMParser()
- .parseFromString(html, 'text/html')
- .querySelector('input[name="_glpi_csrf_token"]');
- if (!newTokenInput) return;
-
- const currentTokenInput = document.querySelector(`#${formId} input[name="_glpi_csrf_token"]`);
- if (currentTokenInput) {
- currentTokenInput.value = newTokenInput.value;
- }
- } catch (e) {
- // Ignore errors silently
- }
- })
- .catch(() => {
- // Ignore errors silently
- });
- }
-
- // Schedule a CSRF token refresh after form submission
- const form = document.getElementById(formId);
- if (form) {
- form.addEventListener('submit', () => {
- // Delay to allow server-side AJAX handlers to complete; full navigation will reload everything
- setTimeout(() => refreshCsrfToken(formId), 800);
- });
- }
});
From 2119be63c3a4d632425bc0146dc3133b50341b8f Mon Sep 17 00:00:00 2001
From: Julien Durand
Date: Thu, 3 Sep 2026 10:06:56 +0200
Subject: [PATCH 02/11] chore: remove deprecated Rector rule
---
rector.php | 1 -
1 file changed, 1 deletion(-)
diff --git a/rector.php b/rector.php
index 65a1f6ed..35d41f46 100644
--- a/rector.php
+++ b/rector.php
@@ -67,7 +67,6 @@
CodeQuality\Foreach_\ForeachItemsAssignToEmptyArrayToAssignRector::class,
CodeQuality\Foreach_\ForeachToInArrayRector::class,
CodeQuality\Foreach_\SimplifyForeachToCoalescingRector::class,
- CodeQuality\Foreach_\UnusedForeachValueToArrayKeysRector::class,
CodeQuality\FuncCall\ChangeArrayPushToArrayAssignRector::class,
CodeQuality\FuncCall\CompactToVariablesRector::class,
CodeQuality\FuncCall\InlineIsAInstanceOfRector::class,
From 5465b6cbc958f204b6034c28a1cdb9e089f8d056 Mon Sep 17 00:00:00 2001
From: Julien Durand
Date: Thu, 3 Sep 2026 10:07:06 +0200
Subject: [PATCH 03/11] chore: rector lint
---
inc/cartridge.class.php | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/inc/cartridge.class.php b/inc/cartridge.class.php
index 9daa8cce..b69a6e12 100644
--- a/inc/cartridge.class.php
+++ b/inc/cartridge.class.php
@@ -366,10 +366,7 @@ public static function pdfForCartridgeItem(PluginPdfSimplePDF $pdf, CartridgeIte
- mktime(0, 0, 0, (int) $tmp_dbeg[1], (int) $tmp_dbeg[2], (int) $tmp_dbeg[0]);
$use_time += $use_time_tmp;
- // Get initial counter page
- if (!isset($pages[$printer])) {
- $pages[$printer] = $data['init_pages_counter'];
- }
+ $pages[$printer] ??= $data['init_pages_counter'];
if ($pages[$printer] < $data['pages']) {
$pages_printed += $data['pages'] - $pages[$printer];
$nb_pages_printed++;
From 729aea55699fcfe7cce0286e01f6b6e71cb00596 Mon Sep 17 00:00:00 2001
From: Julien Durand
Date: Tue, 8 Sep 2026 14:32:39 +0200
Subject: [PATCH 04/11] fix: Change_Item where clause
---
inc/change_item.class.php | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/inc/change_item.class.php b/inc/change_item.class.php
index 36140f55..e6ed3c5c 100644
--- a/inc/change_item.class.php
+++ b/inc/change_item.class.php
@@ -161,34 +161,35 @@ public static function pdfForItem(PluginPdfSimplePDF $pdf, CommonDBTM $item, $tr
$dbu = new DbUtils();
- $restrict = '';
+ $restrict = [];
$order = '';
switch ($item->getType()) {
case 'User':
- $restrict = "(`glpi_changes_users`.`users_id` = '" . $item->getID() . "')";
+ $restrict = ['glpi_changes_users.users_id' => $item->getID()];
$order = '`glpi_changes`.`date_mod` DESC';
break;
case 'Supplier':
- $restrict = "(`glpi_changes_suppliers`.`suppliers_id` = '" . $item->getID() . "')";
+ $restrict = ['glpi_changes_suppliers.suppliers_id' => $item->getID()];
$order = '`glpi_changes`.`date_mod` DESC';
break;
case 'Group':
if ($tree) {
- $restrict = 'IN (' . implode(',', $dbu->getSonsOf('glpi_groups', $item->getID())) . ')';
+ $restrict = ['glpi_changes_groups.groups_id' => $dbu->getSonsOf('glpi_groups', $item->getID())];
} else {
- $restrict = "='" . $item->getID() . "'";
+ $restrict = ['glpi_changes_groups.groups_id' => $item->getID()];
}
- $restrict = "(`glpi_changes_groups`.`groups_id` $restrict
- AND `glpi_changes_groups`.`type` = " . CommonITILActor::REQUESTER . ')';
+ $restrict['glpi_changes_groups.type'] = CommonITILActor::REQUESTER;
$order = '`glpi_changes`.`date_mod` DESC';
break;
default:
- $restrict = "(`items_id` = '" . $item->getID() . "'
- AND `itemtype` = '" . $item->getType() . "')";
+ $restrict = [
+ 'glpi_changes_items.items_id' => $item->getID(),
+ 'glpi_changes_items.itemtype' => $item->getType(),
+ ];
$order = '`glpi_changes`.`date_mod` DESC';
break;
}
@@ -225,7 +226,7 @@ public static function pdfForItem(PluginPdfSimplePDF $pdf, CommonDBTM $item, $tr
'DISTINCT' => true,
'FROM' => 'glpi_changes',
'LEFT JOIN' => $LEFT_JOIN,
- 'WHERE' => [$restrict] + $dbu->getEntitiesRestrictCriteria('glpi_changes'),
+ 'WHERE' => $restrict + $dbu->getEntitiesRestrictCriteria('glpi_changes'),
'ORDER' => $order,
'LIMIT' => (int) $_SESSION['glpilist_limit'],
];
From f7996eb057ae361821c8d77a2b382de2dc2108e4 Mon Sep 17 00:00:00 2001
From: Julien Durand
Date: Tue, 8 Sep 2026 15:53:25 +0200
Subject: [PATCH 05/11] Revert "fix: Change_Item where clause"
This reverts commit b3ab332d6180c77ac3b39cf26471d72b583d4187.
---
inc/change_item.class.php | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/inc/change_item.class.php b/inc/change_item.class.php
index e6ed3c5c..36140f55 100644
--- a/inc/change_item.class.php
+++ b/inc/change_item.class.php
@@ -161,35 +161,34 @@ public static function pdfForItem(PluginPdfSimplePDF $pdf, CommonDBTM $item, $tr
$dbu = new DbUtils();
- $restrict = [];
+ $restrict = '';
$order = '';
switch ($item->getType()) {
case 'User':
- $restrict = ['glpi_changes_users.users_id' => $item->getID()];
+ $restrict = "(`glpi_changes_users`.`users_id` = '" . $item->getID() . "')";
$order = '`glpi_changes`.`date_mod` DESC';
break;
case 'Supplier':
- $restrict = ['glpi_changes_suppliers.suppliers_id' => $item->getID()];
+ $restrict = "(`glpi_changes_suppliers`.`suppliers_id` = '" . $item->getID() . "')";
$order = '`glpi_changes`.`date_mod` DESC';
break;
case 'Group':
if ($tree) {
- $restrict = ['glpi_changes_groups.groups_id' => $dbu->getSonsOf('glpi_groups', $item->getID())];
+ $restrict = 'IN (' . implode(',', $dbu->getSonsOf('glpi_groups', $item->getID())) . ')';
} else {
- $restrict = ['glpi_changes_groups.groups_id' => $item->getID()];
+ $restrict = "='" . $item->getID() . "'";
}
- $restrict['glpi_changes_groups.type'] = CommonITILActor::REQUESTER;
+ $restrict = "(`glpi_changes_groups`.`groups_id` $restrict
+ AND `glpi_changes_groups`.`type` = " . CommonITILActor::REQUESTER . ')';
$order = '`glpi_changes`.`date_mod` DESC';
break;
default:
- $restrict = [
- 'glpi_changes_items.items_id' => $item->getID(),
- 'glpi_changes_items.itemtype' => $item->getType(),
- ];
+ $restrict = "(`items_id` = '" . $item->getID() . "'
+ AND `itemtype` = '" . $item->getType() . "')";
$order = '`glpi_changes`.`date_mod` DESC';
break;
}
@@ -226,7 +225,7 @@ public static function pdfForItem(PluginPdfSimplePDF $pdf, CommonDBTM $item, $tr
'DISTINCT' => true,
'FROM' => 'glpi_changes',
'LEFT JOIN' => $LEFT_JOIN,
- 'WHERE' => $restrict + $dbu->getEntitiesRestrictCriteria('glpi_changes'),
+ 'WHERE' => [$restrict] + $dbu->getEntitiesRestrictCriteria('glpi_changes'),
'ORDER' => $order,
'LIMIT' => (int) $_SESSION['glpilist_limit'],
];
From e6992b63aac9c34d19a28117ea630aae285fbb64 Mon Sep 17 00:00:00 2001
From: Julien Durand
Date: Tue, 8 Sep 2026 14:32:39 +0200
Subject: [PATCH 06/11] fix: Change_Item where clause
---
inc/change_item.class.php | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/inc/change_item.class.php b/inc/change_item.class.php
index 36140f55..e6ed3c5c 100644
--- a/inc/change_item.class.php
+++ b/inc/change_item.class.php
@@ -161,34 +161,35 @@ public static function pdfForItem(PluginPdfSimplePDF $pdf, CommonDBTM $item, $tr
$dbu = new DbUtils();
- $restrict = '';
+ $restrict = [];
$order = '';
switch ($item->getType()) {
case 'User':
- $restrict = "(`glpi_changes_users`.`users_id` = '" . $item->getID() . "')";
+ $restrict = ['glpi_changes_users.users_id' => $item->getID()];
$order = '`glpi_changes`.`date_mod` DESC';
break;
case 'Supplier':
- $restrict = "(`glpi_changes_suppliers`.`suppliers_id` = '" . $item->getID() . "')";
+ $restrict = ['glpi_changes_suppliers.suppliers_id' => $item->getID()];
$order = '`glpi_changes`.`date_mod` DESC';
break;
case 'Group':
if ($tree) {
- $restrict = 'IN (' . implode(',', $dbu->getSonsOf('glpi_groups', $item->getID())) . ')';
+ $restrict = ['glpi_changes_groups.groups_id' => $dbu->getSonsOf('glpi_groups', $item->getID())];
} else {
- $restrict = "='" . $item->getID() . "'";
+ $restrict = ['glpi_changes_groups.groups_id' => $item->getID()];
}
- $restrict = "(`glpi_changes_groups`.`groups_id` $restrict
- AND `glpi_changes_groups`.`type` = " . CommonITILActor::REQUESTER . ')';
+ $restrict['glpi_changes_groups.type'] = CommonITILActor::REQUESTER;
$order = '`glpi_changes`.`date_mod` DESC';
break;
default:
- $restrict = "(`items_id` = '" . $item->getID() . "'
- AND `itemtype` = '" . $item->getType() . "')";
+ $restrict = [
+ 'glpi_changes_items.items_id' => $item->getID(),
+ 'glpi_changes_items.itemtype' => $item->getType(),
+ ];
$order = '`glpi_changes`.`date_mod` DESC';
break;
}
@@ -225,7 +226,7 @@ public static function pdfForItem(PluginPdfSimplePDF $pdf, CommonDBTM $item, $tr
'DISTINCT' => true,
'FROM' => 'glpi_changes',
'LEFT JOIN' => $LEFT_JOIN,
- 'WHERE' => [$restrict] + $dbu->getEntitiesRestrictCriteria('glpi_changes'),
+ 'WHERE' => $restrict + $dbu->getEntitiesRestrictCriteria('glpi_changes'),
'ORDER' => $order,
'LIMIT' => (int) $_SESSION['glpilist_limit'],
];
From 9881b6af846c26e81e4bfc892ed0f4f3bc1b957d Mon Sep 17 00:00:00 2001
From: Julien Durand
Date: Wed, 9 Sep 2026 08:50:42 +0200
Subject: [PATCH 07/11] fix: usage of deprecated methods triggering warnings
---
inc/item_problem.class.php | 36 +++++++++----------------
inc/item_ticket.class.php | 55 +++++++++++++++++---------------------
2 files changed, 37 insertions(+), 54 deletions(-)
diff --git a/inc/item_problem.class.php b/inc/item_problem.class.php
index 32a83683..dffb9b5a 100644
--- a/inc/item_problem.class.php
+++ b/inc/item_problem.class.php
@@ -155,8 +155,7 @@ public static function pdfForProblem(PluginPdfSimplePDF $pdf, Problem $problem)
}
// Ajout de la restriction d'entités
- $entity_restrict = $dbu->getEntitiesRestrictRequest(
- '',
+ $entity_restrict = $dbu->getEntitiesRestrictCriteria(
$itemtable,
'',
'',
@@ -212,32 +211,34 @@ public static function pdfForItem(PluginPdfSimplePDF $pdf, CommonDBTM $item, $tr
$dbu = new DbUtils();
- $restrict = '';
+ $restrict = [];
$order = '';
switch ($item->getType()) {
case 'User':
- $restrict = "(`glpi_problems_users`.`users_id` = '" . $item->getID() . "')";
+ $restrict = ["glpi_problems_users.users_id" => $item->getID()];
$order = '`glpi_problems`.`date_mod` DESC';
break;
case 'Supplier':
- $restrict = "(`glpi_problems_suppliers`.`suppliers_id` = '" . $item->getID() . "')";
+ $restrict = ["glpi_problems_suppliers.suppliers_id" => $item->getID()];
$order = '`glpi_problems`.`date_mod` DESC';
break;
case 'Group':
if ($tree) {
- $restrict = 'IN (' . implode(',', $dbu->getSonsOf('glpi_groups', $item->getID())) . ')';
+ $restrict = ["glpi_groups_problems.groups_id" => $dbu->getSonsOf('glpi_groups', $item->getID())];
} else {
- $restrict = "='" . $item->getID() . "'";
+ $restrict = ["glpi_groups_problems.groups_id" => $item->getID()];
}
- $restrict = "(`glpi_groups_problems`.`groups_id` $restrict)";
+ //$restrict = "(`glpi_groups_problems`.`groups_id` $restrict)";
$order = '`glpi_problems`.`date_mod` DESC';
break;
default:
- $restrict = "(`items_id` = '" . $item->getID() . "'
- AND `itemtype` = '" . $item->getType() . "')";
+ $restrict = [
+ 'glpi_items_problems.items_id' => $item->getID(),
+ 'glpi_items_problems.itemtype' => $item->getType(),
+ ];
$order = '`glpi_problems`.`date_mod` DESC';
break;
}
@@ -294,25 +295,12 @@ public static function pdfForItem(PluginPdfSimplePDF $pdf, CommonDBTM $item, $tr
];
}
- $where_conditions = [];
-
- if (str_contains($restrict, 'IN (') || str_contains($restrict, 'AND') || str_contains($restrict, 'OR')) {
- $where_conditions[] = new QueryExpression($restrict);
- } else {
- $where_conditions[] = new QueryExpression($restrict);
- }
-
- $entity_restrict = $dbu->getEntitiesRestrictRequest('', 'glpi_problems');
- if (!empty($entity_restrict)) {
- $where_conditions[] = new QueryExpression($entity_restrict);
- }
-
$query_params = [
'SELECT' => $select_fields,
'DISTINCT' => true,
'FROM' => 'glpi_problems',
'LEFT JOIN' => $left_joins,
- 'WHERE' => $where_conditions,
+ 'WHERE' => $restrict + $dbu->getEntitiesRestrictCriteria('glpi_problems'),
'ORDER' => $order,
'LIMIT' => intval($_SESSION['glpilist_limit']),
];
diff --git a/inc/item_ticket.class.php b/inc/item_ticket.class.php
index e42b7128..7ba809ea 100644
--- a/inc/item_ticket.class.php
+++ b/inc/item_ticket.class.php
@@ -230,46 +230,54 @@ public static function pdfForItem(PluginPdfSimplePDF $pdf, CommonDBTM $item, $tr
return false;
}
- $restrict = '';
+ $restrict = [];
$order = '';
switch ($item->getType()) {
case 'User':
- $restrict = "(`glpi_tickets_users`.`users_id` = '" . $item->getID() . "'
- AND `glpi_tickets_users`.`type` = " . CommonITILActor::REQUESTER . ')';
+ $restrict = [
+ 'glpi_tickets_users.users_id' => $item->getID(),
+ 'glpi_tickets_users.type' => CommonITILActor::REQUESTER,
+ ];
$order = '`glpi_tickets`.`time_to_resolve` DESC';
break;
case 'SLA':
- $restrict = "(`slas_id` = '" . $item->getID() . "')";
+ $restrict = ['slas_id' => $item->getID()];
$order = '`glpi_tickets`.`time_to_resolve` DESC';
break;
case 'Supplier':
- $restrict = "(`glpi_suppliers_tickets`.`suppliers_id` = '" . $item->getID() . "'
- AND `glpi_suppliers_tickets`.`type` = " . CommonITILActor::ASSIGN . ')';
+ $restrict = [
+ 'glpi_suppliers_tickets.suppliers_id' => $item->getID(),
+ 'glpi_suppliers_tickets.type' => CommonITILActor::ASSIGN,
+ ];
$order = '`glpi_tickets`.`date_mod` DESC';
break;
case 'Group':
if ($tree) {
- $restrict = 'IN (' . implode(',', $dbu->getSonsOf('glpi_groups', $item->getID())) . ')';
+ $restrict = ['glpi_groups_tickets.groups_id' => $dbu->getSonsOf('glpi_groups', $item->getID())];
} else {
- $restrict = "='" . $item->getID() . "'";
+ $restrict = ['glpi_groups_tickets.groups_id' => $item->getID()];
}
- $restrict = "(`glpi_groups_tickets`.`groups_id` $restrict
- AND `glpi_groups_tickets`.`type` = " . CommonITILActor::REQUESTER . ')';
+ $restrict['glpi_groups_tickets.type'] = CommonITILActor::REQUESTER;
$order = '`glpi_tickets`.`date_mod` DESC';
break;
default:
- $restrict = "(`glpi_items_tickets`.`items_id` = '" . $item->getID() . "' " .
- " AND `glpi_items_tickets`.`itemtype` = '" . $item->getType() . "')";
+ $restrict = [
+ 'glpi_items_tickets.items_id' => $item->getID(),
+ 'glpi_items_tickets.itemtype' => $item->getType(),
+ ];
// you can only see your tickets
if (!Session::haveRight('ticket', Ticket::READALL)) {
- $restrict .= " AND (`glpi_tickets`.`users_id_recipient` = '" . Session::getLoginUserID() . "'
- OR (`glpi_tickets_users`.`tickets_id` = '" . $item->getID() . "'
- AND `glpi_tickets_users`.`users_id`
- = '" . Session::getLoginUserID() . "'))";
+ $restrict['OR'] = [
+ 'glpi_tickets.users_id_recipient' => Session::getLoginUserID(),
+ [
+ 'glpi_tickets_users.tickets_id' => $item->getID(),
+ 'glpi_tickets_users.users_id' => Session::getLoginUserID(),
+ ],
+ ];
}
$order = '`glpi_tickets`.`date_mod` DESC';
}
@@ -332,25 +340,12 @@ public static function pdfForItem(PluginPdfSimplePDF $pdf, CommonDBTM $item, $tr
];
}
- $where_conditions = [];
-
- if (str_contains($restrict, 'OR') || str_contains($restrict, 'AND')) {
- $where_conditions[] = new QueryExpression($restrict);
- } else {
- $where_conditions[] = $restrict;
- }
-
- $entity_restrict = $dbu->getEntitiesRestrictRequest('', 'glpi_tickets');
- if (!empty($entity_restrict)) {
- $where_conditions[] = new QueryExpression($entity_restrict);
- }
-
$query_params = [
'SELECT' => $select_fields,
'DISTINCT' => true,
'FROM' => 'glpi_tickets',
'LEFT JOIN' => $left_joins,
- 'WHERE' => $where_conditions,
+ 'WHERE' => $restrict + $dbu->getEntitiesRestrictCriteria('glpi_tickets'),
'ORDER' => $order,
'LIMIT' => intval($_SESSION['glpilist_limit']),
];
From 125b4a5adb8d4192418ce97c68fca69d35006974 Mon Sep 17 00:00:00 2001
From: Julien Durand
Date: Fri, 11 Sep 2026 15:47:29 +0200
Subject: [PATCH 08/11] fix: set default language to avoid 500 error if user
has no defined language
---
inc/user.class.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/inc/user.class.php b/inc/user.class.php
index 61e05357..6935208d 100644
--- a/inc/user.class.php
+++ b/inc/user.class.php
@@ -153,7 +153,7 @@ public static function pdfMain(PluginPdfSimplePDF $pdf, User $item)
'' . sprintf(
__s('%1$s: %2$s'),
__s('Language') . '
Date: Fri, 11 Sep 2026 15:48:20 +0200
Subject: [PATCH 09/11] fix: several pdf generation errors
---
inc/item_problem.class.php | 2 +-
inc/knowbaseitem.class.php | 13 ++++++++++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/inc/item_problem.class.php b/inc/item_problem.class.php
index dffb9b5a..e9676fe8 100644
--- a/inc/item_problem.class.php
+++ b/inc/item_problem.class.php
@@ -163,7 +163,7 @@ public static function pdfForProblem(PluginPdfSimplePDF $pdf, Problem $problem)
);
if (!empty($entity_restrict)) {
- $query_params['WHERE'][] = new QueryExpression($entity_restrict);
+ $query_params['WHERE'] += $entity_restrict;
}
$result_linked = $DB->request($query_params);
diff --git a/inc/knowbaseitem.class.php b/inc/knowbaseitem.class.php
index 677065bc..daf68484 100644
--- a/inc/knowbaseitem.class.php
+++ b/inc/knowbaseitem.class.php
@@ -30,6 +30,8 @@
* --------------------------------------------------------------------------
*/
+use Glpi\Form\ServiceCatalog\ServiceCatalog;
+
class PluginPdfKnowbaseItem extends PluginPdfCommon
{
public static string $rightname = 'plugin_pdf';
@@ -47,6 +49,11 @@ public function defineAllTabsPDF($options = [])
unset($onglets['KnowbaseItemTranslation$1']);
unset($onglets['KnowbaseItem_Revision$1']);
+ $this->obj->addStandardTab(Document_Item::class, $onglets, $options);
+ $this->obj->addStandardTab(ServiceCatalog::class, $onglets, $options);
+ $this->obj->addStandardTab(Log::class, $onglets, $options);
+ $this->obj->addStandardTab(KnowbaseItem_Comment::class, $onglets, $options);
+
return $onglets;
}
@@ -63,11 +70,11 @@ public static function pdfMain(PluginPdfSimplePDF $pdf, KnowbaseItem $item)
return false;
}
- $knowbaseitemcategories_id = $item->getField('knowbaseitemcategories_id');
+ $forms_categories_id = $item->getField('forms_categories_id');
$fullcategoryname
= Toolbox::stripTags($dbu->getTreeValueCompleteName(
- 'glpi_knowbaseitemcategories',
- $knowbaseitemcategories_id,
+ 'glpi_forms_categories',
+ (int) $forms_categories_id,
));
$question
From e251bc41c9144fd518604270e2334250e498f160 Mon Sep 17 00:00:00 2001
From: Julien Durand
Date: Mon, 14 Sep 2026 09:28:12 +0200
Subject: [PATCH 10/11] chore: rector
---
inc/item_problem.class.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/inc/item_problem.class.php b/inc/item_problem.class.php
index e9676fe8..f086fa57 100644
--- a/inc/item_problem.class.php
+++ b/inc/item_problem.class.php
@@ -30,7 +30,7 @@
* --------------------------------------------------------------------------
*/
-use Glpi\DBAL\QueryExpression;
+
/**
* -------------------------------------------------------------------------
@@ -162,7 +162,7 @@ public static function pdfForProblem(PluginPdfSimplePDF $pdf, Problem $problem)
$item->maybeRecursive(),
);
- if (!empty($entity_restrict)) {
+ if ($entity_restrict !== []) {
$query_params['WHERE'] += $entity_restrict;
}
From d7b20fe998e6cfed4c64be8178aa1b7b3bd0109a Mon Sep 17 00:00:00 2001
From: Julien DURAND
Date: Tue, 6 Oct 2026 08:45:03 +0200
Subject: [PATCH 11/11] fix: pdf display with tcpdf (#93)
* fix: pdf display with tcpdf
* fix: header display
Co-authored-by: Romain B. <8530352+Rom1-B@users.noreply.github.com>
* fix: word not spliting if it contains no delimiter
If a word is too long and has no delimiter, it will overflow
Co-authored-by: Romain B. <8530352+Rom1-B@users.noreply.github.com>
* fix: header logo display
* chore: Add unit tests
* chore: changelog
---------
Co-authored-by: Romain B. <8530352+Rom1-B@users.noreply.github.com>
---
CHANGELOG.md | 1 +
inc/document.class.php | 2 +-
inc/simplepdf.class.php | 119 ++++++++++++++++++++++++++++++++++++----
phpunit.xml | 18 ++++++
tests/SimplePDFTest.php | 100 +++++++++++++++++++++++++++++++++
tests/bootstrap.php | 40 ++++++++++++++
6 files changed, 269 insertions(+), 11 deletions(-)
create mode 100644 phpunit.xml
create mode 100644 tests/SimplePDFTest.php
create mode 100644 tests/bootstrap.php
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c49bcd9..c3f84d39 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Fixed
+- Broken display in PDF since TCPDF 7
- Dependencies conflicts with core
- Internal server error when generating appliance asset pdf
- CI: fix Psalm cache directory, declare a unique composer autoloader suffix
diff --git a/inc/document.class.php b/inc/document.class.php
index ad67286c..0b2d7eb5 100644
--- a/inc/document.class.php
+++ b/inc/document.class.php
@@ -77,7 +77,7 @@ public static function pdfForItem(PluginPdfSimplePDF $pdf, CommonDBTM $item)
}
$pdf->displayTitle($title);
- $pdf->setColumnsSize(20, 15, 10, 10, 10, 8, 20, 7);
+ $pdf->setColumnsSize(18, 14, 9, 9, 9, 13, 17, 11);
$pdf->displayTitle(
__s('Name'),
__s('Entity'),
diff --git a/inc/simplepdf.class.php b/inc/simplepdf.class.php
index b2370ff0..981778b2 100644
--- a/inc/simplepdf.class.php
+++ b/inc/simplepdf.class.php
@@ -35,6 +35,13 @@
//use TCPDF;
define('K_PATH_IMAGES', '');
+
+if (!defined('K_ALLOWED_PATHS')) {
+ define('K_ALLOWED_PATHS', [
+ GLPI_PICTURE_DIR,
+ Plugin::getPhpDir('pdf') . '/public/pics',
+ ]);
+}
class PluginPdfSimplePDF
{
// Page orientation
@@ -95,7 +102,6 @@ public function __construct($format = 'A4', $orient = '')
//set auto page breaks
$pdf->SetAutoPageBreak(true, 15);
-
// For standard language
// set font
$pdf->SetFont($font, '', 8);
@@ -128,11 +134,12 @@ public function setHeader($msg)
!empty($hook['logo_path'])
&& $config->getField('use_branding_logo')
) {
- $this->pdf->SetHeaderData($hook['logo_path'], 15, $msg, '');
+ $logo_path = $hook['logo_path'];
} else {
- $path = Plugin::getPhpDir('pdf') . '/public/pics/';
- $this->pdf->SetHeaderData($path . 'fd_logo.png', 15, $msg, '');
+ $logo_path = Plugin::getPhpDir('pdf') . '/public/pics/fd_logo.png';
}
+
+ $this->pdf->SetHeaderData($logo_path, 15, $msg, '');
}
/**
@@ -225,6 +232,75 @@ public function displayBox($gray)
Toolbox::deprecated('Calling this function is deprecated');
}
+ /**
+ * Prepare a cell's content so it wraps inside its column instead of overflowing past it.
+ *
+ * @param $msg String cell content (plain text or HTML)
+ * @param $width Float usable width of the target column (mm)
+ **/
+ private function wrapCellContent($msg, $width)
+ {
+ $msg = (string) $msg;
+ if ($width <= 0 || str_contains($msg, '<')) {
+ return $msg;
+ }
+
+ // Check width word by word
+ $words = explode(' ', $msg);
+ foreach ($words as &$word) {
+ $word = $this->breakWordToFit($word, $width);
+ }
+ unset($word);
+
+ return implode(' ', $words);
+ }
+
+ /**
+ * Insert the minimum number of breakable spaces needed for a single word to fit a width.
+ *
+ * @param $word String single word (no spaces) to fit
+ * @param $width Float usable width of the target column (mm)
+ **/
+ private function breakWordToFit($word, $width)
+ {
+ if ($this->pdf->GetStringWidth($word) <= $width) {
+ return $word;
+ }
+
+ preg_match_all('/[\/\\\\_.@:-]/', $word, $matches, PREG_OFFSET_CAPTURE);
+ $breakpoints = array_map(static fn($match) => $match[1] + 1, $matches[0]);
+ if ($breakpoints === []) {
+ // No delimiter to split on: force a character-level break so the word still fits.
+ $result = '';
+ $chunk = '';
+ foreach (preg_split('//u', $word, -1, PREG_SPLIT_NO_EMPTY) as $char) {
+ if ($chunk !== '' && $this->pdf->GetStringWidth($chunk . $char) > $width) {
+ $result .= $chunk . ' ';
+ $chunk = '';
+ }
+ $chunk .= $char;
+ }
+
+ return $result . $chunk;
+ }
+ $breakpoints[] = strlen($word);
+
+ $result = '';
+ $linestart = 0;
+ $lastfit = 0;
+ foreach ($breakpoints as $point) {
+ $fits = $this->pdf->GetStringWidth(substr($word, $linestart, $point - $linestart)) <= $width;
+ if (!$fits && $lastfit > $linestart) {
+ $result .= substr($word, $linestart, $lastfit - $linestart) . ' ';
+ $linestart = $lastfit;
+ }
+ $lastfit = $point;
+ }
+ $result .= substr($word, $linestart);
+
+ return $result;
+ }
+
/**
* display a row
*
@@ -236,16 +312,26 @@ public function displayBox($gray)
**/
private function displayInternal($gray, $padd, $defalign, $miny, $msgs)
{
+ $msgs = array_map(
+ fn($msg, $i) => $this->wrapCellContent($msg, ($this->colsw[$i] ?? 0) - (2 * $padd)),
+ $msgs,
+ array_keys($msgs),
+ );
+
$this->pdf->SetFillColor($gray, $gray, $gray);
$this->pdf->SetCellPadding($padd);
$max = $miny;
+ $rowy = $this->pdf->GetY();
+ $pageatstart = $this->pdf->getPage();
+ $measurey = $this->pdf->getMargins()['top'];
- /* dry run - compute max cell height */
+ /* Dry run - compute max cell height. */
$this->pdf->startTransaction();
$i = 0;
foreach ($msgs as $msg) {
if ($i < count($this->cols)) {
+ $this->pdf->SetXY($this->colsx[$i], $measurey);
$this->pdf->writeHTMLCell(
$this->colsw[$i], // $w (float) Cell width. If 0, the cell extends up to the right margin.
$miny, // $h (float) Cell minimum height. The cell extends automatically if needed.
@@ -253,23 +339,31 @@ private function displayInternal($gray, $padd, $defalign, $miny, $msgs)
'', // $y (float) upper-left corner Y coordinate
$msg, // $html (string) html text to print. Default value: empty string.
0, // $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:0: no border (default) 1: frame L: left T: top R: right B: bottom 0: to the right (or left for RTL language) 1: to the beginning of the next line 2: below 0: to the right (or left for RTL language) 1: to the beginning of the next line 2: below L : left align C : center R : right align '' : empty string : left for LTR or right for RTL
+
+
+ src
+
+
+
+
+
+ tests
+
+
+
diff --git a/tests/SimplePDFTest.php b/tests/SimplePDFTest.php
new file mode 100644
index 00000000..339a3b71
--- /dev/null
+++ b/tests/SimplePDFTest.php
@@ -0,0 +1,100 @@
+.
+ *
+ * @author Nelly Mahu-Lasson, Remi Collet, Teclib
+ * @author Teclib
+ * @copyright Copyright (c) 2009-2026 PDF plugin team
+ * @license AGPL License 3.0 or (at your option) any later version
+ * @link https://github.com/pluginsGLPI/pdf/
+ * @link http://www.glpi-project.org/
+ * @package pdf
+ * @since 2009
+ * http://www.gnu.org/licenses/agpl-3.0-standalone.html
+ * --------------------------------------------------------------------------
+ */
+
+use Glpi\Tests\GLPITestCase;
+
+class SimplePDFTest extends GLPITestCase
+{
+ private function getStringWidth(PluginPdfSimplePDF $pdf, string $string): float
+ {
+ $property = new ReflectionProperty(PluginPdfSimplePDF::class, 'pdf');
+
+ return $property->getValue($pdf)->GetStringWidth($string);
+ }
+
+ public function testWrapCellContentLeavesHtmlUntouched(): void
+ {
+ $pdf = new PluginPdfSimplePDF();
+ $html = '' . str_repeat('a', 200) . ' ';
+
+ $this->assertSame($html, $this->callPrivateMethod($pdf, 'wrapCellContent', $html, 10));
+ }
+
+ public function testWrapCellContentLeavesContentUntouchedWhenWidthIsNotPositive(): void
+ {
+ $pdf = new PluginPdfSimplePDF();
+ $msg = str_repeat('a', 200);
+
+ $this->assertSame($msg, $this->callPrivateMethod($pdf, 'wrapCellContent', $msg, 0));
+ }
+
+ public function testBreakWordToFitLeavesWordUntouchedWhenItAlreadyFits(): void
+ {
+ $pdf = new PluginPdfSimplePDF();
+
+ $this->assertSame('short', $this->callPrivateMethod($pdf, 'breakWordToFit', 'short', 100));
+ }
+
+ public function testBreakWordToFitSplitsOnDelimiters(): void
+ {
+ $pdf = new PluginPdfSimplePDF();
+ $word = str_repeat('a', 20) . '/' . str_repeat('b', 20) . '-' . str_repeat('c', 20);
+ $width = $this->getStringWidth($pdf, str_repeat('a', 30));
+
+ $result = $this->callPrivateMethod($pdf, 'breakWordToFit', $word, $width);
+ $chunks = explode(' ', $result);
+
+ $this->assertSame($word, str_replace(' ', '', $result));
+ $this->assertGreaterThan(1, count($chunks));
+ foreach ($chunks as $chunk) {
+ $this->assertLessThanOrEqual($width, $this->getStringWidth($pdf, $chunk));
+ }
+ }
+
+ public function testBreakWordToFitFallsBackToCharacterSplitWithoutDelimiters(): void
+ {
+ $pdf = new PluginPdfSimplePDF();
+ $word = str_repeat('a', 200);
+ $width = $this->getStringWidth($pdf, str_repeat('a', 10));
+
+ $result = $this->callPrivateMethod($pdf, 'breakWordToFit', $word, $width);
+ $chunks = explode(' ', $result);
+
+ $this->assertSame($word, str_replace(' ', '', $result));
+ $this->assertGreaterThan(1, count($chunks));
+ foreach ($chunks as $chunk) {
+ $this->assertNotSame('', $chunk);
+ $this->assertLessThanOrEqual($width, $this->getStringWidth($pdf, $chunk));
+ }
+ }
+}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 00000000..f87da9ae
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,40 @@
+.
+ *
+ * @author Nelly Mahu-Lasson, Remi Collet, Teclib
+ * @copyright Copyright (c) 2009-2022 PDF plugin team
+ * @license AGPL License 3.0 or (at your option) any later version
+ * @link https://github.com/pluginsGLPI/pdf/
+ * @link http://www.glpi-project.org/
+ * @package pdf
+ * @since 2009
+ * http://www.gnu.org/licenses/agpl-3.0-standalone.html
+ * --------------------------------------------------------------------------
+ */
+
+$current_plugin_folder = basename(dirname(__DIR__));
+
+require __DIR__ . '/../../../tests/bootstrap.php';
+require dirname(__DIR__) . '/vendor/autoload.php';
+
+if (!Plugin::isPluginActive($current_plugin_folder)) {
+ throw new RuntimeException(sprintf('Plugin %s is not active in the test database', $current_plugin_folder));
+}