Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
I
ISPConfig 3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ISPConfig
ISPConfig 3
Commits
57b164e0
Commit
57b164e0
authored
6 years ago
by
Till Brehm
Browse files
Options
Downloads
Patches
Plain Diff
Fixed issue with creation of duplicate DKIM DNS records when mail domain is saved.
parent
68effaea
No related branches found
No related tags found
1 merge request
!860
Stable 3.1
Pipeline
#281
passed
6 years ago
Stage: syntax
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
interface/web/mail/mail_domain_edit.php
+7
-4
7 additions, 4 deletions
interface/web/mail/mail_domain_edit.php
with
7 additions
and
4 deletions
interface/web/mail/mail_domain_edit.php
+
7
−
4
View file @
57b164e0
...
...
@@ -440,7 +440,8 @@ class page_action extends tform_actions {
$dkim_active
=
@
(
$this
->
dataRecord
[
'dkim'
]
==
'y'
)
?
true
:
false
;
$selector
=
@
(
$this
->
dataRecord
[
'dkim_selector'
]
!=
$this
->
oldDataRecord
[
'dkim_selector'
])
?
true
:
false
;
$dkim_private
=
@
(
$this
->
dataRecord
[
'dkim_private'
]
!=
$this
->
oldDataRecord
[
'dkim_private'
])
?
true
:
false
;
$soaDomain
=
$this
->
dataRecord
[
'domain'
]
.
'.'
;
while
((
!
isset
(
$soa
)
&&
(
substr_count
(
$soaDomain
,
'.'
)
>
1
)))
{
$soa
=
$app
->
db
->
queryOneRecord
(
"SELECT id AS zone, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other, server_id, ttl, serial FROM dns_soa WHERE active = 'Y' AND origin = ?"
,
$soaDomain
);
$soaDomain
=
preg_replace
(
"/^\w+\./"
,
""
,
$soaDomain
);
...
...
@@ -474,10 +475,12 @@ class page_action extends tform_actions {
// purge old rr-record(s)
$sql
=
"SELECT * FROM dns_rr WHERE name LIKE ? AND data LIKE 'v=DKIM1%' AND "
.
$app
->
tform
->
getAuthSQL
(
'r'
)
.
" ORDER BY serial DESC"
;
$rec
=
$app
->
db
->
queryAllRecords
(
$sql
,
'%._domainkey.'
.
$dataRecord
[
'domain'
]
.
'.'
);
if
(
is_array
(
$rec
[
1
]))
{
for
(
$i
=
1
;
$i
<
count
(
$rec
);
++
$i
)
$app
->
db
->
datalogDelete
(
'dns_rr'
,
'id'
,
$rec
[
$i
][
'id'
]);
if
(
is_array
(
$rec
))
{
foreach
(
$rec
as
$r
)
{
$app
->
db
->
datalogDelete
(
'dns_rr'
,
'id'
,
$r
[
'id'
]);
}
}
// also delete a dsn-records with same selector
$sql
=
"SELECT * from dns_rr WHERE name ? AND data LIKE 'v=DKIM1%' AND "
.
$app
->
tform
->
getAuthSQL
(
'r'
);
$rec
=
$app
->
db
->
queryAllRecords
(
$sql
,
'._domainkey.'
.
$dataRecord
[
'dkim_selector'
]
.
'.'
,
$dataRecord
[
'domain'
]);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment