Fix xml dir casesensitive (#2465)

* Remove old script * Create a constant for xml file path and remove tmpmodels and walk directories
fusioninventory · Feb 2, 2018 · 69cfeb1 · 69cfeb1
1 parent 2880dd3
commit 69cfeb1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 21 deletions.
diff --git a/inc/inventorycomputercomputer.class.php b/inc/inventorycomputercomputer.class.php
@@ -322,7 +322,7 @@ static function showDownloadInventoryFile($computers_id) {
          $folder = '0';
       }
 
-      if (file_exists(GLPI_PLUGIN_DOC_DIR."/fusioninventory/xml/computer/".$folder."/".$computers_id)) {
+      if (file_exists(PLUGIN_FUSIONINVENTORY_XML_DIR."computer/".$folder."/".$computers_id)) {
          echo "<table class='tab_cadre_fixe'>";
          echo "<tr class='tab_bg_1'>";
          echo "<th>";

diff --git a/inc/networkequipment.class.php b/inc/networkequipment.class.php
@@ -1227,7 +1227,7 @@ function displaySerializedInventory($items_id) {
       if (empty($folder)) {
          $folder = '0';
       }
-      if (file_exists(GLPI_PLUGIN_DOC_DIR."/fusioninventory/xml/NetworkEquipment/".$folder."/".$items_id)) {
+      if (file_exists(PLUGIN_FUSIONINVENTORY_XML_DIR."networkequipment/".$folder."/".$items_id)) {
          echo "/ <a href='".$CFG_GLPI['root_doc'].
          "/plugins/fusioninventory/front/send_inventory.php".
          "?itemtype=networkequipment".

diff --git a/install/install.php b/install/install.php
@@ -188,12 +188,7 @@ function pluginFusioninventoryInstall($version, $migrationname = 'Migration') {
    if (!is_dir(GLPI_PLUGIN_DOC_DIR.'/fusioninventory/upload')) {
       mkdir(GLPI_PLUGIN_DOC_DIR.'/fusioninventory/upload');
    }
-   if (!is_dir(GLPI_PLUGIN_DOC_DIR.'/fusioninventory/walks')) {
-      mkdir(GLPI_PLUGIN_DOC_DIR.'/fusioninventory/walks');
-   }
-   if (!is_dir(GLPI_PLUGIN_DOC_DIR.'/fusioninventory/tmpmodels')) {
-      mkdir(GLPI_PLUGIN_DOC_DIR.'/fusioninventory/tmpmodels');
-   }
+
    /*
     * Deploy folders
     */
@@ -361,4 +356,3 @@ function pluginFusioninventoryInstall($version, $migrationname = 'Migration') {
    $mode_cli = (basename($_SERVER['SCRIPT_NAME']) == "cli_install.php");
 
 }
-
diff --git a/install/update.php b/install/update.php
@@ -277,20 +277,14 @@ function pluginFusioninventoryUpdate($current_version, $migrationname = 'Migrati
    if (!is_dir(GLPI_PLUGIN_DOC_DIR.'/fusioninventory/xml')) {
       mkdir(GLPI_PLUGIN_DOC_DIR.'/fusioninventory/xml');
    }
-   if (!is_dir(GLPI_PLUGIN_DOC_DIR.'/fusioninventory/xml/computer')) {
-      mkdir(GLPI_PLUGIN_DOC_DIR.'/fusioninventory/xml/computer');
+   if (!is_dir(PLUGIN_FUSIONINVENTORY_XML_DIR.'computer')) {
+      mkdir(PLUGIN_FUSIONINVENTORY_XML_DIR.'computer');
    }
-   if (!is_dir(GLPI_PLUGIN_DOC_DIR.'/fusioninventory/xml/printer')) {
-      mkdir(GLPI_PLUGIN_DOC_DIR.'/fusioninventory/xml/printer');
+   if (!is_dir(PLUGIN_FUSIONINVENTORY_XML_DIR.'printer')) {
+      mkdir(PLUGIN_FUSIONINVENTORY_XML_DIR.'printer');
    }
-   if (!is_dir(GLPI_PLUGIN_DOC_DIR.'/fusioninventory/xml/networkequipment')) {
-      mkdir(GLPI_PLUGIN_DOC_DIR.'/fusioninventory/xml/networkequipment');
-   }
-   if (!is_dir(GLPI_PLUGIN_DOC_DIR.'/fusioninventory/walks')) {
-      mkdir(GLPI_PLUGIN_DOC_DIR.'/fusioninventory/walks');
-   }
-   if (!is_dir(GLPI_PLUGIN_DOC_DIR.'/fusioninventory/tmpmodels')) {
-      mkdir(GLPI_PLUGIN_DOC_DIR.'/fusioninventory/tmpmodels');
+   if (!is_dir(PLUGIN_FUSIONINVENTORY_XML_DIR.'networkequipment')) {
+      mkdir(PLUGIN_FUSIONINVENTORY_XML_DIR.'networkequipment');
    }
 
    // ********* Deploy folders ********************************************** //

diff --git a/setup.php b/setup.php
@@ -62,6 +62,8 @@
        GLPI_PLUGIN_DOC_DIR."/fusioninventory/files/repository/");
 define("PLUGIN_FUSIONINVENTORY_MANIFESTS_DIR",
        GLPI_PLUGIN_DOC_DIR."/fusioninventory/files/manifests/");
+define("PLUGIN_FUSIONINVENTORY_XML_DIR",
+       GLPI_PLUGIN_DOC_DIR."/fusioninventory/xml/");
 
 
 /**