From 25d9743e3bb78e38e8391af04550e4d162841880 Mon Sep 17 00:00:00 2001 From: Bill Zimmerman Date: Fri, 8 May 2020 17:27:15 +0200 Subject: [PATCH 01/20] Update stale.yml --- .github/stale.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/stale.yml b/.github/stale.yml index 17e3b052..b1f787d3 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -1,5 +1,5 @@ # Number of days of inactivity before an issue becomes stale -daysUntilStale: 60 +daysUntilStale: 30 # Number of days of inactivity before a stale issue is closed daysUntilClose: 7 # Issues with these labels will never be considered stale From f02f9c62118b79d611eda37d11ce38803b0dc179 Mon Sep 17 00:00:00 2001 From: Bill Zimmerman Date: Fri, 8 May 2020 18:35:54 +0200 Subject: [PATCH 02/20] Update stale.yml --- .github/stale.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/stale.yml b/.github/stale.yml index b1f787d3..17e3b052 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -1,5 +1,5 @@ # Number of days of inactivity before an issue becomes stale -daysUntilStale: 30 +daysUntilStale: 60 # Number of days of inactivity before a stale issue is closed daysUntilClose: 7 # Issues with these labels will never be considered stale From f4169a0ede0cae3a66647c2963a2945b4652ba74 Mon Sep 17 00:00:00 2001 From: billz Date: Sat, 16 May 2020 11:46:01 +0100 Subject: [PATCH 03/20] Update composer.json --- composer.json | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 2d1021ca..8101d1f3 100644 --- a/composer.json +++ b/composer.json @@ -1,8 +1,19 @@ { "name": "billz/raspap-webgui", - "homepage": "https://raspap.com/", + "description": "Simple AP setup and wifi mangement for Debian-based devices", "license": "GPL-3.0", - "keywords": ["raspberrypi"], + "homepage": "https://raspap.com/", + "keywords": ["raspberrypi", "debian", "armbian", "wifi"], + "type": "raspap-core", + "authors": { + "name": "RaspAP Team", + "email": "billzimmerman@gmail.com", + "homepage": "https://raspap.com/" + }, + "require": { + "php": "^7.0", + "raspap/composer-installer": "^1.0" + }, "require-dev": { "php-parallel-lint/php-parallel-lint": "^1.2.0", "phpcompatibility/php-compatibility": "^9.3.5", From dec0be87bbe62bce5177a4758fc492622bbbc1c6 Mon Sep 17 00:00:00 2001 From: billz Date: Sat, 16 May 2020 11:54:35 +0100 Subject: [PATCH 04/20] Update composer.json --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 8101d1f3..d5279040 100644 --- a/composer.json +++ b/composer.json @@ -11,8 +11,7 @@ "homepage": "https://raspap.com/" }, "require": { - "php": "^7.0", - "raspap/composer-installer": "^1.0" + "php": "^7.0" }, "require-dev": { "php-parallel-lint/php-parallel-lint": "^1.2.0", From 807a8bb7f3a30793a281c35afb61896ec4b5038c Mon Sep 17 00:00:00 2001 From: billz Date: Sat, 16 May 2020 12:05:56 +0100 Subject: [PATCH 05/20] Update composer.json --- composer.json | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index d5279040..4b0f48c0 100644 --- a/composer.json +++ b/composer.json @@ -5,11 +5,13 @@ "homepage": "https://raspap.com/", "keywords": ["raspberrypi", "debian", "armbian", "wifi"], "type": "raspap-core", - "authors": { - "name": "RaspAP Team", - "email": "billzimmerman@gmail.com", - "homepage": "https://raspap.com/" - }, + "authors": [ + { + "name": "RaspAP Team", + "email": "billzimmerman@gmail.com", + "homepage": "https://raspap.com/" + } + ], "require": { "php": "^7.0" }, From 650af228d9cc99099ddc961ef7ce043a3e585106 Mon Sep 17 00:00:00 2001 From: billz Date: Tue, 19 May 2020 13:47:31 +0100 Subject: [PATCH 06/20] Disable Ad block when bridgedEnabled --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index c2fe13ee..136c72b9 100755 --- a/index.php +++ b/index.php @@ -146,7 +146,7 @@ $bridgedEnabled = $arrHostapdConf['BridgedEnable']; - +
    • From 18285bca22cb2b316e0477d5ca38abc974ce3791 Mon Sep 17 00:00:00 2001 From: billz Date: Tue, 19 May 2020 16:35:41 +0100 Subject: [PATCH 07/20] =?UTF-8?q?Update=20=D0=A0=D1=83=D1=81=D1=81=D0=BA?= =?UTF-8?q?=D0=B8=D0=B9=20translation,=20thx=20Denis=20Trifiniuc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locale/ru_RU/LC_MESSAGES/messages.mo | Bin 17052 -> 20232 bytes locale/ru_RU/LC_MESSAGES/messages.po | 104 ++++++++++++++++++++------- 2 files changed, 78 insertions(+), 26 deletions(-) diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo index fe97cb789b5a51c30da3b4cd9f91526b94acb96a..8c5c4d55e7715a66ea7cd1d1a5b6a64b947ab720 100644 GIT binary patch delta 8393 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 WM@oytQo762uU8izDxvSHANXIkg}bW& delta 5157 zcmYk;30zfG0>|<55Jhpr9Tee-LV|*zBue5M?puYG<`U(LArKVMvasid>F8*BU31CF zF{f}!y^1TDl}nA~qiifc)|fNnl(x(?PT4fg%erQ-b$kGkgP^;5phf&}6+546DdI@SkTTuhvgBrl$X!c(Xo#2LMdIq(mpINVC64y6T1BhqZ zasX!FG<&@obyoJG2KXLoU|*ry{T{UfO*k;xf)1#GrnhJPHS=NI&`L~1jj#~aK$*R+ zL_JW2`u-Nw7QKoZ@L|*dPT9X-LA7@S)p0m~)XKK9#v@}g-Td}OE^0~cL3K0{)xk_u z2TvnynWd-!?m&HiH}XQ5{ivCpv3`o`_&d~_?BU&3JI#?>CKkJ+zYi5Pf^uLEXY=5%%e@3l9l$Z6_ zh~lZ}Ml$ANAJhn+u|9{I!HcNx)nFGqiTd6(RLB2D9m0Anm#(8x6N*P2-mcgahoB}h zrxWY1h8J=}r*b_e;65COAKB|fZmQwos3o6*+L|KN57kWTQhR?pYGON4EAyK5Ack>$ z91}doyqVxPrj{Fj=^R?39ZX9P)*|0Ar?D4aL;aS=C30S{2dd*j)YdG(Y+QkQi%w%Q zeuk;oFo}N&u{Sa&Ga0k+8NdBQ4c@_xOPGV+N$BGm7avW5XL`;ibk{+&tna0#LF4J8aj;XpboWFmvIu_Ks`4u zCDiaNWb9@UYJjgGzuM*~(xf?$oICR~GDg#p+4a-=pG!rjb0MmuEtrPYs8f6q2jkbM z5vTLBrH0319u}Ymd<^&DHPisMa#J&X6?yZ_yQt^CM71BmM>_qR-c-hNqX6&58f<_+ zVKWS4-J4(w6|6{H|?qDwaBwR zi}!MU1a+vIW-v$`j(4FS)$mbdjOKmROn*jp#l+AUt89j#&PWMrtJYu??niCyN%S|Q z@+lSiGFMSEYR8e+567LTk&i;{*(_{1{a}LWD{zsUPR8FaZwNc5nJO;)c2cag$B?WwZu87 z=cb{4@n)h1v>Y|#TGZB@MXl%$ekx4T#Py%x)fX2m~%W+(}e<3ux7(b;HBULhyQ%S1(ce3;y?3kutBHV_@gUy*@i zjrPA6mGk6Q(d(k$0F@8OkzkGgx3~TtU$FJ<)?Z*A*+G6ys!30x@+{d&>XQ%2>qM)i z(nkCLD3wxDMfCgs9w{R_T$N-lxm70GN+;|_9wgK4y_YbB#1kE4m4`wEe=Sw*Xs?CN z$QJrH)5tyKx8z>(K1n3CMCC;?C|EP*H>ks>a*!+}Iy1MIUvlvTX=-mSx$TdOsh=bt zk^6}H5B_`p6s{wWkO^ckQAsEJ$X24C=riOrQAr|wgSF7dIB-b~8B5~G?PY|$sKaxl znfhNzr?m~sb{Yr#*JhF2_yOB5Lrf4 z)|1)f6B6A2a4ISVWM;4y`se_WB#RW0Xz~X#h72ReNIA(SDvQVg(p49?l{cs-lT7kE zV)~U=l$Dkg^dDR56el-zzG$_~o!5G~r{R$C6TG8K^QSw@+s3=6+9rlMkuhDJyJIrl zx$QT2oQ&8l?$@z5J?`J);=kmiwnyu(#mG{=W8Vev-1mlsd>Kq8QI?dUuS!L zCDSI{=bX9YAvZs{fyeoKPAg|gO0l!Ib+p^MTV+^Oz^$8Kw0O0UP9lFV3VOncY;HfySi?Wu zFkrXG`6NEaoj0gnn7eDp&M>!VXh)B`b=Y?vr?|^dw_;>lk25&2jeBX-h_KYa>cD}z w1%cyr^8>F3_L2R8+Q6Q=Ro=j%KyBUP!0Y_s7&n##4%Mx4dXG(WipOsGA2KCyX#fBK diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po index bbd6115a..8516ff52 100644 --- a/locale/ru_RU/LC_MESSAGES/messages.po +++ b/locale/ru_RU/LC_MESSAGES/messages.po @@ -1,22 +1,19 @@ -# RaspAP Portable Object file -# Project home: https://github.com/billz/raspap-webgui -# Licensed under the GNU General Public License v3.0 -# This file is distributed under the same license as the RaspAP package -# FIRST AUTHOR billzimmerman@gmail.com, 2017 -# -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: 1.2.1\n" +"Project-Id-Version: raspap\n" "Report-Msgid-Bugs-To: Bill Zimmerman \n" "POT-Creation-Date: 2017-10-19 08:56+0000\n" -"PO-Revision-Date: 2019-10-21 23:15+0000\n" -"Last-Translator: Betep \n" -"Language-Team: \n" -"Language: en_US\n" +"PO-Revision-Date: 2020-05-19 15:29\n" +"Last-Translator: Denis Trifiniuc\n" +"Language-Team: Russian\n" +"Language: ru_RU\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=((n%10==1 && n%100!=11) ? 0 : ((n%10 >= 2 && n%10 <=4 && (n%100 < 12 || n%100 > 14)) ? 1 : ((n%10 == 0 || (n%10 >= 5 && n%10 <=9)) || (n%100 >= 11 && n%100 <= 14)) ? 2 : 3));\n" +"X-Crowdin-Project: raspap\n" +"X-Crowdin-Language: ru\n" +"X-Crowdin-File: /master/locale/en_US/LC_MESSAGES/messages.po\n" #: index.php msgid "RaspAP Wifi Configuration Portal" @@ -37,6 +34,12 @@ msgstr "WiFi клиента" msgid "Hotspot" msgstr "Точка доступа" +msgid "Memory Use" +msgstr "Использование RAM" + +msgid "CPU Temp" +msgstr "Температура ЦП" + msgid "Networking" msgstr "Сетевые" @@ -178,8 +181,8 @@ msgstr "Переданные пакеты" msgid "Transferred Bytes" msgstr "Передано Байт" -msgid "Wireless Information" -msgstr "Беспроводная информация" +msgid "Wireless Client" +msgstr "WiFi клиент" msgid "Connected To" msgstr "Подключено к" @@ -248,6 +251,9 @@ msgstr "Список клиентов" msgid "Interface" msgstr "Интерфейс" +msgid "DNS Server" +msgstr "DNS сервер" + msgid "Starting IP Address" msgstr "Начальный IP-адрес" @@ -318,31 +324,31 @@ msgid "Dnsmasq is not running" msgstr "Dnsmasq не запущена" msgid "Upstream DNS servers" -msgstr "Upstream DNS servers" +msgstr "Пользовательские DNS-серверы" msgid "Only ever query DNS servers configured below" -msgstr "Only ever query DNS servers configured below" +msgstr "Использовать только DNS-серверы, настроенные ниже" msgid "Enable this option if you want RaspAP to send DNS queries to the servers configured below exclusively. By default RaspAP also uses its upstream DHCP server's name servers." -msgstr "Enable this option if you want RaspAP to send DNS queries to the servers configured below exclusively. By default RaspAP also uses its upstream DHCP server's name servers." +msgstr "Включите эту опцию, если вы хотите, чтобы RaspAP отправлял DNS-запросы только на серверы, настроенные ниже. По умолчанию RaspAP также использует восходящие DNS-серверы, назначенные через DHCP." msgid "This option adds no-resolv to the dnsmasq configuration." -msgstr "This option adds no-resolv to the dnsmasq configuration." +msgstr "Этот параметр добавляет no-resolv в конфигурацию dnsmasq." msgid "Add upstream DNS server" -msgstr "Add upstream DNS server" +msgstr "Добавить сервер DNS" msgid "Format" -msgstr "Format" +msgstr "Формат" msgid "Choose a hosted server" -msgstr "Choose a hosted server" +msgstr "Общедоступный DNS-сервер" msgid "Log DHCP requests" -msgstr "Log DHCP requests" +msgstr "Журнал DHCP-запросов" msgid "Log DNS queries" -msgstr "Log DNS queries" +msgstr "Журнал DNS-запросов" #: includes/hostapd.php msgid "Basic" @@ -426,6 +432,9 @@ msgstr "Записи журнала" msgid "WiFi client AP mode" msgstr "Режим AP WiFi-клиента" +msgid "Bridged AP mode" +msgstr "Режим моста ТОЧКИ ДОСТУПА" + msgid "Hide SSID in broadcast" msgstr "Скрыть SSID при трансляции" @@ -445,9 +454,6 @@ msgstr "Текущие настройки" msgid "Default Gateway" msgstr "Основной шлюз" -msgid "DNS Server" -msgstr "DNS сервер" - msgid "Alternate DNS Server" msgstr "Альтернативный DNS-сервер" @@ -660,6 +666,10 @@ msgstr "Попытка запуска TOR" msgid "Attempting to stop TOR" msgstr "Попытка остановить TOR" +#: template/dashboard.php +msgid "Bridged AP mode is enabled. For Hostname and IP, see your router's admin page." +msgstr "Мостовой режим ТОЧКИ ДОСТУПА включен. Для хоста и IP-адреса см. страницу администрирования маршрутизатора." + #: common form controls msgid "Save settings" msgstr "Сохранить настройки" @@ -682,3 +692,45 @@ msgstr "вверх" msgid "down" msgstr "вниз" +msgid "adblock" +msgstr "Adblock" + +msgid "Ad Blocking" +msgstr "Ad Blocking" + +msgid "Start Ad Blocking" +msgstr "Запустить Ad Blocking" + +msgid "Restart Ad Blocking" +msgstr "Перезапустить Ad Blocking" + +msgid "Blocklist settings" +msgstr "Настройки блокировки" + +msgid "Enable blocklists" +msgstr "Включить блокировку" + +msgid "Enable this option if you want RaspAP to block DNS requests for ads, tracking and other virtual garbage. Blocklists are gathered from multiple, actively maintained sources and automatically updated, cleaned, optimized and moderated on a daily basis." +msgstr "Включите эту опцию, если вы хотите, чтобы RaspAP блокировал DNS запросы для рекламы, отслеживания и другого виртуального мусора. Блокирующие списки собираются из множества активно поддерживаемых источников и автоматически обновляются, очищаются, оптимизируются и модерируются ежедневно." + +msgid "This option adds conf-file and addn-hosts to the dnsmasq configuration." +msgstr "Эта опция добавляет в конфигурацию dnsmasq conf-file и addn-hosts." + +msgid "Choose a blocklist provider" +msgstr "Выберите поставщика черного списка" + +msgid "Hostnames blocklist last updated" +msgstr "Имена черного списка последнее обновление" + +msgid "Domains blocklist last updated" +msgstr "Последнее обновление списка блокировки доменов" + +msgid "Update now" +msgstr "Обновить сейчас" + +msgid "Statistics" +msgstr "Статистика" + +msgid "Information provided by adblock" +msgstr "Информация получена от Adblock" + From 0c5e93e9d8400e324b7bdc37c8d094f7567fe254 Mon Sep 17 00:00:00 2001 From: billz Date: Tue, 19 May 2020 17:28:48 +0100 Subject: [PATCH 08/20] Added 802.11.w MFP support, addresses #484 --- includes/hostapd.php | 4 ++++ templates/hostapd.php | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/includes/hostapd.php b/includes/hostapd.php index ad321dbf..38908754 100755 --- a/includes/hostapd.php +++ b/includes/hostapd.php @@ -18,6 +18,7 @@ function DisplayHostAPDConfig() 'b' => '802.11b - 2.4 GHz', 'g' => '802.11g - 2.4 GHz', 'n' => '802.11n - 2.4 GHz', + 'w' => '802.11w - 2.4 Ghz', 'ac' => '802.11.ac - 5 GHz' ]; $arrSecurity = array(1 => 'WPA', 2 => 'WPA2', 3 => 'WPA+WPA2', 'none' => _("None")); @@ -242,6 +243,9 @@ function SaveHostAPDConfig($wpa_array, $enc_types, $modes, $interfaces, $status) $config.= 'vht_capab=[MAX-AMSDU-3839][SHORT-GI-80]'.PHP_EOL; $config.= 'vht_oper_chwidth=1'.PHP_EOL; $config.= 'vht_oper_centr_freq_seg0_idx=42'.PHP_EOL.PHP_EOL; + } elseif ($_POST['hw_mode'] === 'w') { + $config.= 'ieee80211w=2'.PHP_EOL; + $config.= 'wpa_key_mgmt=WPA-EAP-SHA256'.PHP_EOL; } else { $config.= 'hw_mode='.$_POST['hw_mode'].PHP_EOL; $config.= 'ieee80211n=0'.PHP_EOL; diff --git a/templates/hostapd.php b/templates/hostapd.php index d3d7786e..9fcbd8c1 100755 --- a/templates/hostapd.php +++ b/templates/hostapd.php @@ -61,6 +61,12 @@ $selectedHwMode = 'ac'; } } + if (isset($arrConfig['ieee80211w'])) { + if (strval($arrConfig['ieee80211w']) === '2') { + $selectedHwMode = 'w'; + } + } + if (!in_array($arrConfig['country_code'], $countries_5Ghz_max48ch)) { $hwModeDisabled = 'ac'; if ($selectedHwMode === $hwModeDisabled) { From e04ac679ddfc7283185459d6a5ce5a905d3c790a Mon Sep 17 00:00:00 2001 From: Bill Zimmerman Date: Sat, 23 May 2020 13:55:10 +0200 Subject: [PATCH 09/20] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4e145be6..c19bef5e 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,9 @@ configured as an access point as follows: * SSID: `raspi-webgui` * Password: ChangeMe -**Note:** As the name suggests, the Quick Installer is a great way to quickly setup a new AP. However, it does not automagically detect the unique configuration of your system. Best results are obtained by connecting to ethernet (`eth0`) or as a WiFi client, also known as managed mode, with `wlan0`. For the latter, refer to [this FAQ](https://github.com/billz/raspap-webgui/wiki/FAQs#how-do-i-prepare-the-sd-card-to-connect-to-wifi-in-headless-mode). Please [read this](https://github.com/billz/raspap-webgui/wiki/Reporting-issues) before reporting an issue. +**Note:** As the name suggests, the Quick Installer is a great way to quickly setup a new AP. However, it does not automagically detect the unique configuration of your system. Best results are obtained by connecting to ethernet (`eth0`) or as a WiFi client, also known as managed mode, with `wlan0`. For the latter, refer to [this FAQ](https://github.com/billz/raspap-webgui/wiki/FAQs#how-do-i-prepare-the-sd-card-to-connect-to-wifi-in-headless-mode). Special instructions for the Pi Zero W are [available here](https://github.com/billz/raspap-webgui/wiki/RPi-Zero-W-AP-STA-mode). + +Please [read this](https://github.com/billz/raspap-webgui/wiki/Reporting-issues) before reporting an issue. ## Ad Blocking This feature uses DNS blacklisting to block requests for ads, trackers and other undesirable hosts. To enable ad blocking, simply respond to the prompt during the installation. As a beta release, we encourage testing and feedback from users of RaspAP. From ceaa7a3511f18100a7759460dc8b55d68212e4ad Mon Sep 17 00:00:00 2001 From: billz Date: Sat, 23 May 2020 18:01:11 +0100 Subject: [PATCH 10/20] Update _set_php_package w/ pattern match #588 --- installers/common.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/installers/common.sh b/installers/common.sh index a64e8d1c..b27b0684 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -78,16 +78,16 @@ function _get_linux_distro() { # Sets php package option based on Linux version, abort if unsupported distro function _set_php_package() { case $RELEASE in - "18.04"|"19.10") # Ubuntu Server + 18.04|19.10) # Ubuntu Server php_package="php7.4-cgi" phpcgiconf="/etc/php/7.4/cgi/php.ini" ;; - "10") + 10*) php_package="php7.3-cgi" phpcgiconf="/etc/php/7.3/cgi/php.ini" ;; - "9") + 9*) php_package="php7.0-cgi" phpcgiconf="/etc/php/7.0/cgi/php.ini" ;; - "8") + 8) _install_status 1 "${DESC} and php5 are not supported. Please upgrade." ;; *) _install_status 1 "${DESC} is unsupported. Please install on a supported distro." ;; From b128c4106c7c6db845f7b70ddb0c66d40e3ec304 Mon Sep 17 00:00:00 2001 From: billz Date: Sun, 24 May 2020 08:14:07 +0100 Subject: [PATCH 11/20] Applied patches from #581 --- ajax/networking/wifi_stations.php | 1 + includes/configure_client.php | 1 + includes/wifi_functions.php | 45 ++++++++++++++++++++++++------- templates/wifi_stations.php | 19 +++++++------ 4 files changed, 47 insertions(+), 19 deletions(-) diff --git a/ajax/networking/wifi_stations.php b/ajax/networking/wifi_stations.php index a867b6b5..7d9bb82e 100644 --- a/ajax/networking/wifi_stations.php +++ b/ajax/networking/wifi_stations.php @@ -13,5 +13,6 @@ $ssid = null; knownWifiStations($networks); nearbyWifiStations($networks, !isset($_REQUEST["refresh"])); connectedWifiStations($networks); +sortNetworksByRSSI($networks); echo renderTemplate('wifi_stations', compact('networks')); diff --git a/includes/configure_client.php b/includes/configure_client.php index 4e0b001f..07715388 100755 --- a/includes/configure_client.php +++ b/includes/configure_client.php @@ -94,6 +94,7 @@ function DisplayWPAConfig() nearbyWifiStations($networks); connectedWifiStations($networks); + sortNetworksByRSSI($networks); echo renderTemplate("configure_client", compact("status")); } diff --git a/includes/wifi_functions.php b/includes/wifi_functions.php index d8a8ce20..d7194b56 100755 --- a/includes/wifi_functions.php +++ b/includes/wifi_functions.php @@ -63,16 +63,26 @@ function nearbyWifiStations(&$networks, $cached = true) } ); - foreach (explode("\n", $scan_results) as $network) { - $arrNetwork = preg_split("/[\t]+/", $network); // split result into array + // get the name of the AP - should be excluded von the nearby networks + exec('cat '.RASPI_HOSTAPD_CONFIG.' | sed -rn "s/ssid=(.*)\s*$/\1/p" ',$ap_ssid); + $ap_ssid = $ap_ssid[0]; + + foreach (explode("\n", $scan_results) as $network) { + $arrNetwork = preg_split("/[\t]+/", $network); // split result into array + if (!array_key_exists(4, $arrNetwork) || + trim($arrNetwork[4]) == $ap_ssid) continue; + + $ssid = trim($arrNetwork[4]); + // filter SSID string - anything invisable in 7bit ASCII or quotes -> ignore network + if( preg_match('[\x00-\x1f\x7f-\xff\'\`\\"]',$ssid)) continue; // If network is saved - if (array_key_exists(4, $arrNetwork) && array_key_exists($arrNetwork[4], $networks)) { - $networks[$arrNetwork[4]]['visible'] = true; - $networks[$arrNetwork[4]]['channel'] = ConvertToChannel($arrNetwork[1]); + if (array_key_exists($ssid, $networks)) { + $networks[$ssid]['visible'] = true; + $networks[$ssid]['channel'] = ConvertToChannel($arrNetwork[1]); // TODO What if the security has changed? } else { - $networks[$arrNetwork[4]] = array( + $networks[$ssid] = array( 'configured' => false, 'protocol' => ConvertToSecurity($arrNetwork[3]), 'channel' => ConvertToChannel($arrNetwork[1]), @@ -82,10 +92,12 @@ function nearbyWifiStations(&$networks, $cached = true) ); } - // Save RSSI - if (array_key_exists(4, $arrNetwork)) { - $networks[$arrNetwork[4]]['RSSI'] = $arrNetwork[2]; + // Save RSSI, if the current value is larger than the already stored + if (array_key_exists(4, $arrNetwork) && array_key_exists($arrNetwork[4],$networks)) { + if(! array_key_exists('RSSI',$networks[$arrNetwork[4]]) || $networks[$ssid]['RSSI'] < $arrNetwork[2]) + $networks[$ssid]['RSSI'] = $arrNetwork[2]; } + } } @@ -98,3 +110,18 @@ function connectedWifiStations(&$networks) } } } + +function sortNetworksByRSSI(&$networks) { + $valRSSI = array(); + foreach ($networks as $SSID => $net) { + if (!array_key_exists('RSSI',$net)) $net['RSSI'] = -1000; + $valRSSI[$SSID] = $net['RSSI']; + } + $nets = $networks; + arsort($valRSSI); + $networks = array(); + foreach ($valRSSI as $SSID => $RSSI) { + $networks[$SSID] = $nets[$SSID]; + $networks[$SSID]['RSSI'] = $RSSI; + } +} diff --git a/templates/wifi_stations.php b/templates/wifi_stations.php index 1769cc9e..cdfcb654 100755 --- a/templates/wifi_stations.php +++ b/templates/wifi_stations.php @@ -40,16 +40,15 @@
    - = -50) { - echo 100; - } elseif ($network['RSSI'] <= -100) { - echo 0; - } else { - echo 2*($network['RSSI'] + 100); - } - echo "%)"; + = -200 ) { + echo htmlspecialchars($network['RSSI'], ENT_QUOTES); + echo "dB ("; + if ($network['RSSI'] >= -50) echo 100; + elseif ($network['RSSI'] <= -100) echo 0; + else echo 2*($network['RSSI'] + 100); + echo "%)"; + } else echo " not found "; ?>
    From 1a8ffd94fcfc68d3a3c850f7ddfbf55a2facc019 Mon Sep 17 00:00:00 2001 From: billz Date: Sun, 24 May 2020 08:24:42 +0100 Subject: [PATCH 12/20] Replaced tabs w/ spaces, applied PSR-2 code standard --- includes/wifi_functions.php | 56 ++++++++++--------- templates/wifi_stations.php | 104 +++++++++++++++++++----------------- 2 files changed, 87 insertions(+), 73 deletions(-) diff --git a/includes/wifi_functions.php b/includes/wifi_functions.php index d7194b56..eb1e8d92 100755 --- a/includes/wifi_functions.php +++ b/includes/wifi_functions.php @@ -52,7 +52,8 @@ function nearbyWifiStations(&$networks, $cached = true) } $scan_results = cache( - $cacheKey, function () { + $cacheKey, + function () { exec('sudo wpa_cli -i ' . RASPI_WIFI_CLIENT_INTERFACE . ' scan'); sleep(3); @@ -63,18 +64,22 @@ function nearbyWifiStations(&$networks, $cached = true) } ); - // get the name of the AP - should be excluded von the nearby networks - exec('cat '.RASPI_HOSTAPD_CONFIG.' | sed -rn "s/ssid=(.*)\s*$/\1/p" ',$ap_ssid); + // get the name of the AP. Should be excluded from nearby networks + exec('cat '.RASPI_HOSTAPD_CONFIG.' | sed -rn "s/ssid=(.*)\s*$/\1/p" ', $ap_ssid); $ap_ssid = $ap_ssid[0]; - - foreach (explode("\n", $scan_results) as $network) { - $arrNetwork = preg_split("/[\t]+/", $network); // split result into array + + foreach (explode("\n", $scan_results) as $network) { + $arrNetwork = preg_split("/[\t]+/", $network); // split result into array if (!array_key_exists(4, $arrNetwork) || - trim($arrNetwork[4]) == $ap_ssid) continue; + trim($arrNetwork[4]) == $ap_ssid) { + continue; + } $ssid = trim($arrNetwork[4]); - // filter SSID string - anything invisable in 7bit ASCII or quotes -> ignore network - if( preg_match('[\x00-\x1f\x7f-\xff\'\`\\"]',$ssid)) continue; + // filter SSID string: anything invisible in 7bit ASCII or quotes -> ignore network + if (preg_match('[\x00-\x1f\x7f-\xff\'\`\\"]', $ssid)) { + continue; + } // If network is saved if (array_key_exists($ssid, $networks)) { @@ -93,11 +98,11 @@ function nearbyWifiStations(&$networks, $cached = true) } // Save RSSI, if the current value is larger than the already stored - if (array_key_exists(4, $arrNetwork) && array_key_exists($arrNetwork[4],$networks)) { - if(! array_key_exists('RSSI',$networks[$arrNetwork[4]]) || $networks[$ssid]['RSSI'] < $arrNetwork[2]) + if (array_key_exists(4, $arrNetwork) && array_key_exists($arrNetwork[4], $networks)) { + if (! array_key_exists('RSSI', $networks[$arrNetwork[4]]) || $networks[$ssid]['RSSI'] < $arrNetwork[2]) { $networks[$ssid]['RSSI'] = $arrNetwork[2]; + } } - } } @@ -111,17 +116,20 @@ function connectedWifiStations(&$networks) } } -function sortNetworksByRSSI(&$networks) { - $valRSSI = array(); - foreach ($networks as $SSID => $net) { - if (!array_key_exists('RSSI',$net)) $net['RSSI'] = -1000; - $valRSSI[$SSID] = $net['RSSI']; - } - $nets = $networks; - arsort($valRSSI); - $networks = array(); - foreach ($valRSSI as $SSID => $RSSI) { - $networks[$SSID] = $nets[$SSID]; - $networks[$SSID]['RSSI'] = $RSSI; +function sortNetworksByRSSI(&$networks) +{ + $valRSSI = array(); + foreach ($networks as $SSID => $net) { + if (!array_key_exists('RSSI', $net)) { + $net['RSSI'] = -1000; } + $valRSSI[$SSID] = $net['RSSI']; + } + $nets = $networks; + arsort($valRSSI); + $networks = array(); + foreach ($valRSSI as $SSID => $RSSI) { + networks[$SSID] = $nets[$SSID]; + $networks[$SSID]['RSSI'] = $RSSI; + } } diff --git a/templates/wifi_stations.php b/templates/wifi_stations.php index cdfcb654..d6705628 100755 --- a/templates/wifi_stations.php +++ b/templates/wifi_stations.php @@ -16,40 +16,46 @@ } ?>
    -
    +
    - - - - - - - + + + + + +
    -
    +
    - - - - X - + + + + X +
    -
    +
    - = -200 ) { - echo htmlspecialchars($network['RSSI'], ENT_QUOTES); - echo "dB ("; - if ($network['RSSI'] >= -50) echo 100; - elseif ($network['RSSI'] <= -100) echo 0; - else echo 2*($network['RSSI'] + 100); + = -200) { + echo htmlspecialchars($network['RSSI'], ENT_QUOTES); + echo "dB ("; + if ($network['RSSI'] >= -50) { + echo 100; + } elseif ($network['RSSI'] <= -100) { + echo 0; + } else { + echo 2*($network['RSSI'] + 100); + } echo "%)"; - } else echo " not found "; - ?> + } else { + echo " not found "; + } + ?>
    @@ -57,35 +63,35 @@ -
    +
    -
    -
    +
    +
    - - - - -
    - -
    - -
    -
    + + + + +
    + +
    + +
    + -
    - - " id="update" name="update" /> - - - " id="update" name="update" /> - - " name="delete" /> -
    +
    + + " id="update" name="update" /> + + + " id="update" name="update" /> + + " name="delete" /> +
    - - + + From eb6f2c5db70f96d4afcc5f56354efe979e4b593c Mon Sep 17 00:00:00 2001 From: billz Date: Sun, 24 May 2020 08:30:32 +0100 Subject: [PATCH 13/20] Fix build error --- includes/wifi_functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/wifi_functions.php b/includes/wifi_functions.php index eb1e8d92..248cbda0 100755 --- a/includes/wifi_functions.php +++ b/includes/wifi_functions.php @@ -129,7 +129,7 @@ function sortNetworksByRSSI(&$networks) arsort($valRSSI); $networks = array(); foreach ($valRSSI as $SSID => $RSSI) { - networks[$SSID] = $nets[$SSID]; + $networks[$SSID] = $nets[$SSID]; $networks[$SSID]['RSSI'] = $RSSI; } } From 4b7262a98b083bd6f771b7870379b016457de9cd Mon Sep 17 00:00:00 2001 From: billz Date: Tue, 26 May 2020 07:49:04 +0100 Subject: [PATCH 14/20] Remove 802.11w option from UI --- includes/hostapd.php | 1 - 1 file changed, 1 deletion(-) diff --git a/includes/hostapd.php b/includes/hostapd.php index 38908754..088fb67b 100755 --- a/includes/hostapd.php +++ b/includes/hostapd.php @@ -18,7 +18,6 @@ function DisplayHostAPDConfig() 'b' => '802.11b - 2.4 GHz', 'g' => '802.11g - 2.4 GHz', 'n' => '802.11n - 2.4 GHz', - 'w' => '802.11w - 2.4 Ghz', 'ac' => '802.11.ac - 5 GHz' ]; $arrSecurity = array(1 => 'WPA', 2 => 'WPA2', 3 => 'WPA+WPA2', 'none' => _("None")); From 68fb14c390509b65bf44c4ac4b7b191984f41170 Mon Sep 17 00:00:00 2001 From: Bill Zimmerman Date: Tue, 26 May 2020 08:52:40 +0200 Subject: [PATCH 15/20] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c19bef5e..33025128 100644 --- a/README.md +++ b/README.md @@ -80,9 +80,9 @@ By default RaspAP configures a routed AP for your clients to connect to. A bridg More information on Bridged AP mode is provided [on our wiki](https://github.com/billz/raspap-webgui/wiki/Bridged-AP-mode). ## Simultaneous AP and Wifi client -RaspAP lets you easily create an AP with a Wifi client configuration. With your system configured in managed mode, enable the AP from the **Advanced** tab of **Configure hotspot** by sliding the **Wifi client AP mode** toggle. Save settings and start the hotspot. The managed mode AP is functional without restart. +RaspAP lets you create an AP with a Wifi client configuration, often called AP-STA mode. With your system configured in managed mode, enable the AP from the **Advanced** tab of **Configure hotspot** by sliding the **Wifi client AP mode** toggle. Save settings and start the hotspot. The managed mode AP is functional without restart. -**Note:** This option is disabled until you configure your system as a wireless client. For a device operating in [managed mode](https://github.com/billz/raspap-webgui/wiki/FAQs#how-do-i-prepare-the-sd-card-to-connect-to-wifi-in-headless-mode) without an `eth0` connection, this configuration must be enabled _before_ a reboot. +**Note:** This option is disabled until you configure your system as a wireless client. For a device operating in [managed mode](https://github.com/billz/raspap-webgui/wiki/FAQs#how-do-i-prepare-the-sd-card-to-connect-to-wifi-in-headless-mode) without an `eth0` connection, this configuration must be enabled [_before_ a reboot](https://github.com/billz/raspap-webgui/wiki/RPi-Zero-W-AP-STA-mode). ## Support us RaspAP is free software, but powered by your support. If you find RaspAP useful for your personal or commercial projects, please [become a GitHub sponsor](https://github.com/sponsors/billz), join the project on [Open Collective](https://opencollective.com/raspap) or make a one-time donation with [PayPal](https://www.paypal.com/paypalme2/billzgithub). Any of these options makes a big difference! From 7410b45c05dab6f6a916fdfc0459cebd6e7f9f77 Mon Sep 17 00:00:00 2001 From: billz Date: Wed, 27 May 2020 08:31:54 +0100 Subject: [PATCH 16/20] Return model info for non-Pi devices --- includes/system.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/includes/system.php b/includes/system.php index a5e86010..1d885b1e 100755 --- a/includes/system.php +++ b/includes/system.php @@ -51,7 +51,12 @@ function RPiVersion() if (array_key_exists($rev, $revisions)) { return $revisions[$rev]; } else { - return 'Unknown Pi'; + exec('cat /proc/device-tree/model', $model); + if (isset($model[0])) { + return $model[0]; + } else { + return 'Unknown Device'; + } } } From 74723f0de32e68fc5555533b8f52908ad59f0972 Mon Sep 17 00:00:00 2001 From: billz Date: Wed, 27 May 2020 09:04:16 +0100 Subject: [PATCH 17/20] Update uninstaller. Resolves #593 --- installers/uninstall.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/installers/uninstall.sh b/installers/uninstall.sh index e89ece5c..542ddc65 100755 --- a/installers/uninstall.sh +++ b/installers/uninstall.sh @@ -20,6 +20,7 @@ readonly raspap_user="www-data" readonly raspap_sudoers="/etc/sudoers.d/090_raspap" readonly raspap_dnsmasq="/etc/dnsmasq.d/090_raspap.conf" readonly raspap_sysctl="/etc/sysctl.d/90_raspap.conf" +readonly raspap_network="/etc/systemd/network/" readonly rulesv4="/etc/iptables/rules.v4" webroot_dir="/var/www/html" @@ -44,13 +45,13 @@ function _get_linux_distro() { # Sets php package option based on Linux version, abort if unsupported distro function _set_php_package() { case $RELEASE in - "18.04"|"19.10") # Ubuntu Server + 18.04|19.10) # Ubuntu Server php_package="php7.4-cgi" phpcgiconf="/etc/php/7.4/cgi/php.ini" ;; - "10") + 10*) php_package="php7.3-cgi" phpcgiconf="/etc/php/7.3/cgi/php.ini" ;; - "9") + 9*) php_package="php7.0-cgi" phpcgiconf="/etc/php/7.0/cgi/php.ini" ;; esac @@ -148,7 +149,7 @@ function _remove_raspap_service() { function _restore_networking() { _install_log "Restoring networking config to pre-install defaults" echo "Disabling IP forwarding in $raspap_sysctl" - sudo rm $raspap_sysctl || _install_error "Unable to remove $raspap_sysctl" + sudo rm "$raspap_sysctl" || _install_error "Unable to remove $raspap_sysctl" sudo /etc/init.d/procps restart || _install_error "Unable to execute procps" echo "Checking iptables rules" rules=( @@ -169,6 +170,11 @@ function _restore_networking() { sudo iptables-save | sudo tee $rulesv4 > /dev/null || _install_error "Unable to execute iptables-save" fi echo "Done." + # Remove dnsmasq and bridge configs + echo "Removing 090_raspap.conf from dnsmasq" + sudo rm "$raspap_dnsmasq" || _install_error "Unable to remove $raspap_dnsmasq" + echo "Removing raspap bridge configurations" + sudo rm "$raspap_network"/raspap* || _install_error "Unable to remove bridge config" } # Removes installed packages From 7cc196f4f5284255ed8173e928cb5f6793fb82e5 Mon Sep 17 00:00:00 2001 From: billz Date: Wed, 27 May 2020 09:40:44 +0100 Subject: [PATCH 18/20] Update release version --- README.md | 2 +- config/config.php | 2 +- includes/defaults.php | 2 +- index.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 33025128..8ed48f5a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ![](https://i.imgur.com/xeKD93p.png) -[![Release 2.4](https://img.shields.io/badge/Release-2.4-green.svg)](https://github.com/billz/raspap-webgui/releases) [![Awesome](https://awesome.re/badge.svg)](https://github.com/thibmaek/awesome-raspberry-pi) [![Financial Contributors on Open Collective](https://opencollective.com/raspap/all/badge.svg?label=financial+contributors)](https://opencollective.com/raspap) ![https://travis-ci.com/billz/raspap-webgui/](https://img.shields.io/travis/com/billz/raspap-webgui/master) [![Twitter URL](https://img.shields.io/twitter/url?label=%40RaspAP&logoColor=%23d8224c&url=https%3A%2F%2Ftwitter.com%2Frasp_ap)](https://twitter.com/rasp_ap) [![Subreddit subscribers](https://img.shields.io/reddit/subreddit-subscribers/RaspAP?style=social)](https://www.reddit.com/r/RaspAP/) +[![Release 2.4.1](https://img.shields.io/badge/Release-2.4.1-green.svg)](https://github.com/billz/raspap-webgui/releases) [![Awesome](https://awesome.re/badge.svg)](https://github.com/thibmaek/awesome-raspberry-pi) [![Financial Contributors on Open Collective](https://opencollective.com/raspap/all/badge.svg?label=financial+contributors)](https://opencollective.com/raspap) ![https://travis-ci.com/billz/raspap-webgui/](https://img.shields.io/travis/com/billz/raspap-webgui/master) [![Twitter URL](https://img.shields.io/twitter/url?label=%40RaspAP&logoColor=%23d8224c&url=https%3A%2F%2Ftwitter.com%2Frasp_ap)](https://twitter.com/rasp_ap) [![Subreddit subscribers](https://img.shields.io/reddit/subreddit-subscribers/RaspAP?style=social)](https://www.reddit.com/r/RaspAP/) RaspAP lets you quickly get a WiFi access point up and running to share the connectivity of many popular [Debian-based devices](#supported-operating-systems), including the Raspberry Pi. Our popular [Quick installer](#quick-installer) creates a known-good default configuration that "just works" on all current Raspberry Pis with onboard wireless. A responsive interface gives you control over the relevant services and networking options. Advanced DHCP settings, OpenVPN client support, SSL, security audits, themes and multilingual options are included. diff --git a/config/config.php b/config/config.php index f638b2a7..faa08855 100755 --- a/config/config.php +++ b/config/config.php @@ -1,6 +1,6 @@ '2.4', + 'RASPI_VERSION' => '2.4.1', 'RASPI_CONFIG_NETWORKING' => RASPI_CONFIG.'/networking', 'RASPI_ADMIN_DETAILS' => RASPI_CONFIG.'/raspap.auth', 'RASPI_WIFI_CLIENT_INTERFACE' => 'wlan0', diff --git a/index.php b/index.php index 136c72b9..d6682b8e 100755 --- a/index.php +++ b/index.php @@ -13,7 +13,7 @@ * @author Lawrence Yau * @author Bill Zimmerman * @license GNU General Public License, version 3 (GPL-3.0) - * @version 2.4 + * @version 2.4.1 * @link https://github.com/billz/raspap-webgui * @see http://sirlagz.net/2013/02/08/raspap-webgui/ */ From 7393d220ef8933f63ed8715ad77c700f4b317ca4 Mon Sep 17 00:00:00 2001 From: Bill Zimmerman Date: Tue, 2 Jun 2020 00:11:30 +0200 Subject: [PATCH 19/20] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8ed48f5a..c63e289e 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ We hope you enjoy using RaspAP as much as we do creating it. Tell us how you use - [License](#license) ## Prerequisites -Start with a clean install of the [latest release of Raspbian](https://www.raspberrypi.org/downloads/raspbian/) (currently Buster). Raspbian Buster Lite is recommended. +Start with a clean install of the [latest release of Raspberry Pi OS (32-bit)](https://www.raspberrypi.org/downloads/raspbian/). Raspberry Pi OS (32-bit) Lite is recommended. 1. Update Raspbian, including the kernel and firmware, followed by a reboot: ``` From 1a59c06d42ea28ec7265bf8916f159f83baec680 Mon Sep 17 00:00:00 2001 From: Bill Zimmerman Date: Tue, 2 Jun 2020 00:22:10 +0200 Subject: [PATCH 20/20] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c63e289e..26953185 100644 --- a/README.md +++ b/README.md @@ -100,7 +100,7 @@ RaspAP was originally made for Raspbian, but now also installs on the following | Distribution | Release | Architecture | Support | |---|:---:|:---:|:---:| -| Raspbian | Buster | ARM | Official | +| Raspberry Pi OS | (32-bit) Lite Buster | ARM | Official | | Armbian | Buster | [ARM](https://docs.armbian.com/#supported-chips) | Official | | Debian | Buster | ARM / x86_64 | Beta | | Ubuntu | 18.04 LTS / 19.10 | ARM / x86_64 | Beta |