From b31bb1f27f066a2d49f5ab9ee0ca15e985efc788 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 26 Sep 2011 06:50:23 -0400
Subject: [PATCH] Fixed: FS#1619 - Add apache SNI / SAN support for SSL.
---
server/plugins-available/maildeliver_plugin.inc.php | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/server/plugins-available/maildeliver_plugin.inc.php b/server/plugins-available/maildeliver_plugin.inc.php
index b2a1146..61efb9c 100644
--- a/server/plugins-available/maildeliver_plugin.inc.php
+++ b/server/plugins-available/maildeliver_plugin.inc.php
@@ -60,6 +60,7 @@
Register for the events
*/
+ $app->plugins->registerEvent('mail_user_insert','maildeliver_plugin','update');
$app->plugins->registerEvent('mail_user_update','maildeliver_plugin','update');
$app->plugins->registerEvent('mail_user_delete','maildeliver_plugin','delete');
@@ -102,17 +103,42 @@
$tpl = new tpl();
$tpl->newTemplate("sieve_filter.master");
+
+ // cc Field
+ $tpl->setVar('cc',$data["new"]["cc"]);
// Custom filters
$tpl->setVar('custom_mailfilter',$data["new"]["custom_mailfilter"]);
// Move junk
$tpl->setVar('move_junk',$data["new"]["move_junk"]);
-
+
+ // Set autoresponder start date
+ $tpl->setVar('start_date',$data["new"]["autoresponder_start_date"]);
+
+ // Set autoresponder end date
+ $tpl->setVar('end_date',$data["new"]["autoresponder_end_date"]);
+
// Autoresponder
$tpl->setVar('autoresponder',$data["new"]["autoresponder"]);
+
+ $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) && count($records) > 0) {
+ $addresses .= ':addresses ["'.$data["new"]["email"].'",';
+ foreach($records as $rec) {
+ $addresses .= '"'.$rec['source'].'",';
+ }
+ $addresses = substr($addresses,0,-1);
+ $addresses .= ']';
+ }
+ $tpl->setVar('addresses',$addresses);
+
file_put_contents($sieve_file,$tpl->grab());
unset($tpl);
--
Gitblit v1.9.1