Fix limit check for per domain relaying (#6088)

Author: Thom Pol

interface/web/mail/mail_domain_edit.php

@@ -192,12 +192,20 @@ function onShowEnd() {
 
 		// Check wether per domain relaying is enabled or not
 		$global_config = $app->getconf->get_global_config('mail');
-		if($global_config['show_per_domain_relay_options'] == 'n') {
+		if($global_config['show_per_domain_relay_options'] == 'y') {
 			$app->tpl->setVar("show_per_domain_relay_options", 1);
 		} else {
 			$app->tpl->setVar("show_per_domain_relay_options", 0);
 		}
 
+		// Get the limits of the client
+    $client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
+    $client = $app->db->queryOneRecord("SELECT limit_relayhost FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
+		if ($client["limit_relayhost"] == 'y' || $_SESSION["s"]["user"]["typ"] == 'admin') {
+			$app->tpl->setVar("limit_relayhost", 1);
+		} else {
+			$app->tpl->setVar("limit_relayhost", 0);
+		}
 
 		// Get the spamfilter policys for the user
 		$tmp_user = $app->db->queryOneRecord("SELECT policy_id FROM spamfilter_users WHERE email = ?", '@' . $this->dataRecord["domain"]);
@@ -273,7 +281,7 @@ function onSubmit() {
 		if($_SESSION["s"]["user"]["typ"] != 'admin') {
 			// Get the limits of the client
 			$client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
-			$client = $app->db->queryOneRecord("SELECT client.mail_servers, limit_maildomain, default_mailserver, limit_relayhost FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
+			$client = $app->db->queryOneRecord("SELECT client.mail_servers, limit_maildomain, default_mailserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
 			// When the record is updated
 			if($this->id > 0) {
 				// restore the server ID if the user is not admin and record is edited

interface/web/mail/templates/mail_domain_edit.htm

@@ -76,7 +76,7 @@
                 </select></div>
             </div>
             <tmpl_if name="show_per_domain_relay_options">
-            <tmpl_if name="limit_relayhost" op="==" value="y">
+            <tmpl_if name="limit_relayhost">
               <div class="form-group">
                 <label for="relay_host" class="col-sm-3 control-label">{tmpl_var name='relayhost_txt'}</label>
                 <div class="col-sm-9">