Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

- Add compatibility with GLPI `CustomAsset`

### Fixed

- Fix migration error caused by unknown itemtype in containers

## [1.23.2] - 2025-12-22

Expand Down
35 changes: 26 additions & 9 deletions inc/container.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,11 @@ public static function installBaseData(Migration $migration, $version)
self::generateTemplate($container);
foreach (json_decode((string) $container['itemtypes']) as $itemtype) {
$classname = self::getClassname($itemtype, $container["name"]);
// prevent usage of plugin class if not loaded
if (!class_exists($classname)) {
continue;
}

$old_table = $classname::getTable();
// Rename genericobject container table
if (
Expand Down Expand Up @@ -741,8 +746,10 @@ public static function create($fields)

foreach (PluginFieldsToolbox::decodeJSONItemtypes($fields['itemtypes']) as $itemtype) {
//install table for receive field
$classname = self::getClassname($itemtype, $fields['name']);
$classname::install();
if (class_exists($itemtype)) {
$classname = self::getClassname($itemtype, $fields['name']);
$classname::install();
}
}

return null;
Expand All @@ -754,20 +761,31 @@ public static function generateTemplate($fields)
? PluginFieldsToolbox::decodeJSONItemtypes($fields['itemtypes'], true)
: [];
foreach ($itemtypes as $itemtype) {

$sysname = self::getSystemName($itemtype, $fields['name']);
$classname = self::getClassname($itemtype, $fields['name']);
$class_filename = $sysname . '.class.php';
$injection_filename = $sysname . 'injection.class.php';

// prevent usage of plugin class if not loaded
if (!class_exists($itemtype)) {
//remove file
if (file_exists(PLUGINFIELDS_CLASS_PATH . ('/' . $class_filename))) {
unlink(PLUGINFIELDS_CLASS_PATH . ('/' . $class_filename));
}

if (file_exists(PLUGINFIELDS_CLASS_PATH . ('/' . $injection_filename))) {
unlink(PLUGINFIELDS_CLASS_PATH . ('/' . $injection_filename));
}

continue;
}

$sysname = self::getSystemName($itemtype, $fields['name']);
$classname = self::getClassname($itemtype, $fields['name']);

$template_class = file_get_contents(PLUGINFIELDS_DIR . '/templates/container.class.tpl');
$template_class = str_replace('%%CLASSNAME%%', $classname, $template_class);
$template_class = str_replace('%%ITEMTYPE%%', $itemtype, $template_class);
$template_class = str_replace('%%CONTAINER%%', $fields['id'], $template_class);
$template_class = str_replace('%%ITEMTYPE_RIGHT%%', $itemtype::$rightname, $template_class);
$class_filename = $sysname . '.class.php';
if (file_put_contents(PLUGINFIELDS_CLASS_PATH . ('/' . $class_filename), $template_class) === false) {
Toolbox::logDebug('Error : class file creation - ' . $class_filename);

Expand All @@ -780,9 +798,8 @@ public static function generateTemplate($fields)
$template_class = str_replace('%%ITEMTYPE%%', $itemtype, $template_class);
$template_class = str_replace('%%CONTAINER_ID%%', $fields['id'], $template_class);
$template_class = str_replace('%%CONTAINER_NAME%%', $fields['label'], $template_class);
$class_filename = $sysname . 'injection.class.php';
if (file_put_contents(PLUGINFIELDS_CLASS_PATH . ('/' . $class_filename), $template_class) === false) {
Toolbox::logDebug('Error : datainjection class file creation - ' . $class_filename);
if (file_put_contents(PLUGINFIELDS_CLASS_PATH . ('/' . $injection_filename), $template_class) === false) {
Toolbox::logDebug('Error : datainjection class file creation - ' . $injection_filename);

return false;
}
Expand Down