diff --git a/lib/formfields/admin/domains/formfield.domains_edit.php b/lib/formfields/admin/domains/formfield.domains_edit.php index db89fe4b..5126cf1a 100644 --- a/lib/formfields/admin/domains/formfield.domains_edit.php +++ b/lib/formfields/admin/domains/formfield.domains_edit.php @@ -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'])))) diff --git a/lng/de.lng.php b/lng/de.lng.php index 89e3c57b..d1bc4f98 100644 --- a/lng/de.lng.php +++ b/lng/de.lng.php @@ -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', diff --git a/lng/en.lng.php b/lng/en.lng.php index 5065b5b1..d5d35b7b 100644 --- a/lng/en.lng.php +++ b/lng/en.lng.php @@ -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', diff --git a/templates/Froxlor/install/index.html.twig b/templates/Froxlor/install/index.html.twig index 3ffbd3d9..955a7be1 100644 --- a/templates/Froxlor/install/index.html.twig +++ b/templates/Froxlor/install/index.html.twig @@ -71,6 +71,9 @@

{{ preflight.text }} + {% if preflight.criticals is empty and preflight.suggestions %} +
{{ lng('install.suggestionsnote') }} + {% endif %}

{% if preflight.criticals %}