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.cgi: Use new perl system functions

Browse Source 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2021-06-10 14:45:27 +01:00
parent 661918881f
commit 5b8ecec9e8
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -232,7 +232,7 @@ END
open( FILE, "< $level7file" ) or die "Unable to read $level7file"; open( FILE, "< $level7file" ) or die "Unable to read $level7file";
@l7rules = <FILE>; @l7rules = <FILE>;
close FILE; close FILE;
system("rm $level7file"); &General::system("rm", "$level7file");
foreach $l7ruleentry (sort @l7rules) foreach $l7ruleentry (sort @l7rules)
{ {
@l7ruleline = split( /\;/, $l7ruleentry ); @l7ruleline = split( /\;/, $l7ruleentry );
@@ -244,13 +244,13 @@ END
close FILE; close FILE;
} }
} }
open( FILE, "< $level7file" ) or system("touch $level7file");close FILE; open( FILE, "< $level7file" ) or &General::system("touch", "$level7file");close FILE;
} elsif ($qossettings{'DOLEVEL7'} eq $Lang::tr{'edit'}) } elsif ($qossettings{'DOLEVEL7'} eq $Lang::tr{'edit'})
{ {
open( FILE, "< $level7file" ) or die "Unable to read $level7file"; open( FILE, "< $level7file" ) or die "Unable to read $level7file";
@l7rules = <FILE>; @l7rules = <FILE>;
close FILE; close FILE;
system("rm $level7file"); &General::system("rm", "$level7file");
foreach $l7ruleentry (sort @l7rules) foreach $l7ruleentry (sort @l7rules)
{ {
@l7ruleline = split( /\;/, $l7ruleentry ); @l7ruleline = split( /\;/, $l7ruleentry );
@@ -263,7 +263,7 @@ END
} }
} }
&level7rule; &level7rule;
open( FILE, "< $level7file" ) or system("touch $level7file");close FILE; open( FILE, "< $level7file" ) or &General::system("touch", "$level7file");close FILE;
} }
############################################################################################################################ ############################################################################################################################
@@ -323,7 +323,7 @@ END
open( FILE, "< $portfile" ) or die "Unable to read $portfile"; open( FILE, "< $portfile" ) or die "Unable to read $portfile";
@portrules = <FILE>; @portrules = <FILE>;
close FILE; close FILE;
system("rm $portfile"); &General::system("rm", "$portfile");
foreach $portruleentry (sort @portrules) foreach $portruleentry (sort @portrules)
{ {
@portruleline = split( /\;/, $portruleentry ); @portruleline = split( /\;/, $portruleentry );
@@ -336,7 +336,7 @@ END
} }
} }
&portrule; &portrule;
open( FILE, "< $portfile" ) or system("touch $portfile");close FILE; open( FILE, "< $portfile" ) or &General::system("touch", "$portfile");close FILE;
} }
############################################################################################################################ ############################################################################################################################
@@ -408,25 +408,25 @@ if ($qossettings{'ACTION'} eq $Lang::tr{'start'})
{ {
$qossettings{'ENABLED'} = 'on'; $qossettings{'ENABLED'} = 'on';
&General::writehash("${General::swroot}/qos/settings", \%qossettings); &General::writehash("${General::swroot}/qos/settings", \%qossettings);
system("/usr/local/bin/qosctrl generate >/dev/null 2>&1"); &General::system("/usr/local/bin/qosctrl", "generate");
system("/usr/local/bin/qosctrl start >/dev/null 2>&1"); &General::system("/usr/local/bin/qosctrl", "start");
system("logger -t ipfire 'QoS started'"); &General::system("logger", "-t", "ipfire", "QoS started");
} }
elsif ($qossettings{'ACTION'} eq $Lang::tr{'stop'}) elsif ($qossettings{'ACTION'} eq $Lang::tr{'stop'})
{ {
$qossettings{'ENABLED'} = 'off'; $qossettings{'ENABLED'} = 'off';
&General::writehash("${General::swroot}/qos/settings", \%qossettings); &General::writehash("${General::swroot}/qos/settings", \%qossettings);
system("/usr/local/bin/qosctrl stop >/dev/null 2>&1"); &General::system("/usr/local/bin/qosctrl", "stop");
system("/usr/local/bin/qosctrl generate >/dev/null 2>&1"); &General::system("/usr/local/bin/qosctrl", "generate");
system("logger -t ipfire 'QoS stopped'"); &General::system("logger", "-t", "ipfire", "QoS stopped");
} }
elsif ($qossettings{'ACTION'} eq $Lang::tr{'restart'}) elsif ($qossettings{'ACTION'} eq $Lang::tr{'restart'})
{ {
if ($qossettings{'ENABLED'} eq 'on'){ if ($qossettings{'ENABLED'} eq 'on'){
system("/usr/local/bin/qosctrl stop >/dev/null 2>&1"); &General::system("/usr/local/bin/qosctrl", "stop");
system("/usr/local/bin/qosctrl generate >/dev/null 2>&1"); &General::system("/usr/local/bin/qosctrl", "generate");
system("/usr/local/bin/qosctrl start >/dev/null 2>&1"); &General::system("/usr/local/bin/qosctrl", "start");
system("logger -t ipfire 'QoS restarted'"); &General::system("logger", "-t", "ipfire", "QoS restarted");
} }
} }
elsif ($qossettings{'ACTION'} eq $Lang::tr{'save'}) elsif ($qossettings{'ACTION'} eq $Lang::tr{'save'})
@@ -530,9 +530,9 @@ END
$qossettings{'ACK'} ="101"; $qossettings{'ACK'} ="101";
$qossettings{'ENABLED'} = 'on'; $qossettings{'ENABLED'} = 'on';
&General::writehash("${General::swroot}/qos/settings", \%qossettings); &General::writehash("${General::swroot}/qos/settings", \%qossettings);
system("/usr/local/bin/qosctrl generate >/dev/null 2>&1"); &General::system("/usr/local/bin/qosctrl", "generate");
system("/usr/local/bin/qosctrl start >/dev/null 2>&1"); &General::system("/usr/local/bin/qosctrl", "start");
system("logger -t ipfire 'QoS started'"); &General::system("logger", "-t", "ipfire", "QoS started");
} else { } else {
$message = $Lang::tr{'qos enter bandwidths'}; $message = $Lang::tr{'qos enter bandwidths'};
} }