Merge branch 'release/2.5.1'

Author: cedric-anne

.tx/config

@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[glpi-plugins-datainjection.datainjection-243pot]
+[glpi-plugin-datainjection.datainjection-243pot]
 file_filter = locales/<lang>.po
 source_file = locales/datainjection.pot
 source_lang = en

ajax/dropdownMandatory.php

@@ -36,4 +36,4 @@
 }
 
 Session::checkCentralAccess();
-PluginDatainjectionInjectionType::showMandatoryCheckBox($_POST);
+PluginDatainjectionInjectionType::showMandatoryCheckbox($_POST);

datainjection.xml

@@ -25,6 +25,10 @@
       <author>Xavier Caillaud</author>
    </authors>
    <versions>
+      <version>
+          <num>2.5.1</num>
+          <compatibility>9.2</compatibility>
+      </version>
       <version>
           <num>2.5.0</num>
           <compatibility>9.2</compatibility>

hook.php

@@ -48,7 +48,7 @@ function plugin_datainjection_install() {
     global $DB;
 
     include_once GLPI_ROOT."/plugins/datainjection/inc/profile.class.php";
-    $migration = new Migration('2.5.0');
+    $migration = new Migration(PLUGIN_DATAINJECTION_VERSION);
 
    switch (plugin_datainjection_needUpdateOrInstall()) {
       case -1 :

inc/backendcsv.class.php

@@ -198,6 +198,14 @@ function getNumberOfLines() {
    function openFile() {
 
       $this->file_handler = fopen($this->file, 'r');
+
+      // Check if file starts with BOM.
+      // 1. If BOM found, keep the handler moved to 4th char to not include it in data.
+      // 2. If no BOM found, rewind to start of file.
+      $hasBOM = fread($this->file_handler, 3) === pack('CCC', 0xEF, 0xBB, 0xBF);
+      if (!$hasBOM) {
+         fseek($this->file_handler, 0);
+      }
    }
 
 

inc/injectiontype.class.php

@@ -106,7 +106,11 @@ static function dropdownLinkedTypes($mapping_or_info, $options=array()) {
 
       $p['primary_type']    = '';
       $p['itemtype']        = self::NO_VALUE;
-      $p['mapping_or_info'] = json_encode($mapping_or_info->fields);
+      // Use hex code for all special chars to prevent problems when adding/stripping slashes
+      $p['mapping_or_info'] = json_encode(
+         $mapping_or_info->fields,
+         JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP
+      );
       $p['called_by']       = get_class($mapping_or_info);
       $p['fields_update']   = true;
       foreach ($options as $key => $value) {
@@ -290,14 +294,14 @@ static function testBasicEqual($name, $option=array()) {
    **/
    static function showMandatoryCheckbox($options=array()) {
 
-      //json adds more \ char than needed : when $options['mapping_or_info']['name'] contains a '
-      //json_decode fails to decode it !
-      $options['mapping_or_info'] = str_replace("\\", "", $options['mapping_or_info']);
+      // Received data has been slashed.
+      $options = Toolbox::stripslashes_deep($options);
 
       if ($options['need_decode']) {
+         // JSON data has been slashed twice, stripslashes has to be done a second time.
          $mapping_or_info = json_decode(
-             Toolbox::stripslashes_deep($options['mapping_or_info']),
-             true
+            Toolbox::stripslashes_deep($options['mapping_or_info']),
+            true
          );
       } else {
          $mapping_or_info = $options['mapping_or_info'];