From ce1cf430b579463606e1eaa6d0b1d42574ea506e Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Mon, 9 May 2011 10:34:34 +0000
Subject: [PATCH] 2011-05-09 Miguel de Dios <miguel.dedios@artica.es>
* include/graphs/functions_fsgraph.php: fixed the call to
"clean_flash_string", renamed to "clean_flash_string2".
* include/functions_reporting.php: disabled the include old fsgraph.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4319 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
pandora_console/ChangeLog | 7 +++++++
pandora_console/include/functions_reporting.php | 2 +-
.../include/graphs/functions_fsgraph.php | 14 +++++++-------
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 3ee085740c..60772d1b89 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-09 Miguel de Dios <miguel.dedios@artica.es>
+
+ * include/graphs/functions_fsgraph.php: fixed the call to
+ "clean_flash_string", renamed to "clean_flash_string2".
+
+ * include/functions_reporting.php: disabled the include old fsgraph.
+
2011-05-09 Miguel de Dios <miguel.dedios@artica.es>
* pandoradb.postgreSQL.sql: fixed the type of cell "id_agente_modulo" in the
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 342e408750..8b3f3534d4 100644
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -25,7 +25,7 @@
require_once ($config["homedir"]."/include/functions.php");
require_once ($config["homedir"]."/include/functions_db.php");
require_once ($config["homedir"]."/include/functions_agents.php");
-include_once ($config["homedir"]."/include/fgraph.php");
+//include_once ($config["homedir"]."/include/fgraph.php");
include_once($config["homedir"] . "/include/functions_groups.php");
require_once ('functions_graph.php');
include_once($config['homedir'] . "/include/functions_modules.php");
diff --git a/pandora_console/include/graphs/functions_fsgraph.php b/pandora_console/include/graphs/functions_fsgraph.php
index bd0e338810..868e83a356 100755
--- a/pandora_console/include/graphs/functions_fsgraph.php
+++ b/pandora_console/include/graphs/functions_fsgraph.php
@@ -492,7 +492,7 @@ function fs_3d_pie_chart2 ($data, $names, $width, $height, $background = "EEEEEE
$chart->setChartParams($params);
for ($i = 0; $i < sizeof ($data); $i++) {
- $chart->addChartData($data[$i], 'name=' . clean_flash_string($names[$i]));
+ $chart->addChartData($data[$i], 'name=' . clean_flash_string2($names[$i]));
}
// Return the code
@@ -512,7 +512,7 @@ function fs_2d_pie_chart ($data, $names, $width, $height, $background = "EEEEEE"
$chart->setChartParams($params);
for ($i = 0; $i < sizeof ($data); $i++) {
- $chart->addChartData($data[$i], 'name=' . clean_flash_string($names[$i]));
+ $chart->addChartData($data[$i], 'name=' . clean_flash_string2($names[$i]));
}
// Return the code
@@ -583,7 +583,7 @@ function fs_2d_column_chart ($data, $width, $height) {
if ($value > 0) {
$empty = 0;
}
- $chart->addChartData($value, 'name=' . clean_flash_string($name) . ';showName=' . $show_name . ';color=95BB04');
+ $chart->addChartData($value, 'name=' . clean_flash_string2($name) . ';showName=' . $show_name . ';color=95BB04');
}
}
@@ -658,7 +658,7 @@ function fs_2d_hcolumn_chart ($data, $width, $height) {
if ($value > 0) {
$empty = 0;
}
- $chart->addChartData($value, 'name=' . clean_flash_string($name) . ';showName=' . $show_name/* . ';color=95BB04'*/);
+ $chart->addChartData($value, 'name=' . clean_flash_string2($name) . ';showName=' . $show_name/* . ';color=95BB04'*/);
}
}
@@ -695,7 +695,7 @@ function fs_3d_column_chart ($data, $width, $height) {
if ($value > 0) {
$empty = 0;
}
- $chart->addChartData($value, 'name=' . clean_flash_string($name) . ';showName=' . $show_name . ';color=95BB04');
+ $chart->addChartData($value, 'name=' . clean_flash_string2($name) . ';showName=' . $show_name . ';color=95BB04');
}
$chart->setChartParams('decimalPrecision=0;showAlternateVGridColor=1; numVDivLines='.$num_vlines.';showNames=1;rotateNames=1;showValues=0;showPercentageValues=0;showLimits=0;baseFontSize=9;'
@@ -828,7 +828,7 @@ function fs_gantt_chart ($title, $from, $to, $tasks, $milestones, $width, $heigh
// Tasks
foreach ($tasks as $task) {
- $chart->addGanttProcess (clean_flash_string($task['name']), 'id=' . $task['id'] . ';link=' . urlencode($task['link']));
+ $chart->addGanttProcess (clean_flash_string2($task['name']), 'id=' . $task['id'] . ';link=' . urlencode($task['link']));
$chart->addGanttTask (__('Planned'), 'start=' . $task['start'] . ';end=' . $task['end'] . ';id=' . $task['id'] . ';processId=' . $task['id'] . ';color=4b3cff;height=5;topPadding=10;animation=0');
@@ -849,7 +849,7 @@ function fs_gantt_chart ($title, $from, $to, $tasks, $milestones, $width, $heigh
if ($milestones !== '') {
$chart->addGanttProcess (__('Milestones'), 'id=0');
foreach ($milestones as $milestone) {
- $chart->addGanttTask (clean_flash_string($milestone['name']), 'start=' . $milestone['date'] . ';end=' . $milestone['date'] . ';id=ms-' . $milestone['id'] . ';processId=0;color=ffffff;alpha=0;height=60;topPadding=0;animation=0');
+ $chart->addGanttTask (clean_flash_string2($milestone['name']), 'start=' . $milestone['date'] . ';end=' . $milestone['date'] . ';id=ms-' . $milestone['id'] . ';processId=0;color=ffffff;alpha=0;height=60;topPadding=0;animation=0');
$chart->addGanttMilestone ('ms-' . $milestone['id'], 'date=' . $milestone['date'] . ';radius=8;color=efbb07;shape=star;numSides=3;borderThickness=1');
}
}