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-4618-8580-4526-Bug-en-los-CSV-report' into 'develop' 

Fixed csv reports download

See merge request artica/pandorafms!2742
This commit is contained in:
Alejandro Fraguas 2019-10-16 09:58:00 +02:00
parent a3a456da92 f139fb0d2c
commit 7e54a26b49
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pandora_console/include/functions_reporting.php
View File

@ -4193,6 +4193,7 @@ function reporting_sql_graph(
switch ($type) { switch ($type) {
case 'dinamic': case 'dinamic':
case 'static': case 'static':
case 'data':
$return['chart'] = graph_custom_sql_graph( $return['chart'] = graph_custom_sql_graph(
$content['id_rc'], $content['id_rc'],
$width, $width,
@ -4204,9 +4205,6 @@ function reporting_sql_graph(
$content['top_n_value'] $content['top_n_value']
); );
break; break;
case 'data':
break;
} }
return reporting_check_structure_content($return); return reporting_check_structure_content($return);
@ -4406,6 +4404,7 @@ function reporting_netflow(
switch ($type) { switch ($type) {
case 'dinamic': case 'dinamic':
case 'static': case 'static':
case 'data':
$return['chart'] = netflow_draw_item( $return['chart'] = netflow_draw_item(
($report['datetime'] - $content['period']), ($report['datetime'] - $content['period']),
$report['datetime'], $report['datetime'],
@ -7561,8 +7560,26 @@ function reporting_custom_graph(
$content['name'] = __('Simple graph'); $content['name'] = __('Simple graph');
} }
$id_agent = agents_get_module_id(
$content['id_agent_module']
);
$id_agent_module = $content['id_agent_module'];
$agent_description = agents_get_description($id_agent);
$agent_group = agents_get_agent_group($id_agent);
$agent_address = agents_get_address($id_agent);
$agent_alias = agents_get_alias($id_agent);
$module_name = modules_get_agentmodule_name(
$id_agent_module
);
$module_description = modules_get_agentmodule_descripcion(
$id_agent_module
);
$return['title'] = $content['name']; $return['title'] = $content['name'];
$return['subtitle'] = io_safe_output($graph['name']); $return['subtitle'] = io_safe_output($graph['name']);
$return['agent_name'] = $agent_alias;
$return['module_name'] = $module_name;
$return['description'] = $content['description']; $return['description'] = $content['description'];
$return['date'] = reporting_get_date_text( $return['date'] = reporting_get_date_text(
$report, $report,
@ -7576,6 +7593,7 @@ function reporting_custom_graph(
switch ($type) { switch ($type) {
case 'dinamic': case 'dinamic':
case 'static': case 'static':
case 'data':
$params = [ $params = [
'period' => $content['period'], 'period' => $content['period'],
'width' => $width, 'width' => $width,