Merge branch '6489-mail_domain_uniqueue' into 'develop'

Extend uniqueness check to be per server for a mail_domain

Closes #6489

See merge request ispconfig/ispconfig3!1969

Author: Till Brehm

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

@@ -87,9 +87,7 @@
 			),
 			'validators' => array (  0 => array ( 'type' => 'NOTEMPTY',
 					'errmsg'=> 'domain_error_empty'),
-				1 => array ( 'type' => 'UNIQUE',
-					'errmsg'=> 'domain_error_unique'),
-				2 => array ( 'type' => 'ISDOMAIN',
+				1 => array ( 'type' => 'ISDOMAIN',
 					'errmsg'=> 'domain_error_regex'),
 			),
 			'default' => '',

interface/web/mail/mail_domain_edit.php

@@ -295,6 +295,12 @@ function onSubmit() {
 			}
 		}
 
+		// Check uniqueness per server.
+		$tmp = $app->db->queryOneRecord("SELECT domain_id FROM mail_domain WHERE domain = ? AND server_id = ? AND domain_id != ?", $this->dataRecord['domain'], $this->dataRecord['server_id'], $this->id);
+		if (!empty($tmp)) {
+			$app->tform->errorMessage .= $app->tform->lng("domain_error_unique")."<br />";
+		}
+
 		if($_SESSION["s"]["user"]["typ"] != 'admin') {
 			// Get the limits of the client
 			$client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);