From c9fa7a415dde4c95141336bc0deccfa5ff560196 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Mon, 18 Aug 2014 10:26:36 -0400
Subject: [PATCH] changed some logics
---
server/plugins-available/mail_plugin_dkim.inc.php | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/server/plugins-available/mail_plugin_dkim.inc.php b/server/plugins-available/mail_plugin_dkim.inc.php
index 5c04aa8..dbd15de 100755
--- a/server/plugins-available/mail_plugin_dkim.inc.php
+++ b/server/plugins-available/mail_plugin_dkim.inc.php
@@ -152,7 +152,7 @@
}
} else {
- $app->log('Unable to write DKIM settings - no DKIM-Path defined', LOGLEVEL_ERROR);
+ $app->log('Unable to write DKIM settings - no or invalid DKIM-Path defined', LOGLEVEL_ERROR);
$check=false;
}
return $check;
@@ -174,6 +174,7 @@
break;
}
}
+ if ( $initfile == '' ) $initfile = 'service amavis';
$app->log('Restarting amavis: '.$initfile.'.', LOGLEVEL_DEBUG);
exec(escapeshellarg($initfile).' restart', $output);
foreach($output as $logline) $app->log($logline, LOGLEVEL_DEBUG);
@@ -189,7 +190,7 @@
function write_dkim_key($key_file, $key_value, $key_domain) {
global $app, $mailconfig;
$success=false;
- if (!$app->system->file_put_contents($key_file.'.private', $key_value) === false) {
+ 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;
/* now we get the DKIM Public-key */
@@ -197,7 +198,7 @@
$public_key='';
foreach($pubkey as $values) $public_key=$public_key.$values."\n";
/* save the DKIM Public-key in dkim-dir */
- if (!$app->system->file_put_contents($key_file.'.public', $public_key) === false)
+ if ( $app->system->file_put_contents($key_file.'.public', $public_key) )
$app->log('Saved DKIM Public to '.$key_domain.'.', LOGLEVEL_DEBUG);
else $app->log('Unable to save DKIM Public to '.$key_domain.'.', LOGLEVEL_DEBUG);
} else {
--
Gitblit v1.9.1