From 5525a074f5605c7c90abb9cda2da9a9795e9857f Mon Sep 17 00:00:00 2001 From: ArthurMinfotel Date: Thu, 19 Sep 2024 12:21:42 +0200 Subject: [PATCH] phpcs --- inc/replace.class.php | 15 +++++++++------ inc/uninstall.class.php | 12 +++++++----- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/inc/replace.class.php b/inc/replace.class.php index be09de7..9230fe8 100644 --- a/inc/replace.class.php +++ b/inc/replace.class.php @@ -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; } @@ -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 ) { @@ -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]; diff --git a/inc/uninstall.class.php b/inc/uninstall.class.php index 56158ed..dd4e1c9 100644 --- a/inc/uninstall.class.php +++ b/inc/uninstall.class.php @@ -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() ]); @@ -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; }