maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

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

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-11-17 14:27:51 +01:00
parent ed231f159f
commit 51aafafd73
16 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -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

2
lib/Froxlor/Api/Commands/MysqlServer.php
View File

@@ -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

1
lib/configfiles/bionic.xml
View File

@@ -4721,6 +4721,7 @@ aliases: files
<daemon name="cron" title="Cronjob for froxlor"
mandatory="true">
<install><![CDATA[apt-get install cron]]></install>
<command><![CDATA[ln -s <BASE_PATH>bin/froxlor-cli /usr/local/bin/froxlor-cli]]></command>
<command><![CDATA[/usr/bin/php <BASE_PATH>bin/froxlor-cli froxlor:cron --run-task 99]]></command>
<command><![CDATA[{{settings.system.crondreload}}]]></command>
</daemon>

1
lib/configfiles/bookworm.xml
View File

@@ -3359,6 +3359,7 @@ aliases: files
<daemon name="cron" title="Cronjob for froxlor"
mandatory="true">
<install><![CDATA[apt-get install cron]]></install>
<command><![CDATA[ln -s <BASE_PATH>bin/froxlor-cli /usr/local/bin/froxlor-cli]]></command>
<command><![CDATA[/usr/bin/php <BASE_PATH>bin/froxlor-cli froxlor:cron --run-task 99]]></command>
<command><![CDATA[{{settings.system.crondreload}}]]></command>
</daemon>

1
lib/configfiles/bullseye.xml
View File

@@ -4929,6 +4929,7 @@ aliases: files
<daemon name="cron" title="Cronjob for froxlor"
mandatory="true">
<install><![CDATA[apt-get install cron]]></install>
<command><![CDATA[ln -s <BASE_PATH>bin/froxlor-cli /usr/local/bin/froxlor-cli]]></command>
<command><![CDATA[/usr/bin/php <BASE_PATH>bin/froxlor-cli froxlor:cron --run-task 99]]></command>
<command><![CDATA[{{settings.system.crondreload}}]]></command>
</daemon>

1
lib/configfiles/buster.xml
View File

@@ -4920,6 +4920,7 @@ aliases: files
<daemon name="cron" title="Cronjob for froxlor"
mandatory="true">
<install><![CDATA[apt-get install cron]]></install>
<command><![CDATA[ln -s <BASE_PATH>bin/froxlor-cli /usr/local/bin/froxlor-cli]]></command>
<command><![CDATA[/usr/bin/php <BASE_PATH>bin/froxlor-cli froxlor:cron --run-task 99]]></command>
<command><![CDATA[{{settings.system.crondreload}}]]></command>
</daemon>

1
lib/configfiles/focal.xml
View File

@@ -4145,6 +4145,7 @@ aliases: files
<daemon name="cron" title="Cronjob for froxlor"
mandatory="true">
<install><![CDATA[apt-get install cron]]></install>
<command><![CDATA[ln -s <BASE_PATH>bin/froxlor-cli /usr/local/bin/froxlor-cli]]></command>
<command><![CDATA[/usr/bin/php <BASE_PATH>bin/froxlor-cli froxlor:cron --run-task 99]]></command>
<command><![CDATA[{{settings.system.crondreload}}]]></command>
</daemon>

1
lib/configfiles/gentoo.xml
View File

@@ -3935,6 +3935,7 @@ aliases: files
<daemon name="cron" title="Cronjob for froxlor"
mandatory="true">
<install><![CDATA[emerge sys-process/cronie]]></install>
<command><![CDATA[ln -s <BASE_PATH>bin/froxlor-cli /usr/local/bin/froxlor-cli]]></command>
<command><![CDATA[/usr/bin/php <BASE_PATH>bin/froxlor-cli froxlor:cron --run-task 99]]></command>
<command><![CDATA[{{settings.system.crondreload}}]]></command>
</daemon>

1
lib/configfiles/jammy.xml
View File

@@ -4146,6 +4146,7 @@ aliases: files
<daemon name="cron" title="Cronjob for froxlor"
mandatory="true">
<install><![CDATA[apt-get install cron]]></install>
<command><![CDATA[ln -s <BASE_PATH>bin/froxlor-cli /usr/local/bin/froxlor-cli]]></command>
<command><![CDATA[/usr/bin/php <BASE_PATH>bin/froxlor-cli froxlor:cron --run-task 99]]></command>
<command><![CDATA[{{settings.system.crondreload}}]]></command>
</daemon>

8
lng/de.lng.php
View File

@@ -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: <a href="https://docs.froxlor.org/adminguide/domainimport.html" target="_blank">https://docs.froxlor.org/adminguide/domainimport.html</a> (englisch)',
'import_description' => 'Detaillierte Informationen über den Aufbau der Importdatei und einen erfolgreichen Import gibt es hier: <a href="https://docs.froxlor.org/latest/admin-guide/domain-import/" target="_blank">https://docs.froxlor.org/latest/admin-guide/domain-import/</a> (englisch)',
'ssl_redirect_temporarilydisabled' => '<br>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.<br /><br /><b>Dies benötigt eine spezielle Webserver-Konfiguration für Apache, siehe <a target="_blank" href="https://docs.froxlor.org/general/configuration/fcgid.html">FCGID-Handbuch</a>.</b>',
'description' => 'PHP wird unter dem Benutzer des Kunden ausgeführt.<br /><br /><b>Dies benötigt eine spezielle Webserver-Konfiguration für Apache, siehe <a target="_blank" href="https://docs.froxlor.org/latest/admin-guide/configuration/fcgid/">FCGID-Handbuch</a>.</b>',
'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.<br /><br /><div class="text-danger">ACHTUNG: Der Inhalt dieses Ordners wird regelmäßig geleert, daher sollten dort keinerlei Daten manuell abgelegt werden.</div>',
@@ -1678,7 +1678,7 @@ Vielen Dank, Ihr Administrator',
],
'phpfpm' => [
'title' => 'Aktiviere PHP-FPM',
'description' => '<b>Dies benötigt eine spezielle Webserver-Konfiguration, siehe <a target="_blank" href="https://docs.froxlor.org/general/configuration/php-fpm.html">PHP-FPM Handbuch</a></b>',
'description' => '<b>Dies benötigt eine spezielle Webserver-Konfiguration, siehe <a target="_blank" href="https://docs.froxlor.org/latest/admin-guide/configuration/php-fpm/">PHP-FPM Handbuch</a></b>',
],
'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 <a href="https://docs.froxlor.org/apiguide/index.html" target="_new">https://docs.froxlor.org/</a>',
'description' => 'Um die froxlor API nutzen zu können, muss diese Option aktiviert sein. Für detaillierte Informationen siehe <a href="https://docs.froxlor.org/latest/api-guide/" target="_new">https://docs.froxlor.org/</a>',
],
'dhparams_file' => [
'title' => 'DHParams Datei (Diffie–Hellman key exchange)',

8
lng/en.lng.php
View File

@@ -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 <a href="https://docs.froxlor.org/adminguide/domainimport.html" target="_blank">https://docs.froxlor.org/adminguide/domainimport.html</a>',
'import_description' => 'Detailed information about the structure of the import-file and how to import successfully, please visit <a href="https://docs.froxlor.org/latest/admin-guide/domain-import/" target="_blank">https://docs.froxlor.org/latest/admin-guide/domain-import/</a>',
'ssl_redirect_temporarilydisabled' => '<br>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.<br /><br /><b>This needs a special webserver configuration for Apache, see <a target="_blank" href="https://docs.froxlor.org/general/configuration/fcgid.html">FCGID - handbook</a></b>',
'description' => 'Use this to run PHP with the corresponding user account.<br /><br /><b>This needs a special webserver configuration for Apache, see <a target="_blank" href="https://docs.froxlor.org/latest/admin-guide/configuration/fcgid/">FCGID - handbook</a></b>',
'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/<br /><br /><div class="text-danger">NOTE: This folder\'s content gets deleted regularly so avoid storing data in there manually.</div>',
@@ -1795,7 +1795,7 @@ Yours sincerely, your administrator',
],
'phpfpm' => [
'title' => 'Enable php-fpm',
'description' => '<b>This needs a special webserver configuration see <a target="_blank" href="https://docs.froxlor.org/general/configuration/php-fpm.html">PHP-FPM handbook</a></b>',
'description' => '<b>This needs a special webserver configuration see <a target="_blank" href="https://docs.froxlor.org/latest/admin-guide/configuration/php-fpm/">PHP-FPM handbook</a></b>',
],
'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 <a href="https://docs.froxlor.org/apiguide/index.html" target="_new">https://docs.froxlor.org/</a>',
'description' => 'In order to use the froxlor API you need to activate this option. For more detailed information see <a href="https://docs.froxlor.org/latest/api-guide/" target="_new">https://docs.froxlor.org/</a>',
],
'dhparams_file' => [
'title' => 'DHParams file (Diffie–Hellman key exchange)',

6
lng/it.lng.php
View File

@@ -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 <a href="https://docs.froxlor.org/adminguide/domainimport.html" target="_blank">https://docs.froxlor.org/adminguide/domainimport.html</a>',
'import_description' => 'Per ottenere informazioni dettagliate sulla struttura del file di importazione e su come importare con successo, visita <a href="https://docs.froxlor.org/latest/admin-guide/domain-import/" target="_blank">https://docs.froxlor.org/latest/admin-guide/domain-import/</a>',
],
'emails' => [
'description' => 'Qui puoi creare e cambiare i tuoi indirizzi Email.<br />Un account è come la bucalettere davanti a casa tua. Se qualcuno ti manda un\'Email, essa sarà recapitata all\'interno del tuo account.<br /><br />Per scaricare le tue Email usa le seguenti impostazioni nel tuo programma di posta elettronica: (I dati scritti in <i>corsivo</i> vanno cambiati con i tuoi!)<br />Hostname: <b><i>Nome del dominio</i></b><br />Username: <b><i>Nome dell\'account / Indirizzo Email</i></b><br />Password: <b><i>La password scelta</i></b>',
@@ -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<br /><strong>ATTENZIONE:</strong>Questo richiede una configurazione manuale, vedi <a target="_blank" href="https://docs.froxlor.org/general/configuration/fcgid.html">FCGID - handbook</a>',
'description' => 'Se attivato, Froxlor verrà eseguito con un utente locale<br /><strong>ATTENZIONE:</strong>Questo richiede una configurazione manuale, vedi <a target="_blank" href="https://docs.froxlor.org/latest/admin-guide/configuration/fcgid/">FCGID - handbook</a>',
],
'perl' => [
'suexecworkaround' => [
@@ -1621,7 +1621,7 @@ Cordiali Saluti, Team Froxlor',
],
'phpfpm' => [
'title' => 'Abilita php-fpm',
'description' => '<b>Questa impostazione richiede una configurazione speciale del server web. Vedi il <a target="_blank" href="https://docs.froxlor.org/general/configuration/php-fpm.html">manuale PHP-FPM</a></b>',
'description' => '<b>Questa impostazione richiede una configurazione speciale del server web. Vedi il <a target="_blank" href="https://docs.froxlor.org/latest/admin-guide/configuration/php-fpm/">manuale PHP-FPM</a></b>',
],
'diskquota_enabled' => 'Quota attivita?',
'diskquota_repquota_path' => [

2
lng/nl.lng.php
View File

@@ -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<br /><strong>Let op:</strong>Dit vereist handmatige configuratie, zie <a target="_blank" href="https://docs.froxlor.org/general/configuration/fcgid.html">FCGID - handbook</a>',
'description' => 'Indien ingeschakeld wordt Froxlor ook uitgevoerd onder een lokale gebruiker<br /><strong>Let op:</strong>Dit vereist handmatige configuratie, zie <a target="_blank" href="https://docs.froxlor.org/latest/admin-guide/configuration/fcgid/">FCGID - handbook</a>',
],
'perl' => [
'suexecworkaround' => [

2
templates/Froxlor/form/formfields.html.twig
View File

@@ -110,7 +110,7 @@
{% else %}
<div class="form-check form-switch">
<input type="hidden" value="0" name="{{ id }}"/>
<input type="checkbox" {% if (field.visible is defined and field.visible == false) or (field.disabled is defined and field.disabled == true) %} disabled {% endif %} value="{{ field.value }}" id="{{ id }}" name="{{ id }}" class="form-check-input {% if field.valid is defined and field.valid == false %}is-invalid{% endif %}" {% if field.checked is defined and field.checked == 1 %} checked="checked" {% endif %} {% if field.mandatory is defined and field.mandatory %} required {% endif %}>
<input type="checkbox" {% if (field.visible is defined and field.visible == false) or (field.disabled is defined and field.disabled == true) %} disabled {% endif %} value="{{ field.value }}" id="{{ id }}" name="{{ id }}" class="form-check-input {% if field.valid is defined and field.valid == false %}is-invalid{% endif %}" {% if field.checked is defined and field.checked == 1 %} checked="checked" {% endif %}>
</div>
{% endif %}
{% endmacro %}

2
templates/Froxlor/sidebar.html.twig
View File

@@ -14,7 +14,7 @@
{% for item in mitems.items %}
<li class="nav-item d-flex justify-content-between align-items-center" {% if item.active == 1 %}aria-current="page"{% endif %}>
<div class="me-auto">
<a class="nav-link text-light {% if item.active == 1 %}active fw-bold{% endif %}" href="{{ item.url|raw }}">{{ item.label|raw }}</a>
<a class="nav-link text-light {% if item.active == 1 %}active fw-bold{% endif %}" href="{{ item.url|raw }}" {% if item.is_external is defined and item.is_external %}target="_blank"{% endif %}>{{ item.label|raw }}</a>
</div>
{% if item.add_shortlink is defined and item.add_shortlink is not empty %}
<a href="{{ item.add_shortlink|raw }}" class="text-secondary me-2"><i class="fa-solid fa-plus-circle"></i></a>

2
templates/Froxlor/userarea.html.twig
View File

@@ -85,7 +85,7 @@
<a class="dropdown-item" href="{{ linker({'section': 'index', 'page': 'apikeys'}) }}"><i class="fa-solid fa-key"></i> {{ lng('menue.main.apikeys') }}</a>
</li>
<li>
<a class="dropdown-item" href="https://docs.froxlor.org/apiguide/index.html" rel="external" target="_blank"><i class="fa-solid fa-circle-info"></i> {{ lng('menue.main.apihelp') }}</a>
<a class="dropdown-item" href="https://docs.froxlor.org/latest/api-guide/" rel="external" target="_blank"><i class="fa-solid fa-circle-info"></i> {{ lng('menue.main.apihelp') }}</a>
</li>
{% endif %}
</ul>