diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index d5e3b31a8f..a89827027c 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,13 @@ +2009-07-08 Ramon Novoa + + * include/functions_fsgraph.php: Use the user defined date format in + module and combined charts. + + * operation/agentes/estado_ultimopaquete.php: Fixed the chart URL. + + * operation/agentes/stat_win.php: Show the agent name in the window + title. + 2009-07-06 Jorge Gonzalez * include/languages/es.po, include/languages/es.mo: Updated Spanish diff --git a/pandora_console/include/functions_fsgraph.php b/pandora_console/include/functions_fsgraph.php index 9c8f8d04ed..1b0890f8a7 100644 --- a/pandora_console/include/functions_fsgraph.php +++ b/pandora_console/include/functions_fsgraph.php @@ -139,7 +139,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=' . strftime ('%c', $value['timestamp_bottom']) . ';showName=' . $show_name); + $chart->addCategory(date($time_format, $value['timestamp_bottom']), 'hoverText=' . date ($config['date_format'], $value['timestamp_bottom']) . ';showName=' . $show_name); } // Max chart @@ -221,7 +221,7 @@ function fs_combined_chart ($data, $categories, $sets, $width, $height, $type = $show_name = '0'; } - $chart->addCategory(date($time_format, $category['timestamp_bottom']), 'hoverText=' . strftime ('%c', $category['timestamp_bottom']) . ';showName=' . $show_name); + $chart->addCategory(date($time_format, $category['timestamp_bottom']), 'hoverText=' . date ($config['date_format'], $category['timestamp_bottom']) . ';showName=' . $show_name); } // Stack charts diff --git a/pandora_console/operation/agentes/estado_ultimopaquete.php b/pandora_console/operation/agentes/estado_ultimopaquete.php index 01b19067cf..46a0edc784 100644 --- a/pandora_console/operation/agentes/estado_ultimopaquete.php +++ b/pandora_console/operation/agentes/estado_ultimopaquete.php @@ -181,7 +181,7 @@ foreach ($modules as $module) { echo ""; $graph_label = output_clean_strict ($module["nombre"]); - echo " "; + echo " "; $link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=604800&id=".$module["id_agente_modulo"]."&label=".$graph_label."&refresh=6000','week_".$win_handle."')"; echo ' '; diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php index ce0a7450a1..ab682b28e9 100644 --- a/pandora_console/operation/agentes/stat_win.php +++ b/pandora_console/operation/agentes/stat_win.php @@ -48,7 +48,7 @@ if ($refresh > 0) { -Pandora FMS Graph +Pandora FMS Graph (<?php echo get_agentmodule_agent_name ($id) . ' - ' . $label; ?>)