X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Fmedia.cgi;h=2aec3cce1d5a5d81c04cf3c8e7a66de6119f2fe6;hp=490ffcad94d98406dbfeb3a048d0a8cb72dc1b4d;hb=8b40eca59ec98f19544e68342db7ee24d5983aa6;hpb=4e481c3a517c27fae6b8e7056fb8a5fdd05c9188

diff --git a/html/cgi-bin/media.cgi b/html/cgi-bin/media.cgi
index 490ffcad9..2aec3cce1 100644
--- a/html/cgi-bin/media.cgi
+++ b/html/cgi-bin/media.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2008  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -45,9 +45,9 @@ my @querry = split(/\?/,$ENV{'QUERY_STRING'});
 $querry[0] = '' unless defined $querry[0];
 $querry[1] = 'hour' unless defined $querry[1];
 
-my @devices = `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`;
+my @devices = `ls -1 /sys/block | grep -E '^sd|^mmcblk|^xvd|^vd|^md' | sort | uniq`;
 
-if ( $querry[0] =~ "sd?" || $querry[0] =~ "hd?" ){
+if ( $querry[0] =~ "sd?" || $querry[0] =~ "mmcblk?" || $querry[0] =~ "xvd??" || $querry[0] =~ "vd?" || $querry[0] =~ "md*" ){
 	print "Content-type: image/png\n\n";
 	binmode(STDOUT);
 	
@@ -70,7 +70,7 @@ if ( $querry[0] =~ "sd?" || $querry[0] =~ "hd?" ){
 	
 	&Header::openbox('100%', 'center', $Lang::tr{'disk usage'});
 	print "<table width='95%' cellspacing='5'>\n";
-	open(DF,'/bin/df -B M -x rootfs|');
+	open(DF,'/bin/df -P -B M -x rootfs|');
 	while(<DF>){
 		if ($_ =~ m/^Filesystem/ ){
 			print <<END
@@ -108,7 +108,7 @@ END
 	close DF;
 	print "<tr><td colspan='7'>&nbsp;\n<tr><td colspan='7'><h3>Inodes</h3>\n";
 
-	open(DF,'/bin/df -i -x rootfs|');
+	open(DF,'/bin/df -P -i -x rootfs|');
 	while(<DF>){
 		if ($_ =~ m/^Filesystem/ ){
 			print <<END
@@ -152,7 +152,7 @@ END
 
 	for(my $i = 1; $i <= $#iostat1; $i++){
 		if ( $i eq '1' ){
-			print "<tr><td align='center' class='boldbase'><b>Device</b></td><td align='center' class='boldbase'><b>MB read</b></td><td align='center' class='boldbase'><b>MB writen</b></td></tr>";
+			print "<tr><td align='center' class='boldbase'><b>$Lang::tr{'device'}</b></td><td align='center' class='boldbase'><b>MB read</b></td><td align='center' class='boldbase'><b>MB writen</b></td></tr>";
 		}else{
 			print "<tr><td align='center'>$iostat1[$i]</td><td align='center'>$iostat2[$i]</td><td align='center'>$iostat3[$i]</td></tr>";
 		}
@@ -195,8 +195,8 @@ sub diskbox {
 	my $disk = $_[0];
 	chomp $disk;
 	my @status;
-	if (-e "/tmp/hddstatus"){
-		open(DATEI, "</tmp/hddstatus") || die "Datei nicht gefunden";
+	if (-e "/var/run/hddstatus"){
+		open(DATEI, "</var/run/hddstatus") || die "Datei nicht gefunden";
 		my  @diskstate = <DATEI>;
 		close(DATEI);
 
@@ -205,10 +205,10 @@ sub diskbox {
 		}
 
 		if ( $status[1]=~/standby/){
-			my $ftime = localtime((stat("/tmp/hddshutdown-$disk"))[9]);
-			print"<B>Disk $disk status:<font color=#FF0000>".$status[1]."</font></B> (since $ftime)";
+			my $ftime = localtime((stat("/var/run/hddshutdown-$disk"))[9]);
+			print"<b>Disk $disk status:<span style='color:#FF0000'>".$status[1]."</b> ($Lang::tr{'since'} $ftime)";
 		}else{
-			print"<B>Disk $disk status:<font color=#00FF00>".$status[1]."</font></B>";
+			print"<b>Disk $disk status:<span style='color:#00FF00'>".$status[1]."</b>";
 		}
 	}
 
@@ -217,7 +217,7 @@ sub diskbox {
 	print <<END
 <br /><input type="button" onClick="swapVisibility('smart_$disk')" value="$Lang::tr{'smart information'}" />
 <div id='smart_$disk' style='display: none'>
-	<hr /><table border=0><tr><td align=left><pre>$smart</pre></table>
+	<hr /><table border='0'><tr><td align='left'><pre>$smart</pre></table>
 </div>
 END
 ;