[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 2b9b518aa87d71a02cb96aa288244c5d0f4cf8a8

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 3849 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  2b9b518aa87d71a02cb96aa288244c5d0f4cf8a8 (commit)
      from  5eee2654771c7dbe8571ea376017fed7042bae57 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2b9b518aa87d71a02cb96aa288244c5d0f4cf8a8
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Jun 7 13:55:34 2014 +0200

    traffic.cgi: remove work around for a fixed vnstat(i) bug.

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/79/filelists/files |  1 +
 html/cgi-bin/traffic.cgi                 | 17 ++++-------------
 2 files changed, 5 insertions(+), 13 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/79/filelists/files b/config/rootfiles/core/79/filelists/files
index bda32bc..3195bf2 100644
--- a/config/rootfiles/core/79/filelists/files
+++ b/config/rootfiles/core/79/filelists/files
@@ -9,6 +9,7 @@ srv/web/ipfire/cgi-bin/modem-status.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/pppsetup.cgi
 srv/web/ipfire/cgi-bin/proxy.cgi
+srv/web/ipfire/cgi-bin/traffic.cgi
 srv/web/ipfire/html/themes/ipfire/include/functions.pl
 usr/bin/squidGuard
 usr/sbin/firewall-policy
diff --git a/html/cgi-bin/traffic.cgi b/html/cgi-bin/traffic.cgi
index 70e5726..58a51d0 100644
--- a/html/cgi-bin/traffic.cgi
+++ b/html/cgi-bin/traffic.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2014  IPFire Team  <info(a)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        #
@@ -88,10 +88,7 @@ sub display_vnstat
 	if ( $testdata =~ 'enough') {
 		print"No data for $device !<br>";
 	} else {
-	    # Falls back to textoutput if there was no % value because vnstati hang in this case
-	    if (!($testdata =~ 'nan%')) {
-		    system("/usr/bin/vnstati -c 5 -s -i $device -o /srv/web/ipfire/html/graphs/vnstat-s-$device.png");
-	    }
+	    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
@@ -102,15 +99,9 @@ sub display_vnstat
 	    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 "<table>";
-	    if ($testdata =~ 'nan%') {
-		print "<tr><td><b><pre>";
-		system("/usr/bin/vnstat -i $device");
-		print "</pre></b></td></tr>";
-	    } else {
-		print"<tr><td><img src=\"/graphs/vnstat-s-$device.png\"></td></tr>";
-	    }
 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>


hooks/post-receive
--
IPFire 2.x development tree