diff --git a/html/cgi-bin/memory.cgi b/html/cgi-bin/memory.cgi index 204365294..89fa7d14a 100644 --- a/html/cgi-bin/memory.cgi +++ b/html/cgi-bin/memory.cgi @@ -64,7 +64,6 @@ if ( $querry[0] =~ "memory"){ &Header::openbox('100%', 'center', $Lang::tr{'memory'}); print "
@@ -87,13 +88,12 @@ if ( $querry[0] =~ "memory"){ END ; }else{ - if ($_ =~ m/^Mem:\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)$/){ - ($ram,$size,$used,$free,$shared,$buffers,$cached) = ($1,$1,$2,$3,$4,$5,$6); + if ($_ =~ m/^Mem:\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)$/){ + ($size,$used,$free,$shared,$buffers,$cached,$available) = ($1,$2,$3,$4,$5,$6,$7); ($percent = ($used/$size)*100) =~ s/^(\d+)(\.\d+)?$/$1%/; print < | $Lang::tr{'ram'} | -$size KB | END ; }elsif($_ =~ m/^Swap:\s+(\d+)\s+(\d+)\s+(\d+)$/){ @@ -106,17 +106,13 @@ END print <$Lang::tr{'swap'} | -$size KB | END ; - }elsif($ram and $_ =~ m/^-\/\+ buffers\/cache:\s+(\d+)\s+(\d+)$/ ){ - ($used,$free) = ($1,$2); - ($percent = ($used/$ram)*100) =~ s/^(\d+)(\.\d+)?$/$1%/; - print "||||
$Lang::tr{'excluding buffers and cache'} | "; } print <$free KB | +$size KiB | +$used KiB | +$free KiB |
END
;
@@ -129,12 +125,13 @@ END
;
}
}
- close FREE;
+ close($cmd_fh);
print < | |||
$Lang::tr{'shared'} | $shared KB | |||||||
$Lang::tr{'buffers'} | $buffers KB | |||||||
$Lang::tr{'cached'} | $cached KB | |||||||
$Lang::tr{'shared'} | $shared KiB | |||||||
$Lang::tr{'buffers'} | $buffers KiB | |||||||
$Lang::tr{'cached'} | $cached KiB | |||||||
$Lang::tr{'available'} | $available KiB |