From 10b47ccebdb3c25faba6d1075a08c2b9fb63f827 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 15 Jan 2013 08:51:08 -0500
Subject: [PATCH] Fixed: FS#2613 - Adding chrooted cron jobs not work and freeze ispconfig job queue
---
server/plugins-available/maildeliver_plugin.inc.php | 82 +++++++++++++++++++++++++++++++++++-----
1 files changed, 71 insertions(+), 11 deletions(-)
diff --git a/server/plugins-available/maildeliver_plugin.inc.php b/server/plugins-available/maildeliver_plugin.inc.php
index 61cca83..5dbc65e 100644
--- a/server/plugins-available/maildeliver_plugin.inc.php
+++ b/server/plugins-available/maildeliver_plugin.inc.php
@@ -86,6 +86,7 @@
// Write the custom mailfilter script, if mailfilter recipe has changed
if($data["old"]["custom_mailfilter"] != $data["new"]["custom_mailfilter"]
or $data["old"]["move_junk"] != $data["new"]["move_junk"]
+ or $data["old"]["autoresponder_subject"] != $data["new"]["autoresponder_subject"]
or $data["old"]["autoresponder_text"] != $data["new"]["autoresponder_text"]
or $data["old"]["autoresponder"] != $data["new"]["autoresponder"]
or (isset($data["new"]["email"]) and $data["old"]["email"] != $data["new"]["email"])
@@ -100,9 +101,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"]);
@@ -112,26 +127,71 @@
// Move junk
$tpl->setVar('move_junk',$data["new"]["move_junk"]);
-
+
+ // Check autoresponder dates
+ if($data["new"]["autoresponder_start_date"] == '0000-00-00 00:00:00' && $data["new"]["autoresponder_end_date"] == '0000-00-00 00:00:00') {
+ $tpl->setVar('autoresponder_date_limit',0);
+ } else {
+ $tpl->setVar('autoresponder_date_limit',1);
+ }
+
+
+ // Set autoresponder start date
+ $data["new"]["autoresponder_start_date"] = str_replace (" ", "T", $data["new"]["autoresponder_start_date"]);
+ $tpl->setVar('start_date',$data["new"]["autoresponder_start_date"]);
+
+ // Set autoresponder end date
+ $data["new"]["autoresponder_end_date"] = str_replace (" ", "T", $data["new"]["autoresponder_end_date"]);
+ $tpl->setVar('end_date',$data["new"]["autoresponder_end_date"]);
+
// Autoresponder
$tpl->setVar('autoresponder',$data["new"]["autoresponder"]);
-
+
+ // Autoresponder Subject
+ $data["new"]["autoresponder_subject"] = str_replace("\"","'",$data["new"]["autoresponder_subject"]);
+ $tpl->setVar('autoresponder_subject',$data["new"]["autoresponder_subject"]);
+
+ // Autoresponder Text
$data["new"]["autoresponder_text"] = str_replace("\"","'",$data["new"]["autoresponder_text"]);
$tpl->setVar('autoresponder_text',$data["new"]["autoresponder_text"]);
//* Set alias addresses for autoresponder
$sql = "SELECT * FROM mail_forwarding WHERE type = 'alias' AND destination = '".$app->db->quote($data["new"]["email"])."'";
$records = $app->db->queryAllRecords($sql);
- $addresses = '';
- if(is_array($records)) {
- $addresses .= ':addresses [';
+
+ $addresses = array();
+ $addresses[] = $data["new"]["email"];
+ if(is_array($records) && count($records) > 0) {
foreach($records as $rec) {
- $addresses .= '"'.$rec['source'].'",';
+ $addresses[] = $rec['source'];
}
- $addresses = substr($addresses,0,-1);
- $addresses .= ']';
}
- $tpl->setVar('addresses',$addresses);
+
+ $email_parts = explode('@',$data["new"]["email"]);
+ $sql = "SELECT * FROM mail_forwarding WHERE type = 'aliasdomain' AND destination = '@".$app->db->quote($email_parts[1])."'";
+ $records = $app->db->queryAllRecords($sql);
+ if(is_array($records) && count($records) > 0) {
+ foreach($records as $rec) {
+ $aliasdomain = substr($rec['source'],1);
+ foreach($addresses as $email) {
+ $email_parts = explode('@',$email);
+ $addresses[] = $email_parts[0].'@'.$aliasdomain;
+ }
+ }
+ }
+
+ $address_str = '';
+ if(is_array($addresses) && count($addresses) > 0) {
+ $address_str .= ':addresses [';
+ foreach($addresses as $rec) {
+ $address_str .= '"'.$rec.'",';
+ }
+ $address_str = substr($address_str,0,-1);
+ $address_str .= ']';
+ }
+
+
+ $tpl->setVar('addresses',$address_str);
file_put_contents($sieve_file,$tpl->grab());
--
Gitblit v1.9.1