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

2009-07-08 Ramon Novoa <rnovoa@artica.es> 

* 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.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1793 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2009-07-08 13:12:44 +00:00
parent 157c3d1f28
commit eaf483fca8
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,3 +1,13 @@
2009-07-08 Ramon Novoa <rnovoa@artica.es>
* 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 <jorgegonz@artica.es> 2009-07-06 Jorge Gonzalez <jorgegonz@artica.es>
* include/languages/es.po, include/languages/es.mo: Updated Spanish * include/languages/es.po, include/languages/es.mo: Updated Spanish

4
pandora_console/include/functions_fsgraph.php
View File

@ -139,7 +139,7 @@ function fs_module_chart ($data, $width, $height, $avg_only = 1, $step = 10, $ti
} else { } else {
$show_name = '0'; $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 // Max chart
@ -221,7 +221,7 @@ function fs_combined_chart ($data, $categories, $sets, $width, $height, $type =
$show_name = '0'; $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 // Stack charts

2
pandora_console/operation/agentes/estado_ultimopaquete.php
View File

@ -181,7 +181,7 @@ foreach ($modules as $module) {
echo "<td class=".$tdcolor." width='78'>"; echo "<td class=".$tdcolor." width='78'>";
$graph_label = output_clean_strict ($module["nombre"]); $graph_label = output_clean_strict ($module["nombre"]);
echo "<a href='javascript:winopeng(\"operation/agentes/stat_win.php?type=$graph_type&period=2419200&id=".$module["id_agente_modulo"]."&label=".$graph_label."refresh=180000\", \"month_".$win_handle."\")'><img src='images/grafica_m.png' border=0></a>&nbsp;"; echo "<a href='javascript:winopeng(\"operation/agentes/stat_win.php?type=$graph_type&period=2419200&id=".$module["id_agente_modulo"]."&label=".$graph_label."&refresh=180000\", \"month_".$win_handle."\")'><img src='images/grafica_m.png' border=0></a>&nbsp;";
$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."')"; $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 '<a href="javascript:'.$link.'"><img src="images/grafica_w.png" border=0></a>&nbsp;'; echo '<a href="javascript:'.$link.'"><img src="images/grafica_w.png" border=0></a>&nbsp;';

2
pandora_console/operation/agentes/stat_win.php
View File

@ -48,7 +48,7 @@ if ($refresh > 0) {
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Pandora FMS Graph</title> <title>Pandora FMS Graph (<?php echo get_agentmodule_agent_name ($id) . ' - ' . $label; ?>)</title>
<link rel="stylesheet" href="../../include/styles/pandora_minimal.css" type="text/css" /> <link rel="stylesheet" href="../../include/styles/pandora_minimal.css" type="text/css" />
<script type='text/javaScript' src='../../include/javascript/calendar.js'></script> <script type='text/javaScript' src='../../include/javascript/calendar.js'></script>
<script type='text/javascript' src='../../include/javascript/x_core.js'></script> <script type='text/javascript' src='../../include/javascript/x_core.js'></script>