Merge branch 'release/2.7.1'

Author: cedric-anne

composer.lock

@@ -27,6 +27,10 @@
       <author>Xavier Caillaud</author>
    </authors>
    <versions>
+      <version>
+          <num>2.7.1</num>
+          <compatibility>9.4</compatibility>
+      </version>
       <version>
           <num>2.7.0</num>
           <compatibility>~9.4.0</compatibility>

datainjection.xml

@@ -45,5 +45,5 @@ Else
 	Download the tarball of this plugin
 	Uncompress it in the plugins directory of your glpi installation
 
-Once copied in the repertory, go the the "Configuration"->"Plugins"->"File injection" menu, and install the plugin
+Once copied in the repertory, go the the "Configuration"->"Plugins"->"Data injection" menu, and install the plugin
 

docs/README.txt

@@ -31,7 +31,7 @@
 require '../../../inc/includes.php';
 
 Html::header(
-    __('File injection', 'datainjection'), $_SERVER["PHP_SELF"],
+    __('Data injection', 'datainjection'), $_SERVER["PHP_SELF"],
     "tools", "plugindatainjectionmenu", "client"
 );
 

front/clientinjection.form.php

@@ -29,6 +29,5 @@
  ---------------------------------------------------------------------- */
 
 require '../../../inc/includes.php';
-require "../../../lib/ezpdf/class.ezpdf.php";
 
 PluginDatainjectionModel::exportAsPDF($_GET['models_id']);

front/export.pdf.php

@@ -40,7 +40,7 @@
     break;
 
    case "log" :
-       Html::popHeader(__('File injection report', 'datainjection'), $_SERVER['PHP_SELF']);
+       Html::popHeader(__('Data injection report', 'datainjection'), $_SERVER['PHP_SELF']);
        PluginDatainjectionModel::showLogResults($_GET['models_id']);
        Html::popFooter();
     break;

front/popup.php

@@ -30,17 +30,16 @@
 
 function plugin_datainjection_registerMethods() {
 
-    global $WEBSERVICES_METHOD;
+   global $WEBSERVICES_METHOD;
 
-    $methods = ['getModel'      => 'methodGetModel',
+   $methods = ['getModel'      => 'methodGetModel',
                'listModels'    => 'methodListModels',
                'inject'        => 'methodInject',
                'listItemtypes' => 'methodListItemtypes'];
 
-    foreach ($methods as $code => $method) {
-        $WEBSERVICES_METHOD['datainjection.'.$code]
-         = ['PluginDatainjectionWebservice', $method];
-      }
+   foreach ($methods as $code => $method) {
+      $WEBSERVICES_METHOD['datainjection.'.$code] = ['PluginDatainjectionWebservice', $method];
+   }
 }
 
 
@@ -195,27 +194,27 @@ function plugin_datainjection_install() {
 
 
 function plugin_datainjection_uninstall() {
-    global $DB;
+   global $DB;
 
-    $tables = ["glpi_plugin_datainjection_models",
+   $tables = ["glpi_plugin_datainjection_models",
               "glpi_plugin_datainjection_modelcsvs",
               "glpi_plugin_datainjection_mappings",
               "glpi_plugin_datainjection_infos",
               "glpi_plugin_datainjection_filetype",
               "glpi_plugin_datainjection_profiles"];
 
-    foreach ($tables as $table) {
-       if ($DB->tableExists($table)) {
-          $DB->queryOrDie("DROP TABLE IF EXISTS `".$table."`", $DB->error());
-         }
+   foreach ($tables as $table) {
+      if ($DB->tableExists($table)) {
+         $DB->queryOrDie("DROP TABLE IF EXISTS `".$table."`", $DB->error());
       }
+   }
 
-      if (is_dir(PLUGIN_DATAINJECTION_UPLOAD_DIR)) {
-          Toolbox::deleteDir(PLUGIN_DATAINJECTION_UPLOAD_DIR);
-      }
+   if (is_dir(PLUGIN_DATAINJECTION_UPLOAD_DIR)) {
+      Toolbox::deleteDir(PLUGIN_DATAINJECTION_UPLOAD_DIR);
+   }
 
-      plugin_init_datainjection();
-      return true;
+   plugin_init_datainjection();
+   return true;
 }
 
 function plugin_datainjection_migration_264_270(Migration $migration) {
@@ -310,75 +309,75 @@ function plugin_datainjection_upgrade23_240(Migration $migration) {
 
 function plugin_datainjection_update131_14() {
 
-    global $DB;
+   global $DB;
 
-    $migration = new Migration('1.4');
+   $migration = new Migration('1.4');
 
-    $migration->addField(
-        'glpi_plugin_data_injection_models', 'float_format',
-        'bool'
-    );
+   $migration->addField(
+      'glpi_plugin_data_injection_models', 'float_format',
+      'bool'
+   );
 
-    //Template recursivity : need standardize names in order to use privatePublicSwitch
-    $migration->changeField(
-        'glpi_plugin_data_injection_models', 'user_id',
-        'FK_users', 'integer'
-    );
-    $migration->changeField(
-        'glpi_plugin_data_injection_models', 'public',
-        'private', 'bool'
-    );
+   //Template recursivity : need standardize names in order to use privatePublicSwitch
+   $migration->changeField(
+      'glpi_plugin_data_injection_models', 'user_id',
+      'FK_users', 'integer'
+   );
+   $migration->changeField(
+      'glpi_plugin_data_injection_models', 'public',
+      'private', 'bool'
+   );
 
-    $migration->migrationOneTable('glpi_plugin_data_injection_models');
+   $migration->migrationOneTable('glpi_plugin_data_injection_models');
 
-    $sql = "UPDATE `glpi_plugin_data_injection_models`
+   $sql = "UPDATE `glpi_plugin_data_injection_models`
            SET `FK_entities` = '-1',
                `private` = '1'
            WHERE `private` = '0'";
-    $DB->query($sql);
+   $DB->query($sql);
 
-    $sql = "UPDATE `glpi_plugin_data_injection_models`
+   $sql = "UPDATE `glpi_plugin_data_injection_models`
            SET `private` = '0'
            WHERE `private` = '1'
                 AND `FK_entities` > '0'";
-    $DB->query($sql);
+   $DB->query($sql);
 
-    $migration->addField(
-        'glpi_plugin_data_injection_models', 'recursive',
-        'bool'
-    );
+   $migration->addField(
+      'glpi_plugin_data_injection_models', 'recursive',
+      'bool'
+   );
 
-    $sql = "UPDATE `glpi_plugin_data_injection_profiles`
+   $sql = "UPDATE `glpi_plugin_data_injection_profiles`
            SET `create_model` = `use_model`
            WHERE `create_model` IS NULL";
-    $DB->query($sql);
+   $DB->query($sql);
 
-    $migration->dropField('glpi_plugin_data_injection_profiles', 'use_model');
-    $migration->changeField(
-        'glpi_plugin_data_injection_profiles',
-        'create_model', 'model', 'char'
-    );
+   $migration->dropField('glpi_plugin_data_injection_profiles', 'use_model');
+   $migration->changeField(
+      'glpi_plugin_data_injection_profiles',
+      'create_model', 'model', 'char'
+   );
 
-    $migration->executeMigration();
+   $migration->executeMigration();
 }
 
 
 function plugin_datainjection_update15_170() {
 
-    global $DB;
+   global $DB;
 
-    $tables = ["glpi_plugin_data_injection_models"     => "glpi_plugin_datainjection_models",
+   $tables = ["glpi_plugin_data_injection_models"     => "glpi_plugin_datainjection_models",
               "glpi_plugin_data_injection_models_csv" => "glpi_plugin_datainjection_models_csv",
               "glpi_plugin_data_injection_models_csv" => "glpi_plugin_datainjection_models_csv",
               "glpi_plugin_data_injection_mappings"   => "glpi_plugin_datainjection_mappings",
               "glpi_plugin_data_injection_infos"      => "glpi_plugin_datainjection_infos",
               "glpi_plugin_data_injection_filetype"   => "glpi_plugin_datainjection_filetype",
               "glpi_plugin_data_injection_profiles"   => "glpi_plugin_datainjection_profiles"];
 
-    foreach ($tables as $oldname => $newname) {
-        $query = "RENAME TABLE IF EXISTS `".$oldname."` TO `".$newname."`";
-        $DB->query($query);
-      }
+   foreach ($tables as $oldname => $newname) {
+      $query = "RENAME TABLE IF EXISTS `".$oldname."` TO `".$newname."`";
+      $DB->query($query);
+   }
 }
 
 

hook.php

@@ -142,7 +142,7 @@ function showForm($ID, $options = []) {
    static function showUploadFileForm($options = []) {
 
       $add_form = (isset($options['add_form']) && $options['add_form']);
-      $confirm  = (isset($options['confirm']) && $options['confirm']);
+      $confirm  = (isset($options['confirm'])? $options['confirm'] : false);
       $url      = (($confirm == 'creation')?Toolbox::getItemTypeFormURL('PluginDatainjectionModel')
                                          :Toolbox::getItemTypeFormURL(__CLASS__));
       if ($add_form) {
@@ -167,9 +167,9 @@ static function showUploadFileForm($options = []) {
       echo "<td colspan='2' class='center'>";
       if ($confirm) {
          if ($confirm == 'creation') {
-            $message = __('Warning : existing data will be overridden', 'datainjection');
+            $message = __s('Warning : existing mapped column will be overridden', 'datainjection');
          } else {
-            $message = __(
+            $message = __s(
               "Watch out, you're about to inject data into GLPI. Are you sure you want to do it ?",
               'datainjection'
             );

inc/clientinjection.class.php

@@ -35,7 +35,7 @@ class PluginDatainjectionMenu extends CommonGLPI
 
    static function getMenuName() {
 
-      return __('File injection', 'datainjection');
+      return __('Data injection', 'datainjection');
    }
 
    static function getMenuContent() {

inc/menu.class.php

@@ -367,6 +367,7 @@ function rawSearchOptions() {
          'name'          => __('Name'),
          'datatype'      => 'itemlink',
          'itemlink_type' => $this->getType(),
+         'autocomplete'  => true,
       ];
 
       $tab[] = [
@@ -1514,7 +1515,7 @@ static function exportAsPDF($models_id) {
          $pdf->setHeader(
              sprintf(
                  __('%1$s (%2$s)'),
-                 __('File injection report', 'datainjection') . ' - <b>' .
+                 __('Data injection report', 'datainjection') . ' - <b>' .
                                  PluginDatainjectionSession::getParam('file_name') . '</b>',
                  $model->getName()
              )