Merge branch '6229-duplicate-forwards-must-be-allowed-revert-for-6212' into 'develop'

Resolve "Duplicate forwards must be allowed, revert for #6212"

Closes #6229

See merge request ispconfig/ispconfig3!1522

Author: Marius Burkard

install/patches/upd_0094.php

@@ -8,7 +8,7 @@ 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)");
+		//$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

@@ -7,7 +7,7 @@ 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`);
+ALTER TABLE `mail_forwarding` ADD KEY `server_id` (`server_id`, `source`);
 
 -- Purge apps & addons installer (#5795) - second time due to syntax error in 0093
 DROP TABLE IF EXISTS `software_package`;

install/sql/ispconfig3.sql

@@ -918,7 +918,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`),
-  UNIQUE KEY `server_id` (`server_id`, `source`),
+  KEY `server_id` (`server_id`, `source`),
   KEY `type` (`type`)
 ) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 

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

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