From 7e57352bc0264e7dce6e4b251df5cb74c4767089 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Thu, 30 Jul 2020 07:59:22 +0200 Subject: [PATCH] remove underscore from dkim-selector, refs #619 Signed-off-by: Michael Kaufmann --- lib/Froxlor/Api/Commands/SubDomains.php | 4 ++-- lib/Froxlor/Dns/Dns.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Froxlor/Api/Commands/SubDomains.php b/lib/Froxlor/Api/Commands/SubDomains.php index 968e286b..699c70c9 100644 --- a/lib/Froxlor/Api/Commands/SubDomains.php +++ b/lib/Froxlor/Api/Commands/SubDomains.php @@ -36,7 +36,7 @@ class SubDomains extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resourc * @param string $url * optional, overwrites path value with an URL to generate a redirect, alternatively use the path parameter also for URLs * @param int $openbasedir_path - * optional, either 0 for customers-homedir or 1 for domains-docroot + * optional, either 0 for domains-docroot or 1 for customers-homedir * @param int $phpsettingid * optional, php-settings-id, if empty the $domain value is used * @param int $redirectcode @@ -450,7 +450,7 @@ class SubDomains extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resourc * @param bool $isemaildomain * optional * @param int $openbasedir_path - * optional, either 0 for customers-homedir or 1 for domains-docroot + * optional, either 0 for domains-docroot or 1 for customers-homedir * @param int $phpsettingid * optional, php-settings-id, if empty the $domain value is used * @param int $redirectcode diff --git a/lib/Froxlor/Dns/Dns.php b/lib/Froxlor/Dns/Dns.php index 8d0b329c..36692bf0 100644 --- a/lib/Froxlor/Dns/Dns.php +++ b/lib/Froxlor/Dns/Dns.php @@ -144,7 +144,7 @@ class Dns } if (Settings::Get('dkim.use_dkim') == '1') { // check for DKIM content later - self::addRequiredEntry('dkim_' . $domain['dkim_id'] . '._domainkey', 'TXT', $required_entries); + self::addRequiredEntry('dkim' . $domain['dkim_id'] . '._domainkey', 'TXT', $required_entries); } } @@ -283,7 +283,7 @@ class Dns if ($record == '@SPF@') { $txt_content = Settings::Get('spf.spf_entry'); $zonerecords[] = new DnsEntry('@', 'TXT', self::encloseTXTContent($txt_content)); - } elseif ($record == 'dkim_' . $domain['dkim_id'] . '._domainkey' && ! empty($dkim_entries)) { + } elseif ($record == 'dkim' . $domain['dkim_id'] . '._domainkey' && ! empty($dkim_entries)) { // check for multiline entry $multiline = false; if (substr($dkim_entries[0], 0, 1) == '(') {