- fix: point file_put_contents call to correct file - upd: better error han...

Carsten Schoene

2015-01-19 3062be984e6899c525f04086559f6060164066a6

- fix: point file_put_contents call to correct file
- upd: better error handling and logging

 server/plugins-available/maildeliver_plugin.inc.php

@@ -216,11 +216,12 @@
            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) ) {
                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);
@@ -228,6 +229,8 @@
                lchown(".sieve",$mail_config['mailuser_name']);
                lchgrp(".sieve",$mail_config['mailuser_group']);
            }
            exec('chown '.$mail_config['mailuser_name'].':'.$mail_config['mailuser_group'].' '.escapeshellcmd($sieve_file));

            unset($tpl);

        }