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

drop ADSP support, fixes #622

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2019-01-04 20:58:20 +01:00
parent b7585585dc
commit 2b4199e558
7 changed files with 0 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/Froxlor/Dns/Dns.php
View File

@@ -139,10 +139,6 @@ class Dns
if (Settings::Get('dkim.use_dkim') == '1') {
// check for DKIM content later
self::addRequiredEntry('dkim_' . $domain['dkim_id'] . '._domainkey', 'TXT', $required_entries);
// check for ASDP
if (Settings::Get('dkim.dkim_add_adsp') == "1") {
self::addRequiredEntry('_adsp._domainkey', 'TXT', $required_entries);
}
}
}
@@ -277,8 +273,6 @@ class Dns
$multiline = true;
}
$zonerecords[] = new DnsEntry($record, 'TXT', self::encloseTXTContent($dkim_entries[0], $multiline));
} elseif ($record == '_adsp._domainkey' && ! empty($dkim_entries) && isset($dkim_entries[1])) {
$zonerecords[] = new DnsEntry($record, 'TXT', self::encloseTXTContent($dkim_entries[1]));
}
}
}
@@ -401,23 +395,6 @@ class Dns
// dkim-entry
$zone_dkim[] = $dkim_txt;
// adsp-entry
if (Settings::Get('dkim.dkim_add_adsp') == "1") {
$adsp = '"dkim=';
switch ((int) Settings::Get('dkim.dkim_add_adsppolicy')) {
case 0:
$adsp .= 'unknown"';
break;
case 1:
$adsp .= 'all"';
break;
case 2:
$adsp .= 'discardable"';
break;
}
$zone_dkim[] = $adsp;
}
}
return $zone_dkim;