nochmal 2 kleine fixes im Stack

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@568 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index 6cb22fe52467e9792e449bb56cfce9807b9c8d16..f8aadc8103244c3bd441553421ce25f9f371c1ce 100644 (file)
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -58,14 +58,14 @@ sub updatecpugraph {
        "--color", "SHADEB".$color{"color19"},
        "--color", "BACK".$color{"color21"},
        "-t $tr{'cpu usage per'} $tr{$period}",
+       "DEF:iowait=$rrdlog/cpu.rrd:iowait:AVERAGE",
        "DEF:user=$rrdlog/cpu.rrd:user:AVERAGE",
        "DEF:system=$rrdlog/cpu.rrd:system:AVERAGE",
        "DEF:idle=$rrdlog/cpu.rrd:idle:AVERAGE",
-       "DEF:iowait=$rrdlog/cpu.rrd:iowait:AVERAGE",
-       "AREA:user".$color{"color11"}.":$tr{'user cpu usage'}",
+       "AREA:iowait".$color{"color14"}.":$tr{'iowait'}",
+       "STACK:user".$color{"color11"}.":$tr{'user cpu usage'}",
        "STACK:system".$color{"color13"}.":$tr{'system cpu usage'}",
-       "STACK:idle".$color{"color12"}.":$tr{'idle cpu usage'}",
-       "STACK:iowait".$color{"color14"}.":$tr{'iowait'}\\j",
+       "STACK:idle".$color{"color12"}.":$tr{'idle cpu usage'}\\j",
        "COMMENT: \\j",
        "COMMENT:$tr{'maximal'}",
        "COMMENT:$tr{'average'}",

diff --git a/html/cgi-bin/network.cgi b/html/cgi-bin/network.cgi
index 1843d796ba14d4c910441187781f30cafc9c1464..70bdf35c685b67421c611bd267b0c35a4ecadbe7 100644 (file)
--- a/html/cgi-bin/network.cgi
+++ b/html/cgi-bin/network.cgi
@@ -54,7 +54,7 @@ if ($cgiparams[1] =~ /red/) {
 
 foreach my $graphname (@graphs) {
 
-  if ($graphname == "lq" )
+  if ($graphname eq "lq" )
   {
   &Graphs::updatelqgraph("day");
   &Graphs::updatelqgraph("week");
@@ -63,10 +63,10 @@ foreach my $graphname (@graphs) {
   }
   else
   {
-  &Graphs::updateifgraph ($graphname, "day");
-  &Graphs::updateifgraph ($graphname, "week");
-  &Graphs::updateifgraph ($graphname, "month");
-  &Graphs::updateifgraph ($graphname, "year");
+  &Graphs::updateifgraph($graphname, "day");
+  &Graphs::updateifgraph($graphname, "week");
+  &Graphs::updateifgraph($graphname, "month");
+  &Graphs::updateifgraph($graphname, "year");
   }
   
        &Header::openbox('100%', 'center', "$graphname $Lang::tr{'graph'}");