rename .ispconfig-after.sieve to .ispconfig.sieve

Author: jnorell

install/tpl/debian6_dovecot.conf.master

@@ -61,7 +61,7 @@ plugin {
   sieve=/var/vmail/%d/%n/.sieve
 
   sieve_before=/var/vmail/%d/%n/.ispconfig-before.sieve
-  sieve_after=/var/vmail/%d/%n/.ispconfig-after.sieve
+  sieve_after=/var/vmail/%d/%n/.ispconfig.sieve
   sieve_max_script_size = 2M
   sieve_max_actions = 100
   sieve_max_redirects = 25

install/tpl/debian6_dovecot2.conf.master

@@ -30,7 +30,7 @@ plugin {
   sieve=/var/vmail/%d/%n/.sieve
 
   sieve_before=/var/vmail/%d/%n/.ispconfig-before.sieve
-  sieve_after=/var/vmail/%d/%n/.ispconfig-after.sieve
+  sieve_after=/var/vmail/%d/%n/.ispconfig.sieve
   sieve_max_script_size = 2M
   sieve_max_actions = 100
   sieve_max_redirects = 25

install/tpl/debian_dovecot.conf.master

@@ -1146,7 +1146,7 @@ plugin {
   #lazy_expunge = .EXPUNGED/ .DELETED/ .DELETED/.EXPUNGED/
 
   sieve_before=/var/vmail/%d/%n/.ispconfig-before.sieve
-  sieve_after=/var/vmail/%d/%n/.ispconfig-after.sieve
+  sieve_after=/var/vmail/%d/%n/.ispconfig.sieve
   sieve_max_script_size = 2M
   sieve_max_actions = 100
   sieve_max_redirects = 25

install/tpl/debian_dovecot2.conf.master

@@ -29,7 +29,7 @@ plugin {
   sieve=/var/vmail/%d/%n/.sieve
 
   sieve_before=/var/vmail/%d/%n/.ispconfig-before.sieve
-  sieve_after=/var/vmail/%d/%n/.ispconfig-after.sieve
+  sieve_after=/var/vmail/%d/%n/.ispconfig.sieve
   sieve_max_script_size = 2M
   sieve_max_actions = 100
   sieve_max_redirects = 25

install/tpl/fedora_dovecot.conf.master

@@ -1307,7 +1307,7 @@ plugin {
   sieve_dir=~/sieve
 
   sieve_before=/var/vmail/%d/%n/.ispconfig-before.sieve
-  sieve_after=/var/vmail/%d/%n/.ispconfig-after.sieve
+  sieve_after=/var/vmail/%d/%n/.ispconfig.sieve
   sieve_max_script_size = 2M
   sieve_max_actions = 100
   sieve_max_redirects = 25

install/tpl/fedora_dovecot2.conf.master

@@ -27,7 +27,7 @@ plugin {
   sieve=/var/vmail/%d/%n/.sieve
 
   sieve_before=/var/vmail/%d/%n/.ispconfig-before.sieve
-  sieve_after=/var/vmail/%d/%n/.ispconfig-after.sieve
+  sieve_after=/var/vmail/%d/%n/.ispconfig.sieve
   sieve_max_script_size = 2M
   sieve_max_actions = 100
   sieve_max_redirects = 25

install/tpl/opensuse_dovecot.conf.master

@@ -1281,7 +1281,7 @@ plugin {
   sieve_dir=~/sieve
 
   sieve_before=/var/vmail/%d/%n/.ispconfig-before.sieve
-  sieve_after=/var/vmail/%d/%n/.ispconfig-after.sieve
+  sieve_after=/var/vmail/%d/%n/.ispconfig.sieve
   sieve_max_script_size = 2M
   sieve_max_actions = 100
   sieve_max_redirects = 25

install/tpl/opensuse_dovecot2.conf.master

@@ -26,7 +26,7 @@ plugin {
   sieve=/var/vmail/%d/%n/.sieve
 
   sieve_before=/var/vmail/%d/%n/.ispconfig-before.sieve
-  sieve_after=/var/vmail/%d/%n/.ispconfig-after.sieve
+  sieve_after=/var/vmail/%d/%n/.ispconfig.sieve
   sieve_max_script_size = 2M
   sieve_max_actions = 100
   sieve_max_redirects = 25

server/plugins-available/maildeliver_plugin.inc.php

@@ -102,8 +102,9 @@ function update($event_name, $data) {
 			$old_sieve_file_isp = $data["new"]["maildir"].'/sieve/ispconfig.sieve';
 			$sieve_file_isp_before = $data["new"]["maildir"].'/.ispconfig-before.sieve';
 			$sieve_file_isp_before_svbin = $data["new"]["maildir"].'/.ispconfig-before.svbin';
-			$sieve_file_isp_after = $data["new"]["maildir"].'/.ispconfig-after.sieve';
-			$sieve_file_isp_after_svbin = $data["new"]["maildir"].'/.ispconfig-after.svbin';
+			$sieve_file_isp_after = $data["new"]["maildir"].'/.ispconfig.sieve';
+			$sieve_file_isp_after_svbin = $data["new"]["maildir"].'/.ispconfig.svbin';
+
 			if(is_file($old_sieve_file_isp)) unlink($old_sieve_file_isp)  or $app->log("Unable to delete file: $old_sieve_file_isp", LOGLEVEL_WARN);
 			// cleanup .sieve file if it is now a broken link
 			if(is_link($sieve_file) && !file_exists($sieve_file)) unlink($sieve_file)  or $app->log("Unable to delete file: $sieve_file", LOGLEVEL_WARN);
@@ -241,11 +242,12 @@ function delete($event_name, $data) {
 
 		$sieve_file = $data["old"]["maildir"].'/.sieve';
 		$sieve_file_svbin = $data["old"]["maildir"].'/.sieve.svbin';
-		$old_sieve_file_isp = $data["old"]["maildir"].'/sieve/ispconfig.sieve';
+		$old_sieve_file_isp = $data["new"]["maildir"].'/sieve/ispconfig.sieve';
 		$sieve_file_isp_before = $data["old"]["maildir"].'/.ispconfig-before.sieve';
 		$sieve_file_isp_before_svbin = $data["old"]["maildir"].'/.ispconfig-before.svbin';
-		$sieve_file_isp_after = $data["old"]["maildir"].'/.ispconfig-after.sieve';
-		$sieve_file_isp_after_svbin = $data["old"]["maildir"].'/.ispconfig-after.svbin';
+		$sieve_file_isp_after = $data["old"]["maildir"].'/.ispconfig.sieve';
+		$sieve_file_isp_after_svbin = $data["old"]["maildir"].'/.ispconfig.svbin';
+
 		if(is_file($old_sieve_file_isp)) unlink($old_sieve_file_isp)  or $app->log("Unable to delete file: $old_sieve_file_isp", LOGLEVEL_WARN);
 		// cleanup .sieve file if it is now a broken link
 		if(is_link($sieve_file) && !file_exists($sieve_file)) unlink($sieve_file)  or $app->log("Unable to delete file: $sieve_file", LOGLEVEL_WARN);