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

2011-02-01 Junichi Satoh <junichi@rworks.jp> 

* include/functions_fsgraph.php: Fixed html entities are displayed
	on graphs when time format contains them.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3792 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
jsatoh 2011-02-01 01:29:20 +00:00
parent dcb240e316
commit 886bf18d24
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2011-02-01 Junichi Satoh <junichi@rworks.jp>
* include/functions_fsgraph.php: Fixed html entities are displayed
on graphs when time format contains them.
2011-01-31 Miguel de Dios <miguel.dedios@artica.es>
* godmode/modules/manage_network_components_form_wmi.php,

4
pandora_console/include/functions_fsgraph.php
View File

@ -170,7 +170,7 @@ function fs_module_chart ($data, $width, $height, $avg_only = 1, $step = 10, $ti
} else {
$show_name = '0';
}
$chart->addCategory(date($time_format, $value['timestamp_bottom']), 'hoverText=' . date ($config['date_format'], $value['timestamp_bottom']) . ';showName=' . $show_name);
$chart->addCategory(date($time_format, $value['timestamp_bottom']), 'hoverText=' . date (html_entity_decode ($config['date_format'], ENT_QUOTES, "UTF-8"), $value['timestamp_bottom']) . ';showName=' . $show_name);
}
if ($count > 0)
@ -288,7 +288,7 @@ function fs_combined_chart ($data, $categories, $sets, $width, $height, $type =
$show_name = '0';
}
$chart->addCategory(date($time_format, $category['timestamp_bottom']), 'hoverText=' . date ($config['date_format'], $category['timestamp_bottom']) . ';showName=' . $show_name);
$chart->addCategory(date($time_format, $category['timestamp_bottom']), 'hoverText=' . date (html_entity_decode ($config['date_format'], ENT_QUOTES, "UTF-8"), $category['timestamp_bottom']) . ';showName=' . $show_name);
}
// Stack charts