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

add more detailed info in case of only suggestions on installation; correct display of required dns entries for admins

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2025-02-08 16:21:08 +01:00
parent 606377f1d9
commit e35092c31f
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/formfields/admin/domains/formfield.domains_edit.php
View File

@@ -437,17 +437,17 @@ return [
'section_d' => [
'title' => lng('admin.nameserversettings'),
'image' => 'icons/domain_edit.png',
'visible' => $userinfo['change_serversettings'] == '1',
'visible' => ($userinfo['change_serversettings'] == '1' || ($userinfo['change_serversettings'] == '0' && $result['isbinddomain'] == '0')) && (Settings::Get('system.bind_enable') == '1' || $result['isemaildomain'] == '1'),
'fields' => [
'isbinddomain' => [
'visible' => Settings::Get('system.bind_enable') == '1',
'visible' => $userinfo['change_serversettings'] == '1' && Settings::Get('system.bind_enable') == '1',
'label' => lng('admin.createzonefile'),
'type' => 'checkbox',
'value' => '1',
'checked' => $result['isbinddomain']
],
'zonefile' => [
'visible' => Settings::Get('system.bind_enable') == '1',
'visible' => $userinfo['change_serversettings'] == '1' && Settings::Get('system.bind_enable') == '1',
'label' => lng('admin.custombindzone'),
'desc' => lng('admin.bindzonewarning'),
'type' => 'text',
@@ -466,7 +466,7 @@ return [
'value' => (string)(new \Froxlor\Dns\DnsEntry('_dmarc', 'TXT', \Froxlor\Dns\Dns::encloseTXTContent(Settings::Get('dmarc.dmarc_entry'))))
],
'dkim_entry' => [
'visible' => ($result['isbinddomain'] == '0' && Settings::Get('antispam.activated') == '1' && $result['dkim'] == '1' && $result['dkim_pubkey'] != ''),
'visible' => ($result['isbinddomain'] == '0' && Settings::Get('antispam.activated') == '1' && $result['dkim'] == '1' && $result['dkim_pubkey'] != '' && $result['isemaildomain'] == '1'),
'label' => lng('antispam.required_dkim_dns'),
'type' => 'longtext',
'value' => (string)(new \Froxlor\Dns\DnsEntry('dkim' . $result['dkim_id'] . '._domainkey', 'TXT', \Froxlor\Dns\Dns::encloseTXTContent('v=DKIM1; k=rsa; p='.trim($result['dkim_pubkey']))))

1
lng/de.lng.php
View File

@@ -2292,6 +2292,7 @@ Vielen Dank, Ihr Administrator',
'critical_error' => 'Kritischer Fehler',
'suggestions' => 'Nicht notwendig, aber emfohlen',
'phpinfosuccess' => 'Auf dem System ist PHP %s installiert',
'suggestionsnote' => 'Es liegen keine kritische Fehler vor, die eine Installation verhindern, allerdings beachten Sie bitte die Empfehlungen weiter unten für ein optimales Erlebnis.',
'phpinfowarn' => 'Die genutzte PHP Version ist kleiner als die geforderte Version %s',
'phpinfoupdate' => 'Aktualisierung von PHP Version %s auf %s oder höher notwendig',
'start_installation' => 'Installation starten',

1
lng/en.lng.php
View File

@@ -2428,6 +2428,7 @@ Yours sincerely, your administrator',
'critical_error' => 'Critical error',
'suggestions' => 'Not required but recommended',
'phpinfosuccess' => 'Your system is running with PHP %s',
'suggestionsnote' => 'There are no critical errors that prevent installation, but please follow the recommendations below for an optimal experience.',
'phpinfowarn' => 'Your system is running a lower version than PHP %s',
'phpinfoupdate' => 'Update your current PHP version from %s to %s or higher',
'start_installation' => 'Start installation',

3
templates/Froxlor/install/index.html.twig
View File

@@ -71,6 +71,9 @@
<p class="lead {{ preflight.criticals ? 'text-danger' : preflight.suggestions ? 'text-warning' : 'text-success'}}">
<i class="{{ preflight.criticals ? 'fa-solid fa-triangle-exclamation' : preflight.suggestions ? 'fa-solid fa-circle-info' : 'far fa-circle-check' }}"></i>
{{ preflight.text }}
{% if preflight.criticals is empty and preflight.suggestions %}
<br>{{ lng('install.suggestionsnote') }}
{% endif %}
</p>
{% if preflight.criticals %}