From accfcafdae46cfc1cc5567ee111c63dc223b6c8e Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 30 Jan 2015 09:08:17 -0500
Subject: [PATCH] Merge branch 'master' into 'master'
---
server/plugins-available/maildeliver_plugin.inc.php | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/server/plugins-available/maildeliver_plugin.inc.php b/server/plugins-available/maildeliver_plugin.inc.php
index 6e591a6..85293ae 100644
--- a/server/plugins-available/maildeliver_plugin.inc.php
+++ b/server/plugins-available/maildeliver_plugin.inc.php
@@ -216,18 +216,22 @@
if ( ! is_dir($data["new"]["maildir"].'/sieve/') ) {
$app->system->mkdirpath($data["new"]["maildir"].'/sieve/', 0700, $mail_config['mailuser_name'], $mail_config['mailuser_group']);
}
- file_put_contents($sieve_file, $tpl->grab());
- exec('chown '.$mail_config['mailuser_name'].':'.$mail_config['mailuser_group'].' '.escapeshellcmd($sieve_file));
- chown($sieve_file_isp,$mail_config['mailuser_name']);
- chgrp($sieve_file_isp,$mail_config['mailuser_group']);
+ file_put_contents($sieve_file_isp, $tpl->grab()) or $app->log("Unable to write sieve filter file", LOGLEVEL_WARN);
+ if ( is_file($sieve_file_isp) ) {
+ $app->system->chown($sieve_file_isp,$mail_config['mailuser_name'],false);
+ $app->system->chgrp($sieve_file_isp,$mail_config['mailuser_group'],false);
+ }
chdir($data["new"]["maildir"]);
//* create symlink to activate sieve script
symlink("sieve/ispconfig.sieve", ".sieve") or $app->log("Unable to create symlink to active sieve filter", LOGLEVEL_WARN);
if (is_link(".sieve")) {
- lchown(".sieve",$mail_config['mailuser_name']);
- lchgrp(".sieve",$mail_config['mailuser_group']);
+ $app->system->chown(".sieve",$mail_config['mailuser_name'],true);
+ $app->system->chgrp(".sieve",$mail_config['mailuser_group'],true);
}
+ $app->system->chown($sieve_file,$mail_config['mailuser_name'],true);
+ $app->system->chgrp($sieve_file,$mail_config['mailuser_group'],true);
+
unset($tpl);
}
--
Gitblit v1.9.1