tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 17:25:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

2013-05-03 Junichi Satoh <junichi@rworks.jp>

Browse Source 
* include/functions_graph.php: Fixed warnings



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8095 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
jsatoh 2013-05-03 08:19:07 +00:00
parent 792588b26c
commit 61c83b7147
2 changed files with 40 additions and 26 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 @@
2013-05-03 Junichi Satoh <junichi@rworks.jp>
* include/functions_graph.php: Fixed warnings.
2013-05-01 Miguel de Dios <miguel.dedios@artica.es> 2013-05-01 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/agent_manager.php: improved the source code style. * godmode/agentes/agent_manager.php: improved the source code style.

10
pandora_console/include/functions_graph.php
View File

@ -2615,6 +2615,7 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
$event_value = 0; $event_value = 0;
$alert_value = 0; $alert_value = 0;
$unknown_value = 0; $unknown_value = 0;
$is_unknown = false;
$event_ids = array(); $event_ids = array();
$alert_ids = array(); $alert_ids = array();
@ -2857,6 +2858,12 @@ function grafico_modulo_boolean ($agent_module_id, $period, $show_events,
global $series_type; global $series_type;
global $chart_extra_data; global $chart_extra_data;
if (empty($unit_name)) {
$unit = modules_get_unit($agent_module_id);
}
else
$unit = $unit_name;
$series_suffix_str = ''; $series_suffix_str = '';
if ($compare !== false) { if ($compare !== false) {
$series_suffix = '2'; $series_suffix = '2';
@ -3415,6 +3422,7 @@ function graphic_module_events ($id_module, $width, $height, $period = 0, $homeu
} }
$legend = array(); $legend = array();
$cont = 0;
for ($i = 0; $i < $interval; $i++) { for ($i = 0; $i < $interval; $i++) {
$bottom = $datelimit + ($periodtime * $i); $bottom = $datelimit + ($periodtime * $i);
if (! $graphic_type) { if (! $graphic_type) {
@ -3433,6 +3441,7 @@ function graphic_module_events ($id_module, $width, $height, $period = 0, $homeu
'utimestamp < '.$top), 'utimestamp < '.$top),
'event_type, utimestamp'); 'event_type, utimestamp');
if (!empty($events)) {
$status = 'normal'; $status = 'normal';
foreach($events as $event) { foreach($events as $event) {
if (empty($event['utimestamp'])) { if (empty($event['utimestamp'])) {
@ -3461,6 +3470,7 @@ function graphic_module_events ($id_module, $width, $height, $period = 0, $homeu
break; break;
} }
} }
}
$data[$cont]['utimestamp'] = $periodtime; $data[$cont]['utimestamp'] = $periodtime;