Merge branch '6791-validator_mail_domain_transport' into 'develop'

Refactored Mail Transport and Domain Validator (#6791)

Closes #6791

See merge request ispconfig/ispconfig3!1963

Author: Till Brehm

interface/lib/classes/validate_mail_transport.inc.php

@@ -41,6 +41,40 @@ function get_error($errmsg) {
 		}
 	}
 
+	/* Validator function for checking that the 'domain' is not already set as mail_domain */
+	function validate_isnot_maildomain($field_name, $field_value, $validator) {
+		global $app, $conf;
+
+		if(isset($app->remoting_lib->primary_id)) {
+			$id = $app->remoting_lib->primary_id;
+		} else {
+			$id = $app->tform->primary_id;
+		}
+
+		$sql = "SELECT domain_id, domain FROM mail_domain WHERE domain = ? AND domain_id != ?";
+		$domain_check = $app->db->queryOneRecord($sql, $field_value, $id);
+
+		if($domain_check) return $this->get_error('domain_is_maildomain');
+
+	}
+
+	/* Validator function for checking that the 'domain' is not already set as mail_transport */
+	function validate_isnot_mailtransport($field_name, $field_value, $validator) {
+		global $app, $conf;
+
+		if(isset($app->remoting_lib->primary_id)) {
+			$id = $app->remoting_lib->primary_id;
+		} else {
+			$id = $app->tform->primary_id;
+		}
+
+		$sql = "SELECT transport_id, domain FROM mail_transport WHERE domain = ? AND transport_id != ?";
+		$domain_check = $app->db->queryOneRecord($sql, $field_value, $id);
+
+		if($domain_check) return $this->get_error('domain_is_transport');
+
+	}
+
 	/* Validator function for checking the 'domain' of a mail transport */
 	function validate_domain($field_name, $field_value, $validator) {
 		global $app, $conf;
@@ -52,8 +86,8 @@ function validate_domain($field_name, $field_value, $validator) {
 		}
 
 		// mail_transport.domain (could also be an email address) must be unique per server
-		$sql = "SELECT transport_id, domain FROM mail_transport WHERE domain = ? AND server_id = ? AND transport_id != ?";
-		$domain_check = $app->db->queryOneRecord($sql, $field_value, $app->tform_actions->dataRecord['server_id'], $id);
+		$sql = "SELECT transport_id, domain FROM mail_transport WHERE domain = ? AND transport_id != ?";
+		$domain_check = $app->db->queryOneRecord($sql, $field_value, $id);
 
 		if($domain_check) return $this->get_error('domain_error_unique');
 	}

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

@@ -89,6 +89,12 @@
 					'errmsg'=> 'domain_error_empty'),
 				1 => array ( 'type' => 'ISDOMAIN',
 					'errmsg'=> 'domain_error_regex'),
+				3 => array(
+					'type' => 'CUSTOM',
+					'class' => 'validate_mail_transport',
+					'function' => 'validate_isnot_mailtransport',
+					'errmsg'=> 'domain_is_transport',
+				),
 			),
 			'default' => '',
 			'value'  => '',

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

@@ -94,6 +94,12 @@
 					'class' => 'validate_mail_transport',
 					'function' => 'validate_domain',
 					'errmsg'=> 'domain_error_unique',
+				),
+				1 => array(
+					'type' => 'CUSTOM',
+					'class' => 'validate_mail_transport',
+					'function' => 'validate_isnot_maildomain',
+					'errmsg' => 'domain_is_maildomain',
 				)
 			),
 			'default' => '',

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

@@ -25,3 +25,4 @@ $wb['dkim_auto_dns_txt'] = 'Managed zone, dns updated automatically';
 $wb['relayhost_txt'] = 'Relayhost';
 $wb['relayhost_user_txt'] = 'Relayhost User';
 $wb['relayhost_password_txt'] = 'Relayhost Password';
+$wb['domain_is_transport'] = 'The Domain is already set as E-Mail Transport.';

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

@@ -9,3 +9,4 @@ $wb['active_txt'] = 'Active';
 $wb['limit_mailrouting_txt'] = 'The max. number of routes for your account is reached.';
 $wb['transport_txt'] = 'Transport';
 $wb['domain_error_unique'] = 'A mail transport for this Domain already exists on this server.';
+$wb['domain_is_maildomain'] = 'The Domain is already set as a E-Mail Domain.';