frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2023-10-10 13:37:24 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into feature/dhcp-eth0

Browse Source
This commit is contained in:
Bill Zimmerman 2020-12-12 17:41:41 +01:00 committed by GitHub
commit 16f4c47f00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 165 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.github/ISSUE_TEMPLATE/bug_report.md vendored
View File

@ -8,9 +8,12 @@ assignees: ''
--- ---
**Before submitting an issue** **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 searched existing issues before opening this one
* [ ] I checked the FAQ before creating this issue * [ ] I checked the FAQ before creating this issue
* [ ] I have read and understand the issue reporting guidelines * [ ] 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** **Your environment**
* Raspberry Pi hardware (examples: Pi 3 Model B+, Pi Zero W) * 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) * Followed the project prerequisites? (Y/N)
* Checked the project FAQ? (Y/N) * Checked the project FAQ? (Y/N)
* RaspAP Quick Install or Manual setup? * RaspAP Quick Install or Manual setup?

1
BACKERS.md
View File

@ -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 Felipe C - "Thanks for the good work on RaspAP!" -$6
Webagentur S - "Like what you and RaspAP are doing." -€20 Webagentur S - "Like what you and RaspAP are doing." -€20
Matthew B - "Great project, easy to set up." -£15 Matthew B - "Great project, easy to set up." -£15
Mikko M - "Thanks for the great RaspAP." -€10

2
README.md
View File

@ -1,5 +1,5 @@
![](https://i.imgur.com/xeKD93p.png) ![](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. 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.

BIN
app/img/180x150.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 37 KiB

2
includes/defaults.php
View File

@ -6,7 +6,7 @@ if (!defined('RASPI_CONFIG')) {
$defaults = [ $defaults = [
'RASPI_BRAND_TEXT' => 'RaspAP', 'RASPI_BRAND_TEXT' => 'RaspAP',
'RASPI_VERSION' => '2.5.1', 'RASPI_VERSION' => '2.5.2',
'RASPI_CONFIG_NETWORK' => RASPI_CONFIG.'/networking/defaults.json', 'RASPI_CONFIG_NETWORK' => RASPI_CONFIG.'/networking/defaults.json',
'RASPI_ADMIN_DETAILS' => RASPI_CONFIG.'/raspap.auth', 'RASPI_ADMIN_DETAILS' => RASPI_CONFIG.'/raspap.auth',
'RASPI_WIFI_AP_INTERFACE' => 'wlan0', 'RASPI_WIFI_AP_INTERFACE' => 'wlan0',

2
index.php
View File

@ -14,7 +14,7 @@
* @author Lawrence Yau <sirlagz@gmail.com> * @author Lawrence Yau <sirlagz@gmail.com>
* @author Bill Zimmerman <billzimmerman@gmail.com> * @author Bill Zimmerman <billzimmerman@gmail.com>
* @license GNU General Public License, version 3 (GPL-3.0) * @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://github.com/billz/raspap-webgui/
* @link https://raspap.com/ * @link https://raspap.com/
* @see http://sirlagz.net/2013/02/08/raspap-webgui/ * @see http://sirlagz.net/2013/02/08/raspap-webgui/

2
installers/common.sh
View File

@ -294,7 +294,7 @@ function _download_latest_files() {
fi fi
_install_log "Cloning latest files from github" _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" sudo mv /tmp/raspap-webgui $webroot_dir || _install_status 1 "Unable to move raspap-webgui to web root"
if [ "$upgrade" == 1 ]; then if [ "$upgrade" == 1 ]; then

9
installers/raspbian.sh
View File

@ -37,7 +37,6 @@
# Set defaults # Set defaults
repo="billz/raspap-webgui" repo="billz/raspap-webgui"
branch="master"
assume_yes=0 assume_yes=0
upgrade=0 upgrade=0
ovpn_option=1 ovpn_option=1
@ -51,8 +50,14 @@ readonly ANSI_RASPBERRY="\033[0;35m"
readonly ANSI_ERROR="\033[1;37;41m" readonly ANSI_ERROR="\033[1;37;41m"
readonly ANSI_RESET="\033[m" 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 # Fetch latest release from GitHub API
readonly RASPAP_LATEST=$(curl -s "https://api.github.com/repos/$repo/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' ) 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 # Define usage notes
usage=$(cat << EOF usage=$(cat << EOF
@ -62,7 +67,7 @@ Usage: raspbian.sh [OPTION]\n
-o, --openvpn <flag>\n\tUsed with -y, --yes, sets OpenVPN install option (0=no install) -o, --openvpn <flag>\n\tUsed with -y, --yes, sets OpenVPN install option (0=no install)
-a, --adblock <flag>\n\tUsed with -y, --yes, sets Adblock install option (0=no install) -a, --adblock <flag>\n\tUsed with -y, --yes, sets Adblock install option (0=no install)
-r, --repo, --repository <name>\n\tOverrides the default GitHub repo (billz/raspap-webgui) -r, --repo, --repository <name>\n\tOverrides the default GitHub repo (billz/raspap-webgui)
-b, --branch <name>\n\tOverrides the default git branch (master) -b, --branch <name>\n\tOverrides the default git branch (latest release)
-h, --help\n\tOutputs usage notes and exits -h, --help\n\tOutputs usage notes and exits
-u, --upgrade\n\tUpgrades an existing installation to the latest release version -u, --upgrade\n\tUpgrades an existing installation to the latest release version
-v, --version\n\tOutputs release info and exits\n -v, --version\n\tOutputs release info and exits\n

BIN
locale/de_DE/LC_MESSAGES/messages.mo
View File

Binary file not shown.

6
locale/de_DE/LC_MESSAGES/messages.po
View File

@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: raspap\n" "Project-Id-Version: raspap\n"
"Report-Msgid-Bugs-To: Bill Zimmerman <billzimmerman@gmail.com>\n" "Report-Msgid-Bugs-To: Bill Zimmerman <billzimmerman@gmail.com>\n"
"POT-Creation-Date: 2017-10-19 08:56+0000\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 <billzimmerman@gmail.com>\n" "Last-Translator: Bill Zimmerman <billzimmerman@gmail.com>\n"
"Language-Team: German\n" "Language-Team: German\n"
"Language: de_DE\n" "Language: de_DE\n"
@ -181,8 +181,8 @@ msgstr "Übertragene Pakete"
msgid "Transferred Bytes" msgid "Transferred Bytes"
msgstr "Übertragene Bytes" msgstr "Übertragene Bytes"
msgid "Wireless Information" msgid "Wireless Client"
msgstr "Informationen Funknetz" msgstr ""
msgid "Connected To" msgid "Connected To"
msgstr "Verbunden mit" msgstr "Verbunden mit"

BIN
locale/en_US/LC_MESSAGES/messages.mo
View File

Binary file not shown.

BIN
locale/nl_NL/LC_MESSAGES/messages.mo
View File

Binary file not shown.

123
locale/nl_NL/LC_MESSAGES/messages.po
View File

@ -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 "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 1.2.1\n" "Project-Id-Version: raspap\n"
"Report-Msgid-Bugs-To: Bill Zimmerman <billzimmerman@gmail.com>\n" "Report-Msgid-Bugs-To: Bill Zimmerman <billzimmerman@gmail.com>\n"
"POT-Creation-Date: 2017-10-19 08:56+0000\n" "POT-Creation-Date: 2017-10-19 08:56+0000\n"
"PO-Revision-Date: 2019-10-21 23:15+0000\n" "PO-Revision-Date: 2020-04-14 08:51\n"
"Last-Translator: Tom\n" "Last-Translator: Bill Zimmerman <billzimmerman@gmail.com>\n"
"Language-Team: \n" "Language-Team: Dutch\n"
"Language: nl\n" "Language: nl_NL\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\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 #: index.php
msgid "RaspAP Wifi Configuration Portal" msgid "RaspAP Wifi Configuration Portal"
@ -37,6 +34,12 @@ msgstr "WiFi apparaat"
msgid "Hotspot" msgid "Hotspot"
msgstr "Hotspot" msgstr "Hotspot"
msgid "Memory Use"
msgstr ""
msgid "CPU Temp"
msgstr ""
msgid "Networking" msgid "Networking"
msgstr "Netwerk" msgstr "Netwerk"
@ -178,8 +181,8 @@ msgstr "Verzonden pakketen"
msgid "Transferred Bytes" msgid "Transferred Bytes"
msgstr "Verzonden Bytes" msgstr "Verzonden Bytes"
msgid "Wireless Information" msgid "Wireless Client"
msgstr "Draadloze informatie" msgstr ""
msgid "Connected To" msgid "Connected To"
msgstr "Verbinden met" msgstr "Verbinden met"
@ -224,7 +227,7 @@ msgid "Interface is up"
msgstr "Interface is up" msgstr "Interface is up"
msgid "Interface is down" msgid "Interface is down"
msgstr "Interface is down" msgstr ""
msgid "Interface already down" msgid "Interface already down"
msgstr "Interface reeds down" msgstr "Interface reeds down"
@ -248,6 +251,9 @@ msgstr "Clienten lijst"
msgid "Interface" msgid "Interface"
msgstr "Interface" msgstr "Interface"
msgid "DNS Server"
msgstr "DNS server"
msgid "Starting IP Address" msgid "Starting IP Address"
msgstr "Beginnend ip adres" msgstr "Beginnend ip adres"
@ -279,16 +285,16 @@ msgid "Host name"
msgstr "Hostnaam" msgstr "Hostnaam"
msgid "Client ID" msgid "Client ID"
msgstr "Client ID" msgstr "Klant ID"
msgid "Information provided by Dnsmasq" msgid "Information provided by Dnsmasq"
msgstr "Informatie gegeven door Dnsmasq" msgstr "Informatie gegeven door Dnsmasq"
msgid "Stop dnsmasq" msgid "Stop dnsmasq"
msgstr "Stop dnsmasq" msgstr ""
msgid "Start dnsmasq" msgid "Start dnsmasq"
msgstr "Start dnsmasq" msgstr ""
msgid "Dnsmasq configuration updated successfully" msgid "Dnsmasq configuration updated successfully"
msgstr "Dnsmasq configuratie succesvol geupdate" msgstr "Dnsmasq configuratie succesvol geupdate"
@ -318,31 +324,31 @@ msgid "Dnsmasq is not running"
msgstr "Dnsmasq is gestopt" msgstr "Dnsmasq is gestopt"
msgid "Upstream DNS servers" msgid "Upstream DNS servers"
msgstr "Upstream DNS servers" msgstr ""
msgid "Only ever query DNS servers configured below" 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 <b>send DNS queries to the servers configured below exclusively</b>. By default RaspAP also uses its upstream DHCP server's name servers." msgid "Enable this option if you want RaspAP to <b>send DNS queries to the servers configured below exclusively</b>. By default RaspAP also uses its upstream DHCP server's name servers."
msgstr "Enable this option if you want RaspAP to <b>send DNS queries to the servers configured below exclusively</b>. By default RaspAP also uses its upstream DHCP server's name servers." msgstr ""
msgid "This option adds <code>no-resolv</code> to the dnsmasq configuration." msgid "This option adds <code>no-resolv</code> to the dnsmasq configuration."
msgstr "This option adds <code>no-resolv</code> to the dnsmasq configuration." msgstr ""
msgid "Add upstream DNS server" msgid "Add upstream DNS server"
msgstr "Add upstream DNS server" msgstr ""
msgid "Format" msgid "Format"
msgstr "Format" msgstr "Formaat"
msgid "Choose a hosted server" msgid "Choose a hosted server"
msgstr "Choose a hosted server" msgstr ""
msgid "Log DHCP requests" msgid "Log DHCP requests"
msgstr "Log DHCP requests" msgstr ""
msgid "Log DNS queries" msgid "Log DNS queries"
msgstr "Log DNS queries" msgstr ""
#: includes/hostapd.php #: includes/hostapd.php
msgid "Basic" msgid "Basic"
@ -409,7 +415,7 @@ msgid "Unable to save wifi hotspot settings"
msgstr "Mislukt om Wi-FI Hotspot instellen op te slaan" msgstr "Mislukt om Wi-FI Hotspot instellen op te slaan"
msgid "Start hotspot" msgid "Start hotspot"
msgstr "Start hotspot" msgstr ""
msgid "Stop hotspot" msgid "Stop hotspot"
msgstr "Stop hotstop" msgstr "Stop hotstop"
@ -426,6 +432,9 @@ msgstr "Logboek uitvoer"
msgid "WiFi client AP mode" msgid "WiFi client AP mode"
msgstr "WiFi-client AP-modus" msgstr "WiFi-client AP-modus"
msgid "Bridged AP mode"
msgstr ""
msgid "Hide SSID in broadcast" msgid "Hide SSID in broadcast"
msgstr "Verberg SSID in uitzending" msgstr "Verberg SSID in uitzending"
@ -445,9 +454,6 @@ msgstr "Huidige instellingen"
msgid "Default Gateway" msgid "Default Gateway"
msgstr "Standaard Gateway" msgstr "Standaard Gateway"
msgid "DNS Server"
msgstr "DNS Server"
msgid "Alternate DNS Server" msgid "Alternate DNS Server"
msgstr "Alternatieve DNS-server" msgstr "Alternatieve DNS-server"
@ -492,7 +498,7 @@ msgid "Language setting saved"
msgstr "Taalinstellingen opgeslagen" msgstr "Taalinstellingen opgeslagen"
msgid "Console" msgid "Console"
msgstr "Console" msgstr ""
msgid "Hostname" msgid "Hostname"
msgstr "Hostnaam" msgstr "Hostnaam"
@ -501,7 +507,7 @@ msgid "Pi Revision"
msgstr "Pi-Revisie" msgstr "Pi-Revisie"
msgid "Uptime" msgid "Uptime"
msgstr "Uptime" msgstr ""
msgid "Memory Used" msgid "Memory Used"
msgstr "Geheugen gebruik" msgstr "Geheugen gebruik"
@ -554,7 +560,7 @@ msgid "Monthly"
msgstr "Per maand" msgstr "Per maand"
msgid "interface" msgid "interface"
msgstr "interface" msgstr ""
msgid "date" msgid "date"
msgstr "datum" msgstr "datum"
@ -634,7 +640,7 @@ msgid "TOR is running"
msgstr "TOR draait" msgstr "TOR draait"
msgid "Relay" msgid "Relay"
msgstr "Relay" msgstr ""
msgid "Relay settings" msgid "Relay settings"
msgstr "Relay-instellingen" msgstr "Relay-instellingen"
@ -660,6 +666,10 @@ msgstr "We proberen TOR op te starten"
msgid "Attempting to stop TOR" msgid "Attempting to stop TOR"
msgstr "We proberen TOR te stoppen" 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 #: common form controls
msgid "Save settings" msgid "Save settings"
msgstr "Instellingen opslaan" msgstr "Instellingen opslaan"
@ -681,3 +691,46 @@ msgstr "omhoog"
msgid "down" msgid "down"
msgstr "omlaag" 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 <b>block DNS requests for ads, tracking and other virtual garbage</b>. Blocklists are gathered from multiple, actively maintained sources and automatically updated, cleaned, optimized and moderated on a daily basis."
msgstr ""
msgid "This option adds <code>conf-file</code> and <code>addn-hosts</code> 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"

2
locale/pocompile.sh
View File

@ -2,11 +2,11 @@
# Compiles portable object (.po) files into machine object (.mo) files # Compiles portable object (.po) files into machine object (.mo) files
# Requires GNU gettext # Requires GNU gettext
# Install with: apt-get install gettext
arrLocales=($PWD/*/); arrLocales=($PWD/*/);
# compiles message catalogs to binary format # compiles message catalogs to binary format
# requires GNU gettext
for f in "${arrLocales[@]}"; do for f in "${arrLocales[@]}"; do
echo -n `msgfmt -o ${f}LC_MESSAGES/messages.mo ${f}LC_MESSAGES/messages.po` echo -n `msgfmt -o ${f}LC_MESSAGES/messages.mo ${f}LC_MESSAGES/messages.po`
echo "Compiled ${f}LC_MESSAGES/messages.po" echo "Compiled ${f}LC_MESSAGES/messages.po"

32
locale/tr_TR/LC_MESSAGES/messages.po
View File

@ -11,7 +11,7 @@ msgstr ""
"Report-Msgid-Bugs-To: Bill Zimmerman <billzimmerman@gmail.com>\n" "Report-Msgid-Bugs-To: Bill Zimmerman <billzimmerman@gmail.com>\n"
"POT-Creation-Date: 2017-10-19 08:56+0000\n" "POT-Creation-Date: 2017-10-19 08:56+0000\n"
"PO-Revision-Date: 2019-10-21 23:15+0000\n" "PO-Revision-Date: 2019-10-21 23:15+0000\n"
"Last-Translator: Furkan 'Cuqer' Sarıboğa <cuqerr@gmail.com>\n" "Last-Translator: Furkan Sarıboğa <furkan.gnu@gmail.com>\n"
"Language-Team: \n" "Language-Team: \n"
"Language: en_US\n" "Language: en_US\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -252,7 +252,7 @@ msgid "Starting IP Address"
msgstr "Başlangıc IP Adresi" msgstr "Başlangıc IP Adresi"
msgid "Ending IP Address" msgid "Ending IP Address"
msgstr "Ending IP Adresi" msgstr "Bitiş IP Adresi"
msgid "Static Leases" msgid "Static Leases"
msgstr "Statik Kiralamalar" msgstr "Statik Kiralamalar"
@ -270,10 +270,10 @@ msgid "Active DHCP leases"
msgstr "Aktif DHCP kiraları" msgstr "Aktif DHCP kiraları"
msgid "Expire time" msgid "Expire time"
msgstr "Aşım Zamanı" msgstr "Aşım zamanı"
msgid "MAC Address" msgid "MAC Address"
msgstr "MAC adresi" msgstr "MAC Adresi"
msgid "Host name" msgid "Host name"
msgstr "Sunucu adı" msgstr "Sunucu adı"
@ -318,31 +318,31 @@ msgid "Dnsmasq is not running"
msgstr "Dnsmasq çalışmıyor" msgstr "Dnsmasq çalışmıyor"
msgid "Upstream DNS servers" msgid "Upstream DNS servers"
msgstr "Upstream DNS servers" msgstr "Ana DNS sunucuları"
msgid "Only ever query DNS servers configured below" 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 <b>send DNS queries to the servers configured below exclusively</b>. By default RaspAP also uses its upstream DHCP server's name servers." msgid "Enable this option if you want RaspAP to <b>send DNS queries to the servers configured below exclusively</b>. By default RaspAP also uses its upstream DHCP server's name servers."
msgstr "Enable this option if you want RaspAP to <b>send DNS queries to the servers configured below exclusively</b>. By default RaspAP also uses its upstream DHCP server's name servers." msgstr "Eğer RaspAP'ın <b>sadece aşağıda yapılandırılan sunuculara DNS sorgusu göndermesini istiyorsanız</b> bu ayarı aktifleştirin. Varsayılan olarak RaspAP aynı zamanda kendi ana DHCP sunucusunun isim sunucularını da kullanır."
msgid "This option adds <code>no-resolv</code> to the dnsmasq configuration." msgid "This option adds <code>no-resolv</code> to the dnsmasq configuration."
msgstr "This option adds <code>no-resolv</code> to the dnsmasq configuration." msgstr "Bu ayar dnsmasq yapılandırmasına <code>no-resolv</code>'ı ekler."
msgid "Add upstream DNS server" msgid "Add upstream DNS server"
msgstr "Add upstream DNS server" msgstr "Ana(Upstream) DNS sunucusu ekle"
msgid "Format" msgid "Format"
msgstr "Format" msgstr "Biçimlendir"
msgid "Choose a hosted server" msgid "Choose a hosted server"
msgstr "Choose a hosted server" msgstr "Bir kurulu sunucu seçin"
msgid "Log DHCP requests" msgid "Log DHCP requests"
msgstr "Log DHCP requests" msgstr "DHCP isteklerini kaydet"
msgid "Log DNS queries" msgid "Log DNS queries"
msgstr "Log DNS queries" msgstr "DNS sorgularını kaydet"
#: includes/hostapd.php #: includes/hostapd.php
msgid "Basic" msgid "Basic"
@ -379,10 +379,10 @@ msgid "Information provided by hostapd"
msgstr "Bilgi hostapd tarafından sağlandı" msgstr "Bilgi hostapd tarafından sağlandı"
msgid "Attempting to start hotspot" 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" msgid "Attempting to stop hotspot"
msgstr "Paylaşım durduruluyor" msgstr "Paylaşım noktası durduruluyor"
msgid "HostAPD is not running" msgid "HostAPD is not running"
msgstr "HostAPD çalışmıyor" msgstr "HostAPD çalışmıyor"
@ -572,7 +572,7 @@ msgid "Loading {0} bandwidth chart"
msgstr "{0} bant genişliği tablosu yükleniyor" msgstr "{0} bant genişliği tablosu yükleniyor"
msgid "Showing {0} to {1} of {2} entries" 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 #: includes/openvpn.php
msgid "OpenVPN is not running" msgid "OpenVPN is not running"

2
templates/hostapd/security.php
View File

@ -20,7 +20,7 @@
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<figure class="figure"> <figure class="figure">
<img src="/app/img/wifi-qr-code.php" class="figure-img img-fluid" alt="RaspAP Wifi QR code" style="width:100%;"> <img src="app/img/wifi-qr-code.php" class="figure-img img-fluid" alt="RaspAP Wifi QR code" style="width:100%;">
<figcaption class="figure-caption"><?php echo _("Scan this QR code with your phone to connect to this RaspAP."); ?></figcaption> <figcaption class="figure-caption"><?php echo _("Scan this QR code with your phone to connect to this RaspAP."); ?></figcaption>
</figure> </figure>
</div> </div>

63
templates/openvpn.php
View File

@ -27,32 +27,39 @@
<div class="tab-content"> <div class="tab-content">
<div class="tab-pane active" id="openvpnclient"> <div class="tab-pane active" id="openvpnclient">
<h4 class="mt-3"><?php echo _("Client settings"); ?></h4> <h4 class="mt-3"><?php echo _("Client settings"); ?></h4>
<div class="row"> <div class="row">
<div class="col-md-6 mt-2 mb-2"> <div class="col">
<div class="info-item"><?php echo _("IPv4 Address"); ?></div> <div class="row">
<div class="info-item"><?php echo htmlspecialchars($public_ip, ENT_QUOTES); ?><a class="text-gray-500" href="https://ipapi.co/<?php echo($public_ip); ?>" target="_blank" rel="noopener noreferrer"><i class="fas fa-external-link-alt ml-2"></i></a></div> <div class="col-lg-12 mt-2 mb-2">
</div> <div class="info-item"><?php echo _("IPv4 Address"); ?></div>
</div> <div class="info-item"><?php echo htmlspecialchars($public_ip, ENT_QUOTES); ?><a class="text-gray-500" href="https://ipapi.co/<?php echo($public_ip); ?>" target="_blank" rel="noopener noreferrer"><i class="fas fa-external-link-alt ml-2"></i></a></div>
<div class="row">
<div class="form-group col-md-6">
<label for="code"><?php echo _("Username"); ?></label>
<input type="text" class="form-control" name="authUser" value="<?php echo htmlspecialchars($authUser, ENT_QUOTES); ?>" />
</div>
</div>
<div class="row">
<div class="form-group col-md-6">
<label for="code"><?php echo _("Password"); ?></label>
<input type="password" class="form-control" name="authPassword" value="<?php echo htmlspecialchars($authPassword, ENT_QUOTES); ?>" />
</div>
</div>
<div class="row">
<div class="form-group col-md-6">
<div class="custom-file">
<input type="file" class="custom-file-input" name="customFile" id="customFile">
<label class="custom-file-label" for="customFile"><?php echo _("Select OpenVPN configuration file (.ovpn)"); ?></label>
</div> </div>
</div> </div>
</div> <div class="row">
<div class="form-group col-lg-12">
<label for="code"><?php echo _("Username"); ?></label>
<input type="text" class="form-control" name="authUser" value="<?php echo htmlspecialchars($authUser, ENT_QUOTES); ?>" />
</div>
</div>
<div class="row">
<div class="form-group col-lg-12">
<label for="code"><?php echo _("Password"); ?></label>
<input type="password" class="form-control" name="authPassword" value="<?php echo htmlspecialchars($authPassword, ENT_QUOTES); ?>" />
</div>
</div>
<div class="row">
<div class="form-group col-lg-12">
<div class="custom-file">
<input type="file" class="custom-file-input" name="customFile" id="customFile">
<label class="custom-file-label" for="customFile"><?php echo _("Select OpenVPN configuration file (.ovpn)"); ?></label>
</div>
</div>
</div>
</div><!-- col-->
<div class="col-sm">
<a href="https://go.nordvpn.net/aff_c?offer_id=15&aff_id=36402&url_id=902"><img src="app/img/180x150.png" class="rounded float-left mb-3 mt-3"></a>
</div>
</div><!-- main row -->
</div> </div>
<div class="tab-pane fade" id="openvpnlogoutput"> <div class="tab-pane fade" id="openvpnlogoutput">
<h4 class="mt-3"><?php echo _("Client log"); ?></h4> <h4 class="mt-3"><?php echo _("Client log"); ?></h4>
@ -67,10 +74,10 @@
<?php if (!RASPI_MONITOR_ENABLED) : ?> <?php if (!RASPI_MONITOR_ENABLED) : ?>
<input type="submit" class="btn btn-outline btn-primary" name="SaveOpenVPNSettings" value="Save settings" /> <input type="submit" class="btn btn-outline btn-primary" name="SaveOpenVPNSettings" value="Save settings" />
<?php if ($openvpnstatus[0] == 0) { <?php if ($openvpnstatus[0] == 0) {
echo '<input type="submit" class="btn btn-success" name="StartOpenVPN" value="Start OpenVPN" />' , PHP_EOL; echo '<input type="submit" class="btn btn-success" name="StartOpenVPN" value="Start OpenVPN" />' , PHP_EOL;
} else { } else {
echo '<input type="submit" class="btn btn-warning" name="StopOpenVPN" value="Stop OpenVPN" />' , PHP_EOL; echo '<input type="submit" class="btn btn-warning" name="StopOpenVPN" value="Stop OpenVPN" />' , PHP_EOL;
} }
?> ?>
<?php endif ?> <?php endif ?>
</form> </form>

6
yarn.lock
View File

@ -2125,9 +2125,9 @@ inherits@2.0.3:
integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
ini@^1.3.4, ini@~1.3.0: ini@^1.3.4, ini@~1.3.0:
version "1.3.5" version "1.3.8"
resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
interpret@^1.1.0: interpret@^1.1.0:
version "1.2.0" version "1.2.0"