Added mail account import tool.

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

@@ -6,4 +6,5 @@ $wb['Password and Language'] = 'Password and Language';
 $wb['ispconfig_tools_note'] = 'This module allows you to change the password and language and to start a resync of the DNS records.';
 $wb['Sync Tools'] = 'Sync Tools';
 $wb['Resync'] = 'Resync';
+$wb['Import'] = 'Import';
 ?>
\ No newline at end of file

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

+<?php
+$wb['head_txt'] = 'Import email configuration from ISPConfig 3';
+$wb['legend_txt'] = 'Remote server connection details';
+$wb['legend2_txt'] = 'Import email domain';
+$wb['resync_sites_txt'] = 'Resync Websites';
+$wb['resync_ftp_txt'] = 'Resync FTP users';
+$wb['resync_shell_txt'] = 'Resync shell users';
+$wb['resync_cron_txt'] = 'Resync cronjobs';
+$wb['resync_db_txt'] = 'Resync clientdb config';
+$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
+$wb['resync_dns_txt'] = 'Resync DNS records';
+$wb['btn_start_txt'] = 'Start Import';
+$wb['btn_connect_txt'] = 'Connect to remote server';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['client_group_id_txt'] = 'Local client';
+$wb['mail_domain_txt'] = 'Remote email domain';
+$wb['import_mailbox_txt'] = 'Import mailbox';
+$wb['import_aliasdomain_txt'] = 'Import alias domain';
+$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';
+
+?>
\ No newline at end of file

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

@@ -5,7 +5,7 @@ $wb['resync_sites_txt'] = 'Resync Websites';
 $wb['resync_ftp_txt'] = 'Resync FTP users';
 $wb['resync_shell_txt'] = 'Resync shell users';
 $wb['resync_cron_txt'] = 'Resync cronjobs';
-$wb['resync_db_txt'] = 'Resync database config';
+$wb['resync_db_txt'] = 'Resync clientdb config';
 $wb['resync_mailbox_txt'] = 'Resync Mailboxes';
 $wb['resync_dns_txt'] = 'Resync DNS records';
 $wb['btn_start_txt'] = 'Start';

interface/web/tools/lib/menu.d/import.menu.php

+<?php
+
+
+// Menu
+
+if($app->auth->is_admin()) {
+
+$items = array();
+
+$items[] = array( 'title' 	=> 'ISPConfig 3',
+				  'target' 	=> 'content',
+				  'link'	=> 'tools/import_ispconfig.php');
+
+
+$module['nav'][] = array(	'title'	=> 'Import',
+							'open' 	=> 1,
+							'items'	=> $items);
+
+unset($items);
+}
+
+?>
\ No newline at end of file

interface/web/tools/templates/import_ispconfig.htm

+<h2>{tmpl_var name="head_txt"}</h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_language_import">
+  
+  <div class="pnl_formsarea">
+    <fieldset class="inlineLabels"><legend>{tmpl_var name="legend_txt"}</legend>
+	  <div class="ctrlHolder">
+		<p class="label">Remote API URL</p>
+		<div class="multiField">
+			<input id="remote_server" type="text" value="{tmpl_var name='remote_server'}" name="remote_server" /> (e.g. https://www.example.com:8080/remote/ )
+		</div>
+	  </div>
+	  <div class="ctrlHolder">
+		<p class="label">Remote User</p>
+		<div class="multiField">
+			<input id="remote_user" type="text" value="{tmpl_var name='remote_user'}" name="remote_user" />
+		</div>
+	  </div>
+	  <div class="ctrlHolder">
+		<p class="label">Remote password</p>
+		<div class="multiField">
+			<input id="remote_password" type="text" value="{tmpl_var name='remote_password'}" name="remote_password" />
+		</div>
+	  </div>
+	</fieldset>
+	  <tmpl_if name="connected">
+<div class="pnl_formsarea">
+    <fieldset class="inlineLabels"><legend>{tmpl_var name="legend2_txt"}</legend>
+	  <div class="ctrlHolder">
+      	<label for="mail_domain">{tmpl_var name='mail_domain_txt'}</label>
+        <select name="mail_domain" id="mail_domain" class="selectInput">
+					{tmpl_var name='mail_domain'}
+		</select>
+      </div>
+	  <div class="ctrlHolder">
+      	<label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
+        <select name="client_group_id" id="client_group_id" class="selectInput">
+					{tmpl_var name='client_group_id'}
+		</select>
+      </div>
+	  <div class="ctrlHolder">
+		<p class="label">{tmpl_var name="import_mailbox_txt"}</p>
+		<div class="multiField">
+			<input id="import_mailbox" type="checkbox" value="1" name="import_mailbox" checked="checked" />
+		</div>
+	  </div>
+	  <div class="ctrlHolder">
+		<p class="label">{tmpl_var name="import_user_filter_txt"}</p>
+		<div class="multiField">
+			<input id="import_user_filter" type="checkbox" value="1" name="import_user_filter" checked="checked" />
+		</div>
+	  </div>
+	  <div class="ctrlHolder">
+		<p class="label">{tmpl_var name="import_spamfilter_txt"}</p>
+		<div class="multiField">
+			<input id="import_spamfilter" type="checkbox" value="1" name="import_spamfilter" checked="checked" />
+		</div>
+	  </div>
+	  <div class="ctrlHolder">
+		<p class="label">{tmpl_var name="import_alias_txt"}</p>
+		<div class="multiField">
+			<input id="import_alias" type="checkbox" value="1" name="import_alias" checked="checked" />
+		</div>
+	  </div>
+	  <div class="ctrlHolder">
+		<p class="label">{tmpl_var name="import_forward_txt"}</p>
+		<div class="multiField">
+			<input id="import_forward" type="checkbox" value="1" name="import_forward" checked="checked" />
+		</div>
+	  </div>
+	  <div class="ctrlHolder">
+		<p class="label">{tmpl_var name="import_aliasdomain_txt"}</p>
+		<div class="multiField">
+			<input id="import_aliasdomain" type="checkbox" value="1" name="import_aliasdomain" checked="checked" />
+		</div>
+	  </div>
+	</fieldset>
+	  </tmpl_if>
+	  
+
+	
+	<tmpl_if name="msg">
+	<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+  </tmpl_if>
+  <tmpl_if name="error">
+	<div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
+  </tmpl_if>
+	
+    <input type="hidden" name="remote_session_id" value="{tmpl_var name='remote_session_id'}">
+	<input type="hidden" name="connected" value="{tmpl_var name='connected'}">
+<tmpl_if name="connected">
+    <div class="buttonHolder buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/import_ispconfig.php');"><span>{tmpl_var name="btn_start_txt"}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
+    </div>
+<tmpl_else>
+	<div class="buttonHolder buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/import_ispconfig.php');"><span>{tmpl_var name="btn_connect_txt"}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
+    </div>
+</tmpl_if>
+  </div>
+  
+</div>