From 6323102631c4f6903a1bbcbdfa28c8a888646d30 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Mon, 4 Sep 2023 08:30:14 +0200 Subject: [PATCH 1/3] #11652 Fixed fc-calendar size --- pandora_console/godmode/alerts/alert_view.php | 2 +- pandora_console/include/styles/pandora.css | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pandora_console/godmode/alerts/alert_view.php b/pandora_console/godmode/alerts/alert_view.php index 8d4d07e578..7809742221 100644 --- a/pandora_console/godmode/alerts/alert_view.php +++ b/pandora_console/godmode/alerts/alert_view.php @@ -256,7 +256,7 @@ $schedule = io_safe_output( $data[0] = ''; $data[0] .= html_print_input_hidden('schedule', $schedule, true); -$data[0] .= '
'; +$data[0] .= '
'; $data[1] = ''; $table_conditions->data[] = $data; diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index abbb50c927..3a6a4d9ba9 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -12562,3 +12562,7 @@ tr[id^="network_component-plugin-snmp-fields-dynamicMacroRow-"] input { flex-wrap: nowrap; justify-content: flex-start !important; } + +.alert_view_calendar > .fc-view-harness > .fc-view > .fc-scrollgrid { + width: auto !important; +} From bcecfbfdccb22c720c0fb8ae112a25918cbeee57 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Tue, 26 Sep 2023 09:37:48 +0200 Subject: [PATCH 2/3] #12123 Clear html tag characters to prevent XSS attacks --- pandora_console/godmode/reporting/visual_console_builder.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pandora_console/godmode/reporting/visual_console_builder.php b/pandora_console/godmode/reporting/visual_console_builder.php index 986dcb423b..35b5e81dfc 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.php +++ b/pandora_console/godmode/reporting/visual_console_builder.php @@ -164,6 +164,8 @@ switch ($activeTab) { $width = (int) get_parameter('width'); $height = (int) get_parameter('height'); $visualConsoleName = (string) get_parameter('name'); + $visualConsoleName = str_replace('<', '', $visualConsoleName); + $visualConsoleName = str_replace('>', '', $visualConsoleName); $is_favourite = (int) get_parameter('is_favourite_sent'); $auto_adjust = (int) get_parameter('auto_adjust_sent'); From 84ab19119b815fc340a58e9da01ee85ae43759b6 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Thu, 2 Nov 2023 15:11:53 +0100 Subject: [PATCH 3/3] #12175 Fix recovery alert icon --- pandora_console/include/functions_events.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index f709fe2b4c..f5c6342a70 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -2594,6 +2594,7 @@ function events_print_type_img( switch ($type) { case 'alert_recovered': $style .= ' alert_module_background_state icon_background_normal '; + $icon = ''; break; case 'alert_manual_validation': @@ -2680,6 +2681,16 @@ function events_print_type_img( ); } + if ($type === 'alert_recovered') { + $output = html_print_div( + [ + 'title' => events_print_type_description($type, true), + 'class' => $style, + ], + true + ); + } + if ($return) { return $output; }