Skip to content

GLPI 11 compatibility #148

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

Merged
Rom1-B merged 3 commits into from
Sep 30, 2025
Merged

GLPI 11 compatibility #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df78459
GLPI 11 compatibility
stonebuzz Jun 26, 2025
54e6b51
fix path
stonebuzz Sep 10, 2025
0a66368
Clean composer.json
Rom1-B Sep 30, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
name: "Generate CI matrix"
uses: "glpi-project/plugin-ci-workflows/.github/workflows/generate-ci-matrix.yml@v1"
with:
glpi-version: "10.0.x"
glpi-version: "11.0.x"
ci:
name: "GLPI ${{ matrix.glpi-version }} - php:${{ matrix.php-version }} - ${{ matrix.db-image }}"
needs: "generate-ci-matrix"
Expand Down
212 changes: 109 additions & 103 deletions ajax/dropdownReplaceFindDevice.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@

include('../../../inc/includes.php');

use Glpi\Exception\Http\AccessDeniedHttpException;
use Glpi\Exception\Http\BadRequestHttpException;
use Glpi\Toolbox\Sanitizer;

header("Content-Type: text/html; charset=UTF-8");
Expand All @@ -46,128 +48,132 @@
global $UNINSTALL_TYPES, $UNINSTALL_DIRECT_CONNECTIONS_TYPE, $CFG_GLPI, $DB;

if (!in_array($_REQUEST['itemtype'], array_merge($UNINSTALL_TYPES, $UNINSTALL_DIRECT_CONNECTIONS_TYPE))) {
Html::displayErrorAndDie(__("You don't have permission to perform this action."));
throw new AccessDeniedHttpException(__("You don't have permission to perform this action."));
}

$itemtypeisplugin = isPluginItemType($_REQUEST['itemtype']);
$item = new $_REQUEST['itemtype']();
$table = getTableForItemType($_REQUEST['itemtype']);
$options = [];
$count = 0;
$datastoadd = [];

$displaywith = false;
if (isset($_REQUEST['displaywith'])) {
if (is_array($_REQUEST['displaywith']) && count($_REQUEST['displaywith'])) {
$displaywith = true;
if (class_exists($_REQUEST['itemtype']) && is_a($_REQUEST['itemtype'], CommonDBTM::class, true)) {
$itemtypeisplugin = isPluginItemType($_REQUEST['itemtype']);
$item = new $_REQUEST['itemtype']();
$table = getTableForItemType($_REQUEST['itemtype']);
$options = [];
$count = 0;
$datastoadd = [];

$displaywith = false;
if (isset($_REQUEST['displaywith'])) {
if (is_array($_REQUEST['displaywith']) && count($_REQUEST['displaywith'])) {
$displaywith = true;
}
}
}

$criteria = [
'FROM' => $table,
'WHERE' => [],
];

if ($item->isEntityAssign()) {
// allow opening ticket on recursive object (printer, software, ...)
$criteria['WHERE'] = getEntitiesRestrictCriteria($table, '', $_SESSION['glpiactiveentities'], $item->maybeRecursive());
}

if ($item->maybeDeleted()) {
$criteria['WHERE']['is_deleted'] = 0;
}
if ($item->maybeTemplate()) {
$criteria['WHERE']['is_template'] = 0;
}

if (
isset($_REQUEST['searchText'])
&& strlen($_REQUEST['searchText']) > 0
&& $_REQUEST['searchText'] != $CFG_GLPI["ajax_wildcard"]
) {
// isset already makes sure the search value isn't null
$search_val = Search::makeTextSearchValue($_REQUEST['searchText']);
$criteria['WHERE'][] = [
'OR' => [
'name' => ['LIKE', $search_val],
'id' => ['LIKE', $search_val],
'serial' => ['LIKE', $search_val],
'otherserial' => ['LIKE', $search_val],
],
$criteria = [
'FROM' => $table,
'WHERE' => [],
];
}

//If software or plugins : filter to display only the objects that are allowed to be visible in Helpdesk
if (in_array($_REQUEST['itemtype'], $CFG_GLPI["helpdesk_visible_types"])) {
$criteria['WHERE']['is_helpdesk_visible'] = 1;
}
if ($item->isEntityAssign()) {
// allow opening ticket on recursive object (printer, software, ...)
$criteria['WHERE'] = getEntitiesRestrictCriteria($table, '', $_SESSION['glpiactiveentities'], $item->maybeRecursive());
}

if (isset($_REQUEST['used'])) {
$used = $_REQUEST['used'];
if ($item->maybeDeleted()) {
$criteria['WHERE']['is_deleted'] = 0;
}
if ($item->maybeTemplate()) {
$criteria['WHERE']['is_template'] = 0;
}

if (count($used)) {
if (
isset($_REQUEST['searchText'])
&& strlen($_REQUEST['searchText']) > 0
&& $_REQUEST['searchText'] != $CFG_GLPI["ajax_wildcard"]
) {
// isset already makes sure the search value isn't null
$search_val = Search::makeTextSearchValue($_REQUEST['searchText']);
$criteria['WHERE'][] = [
'NOT' => ["$table.id" => $used],
'OR' => [
'name' => ['LIKE', $search_val],
'id' => ['LIKE', $search_val],
'serial' => ['LIKE', $search_val],
'otherserial' => ['LIKE', $search_val],
],
];
}
}

if (isset($_REQUEST['current_item']) && ($_REQUEST['current_item'] > 0)) {
$criteria['WHERE']['id'] = ['!=', $_REQUEST['current_item']];
}
//If software or plugins : filter to display only the objects that are allowed to be visible in Helpdesk
if (in_array($_REQUEST['itemtype'], $CFG_GLPI["helpdesk_visible_types"])) {
$criteria['WHERE']['is_helpdesk_visible'] = 1;
}

$criteria['START'] = 0;
$criteria['LIMIT'] = $CFG_GLPI["dropdown_max"];
$criteria['ORDER'] = ['name'];
if (isset($_REQUEST['used'])) {
$used = $_REQUEST['used'];

if (
isset($_REQUEST['searchText'])
&& $_REQUEST['searchText'] == $CFG_GLPI["ajax_wildcard"]
) {
unset($criteria['LIMIT']);
}

$it = $DB->request($criteria);
foreach ($it as $data) {
$outputval = Sanitizer::unsanitize($data["name"]);

if ($displaywith) {
foreach ($_REQUEST['displaywith'] as $key) {
if (isset($data[$key])) {
$withoutput = $data[$key];
if (isForeignKeyField($key)) {
$withoutput = Dropdown::getDropdownName(
getTableNameForForeignKeyField($key),
$data[$key],
);
}
if ((strlen($withoutput) > 0) && ($withoutput != ' ')) {
$outputval = sprintf(__('%1$s - %2$s'), $outputval, $withoutput);
}
}
if (count($used)) {
$criteria['WHERE'][] = [
'NOT' => ["$table.id" => $used],
];
}
}
$ID = $data['id'];
$addcomment = "";
$title = $outputval;
if (isset($data["comment"])) {
$addcomment .= $data["comment"];
$title = sprintf(__('%1$s - %2$s'), $title, $addcomment);

if (isset($_REQUEST['current_item']) && ($_REQUEST['current_item'] > 0)) {
$criteria['WHERE']['id'] = ['!=', $_REQUEST['current_item']];
}

$criteria['START'] = 0;
$criteria['LIMIT'] = $CFG_GLPI["dropdown_max"];
$criteria['ORDER'] = ['name'];

if (
$_SESSION["glpiis_ids_visible"]
|| (strlen($outputval) == 0)
isset($_REQUEST['searchText'])
&& $_REQUEST['searchText'] == $CFG_GLPI["ajax_wildcard"]
) {
$outputval = sprintf(__('%1$s (%2$s)'), $outputval, $ID);
unset($criteria['LIMIT']);
}

$it = $DB->request($criteria);
foreach ($it as $data) {
$outputval = $data["name"];

if ($displaywith) {
foreach ($_REQUEST['displaywith'] as $key) {
if (isset($data[$key])) {
$withoutput = $data[$key];
if (isForeignKeyField($key)) {
$withoutput = Dropdown::getDropdownName(
getTableNameForForeignKeyField($key),
$data[$key],
);
}
if ((strlen($withoutput) > 0) && ($withoutput != ' ')) {
$outputval = sprintf(__('%1$s - %2$s'), $outputval, $withoutput);
}
}
}
}
$ID = $data['id'];
$addcomment = "";
$title = $outputval;
if (isset($data["comment"])) {
$addcomment .= $data["comment"];
$title = sprintf(__('%1$s - %2$s'), $title, $addcomment);
}
if (
$_SESSION["glpiis_ids_visible"]
|| (strlen($outputval) == 0)
) {
$outputval = sprintf(__('%1$s (%2$s)'), $outputval, $ID);
}
array_push($options, ['id' => $ID,
'text' => $outputval,
'title' => $title,
]);
$count++;
}
array_push($options, ['id' => $ID,
'text' => $outputval,
'title' => $title,
]);
$count++;
}


echo json_encode(['results' => $options,
'count' => $count,
]);
echo json_encode(['results' => $options,
'count' => $count,
]);
} else {
throw new BadRequestHttpException();
}
19 changes: 8 additions & 11 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
{
"require": {
"php": ">=7.4"
"php": ">=8.2"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.86",
"glpi-project/tools": "^0.8.0",
"php-parallel-lint/php-parallel-lint": "^1.4",
"phpstan/extension-installer": "^1.4",
"phpstan/phpstan": "^2.1",
"phpstan/phpstan-deprecation-rules": "^2.0"
"glpi-project/tools": "^0.8"
},
"config": {
"optimize-autoloader": true,
"platform": {
"php": "7.4.0"
"php": "8.2.99"
},
"sort-packages": true,
"allow-plugins": {
"phpstan/extension-installer": true
"sort-packages": true
},
"autoload-dev": {
"psr-4": {
"Glpi\\Tools\\": "../../tools/src/"
}
}
}
Loading
Loading