Skip to content

Commit 62af6f1

Browse files
committed
no need for multiple, identical sieve filter templates
1 parent 74196ba commit 62af6f1

File tree

2 files changed

+1
-86
lines changed

2 files changed

+1
-86
lines changed

server/conf/sieve_filter_1.2.master

Lines changed: 0 additions & 72 deletions
This file was deleted.

server/plugins-available/maildeliver_plugin.inc.php

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -114,23 +114,10 @@ function update($event_name, $data) {
114114
if(is_file($sieve_file_isp_after_svbin)) unlink($sieve_file_isp_after_svbin) or $app->log("Unable to delete file: $sieve_file_isp_after_svbin", LOGLEVEL_WARN);
115115
$app->load('tpl');
116116

117-
//* Select sieve filter file for dovecot version
118-
exec('dovecot --version', $tmp);
119-
if(substr($tmp[0], 0, 3) == '1.0') {
120-
$filter_file_template = "sieve_filter.master";
121-
} elseif(substr($tmp[0], 0, 3) == '1.2') {
122-
$filter_file_template = "sieve_filter_1.2.master";
123-
} elseif(substr($tmp[0], 0, 1) == '2') {
124-
$filter_file_template = "sieve_filter_1.2.master";
125-
} else {
126-
$filter_file_template = "sieve_filter.master";
127-
}
128-
unset($tmp);
129-
130117
foreach ( array('before', 'after') as $sieve_script ) {
131118
//* Create new filter file based on template
132119
$tpl = new tpl();
133-
$tpl->newTemplate($filter_file_template);
120+
$tpl->newTemplate("sieve_filter.master");
134121

135122
// cc Field
136123
$tmp_mails_arr = explode(',',$data["new"]["cc"]);

0 commit comments

Comments
 (0)