From 25907aff4dfaad777cec70b1f5159d742601c682 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Sat, 14 Feb 2015 06:51:05 -0500
Subject: [PATCH] update resync-tool (translations, missing options, resync per server)

---
 interface/web/tools/lib/lang/se_resync.lng     |   52 +
 interface/web/tools/lib/lang/pl_resync.lng     |   58 +
 interface/web/tools/lib/lang/it_resync.lng     |   52 +
 interface/web/tools/lib/lang/ar_resync.lng     |   52 +
 interface/web/tools/lib/lang/fi_resync.lng     |   52 +
 interface/web/tools/lib/lang/br_resync.lng     |   52 +
 interface/web/tools/lib/lang/sk_resync.lng     |   52 +
 interface/web/tools/form/resync.tform.php      |   94 --
 interface/web/tools/lib/lang/fr_resync.lng     |   56 +
 interface/web/tools/lib/lang/cz_resync.lng     |   61 +
 interface/web/tools/lib/lang/nl_resync.lng     |   52 +
 interface/web/tools/lib/lang/ro_resync.lng     |   52 +
 interface/web/tools/lib/lang/en_resync.lng     |   52 +
 interface/web/tools/lib/lang/hu_resync.lng     |   52 +
 interface/web/tools/lib/lang/bg_resync.lng     |   60 +
 interface/web/tools/lib/lang/tr_resync.lng     |   52 +
 interface/web/tools/lib/lang/de_resync.lng     |   51 +
 interface/web/tools/lib/lang/ja_resync.lng     |   52 +
 interface/web/tools/lib/lang/id_resync.lng     |   52 +
 interface/web/tools/resync.php                 |  546 ++++++++++++++
 interface/web/tools/lib/lang/es_resync.lng     |   60 +
 interface/web/tools/lib/lang/hr_resync.lng     |   57 +
 interface/web/tools/lib/lang/pt_resync.lng     |   52 +
 interface/web/tools/lib/menu.d/resync.menu.php |    3 
 /dev/null                                      |  114 ---
 interface/web/tools/lib/lang/ru_resync.lng     |   52 +
 interface/web/tools/templates/resync.htm       |  254 ++----
 interface/web/tools/lib/lang/el_resync.lng     |   52 +
 28 files changed, 1,565 insertions(+), 681 deletions(-)

diff --git a/interface/web/tools/form/resync.tform.php b/interface/web/tools/form/resync.tform.php
index 01c9470..3bc10a6 100644
--- a/interface/web/tools/form/resync.tform.php
+++ b/interface/web/tools/form/resync.tform.php
@@ -2,10 +2,10 @@
 $form["title"]    = "Resync Tool";
 $form["description"]  = "";
 $form["name"]    = "resync";
-$form["action"]   = "resync_do.php";
+$form["action"]   = "resync.php";
 $form["db_history"]  = "no";
 $form["tab_default"] = "resync";
-$form["list_default"] = "resync_show.php";
+$form["list_default"] = "resync.php";
 $form["auth"]   = 'yes'; 
 
 $form["auth_preset"]["userid"]  = 0; // 0 = id of the user, > 0 id must match with id of current user
@@ -18,96 +18,6 @@
 	'title'  => "Resync",
 	'width'  => 100,
 	'template'  => "templates/resync.htm",
-	'fields'  => array (
-		'mail_server_id' => array (
-			'datatype' => 'INTEGER',
-			'formtype' => 'SELECT',
-			'default' => '',
-			'datasource' => array (  'type' => 'SQL',
-				'querystring' => 'SELECT server_id FROM server WHERE mail_server = 1 AND mirror_server_id = 0 AND {AUTHSQL}',
-				'keyfield'=> 'server_id',
-				'valuefield'=> 'server_name'
-			),
-			'value'  => ''
-		),
-		'web_server_id' => array (
-			'datatype' => 'INTEGER',
-			'formtype' => 'SELECT',
-			'default' => '',
-			'datasource' => array (  'type' => 'SQL',
-				'querystring' => 'SELECT server_id FROM server WHERE web_server = 1 AND mirror_server_id = 0 AND {AUTHSQL}',
-				'keyfield'=> 'server_id',
-				'valuefield'=> 'server_name'
-			),
-			'value'  => ''
-		),
-		'dns_server_id' => array (
-			'datatype' => 'INTEGER',
-			'formtype' => 'SELECT',
-			'default' => '',
-			'datasource' => array (  'type' => 'SQL',
-				'querystring' => 'SELECT server_id FROM server WHERE dns_server = 1 AND mirror_server_id = 0 AND {AUTHSQL}',
-				'keyfield'=> 'server_id',
-				'valuefield'=> 'server_name'
-			),
-			'value'  => ''
-		),
-		'file_server_id' => array (
-			'datatype' => 'INTEGER',
-			'formtype' => 'SELECT',
-			'default' => '',
-			'datasource' => array (  'type' => 'SQL',
-				'querystring' => 'SELECT server_id FROM server WHERE file_server = 1 AND mirror_server_id = 0 AND {AUTHSQL}',
-				'keyfield'=> 'server_id',
-				'valuefield'=> 'server_name'
-			),
-			'value'  => ''
-		),
-		'db_server_id' => array (
-			'datatype' => 'INTEGER',
-			'formtype' => 'SELECT',
-			'default' => '',
-			'datasource' => array (  'type' => 'SQL',
-				'querystring' => 'SELECT server_id FROM server WHERE db_server = 1 AND mirror_server_id = 0 AND {AUTHSQL}',
-				'keyfield'=> 'server_id',
-				'valuefield'=> 'server_name'
-			),
-			'value'  => ''
-		),
-		'vserver_server_id' => array (
-			'datatype' => 'INTEGER',
-			'formtype' => 'SELECT',
-			'default' => '',
-			'datasource' => array (  'type' => 'SQL',
-				'querystring' => 'SELECT server_id FROM server WHERE vserver_server = 1 AND mirror_server_id = 0 AND {AUTHSQL}',
-				'keyfield'=> 'server_id',
-				'valuefield'=> 'server_name'
-			),
-			'value'  => ''
-		),
-		'proxy_server_id' => array (
-			'datatype' => 'INTEGER',
-			'formtype' => 'SELECT',
-			'default' => '',
-			'datasource' => array (  'type' => 'SQL',
-				'querystring' => 'SELECT server_id FROM server WHERE proxy_server = 1 AND mirror_server_id = 0 AND {AUTHSQL}',
-				'keyfield'=> 'server_id',
-				'valuefield'=> 'server_name'
-			),
-			'value'  => ''
-		),
-		'firewall_server_id' => array (
-			'datatype' => 'INTEGER',
-			'formtype' => 'SELECT',
-			'default' => '',
-			'datasource' => array (  'type' => 'SQL',
-				'querystring' => 'SELECT server_id FROM server WHERE firewall_server = 1 AND mirror_server_id = 0 AND {AUTHSQL}',
-				'keyfield'=> 'server_id',
-				'valuefield'=> 'server_name'
-			),
-			'value'  => ''
-		),
-	)
 );
 
 
diff --git a/interface/web/tools/lib/lang/ar_resync.lng b/interface/web/tools/lib/lang/ar_resync.lng
index 4e89bde..97537c3 100644
--- a/interface/web/tools/lib/lang/ar_resync.lng
+++ b/interface/web/tools/lib/lang/ar_resync.lng
@@ -1,19 +1,45 @@
 <?php
 $wb['head_txt'] = 'Resync Tool';
 $wb['legend_txt'] = 'Resync';
-$wb['resync_sites_txt'] = 'Resync Websites';
-$wb['resync_ftp_txt'] = 'Resync FTP-Accounts';
-$wb['resync_webdav_txt'] = 'Resync WebDAV-Users';
-$wb['resync_shell_txt'] = 'Resync shell users';
-$wb['resync_cron_txt'] = 'Resync cronjobs';
-$wb['resync_db_txt'] = 'Resync Client Database config';
-$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
-$wb['resync_mail_txt'] = 'Resync Maildomains';
-$wb['resync_dns_txt'] = 'Resync DNS records';
-$wb['resync_vserver_txt'] = 'Resync vServer';
-$wb['resync_client_txt'] = 'Resync Client records';
-$wb['resync_firewall_txt'] = 'Resync Firewall';
-$wb['resync_no_server_txt'] = 'No active server found';
+$wb['resync_all_txt'] = 'All services';
+$wb['resync_sites_txt'] = 'Websites';
+$wb['resync_ftp_txt'] = 'FTP-Accounts';
+$wb['resync_webdav_txt'] = 'WebDAV-Users';
+$wb['resync_shell_txt'] = 'Shell users';
+$wb['resync_cron_txt'] = 'Cronjobs';
+$wb['resync_db_txt'] = 'Client Database config';
+$wb['resync_mailbox_txt'] = 'Mailboxes';
+$wb['resync_mail_txt'] = 'Maildomains';
+$wb['resync_mailfilter_txt'] = 'Mailfilter';
+$wb['resync_mailinglist_txt'] = 'Mailinglist';
+$wb['resync_dns_txt'] = 'DNS records';
+$wb['resync_vserver_txt'] = 'vServer';
+$wb['resync_client_txt'] = 'Client and reseller';
+$wb['all_active_txt'] = 'All active server';
+$wb['all_active_mail_txt'] = 'All active Mail-Server';
+$wb['all_active_web_txt'] = 'All active Web-Server';
+$wb['all_active_dns_txt'] = 'All active DNS-Server';
+$wb['all_active_file_txt'] = 'All active File-Server';
+$wb['all_active_db_txt'] = 'All active Database-Server';
+$wb['all_active_vserver_txt'] = 'All active vServer';
+$wb['do_sites_txt'] = 'Resynced Website';
+$wb['do_ftp_txt'] = 'Resynced FTP user';
+$wb['do_webdav_txt'] = 'Resynced WebDav user';
+$wb['do_shell_txt'] = 'Resynced Shell user';
+$wb['do_cron_txt'] = 'Resynced Cronjob';
+$wb['do_db_user_txt'] = 'Resynced Database User';
+$wb['do_db_txt'] = 'Resynced Database';
+$wb['do_mail_txt'] = 'Resynced Maildomain';
+$wb['do_mailbox_txt'] = 'Resynced Mailbox';
+$wb['do_mail_alias_txt'] = 'Resynced Alias';
+$wb['do_mail_access_txt'] = 'Resynced Mail access';
+$wb['do_mail_contentfilter_txt'] = 'Resynced Content Filter';
+$wb['do_mail_userfilter_txt'] = 'Resynced Mail User Filter';
+$wb['do_mailinglist_txt'] = 'Resynced Mailinglist';
+$wb['do_dns_txt'] = 'Resynced DNS zone';
+$wb['do_vserver_txt'] = 'Resynced vServer';
+$wb['do_clients_txt'] = 'Resynced clients and reseller';
+$wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
 ?>
diff --git a/interface/web/tools/lib/lang/bg_resync.lng b/interface/web/tools/lib/lang/bg_resync.lng
index 3a6a9db..97537c3 100644
--- a/interface/web/tools/lib/lang/bg_resync.lng
+++ b/interface/web/tools/lib/lang/bg_resync.lng
@@ -1,19 +1,45 @@
 <?php
-$wb['head_txt'] = 'Повторно синхронизиране Инструменти';
-$wb['legend_txt'] = 'Повторно синхронизиране';
-$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'] = 'Стартирай';
-$wb['btn_cancel_txt'] = 'Отказ';
-$wb['resync_client_txt'] = 'Resync Client records';
-$wb['resync_webdav_txt'] = 'Resync WebDAV-Users';
-$wb['resync_mail_txt'] = 'Resync Maildomains';
-$wb['resync_vserver_txt'] = 'Resync vServer';
-$wb['resync_firewall_txt'] = 'Resync Firewall';
-$wb['resync_no_server_txt'] = 'No active server found';
+$wb['head_txt'] = 'Resync Tool';
+$wb['legend_txt'] = 'Resync';
+$wb['resync_all_txt'] = 'All services';
+$wb['resync_sites_txt'] = 'Websites';
+$wb['resync_ftp_txt'] = 'FTP-Accounts';
+$wb['resync_webdav_txt'] = 'WebDAV-Users';
+$wb['resync_shell_txt'] = 'Shell users';
+$wb['resync_cron_txt'] = 'Cronjobs';
+$wb['resync_db_txt'] = 'Client Database config';
+$wb['resync_mailbox_txt'] = 'Mailboxes';
+$wb['resync_mail_txt'] = 'Maildomains';
+$wb['resync_mailfilter_txt'] = 'Mailfilter';
+$wb['resync_mailinglist_txt'] = 'Mailinglist';
+$wb['resync_dns_txt'] = 'DNS records';
+$wb['resync_vserver_txt'] = 'vServer';
+$wb['resync_client_txt'] = 'Client and reseller';
+$wb['all_active_txt'] = 'All active server';
+$wb['all_active_mail_txt'] = 'All active Mail-Server';
+$wb['all_active_web_txt'] = 'All active Web-Server';
+$wb['all_active_dns_txt'] = 'All active DNS-Server';
+$wb['all_active_file_txt'] = 'All active File-Server';
+$wb['all_active_db_txt'] = 'All active Database-Server';
+$wb['all_active_vserver_txt'] = 'All active vServer';
+$wb['do_sites_txt'] = 'Resynced Website';
+$wb['do_ftp_txt'] = 'Resynced FTP user';
+$wb['do_webdav_txt'] = 'Resynced WebDav user';
+$wb['do_shell_txt'] = 'Resynced Shell user';
+$wb['do_cron_txt'] = 'Resynced Cronjob';
+$wb['do_db_user_txt'] = 'Resynced Database User';
+$wb['do_db_txt'] = 'Resynced Database';
+$wb['do_mail_txt'] = 'Resynced Maildomain';
+$wb['do_mailbox_txt'] = 'Resynced Mailbox';
+$wb['do_mail_alias_txt'] = 'Resynced Alias';
+$wb['do_mail_access_txt'] = 'Resynced Mail access';
+$wb['do_mail_contentfilter_txt'] = 'Resynced Content Filter';
+$wb['do_mail_userfilter_txt'] = 'Resynced Mail User Filter';
+$wb['do_mailinglist_txt'] = 'Resynced Mailinglist';
+$wb['do_dns_txt'] = 'Resynced DNS zone';
+$wb['do_vserver_txt'] = 'Resynced vServer';
+$wb['do_clients_txt'] = 'Resynced clients and reseller';
+$wb['no_results_txt'] = 'Nothing found';
+$wb['btn_start_txt'] = 'Start';
+$wb['btn_cancel_txt'] = 'Cancel';
 ?>
diff --git a/interface/web/tools/lib/lang/br_resync.lng b/interface/web/tools/lib/lang/br_resync.lng
index 4e89bde..97537c3 100644
--- a/interface/web/tools/lib/lang/br_resync.lng
+++ b/interface/web/tools/lib/lang/br_resync.lng
@@ -1,19 +1,45 @@
 <?php
 $wb['head_txt'] = 'Resync Tool';
 $wb['legend_txt'] = 'Resync';
-$wb['resync_sites_txt'] = 'Resync Websites';
-$wb['resync_ftp_txt'] = 'Resync FTP-Accounts';
-$wb['resync_webdav_txt'] = 'Resync WebDAV-Users';
-$wb['resync_shell_txt'] = 'Resync shell users';
-$wb['resync_cron_txt'] = 'Resync cronjobs';
-$wb['resync_db_txt'] = 'Resync Client Database config';
-$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
-$wb['resync_mail_txt'] = 'Resync Maildomains';
-$wb['resync_dns_txt'] = 'Resync DNS records';
-$wb['resync_vserver_txt'] = 'Resync vServer';
-$wb['resync_client_txt'] = 'Resync Client records';
-$wb['resync_firewall_txt'] = 'Resync Firewall';
-$wb['resync_no_server_txt'] = 'No active server found';
+$wb['resync_all_txt'] = 'All services';
+$wb['resync_sites_txt'] = 'Websites';
+$wb['resync_ftp_txt'] = 'FTP-Accounts';
+$wb['resync_webdav_txt'] = 'WebDAV-Users';
+$wb['resync_shell_txt'] = 'Shell users';
+$wb['resync_cron_txt'] = 'Cronjobs';
+$wb['resync_db_txt'] = 'Client Database config';
+$wb['resync_mailbox_txt'] = 'Mailboxes';
+$wb['resync_mail_txt'] = 'Maildomains';
+$wb['resync_mailfilter_txt'] = 'Mailfilter';
+$wb['resync_mailinglist_txt'] = 'Mailinglist';
+$wb['resync_dns_txt'] = 'DNS records';
+$wb['resync_vserver_txt'] = 'vServer';
+$wb['resync_client_txt'] = 'Client and reseller';
+$wb['all_active_txt'] = 'All active server';
+$wb['all_active_mail_txt'] = 'All active Mail-Server';
+$wb['all_active_web_txt'] = 'All active Web-Server';
+$wb['all_active_dns_txt'] = 'All active DNS-Server';
+$wb['all_active_file_txt'] = 'All active File-Server';
+$wb['all_active_db_txt'] = 'All active Database-Server';
+$wb['all_active_vserver_txt'] = 'All active vServer';
+$wb['do_sites_txt'] = 'Resynced Website';
+$wb['do_ftp_txt'] = 'Resynced FTP user';
+$wb['do_webdav_txt'] = 'Resynced WebDav user';
+$wb['do_shell_txt'] = 'Resynced Shell user';
+$wb['do_cron_txt'] = 'Resynced Cronjob';
+$wb['do_db_user_txt'] = 'Resynced Database User';
+$wb['do_db_txt'] = 'Resynced Database';
+$wb['do_mail_txt'] = 'Resynced Maildomain';
+$wb['do_mailbox_txt'] = 'Resynced Mailbox';
+$wb['do_mail_alias_txt'] = 'Resynced Alias';
+$wb['do_mail_access_txt'] = 'Resynced Mail access';
+$wb['do_mail_contentfilter_txt'] = 'Resynced Content Filter';
+$wb['do_mail_userfilter_txt'] = 'Resynced Mail User Filter';
+$wb['do_mailinglist_txt'] = 'Resynced Mailinglist';
+$wb['do_dns_txt'] = 'Resynced DNS zone';
+$wb['do_vserver_txt'] = 'Resynced vServer';
+$wb['do_clients_txt'] = 'Resynced clients and reseller';
+$wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
 ?>
diff --git a/interface/web/tools/lib/lang/cz_resync.lng b/interface/web/tools/lib/lang/cz_resync.lng
index 56b937c..97537c3 100644
--- a/interface/web/tools/lib/lang/cz_resync.lng
+++ b/interface/web/tools/lib/lang/cz_resync.lng
@@ -1,20 +1,45 @@
 <?php
-$wb['head_txt'] = 'Resynchronizační nástroje';
-$wb['legend_txt'] = 'Resynchronizace';
-$wb['resync_sites_txt'] = 'Resynchronizovat webové stránky';
-$wb['resync_ftp_txt'] = 'Resynchronizovat FTP uživatele';
-$wb['resync_shell_txt'] = 'Resynchronizovat shell uživatele';
-$wb['resync_cron_txt'] = 'Resynchronizovat cron úlohy';
-$wb['resync_db_txt'] = 'Resynchronizovat clientdb konfigurace';
-$wb['resync_mailbox_txt'] = 'Resynchronizovat e-mailové schránky';
-$wb['resync_dns_txt'] = 'Resynchronizovat DNS záznamy';
-$wb['btn_start_txt'] = 'Zahájit';
-$wb['btn_cancel_txt'] = 'Zrušit';
-$wb['resync_client_txt'] = 'Resync Client records';
-$wb['resync_webdav_txt'] = 'Resync WebDAV-Users';
-$wb['resync_mail_txt'] = 'Resync Maildomains';
-$wb['resync_vserver_txt'] = 'Resync vServer';
-$wb['resync_firewall_txt'] = 'Resync Firewall';
-$wb['resync_no_server_txt'] = 'No active server found';
+$wb['head_txt'] = 'Resync Tool';
+$wb['legend_txt'] = 'Resync';
+$wb['resync_all_txt'] = 'All services';
+$wb['resync_sites_txt'] = 'Websites';
+$wb['resync_ftp_txt'] = 'FTP-Accounts';
+$wb['resync_webdav_txt'] = 'WebDAV-Users';
+$wb['resync_shell_txt'] = 'Shell users';
+$wb['resync_cron_txt'] = 'Cronjobs';
+$wb['resync_db_txt'] = 'Client Database config';
+$wb['resync_mailbox_txt'] = 'Mailboxes';
+$wb['resync_mail_txt'] = 'Maildomains';
+$wb['resync_mailfilter_txt'] = 'Mailfilter';
+$wb['resync_mailinglist_txt'] = 'Mailinglist';
+$wb['resync_dns_txt'] = 'DNS records';
+$wb['resync_vserver_txt'] = 'vServer';
+$wb['resync_client_txt'] = 'Client and reseller';
+$wb['all_active_txt'] = 'All active server';
+$wb['all_active_mail_txt'] = 'All active Mail-Server';
+$wb['all_active_web_txt'] = 'All active Web-Server';
+$wb['all_active_dns_txt'] = 'All active DNS-Server';
+$wb['all_active_file_txt'] = 'All active File-Server';
+$wb['all_active_db_txt'] = 'All active Database-Server';
+$wb['all_active_vserver_txt'] = 'All active vServer';
+$wb['do_sites_txt'] = 'Resynced Website';
+$wb['do_ftp_txt'] = 'Resynced FTP user';
+$wb['do_webdav_txt'] = 'Resynced WebDav user';
+$wb['do_shell_txt'] = 'Resynced Shell user';
+$wb['do_cron_txt'] = 'Resynced Cronjob';
+$wb['do_db_user_txt'] = 'Resynced Database User';
+$wb['do_db_txt'] = 'Resynced Database';
+$wb['do_mail_txt'] = 'Resynced Maildomain';
+$wb['do_mailbox_txt'] = 'Resynced Mailbox';
+$wb['do_mail_alias_txt'] = 'Resynced Alias';
+$wb['do_mail_access_txt'] = 'Resynced Mail access';
+$wb['do_mail_contentfilter_txt'] = 'Resynced Content Filter';
+$wb['do_mail_userfilter_txt'] = 'Resynced Mail User Filter';
+$wb['do_mailinglist_txt'] = 'Resynced Mailinglist';
+$wb['do_dns_txt'] = 'Resynced DNS zone';
+$wb['do_vserver_txt'] = 'Resynced vServer';
+$wb['do_clients_txt'] = 'Resynced clients and reseller';
+$wb['no_results_txt'] = 'Nothing found';
+$wb['btn_start_txt'] = 'Start';
+$wb['btn_cancel_txt'] = 'Cancel';
 ?>
-
diff --git a/interface/web/tools/lib/lang/de_resync.lng b/interface/web/tools/lib/lang/de_resync.lng
index 59d85b9..32d1c23 100644
--- a/interface/web/tools/lib/lang/de_resync.lng
+++ b/interface/web/tools/lib/lang/de_resync.lng
@@ -1,20 +1,45 @@
 <?php
-$wb['head_txt'] = 'Resync Werkzeug';
-$wb['legend_txt'] = 'Resync ausgewählte Dienste auf entfernten Server.';
+$wb['head_txt'] = 'Resync Tool';
+$wb['legend_txt'] = 'Resync';
+$wb['resync_all_txt'] = 'Alle Dienste';
 $wb['resync_sites_txt'] = 'Webseiten';
-$wb['resync_ftp_txt'] = 'FTP Benutzer';
+$wb['resync_ftp_txt'] = 'FTP-Benutzer';
+$wb['resync_webdav_txt'] = 'WebDAV Benutzer';
 $wb['resync_shell_txt'] = 'Shell Benutzer';
 $wb['resync_cron_txt'] = 'Cronjobs';
-$wb['resync_db_txt'] = 'Datenbanken';
-$wb['resync_mailbox_txt'] = 'E-Mail Konten';
-$wb['resync_dkim_txt'] = 'DKIM-Keys';
+$wb['resync_db_txt'] = 'Kunden Datenbankeinstellungen';
+$wb['resync_mailbox_txt'] = 'Mailkonten';
+$wb['resync_mail_txt'] = 'Maildomains';
+$wb['resync_mailfilter_txt'] = 'Mailfilter';
+$wb['resync_mailinglist_txt'] = 'Mailinglist';
 $wb['resync_dns_txt'] = 'DNS Einträge';
-$wb['resync_client_txt'] = 'Kunden';
+$wb['resync_vserver_txt'] = 'vServer';
+$wb['resync_client_txt'] = 'Kunden und Reseller';
+$wb['all_active_txt'] = 'Alle aktiven Server';
+$wb['all_active_mail_txt'] = 'Alle aktive Mail-Server';
+$wb['all_active_web_txt'] = 'Alle aktive Web-Server';
+$wb['all_active_dns_txt'] = 'Alle aktive DNS-Server';
+$wb['all_active_file_txt'] = 'Alle aktive File-Server';
+$wb['all_active_db_txt'] = 'Alle aktive Datenbank-Server';
+$wb['all_active_vserver_txt'] = 'Alle aktive vServer';
+$wb['do_sites_txt'] = 'Resynced Webseiten';
+$wb['do_ftp_txt'] = 'Resynced FTP-Benutzer';
+$wb['do_webdav_txt'] = 'Resynced WebDav Benutzer';
+$wb['do_shell_txt'] = 'Resynced Shell Benutzer';
+$wb['do_cron_txt'] = 'Resynced Cronjob';
+$wb['do_db_user_txt'] = 'Resynced Datenbank Benutzer';
+$wb['do_db_txt'] = 'Resynced Datenbank';
+$wb['do_mail_txt'] = 'Resynced Maildomain';
+$wb['do_mailbox_txt'] = 'Resynced Mailkonto';
+$wb['do_mail_alias_txt'] = 'Resynced Alias';
+$wb['do_mail_access_txt'] = 'Resynced Mail Access';
+$wb['do_mail_contentfilter_txt'] = 'Resynced Content Filter';
+$wb['do_mail_userfilter_txt'] = 'Resynced Mail User Filter';
+$wb['do_mailinglist_txt'] = 'Resynced Mailinglist';
+$wb['do_dns_txt'] = 'Resynced DNS Zone';
+$wb['do_vserver_txt'] = 'Resynced vServer';
+$wb['do_clients_txt'] = 'Resynced Kunden und Reseller';
+$wb['no_results_txt'] = 'Keine Daten vorhanden';
 $wb['btn_start_txt'] = 'Start';
-$wb['btn_cancel_txt'] = 'Zurück';
-$wb['resync_webdav_txt'] = 'Resync WebDAV-Benutzer';
-$wb['resync_mail_txt'] = 'Resync Maildomains';
-$wb['resync_vserver_txt'] = 'Resync vServer';
-$wb['resync_firewall_txt'] = 'Resync Firewall';
-$wb['resync_no_server_txt'] = 'Kein aktiver Serfer gefunden';
+$wb['btn_cancel_txt'] = 'Cancel';
 ?>
diff --git a/interface/web/tools/lib/lang/el_resync.lng b/interface/web/tools/lib/lang/el_resync.lng
index 4e89bde..97537c3 100644
--- a/interface/web/tools/lib/lang/el_resync.lng
+++ b/interface/web/tools/lib/lang/el_resync.lng
@@ -1,19 +1,45 @@
 <?php
 $wb['head_txt'] = 'Resync Tool';
 $wb['legend_txt'] = 'Resync';
-$wb['resync_sites_txt'] = 'Resync Websites';
-$wb['resync_ftp_txt'] = 'Resync FTP-Accounts';
-$wb['resync_webdav_txt'] = 'Resync WebDAV-Users';
-$wb['resync_shell_txt'] = 'Resync shell users';
-$wb['resync_cron_txt'] = 'Resync cronjobs';
-$wb['resync_db_txt'] = 'Resync Client Database config';
-$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
-$wb['resync_mail_txt'] = 'Resync Maildomains';
-$wb['resync_dns_txt'] = 'Resync DNS records';
-$wb['resync_vserver_txt'] = 'Resync vServer';
-$wb['resync_client_txt'] = 'Resync Client records';
-$wb['resync_firewall_txt'] = 'Resync Firewall';
-$wb['resync_no_server_txt'] = 'No active server found';
+$wb['resync_all_txt'] = 'All services';
+$wb['resync_sites_txt'] = 'Websites';
+$wb['resync_ftp_txt'] = 'FTP-Accounts';
+$wb['resync_webdav_txt'] = 'WebDAV-Users';
+$wb['resync_shell_txt'] = 'Shell users';
+$wb['resync_cron_txt'] = 'Cronjobs';
+$wb['resync_db_txt'] = 'Client Database config';
+$wb['resync_mailbox_txt'] = 'Mailboxes';
+$wb['resync_mail_txt'] = 'Maildomains';
+$wb['resync_mailfilter_txt'] = 'Mailfilter';
+$wb['resync_mailinglist_txt'] = 'Mailinglist';
+$wb['resync_dns_txt'] = 'DNS records';
+$wb['resync_vserver_txt'] = 'vServer';
+$wb['resync_client_txt'] = 'Client and reseller';
+$wb['all_active_txt'] = 'All active server';
+$wb['all_active_mail_txt'] = 'All active Mail-Server';
+$wb['all_active_web_txt'] = 'All active Web-Server';
+$wb['all_active_dns_txt'] = 'All active DNS-Server';
+$wb['all_active_file_txt'] = 'All active File-Server';
+$wb['all_active_db_txt'] = 'All active Database-Server';
+$wb['all_active_vserver_txt'] = 'All active vServer';
+$wb['do_sites_txt'] = 'Resynced Website';
+$wb['do_ftp_txt'] = 'Resynced FTP user';
+$wb['do_webdav_txt'] = 'Resynced WebDav user';
+$wb['do_shell_txt'] = 'Resynced Shell user';
+$wb['do_cron_txt'] = 'Resynced Cronjob';
+$wb['do_db_user_txt'] = 'Resynced Database User';
+$wb['do_db_txt'] = 'Resynced Database';
+$wb['do_mail_txt'] = 'Resynced Maildomain';
+$wb['do_mailbox_txt'] = 'Resynced Mailbox';
+$wb['do_mail_alias_txt'] = 'Resynced Alias';
+$wb['do_mail_access_txt'] = 'Resynced Mail access';
+$wb['do_mail_contentfilter_txt'] = 'Resynced Content Filter';
+$wb['do_mail_userfilter_txt'] = 'Resynced Mail User Filter';
+$wb['do_mailinglist_txt'] = 'Resynced Mailinglist';
+$wb['do_dns_txt'] = 'Resynced DNS zone';
+$wb['do_vserver_txt'] = 'Resynced vServer';
+$wb['do_clients_txt'] = 'Resynced clients and reseller';
+$wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
 ?>
diff --git a/interface/web/tools/lib/lang/en_resync.lng b/interface/web/tools/lib/lang/en_resync.lng
index 4e89bde..97537c3 100644
--- a/interface/web/tools/lib/lang/en_resync.lng
+++ b/interface/web/tools/lib/lang/en_resync.lng
@@ -1,19 +1,45 @@
 <?php
 $wb['head_txt'] = 'Resync Tool';
 $wb['legend_txt'] = 'Resync';
-$wb['resync_sites_txt'] = 'Resync Websites';
-$wb['resync_ftp_txt'] = 'Resync FTP-Accounts';
-$wb['resync_webdav_txt'] = 'Resync WebDAV-Users';
-$wb['resync_shell_txt'] = 'Resync shell users';
-$wb['resync_cron_txt'] = 'Resync cronjobs';
-$wb['resync_db_txt'] = 'Resync Client Database config';
-$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
-$wb['resync_mail_txt'] = 'Resync Maildomains';
-$wb['resync_dns_txt'] = 'Resync DNS records';
-$wb['resync_vserver_txt'] = 'Resync vServer';
-$wb['resync_client_txt'] = 'Resync Client records';
-$wb['resync_firewall_txt'] = 'Resync Firewall';
-$wb['resync_no_server_txt'] = 'No active server found';
+$wb['resync_all_txt'] = 'All services';
+$wb['resync_sites_txt'] = 'Websites';
+$wb['resync_ftp_txt'] = 'FTP-Accounts';
+$wb['resync_webdav_txt'] = 'WebDAV-Users';
+$wb['resync_shell_txt'] = 'Shell users';
+$wb['resync_cron_txt'] = 'Cronjobs';
+$wb['resync_db_txt'] = 'Client Database config';
+$wb['resync_mailbox_txt'] = 'Mailboxes';
+$wb['resync_mail_txt'] = 'Maildomains';
+$wb['resync_mailfilter_txt'] = 'Mailfilter';
+$wb['resync_mailinglist_txt'] = 'Mailinglist';
+$wb['resync_dns_txt'] = 'DNS records';
+$wb['resync_vserver_txt'] = 'vServer';
+$wb['resync_client_txt'] = 'Client and reseller';
+$wb['all_active_txt'] = 'All active server';
+$wb['all_active_mail_txt'] = 'All active Mail-Server';
+$wb['all_active_web_txt'] = 'All active Web-Server';
+$wb['all_active_dns_txt'] = 'All active DNS-Server';
+$wb['all_active_file_txt'] = 'All active File-Server';
+$wb['all_active_db_txt'] = 'All active Database-Server';
+$wb['all_active_vserver_txt'] = 'All active vServer';
+$wb['do_sites_txt'] = 'Resynced Website';
+$wb['do_ftp_txt'] = 'Resynced FTP user';
+$wb['do_webdav_txt'] = 'Resynced WebDav user';
+$wb['do_shell_txt'] = 'Resynced Shell user';
+$wb['do_cron_txt'] = 'Resynced Cronjob';
+$wb['do_db_user_txt'] = 'Resynced Database User';
+$wb['do_db_txt'] = 'Resynced Database';
+$wb['do_mail_txt'] = 'Resynced Maildomain';
+$wb['do_mailbox_txt'] = 'Resynced Mailbox';
+$wb['do_mail_alias_txt'] = 'Resynced Alias';
+$wb['do_mail_access_txt'] = 'Resynced Mail access';
+$wb['do_mail_contentfilter_txt'] = 'Resynced Content Filter';
+$wb['do_mail_userfilter_txt'] = 'Resynced Mail User Filter';
+$wb['do_mailinglist_txt'] = 'Resynced Mailinglist';
+$wb['do_dns_txt'] = 'Resynced DNS zone';
+$wb['do_vserver_txt'] = 'Resynced vServer';
+$wb['do_clients_txt'] = 'Resynced clients and reseller';
+$wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
 ?>
diff --git a/interface/web/tools/lib/lang/es_resync.lng b/interface/web/tools/lib/lang/es_resync.lng
index a699866..97537c3 100644
--- a/interface/web/tools/lib/lang/es_resync.lng
+++ b/interface/web/tools/lib/lang/es_resync.lng
@@ -1,19 +1,45 @@
 <?php
-$wb['head_txt'] = 'Herramienta de Resincronización';
-$wb['legend_txt'] = 'Resincronizar';
-$wb['resync_sites_txt'] = 'Resincronizar Sitios webs';
-$wb['resync_ftp_txt'] = 'Resincronizar Usuarios FTP';
-$wb['resync_shell_txt'] = 'Resincronizar Usuarios shell';
-$wb['resync_cron_txt'] = 'Resincronizar Tareas de cron';
-$wb['resync_db_txt'] = 'Resincronizar Configuración de bases de datos';
-$wb['resync_mailbox_txt'] = 'Resincronizar Buzones de correo';
-$wb['resync_dns_txt'] = 'Resincronizar Registros DNS ';
-$wb['btn_start_txt'] = 'Inicio';
-$wb['btn_cancel_txt'] = 'Cancelar';
-$wb['resync_client_txt'] = 'Resincronizar Clientes';
-$wb['resync_webdav_txt'] = 'Resync WebDAV-Users';
-$wb['resync_mail_txt'] = 'Resync Maildomains';
-$wb['resync_vserver_txt'] = 'Resync vServer';
-$wb['resync_firewall_txt'] = 'Resync Firewall';
-$wb['resync_no_server_txt'] = 'No active server found';
+$wb['head_txt'] = 'Resync Tool';
+$wb['legend_txt'] = 'Resync';
+$wb['resync_all_txt'] = 'All services';
+$wb['resync_sites_txt'] = 'Websites';
+$wb['resync_ftp_txt'] = 'FTP-Accounts';
+$wb['resync_webdav_txt'] = 'WebDAV-Users';
+$wb['resync_shell_txt'] = 'Shell users';
+$wb['resync_cron_txt'] = 'Cronjobs';
+$wb['resync_db_txt'] = 'Client Database config';
+$wb['resync_mailbox_txt'] = 'Mailboxes';
+$wb['resync_mail_txt'] = 'Maildomains';
+$wb['resync_mailfilter_txt'] = 'Mailfilter';
+$wb['resync_mailinglist_txt'] = 'Mailinglist';
+$wb['resync_dns_txt'] = 'DNS records';
+$wb['resync_vserver_txt'] = 'vServer';
+$wb['resync_client_txt'] = 'Client and reseller';
+$wb['all_active_txt'] = 'All active server';
+$wb['all_active_mail_txt'] = 'All active Mail-Server';
+$wb['all_active_web_txt'] = 'All active Web-Server';
+$wb['all_active_dns_txt'] = 'All active DNS-Server';
+$wb['all_active_file_txt'] = 'All active File-Server';
+$wb['all_active_db_txt'] = 'All active Database-Server';
+$wb['all_active_vserver_txt'] = 'All active vServer';
+$wb['do_sites_txt'] = 'Resynced Website';
+$wb['do_ftp_txt'] = 'Resynced FTP user';
+$wb['do_webdav_txt'] = 'Resynced WebDav user';
+$wb['do_shell_txt'] = 'Resynced Shell user';
+$wb['do_cron_txt'] = 'Resynced Cronjob';
+$wb['do_db_user_txt'] = 'Resynced Database User';
+$wb['do_db_txt'] = 'Resynced Database';
+$wb['do_mail_txt'] = 'Resynced Maildomain';
+$wb['do_mailbox_txt'] = 'Resynced Mailbox';
+$wb['do_mail_alias_txt'] = 'Resynced Alias';
+$wb['do_mail_access_txt'] = 'Resynced Mail access';
+$wb['do_mail_contentfilter_txt'] = 'Resynced Content Filter';
+$wb['do_mail_userfilter_txt'] = 'Resynced Mail User Filter';
+$wb['do_mailinglist_txt'] = 'Resynced Mailinglist';
+$wb['do_dns_txt'] = 'Resynced DNS zone';
+$wb['do_vserver_txt'] = 'Resynced vServer';
+$wb['do_clients_txt'] = 'Resynced clients and reseller';
+$wb['no_results_txt'] = 'Nothing found';
+$wb['btn_start_txt'] = 'Start';
+$wb['btn_cancel_txt'] = 'Cancel';
 ?>
diff --git a/interface/web/tools/lib/lang/fi_resync.lng b/interface/web/tools/lib/lang/fi_resync.lng
index 4e89bde..97537c3 100644
--- a/interface/web/tools/lib/lang/fi_resync.lng
+++ b/interface/web/tools/lib/lang/fi_resync.lng
@@ -1,19 +1,45 @@
 <?php
 $wb['head_txt'] = 'Resync Tool';
 $wb['legend_txt'] = 'Resync';
-$wb['resync_sites_txt'] = 'Resync Websites';
-$wb['resync_ftp_txt'] = 'Resync FTP-Accounts';
-$wb['resync_webdav_txt'] = 'Resync WebDAV-Users';
-$wb['resync_shell_txt'] = 'Resync shell users';
-$wb['resync_cron_txt'] = 'Resync cronjobs';
-$wb['resync_db_txt'] = 'Resync Client Database config';
-$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
-$wb['resync_mail_txt'] = 'Resync Maildomains';
-$wb['resync_dns_txt'] = 'Resync DNS records';
-$wb['resync_vserver_txt'] = 'Resync vServer';
-$wb['resync_client_txt'] = 'Resync Client records';
-$wb['resync_firewall_txt'] = 'Resync Firewall';
-$wb['resync_no_server_txt'] = 'No active server found';
+$wb['resync_all_txt'] = 'All services';
+$wb['resync_sites_txt'] = 'Websites';
+$wb['resync_ftp_txt'] = 'FTP-Accounts';
+$wb['resync_webdav_txt'] = 'WebDAV-Users';
+$wb['resync_shell_txt'] = 'Shell users';
+$wb['resync_cron_txt'] = 'Cronjobs';
+$wb['resync_db_txt'] = 'Client Database config';
+$wb['resync_mailbox_txt'] = 'Mailboxes';
+$wb['resync_mail_txt'] = 'Maildomains';
+$wb['resync_mailfilter_txt'] = 'Mailfilter';
+$wb['resync_mailinglist_txt'] = 'Mailinglist';
+$wb['resync_dns_txt'] = 'DNS records';
+$wb['resync_vserver_txt'] = 'vServer';
+$wb['resync_client_txt'] = 'Client and reseller';
+$wb['all_active_txt'] = 'All active server';
+$wb['all_active_mail_txt'] = 'All active Mail-Server';
+$wb['all_active_web_txt'] = 'All active Web-Server';
+$wb['all_active_dns_txt'] = 'All active DNS-Server';
+$wb['all_active_file_txt'] = 'All active File-Server';
+$wb['all_active_db_txt'] = 'All active Database-Server';
+$wb['all_active_vserver_txt'] = 'All active vServer';
+$wb['do_sites_txt'] = 'Resynced Website';
+$wb['do_ftp_txt'] = 'Resynced FTP user';
+$wb['do_webdav_txt'] = 'Resynced WebDav user';
+$wb['do_shell_txt'] = 'Resynced Shell user';
+$wb['do_cron_txt'] = 'Resynced Cronjob';
+$wb['do_db_user_txt'] = 'Resynced Database User';
+$wb['do_db_txt'] = 'Resynced Database';
+$wb['do_mail_txt'] = 'Resynced Maildomain';
+$wb['do_mailbox_txt'] = 'Resynced Mailbox';
+$wb['do_mail_alias_txt'] = 'Resynced Alias';
+$wb['do_mail_access_txt'] = 'Resynced Mail access';
+$wb['do_mail_contentfilter_txt'] = 'Resynced Content Filter';
+$wb['do_mail_userfilter_txt'] = 'Resynced Mail User Filter';
+$wb['do_mailinglist_txt'] = 'Resynced Mailinglist';
+$wb['do_dns_txt'] = 'Resynced DNS zone';
+$wb['do_vserver_txt'] = 'Resynced vServer';
+$wb['do_clients_txt'] = 'Resynced clients and reseller';
+$wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
 ?>
diff --git a/interface/web/tools/lib/lang/fr_resync.lng b/interface/web/tools/lib/lang/fr_resync.lng
index 81dd225..97537c3 100644
--- a/interface/web/tools/lib/lang/fr_resync.lng
+++ b/interface/web/tools/lib/lang/fr_resync.lng
@@ -1,15 +1,45 @@
 <?php
-$wb['head_txt'] = 'Outil de Resynchronisation';
-$wb['legend_txt'] = 'Resynchroniser';
-$wb['resync_sites_txt'] = 'Resynchroniser Sites web';
-$wb['resync_ftp_txt'] = 'Resynchroniser utilisateurs FTP';
-$wb['resync_shell_txt'] = 'Resynchroniser utilisateurs shell';
-$wb['resync_cron_txt'] = 'Resynchroniser cronjobs';
-$wb['resync_db_txt'] = 'Resynchroniser configuration clientdb';
-$wb['resync_mailbox_txt'] = 'Resynchroniser Boites aux lettres';
-$wb['resync_dkim_txt'] = 'Resynchroniser DKIM-Keys';
-$wb['resync_dns_txt'] = 'Resynchroniser enregistrements DNS';
-$wb['btn_start_txt'] = 'Dérrer';
-$wb['btn_cancel_txt'] = 'Annuler';
-$wb['resync_client_txt'] = 'Resynchroniser Enregisitrements Client';
+$wb['head_txt'] = 'Resync Tool';
+$wb['legend_txt'] = 'Resync';
+$wb['resync_all_txt'] = 'All services';
+$wb['resync_sites_txt'] = 'Websites';
+$wb['resync_ftp_txt'] = 'FTP-Accounts';
+$wb['resync_webdav_txt'] = 'WebDAV-Users';
+$wb['resync_shell_txt'] = 'Shell users';
+$wb['resync_cron_txt'] = 'Cronjobs';
+$wb['resync_db_txt'] = 'Client Database config';
+$wb['resync_mailbox_txt'] = 'Mailboxes';
+$wb['resync_mail_txt'] = 'Maildomains';
+$wb['resync_mailfilter_txt'] = 'Mailfilter';
+$wb['resync_mailinglist_txt'] = 'Mailinglist';
+$wb['resync_dns_txt'] = 'DNS records';
+$wb['resync_vserver_txt'] = 'vServer';
+$wb['resync_client_txt'] = 'Client and reseller';
+$wb['all_active_txt'] = 'All active server';
+$wb['all_active_mail_txt'] = 'All active Mail-Server';
+$wb['all_active_web_txt'] = 'All active Web-Server';
+$wb['all_active_dns_txt'] = 'All active DNS-Server';
+$wb['all_active_file_txt'] = 'All active File-Server';
+$wb['all_active_db_txt'] = 'All active Database-Server';
+$wb['all_active_vserver_txt'] = 'All active vServer';
+$wb['do_sites_txt'] = 'Resynced Website';
+$wb['do_ftp_txt'] = 'Resynced FTP user';
+$wb['do_webdav_txt'] = 'Resynced WebDav user';
+$wb['do_shell_txt'] = 'Resynced Shell user';
+$wb['do_cron_txt'] = 'Resynced Cronjob';
+$wb['do_db_user_txt'] = 'Resynced Database User';
+$wb['do_db_txt'] = 'Resynced Database';
+$wb['do_mail_txt'] = 'Resynced Maildomain';
+$wb['do_mailbox_txt'] = 'Resynced Mailbox';
+$wb['do_mail_alias_txt'] = 'Resynced Alias';
+$wb['do_mail_access_txt'] = 'Resynced Mail access';
+$wb['do_mail_contentfilter_txt'] = 'Resynced Content Filter';
+$wb['do_mail_userfilter_txt'] = 'Resynced Mail User Filter';
+$wb['do_mailinglist_txt'] = 'Resynced Mailinglist';
+$wb['do_dns_txt'] = 'Resynced DNS zone';
+$wb['do_vserver_txt'] = 'Resynced vServer';
+$wb['do_clients_txt'] = 'Resynced clients and reseller';
+$wb['no_results_txt'] = 'Nothing found';
+$wb['btn_start_txt'] = 'Start';
+$wb['btn_cancel_txt'] = 'Cancel';
 ?>
diff --git a/interface/web/tools/lib/lang/hr_resync.lng b/interface/web/tools/lib/lang/hr_resync.lng
index 8a97ae4..97537c3 100644
--- a/interface/web/tools/lib/lang/hr_resync.lng
+++ b/interface/web/tools/lib/lang/hr_resync.lng
@@ -1,16 +1,45 @@
 <?php
-$wb['head_txt'] = 'Sinkronizacija';
-$wb['legend_txt'] = 'Sinkroniziraj';
-$wb['resync_sites_txt'] = 'Sinkroniziraj web stranice';
-$wb['resync_ftp_txt'] = 'Sinkroniziraj FTP korisnike';
-$wb['resync_shell_txt'] = 'Sinkroniziraj shell korisnike';
-$wb['resync_cron_txt'] = 'Sinkroniziraj cron zadatke';
-$wb['resync_db_txt'] = 'Sinkroniziraj clientdb konfiguraciju';
-$wb['resync_mailbox_txt'] = 'Sinkroniziraj email sandučiće';
-$wb['resync_dns_txt'] = 'Sinkroniziraj DNS zapise';
-$wb['btn_start_txt'] = 'Pokreni';
-$wb['btn_cancel_txt'] = 'Odustani';
-$wb['resync_client_txt'] = 'Sinkroniziraj klijente';
+$wb['head_txt'] = 'Resync Tool';
+$wb['legend_txt'] = 'Resync';
+$wb['resync_all_txt'] = 'All services';
+$wb['resync_sites_txt'] = 'Websites';
+$wb['resync_ftp_txt'] = 'FTP-Accounts';
+$wb['resync_webdav_txt'] = 'WebDAV-Users';
+$wb['resync_shell_txt'] = 'Shell users';
+$wb['resync_cron_txt'] = 'Cronjobs';
+$wb['resync_db_txt'] = 'Client Database config';
+$wb['resync_mailbox_txt'] = 'Mailboxes';
+$wb['resync_mail_txt'] = 'Maildomains';
+$wb['resync_mailfilter_txt'] = 'Mailfilter';
+$wb['resync_mailinglist_txt'] = 'Mailinglist';
+$wb['resync_dns_txt'] = 'DNS records';
+$wb['resync_vserver_txt'] = 'vServer';
+$wb['resync_client_txt'] = 'Client and reseller';
+$wb['all_active_txt'] = 'All active server';
+$wb['all_active_mail_txt'] = 'All active Mail-Server';
+$wb['all_active_web_txt'] = 'All active Web-Server';
+$wb['all_active_dns_txt'] = 'All active DNS-Server';
+$wb['all_active_file_txt'] = 'All active File-Server';
+$wb['all_active_db_txt'] = 'All active Database-Server';
+$wb['all_active_vserver_txt'] = 'All active vServer';
+$wb['do_sites_txt'] = 'Resynced Website';
+$wb['do_ftp_txt'] = 'Resynced FTP user';
+$wb['do_webdav_txt'] = 'Resynced WebDav user';
+$wb['do_shell_txt'] = 'Resynced Shell user';
+$wb['do_cron_txt'] = 'Resynced Cronjob';
+$wb['do_db_user_txt'] = 'Resynced Database User';
+$wb['do_db_txt'] = 'Resynced Database';
+$wb['do_mail_txt'] = 'Resynced Maildomain';
+$wb['do_mailbox_txt'] = 'Resynced Mailbox';
+$wb['do_mail_alias_txt'] = 'Resynced Alias';
+$wb['do_mail_access_txt'] = 'Resynced Mail access';
+$wb['do_mail_contentfilter_txt'] = 'Resynced Content Filter';
+$wb['do_mail_userfilter_txt'] = 'Resynced Mail User Filter';
+$wb['do_mailinglist_txt'] = 'Resynced Mailinglist';
+$wb['do_dns_txt'] = 'Resynced DNS zone';
+$wb['do_vserver_txt'] = 'Resynced vServer';
+$wb['do_clients_txt'] = 'Resynced clients and reseller';
+$wb['no_results_txt'] = 'Nothing found';
+$wb['btn_start_txt'] = 'Start';
+$wb['btn_cancel_txt'] = 'Cancel';
 ?>
-
-
diff --git a/interface/web/tools/lib/lang/hu_resync.lng b/interface/web/tools/lib/lang/hu_resync.lng
index 4e89bde..97537c3 100644
--- a/interface/web/tools/lib/lang/hu_resync.lng
+++ b/interface/web/tools/lib/lang/hu_resync.lng
@@ -1,19 +1,45 @@
 <?php
 $wb['head_txt'] = 'Resync Tool';
 $wb['legend_txt'] = 'Resync';
-$wb['resync_sites_txt'] = 'Resync Websites';
-$wb['resync_ftp_txt'] = 'Resync FTP-Accounts';
-$wb['resync_webdav_txt'] = 'Resync WebDAV-Users';
-$wb['resync_shell_txt'] = 'Resync shell users';
-$wb['resync_cron_txt'] = 'Resync cronjobs';
-$wb['resync_db_txt'] = 'Resync Client Database config';
-$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
-$wb['resync_mail_txt'] = 'Resync Maildomains';
-$wb['resync_dns_txt'] = 'Resync DNS records';
-$wb['resync_vserver_txt'] = 'Resync vServer';
-$wb['resync_client_txt'] = 'Resync Client records';
-$wb['resync_firewall_txt'] = 'Resync Firewall';
-$wb['resync_no_server_txt'] = 'No active server found';
+$wb['resync_all_txt'] = 'All services';
+$wb['resync_sites_txt'] = 'Websites';
+$wb['resync_ftp_txt'] = 'FTP-Accounts';
+$wb['resync_webdav_txt'] = 'WebDAV-Users';
+$wb['resync_shell_txt'] = 'Shell users';
+$wb['resync_cron_txt'] = 'Cronjobs';
+$wb['resync_db_txt'] = 'Client Database config';
+$wb['resync_mailbox_txt'] = 'Mailboxes';
+$wb['resync_mail_txt'] = 'Maildomains';
+$wb['resync_mailfilter_txt'] = 'Mailfilter';
+$wb['resync_mailinglist_txt'] = 'Mailinglist';
+$wb['resync_dns_txt'] = 'DNS records';
+$wb['resync_vserver_txt'] = 'vServer';
+$wb['resync_client_txt'] = 'Client and reseller';
+$wb['all_active_txt'] = 'All active server';
+$wb['all_active_mail_txt'] = 'All active Mail-Server';
+$wb['all_active_web_txt'] = 'All active Web-Server';
+$wb['all_active_dns_txt'] = 'All active DNS-Server';
+$wb['all_active_file_txt'] = 'All active File-Server';
+$wb['all_active_db_txt'] = 'All active Database-Server';
+$wb['all_active_vserver_txt'] = 'All active vServer';
+$wb['do_sites_txt'] = 'Resynced Website';
+$wb['do_ftp_txt'] = 'Resynced FTP user';
+$wb['do_webdav_txt'] = 'Resynced WebDav user';
+$wb['do_shell_txt'] = 'Resynced Shell user';
+$wb['do_cron_txt'] = 'Resynced Cronjob';
+$wb['do_db_user_txt'] = 'Resynced Database User';
+$wb['do_db_txt'] = 'Resynced Database';
+$wb['do_mail_txt'] = 'Resynced Maildomain';
+$wb['do_mailbox_txt'] = 'Resynced Mailbox';
+$wb['do_mail_alias_txt'] = 'Resynced Alias';
+$wb['do_mail_access_txt'] = 'Resynced Mail access';
+$wb['do_mail_contentfilter_txt'] = 'Resynced Content Filter';
+$wb['do_mail_userfilter_txt'] = 'Resynced Mail User Filter';
+$wb['do_mailinglist_txt'] = 'Resynced Mailinglist';
+$wb['do_dns_txt'] = 'Resynced DNS zone';
+$wb['do_vserver_txt'] = 'Resynced vServer';
+$wb['do_clients_txt'] = 'Resynced clients and reseller';
+$wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
 ?>
diff --git a/interface/web/tools/lib/lang/id_resync.lng b/interface/web/tools/lib/lang/id_resync.lng
index 4e89bde..97537c3 100644
--- a/interface/web/tools/lib/lang/id_resync.lng
+++ b/interface/web/tools/lib/lang/id_resync.lng
@@ -1,19 +1,45 @@
 <?php
 $wb['head_txt'] = 'Resync Tool';
 $wb['legend_txt'] = 'Resync';
-$wb['resync_sites_txt'] = 'Resync Websites';
-$wb['resync_ftp_txt'] = 'Resync FTP-Accounts';
-$wb['resync_webdav_txt'] = 'Resync WebDAV-Users';
-$wb['resync_shell_txt'] = 'Resync shell users';
-$wb['resync_cron_txt'] = 'Resync cronjobs';
-$wb['resync_db_txt'] = 'Resync Client Database config';
-$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
-$wb['resync_mail_txt'] = 'Resync Maildomains';
-$wb['resync_dns_txt'] = 'Resync DNS records';
-$wb['resync_vserver_txt'] = 'Resync vServer';
-$wb['resync_client_txt'] = 'Resync Client records';
-$wb['resync_firewall_txt'] = 'Resync Firewall';
-$wb['resync_no_server_txt'] = 'No active server found';
+$wb['resync_all_txt'] = 'All services';
+$wb['resync_sites_txt'] = 'Websites';
+$wb['resync_ftp_txt'] = 'FTP-Accounts';
+$wb['resync_webdav_txt'] = 'WebDAV-Users';
+$wb['resync_shell_txt'] = 'Shell users';
+$wb['resync_cron_txt'] = 'Cronjobs';
+$wb['resync_db_txt'] = 'Client Database config';
+$wb['resync_mailbox_txt'] = 'Mailboxes';
+$wb['resync_mail_txt'] = 'Maildomains';
+$wb['resync_mailfilter_txt'] = 'Mailfilter';
+$wb['resync_mailinglist_txt'] = 'Mailinglist';
+$wb['resync_dns_txt'] = 'DNS records';
+$wb['resync_vserver_txt'] = 'vServer';
+$wb['resync_client_txt'] = 'Client and reseller';
+$wb['all_active_txt'] = 'All active server';
+$wb['all_active_mail_txt'] = 'All active Mail-Server';
+$wb['all_active_web_txt'] = 'All active Web-Server';
+$wb['all_active_dns_txt'] = 'All active DNS-Server';
+$wb['all_active_file_txt'] = 'All active File-Server';
+$wb['all_active_db_txt'] = 'All active Database-Server';
+$wb['all_active_vserver_txt'] = 'All active vServer';
+$wb['do_sites_txt'] = 'Resynced Website';
+$wb['do_ftp_txt'] = 'Resynced FTP user';
+$wb['do_webdav_txt'] = 'Resynced WebDav user';
+$wb['do_shell_txt'] = 'Resynced Shell user';
+$wb['do_cron_txt'] = 'Resynced Cronjob';
+$wb['do_db_user_txt'] = 'Resynced Database User';
+$wb['do_db_txt'] = 'Resynced Database';
+$wb['do_mail_txt'] = 'Resynced Maildomain';
+$wb['do_mailbox_txt'] = 'Resynced Mailbox';
+$wb['do_mail_alias_txt'] = 'Resynced Alias';
+$wb['do_mail_access_txt'] = 'Resynced Mail access';
+$wb['do_mail_contentfilter_txt'] = 'Resynced Content Filter';
+$wb['do_mail_userfilter_txt'] = 'Resynced Mail User Filter';
+$wb['do_mailinglist_txt'] = 'Resynced Mailinglist';
+$wb['do_dns_txt'] = 'Resynced DNS zone';
+$wb['do_vserver_txt'] = 'Resynced vServer';
+$wb['do_clients_txt'] = 'Resynced clients and reseller';
+$wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
 ?>
diff --git a/interface/web/tools/lib/lang/it_resync.lng b/interface/web/tools/lib/lang/it_resync.lng
index 4e89bde..97537c3 100644
--- a/interface/web/tools/lib/lang/it_resync.lng
+++ b/interface/web/tools/lib/lang/it_resync.lng
@@ -1,19 +1,45 @@
 <?php
 $wb['head_txt'] = 'Resync Tool';
 $wb['legend_txt'] = 'Resync';
-$wb['resync_sites_txt'] = 'Resync Websites';
-$wb['resync_ftp_txt'] = 'Resync FTP-Accounts';
-$wb['resync_webdav_txt'] = 'Resync WebDAV-Users';
-$wb['resync_shell_txt'] = 'Resync shell users';
-$wb['resync_cron_txt'] = 'Resync cronjobs';
-$wb['resync_db_txt'] = 'Resync Client Database config';
-$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
-$wb['resync_mail_txt'] = 'Resync Maildomains';
-$wb['resync_dns_txt'] = 'Resync DNS records';
-$wb['resync_vserver_txt'] = 'Resync vServer';
-$wb['resync_client_txt'] = 'Resync Client records';
-$wb['resync_firewall_txt'] = 'Resync Firewall';
-$wb['resync_no_server_txt'] = 'No active server found';
+$wb['resync_all_txt'] = 'All services';
+$wb['resync_sites_txt'] = 'Websites';
+$wb['resync_ftp_txt'] = 'FTP-Accounts';
+$wb['resync_webdav_txt'] = 'WebDAV-Users';
+$wb['resync_shell_txt'] = 'Shell users';
+$wb['resync_cron_txt'] = 'Cronjobs';
+$wb['resync_db_txt'] = 'Client Database config';
+$wb['resync_mailbox_txt'] = 'Mailboxes';
+$wb['resync_mail_txt'] = 'Maildomains';
+$wb['resync_mailfilter_txt'] = 'Mailfilter';
+$wb['resync_mailinglist_txt'] = 'Mailinglist';
+$wb['resync_dns_txt'] = 'DNS records';
+$wb['resync_vserver_txt'] = 'vServer';
+$wb['resync_client_txt'] = 'Client and reseller';
+$wb['all_active_txt'] = 'All active server';
+$wb['all_active_mail_txt'] = 'All active Mail-Server';
+$wb['all_active_web_txt'] = 'All active Web-Server';
+$wb['all_active_dns_txt'] = 'All active DNS-Server';
+$wb['all_active_file_txt'] = 'All active File-Server';
+$wb['all_active_db_txt'] = 'All active Database-Server';
+$wb['all_active_vserver_txt'] = 'All active vServer';
+$wb['do_sites_txt'] = 'Resynced Website';
+$wb['do_ftp_txt'] = 'Resynced FTP user';
+$wb['do_webdav_txt'] = 'Resynced WebDav user';
+$wb['do_shell_txt'] = 'Resynced Shell user';
+$wb['do_cron_txt'] = 'Resynced Cronjob';
+$wb['do_db_user_txt'] = 'Resynced Database User';
+$wb['do_db_txt'] = 'Resynced Database';
+$wb['do_mail_txt'] = 'Resynced Maildomain';
+$wb['do_mailbox_txt'] = 'Resynced Mailbox';
+$wb['do_mail_alias_txt'] = 'Resynced Alias';
+$wb['do_mail_access_txt'] = 'Resynced Mail access';
+$wb['do_mail_contentfilter_txt'] = 'Resynced Content Filter';
+$wb['do_mail_userfilter_txt'] = 'Resynced Mail User Filter';
+$wb['do_mailinglist_txt'] = 'Resynced Mailinglist';
+$wb['do_dns_txt'] = 'Resynced DNS zone';
+$wb['do_vserver_txt'] = 'Resynced vServer';
+$wb['do_clients_txt'] = 'Resynced clients and reseller';
+$wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
 ?>
diff --git a/interface/web/tools/lib/lang/ja_resync.lng b/interface/web/tools/lib/lang/ja_resync.lng
index 4e89bde..97537c3 100644
--- a/interface/web/tools/lib/lang/ja_resync.lng
+++ b/interface/web/tools/lib/lang/ja_resync.lng
@@ -1,19 +1,45 @@
 <?php
 $wb['head_txt'] = 'Resync Tool';
 $wb['legend_txt'] = 'Resync';
-$wb['resync_sites_txt'] = 'Resync Websites';
-$wb['resync_ftp_txt'] = 'Resync FTP-Accounts';
-$wb['resync_webdav_txt'] = 'Resync WebDAV-Users';
-$wb['resync_shell_txt'] = 'Resync shell users';
-$wb['resync_cron_txt'] = 'Resync cronjobs';
-$wb['resync_db_txt'] = 'Resync Client Database config';
-$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
-$wb['resync_mail_txt'] = 'Resync Maildomains';
-$wb['resync_dns_txt'] = 'Resync DNS records';
-$wb['resync_vserver_txt'] = 'Resync vServer';
-$wb['resync_client_txt'] = 'Resync Client records';
-$wb['resync_firewall_txt'] = 'Resync Firewall';
-$wb['resync_no_server_txt'] = 'No active server found';
+$wb['resync_all_txt'] = 'All services';
+$wb['resync_sites_txt'] = 'Websites';
+$wb['resync_ftp_txt'] = 'FTP-Accounts';
+$wb['resync_webdav_txt'] = 'WebDAV-Users';
+$wb['resync_shell_txt'] = 'Shell users';
+$wb['resync_cron_txt'] = 'Cronjobs';
+$wb['resync_db_txt'] = 'Client Database config';
+$wb['resync_mailbox_txt'] = 'Mailboxes';
+$wb['resync_mail_txt'] = 'Maildomains';
+$wb['resync_mailfilter_txt'] = 'Mailfilter';
+$wb['resync_mailinglist_txt'] = 'Mailinglist';
+$wb['resync_dns_txt'] = 'DNS records';
+$wb['resync_vserver_txt'] = 'vServer';
+$wb['resync_client_txt'] = 'Client and reseller';
+$wb['all_active_txt'] = 'All active server';
+$wb['all_active_mail_txt'] = 'All active Mail-Server';
+$wb['all_active_web_txt'] = 'All active Web-Server';
+$wb['all_active_dns_txt'] = 'All active DNS-Server';
+$wb['all_active_file_txt'] = 'All active File-Server';
+$wb['all_active_db_txt'] = 'All active Database-Server';
+$wb['all_active_vserver_txt'] = 'All active vServer';
+$wb['do_sites_txt'] = 'Resynced Website';
+$wb['do_ftp_txt'] = 'Resynced FTP user';
+$wb['do_webdav_txt'] = 'Resynced WebDav user';
+$wb['do_shell_txt'] = 'Resynced Shell user';
+$wb['do_cron_txt'] = 'Resynced Cronjob';
+$wb['do_db_user_txt'] = 'Resynced Database User';
+$wb['do_db_txt'] = 'Resynced Database';
+$wb['do_mail_txt'] = 'Resynced Maildomain';
+$wb['do_mailbox_txt'] = 'Resynced Mailbox';
+$wb['do_mail_alias_txt'] = 'Resynced Alias';
+$wb['do_mail_access_txt'] = 'Resynced Mail access';
+$wb['do_mail_contentfilter_txt'] = 'Resynced Content Filter';
+$wb['do_mail_userfilter_txt'] = 'Resynced Mail User Filter';
+$wb['do_mailinglist_txt'] = 'Resynced Mailinglist';
+$wb['do_dns_txt'] = 'Resynced DNS zone';
+$wb['do_vserver_txt'] = 'Resynced vServer';
+$wb['do_clients_txt'] = 'Resynced clients and reseller';
+$wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
 ?>
diff --git a/interface/web/tools/lib/lang/nl_resync.lng b/interface/web/tools/lib/lang/nl_resync.lng
index 4e89bde..97537c3 100644
--- a/interface/web/tools/lib/lang/nl_resync.lng
+++ b/interface/web/tools/lib/lang/nl_resync.lng
@@ -1,19 +1,45 @@
 <?php
 $wb['head_txt'] = 'Resync Tool';
 $wb['legend_txt'] = 'Resync';
-$wb['resync_sites_txt'] = 'Resync Websites';
-$wb['resync_ftp_txt'] = 'Resync FTP-Accounts';
-$wb['resync_webdav_txt'] = 'Resync WebDAV-Users';
-$wb['resync_shell_txt'] = 'Resync shell users';
-$wb['resync_cron_txt'] = 'Resync cronjobs';
-$wb['resync_db_txt'] = 'Resync Client Database config';
-$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
-$wb['resync_mail_txt'] = 'Resync Maildomains';
-$wb['resync_dns_txt'] = 'Resync DNS records';
-$wb['resync_vserver_txt'] = 'Resync vServer';
-$wb['resync_client_txt'] = 'Resync Client records';
-$wb['resync_firewall_txt'] = 'Resync Firewall';
-$wb['resync_no_server_txt'] = 'No active server found';
+$wb['resync_all_txt'] = 'All services';
+$wb['resync_sites_txt'] = 'Websites';
+$wb['resync_ftp_txt'] = 'FTP-Accounts';
+$wb['resync_webdav_txt'] = 'WebDAV-Users';
+$wb['resync_shell_txt'] = 'Shell users';
+$wb['resync_cron_txt'] = 'Cronjobs';
+$wb['resync_db_txt'] = 'Client Database config';
+$wb['resync_mailbox_txt'] = 'Mailboxes';
+$wb['resync_mail_txt'] = 'Maildomains';
+$wb['resync_mailfilter_txt'] = 'Mailfilter';
+$wb['resync_mailinglist_txt'] = 'Mailinglist';
+$wb['resync_dns_txt'] = 'DNS records';
+$wb['resync_vserver_txt'] = 'vServer';
+$wb['resync_client_txt'] = 'Client and reseller';
+$wb['all_active_txt'] = 'All active server';
+$wb['all_active_mail_txt'] = 'All active Mail-Server';
+$wb['all_active_web_txt'] = 'All active Web-Server';
+$wb['all_active_dns_txt'] = 'All active DNS-Server';
+$wb['all_active_file_txt'] = 'All active File-Server';
+$wb['all_active_db_txt'] = 'All active Database-Server';
+$wb['all_active_vserver_txt'] = 'All active vServer';
+$wb['do_sites_txt'] = 'Resynced Website';
+$wb['do_ftp_txt'] = 'Resynced FTP user';
+$wb['do_webdav_txt'] = 'Resynced WebDav user';
+$wb['do_shell_txt'] = 'Resynced Shell user';
+$wb['do_cron_txt'] = 'Resynced Cronjob';
+$wb['do_db_user_txt'] = 'Resynced Database User';
+$wb['do_db_txt'] = 'Resynced Database';
+$wb['do_mail_txt'] = 'Resynced Maildomain';
+$wb['do_mailbox_txt'] = 'Resynced Mailbox';
+$wb['do_mail_alias_txt'] = 'Resynced Alias';
+$wb['do_mail_access_txt'] = 'Resynced Mail access';
+$wb['do_mail_contentfilter_txt'] = 'Resynced Content Filter';
+$wb['do_mail_userfilter_txt'] = 'Resynced Mail User Filter';
+$wb['do_mailinglist_txt'] = 'Resynced Mailinglist';
+$wb['do_dns_txt'] = 'Resynced DNS zone';
+$wb['do_vserver_txt'] = 'Resynced vServer';
+$wb['do_clients_txt'] = 'Resynced clients and reseller';
+$wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
 ?>
diff --git a/interface/web/tools/lib/lang/pl_resync.lng b/interface/web/tools/lib/lang/pl_resync.lng
index 77e656d..97537c3 100644
--- a/interface/web/tools/lib/lang/pl_resync.lng
+++ b/interface/web/tools/lib/lang/pl_resync.lng
@@ -1,19 +1,45 @@
 <?php
-$wb['head_txt'] = 'Resynchronizacja ustawień';
-$wb['legend_txt'] = 'Resynchronizacja';
-$wb['resync_sites_txt'] = 'Resynchronizacja stron www';
-$wb['resync_ftp_txt'] = 'Resynchronizacja kont FTP';
-$wb['resync_shell_txt'] = 'Resynchronizacja kont shell';
-$wb['resync_cron_txt'] = 'Resynchronizacja zadań cron';
-$wb['resync_db_txt'] = 'Resynchronizacja użytkowników bazy';
-$wb['resync_mailbox_txt'] = 'Resynchronizacja skrzynek e-mail';
-$wb['resync_dns_txt'] = 'Resynchronizacja rekordów DNS';
+$wb['head_txt'] = 'Resync Tool';
+$wb['legend_txt'] = 'Resync';
+$wb['resync_all_txt'] = 'All services';
+$wb['resync_sites_txt'] = 'Websites';
+$wb['resync_ftp_txt'] = 'FTP-Accounts';
+$wb['resync_webdav_txt'] = 'WebDAV-Users';
+$wb['resync_shell_txt'] = 'Shell users';
+$wb['resync_cron_txt'] = 'Cronjobs';
+$wb['resync_db_txt'] = 'Client Database config';
+$wb['resync_mailbox_txt'] = 'Mailboxes';
+$wb['resync_mail_txt'] = 'Maildomains';
+$wb['resync_mailfilter_txt'] = 'Mailfilter';
+$wb['resync_mailinglist_txt'] = 'Mailinglist';
+$wb['resync_dns_txt'] = 'DNS records';
+$wb['resync_vserver_txt'] = 'vServer';
+$wb['resync_client_txt'] = 'Client and reseller';
+$wb['all_active_txt'] = 'All active server';
+$wb['all_active_mail_txt'] = 'All active Mail-Server';
+$wb['all_active_web_txt'] = 'All active Web-Server';
+$wb['all_active_dns_txt'] = 'All active DNS-Server';
+$wb['all_active_file_txt'] = 'All active File-Server';
+$wb['all_active_db_txt'] = 'All active Database-Server';
+$wb['all_active_vserver_txt'] = 'All active vServer';
+$wb['do_sites_txt'] = 'Resynced Website';
+$wb['do_ftp_txt'] = 'Resynced FTP user';
+$wb['do_webdav_txt'] = 'Resynced WebDav user';
+$wb['do_shell_txt'] = 'Resynced Shell user';
+$wb['do_cron_txt'] = 'Resynced Cronjob';
+$wb['do_db_user_txt'] = 'Resynced Database User';
+$wb['do_db_txt'] = 'Resynced Database';
+$wb['do_mail_txt'] = 'Resynced Maildomain';
+$wb['do_mailbox_txt'] = 'Resynced Mailbox';
+$wb['do_mail_alias_txt'] = 'Resynced Alias';
+$wb['do_mail_access_txt'] = 'Resynced Mail access';
+$wb['do_mail_contentfilter_txt'] = 'Resynced Content Filter';
+$wb['do_mail_userfilter_txt'] = 'Resynced Mail User Filter';
+$wb['do_mailinglist_txt'] = 'Resynced Mailinglist';
+$wb['do_dns_txt'] = 'Resynced DNS zone';
+$wb['do_vserver_txt'] = 'Resynced vServer';
+$wb['do_clients_txt'] = 'Resynced clients and reseller';
+$wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
-$wb['btn_cancel_txt'] = 'Anuluj';
-$wb['resync_client_txt'] = 'Resync Client records';
-$wb['resync_webdav_txt'] = 'Resync WebDAV-Users';
-$wb['resync_mail_txt'] = 'Resync Maildomains';
-$wb['resync_vserver_txt'] = 'Resync vServer';
-$wb['resync_firewall_txt'] = 'Resync Firewall';
-$wb['resync_no_server_txt'] = 'No active server found';
+$wb['btn_cancel_txt'] = 'Cancel';
 ?>
diff --git a/interface/web/tools/lib/lang/pt_resync.lng b/interface/web/tools/lib/lang/pt_resync.lng
index 4e89bde..97537c3 100644
--- a/interface/web/tools/lib/lang/pt_resync.lng
+++ b/interface/web/tools/lib/lang/pt_resync.lng
@@ -1,19 +1,45 @@
 <?php
 $wb['head_txt'] = 'Resync Tool';
 $wb['legend_txt'] = 'Resync';
-$wb['resync_sites_txt'] = 'Resync Websites';
-$wb['resync_ftp_txt'] = 'Resync FTP-Accounts';
-$wb['resync_webdav_txt'] = 'Resync WebDAV-Users';
-$wb['resync_shell_txt'] = 'Resync shell users';
-$wb['resync_cron_txt'] = 'Resync cronjobs';
-$wb['resync_db_txt'] = 'Resync Client Database config';
-$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
-$wb['resync_mail_txt'] = 'Resync Maildomains';
-$wb['resync_dns_txt'] = 'Resync DNS records';
-$wb['resync_vserver_txt'] = 'Resync vServer';
-$wb['resync_client_txt'] = 'Resync Client records';
-$wb['resync_firewall_txt'] = 'Resync Firewall';
-$wb['resync_no_server_txt'] = 'No active server found';
+$wb['resync_all_txt'] = 'All services';
+$wb['resync_sites_txt'] = 'Websites';
+$wb['resync_ftp_txt'] = 'FTP-Accounts';
+$wb['resync_webdav_txt'] = 'WebDAV-Users';
+$wb['resync_shell_txt'] = 'Shell users';
+$wb['resync_cron_txt'] = 'Cronjobs';
+$wb['resync_db_txt'] = 'Client Database config';
+$wb['resync_mailbox_txt'] = 'Mailboxes';
+$wb['resync_mail_txt'] = 'Maildomains';
+$wb['resync_mailfilter_txt'] = 'Mailfilter';
+$wb['resync_mailinglist_txt'] = 'Mailinglist';
+$wb['resync_dns_txt'] = 'DNS records';
+$wb['resync_vserver_txt'] = 'vServer';
+$wb['resync_client_txt'] = 'Client and reseller';
+$wb['all_active_txt'] = 'All active server';
+$wb['all_active_mail_txt'] = 'All active Mail-Server';
+$wb['all_active_web_txt'] = 'All active Web-Server';
+$wb['all_active_dns_txt'] = 'All active DNS-Server';
+$wb['all_active_file_txt'] = 'All active File-Server';
+$wb['all_active_db_txt'] = 'All active Database-Server';
+$wb['all_active_vserver_txt'] = 'All active vServer';
+$wb['do_sites_txt'] = 'Resynced Website';
+$wb['do_ftp_txt'] = 'Resynced FTP user';
+$wb['do_webdav_txt'] = 'Resynced WebDav user';
+$wb['do_shell_txt'] = 'Resynced Shell user';
+$wb['do_cron_txt'] = 'Resynced Cronjob';
+$wb['do_db_user_txt'] = 'Resynced Database User';
+$wb['do_db_txt'] = 'Resynced Database';
+$wb['do_mail_txt'] = 'Resynced Maildomain';
+$wb['do_mailbox_txt'] = 'Resynced Mailbox';
+$wb['do_mail_alias_txt'] = 'Resynced Alias';
+$wb['do_mail_access_txt'] = 'Resynced Mail access';
+$wb['do_mail_contentfilter_txt'] = 'Resynced Content Filter';
+$wb['do_mail_userfilter_txt'] = 'Resynced Mail User Filter';
+$wb['do_mailinglist_txt'] = 'Resynced Mailinglist';
+$wb['do_dns_txt'] = 'Resynced DNS zone';
+$wb['do_vserver_txt'] = 'Resynced vServer';
+$wb['do_clients_txt'] = 'Resynced clients and reseller';
+$wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
 ?>
diff --git a/interface/web/tools/lib/lang/ro_resync.lng b/interface/web/tools/lib/lang/ro_resync.lng
index 4e89bde..97537c3 100644
--- a/interface/web/tools/lib/lang/ro_resync.lng
+++ b/interface/web/tools/lib/lang/ro_resync.lng
@@ -1,19 +1,45 @@
 <?php
 $wb['head_txt'] = 'Resync Tool';
 $wb['legend_txt'] = 'Resync';
-$wb['resync_sites_txt'] = 'Resync Websites';
-$wb['resync_ftp_txt'] = 'Resync FTP-Accounts';
-$wb['resync_webdav_txt'] = 'Resync WebDAV-Users';
-$wb['resync_shell_txt'] = 'Resync shell users';
-$wb['resync_cron_txt'] = 'Resync cronjobs';
-$wb['resync_db_txt'] = 'Resync Client Database config';
-$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
-$wb['resync_mail_txt'] = 'Resync Maildomains';
-$wb['resync_dns_txt'] = 'Resync DNS records';
-$wb['resync_vserver_txt'] = 'Resync vServer';
-$wb['resync_client_txt'] = 'Resync Client records';
-$wb['resync_firewall_txt'] = 'Resync Firewall';
-$wb['resync_no_server_txt'] = 'No active server found';
+$wb['resync_all_txt'] = 'All services';
+$wb['resync_sites_txt'] = 'Websites';
+$wb['resync_ftp_txt'] = 'FTP-Accounts';
+$wb['resync_webdav_txt'] = 'WebDAV-Users';
+$wb['resync_shell_txt'] = 'Shell users';
+$wb['resync_cron_txt'] = 'Cronjobs';
+$wb['resync_db_txt'] = 'Client Database config';
+$wb['resync_mailbox_txt'] = 'Mailboxes';
+$wb['resync_mail_txt'] = 'Maildomains';
+$wb['resync_mailfilter_txt'] = 'Mailfilter';
+$wb['resync_mailinglist_txt'] = 'Mailinglist';
+$wb['resync_dns_txt'] = 'DNS records';
+$wb['resync_vserver_txt'] = 'vServer';
+$wb['resync_client_txt'] = 'Client and reseller';
+$wb['all_active_txt'] = 'All active server';
+$wb['all_active_mail_txt'] = 'All active Mail-Server';
+$wb['all_active_web_txt'] = 'All active Web-Server';
+$wb['all_active_dns_txt'] = 'All active DNS-Server';
+$wb['all_active_file_txt'] = 'All active File-Server';
+$wb['all_active_db_txt'] = 'All active Database-Server';
+$wb['all_active_vserver_txt'] = 'All active vServer';
+$wb['do_sites_txt'] = 'Resynced Website';
+$wb['do_ftp_txt'] = 'Resynced FTP user';
+$wb['do_webdav_txt'] = 'Resynced WebDav user';
+$wb['do_shell_txt'] = 'Resynced Shell user';
+$wb['do_cron_txt'] = 'Resynced Cronjob';
+$wb['do_db_user_txt'] = 'Resynced Database User';
+$wb['do_db_txt'] = 'Resynced Database';
+$wb['do_mail_txt'] = 'Resynced Maildomain';
+$wb['do_mailbox_txt'] = 'Resynced Mailbox';
+$wb['do_mail_alias_txt'] = 'Resynced Alias';
+$wb['do_mail_access_txt'] = 'Resynced Mail access';
+$wb['do_mail_contentfilter_txt'] = 'Resynced Content Filter';
+$wb['do_mail_userfilter_txt'] = 'Resynced Mail User Filter';
+$wb['do_mailinglist_txt'] = 'Resynced Mailinglist';
+$wb['do_dns_txt'] = 'Resynced DNS zone';
+$wb['do_vserver_txt'] = 'Resynced vServer';
+$wb['do_clients_txt'] = 'Resynced clients and reseller';
+$wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
 ?>
diff --git a/interface/web/tools/lib/lang/ru_resync.lng b/interface/web/tools/lib/lang/ru_resync.lng
index 4e89bde..97537c3 100644
--- a/interface/web/tools/lib/lang/ru_resync.lng
+++ b/interface/web/tools/lib/lang/ru_resync.lng
@@ -1,19 +1,45 @@
 <?php
 $wb['head_txt'] = 'Resync Tool';
 $wb['legend_txt'] = 'Resync';
-$wb['resync_sites_txt'] = 'Resync Websites';
-$wb['resync_ftp_txt'] = 'Resync FTP-Accounts';
-$wb['resync_webdav_txt'] = 'Resync WebDAV-Users';
-$wb['resync_shell_txt'] = 'Resync shell users';
-$wb['resync_cron_txt'] = 'Resync cronjobs';
-$wb['resync_db_txt'] = 'Resync Client Database config';
-$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
-$wb['resync_mail_txt'] = 'Resync Maildomains';
-$wb['resync_dns_txt'] = 'Resync DNS records';
-$wb['resync_vserver_txt'] = 'Resync vServer';
-$wb['resync_client_txt'] = 'Resync Client records';
-$wb['resync_firewall_txt'] = 'Resync Firewall';
-$wb['resync_no_server_txt'] = 'No active server found';
+$wb['resync_all_txt'] = 'All services';
+$wb['resync_sites_txt'] = 'Websites';
+$wb['resync_ftp_txt'] = 'FTP-Accounts';
+$wb['resync_webdav_txt'] = 'WebDAV-Users';
+$wb['resync_shell_txt'] = 'Shell users';
+$wb['resync_cron_txt'] = 'Cronjobs';
+$wb['resync_db_txt'] = 'Client Database config';
+$wb['resync_mailbox_txt'] = 'Mailboxes';
+$wb['resync_mail_txt'] = 'Maildomains';
+$wb['resync_mailfilter_txt'] = 'Mailfilter';
+$wb['resync_mailinglist_txt'] = 'Mailinglist';
+$wb['resync_dns_txt'] = 'DNS records';
+$wb['resync_vserver_txt'] = 'vServer';
+$wb['resync_client_txt'] = 'Client and reseller';
+$wb['all_active_txt'] = 'All active server';
+$wb['all_active_mail_txt'] = 'All active Mail-Server';
+$wb['all_active_web_txt'] = 'All active Web-Server';
+$wb['all_active_dns_txt'] = 'All active DNS-Server';
+$wb['all_active_file_txt'] = 'All active File-Server';
+$wb['all_active_db_txt'] = 'All active Database-Server';
+$wb['all_active_vserver_txt'] = 'All active vServer';
+$wb['do_sites_txt'] = 'Resynced Website';
+$wb['do_ftp_txt'] = 'Resynced FTP user';
+$wb['do_webdav_txt'] = 'Resynced WebDav user';
+$wb['do_shell_txt'] = 'Resynced Shell user';
+$wb['do_cron_txt'] = 'Resynced Cronjob';
+$wb['do_db_user_txt'] = 'Resynced Database User';
+$wb['do_db_txt'] = 'Resynced Database';
+$wb['do_mail_txt'] = 'Resynced Maildomain';
+$wb['do_mailbox_txt'] = 'Resynced Mailbox';
+$wb['do_mail_alias_txt'] = 'Resynced Alias';
+$wb['do_mail_access_txt'] = 'Resynced Mail access';
+$wb['do_mail_contentfilter_txt'] = 'Resynced Content Filter';
+$wb['do_mail_userfilter_txt'] = 'Resynced Mail User Filter';
+$wb['do_mailinglist_txt'] = 'Resynced Mailinglist';
+$wb['do_dns_txt'] = 'Resynced DNS zone';
+$wb['do_vserver_txt'] = 'Resynced vServer';
+$wb['do_clients_txt'] = 'Resynced clients and reseller';
+$wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
 ?>
diff --git a/interface/web/tools/lib/lang/se_resync.lng b/interface/web/tools/lib/lang/se_resync.lng
index 4e89bde..97537c3 100644
--- a/interface/web/tools/lib/lang/se_resync.lng
+++ b/interface/web/tools/lib/lang/se_resync.lng
@@ -1,19 +1,45 @@
 <?php
 $wb['head_txt'] = 'Resync Tool';
 $wb['legend_txt'] = 'Resync';
-$wb['resync_sites_txt'] = 'Resync Websites';
-$wb['resync_ftp_txt'] = 'Resync FTP-Accounts';
-$wb['resync_webdav_txt'] = 'Resync WebDAV-Users';
-$wb['resync_shell_txt'] = 'Resync shell users';
-$wb['resync_cron_txt'] = 'Resync cronjobs';
-$wb['resync_db_txt'] = 'Resync Client Database config';
-$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
-$wb['resync_mail_txt'] = 'Resync Maildomains';
-$wb['resync_dns_txt'] = 'Resync DNS records';
-$wb['resync_vserver_txt'] = 'Resync vServer';
-$wb['resync_client_txt'] = 'Resync Client records';
-$wb['resync_firewall_txt'] = 'Resync Firewall';
-$wb['resync_no_server_txt'] = 'No active server found';
+$wb['resync_all_txt'] = 'All services';
+$wb['resync_sites_txt'] = 'Websites';
+$wb['resync_ftp_txt'] = 'FTP-Accounts';
+$wb['resync_webdav_txt'] = 'WebDAV-Users';
+$wb['resync_shell_txt'] = 'Shell users';
+$wb['resync_cron_txt'] = 'Cronjobs';
+$wb['resync_db_txt'] = 'Client Database config';
+$wb['resync_mailbox_txt'] = 'Mailboxes';
+$wb['resync_mail_txt'] = 'Maildomains';
+$wb['resync_mailfilter_txt'] = 'Mailfilter';
+$wb['resync_mailinglist_txt'] = 'Mailinglist';
+$wb['resync_dns_txt'] = 'DNS records';
+$wb['resync_vserver_txt'] = 'vServer';
+$wb['resync_client_txt'] = 'Client and reseller';
+$wb['all_active_txt'] = 'All active server';
+$wb['all_active_mail_txt'] = 'All active Mail-Server';
+$wb['all_active_web_txt'] = 'All active Web-Server';
+$wb['all_active_dns_txt'] = 'All active DNS-Server';
+$wb['all_active_file_txt'] = 'All active File-Server';
+$wb['all_active_db_txt'] = 'All active Database-Server';
+$wb['all_active_vserver_txt'] = 'All active vServer';
+$wb['do_sites_txt'] = 'Resynced Website';
+$wb['do_ftp_txt'] = 'Resynced FTP user';
+$wb['do_webdav_txt'] = 'Resynced WebDav user';
+$wb['do_shell_txt'] = 'Resynced Shell user';
+$wb['do_cron_txt'] = 'Resynced Cronjob';
+$wb['do_db_user_txt'] = 'Resynced Database User';
+$wb['do_db_txt'] = 'Resynced Database';
+$wb['do_mail_txt'] = 'Resynced Maildomain';
+$wb['do_mailbox_txt'] = 'Resynced Mailbox';
+$wb['do_mail_alias_txt'] = 'Resynced Alias';
+$wb['do_mail_access_txt'] = 'Resynced Mail access';
+$wb['do_mail_contentfilter_txt'] = 'Resynced Content Filter';
+$wb['do_mail_userfilter_txt'] = 'Resynced Mail User Filter';
+$wb['do_mailinglist_txt'] = 'Resynced Mailinglist';
+$wb['do_dns_txt'] = 'Resynced DNS zone';
+$wb['do_vserver_txt'] = 'Resynced vServer';
+$wb['do_clients_txt'] = 'Resynced clients and reseller';
+$wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
 ?>
diff --git a/interface/web/tools/lib/lang/sk_resync.lng b/interface/web/tools/lib/lang/sk_resync.lng
index 4e89bde..97537c3 100644
--- a/interface/web/tools/lib/lang/sk_resync.lng
+++ b/interface/web/tools/lib/lang/sk_resync.lng
@@ -1,19 +1,45 @@
 <?php
 $wb['head_txt'] = 'Resync Tool';
 $wb['legend_txt'] = 'Resync';
-$wb['resync_sites_txt'] = 'Resync Websites';
-$wb['resync_ftp_txt'] = 'Resync FTP-Accounts';
-$wb['resync_webdav_txt'] = 'Resync WebDAV-Users';
-$wb['resync_shell_txt'] = 'Resync shell users';
-$wb['resync_cron_txt'] = 'Resync cronjobs';
-$wb['resync_db_txt'] = 'Resync Client Database config';
-$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
-$wb['resync_mail_txt'] = 'Resync Maildomains';
-$wb['resync_dns_txt'] = 'Resync DNS records';
-$wb['resync_vserver_txt'] = 'Resync vServer';
-$wb['resync_client_txt'] = 'Resync Client records';
-$wb['resync_firewall_txt'] = 'Resync Firewall';
-$wb['resync_no_server_txt'] = 'No active server found';
+$wb['resync_all_txt'] = 'All services';
+$wb['resync_sites_txt'] = 'Websites';
+$wb['resync_ftp_txt'] = 'FTP-Accounts';
+$wb['resync_webdav_txt'] = 'WebDAV-Users';
+$wb['resync_shell_txt'] = 'Shell users';
+$wb['resync_cron_txt'] = 'Cronjobs';
+$wb['resync_db_txt'] = 'Client Database config';
+$wb['resync_mailbox_txt'] = 'Mailboxes';
+$wb['resync_mail_txt'] = 'Maildomains';
+$wb['resync_mailfilter_txt'] = 'Mailfilter';
+$wb['resync_mailinglist_txt'] = 'Mailinglist';
+$wb['resync_dns_txt'] = 'DNS records';
+$wb['resync_vserver_txt'] = 'vServer';
+$wb['resync_client_txt'] = 'Client and reseller';
+$wb['all_active_txt'] = 'All active server';
+$wb['all_active_mail_txt'] = 'All active Mail-Server';
+$wb['all_active_web_txt'] = 'All active Web-Server';
+$wb['all_active_dns_txt'] = 'All active DNS-Server';
+$wb['all_active_file_txt'] = 'All active File-Server';
+$wb['all_active_db_txt'] = 'All active Database-Server';
+$wb['all_active_vserver_txt'] = 'All active vServer';
+$wb['do_sites_txt'] = 'Resynced Website';
+$wb['do_ftp_txt'] = 'Resynced FTP user';
+$wb['do_webdav_txt'] = 'Resynced WebDav user';
+$wb['do_shell_txt'] = 'Resynced Shell user';
+$wb['do_cron_txt'] = 'Resynced Cronjob';
+$wb['do_db_user_txt'] = 'Resynced Database User';
+$wb['do_db_txt'] = 'Resynced Database';
+$wb['do_mail_txt'] = 'Resynced Maildomain';
+$wb['do_mailbox_txt'] = 'Resynced Mailbox';
+$wb['do_mail_alias_txt'] = 'Resynced Alias';
+$wb['do_mail_access_txt'] = 'Resynced Mail access';
+$wb['do_mail_contentfilter_txt'] = 'Resynced Content Filter';
+$wb['do_mail_userfilter_txt'] = 'Resynced Mail User Filter';
+$wb['do_mailinglist_txt'] = 'Resynced Mailinglist';
+$wb['do_dns_txt'] = 'Resynced DNS zone';
+$wb['do_vserver_txt'] = 'Resynced vServer';
+$wb['do_clients_txt'] = 'Resynced clients and reseller';
+$wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
 ?>
diff --git a/interface/web/tools/lib/lang/tr_resync.lng b/interface/web/tools/lib/lang/tr_resync.lng
index 4e89bde..97537c3 100644
--- a/interface/web/tools/lib/lang/tr_resync.lng
+++ b/interface/web/tools/lib/lang/tr_resync.lng
@@ -1,19 +1,45 @@
 <?php
 $wb['head_txt'] = 'Resync Tool';
 $wb['legend_txt'] = 'Resync';
-$wb['resync_sites_txt'] = 'Resync Websites';
-$wb['resync_ftp_txt'] = 'Resync FTP-Accounts';
-$wb['resync_webdav_txt'] = 'Resync WebDAV-Users';
-$wb['resync_shell_txt'] = 'Resync shell users';
-$wb['resync_cron_txt'] = 'Resync cronjobs';
-$wb['resync_db_txt'] = 'Resync Client Database config';
-$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
-$wb['resync_mail_txt'] = 'Resync Maildomains';
-$wb['resync_dns_txt'] = 'Resync DNS records';
-$wb['resync_vserver_txt'] = 'Resync vServer';
-$wb['resync_client_txt'] = 'Resync Client records';
-$wb['resync_firewall_txt'] = 'Resync Firewall';
-$wb['resync_no_server_txt'] = 'No active server found';
+$wb['resync_all_txt'] = 'All services';
+$wb['resync_sites_txt'] = 'Websites';
+$wb['resync_ftp_txt'] = 'FTP-Accounts';
+$wb['resync_webdav_txt'] = 'WebDAV-Users';
+$wb['resync_shell_txt'] = 'Shell users';
+$wb['resync_cron_txt'] = 'Cronjobs';
+$wb['resync_db_txt'] = 'Client Database config';
+$wb['resync_mailbox_txt'] = 'Mailboxes';
+$wb['resync_mail_txt'] = 'Maildomains';
+$wb['resync_mailfilter_txt'] = 'Mailfilter';
+$wb['resync_mailinglist_txt'] = 'Mailinglist';
+$wb['resync_dns_txt'] = 'DNS records';
+$wb['resync_vserver_txt'] = 'vServer';
+$wb['resync_client_txt'] = 'Client and reseller';
+$wb['all_active_txt'] = 'All active server';
+$wb['all_active_mail_txt'] = 'All active Mail-Server';
+$wb['all_active_web_txt'] = 'All active Web-Server';
+$wb['all_active_dns_txt'] = 'All active DNS-Server';
+$wb['all_active_file_txt'] = 'All active File-Server';
+$wb['all_active_db_txt'] = 'All active Database-Server';
+$wb['all_active_vserver_txt'] = 'All active vServer';
+$wb['do_sites_txt'] = 'Resynced Website';
+$wb['do_ftp_txt'] = 'Resynced FTP user';
+$wb['do_webdav_txt'] = 'Resynced WebDav user';
+$wb['do_shell_txt'] = 'Resynced Shell user';
+$wb['do_cron_txt'] = 'Resynced Cronjob';
+$wb['do_db_user_txt'] = 'Resynced Database User';
+$wb['do_db_txt'] = 'Resynced Database';
+$wb['do_mail_txt'] = 'Resynced Maildomain';
+$wb['do_mailbox_txt'] = 'Resynced Mailbox';
+$wb['do_mail_alias_txt'] = 'Resynced Alias';
+$wb['do_mail_access_txt'] = 'Resynced Mail access';
+$wb['do_mail_contentfilter_txt'] = 'Resynced Content Filter';
+$wb['do_mail_userfilter_txt'] = 'Resynced Mail User Filter';
+$wb['do_mailinglist_txt'] = 'Resynced Mailinglist';
+$wb['do_dns_txt'] = 'Resynced DNS zone';
+$wb['do_vserver_txt'] = 'Resynced vServer';
+$wb['do_clients_txt'] = 'Resynced clients and reseller';
+$wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
 ?>
diff --git a/interface/web/tools/lib/menu.d/resync.menu.php b/interface/web/tools/lib/menu.d/resync.menu.php
index bc25fff..65a331f 100644
--- a/interface/web/tools/lib/menu.d/resync.menu.php
+++ b/interface/web/tools/lib/menu.d/resync.menu.php
@@ -9,8 +9,7 @@
 
 	$items[] = array( 'title'  => 'Resync',
 		'target'  => 'content',
-		'link' => 'tools/resync_show.php');
-
+		'link' => 'tools/resync.php');
 
 	$module['nav'][] = array( 'title' => 'Sync Tools',
 		'open'  => 1,
diff --git a/interface/web/tools/resync.php b/interface/web/tools/resync.php
new file mode 100755
index 0000000..8e3b32f
--- /dev/null
+++ b/interface/web/tools/resync.php
@@ -0,0 +1,546 @@
+<?php
+/*
+Copyright (c) 2014, Florian Schaal, info@schaal-24.de
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of ISPConfig nor the names of its contributors
+      may be used to endorse or promote products derived from this software without
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+
+/******************************************
+* Begin Form configuration
+******************************************/
+
+$tform_def_file = 'form/resync.tform.php';
+
+/******************************************
+* End Form configuration
+******************************************/
+
+require_once '../../lib/config.inc.php';
+require_once '../../lib/app.inc.php';
+
+//* Check permissions for module
+$app->auth->check_module_permissions('admin');
+
+// Loading classes
+$app->uses('tpl,tform,tform_actions');
+$app->load('tform_actions');
+
+class page_action extends tform_actions {
+
+	//* called during onShowEnd
+	private function create_list($server_rec, $server_type, $search) {
+
+		$server_count = 0;
+
+		//* we allow multiple search-pattern - convert string to array
+		if (!is_array($search)) {
+			$_search = $search;
+			$search=array();
+			$search[]=$_search;
+		}
+
+		foreach ($server_rec as $server) {
+			//* check the database for existing records
+			$server_data = $this->server_has_data($server_type, $server['server_id']);
+			foreach ($search as $needle) 
+				if (in_array($needle, $server_data) && strpos($options_servers, $server['server_name']) === false) {
+					$options_servers .= "<option value='$server[server_id]'>$server[server_name]</option>";
+					$server_count++;
+				}
+		}
+
+		return array($options_servers, $server_count);
+	}
+
+	//* called from create_list
+	private function server_has_data($type, $server) {
+
+		global $app;
+
+		$server_id = $app->functions->intval($server);
+
+		if($type == 'mail') {
+			$server_data = array (
+    			'mail_domain' => array (
+        			'index_field' => 'domain_id',
+        			'server_type' => 'mail',
+    			),
+    			'mail_mailinglist' => array (
+        			'index_field' =>  'mailinglist_id',
+        			'server_type' => 'mail',
+    			),
+    			'mail_user' => array (
+        			'index_field' =>  'mailuser_id',
+        			'server_type' => 'mail',
+    			),
+			);
+		}
+		if($type == 'mail_filter') {
+			$server_data = array (
+				'mail_access' => array (
+					'index_field' => 'access_id',
+        			'server_type' => 'mail',
+    			),
+				'mail_content_filter' => array (
+					'index_field' => 'content_filter_id',
+        			'server_type' => 'mail',
+    			),
+				'mail_user_filter' => array (
+					'index_field' => 'filter_id',
+        			'server_type' => 'mail',
+    			),
+			);
+		}
+		if($type == 'web'  ) {
+			$server_data = array (
+    			'web_domain' => array (
+        			'index_field' => 'domain_id',
+        			'server_type' => 'web',
+    			),
+    			'shell_user' => array (
+        			'index_field' => 'shell_user_id',
+        			'server_type' => 'web',
+    			),
+    			'cron' => array (
+        			'index_field' => 'id',
+        			'server_type' => 'cron',
+    			),
+    			'ftp_user' => array (
+        			'index_field' => 'ftp_user_id',
+        			'server_type' => 'web',
+    			),
+			);
+		}
+		if($type == 'dns' ) {
+			$server_data = array (
+				'dns_soa' => array (
+					'index_field' => 'id',
+					'server_type' => 'dns',
+				),
+			);
+		}
+		if($type == 'file' ) {
+			$server_data = array (
+    			'webdav_user' => array (
+        			'index_field' => 'webdav_user_id',
+        			'server_type' => 'file',
+    			),
+			);
+		}
+		if($type == 'db' ) {
+			$server_data = array (
+				'web_database' => array (
+					'index_field' => 'web_database_id',
+					'server_type' => 'db',
+				),
+			);
+		}
+		if($type == 'vserver' ) {
+			$server_data = array (
+				'openvz_vm' => array (
+					'index_field' => 'vm_id',
+					'server_type' => 'vserver',
+				),
+			);
+		}
+		//* proxy
+		//* firewall
+		$array_out = array();
+		foreach($server_data as $db_table => $data) {
+			$records = $app->db->queryAllRecords("SELECT * FROM $db_table WHERE server_id = ?", $server_id);
+			if (!empty($records)) array_push($array_out, $db_table);
+		}
+
+		return $array_out;
+	}
+
+	function onShowEnd() {
+		global $app;
+
+		//* fetch all-server
+		$server_rec =  $app->db->queryAllRecords("SELECT server_id, server_name FROM server WHERE active = 1 AND mirror_server_id = 0 ORDER BY active DESC, server_name");
+		$server_count = 0;
+		foreach ($server_rec as $server) {
+			$options_servers .= "<option value='$server[server_id]'>$server[server_name]</option>";
+			$server_count++;
+		}
+		if ($server_count > 1) $options_servers = "<option value='0'>".$app->tform->wordbook['all_active_txt']."</option>" . $options_servers;
+		$app->tpl->setVar('all_server_id', $options_servers);
+		unset($options_servers);
+
+		//* fetch mail-server
+		$mail_server_rec = $app->db->queryAllRecords("SELECT server_id, server_name FROM server WHERE mail_server = 1 AND active = 1 AND mirror_server_id = 0 ORDER BY active DESC, server_name");
+		if (!empty($mail_server_rec)) {
+			$app->tpl->setVar('mail_server_found', 1);
+
+			//* mail-domain
+			$server_list = $this->create_list($mail_server_rec, 'mail', 'mail_domain');
+			$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_txt']."</option>" . $options_servers;
+				$app->tpl->setVar('mail_server_id', $options_servers);
+				$app->tpl->setVar('mail_domain_found', 1);
+				unset($options_servers);
+			}
+
+			//* mailbox
+			$server_list = $this->create_list($mail_server_rec, 'mail', 'mail_user');
+			$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_txt']."</option>" . $options_servers;
+				$app->tpl->setVar('mailbox_server_id', $options_servers);
+				$app->tpl->setVar('mail_user_found', 1);
+				unset($options_servers);
+			}
+
+			//* mailfilter
+			$server_list = $this->create_list($mail_server_rec, 'mail_filter', array('mail_access', 'mail_content_filter', 'mail_user_filter'));
+			$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_txt']."</option>" . $options_servers;
+				$app->tpl->setVar('mailfilter_server_id', $options_servers);
+				$app->tpl->setVar('mail_filter_found', 1);
+				unset($options_servers);
+			}
+
+			//* mailinglist
+			$server_list = $this->create_list($mail_server_rec, 'mail', 'mail_mailinglist');
+			$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_txt']."</option>" . $options_servers;
+				$app->tpl->setVar('mailinglist_server_id', $options_servers);
+				$app->tpl->setVar('mailinglist_found', 1);
+				unset($options_servers);
+			}
+		}
+
+		//* fetch web-server
+		$web_server_rec = $app->db->queryAllRecords("SELECT server_id, server_name FROM server WHERE web_server = 1 AND active = 1 AND mirror_server_id = 0 ORDER BY active DESC, server_name");
+		if (!empty($web_server_rec)) {
+			$app->tpl->setVar('web_server_found', 1);
+
+			//* web-domain
+			$server_list = $this->create_list($web_server_rec, 'web', 'web_domain');
+			$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_web_txt']."</option>" . $options_servers;
+				$app->tpl->setVar('web_server_id', $options_servers);
+				$app->tpl->setVar('web_domain_found', 1);
+				unset($options_servers);
+			}
+
+			//* ftp-user
+			$server_list = $this->create_list($web_server_rec, 'web', 'ftp_user');
+			$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_web_txt']."</option>" . $options_servers;
+				$app->tpl->setVar('ftp_server_id', $options_servers);
+				$app->tpl->setVar('ftp_user_found', 1);
+				unset($options_servers);
+			}
+
+			//* shell-user
+			$server_list = $this->create_list($web_server_rec, 'web', 'shell_user');
+			$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_web_txt']."</option>" . $options_servers;
+				$app->tpl->setVar('shell_server_id', $options_servers);
+				$app->tpl->setVar('shell_user_found', 1);
+				unset($options_servers);
+			}
+
+			//* cron
+			$server_list = $this->create_list($web_server_rec, 'web', 'cron');
+			$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_web_txt']."</option>" . $options_servers;
+				$app->tpl->setVar('cron_server_id', $options_servers);
+				$app->tpl->setVar('cron_found', 1);
+				unset($options_servers);
+			}
+		}
+
+		//* fetch dns-server
+		$dns_server_rec = $app->db->queryAllRecords("SELECT server_id, server_name FROM server WHERE dns_server = 1 AND active = 1 AND mirror_server_id = 0 ORDER BY active DESC, server_name");
+		if (!empty($dns_server_rec)) {
+			$app->tpl->setVar('dns_server_found', 1);
+
+			$server_list = $this->create_list($dns_server_rec, 'dns', 'dns_soa');
+			$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_dns_txt']."</option>" . $options_servers;
+				$app->tpl->setVar('dns_server_id', $options_servers);
+				$app->tpl->setVar('dns_soa_found', 1);
+				unset($options_servers);
+			}
+		}
+
+		//* fetch webdav-user
+		$file_server_rec = $app->db->queryAllRecords("SELECT server_id, server_name FROM server WHERE file_server = 1 AND active = 1 AND mirror_server_id = 0 ORDER BY active DESC, server_name");
+		if (!empty($file_server_rec)) {
+			$app->tpl->setVar('file_server_found', 1);
+
+			$server_list = $this->create_list($file_server_rec, 'file', 'webdav_user');
+			$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_file_txt']."</option>" . $options_servers;
+				$app->tpl->setVar('file_server_id', $options_servers);
+				$app->tpl->setVar('webdav_user_found', 1);
+				unset($options_servers);
+			}
+		}
+
+		//* fetch database-server
+		$db_server_rec = $app->db->queryAllRecords("SELECT server_id, server_name FROM server WHERE db_server = 1 AND active = 1 AND mirror_server_id = 0 ORDER BY active DESC, server_name");
+		if (!empty($db_server_rec)) {
+			$app->tpl->setVar('db_server_found', 1);
+
+			$server_list = $this->create_list($db_server_rec, 'db', 'web_database');
+			$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_db_txt']."</option>" . $options_servers;
+				$app->tpl->setVar('db_server_id', $options_servers);
+				$app->tpl->setVar('client_db_found', 1);
+				unset($options_servers);
+			}
+		}
+
+		//* fetch vserver
+		$v_server_rec = $app->db->queryAllRecords("SELECT server_id, server_name FROM server WHERE vserver_server = 1 AND active = 1 AND mirror_server_id = 0 ORDER BY active DESC, server_name");
+		if (!empty($db_server_rec)) {
+			$app->tpl->setVar('vserver_server_found', 1);
+
+			$server_list = $this->create_list($v_server_rec, 'vserver', 'openvz_vm');
+			$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_vserver_txt']."</option>" . $options_servers;
+				$app->tpl->setVar('vserver_server_id', $options_servers);
+				$app->tpl->setVar('vserver_found', 1);
+				unset($options_servers);
+			}
+		}
+
+		parent::onShowEnd();
+	}
+			
+	//* fetch values during do_resync
+	private function query_server($db_table, $server_id, $server_type, $active=true) {
+		global $app;
+
+		$server_name = array();
+		if ( $server_id == 0 ) { //* resync multiple server
+			$temp = $app->db->queryAllRecords("SELECT server_id, server_name FROM server WHERE ".$server_type."_server = 1 AND active = 1 AND mirror_server_id = 0");
+			foreach ($temp as $server) {
+				$temp_id .= $server['server_id'].',';
+				$server_name[$server['server_id']] = $server['server_name'];
+			}
+		} else {
+			$temp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = ?", $server_id);
+			$server_name[$server_id] = $temp['server_name'];
+		}		
+		unset($temp);
+
+		if ( isset($temp_id) ) $server_id = rtrim($temp_id,',');
+		$sql = "SELECT * FROM $db_table WHERE server_id IN (".$server_id.")"; 
+		if ($active) $sql .= " AND active = 'y'"; 
+		$records = $app->db->queryAllRecords($sql);
+
+		return array($records, $server_name);
+	}			
+
+	private function do_resync($db_table, $index_field, $server_type, $server_id, $msg_field, $wordbook, $active=true) {
+        global $app;
+
+		$server_id = $app->functions->intval($server_id);
+		$rec = $this->query_server($db_table, $server_id, $server_type, $active);
+		$records = $rec[0];
+		$server_name = $rec[1];
+		$msg = '<b>'.$wordbook.'</b><br>';
+		if(!empty($records)) 
+			foreach($records as $rec) {
+				$app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true);
+				$msg .= '['.$server_name[$rec['server_id']].'] '.$rec[$msg_field].'<br>';
+			}
+		else $msg .= $app->tform->wordbook['no_results_txt'].'<br>';
+
+		return $msg.'<br>';
+	}
+
+    function onSubmit() {
+        global $app;
+
+		//* all services
+		if($this->dataRecord['resync_all'] == 1) {
+			$this->dataRecord['resync_sites'] = 1;
+			$this->dataRecord['resync_ftp'] = 1;
+			$this->dataRecord['resync_webdav'] = 1;
+			$this->dataRecord['resync_shell'] = 1;
+			$this->dataRecord['resync_cron'] = 1;
+			$this->dataRecord['resync_db'] = 1;
+			$this->dataRecord['resync_mail'] = 1;
+			$this->dataRecord['resync_mailbox'] = 1;
+			$this->dataRecord['resync_mailfilter'] = 1;
+			$this->dataRecord['resync_mailinglist'] = 1;
+			$this->dataRecord['resync_vserver'] = 1;
+			$this->dataRecord['resync_dns'] = 1;
+			$this->dataRecord['resync_client'] = 1;
+			$this->dataRecord['web_server_id'] = $this->dataRecord['all_server_id'];
+			$this->dataRecord['ftp_server_id'] = $this->dataRecord['all_server_id'];
+			$this->dataRecord['webdav_server_id'] = $this->dataRecord['all_server_id'];
+			$this->dataRecord['shell_server_id'] = $this->dataRecord['all_server_id'];
+			$this->dataRecord['cron_server_id'] = $this->dataRecord['all_server_id'];
+			$this->dataRecord['db_server_id'] = $this->dataRecord['all_server_id'];
+			$this->dataRecord['mail_server_id'] = $this->dataRecord['all_server_id'];
+			$this->dataRecord['mailbox_server_id'] = $this->dataRecord['all_server_id'];
+			$this->dataRecord['verserver_server_id'] = $this->dataRecord['all_server_id'];
+			$this->dataRecord['dns_server_id'] = $this->dataRecord['all_server_id'];
+		}
+
+		//* websites
+		if($this->dataRecord['resync_sites'] == 1)
+			$msg .= $this->do_resync('web_domain', 'domain_id', 'web', $this->dataRecord['web_server_id'], 'domain', $app->tform->wordbook['do_sites_txt']);
+
+		//* ftp
+		if($this->dataRecord['resync_ftp'] == 1)
+			$msg .= $this->do_resync('ftp_user', 'ftp_user_id', 'web', $this->dataRecord['ftp_server_id'], 'username',  $app->tform->wordbook['do_ftp_txt']);
+
+		//* webdav
+		if($this->dataRecord['resync_webdav'] == 1) 
+			$msg .= $this->do_resync('webdav_user', 'webdav_user_id', 'file', $this->dataRecord['webdav_server_id'], 'username',  $app->tform->wordbook['do_webdav_txt']);
+
+		//* shell
+		if($this->dataRecord['resync_shell'] == 1) 
+			$msg .= $this->do_resync('shell_user', 'shell_user_id', 'web', $this->dataRecord['shell_server_id'], 'username',  $app->tform->wordbook['do_shell_txt']);
+
+		//* cron
+		if($this->dataRecord['resync_cron'] == 1) 
+			$msg .= $this->do_resync('cron', 'id', 'web', $this->dataRecord['cron_server_id'], 'command',  $app->tform->wordbook['do_cron_txt']);
+
+		//* database
+		if(isset($this->dataRecord['resync_db']) && $this->dataRecord['resync_db'] == 1) {
+			$msg .= $this->do_resync('web_database_user', 'database_user_id', 'db', $this->dataRecord['db_server_id'], 'database_user',  $app->tform->wordbook['do_db_user_txt']);
+			$msg .= $this->do_resync('web_database', 'database_id', 'db', $this->dataRecord['db_server_id'], 'database_name',  $app->tform->wordbook['do_db_txt']);
+		}
+
+		//* maildomains
+		if($this->dataRecord['resync_mail'] == 1) 
+			$msg .= $this->do_resync('mail_domain', 'domain_id', 'mail', $this->dataRecord['mail_server_id'], 'domain',  $app->tform->wordbook['do_mail_txt']);
+
+		//* mailbox
+		if($this->dataRecord['resync_mailbox'] == 1) {
+			$msg .= $this->do_resync('mail_user', 'mailuser_id', 'mail', $this->dataRecord['mailbox_server_id'], 'email',  $app->tform->wordbook['do_mailbox_txt'], false);
+			$msg .= $this->do_resync('mail_forwarding', 'forwarding_id', 'mail', $this->dataRecord['mailbox_server_id'], '',  $app->tform->wordbook['do_mail_alias_txt']);
+		}
+
+		//* mailfilter
+		if($this->dataRecord['resync_mailfilter'] == 1) {
+			$msg .= $this->do_resync('mail_access', 'access_id', 'mail', $this->dataRecord['mailbox_server_id'], '',  $app->tform->wordbook['do_mail_access_txt']);
+			$msg .= $this->do_resync('mail_content_filter', 'content_filter_id', 'mail', $this->dataRecord['mailbox_server_id'], '',  $app->tform->wordbook['do_mail_contentfilter_txt']);
+			$msg .= $this->do_resync('mail_user_filter', 'filter_id', 'mail', $this->dataRecord['mailbox_server_id'], '',  $app->tform->wordbook['do_mail_userfilter_txt'], false);
+		}
+
+		//* mailinglists
+		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);
+
+		//* 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']);
+
+		//* dns
+		if($this->dataRecord['resync_dns'] == 1) {
+			$rec=$this->query_server('dns_soa', $this->dataRecord['dns_server_id'], 'dns'); 
+			$soa_records = $rec[0];
+			$server_name = $rec[1];
+			unset($rec);
+			$msg .= '<b>'.$app->tform->wordbook['do_dns_txt'].'</b><br>';
+			if(is_array($soa_records) && !empty($soa_records)) 
+				foreach($soa_records as $soa_rec) {
+					$temp = $this->query_server('dns_rr', $soa_rec['server_id'], $server_type);
+					$rr_records = $temp[0];
+					if(!empty($rr_records)) {
+						foreach($rr_records as $rec) {
+							$new_serial = $app->validate_dns->increase_serial($rec['serial']);
+							$app->db->datalogUpdate('dns_rr', "serial = '".$new_serial."'", 'id', $rec['id']);
+						}
+					} else { 
+						$msg .= $app->tform->wordbook['no_results_txt'].'<br>';
+					}
+					$new_serial = $app->validate_dns->increase_serial($soa_rec['serial']);
+					$app->db->datalogUpdate('dns_soa', "serial = '".$new_serial."'", 'id', $soa_rec['id']);
+					$msg .= '['.$server_name[$soa_rec['server_id']].'] '.$soa_rec['origin'].'<br>';
+				}
+			else $msg .= $app->tform->wordbook['no_results_txt'].'<br>'; 
+
+			$msg .= '<br>';
+        }
+
+		//* clients
+		if($this->dataRecord['resync_client'] == 1) {
+        	$db_table = 'client';
+        	$index_field = 'client_id';
+        	$records = $app->db->queryAllRecords("SELECT * FROM ".$db_table);
+			$msg .= '<b>'.$app->tform->wordbook['do_clients_txt'].'</b><br>';
+			if(!empty($records)) {
+	        	$tform_def_file = '../client/form/client.tform.php';
+    	    	$app->uses('tpl,tform,tform_actions');
+        		$app->load('tform_actions');
+				foreach($records as $rec) {
+					$app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true);
+					$tmp = new tform_actions;
+					$tmp->id = $rec[$index_field];
+					$tmp->dataRecord = $rec;
+					$tmp->oldDataRecord = $rec;
+					$app->plugin->raiseEvent('client:client:on_after_update', $tmp);
+					$msg .= $rec['contact_name'].'<br>';
+					unset($tmp);
+				}
+			} else {
+				$msg .= $app->tform->wordbook['no_results_txt'].'<br>'; 
+			}
+			$msg .= '<br>';
+		}
+
+		echo $msg;
+    } //* end onSumbmit
+
+}
+
+$page = new page_action;
+$page->onLoad();
+?>
diff --git a/interface/web/tools/resync_do.php b/interface/web/tools/resync_do.php
deleted file mode 100644
index 0815737..0000000
--- a/interface/web/tools/resync_do.php
+++ /dev/null
@@ -1,383 +0,0 @@
-<?php
-/*
-Copyright (c) 2014, Florian Schaal, info@schaal-24.de
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name of ISPConfig nor the names of its contributors
-      may be used to endorse or promote products derived from this software without
-      specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-/******************************************
-* Begin Form configuration
-******************************************/
-
-$tform_def_file = 'form/resync.tform.php';
-
-/******************************************
-* End Form configuration
-******************************************/
-
-require_once '../../lib/config.inc.php';
-require_once '../../lib/app.inc.php';
-
-//* Check permissions for module
-$app->auth->check_module_permissions('admin');
-
-// Loading classes
-$app->uses('tpl,tform,tform_actions');
-$app->load('tform_actions');
-
-class page_action extends tform_actions {
-
-    function onSubmit() {
-        global $app, $conf, $interfaceConf;
-
-		function query_server($table, $server_id, $server_type, $where = "WHERE active = 'y'", $active_only = true) {
-			global $app;
-			$server_name = array();
-			if ( $server_id <= 0 ) { //* resync multiple server
-				if ($active_only) {
-					$tmp = $app->db->queryAllRecords("SELECT server_id, server_name FROM server WHERE ".$server_type."_server = 1 AND active = 1 AND mirror_server_id = 0");
-				} else {
-					$tmp = $app->db->queryAllRecords("SELECT server_id, server_name FROM server WHERE ".$server_type."_server = 1 AND mirror_server_id = 0");
-				}
-				foreach ($tmp as $server) {
-					$tmp_id .= $server['server_id'].',';
-					$server_name[$server['server_id']] = $server['server_name'];
-				}
-			} else {
-				$temp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = ".$server_id);
-				$server_name[$server_id] = $temp['server_name'];
-				unset($temp);
-			}
-				
-			if ( isset($tmp_id) ) $server_id = rtrim($tmp_id,',');
-
-			if ($active_only) {
-				$sql = "SELECT * FROM ".$table." ".$where." AND server_id IN (".$server_id.")"; 
-			} else { 
-				$sql = "SELECT * FROM ".$table." ".$where; 
-			}
-			$records = $app->db->queryAllRecords($sql);
-
-			return array($records, $server_name);
-		}			
-
-		//* websites
-		if(isset($this->dataRecord['resync_sites']) && $this->dataRecord['resync_sites'] == 1) {
-			$db_table = 'web_domain';
-			$index_field = 'domain_id';
-			$server_type = 'web';
-			$server_id = $app->functions->intval($this->dataRecord['web_server_id']);
-			if ($server_id == -1) $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1', false); else $tmp = query_server($db_table, $server_id, $server_type);
-			$records = $tmp[0];
-			$server_name = $tmp[1];
-			unset($tmp);
-			$msg = '<b>Resynced Website:</b><br>';
-			if(is_array($records)) {
-				foreach($records as $rec) {
-					$app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true);
-					$msg .= $rec['domain'].' on '.$server_name[$rec['server_id']].'<br>';
-				}
-			} else { $msg .= 'no results<bg>'; }
-			$msg .= '<br>';
-		}
-
-		//* ftp
-		if(isset($this->dataRecord['resync_ftp']) && $this->dataRecord['resync_ftp'] == 1) {
-			$db_table = 'ftp_user';
-			$index_field = 'ftp_user_id';
-			$server_type = 'web';
-			$server_id = $app->functions->intval($this->dataRecord['ftp_server_id']);
-			if ($server_id == -1) $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1', false); else $tmp = query_server($db_table, $server_id, $server_type);
-			$records = $tmp[0];
-			$server_name = $tmp[1];
-			unset($tmp);
-			$msg .= '<b>Resynced FTP user:</b><br>';
-			if(is_array($records)) {
-				foreach($records as $rec) {
-					$app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true);
-					$msg .= $rec['username'].' on '.$server_name[$rec['server_id']].'<br>';
-				}
-			} else { $msg .= 'no results<bg>'; }
-			$msg .= '<br>';
-		}
-
-		//* webdav
-		if(isset($this->dataRecord['resync_webdav']) && $this->dataRecord['resync_webdav'] == 1) {
-			$db_table = 'webdav_user';
-			$index_field = 'webdav_user_id';
-			$server_type = 'file';
-			$server_id = $app->functions->intval($this->dataRecord['webdav_server_id']);
-			if ($server_id == -1) $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1', false); else $tmp = query_server($db_table, $server_id, $server_type);
-			$records = $tmp[0];
-			$server_name = $tmp[1];
-			unset($tmp);
-			$msg .= '<b>Resynced WebDav-User</b><br>';
-			if(is_array($records)) {
-				foreach($records as $rec) {
-					$app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true);
-					$msg .= $rec['username'].' on '.$server_name[$rec['server_id']].'<br>';
-				}
-			} else { $msg .= 'no results<bg>'; }
-			$msg .= '<br>';
-		}
-
-		//* shell
-		if(isset($this->dataRecord['resync_shell']) && $this->dataRecord['resync_shell'] == 1) {
-			$db_table = 'shell_user';
-			$index_field = 'shell_user_id';
-			$server_type = 'web';
-			$server_id = $app->functions->intval($this->dataRecord['shell_server_id']);
-			if ($server_id == -1) $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1', false); else $tmp = query_server($db_table, $server_id, $server_type);
-			$records = $tmp[0];
-			$server_name = $tmp[1];
-			unset($tmp);
-			$msg .= '<b>Resynced Shell user:</b><br>';
-			if(is_array($records)) {
-				foreach($records as $rec) {
-					$app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true);
-					$msg .= $rec['username'].' on '.$server_name[$rec['server_id']].'<br>';
-				}
-			} else { $msg .= 'no results<bg>'; }
-			$msg .= '<br>';
-		}
-
-		//* cron
-		if(isset($this->dataRecord['resync_cron']) && $this->dataRecord['resync_cron'] == 1) {
-			$db_table = 'cron';
-			$index_field = 'id';
-			$server_type = 'web';
-			$server_id = $app->functions->intval($this->dataRecord['cron_server_id']);
-			if ($server_id == -1) $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1', false); else $tmp = query_server($db_table, $server_id, $server_type);
-			$records = $tmp[0];
-			$server_name = $tmp[1];
-			unset($tmp);
-			$msg .= '<b>Resynced Cronjob:</b><br>';
-			if(is_array($records)) {
-				foreach($records as $rec) {
-					$app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true);
-					$msg .= $rec['command'].' on '.$server_name[$rec['server_id']].'<br>';
-				}
-			} else { $msg .= 'no results<bg>'; }
-			$msg .= '<br>';
-		}
-
-		//* database
-		if(isset($this->dataRecord['resync_db']) && $this->dataRecord['resync_db'] == 1) {
-			$db_table = 'web_database_user';
-			$index_field = 'database_user_id';
-			$server_type = 'db';
-			$server_id = $app->functions->intval($this->dataRecord['db_server_id']);
-			if ($server_id == -1) $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1', false); else $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1');
-			$records = $tmp[0];
-			$server_name = $tmp[1];
-			unset($tmp);
-			$msg .= '<b>Resynced Database User:</b><br>';
-			if(is_array($records)) {
-				foreach($records as $rec) {
-					$app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true);
-					$msg .= $rec['database_user'].' on '.$server_name[$rec['server_id']].'<br>';
-				}
-			} else { $msg .= 'no results<bg>'; }
-			$msg .= '<br>';
-
-			$db_table = 'web_database';
-			$index_field = 'database_id';
-			if ($server_id == -1) $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1', false); else $tmp = query_server($db_table, $server_id, $server_type);
-			$records = $tmp[0];
-			$msg .= '<b>Resynced Database:</b><br>';
-			if(is_array($records)) {
-				foreach($records as $rec) {
-					$app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true);
-					$msg .= $rec['database_name'].' on '.$server_name[$rec['server_id']].'<br>';
-				}
-			} else { $msg .= 'no results<bg>'; }
-			$msg .= '<br>';
-
-		}
-
-		//* maildomains
-		if(isset($this->dataRecord['resync_mail']) && $this->dataRecord['resync_mail'] == 1) {
-			$db_table = 'mail_domain';
-			$index_field = 'domain_id';
-			$server_type = 'mail';
-			$server_id = $app->functions->intval($this->dataRecord['mail_server_id']);
-			if ($server_id == -1) $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1', false); else $tmp = query_server($db_table, $server_id, $server_type);
-			$records = $tmp[0];
-			$server_name = $tmp[1];
-			unset($tmp);
-			$msg .= '<b>Resynced Maildomain:</b><br>';
-			if(is_array($records)) {
-				foreach($records as $rec) {
-					$app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true);
-					$msg .= $rec['domain'].' on '.$server_name[$rec['server_id']].'<br>';
-				}
-			} else { $msg .= 'no results<bg>'; }
-			$msg .= '<br>';
-		}
-
-		//* mailbox
-		if(isset($this->dataRecord['resync_mailbox']) && $this->dataRecord['resync_mailbox'] == 1) {
-			$db_table = 'mail_user';
-			$index_field = 'mailuser_id';
-			$server_type = 'mail';
-			$server_id = $app->functions->intval($this->dataRecord['mailbox_server_id']);
-			if ($server_id == -1) $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1', false); else $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1');
-			$records = $tmp[0];
-			$server_name = $tmp[1];
-			unset($tmp);
-			$msg .= '<b>Resynced Mailbox:</b><br>';
-			if(is_array($records)) {
-				foreach($records as $rec) {
-					$app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true);
-					$msg .= $rec['email'].' on '.$server_name[$rec['server_id']].'<br>';
-				}
-			} else { $msg .= 'no results<bg>'; }
-			$msg .= '<br>';
-
-			$db_table = 'mail_forwarding';
-			$index_field = 'forwarding_id';
-			if ($server_id == -1) $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1', false); else $tmp = query_server($db_table, $server_id, $server_type);
-			$records = $tmp[0];
-			$server_name = $tmp[1];
-			unset($tmp);
-			$msg .= '<b>Resynced Alias</b><br>';
-			if(is_array($records)) {
-				foreach($records as $rec) {
-					$app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true);
-				}
-			} else { $msg .= 'no results<bg>'; }
-			$msg .= '<br>';
-		}
-
-		//* dns
-		if(isset($this->dataRecord['resync_dns']) && $this->dataRecord['resync_dns'] == 1) {
-			$db_table = 'dns_soa';
-			$index_field = 'id';
-			$server_type = 'dns';
-			$server_id = $app->functions->intval($this->dataRecord['dns_server_id']);
-			if ($server_id == -1) $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1', false); else $tmp = query_server($db_table, $server_id, $server_type, "WHERE active = 'Y'");
-			$zone_records = $tmp[0];
-			$server_name = $tmp[1];
-			unset($tmp);
-			$msg .= '<b>Resynced DNS zone</b><br>';
-			if(is_array($zone_records) && !empty($zone_records)) {
-				foreach($zone_records as $zone_rec) {
-					if ($server_id == -1) {
-						$temp = query_server('dns_rr', $server_id, $server_type, 'WHERE 1', false);
-						$records = $temp[0];
-						unset($temp);
-					} else {
-						$temp= query_server('dns_rr', $server_id, $server_type, "WHERE active = 'Y'");
-						$records = $temp[0];
-						unset($temp);
-					}
-					$rr_count = 0;
-					if (is_array($records)) {
-						foreach($records as $rec) {
-							$new_serial = $app->validate_dns->increase_serial($rec['serial']);
-							$app->db->datalogUpdate('dns_rr', "serial = '".$new_serial."'", 'id', $rec['id']);
-							$rr_count++;
-						}
-					} else { $msg .= 'no dns recordsesults<br>'; }
-					$new_serial = $app->validate_dns->increase_serial($zone_rec['serial']);
-					$app->db->datalogUpdate('dns_soa', "serial = '".$new_serial."'", 'id', $zone_rec['id']);
-					$msg .= $zone_rec['origin'].' on '.$server_name[$zone_rec['server_id']].' with '.$rr_count.' records<br>';
-				}
-			} else { $msg .= 'no results<br>'; }
-			$msg .= '<br>';
-        }
-
-		//* clients
-		if(isset($this->dataRecord['resync_client']) && $this->dataRecord['resync_client'] == 1) {
-        	$db_table = 'client';
-        	$index_field = 'client_id';
-        	$records = $app->db->queryAllRecords("SELECT * FROM ".$db_table);
-			$msg .= '<b>Resynced clients</b><br>';
-			if(is_array($records)) {
-	        	$tform_def_file = '../client/form/client.tform.php';
-    	    	$app->uses('tpl,tform,tform_actions');
-        		$app->load('tform_actions');
-				foreach($records as $rec) {
-					$app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true);
-					$tmp = new tform_actions;
-					$tmp->id = $rec[$index_field];
-					$tmp->dataRecord = $rec;
-					$tmp->oldDataRecord = $rec;
-					$app->plugin->raiseEvent('client:client:on_after_update', $tmp);
-					$msg .= $rec['contact_name'].'<br>';
-					unset($tmp);
-				}
-			} else { $msg .= 'no results<bg>'; }
-			$msg .= '<br>';
-		}
-
-		//* vserver
-		if(isset($this->dataRecord['resync_vserver']) && $this->dataRecord['resync_vserver'] == 1) {
-			$db_table = 'openvz_vm';
-			$index_field = 'vm_id';
-			$server_type = 'vserver';
-			$server_id = $app->functions->intval($this->dataRecord['vserver_server_id']);
-			if ($server_id == -1) $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1', false); else $tmp = query_server($db_table, $server_id, $server_type);
-			$records = $tmp[0];
-			$server_name = $tmp[1];
-			unset($tmp);
-			$msg .= '<b>Resynced vServer:</b><br>';
-			if(is_array($records)) {
-				foreach($records as $rec) {
-					$app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true);
-					$msg .= $rec['hostname'].' on '.$server_name[$rec['server_id']].'<br>';
-				}
-			} else { $msg .= 'no results<bg>'; }
-			$msg .= '<br>';
-		}
-
-		//* firewall
-		if(isset($this->dataRecord['resync_firewall']) && $this->dataRecord['resync_firewall'] == 1) {
-			$db_table = 'iptables';
-			$index_field = 'iptables_id';
-			$server_type = 'firewall';
-			$server_id = $app->functions->intval($this->dataRecord['firewall_server_id']);
-			if ($server_id == -1) $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1', false); else $tmp = query_server($db_table, $server_id, $server_type);
-			$records = $tmp[0];
-			$server_name = $tmp[1];
-			unset($tmp);
-			$msg .= '<b>Resynced Firewall</b><br>';
-			if(is_array($records)) {
-				foreach($records as $rec) {
-					$app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true);
-				}
-			} else { $msg .= 'no results<bg>'; }
-			$msg .= '<br>';
-		}
-
-		echo $msg;
-    }
-
-}
-
-$page = new page_action;
-$page->onLoad();
-?>
diff --git a/interface/web/tools/resync_show.php b/interface/web/tools/resync_show.php
deleted file mode 100644
index b74515d..0000000
--- a/interface/web/tools/resync_show.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/*
-Copyright (c) 2014, Florian Schaal, info@schaal-24.de
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name of ISPConfig nor the names of its contributors
-      may be used to endorse or promote products derived from this software without
-      specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-/******************************************
-* Begin Form configuration
-******************************************/
-
-$tform_def_file = 'form/resync.tform.php';
-
-/******************************************
-* End Form configuration
-******************************************/
-
-require_once '../../lib/config.inc.php';
-require_once '../../lib/app.inc.php';
-
-//* Check permissions for module
-$app->auth->check_module_permissions('admin');
-
-// Loading classes
-$app->uses('tpl,tform,tform_actions');
-$app->load('tform_actions');
-
-class page_action extends tform_actions {
-
-	function get_servers($type) {
-		global $app;
-
-		$inactive_server = false;
-		$tmp = $app->db->queryAllRecords("SELECT server_id, server_name, active FROM server WHERE ".$type."_server = 1 AND mirror_server_id = 0 ORDER BY active DESC, server_name");
-		foreach ($tmp as $server) {
-			if ( $server['active'] == '0' ) {
-				$server['server_name'] .= ' [inactive]';
-				$inactive_server = true;
-			}
-			$options_servers .= "<option value='$server[server_id]'>$server[server_name]</option>";
-		}
-		if ( count ($tmp) > 1 ) {
-			$options_servers = "<option value='0'>all active $type-server</option>" . $options_servers;
-			if ($inactive_server) $options_servers .= "<option value='-1'>force all $type-server</option>";
-		}
-
-		return $options_servers;
-
-	}
-
-	function onShowEnd() {
-		global $app, $conf;
-
-		$servers = $this->get_servers('mail');
-		$app->tpl->setVar('mail_server_id', $servers);
-		if ( !empty($servers) ) $app->tpl->setVar('mail_server_found', 1);
-
-		$servers = $this->get_servers('web');
-		$app->tpl->setVar('web_server_id', $servers);
-		$app->tpl->setVar('ftp_server_id', $servers);
-		if ( !empty($servers) ) $app->tpl->setVar('web_server_found', 1);
-
-		$servers = $this->get_servers('dns');
-		$app->tpl->setVar('dns_server_id', $servers);
-		if ( !empty($servers) ) $app->tpl->setVar('dns_server_found', 1);
-
-		$servers = $this->get_servers('file');
-		$app->tpl->setVar('file_server_id', $servers);
-		if ( !empty($servers) ) $app->tpl->setVar('file_server_found', 1);
-
-		$servers = $this->get_servers('db');
-		$app->tpl->setVar('db_server_id', $servers);
-		if ( !empty($servers) ) $app->tpl->setVar('db_server_found', 1);
-
-		$servers = $this->get_servers('vserver');
-		$app->tpl->setVar('vserver_server_id', $servers);
-		if ( !empty($servers) ) $app->tpl->setVar('vserver_server_found', 1);
-
-		$servers = $this->get_servers('firewall');
-		$app->tpl->setVar('firewall_server_id', $servers);
-		if ( !empty($servers) ) $app->tpl->setVar('firewall_server_found', 1);
-
-		parent::onShowEnd();
-	}
-
-}
-
-$page = new page_action;
-$page->onLoad();
-
-?>
diff --git a/interface/web/tools/templates/resync.htm b/interface/web/tools/templates/resync.htm
old mode 100644
new mode 100755
index 8b6769e..48e20cc
--- a/interface/web/tools/templates/resync.htm
+++ b/interface/web/tools/templates/resync.htm
@@ -2,193 +2,133 @@
 	<h1><tmpl_var name="list_head_txt"></h1>
 </div>
 <p><tmpl_var name="list_desc_txt"></p>
-
-
 	
+<div class="form-group">
+	<div class="col-sm-1"><input class="form-control" type="checkbox" id="resync_all" value="1" name="resync_all"></div>
+	<label for="resync_all" class="col-sm-2 control-label">{tmpl_var name='resync_all_txt'}</label>
+	<div class="col-sm-3"><select name="all_server_id" id="all_server_id" class="form-control">{tmpl_var name='all_server_id'}</select></div>
+</div>
+
+<tmpl_if name="web_server_found">
+	<tmpl_if name="web_domain_found">
 		<div class="form-group">
-			<tmpl_if name="web_server_found">
-				<div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_sites" value="1" name="resync_sites"></div><label for="resync_sites" class="col-sm-3 control-label">{tmpl_var name='resync_sites_txt'}</label>
-				<div class="col-sm-9"><select name="web_server_id" id="web_server_id" class="form-control">
-					{tmpl_var name='web_server_id'}
-				</select></div>
-			<tmpl_else>
-				<label for="resync_sites" class="col-sm-3 control-label">{tmpl_var name="resync_sites_txt"}</label> 
-				<span style="color:red">
-					<strong>{tmpl_var name="resync_no_server_txt"}</strong>
-				</span>
-			</tmpl_if>
+			<div class="col-sm-1"><input class="form-control" type="checkbox" id="resync_sites" value="1" name="resync_sites"></div>
+			<label for="resync_sites" class="col-sm-2 control-label">{tmpl_var name='resync_sites_txt'}</label>
+			<div class="col-sm-3"><select name="web_server_id" id="web_server_id" class="form-control">{tmpl_var name='web_server_id'}</select></div>
 		</div>
-	
-
-	
+	</tmpl_if>
+	<tmpl_if name="ftp_user_found">
 		<div class="form-group">
-			<tmpl_if name="web_server_found">
-				<div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_ftp" value="1" name="resync_ftp"></div><label for="resync_ftp" class="col-sm-3 control-label">{tmpl_var name="resync_ftp_txt"}</label> 
-				<div class="col-sm-9"><select name="ftp_server_id" id="ftp_server_id" class="form-control">
-					{tmpl_var name='ftp_server_id'}
-				</select></div>
-			<tmpl_else>
-				<label for="resync_ftp" class="col-sm-3 control-label">{tmpl_var name="resync_ftp_txt"}</label> 
-				<span style="color:red">
-					<strong>{tmpl_var name="resync_no_server_txt"}</strong>
-				</span>
-			</tmpl_if>
+			<div class="col-sm-1"><input class="form-control" type="checkbox" id="resync_ftp" value="1" name="resync_ftp"></div>
+			<label for="resync_ftp" class="col-sm-2 control-label">{tmpl_var name="resync_ftp_txt"}</label> 
+			<div class="col-sm-3"><select name="ftp_server_id" id="ftp_server_id" class="form-control">{tmpl_var name='ftp_server_id'}</select></div>
 		</div>
-	
-
-	
+	</tmpl_if>
+	<tmpl_if name="shell_user_found">
 		<div class="form-group">
-			<tmpl_if name="file_server_found">
-				<div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_webdav" value="1" name="resync_webdav"></div><label for="resync_webdav" class="col-sm-3 control-label">{tmpl_var name="resync_webdav_txt"}</label> 
-				<div class="col-sm-9"><select name="webdav_server_id" id="webdav_server_id" class="form-control">
-					{tmpl_var name='file_server_id'}
-				</select></div>
-			<tmpl_else>
-				<label for="resync_webdav" class="col-sm-3 control-label">{tmpl_var name="resync_webdav_txt"}</label> 
-				<span style="color:red">
-					<strong>{tmpl_var name="resync_no_server_txt"}</strong>
-				</span>
-			</tmpl_if>
+			<div class="col-sm-1"><input class="form-control" type="checkbox" id="resync_shell" value="1" name="resync_shell"></div>
+			<label for="resync_shell" class="col-sm-2 control-label">{tmpl_var name="resync_shell_txt"}</label> 
+			<div class="col-sm-3"><select name="shell_server_id" id="shell_server_id" class="form-control">{tmpl_var name='shell_server_id'}</select></div>
 		</div>
-	
-
-	
+	</tmpl_if>
+	<tmpl_if name="cron_found">
 		<div class="form-group">
-			<tmpl_if name="web_server_found">
-				<div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_shell" value="1" name="resync_shell"></div><label for="resync_shell" class="col-sm-3 control-label">{tmpl_var name="resync_shell_txt"}</label> 
-				<div class="col-sm-9"><select name="shell_server_id" id="shell_server_id" class="form-control">
-					{tmpl_var name='web_server_id'}
-				</select></div>
-			<tmpl_else>
-				<label for="resync_shell" class="col-sm-3 control-label">{tmpl_var name="resync_shell_txt"}</label> 
-				<span style="color:red">
-					<strong>{tmpl_var name="resync_no_server_txt"}</strong>
-				</span>
-			</tmpl_if>
+			<div class="col-sm-1"><input class="form-control" type="checkbox" id="resync_cron" value="1" name="resync_cron"></div>
+			<label for="resync_cron" class="col-sm-2 control-label">{tmpl_var name="resync_cron_txt"}</label> 
+			<div class="col-sm-3"><select name="cron_server_id" id="cron_server_id" class="form-control">{tmpl_var name='cron_server_id'}</select></div>
 		</div>
+	</tmpl_if>
+</tmpl_if>
 	
-
-	
+<tmpl_if name="file_server_found">
+	<tmpl_if name="webdav_user_found">
 		<div class="form-group">
-			<tmpl_if name="web_server_found">
-				<div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_cron" value="1" name="resync_cron"></div><label for="resync_cron" class="col-sm-3 control-label">{tmpl_var name="resync_cron_txt"}</label> 
-				<div class="col-sm-9"><select name="cron_server_id" id="cron_server_id" class="form-control">
-					{tmpl_var name='web_server_id'}
-				</select></div>
-			<tmpl_else>
-				<label for="resync_cron" class="col-sm-3 control-label">{tmpl_var name="resync_cron_txt"}</label> 
-				<span style="color:red">
-					<strong>{tmpl_var name="resync_no_server_txt"}</strong>
-				</span>
-			</tmpl_if>
+			<div class="col-sm-1"><input class="form-control" type="checkbox" id="resync_webdav" value="1" name="resync_webdav"></div>
+			<label for="resync_webdav" class="col-sm-2 control-label">{tmpl_var name="resync_webdav_txt"}</label> 
+			<div class="col-sm-3"><select name="webdav_server_id" id="webdav_server_id" class="form-control">{tmpl_var name='file_server_id'}</select></div>
 		</div>
+	</tmpl_if>
+</tmpl_if>
 	
-
-	
+<tmpl_if name="db_server_found">
+	<tmpl_if name="client_db_found">
 		<div class="form-group">
-			<tmpl_if name="db_server_found">
-				<div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_db" value="1" name="resync_db"></div><label for="resync_db" class="col-sm-3 control-label">{tmpl_var name="resync_db_txt"}</label> 
-				<div class="col-sm-9"><select name="db_server_id" id="db_server_id" class="form-control">
-					{tmpl_var name='db_server_id'}
-				</select></div>
-			<tmpl_else>
-				<label for="resync_db" class="col-sm-3 control-label">{tmpl_var name="resync_db_txt"}</label> 
-				<span style="color:red">
-					<strong>{tmpl_var name="resync_no_server_txt"}</strong>
-				</span>
-			</tmpl_if>
+			<div class="col-sm-1"><input class="form-control" type="checkbox" id="resync_db" value="1" name="resync_db"></div>
+			<label for="resync_db" class="col-sm-2 control-label">{tmpl_var name="resync_db_txt"}</label> 
+			<div class="col-sm-3"><select name="db_server_id" id="db_server_id" class="form-control">{tmpl_var name='db_server_id'}</select></div>
 		</div>
+	</tmpl_if>
+</tmpl_if>
 	
-	
-	
+<tmpl_if name="mail_server_found">
+	<tmpl_if name="mail_domain_found">
 		<div class="form-group">
-			<tmpl_if name="mail_server_found">
-				<div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_mail" value="1" name="resync_mail"></div><label for="resync_mail" class="col-sm-3 control-label">{tmpl_var name="resync_mail_txt"}</label> 
-				<div class="col-sm-9"><select name="mail_server_id" id="mail_server_id" class="form-control">
-					{tmpl_var name='mail_server_id'}
-				</select></div>
-			<tmpl_else>
-				<label for="resync_mail" class="col-sm-3 control-label">{tmpl_var name="resync_mail_txt"}</label> 
-				<span style="color:red">
-					<strong>{tmpl_var name="resync_no_server_txt"}</strong>
-				</span>
-			</tmpl_if>
+			<div class="col-sm-1"><input class="form-control" type="checkbox" id="resync_mail" value="1" name="resync_mail"></div>
+			<label for="resync_mail" class="col-sm-2 control-label">{tmpl_var name="resync_mail_txt"}</label> 
+			<div class="col-sm-3"><select name="mail_server_id" id="mail_server_id" class="form-control">{tmpl_var name='mail_server_id'}</select></div>
 		</div>
-	
-
-	
+	</tmpl_if>
+	<tmpl_if name="mail_user_found">
 		<div class="form-group">
-			<tmpl_if name="mail_server_found">
-				<div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_mailbox" value="1" name="resync_mailbox"></div><label for="resync_mailbox" class="col-sm-3 control-label">{tmpl_var name="resync_mailbox_txt"}</label> 
-				<div class="col-sm-9"><select name="mailbox_server_id" id="mailbox_server_id" class="form-control">
-					{tmpl_var name='mail_server_id'}
-				</select></div>
-			<tmpl_else>
-				<label for="resync_mailbox" class="col-sm-3 control-label">{tmpl_var name="resync_mailbox_txt"}</label> 
-				<span style="color:red">
-					<strong>{tmpl_var name="resync_no_server_txt"}</strong>
-				</span>
-			</tmpl_if>
+			<div class="col-sm-1"><input class="form-control" type="checkbox" id="resync_mailbox" value="1" name="resync_mailbox"></div>
+			<label for="resync_mailbox" class="col-sm-2 control-label">{tmpl_var name="resync_mailbox_txt"}</label> 
+			<div class="col-sm-3"><select name="mailbox_server_id" id="mailbox_server_id" class="form-control">{tmpl_var name='mailbox_server_id'}</select></div>
 		</div>
-
-	<fieldset class="inlineLabels">
+	</tmpl_if>
+	<tmpl_if name="mail_filter_found">
 		<div class="form-group">
-			<tmpl_if name="dns_server_found">
-				<div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_dns" value="1" name="resync_dns"></div><label for="resync_dns" class="col-sm-3 control-label">{tmpl_var name="resync_dns_txt"}</label> 
-				<div class="col-sm-9"><select name="dns_server_id" id="dns_server_id" class="form-control">
-					{tmpl_var name='dns_server_id'}
-				</select></div>
-			<tmpl_else>
-				<label for="resync_dns" class="col-sm-3 control-label">{tmpl_var name="resync_dns_txt"}</label> 
-				<span style="color:red">
-					<strong>{tmpl_var name="resync_no_server_txt"}</strong>
-				</span>
-			</tmpl_if>
+			<div class="col-sm-1"><input class="form-control" type="checkbox" id="resync_mailfilter" value="1" name="resync_mailfilter"></div>
+			<label for="resync_mailfilter" class="col-sm-2 control-label">{tmpl_var name="resync_mailfilter_txt"}</label> 
+			<div class="col-sm-3"><select name="mailfilter_server_id" id="mailfilter_server_id" class="form-control">{tmpl_var name='mailfilter_server_id'}</select></div>
 		</div>
-	
-
-	
+	</tmpl_if>
+	<tmpl_if name="mailinglist_found">
 		<div class="form-group">
-			<tmpl_if name="vserver_server_found">
-				<div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_vserver" value="1" name="resync_vserver"></div><label for="resync_vserver" class="col-sm-3 control-label">{tmpl_var name="resync_vserver_txt"}</label> 
-				<div class="col-sm-9"><select name="vserver_server_id" id="vserver_server_id" class="form-control">
-					{tmpl_var name='vserver_server_id'}
-				</select></div>
-			<tmpl_else>
-				<label for="resync_vserver" class="col-sm-3 control-label">{tmpl_var name="resync_vserver_txt"}</label> 
-				<span style="color:red">
-					<strong>{tmpl_var name="resync_no_server_txt"}</strong>
-				</span>
-			</tmpl_if>
+			<div class="col-sm-1"><input class="form-control" type="checkbox" id="resync_mailinglist" value="1" name="resync_mailinglist"></div>
+			<label for="resync_mailinglist" class="col-sm-2 control-label">{tmpl_var name="resync_mailinglist_txt"}</label> 
+			<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>
 
-	
+
+<tmpl_if name="dns_server_found">
+	<tmpl_if name="dns_soa_found">
 		<div class="form-group">
-			<tmpl_if name="firewall_server_found">
-				<div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_firewall" value="1" name="resync_firewall"></div><label for="resync_firewall" class="col-sm-3 control-label">{tmpl_var name="resync_firewall_txt"}</label> 
-				<div class="col-sm-9"><select name="firewall_server_id" id="firewall_server_id" class="form-control">
-					{tmpl_var name='firewall_server_id'}
-				</select></div>
-			<tmpl_else>
-				<label for="resync_firewall" class="col-sm-3 control-label">{tmpl_var name="resync_firewall_txt"}</label> 
-				<span style="color:red">
-					<strong>{tmpl_var name="resync_no_server_txt"}</strong>
-				</span>
-			</tmpl_if>
+			<div class="col-sm-1"><input class="form-control" type="checkbox" id="resync_dns" value="1" name="resync_dns"></div>
+			<label for="resync_dns" class="col-sm-2 control-label">{tmpl_var name="resync_dns_txt"}</label> 
+			<div class="col-sm-3"><select name="dns_server_id" id="dns_server_id" class="form-control">{tmpl_var name='dns_server_id'}</select></div>
 		</div>
+	</tmpl_if>
+</tmpl_if>
 	
-
-	
+<tmpl_if name="vserver_server_found">
+	<tmpl_if name="vserver_found">
 		<div class="form-group">
-			<div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_client" value="1" name="resync_client"></div><label for="resync_client" class="col-sm-3 control-label">{tmpl_var name="resync_client_txt"}</label> 
+			<div class="col-sm-1"><input class="form-control" type="checkbox" id="resync_vserver" value="1" name="resync_vserver"></div>
+			<label for="resync_vserver" class="col-sm-2 control-label">{tmpl_var name="resync_vserver_txt"}</label> 
+			<div class="col-sm-3"><select name="vserver_server_id" id="vserver_server_id" class="form-control">{tmpl_var name='vserver_server_id'}</select></div>
 		</div>
+	</tmpl_if>
+</tmpl_if>
 	
+<tmpl_if name="firewall_server_found">
+	<div class="form-group">
+		<div class="col-sm-1"><input class="form-control" type="checkbox" id="resync_firewall" value="1" name="resync_firewall"></div>
+		<label for="resync_firewall" class="col-sm-2 control-label">{tmpl_var name="resync_firewall_txt"}</label> 
+		<div class="col-sm-3"><select name="firewall_server_id" id="firewall_server_id" class="form-control">{tmpl_var name='firewall_server_id'}</select></div>
+	</div>
+</tmpl_if>
+	
+<div class="form-group">
+	<div class="col-sm-1"><input class="form-control" type="checkbox" id="resync_client" value="1" name="resync_client"></div>
+	<label for="resync_client" class="col-sm-2 control-label">{tmpl_var name="resync_client_txt"}</label> 
+</div>
+	
+<input type="hidden" name="id" value="{tmpl_var name='id'}">
 
-	<input type="hidden" name="id" value="{tmpl_var name='id'}">
-
-	<div class="clear"><div class="right">
-		<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="tools/resync_do.php">{tmpl_var name='btn_save_txt'}</button>
-		<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="tools/resync.php">{tmpl_var name='btn_cancel_txt'}</button>
-	</div></div>
+<div class="clear"><div class="right">
+	<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="tools/resync.php">{tmpl_var name='btn_start_txt'}</button>
+	<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="tools/resync.php">{tmpl_var name='btn_cancel_txt'}</button>
+</div></div>
 

--
Gitblit v1.9.1