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

2011-11-30 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* include/functions_reporting.php: Fixed html render of combined 
	graphs.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5211 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2011-11-30 09:50:55 +00:00
parent 6b78f4912b
commit 671f032db4
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2011-11-30 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_reporting.php: Fixed html render of combined
graphs.
2011-11-30 Sergio Martin <sergio.martin@artica.es>
* godmode/massive/massive_edit_modules.php: Fixed massive

9
pandora_console/include/functions_reporting.php
View File

@ -2251,6 +2251,12 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
$table->colspan[1][0] = 3;
$data = array ();
$urlImage = 'http://';
if ($config['https']) {
$urlImage = 'https://';
}
$urlImage .= $_SERVER['SERVER_NAME'] . $config['homeurl'] . '/';
require_once ($config["homedir"] . '/include/functions_graph.php');
$data[0] = graphic_combined_module(
$modules,
@ -2264,7 +2270,8 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
0,
$graph["stacked"],
$report["datetime"],
true);
true,
$urlImage);
array_push ($table->data, $data);
break;