" + item; - }); + data["report"].forEach(function(item) { + text += "
" + item; + }); } $("#msg").empty(); $("#msg").html(text); $("#msg").dialog({ - width: 450, - position: { - my: "center", - at: "center", - of: window, - collision: "fit" - }, - title: title, - buttons: [ - { - class: - "ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-next", + width: 450, + position: { + my: "center", + at: "center", + of: window, + collision: "fit" + }, + title: title, + buttons: [{ + class: "ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-next", text: "OK", click: function(e) { $("#msg").close(); } - } - ] + }] }); } @@ -5044,8 +5131,8 @@ class AgentWizard extends HTML var markedCount = 0; if (type == 'block') { selectedBlock - .parent() - .removeClass("alpha50"); + .parent() + .removeClass("alpha50"); if (selectedBlock.prop("checked")) { // Set to active the values of fields. $("[id*=hidden-module-active-"+blockNumber+"]") @@ -5054,9 +5141,9 @@ class AgentWizard extends HTML }); // Set checked. $("[id*=checkbox-sel_module_" + blockNumber + "]") - .each(function(){ - $(this).prop("checked", true); - }); + .each(function() { + $(this).prop("checked", true); + }); imageInfoModules.removeClass('hidden'); } else { // Set to inactive the values of fields. @@ -5066,15 +5153,15 @@ class AgentWizard extends HTML }); // Set unchecked. $("[id*=checkbox-sel_module_" + blockNumber + "]") - .each(function(){ - $(this).prop("checked", false); - }); + .each(function() { + $(this).prop("checked", false); + }); imageInfoModules.addClass('hidden'); } } else if (type == 'module') { // Getting the element. - var thisModuleHidden = document.getElementById("hidden-module-active-"+switchName[2]+"_"+moduleNumber); - var thisModule = $("#checkbox-sel_module_"+blockNumber+"_"+moduleNumber); + var thisModuleHidden = document.getElementById("hidden-module-active-" + switchName[2] + "_" + moduleNumber); + var thisModule = $("#checkbox-sel_module_" + blockNumber + "_" + moduleNumber); // Setting the individual field if (thisModule.prop('checked')) { thisModuleHidden.value = '1'; @@ -5084,12 +5171,12 @@ class AgentWizard extends HTML // Get the list of selected modules. $("[id*=checkbox-sel_module_" + blockNumber + "]") - .each(function() { - if ($(this).prop("checked")) { - markedCount++; - } - totalCount++; - }); + .each(function() { + if ($(this).prop("checked")) { + markedCount++; + } + totalCount++; + }); if (totalCount == markedCount) { selectedBlock.prop("checked", true); @@ -5118,7 +5205,7 @@ class AgentWizard extends HTML */ function switchBlockControlInterfaces(e) { var string = $('#text-filter-search').val(); - if(string == ''){ + if (string == '') { if (e.checked) { $(".interfaz_select").prop("checked", true); } else { @@ -5127,15 +5214,15 @@ class AgentWizard extends HTML } else { var regex = new RegExp(string); var interfaces = $('.interfaces_search'); - interfaces.each(function(){ - if(this.id.match(regex)) { + interfaces.each(function() { + if (this.id.match(regex)) { $(this).removeClass('hidden'); if (e.checked) { - $("input[name='interfaz_select_"+this.id+"']") + $("input[name='interfaz_select_" + this.id + "']") .prop("checked", true); } else { - $("input[name='interfaz_select_"+this.id+"']") - .prop("checked", false); + $("input[name='interfaz_select_" + this.id + "']") + .prop("checked", false); } } }); @@ -5143,13 +5230,13 @@ class AgentWizard extends HTML } /** - * Show the modal with modules for create. - */ + * Show the modal with modules for create. + */ function processListModules() { confirmDialog({ title: "", message: function() { - var id = "div-"+uniqId(); + var id = "div-" + uniqId(); var loading = "" + "..."; $.ajax({ method: "post", @@ -5165,22 +5252,22 @@ class AgentWizard extends HTML }, datatype: "html", success: function(data) { - $('#'+id).empty().append(data); + $('#' + id).empty().append(data); }, error: function(e) { showMsg(e); } }); - return "
"+loading+"
";
+ return "" + loading + "
";
},
ok: "",
cancel: "",
onAccept: function() {
- $('#reviewed-modules').submit();
+ $('#reviewed-modules').submit();
},
- size:750,
- maxHeight:500
+ size: 750,
+ maxHeight: 500
});
}
diff --git a/pandora_console/include/class/HTML.class.php b/pandora_console/include/class/HTML.class.php
index 376afc4bfd..41ceabf5ab 100644
--- a/pandora_console/include/class/HTML.class.php
+++ b/pandora_console/include/class/HTML.class.php
@@ -547,6 +547,7 @@ class HTML
} else {
if ($input['arguments']['type'] != 'hidden'
&& $input['arguments']['type'] != 'hidden_extended'
+ && $input['arguments']['type'] != 'datalist'
) {
if (!$direct) {
$output .= '') AS user_comment, - GROUP_CONCAT(DISTINCT id_evento SEPARATOR ',') AS similar_ids, - COUNT(id_evento) AS event_rep, MAX(utimestamp) AS timestamp_rep, - MIN(utimestamp) AS timestamp_rep_min, - (SELECT owner_user FROM $table WHERE id_evento = MAX(te.id_evento)) owner_user, - (SELECT id_usuario FROM $table WHERE id_evento = MAX(te.id_evento)) id_usuario, - (SELECT id_agente FROM $table WHERE id_evento = MAX(te.id_evento)) id_agente, - (SELECT criticity FROM $table WHERE id_evento = MAX(te.id_evento)) AS criticity, - (SELECT ack_utimestamp FROM $table WHERE id_evento = MAX(te.id_evento)) AS ack_utimestamp, - (SELECT nombre FROM tagente_modulo WHERE id_agente_modulo = te.id_agentmodule) AS module_name - FROM $table te $event_lj - WHERE 1=1 ".$sql_post.' - GROUP BY estado, evento, id_agente, id_agentmodule'.$groupby_extra; - $sql .= ' '.events_get_sql_order($sort_field, $order, 2); - $sql .= ' LIMIT '.$offset.','.$pagination; + $sql = sprintf( + 'SELECT *, + MAX(id_evento) AS id_evento, + GROUP_CONCAT( + DISTINCT user_comment SEPARATOR "
" + ) AS user_comment, + GROUP_CONCAT( + DISTINCT id_evento SEPARATOR "," + ) AS similar_ids, + COUNT(id_evento) AS event_rep, MAX(utimestamp) AS timestamp_rep, + MIN(utimestamp) AS timestamp_rep_min, + (SELECT owner_user + FROM %s + WHERE id_evento = MAX(te.id_evento)) AS owner_user, + (SELECT id_usuario + FROM %s + WHERE id_evento = MAX(te.id_evento)) AS id_usuario, + (SELECT id_agente + FROM %s + WHERE id_evento = MAX(te.id_evento)) AS id_agente, + (SELECT criticity + FROM %s + WHERE id_evento = MAX(te.id_evento)) AS criticity, + (SELECT ack_utimestamp + FROM %s + WHERE id_evento = MAX(te.id_evento)) AS ack_utimestamp, + (SELECT nombre + FROM tagente_modulo + WHERE id_agente_modulo = te.id_agentmodule) AS module_name + FROM %s te %s + %s + GROUP BY estado, evento, id_agente, id_agentmodule %s + %s + LIMIT %d, %d', + $table, + $table, + $table, + $table, + $table, + $table, + $event_lj, + $sql_post, + $groupby_extra, + events_get_sql_order($sort_field, $order, 2), + $offset, + $pagination + ); } - // Extract the events by filter (or not) from db + // Extract the events by filter (or not) from db. $events = db_get_all_rows_sql($sql, $history_db); if ($total) { @@ -2959,7 +2997,8 @@ function events_get_agent( $type = []; foreach ($filter_event_type as $event_type) { if ($event_type != '') { - // If normal, warning, could be several (going_up_warning, going_down_warning... too complex. + // If normal, warning, could be several + // (going_up_warning, going_down_warning... too complex. // Shown to user only "warning, critical and normal". if ($event_type == 'warning' || $event_type == 'critical' || $event_type == 'normal') { $type[] = " event_type LIKE '%".$event_type."%' "; @@ -2979,10 +3018,10 @@ function events_get_agent( } if ($events_group) { - $sql_where .= sprintf( + $secondary_groups = sprintf( ' INNER JOIN tgrupo tg - ON (te.id_grupo = tg.id_grupo AND tg.id_grupo = %s) - OR (tg.id_grupo = tasg.id_group AND tasg.id_group = %s) + ON (te.id_grupo = tg.id_grupo AND tg.id_grupo IN (%s)) + OR (tg.id_grupo = tasg.id_group AND tasg.id_group IN (%s)) WHERE utimestamp > %d AND utimestamp <= %d ', join(',', $id_group), @@ -2990,22 +3029,27 @@ function events_get_agent( $datelimit, $date ); - } else if ($events_module) { - $sql_where .= sprintf( - ' AND id_agentmodule = %d AND utimestamp > %d - AND utimestamp <= %d ', - $id_agent_module, - $datelimit, - $date - ); + $sql_where = $secondary_groups.' '.$sql_where; } else { - $sql_where .= sprintf( - ' AND id_agente = %d AND utimestamp > %d - AND utimestamp <= %d ', - $id_agent, - $datelimit, - $date - ); + $sql_where = ' WHERE 1=1 '.$sql_where; + + if ($events_module) { + $sql_where .= sprintf( + ' AND id_agentmodule = %d AND utimestamp > %d + AND utimestamp <= %d ', + $id_agent_module, + $datelimit, + $date + ); + } else { + $sql_where .= sprintf( + ' AND id_agente = %d AND utimestamp > %d + AND utimestamp <= %d ', + $id_agent, + $datelimit, + $date + ); + } } if (is_metaconsole() && $id_server) { @@ -3025,11 +3069,7 @@ function events_get_agent( } else { return events_get_events_no_grouped( $sql_where, - 0, - 1000, (is_metaconsole() && $id_server) ? true : false, - false, - false, $history ); } @@ -3793,7 +3833,7 @@ function events_get_response_target( if (strpos($target, '_group_name_') !== false) { $target = str_replace( '_group_name_', - groups_get_name($event['id_grupo'], true), + io_safe_output(groups_get_name($event['id_grupo'], true)), $target ); } @@ -3809,7 +3849,7 @@ function events_get_response_target( if (strpos($target, '_event_date_') !== false) { $target = str_replace( '_event_date_', - date($config['date_format'], $event['utimestamp']), + io_safe_output(date($config['date_format'], $event['utimestamp'])), $target ); } @@ -3833,7 +3873,7 @@ function events_get_response_target( if (strpos($target, '_alert_id_') !== false) { $target = str_replace( '_alert_id_', - empty($event['is_alert_am']) ? __('N/A') : $event['is_alert_am'], + empty($event['id_alert_am']) ? __('N/A') : $event['id_alert_am'], $target ); } @@ -3915,6 +3955,15 @@ function events_get_response_target( $target = str_replace('_current_user_', $config['id_user'], $target); } + // This will replace the macro with the command timeout value. + if (strpos($target, '_command_timeout_') !== false) { + $target = str_replace( + '_command_timeout_', + $event_response['command_timeout'], + $target + ); + } + return $target; } @@ -4652,16 +4701,24 @@ function events_page_general($event) $table_general->data[] = $data; // If event is validated, show who and when acknowleded it. + $table_general->cellclass[8][1] = 'general_acknowleded'; + $data = []; $data[0] = __('Acknowledged by'); if ($event['estado'] == 1) { - $user_ack = db_get_value('fullname', 'tusuario', 'id_user', $event['id_usuario']); - if (empty($user_ack)) { + $user_ack = db_get_value( + 'fullname', + 'tusuario', + 'id_user', + $event['id_usuario'] + ); + + if (empty($user_ack) === true) { $user_ack = $event['id_usuario']; } - $date_ack = date($config['date_format'], $event['ack_utimestamp']); + $date_ack = io_safe_output($event['ack_utimestamp']); $data[1] = $user_ack.' ('.$date_ack.')'; } else { $data[1] = ''.__('N/A').''; @@ -6995,7 +7052,7 @@ function events_get_field_value_by_event_id( if (strpos($value, '_group_name_') !== false) { $value = str_replace( '_group_name_', - groups_get_name($event['id_grupo'], true), + io_safe_output(groups_get_name($event['id_grupo'], true)), $value ); } @@ -7011,7 +7068,9 @@ function events_get_field_value_by_event_id( if (strpos($value, '_event_date_') !== false) { $value = str_replace( '_event_date_', - date($config['date_format'], $event['utimestamp']), + io_safe_output( + date($config['date_format'], $event['utimestamp']) + ), $value ); } diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index 4fd1439f8f..f40b75e3b2 100644 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -2541,13 +2541,9 @@ function graphic_agentaccess( } else { $options['generals']['pdf']['width'] = 350; $options['generals']['pdf']['height'] = 125; - if (!empty($data_array)) { - $imgbase64 = '
;
- $imgbase64 .= ')
';
- } else {
- $imgbase64 .= vbar_graph($data_array, $options, 2);
- }
+ $imgbase64 = ';
+ $imgbase64 .= ')
';
return $imgbase64;
}
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index c61d62d686..2c71835165 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -2032,6 +2032,7 @@ function html_print_input_text_extended(
'required',
'autocomplete',
'form',
+ 'list',
];
$output = '';
+ foreach ($values as $key => $value) {
+ $result .= '