diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 505b7abf..abe8e634 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -8,9 +8,12 @@ assignees: '' --- **Before submitting an issue** -Please read this first https://github.com/billz/raspap-webgui/wiki/Reporting-issues -* [x] This is a bug report +All submitters MUST read this first https://github.com/billz/raspap-webgui/wiki/Reporting-issues + +Have a question or want to suggest a feature? You may do so here https://github.com/billz/raspap-webgui/discussions + +* [ ] This is a bug report * [ ] I searched existing issues before opening this one * [ ] I checked the FAQ before creating this issue * [ ] I have read and understand the issue reporting guidelines @@ -20,7 +23,7 @@ A clear and concise description of what the bug is. **Your environment** * Raspberry Pi hardware (examples: Pi 3 Model B+, Pi Zero W) -* Raspbian version (examples: Buster Lite, Buster Desktop) +* Raspbian version (examples: RPi OS Lite, Armbian) * Followed the project prerequisites? (Y/N) * Checked the project FAQ? (Y/N) * RaspAP Quick Install or Manual setup? diff --git a/BACKERS.md b/BACKERS.md index 9b7dcfa0..9104fb2b 100644 --- a/BACKERS.md +++ b/BACKERS.md @@ -32,3 +32,4 @@ Ralf J - "Thanks for RaspAP including OpenVPN. It was a big help for me." -€15 Felipe C - "Thanks for the good work on RaspAP!" -$6 Webagentur S - "Like what you and RaspAP are doing." -€20 Matthew B - "Great project, easy to set up." -£15 +Mikko M - "Thanks for the great RaspAP." -€10 diff --git a/README.md b/README.md index e5e383fa..2ab02526 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ![](https://i.imgur.com/xeKD93p.png) -[![Release 2.5.1](https://img.shields.io/badge/Release-2.5.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) [![Crowdin](https://badges.crowdin.net/raspap/localized.svg)](https://crowdin.com/project/raspap) [![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.5.2](https://img.shields.io/badge/Release-2.5.2-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) [![Crowdin](https://badges.crowdin.net/raspap/localized.svg)](https://crowdin.com/project/raspap) [![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/app/img/180x150.png b/app/img/180x150.png new file mode 100644 index 00000000..975230ef Binary files /dev/null and b/app/img/180x150.png differ diff --git a/includes/defaults.php b/includes/defaults.php index 88b52fe9..69377de8 100755 --- a/includes/defaults.php +++ b/includes/defaults.php @@ -6,7 +6,7 @@ if (!defined('RASPI_CONFIG')) { $defaults = [ 'RASPI_BRAND_TEXT' => 'RaspAP', - 'RASPI_VERSION' => '2.5.1', + 'RASPI_VERSION' => '2.5.2', 'RASPI_CONFIG_NETWORK' => RASPI_CONFIG.'/networking/defaults.json', 'RASPI_ADMIN_DETAILS' => RASPI_CONFIG.'/raspap.auth', 'RASPI_WIFI_AP_INTERFACE' => 'wlan0', diff --git a/index.php b/index.php index 8c702885..04aee0d1 100755 --- a/index.php +++ b/index.php @@ -14,7 +14,7 @@ * @author Lawrence Yau * @author Bill Zimmerman * @license GNU General Public License, version 3 (GPL-3.0) - * @version 2.5.1 + * @version 2.5.2 * @link https://github.com/billz/raspap-webgui/ * @link https://raspap.com/ * @see http://sirlagz.net/2013/02/08/raspap-webgui/ diff --git a/installers/common.sh b/installers/common.sh index d712f32c..cf6d2081 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -294,7 +294,7 @@ function _download_latest_files() { fi _install_log "Cloning latest files from github" - git clone --branch $branch --depth 1 $git_source_url /tmp/raspap-webgui || _install_status 1 "Unable to download files from github" + git clone --branch $branch --depth 1 -c advice.detachedHead=false $git_source_url /tmp/raspap-webgui || _install_status 1 "Unable to download files from github" sudo mv /tmp/raspap-webgui $webroot_dir || _install_status 1 "Unable to move raspap-webgui to web root" if [ "$upgrade" == 1 ]; then diff --git a/installers/raspbian.sh b/installers/raspbian.sh index bc8c5aab..35409dcf 100755 --- a/installers/raspbian.sh +++ b/installers/raspbian.sh @@ -37,7 +37,6 @@ # Set defaults repo="billz/raspap-webgui" -branch="master" assume_yes=0 upgrade=0 ovpn_option=1 @@ -51,8 +50,14 @@ readonly ANSI_RASPBERRY="\033[0;35m" readonly ANSI_ERROR="\033[1;37;41m" readonly ANSI_RESET="\033[m" +# Log output +readonly LOGFILE_PATH="/tmp" +exec > >(tee -i $LOGFILE_PATH/raspap_install.log) +exec 2>&1 + # Fetch latest release from GitHub API readonly RASPAP_LATEST=$(curl -s "https://api.github.com/repos/$repo/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' ) +branch="$RASPAP_LATEST" #override with the -b, --branch option # Define usage notes usage=$(cat << EOF @@ -62,7 +67,7 @@ Usage: raspbian.sh [OPTION]\n -o, --openvpn \n\tUsed with -y, --yes, sets OpenVPN install option (0=no install) -a, --adblock \n\tUsed with -y, --yes, sets Adblock install option (0=no install) -r, --repo, --repository \n\tOverrides the default GitHub repo (billz/raspap-webgui) --b, --branch \n\tOverrides the default git branch (master) +-b, --branch \n\tOverrides the default git branch (latest release) -h, --help\n\tOutputs usage notes and exits -u, --upgrade\n\tUpgrades an existing installation to the latest release version -v, --version\n\tOutputs release info and exits\n diff --git a/locale/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo index 79079375..a8716159 100644 Binary files a/locale/de_DE/LC_MESSAGES/messages.mo and b/locale/de_DE/LC_MESSAGES/messages.mo differ diff --git a/locale/de_DE/LC_MESSAGES/messages.po b/locale/de_DE/LC_MESSAGES/messages.po index c05b6f8e..a2b5b2e6 100644 --- a/locale/de_DE/LC_MESSAGES/messages.po +++ b/locale/de_DE/LC_MESSAGES/messages.po @@ -3,7 +3,7 @@ msgstr "" "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: 2020-04-12 10:21\n" +"PO-Revision-Date: 2020-04-14 08:51\n" "Last-Translator: Bill Zimmerman \n" "Language-Team: German\n" "Language: de_DE\n" @@ -181,8 +181,8 @@ msgstr "Übertragene Pakete" msgid "Transferred Bytes" msgstr "Übertragene Bytes" -msgid "Wireless Information" -msgstr "Informationen Funknetz" +msgid "Wireless Client" +msgstr "" msgid "Connected To" msgstr "Verbunden mit" diff --git a/locale/en_US/LC_MESSAGES/messages.mo b/locale/en_US/LC_MESSAGES/messages.mo index 54e887d8..606d982e 100644 Binary files a/locale/en_US/LC_MESSAGES/messages.mo and b/locale/en_US/LC_MESSAGES/messages.mo differ diff --git a/locale/nl_NL/LC_MESSAGES/messages.mo b/locale/nl_NL/LC_MESSAGES/messages.mo index 7f05fd36..265bcf1d 100644 Binary files a/locale/nl_NL/LC_MESSAGES/messages.mo and b/locale/nl_NL/LC_MESSAGES/messages.mo differ diff --git a/locale/nl_NL/LC_MESSAGES/messages.po b/locale/nl_NL/LC_MESSAGES/messages.po index ca7711f8..4b21a39e 100644 --- a/locale/nl_NL/LC_MESSAGES/messages.po +++ b/locale/nl_NL/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 -# 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: Tom\n" -"Language-Team: \n" -"Language: nl\n" +"PO-Revision-Date: 2020-04-14 08:51\n" +"Last-Translator: Bill Zimmerman \n" +"Language-Team: Dutch\n" +"Language: nl_NL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.8\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Crowdin-Project: raspap\n" +"X-Crowdin-Language: nl\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 apparaat" msgid "Hotspot" msgstr "Hotspot" +msgid "Memory Use" +msgstr "" + +msgid "CPU Temp" +msgstr "" + msgid "Networking" msgstr "Netwerk" @@ -178,8 +181,8 @@ msgstr "Verzonden pakketen" msgid "Transferred Bytes" msgstr "Verzonden Bytes" -msgid "Wireless Information" -msgstr "Draadloze informatie" +msgid "Wireless Client" +msgstr "" msgid "Connected To" msgstr "Verbinden met" @@ -224,7 +227,7 @@ msgid "Interface is up" msgstr "Interface is up" msgid "Interface is down" -msgstr "Interface is down" +msgstr "" msgid "Interface already down" msgstr "Interface reeds down" @@ -248,6 +251,9 @@ msgstr "Clienten lijst" msgid "Interface" msgstr "Interface" +msgid "DNS Server" +msgstr "DNS server" + msgid "Starting IP Address" msgstr "Beginnend ip adres" @@ -279,16 +285,16 @@ msgid "Host name" msgstr "Hostnaam" msgid "Client ID" -msgstr "Client ID" +msgstr "Klant ID" msgid "Information provided by Dnsmasq" msgstr "Informatie gegeven door Dnsmasq" msgid "Stop dnsmasq" -msgstr "Stop dnsmasq" +msgstr "" msgid "Start dnsmasq" -msgstr "Start dnsmasq" +msgstr "" msgid "Dnsmasq configuration updated successfully" msgstr "Dnsmasq configuratie succesvol geupdate" @@ -318,31 +324,31 @@ msgid "Dnsmasq is not running" msgstr "Dnsmasq is gestopt" msgid "Upstream DNS servers" -msgstr "Upstream DNS servers" +msgstr "" msgid "Only ever query DNS servers configured below" -msgstr "Only ever query DNS servers configured below" +msgstr "" 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 "" msgid "This option adds no-resolv to the dnsmasq configuration." -msgstr "This option adds no-resolv to the dnsmasq configuration." +msgstr "" msgid "Add upstream DNS server" -msgstr "Add upstream DNS server" +msgstr "" msgid "Format" -msgstr "Format" +msgstr "Formaat" msgid "Choose a hosted server" -msgstr "Choose a hosted server" +msgstr "" msgid "Log DHCP requests" -msgstr "Log DHCP requests" +msgstr "" msgid "Log DNS queries" -msgstr "Log DNS queries" +msgstr "" #: includes/hostapd.php msgid "Basic" @@ -409,7 +415,7 @@ msgid "Unable to save wifi hotspot settings" msgstr "Mislukt om Wi-FI Hotspot instellen op te slaan" msgid "Start hotspot" -msgstr "Start hotspot" +msgstr "" msgid "Stop hotspot" msgstr "Stop hotstop" @@ -426,6 +432,9 @@ msgstr "Logboek uitvoer" msgid "WiFi client AP mode" msgstr "WiFi-client AP-modus" +msgid "Bridged AP mode" +msgstr "" + msgid "Hide SSID in broadcast" msgstr "Verberg SSID in uitzending" @@ -445,9 +454,6 @@ msgstr "Huidige instellingen" msgid "Default Gateway" msgstr "Standaard Gateway" -msgid "DNS Server" -msgstr "DNS Server" - msgid "Alternate DNS Server" msgstr "Alternatieve DNS-server" @@ -492,7 +498,7 @@ msgid "Language setting saved" msgstr "Taalinstellingen opgeslagen" msgid "Console" -msgstr "Console" +msgstr "" msgid "Hostname" msgstr "Hostnaam" @@ -501,7 +507,7 @@ msgid "Pi Revision" msgstr "Pi-Revisie" msgid "Uptime" -msgstr "Uptime" +msgstr "" msgid "Memory Used" msgstr "Geheugen gebruik" @@ -554,7 +560,7 @@ msgid "Monthly" msgstr "Per maand" msgid "interface" -msgstr "interface" +msgstr "" msgid "date" msgstr "datum" @@ -634,7 +640,7 @@ msgid "TOR is running" msgstr "TOR draait" msgid "Relay" -msgstr "Relay" +msgstr "" msgid "Relay settings" msgstr "Relay-instellingen" @@ -660,6 +666,10 @@ msgstr "We proberen TOR op te starten" msgid "Attempting to stop TOR" msgstr "We proberen TOR te stoppen" +#: template/dashboard.php +msgid "Bridged AP mode is enabled. For Hostname and IP, see your router's admin page." +msgstr "" + #: common form controls msgid "Save settings" msgstr "Instellingen opslaan" @@ -681,3 +691,46 @@ msgstr "omhoog" msgid "down" msgstr "omlaag" + +msgid "adblock" +msgstr "" + +msgid "Ad Blocking" +msgstr "" + +msgid "Start Ad Blocking" +msgstr "" + +msgid "Restart Ad Blocking" +msgstr "" + +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 "" + +msgid "This option adds conf-file and addn-hosts to the dnsmasq configuration." +msgstr "" + +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 "Informatie verstrekt door adblock" + diff --git a/locale/pocompile.sh b/locale/pocompile.sh index 50795c28..f727cac2 100755 --- a/locale/pocompile.sh +++ b/locale/pocompile.sh @@ -2,11 +2,11 @@ # Compiles portable object (.po) files into machine object (.mo) files # Requires GNU gettext +# Install with: apt-get install gettext arrLocales=($PWD/*/); # compiles message catalogs to binary format -# requires GNU gettext for f in "${arrLocales[@]}"; do echo -n `msgfmt -o ${f}LC_MESSAGES/messages.mo ${f}LC_MESSAGES/messages.po` echo "Compiled ${f}LC_MESSAGES/messages.po" diff --git a/locale/tr_TR/LC_MESSAGES/messages.po b/locale/tr_TR/LC_MESSAGES/messages.po index 807f15bd..d47beaf2 100644 --- a/locale/tr_TR/LC_MESSAGES/messages.po +++ b/locale/tr_TR/LC_MESSAGES/messages.po @@ -11,7 +11,7 @@ msgstr "" "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: Furkan 'Cuqer' Sarıboğa \n" +"Last-Translator: Furkan Sarıboğa \n" "Language-Team: \n" "Language: en_US\n" "MIME-Version: 1.0\n" @@ -252,7 +252,7 @@ msgid "Starting IP Address" msgstr "Başlangıc IP Adresi" msgid "Ending IP Address" -msgstr "Ending IP Adresi" +msgstr "Bitiş IP Adresi" msgid "Static Leases" msgstr "Statik Kiralamalar" @@ -270,10 +270,10 @@ msgid "Active DHCP leases" msgstr "Aktif DHCP kiraları" msgid "Expire time" -msgstr "Aşım Zamanı" +msgstr "Aşım zamanı" msgid "MAC Address" -msgstr "MAC adresi" +msgstr "MAC Adresi" msgid "Host name" msgstr "Sunucu adı" @@ -318,31 +318,31 @@ msgid "Dnsmasq is not running" msgstr "Dnsmasq çalışmıyor" msgid "Upstream DNS servers" -msgstr "Upstream DNS servers" +msgstr "Ana DNS sunucuları" msgid "Only ever query DNS servers configured below" -msgstr "Only ever query DNS servers configured below" +msgstr "Yalnızca aşağıda yapılandırılmış DNS sunucularını sorgulayın" 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 "Eğer RaspAP'ın sadece aşağıda yapılandırılan sunuculara DNS sorgusu göndermesini istiyorsanız bu ayarı aktifleştirin. Varsayılan olarak RaspAP aynı zamanda kendi ana DHCP sunucusunun isim sunucularını da kullanır." msgid "This option adds no-resolv to the dnsmasq configuration." -msgstr "This option adds no-resolv to the dnsmasq configuration." +msgstr "Bu ayar dnsmasq yapılandırmasına no-resolv'ı ekler." msgid "Add upstream DNS server" -msgstr "Add upstream DNS server" +msgstr "Ana(Upstream) DNS sunucusu ekle" msgid "Format" -msgstr "Format" +msgstr "Biçimlendir" msgid "Choose a hosted server" -msgstr "Choose a hosted server" +msgstr "Bir kurulu sunucu seçin" msgid "Log DHCP requests" -msgstr "Log DHCP requests" +msgstr "DHCP isteklerini kaydet" msgid "Log DNS queries" -msgstr "Log DNS queries" +msgstr "DNS sorgularını kaydet" #: includes/hostapd.php msgid "Basic" @@ -379,10 +379,10 @@ msgid "Information provided by hostapd" msgstr "Bilgi hostapd tarafından sağlandı" msgid "Attempting to start hotspot" -msgstr "paylaşım başlatılıyor" +msgstr "Paylaşım noktası başlatılıyor" msgid "Attempting to stop hotspot" -msgstr "Paylaşım durduruluyor" +msgstr "Paylaşım noktası durduruluyor" msgid "HostAPD is not running" msgstr "HostAPD çalışmıyor" @@ -572,7 +572,7 @@ msgid "Loading {0} bandwidth chart" msgstr "{0} bant genişliği tablosu yükleniyor" msgid "Showing {0} to {1} of {2} entries" -msgstr "{2} girdiden {0} ve {1} arası gösteriliyor" +msgstr "{2} girdiden {0} ve {1} arasındakiler gösteriliyor" #: includes/openvpn.php msgid "OpenVPN is not running" diff --git a/templates/hostapd/security.php b/templates/hostapd/security.php index ae6f67c8..7389ee41 100644 --- a/templates/hostapd/security.php +++ b/templates/hostapd/security.php @@ -20,7 +20,7 @@
- RaspAP Wifi QR code + RaspAP Wifi QR code
diff --git a/templates/openvpn.php b/templates/openvpn.php index bfe83d9f..f6cd45b6 100755 --- a/templates/openvpn.php +++ b/templates/openvpn.php @@ -27,32 +27,39 @@

-
-
-
-
-
-
-
-
- - -
-
-
-
- - -
-
-
-
-
- - +
+
+
+
+
+
-
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+ + +
+
+
+
+
+ +
+

@@ -67,10 +74,10 @@ ' , PHP_EOL; - } else { - echo '' , PHP_EOL; - } + echo '' , PHP_EOL; + } else { + echo '' , PHP_EOL; + } ?> diff --git a/yarn.lock b/yarn.lock index c6c21827..2b445d7f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2125,9 +2125,9 @@ inherits@2.0.3: integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= ini@^1.3.4, ini@~1.3.0: - version "1.3.5" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" - integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== interpret@^1.1.0: version "1.2.0"