Migration dicovery fix bugs and changed script paths

pandora_console/godmode/wizards/DiscoveryTaskList.class.php

@@ -761,7 +761,7 @@ class DiscoveryTaskList extends HTML
                     $data[3] = __('Manual');
                 }
 
-                if ($task['id_recon_script'] == 0 || $ipam === true) {
+                if ($task['id_recon_script'] == 0 || $ipam === true && $task['type'] !== 15) {
                     $data[4] = ui_print_truncate_text($subnet, 50, true, true, true, '[…]');
                 } else {
                     $data[4] = '-';

pandora_console/godmode/wizards/ManageExtensions.class.php

@@ -757,7 +757,7 @@ class ManageExtensions extends HTML
 
                 $migrationHash = $this->canMigrate($row['short_name']);
                 if ($migrationHash !== false && empty($migrationHash) !== true) {
-                    // Migrate button
+                    // Migrate button.
                     $data[$key]['actions'] .= html_print_input_image(
                         'button_migrate-'.$row['short_name'],
                         'images/reset.png',
@@ -1153,7 +1153,7 @@ class ManageExtensions extends HTML
         // Path to the INI file
         $filePath = $config['homedir'].'/extras/discovery/DiscoveryApplicationsMigrateCodes.ini';
 
-        // Parse the INI file
+        // Parse the INI file.
         $migrationCodes = parse_ini_file($filePath, true);
 
         if ($migrationCodes === false) {
@@ -1167,7 +1167,7 @@ class ManageExtensions extends HTML
             return $migrationCodes[$shortName];
         }
 
-        // All checks ok, discovery app can be migrated
+        // All checks ok, discovery app can be migrated.
         return false;
 
     }
@@ -1176,9 +1176,6 @@ class ManageExtensions extends HTML
     /**
      * Prints html for migrate modal
      *
-     * @param string $shortName Short name of app
-     * @param string $hash      App hash
-     *
      * @return void
      */
     public function loadMigrateModal()
@@ -1191,6 +1188,7 @@ class ManageExtensions extends HTML
             'id'       => 'modal_migrate_form',
             'onsubmit' => 'return false;',
             'class'    => 'modal',
+            'name'     => 'migrate_form',
         ];
 
         $inputs = [];
@@ -1227,12 +1225,43 @@ class ManageExtensions extends HTML
             ],
         ];
 
+        $inputs[] = [
+            'block_id'      => 'migrate_buttons',
+            'class'         => 'flex-row flex-items-center w98p',
+            'direct'        => 1,
+            'block_content' => [
+                [
+                    'arguments' => [
+                        'name'       => 'cancel',
+                        'label'      => __('Cancel'),
+                        'type'       => 'button',
+                        'attributes' => [
+                            'icon'  => 'left',
+                            'mode'  => 'secondary',
+                            'class' => 'sub cancel float-left',
+                        ],
+                    ],
+                ],
+                [
+                    'arguments' => [
+                        'name'       => 'migrate',
+                        'label'      => __('Migrate'),
+                        'type'       => 'submit',
+                        'attributes' => [
+                            'icon'  => 'wand',
+                            'class' => 'sub wand float-right',
+                        ],
+                    ],
+                ],
+            ],
+        ];
+
         $this->printForm(
             [
                 'form'   => $form,
                 'inputs' => $inputs,
             ],
-            false
+            false,
         );
     }
 
@@ -1254,16 +1283,28 @@ class ManageExtensions extends HTML
         }
 
         // 1. Gets md5
+        try {
             $console_md5 = $this->calculateDirectoryMD5($shortName, false);
             $server_md5 = $this->calculateDirectoryMD5($shortName, true);
+        } catch (Exception $e) {
+            $return = [
+                'error' => $e->getMessage(),
+            ];
+            echo json_encode($return);
+            return;
+        }
 
         if ($console_md5 === false || $server_md5 === false) {
-            return false;
+            $return = [
+                'error' => __('Error calculating app MD5'),
+            ];
+            echo json_encode($return);
+            return;
         }
 
         // 2. Checks MD5
         if ($hash === $console_md5 && $hash === $server_md5) {
-            // Init migration script
+            // Init migration script.
             $return = $this->executeMigrationScript($shortName);
         } else {
             $return = [
@@ -1274,18 +1315,19 @@ class ManageExtensions extends HTML
         // Add shotrname to return for showing messages.
         $return['shortname'] = $shortName;
 
-        echo json_encode($return);
+        echo \json_encode($return);
     }
 
 
     /**
      * Calculates directory MD% and saves it into array
      *
-     * @param  string shortName Shorname of app.
+     * @param string  $shortName Shorname of app.
-     * @param  boolean                          $directory
+     * @param boolean $server    If true, perform checks into server folder.
+     *
      * @return $md5 Array of md5 of filess.
      */
-    function calculateDirectoryMD5($shortName, $server)
+    private function calculateDirectoryMD5($shortName, $server)
     {
         global $config;
 
@@ -1345,11 +1387,16 @@ class ManageExtensions extends HTML
             return false;
         }
 
-        $scriptName = preg_replace('/^pandorafms\.(\w+)$/m', 'migrate.$1.sql', $shortName);
+        $scriptName = preg_replace('/^pandorafms\.(\w+\.?\w*)$/m', 'migrate.$1.sql', $shortName);
 
         $script_path = $config['homedir'].'/extras/discovery/migration_scripts/'.$scriptName;
+        if (file_exists($script_path) === false) {
+            $return = [
+                'error' => __('Migration script '.$scriptName.' could not be found'),
+            ];
+        } else {
             try {
-            $res = db_process_file($script_path, true);
+                $res = db_process_file($script_path, false);
             } catch (\Exception $e) {
                 $return = [
                     'error' => $e->getMessage(),
@@ -1397,6 +1444,7 @@ class ManageExtensions extends HTML
                     'error' => __('Error migrating app'),
                 ];
             }
+        }
 
         return $return;
 
@@ -1406,7 +1454,7 @@ class ManageExtensions extends HTML
     /**
      * Check if legacy app has been migrated.
      *
-     * @param string $shortName
+     * @param string $shortName Shorn name of the app.
      *
      * @return boolean
      */

pandora_console/include/javascript/manage_extensions.js

@@ -1,15 +1,5 @@
 /* globals $, page, url, textsToTranslate, confirmDialog*/
 $(document).ready(function() {
-  function loading(status) {
-    if (status) {
-      $(".spinner-fixed").show();
-      $("#button-upload_button").attr("disabled", "true");
-    } else {
-      $(".spinner-fixed").hide();
-      $("#button-upload_button").removeAttr("disabled");
-    }
-  }
-
   $("#uploadExtension").submit(function(e) {
     e.preventDefault();
     var formData = new FormData(this);
@@ -75,40 +65,73 @@ $(document).ready(function() {
  * Loads modal from AJAX to add a new key or edit an existing one.
  */
 function show_migration_form(shortName, hash) {
-  var btn_ok_text = textsToTranslate["Migrate"];
-  var btn_cancel_text = textsToTranslate["Cancel"];
   var title = textsToTranslate["Migrate"];
   var method = "migrateApp";
+  loading(true);
 
-  load_modal({
+  $("#migrate_modal").dialog({
-    target: $("#migrate_modal"),
+    resizable: true,
-    form: "modal_migrate_form",
+    draggable: true,
-    url: url,
+    modal: true,
-    ajax_callback: showMsg,
+    width: 630,
-    modal: {
+    overlay: {
+      opacity: 0.5,
+      background: "black"
+    },
+    closeOnEscape: false,
     title: title,
-      ok: btn_ok_text,
+    open: function() {
-      cancel: btn_cancel_text
+      loading(false);
-    },
+      $("#migrate_modal").empty();
-    extradata: [
+      $.ajax({
-      {
+        type: "POST",
-        name: "shortName",
+        url: url,
-        value: shortName
+        data: {
-      },
-      {
-        name: "hash",
-        value: hash
-      }
-    ],
-    onshow: {
           page: page,
-      method: "loadMigrateModal"
+          method: "loadMigrateModal",
+          shortName: shortName,
+          hash: hash
         },
-    onsubmit: {
+        dataType: "html",
+        success: function(data) {
+          $("#migrate_modal").append(data);
+
+          $("#button-migrate").click(function() {
+            // All fields are required.
+            loading(true);
+            $.ajax({
+              type: "POST",
+              url: url,
+              data: {
                 page: page,
-      method: method
+                method: method,
+                hash: $("#text-hash").val(),
+                shortName: shortName
+              },
+              success: function(data) {
+                loading(false);
+                showMsg(data);
+                $("input[name='button_migrate-" + shortName + "']").hide();
+              },
+              error: function(e) {
+                loading(false);
+                e.error = e.statusText;
+                showMsg(JSON.stringify(e));
               }
             });
+          });
+
+          $("#button-cancel").click(function() {
+            $("#migrate_modal").dialog("close");
+          });
+        }
+      });
+    }
+  });
+
+  $(".ui-widget-overlay").css("background", "#000");
+  $(".ui-widget-overlay").css("opacity", 0.6);
+  $(".ui-draggable").css("cursor", "inherit");
 }
 
 /**
@@ -165,3 +188,13 @@ function showMsg(data) {
     ]
   });
 }
+
+function loading(status) {
+  if (status) {
+    $(".spinner-fixed").show();
+    $("#button-upload_button").attr("disabled", "true");
+  } else {
+    $(".spinner-fixed").hide();
+    $("#button-upload_button").removeAttr("disabled");
+  }
+}