From 1a485fd6abef7a969edbd43cd028e7d351bfdd8a Mon Sep 17 00:00:00 2001
From: Pascal Dreissen <pascal@dreissen.nl>
Date: Tue, 05 Jul 2016 11:09:43 -0400
Subject: [PATCH] Merge branch 'missing_fonts' into 'stable-3.1'
---
server/plugins-available/mail_plugin_dkim.inc.php | 33 +++++++++++++--------------------
1 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/server/plugins-available/mail_plugin_dkim.inc.php b/server/plugins-available/mail_plugin_dkim.inc.php
index 7ded684..0b840db 100755
--- a/server/plugins-available/mail_plugin_dkim.inc.php
+++ b/server/plugins-available/mail_plugin_dkim.inc.php
@@ -29,7 +29,7 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@author Florian Schaal, info@schaal-24.de
- @copyrighth Florian Schaal, info@schaal-24.de
+ @copyright Florian Schaal, info@schaal-24.de
*/
@@ -122,8 +122,8 @@
$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'])) {
@@ -171,22 +171,11 @@
* This function restarts amavis
*/
function restart_amavis() {
- global $app, $conf;
- $pos_init=array(
- $conf['init_scripts'].'/amavis',
- $conf['init_scripts'].'/amavisd'
- );
- $initfile='';
- foreach($pos_init as $init) {
- if (is_executable($init)) {
- $initfile=$init;
- 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);
+ global $app;
+ $initcommand = $app->system->getinitcommand(array('amavis', 'amavisd'), 'restart');
+ $app->log('Restarting amavis: '.$initcommand.'.', LOGLEVEL_DEBUG);
+ exec($initcommand, $output);
+ foreach($output as $logline) $app->log($logline, LOGLEVEL_DEBUG);
}
/**
@@ -199,6 +188,10 @@
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 +204,7 @@
$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 Private-key to '.$key_file.'.private', LOGLEVEL_ERROR);
}
return $success;
}
--
Gitblit v1.9.1