Skip to content

Fix crash with PDF plugin virtual objects lacking getID() #405

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
grillodemetal wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix crash with PDF plugin virtual objects lacking getID() #405

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 25 additions & 17 deletions src/Ocslink.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1006,26 +1006,34 @@ public static function getHistoryEntry($data)
*
* @return int
*/
public static function getOCSServerForItem(CommonGLPI $item)
{
global $DB;
$dbu = new DbUtils();
$query = "SELECT *
FROM `glpi_plugin_ocsinventoryng_ocslinks`
WHERE `computers_id` = " . $item->getID() . " " .
$dbu->getEntitiesRestrictRequest("AND", "glpi_plugin_ocsinventoryng_ocslinks");
public static function getOCSServerForItem(CommonGLPI $item)
{
global $DB;

$result = $DB->doQuery($query);
if ($DB->numrows($result) > 0) {
$data = $DB->fetchAssoc($result);
// Evita errores con objetos virtuales del plugin PDF
if (!method_exists($item, 'getID')) {
return 0;
}

if (count($data)) {
return $data['plugin_ocsinventoryng_ocsservers_id'];
}
$dbu = new DbUtils();

return false;
}
}
$query = "SELECT *
FROM `glpi_plugin_ocsinventoryng_ocslinks`
WHERE `computers_id` = " . $item->getID() . " " .
$dbu->getEntitiesRestrictRequest("AND", "glpi_plugin_ocsinventoryng_ocslinks");

$result = $DB->doQuery($query);

if ($DB->numrows($result) > 0) {
$data = $DB->fetchAssoc($result);

if (count($data)) {
return $data['plugin_ocsinventoryng_ocsservers_id'];
}
}

return 0;
}

/**
* Make the item link between glpi and ocs.
Expand Down