From 2fe85510a72cfb0f6d34df794561cbf5ec8ff16d Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Fri, 22 May 2015 12:31:33 +0200 Subject: [PATCH 1/3] Fixed PHP Warnings. --- pandora_console/include/functions_events.php | 3 ++- pandora_console/operation/agentes/group_view.php | 1 + pandora_console/operation/agentes/tactical.php | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index 4fa1f53a4f..53dbe452fe 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -854,10 +854,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') . From 3d32d5645eb83845a2fc7046bb8890f37428a475 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Fri, 22 May 2015 13:10:05 +0200 Subject: [PATCH 2/3] Fixed the event list when it is setted the replication, now the info message show again. --- pandora_console/operation/events/events.php | 14 ++++++++++---- pandora_console/operation/events/events_list.php | 7 ++++--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index b2c773a076..8ad9e23852 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -25,6 +25,8 @@ require_once ($config['homedir'].'/include/functions_ui.php'); check_login (); + + if (! check_acl ($config["id_user"], 0, "ER")) { db_pandora_audit("ACL Violation", "Trying to access event viewer"); @@ -46,10 +48,7 @@ if (!$meta) { if (isset($config['event_replication']) && $config['event_replication'] == 1) { - if ($config['show_events_in_local'] == 0) { - return; - } - else { + if ((bool)$config['show_events_in_local']) { $readonly = true; } } @@ -223,6 +222,8 @@ $date_from = (string)get_parameter('date_from', ''); $date_to = (string)get_parameter('date_to', ''); $server_id = (int)get_parameter('server_id', 0); + + $text_agent = (string) get_parameter("text_agent"); $id_agent = get_parameter('id_agent', 0); if ($id_agent != 0) { @@ -243,6 +244,7 @@ if ($id_agent_module != 0) { } + $tag_with_json = base64_decode(get_parameter("tag_with", '')) ; $tag_with_json_clean = io_safe_output($tag_with_json); $tag_with_base64 = base64_encode($tag_with_json_clean); @@ -263,6 +265,8 @@ users_get_groups ($config["id_user"], "ER"); $ids = (array) get_parameter ("eventid", -1); + + $params = "search=" . rawurlencode(io_safe_input($search)) . "&event_type=" . $event_type . "&severity=" . $severity . @@ -295,6 +299,8 @@ if ($meta) { $url = "index.php?sec=eventos&sec2=operation/events/events&" . $params; + + // Header if ($config["pure"] == 0 || $meta) { $pss = get_user_info($config['id_user']); diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php index 6619425fb9..9fc1ce8f7a 100644 --- a/pandora_console/operation/events/events_list.php +++ b/pandora_console/operation/events/events_list.php @@ -35,12 +35,13 @@ if (! check_acl ($config["id_user"], 0, "ER")) { return; } -if(defined('METACONSOLE')){ +if (defined('METACONSOLE')) { $jump = '  '; } -else{ +else { $jump = "
"; } + 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; } From 83967d35264d9bb7b192e68f6651a22635e81007 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Fri, 22 May 2015 13:22:12 +0200 Subject: [PATCH 3/3] Fixed PHP Warnings --- pandora_console/operation/events/events.build_table.php | 7 ++++--- pandora_console/operation/events/events_list.php | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) 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)) { }); } - id = 'events_filter_form_advanced'; $table_advanced->width = '98%'; $table_advanced->cellspacing = 4; @@ -543,6 +544,7 @@ $table_advanced->rowclass[] = ''; //- END ADVANCE FILTER ------------------------------------------------- +$table = new stdClass(); $table->id = 'events_filter_form'; $table->width = '100%'; $table->cellspacing = 4;