Merge remote-tracking branch 'origin/develop' into ent-3616-Pantalla-de-login

Former-commit-id: e3261f935989cbc06f503abe6d8b762cef1b78f0

pandora_agents/unix/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.732-190306
+Version: 7.0NG.732-190311
 Architecture: all
 Priority: optional
 Section: admin

pandora_agents/unix/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.732-190306"
+pandora_version="7.0NG.732-190311"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

pandora_agents/unix/pandora_agent

@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.732';
-use constant AGENT_BUILD => '190306';
+use constant AGENT_BUILD => '190311';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;

pandora_agents/unix/pandora_agent.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.732
-%define release     190306
+%define release     190311
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.732
-%define release     190306
+%define release     190311
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent_installer

@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.732"
-PI_BUILD="190306"
+PI_BUILD="190311"
 OS_NAME=`uname -s`
 
 FORCE=0

pandora_agents/win32/installer/pandora.mpi

@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{190306}
+{190311}
 
 ViewReadme
 {Yes}

pandora_agents/win32/pandora.cc

@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.732(Build 190306)")
+#define PANDORA_VERSION ("7.0NG.732(Build 190311)")
 
 string pandora_path;
 string pandora_dir;

pandora_agents/win32/versioninfo.rc

@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.732(Build 190306))"
+      VALUE "ProductVersion", "(7.0NG.732(Build 190311))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END

pandora_console/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.732-190306
+Version: 7.0NG.732-190311
 Architecture: all
 Priority: optional
 Section: admin

pandora_console/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.732-190306"
+pandora_version="7.0NG.732-190311"
 
 package_pear=0
 package_pandora=1

pandora_console/extras/mr/26.sql

@@ -0,0 +1,8 @@
+START TRANSACTION;
+
+-- ----------------------------------------------------------------------
+-- Add column in table `tagent_custom_fields`
+-- ----------------------------------------------------------------------
+ALTER TABLE tagent_custom_fields ADD COLUMN `combo_values` VARCHAR(255) DEFAULT '';
+
+COMMIT;

pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql

@@ -1199,13 +1199,13 @@ ALTER TABLE titem MODIFY `source_data` int(10) unsigned;
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('big_operation_step_datos_purge', '100');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('small_operation_step_datos_purge', '1000');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_autodisable_deletion', '30');
-INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 25);
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 26);
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_docs_logo', 'default_docs.png');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_support_logo', 'default_support.png');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png');
 UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager';
 DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise';
-INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '732');
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '733');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('status_monitor_fields', 'policy,agent,data_type,module_name,server_type,interval,status,graph,warn,data,timestamp');
 
 -- ---------------------------------------------------------------------
@@ -1900,14 +1900,16 @@ CREATE TABLE IF NOT EXISTS `tevent_extended` (
 -- -----------------------------------------------------
 -- Table `tgis_map_layer_groups`
 -- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `tgis_map_layer_groups` (
+CREATE TABLE `tgis_map_layer_groups` (
-	`layer_id` INT NOT NULL,
+  `layer_id` int(11) NOT NULL,
-	`group_id` MEDIUMINT(4) UNSIGNED NOT NULL,
+  `group_id` mediumint(4) unsigned NOT NULL,
-	`agent_id` INT(10) UNSIGNED NOT NULL COMMENT 'Used to link the position to the group',
+  `agent_id` int(10) unsigned NOT NULL COMMENT 'Used to link the position to the group',
-	PRIMARY KEY (`layer_id`, `group_id`),
+  PRIMARY KEY (`layer_id`,`group_id`),
-	FOREIGN KEY (`layer_id`) REFERENCES `tgis_map_layer` (`id_tmap_layer`) ON DELETE CASCADE,
+  KEY `group_id` (`group_id`),
-	FOREIGN KEY (`group_id`) REFERENCES `tgrupo` (`id_grupo`) ON DELETE CASCADE,
+  KEY `agent_id` (`agent_id`),
-	FOREIGN KEY (`agent_id`) REFERENCES `tagente` (`id_agente`) ON DELETE CASCADE
+  CONSTRAINT `tgis_map_layer_groups_ibfk_1` FOREIGN KEY (`layer_id`) REFERENCES `tgis_map_layer` (`id_tmap_layer`) ON DELETE CASCADE,
+  CONSTRAINT `tgis_map_layer_groups_ibfk_2` FOREIGN KEY (`group_id`) REFERENCES `tgrupo` (`id_grupo`) ON DELETE CASCADE,
+  CONSTRAINT `tgis_map_layer_groups_ibfk_3` FOREIGN KEY (`agent_id`) REFERENCES `tagente` (`id_agente`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- -----------------------------------------------------
@@ -2034,3 +2036,7 @@ INSERT INTO `tnotification_user` (`id_mensaje`, `id_user`) SELECT `id_mensaje`,
 -- ----------------------------------------------------------------------
 INSERT INTO `trecon_script` (`name`,`description`,`script`,`macros`) VALUES ('Discovery.Application.VMware', 'Discovery Application script to monitor VMware technologies (ESXi, VCenter, VSphere)', '/usr/share/pandora_server/util/recon_scripts/vmware-plugin.pl', '{"1":{"macro":"_field1_","desc":"Configuration file","help":"","value":"","hide":""}}');
 INSERT INTO `trecon_script` (`name`,`description`,`script`,`macros`) VALUES ('Discovery.Cloud', 'Discovery Cloud script to monitor Cloud technologies (AWS.EC2, AWS.S3, AWS.RDS,&#x20RDS,&#x20AWS.EKS)', '/usr/share/pandora_server/util/recon_scripts/pcm_client.pl', '{"1":{"macro":"_field1_","desc":"Configuration file","help":"","value":"","hide":""}}');
+-- ----------------------------------------------------------------------
+-- Add column in table `tagent_custom_fields`
+-- ----------------------------------------------------------------------
+ALTER TABLE tagent_custom_fields ADD COLUMN `combo_values` VARCHAR(255) DEFAULT '';

pandora_console/godmode/agentes/agent_manager.php

@@ -708,6 +708,13 @@ foreach ($fields as $field) {
         __('This field allows url insertion using the BBCode\'s url tag').'.<br />'.__('The format is: [url=\'url to navigate\']\'text to show\'[/url]').'.<br /><br />'.__('e.g.: [url=google.com]Google web search[/url]'),
         true
     );
+    $combo = [];
+    $combo = $field['combo_values'];
+    $combo = explode(',', $combo);
+    $combo_values = [];
+    foreach ($combo as $value) {
+        $combo_values[$value] = $value;
+    }
 
     $custom_value = db_get_value_filter(
         'description',
@@ -747,6 +754,28 @@ foreach ($fields as $field) {
         );
     }
 
+    if ($field['combo_values'] !== '') {
+        $data[1] = html_print_select(
+            $combo_values,
+            'customvalue_'.$field['id_field'],
+            $custom_value,
+            '',
+            __('None'),
+            '',
+            true,
+            false,
+            false,
+            '',
+            false,
+            false,
+            false,
+            false,
+            false,
+            '',
+            false
+        );
+    };
+
     array_push($table->data, $data);
 }
 
@@ -757,7 +786,7 @@ if (!empty($fields)) {
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
 
 
-// The context help about the learning mode
+// The context help about the learning mode.
 if ($modo == 0) {
     echo "<span id='modules_not_learning_mode_context_help' style=''>";
 } else {

pandora_console/godmode/agentes/configure_field.php

@@ -25,13 +25,16 @@ $id_field = (int) get_parameter('id_field', 0);
 $name = (string) get_parameter('name', '');
 $display_on_front = (bool) get_parameter('display_on_front', 0);
 $is_password_type = (bool) get_parameter('is_password_type', 0);
-
+$is_combo_enable = (bool) get_parameter('is_combo_enable', 0);
-// Header
+$combo_values = (string) get_parameter('combo_values', '');
+// Header.
 if ($id_field) {
     $field = db_get_row_filter('tagent_custom_fields', ['id_field' => $id_field]);
     $name = $field['name'];
     $display_on_front = $field['display_on_front'];
     $is_password_type = $field['is_password_type'];
+    $combo_values = $field['combo_values'];
+    $is_combo_enable = $config['is_combo_enable'];
     ui_print_page_header(__('Update agent custom field'), 'images/custom_field.png', false, '', true, '');
 } else {
     ui_print_page_header(__('Create agent custom field'), 'images/custom_field.png', false, '', true, '');
@@ -40,17 +43,87 @@ if ($id_field) {
 $table = new stdClass();
 $table->width = '100%';
 $table->class = 'databox filters';
+$table->id = 'configure_field';
 $table->style[0] = 'font-weight: bold';
 $table->style[2] = 'font-weight: bold';
+$table->style[4] = 'font-weight: bold';
+$table->style[6] = 'font-weight: bold';
+
+echo "<div id='message_set_password'  title='".__('Agent Custom Fields Information')."' style='display:none;'>";
+echo "<p style='text-align: center;font-weight: bold;'>".__('You cannot set the Password type until you clear the combo values and click on update button.').'</p>';
+echo '</div>';
+
+echo "<div id='message_set_combo'  title='".__('Agent Custom Fields Information')."' style='display:none;'>";
+echo "<p style='text-align: center;font-weight: bold;'>".__('You cannot unset the enable combo until you clear the combo values and click on update.').'</p>';
+echo '</div>';
+
+echo "<div id='message_no_set_password'  title='".__('Agent Custom Fields Information')."' style='display:none;'>";
+echo "<p style='text-align: center;font-weight: bold;'>".__('If you select Enabled combo the Password type will be disabled.').'</p>';
+echo '</div>';
+
+echo "<div id='message_no_set_combo'  title='".__('Agent Custom Fields Information')."' style='display:none;'>";
+echo "<p style='text-align: center;font-weight: bold;'>".__('If you select Passord type the Enabled combo will be disabled.').'</p>';
+echo '</div>';
+
+
 $table->data = [];
+
 $table->data[0][0] = __('Name');
-$table->data[0][1] = html_print_input_text('name', $name, '', 35, 100, true);
+$table->data[0][1] = html_print_input_text(
+    'name',
+    $name,
+    '',
+    35,
+    100,
+    true
+);
 
-$table->data[0][2] = __('Pass type').ui_print_help_tip(__('The fields with pass type enabled will be displayed like html input type pass in html'), true);
+$table->data[1][0] = __('Pass type').ui_print_help_tip(
-$table->data[0][3] = html_print_checkbox('is_password_type', 1, $is_password_type, true);
+    __('The fields with pass type enabled will be displayed like html input type pass in html'),
+    true
+);
+$table->data[1][1] = html_print_checkbox_switch(
+    'is_password_type',
+    1,
+    $is_password_type,
+    true
+);
 
-$table->data[0][4] = __('Display on front').ui_print_help_tip(__('The fields with display on front enabled will be displayed into the agent details'), true);
+$table->data[2][0] = __('Display on front').ui_print_help_tip(
-$table->data[0][5] = html_print_checkbox('display_on_front', 1, $display_on_front, true);
+    __('The fields with display on front enabled will be displayed into the agent details'),
+    true
+);
+$table->data[2][1] = html_print_checkbox_switch(
+    'display_on_front',
+    1,
+    $display_on_front,
+    true
+);
+
+$table->data[3][0] = __('Enabled combo');
+$table->data[3][1] = html_print_checkbox_switch_extended(
+    'is_combo_enable',
+    0,
+    $config['is_combo_enable'],
+    false,
+    '',
+    '',
+    true
+);
+
+$table->rowstyle[4] = 'display: none;';
+$table->data[4][0] = __('Combo values').ui_print_help_tip(
+    __('Set values separated by comma'),
+    true
+);
+$table->data[4][1] = html_print_input_text(
+    'combo_values',
+    io_safe_output($combo_values),
+    '',
+    35,
+    200,
+    true
+);
 
 echo '<form name="field" method="post" action="index.php?sec=gagente&sec2=godmode/agentes/fields_manager">';
 html_print_table($table);
@@ -67,3 +140,67 @@ if ($id_field) {
 
 echo '</div>';
 echo '</form>';
+?>
+
+<script>
+$(document).ready (function () {
+    if($('input[type=hidden][name=update_field]').val() == 1 && $('input[type=text][name=combo_values]').val() != ''){
+        $('input[type=checkbox][name=is_combo_enable]').prop('checked', true);
+        $('#configure_field-4').show();
+        $('input[type=checkbox][name=is_password_type]').change(function (e) {
+            dialog_message("#message_set_password");
+            $('input[type=checkbox][name=is_password_type]').prop('checked', false);
+            $('input[type=checkbox][name=is_combo_enable]').prop('checked', true);
+            $('#configure_field-4').show();
+            e.preventDefault();
+    });
+    $('input[type=checkbox][name=is_combo_enable]').change(function (e) {
+        if($('input[type=text][name=combo_values]').val() != '' &&  $('input[type=checkbox][name=is_combo_enable]').prop('checked', true)){
+            dialog_message("#message_set_combo");
+            $('input[type=checkbox][name=is_combo_enable]').prop('checked', true);
+            $('#configure_field-4').show();
+            e.preventDefault();
+        }
+    });
+    }
+   
+   
+    $('input[type=checkbox][name=is_combo_enable]').change(function () {
+        if( $(this).is(":checked") ){
+          $('#configure_field-4').show();
+          dialog_message("#message_no_set_password");
+          $('#configure_field-1').hide();
+        }
+        else{
+          $('#configure_field-4').hide();
+          $('#configure_field-1').show();
+        }
+    });
+    $('input[type=checkbox][name=is_password_type]').change(function () {
+        if( $(this).is(":checked")){
+            dialog_message("#message_no_set_combo");
+            $('#configure_field-3').hide();
+        }
+        else{
+            $('#configure_field-3').show();
+        }
+    });
+});
+
+function dialog_message(message_id) {
+  $(message_id)
+    .css("display", "inline")
+    .dialog({
+      modal: true,
+      show: "blind",
+      hide: "blind",
+      width: "400px",
+      buttons: {
+        Close: function() {
+          $(this).dialog("close");
+        }
+      }
+    });
+}
+
+</script>

pandora_console/godmode/agentes/fields_manager.php

@@ -26,7 +26,7 @@ if (!check_acl($config['id_user'], 0, 'PM')) {
     return;
 }
 
-// Header
+// Header.
 ui_print_page_header(__('Agents custom fields manager'), 'images/custom_field.png', false, '', true, '');
 
 $create_field = (bool) get_parameter('create_field');
@@ -36,10 +36,12 @@ $id_field = (int) get_parameter('id_field', 0);
 $name = (string) get_parameter('name', '');
 $display_on_front = (int) get_parameter('display_on_front', 0);
 $is_password_type = (int) get_parameter('is_password_type', 0);
+$combo_values = (string) get_parameter('combo_values', '');
+$combo_value_selected = (string) get_parameter('combo_value_selected', '');
 
-// Create field
+// Create field.
 if ($create_field) {
-    // Check if name field is empty
+    // Check if name field is empty.
     if ($name == '') {
         ui_print_error_message(__('The name must not be empty'));
     } else if ($name == db_get_value('name', 'tagent_custom_fields', 'name', $name)) {
@@ -51,20 +53,22 @@ if ($create_field) {
                 'name'             => $name,
                 'display_on_front' => $display_on_front,
                 'is_password_type' => $is_password_type,
+                'combo_values'     => $combo_values,
             ]
         );
         ui_print_success_message(__('Field successfully created'));
     }
 }
 
-// Update field
+// Update field.
 if ($update_field) {
-    // Check if name field is empty
+    // Check if name field is empty.
     if ($name != '') {
         $values = [
             'name'             => $name,
             'display_on_front' => $display_on_front,
             'is_password_type' => $is_password_type,
+            'combo_values'     => $combo_values,
         ];
 
         $result = db_process_sql_update('tagent_custom_fields', $values, ['id_field' => $id_field]);
@@ -79,7 +83,7 @@ if ($update_field) {
     }
 }
 
-// Delete field
+// Delete field.
 if ($delete_field) {
     $result = db_process_sql_delete(
         'tagent_custom_fields',

pandora_console/godmode/agentes/module_manager_editor_common.php

@@ -431,7 +431,7 @@ if (modules_is_string_type($id_module_type) || $edit) {
         str_replace('"', '', $str_warning),
         '',
         10,
-        255,
+        1024,
         true,
         $disabledBecauseInPolicy,
         false,
@@ -484,7 +484,7 @@ if (modules_is_string_type($id_module_type) || $edit) {
         str_replace('"', '', $str_critical),
         '',
         10,
-        255,
+        1024,
         true,
         $disabledBecauseInPolicy,
         false,

pandora_console/godmode/massive/massive_edit_agents.php

@@ -689,6 +689,13 @@ foreach ($fields as $field) {
         __('This field allows url insertion using the BBCode\'s url tag').'.<br />'.__('The format is: [url=\'url to navigate\']\'text to show\'[/url]').'.<br /><br />'.__('e.g.: [url=google.com]Google web search[/url]'),
         true
     );
+    $combo = [];
+    $combo = $field['combo_values'];
+    $combo = explode(',', $combo);
+    $combo_values = [];
+    foreach ($combo as $value) {
+        $combo_values[$value] = $value;
+    }
 
     $custom_value = db_get_value_filter('description', 'tagent_custom_data', ['id_field' => $field['id_field'], 'id_agent' => $id_agente]);
 
@@ -714,6 +721,28 @@ foreach ($fields as $field) {
         $data[1] = html_print_textarea('customvalue_'.$field['id_field'], 2, 65, $custom_value, 'style="min-height: 30px;"', true);
     }
 
+    if ($field['combo_values'] !== '') {
+        $data[1] = html_print_select(
+            $combo_values,
+            'customvalue_'.$field['id_field'],
+            $custom_value,
+            '',
+            __('No change'),
+            '',
+            true,
+            false,
+            false,
+            '',
+            false,
+            false,
+            false,
+            false,
+            false,
+            '',
+            false
+        );
+    };
+
     array_push($table->data, $data);
 }
 

pandora_console/godmode/massive/massive_edit_modules.php

@@ -562,7 +562,7 @@ $table->data['edit1'][1] = '<table width="100%">';
                 '',
                 '',
                 5,
-                255,
+                1024,
                 true
             );
             $table->data['edit1'][1] .= '</td>';
@@ -631,7 +631,7 @@ $table->data['edit1'][1] = '<table width="100%">';
                 '',
                 '',
                 5,
-                255,
+                1024,
                 true
             );
             $table->data['edit1'][3] .= '</td>';

pandora_console/godmode/modules/manage_network_components_form_common.php

@@ -190,7 +190,7 @@ $table->data[4][1] .= html_print_input_text(
     $str_warning,
     '',
     5,
-    64,
+    1024,
     true
 ).'</span>';
 $table->data[4][1] .= '<br /><em>'.__('Inverse interval').'</em>';
@@ -225,7 +225,7 @@ $table->data[5][1] .= html_print_input_text(
     $str_critical,
     '',
     5,
-    64,
+    1024,
     true
 ).'</span>';
 $table->data[5][1] .= '<br /><em>'.__('Inverse interval').'</em>';

pandora_console/include/ajax/events.php

@@ -54,6 +54,7 @@ $table_events = get_parameter('table_events', 0);
 $total_events = (bool) get_parameter('total_events');
 $total_event_graph = (bool) get_parameter('total_event_graph');
 $graphic_event_group = (bool) get_parameter('graphic_event_group');
+$get_table_response_command = (bool) get_parameter('get_table_response_command');
 
 if ($get_event_name) {
     $event_id = get_parameter('event_id');
@@ -116,6 +117,7 @@ if ($get_response_target) {
     }
 
     echo events_get_response_target($event_id, $response_id, $server_id);
+
     return;
 }
 
@@ -129,6 +131,7 @@ if ($get_response) {
     }
 
     echo json_encode($event_response);
+
     return;
 }
 
@@ -136,6 +139,7 @@ if ($perform_event_response) {
     global $config;
 
     $command = get_parameter('target', '');
+
     $response_id = get_parameter('response_id');
 
     $event_response = db_get_row('tevent_response', 'id', $response_id);
@@ -148,7 +152,11 @@ if ($perform_event_response) {
                 'nano',
             ];
 
-            $server_data = db_get_row('tserver', 'id_server', $event_response['server_to_exec']);
+            $server_data = db_get_row(
+                'tserver',
+                'id_server',
+                $event_response['server_to_exec']
+            );
 
             if (in_array(strtolower($command), $commandExclusions)) {
                 echo 'Only stdin/stdout commands are supported';
@@ -234,13 +242,29 @@ if ($dialogue_event_response) {
                 );
                 echo '</div><br>';
 
-                echo "<div id='response_loading_command_".$out_iterator."' style='display:none'>".html_print_image('images/spinner.gif', true).'</div>';
+                echo "<div id='response_loading_command_".$out_iterator."' style='display:none'>";
+                echo html_print_image(
+                    'images/spinner.gif',
+                    true
+                );
+                echo '</div>';
                 echo "<br><div id='response_out_".$out_iterator."' style='text-align:left'></div>";
 
                 if ($end) {
                     echo "<br><div id='re_exec_command_".$out_iterator."' style='display:none;'>";
-                    html_print_button(__('Execute again'), 'btn_str', false, 'execute_event_response(false);', "class='sub next'");
+                    html_print_button(
-                    echo "<span id='execute_again_loading' style='display:none'>".html_print_image('images/spinner.gif', true).'</span>';
+                        __('Execute again'),
+                        'btn_str',
+                        false,
+                        'execute_event_response(false);',
+                        "class='sub next'"
+                    );
+                    echo "<span id='execute_again_loading' style='display:none'>";
+                    echo html_print_image(
+                        'images/spinner.gif',
+                        true
+                    );
+                    echo '</span>';
                     echo '</div>';
                 }
             } else {
@@ -796,3 +820,67 @@ if ($graphic_event_group) {
     echo $prueba;
     return;
 }
+
+if ($get_table_response_command) {
+    global $config;
+
+    $response_id = get_parameter('event_response_id');
+    $params_string = db_get_value(
+        'params',
+        'tevent_response',
+        'id',
+        $response_id
+    );
+
+    $params = explode(',', $params_string);
+
+    $table = new stdClass;
+    $table->id = 'events_responses_table_command';
+    $table->width = '90%';
+    $table->styleTable = 'text-align:center; margin: 0 auto;';
+
+    $table->style = [];
+    $table->style[0] = 'text-align:center;';
+    $table->style[1] = 'text-align:center;';
+
+    $table->head = [];
+    $table->head[0] = __('Parameters');
+    $table->head[0] .= ui_print_help_tip(
+        __('These commands will apply to all selected events'),
+        true
+    );
+    $table->head[1] = __('Value');
+
+    if (isset($params) === true
+        && is_array($params) === true
+    ) {
+        foreach ($params as $key => $value) {
+            $table->data[$key][0] = $value;
+            $table->data[$key][1] = html_print_input_text(
+                $value.'-'.$key,
+                '',
+                '',
+                50,
+                255,
+                true,
+                false,
+                false,
+                '',
+                'response_command_input'
+            );
+        }
+    }
+
+    echo '<form id="form_response_command">';
+    echo html_print_table($table, true);
+    echo '</form>';
+    echo html_print_submit_button(
+        __('Execute'),
+        'enter_command',
+        false,
+        'class="sub next" style="float:right; margin-top:15px; margin-right:25px;"',
+        true
+    );
+
+    return;
+}

pandora_console/include/config_process.php

@@ -20,7 +20,7 @@
 /**
  * Pandora build version and version
  */
-$build_version = 'PC190306';
+$build_version = 'PC190311';
 $pandora_version = 'v7.0NG.732';
 
 // Do not overwrite default timezone set if defined.

pandora_console/include/functions_filemanager.php

@@ -127,7 +127,7 @@ if (isset($config['homedir_filemanager'])) {
 }
 
 $sec2 = get_parameter('sec2');
-if ($sec2 == 'enterprise/godmode/agentes/collections') {
+if ($sec2 == 'enterprise/godmode/agentes/collections' || $sec2 == 'advanced/collections') {
     $homedir_filemanager .= '/attachment/collection/';
 }
 

pandora_console/include/functions_reporting_html.php

@@ -4531,7 +4531,7 @@ function reporting_get_event_histogram($events, $text_header_event=false)
             [],
             true,
             $ttl,
-            false,
+            true,
             false
         );
 
@@ -4752,7 +4752,10 @@ function reporting_html_planned_downtimes_table($planned_downtimes)
 
     $table = new StdClass();
     $table->width = '99%';
-    $table->title = __('This SLA has been affected by the following planned downtimes');
+    $table->title = __('This SLA has been affected by the following planned downtimes').ui_print_help_tip(
+        __('If the duration of the planned downtime is less than 5 minutes it will not be represented in the graph'),
+        true
+    );
     $table->head = [];
     $table->head[0] = __('Name');
     $table->head[1] = __('Description');

pandora_console/include/graphs/functions_flot.php

@@ -748,7 +748,7 @@ function flot_slicesbar_graph(
         if ($widgets) {
             $return = "<div id='$graph_id' class='noresizevc graph $adapt_key' style='width: ".$width.'px; height: '.$height."px;'></div>";
         } else {
-            $return = "<div id='$graph_id' class='noresizevc graph $adapt_key' style='width: ".$width.'px; height: '.$height."px;'></div>";
+            $return = "<div id='$graph_id' class='noresizevc graph $adapt_key' style='width: ".$width.'%; height: '.$height."px;'></div>";
         }
     }
 

pandora_console/include/javascript/pandora_events.js

@@ -241,6 +241,7 @@ function show_massive_response_dialog(
           },
           close: function(event, ui) {
             $(".chk_val").prop("checked", false);
+            $("#event_response_command_window").dialog("close");
           },
           width: response["modal_width"],
           height: response["modal_height"]
@@ -375,7 +376,12 @@ function add_row_param(id_table, param) {
 }
 
 // Get an event response from db
-function get_response_target(event_id, response_id, server_id) {
+function get_response_target(
+  event_id,
+  response_id,
+  server_id,
+  response_command
+) {
   var ajax_file = $("#hidden-ajax_file").val();
 
   var target = "";
@@ -400,15 +406,21 @@ function get_response_target(event_id, response_id, server_id) {
     }
   });
 
-  // Replace the custom params macros
+  // Replace the custom params macros.
   var response_params = get_response_params(response_id);
-
   if (response_params.length > 1 || response_params[0] != "") {
     for (i = 0; i < response_params.length; i++) {
-      target = target.replace(
+      if (!response_command) {
-        "_" + response_params[i] + "_",
+        target = target.replace(
-        $("#" + response_params[i]).val()
+          "_" + response_params[i] + "_",
-      );
+          $("#" + response_params[i]).val()
+        );
+      } else {
+        target = target.replace(
+          "_" + response_params[i] + "_",
+          response_command[response_params[i] + "-" + i]
+        );
+      }
     }
   }
 
@@ -459,10 +471,6 @@ function perform_response_massive(target, response_id, out_iterator) {
   $("#response_loading_command_" + out_iterator).show();
   $("#response_out_" + out_iterator).html("");
 
-  var finished = 0;
-  var time = Math.round(+new Date() / 1000);
-  var timeout = time + 10;
-
   var params = [];
   params.push("page=include/ajax/events");
   params.push("perform_event_response=1");
@@ -487,7 +495,7 @@ function perform_response_massive(target, response_id, out_iterator) {
   return false;
 }
 
-// Change the status of an event to new, in process or validated
+// Change the status of an event to new, in process or validated.
 function event_change_status(event_ids) {
   var ajax_file = $("#hidden-ajax_file").val();
 
@@ -681,3 +689,53 @@ function show_events_group_agent(id_insert, id_agent, server_id) {
     }
   });
 }
+
+function show_event_response_command_dialog(id, response, total_checked) {
+  var ajax_file = $("#hidden-ajax_file").val();
+
+  var params = [];
+  params.push("page=include/ajax/events");
+  params.push("get_table_response_command=1");
+  params.push("event_response_id=" + id);
+
+  jQuery.ajax({
+    data: params.join("&"),
+    type: "POST",
+    url: (action = ajax_file),
+    dataType: "html",
+    success: function(data) {
+      $("#event_response_command_window")
+        .hide()
+        .empty()
+        .append(data)
+        .dialog({
+          resizable: true,
+          draggable: true,
+          modal: false,
+          open: function() {
+            $("#response_loading_dialog").hide();
+            $("#button-submit_event_response").show();
+          },
+          width: 600,
+          height: 300
+        })
+        .show();
+
+      $("#submit-enter_command").on("click", function(e) {
+        e.preventDefault();
+        var response_command = [];
+
+        $(".response_command_input").each(function() {
+          response_command[$(this).attr("name")] = $(this).val();
+        });
+
+        check_massive_response_event(
+          id,
+          response,
+          total_checked,
+          response_command
+        );
+      });
+    }
+  });
+}

pandora_console/install.php

@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
 $version = '7.0NG.732';
-$build = '190306';
+$build = '190311';
             $banner = "v$version Build $build";
 
             error_reporting(0);

pandora_console/operation/events/events.build_table.php

@@ -988,6 +988,10 @@ if ($group_rep == 2) {
                     'A maximum of %s event custom responses can be selected',
                     $config['max_execution_event_response']
                 ).'</span>';
+                echo '<span id="max_custom_selected" style="display:none; color:#FC4444; line-height: 200%;">';
+                echo __(
+                    'Please, select an event'
+                ).'</span>';
                 echo '</div>';
             }
         }
@@ -995,12 +999,14 @@ if ($group_rep == 2) {
         ?>
             <script type="text/javascript">
 
-                function execute_event_response(event_list_btn) { 
+                function execute_event_response(event_list_btn) {
 
                     $('#max_custom_event_resp_msg').hide();
+                    $('#max_custom_selected').hide();
 
                     var response_id = $('select[name=response_id]').val();
 
+
                     if (!isNaN(response_id)) { // It is a custom response
 
                         var response = get_response(response_id);
@@ -1015,59 +1021,58 @@ if ($group_rep == 2) {
 
                         var total_checked = $(".chk_val:checked").length;
 
-                        // Limit number of events to apply custom responses to for performance reasons
+                        // Check select an event.
+                        if(total_checked == 0){
+                            $('#max_custom_selected').show();
+                            return;
+                        }
+
+                        // Limit number of events to apply custom responses
+                        // to for performance reasons.
                         if (total_checked > <?php echo $config['max_execution_event_response']; ?> ) {
                             $('#max_custom_event_resp_msg').show();
                             return;
                         }
 
+                        var response_command = [];
+                        $(".response_command_input").each(function() {
+                            response_command[$(this).attr("name")] = $(this).val();
+                        });
+
                         if (event_list_btn) {
                             $('#button-submit_event_response').hide(function() {
                                 $('#response_loading_dialog').show(function() {
+                                    var check_params = get_response_params(
+                                        response_id
+                                    );
 
-                                    $(".chk_val").each(function() {
+                                    if(check_params[0] !== ''){
-                                        if ($(this).is(":checked")) {
+                                        show_event_response_command_dialog(
-                                            event_id = $(this).val();
+                                            response_id,
-                                            server_id = $('#hidden-server_id_'+event_id).val();
+                                            response,
-                                            response['target'] = get_response_target(
+                                            total_checked
-                                                event_id,
+                                        );
-                                                response_id,
+                                    }
-                                                server_id
+                                    else{
-                                            );
+                                        check_massive_response_event(
-                                            if (total_checked-1 === counter) end=1;
+                                            response_id,
-                                            show_massive_response_dialog(
+                                            response,
-                                                event_id,
+                                            total_checked,
-                                                response_id,
+                                            response_command
-                                                response,
+                                        );
-                                                counter,
+                                    }
-                                                end
-                                            );
-                                            counter++;
-                                        }
-                                    });
                                 });
                             });
                         }
                         else {
                             $('#button-btn_str').hide(function() {
                                 $('#execute_again_loading').show(function() {
-
+                                    check_massive_response_event(
-                                    $(".chk_val").each(function() {
+                                        response_id,
-                                        
+                                        response,
-                                        if ($(this).is(":checked")) {
+                                        total_checked,
-                                            //var server_id = $('#hidden-server_id_'+).
+                                        response_command
-                                            event_id = $(this).val();
+                                    );
-                                            server_id = $('#hidden-server_id_'+event_id).val();
-
-                                            response['target'] = get_response_target(event_id, response_id, server_id);
-
-                                            if (total_checked-1 === counter) end=1;
-
-                                            show_massive_response_dialog(event_id, response_id, response, counter, end);
-
-                                            counter++;
-                                        }
-                                    });
                                 });
                             });
                         }
@@ -1087,6 +1092,42 @@ if ($group_rep == 2) {
                         }
                     }
                 }
+
+                function check_massive_response_event(
+                    response_id,
+                    response,
+                    total_checked,
+                    response_command
+                ){
+                    var counter=0;
+                    var end=0;
+
+                    $(".chk_val").each(function() {
+                        if ($(this).is(":checked")) {
+                            event_id = $(this).val();
+                            server_id = $('#hidden-server_id_'+event_id).val();
+                            response['target'] = get_response_target(
+                                event_id,
+                                response_id,
+                                server_id,
+                                response_command
+                            );
+
+                            if (total_checked-1 === counter)
+                                end=1;
+
+                            show_massive_response_dialog(
+                                event_id,
+                                response_id,
+                                response,
+                                counter,
+                                end
+                            );
+
+                            counter++;
+                        }
+                    });
+                }
             </script>
         <?php
     } else {

pandora_console/operation/events/events.php

@@ -611,6 +611,7 @@ if ($delete) {
 
 echo "<div id='event_details_window'></div>";
 echo "<div id='event_response_window'></div>";
+echo "<div id='event_response_command_window' title='".__('Parameters')."'></div>";
 
 ui_require_jquery_file('bgiframe');
 ui_require_javascript_file('pandora_events');

pandora_console/pandora_console.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.732
-%define release     190306
+%define release     190311
 
 # User and Group under which Apache is running
 %define httpd_name  httpd

pandora_console/pandora_console.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.732
-%define release     190306
+%define release     190311
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2

pandora_console/pandoradb.sql

@@ -1894,6 +1894,7 @@ CREATE TABLE IF NOT EXISTS `tagent_custom_fields` (
 	`name` varchar(45) NOT NULL default '',
 	`display_on_front` tinyint(1) NOT NULL default 0,
 	`is_password_type` tinyint(1) NOT NULL default 0,
+	`combo_values` VARCHAR(255) DEFAULT '',
 	PRIMARY KEY  (`id_field`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 

pandora_console/pandoradb_data.sql

@@ -111,10 +111,10 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
 ('custom_report_front_logo', 'images/pandora_logo_white.jpg'),
 ('custom_report_front_header', ''),
 ('custom_report_front_footer', ''),
-('MR', 25),
+('MR', 26),
 ('identification_reminder', 1),
 ('identification_reminder_timestamp', 0),
-('current_package_enterprise', '732'),
+('current_package_enterprise', '733'),
 ('post_process_custom_values', '{"0.00000038580247":"Seconds to months","0.00000165343915":"Seconds to weeks","0.00001157407407":"Seconds to days","0.01666666666667":"Seconds to minutes","0.00000000093132":"Bytes to Gigabytes","0.00000095367432":"Bytes to Megabytes","0.0009765625":"Bytes to Kilobytes","0.00000001653439":"Timeticks to weeks","0.00000011574074":"Timeticks to days"}'),
 ('custom_docs_logo', 'default_docs.png'),
 ('custom_support_logo', 'default_support.png'),
@@ -1151,7 +1151,7 @@ INSERT INTO `tplugin` (`id`, `name`, `description`, `max_timeout`, `execute`, `p
 
 INSERT INTO `tplugin` (`id`, `name`, `description`, `max_timeout`, `max_retries`, `execute`, `net_dst_opt`, `net_port_opt`, `user_opt`, `pass_opt`, `plugin_type`, `macros`, `parameters`) VALUES (9,'Packet Loss','Checks for dropped packages after X seconds of testing. It returns % of dropped packets. It uses ping flood mode to launch 50 consecutive pings to a remote destination. On local, stable networks, value should be 0.
',30,0,'/usr/share/pandora_server/util/plugin/packet_loss.sh','','','','',0,'{\"1\":{\"macro\":\"_field1_\",\"desc\":\"Test time\",\"help\":\"\",\"value\":\"8\",\"hide\":\"\"},\"2\":{\"macro\":\"_field2_\",\"desc\":\"Target IP\",\"help\":\"\",\"value\":\"\",\"hide\":\"\"}}','_field1_ _field2_');
 
-INSERT INTO `tagent_custom_fields` VALUES (1,'Serial Number',0,0),(2,'Department',0,0),(3,'Additional ID',0,0),(4,'eHorusID',0,0);
+INSERT INTO `tagent_custom_fields` VALUES (1,'Serial Number',0,0,''),(2,'Department',0,0,''),(3,'Additional ID',0,0,''),(4,'eHorusID',0,0,'');
 
 INSERT INTO `ttag` VALUES (1,'network','Network equipment','http://artica.es','',''),(2,'critical','Critical modules','','',''),(3,'dmz','DMZ Network Zone','','',''),(4,'performance','Performance anda capacity modules','','',''),(5,'configuration','','','','');
 

pandora_server/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.732-190306
+Version: 7.0NG.732-190311
 Architecture: all
 Priority: optional
 Section: admin

pandora_server/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.732-190306"
+pandora_version="7.0NG.732-190311"
 
 package_cpan=0
 package_pandora=1

pandora_server/lib/PandoraFMS/Config.pm

@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.732";
-my $pandora_build = "190306";
+my $pandora_build = "190311";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash

pandora_server/lib/PandoraFMS/PluginTools.pm

@@ -32,7 +32,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.732";
-my $pandora_build = "190306";
+my $pandora_build = "190311";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );

pandora_server/pandora_server.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.732
-%define release     190306
+%define release     190311
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.732
-%define release     190306
+%define release     190311
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server_installer

@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.732"
-PI_BUILD="190306"
+PI_BUILD="190311"
 
 MODE=$1
 if [ $# -gt 1 ]; then

pandora_server/util/pandora_db.pl

@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.732 PS190306";
+my $version = "7.0NG.732 PS190311";
 
 # Pandora server configuration
 my %conf;

pandora_server/util/pandora_manage.pl

@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.732 PS190306";
+my $version = "7.0NG.732 PS190311";
 
 # save program name for logging
 my $progname = basename($0);

tests/Dockerfile

@@ -126,5 +126,23 @@ RUN mkdir -p /opt/phantomjs/bin && cd /opt/phantomjs/bin; \
 	chmod +x phantomjs; \
 	ln -s /opt/phantomjs/bin/phantomjs /usr/bin/;
 
+# Install debugg dependencies.
+RUN yum install -y \
+	php-devel \
+	php-pear \
+	gcc \
+	gcc-c++ \
+	autoconf \
+	automake  && \
+	pecl install Xdebug && \
+	git clone https://github.com/tideways/php-xhprof-extension && \
+	cd php-xhprof-extension && \
+	phpize && \
+	./configure && \
+	make && \
+	make install && \
+	cd .. && \
+	rm -rf php-xhprof-extension
+
 #Exposing ports for: HTTP, SNMP Traps, Tentacle protocol
 EXPOSE 80 162/udp 41121