From 7b42e67733c7a4eb0ec4fa22af155776dd8bcfdb Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 25 May 2008 23:14:02 +0200
Subject: [PATCH] Some fixes on traffic.cgi if no data is present (not
 translated yet)

---
 html/cgi-bin/traffic.cgi | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/html/cgi-bin/traffic.cgi b/html/cgi-bin/traffic.cgi
index 0930fdf40d..0fff97ca89 100644
--- a/html/cgi-bin/traffic.cgi
+++ b/html/cgi-bin/traffic.cgi
@@ -50,7 +50,7 @@ my %netsettings;
 &Header::openpage($Lang::tr{'sstraffic'}, 1, '');
 &Header::openbigbox('100%', 'left');
 
-&Header::openbox('100%', 'left', "$Lang::tr{'traffics'}");
+&Header::openbox('100%', 'center', "$Lang::tr{'traffics'}");
 
 # Display internal network
 display_vnstat($netsettings{'GREEN_DEV'});
@@ -83,23 +83,23 @@ sub display_vnstat
 {
 	my $device = $_[0];
 
-	# Sumary graph sometimes hang so i print the text
-	print "<B><PRE>";
-	system("/usr/bin/vnstat -s -i $device");
-	print "</PRE></B>";
-	# generate Graphs if they are older than 5 min (-c 5)
-	# Hour graph
-	system("/usr/bin/vnstati -c 5 -h -i $device -o /srv/web/ipfire/html/graphs/vnstat-h-$device.png");
-	# Day graph
-	system("/usr/bin/vnstati -c 5 -d -i $device -o /srv/web/ipfire/html/graphs/vnstat-d-$device.png");
-	# Month graph
-	system("/usr/bin/vnstati -c 5 -m -i $device -o /srv/web/ipfire/html/graphs/vnstat-m-$device.png");
-	# Top10 graph
-	system("/usr/bin/vnstati -c 5 -t -i $device -o /srv/web/ipfire/html/graphs/vnstat-t-$device.png");
+	my $testdata = `/usr/bin/vnstat -i $device | grep "enough data"`;
+
+	if (! $testdata) {
+	    system("/usr/bin/vnstati -c 5 -s -i $device -o /srv/web/ipfire/html/graphs/vnstat-s-$device.png");
+	    # Hour graph
+	    system("/usr/bin/vnstati -c 5 -h -i $device -o /srv/web/ipfire/html/graphs/vnstat-h-$device.png");
+	    # Day graph
+	    system("/usr/bin/vnstati -c 5 -d -i $device -o /srv/web/ipfire/html/graphs/vnstat-d-$device.png");
+	    # Month graph
+	    system("/usr/bin/vnstati -c 5 -m -i $device -o /srv/web/ipfire/html/graphs/vnstat-m-$device.png");
+	    # Top10 graph
+	    system("/usr/bin/vnstati -c 5 -t -i $device -o /srv/web/ipfire/html/graphs/vnstat-t-$device.png");
 
 # Generate HTML-Table with the graphs
 print <<END
 <table>
+<tr><td><img src="/graphs/vnstat-s-$device.png"></td></tr>
 <tr><td><img src="/graphs/vnstat-h-$device.png"></td></tr>
 <tr><td><img src="/graphs/vnstat-d-$device.png"></td></tr>
 <tr><td><img src="/graphs/vnstat-m-$device.png"></td></tr>
@@ -107,4 +107,8 @@ print <<END
 </table>
 END
 ;
+	    } else {
+		print"No data for $device !<br>";
+	    }
+	print"<hr>";
 }
-- 
2.39.2