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

Revert per-domain CAA settings

Browse Source
This commit is contained in:
Marc-André Kolly
2019-07-28 19:49:56 +02:00
parent 240178eba7
commit be0470aec1
4 changed files with 0 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -214,16 +214,6 @@ return array(
), ),
'value' => array() 'value' => array()
), ),
'caa' => array(
'visible' => $ssl_ipsandports != '' ? true : false,
'style' => 'align-top',
'label' => $lng['admin']['caa']['title'],
'desc' => $lng['admin']['caa']['description'],
'type' => 'textarea',
'value' => (\Froxlor\Settings::Get('system.leenabled') == '1' ? ($ssl_ipsandports != '' ? '0 issue "letsencrypt.org"' : '') : ''),
'cols' => 60,
'rows' => 5
),
'http2' => array( 'http2' => array(
'visible' => ($ssl_ipsandports != '' ? true : false) && \Froxlor\Settings::Get('system.webserver') != 'lighttpd' && \Froxlor\Settings::Get('system.http2_support') == '1', 'visible' => ($ssl_ipsandports != '' ? true : false) && \Froxlor\Settings::Get('system.webserver') != 'lighttpd' && \Froxlor\Settings::Get('system.http2_support') == '1',
'label' => $lng['admin']['domain_http2']['title'], 'label' => $lng['admin']['domain_http2']['title'],

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

@@ -250,16 +250,6 @@ return array(
$result['letsencrypt'] $result['letsencrypt']
) )
), ),
'caa' => array(
'visible' => $ssl_ipsandports != '' ? true : false,
'style' => 'align-top',
'label' => $lng['admin']['caa']['title'],
'desc' => $lng['admin']['caa']['description'],
'type' => 'textarea',
'value' => $result['caa'],
'cols' => 60,
'rows' => 5
),
'http2' => array( 'http2' => array(
'visible' => ($ssl_ipsandports != '' ? true : false) && \Froxlor\Settings::Get('system.webserver') != 'lighttpd' && \Froxlor\Settings::Get('system.http2_support') == '1', 'visible' => ($ssl_ipsandports != '' ? true : false) && \Froxlor\Settings::Get('system.webserver') != 'lighttpd' && \Froxlor\Settings::Get('system.http2_support') == '1',
'label' => $lng['admin']['domain_http2']['title'], 'label' => $lng['admin']['domain_http2']['title'],

10
lib/formfields/customer/domains/formfield.domains_add.php
View File

@@ -108,16 +108,6 @@ return array(
), ),
'value' => array() 'value' => array()
), ),
'caa' => array(
'visible' => $ssl_ipsandports != '' ? true : false,
'style' => 'align-top',
'label' => $lng['customer']['caa']['title'],
'desc' => $lng['customer']['caa']['description'],
'type' => 'textarea',
'value' => (\Froxlor\Settings::Get('system.leenabled') == '1' ? ($ssl_ipsandports != '' ? '0 issue "letsencrypt.org"' : '') : ''),
'cols' => 60,
'rows' => 5
),
'hsts_maxage' => array( 'hsts_maxage' => array(
'label' => $lng['admin']['domain_hsts_maxage']['title'], 'label' => $lng['admin']['domain_hsts_maxage']['title'],
'desc' => $lng['admin']['domain_hsts_maxage']['description'], 'desc' => $lng['admin']['domain_hsts_maxage']['description'],

10
lib/formfields/customer/domains/formfield.domains_edit.php
View File

@@ -128,16 +128,6 @@ return array(
$result['letsencrypt'] $result['letsencrypt']
) )
), ),
'caa' => array(
'visible' => $ssl_ipsandports != '' ? true : false,
'style' => 'align-top',
'label' => $lng['customer']['caa']['title'],
'desc' => $lng['customer']['caa']['description'],
'type' => 'textarea',
'value' => $result['caa'],
'cols' => 60,
'rows' => 5
),
'hsts_maxage' => array( 'hsts_maxage' => array(
'label' => $lng['admin']['domain_hsts_maxage']['title'], 'label' => $lng['admin']['domain_hsts_maxage']['title'],
'desc' => $lng['admin']['domain_hsts_maxage']['description'], 'desc' => $lng['admin']['domain_hsts_maxage']['description'],