remote.cgi: Fix splitting output from ssh-keygen.

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

diff --git a/html/cgi-bin/wirelessclient.cgi b/html/cgi-bin/wirelessclient.cgi
index b1679c128573dabc33506bc02d4b692ee7dbcb8f..7cd23aed4671bbae4b4ef288a4cb0ea22a764010 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 = ();
@@ -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'}
@@ -768,7 +796,7 @@ END
 }
 
 sub BuildConfiguration() {
-       system("/usr/local/bin/wirelessclient restart");
+       &General::system("/usr/local/bin/wirelessclient", "restart");
 }
 
 sub NextID() {