Skip to content

Glpi 11.04 adapt #43

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
jpnr79 wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Glpi 11.04 adapt #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5909bea
glpi 11 update
jpnr79 Dec 12, 2025
8a10948
a
jpnr79 Dec 12, 2025
1aadc70
a
jpnr79 Dec 12, 2025
7584470
11
jpnr79 Dec 13, 2025
4f43829
11
jpnr79 Dec 14, 2025
60ecda7
Add plugin version modifications function for database migrations
jpnr79 Dec 14, 2025
1a3e050
Refactor setup.php to improve structure and remove redundant declarat…
jpnr79 Dec 14, 2025
749dee0
Rename function for plugin version modifications to improve clarity
jpnr79 Dec 14, 2025
c962a20
Refactor hook.php and setup.php to improve structure and ensure GLPI_…
jpnr79 Dec 15, 2025
0cbbc5d
Remove deprecated autofix backup files for setup.php
jpnr79 Dec 15, 2025
9571e4a
Fix null handling for fields in multiple classes to prevent potential…
jpnr79 Dec 15, 2025
d2a8e9b
Refactor field access to ensure consistent null handling across multi…
jpnr79 Dec 15, 2025
64f1189
Enhance error handling and logging during plugin installation and uni…
jpnr79 Dec 28, 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
10 changes: 5 additions & 5 deletions ajax/dropdownAllItems.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
*/

header("Content-Type: text/html; charset=UTF-8");
Html::header_nocache();
Session::checkLoginUser();
\Html::header_nocache();
\Session::checkLoginUser();

global $CFG_GLPI;

Expand All @@ -47,15 +47,15 @@

$rand = mt_rand();

$field_id = Html::cleanId("dropdown_" . $_POST["name"] . $rand);
$field_id = \Html::cleanId("dropdown_" . $_POST["name"] . $rand);

$p = [
'value' => 0,
'valuename' => Dropdown::EMPTY_VALUE,
'itemtype' => $_POST["idtable"],
'display_emptychoice' => true,
'displaywith' => ['otherserial', 'serial'],
'_idor_token' => Session::getNewIDORToken($_POST["idtable"]),
'_idor_token' => \Session::getNewIDORToken($_POST["idtable"]),
];
if (isset($_POST['value'])) {
$p['value'] = $_POST['value'];
Expand All @@ -75,7 +75,7 @@
$p['condition'] = Dropdown::addNewCondition(["id" =>$user_groups]);
}

echo Html::jsAjaxDropdown(
echo \Html::jsAjaxDropdown(
$_POST["name"],
$field_id,
$CFG_GLPI['root_doc'] . "/ajax/" . $link,
Expand Down
4 changes: 2 additions & 2 deletions ajax/request.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
use GlpiPlugin\Consumables\Request;
use GlpiPlugin\Consumables\Validation;

Session::checkRight('plugin_consumables_request', 1);
Session::checkLoginUser();
\Session::checkRight('plugin_consumables_request', 1);
\Session::checkLoginUser();

switch ($_POST['action']) {
case 'addToCart':
Expand Down
4 changes: 2 additions & 2 deletions front/option.form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@

use GlpiPlugin\Consumables\Option;

Session::checkLoginUser();
\Session::checkLoginUser();

$option = new Option();

if (isset($_POST["add_groups"])
|| isset($_POST["delete_groups"])
|| isset($_POST["update"])) {
$option->update($_POST);
Html::back();
\Html::back();
}
16 changes: 8 additions & 8 deletions front/validation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@
use GlpiPlugin\Consumables\Wizard;
use GlpiPlugin\Servicecatalog\Main;

Session::checkLoginUser();
\Session::checkLoginUser();

if ($_SESSION['glpiactiveprofile']['interface'] == 'central') {
Html::header(Wizard::getTypeName(2), '', "management", Menu::class);
\Html::header(Wizard::getTypeName(2), '', "management", Menu::class);
} else {
if (Plugin::isPluginActive('servicecatalog')) {
if (\Plugin::isPluginActive('servicecatalog')) {
Main::showDefaultHeaderHelpdesk(Wizard::getTypeName(2));
} else {
Html::helpHeader(Wizard::getTypeName(2));
\Html::helpHeader(Wizard::getTypeName(2));
}
}

Expand All @@ -60,14 +60,14 @@
];
Search::showList(Validation::class,$p);

if (Session::getCurrentInterface() != 'central'
&& Plugin::isPluginActive('servicecatalog')) {
if (\Session::getCurrentInterface() != 'central'
&& \Plugin::isPluginActive('servicecatalog')) {

Main::showNavBarFooter('consumables');
}

if ($_SESSION['glpiactiveprofile']['interface'] == 'central') {
Html::footer();
\Html::footer();
} else {
Html::helpFooter();
\Html::helpFooter();
}
16 changes: 8 additions & 8 deletions front/wizard.form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@
use GlpiPlugin\Consumables\Wizard;
use GlpiPlugin\Servicecatalog\Main;

Session::checkRight('plugin_consumables_request', READ);
\Session::checkRight('plugin_consumables_request', READ);

if ($_SESSION['glpiactiveprofile']['interface'] == 'central') {
Html::header(Wizard::getTypeName(2), '', "management", Menu::class);
\Html::header(Wizard::getTypeName(2), '', "management", Menu::class);
} else {
if (Plugin::isPluginActive('servicecatalog')) {
if (\Plugin::isPluginActive('servicecatalog')) {
Main::showDefaultHeaderHelpdesk(Wizard::getTypeName(2));
} else {
Html::helpHeader(Wizard::getTypeName(2));
\Html::helpHeader(Wizard::getTypeName(2));
}
}

Expand Down Expand Up @@ -76,14 +76,14 @@
}
}

if (Session::getCurrentInterface() != 'central'
&& Plugin::isPluginActive('servicecatalog')) {
if (\Session::getCurrentInterface() != 'central'
&& \Plugin::isPluginActive('servicecatalog')) {

Main::showNavBarFooter('consumables');
}

if ($_SESSION['glpiactiveprofile']['interface'] == 'central') {
Html::footer();
\Html::footer();
} else {
Html::helpFooter();
\Html::helpFooter();
}
16 changes: 8 additions & 8 deletions front/wizard.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,29 +31,29 @@
use GlpiPlugin\Consumables\Wizard;
use GlpiPlugin\Servicecatalog\Main;

Session::checkRight('plugin_consumables_request', READ);
\Session::checkRight('plugin_consumables_request', READ);

if ($_SESSION['glpiactiveprofile']['interface'] == 'central') {
Html::header(Wizard::getTypeName(2), '', "management", Menu::class);
\Html::header(Wizard::getTypeName(2), '', "management", Menu::class);
} else {
if (Plugin::isPluginActive('servicecatalog')) {
if (\Plugin::isPluginActive('servicecatalog')) {
Main::showDefaultHeaderHelpdesk(Wizard::getTypeName(2));
} else {
Html::helpHeader(Wizard::getTypeName(2));
\Html::helpHeader(Wizard::getTypeName(2));
}
}

$wizard = new Wizard();
$wizard->showMenu();

if (Session::getCurrentInterface() != 'central'
&& Plugin::isPluginActive('servicecatalog')) {
if (\Session::getCurrentInterface() != 'central'
&& \Plugin::isPluginActive('servicecatalog')) {

Main::showNavBarFooter('consumables');
}

if ($_SESSION['glpiactiveprofile']['interface'] == 'central') {
Html::footer();
\Html::footer();
} else {
Html::helpFooter();
\Html::helpFooter();
}
Loading