Fixed problems with label and title in simple graph of monitor status

This commit is contained in:
m-lopez-f 2016-09-14 10:31:35 +02:00
parent 98d3401a12
commit 71a3014ec2
1 changed files with 7 additions and 7 deletions

View File

@ -57,7 +57,7 @@ if (file_exists ('../../include/languages/'.$user_language.'.mo')) {
echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/css"/>';
$label = get_parameter('label');
$label = base64_decode($label);
$label_title = base64_decode($label);
$id = get_parameter('id');
//$label = rawurldecode(urldecode(base64_decode(get_parameter('label', ''))));
?>
@ -74,7 +74,7 @@ $id = get_parameter('id');
}
?>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Pandora FMS Graph (<?php echo modules_get_agentmodule_agent_name ($id) . ' - ' . $label; ?>)</title>
<title>Pandora FMS Graph (<?php echo modules_get_agentmodule_agent_name ($id) . ' - ' . $label_title; ?>)</title>
<link rel="stylesheet" href="../../include/styles/pandora_minimal.css" type="text/css" />
<link rel="stylesheet" href="../../include/styles/jquery-ui-1.10.0.custom.css" type="text/css" />
<script type='text/javascript' src='../../include/javascript/pandora.js'></script>
@ -143,7 +143,7 @@ $id = get_parameter('id');
$id = get_parameter ("id", 0);
$width = get_parameter ("width", STATWIN_DEFAULT_CHART_WIDTH);
$height = get_parameter ("height", STATWIN_DEFAULT_CHART_HEIGHT);
//$label = get_parameter ("label", "");
$label = get_parameter ("label", "");
$start_date = get_parameter ("start_date", date("Y/m/d"));
$start_time = get_parameter ("start_time", date("H:i:s"));
$draw_events = get_parameter ("draw_events", 0);
@ -196,7 +196,7 @@ $id = get_parameter('id');
switch ($graph_type) {
case 'boolean':
echo grafico_modulo_boolean ($id, $period, $draw_events,
$width, $height, $label, $unit, $draw_alerts,
$width, $height, $label_title, $unit, $draw_alerts,
$avg_only, false, $date, false, $urlImage,
'adapter_' . $graph_type, $time_compare,
$unknown_graph);
@ -208,7 +208,7 @@ $id = get_parameter('id');
break;
case 'sparse':
echo grafico_modulo_sparse ($id, $period, $draw_events,
$width, $height, $label, $unit, $draw_alerts,
$width, $height, $label_title, $unit, $draw_alerts,
$avg_only, false, $date, $unit, $baseline, 0, true,
false, $urlImage, 1, false,
'adapter_' . $graph_type, $time_compare,
@ -222,7 +222,7 @@ $id = get_parameter('id');
break;
case 'string':
echo grafico_modulo_string ($id, $period, $draw_events,
$width, $height, $label, null, $draw_alerts, 1,
$width, $height, $label_title, null, $draw_alerts, 1,
false, $date, false, $urlImage,
'adapter_' . $graph_type);
echo '<br>';
@ -233,7 +233,7 @@ $id = get_parameter('id');
break;
case 'log4x':
echo grafico_modulo_log4x ($id, $period, $draw_events,
$width, $height, $label, $unit, $draw_alerts, 1,
$width, $height, $label_title, $unit, $draw_alerts, 1,
$pure, $date);
echo '<br>';
if ($show_events_graph)