From 779849d9495538e05ea325179dec47e34b99ea9b Mon Sep 17 00:00:00 2001 From: Jonathan Date: Thu, 30 Mar 2023 13:56:53 +0200 Subject: [PATCH 1/4] Agent modules view fix filters --- pandora_console/extensions/agents_modules.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pandora_console/extensions/agents_modules.php b/pandora_console/extensions/agents_modules.php index 5bf3d18ab5..e540a163a1 100644 --- a/pandora_console/extensions/agents_modules.php +++ b/pandora_console/extensions/agents_modules.php @@ -259,6 +259,15 @@ function agents_modules_load_js() return results[1]; } } + + function select_selected () { + $('#id_agents2 option').each(function(){ + if($(this).attr('selected') === 'selected'){ + $(this).prop('selected', true); + } + }); + + } $offset, 'hor_offset' => $offset, 'group_id' => $group_id, 'modulegroup' => $modulegroup]).'" class="w100p">'; + $show_filters = '
'; $show_filters .= ''; $show_filters .= ''; $show_filters .= ''; @@ -666,8 +675,9 @@ function mainAgentsModules() 'srcbutton', false, [ - 'icon' => 'search', - 'mode' => 'mini', + 'icon' => 'search', + 'mode' => 'mini', + 'onclick' => 'select_selected()', ], true ), @@ -729,7 +739,7 @@ function mainAgentsModules() if (isset($modules_selected[0]) === true && $modules_selected[0]) { $all_modules = []; foreach ($modules_selected as $key => $value) { - if (is_int($value)) { + if ((int) $value > 0) { $name = modules_get_agentmodule_name($value); $sql = "SELECT id_agente_modulo FROM tagente_modulo From 8b04d5981db92490de1db7b62a0589ef4007bf42 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Thu, 30 Mar 2023 14:17:33 +0200 Subject: [PATCH 2/4] Agent view follow menu change --- pandora_console/include/functions_menu.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php index 3bf0799599..7a04cbf30a 100644 --- a/pandora_console/include/functions_menu.php +++ b/pandora_console/include/functions_menu.php @@ -57,7 +57,7 @@ function menu_print_menu(&$menu) $sec = (string) get_parameter('sec'); $sec2 = (string) get_parameter('sec2'); if ($sec2 === 'operation/agentes/ver_agente') { - $sec2 = 'godmode/agentes/configurar_agente'; + $sec2 = 'operation/agentes/estado_agente'; } else if ($sec2 === 'godmode/alerts/configure_alert_template') { $sec2 = 'godmode/alerts/alert_templates'; } else if ($sec2 === 'godmode/events/events') { From 9635b4b721233d8a86400f190c40e0a5446d4631 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Thu, 30 Mar 2023 16:45:27 +0200 Subject: [PATCH 3/4] Dashboard slides fix --- .../include/lib/Dashboard/Manager.php | 2 +- pandora_console/include/styles/dashboards.css | 22 ++++++++++++++----- pandora_console/views/dashboard/slides.php | 2 +- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/pandora_console/include/lib/Dashboard/Manager.php b/pandora_console/include/lib/Dashboard/Manager.php index 6e2f9a00d8..85497e212f 100644 --- a/pandora_console/include/lib/Dashboard/Manager.php +++ b/pandora_console/include/lib/Dashboard/Manager.php @@ -287,7 +287,7 @@ class Manager implements PublicLogin $this->dashboardId = (int) \get_parameter('dashboardId', 0); if ($this->slides === 1) { - $this->slidesIds = (array) \get_parameter('slidesIds'); + $this->slidesIds = (array) \get_parameter('slidesIds', [get_user_dashboards($config['id_user'])[0]['id']]); $this->cellModeSlides = (int) \get_parameter( 'cellModeSlides', 0 diff --git a/pandora_console/include/styles/dashboards.css b/pandora_console/include/styles/dashboards.css index df35299d27..1a276fcdfd 100644 --- a/pandora_console/include/styles/dashboards.css +++ b/pandora_console/include/styles/dashboards.css @@ -430,7 +430,12 @@ li#search_input_widget { width: auto; } -div#dashboard-controls { +div#dashboard-controls-slides { + width: 720px !important; +} + +div#dashboard-controls, +div#dashboard-controls-slides { position: fixed; z-index: 1; top: 10px; @@ -447,27 +452,32 @@ div#dashboard-controls { padding: 0px 10px; } -div#dashboard-controls div { +div#dashboard-controls div, +div#dashboard-controls-slides div { margin-left: 10px; text-align: center; } -div#dashboard-controls div#dashboard-slides-form-countdown { +div#dashboard-controls div#dashboard-slides-form-countdown, +div#dashboard-controls-slides div#dashboard-slides-form-countdown { flex: 7; } -div#dashboard-controls div#dashboard-slides-name { +div#dashboard-controls div#dashboard-slides-name, +div#dashboard-controls-slides div#dashboard-slides-name { flex: 3; } -div#dashboard-controls div.dashboard-mode { +div#dashboard-controls div.dashboard-mode, +div#dashboard-controls-slides div.dashboard-mode { flex: 1; display: flex; flex-direction: row; justify-content: center; } -div#dashboard-controls div.dashboard-mode a { +div#dashboard-controls div.dashboard-mode a, +div#dashboard-controls-slides div.dashboard-mode a { margin: 0px; } diff --git a/pandora_console/views/dashboard/slides.php b/pandora_console/views/dashboard/slides.php index c2d4f899a7..75c771e2e2 100644 --- a/pandora_console/views/dashboard/slides.php +++ b/pandora_console/views/dashboard/slides.php @@ -28,7 +28,7 @@ global $config; -$output = '
'; +$output = '
'; // Normal view button. $output .= '
'; From 72e35de00eed5534d300f0b6d2f9016154d4b9b2 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 30 Mar 2023 16:49:17 +0200 Subject: [PATCH 4/4] fixed styles --- pandora_console/pandoradb_data.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index eabbb48d59..6dc7c86328 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -118,10 +118,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', 61), +('MR', 62), ('identification_reminder', 1), ('identification_reminder_timestamp', 0), -('current_package', 769), +('current_package', 770), ('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.00097656250000":"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'),
'.$filter_type.'