Skip to content

[Fix] 45721: PDF Generation involving a network port that has multiple IPs #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jdurand-teclib wants to merge 11 commits into
base: main
Choose a base branch
from
+28 −15
Open

[Fix] 45721: PDF Generation involving a network port that has multiple IPs #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f7da623
fix(45721): Error when generating a pdf containing a network port wit…
jdurand-teclib Aug 10, 2026
dc447f1
chore(45721): linter
jdurand-teclib Aug 10, 2026
84b0d02
chore(45721): Update changelog
jdurand-teclib Aug 10, 2026
a47e662
Update inc/networkport.class.php
jdurand-teclib Aug 10, 2026
ab8ce65
Update inc/networkport.class.php
jdurand-teclib Aug 10, 2026
3742807
Update inc/networkport.class.php
jdurand-teclib Aug 10, 2026
7ecc23b
Update inc/networkport.class.php
jdurand-teclib Aug 10, 2026
01561b9
Update inc/networkport.class.php
jdurand-teclib Aug 11, 2026
80c7d6d
Update inc/networkport.class.php
jdurand-teclib Aug 11, 2026
fb983be
fix(45721): broken code following last diff suggestion implementation
jdurand-teclib Aug 11, 2026
2b74b33
fix(45721): Restore where condition after it was accidentally deleted
jdurand-teclib Aug 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

### Fixed

- Fix PDF Generation involving a Network port with multiple IPs
- Fix PDF export of tabs renamed in GLPI 11

## [4.1.4] - 2026-07-30
Expand Down
42 changes: 27 additions & 15 deletions inc/networkport.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,27 +138,39 @@ public static function pdfForItem(PluginPdfSimplePDF $pdf, CommonDBTM $item)
$netport->fields['mac'],
));

$sqlip = ['LEFT JOIN' => ['glpi_networknames'
=> ['FKEY' => ['glpi_ipaddresses' => 'items_id',
'glpi_networknames' => 'id'],
['glpi_ipaddresses.entities_id'
=> $_SESSION['glpiactive_entity']]]],
'WHERE' => ['glpi_networknames.items_id' => $netport->fields['id']]];

$ipname = '';
$ip = new IPAddress();
if ($ip->getFromDBByRequest($sqlip)) {
$ipname = $ip->fields['name'];

$pdf->displayLine('<b>' . sprintf(__s('%1$s: %2$s'), __s('ip') . '</b>', $ipname));
$ips = $DB->request(
[
'SELECT' => [IPAddress::getTable() . '.*'],
'FROM' => IPAddress::getTable(),
'LEFT JOIN' => [
'glpi_networknames' => [
'FKEY' => [
'glpi_ipaddresses' => 'items_id',
'glpi_networknames' => 'id',
],
[
'glpi_ipaddresses.entities_id' => $_SESSION['glpiactive_entity'],
],
],
],
'WHERE' => [
'glpi_networknames.items_id' => $netport->fields['id'],
'glpi_networknames.itemtype' => NetworkPort::class,
],
],
);

foreach ($ips as $ip) {

$pdf->displayLine('<b>' . sprintf(__s('%1$s: %2$s'), __s('ip') . '</b>', $ip['name']));

$sql = ['SELECT' => 'glpi_ipaddresses_ipnetworks.ipnetworks_id',
'FROM' => 'glpi_ipaddresses_ipnetworks',
'LEFT JOIN' => ['glpi_ipnetworks'
=> ['FKEY' => ['glpi_ipaddresses_ipnetworks' => 'ipnetworks_id',
'glpi_ipnetworks' => 'id']]],
'WHERE' => ['glpi_ipaddresses_ipnetworks.ipaddresses_id' => $ip->getID()]
+ $dbu->getEntitiesRestrictCriteria('glpi_ipnetworks')];
'WHERE' => ['glpi_ipaddresses_ipnetworks.ipaddresses_id' => $ip['id']]
+ $dbu->getEntitiesRestrictCriteria('glpi_ipnetworks')];

$res = $DB->request($sql);
foreach ($res as $row) {
Expand Down