Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
ISPConfig 3
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Dirk Dankhoff
ISPConfig 3
Commits
14150027
Commit
14150027
authored
Sep 18, 2015
by
Florian Schaal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update mail_mail_domain_plugin.inc.php
parent
b3ada521
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
3 deletions
+7
-3
server/plugins-available/mail_plugin_dkim.inc.php
server/plugins-available/mail_plugin_dkim.inc.php
+7
-3
No files found.
server/plugins-available/mail_plugin_dkim.inc.php
View file @
14150027
...
...
@@ -122,8 +122,8 @@ class mail_plugin_dkim {
$mail_config
=
$app
->
getconf
->
get_server_config
(
$conf
[
'server_id'
],
'mail'
);
if
(
isset
(
$mail_config
[
'dkim_path'
])
&&
!
empty
(
$mail_config
[
'dkim_path'
])
&&
isset
(
$data
[
'new'
][
'dkim_private'
])
&&
!
empty
(
$data
[
'new'
][
'dkim_private'
])
&&
//
isset($data['new']['dkim_private']) &&
//
!empty($data['new']['dkim_private']) &&
$mail_config
[
'dkim_path'
]
!=
'/'
)
{
if
(
!
is_dir
(
$mail_config
[
'dkim_path'
]))
{
...
...
@@ -199,6 +199,10 @@ class mail_plugin_dkim {
function
write_dkim_key
(
$key_file
,
$key_value
,
$key_domain
)
{
global
$app
,
$mailconfig
;
$success
=
false
;
if
(
$key_file
==
''
||
$key_value
==
''
||
$key_domain
==
''
)
{
$app
->
log
(
'DKIM internal error for domain '
.
$key_domain
,
LOGLEVEL_ERROR
);
return
$success
;
}
if
(
$app
->
system
->
file_put_contents
(
$key_file
.
'.private'
,
$key_value
)
)
{
$app
->
log
(
'Saved DKIM Private-key to '
.
$key_file
.
'.private'
,
LOGLEVEL_DEBUG
);
$success
=
true
;
...
...
@@ -211,7 +215,7 @@ class mail_plugin_dkim {
$app
->
log
(
'Saved DKIM Public to '
.
$key_domain
.
'.'
,
LOGLEVEL_DEBUG
);
else
$app
->
log
(
'Unable to save DKIM Public to '
.
$key_domain
.
'.'
,
LOGLEVEL_DEBUG
);
}
else
{
$app
->
log
(
'Unable to save DKIM Privte-key to '
.
$key_file
.
'.private'
,
LOGLEVEL_ERROR
);
$app
->
log
(
'Unable to save DKIM Priv
a
te-key to '
.
$key_file
.
'.private'
,
LOGLEVEL_ERROR
);
}
return
$success
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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