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

specify clearly which tls settings are being overwritten/ignored depending on the 'Override system TLS settings' flag when adding/updating Domains

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2023-02-19 12:27:56 +01:00
parent a5af104d53
commit 23f1f79eff
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/formfields/admin/domains/formfield.domains_add.php
View File

@@ -250,7 +250,7 @@ return [
'ssl_protocols' => [
'visible' => !empty($ssl_ipsandports) && $userinfo['change_serversettings'] == '1' && Settings::Get('system.webserver') != 'lighttpd',
'label' => lng('serversettings.ssl.ssl_protocols.title'),
'desc' => lng('serversettings.ssl.ssl_protocols.description'),
'desc' => lng('serversettings.ssl.ssl_protocols.description').lng('admin.domain_override_tls_addinfo'),
'type' => 'checkbox',
'value' => [
'TLSv1.2'
@@ -278,14 +278,14 @@ return [
'ssl_cipher_list' => [
'visible' => !empty($ssl_ipsandports) && $userinfo['change_serversettings'] == '1',
'label' => lng('serversettings.ssl.ssl_cipher_list.title'),
'desc' => lng('serversettings.ssl.ssl_cipher_list.description'),
'desc' => lng('serversettings.ssl.ssl_cipher_list.description').lng('admin.domain_override_tls_addinfo'),
'type' => 'text',
'value' => Settings::Get('system.ssl_cipher_list')
],
'tlsv13_cipher_list' => [
'visible' => !empty($ssl_ipsandports) && $userinfo['change_serversettings'] == '1' && Settings::Get('system.webserver') == "apache2" && Settings::Get('system.apache24') == 1,
'label' => lng('serversettings.ssl.tlsv13_cipher_list.title'),
'desc' => lng('serversettings.ssl.tlsv13_cipher_list.description'),
'desc' => lng('serversettings.ssl.tlsv13_cipher_list.description').lng('admin.domain_override_tls_addinfo'),
'type' => 'text',
'value' => Settings::Get('system.tlsv13_cipher_list')
],

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

@@ -277,7 +277,7 @@ return [
'ssl_protocols' => [
'visible' => !empty($ssl_ipsandports) && $userinfo['change_serversettings'] == '1' && Settings::Get('system.webserver') != 'lighttpd',
'label' => lng('serversettings.ssl.ssl_protocols.title'),
'desc' => lng('serversettings.ssl.ssl_protocols.description'),
'desc' => lng('serversettings.ssl.ssl_protocols.description').lng('admin.domain_override_tls_addinfo'),
'type' => 'checkbox',
'value' => !empty($result['ssl_protocols']) ? explode(",", $result['ssl_protocols']) : explode(",", Settings::Get('system.ssl_protocols')),
'values' => [
@@ -303,14 +303,14 @@ return [
'ssl_cipher_list' => [
'visible' => !empty($ssl_ipsandports) && $userinfo['change_serversettings'] == '1',
'label' => lng('serversettings.ssl.ssl_cipher_list.title'),
'desc' => lng('serversettings.ssl.ssl_cipher_list.description'),
'desc' => lng('serversettings.ssl.ssl_cipher_list.description').lng('admin.domain_override_tls_addinfo'),
'type' => 'text',
'value' => !empty($result['ssl_cipher_list']) ? $result['ssl_cipher_list'] : Settings::Get('system.ssl_cipher_list')
],
'tlsv13_cipher_list' => [
'visible' => !empty($ssl_ipsandports) && $userinfo['change_serversettings'] == '1' && Settings::Get('system.webserver') == "apache2" && Settings::Get('system.apache24') == 1,
'label' => lng('serversettings.ssl.tlsv13_cipher_list.title'),
'desc' => lng('serversettings.ssl.tlsv13_cipher_list.description'),
'desc' => lng('serversettings.ssl.tlsv13_cipher_list.description').lng('admin.domain_override_tls_addinfo'),
'type' => 'text',
'value' => !empty($result['tlsv13_cipher_list']) ? $result['tlsv13_cipher_list'] : Settings::Get('system.tlsv13_cipher_list')
],

2
lng/de.lng.php
View File

@@ -454,6 +454,7 @@ return [
'novhostcontainer' => '<br><br><small class="text-danger">Keine der IPs und Ports hat die Option "Erstelle vHost-Container" aktiviert, einige Einstellungen sind daher nicht verfügbar.</small>',
'ownsslvhostsettings' => 'Eigene SSL vHost-Einstellungen',
'domain_override_tls' => 'Überschreibe System TLS Einstellungen',
'domain_override_tls_addinfo' => '<br /><span class="text-danger">Nur verwendet wenn "Überschreibe System TLS Einstellungen" auf "Ja" gestellt ist</span>',
'domain_sslenabled' => 'Aktiviere Nutzung von SSL',
'domain_honorcipherorder' => 'Bevorzuge die serverseitige Cipher Reihenfolge, Standardwert <strong>nein</strong>',
'domain_sessiontickets' => 'Aktiviere TLS Sessiontickets (RFC 5077), Standardwert <strong>ja</strong>',
@@ -568,7 +569,6 @@ return [
'email_quota' => 'E-Mail-Kontingent',
'email_imap' => 'IMAP',
'email_pop3' => 'POP3',
'mail_quota' => 'E-Mail-Kontingent',
'sendinfomail' => 'Daten per E-Mail an mich senden',
'generated_pwd' => 'Passwortvorschlag',
'usedmax' => 'Benutzt / Max.',

2
lng/en.lng.php
View File

@@ -461,6 +461,7 @@ return [
'novhostcontainer' => '<br><br><small class="text-danger">None of the IPs and ports has the "Create vHost-Container" option enabled, many settings here will not be available</small>',
'ownsslvhostsettings' => 'Own SSL vHost-settings',
'domain_override_tls' => 'Override system TLS settings',
'domain_override_tls_addinfo' => '<br /><span class="text-danger">Only used if "Override system TLS settings" is set to "Yes"</span>',
'domain_sslenabled' => 'Enable usage of SSL',
'domain_honorcipherorder' => 'Honor the (server) cipher order, default <strong>no</strong>',
'domain_sessiontickets' => 'Enable TLS sessiontickets (RFC 5077), default <strong>yes</strong>',
@@ -613,7 +614,6 @@ return [
'email_quota' => 'E-mail quota',
'email_imap' => 'E-mail IMAP',
'email_pop3' => 'E-mail POP3',
'mail_quota' => 'Mailquota',
'sendinfomail' => 'Send data via email to me',
'generated_pwd' => 'Password suggestion',
'usedmax' => 'Used / Max',