webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Arne Fitzenreiter
2014-06-07 13:55:34 +02:00
parent 5eee265477
commit 2b9b518aa8
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/79/filelists/files
View File

@@ -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

17
html/cgi-bin/traffic.cgi
View File

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2014 IPFire Team <info@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>