From b9e8554a71598792efecd1c27961abe2605aa534 Mon Sep 17 00:00:00 2001
From: maniacikarus <maniacikarus@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Sun, 20 May 2007 16:11:15 +0000
Subject: [PATCH] nochmal 2 kleine fixes im Stack

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@568 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---
 config/cfgroot/graphs.pl |  8 ++++----
 html/cgi-bin/network.cgi | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index 6cb22fe524..f8aadc8103 100644
--- 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 1843d796ba..70bdf35c68 100644
--- 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'}");
-- 
2.39.2