This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via e786363dc0425b5746d6a1a94f6b280f95b303b8 (commit)
via c027d3a410d70c687e409ae3d2f5e2b30e16e370 (commit)
via 9f30d83f50767d019870031edb1dbc101da61043 (commit)
via 65ec7b9d8363838ef4a9d31adb83d1ebae35fbc5 (commit)
via 67597f26439c6cb4ae4e3619d8bd67df0dae4c3d (commit)
via dc2d68858d901f812d605ed64b35a3aff857c1b3 (commit)
via 58a5aaeec9d89efd3197294999d8b4d5d86ec20b (commit)
via 3c5b63840070823b4c6dcabc985151dafd210914 (commit)
from fc4ba90b438851e54d5a5089ee55f58501ace5d5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e786363dc0425b5746d6a1a94f6b280f95b303b8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Sep 20 12:40:19 2024 +0000
core190: Ship changed network-functions.pl & index.cgi
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c027d3a410d70c687e409ae3d2f5e2b30e16e370
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Sep 20 14:12:07 2024 +0200
wlanap.cgi: Fix copying configuration
This allows to uncheck checkboxes again.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 9f30d83f50767d019870031edb1dbc101da61043
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Sep 20 13:55:40 2024 +0200
wlanap.cgi: Change broadcast SSID to hide SSID
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 65ec7b9d8363838ef4a9d31adb83d1ebae35fbc5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Sep 20 13:42:05 2024 +0200
index.cgi: Update wireless functions to use iw instead of iwconfig
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 67597f26439c6cb4ae4e3619d8bd67df0dae4c3d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Sep 20 13:19:10 2024 +0200
wlanap.cgi: Default to channel 0 for ACS
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit dc2d68858d901f812d605ed64b35a3aff857c1b3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Sep 20 13:17:59 2024 +0200
wlanap.cgi: Enable Neighbourhood Scan by default
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 58a5aaeec9d89efd3197294999d8b4d5d86ec20b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Sep 20 13:16:44 2024 +0200
wlanap.cgi: Don't try to show status if there is no interface
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 3c5b63840070823b4c6dcabc985151dafd210914
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Sep 20 13:13:41 2024 +0200
wlanap.cgi: Correctly show broadcast SSID status
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/cfgroot/network-functions.pl | 26 +++--------
config/rootfiles/core/190/filelists/files | 2 +
doc/language_issues.en | 2 +-
doc/language_issues.es | 2 +
doc/language_issues.fr | 2 +
doc/language_issues.it | 2 +-
doc/language_issues.nl | 2 +-
doc/language_issues.pl | 2 +-
doc/language_issues.ru | 2 +-
doc/language_issues.tr | 2 +-
doc/language_missings | 12 +++---
html/cgi-bin/index.cgi | 3 +-
html/cgi-bin/wlanap.cgi | 71 +++++++++++++++++++++----------
langs/de/cgi-bin/de.pl | 2 +-
langs/en/cgi-bin/en.pl | 2 +-
15 files changed, 77 insertions(+), 57 deletions(-)
create mode 100644 config/rootfiles/core/190/filelists/files
Difference in files:
diff --git a/config/cfgroot/network-functions.pl b/config/cfgroot/network-functions.pl
index 5b35114aa..37eaf69cc 100644
--- a/config/cfgroot/network-functions.pl
+++ b/config/cfgroot/network-functions.pl
@@ -438,7 +438,7 @@ sub _get_wireless_status($) {
my $intf = shift;
if (!$wireless_status{$intf}) {
- $wireless_status{$intf} = join('\n', &General::system_output("iwconfig", "$intf"));
+ $wireless_status{$intf} = join(/\n/, &General::system_output("iw", "dev", "$intf", "link"));
}
return $wireless_status{$intf};
@@ -447,7 +447,7 @@ sub _get_wireless_status($) {
sub wifi_get_essid($) {
my $status = &_get_wireless_status(shift);
- my ($essid) = $status =~ /ESSID:\"(.*)\"/;
+ my ($essid) = $status =~ /^\s+SSID: (.*)$/m;
return $essid;
}
@@ -455,15 +455,15 @@ sub wifi_get_essid($) {
sub wifi_get_frequency($) {
my $status = &_get_wireless_status(shift);
- my ($frequency) = $status =~ /Frequency:(\d+\.\d+ GHz)/;
+ my ($frequency) = $status =~ /^\s+freq: (\d+\.\d+)/m;
- return $frequency;
+ return $frequency / 1000 . " GHz";
}
sub wifi_get_access_point($) {
my $status = &_get_wireless_status(shift);
- my ($access_point) = $status =~ /Access Point: ([0-9A-F:]+)/;
+ my ($access_point) = $status =~ /^Connected to ([0-9a-f:]+)/;
return $access_point;
}
@@ -471,27 +471,15 @@ sub wifi_get_access_point($) {
sub wifi_get_bit_rate($) {
my $status = &_get_wireless_status(shift);
- my ($bit_rate) = $status =~ /Bit Rate=(\d+ [GM]b\/s)/;
+ my ($bit_rate) = $status =~ /^\s+rx bitrate: (\d+(?:\.\d+) MBit\/s)/m;
return $bit_rate;
}
-sub wifi_get_link_quality($) {
- my $status = &_get_wireless_status(shift);
-
- my ($cur, $max) = $status =~ /Link Quality=(\d+)\/(\d+)/;
-
- if($max > 0) {
- return sprintf('%.0f', ($cur * 100) / $max);
- }
-
- return 0;
-}
-
sub wifi_get_signal_level($) {
my $status = &_get_wireless_status(shift);
- my ($signal_level) = $status =~ /Signal level=(\-\d+ dBm)/;
+ my ($signal_level) = $status =~ /^\s+signal: (\-\d+ dBm)/m;
return $signal_level;
}
diff --git a/config/rootfiles/core/190/filelists/files b/config/rootfiles/core/190/filelists/files
new file mode 100644
index 000000000..1ef1b85d8
--- /dev/null
+++ b/config/rootfiles/core/190/filelists/files
@@ -0,0 +1,2 @@
+srv/web/ipfire/cgi-bin/index.cgi
+var/ipfire/network-functions.pl
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 3aa4e9bd8..f7b5e2f91 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -2345,13 +2345,13 @@ WARNING: untranslated string: wlanap 802.11w disabled = Disabled
WARNING: untranslated string: wlanap 802.11w enforced = Enforced
WARNING: untranslated string: wlanap 802.11w optional = Optional
WARNING: untranslated string: wlanap auto = Automatic Channel Selection
-WARNING: untranslated string: wlanap broadcast ssid = Broadcast SSID
WARNING: untranslated string: wlanap channel = Channel
WARNING: untranslated string: wlanap client isolation = Client Isolation
WARNING: untranslated string: wlanap clients = unknown string
WARNING: untranslated string: wlanap configuration = Wireless Access Point Configuration
WARNING: untranslated string: wlanap country = Country Code
WARNING: untranslated string: wlanap encryption = Encryption
+WARNING: untranslated string: wlanap hide ssid = Hide SSID
WARNING: untranslated string: wlanap interface = Select Interface
WARNING: untranslated string: wlanap invalid wpa = Invalid length in WPA passphrase. Must be between 8 and 63 characters.
WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w)
diff --git a/doc/language_issues.es b/doc/language_issues.es
index fbbcd1e74..e58cb377f 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -939,6 +939,7 @@ WARNING: translation string unused: wins server
WARNING: translation string unused: wins support
WARNING: translation string unused: wlan clients
WARNING: translation string unused: wlanap access point
+WARNING: translation string unused: wlanap broadcast ssid
WARNING: translation string unused: wlanap debugging
WARNING: translation string unused: wlanap del interface
WARNING: translation string unused: wlanap informations
@@ -1189,5 +1190,6 @@ WARNING: untranslated string: wireguard = WireGuard
WARNING: untranslated string: wlan client configuration = Wireless Client Configuration
WARNING: untranslated string: wlanap = Wireless Access Point
WARNING: untranslated string: wlanap clients = unknown string
+WARNING: untranslated string: wlanap hide ssid = Hide SSID
WARNING: untranslated string: wlanap psk = Pre-Shared Key
WARNING: untranslated string: wlanap wireless mode = Wireless Mode
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 25193da6a..8569e9ae9 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -908,6 +908,7 @@ WARNING: translation string unused: wildcards
WARNING: translation string unused: wins server
WARNING: translation string unused: wins support
WARNING: translation string unused: wlan clients
+WARNING: translation string unused: wlanap broadcast ssid
WARNING: translation string unused: wlanap debugging
WARNING: translation string unused: wlanap del interface
WARNING: translation string unused: wlanap informations
@@ -1125,5 +1126,6 @@ WARNING: untranslated string: wio_webinterface = unknown string
WARNING: untranslated string: wio_webinterface_link = unknown string
WARNING: untranslated string: wireguard = WireGuard
WARNING: untranslated string: wlanap clients = unknown string
+WARNING: untranslated string: wlanap hide ssid = Hide SSID
WARNING: untranslated string: wlanap psk = Pre-Shared Key
WARNING: untranslated string: wlanap wireless mode = Wireless Mode
diff --git a/doc/language_issues.it b/doc/language_issues.it
index f00d959d5..a3bd6284d 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -1498,10 +1498,10 @@ WARNING: untranslated string: wlanap 802.11w disabled = Disabled
WARNING: untranslated string: wlanap 802.11w enforced = Enforced
WARNING: untranslated string: wlanap 802.11w optional = Optional
WARNING: untranslated string: wlanap auto = Automatic Channel Selection
-WARNING: untranslated string: wlanap broadcast ssid = Broadcast SSID
WARNING: untranslated string: wlanap client isolation = Client Isolation
WARNING: untranslated string: wlanap clients = unknown string
WARNING: untranslated string: wlanap configuration = Wireless Access Point Configuration
+WARNING: untranslated string: wlanap hide ssid = Hide SSID
WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w)
WARNING: untranslated string: wlanap neighbor scan = Neighborhood Scan
WARNING: untranslated string: wlanap neighbor scan warning = Warning: Disabling may violate regulatory rules
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 9607f98af..8e5e64071 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -1521,10 +1521,10 @@ WARNING: untranslated string: wlanap 802.11w disabled = Disabled
WARNING: untranslated string: wlanap 802.11w enforced = Enforced
WARNING: untranslated string: wlanap 802.11w optional = Optional
WARNING: untranslated string: wlanap auto = Automatic Channel Selection
-WARNING: untranslated string: wlanap broadcast ssid = Broadcast SSID
WARNING: untranslated string: wlanap client isolation = Client Isolation
WARNING: untranslated string: wlanap clients = unknown string
WARNING: untranslated string: wlanap configuration = Wireless Access Point Configuration
+WARNING: untranslated string: wlanap hide ssid = Hide SSID
WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w)
WARNING: untranslated string: wlanap neighbor scan = Neighborhood Scan
WARNING: untranslated string: wlanap neighbor scan warning = Warning: Disabling may violate regulatory rules
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 92ad3b7be..061fbfbfa 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1791,11 +1791,11 @@ WARNING: untranslated string: wlanap 802.11w disabled = Disabled
WARNING: untranslated string: wlanap 802.11w enforced = Enforced
WARNING: untranslated string: wlanap 802.11w optional = Optional
WARNING: untranslated string: wlanap auto = Automatic Channel Selection
-WARNING: untranslated string: wlanap broadcast ssid = Broadcast SSID
WARNING: untranslated string: wlanap client isolation = Client Isolation
WARNING: untranslated string: wlanap clients = unknown string
WARNING: untranslated string: wlanap configuration = Wireless Access Point Configuration
WARNING: untranslated string: wlanap country = Country Code
+WARNING: untranslated string: wlanap hide ssid = Hide SSID
WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w)
WARNING: untranslated string: wlanap neighbor scan = Neighborhood Scan
WARNING: untranslated string: wlanap neighbor scan warning = Warning: Disabling may violate regulatory rules
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 35a590b6b..c6ef682f1 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1784,11 +1784,11 @@ WARNING: untranslated string: wlanap 802.11w disabled = Disabled
WARNING: untranslated string: wlanap 802.11w enforced = Enforced
WARNING: untranslated string: wlanap 802.11w optional = Optional
WARNING: untranslated string: wlanap auto = Automatic Channel Selection
-WARNING: untranslated string: wlanap broadcast ssid = Broadcast SSID
WARNING: untranslated string: wlanap client isolation = Client Isolation
WARNING: untranslated string: wlanap clients = unknown string
WARNING: untranslated string: wlanap configuration = Wireless Access Point Configuration
WARNING: untranslated string: wlanap country = Country Code
+WARNING: untranslated string: wlanap hide ssid = Hide SSID
WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w)
WARNING: untranslated string: wlanap neighbor scan = Neighborhood Scan
WARNING: untranslated string: wlanap neighbor scan warning = Warning: Disabling may violate regulatory rules
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 3bf595efe..5fae1e0bd 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -1366,9 +1366,9 @@ WARNING: untranslated string: wlanap 802.11w disabled = Disabled
WARNING: untranslated string: wlanap 802.11w enforced = Enforced
WARNING: untranslated string: wlanap 802.11w optional = Optional
WARNING: untranslated string: wlanap auto = Automatic Channel Selection
-WARNING: untranslated string: wlanap broadcast ssid = Broadcast SSID
WARNING: untranslated string: wlanap client isolation = Client Isolation
WARNING: untranslated string: wlanap clients = unknown string
+WARNING: untranslated string: wlanap hide ssid = Hide SSID
WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w)
WARNING: untranslated string: wlanap neighbor scan = Neighborhood Scan
WARNING: untranslated string: wlanap neighbor scan warning = Warning: Disabling may violate regulatory rules
diff --git a/doc/language_missings b/doc/language_missings
index 98856b0e8..f3d945c5b 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -158,6 +158,7 @@
< warning
< wireguard
< wlanap
+< wlanap hide ssid
< wlanap psk
< wlanap wireless mode
< wlanap wlan clients
@@ -186,6 +187,7 @@
< upload fcdsl.o
< warning
< wireguard
+< wlanap hide ssid
< wlanap psk
< wlanap wireless mode
< wlanap wlan clients
@@ -677,9 +679,9 @@
< wlanap 802.11w enforced
< wlanap 802.11w optional
< wlanap auto
-< wlanap broadcast ssid
< wlanap client isolation
< wlanap configuration
+< wlanap hide ssid
< wlanap management frame protection
< wlanap neighbor scan
< wlanap neighbor scan warning
@@ -1238,9 +1240,9 @@
< wlanap 802.11w enforced
< wlanap 802.11w optional
< wlanap auto
-< wlanap broadcast ssid
< wlanap client isolation
< wlanap configuration
+< wlanap hide ssid
< wlanap management frame protection
< wlanap neighbor scan
< wlanap neighbor scan warning
@@ -2214,10 +2216,10 @@
< wlanap 802.11w enforced
< wlanap 802.11w optional
< wlanap auto
-< wlanap broadcast ssid
< wlanap client isolation
< wlanap configuration
< wlanap country
+< wlanap hide ssid
< wlanap management frame protection
< wlanap neighbor scan
< wlanap neighbor scan warning
@@ -3227,10 +3229,10 @@
< wlanap 802.11w enforced
< wlanap 802.11w optional
< wlanap auto
-< wlanap broadcast ssid
< wlanap client isolation
< wlanap configuration
< wlanap country
+< wlanap hide ssid
< wlanap management frame protection
< wlanap neighbor scan
< wlanap neighbor scan warning
@@ -3615,8 +3617,8 @@
< wlanap 802.11w enforced
< wlanap 802.11w optional
< wlanap auto
-< wlanap broadcast ssid
< wlanap client isolation
+< wlanap hide ssid
< wlanap management frame protection
< wlanap neighbor scan
< wlanap neighbor scan warning
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index a3b1589aa..d9c74ce7f 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -199,7 +199,6 @@ END
my $frequency = &Network::wifi_get_frequency($iface);
my $access_point = &Network::wifi_get_access_point($iface);
my $bit_rate = &Network::wifi_get_bit_rate($iface);
- my $link_quality = &Network::wifi_get_link_quality($iface);
my $signal_level = &Network::wifi_get_signal_level($iface);
print <<END;
@@ -224,7 +223,7 @@ END
$bit_rate
</td>
<td style="text-align: center">
- $link_quality% @ $signal_level
+ $signal_level
</td>
</tr>
END
diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index 54ee41ccc..2691496ab 100644
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -34,6 +34,9 @@ my %selected=();
my %checked=();
my %wlanapsettings=();
+# Read the configuration file
+&General::readhash("/var/ipfire/wlanap/settings", \%wlanapsettings);
+
# Set defaults
&General::set_defaults(\%wlanapsettings, {
"APMODE" => "on",
@@ -41,22 +44,24 @@ my %wlanapsettings=();
"HIDESSID" => "off",
"ENC" => "wpa2",
"TXPOWER" => "auto",
- "CHANNEL" => "6",
+ "CHANNEL" => "0",
"COUNTRY" => "00",
"HW_MODE" => "g",
"PWD" => "",
"HTCAPS" => "",
"VHTCAPS" => "",
- "NOSCAN" => "off",
+ "NOSCAN" => "on",
"CLIENTISOLATION" => "off",
"IEEE80211W" => "off",
});
-&General::readhash("/var/ipfire/wlanap/settings", \%wlanapsettings);
-&Header::getcgihash(\%wlanapsettings);
+my %cgiparams = ();
+
+# Fetch arguments from browser
+&Header::getcgihash(\%cgiparams);
# Find the selected interface
-my $INTF = &Network::get_intf_by_address($wlanapsettings{'INTERFACE'});
+my $INTF = &Network::get_intf_by_address($cgiparams{'INTERFACE'});
delete $wlanapsettings{'__CGI__'};
delete $wlanapsettings{'x'};
@@ -64,20 +69,36 @@ delete $wlanapsettings{'y'};
&Header::showhttpheaders();
-if ($wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}") {
+if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") {
# verify WPA Passphrase - only with enabled enc
- if ($wlanapsettings{'ENC'} ne "none") {
+ if ($cgiparams{'ENC'} ne "none") {
# must be 8 .. 63 characters
- if ((length($wlanapsettings{'PWD'}) < 8) || (length($wlanapsettings{'PWD'}) > 63)) {
+ if ((length($cgiparams{'PWD'}) < 8) || (length($cgiparams{'PWD'}) > 63)) {
$errormessage .= "$Lang::tr{'wlanap invalid wpa'}<br />";
}
# only ASCII alowed
- if (!($wlanapsettings{'PWD'} !~ /[^\x00-\x7f]/)) {
+ if (!($cgiparams{'PWD'} !~ /[^\x00-\x7f]/)) {
$errormessage .= "$Lang::tr{'wlanap invalid wpa'}<br />";
}
}
+ # XXX This needs validation
+ $wlanapsettings{'INTERFACE'} = $cgiparams{'INTERFACE'};
+ $wlanapsettings{'SSID'} = $cgiparams{'SSID'};
+ $wlanapsettings{'HIDESSID'} = ($cgiparams{'HIDESSID'} eq 'on') ? 'on' : 'off';
+ $wlanapsettings{'CLIENTISOLATION'} = ($cgiparams{'CLIENTISOLATION'} eq 'on') ? 'on' : 'off';
+ $wlanapsettings{'COUNTRY'} = $cgiparams{'COUNTRY'};
+ $wlanapsettings{'HW_MODE'} = $cgiparams{'HW_MODE'};
+ $wlanapsettings{'CHANNEL'} = $cgiparams{'CHANNEL'};
+ $wlanapsettings{'NOSCAN'} = ($cgiparams{'NOSCAN'} eq 'on') ? 'on' : 'off';
+ $wlanapsettings{'ENC'} = $cgiparams{'ENC'};
+ $wlanapsettings{'PWD'} = $cgiparams{'PWD'};
+ $wlanapsettings{'IEEE80211W'} = ($cgiparams{'IEEE80211W'} eq 'on') ? 'on' : 'off';
+ $wlanapsettings{'HTCAPS'} = $cgiparams{'HTCAPS'};
+ $wlanapsettings{'VHTCAPS'} = $cgiparams{'VHTCAPS'};
+ $wlanapsettings{'TX_POWER'} = $cgiparams{'TX_POWER'};
+
if ($errormessage eq '') {
&General::writehash("/var/ipfire/wlanap/settings", \%wlanapsettings);
&WriteConfig_hostapd();
@@ -211,7 +232,7 @@ print <<END;
</tr>
<tr>
- <td>$Lang::tr{'wlanap broadcast ssid'}</td>
+ <td>$Lang::tr{'wlanap hide ssid'}</td>
<td>
<input type='checkbox' name='HIDESSID' $checked{'HIDESSID'}{'on'}>
</td>
@@ -354,29 +375,33 @@ END
&Header::closebox();
-&Header::opensection();
+if ($INTF) {
-my @status = `iw dev $INTF info`;
+ &Header::opensection();
-if (@status) {
- print <<END;
- <h6>$Lang::tr{'wlanap wlan status'}</h6>
+ my @status = `iw dev $INTF info`;
- <pre>@status</pre>
+ if (@status) {
+ print <<END;
+ <h6>$Lang::tr{'wlanap wlan status'}</h6>
+
+ <pre>@status</pre>
END
-}
+ }
-my @status = `iw dev $INTF station dump`;
+ @status = `iw dev $INTF station dump`;
-if (@status) {
- print <<END;
- <h6>$Lang::tr{'wlanap clients'}</h6>
+ if (@status) {
+ print <<END;
+ <h6>$Lang::tr{'wlanap clients'}</h6>
- <pre>@status</pre>
+ <pre>@status</pre>
END
+ }
+
+ &Header::closesection();
}
-&Header::closesection();
&Header::closebigbox();
&Header::closepage();
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index a718228bc..e50930c0e 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -2991,7 +2991,6 @@
'wlan clients' => 'WLAN-Clients',
'wlanap' => 'Access Point',
'wlanap auto' => 'Automatic Channel Selection',
-'wlanap broadcast ssid' => 'SSID übertragen',
'wlanap channel' => 'Kanal',
'wlanap client isolation' => 'Client-Isolierung',
'wlanap configuration' => 'Access Point Konfiguration',
@@ -2999,6 +2998,7 @@
'wlanap debugging' => 'Debugging',
'wlanap del interface' => 'Ausgewähltes Interface zurücksetzen?',
'wlanap encryption' => 'Verschlüsselung',
+'wlanap hide ssid' => 'SSID verbergen',
'wlanap informations' => 'Informationen',
'wlanap interface' => 'Interface übernehmen',
'wlanap invalid wpa' => 'Ungültige Länge in WPA-Passphrase. Muss zwischen 8 und 63 Zeichen lang sein.',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index dca9f1645..581e33a71 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -3082,7 +3082,6 @@
'wlanap 802.11w enforced' => 'Enforced',
'wlanap 802.11w optional' => 'Optional',
'wlanap auto' => 'Automatic Channel Selection',
-'wlanap broadcast ssid' => 'Broadcast SSID',
'wlanap channel' => 'Channel',
'wlanap client isolation' => 'Client Isolation',
'wlanap configuration' => 'Wireless Access Point Configuration',
@@ -3090,6 +3089,7 @@
'wlanap debugging' => 'Debugging',
'wlanap del interface' => 'Remove selected interface?',
'wlanap encryption' => 'Encryption',
+'wlanap hide ssid' => 'Hide SSID',
'wlanap informations' => 'Information',
'wlanap interface' => 'Select Interface',
'wlanap invalid wpa' => 'Invalid length in WPA passphrase. Must be between 8 and 63 characters.',
hooks/post-receive
--
IPFire 2.x development tree
