Skip to content
Snippets Groups Projects
Commit 3d3f4704 authored by Carsten's avatar Carsten
Browse files

be compatible to managesieve service

- write sieve filter to sieve subdirectory into ispconfig.sieve
- link .sieve to sieve/ispconfig.sieve
parent f9e50d88
No related branches found
No related tags found
No related merge requests found
...@@ -98,8 +98,9 @@ class maildeliver_plugin { ...@@ -98,8 +98,9 @@ class maildeliver_plugin {
$app->log("Mailfilter config has been changed", LOGLEVEL_DEBUG); $app->log("Mailfilter config has been changed", LOGLEVEL_DEBUG);
$sieve_file = $data["new"]["maildir"].'/.sieve'; $sieve_file = $data["new"]["maildir"].'/.sieve';
$sieve_file_isp = $data["new"]["maildir"].'/sieve/ispconfig.sieve';
if(is_file($sieve_file)) unlink($sieve_file) or $app->log("Unable to delete file: $sieve_file", LOGLEVEL_WARN); if(is_file($sieve_file)) unlink($sieve_file) or $app->log("Unable to delete file: $sieve_file", LOGLEVEL_WARN);
if(is_file($sieve_file_isp)) unlink($sieve_file_isp) or $app->log("Unable to delete file: $sieve_file_isp", LOGLEVEL_WARN);
$app->load('tpl'); $app->load('tpl');
//* Select sieve filter file for dovecot version //* Select sieve filter file for dovecot version
...@@ -204,8 +205,9 @@ class maildeliver_plugin { ...@@ -204,8 +205,9 @@ class maildeliver_plugin {
$tpl->setVar('addresses', $address_str); $tpl->setVar('addresses', $address_str);
file_put_contents($sieve_file, $tpl->grab()); file_put_contents($sieve_file_isp, $tpl->grab());
//* create symlink to activate sieve script
symlink("sieve/ispconfig.sieve", ".sieve") or $app->log("Unable to create symlink to active sieve filter", LOGLEVEL_WARN);
unset($tpl); unset($tpl);
} }
...@@ -215,7 +217,9 @@ class maildeliver_plugin { ...@@ -215,7 +217,9 @@ class maildeliver_plugin {
global $app, $conf; global $app, $conf;
$sieve_file = $data["old"]["maildir"].'/.sieve'; $sieve_file = $data["old"]["maildir"].'/.sieve';
$sieve_file_isp = $data["old"]["maildir"].'/sieve/ispconfig.sieve';
if(is_file($sieve_file)) unlink($sieve_file) or $app->log("Unable to delete file: $sieve_file", LOGLEVEL_WARN); if(is_file($sieve_file)) unlink($sieve_file) or $app->log("Unable to delete file: $sieve_file", LOGLEVEL_WARN);
if(is_file($sieve_file_isp)) unlink($sieve_file_isp) or $app->log("Unable to delete file: $sieve_file_isp", LOGLEVEL_WARN);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment