From be0470aec123ef652a1261ced99b175b794ff2da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Kolly?= Date: Sun, 28 Jul 2019 19:49:56 +0200 Subject: [PATCH] Revert per-domain CAA settings --- lib/formfields/admin/domains/formfield.domains_add.php | 10 ---------- .../admin/domains/formfield.domains_edit.php | 10 ---------- .../customer/domains/formfield.domains_add.php | 10 ---------- .../customer/domains/formfield.domains_edit.php | 10 ---------- 4 files changed, 40 deletions(-) diff --git a/lib/formfields/admin/domains/formfield.domains_add.php b/lib/formfields/admin/domains/formfield.domains_add.php index b2dde16b..ddbb6266 100644 --- a/lib/formfields/admin/domains/formfield.domains_add.php +++ b/lib/formfields/admin/domains/formfield.domains_add.php @@ -214,16 +214,6 @@ return 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( 'visible' => ($ssl_ipsandports != '' ? true : false) && \Froxlor\Settings::Get('system.webserver') != 'lighttpd' && \Froxlor\Settings::Get('system.http2_support') == '1', 'label' => $lng['admin']['domain_http2']['title'], diff --git a/lib/formfields/admin/domains/formfield.domains_edit.php b/lib/formfields/admin/domains/formfield.domains_edit.php index 5585a193..4c756ec1 100644 --- a/lib/formfields/admin/domains/formfield.domains_edit.php +++ b/lib/formfields/admin/domains/formfield.domains_edit.php @@ -250,16 +250,6 @@ return array( $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( 'visible' => ($ssl_ipsandports != '' ? true : false) && \Froxlor\Settings::Get('system.webserver') != 'lighttpd' && \Froxlor\Settings::Get('system.http2_support') == '1', 'label' => $lng['admin']['domain_http2']['title'], diff --git a/lib/formfields/customer/domains/formfield.domains_add.php b/lib/formfields/customer/domains/formfield.domains_add.php index 15f352d2..00d9fca6 100644 --- a/lib/formfields/customer/domains/formfield.domains_add.php +++ b/lib/formfields/customer/domains/formfield.domains_add.php @@ -108,16 +108,6 @@ return 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( 'label' => $lng['admin']['domain_hsts_maxage']['title'], 'desc' => $lng['admin']['domain_hsts_maxage']['description'], diff --git a/lib/formfields/customer/domains/formfield.domains_edit.php b/lib/formfields/customer/domains/formfield.domains_edit.php index 9a21d3e6..56a28543 100644 --- a/lib/formfields/customer/domains/formfield.domains_edit.php +++ b/lib/formfields/customer/domains/formfield.domains_edit.php @@ -128,16 +128,6 @@ return array( $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( 'label' => $lng['admin']['domain_hsts_maxage']['title'], 'desc' => $lng['admin']['domain_hsts_maxage']['description'],