Merge branch '6212-duplicate-forwards-allowed' into 'develop'

Resolve "duplicate forwards allowed"

Closes #6212

See merge request ispconfig/ispconfig3!1513

Author: Marius Burkard

install/patches/upd_0094.php

@@ -0,0 +1,14 @@
+<?php
+
+if(!defined('INSTALLER_RUN')) die('Patch update file access violation.');
+
+class upd_0094 extends installer_patch_update {
+
+	public function onBeforeSQL() {
+		global $inst;
+
+		// Remove any duplicate mail_forwardings prior to adding unique key
+		$inst->db->query("DELETE FROM mail_forwarding WHERE forwarding_id IN (SELECT forwarding_id FROM (SELECT forwarding_id, COUNT(source) AS source_count FROM mail_forwarding GROUP BY source HAVING source_count > 1) as t1)");
+	}
+
+}

install/sql/incremental/upd_dev_collection.sql

@@ -1,2 +1,6 @@
 -- default spamfilter_users.policy_id to 0
 ALTER TABLE `spamfilter_users` ALTER `policy_id` SET DEFAULT 0;
+
+-- mail_forwarding.source must be unique
+ALTER TABLE `mail_forwarding` DROP KEY `server_id`;
+ALTER TABLE `mail_forwarding` ADD UNIQUE KEY `server_id` (`server_id`, `source`);

install/sql/ispconfig3.sql

@@ -916,7 +916,7 @@ CREATE TABLE `mail_forwarding` (
   `allow_send_as` ENUM('n','y') NOT NULL DEFAULT 'n',
   `greylisting` enum('n','y' ) NOT NULL DEFAULT 'n',
   PRIMARY KEY  (`forwarding_id`),
-  KEY `server_id` (`server_id`,`source`),
+  UNIQUE KEY `server_id` (`server_id`, `source`),
   KEY `type` (`type`)
 ) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 

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

@@ -83,6 +83,8 @@
 			),
 			'validators' => array (  0 => array ( 'type' => 'ISEMAIL',
 					'errmsg'=> 'email_error_isemail'),
+				1 => array ( 'type' => 'UNIQUE',
+					'errmsg'=> 'email_error_unique'),
 			),
 			'default' => '',
 			'value'  => '',

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

@@ -83,6 +83,8 @@
 			),
 			'validators' => array (  0 => array ( 'type' => 'ISEMAIL',
 					'errmsg'=> 'email_error_isemail'),
+				1 => array ( 'type' => 'UNIQUE',
+					'errmsg'=> 'email_error_unique'),
 			),
 			'default' => '',
 			'value'  => '',

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

@@ -14,4 +14,3 @@ $wb['source_txt'] = 'Alias';
 $wb['greylisting_txt'] = 'Enable greylisting';
 $wb['send_as_txt'] = 'Send as';
 $wb['send_as_exp'] = 'Allow target to send mail using this alias as origin';
-?>

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

@@ -10,6 +10,6 @@ $wb['greylisting_txt'] = 'Enable greylisting';
 $wb['destination_error_empty'] = 'The destination must not be empty.';
 $wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.';
 $wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['email_error_unique'] = 'Duplicate Emailaddress.';
 $wb['send_as_txt'] = 'Send as';
 $wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';
-?>

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

@@ -14,4 +14,3 @@ $wb['source_txt'] = 'Alias';
 $wb['greylisting_txt'] = 'Enable greylisting';
 $wb['send_as_txt'] = 'Send as';
 $wb['send_as_exp'] = 'Allow target to send mail using this alias as origin';
-?>

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

@@ -10,6 +10,6 @@ $wb['greylisting_txt'] = 'Enable greylisting';
 $wb['destination_error_empty'] = 'The destination must not be empty.';
 $wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.';
 $wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['email_error_unique'] = 'Duplicate Emailaddress.';
 $wb['send_as_txt'] = 'Send as';
 $wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';
-?>

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

@@ -9,6 +9,7 @@ $wb['source_txt'] = 'Endereço de email de origem';
 $wb['destination_error_empty'] = 'O endereço de email de destino não pode ficar vazio.';
 $wb['destination_error_isemail'] = 'O endereço de email de destino é inválido.';
 $wb['email_error_isemail'] = 'Por favor informe um endereço de email válido.';
+$wb['email_error_unique'] = 'Endereço de email duplicado.';
 $wb['send_as_txt'] = 'Enviar como';
 $wb['send_as_exp'] = 'Permitir o destino enviar emails usando este endereço como origem (se o destino for interno)';
 $wb['greylisting_txt'] = 'Habilitar greylist';