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

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

* 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
This commit is contained in:
mdtrooper 2011-04-20 11:03:50 +00:00
parent 99e3c78c19
commit d943cee966
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/ChangeLog
View File

@ -1,3 +1,7 @@
2011-04-20 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_graph.php: fixed duplicated function.
2011-04-20 Miguel de Dios <miguel.dedios@artica.es>
* images/logo_vertical_water.png: added water mark for the graphs.

4
pandora_console/include/functions_graph.php
View File

@ -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');