fix(mqtt): connection to backend

flyve-mdm · Nov 24, 2017 · 10d67d2 · 10d67d2
1 parent 8333fab
commit 10d67d2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/install/installer.class.php b/install/installer.class.php
@@ -110,7 +110,6 @@ public function install() {
             $this->migration->displayWarning("Error creating tables : " . $DB->error(), true);
             return false;
          }
-
          $this->createInitialConfig();
       } else {
          if ($this->endsWith(PLUGIN_FLYVEMDM_VERSION, "-dev") || (version_compare(self::getCurrentVersion(), PLUGIN_FLYVEMDM_VERSION) != 0)) {
@@ -509,7 +508,6 @@ protected function upgradeOneStep($toVersion) {
          if (function_exists($updateFunction)) {
             $this->migration->addNewMessageArea("Upgrade to $toVersion");
             $updateFunction($this->migration);
-            $this->migration->executeMigration();
             $this->migration->displayMessage('Done');
          }
       }

diff --git a/install/upgrade/update_to_dev.php b/install/upgrade/update_to_dev.php
@@ -181,7 +181,16 @@ function plugin_flyvemdm_update_to_dev(Migration $migration) {
    $migration->addfield($table, 'plugin_orion_tasks_id', 'integer', ['after' => 'dl_filename']);
    $migration->addKey($table, 'entities_id', 'entities_id');
    $migration->addPostQuery("UPDATE `$table` SET `parse_status` = 'parsed'");
-   $migration->addPostQuery("UPDATE `$table` SET `filename` = CONCAT('" . addslashes(GLPI_DOC_DIR) . "', `filename`)");
+
+   $result = $DB->request(['FROM' => $table, 'LIMIT' => '1']);
+   if ($result->count() > 0) {
+      $result->rewind();
+      $row = $result->current();
+      if (strpos($row['filename'], 'flyvemdm/package/') !== 0) {
+         // It there is at least one package and the path does st arts with the new prefix, then update all the table
+         $migration->addPostQuery("UPDATE `$table` SET `filename` = CONCAT('flyvemdm/package/', `filename`)");
+      }
+   }
 
    $table = 'glpi_plugin_flyvemdm_files';
    $migration->addKey($table, 'entities_id', 'entities_id');