From ae6b86b02a9f8211a51966ac7150499da103dce9 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 18 Nov 2011 06:06:57 -0500
Subject: [PATCH] - Select sieve template depending on dovecot version as doevceot 1.0 does not support the new date based autoresponders. - Cleaned up opensuse dovecot-sql.conf file
---
server/plugins-available/maildeliver_plugin.inc.php | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/server/plugins-available/maildeliver_plugin.inc.php b/server/plugins-available/maildeliver_plugin.inc.php
index 0576fde..1f3c563 100644
--- a/server/plugins-available/maildeliver_plugin.inc.php
+++ b/server/plugins-available/maildeliver_plugin.inc.php
@@ -100,9 +100,23 @@
if(is_file($sieve_file)) unlink($sieve_file) or $app->log("Unable to delete file: $sieve_file",LOGLEVEL_WARN);
$app->load('tpl');
-
+
+ //* Select sieve filter file for dovecot version
+ exec('dovecot --version',$tmp);
+ if(substr($tmp[0],0,3) == '1.0') {
+ $filter_file_template = "sieve_filter.master";
+ } elseif(substr($tmp[0],0,3) == '1.2') {
+ $filter_file_template = "sieve_filter_1.2.master";
+ } elseif(substr($tmp[0],0,1) == '2') {
+ $filter_file_template = "sieve_filter_1.2.master";
+ } else {
+ $filter_file_template = "sieve_filter.master";
+ }
+ unset($tmp);
+
+ //* Create new filter file based on template
$tpl = new tpl();
- $tpl->newTemplate("sieve_filter.master");
+ $tpl->newTemplate($filter_file_template);
// cc Field
$tpl->setVar('cc',$data["new"]["cc"]);
--
Gitblit v1.9.1