tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round

This commit is contained in:
Jonathan 2023-03-16 10:42:46 +01:00
parent 3aba51d0ed e474ec0915
commit 02ef024905
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/include/functions_netflow.php
View File

@ -202,7 +202,7 @@ function netflow_stat_table($data, $start_date, $end_date, $aggregate)
$table = new stdClass();
$table->width = '100%';
$table->cellspacing = 0;
$table->class = 'databox';
$table->class = 'info_table';
$table->data = [];
$j = 0;
$x = 0;
@ -270,7 +270,7 @@ function netflow_data_table($data, $start_date, $end_date, $aggregate, $pdf=fals
$table->size = ['100%'];
}
$table->class = 'databox w100p';
$table->class = 'info_table w100p';
$table->cellspacing = 0;
$table->data = [];
@ -339,7 +339,7 @@ function netflow_top_n_table(array $data, int $total_bytes)
$values = [];
$table = new stdClass();
$table->class = 'w100p';
$table->class = 'info_table w100p';
$table->cellspacing = 0;
$table->data = [];
@ -405,7 +405,7 @@ function netflow_summary_table($data)
$values = [];
$table = new stdClass();
$table->cellspacing = 0;
$table->class = 'databox';
$table->class = 'info_table';
$table->styleTable = 'width: 100%';
$table->data = [];
@ -1323,7 +1323,7 @@ function netflow_draw_item(
}
if ($output === 'HTML' || $output === 'PDF') {
$html = '<table class="w100p">';
$html = '<table class="databox w100p">';
$html .= '<tr>';
$html .= '<td class="w50p">';
$html .= netflow_summary_table($data_summary);

5
pandora_console/operation/netflow/nf_live_view.php
View File

@ -622,10 +622,13 @@ if (empty($draw) === false) {
'selected_style_theme',
$config['style']
);
$netflowContainerClass = ($chart_type === 'netflow_data' || $chart_type === 'netflow_summary' || $chart_type === 'netflow_top_N') ? '' : 'white_box';
// Draw the netflow chart.
html_print_div(
[
'class' => 'white_box',
'class' => $netflowContainerClass,
'content' => netflow_draw_item(
$start_date,
$end_date,