From 37f8112073b80ddbb7faad28a9f67ed5bd90a6c2 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Wed, 20 Apr 2011 11:03:50 +0000 Subject: [PATCH] 2011-04-20 Miguel de Dios * include/functions_graph.php: fixed duplicated function. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4262 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 4 ++++ pandora_console/include/functions_graph.php | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 8889b6fe72..e9f4e7cd16 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,7 @@ +2011-04-20 Miguel de Dios + + * include/functions_graph.php: fixed duplicated function. + 2011-04-20 Miguel de Dios * images/logo_vertical_water.png: added water mark for the graphs. diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index 44a5338fe9..3c234f11f2 100755 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -1388,7 +1388,7 @@ function graphic_agentevents2 ($id_agent, $width, $height, $period = 0) { } // Clean FLASH string strips non-valid characters for flashchart -function clean_flash_string ($string) { +function clean_flash_string2 ($string) { $string = html_entity_decode ($string, ENT_QUOTES, "UTF-8"); $string = str_replace('&', '', $string); $string = str_replace(' ', '', $string); @@ -1416,7 +1416,7 @@ function fs_agent_event_chart2 ($data, $width, $height, $step = 1) { } else { $show_name = '0'; } - $chart->addChartData(1, 'name=' . clean_flash_string($name) . ';showName=' . $show_name . ';color=' . $value); + $chart->addChartData(1, 'name=' . clean_flash_string2($name) . ';showName=' . $show_name . ';color=' . $value); } $chart->setChartParams('numDivLines=0;numVDivLines=0;showNames=1;rotateNames=0;showValues=0;baseFontSize=9;showLimits=0;showAreaBorder=0;areaBorderThickness=1;canvasBgColor=9ABD18');