Merge remote-tracking branch 'ispc3master/master'

Dominik

2014-01-23 6250b7ea002fd99e40d0170d31e7e19e69f97ccd

 server/plugins-available/maildeliver_plugin.inc.php

@@ -208,16 +208,17 @@
         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));

         file_put_contents($sieve_file_isp, $tpl->grab());
         chown($sieve_file_isp,$mail_config['mailuser_name']);
         chgrp($sieve_file_isp,$mail_config['mailuser_group']);
         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_file_isp,$mail_config['mailuser_name']);
            lchgrp($sieve_file_isp,$mail_config['mailuser_group']);
            lchown(".sieve",$mail_config['mailuser_name']);
            lchgrp(".sieve",$mail_config['mailuser_group']);
         }
         unset($tpl);