diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index c09991a05b..52f90452ff 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -855,10 +855,11 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret $returned = ui_print_info_message ( __('No events'),'',true ); return $returned; } - else + else echo ui_print_info_message ( __('No events') ); } else { + $table = new stdClass(); $table->id = 'latest_events_table'; $table->cellpadding = 0; $table->cellspacing = 0; diff --git a/pandora_console/operation/agentes/group_view.php b/pandora_console/operation/agentes/group_view.php index 3a5b8bd20a..909bcff12f 100644 --- a/pandora_console/operation/agentes/group_view.php +++ b/pandora_console/operation/agentes/group_view.php @@ -82,6 +82,7 @@ $total_agentes = 0; $monitor_ok = 0; $monitor_warning = 0; $monitor_critical = 0; +$monitor_unknown = 0; $agents_unknown = 0; foreach ($result_groups as $data) { $total_agentes += $data["_total_agents_"]; diff --git a/pandora_console/operation/agentes/tactical.php b/pandora_console/operation/agentes/tactical.php index 895e6d3cb8..1e3786c721 100755 --- a/pandora_console/operation/agentes/tactical.php +++ b/pandora_console/operation/agentes/tactical.php @@ -228,7 +228,7 @@ $acltags = tags_get_user_module_and_tags ($config['id_user'], $access = 'ER', $u if (!empty($acltags)) { $tags_condition = tags_get_acl_tags_event_condition($acltags, false, $user_strict); - + if (!empty($tags_condition)) { $events = events_print_event_table ("estado<>1 AND ($tags_condition)", 10, "100%",true,false,true); ui_toggle($events, __('Latest events')); @@ -243,7 +243,7 @@ if ($is_admin) { require($config['homedir'] . '/godmode/servers/servers.build_table.php'); } -$out .= '
'; +$out = '
'; $out .= '
' . __('Event graph') . diff --git a/pandora_console/operation/events/events.build_table.php b/pandora_console/operation/events/events.build_table.php index 17f99d3c48..5b98f9b9a9 100644 --- a/pandora_console/operation/events/events.build_table.php +++ b/pandora_console/operation/events/events.build_table.php @@ -14,6 +14,7 @@ // GNU General Public License for more details. if(!isset($table->width)) { + $table = new stdClass(); $table->width = '100%'; } @@ -500,7 +501,7 @@ foreach ($result as $event) { if (!empty($event_user_comments)) { $last_key = key(array_slice($event_user_comments, -1, 1, true)); $date_format = $config['date_format']; - + foreach ($event_user_comments as $key => $event_user_comment) { $event_user_comment_str .= sprintf('%s: %s
%s: %s
%s: %s
', __('Date'), date($date_format, $event_user_comment['utimestamp']), @@ -591,7 +592,7 @@ foreach ($result as $event) { array ("title" => __('Validate event'))); $data[$i] .= ''; } - + // Delete event if ((tags_checks_event_acl($config["id_user"], $event["id_grupo"], "EM", $event['clean_tags'],$childrens_ids) == 1)) { if($event['estado'] != 2) { @@ -677,7 +678,7 @@ if (!empty ($table->data)) { }); } - "; } + if (is_ajax()) { $get_filter_values = get_parameter('get_filter_values', 0); $save_event_filter = get_parameter('save_event_filter', 0); @@ -141,7 +142,7 @@ $strict_user = db_get_value('strict_acl', 'tusuario', 'id_user', $config['id_use $tags = tags_get_user_tags($config['id_user'], 'ER'); -if ($id_agent == 0 && $text_agent != '') { +if ($id_agent == 0 && $text_agent != __('All')) { $id_agent = -1; } @@ -419,6 +420,7 @@ else { //---------------------------------------------------------------------- //- INI ADVANCE FILTER ------------------------------------------------- +$table_advanced = new stdClass(); $table_advanced->id = 'events_filter_form_advanced'; $table_advanced->width = '98%'; $table_advanced->cellspacing = 4; @@ -542,6 +544,7 @@ $table_advanced->rowclass[] = ''; //- END ADVANCE FILTER ------------------------------------------------- +$table = new stdClass(); $table->id = 'events_filter_form'; $table->width = '100%'; $table->cellspacing = 4;