From: Michael Tremer Date: Fri, 16 Aug 2024 15:10:29 +0000 (+0000) Subject: wlanap.cgi: Refactor the entire thing X-Git-Tag: v2.29-core188~10^2~43 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b1225603f639b995a3f5ba6f6760579ca5121d3;p=ipfire-2.x.git wlanap.cgi: Refactor the entire thing This went really bad with the latest CSS changes. So this is a refactor/rewrite of the CGI without many modifications. Signed-off-by: Michael Tremer --- diff --git a/config/menu/EX-wlanap.menu b/config/menu/EX-wlanap.menu index 95b6530528..2e06d8586a 100644 --- a/config/menu/EX-wlanap.menu +++ b/config/menu/EX-wlanap.menu @@ -1,5 +1,5 @@ - $subipfire->{'54.wlanap'} = {'caption' => WLanAP, + $subipfire->{'54.wlanap'} = {'caption' => $Lang::tr{'wlanap'}, 'uri' => '/cgi-bin/wlanap.cgi', - 'title' => WLanAP, + 'title' => $Lang::tr{'wlanap'}, 'enabled' => 1, }; diff --git a/doc/language_issues.de b/doc/language_issues.de index a10102a031..bdedb13c57 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -480,6 +480,7 @@ WARNING: translation string unused: ls_pam_unix WARNING: translation string unused: ls_sshd WARNING: translation string unused: ls_syslogd WARNING: translation string unused: mac address error not 00 +WARNING: translation string unused: mac filter WARNING: translation string unused: mailmethod WARNING: translation string unused: mailprogramm WARNING: translation string unused: manage ovpn @@ -866,9 +867,19 @@ 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 debugging +WARNING: translation string unused: wlanap del interface +WARNING: translation string unused: wlanap informations WARNING: translation string unused: wlanap link dhcp WARNING: translation string unused: wlanap link wireless +WARNING: translation string unused: wlanap no interface +WARNING: translation string unused: wlanap notifications +WARNING: translation string unused: wlanap select interface +WARNING: translation string unused: wlanap verbose +WARNING: translation string unused: wlanap warnings +WARNING: translation string unused: wlanap wlan card WARNING: translation string unused: wlanap wlan services +WARNING: translation string unused: wlanap wlan settings WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph @@ -1120,3 +1131,6 @@ WARNING: untranslated string: wlan client management frame protection = Manageme 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 clients = unknown string +WARNING: untranslated string: wlanap psk = Pre-Shared Key +WARNING: untranslated string: wlanap wireless mode = Wireless Mode diff --git a/doc/language_issues.en b/doc/language_issues.en index 7ae1a19bbd..e196bd6400 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -1267,7 +1267,6 @@ WARNING: untranslated string: mac address saved = Successfully saved! WARNING: untranslated string: mac address saved txt = The MAC address has been successfully saved, but changes will only take effect after reboot or reconnection. WARNING: untranslated string: mac address title = Assign MAC Address WARNING: untranslated string: mac desc = Here you are able to change the MAC address on red0. The address must be entered in hexadecimal (0-9,a-f), a valid entry is
e.g. 00-01-02-0e-b8-d6 or 00:01:02:0e:b8:d6. -WARNING: untranslated string: mac filter = MAC filter WARNING: untranslated string: mac new = new MAC address: WARNING: untranslated string: mac1 new = new MAC address 1 (vdsl-inet): WARNING: untranslated string: mac2 new = new MAC address 2 (vdsl-iptv): @@ -2342,7 +2341,7 @@ WARNING: untranslated string: wlan client wpa mode all = Auto WARNING: untranslated string: wlan client wpa mode ccmp ccmp = CCMP-CCMP WARNING: untranslated string: wlan client wpa mode ccmp tkip = CCMP-TKIP WARNING: untranslated string: wlan client wpa mode tkip tkip = TKIP-TKIP -WARNING: untranslated string: wlanap = Access Point +WARNING: untranslated string: wlanap = Wireless Access Point WARNING: untranslated string: wlanap 802.11w disabled = Disabled WARNING: untranslated string: wlanap 802.11w enforced = Enforced WARNING: untranslated string: wlanap 802.11w optional = Optional @@ -2350,27 +2349,20 @@ 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 configuration = Access Point Configuration +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 debugging = Debugging -WARNING: untranslated string: wlanap del interface = Remove selected interface? WARNING: untranslated string: wlanap encryption = Encryption -WARNING: untranslated string: wlanap informations = Informations -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 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) -WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan -WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules! -WARNING: untranslated string: wlanap no interface = Selected interface is not a wirless lan card! +WARNING: untranslated string: wlanap neighbor scan = Neighborhood Scan +WARNING: untranslated string: wlanap neighbor scan warning = Warning: Disabling may violate regulatory rules WARNING: untranslated string: wlanap none = none -WARNING: untranslated string: wlanap notifications = Notifications -WARNING: untranslated string: wlanap select interface = Please select the wireless lan interface. +WARNING: untranslated string: wlanap psk = Pre-Shared Key WARNING: untranslated string: wlanap ssid = SSID -WARNING: untranslated string: wlanap verbose = Verbose -WARNING: untranslated string: wlanap warnings = Warnings -WARNING: untranslated string: wlanap wlan card = WLan Card -WARNING: untranslated string: wlanap wlan settings = WLan Settings -WARNING: untranslated string: wlanap wlan status = WLan Status +WARNING: untranslated string: wlanap wireless mode = Wireless Mode +WARNING: untranslated string: wlanap wlan status = WiFi Status WARNING: untranslated string: wol wakeup = WakeUp WARNING: untranslated string: workgroup = Workgroup WARNING: untranslated string: working = Working diff --git a/doc/language_issues.es b/doc/language_issues.es index 259c3a9c3e..4ff53b1559 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -528,6 +528,7 @@ WARNING: translation string unused: ls_pam_unix WARNING: translation string unused: ls_sshd WARNING: translation string unused: ls_syslogd WARNING: translation string unused: mac address error not 00 +WARNING: translation string unused: mac filter WARNING: translation string unused: mailmethod WARNING: translation string unused: mailprogramm WARNING: translation string unused: manage ovpn @@ -937,9 +938,19 @@ 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 debugging +WARNING: translation string unused: wlanap del interface +WARNING: translation string unused: wlanap informations WARNING: translation string unused: wlanap link dhcp WARNING: translation string unused: wlanap link wireless +WARNING: translation string unused: wlanap no interface +WARNING: translation string unused: wlanap notifications +WARNING: translation string unused: wlanap select interface +WARNING: translation string unused: wlanap verbose +WARNING: translation string unused: wlanap warnings +WARNING: translation string unused: wlanap wlan card WARNING: translation string unused: wlanap wlan services +WARNING: translation string unused: wlanap wlan settings WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph @@ -1175,4 +1186,7 @@ WARNING: untranslated string: wio_webinterface = unknown string WARNING: untranslated string: wio_webinterface_link = unknown string WARNING: untranslated string: wireguard = WireGuard WARNING: untranslated string: wlan client configuration = Wireless Client Configuration -WARNING: untranslated string: wlanap = Access Point +WARNING: untranslated string: wlanap = Wireless Access Point +WARNING: untranslated string: wlanap clients = unknown string +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 41e39f18b5..c21cb00679 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -508,6 +508,7 @@ WARNING: translation string unused: ls_pam_unix WARNING: translation string unused: ls_sshd WARNING: translation string unused: ls_syslogd WARNING: translation string unused: mac address error not 00 +WARNING: translation string unused: mac filter WARNING: translation string unused: mailmethod WARNING: translation string unused: mailprogramm WARNING: translation string unused: manage ovpn @@ -906,9 +907,19 @@ 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 debugging +WARNING: translation string unused: wlanap del interface +WARNING: translation string unused: wlanap informations WARNING: translation string unused: wlanap link dhcp WARNING: translation string unused: wlanap link wireless +WARNING: translation string unused: wlanap no interface +WARNING: translation string unused: wlanap notifications +WARNING: translation string unused: wlanap select interface +WARNING: translation string unused: wlanap verbose +WARNING: translation string unused: wlanap warnings +WARNING: translation string unused: wlanap wlan card WARNING: translation string unused: wlanap wlan services +WARNING: translation string unused: wlanap wlan settings WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph @@ -1112,3 +1123,6 @@ WARNING: untranslated string: wio_wanname = unknown string 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 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 f900bced12..9974b34f31 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -465,6 +465,7 @@ WARNING: translation string unused: ls_pam_unix WARNING: translation string unused: ls_sshd WARNING: translation string unused: ls_syslogd WARNING: translation string unused: mac address error not 00 +WARNING: translation string unused: mac filter WARNING: translation string unused: mailmethod WARNING: translation string unused: mailprogramm WARNING: translation string unused: manage ovpn @@ -861,9 +862,19 @@ 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 debugging +WARNING: translation string unused: wlanap del interface +WARNING: translation string unused: wlanap informations WARNING: translation string unused: wlanap link dhcp WARNING: translation string unused: wlanap link wireless +WARNING: translation string unused: wlanap no interface +WARNING: translation string unused: wlanap notifications +WARNING: translation string unused: wlanap select interface +WARNING: translation string unused: wlanap verbose +WARNING: translation string unused: wlanap warnings +WARNING: translation string unused: wlanap wlan card WARNING: translation string unused: wlanap wlan services +WARNING: translation string unused: wlanap wlan settings WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph @@ -1481,18 +1492,21 @@ WARNING: untranslated string: wlan client method = Method WARNING: untranslated string: wlan client password = Password WARNING: untranslated string: wlan client tls cipher = TLS Cipher WARNING: untranslated string: wlan client tls version = TLS Version -WARNING: untranslated string: wlanap = Access Point +WARNING: untranslated string: wlanap = Wireless Access Point 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 configuration = Access Point Configuration +WARNING: untranslated string: wlanap clients = unknown string +WARNING: untranslated string: wlanap configuration = Wireless Access Point Configuration 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! +WARNING: untranslated string: wlanap neighbor scan = Neighborhood Scan +WARNING: untranslated string: wlanap neighbor scan warning = Warning: Disabling may violate regulatory rules +WARNING: untranslated string: wlanap psk = Pre-Shared Key WARNING: untranslated string: wlanap ssid = SSID +WARNING: untranslated string: wlanap wireless mode = Wireless Mode WARNING: untranslated string: working = Working WARNING: untranslated string: zoneconf notice reboot = Please reboot to apply your changes. WARNING: untranslated string: zoneconf title = Zone Configuration diff --git a/doc/language_issues.nl b/doc/language_issues.nl index dadcbaea2b..452dd5b335 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -467,6 +467,7 @@ WARNING: translation string unused: ls_pam_unix WARNING: translation string unused: ls_sshd WARNING: translation string unused: ls_syslogd WARNING: translation string unused: mac address error not 00 +WARNING: translation string unused: mac filter WARNING: translation string unused: mailmethod WARNING: translation string unused: mailprogramm WARNING: translation string unused: manage ovpn @@ -862,9 +863,19 @@ 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 debugging +WARNING: translation string unused: wlanap del interface +WARNING: translation string unused: wlanap informations WARNING: translation string unused: wlanap link dhcp WARNING: translation string unused: wlanap link wireless +WARNING: translation string unused: wlanap no interface +WARNING: translation string unused: wlanap notifications +WARNING: translation string unused: wlanap select interface +WARNING: translation string unused: wlanap verbose +WARNING: translation string unused: wlanap warnings +WARNING: translation string unused: wlanap wlan card WARNING: translation string unused: wlanap wlan services +WARNING: translation string unused: wlanap wlan settings WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph @@ -1504,18 +1515,21 @@ WARNING: untranslated string: wlan client method = Method WARNING: untranslated string: wlan client password = Password WARNING: untranslated string: wlan client tls cipher = TLS Cipher WARNING: untranslated string: wlan client tls version = TLS Version -WARNING: untranslated string: wlanap = Access Point +WARNING: untranslated string: wlanap = Wireless Access Point 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 configuration = Access Point Configuration +WARNING: untranslated string: wlanap clients = unknown string +WARNING: untranslated string: wlanap configuration = Wireless Access Point Configuration 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! +WARNING: untranslated string: wlanap neighbor scan = Neighborhood Scan +WARNING: untranslated string: wlanap neighbor scan warning = Warning: Disabling may violate regulatory rules +WARNING: untranslated string: wlanap psk = Pre-Shared Key WARNING: untranslated string: wlanap ssid = SSID +WARNING: untranslated string: wlanap wireless mode = Wireless Mode WARNING: untranslated string: working = Working WARNING: untranslated string: zoneconf notice reboot = Please reboot to apply your changes. WARNING: untranslated string: zoneconf title = Zone Configuration diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 2f8d0e5014..8afc26cab3 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -773,9 +773,19 @@ WARNING: translation string unused: wildcards WARNING: translation string unused: wins server WARNING: translation string unused: wins support WARNING: translation string unused: wlanap access point +WARNING: translation string unused: wlanap debugging +WARNING: translation string unused: wlanap del interface +WARNING: translation string unused: wlanap informations WARNING: translation string unused: wlanap link dhcp WARNING: translation string unused: wlanap link wireless +WARNING: translation string unused: wlanap no interface +WARNING: translation string unused: wlanap notifications +WARNING: translation string unused: wlanap select interface +WARNING: translation string unused: wlanap verbose +WARNING: translation string unused: wlanap warnings +WARNING: translation string unused: wlanap wlan card WARNING: translation string unused: wlanap wlan services +WARNING: translation string unused: wlanap wlan settings WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph @@ -1344,7 +1354,6 @@ WARNING: untranslated string: log drop hostile in = Log dropped packets FROM hos WARNING: untranslated string: log drop hostile out = Log dropped packets TO hostile networks WARNING: untranslated string: log dropped conntrack invalids = Log dropped packets classified as INVALID by connection tracking WARNING: untranslated string: log server protocol = protocol: -WARNING: untranslated string: mac filter = MAC filter WARNING: untranslated string: masquerade blue = Masquerade BLUE WARNING: untranslated string: masquerade green = Masquerade GREEN WARNING: untranslated string: masquerade orange = Masquerade ORANGE @@ -1776,19 +1785,22 @@ WARNING: untranslated string: wlan client wpa mode all = Auto WARNING: untranslated string: wlan client wpa mode ccmp ccmp = CCMP-CCMP WARNING: untranslated string: wlan client wpa mode ccmp tkip = CCMP-TKIP WARNING: untranslated string: wlan client wpa mode tkip tkip = TKIP-TKIP -WARNING: untranslated string: wlanap = Access Point +WARNING: untranslated string: wlanap = Wireless Access Point 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 configuration = Access Point Configuration +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 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! +WARNING: untranslated string: wlanap neighbor scan = Neighborhood Scan +WARNING: untranslated string: wlanap neighbor scan warning = Warning: Disabling may violate regulatory rules +WARNING: untranslated string: wlanap psk = Pre-Shared Key WARNING: untranslated string: wlanap ssid = SSID +WARNING: untranslated string: wlanap wireless mode = Wireless Mode WARNING: untranslated string: working = Working WARNING: untranslated string: zoneconf notice reboot = Please reboot to apply your changes. WARNING: untranslated string: zoneconf title = Zone Configuration diff --git a/doc/language_issues.ru b/doc/language_issues.ru index e57d2199cf..3719cd63a7 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -767,9 +767,19 @@ WARNING: translation string unused: wildcards WARNING: translation string unused: wins server WARNING: translation string unused: wins support WARNING: translation string unused: wlanap access point +WARNING: translation string unused: wlanap debugging +WARNING: translation string unused: wlanap del interface +WARNING: translation string unused: wlanap informations WARNING: translation string unused: wlanap link dhcp WARNING: translation string unused: wlanap link wireless +WARNING: translation string unused: wlanap no interface +WARNING: translation string unused: wlanap notifications +WARNING: translation string unused: wlanap select interface +WARNING: translation string unused: wlanap verbose +WARNING: translation string unused: wlanap warnings +WARNING: translation string unused: wlanap wlan card WARNING: translation string unused: wlanap wlan services +WARNING: translation string unused: wlanap wlan settings WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: yearly firewallhits @@ -1340,7 +1350,6 @@ WARNING: untranslated string: log drop hostile in = Log dropped packets FROM hos WARNING: untranslated string: log drop hostile out = Log dropped packets TO hostile networks WARNING: untranslated string: log dropped conntrack invalids = Log dropped packets classified as INVALID by connection tracking WARNING: untranslated string: log server protocol = protocol: -WARNING: untranslated string: mac filter = MAC filter WARNING: untranslated string: masquerade blue = Masquerade BLUE WARNING: untranslated string: masquerade green = Masquerade GREEN WARNING: untranslated string: masquerade orange = Masquerade ORANGE @@ -1769,19 +1778,22 @@ WARNING: untranslated string: wlan client wpa mode all = Auto WARNING: untranslated string: wlan client wpa mode ccmp ccmp = CCMP-CCMP WARNING: untranslated string: wlan client wpa mode ccmp tkip = CCMP-TKIP WARNING: untranslated string: wlan client wpa mode tkip tkip = TKIP-TKIP -WARNING: untranslated string: wlanap = Access Point +WARNING: untranslated string: wlanap = Wireless Access Point 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 configuration = Access Point Configuration +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 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! +WARNING: untranslated string: wlanap neighbor scan = Neighborhood Scan +WARNING: untranslated string: wlanap neighbor scan warning = Warning: Disabling may violate regulatory rules +WARNING: untranslated string: wlanap psk = Pre-Shared Key WARNING: untranslated string: wlanap ssid = SSID +WARNING: untranslated string: wlanap wireless mode = Wireless Mode WARNING: untranslated string: working = Working WARNING: untranslated string: zoneconf notice reboot = Please reboot to apply your changes. WARNING: untranslated string: zoneconf title = Zone Configuration diff --git a/doc/language_issues.tr b/doc/language_issues.tr index b5197e1088..5d5c13cf88 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -494,6 +494,7 @@ WARNING: translation string unused: ls_pam_unix WARNING: translation string unused: ls_sshd WARNING: translation string unused: ls_syslogd WARNING: translation string unused: mac address error not 00 +WARNING: translation string unused: mac filter WARNING: translation string unused: mailmethod WARNING: translation string unused: mailprogramm WARNING: translation string unused: manage ovpn @@ -890,9 +891,19 @@ 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 debugging +WARNING: translation string unused: wlanap del interface +WARNING: translation string unused: wlanap informations WARNING: translation string unused: wlanap link dhcp WARNING: translation string unused: wlanap link wireless +WARNING: translation string unused: wlanap no interface +WARNING: translation string unused: wlanap notifications +WARNING: translation string unused: wlanap select interface +WARNING: translation string unused: wlanap verbose +WARNING: translation string unused: wlanap warnings +WARNING: translation string unused: wlanap wlan card WARNING: translation string unused: wlanap wlan services +WARNING: translation string unused: wlanap wlan settings WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph @@ -1356,10 +1367,13 @@ 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 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! +WARNING: untranslated string: wlanap neighbor scan = Neighborhood Scan +WARNING: untranslated string: wlanap neighbor scan warning = Warning: Disabling may violate regulatory rules +WARNING: untranslated string: wlanap psk = Pre-Shared Key WARNING: untranslated string: wlanap ssid = SSID +WARNING: untranslated string: wlanap wireless mode = Wireless Mode WARNING: untranslated string: working = Working WARNING: untranslated string: zoneconf notice reboot = Please reboot to apply your changes. WARNING: untranslated string: zoneconf title = Zone Configuration diff --git a/doc/language_missings b/doc/language_missings index ef5c58ff16..de2217c601 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -108,6 +108,9 @@ < wlanap 802.11w disabled < wlanap 802.11w enforced < wlanap 802.11w optional +< wlanap psk +< wlanap wireless mode +< wlanap wlan clients < wlan client encryption wpa3 < wlan client management frame protection ############################################################################ @@ -154,6 +157,9 @@ < transport mode does not support vti < wireguard < wlanap +< wlanap psk +< wlanap wireless mode +< wlanap wlan clients < wlan client configuration ############################################################################ # Checking cgi-bin translations for language: fr # @@ -178,6 +184,9 @@ < timeformat < upload fcdsl.o < wireguard +< wlanap psk +< wlanap wireless mode +< wlanap wlan clients ############################################################################ # Checking cgi-bin translations for language: it # ############################################################################ @@ -671,7 +680,10 @@ < wlanap management frame protection < wlanap neighbor scan < wlanap neighbor scan warning +< wlanap psk < wlanap ssid +< wlanap wireless mode +< wlanap wlan clients < wlan client anonymous identity < wlan client auth auto < wlan client authentication settings @@ -1228,7 +1240,10 @@ < wlanap management frame protection < wlanap neighbor scan < wlanap neighbor scan warning +< wlanap psk < wlanap ssid +< wlanap wireless mode +< wlanap wlan clients < wlan client anonymous identity < wlan client auth auto < wlan client authentication settings @@ -2201,7 +2216,10 @@ < wlanap management frame protection < wlanap neighbor scan < wlanap neighbor scan warning +< wlanap psk < wlanap ssid +< wlanap wireless mode +< wlanap wlan clients < wlan client < wlan client advanced settings < wlan client and @@ -3210,7 +3228,10 @@ < wlanap management frame protection < wlanap neighbor scan < wlanap neighbor scan warning +< wlanap psk < wlanap ssid +< wlanap wireless mode +< wlanap wlan clients < wlan client < wlan client advanced settings < wlan client and @@ -3592,7 +3613,10 @@ < wlanap management frame protection < wlanap neighbor scan < wlanap neighbor scan warning +< wlanap psk < wlanap ssid +< wlanap wireless mode +< wlanap wlan clients < wlan client encryption wpa3 < wlan client management frame protection < working diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi index c2a5605fca..d5f5f09eea 100644 --- a/html/cgi-bin/wlanap.cgi +++ b/html/cgi-bin/wlanap.cgi @@ -18,65 +18,39 @@ # along with this program. If not, see . # # # ############################################################################### -# -# WLAN AP cgi based on wlanap.cgi written by Markus Hoffmann & Olaf Westrik -# use strict; # enable only the following on debugging purpose -#use warnings; -#use CGI::Carp 'fatalsToBrowser'; +use warnings; +use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require '/var/ipfire/lang.pl'; require '/var/ipfire/header.pl'; -my $debug = 0; -my $status = ''; my $errormessage = ''; -my $status_started = "$Lang::tr{'running'}"; -my $status_stopped = "$Lang::tr{'stopped'}"; -my $count=0; -my $col=''; -# get rid of used only once warnings -my @onlyonce = ( $Header::colourgreen, $Header::colourred ); -undef @onlyonce; - my %selected=(); my %checked=(); -my %color = (); -my %mainsettings = (); -my %netsettings=(); my %wlanapsettings=(); -my $channel = ''; -my $country = ''; -my $txpower = ''; - -&General::readhash("${General::swroot}/main/settings", \%mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color); -&General::readhash("/var/ipfire/ethernet/settings", \%netsettings); - -$wlanapsettings{'APMODE'} = 'on'; -$wlanapsettings{'ACTION'} = ''; -$wlanapsettings{'MACMODE'} = '0'; -$wlanapsettings{'INTERFACE'} = ''; -$wlanapsettings{'SSID'} = 'IPFire'; -$wlanapsettings{'HIDESSID'} = 'off'; -$wlanapsettings{'ENC'} = 'wpa2'; # none / wpa1 /wpa2 -$wlanapsettings{'TXPOWER'} = 'auto'; -$wlanapsettings{'CHANNEL'} = '6'; -$wlanapsettings{'COUNTRY'} = '00'; -$wlanapsettings{'HW_MODE'} = 'g'; -$wlanapsettings{'PWD'} = 'IPFire-2.x'; -$wlanapsettings{'SYSLOGLEVEL'} = '0'; -$wlanapsettings{'DEBUG'} = '4'; -$wlanapsettings{'DRIVER'} = 'NL80211'; -$wlanapsettings{'HTCAPS'} = ''; -$wlanapsettings{'VHTCAPS'} = ''; -$wlanapsettings{'NOSCAN'} = 'off'; -$wlanapsettings{'CLIENTISOLATION'} = 'off'; -$wlanapsettings{'IEEE80211W'} = 'off'; + +# Set defaults +&General::set_defaults(\%wlanapsettings, { + "APMODE" => "on", + "SSID" => "IPFire", + "HIDESSID" => "off", + "ENC" => "wpa2", + "TXPOWER" => "auto", + "CHANNEL" => "6", + "COUNTRY" => "00", + "HW_MODE" => "g", + "PWD" => "", + "HTCAPS" => "", + "VHTCAPS" => "", + "NOSCAN" => "off", + "CLIENTISOLATION" => "off", + "IEEE80211W" => "off", +}); &General::readhash("/var/ipfire/wlanap/settings", \%wlanapsettings); &Header::getcgihash(\%wlanapsettings); @@ -84,116 +58,51 @@ $wlanapsettings{'IEEE80211W'} = 'off'; # Find the selected interface my $INTF = &Network::get_intf_by_address($wlanapsettings{'INTERFACE'}); -my @macs = $wlanapsettings{'MACS'}; - delete $wlanapsettings{'__CGI__'}; delete $wlanapsettings{'x'}; delete $wlanapsettings{'y'}; -delete $wlanapsettings{'MACS'}; -delete $wlanapsettings{'ACCEPT_MACS'}; -delete $wlanapsettings{'DENY_MACS'}; &Header::showhttpheaders(); -my $string=(); -my $status=(); -my $errormessage = ''; -my $memory = 0; -my @memory=(); -my @pid=(); -my @hostapd=(); -sub pid -{ -# for pid and memory - open(FILE, '/usr/local/bin/addonctrl hostapd status | '); - @hostapd = ; - close(FILE); - $string = join("", @hostapd); - $string =~ s/[a-z_]//gi; - $string =~ s/\[[0-1]\;[0-9]+//gi; - $string =~ s/[\(\)\.]//gi; - $string =~ s/ //gi; - $string =~ s///gi; - @pid = split(/\s/,$string); - if (open(FILE, "/proc/$pid[0]/statm")){ - my $temp = ; - @memory = split(/ /,$temp); - close(FILE); - } - $memory+=$memory[0]; -} -pid(); - - - -if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'wlanap del interface'}" ){ - delete $wlanapsettings{'INTERFACE'}; - &General::writehash("/var/ipfire/wlanap/settings", \%wlanapsettings); -} - -if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}" ){ +if ($wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}") { # verify WPA Passphrase - only with enabled enc if ($wlanapsettings{'ENC'} ne "none") { # must be 8 .. 63 characters - if ( (length($wlanapsettings{'PWD'}) < 8) || (length($wlanapsettings{'PWD'}) > 63)){ + if ((length($wlanapsettings{'PWD'}) < 8) || (length($wlanapsettings{'PWD'}) > 63)) { $errormessage .= "$Lang::tr{'wlanap invalid wpa'}
"; } + # only ASCII alowed - if ( !($wlanapsettings{'PWD'} !~ /[^\x00-\x7f]/) ){ + if (!($wlanapsettings{'PWD'} !~ /[^\x00-\x7f]/)) { $errormessage .= "$Lang::tr{'wlanap invalid wpa'}
"; } } - if ( $errormessage eq '' ){ + if ($errormessage eq '') { &General::writehash("/var/ipfire/wlanap/settings", \%wlanapsettings); &WriteConfig_hostapd(); &General::system("/usr/local/bin/wlanapctrl", "restart"); - pid(); } -}elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'wlanap interface'}" ){ - &General::writehash("/var/ipfire/wlanap/settings", \%wlanapsettings); -}elsif ( ($wlanapsettings{'ACTION'} eq "$Lang::tr{'start'}") && ($memory == 0) ){ + +# Start +} elsif ($wlanapsettings{'ACTION'} eq "$Lang::tr{'start'}") { &General::system("/usr/local/bin/wlanapctrl", "start"); - pid(); -}elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'stop'}" ){ + +# Stop +} elsif ($wlanapsettings{'ACTION'} eq "$Lang::tr{'stop'}") { &General::system("/usr/local/bin/wlanapctrl", "stop"); - $memory=0; } &Header::openpage($Lang::tr{'wlanap configuration'}, 1, '', ''); &Header::openbigbox('100%', 'left', '', $errormessage); -if ( $errormessage ){ - &Header::openbox('100%', 'center', $Lang::tr{'error messages'}); - print "$errormessage\n"; - print " \n"; - &Header::closebox(); -} - - -# Found this usefull piece of code in BlockOutTraffic AddOn 8-) -# fwrules.cgi -############### -# DEBUG DEBUG -if ( $debug ){ - &Header::openbox('100%', 'center', 'DEBUG'); - my $debugCount = 0; - foreach my $line (sort keys %wlanapsettings) { - print "$line = '$wlanapsettings{$line}'
\n"; - $debugCount++; - } - print " Count: $debugCount\n"; - &Header::closebox(); -} -# DEBUG DEBUG -############### +# Show any errors +&Header::errorbox($errormessage); # # Driver and status detection # -my $wlan_card_status = 'dummy'; -my $wlan_ap_status = ''; my $message = ""; my %INTERFACES = &Network::list_wireless_interfaces(); @@ -201,52 +110,7 @@ my %INTERFACES = &Network::list_wireless_interfaces(); foreach my $intf (keys %INTERFACES) { $selected{'INTERFACE'}{$intf} = ''; } -$selected{'ENC'}{$wlanapsettings{'INTERFACE'}} = "selected='selected'"; - -if ( ($wlanapsettings{'INTERFACE'} eq '') ){ - $message = $Lang::tr{'wlanap select interface'}; - &Header::openbox('100%', 'center', "WLAN AP"); -print < -
-
-END -; - &Header::closebox(); - &Header::closebigbox(); - &Header::closepage(); - exit; -}else{ - my $cmd_out = `/usr/sbin/iwconfig $INTF 2>/dev/null`; - - if ( $cmd_out eq '' ){ - $message = "$Lang::tr{'wlanap no interface'}"; - $wlan_card_status = ''; - }else{ - $cmd_out = `/sbin/ifconfig $INTF`; - if ( $cmd_out eq '' ){ - $wlan_card_status = 'down'; - }else{ - $wlan_card_status = 'up'; - $cmd_out = `/usr/sbin/iwconfig $INTF | /bin/grep "Mode:Master"`; - if ( $cmd_out ne '' ){ - $wlan_ap_status = 'up'; - } - } - } -} +$selected{'INTERFACE'}{$wlanapsettings{'INTERFACE'}} = "selected='selected'"; # Change old "n" to "gn" if ( $wlanapsettings{'HW_MODE'} eq 'n' ) { @@ -275,317 +139,251 @@ $selected{'CHANNEL'}{$wlanapsettings{'CHANNEL'}} = "selected='selected'"; $selected{'COUNTRY'}{$wlanapsettings{'COUNTRY'}} = "selected='selected'"; $selected{'TXPOWER'}{$wlanapsettings{'TXPOWER'}} = "selected='selected'"; $selected{'HW_MODE'}{$wlanapsettings{'HW_MODE'}} = "selected='selected'"; -$selected{'MACMODE'}{$wlanapsettings{'MACMODE'}} = "selected='selected'"; -my $monwlaninterface = $INTF; -if ( -d '/sys/class/net/mon.' . $INTF) { - $monwlaninterface = 'mon.' . $INTF; -} +# Fetch all available channels +my @channellist = &get_channellist($INTF); -my @channellist_cmd; -my @channellist = (0); +# Fetch countries +my @countrylist = &get_countrylist(); -if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){ -my $wiphy = `iw dev $INTF info | grep wiphy | cut -d" " -f2`; -chomp $wiphy; +# Show status +&Header::opensection(); -@channellist_cmd = `iw phy phy$wiphy info | grep " MHz \\\[" | grep -v "(disabled)" | grep -v "no IBSS" | grep -v "no IR" | grep -v "passive scanning" 2>/dev/null`; -# get available channels +&Header::ServiceStatus({ + "$Lang::tr{'wlanap'}" => { + "process" => "hostapd", + } +}); + +print < + + +
+ +
+ +
+ +
+ + + +EOF + +&Header::closesection(); -my @temp; -foreach (@channellist_cmd){ -$_ =~ /(.*) \[(\d+)(.*)\]/; -$channel = $2;chomp $channel; -if ( $channel =~ /\d+/ ){push(@temp,$channel + 0);} -} -push(@channellist, @temp); -} else { -@channellist_cmd = `iwlist $monwlaninterface channel|tail -n +2 2>/dev/null`; -# get available channels - -my @temp; -foreach (@channellist_cmd){ -$_ =~ /(.*)Channel (\d+)(.*):/; -$channel = $2;chomp $channel; -if ( $channel =~ /\d+/ ){push(@temp,$channel + 0);} -} -push(@channellist, @temp); -} +# +# Configuration +# +&Header::openbox("100%", "center", $Lang::tr{'wlanap configuration'}); -# get available country codes -open(FILE, "; -close(FILE); +print < +
$Lang::tr{'wlanap configuration'}
+ + + -my @temp = "00"; -foreach (@countrylist_cmd){ -$_ =~ /country (.*):/; -$country = $1;chomp $country; -if ( $country =~ /[0,A-Z][0,A-Z]/ ) {push(@temp,$country);} -} -my @countrylist = @temp; + + + + + + + + + + + + + + + + + + + + + "; - print ""; - print $wlan_card_status eq 'up' ? $status_started : $status_stopped; - print""; - print ""; - print $wlan_ap_status eq 'up' ? $status_started : $status_stopped; - if ( ($memory != 0) && (@pid[0] ne "///") ){ - print ""; - print ""; - print ""; - print ""; - }else{ - print""; - print ""; - print ""; - } - -}else{ - print "
$Lang::tr{'wlanap interface'} +
$Lang::tr{'wlanap ssid'} + +
$Lang::tr{'wlanap broadcast ssid'} + +
$Lang::tr{'wlanap client isolation'} + +
$Lang::tr{'wlanap country'} +
$Lang::tr{'service'}StatusPID$Lang::tr{'memory'}$Lang::tr{'action'}
$Lang::tr{'wlanap wlan card'} ($wlanapsettings{'DRIVER'})
$Lang::tr{'wlanap'}@pid[0]$memory KB
$message"; -} - print "
"; - -if ( $wlan_card_status eq '' ){ - print "
"; - print ""; - print ""; - print ""; - print ""; - print ""; - print ""; - print ""; - print ""; - print ""; - print ""; - print "
 
"; +foreach my $country (@countrylist){ + print " "; } -if ( $wlan_card_status eq '' ){ - &Header::closebox(); - &Header::closebigbox(); - &Header::closepage(); - exit 0; -} -print <
-
- - - - - - - - + + + + + + + + + + - -END -; -if ( scalar @channellist > 0 ){ - print <" -} else { - print < -END -; + print ""; } -print< - - - - - - - - -END -; -print < - - - - - -
$Lang::tr{'wlanap wlan settings'}

$Lang::tr{'wlanap ssid'}: 
$Lang::tr{'wlanap broadcast ssid'}: $Lang::tr{'on'} | $Lang::tr{'off'}
$Lang::tr{'wlanap client isolation'}: $Lang::tr{'on'} | $Lang::tr{'off'}
$Lang::tr{'wlanap country'}:  -
$Lang::tr{'wlanap wireless mode'} + +
$Lang::tr{'wlanap channel'} +
HW Mode:  - -
$Lang::tr{'wlanap channel'}:  -
$Lang::tr{'wlanap channel'}:  - -
$Lang::tr{'wlanap neighbor scan'}: $Lang::tr{'on'} | $Lang::tr{'off'}$Lang::tr{'wlanap neighbor scan warning'}

$Lang::tr{'wlanap encryption'}:  - -
Passphrase: 
$Lang::tr{'wlanap management frame protection'}:  - -

HT Caps: 
VHT Caps: 
Tx Power: 
Loglevel (hostapd):  - -Debuglevel (hostapd):  - -

-END -; -if ( $INTF =~ /green0/ ){ - print < - - - - - -
$Lang::tr{'mac filter'}
Mac Filter:  - -Mac Adress List (one per line)
+ +print < + + + + + $Lang::tr{'wlanap neighbor scan'} + + + + $Lang::tr{'wlanap neighbor scan warning'} + + + + + $Lang::tr{'wlanap encryption'} + + + + + + + $Lang::tr{'wlanap psk'} + + + + + + + $Lang::tr{'wlanap management frame protection'} + + + + + + + HT Caps + + + + + + + VHT Caps + + + + + + + Tx Power + + + + + + + + + + + + END ; -} -print < - - - -
-
-
+ +&Header::closebox(); + +&Header::opensection(); + +my @status = `iw dev $INTF info`; + +if (@status) { + print <$Lang::tr{'wlanap wlan status'} + + 
@status
END -; -my @status; -if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){ - @status = `iw dev $INTF info && iw dev $INTF station dump && echo ""`; } -print < - - -END -; -for (my $i=0;$i<$#status;$i++){ +my @status = `iw dev $INTF station dump`; -if (@status[$i]=~"^Station ") { $count++; } -if ($count % 2){ - $col="bgcolor='$color{'color20'}'"; - }else{ - $col="bgcolor='$color{'color22'}'"; - } - print""; - if (! @status[$i]=~"^/t" ) { $count++; } -} - $count++; +if (@status) { + print <$Lang::tr{'wlanap clients'} -foreach my $nr (@channellist_cmd){ - if ($count % 2){ - $col="bgcolor='$color{'color20'}'"; - }else{ - $col="bgcolor='$color{'color22'}'"; - } - print""; - $count++; + 
@status
+END } -for (my $i=0;$i<$#txpower_cmd;$i=$i+2){ - if ($count % 2){ - $col="bgcolor='$color{'color20'}'"; - }else{ - $col="bgcolor='$color{'color22'}'"; - } - print ""; - $count++; -} -print "
$Lang::tr{'wlanap wlan status'}
@status[$i]
$nr
@txpower_cmd[$i]
"; -&Header::closebox(); -print ""; +&Header::closesection(); &Header::closebigbox(); &Header::closepage(); sub WriteConfig_hostapd{ - $wlanapsettings{'DRIVER_HOSTAPD'} = lc($wlanapsettings{'DRIVER'}); - open (CONFIGFILE, ">/var/ipfire/wlanap/hostapd.conf"); print CONFIGFILE </var/ipfire/wlanap/macfile"); - foreach(@macs){ - $_ =~ s/\r//gi; - chomp($_); - if ( $_ ne "" ){print MACFILE $_;} + while (<$file>) { + chomp $_; + + $phy = $_; + last; } - close MACFILE; + + close($file); + + return $phy; +} + +sub get_channellist($) { + my $intf = shift; + + # Fetch the PHY ID + my $phy = &get_phy($intf); + + my @channels = (0); + + open(my $command, "iw phy phy$phy info |"); + + while (<$command>) { + # Skip everything we are not interested in + next unless ($_ =~ m/MHz \[(\d+)\]/); + + my $channel = $1; + + # Skip disabled and otherwise unusable channels + next if ($_ =~ m/disabled/); + next if ($_ =~ m/no IBSS/); + next if ($_ =~ m/no IR/); + next if ($_ =~ m/passive scanning/); + + push(@channels, $channel); + } + + close($command); + + return @channels; +} + +sub get_countrylist() { + open(my $file, ") { + if ($_ =~ m/^country ([A-Z0-9]{2}):/) { + push(@countries, $1); + } + } + + close($file); + + return @countries; } diff --git a/html/html/themes/ipfire/include/css/style.css b/html/html/themes/ipfire/include/css/style.css index 18dfe347a0..54d0f12e5b 100644 --- a/html/html/themes/ipfire/include/css/style.css +++ b/html/html/themes/ipfire/include/css/style.css @@ -361,6 +361,10 @@ table.form tr.action td { text-align: right; } +table.form tr.action td form { + display: inline; +} + .tbl { width: 100%; } diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 89bef62f08..0004685a73 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -3076,7 +3076,7 @@ 'wlan client wpa mode ccmp tkip' => 'CCMP-TKIP', 'wlan client wpa mode tkip tkip' => 'TKIP-TKIP', 'wlan clients' => 'Wireless clients', -'wlanap' => 'Access Point', +'wlanap' => 'Wireless Access Point', 'wlanap 802.11w disabled' => 'Disabled', 'wlanap 802.11w enforced' => 'Enforced', 'wlanap 802.11w optional' => 'Optional', @@ -3084,30 +3084,33 @@ 'wlanap broadcast ssid' => 'Broadcast SSID', 'wlanap channel' => 'Channel', 'wlanap client isolation' => 'Client Isolation', -'wlanap configuration' => 'Access Point Configuration', +'wlanap configuration' => 'Wireless Access Point Configuration', 'wlanap country' => 'Country Code', 'wlanap debugging' => 'Debugging', 'wlanap del interface' => 'Remove selected interface?', 'wlanap encryption' => 'Encryption', -'wlanap informations' => 'Informations', -'wlanap interface' => 'Select interface', -'wlanap invalid wpa' => 'Invalid length in WPA Passphrase. Must be between 8 and 63 characters.', -'wlanap link dhcp' => 'Wireless lan DHCP configuration', +'wlanap informations' => 'Information', +'wlanap interface' => 'Select Interface', +'wlanap invalid wpa' => 'Invalid length in WPA passphrase. Must be between 8 and 63 characters.', +'wlanap link dhcp' => 'Wireless LAN DHCP configuration', 'wlanap link wireless' => 'Activate wireless lan clients', 'wlanap management frame protection' => 'Management Frame Protection (802.11w)', -'wlanap neighbor scan' => 'Neighborhood scan', -'wlanap neighbor scan warning' => 'Warning! Disabling may violate regulatory rules!', +'wlanap neighbor scan' => 'Neighborhood Scan', +'wlanap neighbor scan warning' => 'Warning: Disabling may violate regulatory rules', 'wlanap no interface' => 'Selected interface is not a wirless lan card!', 'wlanap none' => 'none', -'wlanap notifications' => 'Notifications', +'wlanap notifications' => 'Notification', +'wlanap psk' => 'Pre-Shared Key', 'wlanap select interface' => 'Please select the wireless lan interface.', 'wlanap ssid' => 'SSID', 'wlanap verbose' => 'Verbose', 'wlanap warnings' => 'Warnings', +'wlanap wireless mode' => 'Wireless Mode', 'wlanap wlan card' => 'WLan Card', -'wlanap wlan services' => 'WLan Services', -'wlanap wlan settings' => 'WLan Settings', -'wlanap wlan status' => 'WLan Status', +'wlanap wlan clients' => 'WiFi Clients', +'wlanap wlan services' => 'WiFi Services', +'wlanap wlan settings' => 'WiFi Settings', +'wlanap wlan status' => 'WiFi Status', 'wol wakeup' => 'WakeUp', 'workgroup' => 'Workgroup', 'working' => 'Working',