my %color = ();
my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
-&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color);
our %settings = ();
our %netsettings = ();
$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'};
}
my %selected = ();
$selected{'ENCRYPTION'} = ();
$selected{'ENCRYPTION'}{'NONE'} = '';
+ $selected{'ENCRYPTION'}{'WPA3'} = '';
$selected{'ENCRYPTION'}{'WPA2'} = '';
$selected{'ENCRYPTION'}{'WPA'} = '';
$selected{'ENCRYPTION'}{'WEP'} = '';
<select name='ENCRYPTION'>
<option value="NONE" $selected{'ENCRYPTION'}{'NONE'}>$Lang::tr{'wlan client encryption none'}</option>
<option value="EAP" $selected{'ENCRYPTION'}{'EAP'}>$Lang::tr{'wlan client encryption eap'}</option>
+ <option value="WPA3" $selected{'ENCRYPTION'}{'WPA3'}>$Lang::tr{'wlan client encryption wpa3'}</option>
<option value="WPA2" $selected{'ENCRYPTION'}{'WPA2'}>$Lang::tr{'wlan client encryption wpa2'}</option>
<option value="WPA" $selected{'ENCRYPTION'}{'WPA'}>$Lang::tr{'wlan client encryption wpa'}</option>
- <option value="WEP" $selected{'ENCRYPTION'}{'WEP'}>$Lang::tr{'wlan client encryption wep'}</option>
+ <option value="WEP" $selected{'ENCRYPTION'}{'WEP'}>$Lang::tr{'wlan client encryption wep'}</option>
</select>
</td>
<td colspan="2" width='40%'></td>
</td>
<td width='40%'>
<select name='PRIO'>
- <option value="0" $selected{'PRIO'}{'0'}>0 ($Lang::tr{'most preferred'})</option>
+ <option value="0" $selected{'PRIO'}{'0'}>0 ($Lang::tr{'least preferred'})</option>
<option value="1" $selected{'PRIO'}{'1'}>1</option>
<option value="2" $selected{'PRIO'}{'2'}>2</option>
<option value="3" $selected{'PRIO'}{'3'}>3</option>
- <option value="4" $selected{'PRIO'}{'4'}>4 ($Lang::tr{'least preferred'})</option>
+ <option value="4" $selected{'PRIO'}{'4'}>4 ($Lang::tr{'most preferred'})</option>
</select>
</td>
<td colspan="2" width='40%'></td>
</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;
}
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'}
}
sub BuildConfiguration() {
- system("/usr/local/bin/wirelessclient restart");
+ &General::system("/usr/local/bin/wirelessclient", "restart");
}
sub NextID() {
# Check for invalid key length.
} elsif (ValidKeyLength($settings{'ENCRYPTION'}, $settings{'PSK'})) {
return "$Lang::tr{'wlan client invalid key length'}";
-
}
# Reset WPA mode, if WPA(2) is not selected.