From 5e7339a89814b8377aadd70496d7fb04ff51d857 Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Tue, 5 Apr 2011 09:27:38 +0000
Subject: [PATCH] 2011-04-04 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_fsgraph.php: added check if loaded the class.
* include/graphs/functions_fsgraph.php: added check if loaded the class.
Rename some functions and erased the function "fs_module_chart".
* include/graphs/functions_pchart.php: erased some debug traces.
* include/graphs/fgraph.php: cleaned the function "area_graph".
* operation/agentes/stat_win.php: cleaned source code.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4169 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
pandora_console/ChangeLog | 15 +-
pandora_console/include/functions_fsgraph.php | 4 +-
pandora_console/include/graphs/fgraph.php | 14 +-
.../include/graphs/functions_fsgraph.php | 172 ++----------------
.../include/graphs/functions_pchart.php | 5 +-
.../operation/agentes/stat_win.php | 8 -
6 files changed, 31 insertions(+), 187 deletions(-)
diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index c1545b3edb..886d4cfde1 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,4 +1,17 @@
-2011-04-3 Miguel de Dios <miguel.dedios@artica.es>
+2011-04-04 Miguel de Dios <miguel.dedios@artica.es>
+
+ * include/functions_fsgraph.php: added check if loaded the class.
+
+ * include/graphs/functions_fsgraph.php: added check if loaded the class.
+ Rename some functions and erased the function "fs_module_chart".
+
+ * include/graphs/functions_pchart.php: erased some debug traces.
+
+ * include/graphs/fgraph.php: cleaned the function "area_graph".
+
+ * operation/agentes/stat_win.php: cleaned source code.
+
+2011-04-03 Miguel de Dios <miguel.dedios@artica.es>
* pandora_console/godmode/modules/manage_network_templates.php: fixed the
output of description and name, and fixed the buttons to delete and export.
diff --git a/pandora_console/include/functions_fsgraph.php b/pandora_console/include/functions_fsgraph.php
index fd84e7a2be..acbcffa9ec 100644
--- a/pandora_console/include/functions_fsgraph.php
+++ b/pandora_console/include/functions_fsgraph.php
@@ -22,7 +22,9 @@
/**
* Include the FusionCharts class
*/
-require_once ('FusionCharts/FusionCharts_Gen.php');
+if (!class_exists("FusionCharts")) {
+ require_once ('FusionCharts/FusionCharts_Gen.php');
+}
// Returns the code needed to display the chart
function get_chart_code ($chart, $width, $height, $swf) {
diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php
index 68d08e8815..88bbcbef2a 100755
--- a/pandora_console/include/graphs/fgraph.php
+++ b/pandora_console/include/graphs/fgraph.php
@@ -42,12 +42,9 @@ function threshold_graph($flash_chart, $chart_data, $width, $height) {
}
}
-function area_graph($flash_chart, $chart_data, $width, $height, $avg_only, $resolution, $time_format, $show_events, $show_alerts, $caption, $baseline, $color,$legend, $long_index) {
- $flash_chart = 1;
-
+function area_graph($flash_chart, $chart_data, $width, $height, $color,$legend, $long_index) {
if($flash_chart) {
echo fs_area_graph($chart_data, $width, $height, $color, $legend, $long_index);
- //echo fs_module_chart ($chart_data, $width, $height, $avg_only, $resolution, $time_format, $show_events, $show_alerts, $legend, $baseline, $color);
}
else {
$id_graph = uniqid();
@@ -58,21 +55,12 @@ function area_graph($flash_chart, $chart_data, $width, $height, $avg_only, $reso
$graph['height'] = $height;
$graph['color'] = $color;
$graph['legend'] = $legend;
-// $graph['avg_only'] = $avg_only;
-// $graph['resolution'] = $resolution;
-// $graph['time_format'] = $time_format;
-// $graph['show_events'] = $show_events;
-// $graph['show_alerts'] = $show_alerts;
-// $graph['caption'] = $caption;
-// $graph['baseline'] = $baseline;
session_start();
//unset($_SESSION['graph']);
$_SESSION['graph_session'][$id_graph] = $graph;
- //debugPrint($_SESSION);
session_write_close();
- //echo "<img src='include/graphs/functions_pchart.php?graph_type=area&data=".json_encode($chart_data)."&width=".$width."&height=".$height."'>";
echo "<img src='http://127.0.0.1/pandora_console/include/graphs/functions_pchart.php?graph_type=area&id_graph=" . $id_graph . "'>";
}
}
diff --git a/pandora_console/include/graphs/functions_fsgraph.php b/pandora_console/include/graphs/functions_fsgraph.php
index 7a05c0ff3d..8561d1c02d 100755
--- a/pandora_console/include/graphs/functions_fsgraph.php
+++ b/pandora_console/include/graphs/functions_fsgraph.php
@@ -17,8 +17,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Lesser General Public License for more details.
-
-require_once ("FusionCharts/FusionCharts_Gen.php");
+if (!class_exists("FusionCharts")) {
+ require_once ("FusionCharts/FusionCharts_Gen.php");
+}
@@ -154,157 +155,6 @@ function fs_area_graph($chart_data, $width, $height, $color, $legend, $long_inde
return $output;
}
-
-function fs_module_chart ($data, $width, $height, $avg_only = 1, $step = 10, $time_format = 'G:i', $show_events = 0, $show_alerts = 0, $caption = '', $baseline = 0, $color) {
- global $config;
-
- $graph_type = "MSArea2D"; //MSLine is possible also
-
- // Generate the XML
- $chart = new FusionCharts($graph_type, $width, $height);
- $num_vlines = 0;
- $count = 0;
-
- // NO caption needed (graph avg/max/min stats are in the legend now)
- /*
- if ($caption != '') {
- $chart->setChartParam("caption", $caption);
- }
- */
-
- $total_max = 0;
- $total_avg = 0;
- $total_min = 0;
-
- // Create categories
- foreach ($data as $i => $value) {
-
- $total_avg +=$value["sum"];
-
- if ($avg_only != 1){
- if ($value["max"] > $total_max)
- $total_max =$value["max"];
- if ($value["min"] < $total_min)
- $total_min =$value["min"];
- }
-
- if ($count++ % $step == 0) {
- $show_name = '1';
- $num_vlines++;
- } else {
- $show_name = '0';
- }
- //$chart->addCategory(date($time_format, $i), '');
- $chart->addCategory(date($time_format, $i),
- 'hoverText=' . date (html_entity_decode ($config['date_format'], ENT_QUOTES, "UTF-8"), $i) . ';showName=' . $show_name);
- }
-
- if ($count > 0)
- $total_avg = format_for_graph($total_avg / $count);
- else
- $total_avg = 0;
-
- //$total_min = format_for_graph ($total_min);
- //$total_max = format_for_graph ($total_max);
-
- // Event chart
- if ($show_events == 1) {
- $showAreaBorder = 0;
- if (!is_null($color['event']['border'])) {
- $showAreaBorder = 1;
- }
-
- $chart->addDataSet($caption['event'], 'alpha=' . $color['event']['alpha'] . ';' .
- 'showAreaBorder=' . $showAreaBorder . ';' .
- 'areaBorderColor=' . $color['event']['border'] . ';' .
- 'color=#' . $color['event']['color']);
- foreach ($data as $value) {
- $chart->addChartData($value['event']);
- }
- }
-
- // Alert chart
- if ($show_alerts == 1) {
- $showAreaBorder = 0;
- if (!is_null($color['alert']['border'])) {
- $showAreaBorder = 1;
- }
-
- $chart->addDataSet($caption['alert'], 'alpha=' . $color['alert']['alpha'] . ';' .
- 'showAreaBorder=' . $showAreaBorder . ';' .
- 'areaBorderColor=' . $color['alert']['border'] . ';' .
- 'color=' . $color['alert']['color']);
- foreach ($data as $value) {
- $chart->addChartData($value['alert']);
- }
- }
-
- // Max chart
- if ($avg_only == 0) {
- $chart->addDataSet($caption['max'], 'color=' . $color['max']['color']);
- foreach ($data as $value) {
- $chart->addChartData($value['max']);
- }
- }
-
- // Avg chart
- $empty = 1;
- $chart->addDataSet($caption['sum'], 'color=' . $color['sum']['color']);
- foreach ($data as $value) {
- if ($value['sum'] > 0) {
- $empty = 0;
- }
- $chart->addChartData($value['sum']);
- }
-
- // Min chart
- if ($avg_only == 0) {
- $chart->addDataSet($caption['min'], 'color=' . $color['min']['color']);
- foreach ($data as $value) {
- $chart->addChartData($value['min']);
- }
- }
-
- // Baseline chart
- if ($baseline == 1) {
- $showAreaBorder = 0;
- if (!is_null($color['baseline']['border'])) {
- $showAreaBorder = 1;
- }
- //debugPrint($color);
- $chart->addDataSet($caption['baseline'], 'color=' . $color['baseline']['color'] . ';' .
- 'alpha=' . $color['baseline']['alpha'] . ';' .
- 'showAreaBorder=' . $showAreaBorder . ';');
- debugPrint('color=' . $color['baseline']['color'] . ';' .
- 'alpha=' . $color['baseline']['alpha'] . ';' .
- 'showAreaBorder=' . $showAreaBorder . ';');
- foreach ($data as $value) {
- $chart->addChartData($value['baseline']);
- }
- }
-
- $chart->setChartParams('animation=0;numVDivLines=' . $num_vlines . ';showShadow=0;showAlternateVGridColor=1;showNames=1;rotateNames=1;lineThickness=0.1;anchorRadius=0.5;showValues=0;baseFontSize=9;showLimits=0;showAreaBorder=1;areaBorderThickness=0.1;areaBorderColor=000000' . ($empty == 1 ? ';yAxisMinValue=0;yAxisMaxValue=1' : ''));
-
- $random_number = rand ();
- $div_id = 'chart_div_' . $random_number;
- $chart_id = 'chart_' . $random_number;
- $output = '<div id="' . $div_id. '" style="z-index:1;"></div>';
- $pre_url = ($config["homeurl"] == "/") ? '' : $config["homeurl"];
-
- $output .= '<script language="JavaScript" src="' . $pre_url . '/include/FusionCharts/FusionCharts.js"></script>';
- $output .= '<script type="text/javascript">
- <!--
- function pie_' . $chart_id . ' () {
- var myChart = new FusionCharts("' . $pre_url . '/include/FusionCharts/FCF_'.$graph_type.'.swf", "' . $chart_id . '", "' . $width. '", "' . $height. '", "0", "1");
- myChart.setDataXML("' . addslashes($chart->getXML ()) . '");
- myChart.addParam("WMode", "Transparent");
- myChart.render("' . $div_id . '");
- }
- pie_' . $chart_id . ' ();
- -->
- </script>';
- return $output;
-}
///////////////////////////////
///////////////////////////////
///////////////////////////////
@@ -322,7 +172,7 @@ function date_to_epoch ($date) {
}
// Returns the code needed to display the chart
-function get_chart_code ($chart, $width, $height, $swf) {
+function get_chart_code2 ($chart, $width, $height, $swf) {
$random_number = rand ();
$div_id = 'chart_div_' . $random_number;
$chart_id = 'chart_' . $random_number;
@@ -340,7 +190,7 @@ function get_chart_code ($chart, $width, $height, $swf) {
}
// Prints a 3D pie chart
-function fs_3d_pie_chart ($data, $names, $width, $height, $background = "EEEEEE") {
+function fs_3d_pie_chart2 ($data, $names, $width, $height, $background = "EEEEEE") {
if ((sizeof ($data) != sizeof ($names)) OR (sizeof($data) == 0) ){
return;
}
@@ -356,7 +206,7 @@ function fs_3d_pie_chart ($data, $names, $width, $height, $background = "EEEEEE"
}
// Return the code
- return get_chart_code ($chart, $width, $height, 'include/graphs/FusionCharts/FCF_Pie3D.swf');
+ return get_chart_code2 ($chart, $width, $height, 'include/graphs/FusionCharts/FCF_Pie3D.swf');
}
// Prints a 2D pie chart
@@ -376,7 +226,7 @@ function fs_2d_pie_chart ($data, $names, $width, $height, $background = "EEEEEE"
}
// Return the code
- return get_chart_code ($chart, $width, $height, 'include/graphs/FusionCharts/FCF_Pie2D.swf');
+ return get_chart_code2 ($chart, $width, $height, 'include/graphs/FusionCharts/FCF_Pie2D.swf');
}
// Prints a BAR Horizontalchart
@@ -396,7 +246,7 @@ function fs_hbar_chart ($data, $names, $width, $height) {
}
// Return the code
- return get_chart_code ($chart, $width, $height, 'include/graphs/FusionCharts/FCF_Bar2D.swf');
+ return get_chart_code2 ($chart, $width, $height, 'include/graphs/FusionCharts/FCF_Bar2D.swf');
}
// Returns a 2D column chart
@@ -431,7 +281,7 @@ function fs_2d_column_chart ($data, $width, $height) {
. ($empty == 1 ? ';yAxisMinValue=0;yAxisMaxValue=1' : ''));
// Return the code
- return get_chart_code ($chart, $width, $height, 'include/graphs/FusionCharts/FCF_Column2D.swf');
+ return get_chart_code2 ($chart, $width, $height, 'include/graphs/FusionCharts/FCF_Column2D.swf');
}
// Returns a 3D column chart
@@ -466,7 +316,7 @@ function fs_3d_column_chart ($data, $width, $height) {
. ($empty == 1 ? ';yAxisMinValue=0;yAxisMaxValue=1' : ''));
// Return the code
- return get_chart_code ($chart, $width, $height, 'include/graphs/FusionCharts/FCF_Column3D.swf');
+ return get_chart_code2 ($chart, $width, $height, 'include/graphs/FusionCharts/FCF_Column3D.swf');
}
// Prints a Gantt chart
@@ -622,7 +472,7 @@ function fs_gantt_chart ($title, $from, $to, $tasks, $milestones, $width, $heigh
$chart->addTrendLine ('start=' . date ('d/m/Y') . ';displayValue='. __('Today') . ';color=666666;isTrendZone=1;alpha=20');
// Return the code
- return get_chart_code ($chart, $width, $height, 'include/graphs/FusionCharts/FCF_Gantt.swf');
+ return get_chart_code2 ($chart, $width, $height, 'include/graphs/FusionCharts/FCF_Gantt.swf');
}
?>
diff --git a/pandora_console/include/graphs/functions_pchart.php b/pandora_console/include/graphs/functions_pchart.php
index 3bbac7cfbf..51978c18fb 100755
--- a/pandora_console/include/graphs/functions_pchart.php
+++ b/pandora_console/include/graphs/functions_pchart.php
@@ -98,7 +98,6 @@ if($graph_type != 'pie3d' && $graph_type != 'pie2d') {
$c++;
}
- //debugPrint($data_values);
}
switch($graph_type) {
@@ -289,7 +288,7 @@ function pch_bar_graph ($graph_type, $index, $data, $width, $height, $rgb_color
$myPicture->drawBarChart($settings);
break;
}
-
+
/* Render the picture */
$myPicture->stroke();
}
@@ -320,7 +319,7 @@ function pch_vertical_graph ($graph_type, $index, $data, $width, $height, $rgb_c
/* Create and populate the pData object */
$MyData = new pData();
- //debugPrint($data);
+
foreach($data as $i => $values) {
if(isset($legend)) {
$point_id = $legend[$i];
diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php
index 12f9d1e7b2..70e7bba588 100644
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -138,8 +138,6 @@ else
// log4x doesnt support flash yet
//
if ($config['flash_charts'] && $graph_type != "log4x") {
-//if (true) {
-
switch ($graph_type) {
case 'sparse':
echo grafico_modulo_sparse2 ($id, $period, $draw_events, $width, $height,
@@ -184,12 +182,6 @@ else {
echo fs_error_image ('../images');
break;
}
-
-//$image = "../../include/fgraph.php?tipo=".$graph_type."&draw_alerts=".$draw_alerts."&draw_events=".$draw_events."&id=".$id."&zoom=".$zoom."&label=". base64_encode ($label) ."&height=".$height."&width=".$width."&period=".$period."&avg_only=".$avg_only."&baseline=".$baseline;
-//
-//$image .= "&date=" . $date;
-//
-//print_image ($image, false, array ("border" => 0));
}
//z-index is 1 because 2 made the calendar show under the divmenu.