';
@@ -448,10 +452,16 @@ class SingleGraphWidget extends Widget
'period' => $this->values['period'],
'date' => strtotime(date('Y-m-d H:i:s')),
'only_image' => false,
- 'homeurl' => ui_get_full_url(false, false, false, false).'/',
'height' => ((int) $size['height'] - $trickHight),
'landscape' => $content['landscape'],
'return_img_base_64' => true,
+ 'show_legend' => $this->values['showLegend'],
+ 'width' => '100%',
+ 'height' => ((int) $size['height'] - $trickHight),
+ 'title' => $module_name,
+ 'unit' => $units_name,
+ 'homeurl' => $config['homeurl'],
+ 'menu' => false,
];
$params_combined = [
diff --git a/pandora_console/include/styles/dashboards.css b/pandora_console/include/styles/dashboards.css
index 2cda2de6f4..818e523316 100644
--- a/pandora_console/include/styles/dashboards.css
+++ b/pandora_console/include/styles/dashboards.css
@@ -949,3 +949,7 @@ input.resize_button {
bottom: 3%;
right: 6%;
}
+
+.parent_graph > .graph {
+ margin-left: 10px;
+}
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 26df195090..63179618b1 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -1292,6 +1292,11 @@ p.center {
margin: 0 5px;
}
+.loading-text {
+ font-size: 19px;
+ text-align: center;
+}
+
/* Legacy spinner */
#loading {
position: fixed;
diff --git a/pandora_console/install.php b/pandora_console/install.php
index bd099564eb..1b461bc6ee 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
'container_netflow',
'class' => $netflowContainerClass,
'content' => netflow_draw_item(
$date_from,
@@ -677,6 +679,22 @@ if (empty($draw) === false) {
),
]
);
+ $spinner = html_print_div(
+ [
+ 'content' => '
',
+ 'class' => 'spinner-fixed inherit',
+ 'style' => 'position: initial;',
+ ],
+ true
+ );
+ html_print_div(
+ [
+ 'id' => 'spinner',
+ 'content' => '
'.__('Loading netflow data, please wait...').'
'.$spinner,
+ 'class' => 'invisible',
+ 'style' => 'position: initial;',
+ ]
+ );
}
} else {
ui_print_info_message(__('No data to show'));
@@ -934,6 +952,11 @@ ui_include_time_picker();
$('#filter_group_color').css('color', '#000000');
}
});
+
+ $("#button-draw_button").on('click', function(){
+ $("#container_netflow").remove();
+ $("#spinner").removeClass("invisible");
+ });
});
$("#text-time, #text-time_lower").timepicker({
diff --git a/pandora_console/operation/network/network_report.php b/pandora_console/operation/network/network_report.php
index d3f736c13d..66847f4c1b 100644
--- a/pandora_console/operation/network/network_report.php
+++ b/pandora_console/operation/network/network_report.php
@@ -135,11 +135,53 @@ if ($advanced_filter !== '') {
$filter['advanced_filter'] = $advanced_filter;
}
+$filter_name = get_parameter('filter_name');
+
$order_by = get_parameter('order_by', 'bytes');
if (!in_array($order_by, ['bytes', 'pkts', 'flows'])) {
$order_by = 'bytes';
}
+
+$save = get_parameter('save_button', '');
+$update = get_parameter('update_button', '');
+
+// Save user defined filter.
+if ($save != '' && check_acl($config['id_user'], 0, 'AW')) {
+ // Save filter args.
+ $data['filter_name'] = $filter_name;
+ $data['top'] = $top;
+ $data['action'] = $action;
+ $data['advanced_filter'] = $advanced_filter;
+
+
+ $filter_id = db_process_sql_insert('tnetwork_explorer_filter', $data);
+ if ($filter_id === false) {
+ $filter_id = 0;
+ ui_print_error_message(__('Error creating filter'));
+ } else {
+ ui_print_success_message(__('Filter created successfully'));
+ }
+} else if ($update != '' && check_acl($config['id_user'], 0, 'AW')) {
+ // Update current filter.
+ // Do not update the filter name and group.
+ $data['top'] = $top;
+ $data['action'] = $action;
+ $data['advanced_filter'] = $advanced_filter;
+
+ $result = db_process_sql_update(
+ 'tnetwork_explorer_filter',
+ $data,
+ ['id' => $filter_id]
+ );
+ ui_print_result_message(
+ $result,
+ __('Filter updated successfully'),
+ __('Error updating filter')
+ );
+}
+
+
// Build the table.
$filterTable = new stdClass();
$filterTable->id = '';
@@ -176,6 +218,59 @@ $filterTable->data[0][1] = html_print_label_input_block(
html_print_select_date_range('date', true)
);
+$filterTable->data[1][0] = html_print_label_input_block(
+ __('Data to show'),
+ html_print_select(
+ network_get_report_actions(),
+ 'action',
+ $action,
+ '',
+ '',
+ 0,
+ true
+ )
+);
+
+$advanced_toggle = new stdClass();
+$advanced_toggle->class = 'filter-table-adv';
+$advanced_toggle->size = [];
+$advanced_toggle->size[0] = '50%';
+$advanced_toggle->size[1] = '50%';
+$advanced_toggle->width = '100%';
+$user_groups = users_get_groups($config['id_user'], 'AR', $own_info['is_admin'], true);
+$user_groups[0] = 0;
+// Add all groups.
+$sql = 'SELECT * FROM tnetwork_explorer_filter';
+$advanced_toggle->data[0][0] = html_print_label_input_block(
+ __('Load Filter'),
+ html_print_select_from_sql($sql, 'filter_id', $filter_id, '', __('Select a filter'), 0, true, false, true, false, 'width:100%;')
+);
+$advanced_toggle->data[0][1] = html_print_label_input_block(
+ __('Filter name'),
+ html_print_input_text('filter_name', $filter_name, false, 40, 45, true, false, false, '', 'w100p')
+);
+$advanced_toggle->colspan[1][0] = 2;
+$advanced_toggle->data[1][0] = html_print_label_input_block(
+ __('Filter').ui_print_help_icon('pcap_filter', true),
+ html_print_textarea('advanced_filter', 4, 10, $advanced_filter, 'style="width:100%"', true)
+);
+$filterTable->colspan[2][0] = 3;
+$filterTable->data[2][0] = html_print_label_input_block(
+ '',
+ ui_toggle(
+ html_print_table($advanced_toggle, true),
+ __('Advanced'),
+ '',
+ '',
+ true,
+ true,
+ '',
+ 'white-box-content',
+ 'box-flat white_table_graph'
+ )
+);
+
+
$filterInputTable = '