@@ -98,8 +98,9 @@ function update($event_name, $data) {
9898 $ app ->log ("Mailfilter config has been changed " , LOGLEVEL_DEBUG );
9999
100100 $ sieve_file = $ data ["new " ]["maildir " ].'/.sieve ' ;
101+ $ sieve_file_isp = $ data ["new " ]["maildir " ].'/sieve/ispconfig.sieve ' ;
101102 if (is_file ($ sieve_file )) unlink ($ sieve_file ) or $ app ->log ("Unable to delete file: $ sieve_file " , LOGLEVEL_WARN );
102-
103+ if ( is_file ( $ sieve_file_isp )) unlink ( $ sieve_file_isp ) or $ app -> log ( " Unable to delete file: $ sieve_file_isp " , LOGLEVEL_WARN );
103104 $ app ->load ('tpl ' );
104105
105106 //* Select sieve filter file for dovecot version
@@ -204,8 +205,9 @@ function update($event_name, $data) {
204205
205206 $ tpl ->setVar ('addresses ' , $ address_str );
206207
207- file_put_contents ($ sieve_file , $ tpl ->grab ());
208-
208+ file_put_contents ($ sieve_file_isp , $ tpl ->grab ());
209+ //* create symlink to activate sieve script
210+ symlink ("sieve/ispconfig.sieve " , ".sieve " ) or $ app ->log ("Unable to create symlink to active sieve filter " , LOGLEVEL_WARN );
209211 unset($ tpl );
210212
211213 }
@@ -215,7 +217,9 @@ function delete($event_name, $data) {
215217 global $ app , $ conf ;
216218
217219 $ sieve_file = $ data ["old " ]["maildir " ].'/.sieve ' ;
220+ $ sieve_file_isp = $ data ["old " ]["maildir " ].'/sieve/ispconfig.sieve ' ;
218221 if (is_file ($ sieve_file )) unlink ($ sieve_file ) or $ app ->log ("Unable to delete file: $ sieve_file " , LOGLEVEL_WARN );
222+ if (is_file ($ sieve_file_isp )) unlink ($ sieve_file_isp ) or $ app ->log ("Unable to delete file: $ sieve_file_isp " , LOGLEVEL_WARN );
219223 }
220224
221225
0 commit comments