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

Merge branch 'master' into next

Browse Source
This commit is contained in:
Michael Tremer
2021-02-16 17:37:26 +00:00
parent 9572ae7b1d 9aa6f9a89f
commit 5459c8a4b7
16 changed files with 51 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -180,12 +180,12 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'save'}) {
if (($dhcpsettings{"START_ADDR_${itf}"}) eq '' && ($dhcpsettings{"END_ADDR_${itf}"}) eq '') {
$errormessage = "DHCP on ${itf}: " . $Lang::tr{'dhcp valid range required when deny known clients checked'};
goto ERROR;
}
}
if (!($dhcpsettings{"DEFAULT_LEASE_TIME_${itf}"} =~ /^\d+$/)) {
$errormessage = "DHCP on ${itf}: " . $Lang::tr{'invalid default lease time'} . $dhcpsettings{'DEFAULT_LEASE_TIME_${itf}'};
goto ERROR;
}
}
if (!($dhcpsettings{"MAX_LEASE_TIME_${itf}"} =~ /^\d+$/)) {

30
html/cgi-bin/wirelessclient.cgi
View File

@@ -324,6 +324,8 @@ END
$encryption_mode = $Lang::tr{'wlan client encryption wpa'};
} elsif ($config[3] eq "WPA2") {
$encryption_mode = $Lang::tr{'wlan client encryption wpa2'};
} elsif ($config[3] eq "WPA3") {
$encryption_mode = $Lang::tr{'wlan client encryption wpa3'};
} elsif ($config[3] eq "EAP") {
$encryption_mode = $Lang::tr{'wlan client encryption eap'};
}
@@ -682,6 +684,19 @@ sub ShowStatus() {
</tr>
END
if ($status{'pmf'} eq "1") {
print <<END;
<tr>
<td width='20%'>
$Lang::tr{'wlan client management frame protection'}
</td>
<td width='80%'>
$Lang::tr{'active'}
</td>
</tr>
END
}
if ($status{'EAP state'}) {
my $selected_method = $status{'selectedMethod'};
$selected_method =~ s/\d+ \((.*)\)/$1/e;
@@ -736,12 +751,25 @@ END
}
if (($status{'pairwise_cipher'} ne "NONE") || ($status{'group_cipher'} ne "NONE")) {
print <<END;
if ($status{'key_mgmt'} eq "SAE") {
print <<END;
<tr>
<td colspan='2'>
<strong>$Lang::tr{'wlan client encryption wpa3'}</strong>
</td>
</tr>
END
} else {
print <<END;
<tr>
<td colspan='2'>
<strong>$Lang::tr{'wlan client encryption wpa'}</strong>
</td>
</tr>
END
}
print <<END;
<tr>
<td width='20%'>
$Lang::tr{'wlan client pairwise cipher'}