Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into files

Browse Source
This commit is contained in:
HB9HIL
2024-07-30 13:13:00 +02:00
committed by GitHub
parent 13689f68c3 e0e49c48b6
commit 817a47e44c
22 changed files with 94 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/lang_src/messages.pot
View File

@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-07-30 08:08+0000\n"
"POT-Creation-Date: 2024-07-30 10:37+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

8
install/includes/gettext/lang_src/installer.pot
View File

@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-07-30 08:08+0000\n"
"POT-Creation-Date: 2024-07-30 10:38+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -616,8 +616,7 @@ msgid "PHP Module missing"
msgstr ""
#: install/index.php:1900
#, php-format
msgid "The PHP module %s is missing."
msgid "The following PHP modules are missing:"
msgstr ""
#: install/index.php:1901
@@ -625,8 +624,7 @@ msgid "Without this module the Wavelog Installer does not work!"
msgstr ""
#: install/index.php:1902
#, php-format
msgid "Install %s and restart the webserver."
msgid "Please install the required modules and restart the webserver."
msgstr ""
#: install/run.php:10

8
install/includes/gettext/locale/bg_BG/LC_MESSAGES/installer.po
View File

@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-07-29 12:05+0000\n"
"POT-Creation-Date: 2024-07-30 10:38+0000\n"
"PO-Revision-Date: 2024-06-05 15:15+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -617,8 +617,7 @@ msgid "PHP Module missing"
msgstr ""
#: install/index.php:1900
#, php-format
msgid "The PHP module %s is missing."
msgid "The following PHP modules are missing:"
msgstr ""
#: install/index.php:1901
@@ -626,8 +625,7 @@ msgid "Without this module the Wavelog Installer does not work!"
msgstr ""
#: install/index.php:1902
#, php-format
msgid "Install %s and restart the webserver."
msgid "Please install the required modules and restart the webserver."
msgstr ""
#: install/run.php:10

8
install/includes/gettext/locale/cs_CZ/LC_MESSAGES/installer.po
View File

@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-07-29 12:05+0000\n"
"POT-Creation-Date: 2024-07-30 10:38+0000\n"
"PO-Revision-Date: 2024-06-05 15:15+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -617,8 +617,7 @@ msgid "PHP Module missing"
msgstr ""
#: install/index.php:1900
#, php-format
msgid "The PHP module %s is missing."
msgid "The following PHP modules are missing:"
msgstr ""
#: install/index.php:1901
@@ -626,8 +625,7 @@ msgid "Without this module the Wavelog Installer does not work!"
msgstr ""
#: install/index.php:1902
#, php-format
msgid "Install %s and restart the webserver."
msgid "Please install the required modules and restart the webserver."
msgstr ""
#: install/run.php:10

BIN
install/includes/gettext/locale/de_DE/LC_MESSAGES/installer.mo
View File

Binary file not shown.

20
install/includes/gettext/locale/de_DE/LC_MESSAGES/installer.po
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-07-29 12:05+0000\n"
"POT-Creation-Date: 2024-07-30 10:38+0000\n"
"PO-Revision-Date: 2024-07-29 12:08+0000\n"
"Last-Translator: Fabian Berg <hb9hil@wavelog.org>\n"
"Language-Team: German <https://translate.wavelog.org/projects/wavelog/"
@@ -684,18 +684,16 @@ msgid "PHP Module missing"
msgstr "PHP-Modul fehlt"
#: install/index.php:1900
#, php-format
msgid "The PHP module %s is missing."
msgstr "Das PHP-Modul %s fehlt."
msgid "The following PHP modules are missing:"
msgstr ""
#: install/index.php:1901
msgid "Without this module the Wavelog Installer does not work!"
msgstr "Ohne dieses Modul funktioniert der Wavelog-Installer nicht!"
#: install/index.php:1902
#, php-format
msgid "Install %s and restart the webserver."
msgstr "Installiere %s und starte den Webserver neu."
msgid "Please install the required modules and restart the webserver."
msgstr ""
#: install/run.php:10
msgid "Installation"
@@ -772,6 +770,14 @@ msgstr "Konnte DXCC-Daten nicht aktualisieren"
msgid "Could not create install/.lock file"
msgstr "Konnte die install/.lock Datei nicht anlegen"
#, php-format
#~ msgid "The PHP module %s is missing."
#~ msgstr "Das PHP-Modul %s fehlt."
#, php-format
#~ msgid "Install %s and restart the webserver."
#~ msgstr "Installiere %s und starte den Webserver neu."
#~ msgid ""
#~ "This field<br>\n"
#~ "\t\t\t\t\t\t\t\t\t\t\t\t- can't be empty<br>\n"

8
install/includes/gettext/locale/el_GR/LC_MESSAGES/installer.po
View File

@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-07-29 14:39+0000\n"
"POT-Creation-Date: 2024-07-30 10:38+0000\n"
"PO-Revision-Date: 2024-07-29 12:05+0000\n"
"Last-Translator: Fabian Berg <hb9hil@wavelog.org>\n"
"Language-Team: Greek <https://translate.wavelog.org/projects/wavelog/"
@@ -619,8 +619,7 @@ msgid "PHP Module missing"
msgstr ""
#: install/index.php:1900
#, php-format
msgid "The PHP module %s is missing."
msgid "The following PHP modules are missing:"
msgstr ""
#: install/index.php:1901
@@ -628,8 +627,7 @@ msgid "Without this module the Wavelog Installer does not work!"
msgstr ""
#: install/index.php:1902
#, php-format
msgid "Install %s and restart the webserver."
msgid "Please install the required modules and restart the webserver."
msgstr ""
#: install/run.php:10

8
install/includes/gettext/locale/es_ES/LC_MESSAGES/installer.po
View File

@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-07-29 12:05+0000\n"
"POT-Creation-Date: 2024-07-30 10:38+0000\n"
"PO-Revision-Date: 2024-06-05 15:15+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -617,8 +617,7 @@ msgid "PHP Module missing"
msgstr ""
#: install/index.php:1900
#, php-format
msgid "The PHP module %s is missing."
msgid "The following PHP modules are missing:"
msgstr ""
#: install/index.php:1901
@@ -626,8 +625,7 @@ msgid "Without this module the Wavelog Installer does not work!"
msgstr ""
#: install/index.php:1902
#, php-format
msgid "Install %s and restart the webserver."
msgid "Please install the required modules and restart the webserver."
msgstr ""
#: install/run.php:10

8
install/includes/gettext/locale/fi_FI/LC_MESSAGES/installer.po
View File

@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-07-29 12:05+0000\n"
"POT-Creation-Date: 2024-07-30 10:38+0000\n"
"PO-Revision-Date: 2024-06-05 15:15+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -617,8 +617,7 @@ msgid "PHP Module missing"
msgstr ""
#: install/index.php:1900
#, php-format
msgid "The PHP module %s is missing."
msgid "The following PHP modules are missing:"
msgstr ""
#: install/index.php:1901
@@ -626,8 +625,7 @@ msgid "Without this module the Wavelog Installer does not work!"
msgstr ""
#: install/index.php:1902
#, php-format
msgid "Install %s and restart the webserver."
msgid "Please install the required modules and restart the webserver."
msgstr ""
#: install/run.php:10

8
install/includes/gettext/locale/fr_FR/LC_MESSAGES/installer.po
View File

@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-07-29 12:05+0000\n"
"POT-Creation-Date: 2024-07-30 10:38+0000\n"
"PO-Revision-Date: 2024-07-22 18:23+0000\n"
"Last-Translator: \"Francisco (F4VSE)\" <kikosgc@gmail.com>\n"
"Language-Team: French <https://translate.wavelog.org/projects/wavelog/"
@@ -659,8 +659,7 @@ msgid "PHP Module missing"
msgstr ""
#: install/index.php:1900
#, php-format
msgid "The PHP module %s is missing."
msgid "The following PHP modules are missing:"
msgstr ""
#: install/index.php:1901
@@ -668,8 +667,7 @@ msgid "Without this module the Wavelog Installer does not work!"
msgstr ""
#: install/index.php:1902
#, php-format
msgid "Install %s and restart the webserver."
msgid "Please install the required modules and restart the webserver."
msgstr ""
#: install/run.php:10

8
install/includes/gettext/locale/it_IT/LC_MESSAGES/installer.po
View File

@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-07-29 12:05+0000\n"
"POT-Creation-Date: 2024-07-30 10:38+0000\n"
"PO-Revision-Date: 2024-06-05 15:15+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -617,8 +617,7 @@ msgid "PHP Module missing"
msgstr ""
#: install/index.php:1900
#, php-format
msgid "The PHP module %s is missing."
msgid "The following PHP modules are missing:"
msgstr ""
#: install/index.php:1901
@@ -626,8 +625,7 @@ msgid "Without this module the Wavelog Installer does not work!"
msgstr ""
#: install/index.php:1902
#, php-format
msgid "Install %s and restart the webserver."
msgid "Please install the required modules and restart the webserver."
msgstr ""
#: install/run.php:10

8
install/includes/gettext/locale/nl_NL/LC_MESSAGES/installer.po
View File

@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-07-29 12:05+0000\n"
"POT-Creation-Date: 2024-07-30 10:38+0000\n"
"PO-Revision-Date: 2024-06-05 15:15+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -617,8 +617,7 @@ msgid "PHP Module missing"
msgstr ""
#: install/index.php:1900
#, php-format
msgid "The PHP module %s is missing."
msgid "The following PHP modules are missing:"
msgstr ""
#: install/index.php:1901
@@ -626,8 +625,7 @@ msgid "Without this module the Wavelog Installer does not work!"
msgstr ""
#: install/index.php:1902
#, php-format
msgid "Install %s and restart the webserver."
msgid "Please install the required modules and restart the webserver."
msgstr ""
#: install/run.php:10

8
install/includes/gettext/locale/pl_PL/LC_MESSAGES/installer.po
View File

@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-07-29 12:05+0000\n"
"POT-Creation-Date: 2024-07-30 10:38+0000\n"
"PO-Revision-Date: 2024-06-05 15:15+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -617,8 +617,7 @@ msgid "PHP Module missing"
msgstr ""
#: install/index.php:1900
#, php-format
msgid "The PHP module %s is missing."
msgid "The following PHP modules are missing:"
msgstr ""
#: install/index.php:1901
@@ -626,8 +625,7 @@ msgid "Without this module the Wavelog Installer does not work!"
msgstr ""
#: install/index.php:1902
#, php-format
msgid "Install %s and restart the webserver."
msgid "Please install the required modules and restart the webserver."
msgstr ""
#: install/run.php:10

8
install/includes/gettext/locale/pt_PT/LC_MESSAGES/installer.po
View File

@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-07-29 12:05+0000\n"
"POT-Creation-Date: 2024-07-30 10:38+0000\n"
"PO-Revision-Date: 2024-07-29 12:08+0000\n"
"Last-Translator: Fabian Berg <hb9hil@wavelog.org>\n"
"Language-Team: Portuguese (Portugal) <https://translate.wavelog.org/projects/"
@@ -678,8 +678,7 @@ msgid "PHP Module missing"
msgstr ""
#: install/index.php:1900
#, php-format
msgid "The PHP module %s is missing."
msgid "The following PHP modules are missing:"
msgstr ""
#: install/index.php:1901
@@ -687,8 +686,7 @@ msgid "Without this module the Wavelog Installer does not work!"
msgstr ""
#: install/index.php:1902
#, php-format
msgid "Install %s and restart the webserver."
msgid "Please install the required modules and restart the webserver."
msgstr ""
#: install/run.php:10

8
install/includes/gettext/locale/ru_RU/LC_MESSAGES/installer.po
View File

@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-07-29 12:05+0000\n"
"POT-Creation-Date: 2024-07-30 10:38+0000\n"
"PO-Revision-Date: 2024-07-29 12:08+0000\n"
"Last-Translator: Fabian Berg <hb9hil@wavelog.org>\n"
"Language-Team: Russian <https://translate.wavelog.org/projects/wavelog/"
@@ -675,8 +675,7 @@ msgid "PHP Module missing"
msgstr ""
#: install/index.php:1900
#, php-format
msgid "The PHP module %s is missing."
msgid "The following PHP modules are missing:"
msgstr ""
#: install/index.php:1901
@@ -684,8 +683,7 @@ msgid "Without this module the Wavelog Installer does not work!"
msgstr ""
#: install/index.php:1902
#, php-format
msgid "Install %s and restart the webserver."
msgid "Please install the required modules and restart the webserver."
msgstr ""
#: install/run.php:10

8
install/includes/gettext/locale/sv_SE/LC_MESSAGES/installer.po
View File

@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-07-29 12:05+0000\n"
"POT-Creation-Date: 2024-07-30 10:38+0000\n"
"PO-Revision-Date: 2024-06-05 15:15+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -617,8 +617,7 @@ msgid "PHP Module missing"
msgstr ""
#: install/index.php:1900
#, php-format
msgid "The PHP module %s is missing."
msgid "The following PHP modules are missing:"
msgstr ""
#: install/index.php:1901
@@ -626,8 +625,7 @@ msgid "Without this module the Wavelog Installer does not work!"
msgstr ""
#: install/index.php:1902
#, php-format
msgid "Install %s and restart the webserver."
msgid "Please install the required modules and restart the webserver."
msgstr ""
#: install/run.php:10

8
install/includes/gettext/locale/tr_TR/LC_MESSAGES/installer.po
View File

@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-07-29 12:05+0000\n"
"POT-Creation-Date: 2024-07-30 10:38+0000\n"
"PO-Revision-Date: 2024-07-26 09:13+0000\n"
"Last-Translator: Halil AYYILDIZ <ta2lghalil@gmail.com>\n"
"Language-Team: Turkish <https://translate.wavelog.org/projects/wavelog/"
@@ -649,8 +649,7 @@ msgid "PHP Module missing"
msgstr ""
#: install/index.php:1900
#, php-format
msgid "The PHP module %s is missing."
msgid "The following PHP modules are missing:"
msgstr ""
#: install/index.php:1901
@@ -658,8 +657,7 @@ msgid "Without this module the Wavelog Installer does not work!"
msgstr ""
#: install/index.php:1902
#, php-format
msgid "Install %s and restart the webserver."
msgid "Please install the required modules and restart the webserver."
msgstr ""
#: install/run.php:10

BIN
install/includes/gettext/locale/zh_CN/LC_MESSAGES/installer.mo
View File

Binary file not shown.

31
install/includes/gettext/locale/zh_CN/LC_MESSAGES/installer.po
View File

@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-07-29 12:05+0000\n"
"POT-Creation-Date: 2024-07-30 10:38+0000\n"
"PO-Revision-Date: 2024-07-29 13:32+0000\n"
"Last-Translator: Karuru <karuru@aerodefense.co.uk>\n"
"Language-Team: Chinese (Simplified) <https://translate.wavelog.org/projects/"
@@ -234,7 +234,8 @@ msgstr "Nginx 用户看过来！"
msgid ""
"Since you are using nginx as web server please make sure that you have made "
"the changes described in the Wiki before continuing."
msgstr "由于您使用 Nginx 作为前端程序，请您先阅读 Wiki 中的说明，并进行适当改动。"
msgstr ""
"由于您使用 Nginx 作为前端程序，请您先阅读 Wiki 中的说明，并进行适当改动。"
#: install/index.php:314
msgid "Some Checks have failed!"
@@ -254,7 +255,8 @@ msgstr "在这之后，您需要重启服务器，重新启动安装程序。"
msgid ""
"In case of failed 'Folder Write Permissions' check out our Wiki <a href='%s' "
"target='_blank'>here</a>."
msgstr "如遇到“文件夹可写权限”错误，请查看 <a href='%s' target='_blank'>Wiki</a>。"
msgstr ""
"如遇到“文件夹可写权限”错误，请查看 <a href='%s' target='_blank'>Wiki</a>。"
#: install/index.php:323
msgid "You have some warnings!"
@@ -438,8 +440,9 @@ msgstr "测试连接"
msgid ""
"Now you can create your first user in Wavelog. Fill out all fields and click "
"continue. Make sure you use a safe password."
msgstr "您现在可以为 Wavelog "
"创建第一个用户了，填写所有信息点击下一步，确保创建一个高强度的密码。"
msgstr ""
"您现在可以为 Wavelog 创建第一个用户了，填写所有信息点击下一步，确保创建一个高"
"强度的密码。"
#: install/index.php:473
msgid "All fields are required!"
@@ -640,18 +643,16 @@ msgid "PHP Module missing"
msgstr "PHP 模块未安装"
#: install/index.php:1900
#, php-format
msgid "The PHP module %s is missing."
msgstr "PHP 模块 %s 未安装。"
msgid "The following PHP modules are missing:"
msgstr ""
#: install/index.php:1901
msgid "Without this module the Wavelog Installer does not work!"
msgstr "Wavelog 需要这个模块来运行！"
#: install/index.php:1902
#, php-format
msgid "Install %s and restart the webserver."
msgstr "安装 %s 并重启服务器。"
msgid "Please install the required modules and restart the webserver."
msgstr ""
#: install/run.php:10
msgid "Installation"
@@ -726,6 +727,14 @@ msgstr "无法更新 DXCC 数据"
msgid "Could not create install/.lock file"
msgstr "无法创建 install/.lock 文件"
#, php-format
#~ msgid "The PHP module %s is missing."
#~ msgstr "PHP 模块 %s 未安装。"
#, php-format
#~ msgid "Install %s and restart the webserver."
#~ msgstr "安装 %s 并重启服务器。"
#~ msgid "On"
#~ msgstr "开启"

4
install/includes/install_config/install_config.php
View File

@@ -39,3 +39,7 @@ $required_php_modules = [
// MariaDB / MySQL
$mariadb_version = 10.1;
$mysql_version = 5.7;
// PHP modules that are directly required for the installer
global $installer_required_modules;
$installer_required_modules = array("mbstring", "curl");

11
install/includes/install_config/install_lib.php
View File

@@ -133,3 +133,14 @@ function detect_nginx_php_setting($http_scheme) {
curl_close($ch);
return $code;
}
function installer_required_modules() {
global $installer_required_modules;
$not_found_modules = array();
foreach ($installer_required_modules as $module) {
if (!extension_loaded($module)) {
array_push($not_found_modules, 'php-'.$module);
}
}
return $not_found_modules;
}

6
install/index.php
View File

@@ -16,7 +16,7 @@ if (!file_exists('.lock')) {
// php-mbstring has to be installed for the installer to work properly!!
// The other prechecks can be run within the installer.
if ($required_php_modules['php-mbstring']['condition']) { ?>
if ($required_php_modules['php-mbstring']['condition'] && $required_php_modules['php-curl']['condition']) { ?>
<body>
@@ -1897,9 +1897,9 @@ if (!file_exists('.lock')) {
<div class="card-body text-center p-4">
<h3 style="margin-top: 50px;"><?= __("PHP Module missing"); ?></h3>
<img src="assets/images/danger_triangle.png" alt="danger_triangle" style="max-width: 400px; height: auto; margin-bottom: 50px;">
<p><?= sprintf(__("The PHP module %s is missing."), "<code>php-mbstring</code>"); ?></p>
<p><?= __("The following PHP modules are missing:")." <code>".implode(',', installer_required_modules())."</code>"; ?></p>
<p><?= __("Without this module the Wavelog Installer does not work!"); ?></p>
<p><?= sprintf(__("Install %s and restart the webserver."), "<code>php-mbstring</code>"); ?></p>
<p><?= __("Please install the required modules and restart the webserver."); ?></p>
</div>
</div>
</div>