forward mail_user.cc in postfix

Author: jnorell

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}

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}

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>

server/plugins-available/maildeliver_plugin.inc.php

@@ -92,7 +92,6 @@ function update($event_name, $data) {
 			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 @@ function update($event_name, $data) {
 				$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"]));

server/plugins-available/maildrop_plugin.inc.php

@@ -175,13 +175,11 @@ function update($event_name, $data) {
 
 		// 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 @@ function update($event_name, $data) {
 
 				$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";