Merge branch '6817-local_mail_delivery' into 'develop'

Introduce a local_delivery flag for a mail_domain, #6817

Closes #6817

See merge request ispconfig/ispconfig3!1967

Author: Till Brehm

install/sql/incremental/upd_dev_collection.sql

@@ -1 +1,3 @@
 ALTER TABLE `web_database_user` ADD `database_password_sha2` varchar(70) DEFAULT NULL AFTER `database_password`;
+
+ALTER TABLE `mail_domain` ADD `local_delivery` enum('n','y') NOT NULL DEFAULT 'y' AFTER `active`;

install/sql/ispconfig3.sql

@@ -894,6 +894,7 @@ CREATE TABLE `mail_domain` (
   `relay_user` varchar(255) NOT NULL DEFAULT '',
   `relay_pass` varchar(255) NOT NULL DEFAULT '',
   `active` enum('n','y') NOT NULL DEFAULT 'n',
+  `local_delivery` enum('n','y') NOT NULL DEFAULT 'y',
   PRIMARY KEY  (`domain_id`),
   KEY `server_id` (`server_id`,`domain`),
   KEY `domain_active` (`domain`,`active`)

install/tpl/mysql-virtual_domains.cf.master

@@ -2,5 +2,5 @@ user = {mysql_server_ispconfig_user}
 password = {mysql_server_ispconfig_password}
 dbname = {mysql_server_database}
 hosts = {mysql_server_ip}
-query = SELECT domain FROM mail_domain WHERE domain = '%s' AND active = 'y' AND server_id = {server_id}
+query = SELECT domain FROM mail_domain WHERE domain = '%s' AND active = 'y' AND local_delivery = 'y' AND server_id = {server_id}
            AND NOT EXISTS (SELECT source FROM mail_forwarding WHERE source = '@%s' AND type = 'aliasdomain' AND active = 'y' AND server_id = {server_id})

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

@@ -165,6 +165,12 @@
 			'default' => 'y',
 			'value'  => array(0 => 'n', 1 => 'y')
 		),
+		'local_delivery' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'y',
+			'value'  => array(0 => 'n', 1 => 'y')
+		),
 		//#################################
 		// END Datatable fields
 		//#################################

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

@@ -3,6 +3,7 @@ $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Domain';
 $wb['type_txt'] = 'Type';
 $wb['active_txt'] = 'Active';
+$wb['local_delivery_txt'] = 'Local delivery';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'Duplicate Domain.';
 $wb['domain_error_regex'] = 'Invalid domain name.';

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

@@ -3,6 +3,7 @@ $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Domain';
 $wb['type_txt'] = 'Type';
 $wb['active_txt'] = 'Active';
+$wb['local_delivery_txt'] = 'Local delivery';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'Дублиращ се домейн.';
 $wb['domain_error_regex'] = 'Неправилно домейн име.';

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

@@ -3,6 +3,7 @@ $wb['server_id_txt'] = 'Servidor';
 $wb['domain_txt'] = 'Domínio';
 $wb['type_txt'] = 'Tipo';
 $wb['active_txt'] = 'Ativo';
+$wb['local_delivery_txt'] = 'Local delivery';
 $wb['dkim_txt'] = 'Habilitar DKIM';
 $wb['dkim_private_txt'] = 'Chave privada DKIM';
 $wb['dkim_public_txt'] = 'Chave pública DKIM apenas para informação';

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

@@ -3,6 +3,7 @@ $wb['server_id_txt'] = 'Serveur';
 $wb['domain_txt'] = 'Domaine';
 $wb['type_txt'] = 'Type';
 $wb['active_txt'] = 'Actif';
+$wb['local_delivery_txt'] = 'Local delivery';
 $wb['domain_error_empty'] = 'Le domaine est vide.';
 $wb['domain_error_unique'] = 'Dupliquer le domaine.';
 $wb['domain_error_regex'] = 'Le domaine est invalide.';

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

@@ -3,6 +3,7 @@ $wb['server_id_txt'] = '服务器';
 $wb['domain_txt'] = '域名';
 $wb['type_txt'] = '类型';
 $wb['active_txt'] = '启用';
+$wb['local_delivery_txt'] = 'Local delivery';
 $wb['dkim_txt'] = '启用 DKIM';
 $wb['dkim_private_txt'] = 'DKIM 私钥';
 $wb['dkim_public_txt'] = 'DKIM 公钥' . "\n" . '仅供参考';

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

@@ -3,6 +3,7 @@ $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Doména';
 $wb['type_txt'] = 'Typ';
 $wb['active_txt'] = 'Aktivní';
+$wb['local_delivery_txt'] = 'Local delivery';
 $wb['domain_error_empty'] = 'Doména je prázdná.';
 $wb['domain_error_unique'] = 'E-mailová doména s tímto doménovým jménem na serveru již existuje.';
 $wb['domain_error_regex'] = 'Chybný název domény.';