Merge branch 'stable-3.1' into 'stable-3.1'

Till Brehm · Till Brehm · commit 54be089b30b9 · 2018-03-20T10:56:34.000+01:00
add mail-relay and mail-transport to resync

See merge request ispconfig/ispconfig3!763
diff --git a/interface/web/tools/lib/lang/ar_resync.lng b/interface/web/tools/lib/lang/ar_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/bg_resync.lng b/interface/web/tools/lib/lang/bg_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/br_resync.lng b/interface/web/tools/lib/lang/br_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Políticas anti-spam sincronizadas';
 $wb['do_mail_spamfilter_txt'] = 'Filtros anti-spam sincronizados';
 $wb['do_mailget_txt'] = 'Contas de busca de e-mail sincronizadas';
 $wb['resync_mailget_txt'] = 'Contas de busca de e-mails';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/ca_resync.lng b/interface/web/tools/lib/lang/ca_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/cz_resync.lng b/interface/web/tools/lib/lang/cz_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Proběhla resynchronizace externího získávání e-mailů';
 $wb['resync_mailget_txt'] = 'Externí získávání e-mailů';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/de_resync.lng b/interface/web/tools/lib/lang/de_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'E-Mail Sammeldienst';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/dk_resync.lng b/interface/web/tools/lib/lang/dk_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/el_resync.lng b/interface/web/tools/lib/lang/el_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/en_resync.lng b/interface/web/tools/lib/lang/en_resync.lng
@@ -46,4 +46,8 @@ $wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
 $wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
 $wb["do_mailget_txt"] = "Resynced Fetchmail";
 $wb["resync_mailget_txt"] = "Fetchmail";
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/es_resync.lng b/interface/web/tools/lib/lang/es_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/fi_resync.lng b/interface/web/tools/lib/lang/fi_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/fr_resync.lng b/interface/web/tools/lib/lang/fr_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/hr_resync.lng b/interface/web/tools/lib/lang/hr_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/hu_resync.lng b/interface/web/tools/lib/lang/hu_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/id_resync.lng b/interface/web/tools/lib/lang/id_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/it_resync.lng b/interface/web/tools/lib/lang/it_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/ja_resync.lng b/interface/web/tools/lib/lang/ja_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/nl_resync.lng b/interface/web/tools/lib/lang/nl_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/pl_resync.lng b/interface/web/tools/lib/lang/pl_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/pt_resync.lng b/interface/web/tools/lib/lang/pt_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/ro_resync.lng b/interface/web/tools/lib/lang/ro_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/ru_resync.lng b/interface/web/tools/lib/lang/ru_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Ресинхронизация прав
 $wb['do_mail_spamfilter_txt'] = 'Ресинхронизация спам-фильтров';
 $wb['do_mailget_txt'] = 'Ресинхронизация сборщиков почты';
 $wb['resync_mailget_txt'] = 'Сборщики почты';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/se_resync.lng b/interface/web/tools/lib/lang/se_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/sk_resync.lng b/interface/web/tools/lib/lang/sk_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/tr_resync.lng b/interface/web/tools/lib/lang/tr_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/resync.php b/interface/web/tools/resync.php
@@ -113,6 +113,16 @@ private function server_has_data($type, $server) {
         			'server_type' => 'mail',
 					'server_id' => $server_id,
 				),
+    			'mail_transport' => array (
+        			'index_field' =>  'transport_id',
+        			'server_type' => 'mail',
+					'server_id' => $server_id,
+				),
+    			'mail_relay' => array (
+        			'index_field' =>  'relay_recipient_id',
+        			'server_type' => 'mail',
+					'server_id' => $server_id,
+				),
 			);
 		}
 		if($type == 'mail_filter') {
@@ -292,6 +302,27 @@ function onShowEnd() {
 				unset($options_servers);
 			}
 
+			//* mailtransport
+			$server_list = $this->create_list($mail_server_rec, 'mail', 'mail_transport');
+			$options_servers = $server_list[0];$server_count = $server_list[1];
+			unset($server_list);
+			if (isset($options_servers)) {	//* server with data found
+				if ($server_count > 1) $options_servers = "<option value='0'>".$app->tform->wordbook['all_active_mail_transport_txt']."</option>" . $options_servers;
+				$app->tpl->setVar('mailtransport_server_id', $options_servers);
+				$app->tpl->setVar('mailtransport_found', 1);
+				unset($options_servers);
+			}
+
+			//* mailrelay
+			$server_list = $this->create_list($mail_server_rec, 'mail', 'mail_relay');
+			$options_servers = $server_list[0];$server_count = $server_list[1];
+			unset($server_list);
+			if (isset($options_servers)) {	//* server with data found
+				if ($server_count > 1) $options_servers = "<option value='0'>".$app->tform->wordbook['all_active_mail_relay_txt']."</option>" . $options_servers;
+				$app->tpl->setVar('mailrelay_server_id', $options_servers);
+				$app->tpl->setVar('mailrelay_found', 1);
+				unset($options_servers);
+			}
 		}
 
 		//* fetch web-server
@@ -481,6 +512,8 @@ function onSubmit() {
 			$this->dataRecord['resync_mailbox'] = 1;
 			$this->dataRecord['resync_mailfilter'] = 1;
 			$this->dataRecord['resync_mailinglist'] = 1;
+			$this->dataRecord['resync_mailtransport'] = 1;
+			$this->dataRecord['resync_mailrelay'] = 1;
 			$this->dataRecord['resync_vserver'] = 1;
 			$this->dataRecord['resync_dns'] = 1;
 			$this->dataRecord['resync_client'] = 1;
@@ -553,6 +586,14 @@ function onSubmit() {
 		if($this->dataRecord['resync_mailinglist'] == 1) 
 			$msg .= $this->do_resync('mail_mailinglist', 'mailinglist_id', 'mail', $this->dataRecord['mail_server_id'], 'listname',  $app->tform->wordbook['do_mailinglist_txt'], false);
 
+		//* mailtransport
+		if($this->dataRecord['resync_mailtransport'] == 1) 
+			$msg .= $this->do_resync('mail_transport', 'transport_id', 'mail', $this->dataRecord['mail_server_id'], 'domain',  $app->tform->wordbook['do_mailtransport_txt'], false);
+
+		//* mailrelay
+		if($this->dataRecord['resync_mailrelay'] == 1) 
+			$msg .= $this->do_resync('mail_relay_recipient', 'relay_recipient_id', 'mail', $this->dataRecord['mail_server_id'], 'source',  $app->tform->wordbook['do_mailrelay_txt'], false);
+
 		//* vserver
 		if($this->dataRecord['resync_vserver'] == 1) 
 			$msg .= $this->do_resync('openvz_vm', 'vm_id', 'vserver', $this->dataRecord['verserver_server_id'], 'hostname',  $app->tform->wordbook['do_vserver_txt']);
diff --git a/interface/web/tools/templates/resync.htm b/interface/web/tools/templates/resync.htm
@@ -96,9 +96,22 @@ <h1><tmpl_var name="list_head_txt"></h1>
 			<div class="col-sm-3"><select name="mailinglist_server_id" id="mailinglist_server_id" class="form-control">{tmpl_var name='mailinglist_server_id'}</select></div>
 		</div>
 	</tmpl_if>
+	<tmpl_if name="mailtransport_found">
+		<div class="form-group">
+			<label for="resync_mailtransport" class="col-sm-2 control-label">{tmpl_var name="resync_mailtransport_txt"}</label>
+			<div class="col-sm-1"><input type="checkbox" id="resync_mailtransport" value="1" name="resync_mailtransport"></div>
+			<div class="col-sm-3"><select name="mailtransport_server_id" id="mailtransport_server_id" class="form-control">{tmpl_var name='mailtransport_server_id'}</select></div>
+		</div>
+	</tmpl_if>
+	<tmpl_if name="mailrelay_found">
+		<div class="form-group">
+			<label for="resync_mailrelay" class="col-sm-2 control-label">{tmpl_var name="resync_mailrelay_txt"}</label>
+			<div class="col-sm-1"><input type="checkbox" id="resync_mailtransport" value="1" name="resync_mailrelay"></div>
+			<div class="col-sm-3"><select name="mailrelay_server_id" id="mailrelay_server_id" class="form-control">{tmpl_var name='mailrelay_server_id'}</select></div>
+		</div>
+	</tmpl_if>
 </tmpl_if>
 
-
 <tmpl_if name="dns_server_found">
 	<tmpl_if name="dns_soa_found">
 		<div class="form-group">
