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

Added option to select Local Mail server for remote email accounts import

See merge request ispconfig/ispconfig3!924

Author: Till Brehm

interface/web/tools/import_ispconfig.php

@@ -107,6 +107,17 @@
 		}
 		$app->tpl->setVar("client_group_id", $client_select);
 
+		//* Fill the mail server select field
+		$sql = "SELECT server_id, server_name FROM server WHERE mail_server = 1 and mirror_server_id = 0";
+		$mail_servers = $app->db->queryAllRecords($sql);
+		$mail_server_select = "";
+		if(is_array($mail_servers)) {
+			foreach( $mail_servers as $m_server) {
+				$selected = @($m_server['server_id'] == $_POST['local_server_id'])?'SELECTED':'';
+				$mail_server_select .= "<option value='$m_server[server_id]' $selected>$m_server[server_name]</option>\r\n";
+			}
+		}
+		$app->tpl->setVar("local_server_id", $mail_server_select);
 
 		try {
 			//* Allow connections to self signed SSL certs
@@ -161,6 +172,7 @@
 $app->tpl->setVar('remote_session_id', $remote_session_id);
 $app->tpl->setVar('msg', $msg);
 $app->tpl->setVar('error', $error);
+$app->tpl->setVar('local_server_id', $_POST['local_server_id'], true);
 
 //* SET csrf token
 $csrf_token = $app->auth->csrf_token_get('ispconfig_import');
@@ -188,7 +200,10 @@ function start_domain_import($mail_domain) {
 	$server_id = intval($tmp['server_id']);
 	unset($tmp);
 	if($server_id == 0) $server_id = 1;
-
+	
+    if (isset($_POST['local_server_id']) && intval($_POST['local_server_id']) !== $server_id){
+        $server_id = intval($_POST['local_server_id']);
+    }
 	//* get the mail domain record
 	$mail_domain_rec = $client->mail_domain_get($remote_session_id, array('domain' => $mail_domain));
 	if(is_array($mail_domain_rec)) {

interface/web/tools/lib/lang/en_import_ispconfig.lng

@@ -20,5 +20,6 @@ $wb['import_alias_txt'] = 'Import email alias';
 $wb['import_forward_txt'] = 'Import forward';
 $wb['import_user_filter_txt'] = 'Import user filter';
 $wb['import_spamfilter_txt'] = 'Import spamfilter';
+$wb['local_server_txt'] = 'Local Mail Server';
 
 ?>

interface/web/tools/templates/import_ispconfig.htm

@@ -36,6 +36,12 @@ <h1><tmpl_var name="head_txt"></h1>
                         {tmpl_var name='client_group_id'}
                     </select></div>
                 </div>
+                <div class="form-group">
+                    <label for="local_server_id" class="col-sm-3 control-label">{tmpl_var name='local_server_txt'}</label>
+                    <div class="col-sm-9"><select name="local_server_id" id="local_server_id" class="form-control">
+                        {tmpl_var name='local_server_id'}
+                    </select></div>
+                </div>
                 <div class="form-group">
                     <label class="col-sm-3 control-label">{tmpl_var name="import_mailbox_txt"}</label>
                     <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_mailbox" value="1" name="import_mailbox" checked="checked" /></div>