Merge pull request #14 from pluginsGLPI/9.1/compat

9.1/compat

README.md

@@ -4,7 +4,7 @@ This plugin allows data import into [GLPI](http://glpi-project.org) using CSV fi
 
 It allows to create models of injection for a future re-use. It's been created in order to:
 
-- import datas coming from others asset management softwares
+- import data coming from others asset management softwares
 - inject electronic delivery forms
 
 Data to be imported using the plugins are:

datainjection.xml

@@ -25,6 +25,12 @@
       <author>Xavier Caillaud</author>
    </authors>
    <versions>
+      <version>
+          <num>2.4.2</num>
+          <compatibility>0.85</compatibility>
+          <compatibility>0.90</compatibility>
+          <compatibility>9.1</compatibility>
+      </version>
       <version>
           <num>2.4.1</num>
           <compatibility> 0.85</compatibility>

docs/CHANGELOG.TXT

@@ -100,7 +100,7 @@ Version 1.6.0 - GLPI 0.72
    https://dev.indepnet.net/plugins/query?milestone=Data_injection+1.6.0
 
 Version 1.5.1
-   #200 Remove any message in MESSAGE_AFTER_REDIRECT when importing datas
+   #200 Remove any message in MESSAGE_AFTER_REDIRECT when importing data
    #199 Add more info mappings
    #198 Add more warning messages
 

docs/README.txt

@@ -31,7 +31,7 @@ Author :Walid NOUH
 
 1 - Presentation
 
-This plugin enables you inject datas from CSV files into GLPI. 
+This plugin enables you inject data from CSV files into GLPI. 
 
 Compatibility 0.72
 PHP5 or higher is required !

inc/backend.class.php

@@ -49,7 +49,7 @@ abstract class PluginDatainjectionBackend {
     * @param $injectionData
     * @param $header_present
     *
-    * @return array with the datas from the header
+    * @return array with the data from the header
    **/
    static function getHeader(PluginDatainjectionData $injectionData, $header_present) {
 
@@ -102,4 +102,4 @@ static function toUTF8($string) {
    }
 
 }
-?>
+?>

inc/backendcsv.class.php

@@ -88,7 +88,7 @@ static function parseLine($fic, $data, $encoding=1) {
                  && ($data[$num -1] != PluginDatainjectionCommonInjectionLib::EMPTY_VALUE))) {
             $tmp = trim($DB->escape($data[$c]));
             switch ($encoding) {
-               //If file is ISO8859-1 : encode the datas in utf8
+               //If file is ISO8859-1 : encode the data in utf8
                case PluginDatainjectionBackend::ENCODING_ISO8859_1 :
                   if (!Toolbox::seems_utf8($tmp)) {
                      $csv[0][] = utf8_encode($tmp);
@@ -136,7 +136,7 @@ function read($numberOfLines=1) {
       for ($index = 0 ; (($numberOfLines == -1) || ($index < $numberOfLines)) && $continue ; $index++) {
          $data = $this->getNextLine();
          if ($data) {
-            $injectionData->addToDatas($data);
+            $injectionData->addToData($data);
          } else {
             $continue = false;
          }
@@ -224,4 +224,4 @@ function deleteFile() {
    }
 
 }
-?>
+?>

inc/clientinjection.class.php

@@ -156,7 +156,7 @@ static function showUploadFileForm($options=array()) {
          if ($confirm == 'creation') {
             $message = __('Warning : existing data will be overridden', 'datainjection');
          } else {
-            $message = __("Watch out, you're about to inject datas into GLPI. Are you sure you want to do it ?",
+            $message = __("Watch out, you're about to inject data into GLPI. Are you sure you want to do it ?",
                           'datainjection');
          }
          $alert = "OnClick='return window.confirm(\"$message\");'";

inc/commoninjectionlib.class.php

@@ -930,7 +930,7 @@ private function reformatSecondPass() {
 
 
    /**
-    * Third pass of reformat : datas, mac address & floats
+    * Third pass of reformat : data, mac address & floats
    */
    private function reformatThirdPass() {
       global $CFG_GLPI;
@@ -1594,7 +1594,7 @@ private function manageRelations() {
 
 
    /**
-    * Function to check if the datas to inject already exists in DB
+    * Function to check if the data to inject already exists in DB
     *
     * @param class which represents type to inject
     * @param itemtype the itemtype to inject
@@ -1881,7 +1881,7 @@ public static function getLogLabel($type) {
             break;
 
          case self::SUCCESS :
-            $message = __('Datas to insert are correct', 'datainjection');
+            $message = __('Data to insert are correct', 'datainjection');
             break;
 
          case self::TYPE_MISMATCH :

inc/data.class.php

@@ -30,24 +30,24 @@
 
 class PluginDatainjectionData {
 
-   private $injectionDatas;
+   private $injectionData;
 
 
    function __construct() {
-      $injectionDatas = array();
+      $injectionData = array();
    }
 
 
    /**
     * @param $newData
    **/
-   function addToDatas($newData) {
-      $this->injectionDatas[] = $newData;
+   function addToData($newData) {
+      $this->injectionData[] = $newData;
    }
 
 
-   function getDatas() {
-      return $this->injectionDatas;
+   function getData() {
+      return $this->injectionData;
    }
 
 
@@ -56,11 +56,11 @@ function getDatas() {
    **/
    function getDataAtLine($line_id) {
 
-      if (count($this->injectionDatas) >= $line_id) {
-         return $this->injectionDatas[$line_id][0];
+      if (count($this->injectionData) >= $line_id) {
+         return $this->injectionData[$line_id][0];
       }
       return array();
    }
 
 }
-?>
+?>

inc/engine.class.php

@@ -62,7 +62,7 @@ function __construct($model, $infos=array(), $entity=0) {
 
 
    /**
-    * Inject one line of datas
+    * Inject one line of data
     *
     * @param $line   one line of data to import
     * @param $index  the line number is the file
@@ -237,4 +237,4 @@ function getLinesInError() {
    }
 
 }
-?>
+?>

inc/model.class.php

@@ -348,7 +348,7 @@ function getSearchOptions() {
 
       $tab[5]['table']           = $this->getTable();
       $tab[5]['field']           = 'itemtype';
-      $tab[5]['name']            = __('Type of datas to import', 'datainjection');
+      $tab[5]['name']            = __('Type of data to import', 'datainjection');
       $tab[5]['datatype']        = 'itemtypename';
       $tab[5]['nosearch']        = true;
       $tab[5]['massiveaction']   = false;
@@ -543,7 +543,7 @@ function showAdvancedForm($ID, $options = array()) {
       echo "</td></tr>";
 
       echo "<tr class='tab_bg_1'>";
-      echo "<td>".__('Type of datas to import', 'datainjection')."</td>";
+      echo "<td>".__('Type of data to import', 'datainjection')."</td>";
       echo "<td>";
 
       if (($this->fields['step'] == '') || ($this->fields['step'] == self::INITIAL_STEP)) {
@@ -1162,7 +1162,7 @@ static function showPreviewMappings($models_id) {
       echo "<table class='tab_cadre_fixe'>";
       if (isset($_SESSION['datainjection']['lines'])) {
          $injectionData = unserialize($_SESSION['datainjection']['lines']);
-         $lines         = $injectionData->getDatas();
+         $lines         = $injectionData->getData();
          $nblines       = $_SESSION['datainjection']['nblines'];
          $model         = self::getInstanceByModelID($models_id);
 
@@ -1405,4 +1405,4 @@ function cleanData() {
    }
 
 }
-?>
+?>

inc/webservice.class.php

@@ -133,7 +133,7 @@ static function methodInject($params, $protocol) {
          $engine  = new PluginDatainjectionEngine($model, $additional_infos, $params['entities_id']);
          //Remove first line if header is present
          $first = true;
-         foreach ($model->injectionData->getDatas() as $id => $data) {
+         foreach ($model->injectionData->getData() as $id => $data) {
             if ($first
                 && $model->getSpecificModel()->isHeaderPresent()) {
                $first = false;
@@ -176,4 +176,4 @@ static function methodListItemtypes($params, $protocol) {
    }
 
 }
-?>
+?>