diff --git a/pandora_console/godmode/category/category.php b/pandora_console/godmode/category/category.php index aa3a23778d..935d2c1d5d 100755 --- a/pandora_console/godmode/category/category.php +++ b/pandora_console/godmode/category/category.php @@ -262,10 +262,7 @@ if ($is_management_allowed === true) { [ 'icon' => 'next' ], true ), - [ - 'type' => 'form_action', - 'right_content' => $tablePagination, - ] + [ 'right_content' => $tablePagination ] ); echo ''; 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/functions_network.php b/pandora_console/include/functions_network.php index c503945c87..1945b5428b 100644 --- a/pandora_console/include/functions_network.php +++ b/pandora_console/include/functions_network.php @@ -68,10 +68,10 @@ function network_print_explorer_header( $cell = '
'; $cell .= $title; $cell .= html_print_link_with_params( - 'images/arrow-down-white.png', + 'images/arrow@svg.svg', array_merge($hidden_data, ['order_by' => $order]), 'image', - ($selected === $order) ? 'opacity: 0.5' : '' + 'rotate: 270deg; width: 20px; margin-top: 4px;'.(($selected === $order) ? '' : 'opacity: 0.5') ); $cell .= '
'; diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php index e93910ec15..86367a1097 100755 --- a/pandora_console/include/functions_treeview.php +++ b/pandora_console/include/functions_treeview.php @@ -727,8 +727,8 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false) false, false, '', - 'white-box-content', - 'white_table_flex margin-bottom-10 border-bottom-gray' + 'white-box-content mrgn_top_0 mrgn_btn_0px', + 'white_table_flex' ); if ($config['agentaccess']) { @@ -747,8 +747,8 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false) true, false, '', - 'white-box-content border-bottom-gray', - 'white_table_flex margin-top-10 margin-bottom-10' + 'white-box-content mrgn_top_0 mrgn_btn_0px border-bottom-gray', + 'white_table_flex' ); } @@ -920,8 +920,8 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false) true, false, '', - 'white-box-content border-bottom-gray', - 'white_table_flex margin-top-10 margin-bottom-10' + 'white-box-content mrgn_top_0 mrgn_btn_0px border-bottom-gray', + 'white_table_flex' ); if (empty($server_data) === false && is_metaconsole() === true) { diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 5a19b69da3..7e1b4f6816 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -385,7 +385,12 @@ function ui_print_message($message, $class='', $attributes='', $return=false, $t $messageCreated = html_print_table($messageTable, true); $autocloseTime = ((int) $config['notification_autoclose_time'] * 1000); - $classes[] = 'info_box_container'; + if (empty($message['div_class']) === false) { + $classes[] = $message['div_class']; + } else { + $classes[] = 'info_box_container'; + } + $classes[] = (($autoclose === true) && ($autocloseTime > 0)) ? ' info_box_autoclose' : ''; // This session var is defined in index. @@ -3873,6 +3878,29 @@ function ui_print_datatable(array $parameters) }'; } + $js .= 'if ($("#'.$table_id.' tr td").length == 1) { + $("div[id^=info_box_]").show(); + $("div[id^=info_box_]").removeClass(\'invisible_important\'); + $("table#'.$table_id.'").hide(); + $("div.dataTables_paginate").hide(); + $("div.dataTables_info").hide(); + $("div.dataTables_length").hide(); + + if (dt_'.$table_id.'.page.info().pages > 1) { + $(".dataTables_paginate.paging_simple_numbers").show() + } + } else { + $("div[id^=info_box_]").hide(); + $("table#'.$table_id.'").show(); + $("div.dataTables_paginate").show(); + $("div.dataTables_info").show(); + $("div.dataTables_length").show(); + + if (dt_'.$table_id.'.page.info().pages == 1) { + $(".dataTables_paginate.paging_simple_numbers").hide() + } + }'; + if (isset($parameters['drawCallback'])) { $js .= $parameters['drawCallback']; } @@ -3996,8 +4024,13 @@ function ui_print_datatable(array $parameters) $js .= ''; // Order. + $info_msg_arr = []; + $info_msg_arr['message'] = $emptyTable; + $info_msg_arr['div_class'] = 'info_box_container invisible_important'; + + $info_msg = '
'.ui_print_info_message($info_msg_arr).'
'; $err_msg = '
'; - $output = $err_msg.$filter.$extra.$table.$js; + $output = $info_msg.$err_msg.$filter.$extra.$table.$js; if (is_ajax() === false) { ui_require_css_file('datatables.min', 'include/styles/js/'); ui_require_css_file('tables'); @@ -4327,7 +4360,10 @@ function ui_toggle( $image_a = html_print_image( $img_a, true, - [ 'style' => 'rotate: '.$rotateA ], + [ + 'class' => 'mrgn_right_10px', + 'style' => 'rotate: '.$rotateA, + ], true ); } else { @@ -4338,7 +4374,10 @@ function ui_toggle( $image_b = html_print_image( $img_b, true, - [ 'style' => 'rotate: '.$rotateB ], + [ + 'class' => 'mrgn_right_10px', + 'style' => 'margin-right:10px; rotate: '.$rotateB, + ], true ); } else { @@ -4401,7 +4440,7 @@ function ui_toggle( $original, true, [ - 'class' => 'float-left main_menu_icon', + 'class' => 'float-left main_menu_icon mrgn_right_10px', 'style' => 'object-fit: contain; margin-right:10px; rotate:'.$imageRotate, 'title' => $title, 'id' => 'image_'.$uniqid, @@ -4433,7 +4472,7 @@ function ui_toggle( $original, true, [ - 'class' => 'main_menu_icon', + 'class' => 'main_menu_icon mrgn_right_10px', 'style' => 'object-fit: contain; float:right; margin-right:10px; rotate:'.$imageRotate, 'title' => $title, 'id' => 'image_'.$uniqid, diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 14f078855c..0bfbf12a5d 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/include/styles/tables.css b/pandora_console/include/styles/tables.css index 1aeaa479e7..9fdd4fa1cf 100644 --- a/pandora_console/include/styles/tables.css +++ b/pandora_console/include/styles/tables.css @@ -798,3 +798,7 @@ div[id^="auto-os-"] > img { width: 20px; height: 20px; } + +.dataTables_paginate { + margin-right: 10px; +} 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/netflow/netflow_explorer.php b/pandora_console/operation/netflow/netflow_explorer.php index cb09927178..3f7e18ba52 100644 --- a/pandora_console/operation/netflow/netflow_explorer.php +++ b/pandora_console/operation/netflow/netflow_explorer.php @@ -1,21 +1,29 @@ '', + '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,157 @@ 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 '
'; - - // 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 - ); - } +if (empty($draw) === false) { + // 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 + ), + ] + ); } +} else { + ui_print_info_message(__('No data to show')); +} - ui_include_time_picker(); - ?> +ui_include_time_picker(); +?> + + - \ No newline at end of file diff --git a/pandora_console/operation/network/network_report.php b/pandora_console/operation/network/network_report.php index b4e41987de..5d036df61a 100644 --- a/pandora_console/operation/network/network_report.php +++ b/pandora_console/operation/network/network_report.php @@ -1,23 +1,32 @@ id = ''; $table->width = '100%'; +$table->class = 'info_table'; // Print the header. $table->head = []; $table->head['main'] = __('IP'); @@ -385,20 +395,31 @@ if (empty($data)) { 'height' => 230, 'legend' => [ 'display' => true, - 'position' => 'right', - 'align' => 'center', + 'position' => 'top', + 'align' => 'left', ], 'labels' => $labels, ]; + // Results table. + $resultsTable = html_print_div( + [ + 'class' => '', + 'style' => 'flex: 75;margin-right: 5px;', + 'content' => html_print_table($table, true), + ], + true + ); // Pie graph. - html_print_div( + $pieGraph = html_print_div( [ 'class' => 'databox netflow-pie-graph-container padding-2 white_box', + 'style' => 'flex: 25;margin-left: 5px;', 'content' => pie_graph( $chart_data, $options ), - ] + ], + true ); // Print the filter remove link. if (empty($main_value) === false) { @@ -418,7 +439,13 @@ if (empty($data)) { } // Print results. - html_print_table($table); + html_print_div( + [ + 'style' => 'max-width: -webkit-fill-available; display: flex', + 'class' => '', + 'content' => $resultsTable.$pieGraph, + ] + ); } ?> diff --git a/pandora_console/operation/network/network_usage_map.php b/pandora_console/operation/network/network_usage_map.php index 8af9ccd485..7e3964b277 100644 --- a/pandora_console/operation/network/network_usage_map.php +++ b/pandora_console/operation/network/network_usage_map.php @@ -1,24 +1,32 @@ '', + 'label' => __('Monitoring'), + ], + [ + 'link' => '', + 'label' => __('Network'), + ], + ] +); // ACL Check. if (! check_acl($config['id_user'], 0, 'AR')) { @@ -58,105 +84,180 @@ if (!$is_period) { $top = (int) get_parameter('top', 10); $order_by = get_parameter('order_by', 'bytes'); -if (!in_array($order_by, ['bytes', 'pkts', 'flows'])) { +if (in_array($order_by, ['bytes', 'pkts', 'flows']) === false) { $order_by = 'bytes'; } -$style_end = ($is_period) ? 'display: none;' : ''; -$style_period = ($is_period) ? '' : 'display: none;'; - -// Build the table. -$table = new stdClass(); -$table->class = 'databox filters'; -$table->styleTable = 'width: 100%'; - -$table->data['0']['0'] = '
'; -$table->data['0']['0'] .= '
'; -$table->data['0']['0'] .= __('Start date').'  '; -$table->data['0']['0'] .= html_print_input_text('date_lower', $date_lower, '', 10, 7, true); -$table->data['0']['0'] .= '  '; -$table->data['0']['0'] .= html_print_input_text('time_lower', $time_lower, '', 7, 8, true); -$table->data['0']['0'] .= '
'; - -$table->data['0']['0'] .= '
'; -$table->data['0']['0'] .= __('Time Period').'  '; -$table->data['0']['0'] .= html_print_extended_select_for_time('period', $period, '', '', 0, false, true); -$table->data['0']['0'] .= '
'; -$table->data['0']['0'] .= html_print_checkbox( - 'is_period', - 1, - ($is_period === true) ? 1 : 0, - true, - false, - 'network_report_click_period(event)' -); -$table->data['0']['0'] .= ui_print_help_tip( - __('Select this checkbox to write interval instead a date.'), - true -); -$table->data['0']['0'] .= '
'; - -$table->data['0']['1'] = __('End date').'  '; -$table->data['0']['1'] .= html_print_input_text('date_greater', $date_greater, '', 10, 7, true); -$table->data['0']['1'] .= '  '; -$table->data['0']['1'] .= html_print_input_text('time_greater', $time_greater, '', 7, 8, true); - -$table->data['0']['2'] = __('Number of result to show').'  '; -$table->data['0']['2'] .= html_print_select( - [ - '5' => 5, - '10' => 10, - '15' => 15, - '20' => 20, - '25' => 25, - '50' => 50, - '100' => 100, - '250' => 250, - ], - 'top', - $top, - '', - '', - 0, - true -); - -$table->data['1']['0'] = __('Data to show').'  '; -$table->data['1']['0'] .= html_print_select( - network_get_report_actions(), - 'action', - $action, - '', - '', - 0, - true -); -$table->data['1']['1'] = ''; - -$netflow_button = ''; if ((bool) $config['activate_netflow'] === true) { $netflow_button = html_print_submit_button( __('Show netflow map'), 'update_netflow', false, - 'class="sub upd"', + ['icon' => 'update'], true ); +} else { + $netflow_button = ''; } -$table->data['1']['2'] .= implode( - '  ', - [$netflow_button] + +$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 = []; + +$filterTable->data[0][0] = html_print_label_input_block( + __('Interval'), + html_print_extended_select_for_time( + 'period', + $period, + '', + '', + 0, + false, + true + ), + [ 'div_id' => 'period_container' ] ); -echo '
'; -html_print_input_hidden('order_by', $order_by); +$filterTable->data[0][0] .= html_print_label_input_block( + __('Start date'), + html_print_div( + [ + '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' ] +); -html_print_table($table); -echo '
'; +$filterTable->data[0][1] = html_print_label_input_block( + __('End date'), + html_print_div( + [ + 'content' => html_print_input_text( + 'date', + $date_greater, + false, + 13, + 10, + true + ).html_print_image( + 'images/calendar_view_day.png', + true, + ['alt' => 'calendar'] + ).html_print_input_text( + 'time', + $time_greater, + false, + 10, + 8, + true + ), + ], + true + ) +); + +$filterTable->data[0][2] = 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()' + ) +); + +$filterTable->data[1][] = html_print_label_input_block( + __('Results to show'), + html_print_select( + [ + '5' => 5, + '10' => 10, + '15' => 15, + '20' => 20, + '25' => 25, + '50' => 50, + '100' => 100, + '250' => 250, + ], + 'top', + $top, + '', + '', + 0, + true + ) +); + +$filterTable->data[1][] = html_print_label_input_block( + __('Data to show'), + html_print_select( + network_get_report_actions(), + 'action', + $action, + '', + '', + 0, + true + ) +); + +$filterInputTable = '
'; +$filterInputTable .= html_print_input_hidden('order_by', $order_by); +$filterInputTable .= html_print_table($filterTable, true); +$filterInputTable .= html_print_div( + [ + 'class' => 'action-buttons', + 'content' => $netflow_button, + ], + true +); +$filterInputTable .= '
'; + +ui_toggle( + $filterInputTable, + ''.__('Filter').'', + __('Filter'), + 'search', + true, + false, + '', + 'white-box-content no_border', + 'box-flat white_table_graph fixed_filter_bar' +); $has_data = false; -$first_load = true; + if ((bool) get_parameter('update_netflow') === true) { $map_data = netflow_build_map_data( $utimestamp_lower, @@ -165,18 +266,27 @@ if ((bool) get_parameter('update_netflow') === true) { ($action === 'talkers') ? 'srcip' : 'dstip' ); $has_data = !empty($map_data['nodes']); - $first_load = false; } if ($has_data === true) { $map_manager = new NetworkMap($map_data); $map_manager->printMap(); -} else if (!$first_load) { - ui_print_info_message(__('No data retrieved')); +} else { + ui_print_info_message(__('No data to show')); } ?> +