From 6a32720c9abb5a97dafde0cd6f06661060929e7b Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Sun, 9 Aug 2020 10:54:22 +0200 Subject: [PATCH] remove underscore from dkim-selector in the output certificate files too as (old) dkim-filter read the selector from this filename; refs #619 Signed-off-by: Michael Kaufmann --- lib/Froxlor/Cron/Dns/DnsBase.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Froxlor/Cron/Dns/DnsBase.php b/lib/Froxlor/Cron/Dns/DnsBase.php index f51ff6bc..820c9df2 100644 --- a/lib/Froxlor/Cron/Dns/DnsBase.php +++ b/lib/Froxlor/Cron/Dns/DnsBase.php @@ -195,8 +195,8 @@ abstract class DnsBase while ($domain = $result_domains_stmt->fetch(\PDO::FETCH_ASSOC)) { - $privkey_filename = \Froxlor\FileDir::makeCorrectFile(Settings::Get('dkim.dkim_prefix') . '/dkim_' . $domain['dkim_id']); - $pubkey_filename = \Froxlor\FileDir::makeCorrectFile(Settings::Get('dkim.dkim_prefix') . '/dkim_' . $domain['dkim_id'] . '.public'); + $privkey_filename = \Froxlor\FileDir::makeCorrectFile(Settings::Get('dkim.dkim_prefix') . '/dkim' . $domain['dkim_id']); + $pubkey_filename = \Froxlor\FileDir::makeCorrectFile(Settings::Get('dkim.dkim_prefix') . '/dkim' . $domain['dkim_id'] . '.public'); if ($domain['dkim_privkey'] == '' || $domain['dkim_pubkey'] == '') { $max_dkim_id_stmt = Database::query("SELECT MAX(`dkim_id`) as `max_dkim_id` FROM `" . TABLE_PANEL_DOMAINS . "`");