From 2f7d074afd82f118b9cbf8a42b0f26ff86a167da Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Thu, 29 Jul 2010 14:11:15 +0000 Subject: [PATCH] fix temperatures graphs (reported by monrad) git-svn-id: http://www.observium.org/svn/observer/trunk@1519 61d68cd4-352d-0410-923a-c4978735b2b8 --- html/includes/graphs/device/temperatures.inc.php | 2 +- html/includes/graphs/sensor/temperature.inc.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/html/includes/graphs/device/temperatures.inc.php b/html/includes/graphs/device/temperatures.inc.php index 386ac92c8..7fb407cd5 100644 --- a/html/includes/graphs/device/temperatures.inc.php +++ b/html/includes/graphs/device/temperatures.inc.php @@ -40,7 +40,7 @@ while($temperature = mysql_fetch_array($sql)) $temperature['sensor_descr_fixed'] = substr(str_pad($temperature['sensor_descr'], 22),0,22); $temprrd = $config['rrd_dir'] . "/".$device['hostname']."/".safename("temp-" . $temperature['sensor_descr'] . ".rrd"); $rrd_options .= " DEF:temp" . $temperature['sensor_id'] . "=$temprrd:temp:AVERAGE "; - $rrd_options .= " LINE1:temp" . $temperature['sensor_id'] . "#" . $colour . ":'" . str_replace(':','\:',str_replace('\*','*',quotemeta($temperature['sensor_descr_fixed']))) . "' "; + $rrd_options .= " LINE1:temp" . $temperature['sensor_id'] . "#" . $colour . ":'" . str_replace(':','\:',str_replace('\*','*',$temperature['sensor_descr_fixed'])) . "'"; $rrd_options .= " GPRINT:temp" . $temperature['sensor_id'] . ":LAST:%3.0lfC "; $rrd_options .= " GPRINT:temp" . $temperature['sensor_id'] . ":MIN:%3.0lfC "; $rrd_options .= " GPRINT:temp" . $temperature['sensor_id'] . ":MAX:%3.0lfC\\\l "; diff --git a/html/includes/graphs/sensor/temperature.inc.php b/html/includes/graphs/sensor/temperature.inc.php index 7f9b5db4c..50e084fad 100644 --- a/html/includes/graphs/sensor/temperature.inc.php +++ b/html/includes/graphs/sensor/temperature.inc.php @@ -29,7 +29,8 @@ include("includes/graphs/common.inc.php"); # $rrd_options .= " AREA:temp#bbd392"; # $rrd_options .= " AREA:tempwarm#FFCCCC"; # $rrd_options .= " AREA:tempcold#CCCCFF"; - $rrd_options .= " LINE1:temp#cc0000:'" . str_replace(':','\:',str_replace('\*','*',quotemeta($temperature['sensor_descr_fixed'])))."'"; # Ugly hack :( +# $rrd_options .= " LINE1:temp#cc0000:'" . str_replace(':','\:',str_replace('\*','*',quotemeta($temperature['sensor_descr_fixed'])))."'"; # Ugly hack :( + $rrd_options .= " LINE1:temp#cc0000:'" . str_replace(':','\:',str_replace('\*','*',$temperature['sensor_descr_fixed']))."'"; # Ugly hack :( $rrd_options .= " LINE1:tempwarm#660000"; $rrd_options .= " GPRINT:temp:LAST:%3.0lfC"; $rrd_options .= " GPRINT:temp:MIN:%3.0lfC";