From aa39c6aaa1a1a2b3fc5012427c044ade651ce5f5 Mon Sep 17 00:00:00 2001
From: Jesse Norell <jesse@kci.net>
Date: Tue, 18 Aug 2020 10:10:33 -0600
Subject: [PATCH] forward mail_user.cc in postfix
---
install/tpl/mysql-virtual_email2email.cf.master | 4 +---
install/tpl/mysql-virtual_mailboxes.cf.master | 2 +-
server/conf/sieve_filter.master | 7 -------
.../plugins-available/maildeliver_plugin.inc.php | 11 -----------
server/plugins-available/maildrop_plugin.inc.php | 15 ++-------------
5 files changed, 4 insertions(+), 35 deletions(-)
diff --git a/install/tpl/mysql-virtual_email2email.cf.master b/install/tpl/mysql-virtual_email2email.cf.master
index 17e1cdf0bf..1dc8ba1321 100644
--- a/install/tpl/mysql-virtual_email2email.cf.master
+++ b/install/tpl/mysql-virtual_email2email.cf.master
@@ -2,6 +2,4 @@ user = {mysql_server_ispconfig_user}
password = {mysql_server_ispconfig_password}
dbname = {mysql_server_database}
hosts = {mysql_server_ip}
-query = SELECT email FROM mail_user WHERE email = '%s' AND postfix = 'y' AND disabledeliver = 'n' AND server_id = {server_id}
- UNION
- SELECT cc AS email FROM mail_user WHERE email = '%s' AND postfix = 'y' AND disabledeliver = 'y' AND server_id = {server_id}
+query = SELECT cc AS email FROM mail_user WHERE cc != '' AND email = '%s' AND postfix = 'y' AND disabledeliver = 'y' AND server_id = {server_id}
diff --git a/install/tpl/mysql-virtual_mailboxes.cf.master b/install/tpl/mysql-virtual_mailboxes.cf.master
index 97825f9ffc..281bedb07b 100644
--- a/install/tpl/mysql-virtual_mailboxes.cf.master
+++ b/install/tpl/mysql-virtual_mailboxes.cf.master
@@ -2,4 +2,4 @@ user = {mysql_server_ispconfig_user}
password = {mysql_server_ispconfig_password}
dbname = {mysql_server_database}
hosts = {mysql_server_ip}
-query = select CONCAT(SUBSTRING_INDEX(email,'@',-1),'/',SUBSTRING_INDEX(email,'@',1),'/') from mail_user where login = '%s' and postfix = 'y' and server_id = {server_id}
+query = select CONCAT(SUBSTRING_INDEX(email,'@',-1),'/',SUBSTRING_INDEX(email,'@',1),'/') from mail_user where login = '%s' and postfix = 'y' and disabledeliver = 'n' and server_id = {server_id}
diff --git a/server/conf/sieve_filter.master b/server/conf/sieve_filter.master
index b5dedebf29..75459cd57b 100644
--- a/server/conf/sieve_filter.master
+++ b/server/conf/sieve_filter.master
@@ -14,13 +14,6 @@ if anyof (header :contains "X-Spam-Flag" "YES", header :contains "X-Spam" "Yes",
}
</tmpl_if>
-<tmpl_if name="cc">
-# Send a copy of email to
-<tmpl_loop name="ccloop">
-redirect "<tmpl_var name='address'>";
-</tmpl_loop>
-</tmpl_if>
-
<tmpl_var name='custom_mailfilter'>
</tmpl_if>
diff --git a/server/plugins-available/maildeliver_plugin.inc.php b/server/plugins-available/maildeliver_plugin.inc.php
index 130d0a7f18..4465cf2090 100644
--- a/server/plugins-available/maildeliver_plugin.inc.php
+++ b/server/plugins-available/maildeliver_plugin.inc.php
@@ -92,7 +92,6 @@ class maildeliver_plugin {
or (isset($data["new"]["email"]) and $data["old"]["email"] != $data["new"]["email"])
or $data["old"]["autoresponder_start_date"] != $data["new"]["autoresponder_start_date"]
or $data["old"]["autoresponder_end_date"] != $data["new"]["autoresponder_end_date"]
- or $data["old"]["cc"] != $data["new"]["cc"]
) {
$app->log("Mailfilter config has been changed", LOGLEVEL_DEBUG);
@@ -120,16 +119,6 @@ class maildeliver_plugin {
$tpl = new tpl();
$tpl->newTemplate("sieve_filter.master");
- // cc Field
- $tmp_mails_arr = explode(',',$data["new"]["cc"]);
- $tmp_addresses_arr = array();
- foreach($tmp_mails_arr as $address) {
- if(trim($address) != '') $tmp_addresses_arr[] = array('address' => trim($address));
- }
-
- $tpl->setVar('cc', $data["new"]["cc"]);
- $tpl->setLoop('ccloop', $tmp_addresses_arr);
-
// Custom filters
if($data["new"]["custom_mailfilter"] == 'NULL') $data["new"]["custom_mailfilter"] = '';
$tpl->setVar('custom_mailfilter', str_replace("\r\n","\n",$data["new"]["custom_mailfilter"]));
diff --git a/server/plugins-available/maildrop_plugin.inc.php b/server/plugins-available/maildrop_plugin.inc.php
index 00777a1662..3c0bd3af94 100644
--- a/server/plugins-available/maildrop_plugin.inc.php
+++ b/server/plugins-available/maildrop_plugin.inc.php
@@ -175,13 +175,11 @@ class maildrop_plugin {
// 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"]["cc"] != $data["new"]["cc"]) {
+ or $data["old"]["move_junk"] != $data["new"]["move_junk"]) {
$app->log("Mailfilter config has been changed", LOGLEVEL_DEBUG);
if(trim($data["new"]["custom_mailfilter"]) != ''
- or $data["new"]["move_junk"] != 'n'
- or $data["new"]["cc"] != '') {
+ or $data["new"]["move_junk"] != 'n') {
// Delete the old filter recipe
$email_parts = explode("@", $data["old"]["email"]);
@@ -198,15 +196,6 @@ class maildrop_plugin {
$mailfilter_content = '';
- if($data["new"]["cc"] != '') {
- $tmp_mails_arr = explode(',',$data["new"]["cc"]);
- foreach($tmp_mails_arr as $address) {
- if(trim($address) != '') $mailfilter_content .= "cc \"!".trim($address)."\"\n";
- }
- //$mailfilter_content .= "cc \"!".$data["new"]["cc"]."\"\n";
- $app->log("Added CC address ".$data["new"]["cc"].' to mailfilter file.', LOGLEVEL_DEBUG);
- }
-
if($data["new"]["move_junk"] != 'n') {
if(file_exists($conf["rootpath"].'/conf-custom/mailfilter_move_junk.master')) {
$mailfilter_content .= file_get_contents($conf["rootpath"].'/conf-custom/mailfilter_move_junk.master')."\n";
--
GitLab