Merge branch 'stable-3.1' into 'stable-3.1'

Create Junk-Folder if it doesn't exist, but Junkmail shall be moved

See merge request ispconfig/ispconfig3!1100

Author: Till Brehm

server/conf/sieve_filter.master

@@ -3,12 +3,12 @@
 # You can create and activate a per-user sieve script (manually or via managesieve),
 # which will execute after this.
 
-require ["fileinto", "regex", "date", "relational", "vacation", "imap4flags", "envelope", "subaddress", "copy", "reject"];
+require ["fileinto", "mailbox", "regex", "date", "relational", "vacation", "imap4flags", "envelope", "subaddress", "copy", "reject"];
 
 <tmpl_if name="move_junk" op="==" value="y">
 # Move spam to spam folder
 if anyof (header :contains "X-Spam-Flag" "YES", header :contains "X-Spam" "Yes", header :contains "subject" "*** SPAM ***", header :contains "subject" "***SPAM***") {
-  fileinto "Junk";
+  fileinto :create "Junk";
   # Stop here so that we do not reply on spams
   stop;
 }
@@ -32,7 +32,7 @@ redirect "<tmpl_var name='address'>";
 <tmpl_if name="move_junk" op="==" value="a">
 # Move spam to spam folder
 if anyof (header :contains "X-Spam-Flag" "YES", header :contains "X-Spam" "Yes", header :contains "subject" "*** SPAM ***", header :contains "subject" "***SPAM***") {
-  fileinto "Junk";
+  fileinto :create "Junk";
   # Stop here so that we do not reply on spams
   stop;
 }