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

2011-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* include/functions_graph.php: Added check for flash charts in pdf
	exportation.
	* operation/events/events_validate.php: Removed entities in this 
	view.

	Fixes: #3445106



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5200 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2011-11-29 12:52:56 +00:00
parent 8c142204aa
commit f317f494f5
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,3 +1,12 @@
2011-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_graph.php: Added check for flash charts in pdf
exportation.
* operation/events/events_validate.php: Removed entities in this
view.
Fixes: #3445106
2011-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/setup/setup_visuals.php: Added custom logo in visual

11
pandora_console/include/functions_graph.php
View File

@ -378,11 +378,6 @@ function graphic_combined_module ($module_list, $weight_list, $period, $width, $
global $config;
global $graphic_type;
$flash_charts = $config['flash_charts'];
if ($flash_charts){
include_flash_chart_script();
}
// Set the title and time format
@ -741,10 +736,16 @@ function graphic_combined_module ($module_list, $weight_list, $period, $width, $
$time_format = 'M j';
}
$flash_charts = $config['flash_charts'];
if ($only_image) {
$flash_charts = false;
}
if ($flash_charts){
include_flash_chart_script();
}
switch ($stacked) {
case GRAPH_AREA:
$color = null;

2
pandora_console/operation/events/events_validate.php
View File

@ -84,7 +84,7 @@ foreach($ids as $key => $id) {
"title" => $title_st,
"id" => 'status_img_'.$event["id_evento"]));
$table->data[$key][0] = $icon." ".$event['evento'];
$table->data[$key][0] = $icon." ".io_safe_output($event['evento']);
$table->align[$key][0] = 'left';
if($event['id_alert_am'] != 0) {
$any_alert = true;