Hardcode theme to ipfire

[ipfire-2.x.git] / html / cgi-bin / wirelessclient.cgi

diff --git a/html/cgi-bin/wirelessclient.cgi b/html/cgi-bin/wirelessclient.cgi
index 607ef71053b5aba335a024f8ee6c26b1b1628e15..a7a9881b84c8214cbae6b418dcc7078c3e1e8c27 100644 (file)
--- a/html/cgi-bin/wirelessclient.cgi
+++ b/html/cgi-bin/wirelessclient.cgi
@@ -43,7 +43,7 @@ our $datafile = "${General::swroot}/ethernet/wireless";
 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 = ();
@@ -604,11 +604,11 @@ sub showEditBox() {
                                        </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>
@@ -684,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;
@@ -738,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'}