Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
Open sidebar
Thom
ISPConfig 3
Commits
366b1ad5
Unverified
Commit
366b1ad5
authored
Mar 03, 2021
by
Helmo
Browse files
Also relate spf record check to a soa
parent
8a03bc6b
Changes
1
Hide whitespace changes
Inline
Side-by-side
interface/web/dns/dns_dmarc_edit.php
View file @
366b1ad5
...
...
@@ -236,8 +236,10 @@ class page_action extends tform_actions {
}
// ... and an active spf-record (this breaks the current draft but DMARC is useless if you use DKIM or SPF
$sql
=
"SELECT * FROM dns_rr WHERE name LIKE ? AND type='TXT' AND (data LIKE 'v=spf1%' AND active = 'y')"
;
$temp
=
$app
->
db
->
queryAllRecords
(
$sql
,
$domain_name
.
'.'
);
$sql
=
"SELECT * FROM dns_rr
LEFT JOIN dns_soa ON (dns_rr.zone=dns_soa.id)
WHERE dns_soa.origin = ? AND (dns_rr.name LIKE ? OR dns_rr.name = '') AND type='TXT' AND data like 'v=spf1%' AND dns_rr.active='Y'"
;
$temp
=
$app
->
db
->
queryAllRecords
(
$sql
,
$soa
[
'origin'
],
$soa
[
'origin'
]);
// abort if more than 1 active spf-records (backward-compatibility)
if
(
is_array
(
$temp
[
1
]))
{
if
(
isset
(
$app
->
tform
->
errorMessage
))
$app
->
tform
->
errorMessage
=
'<br/>'
.
$app
->
tform
->
errorMessage
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment