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

2011-04-18 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_graph.php, include/graphs/functions_fsgraph.php,
	include/graphs/fgraph.php, operation/agentes/stat_win.php: fixed the
	relative urls for absolute urls.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4238 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2011-04-18 15:12:48 +00:00
parent 107e8c3906
commit 635e24fe11
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2011-04-18 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_graph.php, include/graphs/functions_fsgraph.php,
include/graphs/fgraph.php, operation/agentes/stat_win.php: fixed the
relative urls for absolute urls.
2011-04-18 Javier Lanz <javier.lanz@artica.es> 2011-04-18 Javier Lanz <javier.lanz@artica.es>
* include/functions_filemanager.php: Fixed a problem with html entities * include/functions_filemanager.php: Fixed a problem with html entities

2
pandora_console/include/functions_graph.php
View File

@ -30,7 +30,7 @@ function grafico_modulo_sparse2 ($agent_module_id, $period, $show_events,
global $config; global $config;
global $graphic_type; global $graphic_type;
//include_flash_chart_script(); include_flash_chart_script($homeurl);
// Set variables // Set variables
if ($date == 0) $date = get_system_time(); if ($date == 0) $date = get_system_time();

6
pandora_console/include/graphs/fgraph.php
View File

@ -143,7 +143,7 @@ function area_graph($flash_chart, $chart_data, $width, $height, $color, $legend,
} }
if($flash_chart) { if($flash_chart) {
return fs_area_graph($chart_data, $width, $height, $color, $legend, $long_index); return fs_area_graph($chart_data, $width, $height, $color, $legend, $long_index, $homedir);
} }
else { else {
$graph = array(); $graph = array();
@ -348,8 +348,8 @@ function gantt_graph($project_name, $from, $to, $tasks, $milestones, $width, $he
return fs_gantt_chart ($project_name, $from, $to, $tasks, $milestones, $width, $height); return fs_gantt_chart ($project_name, $from, $to, $tasks, $milestones, $width, $height);
} }
function include_flash_chart_script() { function include_flash_chart_script($homeurl = '') {
echo '<script language="JavaScript" src="include/graphs/FusionCharts/FusionCharts.js"></script>'; echo '<script language="JavaScript" src="' . $homeurl . 'include/graphs/FusionCharts/FusionCharts.js"></script>';
} }
?> ?>

4
pandora_console/include/graphs/functions_fsgraph.php
View File

@ -309,7 +309,7 @@ function fs_line_graph($chart_data, $width, $height, $color, $legend, $long_inde
} }
function fs_area_graph($chart_data, $width, $height, $color, $legend, $long_index) { function fs_area_graph($chart_data, $width, $height, $color, $legend, $long_index, $homeurl = '') {
global $config; global $config;
$graph_type = "MSArea2D"; //MSLine is possible also $graph_type = "MSArea2D"; //MSLine is possible also
@ -438,7 +438,7 @@ function fs_area_graph($chart_data, $width, $height, $color, $legend, $long_inde
$output .= '<script type="text/javascript"> $output .= '<script type="text/javascript">
<!-- <!--
function pie_' . $chart_id . ' () { function pie_' . $chart_id . ' () {
var myChart = new FusionCharts("include/graphs/FusionCharts/FCF_'.$graph_type.'.swf", "' . $chart_id . '", "' . $width. '", "' . $height. '", "0", "1"); var myChart = new FusionCharts("' . $homeurl . 'include/graphs/FusionCharts/FCF_'.$graph_type.'.swf", "' . $chart_id . '", "' . $width. '", "' . $height. '", "0", "1");
myChart.setDataXML("' . addslashes($chart->getXML ()) . '"); myChart.setDataXML("' . addslashes($chart->getXML ()) . '");
myChart.addParam("WMode", "Transparent"); myChart.addParam("WMode", "Transparent");
myChart.render("' . $div_id . '"); myChart.render("' . $div_id . '");

2
pandora_console/operation/agentes/stat_win.php
View File

@ -211,7 +211,7 @@ print_checkbox ("avg_only", 1, (bool) $avg_only);
echo '<tr><td>'.__('Begin date').'</td><td>'; echo '<tr><td>'.__('Begin date').'</td><td>';
print_input_text ("start_date", substr ($start_date, 0, 10),'', 10); print_input_text ("start_date", substr ($start_date, 0, 10),'', 10);
print_image ("../../images/calendar_view_day.png", false, array ("onclick" => "scwShow(scwID('text-start_date'),this);")); print_image ("images/calendar_view_day.png", false, array ("onclick" => "scwShow(scwID('text-start_date'),this);"));
echo '</td></tr><tr><td>'.__('Zoom factor').'</td>'; echo '</td></tr><tr><td>'.__('Zoom factor').'</td>';
echo '<td>'; echo '<td>';