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
Container Registry
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
Webslice
ISPConfig 3
Commits
a8739d9e
Commit
a8739d9e
authored
10 years ago
by
Florian Schaal
Browse files
Options
Downloads
Patches
Plain Diff
changed checkpath for dkim-dir
parent
919c2367
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
server/plugins-available/mail_plugin_dkim.inc.php
+8
-3
8 additions, 3 deletions
server/plugins-available/mail_plugin_dkim.inc.php
with
8 additions
and
3 deletions
server/plugins-available/mail_plugin_dkim.inc.php
+
8
−
3
View file @
a8739d9e
...
@@ -117,14 +117,14 @@ class mail_plugin_dkim {
...
@@ -117,14 +117,14 @@ class mail_plugin_dkim {
$app
->
log
(
'Amavis-config not found or not writeable.'
,
LOGLEVEL_ERROR
);
$app
->
log
(
'Amavis-config not found or not writeable.'
,
LOGLEVEL_ERROR
);
$check
=
false
;
$check
=
false
;
}
}
/* dir for dkim-keys writeable? */
/* dir for dkim-keys writeable? */
$mail_config
=
$app
->
getconf
->
get_server_config
(
$conf
[
'server_id'
],
'mail'
);
$mail_config
=
$app
->
getconf
->
get_server_config
(
$conf
[
'server_id'
],
'mail'
);
if
(
isset
(
$mail_config
[
'dkim_path'
])
&&
if
(
isset
(
$mail_config
[
'dkim_path'
])
&&
!
empty
(
$mail_config
[
'dkim_path'
])
&&
!
empty
(
$mail_config
[
'dkim_path'
])
&&
isset
(
$data
[
'new'
][
'dkim_private'
])
&&
isset
(
$data
[
'new'
][
'dkim_private'
])
&&
!
empty
(
$data
[
'new'
][
'dkim_private'
])
&&
!
empty
(
$data
[
'new'
][
'dkim_private'
])
&&
$mail_config
[
'dkim_path'
]
!=
'/'
&&
$mail_config
[
'dkim_path'
]
!=
'/'
$app
->
system
->
checkpath
(
$mail_config
[
'dkim_path'
])
)
{
)
{
if
(
!
is_dir
(
$mail_config
[
'dkim_path'
]))
{
if
(
!
is_dir
(
$mail_config
[
'dkim_path'
]))
{
$app
->
log
(
'DKIM Path '
.
$mail_config
[
'dkim_path'
]
.
' not found - (re)created.'
,
LOGLEVEL_DEBUG
);
$app
->
log
(
'DKIM Path '
.
$mail_config
[
'dkim_path'
]
.
' not found - (re)created.'
,
LOGLEVEL_DEBUG
);
...
@@ -150,6 +150,11 @@ class mail_plugin_dkim {
...
@@ -150,6 +150,11 @@ class mail_plugin_dkim {
$check
=
false
;
$check
=
false
;
}
}
if
(
!
$app
->
system
->
checkpath
(
$mail_config
[
'dkim_path'
])
)
{
$app
->
log
(
'DKIM Path '
.
$mail_config
[
'dkim_path'
]
.
' failed in checkpath.'
,
LOGLEVEL_ERROR
);
$check
=
false
;
}
}
else
{
}
else
{
$app
->
log
(
'Unable to write DKIM settings - no or invalid DKIM-Path defined'
,
LOGLEVEL_ERROR
);
$app
->
log
(
'Unable to write DKIM settings - no or invalid DKIM-Path defined'
,
LOGLEVEL_ERROR
);
$check
=
false
;
$check
=
false
;
...
@@ -184,7 +189,7 @@ class mail_plugin_dkim {
...
@@ -184,7 +189,7 @@ class mail_plugin_dkim {
* @param string $key_file full path to the key-file
* @param string $key_file full path to the key-file
* @param string $key_value private-key
* @param string $key_value private-key
* @param string $key_domain mail-domain
* @param string $key_domain mail-domain
* @return bool - true when the key
i
s written to disk
* @return bool - true when the
private
key
wa
s written to disk
*/
*/
function
write_dkim_key
(
$key_file
,
$key_value
,
$key_domain
)
{
function
write_dkim_key
(
$key_file
,
$key_value
,
$key_domain
)
{
global
$app
,
$mailconfig
;
global
$app
,
$mailconfig
;
...
...
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