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