From 80076434b34d44b73eda55b180a457efb90cab93 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Mon, 13 Mar 2023 10:29:03 +0100 Subject: [PATCH 01/10] SNMP visual fix staticts --- .../include/class/SnmpConsole.class.php | 140 +++++------------- pandora_console/include/functions_ui.php | 9 +- pandora_console/include/styles/pandora.css | 18 +++ .../operation/snmpconsole/snmp_statistics.php | 29 ++-- 4 files changed, 79 insertions(+), 117 deletions(-) diff --git a/pandora_console/include/class/SnmpConsole.class.php b/pandora_console/include/class/SnmpConsole.class.php index ec7e3394dd..f1895dfc51 100644 --- a/pandora_console/include/class/SnmpConsole.class.php +++ b/pandora_console/include/class/SnmpConsole.class.php @@ -181,113 +181,47 @@ class SnmpConsole extends HTML $default_refr = 300; - if (!isset($config['pure']) || $config['pure'] === false) { - $statistics['text'] = ''.html_print_image( - 'images/logs@svg.svg', - true, - [ - 'title' => __('Statistics'), - 'class' => 'main_menu_icon invert_filter', - ] - ).''; - $list['text'] = ''.html_print_image( - 'images/SNMP-network-numeric-data@svg.svg', - true, - [ - 'title' => __('List'), - 'class' => 'main_menu_icon invert_filter', - ] - ).''; - $list['active'] = true; + $statistics['text'] = ''.html_print_image( + 'images/logs@svg.svg', + true, + [ + 'title' => __('Statistics'), + 'class' => 'main_menu_icon invert_filter', + ] + ).''; + $list['text'] = ''.html_print_image( + 'images/SNMP-network-numeric-data@svg.svg', + true, + [ + 'title' => __('List'), + 'class' => 'main_menu_icon invert_filter', + ] + ).''; + $list['active'] = true; - $screen['text'] = ''.html_print_image( - 'images/fullscreen@svg.svg', - true, + // Header. + ui_print_standard_header( + __('SNMP Console'), + 'images/op_snmp.png', + false, + 'snmp_console', + false, + [ + $screen, + $list, + $statistics, + ], + [ [ - 'title' => __('View in full screen'), - 'class' => 'main_menu_icon invert_filter', - ] - ).''; - - // Header. - ui_print_standard_header( - __('SNMP Console'), - 'images/op_snmp.png', - false, - 'snmp_console', - false, - [ - $screen, - $list, - $statistics, + 'link' => '', + 'label' => __('Monitoring'), ], [ - [ - 'link' => '', - 'label' => __('Monitoring'), - ], - [ - 'link' => '', - 'label' => __('SNMP'), - ], - ] - ); - } else { - echo '
'; - - echo ''; - - echo '
'; - - ui_require_css_file('pandora_enterprise', ENTERPRISE_DIR.'/include/styles/'); - ui_require_css_file('pandora_dashboard', ENTERPRISE_DIR.'/include/styles/'); - ui_require_css_file('cluetip', 'include/styles/js/'); - - ui_require_jquery_file('countdown'); - ui_require_javascript_file('pandora_dashboard', ENTERPRISE_DIR.'/include/javascript/'); - ui_require_javascript_file('wz_jsgraphics'); - ui_require_javascript_file('pandora_visual_console'); - } + 'link' => '', + 'label' => __('SNMP'), + ], + ] + ); // Datatables list. try { diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index d272ee224a..5a19b69da3 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -5044,6 +5044,8 @@ function ui_print_page_header( $breadcrumbs='', $hide_left_small=false ) { + global $config; + $title = io_safe_input_html($title); if (($icon == '') && ($godmode == true)) { $icon = 'images/gm_setup.png'; @@ -5057,13 +5059,18 @@ function ui_print_page_header( $type = 'view'; $type2 = 'menu_tab_frame_view'; $separator_class = 'separator'; + $div_style = ''; } else { $type = 'view'; $type2 = 'menu_tab_frame_view'; $separator_class = 'separator_view'; + $div_style = ''; + if ($config['pure'] === true) { + $div_style = 'top:0px;'; + } } - $buffer = '
'; + $buffer = '
'; if (!empty($breadcrumbs)) { $buffer .= '
'; diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 4d8f807bdb..14f078855c 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -11635,3 +11635,21 @@ ul.tag-editor { padding-left: 5px !important; font-size: 20px !important; } + +div.ui-dialog-buttonset > button.ui-button.ui-corner-all.ui-widget { + background-color: var(--primary-color); + color: #fff; + border: 1px solid var(--primary-color); + border-radius: 8px; + font-size: 11pt; +} + +div.ui-dialog-buttonset > button.ui-button.ui-corner-all.ui-widget:hover { + background-color: #1d7873; + border-color: #1d7873; +} + +div.ui-dialog-buttonset > button.ui-button.ui-corner-all.ui-widget:active { + background-color: #0d312f; + border-color: #0d312f; +} diff --git a/pandora_console/operation/snmpconsole/snmp_statistics.php b/pandora_console/operation/snmpconsole/snmp_statistics.php index 0ebc548496..ec5dfd9837 100755 --- a/pandora_console/operation/snmpconsole/snmp_statistics.php +++ b/pandora_console/operation/snmpconsole/snmp_statistics.php @@ -57,16 +57,18 @@ if ($config['pure']) { ).''; } -// List -$list = []; -$list['text'] = ''.html_print_image( - 'images/SNMP-network-numeric-data@svg.svg', - true, - [ - 'title' => __('List'), - 'class' => 'main_menu_icon invert_filter', - ] -).''; +if ($config['pure'] === false) { + // List. + $list = []; + $list['text'] = ''.html_print_image( + 'images/SNMP-network-numeric-data@svg.svg', + true, + [ + 'title' => __('List'), + 'class' => 'main_menu_icon invert_filter', + ] + ).''; +} // Statistics (This file) $statistics = []; @@ -165,10 +167,9 @@ $water_mark = [ // By SOURCE $table_source = new StdClass(); $table_source->width = '100%'; -$table_source->class = 'databox data'; +$table_source->class = 'info_table'; $table_source->head[] = __('Traps received by source').' - '.sprintf(__('Top %d'), 25); $table_source->head_colspan[] = 2; -$table_source->headstyle[] = 'background-color: #82b92e'; $table_source->size = []; $table_source->size['table'] = '50%'; $table_source->size['graph'] = '50%'; @@ -182,6 +183,7 @@ $table_source_data->head = []; $table_source_data->head['source'] = __('Source IP'); $table_source_data->head['num'] = __('Number'); $table_source_data->data = []; +$table_source_data->class = 'info_table'; $table_source_graph_data = []; $labels = []; @@ -239,9 +241,9 @@ unset($table_source); // By OID $table_oid = new StdClass(); $table_oid->width = '100%'; +$table_oid->class = 'info_table'; $table_oid->head[] = __('Traps received by Enterprise String').' - '.sprintf(__('Top %d'), 25); $table_oid->head_colspan[] = 2; -$table_oid->headstyle[] = 'background-color: #82b92e'; $table_oid->size = []; $table_oid->size['table'] = '50%'; $table_oid->size['graph'] = '50%'; @@ -255,6 +257,7 @@ $table_oid_data->head = []; $table_oid_data->head['oid'] = __('Trap Enterprise String'); $table_oid_data->head['num'] = __('Number'); $table_oid_data->data = []; +$table_oid_data->class = 'info_table'; $table_oid_graph_data = []; $labels = []; From 0643b4e0bafd9b61d7ba3b5d9f7cbd5f25e98958 Mon Sep 17 00:00:00 2001 From: daniel Date: Mon, 13 Mar 2023 12:19:27 +0100 Subject: [PATCH 02/10] fixed styles --- .../include/class/Diagnostics.class.php | 6 +++--- pandora_console/include/functions_menu.php | 4 ++-- pandora_console/include/styles/pandora.css | 1 + pandora_console/include/styles/pandora_black.css | 14 +++++++++++--- pandora_console/operation/agentes/stat_win.php | 2 +- pandora_console/operation/events/sound_events.php | 2 +- .../operation/gis_maps/public_console.php | 2 +- .../visual_console/legacy_public_view.php | 2 +- .../operation/visual_console/public_view.php | 2 +- 9 files changed, 22 insertions(+), 13 deletions(-) diff --git a/pandora_console/include/class/Diagnostics.class.php b/pandora_console/include/class/Diagnostics.class.php index aeb5a46400..2a041e63e8 100644 --- a/pandora_console/include/class/Diagnostics.class.php +++ b/pandora_console/include/class/Diagnostics.class.php @@ -1831,7 +1831,7 @@ class Diagnostics extends Wizard if ($items[$key]['status'] === 2) { $items[$key]['value'] = html_print_image( - 'images/icono-warning.png', + 'images/alert-yellow@svg.svg', true, [ 'title' => __('Warning'), @@ -1840,7 +1840,7 @@ class Diagnostics extends Wizard ); } else if ($items[$key]['status'] === 1) { $items[$key]['value'] = html_print_image( - 'images/exito.png', + 'images/validate.svg', true, [ 'title' => __('Successfully'), @@ -1849,7 +1849,7 @@ class Diagnostics extends Wizard ); } else { $items[$key]['value'] = html_print_image( - 'images/error_1.png', + 'images/fail@svg.svg', true, [ 'title' => __('Error'), diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php index 2708b8016e..1d567af5cc 100644 --- a/pandora_console/include/functions_menu.php +++ b/pandora_console/include/functions_menu.php @@ -842,7 +842,7 @@ if (is_ajax()) { $fragmentation_status = ''; if ($db_fragmentation->data->tablesFragmentationStatus->status === 1) { $fragmentation_status = html_print_image( - 'images/exito.png', + 'images/validate.svg', true, [ 'title' => __('Successfully'), @@ -851,7 +851,7 @@ if (is_ajax()) { ); } else { $fragmentation_status = html_print_image( - 'images/error_1.png', + 'images/fail@svg.svg', true, [ 'title' => __('Error'), diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 4d8f807bdb..0bb3b0e80c 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -5843,6 +5843,7 @@ div.switch_radio_button label { margin-right: -1px; border: 1px solid #cbcbcb; transition: all 0.1s ease-in-out; + background: transparent; } div.switch_radio_button label:first-of-type { diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css index 9d5185fd9f..62af20b92f 100644 --- a/pandora_console/include/styles/pandora_black.css +++ b/pandora_console/include/styles/pandora_black.css @@ -1249,8 +1249,7 @@ a.pandora_pagination:hover { background-color: #555 !important; } .dt-button.buttons-csv.buttons-html5 { - filter: invert(100%); - background-color: transparent; + box-shadow: 0px 3px 6px #111; } .info_table.events > tbody > tr > td { @@ -1494,7 +1493,7 @@ div.white_box.white_box_opened.no_border { border-radius: 0px; } -table.filter-table-adv td > div label { +table.filter-table-adv td > div label:not(.inputFile) { color: white !important; } @@ -1507,3 +1506,12 @@ div.fixed-bottom-box > div.fixed-bottom-box-head-body { background-color: #111111 !important; } + +.filter_table, +.white_table_graph_fixed table { + background-color: transparent; +} + +span.select2 { + border-radius: 6px; +} diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php index 1dc0030eeb..8c39ad8b8d 100644 --- a/pandora_console/operation/agentes/stat_win.php +++ b/pandora_console/operation/agentes/stat_win.php @@ -97,7 +97,7 @@ ui_print_message_dialog( $conn_title, $conn_text, 'connection', - '/images/error_1.png' + '/images/fail@svg.svg' ); ?> diff --git a/pandora_console/operation/events/sound_events.php b/pandora_console/operation/events/sound_events.php index 6ce7a31c3a..956282b045 100644 --- a/pandora_console/operation/events/sound_events.php +++ b/pandora_console/operation/events/sound_events.php @@ -173,7 +173,7 @@ ui_print_message_dialog( $conn_title, $conn_text, 'connection', - '/images/error_1.png' + '/images/fail@svg.svg' ); $inputs = []; diff --git a/pandora_console/operation/gis_maps/public_console.php b/pandora_console/operation/gis_maps/public_console.php index 1070443ed1..b301754a1e 100755 --- a/pandora_console/operation/gis_maps/public_console.php +++ b/pandora_console/operation/gis_maps/public_console.php @@ -278,7 +278,7 @@ if ($layers != false) { $conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.'); ui_require_javascript_file('connection_check'); set_js_value('absolute_homeurl', ui_get_full_url(false, false, false, false)); - ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png'); + ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/fail@svg.svg'); } // Resize GIS map on fullscreen diff --git a/pandora_console/operation/visual_console/legacy_public_view.php b/pandora_console/operation/visual_console/legacy_public_view.php index 40ae10e4bc..e8edbae7db 100644 --- a/pandora_console/operation/visual_console/legacy_public_view.php +++ b/pandora_console/operation/visual_console/legacy_public_view.php @@ -56,7 +56,7 @@ ui_require_javascript_file('connection_check', 'include/javascript/', true); set_js_value('absolute_homeurl', ui_get_full_url(false, false, false, false)); $conn_title = __('Connection with server has been lost'); $conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.'); -ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png'); +ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/fail@svg.svg'); require_once 'include/functions_visual_map.php'; diff --git a/pandora_console/operation/visual_console/public_view.php b/pandora_console/operation/visual_console/public_view.php index 265b3183c6..496a34f3a6 100644 --- a/pandora_console/operation/visual_console/public_view.php +++ b/pandora_console/operation/visual_console/public_view.php @@ -37,7 +37,7 @@ ui_require_javascript_file('connection_check', 'include/javascript/', true); set_js_value('absolute_homeurl', ui_get_full_url(false, false, false, false)); $conn_title = __('Connection with server has been lost'); $conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.'); -ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png'); +ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/fail@svg.svg'); echo ''."\n"; echo ''."\n"; From 5466cb5995e1a34c1566e79ad0e6948a35a81462 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Mon, 13 Mar 2023 13:25:42 +0100 Subject: [PATCH 03/10] Netflow live view --- .../operation/netflow/nf_live_view.php | 671 +++++++++++------- 1 file changed, 396 insertions(+), 275 deletions(-) diff --git a/pandora_console/operation/netflow/nf_live_view.php b/pandora_console/operation/netflow/nf_live_view.php index f5ee650fb0..59ff2e70f2 100644 --- a/pandora_console/operation/netflow/nf_live_view.php +++ b/pandora_console/operation/netflow/nf_live_view.php @@ -101,7 +101,7 @@ $max_aggregates = (int) get_parameter('max_aggregates', 10); $update_date = (int) get_parameter('update_date', 0); $connection_name = get_parameter('connection_name', ''); $interval_length = get_parameter('interval_length', NETFLOW_RES_MEDD); -$address_resolution = (int) get_parameter('address_resolution', $config['netflow_get_ip_hostname']); +$address_resolution = (int) get_parameter('address_resolution', ($config['netflow_get_ip_hostname'] ?? '')); $filter_selected = (int) get_parameter('filter_selected', 0); // Read time values. @@ -127,13 +127,23 @@ $update = get_parameter('update_button', ''); if (is_metaconsole() === false) { // Header. - ui_print_page_header( + ui_print_standard_header( __('Netflow live view'), 'images/op_netflow.png', false, '', false, - [] + [], + [ + [ + 'link' => '', + 'label' => __('Monitoring'), + ], + [ + 'link' => '', + 'label' => __('Network'), + ], + ] ); $is_windows = strtoupper(substr(PHP_OS, 0, 3)) == 'WIN'; @@ -202,22 +212,9 @@ if (isset($config['netflow_disable_custom_lvfilters'])) { $netflow_disable_custom_lvfilters = $config['netflow_disable_custom_lvfilters']; } -$class = 'databox filters'; - -echo '
'; - - echo ""; -if (is_metaconsole()) { - echo ' - - - - '; - +// Add nodes list. +if (is_metaconsole() === true) { $list_servers = []; - $servers = db_get_all_rows_sql( 'SELECT * FROM tmetaconsole_setup' @@ -244,62 +241,245 @@ if (is_metaconsole()) { metaconsole_restore_db(); } - echo ''; - echo ''; - echo ''; - echo ''; -} + true + ), + [ 'div_id' => 'period_container' ] +); - echo ''; - - $class_not_period = ($is_period) ? 'nf_hidden' : 'nf_display'; - $class_period = ($is_period) ? 'nf_display' : 'nf_hidden'; - echo ''; - echo ''; + 'class' => '', + 'content' => html_print_input_text( + 'date_lower', + $date_lower, + false, + 13, + 10, + true + ).html_print_image( + 'images/calendar_view_day.png', + true, + [ + 'alt' => 'calendar', + 'class' => 'main_menu_icon invert_filter', + ] + ).html_print_input_text( + 'time_lower', + $time_lower, + false, + 10, + 8, + true + ), + ], + true + ), + [ 'div_id' => 'end_date_container' ] +); - echo ''; - echo ''; +$filterTable->data[0][1] = html_print_label_input_block( + __('End date'), + html_print_div( + [ + 'class' => '', + 'content' => html_print_input_text( + 'date', + $date, + false, + 13, + 10, + true + ).html_print_image( + 'images/calendar_view_day.png', + true, + ['alt' => 'calendar'] + ).html_print_input_text( + 'time', + $time, + false, + 10, + 8, + true + ), + ], + true + ) +); - echo ''; - echo ''; + ).ui_print_input_placeholder( + __('The interval will be divided in chunks the length of the resolution.'), + true + ) +); - echo ''; - echo ''; +$filterTable->data[1][] = html_print_label_input_block( + __('Defined period'), + html_print_checkbox_switch( + 'is_period', + 1, + ($is_period === true) ? 1 : 0, + true, + false, + 'nf_view_click_period(event)' + ) +); - echo ''; - echo ''; + ) +); - echo ''; - $max_values = [ - '2' => '2', - '5' => '5', - '10' => '10', - '15' => '15', - '20' => '20', - '25' => '25', - '50' => '50', - $max_aggregates => $max_aggregates, - ]; - echo ''; - - echo ''; - $aggregate_list = []; - $aggregate_list = [ - 'srcip' => __('Src Ip Address'), - 'dstip' => __('Dst Ip Address'), - 'srcport' => __('Src Port'), - 'dstport' => __('Dst Port'), - ]; - echo ''; - - echo ''; - - // Read filter type. - if ($filter['advanced_filter'] != '') { - $filter_type = 1; - } else { - $filter_type = 0; - } - - echo ""; - - echo "'; - - echo ''; - echo ""; - - echo ''; - echo "'; - $own_info = get_user_info($config['id_user']); - echo ''; - echo "'; - echo ''; - - $advanced_toggle = '
- '.__('Draw live filter').' -
'.__('Connection').''.html_print_select( - $list_servers, - 'connection_name', - $connection_name, + $nodeListInput = html_print_label_input_block( + __('Connection'), + html_print_select( + $list_servers, + 'connection_name', + $connection_name, + '', + '', + 0, + true, + false, + false + ) + ); +} else { + $nodeListInput = ''; +} + +$class_not_period = ($is_period === true) ? 'nf_hidden' : 'nf_display'; +$class_period = ($is_period === true) ? 'nf_display' : 'nf_hidden'; + +$max_values = [ + '2' => '2', + '5' => '5', + '10' => '10', + '15' => '15', + '20' => '20', + '25' => '25', + '50' => '50', + $max_aggregates => $max_aggregates, +]; + +$aggregate_list = []; +$aggregate_list = [ + 'srcip' => __('Src Ip Address'), + 'dstip' => __('Dst Ip Address'), + 'srcport' => __('Src Port'), + 'dstport' => __('Dst Port'), +]; + +$advanced_toggle = ''; +$advanced_toggle .= ''; +if ($netflow_disable_custom_lvfilters) { + $advanced_toggle .= ''; + $advanced_toggle .= ''; +} else { + $advanced_toggle .= ''; + $advanced_toggle .= ''; +} + +$advanced_toggle .= ''; +$user_groups = users_get_groups($config['id_user'], 'AR', $own_info['is_admin'], true); +$user_groups[0] = 0; +// Add all groups. +$sql = 'SELECT * + FROM tnetflow_filter + WHERE id_group IN ('.implode(',', array_keys($user_groups)).')'; +$advanced_toggle .= "'; +$advanced_toggle .= ''; + +$advanced_toggle .= ""; +if ($netflow_disable_custom_lvfilters) { + $advanced_toggle .= ''; + $advanced_toggle .= ''; +} else { + $advanced_toggle .= "'; + $advanced_toggle .= ''; +} + +if ($netflow_disable_custom_lvfilters) { + $advanced_toggle .= ''; + $advanced_toggle .= ''; +} else { + $advanced_toggle .= "'; + $advanced_toggle .= ''; +} + +$advanced_toggle .= ''; + +$advanced_toggle .= ""; +if ($netflow_disable_custom_lvfilters) { + $advanced_toggle .= ''; + $advanced_toggle .= ''; +} else { + $advanced_toggle .= "'; + $advanced_toggle .= ''; +} + +if ($netflow_disable_custom_lvfilters) { + $advanced_toggle .= ''; + $advanced_toggle .= ''; +} else { + $advanced_toggle .= "'; + $advanced_toggle .= ''; +} + +$advanced_toggle .= ''; + +$advanced_toggle .= ""; +if ($netflow_disable_custom_lvfilters) { + $advanced_toggle .= ''; + $advanced_toggle .= ''; +} else { + $advanced_toggle .= ''; + $advanced_toggle .= "'; +} + +$advanced_toggle .= ''; +$advanced_toggle .= ''; + +$onclick = "if (!confirm('".__('Warning').'. '.__('IP address resolution can take a lot of time')."')) return false;"; +$radio_buttons = __('Yes').'  '.html_print_radio_button_extended( + 'address_resolution', + 1, + '', + $address_resolution, + false, + $onclick, + '', + true +).'   '; +$radio_buttons .= __('No').'  '.html_print_radio_button( + 'address_resolution', + 0, + '', + $address_resolution, + true +); +$advanced_toggle .= ''; +$advanced_toggle .= ''; + +$advanced_toggle .= ''; +$advanced_toggle .= ''; + +$advanced_toggle .= ''; + +$advanced_toggle .= '
'.__('Filter').''.__('Normal').' '.html_print_radio_button_extended('filter_type', 0, '', $filter_type, false, 'displayNormalFilter();', 'style="margin-right: 40px;"', true).__('Custom').' '.html_print_radio_button_extended('filter_type', 1, '', $filter_type, false, 'displayAdvancedFilter();', 'style="margin-right: 40px;"', true).''.__('Load filter').'".html_print_select_from_sql($sql, 'filter_id', $filter_id, '', __('Select a filter'), 0, true); +$advanced_toggle .= html_print_input_hidden('filter_selected', $filter_selected, false); +$advanced_toggle .= '
".__('Dst Ip').ui_print_help_tip(__('Destination IP. A comma separated list of destination ip. If we leave the field blank, will show all ip. Example filter by ip:
25.46.157.214,160.253.135.249'), true).'		'.html_print_input_text('ip_dst', $filter['ip_dst'], false, 40, 80, true).'".__('Src Ip').ui_print_help_tip(__('Source IP. A comma separated list of source ip. If we leave the field blank, will show all ip. Example filter by ip:
25.46.157.214,160.253.135.249'), true).'		'.html_print_input_text('ip_src', $filter['ip_src'], false, 40, 80, true).'
".__('Dst Port').ui_print_help_tip(__('Destination port. A comma separated list of destination ports. If we leave the field blank, will show all ports. Example filter by ports 80 and 22:
80,22'), true).'		'.html_print_input_text('dst_port', $filter['dst_port'], false, 40, 80, true).'".__('Src Port').ui_print_help_tip(__('Source port. A comma separated list of source ports. If we leave the field blank, will show all ports. Example filter by ports 80 and 22:
80,22'), true).'		'.html_print_input_text('src_port', $filter['src_port'], false, 40, 80, true).'
'.__('IP address resolution').''.ui_print_help_tip(__('Resolve the IP addresses to get their hostnames.'), true).''.$radio_buttons.''.__('Source ip').''.html_print_input_text('router_ip', $filter['router_ip'], false, 40, 80, true).'
'; + +// Read filter type. +if (empty($filter['advanced_filter']) === false) { + $filter_type = 1; +} else { + $filter_type = 0; +} + +$filterTable = new stdClass(); +$filterTable->id = ''; +$filterTable->class = 'filter-table-adv'; +$filterTable->size = []; +$filterTable->size[0] = '33%'; +$filterTable->size[1] = '33%'; +$filterTable->size[2] = '33%'; +$filterTable->data = []; + +if (empty($nodeListInput) === false) { + $filterTable->data[-1][] = $nodeListInput; +} + +$filterTable->data[0][0] = html_print_label_input_block( + __('Interval'), + html_print_extended_select_for_time( + 'period', + $period, '', '', 0, - true, false, - false - ).'
'; - echo ''.__('Interval').''; - echo ''.__('Start date').''; - echo ''; - echo html_print_extended_select_for_time('period', $period, '', '', 0, false, true, false, true, $class_period); - echo html_print_input_text('date_lower', $date_lower, false, 13, 10, true, false, false, '', $class_not_period); - echo html_print_image( - 'images/calendar_view_day.png', - true, +$filterTable->data[0][0] .= html_print_label_input_block( + __('Start date'), + html_print_div( [ - 'alt' => 'calendar', - 'class' => $class_not_period, - ] - ).html_print_input_text('time_lower', $time_lower, false, 10, 8, true, false, false, '', $class_not_period); - echo html_print_checkbox( - 'is_period', - 1, - ($is_period === true) ? 1 : 0, - true, - false, - 'nf_view_click_period(event)' - ); - echo ui_print_help_tip(__('Select this checkbox to write interval instead a date.'), true); - echo ''.__('End date').''.html_print_input_text('date', $date, false, 13, 10, true).html_print_image( - 'images/calendar_view_day.png', - true, - ['alt' => 'calendar'] - ).html_print_input_text('time', $time, false, 10, 8, true); - echo ''.__('Resolution').ui_print_help_tip(__('The interval will be divided in chunks the length of the resolution.'), true).''.html_print_select( +$filterTable->data[0][2] = html_print_label_input_block( + __('Resolution'), + html_print_select( netflow_resolution_select_params(), 'interval_length', $interval_length, @@ -309,13 +489,27 @@ if (is_metaconsole()) { true, false, false - ).'
'.__('Type').''.html_print_select( +$filterTable->data[1][] = html_print_label_input_block( + __('Type'), + html_print_select( netflow_get_chart_types(), 'chart_type', $chart_type, @@ -323,224 +517,152 @@ if (is_metaconsole()) { '', 0, true - ).''.__('Max. values').''.html_print_select($max_values, 'max_aggregates', $max_aggregates, '', '', 0, true).''.html_print_image('images/edit.svg', true, ['id' => 'pencil', 'class' => 'main_menu_icon invert_filter']).''; - echo ''.__('Aggregate by').''.html_print_select($aggregate_list, 'aggregate', $filter['aggregate'], '', '', 0, true, false, true, '', false).'
'; - - $advanced_toggle .= ''; - if ($netflow_disable_custom_lvfilters) { - $advanced_toggle .= ''; - $advanced_toggle .= ''; - } else { - $advanced_toggle .= ''; - $advanced_toggle .= ''; - } - - - - $advanced_toggle .= ''; - $user_groups = users_get_groups($config['id_user'], 'AR', $own_info['is_admin'], true); - $user_groups[0] = 0; - // Add all groups. - $sql = 'SELECT * - FROM tnetflow_filter - WHERE id_group IN ('.implode(',', array_keys($user_groups)).')'; - $advanced_toggle .= "'; - $advanced_toggle .= ''; - - $advanced_toggle .= ""; - if ($netflow_disable_custom_lvfilters) { - $advanced_toggle .= ''; - $advanced_toggle .= ''; - } else { - $advanced_toggle .= "'; - $advanced_toggle .= ''; - } - - if ($netflow_disable_custom_lvfilters) { - $advanced_toggle .= ''; - $advanced_toggle .= ''; - } else { - $advanced_toggle .= "'; - $advanced_toggle .= ''; - } - - $advanced_toggle .= ''; - - $advanced_toggle .= ""; - if ($netflow_disable_custom_lvfilters) { - $advanced_toggle .= ''; - $advanced_toggle .= ''; - } else { - $advanced_toggle .= "'; - $advanced_toggle .= ''; - } - - if ($netflow_disable_custom_lvfilters) { - $advanced_toggle .= ''; - $advanced_toggle .= ''; - } else { - $advanced_toggle .= "'; - $advanced_toggle .= ''; - } - - $advanced_toggle .= ''; - - $advanced_toggle .= ""; - if ($netflow_disable_custom_lvfilters) { - $advanced_toggle .= ''; - $advanced_toggle .= ''; - } else { - $advanced_toggle .= ''; - $advanced_toggle .= "'; - } - - $advanced_toggle .= ''; - $advanced_toggle .= ''; - - $onclick = "if (!confirm('".__('Warning').'. '.__('IP address resolution can take a lot of time')."')) return false;"; - $radio_buttons = __('Yes').'  '.html_print_radio_button_extended( - 'address_resolution', - 1, +$filterTable->data[1][] = html_print_label_input_block( + __('Aggregated by'), + html_print_select( + $aggregate_list, + 'aggregate', + $filter['aggregate'], '', - $address_resolution, - false, - $onclick, '', - true - ).'   '; - $radio_buttons .= __('No').'  '.html_print_radio_button( - 'address_resolution', 0, + true, + false, + true, '', - $address_resolution, + false + ) +); + +$filterTable->data[2][] = html_print_label_input_block( + __('Max values'), + html_print_div( + [ + 'class' => '', + 'content' => html_print_select( + $max_values, + 'max_aggregates', + $max_aggregates, + '', + '', + 0, + true + ).html_print_anchor( + [ + 'id' => 'max_values', + 'href' => '#', + 'onClick' => 'edit_max_value()', + 'content' => html_print_image( + 'images/edit.svg', + true, + [ + 'id' => 'pencil', + 'class' => 'main_menu_icon invert_filter', + ] + ), + ], + true + ), + ], true - ); - $advanced_toggle .= ''; - $advanced_toggle .= ''; + ) +); - $advanced_toggle .= ''; - $advanced_toggle .= ''; - - $advanced_toggle .= ''; - - $advanced_toggle .= '
'.__('Filter').''.__('Normal').' '.html_print_radio_button_extended('filter_type', 0, '', $filter_type, false, 'displayNormalFilter();', 'style="margin-right: 40px;"', true).__('Custom').' '.html_print_radio_button_extended('filter_type', 1, '', $filter_type, false, 'displayAdvancedFilter();', 'style="margin-right: 40px;"', true).''.__('Load filter').'".html_print_select_from_sql($sql, 'filter_id', $filter_id, '', __('Select a filter'), 0, true); - $advanced_toggle .= html_print_input_hidden('filter_selected', $filter_selected, false); - $advanced_toggle .= '
".__('Dst Ip').ui_print_help_tip(__('Destination IP. A comma separated list of destination ip. If we leave the field blank, will show all ip. Example filter by ip:
25.46.157.214,160.253.135.249'), true).'		'.html_print_input_text('ip_dst', $filter['ip_dst'], false, 40, 80, true).'".__('Src Ip').ui_print_help_tip(__('Source IP. A comma separated list of source ip. If we leave the field blank, will show all ip. Example filter by ip:
25.46.157.214,160.253.135.249'), true).'		'.html_print_input_text('ip_src', $filter['ip_src'], false, 40, 80, true).'
".__('Dst Port').ui_print_help_tip(__('Destination port. A comma separated list of destination ports. If we leave the field blank, will show all ports. Example filter by ports 80 and 22:
80,22'), true).'		'.html_print_input_text('dst_port', $filter['dst_port'], false, 40, 80, true).'".__('Src Port').ui_print_help_tip(__('Source port. A comma separated list of source ports. If we leave the field blank, will show all ports. Example filter by ports 80 and 22:
80,22'), true).'		'.html_print_input_text('src_port', $filter['src_port'], false, 40, 80, true).'
'.__('IP address resolution').''.ui_print_help_tip(__('Resolve the IP addresses to get their hostnames.'), true).''.$radio_buttons.''.__('Source ip').''.html_print_input_text('router_ip', $filter['router_ip'], false, 40, 80, true).'
'; - - echo ''; - echo ui_toggle( +$filterTable->colspan[3][0] = 3; +$filterTable->data[3][0] = html_print_label_input_block( + '', + ui_toggle( $advanced_toggle, __('Advanced'), '', '', true, true, - 'white_box white_box_opened', - 'no-border flex-row' - ); - echo ''; - echo ''; + '', + 'white-box-content', + 'box-flat white_table_graph' + ) +); - echo "
"; +$buttons = html_print_submit_button( + __('Draw'), + 'draw_button', + false, + [ + 'icon' => 'cog', + 'mode' => 'mini', + ], + true +); - echo html_print_submit_button(__('Draw'), 'draw_button', false, 'class="sub upd"', true); - - if (!$netflow_disable_custom_lvfilters) { - if (check_acl($config['id_user'], 0, 'AW')) { - html_print_submit_button(__('Save as new filter'), 'save_button', false, 'style="margin-left: 5px;" class="sub upd" onClick="return defineFilterName();"'); - html_print_submit_button(__('Update current filter'), 'update_button', false, 'style="margin-left: 5px;" class="sub upd"'); - } +if (!$netflow_disable_custom_lvfilters) { + if ((bool) check_acl($config['id_user'], 0, 'AW') === true) { + $buttons .= html_print_submit_button(__('Save as new filter'), 'save_button', false, ['icon' => 'load', 'onClick' => 'return defineFilterName();', 'mode' => 'mini secondary'], true); + $buttons .= html_print_submit_button(__('Update current filter'), 'update_button', false, ['icon' => 'load', 'mode' => 'mini secondary'], true); } +} - echo '
'; +$filterInputTable = ''; +$filterInputTable .= html_print_table($filterTable, true); +$filterInputTable .= html_print_div( + [ + 'class' => 'action-buttons', + 'content' => $buttons, + ], + true +); +$filterInputTable .= '
'; - echo ''; +ui_toggle( + $filterInputTable, + ''.__('Filter').'', + __('Filter'), + 'search', + true, + false, + '', + 'white-box-content no_border', + 'box-flat white_table_graph fixed_filter_bar' +); - if (empty($draw) === false) { - // Draw. - echo '
'; +if (empty($draw) === false) { + // Draw. + echo '
'; - // No filter selected. - if ($netflow_disable_custom_lvfilters && $filter_selected == 0) { - ui_print_error_message(__('No filter selected')); - } else { - // Hidden input for handle properly the text colors. - html_print_input_hidden( - 'selected_style_theme', - $config['style'] - ); - // Draw the netflow chart. - echo netflow_draw_item( - $start_date, - $end_date, - $interval_length, - $chart_type, - $filter, - $max_aggregates, - $connection_name, - 'HTML', - $address_resolution - ); - } + // No filter selected. + if ($netflow_disable_custom_lvfilters && $filter_selected == 0) { + ui_print_error_message(__('No filter selected')); + } else { + // Hidden input for handle properly the text colors. + html_print_input_hidden( + 'selected_style_theme', + $config['style'] + ); + // Draw the netflow chart. + html_print_div( + [ + 'class' => 'white_box', + 'content' => netflow_draw_item( + $start_date, + $end_date, + $interval_length, + $chart_type, + $filter, + $max_aggregates, + $connection_name, + 'HTML', + $address_resolution + ), + ] + ); } +} - ui_include_time_picker(); - ?> +ui_include_time_picker(); +?> - \ No newline at end of file From 45ba4cdd15c5ccba74c8d8cb225ec695a0d9c1bd Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Mon, 13 Mar 2023 14:03:00 +0100 Subject: [PATCH 04/10] Netflow --- .../operation/netflow/nf_live_view.php | 11 +- .../operation/network/network_report.php | 9 +- .../operation/network/network_usage_map.php | 312 ++++++++++++------ 3 files changed, 222 insertions(+), 110 deletions(-) diff --git a/pandora_console/operation/netflow/nf_live_view.php b/pandora_console/operation/netflow/nf_live_view.php index 59ff2e70f2..2164aeb562 100644 --- a/pandora_console/operation/netflow/nf_live_view.php +++ b/pandora_console/operation/netflow/nf_live_view.php @@ -629,9 +629,6 @@ ui_toggle( ); if (empty($draw) === false) { - // Draw. - echo '
'; - // No filter selected. if ($netflow_disable_custom_lvfilters && $filter_selected == 0) { ui_print_error_message(__('No filter selected')); @@ -659,11 +656,19 @@ if (empty($draw) === false) { ] ); } +} else { + ui_print_info_message(__('No data to show')); } ui_include_time_picker(); ?> + +