webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

QoS: Don't create template when bandwidth is empty.

Browse Source
This commit is contained in:
Michael Tremer
2013-02-14 15:35:43 +01:00
parent 48d9bbba75
commit 40d3e72956
11 changed files with 71 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/language_issues.de
View File

@@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature
WARNING: translation string unused: Level7 rule
WARNING: translation string unused: Local VPN IP
WARNING: translation string unused: Ping
WARNING: translation string unused: Queuelenght
WARNING: translation string unused: Remote IP
WARNING: translation string unused: Remote VPN IP
WARNING: translation string unused: Resolv
@@ -146,6 +147,7 @@ WARNING: translation string unused: err rs 8 untar
WARNING: translation string unused: error config
WARNING: translation string unused: error external access
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
WARNING: translation string unused: external access rule changed
WARNING: translation string unused: extrahd unable to read
@@ -257,6 +259,7 @@ WARNING: translation string unused: monthly volume
WARNING: translation string unused: monthly volume start day
WARNING: translation string unused: monthly volume start day short
WARNING: translation string unused: mount
WARNING: translation string unused: mtu QoS
WARNING: translation string unused: nat-traversal
WARNING: translation string unused: net address
WARNING: translation string unused: net config type

3
doc/language_issues.en
View File

@@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature
WARNING: translation string unused: Level7 rule
WARNING: translation string unused: Local VPN IP
WARNING: translation string unused: Ping
WARNING: translation string unused: Queuelenght
WARNING: translation string unused: Remote IP
WARNING: translation string unused: Remote VPN IP
WARNING: translation string unused: Resolv
@@ -169,6 +170,7 @@ WARNING: translation string unused: err rs 8 untar
WARNING: translation string unused: error config
WARNING: translation string unused: error external access
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
WARNING: translation string unused: external access rule changed
WARNING: translation string unused: extrahd unable to read
@@ -283,6 +285,7 @@ WARNING: translation string unused: monthly volume
WARNING: translation string unused: monthly volume start day
WARNING: translation string unused: monthly volume start day short
WARNING: translation string unused: mount
WARNING: translation string unused: mtu QoS
WARNING: translation string unused: nat-traversal
WARNING: translation string unused: net address
WARNING: translation string unused: net config type

4
doc/language_issues.es
View File

@@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature
WARNING: translation string unused: Level7 rule
WARNING: translation string unused: Local VPN IP
WARNING: translation string unused: Ping
WARNING: translation string unused: Queuelenght
WARNING: translation string unused: Remote IP
WARNING: translation string unused: Remote VPN IP
WARNING: translation string unused: Resolv
@@ -167,6 +168,7 @@ WARNING: translation string unused: err rs 8 untar
WARNING: translation string unused: error config
WARNING: translation string unused: error external access
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
WARNING: translation string unused: external access rule changed
WARNING: translation string unused: extrahd unable to read
@@ -281,6 +283,7 @@ WARNING: translation string unused: monthly volume
WARNING: translation string unused: monthly volume start day
WARNING: translation string unused: monthly volume start day short
WARNING: translation string unused: mount
WARNING: translation string unused: mtu QoS
WARNING: translation string unused: nat-traversal
WARNING: translation string unused: net address
WARNING: translation string unused: net config type
@@ -604,6 +607,7 @@ WARNING: untranslated string: proxy reports daily
WARNING: untranslated string: proxy reports monthly
WARNING: untranslated string: proxy reports today
WARNING: untranslated string: proxy reports weekly
WARNING: untranslated string: qos enter bandwidths
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed

4
doc/language_issues.fr
View File

@@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature
WARNING: translation string unused: Level7 rule
WARNING: translation string unused: Local VPN IP
WARNING: translation string unused: Ping
WARNING: translation string unused: Queuelenght
WARNING: translation string unused: Remote IP
WARNING: translation string unused: Remote VPN IP
WARNING: translation string unused: Resolv
@@ -167,6 +168,7 @@ WARNING: translation string unused: err rs 8 untar
WARNING: translation string unused: error config
WARNING: translation string unused: error external access
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
WARNING: translation string unused: external access rule changed
WARNING: translation string unused: extrahd unable to read
@@ -281,6 +283,7 @@ WARNING: translation string unused: monthly volume
WARNING: translation string unused: monthly volume start day
WARNING: translation string unused: monthly volume start day short
WARNING: translation string unused: mount
WARNING: translation string unused: mtu QoS
WARNING: translation string unused: nat-traversal
WARNING: translation string unused: net address
WARNING: translation string unused: net config type
@@ -588,6 +591,7 @@ WARNING: untranslated string: proxy reports daily
WARNING: untranslated string: proxy reports monthly
WARNING: untranslated string: proxy reports today
WARNING: untranslated string: proxy reports weekly
WARNING: untranslated string: qos enter bandwidths
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed

4
doc/language_issues.nl
View File

@@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature
WARNING: translation string unused: Level7 rule
WARNING: translation string unused: Local VPN IP
WARNING: translation string unused: Ping
WARNING: translation string unused: Queuelenght
WARNING: translation string unused: Remote IP
WARNING: translation string unused: Remote VPN IP
WARNING: translation string unused: Resolv
@@ -169,6 +170,7 @@ WARNING: translation string unused: err rs 8 untar
WARNING: translation string unused: error config
WARNING: translation string unused: error external access
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
WARNING: translation string unused: external access rule changed
WARNING: translation string unused: extrahd unable to read
@@ -283,6 +285,7 @@ WARNING: translation string unused: monthly volume
WARNING: translation string unused: monthly volume start day
WARNING: translation string unused: monthly volume start day short
WARNING: translation string unused: mount
WARNING: translation string unused: mtu QoS
WARNING: translation string unused: nat-traversal
WARNING: translation string unused: net address
WARNING: translation string unused: net config type
@@ -508,6 +511,7 @@ WARNING: untranslated string: bytes
WARNING: untranslated string: ccd iroute2
WARNING: untranslated string: new
WARNING: untranslated string: outgoing firewall reserved groupname
WARNING: untranslated string: qos enter bandwidths
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed

4
doc/language_issues.pl
View File

@@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature
WARNING: translation string unused: Level7 rule
WARNING: translation string unused: Local VPN IP
WARNING: translation string unused: Ping
WARNING: translation string unused: Queuelenght
WARNING: translation string unused: Remote IP
WARNING: translation string unused: Remote VPN IP
WARNING: translation string unused: Resolv
@@ -167,6 +168,7 @@ WARNING: translation string unused: err rs 8 untar
WARNING: translation string unused: error config
WARNING: translation string unused: error external access
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
WARNING: translation string unused: external access rule changed
WARNING: translation string unused: extrahd unable to read
@@ -281,6 +283,7 @@ WARNING: translation string unused: monthly volume
WARNING: translation string unused: monthly volume start day
WARNING: translation string unused: monthly volume start day short
WARNING: translation string unused: mount
WARNING: translation string unused: mtu QoS
WARNING: translation string unused: nat-traversal
WARNING: translation string unused: net address
WARNING: translation string unused: net config type
@@ -604,6 +607,7 @@ WARNING: untranslated string: proxy reports daily
WARNING: untranslated string: proxy reports monthly
WARNING: untranslated string: proxy reports today
WARNING: untranslated string: proxy reports weekly
WARNING: untranslated string: qos enter bandwidths
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed

4
doc/language_issues.ru
View File

@@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature
WARNING: translation string unused: Level7 rule
WARNING: translation string unused: Local VPN IP
WARNING: translation string unused: Ping
WARNING: translation string unused: Queuelenght
WARNING: translation string unused: Remote IP
WARNING: translation string unused: Remote VPN IP
WARNING: translation string unused: Resolv
@@ -166,6 +167,7 @@ WARNING: translation string unused: err rs 8 untar
WARNING: translation string unused: error config
WARNING: translation string unused: error external access
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
WARNING: translation string unused: external access rule changed
WARNING: translation string unused: filename
@@ -275,6 +277,7 @@ WARNING: translation string unused: monthly volume
WARNING: translation string unused: monthly volume start day
WARNING: translation string unused: monthly volume start day short
WARNING: translation string unused: mount
WARNING: translation string unused: mtu QoS
WARNING: translation string unused: nat-traversal
WARNING: translation string unused: net address
WARNING: translation string unused: net config type
@@ -569,6 +572,7 @@ WARNING: untranslated string: proxy reports daily
WARNING: untranslated string: proxy reports monthly
WARNING: untranslated string: proxy reports today
WARNING: untranslated string: proxy reports weekly
WARNING: untranslated string: qos enter bandwidths
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed

4
doc/language_missings
View File

@@ -98,6 +98,7 @@
< proxy reports monthly
< proxy reports today
< proxy reports weekly
< qos enter bandwidths
< server restart
< snort working
< static routes
@@ -236,6 +237,7 @@
< proxy reports monthly
< proxy reports today
< proxy reports weekly
< qos enter bandwidths
< server restart
< Set time on boot
< static routes
@@ -328,6 +330,7 @@
< proxy reports monthly
< proxy reports today
< proxy reports weekly
< qos enter bandwidths
< server restart
< static routes
< visit us at
@@ -423,6 +426,7 @@
< proxy reports monthly
< proxy reports today
< proxy reports weekly
< qos enter bandwidths
< server restart
< static routes
< visit us at

4
html/cgi-bin/qos.cgi
View File

@@ -497,6 +497,7 @@ elsif ($qossettings{'ACTION'} eq $Lang::tr{'save'})
}
elsif ($qossettings{'ACTION'} eq $Lang::tr{'template'} )
{
if (($qossettings{'OUT_SPD'} > 0) && ($qossettings{'INC_SPD'} > 0)) {
my @UP;
#print "UP<br />";
for(my $i = 1; $i <= 10; $i++) {
@@ -589,6 +590,9 @@ END
system("/usr/bin/touch /var/ipfire/qos/enable");
system("/usr/local/bin/qosctrl start >/dev/null 2>&1");
system("logger -t ipfire 'QoS started'");
} else {
$message = $Lang::tr{'qos enter bandwidths'};
}
}
elsif ($qossettings{'ACTION'} eq $Lang::tr{'status'} )
{

1
langs/de/cgi-bin/de.pl
View File

@@ -1523,6 +1523,7 @@
'psk' => 'PSK',
'pulse' => 'Puls',
'pulse dial' => 'Pulswahl:',
'qos enter bandwidths' => 'Bitte geben Sie ihre Downstream- und Upstream-Bandbreite an!',
'qos graphs' => 'Qos Diagramme',
'qos warning' => 'Die Regel <strong>muss</strong> wieder gespeichert werden, ansonsten wird sie verworfen!',
'quick playlist' => 'Quick Playlist',

1
langs/en/cgi-bin/en.pl
View File

@@ -1551,6 +1551,7 @@
'pulse' => 'Pulse',
'pulse dial' => 'Pulse dial:',
'qos add subclass' => 'Add subclass',
'qos enter bandwidths' => 'You will need to enter your downstream and upstream bandwidth!',
'qos graphs' => 'Qos Graphs',
'qos warning' => 'The rule <strong>must</strong> be saved, otherwise it will be discarded!',
'quick control' => 'Quick Control',