From 51aafafd739d3f132f432c55a2487767a08803c0 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Thu, 17 Nov 2022 14:27:51 +0100 Subject: [PATCH] update links to new docs.froxlor.org pages (v2 will be /latest/ when released); fixed required-checkbox attribute when having a hidden fallback to value 0 (bool checkboxes); added automatic creation of symlink for bin/froxlor-cli to /usr/local/bin Signed-off-by: Michael Kaufmann --- README.md | 4 ++-- lib/Froxlor/Api/Commands/MysqlServer.php | 2 +- lib/configfiles/bionic.xml | 1 + lib/configfiles/bookworm.xml | 1 + lib/configfiles/bullseye.xml | 1 + lib/configfiles/buster.xml | 1 + lib/configfiles/focal.xml | 1 + lib/configfiles/gentoo.xml | 1 + lib/configfiles/jammy.xml | 1 + lng/de.lng.php | 8 ++++---- lng/en.lng.php | 8 ++++---- lng/it.lng.php | 6 +++--- lng/nl.lng.php | 2 +- templates/Froxlor/form/formfields.html.twig | 2 +- templates/Froxlor/sidebar.html.twig | 2 +- templates/Froxlor/userarea.html.twig | 2 +- 16 files changed, 25 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 709ad1eb..b81ccf6a 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Developed by experienced server administrators, this panel simplifies the effort 9. Have fun! ### Detailed installation -https://docs.froxlor.org/general/installation/index.html +https://docs.froxlor.org/latest/general/installation/ ## Help @@ -56,7 +56,7 @@ https://files.froxlor.org/releases/froxlor-latest.tar.gz [MD5](https://files.fro ### Debian / Ubutnu repository -[HowTo](https://docs.froxlor.org/general/installation/aptpackage.html) +[HowTo](https://docs.froxlor.org/latets/general/installation/apt-package.html) #### Debian diff --git a/lib/Froxlor/Api/Commands/MysqlServer.php b/lib/Froxlor/Api/Commands/MysqlServer.php index 42405825..f44b45d1 100644 --- a/lib/Froxlor/Api/Commands/MysqlServer.php +++ b/lib/Froxlor/Api/Commands/MysqlServer.php @@ -455,7 +455,7 @@ class MysqlServer extends ApiCommand implements ResourceEntity * check whether a given customer / current user (as customer) has * databases on the given dbserver * - * @param int mysql_server + * @param int $mysql_server * @param int $customerid * optional, admin-only, select ftp-users of a specific customer by id * @param string $loginname diff --git a/lib/configfiles/bionic.xml b/lib/configfiles/bionic.xml index 19c0a869..e28e80bb 100644 --- a/lib/configfiles/bionic.xml +++ b/lib/configfiles/bionic.xml @@ -4721,6 +4721,7 @@ aliases: files + bin/froxlor-cli /usr/local/bin/froxlor-cli]]> bin/froxlor-cli froxlor:cron --run-task 99]]> diff --git a/lib/configfiles/bookworm.xml b/lib/configfiles/bookworm.xml index 2d9a9ef6..752e6ec4 100644 --- a/lib/configfiles/bookworm.xml +++ b/lib/configfiles/bookworm.xml @@ -3359,6 +3359,7 @@ aliases: files + bin/froxlor-cli /usr/local/bin/froxlor-cli]]> bin/froxlor-cli froxlor:cron --run-task 99]]> diff --git a/lib/configfiles/bullseye.xml b/lib/configfiles/bullseye.xml index 4078251d..068ee12b 100644 --- a/lib/configfiles/bullseye.xml +++ b/lib/configfiles/bullseye.xml @@ -4929,6 +4929,7 @@ aliases: files + bin/froxlor-cli /usr/local/bin/froxlor-cli]]> bin/froxlor-cli froxlor:cron --run-task 99]]> diff --git a/lib/configfiles/buster.xml b/lib/configfiles/buster.xml index 9360124b..c562e4e2 100644 --- a/lib/configfiles/buster.xml +++ b/lib/configfiles/buster.xml @@ -4920,6 +4920,7 @@ aliases: files + bin/froxlor-cli /usr/local/bin/froxlor-cli]]> bin/froxlor-cli froxlor:cron --run-task 99]]> diff --git a/lib/configfiles/focal.xml b/lib/configfiles/focal.xml index 45d4158c..9e9a9217 100644 --- a/lib/configfiles/focal.xml +++ b/lib/configfiles/focal.xml @@ -4145,6 +4145,7 @@ aliases: files + bin/froxlor-cli /usr/local/bin/froxlor-cli]]> bin/froxlor-cli froxlor:cron --run-task 99]]> diff --git a/lib/configfiles/gentoo.xml b/lib/configfiles/gentoo.xml index 240ecfaa..8b720e53 100644 --- a/lib/configfiles/gentoo.xml +++ b/lib/configfiles/gentoo.xml @@ -3935,6 +3935,7 @@ aliases: files + bin/froxlor-cli /usr/local/bin/froxlor-cli]]> bin/froxlor-cli froxlor:cron --run-task 99]]> diff --git a/lib/configfiles/jammy.xml b/lib/configfiles/jammy.xml index 7b8c69d8..37bccc21 100644 --- a/lib/configfiles/jammy.xml +++ b/lib/configfiles/jammy.xml @@ -4146,6 +4146,7 @@ aliases: files + bin/froxlor-cli /usr/local/bin/froxlor-cli]]> bin/froxlor-cli froxlor:cron --run-task 99]]> diff --git a/lng/de.lng.php b/lng/de.lng.php index f338106a..bd98f106 100644 --- a/lng/de.lng.php +++ b/lng/de.lng.php @@ -682,7 +682,7 @@ return [ 'import_separator' => 'Trennzeichen', 'import_offset' => 'Versatz (offset)', 'import_file' => 'CSV-Datei', - 'import_description' => 'Detaillierte Informationen über den Aufbau der Importdatei und einen erfolgreichen Import gibt es hier: https://docs.froxlor.org/adminguide/domainimport.html (englisch)', + 'import_description' => 'Detaillierte Informationen über den Aufbau der Importdatei und einen erfolgreichen Import gibt es hier: https://docs.froxlor.org/latest/admin-guide/domain-import/ (englisch)', 'ssl_redirect_temporarilydisabled' => '
Die SSL-Umleitung ist, während ein neues Let\'s Encrypt - Zertifikat erstellt wird, temporär deaktiviert. Die Umleitung wird nach der Zertifikatserstellung wieder aktiviert.', 'termination_date' => 'Kündigungsdatum', 'termination_date_overview' => 'gekündigt zum ', @@ -1424,7 +1424,7 @@ Vielen Dank, Ihr Administrator', ], 'mod_fcgid' => [ 'title' => 'PHP über mod_fcgid/suexec einbinden', - 'description' => 'PHP wird unter dem Benutzer des Kunden ausgeführt.

Dies benötigt eine spezielle Webserver-Konfiguration für Apache, siehe FCGID-Handbuch.', + 'description' => 'PHP wird unter dem Benutzer des Kunden ausgeführt.

Dies benötigt eine spezielle Webserver-Konfiguration für Apache, siehe FCGID-Handbuch.', 'configdir' => [ 'title' => 'Konfigurations-Verzeichnis', 'description' => 'Wo sollen alle Konfigurationsdateien von fcgid liegen? Wenn Sie keine selbst kompilierte suexec Binary benutzen, was in der Regel der Fall ist, muss dieser Pfad unter /var/www/ liegen.

ACHTUNG: Der Inhalt dieses Ordners wird regelmäßig geleert, daher sollten dort keinerlei Daten manuell abgelegt werden.
', @@ -1678,7 +1678,7 @@ Vielen Dank, Ihr Administrator', ], 'phpfpm' => [ 'title' => 'Aktiviere PHP-FPM', - 'description' => 'Dies benötigt eine spezielle Webserver-Konfiguration, siehe PHP-FPM Handbuch', + 'description' => 'Dies benötigt eine spezielle Webserver-Konfiguration, siehe PHP-FPM Handbuch', ], 'phpfpm_settings' => [ 'configdir' => 'Pfad zu php-fpm-Konfigurationen', @@ -1964,7 +1964,7 @@ Vielen Dank, Ihr Administrator', ], 'enable_api' => [ 'title' => 'Aktiviere externe API Nutzung', - 'description' => 'Um die froxlor API nutzen zu können, muss diese Option aktiviert sein. Für detaillierte Informationen siehe https://docs.froxlor.org/', + 'description' => 'Um die froxlor API nutzen zu können, muss diese Option aktiviert sein. Für detaillierte Informationen siehe https://docs.froxlor.org/', ], 'dhparams_file' => [ 'title' => 'DHParams Datei (Diffie–Hellman key exchange)', diff --git a/lng/en.lng.php b/lng/en.lng.php index 24338260..2ab581b3 100644 --- a/lng/en.lng.php +++ b/lng/en.lng.php @@ -746,7 +746,7 @@ return [ 'import_separator' => 'Separator', 'import_offset' => 'Offset', 'import_file' => 'CSV-File', - 'import_description' => 'Detailed information about the structure of the import-file and how to import successfully, please visit https://docs.froxlor.org/adminguide/domainimport.html', + 'import_description' => 'Detailed information about the structure of the import-file and how to import successfully, please visit https://docs.froxlor.org/latest/admin-guide/domain-import/', 'ssl_redirect_temporarilydisabled' => '
The SSL redirect is temporarily deactivated while a new Let\'s Encrypt certificate is generated. It will be activated again after the certificate was generated.', 'termination_date' => 'Date of termination', 'termination_date_overview' => 'terminated as of ', @@ -1541,7 +1541,7 @@ Yours sincerely, your administrator', ], 'mod_fcgid' => [ 'title' => 'Enable FCGID', - 'description' => 'Use this to run PHP with the corresponding user account.

This needs a special webserver configuration for Apache, see FCGID - handbook', + 'description' => 'Use this to run PHP with the corresponding user account.

This needs a special webserver configuration for Apache, see FCGID - handbook', 'configdir' => [ 'title' => 'Configuration directory', 'description' => 'Where should all fcgid-configuration files be stored? If you don\'t use a self compiled suexec binary, which is the normal situation, this path must be under /var/www/

NOTE: This folder\'s content gets deleted regularly so avoid storing data in there manually.
', @@ -1795,7 +1795,7 @@ Yours sincerely, your administrator', ], 'phpfpm' => [ 'title' => 'Enable php-fpm', - 'description' => 'This needs a special webserver configuration see PHP-FPM handbook', + 'description' => 'This needs a special webserver configuration see PHP-FPM handbook', ], 'phpfpm_settings' => [ 'configdir' => 'Configuration directory of php-fpm', @@ -2081,7 +2081,7 @@ Yours sincerely, your administrator', ], 'enable_api' => [ 'title' => 'Enable external API usage', - 'description' => 'In order to use the froxlor API you need to activate this option. For more detailed information see https://docs.froxlor.org/', + 'description' => 'In order to use the froxlor API you need to activate this option. For more detailed information see https://docs.froxlor.org/', ], 'dhparams_file' => [ 'title' => 'DHParams file (Diffie–Hellman key exchange)', diff --git a/lng/it.lng.php b/lng/it.lng.php index 4faeebab..c7fac2ff 100644 --- a/lng/it.lng.php +++ b/lng/it.lng.php @@ -754,7 +754,7 @@ return [ 'import_separator' => 'Separatore', 'import_offset' => 'Offset', 'import_file' => 'File CSV', - 'import_description' => 'Per ottenere informazioni dettagliate sulla struttura del file di importazione e su come importare con successo, visita https://docs.froxlor.org/adminguide/domainimport.html', + 'import_description' => 'Per ottenere informazioni dettagliate sulla struttura del file di importazione e su come importare con successo, visita https://docs.froxlor.org/latest/admin-guide/domain-import/', ], 'emails' => [ 'description' => 'Qui puoi creare e cambiare i tuoi indirizzi Email.
Un account è come la bucalettere davanti a casa tua. Se qualcuno ti manda un\'Email, essa sarà recapitata all\'interno del tuo account.

Per scaricare le tue Email usa le seguenti impostazioni nel tuo programma di posta elettronica: (I dati scritti in corsivo vanno cambiati con i tuoi!)
Hostname: Nome del dominio
Username: Nome dell\'account / Indirizzo Email
Password: La password scelta', @@ -1543,7 +1543,7 @@ Cordiali Saluti, Team Froxlor', ], 'mod_fcgid_ownvhost' => [ 'title' => 'Abilita FCGID per i vhost Froxlor', - 'description' => 'Se attivato, Froxlor verrà eseguito con un utente locale
ATTENZIONE:Questo richiede una configurazione manuale, vedi FCGID - handbook', + 'description' => 'Se attivato, Froxlor verrà eseguito con un utente locale
ATTENZIONE:Questo richiede una configurazione manuale, vedi FCGID - handbook', ], 'perl' => [ 'suexecworkaround' => [ @@ -1621,7 +1621,7 @@ Cordiali Saluti, Team Froxlor', ], 'phpfpm' => [ 'title' => 'Abilita php-fpm', - 'description' => 'Questa impostazione richiede una configurazione speciale del server web. Vedi il manuale PHP-FPM', + 'description' => 'Questa impostazione richiede una configurazione speciale del server web. Vedi il manuale PHP-FPM', ], 'diskquota_enabled' => 'Quota attivita?', 'diskquota_repquota_path' => [ diff --git a/lng/nl.lng.php b/lng/nl.lng.php index d9bf3a06..5c3cce38 100644 --- a/lng/nl.lng.php +++ b/lng/nl.lng.php @@ -1051,7 +1051,7 @@ Met vriendelijke groet, uw beheerder', ], 'mod_fcgid_ownvhost' => [ 'title' => 'FCGID inschakelen voor de VHost voor Froxlor', - 'description' => 'Indien ingeschakeld wordt Froxlor ook uitgevoerd onder een lokale gebruiker
Let op:Dit vereist handmatige configuratie, zie FCGID - handbook', + 'description' => 'Indien ingeschakeld wordt Froxlor ook uitgevoerd onder een lokale gebruiker
Let op:Dit vereist handmatige configuratie, zie FCGID - handbook', ], 'perl' => [ 'suexecworkaround' => [ diff --git a/templates/Froxlor/form/formfields.html.twig b/templates/Froxlor/form/formfields.html.twig index 223b3b9c..c2ce18e5 100644 --- a/templates/Froxlor/form/formfields.html.twig +++ b/templates/Froxlor/form/formfields.html.twig @@ -110,7 +110,7 @@ {% else %}
- +
{% endif %} {% endmacro %} diff --git a/templates/Froxlor/sidebar.html.twig b/templates/Froxlor/sidebar.html.twig index 5a65c151..964022c0 100644 --- a/templates/Froxlor/sidebar.html.twig +++ b/templates/Froxlor/sidebar.html.twig @@ -14,7 +14,7 @@ {% for item in mitems.items %}
  • - {{ item.label|raw }} + {{ item.label|raw }}
    {% if item.add_shortlink is defined and item.add_shortlink is not empty %} diff --git a/templates/Froxlor/userarea.html.twig b/templates/Froxlor/userarea.html.twig index 1a2c5827..a760aa56 100644 --- a/templates/Froxlor/userarea.html.twig +++ b/templates/Froxlor/userarea.html.twig @@ -85,7 +85,7 @@ {{ lng('menue.main.apikeys') }}
  • - {{ lng('menue.main.apihelp') }} + {{ lng('menue.main.apihelp') }}
    • {% endif %}