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

dhcp.cgi: Use perl built-in grep

Browse Source 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
This commit is contained in:
Stefan Schantl
2021-05-17 22:25:44 +02:00
committed by Michael Tremer
parent d39c7076ac
commit 2bbf176619
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,6 +130,15 @@ open(FILE, "$filename2") or die 'Unable to open fixed leases file.';
our @current2 = <FILE>; our @current2 = <FILE>;
close(FILE); close(FILE);
# Open and read-in file which contains the list of allowed advanced options.
open(FILE, $filename3) or die "Could not open $filename3. $!\n"
# Grab file content.
my @advoptions_list = <FILE>;
# Close file handle.
close(FILE);
# Check Settings1 first because they are needed by &buildconf # Check Settings1 first because they are needed by &buildconf
if ($dhcpsettings{'ACTION'} eq $Lang::tr{'save'}) { if ($dhcpsettings{'ACTION'} eq $Lang::tr{'save'}) {
foreach my $itf (@ITFs) { foreach my $itf (@ITFs) {
@@ -338,7 +347,7 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'add'}.'1' &&
map ($dhcpsettings{"ADVOPT_SCOPE_$_"} = 'off', @ITFs); # force global map ($dhcpsettings{"ADVOPT_SCOPE_$_"} = 'off', @ITFs); # force global
} elsif (ValidNewOption ($dhcpsettings{'ADVOPT_NAME'} . ' ' . $dhcpsettings{'ADVOPT_DATA'})) { } elsif (ValidNewOption ($dhcpsettings{'ADVOPT_NAME'} . ' ' . $dhcpsettings{'ADVOPT_DATA'})) {
#was a new option #was a new option
} elsif (! `grep "\$option $dhcpsettings{'ADVOPT_NAME'} " $filename3`) { } elsif (! grep(/option $dhcpsettings{'ADVOPT_NAME'}/, @advoptions_list)) {
$errormessage=$Lang::tr{'dhcp advopt unknown'}.': '.$dhcpsettings{'ADVOPT_NAME'}; $errormessage=$Lang::tr{'dhcp advopt unknown'}.': '.$dhcpsettings{'ADVOPT_NAME'};
} }
@@ -714,7 +723,11 @@ if ($dhcpsettings{'KEY1'} ne '') {
} }
#search if the 'option' is in the list and print the syntax model #search if the 'option' is in the list and print the syntax model
my $opt = `grep "\$option $dhcpsettings{'ADVOPT_NAME'} " $filename3`; my @opt = grep(/option $dhcpsettings{'ADVOPT_NAME'}/, @advoptions_list);
# Assign array element to variable and remove newlines.
my $opt = chomp(@opt[0]);
if ($opt ne '') { if ($opt ne '') {
$opt =~ s/option $dhcpsettings{'ADVOPT_NAME'}/Syntax:/; # "option xyz abc" => "syntax: abc" $opt =~ s/option $dhcpsettings{'ADVOPT_NAME'}/Syntax:/; # "option xyz abc" => "syntax: abc"
$opt =~ s/;//; $opt =~ s/;//;