Merge branch 'forward_via_postfix' into 'stable-3.1'

Forward via postfix

Closes #5670

See merge request ispconfig/ispconfig3!1111

Author: Till Brehm

install/sql/incremental/upd_dev_collection.sql

@@ -76,3 +76,7 @@ ALTER TABLE `dns_soa` CHANGE `dnssec_algo` `dnssec_algo` SET('NSEC3RSASHA1','ECD
 ALTER TABLE `client_template` CHANGE `ssh_chroot` `ssh_chroot` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';
 ALTER TABLE `client_template` CHANGE `web_php_options` `web_php_options` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';
 
+-- add option to forward in lda, default to forward in mta except for existing forwards
+ALTER TABLE `mail_user` ADD `forward_in_lda` enum('n','y') NOT NULL default 'n' AFTER `cc`;
+UPDATE `mail_user` set `forward_in_lda` = 'y' where `cc` != '';
+

install/sql/ispconfig3.sql

@@ -1041,6 +1041,7 @@ CREATE TABLE `mail_user` (
   `maildir_format` varchar(255) NOT NULL default 'maildir',
   `quota` bigint(20) NOT NULL default '-1',
   `cc` text,
+  `forward_in_lda` enum('n','y') NOT NULL default 'n',
   `sender_cc` varchar(255) NOT NULL default '',
   `homedir` varchar(255) NOT NULL default '',
   `autoresponder` enum('n','y') NOT NULL default 'n',

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 email = '%s' AND cc != '' AND (forward_in_lda = 'n' OR disabledeliver = 'y') AND postfix = '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}

interface/web/mail/form/mail_user.tform.php

@@ -189,6 +189,12 @@
 			'width'  => '30',
 			'maxlength' => '65535'
 		),
+		'forward_in_lda' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'n',
+			'value'  => array(0 => 'n', 1 => 'y')
+		),
 		'sender_cc' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',

interface/web/mail/lib/lang/ar_mail_user.lng

@@ -40,6 +40,8 @@ $wb['name_optional_txt'] = '(Optional)';
 $wb['autoresponder_active'] = 'Enable the autoresponder';
 $wb['cc_txt'] = 'Send copy to';
 $wb['cc_error_isemail'] = 'The Send copy to field does not conatin a valid email address';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 $wb['domain_txt'] = 'Domain';
 $wb['now_txt'] = 'Now';
 $wb['login_error_unique'] = 'Login is already taken.';

interface/web/mail/lib/lang/bg_mail_user.lng

@@ -40,6 +40,8 @@ $wb['name_optional_txt'] = '(По желание)';
 $wb['autoresponder_active'] = 'Разреши автоматичен отговор';
 $wb['cc_txt'] = 'Изпрати копие до:';
 $wb['cc_error_isemail'] = 'Полето с Изпрати копие до: не съдържа валиден емайл адрес';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 $wb['domain_txt'] = 'Домейн';
 $wb['now_txt'] = 'Сега';
 $wb['login_error_unique'] = 'Login is already taken.';

interface/web/mail/lib/lang/br_mail_user.lng

@@ -46,8 +46,10 @@ $wb['name_txt'] = 'Nome';
 $wb['name_optional_txt'] = '(Opcional)';
 $wb['autoresponder_active'] = 'Habilitar auto-resposta';
 $wb['cc_txt'] = 'Enviar cópia para';
-$wb['sender_cc_txt'] = 'Enviar cópia oculta (BCC) para';
 $wb['cc_error_isemail'] = 'O campo "Enviar cópia para" contém um endereço de e-mail inválido.';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
+$wb['sender_cc_txt'] = 'Enviar cópia oculta (BCC) para';
 $wb['sender_cc_error_isemail'] = 'O campo "Enviar cópia oculta para" contém um endereço de e-mail inválido.';
 $wb['domain_txt'] = 'Domínio';
 $wb['now_txt'] = 'Agora';

interface/web/mail/lib/lang/ca_mail_user.lng

@@ -39,6 +39,8 @@ $wb['name_optional_txt'] = '(Optionnel)';
 $wb['autoresponder_active'] = 'Activer le répondeur automatique';
 $wb['cc_txt'] = 'Envoyer une copie à';
 $wb['cc_error_isemail'] = 'Le champ Envoyer une copie ne contient pas une adresse courriel valide';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 $wb['domain_txt'] = 'Domaine';
 $wb['now_txt'] = 'Maintenant';
 $wb['login_error_unique'] = 'Ce nom d\'utilisateur est déjà pris.';

interface/web/mail/lib/lang/cz_mail_user.lng

@@ -39,6 +39,8 @@ $wb['name_optional_txt'] = '(volitelné)';
 $wb['autoresponder_active'] = 'Povolit automatický odpovídač';
 $wb['cc_txt'] = 'Odeslat příchozí kopii na';
 $wb['cc_error_isemail'] = 'Adresa uvedená v poli zaslat kopii na je neplatná';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 $wb['domain_txt'] = 'Doména';
 $wb['now_txt'] = 'Nyní';
 $wb['login_error_unique'] = 'Přihlášovací jméno je již obsazeno.';