Merge branch 'glpi9.5'

Author: trasher

inc/inventorycomputerlib.class.php

@@ -1681,7 +1681,7 @@ function updateComputer($a_computerinventory, $computers_id, $no_history, $setdy
                $arrays['entities_id'] = $entities_id;
                $arrays['otherserial'] = PluginFusioninventoryToolbox::setInventoryNumber(
                   'Peripheral', '', $entities_id);
-               $a_peripherals[] = $peripheral->add($arrays);
+               $a_peripherals[] = $peripheral->add(\Toolbox::addslashes_deep($arrays));
             } else {
                $a_peripherals[] = $data['found_equipment'][0];
             }

inc/inventorynetworkequipmentlib.class.php

@@ -752,7 +752,7 @@ function rulepassed($items_id, $itemtype, $ports_id = 0) {
             $inputrulelog['items_id'] = $items_id;
             $inputrulelog['itemtype'] = $itemtype;
             $inputrulelog['method'] = 'networkinventory';
-            $inputrulelog['criteria'] = $dbu->exportArrayToDB(unserialize($_SESSION['plugin_fusinvsnmp_datacriteria']));
+            $inputrulelog['criteria'] = $dbu->exportArrayToDB(Toolbox::addslashes_deep(unserialize($_SESSION['plugin_fusinvsnmp_datacriteria'])));
             $pfRulematchedlog->add($inputrulelog);
             $pfRulematchedlog->cleanOlddata($items_id, $itemtype);
             unset($_SESSION['plugin_fusioninventory_rules_id']);

inc/inventoryruleimport.class.php

@@ -967,7 +967,7 @@ function executeActions($output, $params, array $input = []) {
                               if (isset($critinput['class'])) {
                                  unset($critinput['class']);
                               }
-                              $inputrulelog['criteria'] = exportArrayToDB($critinput);
+                              $inputrulelog['criteria'] = exportArrayToDB(\Toolbox::addslashes_deep($critinput));
                               $pfRulematchedlog->add($inputrulelog);
                               $pfRulematchedlog->cleanOlddata($items_id, $itemtype);
                               $class->rulepassed($items_id, $itemtype, $this->criterias_results['found_port']);

inc/lock.class.php

@@ -763,7 +763,7 @@ static function deleteLock($item) {
          }
       }
       $_SESSION['glpi_fusionionventory_nolock'] = true;
-      $item_device->update($item_device->fields);
+      $item_device->update(Toolbox::addslashes_deep($item_device->fields));
       unset($_SESSION['glpi_fusionionventory_nolock']);
    }