From 0728c73844ae0c43b0d683e6e0f559b4e767f696 Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Wed, 22 May 2019 19:14:01 +0200
Subject: [PATCH] fixed bug in macros of plugin modules

---
 .../godmode/agentes/configurar_agente.php         | 15 ++++++++++++---
 .../agentes/module_manager_editor_plugin.php      |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 8ebfdb296a..4e3b399e96 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -1220,6 +1220,7 @@ if ($update_module || $create_module) {
 
     // Get macros.
     $macros = (string) get_parameter('macros');
+    $macros_names = (array) get_parameter('macro_name', []);
 
     if (!empty($macros)) {
         $macros = json_decode(base64_decode($macros), true);
@@ -1230,10 +1231,18 @@ if ($update_module || $create_module) {
                 $m_hide = $m['hide'];
             }
 
-            if ($m_hide == '1') {
-                $macros[$k]['value'] = io_input_password(get_parameter($m['macro'], ''));
+            if ($update_module) {
+                if ($m_hide == '1') {
+                    $macros[$k]['value'] = io_input_password(get_parameter($m['macro'], ''));
+                } else {
+                    $macros[$k]['value'] = get_parameter($m['macro'], '');
+                }
             } else {
-                $macros[$k]['value'] = get_parameter($m['macro'], '');
+                if ($m_hide == '1') {
+                    $macros[$k]['value'] = io_input_password($macros_names[$k]);
+                } else {
+                    $macros[$k]['value'] = $macros_names[$k];
+                }
             }
         }
 
diff --git a/pandora_console/godmode/agentes/module_manager_editor_plugin.php b/pandora_console/godmode/agentes/module_manager_editor_plugin.php
index 6b39172bca..f8fbd46c73 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_plugin.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_plugin.php
@@ -79,7 +79,7 @@ push_table_simple($data, 'plugin_1');
 $data = [];
 $data[0] = 'macro_desc';
 $data[0] .= ui_print_help_tip('macro_help', true);
-$data[1] = html_print_input_text('macro_name', 'macro_value', '', 100, 1024, true);
+$data[1] = html_print_input_text('macro_name[]', 'macro_value', '', 100, 1024, true);
 $table_simple->colspan['macro_field'][1] = 3;
 $table_simple->rowstyle['macro_field'] = 'display:none';