X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Fhardwaregraphs.cgi;h=dabdfd1aeeeed3af82f9f4c384890de0b622e1d0;hp=f1774afa02a079c2d04e269fed81c8d6b79398e9;hb=fac92c6d25038f61430a4e872e720ba00b539385;hpb=301146259c965fd27daa0892b7bc606cd35aa7e0

diff --git a/html/cgi-bin/hardwaregraphs.cgi b/html/cgi-bin/hardwaregraphs.cgi
index f1774afa02..dabdfd1aee 100644
--- a/html/cgi-bin/hardwaregraphs.cgi
+++ b/html/cgi-bin/hardwaregraphs.cgi
@@ -67,7 +67,7 @@ if ( $querry[0] =~ "hwtemp"){
 	print "Content-type: image/png\n\n";
 	binmode(STDOUT);
 	&Graphs::updatethermaltempgraph($querry[1]);
-}elsif ( $querry[0] =~ "sd?" || $querry[0] =~ "hd?" ){
+}elsif ( $querry[0] =~ "sd?" || $querry[0] =~ "hd?" || $querry[0] =~ "xvd??" ){
 	print "Content-type: image/png\n\n";
 	binmode(STDOUT);
 	&Graphs::updatehddgraph($querry[0],$querry[1]);
@@ -83,8 +83,12 @@ if ( $querry[0] =~ "hwtemp"){
 			chomp($_);
 				$_ =~ /\/(.*)sensors-(.*)\/(.*)\.rrd/;
 				my $label = $2.$3;$label=~ s/-//g;
-				if ( $sensorsettings{'LINE-'.$label} ne "on" ){$sensorsettings{'LINE-'.$label} = 'off';}
-				elsif ( $sensorsettings{'LINE-'.$label} eq "on" ){$sensorsettings{'LINE-'.$label} = 'checked';}
+				if ( $sensorsettings{'LINE-'.$label} ne "on" ){
+					$sensorsettings{'LINE-'.$label} = 'off';
+				} elsif ($sensorsettings{'LINE-'.$label} eq "on" ){
+					$sensorsettings{'LINE-'.$label} = 'checked';
+				}
+				$sensorsettings{'LABEL-'.$label} =~ s/\W//g;
 		}
 		&General::writehash("${General::swroot}/sensors/settings", \%sensorsettings);
 	}
@@ -102,31 +106,31 @@ if ( $querry[0] =~ "hwtemp"){
 	}
 
 	if ( `ls $mainsettings{'RRDLOG'}/collectd/localhost/thermal-thermal_zone*` ) {
-	    &Header::openbox('100%', 'center', "ACPI Thermal-Zone Temp $Lang::tr{'graph'}");
-	    &Graphs::makegraphbox("hardwaregraphs.cgi","thermaltemp","day");
-	    &Header::closebox();
+		&Header::openbox('100%', 'center', "ACPI Thermal-Zone Temp $Lang::tr{'graph'}");
+		&Graphs::makegraphbox("hardwaregraphs.cgi","thermaltemp","day");
+		&Header::closebox();
 	}
 
 	if ( `ls $mainsettings{'RRDLOG'}/collectd/localhost/sensors-*/temperature-*` ) {
-	    &Header::openbox('100%', 'center', "hwtemp $Lang::tr{'graph'}");
-	    &Graphs::makegraphbox("hardwaregraphs.cgi","hwtemp","day");
-	    &Header::closebox();
+		&Header::openbox('100%', 'center', "hwtemp $Lang::tr{'graph'}");
+		&Graphs::makegraphbox("hardwaregraphs.cgi","hwtemp","day","375");
+		Header::closebox();
 	}
 
 	if ( `ls $mainsettings{'RRDLOG'}/collectd/localhost/sensors-*/fanspeed-*` ) {
-	    &Header::openbox('100%', 'center', "hwfan $Lang::tr{'graph'}");
-	    &Graphs::makegraphbox("hardwaregraphs.cgi","hwfan","day");
-	    &Header::closebox();
+		&Header::openbox('100%', 'center', "hwfan $Lang::tr{'graph'}");
+		&Graphs::makegraphbox("hardwaregraphs.cgi","hwfan","day");
+		&Header::closebox();
 	}
 
 	if ( `ls $mainsettings{'RRDLOG'}/collectd/localhost/sensors-*/voltage-*` ) {
-	    &Header::openbox('100%', 'center', "hwvolt $Lang::tr{'graph'}");
-	    &Graphs::makegraphbox("hardwaregraphs.cgi","hwvolt","day","375");
-	    &Header::closebox();
+		&Header::openbox('100%', 'center', "hwvolt $Lang::tr{'graph'}");
+		&Graphs::makegraphbox("hardwaregraphs.cgi","hwvolt","day","435");
+		&Header::closebox();
 	}
 
 	if ( `ls $mainsettings{'RRDLOG'}/collectd/localhost/sensors-*` ) {
-	    sensorsbox();
+		sensorsbox();
 	}
 	&Header::closebigbox();
 	&Header::closepage();