Skip to content

Commit

Permalink
phpcs
Browse files Browse the repository at this point in the history
  • Loading branch information
ArthurMinfotel committed Sep 19, 2024
1 parent 7ca28f5 commit 5525a07
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 11 deletions.
15 changes: 9 additions & 6 deletions inc/replace.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -1162,14 +1162,14 @@ public static function handlePluginFieldsContainerValues($overwrite, $container,
$parameters = [];
foreach ($fields as $field) {
switch ($field['type']) {
case 'dropdown' :
case 'dropdown':
$property = 'plugin_fields_' . $field['name'] . 'dropdowns_id';
break;
case 'glpi_item' :
case 'glpi_item':
$property = 'items_id_' . $field['name'];
$itemtype = 'itemtype_' . $field['name'];
break;
default :
default:
$property = $field['name'];
break;
}
Expand All @@ -1182,7 +1182,8 @@ public static function handlePluginFieldsContainerValues($overwrite, $container,
])
) {
if ($pluginUninstallField->fields['action_replace'] == $pluginUninstallField::ACTION_COPY) {
if ($overwrite // template setting say to overwrite
if (
$overwrite // template setting say to overwrite
|| !$newItemValues->current() // no plugin field data for new item
|| !$pluginUninstallField::fieldHasValue($field, $newItemValues->current()) // new item has no value for the field
) {
Expand All @@ -1194,9 +1195,11 @@ public static function handlePluginFieldsContainerValues($overwrite, $container,
}
}
} else {
if ($overwrite
if (
$overwrite
|| !$newItemValues->current()
|| !$pluginUninstallField::fieldHasValue($field, $newItemValues->current())) {
|| !$pluginUninstallField::fieldHasValue($field, $newItemValues->current())
) {
$parameters[$property] = $oldItemValues->current()[$property];
if ($field['type'] == 'glpi_item') {
$parameters[$itemtype] = $oldItemValues->current()[$itemtype];
Expand Down
12 changes: 7 additions & 5 deletions inc/uninstall.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -548,8 +548,10 @@ public static function handlePluginFieldsValues($itemtype, $items_id, $model)
if ($pluginUninstallContainer->fields['action_uninstall'] == PluginUninstallModelcontainer::ACTION_RAZ) {
// same as PluginFieldsContainer::preItemPurge
$obj->deleteByCriteria(['items_id' => $item->fields['id']], true);
} else if ($pluginUninstallContainer->fields['action_uninstall'] == PluginUninstallModelcontainer::ACTION_CUSTOM
&& $obj->getFromDBByCrit(['items_id' => $items_id])) {
} else if (
$pluginUninstallContainer->fields['action_uninstall'] == PluginUninstallModelcontainer::ACTION_CUSTOM
&& $obj->getFromDBByCrit(['items_id' => $items_id])
) {
$uninstallFields = $pluginUninstallField->find([
'plugin_uninstall_modelcontainers_id' => $pluginUninstallContainer->getID()
]);
Expand All @@ -563,14 +565,14 @@ public static function handlePluginFieldsValues($itemtype, $items_id, $model)
$field = reset($field);

switch ($field['type']) {
case 'dropdown' :
case 'dropdown':
$property = 'plugin_fields_' . $field['name'] . 'dropdowns_id';
break;
case 'glpi_item' :
case 'glpi_item':
$property = 'items_id_' . $field['name'];
$itemtype = 'itemtype_' . $field['name'];
break;
default :
default:
$property = $field['name'];
break;
}
Expand Down

0 comments on commit 5525a07

Please sign in to comment.