tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-554-informes-pdf-de-netflow-no-funcionan' into 'develop'

Browse Source 
Fixed pdf netflow reports

See merge request !294
This commit is contained in:
vgilc 2017-04-07 12:42:07 +02:00
commit 78567fa588
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/functions_graph.php
View File

@ -4242,7 +4242,7 @@ function graph_netflow_aggregate_area ($data, $period, $width, $height, $unit =
$sources, array (), ui_get_full_url("images/image_problem.opaque.png", false, false, false), $sources, array (), ui_get_full_url("images/image_problem.opaque.png", false, false, false),
"", $unit, $homeurl, "", $unit, $homeurl,
$config['homedir'] . "/images/logo_vertical_water.png", $config['homedir'] . "/images/logo_vertical_water.png",
$config['fontpath'], $config['font_size'], $unit, 2); $config['fontpath'], $config['font_size'], $unit, $ttl);
} }

19
pandora_console/include/functions_reporting.php
View File

@ -311,7 +311,8 @@ function reporting_make_reporting_data($report = null, $id_report,
$type, $type,
$force_width_chart, $force_width_chart,
$force_height_chart, $force_height_chart,
'netflow_area'); 'netflow_area',
$pdf);
break; break;
case 'netflow_pie': case 'netflow_pie':
$report['contents'][] = reporting_netflow( $report['contents'][] = reporting_netflow(
@ -320,7 +321,8 @@ function reporting_make_reporting_data($report = null, $id_report,
$type, $type,
$force_width_chart, $force_width_chart,
$force_height_chart, $force_height_chart,
'netflow_pie'); 'netflow_pie',
$pdf);
break; break;
case 'netflow_data': case 'netflow_data':
$report['contents'][] = reporting_netflow( $report['contents'][] = reporting_netflow(
@ -329,7 +331,8 @@ function reporting_make_reporting_data($report = null, $id_report,
$type, $type,
$force_width_chart, $force_width_chart,
$force_height_chart, $force_height_chart,
'netflow_data'); 'netflow_data',
$pdf);
break; break;
case 'netflow_statistics': case 'netflow_statistics':
$report['contents'][] = reporting_netflow( $report['contents'][] = reporting_netflow(
@ -338,7 +341,8 @@ function reporting_make_reporting_data($report = null, $id_report,
$type, $type,
$force_width_chart, $force_width_chart,
$force_height_chart, $force_height_chart,
'netflow_statistics'); 'netflow_statistics',
$pdf);
break; break;
case 'netflow_summary': case 'netflow_summary':
$report['contents'][] = reporting_netflow( $report['contents'][] = reporting_netflow(
@ -347,7 +351,8 @@ function reporting_make_reporting_data($report = null, $id_report,
$type, $type,
$force_width_chart, $force_width_chart,
$force_height_chart, $force_height_chart,
'netflow_summary'); 'netflow_summary',
$pdf);
break; break;
case 'monitor_report': case 'monitor_report':
$report['contents'][] = reporting_monitor_report( $report['contents'][] = reporting_monitor_report(
@ -3241,7 +3246,7 @@ function reporting_monitor_report($report, $content) {
} }
function reporting_netflow($report, $content, $type, function reporting_netflow($report, $content, $type,
$force_width_chart, $force_height_chart, $type_netflow = null) { $force_width_chart, $force_height_chart, $type_netflow = null, $pdf = false) {
global $config; global $config;
@ -3315,7 +3320,7 @@ function reporting_netflow($report, $content, $type,
$filter, $filter,
$content['top_n_value'], $content['top_n_value'],
$content ['server_name'], $content ['server_name'],
'HTML'); $pdf ? 'PDF' : 'HTML');
break; break;
case 'data': case 'data':
break; break;