diff --git a/install/lib/update.lib.php b/install/lib/update.lib.php
index bc0453f7f63df24fbe45fef5e219131f297c45ef..61f400be7d6ac2c581c177c839cec45dcf79ea8a 100644
--- a/install/lib/update.lib.php
+++ b/install/lib/update.lib.php
@@ -179,7 +179,7 @@ function updateDbAndIni() {
}
//* Exec onBeforeSQL function
- if(isset($php_patch) && is_object($php_patch)) {
+ if(isset($php_patch) && is_object($php_patch) && method_exists($php_patch, 'onBeforeSQL')) {
$php_patch->onBeforeSQL();
swriteln($inst->lng('Executing PHP patch file').': '.$php_patch_filename);
}
@@ -193,7 +193,7 @@ function updateDbAndIni() {
swriteln($inst->lng('Loading SQL patch file').': '.$sql_patch_filename);
//* Exec onAfterSQL function
- if(isset($php_patch) && is_object($php_patch)) {
+ if(isset($php_patch) && is_object($php_patch) && method_exists($php_patch, 'onAfterSQL')) {
$php_patch->onAfterSQL();
}
diff --git a/install/patches/upd_0065.php b/install/patches/upd_0065.php
new file mode 100644
index 0000000000000000000000000000000000000000..28066864ea6ad217ed38b69cff3fab94287936d8
--- /dev/null
+++ b/install/patches/upd_0065.php
@@ -0,0 +1,1430 @@
+<?php
+
+if(!defined('INSTALLER_RUN')) die('Patch update file access violation.');
+
+/*
+ Example installer patch update class. the classname must match
+ the php and the sql patch update filename. The php patches are
+ only executed when a corresponding sql patch exists.
+*/
+
+class upd_0065 extends installer_patch_update {
+
+ public function onAfterSQL() {
+ global $inst;
+
+ // delete all the files that were deleted on previous updates
+ $delete = array(
+ 'interface/bin/php-fcgi',
+ 'interface/lib/classes/datasources_enbion.inc.php',
+ 'interface/lib/config.inc.local.php',
+ 'interface/lib/db_local.php.skel',
+ 'interface/lib/plugins/sites_web_domain_plugin.inc.php',
+ 'interface/lib/plugins/sites_web_vhost_aliasdomain_plugin.inc.php',
+ 'interface/lib/plugins/sites_web_vhost_subdomain_plugin.inc.php',
+ 'interface/sql/auth_sql_snippet.sql',
+ 'interface/sql/db_installer_sandbox/defs.ftp_servers_sites_domains.php',
+ 'interface/sql/db_installer_sandbox/defs.mail_spam.php',
+ 'interface/sql/db_installer_sandbox/defs.resellers_clients.php',
+ 'interface/sql/db_installer_sandbox/defs.system.php',
+ 'interface/sql/db_installer_sandbox/table_definitions.php',
+ 'interface/sql/ispconfig3db.sql',
+ 'interface/sql/WARNING.txt',
+ 'interface/web/admin/datalog_del.php',
+ 'interface/web/admin/datalog_list.php',
+ 'interface/web/admin/dbsync_cron.php',
+ 'interface/web/admin/dbsync_del.php',
+ 'interface/web/admin/dbsync_edit.php',
+ 'interface/web/admin/dbsync_list.php',
+ 'interface/web/admin/filesync_cron.php',
+ 'interface/web/admin/filesync_del.php',
+ 'interface/web/admin/filesync_edit.php',
+ 'interface/web/admin/filesync_list.php',
+ 'interface/web/admin/form/tpl_default_admin.tform.php',
+ 'interface/web/admin/form/tpl_default-v2_admin.tform.php',
+ 'interface/web/admin/form/tpl_default-v2.tform.php',
+ 'interface/web/admin/lib/interface.d/default-v2.menu.php',
+ 'interface/web/admin/lib/interface.d/tpl_default.menu.php',
+ 'interface/web/admin/lib/interface.d/tpl_default-v2.menu.php',
+ 'interface/web/admin/lib/lang/ar_login_as.lng',
+ 'interface/web/admin/lib/lang/ar_tpl_default-v2_admin.lng',
+ 'interface/web/admin/lib/lang/bg_datalog_list.lng',
+ 'interface/web/admin/lib/lang/bg_dbsync_list.lng',
+ 'interface/web/admin/lib/lang/bg_dbsync.lng',
+ 'interface/web/admin/lib/lang/bg_filesync_list.lng',
+ 'interface/web/admin/lib/lang/bg_filesync.lng',
+ 'interface/web/admin/lib/lang/bg_login_as.lng',
+ 'interface/web/admin/lib/lang/bg_syslog_list.lng',
+ 'interface/web/admin/lib/lang/bg_tpl_default-v2_admin.lng',
+ 'interface/web/admin/lib/lang/br_login_as.lng',
+ 'interface/web/admin/lib/lang/br_tpl_default-v2_admin.lng',
+ 'interface/web/admin/lib/lang/cz_login_as.lng',
+ 'interface/web/admin/lib/lang/cz_tpl_default-v2_admin.lng',
+ 'interface/web/admin/lib/lang/de_datalog_list.lng',
+ 'interface/web/admin/lib/lang/de_dbsync_list.lng',
+ 'interface/web/admin/lib/lang/de_dbsync.lng',
+ 'interface/web/admin/lib/lang/de_filesync_list.lng',
+ 'interface/web/admin/lib/lang/de_filesync.lng',
+ 'interface/web/admin/lib/lang/de_login_as.lng',
+ 'interface/web/admin/lib/lang/de_syslog_list.lng',
+ 'interface/web/admin/lib/lang/de_tpl_default-v2_admin.lng',
+ 'interface/web/admin/lib/lang/el_login_as.lng',
+ 'interface/web/admin/lib/lang/el_tpl_default-v2_admin.lng',
+ 'interface/web/admin/lib/lang/en_datalog_list.lng',
+ 'interface/web/admin/lib/lang/en_dbsync_list.lng',
+ 'interface/web/admin/lib/lang/en_dbsync.lng',
+ 'interface/web/admin/lib/lang/en_filesync_list.lng',
+ 'interface/web/admin/lib/lang/en_filesync.lng',
+ 'interface/web/admin/lib/lang/en_login_as.lng',
+ 'interface/web/admin/lib/lang/en_syslog_list.lng',
+ 'interface/web/admin/lib/lang/en_tpl_default-v2_admin.lng',
+ 'interface/web/admin/lib/lang/es_datalog_list.lng',
+ 'interface/web/admin/lib/lang/es_dbsync_list.lng',
+ 'interface/web/admin/lib/lang/es_dbsync.lng',
+ 'interface/web/admin/lib/lang/es_filesync_list.lng',
+ 'interface/web/admin/lib/lang/es_filesync.lng',
+ 'interface/web/admin/lib/lang/es_login_as.lng',
+ 'interface/web/admin/lib/lang/es_syslog_list.lng',
+ 'interface/web/admin/lib/lang/es_tpl_default-v2_admin.lng',
+ 'interface/web/admin/lib/lang/fi_dbsync_list.lng',
+ 'interface/web/admin/lib/lang/fi_dbsync.lng',
+ 'interface/web/admin/lib/lang/fi_filesync_list.lng',
+ 'interface/web/admin/lib/lang/fi_filesync.lng',
+ 'interface/web/admin/lib/lang/fi_login_as.lng',
+ 'interface/web/admin/lib/lang/fi_tpl_default-v2_admin.lng',
+ 'interface/web/admin/lib/lang/fr_datalog_list.lng',
+ 'interface/web/admin/lib/lang/fr_dbsync_list.lng',
+ 'interface/web/admin/lib/lang/fr_dbsync.lng',
+ 'interface/web/admin/lib/lang/fr_filesync_list.lng',
+ 'interface/web/admin/lib/lang/fr_filesync.lng',
+ 'interface/web/admin/lib/lang/fr_login_as.lng',
+ 'interface/web/admin/lib/lang/fr_syslog_list.lng',
+ 'interface/web/admin/lib/lang/fr_tpl_default-v2_admin.lng',
+ 'interface/web/admin/lib/lang/hr_login_as.lng',
+ 'interface/web/admin/lib/lang/hr_tpl_default-v2_admin.lng',
+ 'interface/web/admin/lib/lang/hu_datalog_list.lng',
+ 'interface/web/admin/lib/lang/hu_dbsync_list.lng',
+ 'interface/web/admin/lib/lang/hu_dbsync.lng',
+ 'interface/web/admin/lib/lang/hu_filesync_list.lng',
+ 'interface/web/admin/lib/lang/hu_filesync.lng',
+ 'interface/web/admin/lib/lang/hu_login_as.lng',
+ 'interface/web/admin/lib/lang/hu_syslog_list.lng',
+ 'interface/web/admin/lib/lang/hu_tpl_default-v2_admin.lng',
+ 'interface/web/admin/lib/lang/id_login_as.lng',
+ 'interface/web/admin/lib/lang/id_tpl_default-v2_admin.lng',
+ 'interface/web/admin/lib/lang/it_datalog_list.lng',
+ 'interface/web/admin/lib/lang/it_dbsync_list.lng',
+ 'interface/web/admin/lib/lang/it_dbsync.lng',
+ 'interface/web/admin/lib/lang/it_filesync_list.lng',
+ 'interface/web/admin/lib/lang/it_filesync.lng',
+ 'interface/web/admin/lib/lang/it_login_as.lng',
+ 'interface/web/admin/lib/lang/it_syslog_list.lng',
+ 'interface/web/admin/lib/lang/it_tpl_default-v2_admin.lng',
+ 'interface/web/admin/lib/lang/ja_login_as.lng',
+ 'interface/web/admin/lib/lang/ja_tpl_default-v2_admin.lng',
+ 'interface/web/admin/lib/lang/nl_datalog_list.lng',
+ 'interface/web/admin/lib/lang/nl_dbsync_list.lng',
+ 'interface/web/admin/lib/lang/nl_dbsync.lng',
+ 'interface/web/admin/lib/lang/nl_filesync_list.lng',
+ 'interface/web/admin/lib/lang/nl_filesync.lng',
+ 'interface/web/admin/lib/lang/nl_login_as.lng',
+ 'interface/web/admin/lib/lang/nl_syslog_list.lng',
+ 'interface/web/admin/lib/lang/nl_tpl_default-v2_admin.lng',
+ 'interface/web/admin/lib/lang/pl_login_as.lng',
+ 'interface/web/admin/lib/lang/pl_tpl_default-v2_admin.lng',
+ 'interface/web/admin/lib/lang/pt_login_as.lng',
+ 'interface/web/admin/lib/lang/pt_tpl_default-v2_admin.lng',
+ 'interface/web/admin/lib/lang/ro_login_as.lng',
+ 'interface/web/admin/lib/lang/ro_tpl_default-v2_admin.lng',
+ 'interface/web/admin/lib/lang/ru_datalog_list.lng',
+ 'interface/web/admin/lib/lang/ru_dbsync_list.lng',
+ 'interface/web/admin/lib/lang/ru_dbsync.lng',
+ 'interface/web/admin/lib/lang/ru_filesync_list.lng',
+ 'interface/web/admin/lib/lang/ru_filesync.lng',
+ 'interface/web/admin/lib/lang/ru_login_as.lng',
+ 'interface/web/admin/lib/lang/ru_syslog_list.lng',
+ 'interface/web/admin/lib/lang/ru_tpl_default-v2_admin.lng',
+ 'interface/web/admin/lib/lang/se_datalog_list.lng',
+ 'interface/web/admin/lib/lang/se_dbsync_list.lng',
+ 'interface/web/admin/lib/lang/se_dbsync.lng',
+ 'interface/web/admin/lib/lang/se_filesync_list.lng',
+ 'interface/web/admin/lib/lang/se_filesync.lng',
+ 'interface/web/admin/lib/lang/se_login_as.lng',
+ 'interface/web/admin/lib/lang/se_syslog_list.lng',
+ 'interface/web/admin/lib/lang/se_tpl_default-v2_admin.lng',
+ 'interface/web/admin/lib/lang/sk_login_as.lng',
+ 'interface/web/admin/lib/lang/sk_tpl_default-v2_admin.lng',
+ 'interface/web/admin/lib/lang/tr_login_as.lng',
+ 'interface/web/admin/lib/lang/tr_tpl_default-v2_admin.lng',
+ 'interface/web/admin/list/datalog.list.php',
+ 'interface/web/admin/list/dbsync.list.php',
+ 'interface/web/admin/list/filesync.list.php',
+ 'interface/web/admin/list/log.list.php',
+ 'interface/web/admin/log_del.php',
+ 'interface/web/admin/login_as.php',
+ 'interface/web/admin/log_list.php',
+ 'interface/web/admin/system_config_edit.php.bak',
+ 'interface/web/admin/templates/datalog_list.htm',
+ 'interface/web/admin/templates/dbsync_edit.htm',
+ 'interface/web/admin/templates/dbsync_list.htm',
+ 'interface/web/admin/templates/filesync_edit.htm',
+ 'interface/web/admin/templates/filesync_list.htm',
+ 'interface/web/admin/templates/index.htm',
+ 'interface/web/admin/_templates_old/dbsync_edit.htm',
+ 'interface/web/admin/_templates_old/dbsync_list.htm',
+ 'interface/web/admin/_templates_old/filesync_edit.htm',
+ 'interface/web/admin/_templates_old/filesync_list.htm',
+ 'interface/web/admin/_templates_old/firewall_edit.htm',
+ 'interface/web/admin/_templates_old/firewall_list.htm',
+ 'interface/web/admin/_templates_old/groups_edit.htm',
+ 'interface/web/admin/_templates_old/groups_list.htm',
+ 'interface/web/admin/_templates_old/index.htm',
+ 'interface/web/admin/_templates_old/language_add.htm',
+ 'interface/web/admin/_templates_old/language_complete.htm',
+ 'interface/web/admin/_templates_old/language_edit.htm',
+ 'interface/web/admin/_templates_old/language_export.htm',
+ 'interface/web/admin/_templates_old/language_import.htm',
+ 'interface/web/admin/_templates_old/language_list.htm',
+ 'interface/web/admin/_templates_old/server_config_fastcgi_edit.htm',
+ 'interface/web/admin/_templates_old/server_config_getmail_edit.htm',
+ 'interface/web/admin/_templates_old/server_config_jailkit_edit.htm',
+ 'interface/web/admin/_templates_old/server_config_list.htm',
+ 'interface/web/admin/_templates_old/server_config_mail_edit.htm',
+ 'interface/web/admin/_templates_old/server_config_server_edit.htm',
+ 'interface/web/admin/_templates_old/server_config_web_edit.htm',
+ 'interface/web/admin/_templates_old/server_edit_config.htm',
+ 'interface/web/admin/_templates_old/server_edit_services.htm',
+ 'interface/web/admin/_templates_old/server_ip_edit.htm',
+ 'interface/web/admin/_templates_old/server_ip_list.htm',
+ 'interface/web/admin/_templates_old/server_list.htm',
+ 'interface/web/admin/_templates_old/software_package_list.htm',
+ 'interface/web/admin/_templates_old/software_repo_edit.htm',
+ 'interface/web/admin/_templates_old/software_repo_list.htm',
+ 'interface/web/admin/_templates_old/software_update_list.htm',
+ 'interface/web/admin/_templates_old/users_address_edit.htm',
+ 'interface/web/admin/_templates_old/users_groups_edit.htm',
+ 'interface/web/admin/_templates_old/users_list.htm',
+ 'interface/web/admin/_templates_old/users_user_edit.htm',
+ 'interface/web/admin/templates/paging.tpl.htm',
+ 'interface/web/admin/templates/syslog_list.htm',
+ 'interface/web/admin/templates/system_config_branding_edit.htm',
+ 'interface/web/admin/templates/tpl_default_admin.htm',
+ 'interface/web/admin/templates/tpl_default-v2_admin.htm',
+ 'interface/web/admin/templates/tpl_default-v2_basic.htm',
+ 'interface/web/admin/templates/users_address_edit.htm',
+ 'interface/web/admin/tpl_default_admin.php',
+ 'interface/web/admin/tpl_default-v2_admin.php',
+ 'interface/web/admin/tpl_default-v2.php',
+ 'interface/web/clang.php',
+ 'interface/web/client/lib/lang/de_client_list.lng',
+ 'interface/web/client/lib/lang/de_users_list.lng',
+ 'interface/web/client/lib/lang/en_client_list.lng',
+ 'interface/web/client/lib/lang/en_users_list.lng',
+ 'interface/web/client/lib/lang/fi_client_list.lng',
+ 'interface/web/client/lib/lang/fi_users_list.lng',
+ 'interface/web/client/lib/lang/fr_users_list.lng',
+ 'interface/web/client/lib/lang/hu_client_list.lng',
+ 'interface/web/client/lib/lang/hu_users_list.lng',
+ 'interface/web/client/lib/lang/nl_client_list.lng',
+ 'interface/web/client/lib/lang/nl_users_list.lng',
+ 'interface/web/client/lib/lang/ru_client_list.lng',
+ 'interface/web/client/lib/lang/ru_users_list.lng',
+ 'interface/web/client/lib/lang/se_users_list.lng',
+ 'interface/web/client/list/users.list.php',
+ 'interface/web/clients/lib/admin.conf.php',
+ 'interface/web/clients/lib/module.conf.php',
+ 'interface/web/client/templates/client_edit_ipaddress.htm',
+ 'interface/web/client/templates/client_edit_login.htm',
+ 'interface/web/client/templates/client_edit_users.htm',
+ 'interface/web/client/templates/client_list.htm',
+ 'interface/web/client/_templates_old/client_edit_address.htm',
+ 'interface/web/client/_templates_old/client_edit_limits.htm',
+ 'interface/web/client/_templates_old/clients_list.htm',
+ 'interface/web/client/templates/paging.tpl.htm',
+ 'interface/web/client/templates/reseller_edit_ipaddress.htm',
+ 'interface/web/client/templates/reseller_edit_users.htm',
+ 'interface/web/client/templates/users_list.htm',
+ 'interface/web/client/tools.inc.php',
+ 'interface/web/cms/form/media_cat.tform.php',
+ 'interface/web/cms/form/media_profile.tform.php',
+ 'interface/web/cms/form/media.tform.php',
+ 'interface/web/cms/lib/admin.conf.php',
+ 'interface/web/cms/lib/lang/de.lng',
+ 'interface/web/cms/lib/lang/de_media_cat_list.lng',
+ 'interface/web/cms/lib/lang/de_media_cat.lng',
+ 'interface/web/cms/lib/lang/de_media_list.lng',
+ 'interface/web/cms/lib/lang/de_media.lng',
+ 'interface/web/cms/lib/lang/de_media_profile_list.lng',
+ 'interface/web/cms/lib/lang/de_media_profile.lng',
+ 'interface/web/cms/lib/lang/en.lng',
+ 'interface/web/cms/lib/lang/en_media_cat_list.lng',
+ 'interface/web/cms/lib/lang/en_media_cat.lng',
+ 'interface/web/cms/lib/lang/en_media_list.lng',
+ 'interface/web/cms/lib/lang/en_media.lng',
+ 'interface/web/cms/lib/lang/en_media_profile_list.lng',
+ 'interface/web/cms/lib/lang/en_media_profile.lng',
+ 'interface/web/cms/lib/module.conf.php',
+ 'interface/web/cms/list/media_cat.list.php',
+ 'interface/web/cms/list/media.list.php',
+ 'interface/web/cms/list/media_profile.list.php',
+ 'interface/web/cms/media_add.php',
+ 'interface/web/cms/media_cat_del.php',
+ 'interface/web/cms/media_cat_edit.php',
+ 'interface/web/cms/media_cat_list.php',
+ 'interface/web/cms/media_del.php',
+ 'interface/web/cms/media_edit.php',
+ 'interface/web/cms/media_list.php',
+ 'interface/web/cms/media_profile_del.php',
+ 'interface/web/cms/media_profile_edit.php',
+ 'interface/web/cms/media_profile_list.php',
+ 'interface/web/cms/media_view.php',
+ 'interface/web/cms/templates/media_add.htm',
+ 'interface/web/cms/templates/media_cat_edit.htm',
+ 'interface/web/cms/templates/media_cat_list.htm',
+ 'interface/web/cms/templates/media_edit.htm',
+ 'interface/web/cms/templates/media_list.htm',
+ 'interface/web/cms/templates/media_profile_edit.htm',
+ 'interface/web/cms/templates/media_profile_list.htm',
+ 'interface/web/cms/templates/paging.tpl.htm',
+ 'interface/web/cms/templates/treenavi.htm',
+ 'interface/web/cms/treenavi.php',
+ 'interface/web/dashboard/ajax_get_json.php.bak',
+ 'interface/web/dashboard/dashlets/limits.php.bak',
+ 'interface/web/data.sql',
+ 'interface/web/dns/form/rr.tform.php',
+ 'interface/web/dns/form/soa.tform.php',
+ 'interface/web/dns/lib/lang/de_rr_list.lng',
+ 'interface/web/dns/lib/lang/de_rr.lng',
+ 'interface/web/dns/lib/lang/de_soa_list.lng',
+ 'interface/web/dns/lib/lang/de_soa.lng',
+ 'interface/web/dns/lib/lang/en_rr_list.lng',
+ 'interface/web/dns/lib/lang/en_rr.lng',
+ 'interface/web/dns/lib/lang/en_soa_list.lng',
+ 'interface/web/dns/lib/lang/en_soa.lng',
+ 'interface/web/dns/lib/lang/fr_rr_list.lng',
+ 'interface/web/dns/lib/lang/fr_rr.lng',
+ 'interface/web/dns/lib/lang/fr_soa_list.lng',
+ 'interface/web/dns/lib/lang/fr_soa.lng',
+ 'interface/web/dns/lib/lang/fr_support_message_list.lng',
+ 'interface/web/dns/lib/lang/fr_support_message.lng',
+ 'interface/web/dns/lib/lang/se_rr_list.lng',
+ 'interface/web/dns/lib/lang/se_rr.lng',
+ 'interface/web/dns/lib/lang/se_soa_list.lng',
+ 'interface/web/dns/lib/lang/se_soa.lng',
+ 'interface/web/dns/list/rr.list.php',
+ 'interface/web/dns/list/soa.list.php',
+ 'interface/web/dns_old/form/rr.tform.php',
+ 'interface/web/dns_old/form/soa.tform.php',
+ 'interface/web/dns_old/lib/admin.conf.php',
+ 'interface/web/dns_old/lib/lang/de.lng',
+ 'interface/web/dns_old/lib/lang/de_rr_list.lng',
+ 'interface/web/dns_old/lib/lang/de_rr.lng',
+ 'interface/web/dns_old/lib/lang/de_soa_list.lng',
+ 'interface/web/dns_old/lib/lang/de_soa.lng',
+ 'interface/web/dns_old/lib/lang/en.lng',
+ 'interface/web/dns_old/lib/lang/en_rr_list.lng',
+ 'interface/web/dns_old/lib/lang/en_rr.lng',
+ 'interface/web/dns_old/lib/lang/en_soa_list.lng',
+ 'interface/web/dns_old/lib/lang/en_soa.lng',
+ 'interface/web/dns_old/lib/lang/fr.lng',
+ 'interface/web/dns_old/lib/lang/fr_rr_list.lng',
+ 'interface/web/dns_old/lib/lang/fr_rr.lng',
+ 'interface/web/dns_old/lib/lang/fr_soa_list.lng',
+ 'interface/web/dns_old/lib/lang/fr_soa.lng',
+ 'interface/web/dns_old/lib/lang/se.lng',
+ 'interface/web/dns_old/lib/lang/se_rr_list.lng',
+ 'interface/web/dns_old/lib/lang/se_rr.lng',
+ 'interface/web/dns_old/lib/lang/se_soa_list.lng',
+ 'interface/web/dns_old/lib/lang/se_soa.lng',
+ 'interface/web/dns_old/lib/module.conf.php',
+ 'interface/web/dns_old/list/rr.list.php',
+ 'interface/web/dns_old/list/soa.list.php',
+ 'interface/web/dns_old/rr_del.php',
+ 'interface/web/dns_old/rr_edit.php',
+ 'interface/web/dns_old/rr_list.php',
+ 'interface/web/dns_old/soa_del.php',
+ 'interface/web/dns_old/soa_edit.php',
+ 'interface/web/dns_old/soa_list.php',
+ 'interface/web/dns_old/templates/rr_edit.htm',
+ 'interface/web/dns_old/templates/rr_list.htm',
+ 'interface/web/dns_old/templates/soa_edit.htm',
+ 'interface/web/dns_old/templates/soa_edit_rr.htm',
+ 'interface/web/dns_old/templates/soa_list.htm',
+ 'interface/web/dns/rr_del.php',
+ 'interface/web/dns/rr_edit.php',
+ 'interface/web/dns/rr_list.php',
+ 'interface/web/dns/soa_del.php',
+ 'interface/web/dns/soa_edit.php',
+ 'interface/web/dns/soa_list.php',
+ 'interface/web/dns/_templates_old/dns_a_edit.htm',
+ 'interface/web/dns/_templates_old/dns_alias_edit.htm',
+ 'interface/web/dns/_templates_old/dns_a_list.htm',
+ 'interface/web/dns/_templates_old/dns_cname_edit.htm',
+ 'interface/web/dns/_templates_old/dns_hinfo_edit.htm',
+ 'interface/web/dns/_templates_old/dns_mx_edit.htm',
+ 'interface/web/dns/_templates_old/dns_ns_edit.htm',
+ 'interface/web/dns/_templates_old/dns_ptr_edit.htm',
+ 'interface/web/dns/_templates_old/dns_records_edit.htm',
+ 'interface/web/dns/_templates_old/dns_rp_edit.htm',
+ 'interface/web/dns/_templates_old/dns_soa_edit.htm',
+ 'interface/web/dns/_templates_old/dns_soa_list.htm',
+ 'interface/web/dns/_templates_old/dns_srv_edit.htm',
+ 'interface/web/dns/_templates_old/dns_txt_edit.htm',
+ 'interface/web/dns/templates/rr_edit.htm',
+ 'interface/web/dns/templates/rr_list.htm',
+ 'interface/web/dns/templates/soa_edit.htm',
+ 'interface/web/dns/templates/soa_edit_rr.htm',
+ 'interface/web/dns/templates/soa_list.htm',
+ 'interface/web/domain/domain_del.php',
+ 'interface/web/domain/domain_edit.php',
+ 'interface/web/domain/domain_list.php',
+ 'interface/web/domain/domain_new_client.php',
+ 'interface/web/domain/form/domain.tform.php',
+ 'interface/web/domain/handle_list.php',
+ 'interface/web/domain/lib/admin.conf.php',
+ 'interface/web/domain/lib/lang/ar_domain_list.lng',
+ 'interface/web/domain/lib/lang/ar_domain.lng',
+ 'interface/web/domain/lib/lang/ar.lng',
+ 'interface/web/domain/lib/lang/bg_domain_list.lng',
+ 'interface/web/domain/lib/lang/bg_domain.lng',
+ 'interface/web/domain/lib/lang/bg.lng',
+ 'interface/web/domain/lib/lang/br_domain_list.lng',
+ 'interface/web/domain/lib/lang/br_domain.lng',
+ 'interface/web/domain/lib/lang/br.lng',
+ 'interface/web/domain/lib/lang/cz_domain_list.lng',
+ 'interface/web/domain/lib/lang/cz_domain.lng',
+ 'interface/web/domain/lib/lang/cz.lng',
+ 'interface/web/domain/lib/lang/de_domain_list.lng',
+ 'interface/web/domain/lib/lang/de_domain.lng',
+ 'interface/web/domain/lib/lang/de.lng',
+ 'interface/web/domain/lib/lang/el_domain_list.lng',
+ 'interface/web/domain/lib/lang/el_domain.lng',
+ 'interface/web/domain/lib/lang/el.lng',
+ 'interface/web/domain/lib/lang/en_domain_list.lng',
+ 'interface/web/domain/lib/lang/en_domain.lng',
+ 'interface/web/domain/lib/lang/en.lng',
+ 'interface/web/domain/lib/lang/es_domain_list.lng',
+ 'interface/web/domain/lib/lang/es_domain.lng',
+ 'interface/web/domain/lib/lang/es.lng',
+ 'interface/web/domain/lib/lang/fi_domain_list.lng',
+ 'interface/web/domain/lib/lang/fi_domain.lng',
+ 'interface/web/domain/lib/lang/fi.lng',
+ 'interface/web/domain/lib/lang/fr_domain_list.lng',
+ 'interface/web/domain/lib/lang/fr_domain.lng',
+ 'interface/web/domain/lib/lang/fr.lng',
+ 'interface/web/domain/lib/lang/hr_domain_list.lng',
+ 'interface/web/domain/lib/lang/hr_domain.lng',
+ 'interface/web/domain/lib/lang/hr.lng',
+ 'interface/web/domain/lib/lang/hu_domain_list.lng',
+ 'interface/web/domain/lib/lang/hu_domain.lng',
+ 'interface/web/domain/lib/lang/hu.lng',
+ 'interface/web/domain/lib/lang/id_domain_list.lng',
+ 'interface/web/domain/lib/lang/id_domain.lng',
+ 'interface/web/domain/lib/lang/id.lng',
+ 'interface/web/domain/lib/lang/it_domain_list.lng',
+ 'interface/web/domain/lib/lang/it_domain.lng',
+ 'interface/web/domain/lib/lang/it.lng',
+ 'interface/web/domain/lib/lang/ja_domain_list.lng',
+ 'interface/web/domain/lib/lang/ja_domain.lng',
+ 'interface/web/domain/lib/lang/ja.lng',
+ 'interface/web/domain/lib/lang/nl_domain_list.lng',
+ 'interface/web/domain/lib/lang/nl_domain.lng',
+ 'interface/web/domain/lib/lang/nl.lng',
+ 'interface/web/domain/lib/lang/pl_domain_list.lng',
+ 'interface/web/domain/lib/lang/pl_domain.lng',
+ 'interface/web/domain/lib/lang/pl.lng',
+ 'interface/web/domain/lib/lang/pt_domain_list.lng',
+ 'interface/web/domain/lib/lang/pt_domain.lng',
+ 'interface/web/domain/lib/lang/pt.lng',
+ 'interface/web/domain/lib/lang/ro_domain_list.lng',
+ 'interface/web/domain/lib/lang/ro_domain.lng',
+ 'interface/web/domain/lib/lang/ro.lng',
+ 'interface/web/domain/lib/lang/ru_domain_list.lng',
+ 'interface/web/domain/lib/lang/ru_domain.lng',
+ 'interface/web/domain/lib/lang/ru.lng',
+ 'interface/web/domain/lib/lang/se_domain_list.lng',
+ 'interface/web/domain/lib/lang/se_domain.lng',
+ 'interface/web/domain/lib/lang/se.lng',
+ 'interface/web/domain/lib/lang/sk_domain_list.lng',
+ 'interface/web/domain/lib/lang/sk_domain.lng',
+ 'interface/web/domain/lib/lang/sk.lng',
+ 'interface/web/domain/lib/lang/tr_domain_list.lng',
+ 'interface/web/domain/lib/lang/tr_domain.lng',
+ 'interface/web/domain/lib/lang/tr.lng',
+ 'interface/web/domain/lib/module.conf.php',
+ 'interface/web/domain/lib/remote.conf.php',
+ 'interface/web/domain/list/domain.list.php',
+ 'interface/web/domain/list/handle.list.php',
+ 'interface/web/domain/list/provider.list.php',
+ 'interface/web/domain/list/tld.list.php',
+ 'interface/web/domain/provider_list.php',
+ 'interface/web/domain/README_DEVELOPER.txt',
+ 'interface/web/domain/templates/domain_edit.htm',
+ 'interface/web/domain/templates/domain_handle_list.htm',
+ 'interface/web/domain/templates/domain_list.htm',
+ 'interface/web/domain/templates/domain_provider_list.htm',
+ 'interface/web/domain/templates/domain_tld_list.htm',
+ 'interface/web/domain/tld_list.php',
+ 'interface/web/help/_templates_old/support_message_edit.htm',
+ 'interface/web/help/_templates_old/support_message_list.htm',
+ 'interface/web/help/_templates_old/support_message_view.htm',
+ 'interface/web/js/lib/lang/bg_javascript.lng',
+ 'interface/web/js/lib/lang/de_javascript.lng',
+ 'interface/web/js/lib/lang/en_javascript.lng',
+ 'interface/web/js/lib/lang/es_javascript.lng',
+ 'interface/web/js/lib/lang/fi_javascript.lng',
+ 'interface/web/js/lib/lang/fr_javascript.lng',
+ 'interface/web/js/lib/lang/it_javascript.lng',
+ 'interface/web/js/lib/lang/nl_javascript.lng',
+ 'interface/web/js/lib/lang/ru_javascript.lng',
+ 'interface/web/js/lib/lang/se_javascript.lng',
+ 'interface/web/js/scrigo.js',
+ 'interface/web/js/yui/animation/animation-debug.js',
+ 'interface/web/js/yui/animation/animation.js',
+ 'interface/web/js/yui/animation/animation-min.js',
+ 'interface/web/js/yui/animation/README',
+ 'interface/web/js/yui/autocomplete/autocomplete-debug.js',
+ 'interface/web/js/yui/autocomplete/autocomplete.js',
+ 'interface/web/js/yui/autocomplete/autocomplete-min.js',
+ 'interface/web/js/yui/autocomplete/README',
+ 'interface/web/js/yui/button/assets/background.png',
+ 'interface/web/js/yui/button/assets/button.css',
+ 'interface/web/js/yui/button/assets/menuarrow.gif',
+ 'interface/web/js/yui/button/assets/splitarrow_active.gif',
+ 'interface/web/js/yui/button/assets/splitarrow.gif',
+ 'interface/web/js/yui/button/button-beta-debug.js',
+ 'interface/web/js/yui/button/button-beta.js',
+ 'interface/web/js/yui/button/button-beta-min.js',
+ 'interface/web/js/yui/button/README',
+ 'interface/web/js/yui/calendar/assets/calendar.css',
+ 'interface/web/js/yui/calendar/assets/callt.gif',
+ 'interface/web/js/yui/calendar/assets/calrt.gif',
+ 'interface/web/js/yui/calendar/assets/calx.gif',
+ 'interface/web/js/yui/calendar/calendar-debug.js',
+ 'interface/web/js/yui/calendar/calendar.js',
+ 'interface/web/js/yui/calendar/calendar-min.js',
+ 'interface/web/js/yui/calendar/README',
+ 'interface/web/js/yui-combo.js',
+ 'interface/web/js/yui/connection/connection-debug.js',
+ 'interface/web/js/yui/connection/connection.js',
+ 'interface/web/js/yui/connection/connection-min.js',
+ 'interface/web/js/yui/connection/README',
+ 'interface/web/js/yui/container/assets/alrt16_1.gif',
+ 'interface/web/js/yui/container/assets/blck16_1.gif',
+ 'interface/web/js/yui/container/assets/close12_1.gif',
+ 'interface/web/js/yui/container/assets/container.css',
+ 'interface/web/js/yui/container/assets/hlp16_1.gif',
+ 'interface/web/js/yui/container/assets/info16_1.gif',
+ 'interface/web/js/yui/container/assets/tip16_1.gif',
+ 'interface/web/js/yui/container/assets/warn16_1.gif',
+ 'interface/web/js/yui/container/container_core-debug.js',
+ 'interface/web/js/yui/container/container_core.js',
+ 'interface/web/js/yui/container/container_core-min.js',
+ 'interface/web/js/yui/container/container-debug.js',
+ 'interface/web/js/yui/container/container.js',
+ 'interface/web/js/yui/container/container-min.js',
+ 'interface/web/js/yui/container/README',
+ 'interface/web/js/yui/datasource/datasource-beta-debug.js',
+ 'interface/web/js/yui/datasource/datasource-beta.js',
+ 'interface/web/js/yui/datasource/datasource-beta-min.js',
+ 'interface/web/js/yui/datasource/README',
+ 'interface/web/js/yui/datatable/assets/datatable.css',
+ 'interface/web/js/yui/datatable/datatable-beta-debug.js',
+ 'interface/web/js/yui/datatable/datatable-beta.js',
+ 'interface/web/js/yui/datatable/datatable-beta-min.js',
+ 'interface/web/js/yui/datatable/README',
+ 'interface/web/js/yui/dom/dom-debug.js',
+ 'interface/web/js/yui/dom/dom.js',
+ 'interface/web/js/yui/dom/dom-min.js',
+ 'interface/web/js/yui/dom/README',
+ 'interface/web/js/yui/dragdrop/dragdrop-debug.js',
+ 'interface/web/js/yui/dragdrop/dragdrop.js',
+ 'interface/web/js/yui/dragdrop/dragdrop-min.js',
+ 'interface/web/js/yui/dragdrop/README',
+ 'interface/web/js/yui/element/element-beta-debug.js',
+ 'interface/web/js/yui/element/element-beta.js',
+ 'interface/web/js/yui/element/element-beta-min.js',
+ 'interface/web/js/yui/element/README',
+ 'interface/web/js/yui/event/event-debug.js',
+ 'interface/web/js/yui/event/event.js',
+ 'interface/web/js/yui/event/event-min.js',
+ 'interface/web/js/yui/event/README',
+ 'interface/web/js/yui/fonts/fonts.css',
+ 'interface/web/js/yui/fonts/fonts-min.css',
+ 'interface/web/js/yui/fonts/README',
+ 'interface/web/js/yui/grids/grids.css',
+ 'interface/web/js/yui/grids/grids-min.css',
+ 'interface/web/js/yui/grids/README',
+ 'interface/web/js/yui/history/assets/blank.html',
+ 'interface/web/js/yui/history/history-experimental-debug.js',
+ 'interface/web/js/yui/history/history-experimental.js',
+ 'interface/web/js/yui/history/history-experimental-min.js',
+ 'interface/web/js/yui/history/README',
+ 'interface/web/js/yui/logger/assets/logger.css',
+ 'interface/web/js/yui/logger/logger-debug.js',
+ 'interface/web/js/yui/logger/logger.js',
+ 'interface/web/js/yui/logger/logger-min.js',
+ 'interface/web/js/yui/logger/README',
+ 'interface/web/js/yui/menu/assets/map.gif',
+ 'interface/web/js/yui/menu/assets/menuarodwn8_dim_1.gif',
+ 'interface/web/js/yui/menu/assets/menuarodwn8_hov_1.gif',
+ 'interface/web/js/yui/menu/assets/menuarodwn8_nrm_1.gif',
+ 'interface/web/js/yui/menu/assets/menuarorght8_dim_1.gif',
+ 'interface/web/js/yui/menu/assets/menuarorght8_hov_1.gif',
+ 'interface/web/js/yui/menu/assets/menuarorght8_nrm_1.gif',
+ 'interface/web/js/yui/menu/assets/menuaroup8_dim_1.gif',
+ 'interface/web/js/yui/menu/assets/menuaroup8_nrm_1.gif',
+ 'interface/web/js/yui/menu/assets/menuchk8_dim_1.gif',
+ 'interface/web/js/yui/menu/assets/menuchk8_hov_1.gif',
+ 'interface/web/js/yui/menu/assets/menuchk8_nrm_1.gif',
+ 'interface/web/js/yui/menu/assets/menu.css',
+ 'interface/web/js/yui/menu/menu-debug.js',
+ 'interface/web/js/yui/menu/menu.js',
+ 'interface/web/js/yui/menu/menu-min.js',
+ 'interface/web/js/yui/menu/README',
+ 'interface/web/js/yui/reset-fonts-grids/README',
+ 'interface/web/js/yui/reset-fonts-grids/reset-fonts-grids.css',
+ 'interface/web/js/yui/reset/README',
+ 'interface/web/js/yui/reset/reset.css',
+ 'interface/web/js/yui/reset/reset-min.css',
+ 'interface/web/js/yui/slider/README',
+ 'interface/web/js/yui/slider/slider-debug.js',
+ 'interface/web/js/yui/slider/slider.js',
+ 'interface/web/js/yui/slider/slider-min.js',
+ 'interface/web/js/yui/tabview/assets/border_tabs.css',
+ 'interface/web/js/yui/tabview/assets/tabview.css',
+ 'interface/web/js/yui/tabview/README',
+ 'interface/web/js/yui/tabview/tabview-debug.js',
+ 'interface/web/js/yui/tabview/tabview.js',
+ 'interface/web/js/yui/tabview/tabview-min.js',
+ 'interface/web/js/yui/treeview/assets/lm.gif',
+ 'interface/web/js/yui/treeview/assets/lmh.gif',
+ 'interface/web/js/yui/treeview/assets/ln.gif',
+ 'interface/web/js/yui/treeview/assets/loading.gif',
+ 'interface/web/js/yui/treeview/assets/lp.gif',
+ 'interface/web/js/yui/treeview/assets/lph.gif',
+ 'interface/web/js/yui/treeview/assets/tm.gif',
+ 'interface/web/js/yui/treeview/assets/tmh.gif',
+ 'interface/web/js/yui/treeview/assets/tn.gif',
+ 'interface/web/js/yui/treeview/assets/tp.gif',
+ 'interface/web/js/yui/treeview/assets/tph.gif',
+ 'interface/web/js/yui/treeview/assets/tree.css',
+ 'interface/web/js/yui/treeview/assets/vline.gif',
+ 'interface/web/js/yui/treeview/README',
+ 'interface/web/js/yui/treeview/treeview-debug.js',
+ 'interface/web/js/yui/treeview/treeview.js',
+ 'interface/web/js/yui/treeview/treeview-min.js',
+ 'interface/web/js/yui/utilities/README',
+ 'interface/web/js/yui/utilities/utilities.js',
+ 'interface/web/js/yui/yahoo-dom-event/README',
+ 'interface/web/js/yui/yahoo-dom-event/yahoo-dom-event.js',
+ 'interface/web/js/yui/yahoo/README',
+ 'interface/web/js/yui/yahoo/yahoo-debug.js',
+ 'interface/web/js/yui/yahoo/yahoo.js',
+ 'interface/web/js/yui/yahoo/yahoo-min.js',
+ 'interface/web/lang/lib/lang/bg_list.lng',
+ 'interface/web/lang/lib/lang/bg_tform.lng',
+ 'interface/web/lang/lib/lang/de_list.lng',
+ 'interface/web/lang/lib/lang/de_tform.lng',
+ 'interface/web/lang/lib/lang/en_list.lng',
+ 'interface/web/lang/lib/lang/en_tform.lng',
+ 'interface/web/lang/lib/lang/es_list.lng',
+ 'interface/web/lang/lib/lang/es_tform.lng',
+ 'interface/web/lang/lib/lang/fr_list.lng',
+ 'interface/web/lang/lib/lang/fr_tform.lng',
+ 'interface/web/lang/lib/lang/it_list.lng',
+ 'interface/web/lang/lib/lang/it_tform.lng',
+ 'interface/web/lang/lib/lang/nl_list.lng',
+ 'interface/web/lang/lib/lang/nl_tform.lng',
+ 'interface/web/lang/lib/lang/ru_list.lng',
+ 'interface/web/lang/lib/lang/ru_tform.lng',
+ 'interface/web/lang/lib/lang/se_list.lng',
+ 'interface/web/lang/lib/lang/se_tform.lng',
+ 'interface/web/login/_index.php',
+ 'interface/web/login/_templates_old/index.htm',
+ 'interface/web/login/_templates_old/password_reset.htm',
+ 'interface/web/mail/form/mail_box.tform.php',
+ 'interface/web/mail/form/mail_domain_alias.tform.php',
+ 'interface/web/mail/form/mail_domain_relay.tform.php',
+ 'interface/web/mail/form/_old_mail_domain_catchall.tform.php',
+ 'interface/web/mail/it.lng',
+ 'interface/web/mail/it_mail_alias_list.lng',
+ 'interface/web/mail/it_mail_alias.lng',
+ 'interface/web/mail/it_mail_blacklist_list.lng',
+ 'interface/web/mail/it_mail_blacklist.lng',
+ 'interface/web/mail/it_mail_content_filter_list.lng',
+ 'interface/web/mail/it_mail_content_filter.lng',
+ 'interface/web/mail/it_mail_domain_catchall_list.lng',
+ 'interface/web/mail/it_mail_domain_catchall.lng',
+ 'interface/web/mail/it_mail_domain_list.lng',
+ 'interface/web/mail/it_mail_domain.lng',
+ 'interface/web/mail/it_mail_forward_list.lng',
+ 'interface/web/mail/it_mail_forward.lng',
+ 'interface/web/mail/it_mail_get_list.lng',
+ 'interface/web/mail/it_mail_get.lng',
+ 'interface/web/mail/it_mail_spamfilter_list.lng',
+ 'interface/web/mail/it_mail_spamfilter.lng',
+ 'interface/web/mail/it_mail_transport_list.lng',
+ 'interface/web/mail/it_mail_transport.lng',
+ 'interface/web/mail/it_mail_user_filter_list.lng',
+ 'interface/web/mail/it_mail_user_filter.lng',
+ 'interface/web/mail/it_mail_user_list.lng',
+ 'interface/web/mail/it_mail_user.lng',
+ 'interface/web/mail/it_mail_user_stats_list.lng',
+ 'interface/web/mail/it_mail_whitelist_list.lng',
+ 'interface/web/mail/it_mail_whitelist.lng',
+ 'interface/web/mail/it_spamfilter_blacklist_list.lng',
+ 'interface/web/mail/it_spamfilter_blacklist.lng',
+ 'interface/web/mail/it_spamfilter_config_list.lng',
+ 'interface/web/mail/it_spamfilter_config.lng',
+ 'interface/web/mail/it_spamfilter_policy_list.lng',
+ 'interface/web/mail/it_spamfilter_policy.lng',
+ 'interface/web/mail/it_spamfilter_users_list.lng',
+ 'interface/web/mail/it_spamfilter_users.lng',
+ 'interface/web/mail/it_spamfilter_whitelist_list.lng',
+ 'interface/web/mail/it_spamfilter_whitelist.lng',
+ 'interface/web/mail/lib/lang/en_mail_box_list.lng',
+ 'interface/web/mail/lib/lang/en_mail_box.lng',
+ 'interface/web/mail/lib/lang/en_mail_domain_alias_list.lng',
+ 'interface/web/mail/lib/lang/en_mail_domain_alias.lng',
+ 'interface/web/mail/lib/lang/en_mail_domain_relay_list.lng',
+ 'interface/web/mail/lib/lang/en_mail_domain_relay.lng',
+ 'interface/web/mail/lib/lang/se_mail_box_list.lng',
+ 'interface/web/mail/lib/lang/se_mail_box.lng',
+ 'interface/web/mail/lib/lang/se_mail_domain_alias_list.lng',
+ 'interface/web/mail/lib/lang/se_mail_domain_alias.lng',
+ 'interface/web/mail/lib/lang/se_mail_domain_relay_list.lng',
+ 'interface/web/mail/lib/lang/se_mail_domain_relay.lng',
+ 'interface/web/mail/list/mail_box.list.php',
+ 'interface/web/mail/list/mail_domain_alias.list.php',
+ 'interface/web/mail/list/mail_domain_relay.list.php',
+ 'interface/web/mail/mail_box_del.php',
+ 'interface/web/mail/mail_box_edit.php',
+ 'interface/web/mail/mail_box_list.php',
+ 'interface/web/mail/mail_domain_alias_del.php',
+ 'interface/web/mail/mail_domain_alias_edit.php',
+ 'interface/web/mail/mail_domain_alias_list.php',
+ 'interface/web/mail/mail_domain_relay_del.php',
+ 'interface/web/mail/mail_domain_relay_edit.php',
+ 'interface/web/mail/mail_domain_relay_list.php',
+ 'interface/web/mail/mail_domain_route_del.php',
+ 'interface/web/mail/mail_domain_route_edit.php',
+ 'interface/web/mail/mail_domain_route_list.php',
+ 'interface/web/mail/templates/mail_box_autoresponder_edit.htm',
+ 'interface/web/mail/templates/mail_box_list.htm',
+ 'interface/web/mail/templates/mail_box_mailbox_edit.htm',
+ 'interface/web/mail/templates/mail_box_mailuser_edit.htm',
+ 'interface/web/mail/templates/mail_domain_alias_edit.htm',
+ 'interface/web/mail/templates/mail_domain_alias_list.htm',
+ 'interface/web/mail/templates/mail_domain_relay_edit.htm',
+ 'interface/web/mail/templates/mail_domain_relay_list.htm',
+ 'interface/web/mail/templates/mail_spamfilter_edit.htm',
+ 'interface/web/mail/templates/mail_spamfilter_list.htm',
+ 'interface/web/mail/templates/mail_user_mailuser_edit.htm',
+ 'interface/web/mail/_templates_old/mail_alias_edit.htm',
+ 'interface/web/mail/_templates_old/mail_alias_list.htm',
+ 'interface/web/mail/_templates_old/mail_blacklist_edit.htm',
+ 'interface/web/mail/_templates_old/mail_blacklist_list.htm',
+ 'interface/web/mail/_templates_old/mail_box_mailuser_edit.htm',
+ 'interface/web/mail/_templates_old/mail_content_filter_edit.htm',
+ 'interface/web/mail/_templates_old/mail_content_filter_list.htm',
+ 'interface/web/mail/_templates_old/mail_domain_catchall_edit.htm',
+ 'interface/web/mail/_templates_old/mail_domain_catchall_list.htm',
+ 'interface/web/mail/_templates_old/mail_domain_edit.htm',
+ 'interface/web/mail/_templates_old/mail_domain_list.htm',
+ 'interface/web/mail/_templates_old/mail_forward_edit.htm',
+ 'interface/web/mail/_templates_old/mail_forward_list.htm',
+ 'interface/web/mail/_templates_old/mail_get_edit.htm',
+ 'interface/web/mail/_templates_old/mail_get_list.htm',
+ 'interface/web/mail/_templates_old/mail_spamfilter_edit.htm',
+ 'interface/web/mail/_templates_old/mail_transport_edit.htm',
+ 'interface/web/mail/_templates_old/mail_transport_list.htm',
+ 'interface/web/mail/_templates_old/mail_user_autoresponder_edit.htm',
+ 'interface/web/mail/_templates_old/mail_user_custom_rules_edit.htm',
+ 'interface/web/mail/_templates_old/mail_user_filter_edit.htm',
+ 'interface/web/mail/_templates_old/mail_user_filter_list.htm',
+ 'interface/web/mail/_templates_old/mail_user_list.htm',
+ 'interface/web/mail/_templates_old/mail_user_mailbox_edit.htm',
+ 'interface/web/mail/_templates_old/mail_user_mailfilter_edit.htm',
+ 'interface/web/mail/_templates_old/mail_user_mailuser_edit.htm',
+ 'interface/web/mail/_templates_old/mail_user_stats_list.htm',
+ 'interface/web/mail/_templates_old/mail_whitelist_edit.htm',
+ 'interface/web/mail/_templates_old/mail_whitelist_list.htm',
+ 'interface/web/mail/_templates_old/spamfilter_blacklist_edit.htm',
+ 'interface/web/mail/_templates_old/spamfilter_blacklist_list.htm',
+ 'interface/web/mail/_templates_old/spamfilter_config_getmail_edit.htm',
+ 'interface/web/mail/_templates_old/spamfilter_config_list.htm',
+ 'interface/web/mail/_templates_old/spamfilter_config_mail_edit.htm',
+ 'interface/web/mail/_templates_old/spamfilter_config_server_edit.htm',
+ 'interface/web/mail/_templates_old/spamfilter_other_edit.htm',
+ 'interface/web/mail/_templates_old/spamfilter_policy_edit.htm',
+ 'interface/web/mail/_templates_old/spamfilter_policy_list.htm',
+ 'interface/web/mail/_templates_old/spamfilter_quarantine_edit.htm',
+ 'interface/web/mail/_templates_old/spamfilter_taglevel_edit.htm',
+ 'interface/web/mail/_templates_old/spamfilter_users_edit.htm',
+ 'interface/web/mail/_templates_old/spamfilter_users_list.htm',
+ 'interface/web/mail/_templates_old/spamfilter_whitelist_edit.htm',
+ 'interface/web/mail/_templates_old/spamfilter_whitelist_list.htm',
+ 'interface/web/media/thumbnails/thumb_3.png',
+ 'interface/web/monitor/logview.php',
+ 'interface/web/monitor/system.php',
+ 'interface/web/monitor/templates/logview.htm',
+ 'interface/web/monitor/_templates_old/logview.htm',
+ 'interface/web/monitor/_templates_old/system.htm',
+ 'interface/web/monitor/templates/system.htm',
+ 'interface/web/monitor/tools.inc.php',
+ 'interface/web/resellers/form/reseller.tform.php',
+ 'interface/web/resellers/lib/admin.conf.php',
+ 'interface/web/resellers/lib/lang/en.lng',
+ 'interface/web/resellers/lib/lang/en_reseller.lng',
+ 'interface/web/resellers/lib/lang/en_resellers_list.lng',
+ 'interface/web/resellers/lib/lang/en_users_list.lng',
+ 'interface/web/resellers/lib/lang/fr.lng',
+ 'interface/web/resellers/lib/lang/fr_reseller.lng',
+ 'interface/web/resellers/lib/lang/fr_resellers_list.lng',
+ 'interface/web/resellers/lib/lang/fr_users_list.lng',
+ 'interface/web/resellers/lib/lang/se.lng',
+ 'interface/web/resellers/lib/lang/se_reseller.lng',
+ 'interface/web/resellers/lib/lang/se_resellers_list.lng',
+ 'interface/web/resellers/lib/lang/se_users_list.lng',
+ 'interface/web/resellers/lib/module.conf.php',
+ 'interface/web/resellers/list/reseller.list.php',
+ 'interface/web/resellers/list/users.list.php',
+ 'interface/web/resellers/reseller_del.php',
+ 'interface/web/resellers/reseller_edit.php',
+ 'interface/web/resellers/reseller_list.php',
+ 'interface/web/resellers/templates/paging.tpl.htm',
+ 'interface/web/resellers/templates/reseller_edit_address.htm',
+ 'interface/web/resellers/templates/reseller_edit_ipaddress.htm',
+ 'interface/web/resellers/templates/reseller_edit_limits.htm',
+ 'interface/web/resellers/templates/reseller_edit_users.htm',
+ 'interface/web/resellers/templates/resellers_list.htm',
+ 'interface/web/resellers/templates/users_list.htm',
+ 'interface/web/sandbox-remote_client/class.ispconfig.remote.client.php',
+ 'interface/web/sandbox-remote_client/README.txt',
+ 'interface/web/sites/ajax_get_fastcgi_php_versions.php',
+ 'interface/web/sites/aps_install_package.php.bak',
+ 'interface/web/sites/form/mail_alias.tform.php',
+ 'interface/web/sites/form/mail_blacklist.tform.php',
+ 'interface/web/sites/form/mail_box.tform.php',
+ 'interface/web/sites/form/mail_domain_alias.tform.php',
+ 'interface/web/sites/form/mail_domain_catchall.tform.php',
+ 'interface/web/sites/form/mail_domain_relay.tform.php',
+ 'interface/web/sites/form/mail_domain.tform.php',
+ 'interface/web/sites/form/mail_forward.tform.php',
+ 'interface/web/sites/form/mail_whitelist.tform.php',
+ 'interface/web/sites/form/web_aliasdomain.tform.php',
+ 'interface/web/sites/form/web_domain.tform.php',
+ 'interface/web/sites/form/web_folder.tform.php.bak',
+ 'interface/web/sites/form/web_subdomain.tform.php',
+ 'interface/web/sites/form/web_vhost_aliasdomain.tform.php',
+ 'interface/web/sites/form/web_vhost_subdomain.tform.php',
+ 'interface/web/sites/lib/lang/ar_web_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/ar_web_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/ar_web_domain_admin_list.lng',
+ 'interface/web/sites/lib/lang/ar_web_domain_list.lng',
+ 'interface/web/sites/lib/lang/ar_web_domain.lng',
+ 'interface/web/sites/lib/lang/ar_web_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/ar_web_subdomain.lng',
+ 'interface/web/sites/lib/lang/ar_web_vhost_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/ar_web_vhost_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/ar_web_vhost_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/ar_web_vhost_subdomain.lng',
+ 'interface/web/sites/lib/lang/bg_web_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/bg_web_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/bg_web_domain_admin_list.lng',
+ 'interface/web/sites/lib/lang/bg_web_domain_list.lng',
+ 'interface/web/sites/lib/lang/bg_web_domain.lng',
+ 'interface/web/sites/lib/lang/bg_web_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/bg_web_subdomain.lng',
+ 'interface/web/sites/lib/lang/bg_web_vhost_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/bg_web_vhost_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/bg_web_vhost_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/bg_web_vhost_subdomain.lng',
+ 'interface/web/sites/lib/lang/br_web_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/br_web_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/br_web_domain_admin_list.lng',
+ 'interface/web/sites/lib/lang/br_web_domain_list.lng',
+ 'interface/web/sites/lib/lang/br_web_domain.lng',
+ 'interface/web/sites/lib/lang/br_web_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/br_web_subdomain.lng',
+ 'interface/web/sites/lib/lang/br_web_vhost_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/br_web_vhost_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/br_web_vhost_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/br_web_vhost_subdomain.lng',
+ 'interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/cz_web_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/cz_web_domain_admin_list.lng',
+ 'interface/web/sites/lib/lang/cz_web_domain_list.lng',
+ 'interface/web/sites/lib/lang/cz_web_domain.lng',
+ 'interface/web/sites/lib/lang/cz_web_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/cz_web_subdomain.lng',
+ 'interface/web/sites/lib/lang/cz_web_vhost_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/cz_web_vhost_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng',
+ 'interface/web/sites/lib/lang/de_web_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/de_web_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/de_web_domain_admin_list.lng',
+ 'interface/web/sites/lib/lang/de_web_domain_list.lng',
+ 'interface/web/sites/lib/lang/de_web_domain.lng',
+ 'interface/web/sites/lib/lang/de_web_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/de_web_subdomain.lng',
+ 'interface/web/sites/lib/lang/de_web_vhost_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/de_web_vhost_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/de_web_vhost_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/de_web_vhost_subdomain.lng',
+ 'interface/web/sites/lib/lang/el_web_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/el_web_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/el_web_domain_admin_list.lng',
+ 'interface/web/sites/lib/lang/el_web_domain_list.lng',
+ 'interface/web/sites/lib/lang/el_web_domain.lng',
+ 'interface/web/sites/lib/lang/el_web_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/el_web_subdomain.lng',
+ 'interface/web/sites/lib/lang/el_web_vhost_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/el_web_vhost_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/el_web_vhost_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/el_web_vhost_subdomain.lng',
+ 'interface/web/sites/lib/lang/en_mail_alias_list.lng',
+ 'interface/web/sites/lib/lang/en_mail_alias.lng',
+ 'interface/web/sites/lib/lang/en_mail_blacklist_list.lng',
+ 'interface/web/sites/lib/lang/en_mail_blacklist.lng',
+ 'interface/web/sites/lib/lang/en_mail_box_list.lng',
+ 'interface/web/sites/lib/lang/en_mail_box.lng',
+ 'interface/web/sites/lib/lang/en_mail_domain_alias_list.lng',
+ 'interface/web/sites/lib/lang/en_mail_domain_alias.lng',
+ 'interface/web/sites/lib/lang/en_mail_domain_catchall_list.lng',
+ 'interface/web/sites/lib/lang/en_mail_domain_catchall.lng',
+ 'interface/web/sites/lib/lang/en_mail_domain_list.lng',
+ 'interface/web/sites/lib/lang/en_mail_domain.lng',
+ 'interface/web/sites/lib/lang/en_mail_domain_relay_list.lng',
+ 'interface/web/sites/lib/lang/en_mail_domain_relay.lng',
+ 'interface/web/sites/lib/lang/en_mail_forward_list.lng',
+ 'interface/web/sites/lib/lang/en_mail_forward.lng',
+ 'interface/web/sites/lib/lang/en_mail_whitelist_list.lng',
+ 'interface/web/sites/lib/lang/en_mail_whitelist.lng',
+ 'interface/web/sites/lib/lang/en_web_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/en_web_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/en_web_domain_admin_list.lng',
+ 'interface/web/sites/lib/lang/en_web_domain_list.lng',
+ 'interface/web/sites/lib/lang/en_web_domain.lng',
+ 'interface/web/sites/lib/lang/en_web_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/en_web_subdomain.lng',
+ 'interface/web/sites/lib/lang/en_web_vhost_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/en_web_vhost_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/en_web_vhost_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/en_web_vhost_subdomain.lng',
+ 'interface/web/sites/lib/lang/es_web_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/es_web_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/es_web_domain_admin_list.lng',
+ 'interface/web/sites/lib/lang/es_web_domain_list.lng',
+ 'interface/web/sites/lib/lang/es_web_domain.lng',
+ 'interface/web/sites/lib/lang/es_web_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/es_web_subdomain.lng',
+ 'interface/web/sites/lib/lang/es_web_vhost_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/es_web_vhost_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/es_web_vhost_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/es_web_vhost_subdomain.lng',
+ 'interface/web/sites/lib/lang/fi_web_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/fi_web_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/fi_web_domain_admin_list.lng',
+ 'interface/web/sites/lib/lang/fi_web_domain_list.lng',
+ 'interface/web/sites/lib/lang/fi_web_domain.lng',
+ 'interface/web/sites/lib/lang/fi_web_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/fi_web_subdomain.lng',
+ 'interface/web/sites/lib/lang/fi_web_vhost_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/fi_web_vhost_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/fi_web_vhost_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/fi_web_vhost_subdomain.lng',
+ 'interface/web/sites/lib/lang/fr_mail_domain_list.lng',
+ 'interface/web/sites/lib/lang/fr_mail_domain.lng',
+ 'interface/web/sites/lib/lang/fr_web_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/fr_web_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/fr_web_domain_admin_list.lng',
+ 'interface/web/sites/lib/lang/fr_web_domain_list.lng',
+ 'interface/web/sites/lib/lang/fr_web_domain.lng',
+ 'interface/web/sites/lib/lang/fr_web_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/fr_web_subdomain.lng',
+ 'interface/web/sites/lib/lang/fr_web_vhost_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/fr_web_vhost_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/fr_web_vhost_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/fr_web_vhost_subdomain.lng',
+ 'interface/web/sites/lib/lang/hr_web_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/hr_web_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/hr_web_domain_admin_list.lng',
+ 'interface/web/sites/lib/lang/hr_web_domain_list.lng',
+ 'interface/web/sites/lib/lang/hr_web_domain.lng',
+ 'interface/web/sites/lib/lang/hr_web_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/hr_web_subdomain.lng',
+ 'interface/web/sites/lib/lang/hr_web_vhost_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/hr_web_vhost_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/hr_web_vhost_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/hr_web_vhost_subdomain.lng',
+ 'interface/web/sites/lib/lang/hu_web_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/hu_web_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/hu_web_domain_admin_list.lng',
+ 'interface/web/sites/lib/lang/hu_web_domain_list.lng',
+ 'interface/web/sites/lib/lang/hu_web_domain.lng',
+ 'interface/web/sites/lib/lang/hu_web_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/hu_web_subdomain.lng',
+ 'interface/web/sites/lib/lang/hu_web_vhost_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/hu_web_vhost_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/hu_web_vhost_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/hu_web_vhost_subdomain.lng',
+ 'interface/web/sites/lib/lang/id_web_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/id_web_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/id_web_domain_admin_list.lng',
+ 'interface/web/sites/lib/lang/id_web_domain_list.lng',
+ 'interface/web/sites/lib/lang/id_web_domain.lng',
+ 'interface/web/sites/lib/lang/id_web_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/id_web_subdomain.lng',
+ 'interface/web/sites/lib/lang/id_web_vhost_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/id_web_vhost_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/id_web_vhost_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/id_web_vhost_subdomain.lng',
+ 'interface/web/sites/lib/lang/it_web_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/it_web_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/it_web_domain_admin_list.lng',
+ 'interface/web/sites/lib/lang/it_web_domain_list.lng',
+ 'interface/web/sites/lib/lang/it_web_domain.lng',
+ 'interface/web/sites/lib/lang/it_web_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/it_web_subdomain.lng',
+ 'interface/web/sites/lib/lang/it_web_vhost_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/it_web_vhost_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/it_web_vhost_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/it_web_vhost_subdomain.lng',
+ 'interface/web/sites/lib/lang/ja_web_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/ja_web_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/ja_web_domain_admin_list.lng',
+ 'interface/web/sites/lib/lang/ja_web_domain_list.lng',
+ 'interface/web/sites/lib/lang/ja_web_domain.lng',
+ 'interface/web/sites/lib/lang/ja_web_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/ja_web_subdomain.lng',
+ 'interface/web/sites/lib/lang/ja_web_vhost_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/ja_web_vhost_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/ja_web_vhost_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/ja_web_vhost_subdomain.lng',
+ 'interface/web/sites/lib/lang/nl_web_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/nl_web_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/nl_web_domain_admin_list.lng',
+ 'interface/web/sites/lib/lang/nl_web_domain_list.lng',
+ 'interface/web/sites/lib/lang/nl_web_domain.lng',
+ 'interface/web/sites/lib/lang/nl_web_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/nl_web_subdomain.lng',
+ 'interface/web/sites/lib/lang/nl_web_vhost_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/nl_web_vhost_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/nl_web_vhost_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/nl_web_vhost_subdomain.lng',
+ 'interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/pl_web_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/pl_web_domain_admin_list.lng',
+ 'interface/web/sites/lib/lang/pl_web_domain_list.lng',
+ 'interface/web/sites/lib/lang/pl_web_domain.lng',
+ 'interface/web/sites/lib/lang/pl_web_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/pl_web_subdomain.lng',
+ 'interface/web/sites/lib/lang/pl_web_vhost_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/pl_web_vhost_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/pl_web_vhost_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng',
+ 'interface/web/sites/lib/lang/pt_web_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/pt_web_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/pt_web_domain_admin_list.lng',
+ 'interface/web/sites/lib/lang/pt_web_domain_list.lng',
+ 'interface/web/sites/lib/lang/pt_web_domain.lng',
+ 'interface/web/sites/lib/lang/pt_web_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/pt_web_subdomain.lng',
+ 'interface/web/sites/lib/lang/pt_web_vhost_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/pt_web_vhost_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/pt_web_vhost_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/pt_web_vhost_subdomain.lng',
+ 'interface/web/sites/lib/lang/ro_web_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/ro_web_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/ro_web_domain_admin_list.lng',
+ 'interface/web/sites/lib/lang/ro_web_domain_list.lng',
+ 'interface/web/sites/lib/lang/ro_web_domain.lng',
+ 'interface/web/sites/lib/lang/ro_web_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/ro_web_subdomain.lng',
+ 'interface/web/sites/lib/lang/ro_web_vhost_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/ro_web_vhost_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/ro_web_vhost_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/ro_web_vhost_subdomain.lng',
+ 'interface/web/sites/lib/lang/ru_web_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/ru_web_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/ru_web_domain_admin_list.lng',
+ 'interface/web/sites/lib/lang/ru_web_domain_list.lng',
+ 'interface/web/sites/lib/lang/ru_web_domain.lng',
+ 'interface/web/sites/lib/lang/ru_web_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/ru_web_subdomain.lng',
+ 'interface/web/sites/lib/lang/ru_web_vhost_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/ru_web_vhost_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/ru_web_vhost_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/ru_web_vhost_subdomain.lng',
+ 'interface/web/sites/lib/lang/se_mail_alias_list.lng',
+ 'interface/web/sites/lib/lang/se_mail_alias.lng',
+ 'interface/web/sites/lib/lang/se_mail_blacklist_list.lng',
+ 'interface/web/sites/lib/lang/se_mail_blacklist.lng',
+ 'interface/web/sites/lib/lang/se_mail_box_list.lng',
+ 'interface/web/sites/lib/lang/se_mail_box.lng',
+ 'interface/web/sites/lib/lang/se_mail_domain_alias_list.lng',
+ 'interface/web/sites/lib/lang/se_mail_domain_alias.lng',
+ 'interface/web/sites/lib/lang/se_mail_domain_catchall_list.lng',
+ 'interface/web/sites/lib/lang/se_mail_domain_catchall.lng',
+ 'interface/web/sites/lib/lang/se_mail_domain_list.lng',
+ 'interface/web/sites/lib/lang/se_mail_domain.lng',
+ 'interface/web/sites/lib/lang/se_mail_domain_relay_list.lng',
+ 'interface/web/sites/lib/lang/se_mail_domain_relay.lng',
+ 'interface/web/sites/lib/lang/se_mail_forward_list.lng',
+ 'interface/web/sites/lib/lang/se_mail_forward.lng',
+ 'interface/web/sites/lib/lang/se_mail_whitelist_list.lng',
+ 'interface/web/sites/lib/lang/se_mail_whitelist.lng',
+ 'interface/web/sites/lib/lang/se_web_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/se_web_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/se_web_domain_admin_list.lng',
+ 'interface/web/sites/lib/lang/se_web_domain_list.lng',
+ 'interface/web/sites/lib/lang/se_web_domain.lng',
+ 'interface/web/sites/lib/lang/se_web_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/se_web_subdomain.lng',
+ 'interface/web/sites/lib/lang/se_web_vhost_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/se_web_vhost_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/se_web_vhost_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/se_web_vhost_subdomain.lng',
+ 'interface/web/sites/lib/lang/sk_web_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/sk_web_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/sk_web_domain_admin_list.lng',
+ 'interface/web/sites/lib/lang/sk_web_domain_list.lng',
+ 'interface/web/sites/lib/lang/sk_web_domain.lng',
+ 'interface/web/sites/lib/lang/sk_web_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/sk_web_subdomain.lng',
+ 'interface/web/sites/lib/lang/sk_web_vhost_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/sk_web_vhost_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/sk_web_vhost_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/sk_web_vhost_subdomain.lng',
+ 'interface/web/sites/lib/lang/tr_web_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/tr_web_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/tr_web_domain_admin_list.lng',
+ 'interface/web/sites/lib/lang/tr_web_domain_list.lng',
+ 'interface/web/sites/lib/lang/tr_web_domain.lng',
+ 'interface/web/sites/lib/lang/tr_web_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/tr_web_subdomain.lng',
+ 'interface/web/sites/lib/lang/tr_web_vhost_aliasdomain_list.lng',
+ 'interface/web/sites/lib/lang/tr_web_vhost_aliasdomain.lng',
+ 'interface/web/sites/lib/lang/tr_web_vhost_subdomain_list.lng',
+ 'interface/web/sites/lib/lang/tr_web_vhost_subdomain.lng',
+ 'interface/web/sites/list/mail_alias.list.php',
+ 'interface/web/sites/list/mail_blacklist.list.php',
+ 'interface/web/sites/list/mail_box.list.php',
+ 'interface/web/sites/list/mail_domain_alias.list.php',
+ 'interface/web/sites/list/mail_domain_catchall.list.php',
+ 'interface/web/sites/list/mail_domain.list.php',
+ 'interface/web/sites/list/mail_domain_relay.list.php',
+ 'interface/web/sites/list/mail_forward.list.php',
+ 'interface/web/sites/list/mail_whitelist.list.php',
+ 'interface/web/sites/list/web_aliasdomain.list.php',
+ 'interface/web/sites/list/web_domain.list.php',
+ 'interface/web/sites/list/web_folder.list.php.bak',
+ 'interface/web/sites/list/web_subdomain.list.php',
+ 'interface/web/sites/list/web_vhost_aliasdomain.list.php',
+ 'interface/web/sites/list/web_vhost_subdomain.list.php',
+ 'interface/web/sites/mail_alias_del.php',
+ 'interface/web/sites/mail_alias_edit.php',
+ 'interface/web/sites/mail_alias_list.php',
+ 'interface/web/sites/mail_blacklist_del.php',
+ 'interface/web/sites/mail_blacklist_edit.php',
+ 'interface/web/sites/mail_blacklist_list.php',
+ 'interface/web/sites/mail_box_del.php',
+ 'interface/web/sites/mail_box_edit.php',
+ 'interface/web/sites/mail_box_list.php',
+ 'interface/web/sites/mail_domain_alias_del.php',
+ 'interface/web/sites/mail_domain_alias_edit.php',
+ 'interface/web/sites/mail_domain_alias_list.php',
+ 'interface/web/sites/mail_domain_catchall_del.php',
+ 'interface/web/sites/mail_domain_catchall_edit.php',
+ 'interface/web/sites/mail_domain_catchall_list.php',
+ 'interface/web/sites/mail_domain_del.php',
+ 'interface/web/sites/mail_domain_edit.php',
+ 'interface/web/sites/mail_domain_list.php',
+ 'interface/web/sites/mail_domain_relay_del.php',
+ 'interface/web/sites/mail_domain_relay_edit.php',
+ 'interface/web/sites/mail_domain_relay_list.php',
+ 'interface/web/sites/mail_forward_del.php',
+ 'interface/web/sites/mail_forward_edit.php',
+ 'interface/web/sites/mail_forward_list.php',
+ 'interface/web/sites/mail_whitelist_del.php',
+ 'interface/web/sites/mail_whitelist_edit.php',
+ 'interface/web/sites/mail_whitelist_list.php',
+ 'interface/web/sites/templates/mail_alias_edit.htm',
+ 'interface/web/sites/templates/mail_alias_list.htm',
+ 'interface/web/sites/templates/mail_blacklist_edit.htm',
+ 'interface/web/sites/templates/mail_blacklist_list.htm',
+ 'interface/web/sites/templates/mail_box_autoresponder_edit.htm',
+ 'interface/web/sites/templates/mail_box_list.htm',
+ 'interface/web/sites/templates/mail_box_mailbox_edit.htm',
+ 'interface/web/sites/templates/mail_domain_alias_edit.htm',
+ 'interface/web/sites/templates/mail_domain_alias_list.htm',
+ 'interface/web/sites/templates/mail_domain_catchall_edit.htm',
+ 'interface/web/sites/templates/mail_domain_catchall_list.htm',
+ 'interface/web/sites/templates/mail_domain_edit.htm',
+ 'interface/web/sites/templates/mail_domain_list.htm',
+ 'interface/web/sites/templates/mail_domain_relay_edit.htm',
+ 'interface/web/sites/templates/mail_domain_relay_list.htm',
+ 'interface/web/sites/templates/mail_forward_edit.htm',
+ 'interface/web/sites/templates/mail_forward_list.htm',
+ 'interface/web/sites/templates/mail_whitelist_edit.htm',
+ 'interface/web/sites/templates/mail_whitelist_list.htm',
+ 'interface/web/sites/_templates_old/database_edit.htm',
+ 'interface/web/sites/_templates_old/database_list.htm',
+ 'interface/web/sites/_templates_old/ftp_user_advanced.htm',
+ 'interface/web/sites/_templates_old/ftp_user_edit.htm',
+ 'interface/web/sites/_templates_old/ftp_user_list.htm',
+ 'interface/web/sites/_templates_old/shell_user_advanced.htm',
+ 'interface/web/sites/_templates_old/shell_user_edit.htm',
+ 'interface/web/sites/_templates_old/shell_user_list.htm',
+ 'interface/web/sites/_templates_old/web_aliasdomain_edit.htm',
+ 'interface/web/sites/_templates_old/web_aliasdomain_list.htm',
+ 'interface/web/sites/_templates_old/web_domain_advanced.htm',
+ 'interface/web/sites/_templates_old/web_domain_edit.htm',
+ 'interface/web/sites/_templates_old/web_domain_list.htm',
+ 'interface/web/sites/_templates_old/web_domain_redirect.htm',
+ 'interface/web/sites/_templates_old/web_domain_ssl.htm',
+ 'interface/web/sites/_templates_old/web_subdomain_edit.htm',
+ 'interface/web/sites/_templates_old/web_subdomain_list.htm',
+ 'interface/web/sites/templates/web_aliasdomain_advanced.htm',
+ 'interface/web/sites/templates/web_aliasdomain_edit.htm',
+ 'interface/web/sites/templates/web_aliasdomain_list.htm',
+ 'interface/web/sites/templates/web_domain_admin_list.htm',
+ 'interface/web/sites/templates/web_domain_advanced.htm',
+ 'interface/web/sites/templates/web_domain_backup.htm',
+ 'interface/web/sites/templates/web_domain_edit.htm',
+ 'interface/web/sites/templates/web_domain_list.htm',
+ 'interface/web/sites/templates/web_domain_logs.htm',
+ 'interface/web/sites/templates/web_domain_redirect.htm',
+ 'interface/web/sites/templates/web_domain_ssl.htm',
+ 'interface/web/sites/templates/web_domain_stats.htm',
+ 'interface/web/sites/templates/web_sites_stats_list.htm.bak',
+ 'interface/web/sites/templates/web_subdomain_advanced.htm',
+ 'interface/web/sites/templates/web_subdomain_edit.htm',
+ 'interface/web/sites/templates/web_subdomain_list.htm',
+ 'interface/web/sites/templates/web_vhost_aliasdomain_advanced.htm',
+ 'interface/web/sites/templates/web_vhost_aliasdomain_backup.htm',
+ 'interface/web/sites/templates/web_vhost_aliasdomain_edit.htm',
+ 'interface/web/sites/templates/web_vhost_aliasdomain_list.htm',
+ 'interface/web/sites/templates/web_vhost_aliasdomain_redirect.htm',
+ 'interface/web/sites/templates/web_vhost_aliasdomain_ssl.htm',
+ 'interface/web/sites/templates/web_vhost_aliasdomain_stats.htm',
+ 'interface/web/sites/templates/web_vhost_subdomain_advanced.htm',
+ 'interface/web/sites/templates/web_vhost_subdomain_backup.htm',
+ 'interface/web/sites/templates/web_vhost_subdomain_edit.htm',
+ 'interface/web/sites/templates/web_vhost_subdomain_list.htm',
+ 'interface/web/sites/templates/web_vhost_subdomain_redirect.htm',
+ 'interface/web/sites/templates/web_vhost_subdomain_ssl.htm',
+ 'interface/web/sites/templates/web_vhost_subdomain_stats.htm',
+ 'interface/web/sites/tools.inc.php',
+ 'interface/web/sites/web_aliasdomain_edit.php.bak',
+ 'interface/web/sites/web_domain_del.php',
+ 'interface/web/sites/web_domain_edit.php',
+ 'interface/web/sites/web_domain_edit.php.bak',
+ 'interface/web/sites/web_domain_list.php',
+ 'interface/web/sites/web_sites_stats.php.bak',
+ 'interface/web/sites/web_vhost_aliasdomain_del.php',
+ 'interface/web/sites/web_vhost_aliasdomain_edit.php',
+ 'interface/web/sites/web_vhost_aliasdomain_list.php',
+ 'interface/web/sites/web_vhost_subdomain_del.php',
+ 'interface/web/sites/web_vhost_subdomain_edit.php',
+ 'interface/web/sites/web_vhost_subdomain_list.php',
+ 'interface/web/strengthmeter/lib/lang/bg_javascript.lng',
+ 'interface/web/strengthmeter/lib/lang/de_javascript.lng',
+ 'interface/web/strengthmeter/lib/lang/en_javascript.lng',
+ 'interface/web/strengthmeter/lib/lang/es_javascript.lng',
+ 'interface/web/strengthmeter/lib/lang/fi_javascript.lng',
+ 'interface/web/strengthmeter/lib/lang/fr_javascript.lng',
+ 'interface/web/strengthmeter/lib/lang/it_javascript.lng',
+ 'interface/web/strengthmeter/lib/lang/nl_javascript.lng',
+ 'interface/web/strengthmeter/lib/lang/ru_javascript.lng',
+ 'interface/web/strengthmeter/lib/lang/se_javascript.lng',
+ 'interface/web/temp/en.lng',
+ 'interface/web/test/form/test.tform.php',
+ 'interface/web/test/lib/admin.conf.php',
+ 'interface/web/test/lib/lang/de_test.lng',
+ 'interface/web/test/lib/module.conf.php',
+ 'interface/web/test/templates/test_edit_adresse.htm',
+ 'interface/web/test/test_edit.php',
+ 'interface/web/test.txt',
+ 'interface/web/tools/default-v2_settings.php',
+ 'interface/web/tools/dns_resync.php',
+ 'interface/web/tools/form/default-v2_settings.tform.php',
+ 'interface/web/tools/form/tpl_default-v2.tform.php',
+ 'interface/web/tools/lib/interface.d/default-v2.menu.php',
+ 'interface/web/tools/lib/interface.d/tpl_default-v2.menu.php',
+ 'interface/web/tools/lib/lang/ar_tpl_default-v2.lng',
+ 'interface/web/tools/lib/lang/bg_tpl_default-v2.lng',
+ 'interface/web/tools/lib/lang/br_tpl_default-v2.lng',
+ 'interface/web/tools/lib/lang/cz_tpl_default-v2.lng',
+ 'interface/web/tools/lib/lang/de_default-v2.lng',
+ 'interface/web/tools/lib/lang/de_tpl_default-v2.lng',
+ 'interface/web/tools/lib/lang/el_tpl_default-v2.lng',
+ 'interface/web/tools/lib/lang/en_default-v2.lng',
+ 'interface/web/tools/lib/lang/en_tpl_default-v2.lng',
+ 'interface/web/tools/lib/lang/es_tpl_default-v2.lng',
+ 'interface/web/tools/lib/lang/fi_tpl_default-v2.lng',
+ 'interface/web/tools/lib/lang/fr_tpl_default-v2.lng',
+ 'interface/web/tools/lib/lang/hr_tpl_default-v2.lng',
+ 'interface/web/tools/lib/lang/hu_tpl_default-v2.lng',
+ 'interface/web/tools/lib/lang/id_tpl_default-v2.lng',
+ 'interface/web/tools/lib/lang/it_tpl_default-v2.lng',
+ 'interface/web/tools/lib/lang/ja_tpl_default-v2.lng',
+ 'interface/web/tools/lib/lang/nl_tpl_default-v2.lng',
+ 'interface/web/tools/lib/lang/pl_tpl_default-v2.lng',
+ 'interface/web/tools/lib/lang/pt_tpl_default-v2.lng',
+ 'interface/web/tools/lib/lang/ro_tpl_default-v2.lng',
+ 'interface/web/tools/lib/lang/ru_tpl_default-v2.lng',
+ 'interface/web/tools/lib/lang/se_tpl_default-v2.lng',
+ 'interface/web/tools/lib/lang/sk_tpl_default-v2.lng',
+ 'interface/web/tools/lib/lang/tr_tpl_default-v2.lng',
+ 'interface/web/tools/lib/menu.d/dns_resync.menu.php',
+ 'interface/web/tools/templates/default-v2_settings.htm',
+ 'interface/web/tools/templates/dns_resync.htm',
+ 'interface/web/tools/_templates_old/user_settings.htm',
+ 'interface/web/tools/templates/tpl_default-v2.htm',
+ 'interface/web/tools/tpl_default-v2.php',
+ 'server/conf/apache.conf.master',
+ 'server/conf-custom/index/favicon.ico',
+ 'server/conf-custom/index/robots.txt',
+ 'server/conf/error/br/authorizationRequired.html',
+ 'server/conf/error/br/fileNotFound.html',
+ 'server/conf/error/br/forbidden.html',
+ 'server/conf/error/br/internalServerError.html',
+ 'server/conf/error/br/invalidSyntax.html',
+ 'server/conf/error/br/methodNotAllowed.html',
+ 'server/conf/error/br/overloaded.html',
+ 'server/conf/error/cz/authorizationRequired.html',
+ 'server/conf/error/cz/fileNotFound.html',
+ 'server/conf/error/cz/forbidden.html',
+ 'server/conf/error/cz/internalServerError.html',
+ 'server/conf/error/cz/invalidSyntax.html',
+ 'server/conf/error/cz/methodNotAllowed.html',
+ 'server/conf/error/cz/overloaded.html',
+ 'server/conf/error/de/authorizationRequired.html',
+ 'server/conf/error/de/fileNotFound.html',
+ 'server/conf/error/de/forbidden.html',
+ 'server/conf/error/de/internalServerError.html',
+ 'server/conf/error/de/invalidSyntax.html',
+ 'server/conf/error/de/methodNotAllowed.html',
+ 'server/conf/error/de/overloaded.html',
+ 'server/conf/error/en/authorizationRequired.html',
+ 'server/conf/error/en/fileNotFound.html',
+ 'server/conf/error/en/forbidden.html',
+ 'server/conf/error/en/internalServerError.html',
+ 'server/conf/error/en/invalidSyntax.html',
+ 'server/conf/error/en/methodNotAllowed.html',
+ 'server/conf/error/en/overloaded.html',
+ 'server/conf/error/es/authorizationRequired.html',
+ 'server/conf/error/es/fileNotFound.html',
+ 'server/conf/error/es/forbidden.html',
+ 'server/conf/error/es/internalServerError.html',
+ 'server/conf/error/es/invalidSyntax.html',
+ 'server/conf/error/es/methodNotAllowed.html',
+ 'server/conf/error/es/overloaded.html',
+ 'server/conf/error/fr/authorizationRequired.html',
+ 'server/conf/error/fr/fileNotFound.html',
+ 'server/conf/error/fr/forbidden.html',
+ 'server/conf/error/fr/internalServerError.html',
+ 'server/conf/error/fr/invalidSyntax.html',
+ 'server/conf/error/fr/methodNotAllowed.html',
+ 'server/conf/error/fr/overloaded.html',
+ 'server/conf/error/gr/authorizationRequired.html',
+ 'server/conf/error/gr/fileNotFound.html',
+ 'server/conf/error/gr/forbidden.html',
+ 'server/conf/error/gr/internalServerError.html',
+ 'server/conf/error/gr/invalidSyntax.html',
+ 'server/conf/error/gr/methodNotAllowed.html',
+ 'server/conf/error/gr/overloaded.html',
+ 'server/conf/error/hu/authorizationRequired.html',
+ 'server/conf/error/hu/fileNotFound.html',
+ 'server/conf/error/hu/forbidden.html',
+ 'server/conf/error/hu/internalServerError.html',
+ 'server/conf/error/hu/invalidSyntax.html',
+ 'server/conf/error/hu/methodNotAllowed.html',
+ 'server/conf/error/hu/overloaded.html',
+ 'server/conf/error/it/authorizationRequired.html',
+ 'server/conf/error/it/fileNotFound.html',
+ 'server/conf/error/it/forbidden.html',
+ 'server/conf/error/it/internalServerError.html',
+ 'server/conf/error/it/invalidSyntax.html',
+ 'server/conf/error/it/methodNotAllowed.html',
+ 'server/conf/error/it/overloaded.html',
+ 'server/conf/error/nl/authorizationRequired.html',
+ 'server/conf/error/nl/fileNotFound.html',
+ 'server/conf/error/nl/forbidden.html',
+ 'server/conf/error/nl/internalServerError.html',
+ 'server/conf/error/nl/invalidSyntax.html',
+ 'server/conf/error/nl/methodNotAllowed.html',
+ 'server/conf/error/nl/overloaded.html',
+ 'server/conf/error/pl/authorizationRequired.html',
+ 'server/conf/error/pl/fileNotFound.html',
+ 'server/conf/error/pl/forbidden.html',
+ 'server/conf/error/pl/internalServerError.html',
+ 'server/conf/error/pl/invalidSyntax.html',
+ 'server/conf/error/pl/methodNotAllowed.html',
+ 'server/conf/error/pl/overloaded.html',
+ 'server/conf/error/se/authorizationRequired.html',
+ 'server/conf/error/se/fileNotFound.html',
+ 'server/conf/error/se/forbidden.html',
+ 'server/conf/error/se/internalServerError.html',
+ 'server/conf/error/se/invalidSyntax.html',
+ 'server/conf/error/se/methodNotAllowed.html',
+ 'server/conf/error/se/overloaded.html',
+ 'server/conf/error/si/authorizationRequired.html',
+ 'server/conf/error/si/fileNotFound.html',
+ 'server/conf/error/si/forbidden.html',
+ 'server/conf/error/si/internalServerError.html',
+ 'server/conf/error/si/invalidSyntax.html',
+ 'server/conf/error/si/methodNotAllowed.html',
+ 'server/conf/error/si/overloaded.html',
+ 'server/conf/error/sr/authorizationRequired.html',
+ 'server/conf/error/sr/fileNotFound.html',
+ 'server/conf/error/sr/forbidden.html',
+ 'server/conf/error/sr/internalServerError.html',
+ 'server/conf/error/sr/invalidSyntax.html',
+ 'server/conf/error/sr/methodNotAllowed.html',
+ 'server/conf/error/sr/overloaded.html',
+ 'server/conf/nginx_reverseproxy_rewrites.conf.master',
+ 'server/conf/nginx_reverseproxy_vhost.conf.master',
+ 'server/conf/nginx_rewrites.conf.master',
+ 'server/conf/squidRewriteRules.py.master',
+ 'server/conf/ufw.before.rules.master',
+ 'server/conf/ufw.conf.master',
+ 'server/conf/ufw.default.master',
+ 'server/ispconfig.log',
+ 'server/lib/classes/aps_installer.inc.php.bak',
+ 'server/lib/config.inc.php',
+ 'server/mods-available/mail.module.php',
+ 'server/plugins-available/shelluser_plugin.inc.php',
+ 'server/plugins-available/ufw_firewall_plugin.inc.php',
+ 'server/scripts/getmail.sh
+ ');
+
+ $curpath = dirname(dirname(realpath(dirname(__FILE__))));
+
+ $c = 0;
+ $del_all = false;
+ foreach($delete as $file) {
+ if(strpos($file, '..') !== false) continue; // security!
+
+ if($del_all == false) {
+ $answer = $inst->simple_query('Delete obsolete file ' . $file . '?', array('y', 'n', 'a', 'all', 'none'), 'y');
+ if($answer == 'n') continue;
+ elseif($answer == 'a' || $answer == 'all') $del_all = true;
+ elseif($answer == 'none') break;
+ }
+ if(@is_file('/usr/local/ispconfig/' . $file) && !@is_file($curpath . '/' . $file)) {
+ // be sure this is not a file contained in installation!
+ @unlink('/usr/local/ispconfig/' . $file);
+ ilog('Deleted obsolete file /usr/local/ispconfig/' . $file);
+ $c++;
+ }
+ }
+ ilog($c . 'obsolete files deleted.');
+ }
+}
+
+?>
diff --git a/interface/lib/classes/validate_dkim.inc.php b/interface/lib/classes/validate_dkim.inc.php
index 523c7c7aec9155983372458f6c3de0eb2244cbdd..695288e0e02c8656fce4de72eded6c62ddf84fce 100644
--- a/interface/lib/classes/validate_dkim.inc.php
+++ b/interface/lib/classes/validate_dkim.inc.php
@@ -87,10 +87,10 @@ class validate_dkim {
function validate_post($key, $value) {
switch ($key) {
case 'public':
- if (preg_match("/(^-----BEGIN PUBLIC KEY-----)[a-zA-Z0-9\r\n\/\+=]{1,221}(-----END PUBLIC KEY-----(\n|\r)$)/", $value) === 1) { return true; } else { return false; }
+ if (preg_match("/(^-----BEGIN PUBLIC KEY-----)[a-zA-Z0-9\r\n\/\+=]{1,221}(-----END PUBLIC KEY-----(\n|\r)?$)/", $value) === 1) { return true; } else { return false; }
break;
case 'private':
- if (preg_match("/(^-----BEGIN RSA PRIVATE KEY-----)[a-zA-Z0-9\r\n\/\+=]{1,850}(-----END RSA PRIVATE KEY-----(\n|\r)$)/", $value) === 1) { return true; } else { return false; }
+ if (preg_match("/(^-----BEGIN RSA PRIVATE KEY-----)[a-zA-Z0-9\r\n\/\+=]{1,850}(-----END RSA PRIVATE KEY-----(\n|\r)?$)/", $value) === 1) { return true; } else { return false; }
break;
}
}
diff --git a/interface/lib/plugins/sites_web_domain_plugin.inc.php b/interface/lib/plugins/sites_web_domain_plugin.inc.php
deleted file mode 100644
index a84857aa8c023d0c40cc5992506fa73d5baeed34..0000000000000000000000000000000000000000
--- a/interface/lib/plugins/sites_web_domain_plugin.inc.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * sites_web_domain_plugin plugin
- *
- * @author Julio Montoya <gugli100@gmail.com> BeezNest 2010
- */
-
-
-class sites_web_domain_plugin {
-
- var $plugin_name = 'sites_web_domain_plugin';
- var $class_name = 'sites_web_domain_plugin';
-
- // TODO: This function is a duplicate from the one in interface/web/sites/web_domain_edit.php
- // There should be a single "token replacement" function to be called from modules and
- // from the main code.
- // Returna a "3/2/1" path hash from a numeric id '123'
- function id_hash($id, $levels) {
- $hash = "" . $id % 10 ;
- $id /= 10 ;
- $levels -- ;
- while ( $levels > 0 ) {
- $hash .= "/" . $id % 10 ;
- $id /= 10 ;
- $levels-- ;
- }
- return $hash;
- }
-
- /*
- This function is called when the plugin is loaded
- */
- function onLoad() {
- global $app;
- //Register for the events
- $app->plugin->registerEvent('sites:web_domain:on_after_insert', 'sites_web_domain_plugin', 'sites_web_domain_edit');
- }
-
- /*
- Function to create the sites_web_domain rule and insert it into the custom rules
- */
- function sites_web_domain_edit($event_name, $page_form) {
- global $app, $conf;
- // make sure that the record belongs to the clinet group and not the admin group when a dmin inserts it
- // also make sure that the user can not delete domain created by a admin
- if($_SESSION["s"]["user"]["typ"] == 'admin' && isset($page_form->dataRecord["client_group_id"])) {
- $client_group_id = $app->functions->intval($page_form->dataRecord["client_group_id"]);
- $app->db->query("UPDATE web_domain SET sys_groupid = $client_group_id, sys_perm_group = 'ru' WHERE domain_id = ".$page_form->id);
- }
- if($app->auth->has_clients($_SESSION['s']['user']['userid']) && isset($page_form->dataRecord["client_group_id"])) {
- $client_group_id = $app->functions->intval($page_form->dataRecord["client_group_id"]);
- $app->db->query("UPDATE web_domain SET sys_groupid = $client_group_id, sys_perm_group = 'riud' WHERE domain_id = ".$page_form->id);
- }
- // Get configuration for the web system
- $app->uses("getconf");
- $web_config = $app->getconf->get_server_config($app->functions->intval($page_form->dataRecord['server_id']), 'web');
- $document_root = str_replace("[website_id]", $page_form->id, $web_config["website_path"]);
- $document_root = str_replace("[website_idhash_1]", $this->id_hash($page_form->id, 1), $document_root);
- $document_root = str_replace("[website_idhash_2]", $this->id_hash($page_form->id, 1), $document_root);
- $document_root = str_replace("[website_idhash_3]", $this->id_hash($page_form->id, 1), $document_root);
- $document_root = str_replace("[website_idhash_4]", $this->id_hash($page_form->id, 1), $document_root);
-
- // get the ID of the client
- if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) {
- $client_group_id = $_SESSION["s"]["user"]["default_group"];
- $client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = $client_group_id");
- $client_id = $app->functions->intval($client["client_id"]);
- } else {
- //$client_id = $app->functions->intval($this->dataRecord["client_group_id"]);
- $client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = ".$app->functions->intval($page_form->dataRecord["client_group_id"]));
- $client_id = $app->functions->intval($client["client_id"]);
- }
-
- // Set the values for document_root, system_user and system_group
- $system_user = $app->db->quote('web'.$page_form->id);
- $system_group = $app->db->quote('client'.$client_id);
-
- $document_root = str_replace("[client_id]", $client_id, $document_root);
- $document_root = str_replace("[client_idhash_1]", $this->id_hash($client_id, 1), $document_root);
- $document_root = str_replace("[client_idhash_2]", $this->id_hash($client_id, 2), $document_root);
- $document_root = str_replace("[client_idhash_3]", $this->id_hash($client_id, 3), $document_root);
- $document_root = str_replace("[client_idhash_4]", $this->id_hash($client_id, 4), $document_root);
- $document_root = $app->db->quote($document_root);
-
- $php_open_basedir = str_replace("[website_path]", $document_root, $web_config["php_open_basedir"]);
- $php_open_basedir = $app->db->quote(str_replace("[website_domain]", $page_form->dataRecord['domain'], $php_open_basedir));
-
- $htaccess_allow_override = $app->db->quote($web_config["htaccess_allow_override"]);
-
- $sql = "UPDATE web_domain SET system_user = '$system_user', system_group = '$system_group', document_root = '$document_root', allow_override = '$htaccess_allow_override', php_open_basedir = '$php_open_basedir' WHERE domain_id = ".$page_form->id;
- $app->db->query($sql);
- }
-
-}
diff --git a/interface/lib/plugins/sites_web_vhost_aliasdomain_plugin.inc.php b/interface/lib/plugins/sites_web_vhost_aliasdomain_plugin.inc.php
deleted file mode 100644
index c94db2a27d811b6a06158895aa9d9dd55119e625..0000000000000000000000000000000000000000
--- a/interface/lib/plugins/sites_web_vhost_aliasdomain_plugin.inc.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * sites_web_vhost_aliasdomain_plugin plugin
- *
- * @author Marius Cramer <m.cramer@pixcept.de> pixcept KG 2012, copied and adapted from web_domain plugin by:
- * @author Julio Montoya <gugli100@gmail.com> BeezNest 2010
- */
-
-
-class sites_web_vhost_aliasdomain_plugin {
-
- var $plugin_name = 'sites_web_vhost_aliasdomain_plugin';
- var $class_name = 'sites_web_vhost_aliasdomain_plugin';
-
- // TODO: This function is a duplicate from the one in interface/web/sites/web_vhost_aliasdomain_edit.php
- // There should be a single "token replacement" function to be called from modules and
- // from the main code.
- // Returna a "3/2/1" path hash from a numeric id '123'
- function id_hash($id, $levels) {
- $hash = "" . $id % 10 ;
- $id /= 10 ;
- $levels -- ;
- while ( $levels > 0 ) {
- $hash .= "/" . $id % 10 ;
- $id /= 10 ;
- $levels-- ;
- }
- return $hash;
- }
-
- /*
- This function is called when the plugin is loaded
- */
- function onLoad() {
- global $app;
- //Register for the events
- // both event call the same function as the things to do do not differ here
- $app->plugin->registerEvent('sites:web_vhost_aliasdomain:on_after_insert', 'sites_web_vhost_aliasdomain_plugin', 'sites_web_vhost_aliasdomain_edit');
- $app->plugin->registerEvent('sites:web_vhost_aliasdomain:on_after_update', 'sites_web_vhost_aliasdomain_plugin', 'sites_web_vhost_aliasdomain_edit');
- }
-
- /*
- Function to create the sites_web_vhost_aliasdomain rule and insert it into the custom rules
- */
- function sites_web_vhost_aliasdomain_edit($event_name, $page_form) {
- global $app, $conf;
-
- // Get configuration for the web system
- $app->uses("getconf");
- $web_config = $app->getconf->get_server_config($app->functions->intval($page_form->dataRecord['server_id']), 'web');
-
- $parent_domain = $app->db->queryOneRecord("SELECT * FROM `web_domain` WHERE `domain_id` = '" . $app->functions->intval($page_form->dataRecord['parent_domain_id']) . "'");
-
- // Set the values for document_root, system_user and system_group
- $system_user = $app->db->quote($parent_domain['system_user']);
- $system_group = $app->db->quote($parent_domain['system_group']);
- $document_root = $app->db->quote($parent_domain['document_root']);
- $php_open_basedir = str_replace("[website_path]/web", $document_root.'/'.$page_form->dataRecord['web_folder'], $web_config["php_open_basedir"]);
- $php_open_basedir = str_replace("[website_domain]/web", $page_form->dataRecord['domain'].'/'.$page_form->dataRecord['web_folder'], $php_open_basedir);
- $php_open_basedir = str_replace("[website_path]", $document_root, $php_open_basedir);
- $php_open_basedir = $app->db->quote(str_replace("[website_domain]", $page_form->dataRecord['domain'], $php_open_basedir));
- $htaccess_allow_override = $app->db->quote($parent_domain['allow_override']);
-
- $sql = "UPDATE web_domain SET sys_groupid = ".$app->functions->intval($parent_domain['sys_groupid']).",system_user = '$system_user', system_group = '$system_group', document_root = '$document_root', allow_override = '$htaccess_allow_override', php_open_basedir = '$php_open_basedir' WHERE domain_id = ".$page_form->id;
- $app->db->query($sql);
- }
-
-}
diff --git a/interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php b/interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php
new file mode 100644
index 0000000000000000000000000000000000000000..4ca9f1f9387fb30c66905bb8dbb878a3f4ff4632
--- /dev/null
+++ b/interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php
@@ -0,0 +1,243 @@
+<?php
+/**
+ * sites_web_vhost_domain_plugin plugin
+ *
+ * @author Julio Montoya <gugli100@gmail.com> BeezNest 2010
+ */
+
+
+class sites_web_vhost_domain_plugin {
+
+ var $plugin_name = 'sites_web_vhost_domain_plugin';
+ var $class_name = 'sites_web_vhost_domain_plugin';
+
+ // TODO: This function is a duplicate from the one in interface/web/sites/web_domain_edit.php
+ // There should be a single "token replacement" function to be called from modules and
+ // from the main code.
+ // Returna a "3/2/1" path hash from a numeric id '123'
+ function id_hash($id, $levels) {
+ $hash = "" . $id % 10 ;
+ $id /= 10 ;
+ $levels -- ;
+ while ( $levels > 0 ) {
+ $hash .= "/" . $id % 10 ;
+ $id /= 10 ;
+ $levels-- ;
+ }
+ return $hash;
+ }
+
+ /*
+ This function is called when the plugin is loaded
+ */
+ function onLoad() {
+ global $app;
+ //Register for the events
+ $app->plugin->registerEvent('sites:web_vhost_domain:on_after_insert', 'sites_web_vhost_domain_plugin', 'sites_web_vhost_domain_edit');
+ $app->plugin->registerEvent('sites:web_vhost_domain:on_after_update', 'sites_web_vhost_domain_plugin', 'sites_web_vhost_domain_edit');
+ }
+
+ /*
+ Function to create the sites_web_domain rule and insert it into the custom rules
+ */
+ function sites_web_vhost_domain_edit($event_name, $page_form) {
+ global $app, $conf;
+
+ $vhostdomain_type = 'domain';
+ if($page_form->dataRecord['type'] == 'vhostalias') $vhostdomain_type = 'aliasdomain';
+ elseif($page_form->dataRecord['type'] == 'vhostsubdomain') $vhostdomain_type = 'subdomain';
+
+ // make sure that the record belongs to the clinet group and not the admin group when a dmin inserts it
+ // also make sure that the user can not delete domain created by a admin
+ if($_SESSION["s"]["user"]["typ"] == 'admin' && isset($page_form->dataRecord["client_group_id"])) {
+ $client_group_id = $app->functions->intval($page_form->dataRecord["client_group_id"]);
+ $app->db->query("UPDATE web_domain SET sys_groupid = $client_group_id, sys_perm_group = 'ru' WHERE domain_id = ".$page_form->id);
+ }
+ if($app->auth->has_clients($_SESSION['s']['user']['userid']) && isset($page_form->dataRecord["client_group_id"])) {
+ $client_group_id = $app->functions->intval($page_form->dataRecord["client_group_id"]);
+ $app->db->query("UPDATE web_domain SET sys_groupid = $client_group_id, sys_perm_group = 'riud' WHERE domain_id = ".$page_form->id);
+ }
+ // Get configuration for the web system
+ $app->uses("getconf");
+ $web_config = $app->getconf->get_server_config($app->functions->intval($page_form->dataRecord['server_id']), 'web');
+ if(isset($app->tform) && is_object($app->tform)) $web_rec = $app->tform->getDataRecord($page_form->id);
+ else $web_rec = $app->remoting_lib->getDataRecord($page_form->id);
+
+ if($vhostdomain_type == 'domain') {
+ $document_root = str_replace("[website_id]", $page_form->id, $web_config["website_path"]);
+ $document_root = str_replace("[website_idhash_1]", $this->id_hash($page_form->id, 1), $document_root);
+ $document_root = str_replace("[website_idhash_2]", $this->id_hash($page_form->id, 1), $document_root);
+ $document_root = str_replace("[website_idhash_3]", $this->id_hash($page_form->id, 1), $document_root);
+ $document_root = str_replace("[website_idhash_4]", $this->id_hash($page_form->id, 1), $document_root);
+
+ // get the ID of the client
+ if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) {
+ $client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
+ $client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = $client_group_id");
+ $client_id = $app->functions->intval($client["client_id"]);
+ } elseif (isset($page_form->dataRecord["client_group_id"])) {
+ $client_group_id = $page_form->dataRecord["client_group_id"];
+ $client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = ".$app->functions->intval(@$page_form->dataRecord["client_group_id"]));
+ $client_id = $app->functions->intval($client["client_id"]);
+ } else {
+ $client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = ".$app->functions->intval($page_form->dataRecord["client_group_id"]));
+ $client_id = $app->functions->intval($client["client_id"]);
+ }
+
+ // Set the values for document_root, system_user and system_group
+ $system_user = $app->db->quote('web'.$page_form->id);
+ $system_group = $app->db->quote('client'.$client_id);
+
+ $document_root = str_replace("[client_id]", $client_id, $document_root);
+ $document_root = str_replace("[client_idhash_1]", $this->id_hash($client_id, 1), $document_root);
+ $document_root = str_replace("[client_idhash_2]", $this->id_hash($client_id, 2), $document_root);
+ $document_root = str_replace("[client_idhash_3]", $this->id_hash($client_id, 3), $document_root);
+ $document_root = str_replace("[client_idhash_4]", $this->id_hash($client_id, 4), $document_root);
+ $document_root = $app->db->quote($document_root);
+
+ if($event_name == 'sites:web_vhost_domain:on_after_update') {
+ if(($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) && isset($page_form->dataRecord["client_group_id"]) && $page_form->dataRecord["client_group_id"] != $page_form->oldDataRecord["sys_groupid"]) {
+
+ $sql = "UPDATE web_domain SET system_user = '$system_user', system_group = '$system_group', document_root = '$document_root' WHERE domain_id = ".$page_form->id;
+ $app->db->query($sql);
+
+ // Update the FTP user(s) too
+ $records = $app->db->queryAllRecords("SELECT ftp_user_id FROM ftp_user WHERE parent_domain_id = ".$page_form->id);
+ foreach($records as $rec) {
+ $app->db->datalogUpdate('ftp_user', "sys_userid = '".$app->functions->intval($web_rec['sys_userid'])."', sys_groupid = '".$app->functions->intval($web_rec['sys_groupid'])."', uid = '$system_user', gid = '$system_group', dir = '$document_root'", 'ftp_user_id', $app->functions->intval($rec['ftp_user_id']));
+ }
+ unset($records);
+ unset($rec);
+
+ // Update the Shell user(s) too
+ $records = $app->db->queryAllRecords("SELECT shell_user_id FROM shell_user WHERE parent_domain_id = ".$page_form->id);
+ foreach($records as $rec) {
+ $app->db->datalogUpdate('shell_user', "sys_userid = '".$web_rec['sys_userid']."', sys_groupid = '".$web_rec['sys_groupid']."', puser = '$system_user', pgroup = '$system_group', dir = '$document_root'", 'shell_user_id', $app->functions->intval($rec['shell_user_id']));
+ }
+ unset($records);
+ unset($rec);
+
+ //* Update all subdomains and alias domains
+ $records = $app->db->queryAllRecords("SELECT domain_id, `domain`, `type`, `web_folder` FROM web_domain WHERE parent_domain_id = ".$page_form->id);
+ foreach($records as $rec) {
+ $update_columns = "sys_userid = '".$web_rec['sys_userid']."', sys_groupid = '".$web_rec['sys_groupid']."'";
+ if($rec['type'] == 'vhostsubdomain' || $rec['type'] == 'vhostalias') {
+ $php_open_basedir = str_replace("[website_path]/web", $document_root.'/'.$rec['web_folder'], $web_config["php_open_basedir"]);
+ $php_open_basedir = str_replace("[website_domain]/web", $rec['domain'].'/'.$rec['web_folder'], $php_open_basedir);
+ $php_open_basedir = str_replace("[website_path]", $document_root, $php_open_basedir);
+ $php_open_basedir = $app->db->quote(str_replace("[website_domain]", $rec['domain'], $php_open_basedir));
+
+ $update_columns .= ", document_root = '".$document_root."', `php_open_basedir` = '".$php_open_basedir."'";
+ }
+ $app->db->datalogUpdate('web_domain', $update_columns, 'domain_id', $rec['domain_id']);
+ }
+ unset($records);
+ unset($rec);
+
+ //* Update all databases
+ $records = $app->db->queryAllRecords("SELECT database_id FROM web_database WHERE parent_domain_id = ".$page_form->id);
+ foreach($records as $rec) {
+ $app->db->datalogUpdate('web_database', "sys_userid = '".$app->functions->intval($web_rec['sys_userid'])."', sys_groupid = '".$app->functions->intval($web_rec['sys_groupid'])."'", 'database_id', $app->functions->intval($rec['database_id']));
+ }
+ unset($records);
+ unset($rec);
+
+ }
+
+ //* If the domain name has been changed, we will have to change all subdomains + APS instances
+ if(!empty($page_form->dataRecord["domain"]) && !empty($page_form->oldDataRecord["domain"]) && $page_form->dataRecord["domain"] != $page_form->oldDataRecord["domain"]) {
+ $records = $app->db->queryAllRecords("SELECT domain_id,domain FROM web_domain WHERE (type = 'subdomain' OR type = 'vhostsubdomain' OR type = 'vhostalias') AND domain LIKE '%.".$app->db->quote($page_form->oldDataRecord["domain"])."'");
+ foreach($records as $rec) {
+ $subdomain = $app->db->quote(str_replace($page_form->oldDataRecord["domain"], $page_form->dataRecord["domain"], $rec['domain']));
+ $app->db->datalogUpdate('web_domain', "domain = '".$subdomain."'", 'domain_id', $rec['domain_id']);
+ }
+ unset($records);
+ unset($rec);
+ unset($subdomain);
+
+ // Update APS instances
+ $records = $app->db->queryAllRecords("SELECT id, instance_id FROM aps_instances_settings WHERE name = 'main_domain' AND value = '".$app->db->quote($page_form->oldDataRecord["domain"])."'");
+ if(is_array($records) && !empty($records)){
+ foreach($records as $rec){
+ $app->db->datalogUpdate('aps_instances_settings', "value = '".$app->db->quote($page_form->dataRecord["domain"])."'", 'id', $rec['id']);
+ // Reinstall of package needed?
+ //$app->db->datalogUpdate('aps_instances', "instance_status = '1'", 'id', $rec['instance_id']);
+ }
+ }
+ unset($records);
+ unset($rec);
+ }
+
+ //* Set allow_override if empty
+ if($web_rec['allow_override'] == '') {
+ $sql = "UPDATE web_domain SET allow_override = '".$app->db->quote($web_config["htaccess_allow_override"])."' WHERE domain_id = ".$page_form->id;
+ $app->db->query($sql);
+ }
+
+ //* Set php_open_basedir if empty or domain or client has been changed
+ if(empty($web_rec['php_open_basedir']) ||
+ (!empty($page_form->dataRecord["domain"]) && !empty($page_form->oldDataRecord["domain"]) && $page_form->dataRecord["domain"] != $page_form->oldDataRecord["domain"])) {
+ $php_open_basedir = $web_rec['php_open_basedir'];
+ $php_open_basedir = $app->db->quote(str_replace($page_form->oldDataRecord['domain'], $web_rec['domain'], $php_open_basedir));
+ $sql = "UPDATE web_domain SET php_open_basedir = '$php_open_basedir' WHERE domain_id = ".$page_form->id;
+ $app->db->query($sql);
+ }
+ if(empty($web_rec['php_open_basedir']) ||
+ (isset($page_form->dataRecord["client_group_id"]) && $page_form->dataRecord["client_group_id"] != $page_form->oldDataRecord["sys_groupid"])) {
+ $document_root = $app->db->quote(str_replace("[client_id]", $client_id, $document_root));
+ $php_open_basedir = str_replace("[website_path]", $document_root, $web_config["php_open_basedir"]);
+ $php_open_basedir = $app->db->quote(str_replace("[website_domain]", $web_rec['domain'], $php_open_basedir));
+ $sql = "UPDATE web_domain SET php_open_basedir = '$php_open_basedir' WHERE domain_id = ".$page_form->id;
+ $app->db->query($sql);
+ }
+
+ //* Change database backup options when web backup options have been changed
+ if(isset($page_form->dataRecord['backup_interval']) && ($page_form->dataRecord['backup_interval'] != $page_form->oldDataRecord['backup_interval'] || $page_form->dataRecord['backup_copies'] != $page_form->oldDataRecord['backup_copies'])) {
+ //* Update all databases
+ $backup_interval = $app->functions->intval($page_form->dataRecord['backup_interval']);
+ $backup_copies = $app->functions->intval($page_form->dataRecord['backup_copies']);
+ $records = $app->db->queryAllRecords("SELECT database_id FROM web_database WHERE parent_domain_id = ".$page_form->id);
+ foreach($records as $rec) {
+ $app->db->datalogUpdate('web_database', "backup_interval = '$backup_interval', backup_copies = '$backup_copies'", 'database_id', $rec['database_id']);
+ }
+ unset($records);
+ unset($rec);
+ unset($backup_copies);
+ unset($backup_interval);
+ }
+
+ //* Change vhost subdomain and alias ip/ipv6 if domain ip/ipv6 has changed
+ if(isset($page_form->dataRecord['ip_address']) && ($page_form->dataRecord['ip_address'] != $page_form->oldDataRecord['ip_address'] || $page_form->dataRecord['ipv6_address'] != $page_form->oldDataRecord['ipv6_address'])) {
+ $records = $app->db->queryAllRecords("SELECT domain_id FROM web_domain WHERE (type = 'vhostsubdomain' OR type = 'vhostalias') AND parent_domain_id = ".$page_form->id);
+ foreach($records as $rec) {
+ $app->db->datalogUpdate('web_domain', "ip_address = '".$app->db->quote($web_rec['ip_address'])."', ipv6_address = '".$app->db->quote($web_rec['ipv6_address'])."'", 'domain_id', $rec['domain_id']);
+ }
+ unset($records);
+ unset($rec);
+ }
+ } else {
+ $php_open_basedir = str_replace("[website_path]", $document_root, $web_config["php_open_basedir"]);
+ $php_open_basedir = $app->db->quote(str_replace("[website_domain]", $page_form->dataRecord['domain'], $php_open_basedir));
+
+ $htaccess_allow_override = $app->db->quote($web_config["htaccess_allow_override"]);
+ $sql = "UPDATE web_domain SET system_user = '$system_user', system_group = '$system_group', document_root = '$document_root', allow_override = '$htaccess_allow_override', php_open_basedir = '$php_open_basedir' WHERE domain_id = ".$page_form->id;
+ $app->db->query($sql);
+ }
+ } else {
+ $parent_domain = $app->db->queryOneRecord("SELECT * FROM `web_domain` WHERE `domain_id` = '" . $app->functions->intval($page_form->dataRecord['parent_domain_id']) . "'");
+
+ // Set the values for document_root, system_user and system_group
+ $system_user = $app->db->quote($parent_domain['system_user']);
+ $system_group = $app->db->quote($parent_domain['system_group']);
+ $document_root = $app->db->quote($parent_domain['document_root']);
+ $php_open_basedir = str_replace("[website_path]/web", $document_root.'/'.$page_form->dataRecord['web_folder'], $web_config["php_open_basedir"]);
+ $php_open_basedir = str_replace("[website_domain]/web", $page_form->dataRecord['domain'].'/'.$page_form->dataRecord['web_folder'], $php_open_basedir);
+ $php_open_basedir = str_replace("[website_path]", $document_root, $php_open_basedir);
+ $php_open_basedir = $app->db->quote(str_replace("[website_domain]", $page_form->dataRecord['domain'], $php_open_basedir));
+ $htaccess_allow_override = $app->db->quote($parent_domain['allow_override']);
+ $sql = "UPDATE web_domain SET sys_groupid = ".$app->functions->intval($parent_domain['sys_groupid']).",system_user = '$system_user', system_group = '$system_group', document_root = '$document_root', allow_override = '$htaccess_allow_override', php_open_basedir = '$php_open_basedir' WHERE domain_id = ".$page_form->id;
+ $app->db->query($sql);
+ }
+ }
+
+}
diff --git a/interface/lib/plugins/sites_web_vhost_subdomain_plugin.inc.php b/interface/lib/plugins/sites_web_vhost_subdomain_plugin.inc.php
deleted file mode 100644
index e28c184eef9f42eb621dad9b127c200250c15bf1..0000000000000000000000000000000000000000
--- a/interface/lib/plugins/sites_web_vhost_subdomain_plugin.inc.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * sites_web_domain_plugin plugin
- *
- * @author Marius Cramer <m.cramer@pixcept.de> pixcept KG 2012, copied and adapted from web_domain plugin by:
- * @author Julio Montoya <gugli100@gmail.com> BeezNest 2010
- */
-
-
-class sites_web_vhost_subdomain_plugin {
-
- var $plugin_name = 'sites_web_vhost_subdomain_plugin';
- var $class_name = 'sites_web_vhost_subdomain_plugin';
-
- // TODO: This function is a duplicate from the one in interface/web/sites/web_vhost_subdomain_edit.php
- // There should be a single "token replacement" function to be called from modules and
- // from the main code.
- // Returna a "3/2/1" path hash from a numeric id '123'
- function id_hash($id, $levels) {
- $hash = "" . $id % 10 ;
- $id /= 10 ;
- $levels -- ;
- while ( $levels > 0 ) {
- $hash .= "/" . $id % 10 ;
- $id /= 10 ;
- $levels-- ;
- }
- return $hash;
- }
-
- /*
- This function is called when the plugin is loaded
- */
- function onLoad() {
- global $app;
- //Register for the events
- // both event call the same function as the things to do do not differ here
- $app->plugin->registerEvent('sites:web_vhost_subdomain:on_after_insert', 'sites_web_vhost_subdomain_plugin', 'sites_web_vhost_subdomain_edit');
- $app->plugin->registerEvent('sites:web_vhost_subdomain:on_after_update', 'sites_web_vhost_subdomain_plugin', 'sites_web_vhost_subdomain_edit');
- }
-
- /*
- Function to create the sites_web_vhost_subdomain rule and insert it into the custom rules
- */
- function sites_web_vhost_subdomain_edit($event_name, $page_form) {
- global $app, $conf;
-
- // Get configuration for the web system
- $app->uses("getconf");
- $web_config = $app->getconf->get_server_config($app->functions->intval($page_form->dataRecord['server_id']), 'web');
-
- $parent_domain = $app->db->queryOneRecord("SELECT * FROM `web_domain` WHERE `domain_id` = '" . $app->functions->intval($page_form->dataRecord['parent_domain_id']) . "'");
-
- // Set the values for document_root, system_user and system_group
- $system_user = $app->db->quote($parent_domain['system_user']);
- $system_group = $app->db->quote($parent_domain['system_group']);
- $document_root = $app->db->quote($parent_domain['document_root']);
- $php_open_basedir = str_replace("[website_path]/web", $document_root.'/'.$page_form->dataRecord['web_folder'], $web_config["php_open_basedir"]);
- $php_open_basedir = str_replace("[website_domain]/web", $page_form->dataRecord['domain'].'/'.$page_form->dataRecord['web_folder'], $php_open_basedir);
- $php_open_basedir = str_replace("[website_path]", $document_root, $php_open_basedir);
- $php_open_basedir = $app->db->quote(str_replace("[website_domain]", $page_form->dataRecord['domain'], $php_open_basedir));
- $htaccess_allow_override = $app->db->quote($parent_domain['allow_override']);
-
- $sql = "UPDATE web_domain SET sys_groupid = ".$app->functions->intval($parent_domain['sys_groupid']).",system_user = '$system_user', system_group = '$system_group', document_root = '$document_root', allow_override = '$htaccess_allow_override', php_open_basedir = '$php_open_basedir' WHERE domain_id = ".$page_form->id;
- $app->db->query($sql);
- }
-
-}
diff --git a/interface/web/admin/lib/lang/ar_server_config.lng b/interface/web/admin/lib/lang/ar_server_config.lng
index 26e13b40a7ee69760e96d83dcf8e12eedf4e40b8..4175aa1aebd02f473bcce45bec2a3d8a2c9209c0 100644
--- a/interface/web/admin/lib/lang/ar_server_config.lng
+++ b/interface/web/admin/lib/lang/ar_server_config.lng
@@ -189,4 +189,10 @@ $wb['munin_user_txt'] = 'Munin User';
$wb['munin_password_txt'] = 'Munin Password';
$wb['munin_url_error_regex'] = 'Invalid Munin URL';
$wb['munin_url_note_txt'] = 'Placeholder:';
+$wb["dkim_path_txt"] = 'DKIM Path';
+$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.';
+$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
+$wb["v6_prefix_txt"] = 'IPv6 Prefix';
+$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
+$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
?>
diff --git a/interface/web/admin/lib/lang/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng
index db043eea8584d7fbc89cbd821dbcd5e86d957b91..8a28512023f1662ebc127307a4130df5fec55df9 100644
--- a/interface/web/admin/lib/lang/bg_server_config.lng
+++ b/interface/web/admin/lib/lang/bg_server_config.lng
@@ -189,4 +189,10 @@ $wb['munin_user_txt'] = 'Munin User';
$wb['munin_password_txt'] = 'Munin Password';
$wb['munin_url_error_regex'] = 'Invalid Munin URL';
$wb['munin_url_note_txt'] = 'Placeholder:';
+$wb["dkim_path_txt"] = 'DKIM Path';
+$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.';
+$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
+$wb["v6_prefix_txt"] = 'IPv6 Prefix';
+$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
+$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
?>
diff --git a/interface/web/admin/lib/lang/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng
index 67e8a20ec653313822e294cefccf456035ef88c5..12557b7cb8aaa22918bc9f542ac61a10003a02f6 100644
--- a/interface/web/admin/lib/lang/br_server_config.lng
+++ b/interface/web/admin/lib/lang/br_server_config.lng
@@ -189,4 +189,10 @@ $wb['munin_user_txt'] = 'Munin User';
$wb['munin_password_txt'] = 'Munin Password';
$wb['munin_url_error_regex'] = 'Invalid Munin URL';
$wb['munin_url_note_txt'] = 'Placeholder:';
+$wb["dkim_path_txt"] = 'DKIM Path';
+$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.';
+$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
+$wb["v6_prefix_txt"] = 'IPv6 Prefix';
+$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
+$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
?>
diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng
index a6601710958d7c096d8179821368580ba27f699a..05fa26912e140185503495ebf41db49816a4b464 100644
--- a/interface/web/admin/lib/lang/cz_server_config.lng
+++ b/interface/web/admin/lib/lang/cz_server_config.lng
@@ -183,6 +183,9 @@ $wb['monit_url_txt'] = 'Monit URL';
$wb['monit_user_txt'] = 'Monit User';
$wb['monit_password_txt'] = 'Monit Password';
$wb['monit_url_error_regex'] = 'Invalid Monit URL';
+$wb["dkim_path_txt"] = 'DKIM Path';
+$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.';
+$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
$wb['monit_url_note_txt'] = 'Placeholder:';
$wb['munin_url_txt'] = 'Munin URL';
$wb['munin_user_txt'] = 'Munin User';
diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng
index c9673b2804b8eeb20cc8590d30a449651e46148d..26d5e24dae6a8b9d5b2926ef2228aa8b854e58ee 100644
--- a/interface/web/admin/lib/lang/de_server_config.lng
+++ b/interface/web/admin/lib/lang/de_server_config.lng
@@ -194,4 +194,8 @@ $wb['munin_url_error_regex'] = 'Ungültige Munin-URL';
$wb['munin_url_note_txt'] = 'Platzhalter:';
$wb['backup_dir_is_mount_txt'] = 'Backupverzeichnis ist ein eigener Mount?';
$wb['backup_dir_mount_cmd_txt'] = 'Mount-Befehl, falls Backupverzeichnis nicht gemountet';
+$wb['backup_delete_txt'] = 'Backups loeschen wenn eine Domain / Webseite geloescht wird';
+$wb["v6_prefix_txt"] = 'IPv6 Prefix';
+$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
+$wb["v6_prefix_length"] = 'Prefix zu lang fuer angegebene IPv6-Adresse ';
?>
diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng
index 2088dba09ff36ddb368598f48e6fb5e2b4e59f3d..b4efb0e0c176cd276fd62882eb6231fb65ce1c10 100644
--- a/interface/web/admin/lib/lang/es_server_config.lng
+++ b/interface/web/admin/lib/lang/es_server_config.lng
@@ -189,4 +189,10 @@ $wb['munin_user_txt'] = 'Munin User';
$wb['munin_password_txt'] = 'Munin Password';
$wb['munin_url_error_regex'] = 'Invalid Munin URL';
$wb['munin_url_note_txt'] = 'Placeholder:';
+$wb["dkim_path_txt"] = 'DKIM Path';
+$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.';
+$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
+$wb["v6_prefix_txt"] = 'IPv6 Prefix';
+$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
+$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
?>
diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng
index fe203bea32cbde7f1ed8b5c5ffe7a3b5cbc91e97..2ee8b4f8bc56b10c7b33a72933e3157fb463b5ed 100755
--- a/interface/web/admin/lib/lang/fi_server_config.lng
+++ b/interface/web/admin/lib/lang/fi_server_config.lng
@@ -189,4 +189,10 @@ $wb['munin_user_txt'] = 'Munin User';
$wb['munin_password_txt'] = 'Munin Password';
$wb['munin_url_error_regex'] = 'Invalid Munin URL';
$wb['munin_url_note_txt'] = 'Placeholder:';
+$wb["dkim_path_txt"] = 'DKIM Path';
+$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.';
+$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
+$wb["v6_prefix_txt"] = 'IPv6 Prefix';
+$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
+$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
?>
diff --git a/interface/web/admin/lib/lang/fr_server_config.lng b/interface/web/admin/lib/lang/fr_server_config.lng
index f61a4096a1e762dd9292f170cabdb947fea51d41..22048a40951df2591643d1fdf8cb4e738b3d93da 100644
--- a/interface/web/admin/lib/lang/fr_server_config.lng
+++ b/interface/web/admin/lib/lang/fr_server_config.lng
@@ -191,4 +191,8 @@ $wb['munin_user_txt'] = 'Munin User';
$wb['munin_password_txt'] = 'Munin Password';
$wb['munin_url_error_regex'] = 'Invalid Munin URL';
$wb['munin_url_note_txt'] = 'Placeholder:';
+$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
+$wb["v6_prefix_txt"] = 'IPv6 Prefix';
+$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
+$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
?>
diff --git a/interface/web/admin/lib/lang/hr_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng
index d7880eecb4af3c1ddf73071a58385d229546e287..627cf50a6270b214faba0f63b92815429c1a27ce 100644
--- a/interface/web/admin/lib/lang/hr_server_config.lng
+++ b/interface/web/admin/lib/lang/hr_server_config.lng
@@ -189,4 +189,10 @@ $wb['munin_user_txt'] = 'Munin User';
$wb['munin_password_txt'] = 'Munin Password';
$wb['munin_url_error_regex'] = 'Invalid Munin URL';
$wb['munin_url_note_txt'] = 'Placeholder:';
+$wb["dkim_path_txt"] = 'DKIM Path';
+$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.';
+$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
+$wb["v6_prefix_txt"] = 'IPv6 Prefix';
+$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
+$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
?>
diff --git a/interface/web/admin/lib/lang/hu_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng
index db881852ad961946f77ed3be817d8dbdcb327aa8..c0cc3738e2a4a698696628f0b32c59a18b75f77b 100644
--- a/interface/web/admin/lib/lang/hu_server_config.lng
+++ b/interface/web/admin/lib/lang/hu_server_config.lng
@@ -189,4 +189,10 @@ $wb['munin_user_txt'] = 'Munin User';
$wb['munin_password_txt'] = 'Munin Password';
$wb['munin_url_error_regex'] = 'Invalid Munin URL';
$wb['munin_url_note_txt'] = 'Placeholder:';
+$wb["dkim_path_txt"] = 'DKIM Path';
+$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.';
+$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
+$wb["v6_prefix_txt"] = 'IPv6 Prefix';
+$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
+$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
?>
diff --git a/interface/web/admin/lib/lang/id_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng
index dfa67f9ea7fafd92764d577750adf2a187d6eddb..ad3b1f9164f2185673ed14bae2ff396451613dd3 100644
--- a/interface/web/admin/lib/lang/id_server_config.lng
+++ b/interface/web/admin/lib/lang/id_server_config.lng
@@ -189,4 +189,10 @@ $wb['munin_user_txt'] = 'Munin User';
$wb['munin_password_txt'] = 'Munin Password';
$wb['munin_url_error_regex'] = 'Invalid Munin URL';
$wb['munin_url_note_txt'] = 'Placeholder:';
+$wb["dkim_path_txt"] = 'DKIM Path';
+$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.';
+$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
+$wb["v6_prefix_txt"] = 'IPv6 Prefix';
+$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
+$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
?>
diff --git a/interface/web/admin/lib/lang/it_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng
index 33101e9717bf5a716531272a48e947aa8a638384..d244720946d14c8c30a67930105df851fbe0c854 100644
--- a/interface/web/admin/lib/lang/it_server_config.lng
+++ b/interface/web/admin/lib/lang/it_server_config.lng
@@ -189,4 +189,10 @@ $wb['munin_user_txt'] = 'Munin User';
$wb['munin_password_txt'] = 'Munin Password';
$wb['munin_url_error_regex'] = 'Invalid Munin URL';
$wb['munin_url_note_txt'] = 'Placeholder:';
+$wb["dkim_path_txt"] = 'DKIM Path';
+$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.';
+$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
+$wb["v6_prefix_txt"] = 'IPv6 Prefix';
+$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
+$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
?>
diff --git a/interface/web/admin/lib/lang/ja_server_config.lng b/interface/web/admin/lib/lang/ja_server_config.lng
index 46e8b21b7c5a930279e50246a0d87338d6f4677b..60e621f69f27f6de44ac191bbd5ea0a278c4e9e0 100644
--- a/interface/web/admin/lib/lang/ja_server_config.lng
+++ b/interface/web/admin/lib/lang/ja_server_config.lng
@@ -189,4 +189,10 @@ $wb['munin_user_txt'] = 'Munin User';
$wb['munin_password_txt'] = 'Munin Password';
$wb['munin_url_error_regex'] = 'Invalid Munin URL';
$wb['munin_url_note_txt'] = 'Placeholder:';
+$wb["dkim_path_txt"] = 'DKIM Path';
+$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.';
+$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
+$wb["v6_prefix_txt"] = 'IPv6 Prefix';
+$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
+$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
?>
diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng
index 6847356d4ec19c0be2b9be323b245fffe91edd91..f54d1c573bedb5f9c558c5ea92eba7a4d3d4fea9 100644
--- a/interface/web/admin/lib/lang/nl_server_config.lng
+++ b/interface/web/admin/lib/lang/nl_server_config.lng
@@ -189,4 +189,10 @@ $wb['munin_user_txt'] = 'Munin User';
$wb['munin_password_txt'] = 'Munin Password';
$wb['munin_url_error_regex'] = 'Invalid Munin URL';
$wb['munin_url_note_txt'] = 'Placeholder:';
+$wb["dkim_path_txt"] = 'DKIM Path';
+$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.';
+$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
+$wb["v6_prefix_txt"] = 'IPv6 Prefix';
+$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
+$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
?>
diff --git a/interface/web/admin/lib/lang/nl_system_config.lng b/interface/web/admin/lib/lang/nl_system_config.lng
index 57464742fa05cf51932ed4814a5812bd20579ad7..4a0bb6a3b38d6068c9019bc4e2ae5a048ca7fbf0 100644
--- a/interface/web/admin/lib/lang/nl_system_config.lng
+++ b/interface/web/admin/lib/lang/nl_system_config.lng
@@ -18,7 +18,7 @@ $wb['dblist_phpmyadmin_link_txt'] = 'Link naar phpmyadmin in DB lijst';
$wb['mailboxlist_webmail_link_txt'] = 'Link naar webmail in Mailbox lijst';
$wb['mailbox_show_autoresponder_tab_txt'] = 'Toon Autoresponder tabblad in Mailbox detail';
$wb['mailbox_show_mail_filter_tab_txt'] = 'Toon Mail Filter tabblad in Mailbox detail';
-$wb['mailbox_show_custom_rules_tab_txt'] 'Toon Custom Rules tabblad in Mailbox detail';
+$wb['mailbox_show_custom_rules_tab_txt'] = 'Toon Custom Rules tabblad in Mailbox detail';
$wb['webmail_url_txt'] = 'Webmail URL';
$wb['phpmyadmin_url_txt'] = 'PHPMyAdmin URL';
$wb['use_domain_module_txt'] = 'Gebruik de domein-module om nieuwe domeinen toe te voegen';
diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng
index ec51f689a7575f040c51e06a11a9351c869a26de..efe2623b8598d3e61fd13f4e6040632343f96cb2 100644
--- a/interface/web/admin/lib/lang/pl_server_config.lng
+++ b/interface/web/admin/lib/lang/pl_server_config.lng
@@ -189,4 +189,10 @@ $wb['munin_user_txt'] = 'Munin User';
$wb['munin_password_txt'] = 'Munin Password';
$wb['munin_url_error_regex'] = 'Invalid Munin URL';
$wb['munin_url_note_txt'] = 'Placeholder:';
+$wb["dkim_path_txt"] = 'DKIM Path';
+$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.';
+$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
+$wb["v6_prefix_txt"] = 'IPv6 Prefix';
+$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
+$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
?>
diff --git a/interface/web/admin/lib/lang/pt_server_config.lng b/interface/web/admin/lib/lang/pt_server_config.lng
index 0fee45fb618ed33cc99469153bfebe18f0dd790b..521d144a2bfe439afc4bfc3375c8ea500e459e20 100644
--- a/interface/web/admin/lib/lang/pt_server_config.lng
+++ b/interface/web/admin/lib/lang/pt_server_config.lng
@@ -189,4 +189,10 @@ $wb['munin_user_txt'] = 'Munin User';
$wb['munin_password_txt'] = 'Munin Password';
$wb['munin_url_error_regex'] = 'Invalid Munin URL';
$wb['munin_url_note_txt'] = 'Placeholder:';
+$wb["dkim_path_txt"] = 'DKIM Path';
+$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.';
+$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
+$wb["v6_prefix_txt"] = 'IPv6 Prefix';
+$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
+$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
?>
diff --git a/interface/web/admin/lib/lang/ro_server_config.lng b/interface/web/admin/lib/lang/ro_server_config.lng
index e0a43db87b57af309096fbee505e59ea336841f4..05ff9b035cbb4854d69cc938117dc1d22dfb290e 100644
--- a/interface/web/admin/lib/lang/ro_server_config.lng
+++ b/interface/web/admin/lib/lang/ro_server_config.lng
@@ -189,4 +189,10 @@ $wb['munin_user_txt'] = 'Munin User';
$wb['munin_password_txt'] = 'Munin Password';
$wb['munin_url_error_regex'] = 'Invalid Munin URL';
$wb['munin_url_note_txt'] = 'Placeholder:';
+$wb["dkim_path_txt"] = 'DKIM Path';
+$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.';
+$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
+$wb["v6_prefix_txt"] = 'IPv6 Prefix';
+$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
+$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
?>
diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng
index 79cdfe0b3a1e80d7b39d2ce1806259a7107b4829..76429e9595e412d736859008e78a6b5a20dd81ec 100644
--- a/interface/web/admin/lib/lang/ru_server_config.lng
+++ b/interface/web/admin/lib/lang/ru_server_config.lng
@@ -189,4 +189,10 @@ $wb['munin_user_txt'] = 'Munin User';
$wb['munin_password_txt'] = 'Munin Password';
$wb['munin_url_error_regex'] = 'Invalid Munin URL';
$wb['munin_url_note_txt'] = 'Placeholder:';
+$wb["dkim_path_txt"] = 'DKIM Path';
+$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.';
+$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
+$wb["v6_prefix_txt"] = 'IPv6 Prefix';
+$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
+$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
?>
diff --git a/interface/web/admin/lib/lang/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng
index bf3fe039b6e9696d71e858c8dbdaac481e5c961d..ddcb1f0f8e48eeff5912403d2352ecca9fb5619a 100644
--- a/interface/web/admin/lib/lang/se_server_config.lng
+++ b/interface/web/admin/lib/lang/se_server_config.lng
@@ -189,4 +189,10 @@ $wb['munin_user_txt'] = 'Munin User';
$wb['munin_password_txt'] = 'Munin Password';
$wb['munin_url_error_regex'] = 'Invalid Munin URL';
$wb['munin_url_note_txt'] = 'Placeholder:';
+$wb["dkim_path_txt"] = 'DKIM Path';
+$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.';
+$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
+$wb["v6_prefix_txt"] = 'IPv6 Prefix';
+$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
+$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
?>
diff --git a/interface/web/admin/lib/lang/sk_server_config.lng b/interface/web/admin/lib/lang/sk_server_config.lng
index 74ff9940386347d181d98bd1e0df9e7783c0f9ef..ebc2c6bf392bd8662251534cd3373cb98068c608 100644
--- a/interface/web/admin/lib/lang/sk_server_config.lng
+++ b/interface/web/admin/lib/lang/sk_server_config.lng
@@ -189,4 +189,10 @@ $wb['munin_user_txt'] = 'Munin User';
$wb['munin_password_txt'] = 'Munin Password';
$wb['munin_url_error_regex'] = 'Invalid Munin URL';
$wb['munin_url_note_txt'] = 'Placeholder:';
+$wb["dkim_path_txt"] = 'DKIM Path';
+$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.';
+$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
+$wb["v6_prefix_txt"] = 'IPv6 Prefix';
+$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
+$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
?>
diff --git a/interface/web/admin/lib/lang/tr_server_config.lng b/interface/web/admin/lib/lang/tr_server_config.lng
index fe2b28697f0e2a74b0829c34f4f77f3b31a2799b..3b86042ffaeb9e08a4302ddd8320c34e533891cf 100644
--- a/interface/web/admin/lib/lang/tr_server_config.lng
+++ b/interface/web/admin/lib/lang/tr_server_config.lng
@@ -189,4 +189,10 @@ $wb['munin_user_txt'] = 'Munin User';
$wb['munin_password_txt'] = 'Munin Password';
$wb['munin_url_error_regex'] = 'Invalid Munin URL';
$wb['munin_url_note_txt'] = 'Placeholder:';
+$wb["dkim_path_txt"] = 'DKIM Path';
+$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.';
+$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
+$wb["v6_prefix_txt"] = 'IPv6 Prefix';
+$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
+$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
?>
diff --git a/interface/web/admin/templates/server_config_mail_edit.htm b/interface/web/admin/templates/server_config_mail_edit.htm
index 991f1b0cea39df974c3b1edbdb2b45d79363eaaf..aba95279e8b18f4eac8a7a9c30572c4ea3780561 100644
--- a/interface/web/admin/templates/server_config_mail_edit.htm
+++ b/interface/web/admin/templates/server_config_mail_edit.htm
@@ -67,11 +67,11 @@
</div>
<div class="ctrlHolder">
<label for="relayhost_user">{tmpl_var name='relayhost_user_txt'}</label>
- <input name="relayhost_user" id="relayhost_user" value="{tmpl_var name='relayhost_user'}" size="40" maxlength="255" type="text" class="textInput formLengthHalf" />
+ <input name="relayhost_user" id="relayhost_user" value="{tmpl_var name='relayhost_user'}" size="40" maxlength="255" type="text" class="textInput formLengthHalf" autocomplete="off" />
</div>
<div class="ctrlHolder">
<label for="relayhost_password">{tmpl_var name='relayhost_password_txt'}</label>
- <input name="relayhost_password" id="relayhost_password" value="{tmpl_var name='relayhost_password'}" size="40" maxlength="255" type="password" class="textInput formLengthHalf" />
+ <input name="relayhost_password" id="relayhost_password" value="{tmpl_var name='relayhost_password'}" size="40" maxlength="255" type="password" class="textInput formLengthHalf" autocomplete="off" />
</div>
<div class="ctrlHolder">
<label for="mailbox_size_limit">{tmpl_var name='mailbox_size_limit_txt'}</label>
diff --git a/interface/web/dashboard/dashlets/limits.php b/interface/web/dashboard/dashlets/limits.php
index 5ffa346277f3af16890fc6b624a598b0e487942c..13c0a4a2f5ecb39878e1653c04e1c7bcb0a7c92a 100644
--- a/interface/web/dashboard/dashlets/limits.php
+++ b/interface/web/dashboard/dashlets/limits.php
@@ -71,7 +71,7 @@ class dashlet_limits {
$limits[] = array('field' => 'limit_web_aliasdomain',
'db_table' => 'web_domain',
- 'db_where' => "(type = 'alias' OR type = 'vhostalias'");
+ 'db_where' => "(type = 'alias' OR type = 'vhostalias')");
$limits[] = array('field' => 'limit_ftp_user',
'db_table' => 'ftp_user',
diff --git a/interface/web/data.sql b/interface/web/data.sql
deleted file mode 100644
index 0c15827b2c0d42aa04e12e7f6521556cf1342c74..0000000000000000000000000000000000000000
--- a/interface/web/data.sql
+++ /dev/null
@@ -1,851 +0,0 @@
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/remote_user_edit.php', 'remote_functions', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/software_package_edit.php', 'package_key', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_ip_edit.php', 'virtualhost', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/groups_edit.php', 'name', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/groups_edit.php', 'description', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'v6_prefix', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'auto_network_configuration', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'dkim_path', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'relayhost', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'relayhost_user', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'relayhost_password', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'module', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'mailbox_quota_stats', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'overquota_notify_admin', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'overquota_notify_client', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'overquota_notify_onok', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'vhost_conf_enabled_dir', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'nginx_vhost_conf_enabled_dir', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'nginx_cgi_socket', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'php_fpm_ini_path', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'php_fpm_pool_dir', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'php_fpm_start_port', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'php_fpm_socket_dir', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'php_ini_check_minutes', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'awstats_conf_dir', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'awstats_data_dir', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'awstats_pl', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'awstats_buildstaticpages_pl', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'server_type', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'website_symlinks_rel', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'check_apache_config', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'enable_ip_wildcard', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'overtraffic_notify_admin', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'overtraffic_notify_client', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'overquota_notify_admin', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'overquota_notify_client', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'overquota_notify_onok', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'enable_sni', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'set_folder_permissions_on_update', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'web_folder_protection', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'add_web_users_to_sshusers_group', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'connect_userid_to_webid', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'bind_user', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'bind_group', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'bind_zonefiles_dir', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'named_conf_path', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'named_conf_local_path', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'fastcgi_starter_path', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'fastcgi_starter_script', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'fastcgi_alias', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'fastcgi_phpini_path', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'fastcgi_children', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'fastcgi_max_requests', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'fastcgi_bin', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'fastcgi_config_syntax', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'jailkit_chroot_home', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'jailkit_chroot_app_sections', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'jailkit_chroot_app_programs', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'jailkit_chroot_cron_programs', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'ufw_default_input_policy', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'ufw_default_output_policy', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'ufw_default_forward_policy', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'ufw_default_application_policy', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'ufw_log_level', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'ufw_enable', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'ufw_manage_builtins', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'ufw_ipv6', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'config_dir', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'init_script', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'crontab_dir', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'wget', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'try_rescue', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'do_not_try_rescue_httpd', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'do_not_try_rescue_mongodb', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'do_not_try_rescue_mysql', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_config_edit.php', 'do_not_try_rescue_mail', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/firewall_edit.php', 'tcp_port', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/firewall_edit.php', 'udp_port', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/firewall_edit.php', 'server_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/firewall_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/software_repo_edit.php', 'repo_name', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/software_repo_edit.php', 'repo_url', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/software_repo_edit.php', 'repo_username', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/software_repo_edit.php', 'repo_password', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/software_repo_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/directive_snippets_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'dbname_prefix', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'dbuser_prefix', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'ftpuser_prefix', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'shelluser_prefix', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'webdavuser_prefix', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'phpmyadmin_url', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'webftp_url', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'dblist_phpmyadmin_link', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'vhost_subdomains', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'client_username_web_check_disabled', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'reseller_can_use_options', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'webmail_url', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'mailmailinglist_url', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'admin_mail', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'admin_name', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'smtp_host', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'smtp_port', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'smtp_user', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'smtp_pass', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'enable_custom_login', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'mailbox_show_autoresponder_tab', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'mailbox_show_mail_filter_tab', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'mailbox_show_custom_rules_tab', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'mailboxlist_webmail_link', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'mailmailinglist_link', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'smtp_enabled', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'smtp_crypt', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'new_domain_html', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'use_domain_module', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'dashboard_atom_url_admin', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'dashboard_atom_url_reseller', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'dashboard_atom_url_client', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'monitor_key', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'admin_dashlets_left', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'admin_dashlets_right', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'reseller_dashlets_left', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'reseller_dashlets_right', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'client_dashlets_left', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'client_dashlets_right', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'tab_change_discard', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'tab_change_warning', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'use_loadindicator', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'use_combobox', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/system_config_edit.php', 'maintenance_mode', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/iptables_edit.php', 'singleport', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/iptables_edit.php', 'multiport', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/iptables_edit.php', 'destination_ip', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/iptables_edit.php', 'source_ip', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/iptables_edit.php', 'state', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/iptables_edit.php', 'server_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/iptables_edit.php', 'table', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/iptables_edit.php', 'protocol', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/iptables_edit.php', 'target', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/iptables_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_edit.php', 'server_name', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_edit.php', 'mirror_server_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_edit.php', 'mail_server', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_edit.php', 'web_server', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_edit.php', 'dns_server', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_edit.php', 'file_server', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_edit.php', 'db_server', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_edit.php', 'vserver_server', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/admin/server_edit.php', 'config', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_vm_edit.php', 'hostname', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_vm_edit.php', 'vm_password', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_vm_edit.php', 'active_until_date', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_vm_edit.php', 'server_id_disabled', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_vm_edit.php', 'server_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_vm_edit.php', 'client_group_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_vm_edit.php', 'client_group_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_vm_edit.php', 'ostemplate_id_disabled', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_vm_edit.php', 'ostemplate_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_vm_edit.php', 'template_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_vm_edit.php', 'ip_address', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_vm_edit.php', 'description', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_vm_edit.php', 'start_boot', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_vm_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_vm_edit.php', 'veid', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_vm_edit.php', 'diskspace', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_vm_edit.php', 'ram', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_vm_edit.php', 'ram_burst', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_vm_edit.php', 'cpu_units', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_vm_edit.php', 'cpu_num', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_vm_edit.php', 'cpu_limit', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_vm_edit.php', 'io_priority', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_vm_edit.php', 'nameserver', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_vm_edit.php', 'capability', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_vm_edit.php', 'create_dns', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_ip_edit.php', 'ip_address', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_ip_edit.php', 'server_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_ip_edit.php', 'vm_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_ip_edit.php', 'reserved', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'template_name', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'diskspace', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'ram', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'ram_burst', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'cpu_units', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'cpu_num', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'cpu_limit', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'io_priority', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'hostname', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'nameserver', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'description', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'create_dns', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'numproc', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'numtcpsock', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'numothersock', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'vmguarpages', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'kmemsize', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'tcpsndbuf', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'tcprcvbuf', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'othersockbuf', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'dgramrcvbuf', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'oomguarpages', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'privvmpages', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'lockedpages', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'shmpages', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'physpages', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'numfile', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'avnumproc', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'numflock', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'numpty', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'numsiginfo', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'dcachesize', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'numiptent', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'swappages', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_template_edit.php', 'capability', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_ostemplate_edit.php', 'template_name', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_ostemplate_edit.php', 'template_file', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_ostemplate_edit.php', 'server_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_ostemplate_edit.php', 'description', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_ostemplate_edit.php', 'allservers', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/vm/openvz_ostemplate_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mailuser/mail_user_password_edit.php', 'password', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mailuser/mail_user_password_edit.php', 'repeat_password', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mailuser/mail_user_filter_edit.php', 'rulename', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mailuser/mail_user_filter_edit.php', 'searchterm', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mailuser/mail_user_filter_edit.php', 'target', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mailuser/mail_user_filter_edit.php', 'source', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mailuser/mail_user_filter_edit.php', 'op', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mailuser/mail_user_filter_edit.php', 'action', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mailuser/mail_user_cc_edit.php', 'cc', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mailuser/mail_user_spamfilter_edit.php', 'policy', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mailuser/mail_user_autoresponder_edit.php', 'autoresponder_subject', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mailuser/mail_user_autoresponder_edit.php', 'autoresponder', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mailuser/mail_user_autoresponder_edit.php', 'autoresponder_text', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/help/support_message_edit.php', 'subject', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/help/support_message_edit.php', 'recipient_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/help/support_message_edit.php', 'message', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/database_edit.php', 'server_id_disabled', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/database_edit.php', 'database_charset_disabled', '0', '', '');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/database_edit.php', 'remote_access', '0', '', 'Soll für diese Datenbank ein Zugriff von außerhalb des Servers ermöglicht werden? Dann müssen Sie diese Option aktivieren.');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/database_edit.php', 'active', '0', '', 'Ist diese Option gesetzt, ist die Datenbank aktiv.');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/webdav_user_edit.php', 'username', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/webdav_user_edit.php', 'password', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/webdav_user_edit.php', 'repeat_password', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/webdav_user_edit.php', 'dir', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/webdav_user_edit.php', 'parent_domain_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/webdav_user_edit.php', 'parent_domain_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/webdav_user_edit.php', 'active', '0', '', '');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/ftp_user_edit.php', 'repeat_password', '0', '', 'Geben Sie hier das gleiche Passwort noch einmal ein.');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/ftp_user_edit.php', 'active', '0', '', 'Ist diese Option gesetzt, ist der FTP-Zugang aktiv.');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/ftp_user_edit.php', 'uid', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/ftp_user_edit.php', 'gid', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/ftp_user_edit.php', 'dir', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/ftp_user_edit.php', 'quota_files', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/ftp_user_edit.php', 'ul_ratio', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/ftp_user_edit.php', 'dl_ratio', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/ftp_user_edit.php', 'ul_bandwidth', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/ftp_user_edit.php', 'dl_bandwidth', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/ftp_user_edit.php', 'dir', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_subdomain_edit.php', 'sel_domain', '0', '', '');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_subdomain_edit.php', 'active', '0', '', 'Ist diese Option gesetzt, ist die Subdomain aktiv.');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_subdomain_edit.php', 'proxy_directives', '0', '', '');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/database_user_edit.php', 'repeat_password', '0', '', 'Geben Sie hier das gleiche Passwort noch einmal ein.');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/database_user_edit.php', 'client_group_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/database_user_edit.php', 'client_group_id', '0', '', '');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_aliasdomain_edit.php', 'active', '0', '', 'Ist diese Option gesetzt, ist die Aliasdomain aktiv.');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_aliasdomain_edit.php', 'proxy_directives', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/cron_edit.php', 'run_min', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/cron_edit.php', 'run_hour', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/cron_edit.php', 'run_mday', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/cron_edit.php', 'run_month', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/cron_edit.php', 'run_wday', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/cron_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'domain', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'web_folder', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'traffic_quota', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'parent_domain_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'sel_domain', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'parent_domain_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'subdomain', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'php', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'fastcgi_php_version', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'cgi', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'ssi', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'perl', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'ruby', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'python', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'suexec', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'errordocs', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'ssl', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'redirect_path', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'redirect_type', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'seo_redirect', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'ssl_state', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'ssl_locality', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'ssl_organisation', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'ssl_organisation_unit', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'ssl_country', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'ssl_domain', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'ssl_action', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'ssl_key', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'ssl_request', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'ssl_cert', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'ssl_bundle', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'stats_password', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'repeat_password', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'stats_type', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'backup_interval', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'backup_copies', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'allow_override', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'pm_max_children', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'pm_start_servers', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'pm_min_spare_servers', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'pm_max_spare_servers', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'pm_process_idle_timeout', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'pm_max_requests', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'php_open_basedir', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'pm', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'custom_php_ini', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'apache_directives', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'nginx_directives', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'proxy_directives', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_subdomain_edit.php', 'php_fpm_use_socket', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'domain', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'web_folder', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'traffic_quota', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'parent_domain_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'sel_domain', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'parent_domain_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'aliasdomain', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'php', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'fastcgi_php_version', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'cgi', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'ssi', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'perl', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'ruby', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'python', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'suexec', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'errordocs', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'ssl', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'redirect_path', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'redirect_type', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'seo_redirect', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'ssl_state', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'ssl_locality', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'ssl_organisation', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'ssl_organisation_unit', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'ssl_country', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'ssl_domain', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'ssl_action', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'ssl_key', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'ssl_request', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'ssl_cert', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'ssl_bundle', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'stats_password', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'repeat_password', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'stats_type', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'backup_interval', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'backup_copies', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'allow_override', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'pm_max_children', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'pm_start_servers', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'pm_min_spare_servers', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'pm_max_spare_servers', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'pm_process_idle_timeout', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'pm_max_requests', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'php_open_basedir', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'pm', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'custom_php_ini', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'apache_directives', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'nginx_directives', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'proxy_directives', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_vhost_aliasdomain_edit.php', 'php_fpm_use_socket', '0', '', '');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_folder_edit.php', 'path', '0', '', 'Welches Verzeichnis von Ihrer Webseite möchten Sie mit einem Passwort schützen?');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_folder_edit.php', 'parent_domain_id', '0', '', 'Zu welcher Webseite soll ein Passwortschutz angelegt werden?');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_folder_edit.php', 'active', '0', '', 'Ist diese Option gesetzt, ist der Passwortschutz aktiv.');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/shell_user_edit.php', 'username', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/shell_user_edit.php', 'password', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/shell_user_edit.php', 'repeat_password', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/shell_user_edit.php', 'quota_size', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/shell_user_edit.php', 'parent_domain_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/shell_user_edit.php', 'parent_domain_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/shell_user_edit.php', 'chroot', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/shell_user_edit.php', 'ssh_rsa', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/shell_user_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/shell_user_edit.php', 'puser', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/shell_user_edit.php', 'pgroup', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/shell_user_edit.php', 'shell', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/shell_user_edit.php', 'dir', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_domain_edit.php', 'server_id_disabled', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_domain_edit.php', 'client_group_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_domain_edit.php', 'client_group_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_domain_edit.php', 'subdomain', '0', '', '');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_domain_edit.php', 'cgi', '0', '', 'Mit dieser Option können Sie die Unterstützung für CGI Skripte auf Ihrer Webseite aktivieren. Verwenden Sie diese Option NICHT zusammen mit aktiviertem Perl.');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_domain_edit.php', 'ssi', '0', '', 'Mit dieser Option können Sie die Unterstützung von Serverside Includes (SSI) aktivieren.');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_domain_edit.php', 'perl', '0', '', 'Mit dieser Option können Sie die Unterstützung von Perl aktivieren. Verwenden Sie diese Option NICHT zusammen mit aktiviertem CGI.');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_domain_edit.php', 'ruby', '0', '', 'Mit dieser Option können Sie die Unterstützung von Ruby aktivieren.');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_domain_edit.php', 'python', '0', '', 'Mit dieser Option können Sie die Unterstützung von Python aktivieren.');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_domain_edit.php', 'suexec', '0', '', 'Mit dieser Option wird SuExec für PHP aktiviert. Diese Einstellung wird aus Sicherheitsgründen dringend empfohlen.');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_domain_edit.php', 'errordocs', '0', '', 'Mit dieser Option aktivieren Sie benutzerdefinierte Fehlerseiten. Im Verzeichnis /web/error/ in Ihrem FTP-Zugang können Sie diese Seiten bearbeiten.');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_domain_edit.php', 'ssl', '0', '', '');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_domain_edit.php', 'active', '0', '', 'Ist diese Option gesetzt, ist die Webseite aktiv.');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_domain_edit.php', 'rewrite_rules', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_domain_edit.php', 'repeat_password', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_domain_edit.php', 'allow_override', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_domain_edit.php', 'pm_max_children', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_domain_edit.php', 'pm_start_servers', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_domain_edit.php', 'pm_min_spare_servers', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_domain_edit.php', 'pm_max_spare_servers', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_domain_edit.php', 'pm_process_idle_timeout', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_domain_edit.php', 'pm_max_requests', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_domain_edit.php', 'php_open_basedir', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_domain_edit.php', 'pm', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_domain_edit.php', 'custom_php_ini', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_domain_edit.php', 'apache_directives', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_domain_edit.php', 'nginx_directives', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_domain_edit.php', 'proxy_directives', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_domain_edit.php', 'php_fpm_use_socket', '0', '', '');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_folder_user_edit.php', 'username', '0', '', 'Geben Sie einen Benutzernamen ein, der auf das geschützte Verzeichnis zugreifen soll.');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_folder_user_edit.php', 'password', '0', '', 'Geben Sie ein sicheres Passwort für den Benutzer ein.');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_folder_user_edit.php', 'repeat_password', '0', '', 'Geben Sie das gleiche Passwort noch einmal ein.');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_folder_user_edit.php', 'web_folder_id', '0', '', 'Für welchen Ordner möchten Sie einen Benutzer anlegen?');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/sites/web_folder_user_edit.php', 'active', '0', '', 'Ist diese Option gesetzt, ist der Benutzerzugang aktiv.');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/domain_edit.php', 'domain', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/domain_edit.php', 'domain', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/domain_edit.php', 'client_group_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/domain_edit.php', 'client_group_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_circle_edit.php', 'circle_name', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_circle_edit.php', 'description', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_circle_edit.php', 'client_ids', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_circle_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'company_name', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'contact_name', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'customer_no', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'username', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'password', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'repeat_password', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'street', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'zip', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'city', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'state', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'telephone', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'mobile', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'fax', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'email', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'internet', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'icq', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'vat_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'company_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'bank_account_owner', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'bank_account_number', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'bank_code', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'bank_name', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'bank_account_iban', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'bank_account_swift', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'paypal_email', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'gender', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'language', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'usertheme', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'country', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'notes', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'locked', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'canceled', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_web_domain', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_web_quota', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_traffic_quota', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_web_aliasdomain', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_web_subdomain', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_ftp_user', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_shell_user', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_webdav_user', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_maildomain', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_mailbox', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_mailalias', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_mailaliasdomain', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_mailmailinglist', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_mailforward', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_mailcatchall', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_mailrouting', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_mailfilter', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_fetchmail', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_mailquota', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_spamfilter_wblist', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_spamfilter_user', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_spamfilter_policy', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_database', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_cron', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_cron_frequency', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_dns_zone', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_dns_slave_zone', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_dns_record', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_openvz_vm', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_aps', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'template_master', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'tpl_add_select', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'default_webserver', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'default_mailserver', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'default_dbserver', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_cron_type', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'default_dnsserver', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'default_slave_dnsserver', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_openvz_vm_template_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'web_php_options', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_cgi', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_ssi', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_perl', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_ruby', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_python', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'force_suexec', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_hterror', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_wildcard', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'limit_ssl', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_edit.php', 'ssh_chroot', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'company_name', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'contact_name', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'customer_no', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'username', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'password', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'repeat_password', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'street', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'zip', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'city', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'state', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'telephone', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'mobile', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'fax', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'email', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'internet', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'icq', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'vat_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'company_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'bank_account_owner', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'bank_account_number', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'bank_code', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'bank_name', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'bank_account_iban', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'bank_account_swift', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'paypal_email', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'gender', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'language', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'usertheme', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'country', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'notes', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'locked', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'canceled', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_client', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_web_domain', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_web_quota', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_traffic_quota', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_web_aliasdomain', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_web_subdomain', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_ftp_user', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_shell_user', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_webdav_user', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_maildomain', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_mailmailinglist', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_mailbox', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_mailalias', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_mailaliasdomain', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_mailforward', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_mailcatchall', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_mailrouting', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_mailfilter', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_fetchmail', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_mailquota', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_spamfilter_wblist', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_spamfilter_user', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_spamfilter_policy', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_database', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_cron', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_cron_frequency', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_dns_zone', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_dns_slave_zone', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_dns_record', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_openvz_vm', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_aps', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'default_webserver', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'default_mailserver', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'default_dbserver', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_cron_type', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'default_dnsserver', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'default_slave_dnsserver', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_openvz_vm_template_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'web_php_options', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_cgi', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_ssi', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_perl', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_ruby', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_python', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'force_suexec', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_hterror', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_wildcard', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'limit_ssl', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/reseller_edit.php', 'ssh_chroot', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'template_name', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'template_type', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_web_domain', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_web_quota', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_traffic_quota', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_web_aliasdomain', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_web_subdomain', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_ftp_user', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_shell_user', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_webdav_user', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_maildomain', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_mailbox', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_mailalias', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_mailaliasdomain', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_mailmailinglist', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_mailforward', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_mailcatchall', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_mailrouting', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_mailfilter', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_fetchmail', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_mailquota', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_spamfilter_wblist', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_spamfilter_user', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_spamfilter_policy', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_database', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_cron', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_cron_frequency', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_dns_zone', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_dns_slave_zone', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_dns_record', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_openvz_vm', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_aps', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_cron_type', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_openvz_vm_template_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'web_php_options', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_cgi', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_ssi', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_perl', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_ruby', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_python', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'force_suexec', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_hterror', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_wildcard', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'limit_ssl', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/client/client_template_edit.php', 'ssh_chroot', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_content_filter_edit.php', 'pattern', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_content_filter_edit.php', 'data', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_content_filter_edit.php', 'server_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_content_filter_edit.php', 'type', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_content_filter_edit.php', 'action', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_content_filter_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_transport_edit.php', 'domain', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_transport_edit.php', 'mx', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_transport_edit.php', 'destination', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_transport_edit.php', 'server_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_transport_edit.php', 'type', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_transport_edit.php', 'sort_order', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_transport_edit.php', 'active', '0', '', '');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_aliasdomain_edit.php', 'active', '0', '', 'Ist diese Option gesetzt, ist der E-Mail-Empfang für diese Domain aktiv.');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_alias_edit.php', 'active', '0', '', 'Ist diese Option gesetzt, ist diese E-Mail-Adresse aktiv.');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_forward_edit.php', 'active', '0', '', 'Ist diese Option gesetzt, ist diese E-Mail-Weiterleitung aktiv.');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'policy_name', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'virus_lover', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'spam_lover', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'banned_files_lover', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'bad_header_lover', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'bypass_virus_checks', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'bypass_banned_checks', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'bypass_header_checks', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'virus_quarantine_to', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'spam_quarantine_to', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'banned_quarantine_to', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'bad_header_quarantine_to', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'spam_tag_level', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'spam_tag2_level', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'spam_kill_level', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'spam_dsn_cutoff_level', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'spam_quarantine_cutoff_level', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'spam_subject_tag', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'spam_subject_tag2', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'spam_modifies_subj', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'addr_extension_virus', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'addr_extension_spam', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'addr_extension_banned', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'addr_extension_bad_header', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'newvirus_admin', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'virus_admin', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'banned_admin', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'bad_header_admin', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'spam_admin', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'message_size_limit', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'banned_rulenames', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'warnvirusrecip', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'warnbannedrecip', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_policy_edit.php', 'warnbadhrecip', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_blacklist_edit.php', 'email', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_blacklist_edit.php', 'rid', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_blacklist_edit.php', 'priority', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_blacklist_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_user_filter_edit.php', 'rulename', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_user_filter_edit.php', 'searchterm', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_user_filter_edit.php', 'target', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_user_filter_edit.php', 'source', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_user_filter_edit.php', 'op', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_user_filter_edit.php', 'action', '0', '', '');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_user_edit.php', 'repeat_password', '0', '', 'Geben Sie das gleiche Passwort noch einmal ein.');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_user_edit.php', 'quota', '0', '', '');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_user_edit.php', 'postfix', '0', '', 'Ist diese Option gesetzt, ist der E-Mail-Empfang auf dieser Adresse aktiv.');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_user_edit.php', 'disableimap', '0', '', 'Ist diese Option gesetzt, kann NICHT via IMAP auf diese Adresse zugegriffen werden.');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_user_edit.php', 'disablepop3', '0', '', 'Ist diese Option gesetzt, kann NICHT via POP3 auf diese Adresse zugegriffen werden.');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_user_edit.php', 'move_junk', '0', '', 'Ist diese Option gesetzt, werden als Spam erkannte E-Mails in den Spam-Ordner verschoben. Bei der Verwendung von POP3 sind diese Mails NICHT sichtbar.');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_user_edit.php', 'custom_mailfilter', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_blacklist_edit.php', 'source', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_blacklist_edit.php', 'server_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_blacklist_edit.php', 'type', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_blacklist_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_whitelist_edit.php', 'source', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_whitelist_edit.php', 'server_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_whitelist_edit.php', 'type', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_whitelist_edit.php', 'active', '0', '', '');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_domain_catchall_edit.php', 'active', '0', '', 'Ist diese Option gesetzt, ist dieses Catch-All-Konto aktiv.');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_get_edit.php', 'source_server', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_get_edit.php', 'source_username', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_get_edit.php', 'source_password', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_get_edit.php', 'type', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_get_edit.php', 'destination', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_get_edit.php', 'source_delete', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_get_edit.php', 'source_read_all', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_get_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_domain_edit.php', 'server_id_disabled', '0', '', '');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_domain_edit.php', 'client_group_id', '0', '', 'Welchem Kunden ist diese Domain zugeordnet?');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_domain_edit.php', 'dkim_private', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_domain_edit.php', 'dkim_public', '0', '', '');
-REPLACE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_domain_edit.php', 'active', '0', '', 'Ist diese Option gesetzt, ist die E-Mail-Domain aktiv.');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_domain_edit.php', 'dkim', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_users_edit.php', 'email', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_users_edit.php', 'fullname', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_users_edit.php', 'server_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_users_edit.php', 'priority', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_users_edit.php', 'policy_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_users_edit.php', 'local', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_mailinglist_edit.php', 'listname_disabled', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_mailinglist_edit.php', 'email_disabled', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_mailinglist_edit.php', 'listname', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_mailinglist_edit.php', 'email', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_mailinglist_edit.php', 'password', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_mailinglist_edit.php', 'repeat_password', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_mailinglist_edit.php', 'client_group_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_mailinglist_edit.php', 'client_group_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_mailinglist_edit.php', 'domain_disabled', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_mailinglist_edit.php', 'domain', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_relay_recipient_edit.php', 'source', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_relay_recipient_edit.php', 'server_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/mail_relay_recipient_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_whitelist_edit.php', 'email', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_whitelist_edit.php', 'rid', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_whitelist_edit.php', 'priority', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_whitelist_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_config_edit.php', 'ip_address', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_config_edit.php', 'netmask', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_config_edit.php', 'gateway', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_config_edit.php', 'hostname', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_config_edit.php', 'nameservers', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_config_edit.php', 'maildir_path', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_config_edit.php', 'homedir_path', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_config_edit.php', 'mailuser_uid', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_config_edit.php', 'mailuser_gid', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_config_edit.php', 'mailuser_name', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_config_edit.php', 'mailuser_group', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_config_edit.php', 'relayhost', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_config_edit.php', 'relayhost_user', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_config_edit.php', 'relayhost_password', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_config_edit.php', 'mailbox_size_limit', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_config_edit.php', 'message_size_limit', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_config_edit.php', 'module', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/mail/spamfilter_config_edit.php', 'getmail_config_dir', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_aaaa_edit.php', 'name', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_aaaa_edit.php', 'data', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_aaaa_edit.php', 'ttl', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_aaaa_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_cname_edit.php', 'name', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_cname_edit.php', 'data', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_cname_edit.php', 'ttl', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_cname_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_mx_edit.php', 'name', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_mx_edit.php', 'data', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_mx_edit.php', 'aux', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_mx_edit.php', 'ttl', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_mx_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_srv_edit.php', 'name', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_srv_edit.php', 'target', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_srv_edit.php', 'weight', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_srv_edit.php', 'port', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_srv_edit.php', 'aux', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_srv_edit.php', 'ttl', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_srv_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_alias_edit.php', 'name', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_alias_edit.php', 'data', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_alias_edit.php', 'ttl', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_alias_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_ptr_edit.php', 'name', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_ptr_edit.php', 'data', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_ptr_edit.php', 'ttl', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_ptr_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_ns_edit.php', 'name', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_ns_edit.php', 'data', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_ns_edit.php', 'ttl', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_ns_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_template_edit.php', 'name', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_template_edit.php', 'template', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_template_edit.php', 'fields', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_template_edit.php', 'visible', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_hinfo_edit.php', 'name', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_hinfo_edit.php', 'data', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_hinfo_edit.php', 'ttl', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_hinfo_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_a_edit.php', 'name', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_a_edit.php', 'data', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_a_edit.php', 'ttl', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_a_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_slave_edit.php', 'origin', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_slave_edit.php', 'ns', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_slave_edit.php', 'xfer', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_slave_edit.php', 'server_id_disabled', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_slave_edit.php', 'server_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_slave_edit.php', 'client_group_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_slave_edit.php', 'client_group_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_slave_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_dkim_edit.php', 'ttl', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_dkim_edit.php', 'data', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_dkim_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_soa_edit.php', 'origin', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_soa_edit.php', 'ns', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_soa_edit.php', 'mbox', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_soa_edit.php', 'refresh', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_soa_edit.php', 'retry', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_soa_edit.php', 'expire', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_soa_edit.php', 'minimum', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_soa_edit.php', 'ttl', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_soa_edit.php', 'xfer', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_soa_edit.php', 'also_notify', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_soa_edit.php', 'update_acl', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_soa_edit.php', 'server_id_disabled', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_soa_edit.php', 'server_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_soa_edit.php', 'client_group_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_soa_edit.php', 'client_group_id', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_soa_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_rp_edit.php', 'name', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_rp_edit.php', 'data', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_rp_edit.php', 'ttl', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_rp_edit.php', 'active', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_txt_edit.php', 'name', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_txt_edit.php', 'data', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_txt_edit.php', 'ttl', '0', '', '');
-INSERT IGNORE INTO `help_tooltips` (`url`, `field`, `demo`, `en`, `de`) VALUES ('/dns/dns_txt_edit.php', 'active', '0', '', '');
diff --git a/interface/web/dns/lib/lang/ar_dns_dkim.lng b/interface/web/dns/lib/lang/ar_dns_dkim.lng
new file mode 100644
index 0000000000000000000000000000000000000000..6ca7521495f7d4f7d87f549fa2b18f9fb66fb459
--- /dev/null
+++ b/interface/web/dns/lib/lang/ar_dns_dkim.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['public_key_txt'] = 'Public-Key';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['dkim_disabled_txt'] = 'DKIM disabled for this mail-domain';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+?>
diff --git a/interface/web/dns/lib/lang/ar_dns_wizard.lng b/interface/web/dns/lib/lang/ar_dns_wizard.lng
index 245e30fe255fb1f3adaa195f5b20cb640d30e7ea..5e1df4a3a16dd1a359c77c7553d505b60a030015 100644
--- a/interface/web/dns/lib/lang/ar_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/ar_dns_wizard.lng
@@ -37,4 +37,5 @@ $wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
$wb['list_head_txt'] = 'DNS Zone Wizard';
$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
+$wb['dkim_txt'] = 'DKIM enabled';
?>
diff --git a/interface/web/dns/lib/lang/bg_dns_dkim.lng b/interface/web/dns/lib/lang/bg_dns_dkim.lng
new file mode 100644
index 0000000000000000000000000000000000000000..6ca7521495f7d4f7d87f549fa2b18f9fb66fb459
--- /dev/null
+++ b/interface/web/dns/lib/lang/bg_dns_dkim.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['public_key_txt'] = 'Public-Key';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['dkim_disabled_txt'] = 'DKIM disabled for this mail-domain';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+?>
diff --git a/interface/web/dns/lib/lang/bg_dns_wizard.lng b/interface/web/dns/lib/lang/bg_dns_wizard.lng
index 7a36028ca583776d19db82bdd04300dbaeb0f63f..7e8cce66b9a279b6e7424b38096bff3dd7693dcb 100644
--- a/interface/web/dns/lib/lang/bg_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/bg_dns_wizard.lng
@@ -37,4 +37,5 @@ $wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
$wb['list_head_txt'] = 'DNS Zone Wizard';
$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
+$wb['dkim_txt'] = 'DKIM enabled';
?>
diff --git a/interface/web/dns/lib/lang/br_dns_dkim.lng b/interface/web/dns/lib/lang/br_dns_dkim.lng
new file mode 100644
index 0000000000000000000000000000000000000000..6ca7521495f7d4f7d87f549fa2b18f9fb66fb459
--- /dev/null
+++ b/interface/web/dns/lib/lang/br_dns_dkim.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['public_key_txt'] = 'Public-Key';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['dkim_disabled_txt'] = 'DKIM disabled for this mail-domain';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+?>
diff --git a/interface/web/dns/lib/lang/br_dns_wizard.lng b/interface/web/dns/lib/lang/br_dns_wizard.lng
index 67c4315ce4f417cd4a7125c66d327c5925a66b21..351fc6992e101db0ac56842bf3661d09cda1f969 100644
--- a/interface/web/dns/lib/lang/br_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/br_dns_wizard.lng
@@ -37,4 +37,5 @@ $wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
$wb['list_head_txt'] = 'DNS Zone Wizard';
$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
+$wb['dkim_txt'] = 'DKIM enabled';
?>
diff --git a/interface/web/dns/lib/lang/cz_dns_dkim.lng b/interface/web/dns/lib/lang/cz_dns_dkim.lng
new file mode 100644
index 0000000000000000000000000000000000000000..6ca7521495f7d4f7d87f549fa2b18f9fb66fb459
--- /dev/null
+++ b/interface/web/dns/lib/lang/cz_dns_dkim.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['public_key_txt'] = 'Public-Key';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['dkim_disabled_txt'] = 'DKIM disabled for this mail-domain';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+?>
diff --git a/interface/web/dns/lib/lang/cz_dns_wizard.lng b/interface/web/dns/lib/lang/cz_dns_wizard.lng
index c5a0480fa3e565801d56830efc7c7c6bf08c0e1f..599380e397f5fdf9e336fb0b9e4738d63ae7a59f 100644
--- a/interface/web/dns/lib/lang/cz_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/cz_dns_wizard.lng
@@ -37,5 +37,6 @@ $wb['globalsearch_searchfield_watermark_txt'] = 'Hledat';
$wb['globalsearch_suggestions_text_txt'] = 'Návrhy';
$wb['list_head_txt'] = 'Průvodce vytvoÅ™enÃm DNS zóny';
$wb['list_desc_txt'] = 'Vytvořenà DNS zóny pomocà průvodce';
+$wb['dkim_txt'] = 'DKIM enabled';
?>
diff --git a/interface/web/dns/lib/lang/el_dns_dkim.lng b/interface/web/dns/lib/lang/el_dns_dkim.lng
new file mode 100644
index 0000000000000000000000000000000000000000..6ca7521495f7d4f7d87f549fa2b18f9fb66fb459
--- /dev/null
+++ b/interface/web/dns/lib/lang/el_dns_dkim.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['public_key_txt'] = 'Public-Key';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['dkim_disabled_txt'] = 'DKIM disabled for this mail-domain';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+?>
diff --git a/interface/web/dns/lib/lang/es_dns_dkim.lng b/interface/web/dns/lib/lang/es_dns_dkim.lng
new file mode 100644
index 0000000000000000000000000000000000000000..6ca7521495f7d4f7d87f549fa2b18f9fb66fb459
--- /dev/null
+++ b/interface/web/dns/lib/lang/es_dns_dkim.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['public_key_txt'] = 'Public-Key';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['dkim_disabled_txt'] = 'DKIM disabled for this mail-domain';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+?>
diff --git a/interface/web/dns/lib/lang/es_dns_wizard.lng b/interface/web/dns/lib/lang/es_dns_wizard.lng
index 32ce474364d5418b11362925702efd1c4eac2346..7ecc1e04dcf09744b968c05a3bfb1fde900dc838 100644
--- a/interface/web/dns/lib/lang/es_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/es_dns_wizard.lng
@@ -37,4 +37,5 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['dkim_txt'] = 'DKIM enabled';
?>
diff --git a/interface/web/dns/lib/lang/fi_dns_dkim.lng b/interface/web/dns/lib/lang/fi_dns_dkim.lng
new file mode 100644
index 0000000000000000000000000000000000000000..6ca7521495f7d4f7d87f549fa2b18f9fb66fb459
--- /dev/null
+++ b/interface/web/dns/lib/lang/fi_dns_dkim.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['public_key_txt'] = 'Public-Key';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['dkim_disabled_txt'] = 'DKIM disabled for this mail-domain';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+?>
diff --git a/interface/web/dns/lib/lang/fi_dns_wizard.lng b/interface/web/dns/lib/lang/fi_dns_wizard.lng
index d5fc18c44fa2a80dd972ba1ceea2e628c0f129fc..3402723b1ee9ffdff566d87dbec905350b75fc85 100755
--- a/interface/web/dns/lib/lang/fi_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/fi_dns_wizard.lng
@@ -37,4 +37,5 @@ $wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
$wb['list_head_txt'] = 'DNS Zone Wizard';
$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
+$wb['dkim_txt'] = 'DKIM enabled';
?>
diff --git a/interface/web/dns/lib/lang/hr_dns_dkim.lng b/interface/web/dns/lib/lang/hr_dns_dkim.lng
new file mode 100644
index 0000000000000000000000000000000000000000..6ca7521495f7d4f7d87f549fa2b18f9fb66fb459
--- /dev/null
+++ b/interface/web/dns/lib/lang/hr_dns_dkim.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['public_key_txt'] = 'Public-Key';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['dkim_disabled_txt'] = 'DKIM disabled for this mail-domain';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+?>
diff --git a/interface/web/dns/lib/lang/hr_dns_wizard.lng b/interface/web/dns/lib/lang/hr_dns_wizard.lng
index 0e7f4103cf300f0e26b84c95cc65ed5174b41db1..7650318b35bad1ea2fdc04b3d8ee5f7589d6eea8 100644
--- a/interface/web/dns/lib/lang/hr_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/hr_dns_wizard.lng
@@ -35,6 +35,7 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.';
$wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['dkim_txt'] = 'DKIM enabled';
$wb['list_head_txt'] = 'DNS Zone Wizard';
$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
?>
diff --git a/interface/web/dns/lib/lang/hu_dns_dkim.lng b/interface/web/dns/lib/lang/hu_dns_dkim.lng
new file mode 100644
index 0000000000000000000000000000000000000000..6ca7521495f7d4f7d87f549fa2b18f9fb66fb459
--- /dev/null
+++ b/interface/web/dns/lib/lang/hu_dns_dkim.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['public_key_txt'] = 'Public-Key';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['dkim_disabled_txt'] = 'DKIM disabled for this mail-domain';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+?>
diff --git a/interface/web/dns/lib/lang/hu_dns_wizard.lng b/interface/web/dns/lib/lang/hu_dns_wizard.lng
index 9d2f2afb2128b6eaec8d40bb706cd642686e2af8..89098341b795b8a087a8b840c1bf8b87e771aa36 100644
--- a/interface/web/dns/lib/lang/hu_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/hu_dns_wizard.lng
@@ -37,4 +37,5 @@ $wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
$wb['list_head_txt'] = 'DNS Zone Wizard';
$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
+$wb['dkim_txt'] = 'DKIM enabled';
?>
diff --git a/interface/web/dns/lib/lang/id_dns_dkim.lng b/interface/web/dns/lib/lang/id_dns_dkim.lng
new file mode 100644
index 0000000000000000000000000000000000000000..6ca7521495f7d4f7d87f549fa2b18f9fb66fb459
--- /dev/null
+++ b/interface/web/dns/lib/lang/id_dns_dkim.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['public_key_txt'] = 'Public-Key';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['dkim_disabled_txt'] = 'DKIM disabled for this mail-domain';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+?>
diff --git a/interface/web/dns/lib/lang/id_dns_wizard.lng b/interface/web/dns/lib/lang/id_dns_wizard.lng
index df95a20ac1b6cf382d269639e044317cb463345e..3ad597727d306d2be157fe09d7407c9c9b6bd140 100644
--- a/interface/web/dns/lib/lang/id_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/id_dns_wizard.lng
@@ -37,4 +37,5 @@ $wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
$wb['list_head_txt'] = 'DNS Zone Wizard';
$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
+$wb['dkim_txt'] = 'DKIM enabled';
?>
diff --git a/interface/web/dns/lib/lang/it_dns_dkim.lng b/interface/web/dns/lib/lang/it_dns_dkim.lng
new file mode 100644
index 0000000000000000000000000000000000000000..6ca7521495f7d4f7d87f549fa2b18f9fb66fb459
--- /dev/null
+++ b/interface/web/dns/lib/lang/it_dns_dkim.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['public_key_txt'] = 'Public-Key';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['dkim_disabled_txt'] = 'DKIM disabled for this mail-domain';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+?>
diff --git a/interface/web/dns/lib/lang/it_dns_wizard.lng b/interface/web/dns/lib/lang/it_dns_wizard.lng
index 245e30fe255fb1f3adaa195f5b20cb640d30e7ea..5e1df4a3a16dd1a359c77c7553d505b60a030015 100644
--- a/interface/web/dns/lib/lang/it_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/it_dns_wizard.lng
@@ -37,4 +37,5 @@ $wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
$wb['list_head_txt'] = 'DNS Zone Wizard';
$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
+$wb['dkim_txt'] = 'DKIM enabled';
?>
diff --git a/interface/web/dns/lib/lang/ja_dns_dkim.lng b/interface/web/dns/lib/lang/ja_dns_dkim.lng
new file mode 100644
index 0000000000000000000000000000000000000000..6ca7521495f7d4f7d87f549fa2b18f9fb66fb459
--- /dev/null
+++ b/interface/web/dns/lib/lang/ja_dns_dkim.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['public_key_txt'] = 'Public-Key';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['dkim_disabled_txt'] = 'DKIM disabled for this mail-domain';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+?>
diff --git a/interface/web/dns/lib/lang/ja_dns_wizard.lng b/interface/web/dns/lib/lang/ja_dns_wizard.lng
index 10030383c374fb38116c8923ff2bc26cf6329702..a4c6413098cffeea00173259cdcf5b5014d0e6bd 100644
--- a/interface/web/dns/lib/lang/ja_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/ja_dns_wizard.lng
@@ -37,4 +37,4 @@ $wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
$wb['list_head_txt'] = 'DNS Zone Wizard';
$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
-?>
+$wb['dkim_txt'] = 'DKIM enabled';?>
diff --git a/interface/web/dns/lib/lang/nl_dns_dkim.lng b/interface/web/dns/lib/lang/nl_dns_dkim.lng
new file mode 100644
index 0000000000000000000000000000000000000000..6ca7521495f7d4f7d87f549fa2b18f9fb66fb459
--- /dev/null
+++ b/interface/web/dns/lib/lang/nl_dns_dkim.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['public_key_txt'] = 'Public-Key';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['dkim_disabled_txt'] = 'DKIM disabled for this mail-domain';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+?>
diff --git a/interface/web/dns/lib/lang/nl_dns_wizard.lng b/interface/web/dns/lib/lang/nl_dns_wizard.lng
index d9fa165faeb0db05523dd22bfa11820b93e5fc60..a8aa8119f46ecf4cca88cae2d9ec1578e29bbdc3 100644
--- a/interface/web/dns/lib/lang/nl_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/nl_dns_wizard.lng
@@ -37,4 +37,5 @@ $wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
$wb['list_head_txt'] = 'DNS Zone Wizard';
$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
+$wb['dkim_txt'] = 'DKIM enabled';
?>
diff --git a/interface/web/dns/lib/lang/pl_dns_wizard.lng b/interface/web/dns/lib/lang/pl_dns_wizard.lng
index 7410f1665264c3a34caa7c46a3f2a7c0709b883a..a205b6c6c415b6213bc8d335cd2d2a47ebef8588 100644
--- a/interface/web/dns/lib/lang/pl_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/pl_dns_wizard.lng
@@ -37,4 +37,5 @@ $wb['globalsearch_noresults_text_txt'] = 'Brak wyników';
$wb['globalsearch_noresults_limit_txt'] = '0 wyników';
$wb['globalsearch_searchfield_watermark_txt'] = 'Szukaj';
$wb['globalsearch_suggestions_text_txt'] = 'Sugestie';
+$wb['dkim_txt'] = 'DKIM enabled';
?>
diff --git a/interface/web/dns/lib/lang/pt_dns_wizard.lng b/interface/web/dns/lib/lang/pt_dns_wizard.lng
index 52d96345177f007193bf1ed384be4c417af3e388..f6b4aad7783bfbedf3f8cc5333db835656b87754 100644
--- a/interface/web/dns/lib/lang/pt_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/pt_dns_wizard.lng
@@ -37,4 +37,5 @@ $wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
$wb['list_head_txt'] = 'DNS Zone Wizard';
$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
+$wb['dkim_txt'] = 'DKIM enabled';
?>
diff --git a/interface/web/dns/lib/lang/ro_dns_wizard.lng b/interface/web/dns/lib/lang/ro_dns_wizard.lng
index 7000ede0031b74f6ce55ee3fca90d341b3f60090..7c847cb9834474f7986cc35f80299bd2d1ec8103 100644
--- a/interface/web/dns/lib/lang/ro_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/ro_dns_wizard.lng
@@ -37,4 +37,5 @@ $wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
$wb['list_head_txt'] = 'DNS Zone Wizard';
$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
+$wb['dkim_txt'] = 'DKIM enabled';
?>
diff --git a/interface/web/dns/lib/lang/ru_dns_dkim.lng b/interface/web/dns/lib/lang/ru_dns_dkim.lng
new file mode 100644
index 0000000000000000000000000000000000000000..6ca7521495f7d4f7d87f549fa2b18f9fb66fb459
--- /dev/null
+++ b/interface/web/dns/lib/lang/ru_dns_dkim.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['public_key_txt'] = 'Public-Key';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['dkim_disabled_txt'] = 'DKIM disabled for this mail-domain';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+?>
diff --git a/interface/web/dns/lib/lang/ru_dns_wizard.lng b/interface/web/dns/lib/lang/ru_dns_wizard.lng
index fed88734c4b142a731759354329b96dc23680af2..385eaacf796858c30c48c75abdd271a8e7976bb4 100644
--- a/interface/web/dns/lib/lang/ru_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/ru_dns_wizard.lng
@@ -37,4 +37,5 @@ $wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
$wb['list_head_txt'] = 'DNS Zone Wizard';
$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
+$wb['dkim_txt'] = 'DKIM enabled';
?>
diff --git a/interface/web/dns/lib/lang/se_dns_dkim.lng b/interface/web/dns/lib/lang/se_dns_dkim.lng
new file mode 100644
index 0000000000000000000000000000000000000000..6ca7521495f7d4f7d87f549fa2b18f9fb66fb459
--- /dev/null
+++ b/interface/web/dns/lib/lang/se_dns_dkim.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['public_key_txt'] = 'Public-Key';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['dkim_disabled_txt'] = 'DKIM disabled for this mail-domain';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+?>
diff --git a/interface/web/dns/lib/lang/se_dns_wizard.lng b/interface/web/dns/lib/lang/se_dns_wizard.lng
index 245e30fe255fb1f3adaa195f5b20cb640d30e7ea..5e1df4a3a16dd1a359c77c7553d505b60a030015 100644
--- a/interface/web/dns/lib/lang/se_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/se_dns_wizard.lng
@@ -37,4 +37,5 @@ $wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
$wb['list_head_txt'] = 'DNS Zone Wizard';
$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
+$wb['dkim_txt'] = 'DKIM enabled';
?>
diff --git a/interface/web/dns/lib/lang/sk_dns_dkim.lng b/interface/web/dns/lib/lang/sk_dns_dkim.lng
new file mode 100644
index 0000000000000000000000000000000000000000..6ca7521495f7d4f7d87f549fa2b18f9fb66fb459
--- /dev/null
+++ b/interface/web/dns/lib/lang/sk_dns_dkim.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['public_key_txt'] = 'Public-Key';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['dkim_disabled_txt'] = 'DKIM disabled for this mail-domain';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+?>
diff --git a/interface/web/dns/lib/lang/sk_dns_wizard.lng b/interface/web/dns/lib/lang/sk_dns_wizard.lng
index 4d19fc560a9351c78e75fe995746a3e2a9f6c76b..e82610354213959f3e0f1ed82644473191bba766 100644
--- a/interface/web/dns/lib/lang/sk_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/sk_dns_wizard.lng
@@ -37,4 +37,5 @@ $wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
$wb['list_head_txt'] = 'DNS Zone Wizard';
$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
+$wb['dkim_txt'] = 'DKIM enabled';
?>
diff --git a/interface/web/dns/lib/lang/tr_dns_dkim.lng b/interface/web/dns/lib/lang/tr_dns_dkim.lng
new file mode 100644
index 0000000000000000000000000000000000000000..6ca7521495f7d4f7d87f549fa2b18f9fb66fb459
--- /dev/null
+++ b/interface/web/dns/lib/lang/tr_dns_dkim.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['public_key_txt'] = 'Public-Key';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['dkim_disabled_txt'] = 'DKIM disabled for this mail-domain';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
+?>
diff --git a/interface/web/dns/lib/lang/tr_dns_wizard.lng b/interface/web/dns/lib/lang/tr_dns_wizard.lng
index 038712c2a08f268788f0758b2311af64ccd21217..5948a41e6133b1d1daed0c2b53100138556ef73c 100644
--- a/interface/web/dns/lib/lang/tr_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/tr_dns_wizard.lng
@@ -37,4 +37,5 @@ $wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
$wb['list_head_txt'] = 'DNS Zone Wizard';
$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
+$wb['dkim_txt'] = 'DKIM enabled';
?>
diff --git a/interface/web/mail/lib/lang/ar_mail_backup_list.lng b/interface/web/mail/lib/lang/ar_mail_backup_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..320ff5023ce51d69ccbf9e85b4982a2f126ba854
--- /dev/null
+++ b/interface/web/mail/lib/lang/ar_mail_backup_list.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['list_head_txt'] = 'Existing backups';
+$wb['date_txt'] = 'Date';
+$wb['backup_type_txt'] = 'Type';
+$wb['filename_txt'] = 'Backup file';
+$wb['restore_backup_txt'] = 'Restore';
+$wb['restore_info_txt'] = 'Restore of the backup has been started. This action takes several minutes to be completed.';
+$wb['restore_confirm_txt'] = 'Restoring may overwrite existing files in your mailbox. Do you really want to restore this backup?';
+$wb['download_pending_txt'] = 'There is already a pending backup download job.';
+$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
+$wb['filesize_txt'] = 'Filesize';
+?>
diff --git a/interface/web/mail/lib/lang/ar_mail_domain.lng b/interface/web/mail/lib/lang/ar_mail_domain.lng
index 6120e82b7dc518f9d496329f38d0cf57257e3941..c0f30d2f4d18bfaa74803e85bd59a5ac26160432 100644
--- a/interface/web/mail/lib/lang/ar_mail_domain.lng
+++ b/interface/web/mail/lib/lang/ar_mail_domain.lng
@@ -10,4 +10,10 @@ $wb['client_txt'] = 'Client';
$wb['limit_maildomain_txt'] = 'The max. number of email domains for your account is reached.';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- not enabled -';
+$wb["dkim_txt"] = 'enable DKIM';
+$wb["dkim_private_txt"] = 'DKIM Private-key';
+$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
+$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
+$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
+$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
?>
diff --git a/interface/web/mail/lib/lang/ar_mail_user.lng b/interface/web/mail/lib/lang/ar_mail_user.lng
index 38f0afe7c134d393148955243e860aeec6d27b48..6a8d4ee21772510a30f546fb49b31b14e90ce901 100644
--- a/interface/web/mail/lib/lang/ar_mail_user.lng
+++ b/interface/web/mail/lib/lang/ar_mail_user.lng
@@ -47,4 +47,10 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['no_backup_txt'] = 'No backup';
+$wb['daily_backup_txt'] = 'Daily';
+$wb['weekly_backup_txt'] = 'Weekly';
+$wb['monthly_backup_txt'] = 'Monthly';
?>
diff --git a/interface/web/mail/lib/lang/bg_mail_backup_list.lng b/interface/web/mail/lib/lang/bg_mail_backup_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..320ff5023ce51d69ccbf9e85b4982a2f126ba854
--- /dev/null
+++ b/interface/web/mail/lib/lang/bg_mail_backup_list.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['list_head_txt'] = 'Existing backups';
+$wb['date_txt'] = 'Date';
+$wb['backup_type_txt'] = 'Type';
+$wb['filename_txt'] = 'Backup file';
+$wb['restore_backup_txt'] = 'Restore';
+$wb['restore_info_txt'] = 'Restore of the backup has been started. This action takes several minutes to be completed.';
+$wb['restore_confirm_txt'] = 'Restoring may overwrite existing files in your mailbox. Do you really want to restore this backup?';
+$wb['download_pending_txt'] = 'There is already a pending backup download job.';
+$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
+$wb['filesize_txt'] = 'Filesize';
+?>
diff --git a/interface/web/mail/lib/lang/bg_mail_domain.lng b/interface/web/mail/lib/lang/bg_mail_domain.lng
index b91704dc1fde407a091a12326f54840c91f2a17e..4c028ade0aaebc6a5c7fe0d520ebf7b74dd0b182 100644
--- a/interface/web/mail/lib/lang/bg_mail_domain.lng
+++ b/interface/web/mail/lib/lang/bg_mail_domain.lng
@@ -8,6 +8,12 @@ $wb['domain_error_unique'] = 'Дублиращ Ñе домейн.';
$wb['domain_error_regex'] = 'Ðеправилно домейн име.';
$wb['client_txt'] = 'Клиент';
$wb['limit_maildomain_txt'] = 'The max. number of email domains for your account is reached.';
+$wb["dkim_txt"] = 'enable DKIM';
+$wb["dkim_private_txt"] = 'DKIM Private-key';
+$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
+$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
+$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
+$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
$wb['policy_txt'] = 'Спамфилтър';
$wb['no_policy'] = '- не е разрешен -';
?>
diff --git a/interface/web/mail/lib/lang/br_mail_backup_list.lng b/interface/web/mail/lib/lang/br_mail_backup_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..320ff5023ce51d69ccbf9e85b4982a2f126ba854
--- /dev/null
+++ b/interface/web/mail/lib/lang/br_mail_backup_list.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['list_head_txt'] = 'Existing backups';
+$wb['date_txt'] = 'Date';
+$wb['backup_type_txt'] = 'Type';
+$wb['filename_txt'] = 'Backup file';
+$wb['restore_backup_txt'] = 'Restore';
+$wb['restore_info_txt'] = 'Restore of the backup has been started. This action takes several minutes to be completed.';
+$wb['restore_confirm_txt'] = 'Restoring may overwrite existing files in your mailbox. Do you really want to restore this backup?';
+$wb['download_pending_txt'] = 'There is already a pending backup download job.';
+$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
+$wb['filesize_txt'] = 'Filesize';
+?>
diff --git a/interface/web/mail/lib/lang/br_mail_domain.lng b/interface/web/mail/lib/lang/br_mail_domain.lng
index a1cab1cfae8d2c50ce6e9912b201c03dab044827..7f320be4f61d92be65017a9e854feca6bed98393 100644
--- a/interface/web/mail/lib/lang/br_mail_domain.lng
+++ b/interface/web/mail/lib/lang/br_mail_domain.lng
@@ -10,4 +10,10 @@ $wb['client_txt'] = 'Cliente';
$wb['limit_maildomain_txt'] = 'O número máximo de contas de correio eletrônico para este domÃnio foi atingido.';
$wb['policy_txt'] = 'Filtro Anti-Spam';
$wb['no_policy'] = '- desativado -';
+$wb["dkim_txt"] = 'enable DKIM';
+$wb["dkim_private_txt"] = 'DKIM Private-key';
+$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
+$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
+$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
+$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
?>
diff --git a/interface/web/mail/lib/lang/cz_mail_backup_list.lng b/interface/web/mail/lib/lang/cz_mail_backup_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..320ff5023ce51d69ccbf9e85b4982a2f126ba854
--- /dev/null
+++ b/interface/web/mail/lib/lang/cz_mail_backup_list.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['list_head_txt'] = 'Existing backups';
+$wb['date_txt'] = 'Date';
+$wb['backup_type_txt'] = 'Type';
+$wb['filename_txt'] = 'Backup file';
+$wb['restore_backup_txt'] = 'Restore';
+$wb['restore_info_txt'] = 'Restore of the backup has been started. This action takes several minutes to be completed.';
+$wb['restore_confirm_txt'] = 'Restoring may overwrite existing files in your mailbox. Do you really want to restore this backup?';
+$wb['download_pending_txt'] = 'There is already a pending backup download job.';
+$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
+$wb['filesize_txt'] = 'Filesize';
+?>
diff --git a/interface/web/mail/lib/lang/cz_mail_domain.lng b/interface/web/mail/lib/lang/cz_mail_domain.lng
index d497e0502ae09ea8ad98557da2f9a14d9cf1672f..0986e32c1a1c5dd8c9819ff9cc0764fbdd13e4e3 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain.lng
@@ -8,6 +8,12 @@ $wb['domain_error_unique'] = 'Dupolikovánà domény.';
$wb['domain_error_regex'] = 'Chybný název domény.';
$wb['client_txt'] = 'Klient';
$wb['limit_maildomain_txt'] = 'Dosažen maximálnà poÄet email domén pro Váš úÄet.';
+$wb["dkim_txt"] = 'enable DKIM';
+$wb["dkim_private_txt"] = 'DKIM Private-key';
+$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
+$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
+$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
+$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
$wb['policy_txt'] = 'Spamový filtr';
$wb['no_policy'] = '- nepovoleno -';
?>
diff --git a/interface/web/mail/lib/lang/cz_mail_user.lng b/interface/web/mail/lib/lang/cz_mail_user.lng
index 48a9ea35c5a74ad29c2f5cb9875c8f8a961dd248..af5518d041510b760108b38b337a2987b0da529c 100644
--- a/interface/web/mail/lib/lang/cz_mail_user.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user.lng
@@ -47,5 +47,11 @@ $wb['generate_password_txt'] = 'Generovat heslo';
$wb['repeat_password_txt'] = 'Opakujte heslo';
$wb['password_mismatch_txt'] = 'Hesla se neshodujÃ.';
$wb['password_match_txt'] = 'Hesla se shodujÃ.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['no_backup_txt'] = 'No backup';
+$wb['daily_backup_txt'] = 'Daily';
+$wb['weekly_backup_txt'] = 'Weekly';
+$wb['monthly_backup_txt'] = 'Monthly';
?>
diff --git a/interface/web/mail/lib/lang/de_mail_backup_list.lng b/interface/web/mail/lib/lang/de_mail_backup_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..320ff5023ce51d69ccbf9e85b4982a2f126ba854
--- /dev/null
+++ b/interface/web/mail/lib/lang/de_mail_backup_list.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['list_head_txt'] = 'Existing backups';
+$wb['date_txt'] = 'Date';
+$wb['backup_type_txt'] = 'Type';
+$wb['filename_txt'] = 'Backup file';
+$wb['restore_backup_txt'] = 'Restore';
+$wb['restore_info_txt'] = 'Restore of the backup has been started. This action takes several minutes to be completed.';
+$wb['restore_confirm_txt'] = 'Restoring may overwrite existing files in your mailbox. Do you really want to restore this backup?';
+$wb['download_pending_txt'] = 'There is already a pending backup download job.';
+$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
+$wb['filesize_txt'] = 'Filesize';
+?>
diff --git a/interface/web/mail/lib/lang/de_mail_user.lng b/interface/web/mail/lib/lang/de_mail_user.lng
index 20f85266cf3676ce623ede682267a48ded161e03..f9f66f669e0b5ecf31044fcee769537a287828a6 100644
--- a/interface/web/mail/lib/lang/de_mail_user.lng
+++ b/interface/web/mail/lib/lang/de_mail_user.lng
@@ -48,4 +48,11 @@ $wb['repeat_password_txt'] = 'Passwort wiederholen';
$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
$wb['password_match_txt'] = 'Die Passwörter stimmen überein.';
$wb['email_error_isascii'] = 'Bitte verwenden Sie keine Umlaute im Passwort. Dies kann zu Problemen mit Ihrem E-Mail-Programm führen.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Anzahl der Backups';
+$wb['no_backup_txt'] = 'inaktiv';
+$wb['daily_backup_txt'] = 'taeglich';
+$wb['weekly_backup_txt'] = 'woechentlich';
+$wb['monthly_backup_txt'] = 'monatlich';
+
?>
diff --git a/interface/web/mail/lib/lang/el_mail_backup_list.lng b/interface/web/mail/lib/lang/el_mail_backup_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..320ff5023ce51d69ccbf9e85b4982a2f126ba854
--- /dev/null
+++ b/interface/web/mail/lib/lang/el_mail_backup_list.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['list_head_txt'] = 'Existing backups';
+$wb['date_txt'] = 'Date';
+$wb['backup_type_txt'] = 'Type';
+$wb['filename_txt'] = 'Backup file';
+$wb['restore_backup_txt'] = 'Restore';
+$wb['restore_info_txt'] = 'Restore of the backup has been started. This action takes several minutes to be completed.';
+$wb['restore_confirm_txt'] = 'Restoring may overwrite existing files in your mailbox. Do you really want to restore this backup?';
+$wb['download_pending_txt'] = 'There is already a pending backup download job.';
+$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
+$wb['filesize_txt'] = 'Filesize';
+?>
diff --git a/interface/web/mail/lib/lang/es_mail_backup_list.lng b/interface/web/mail/lib/lang/es_mail_backup_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..320ff5023ce51d69ccbf9e85b4982a2f126ba854
--- /dev/null
+++ b/interface/web/mail/lib/lang/es_mail_backup_list.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['list_head_txt'] = 'Existing backups';
+$wb['date_txt'] = 'Date';
+$wb['backup_type_txt'] = 'Type';
+$wb['filename_txt'] = 'Backup file';
+$wb['restore_backup_txt'] = 'Restore';
+$wb['restore_info_txt'] = 'Restore of the backup has been started. This action takes several minutes to be completed.';
+$wb['restore_confirm_txt'] = 'Restoring may overwrite existing files in your mailbox. Do you really want to restore this backup?';
+$wb['download_pending_txt'] = 'There is already a pending backup download job.';
+$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
+$wb['filesize_txt'] = 'Filesize';
+?>
diff --git a/interface/web/mail/lib/lang/es_mail_domain.lng b/interface/web/mail/lib/lang/es_mail_domain.lng
index 1bf9bc3f64e45c31cfd4abd53924793c95ddf088..529d70741748b8a84cf288a806fe74a9439997fe 100644
--- a/interface/web/mail/lib/lang/es_mail_domain.lng
+++ b/interface/web/mail/lib/lang/es_mail_domain.lng
@@ -10,4 +10,10 @@ $wb['client_txt'] = 'Cliente';
$wb['limit_maildomain_txt'] = 'Se ha alcanzado el número máximo de dominios de correo para esta cuenta';
$wb['policy_txt'] = 'Filtro de spam';
$wb['no_policy'] = '- no activado -';
+$wb["dkim_txt"] = 'enable DKIM';
+$wb["dkim_private_txt"] = 'DKIM Private-key';
+$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
+$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
+$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
+$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
?>
diff --git a/interface/web/mail/lib/lang/es_mail_user.lng b/interface/web/mail/lib/lang/es_mail_user.lng
index c1ac1f680382781a7b419ba55552177597f63e66..098c2f1d51588e494fcc3e91d2b3f621041bf118 100644
--- a/interface/web/mail/lib/lang/es_mail_user.lng
+++ b/interface/web/mail/lib/lang/es_mail_user.lng
@@ -47,4 +47,10 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['no_backup_txt'] = 'No backup';
+$wb['daily_backup_txt'] = 'Daily';
+$wb['weekly_backup_txt'] = 'Weekly';
+$wb['monthly_backup_txt'] = 'Monthly';
?>
diff --git a/interface/web/mail/lib/lang/fi_mail_backup_list.lng b/interface/web/mail/lib/lang/fi_mail_backup_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..320ff5023ce51d69ccbf9e85b4982a2f126ba854
--- /dev/null
+++ b/interface/web/mail/lib/lang/fi_mail_backup_list.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['list_head_txt'] = 'Existing backups';
+$wb['date_txt'] = 'Date';
+$wb['backup_type_txt'] = 'Type';
+$wb['filename_txt'] = 'Backup file';
+$wb['restore_backup_txt'] = 'Restore';
+$wb['restore_info_txt'] = 'Restore of the backup has been started. This action takes several minutes to be completed.';
+$wb['restore_confirm_txt'] = 'Restoring may overwrite existing files in your mailbox. Do you really want to restore this backup?';
+$wb['download_pending_txt'] = 'There is already a pending backup download job.';
+$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
+$wb['filesize_txt'] = 'Filesize';
+?>
diff --git a/interface/web/mail/lib/lang/fi_mail_domain.lng b/interface/web/mail/lib/lang/fi_mail_domain.lng
index fc92040a1c5d540b443f9211db44a28ce75be2d3..9bebd46089335a9fb2b624ffc23f8d453c1d37ec 100755
--- a/interface/web/mail/lib/lang/fi_mail_domain.lng
+++ b/interface/web/mail/lib/lang/fi_mail_domain.lng
@@ -10,4 +10,10 @@ $wb['client_txt'] = 'Asiakastunnus';
$wb['limit_maildomain_txt'] = 'Käyttäjatunnuksella on jo sallittu määrä postiverkkotunnuksia.';
$wb['policy_txt'] = 'Roskapostisuodatin';
$wb['no_policy'] = '- ei käytössä -';
+$wb["dkim_txt"] = 'enable DKIM';
+$wb["dkim_private_txt"] = 'DKIM Private-key';
+$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
+$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
+$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
+$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
?>
diff --git a/interface/web/mail/lib/lang/fi_mail_user.lng b/interface/web/mail/lib/lang/fi_mail_user.lng
index 4c7f36a30471eed3b91580b3ea0852914070976f..599e3ef97f47a69b15e30550ad4c52f7790ec5c2 100755
--- a/interface/web/mail/lib/lang/fi_mail_user.lng
+++ b/interface/web/mail/lib/lang/fi_mail_user.lng
@@ -47,4 +47,10 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['no_backup_txt'] = 'No backup';
+$wb['daily_backup_txt'] = 'Daily';
+$wb['weekly_backup_txt'] = 'Weekly';
+$wb['monthly_backup_txt'] = 'Monthly';
?>
diff --git a/interface/web/mail/lib/lang/fr_mail_backup_list.lng b/interface/web/mail/lib/lang/fr_mail_backup_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..320ff5023ce51d69ccbf9e85b4982a2f126ba854
--- /dev/null
+++ b/interface/web/mail/lib/lang/fr_mail_backup_list.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['list_head_txt'] = 'Existing backups';
+$wb['date_txt'] = 'Date';
+$wb['backup_type_txt'] = 'Type';
+$wb['filename_txt'] = 'Backup file';
+$wb['restore_backup_txt'] = 'Restore';
+$wb['restore_info_txt'] = 'Restore of the backup has been started. This action takes several minutes to be completed.';
+$wb['restore_confirm_txt'] = 'Restoring may overwrite existing files in your mailbox. Do you really want to restore this backup?';
+$wb['download_pending_txt'] = 'There is already a pending backup download job.';
+$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
+$wb['filesize_txt'] = 'Filesize';
+?>
diff --git a/interface/web/mail/lib/lang/fr_mail_user.lng b/interface/web/mail/lib/lang/fr_mail_user.lng
index f335b106626a72abf7d7a76a5c2218dbdc2af720..773578265e29ddafb32192b88543c5704de5617f 100644
--- a/interface/web/mail/lib/lang/fr_mail_user.lng
+++ b/interface/web/mail/lib/lang/fr_mail_user.lng
@@ -47,4 +47,10 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['no_backup_txt'] = 'No backup';
+$wb['daily_backup_txt'] = 'Daily';
+$wb['weekly_backup_txt'] = 'Weekly';
+$wb['monthly_backup_txt'] = 'Monthly';
?>
diff --git a/interface/web/mail/lib/lang/hr_mail_backup_list.lng b/interface/web/mail/lib/lang/hr_mail_backup_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..320ff5023ce51d69ccbf9e85b4982a2f126ba854
--- /dev/null
+++ b/interface/web/mail/lib/lang/hr_mail_backup_list.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['list_head_txt'] = 'Existing backups';
+$wb['date_txt'] = 'Date';
+$wb['backup_type_txt'] = 'Type';
+$wb['filename_txt'] = 'Backup file';
+$wb['restore_backup_txt'] = 'Restore';
+$wb['restore_info_txt'] = 'Restore of the backup has been started. This action takes several minutes to be completed.';
+$wb['restore_confirm_txt'] = 'Restoring may overwrite existing files in your mailbox. Do you really want to restore this backup?';
+$wb['download_pending_txt'] = 'There is already a pending backup download job.';
+$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
+$wb['filesize_txt'] = 'Filesize';
+?>
diff --git a/interface/web/mail/lib/lang/hr_mail_domain.lng b/interface/web/mail/lib/lang/hr_mail_domain.lng
index 6dae122b59af9cd7c840f53c53e107931dca83cc..214edee99db27bba246d346c3b9899fb47090219 100644
--- a/interface/web/mail/lib/lang/hr_mail_domain.lng
+++ b/interface/web/mail/lib/lang/hr_mail_domain.lng
@@ -10,4 +10,10 @@ $wb['client_txt'] = 'Klijent';
$wb['limit_maildomain_txt'] = 'Iskorišten je maksimalan broj email domena.';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- nema pravila -';
+$wb["dkim_txt"] = 'enable DKIM';
+$wb["dkim_private_txt"] = 'DKIM Private-key';
+$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
+$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
+$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
+$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
?>
diff --git a/interface/web/mail/lib/lang/hr_mail_user.lng b/interface/web/mail/lib/lang/hr_mail_user.lng
index 9a54c4ecb016e43d9fa9cfb0390e51f79e35be72..8bba7e09d4cd664f470185ef13e6c1d92d4d743e 100644
--- a/interface/web/mail/lib/lang/hr_mail_user.lng
+++ b/interface/web/mail/lib/lang/hr_mail_user.lng
@@ -47,4 +47,10 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['no_backup_txt'] = 'No backup';
+$wb['daily_backup_txt'] = 'Daily';
+$wb['weekly_backup_txt'] = 'Weekly';
+$wb['monthly_backup_txt'] = 'Monthly';
?>
diff --git a/interface/web/mail/lib/lang/hu_mail_backup_list.lng b/interface/web/mail/lib/lang/hu_mail_backup_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..320ff5023ce51d69ccbf9e85b4982a2f126ba854
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_mail_backup_list.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['list_head_txt'] = 'Existing backups';
+$wb['date_txt'] = 'Date';
+$wb['backup_type_txt'] = 'Type';
+$wb['filename_txt'] = 'Backup file';
+$wb['restore_backup_txt'] = 'Restore';
+$wb['restore_info_txt'] = 'Restore of the backup has been started. This action takes several minutes to be completed.';
+$wb['restore_confirm_txt'] = 'Restoring may overwrite existing files in your mailbox. Do you really want to restore this backup?';
+$wb['download_pending_txt'] = 'There is already a pending backup download job.';
+$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
+$wb['filesize_txt'] = 'Filesize';
+?>
diff --git a/interface/web/mail/lib/lang/hu_mail_domain.lng b/interface/web/mail/lib/lang/hu_mail_domain.lng
index a6f2f871500ee667719e42b29de7de2263225091..2ad4913b9989809334bc7c94d4a34fa188a3f6f8 100644
--- a/interface/web/mail/lib/lang/hu_mail_domain.lng
+++ b/interface/web/mail/lib/lang/hu_mail_domain.lng
@@ -10,4 +10,10 @@ $wb['limit_maildomain_txt'] = 'Meghaladta az ön hozzáférésével elérhető d
$wb['policy_txt'] = 'Spamszűrő';
$wb['no_policy'] = '- nem engedélyezett -';
$wb['client_txt'] = 'Client';
+$wb["dkim_txt"] = 'enable DKIM';
+$wb["dkim_private_txt"] = 'DKIM Private-key';
+$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
+$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
+$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
+$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
?>
diff --git a/interface/web/mail/lib/lang/hu_mail_user.lng b/interface/web/mail/lib/lang/hu_mail_user.lng
index c7e7b2c72dc5c16693dac76e58841cccde55ab10..d4e56fb1c37426986d92f734b1307383c3ffb679 100644
--- a/interface/web/mail/lib/lang/hu_mail_user.lng
+++ b/interface/web/mail/lib/lang/hu_mail_user.lng
@@ -47,4 +47,10 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['no_backup_txt'] = 'No backup';
+$wb['daily_backup_txt'] = 'Daily';
+$wb['weekly_backup_txt'] = 'Weekly';
+$wb['monthly_backup_txt'] = 'Monthly';
?>
diff --git a/interface/web/mail/lib/lang/id_mail_backup_list.lng b/interface/web/mail/lib/lang/id_mail_backup_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..320ff5023ce51d69ccbf9e85b4982a2f126ba854
--- /dev/null
+++ b/interface/web/mail/lib/lang/id_mail_backup_list.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['list_head_txt'] = 'Existing backups';
+$wb['date_txt'] = 'Date';
+$wb['backup_type_txt'] = 'Type';
+$wb['filename_txt'] = 'Backup file';
+$wb['restore_backup_txt'] = 'Restore';
+$wb['restore_info_txt'] = 'Restore of the backup has been started. This action takes several minutes to be completed.';
+$wb['restore_confirm_txt'] = 'Restoring may overwrite existing files in your mailbox. Do you really want to restore this backup?';
+$wb['download_pending_txt'] = 'There is already a pending backup download job.';
+$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
+$wb['filesize_txt'] = 'Filesize';
+?>
diff --git a/interface/web/mail/lib/lang/id_mail_domain.lng b/interface/web/mail/lib/lang/id_mail_domain.lng
index c9775de8e7725a8e01b1d2ba0aee1e31391feea5..265bfc99e80ff26077ead573db2c7af31e2a9f22 100644
--- a/interface/web/mail/lib/lang/id_mail_domain.lng
+++ b/interface/web/mail/lib/lang/id_mail_domain.lng
@@ -10,4 +10,10 @@ $wb['client_txt'] = 'Klien';
$wb['limit_maildomain_txt'] = 'Jumlah maks domain email untuk akun Anda telah tercapai.';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- tidak aktif -';
+$wb["dkim_txt"] = 'enable DKIM';
+$wb["dkim_private_txt"] = 'DKIM Private-key';
+$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
+$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
+$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
+$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
?>
diff --git a/interface/web/mail/lib/lang/id_mail_user.lng b/interface/web/mail/lib/lang/id_mail_user.lng
index 7241a0d032b4c9d63d5d045b5fd8cea21c2bad45..955b73d4ecace6bf40cf54dbe74cf629cfea2f6c 100644
--- a/interface/web/mail/lib/lang/id_mail_user.lng
+++ b/interface/web/mail/lib/lang/id_mail_user.lng
@@ -47,4 +47,10 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['no_backup_txt'] = 'No backup';
+$wb['daily_backup_txt'] = 'Daily';
+$wb['weekly_backup_txt'] = 'Weekly';
+$wb['monthly_backup_txt'] = 'Monthly';
?>
diff --git a/interface/web/mail/lib/lang/it_mail_backup_list.lng b/interface/web/mail/lib/lang/it_mail_backup_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..320ff5023ce51d69ccbf9e85b4982a2f126ba854
--- /dev/null
+++ b/interface/web/mail/lib/lang/it_mail_backup_list.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['list_head_txt'] = 'Existing backups';
+$wb['date_txt'] = 'Date';
+$wb['backup_type_txt'] = 'Type';
+$wb['filename_txt'] = 'Backup file';
+$wb['restore_backup_txt'] = 'Restore';
+$wb['restore_info_txt'] = 'Restore of the backup has been started. This action takes several minutes to be completed.';
+$wb['restore_confirm_txt'] = 'Restoring may overwrite existing files in your mailbox. Do you really want to restore this backup?';
+$wb['download_pending_txt'] = 'There is already a pending backup download job.';
+$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
+$wb['filesize_txt'] = 'Filesize';
+?>
diff --git a/interface/web/mail/lib/lang/it_mail_domain.lng b/interface/web/mail/lib/lang/it_mail_domain.lng
index 5e6342bd0965fa9741df8edc81883b1d2ee04d0c..8223dba001fab0d94b94958169a6681c1ff09582 100644
--- a/interface/web/mail/lib/lang/it_mail_domain.lng
+++ b/interface/web/mail/lib/lang/it_mail_domain.lng
@@ -10,4 +10,10 @@ $wb['client_txt'] = 'Cleient';
$wb['limit_maildomain_txt'] = 'Raggiunto numero massimo di domini email per questo account.';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- non abilitato -';
+$wb["dkim_txt"] = 'enable DKIM';
+$wb["dkim_private_txt"] = 'DKIM Private-key';
+$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
+$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
+$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
+$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
?>
diff --git a/interface/web/mail/lib/lang/it_mail_user.lng b/interface/web/mail/lib/lang/it_mail_user.lng
index b32c69c42bc7c5a4b930b5f6880d0b652e3c2dbf..d8636216675135cb65126a2542a1219857d7f55b 100644
--- a/interface/web/mail/lib/lang/it_mail_user.lng
+++ b/interface/web/mail/lib/lang/it_mail_user.lng
@@ -47,4 +47,10 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['no_backup_txt'] = 'No backup';
+$wb['daily_backup_txt'] = 'Daily';
+$wb['weekly_backup_txt'] = 'Weekly';
+$wb['monthly_backup_txt'] = 'Monthly';
?>
diff --git a/interface/web/mail/lib/lang/ja_mail_backup_list.lng b/interface/web/mail/lib/lang/ja_mail_backup_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..320ff5023ce51d69ccbf9e85b4982a2f126ba854
--- /dev/null
+++ b/interface/web/mail/lib/lang/ja_mail_backup_list.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['list_head_txt'] = 'Existing backups';
+$wb['date_txt'] = 'Date';
+$wb['backup_type_txt'] = 'Type';
+$wb['filename_txt'] = 'Backup file';
+$wb['restore_backup_txt'] = 'Restore';
+$wb['restore_info_txt'] = 'Restore of the backup has been started. This action takes several minutes to be completed.';
+$wb['restore_confirm_txt'] = 'Restoring may overwrite existing files in your mailbox. Do you really want to restore this backup?';
+$wb['download_pending_txt'] = 'There is already a pending backup download job.';
+$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
+$wb['filesize_txt'] = 'Filesize';
+?>
diff --git a/interface/web/mail/lib/lang/ja_mail_domain.lng b/interface/web/mail/lib/lang/ja_mail_domain.lng
index 37867b047f34cc545aab849df17c5c378bb4e19a..64b51461a8e8ce767a4340c41fa2016b0307e200 100644
--- a/interface/web/mail/lib/lang/ja_mail_domain.lng
+++ b/interface/web/mail/lib/lang/ja_mail_domain.lng
@@ -9,5 +9,11 @@ $wb['domain_error_regex'] = 'ä¸æ£ãªãƒ‰ãƒ¡ã‚¤ãƒ³åã§ã™ã€‚';
$wb['client_txt'] = 'クライアント';
$wb['limit_maildomain_txt'] = 'メールドメインãŒæœ€å¤§æ•°ã«é”ã—ãŸãŸã‚ã€ã“ã‚Œä»¥ä¸Šè¿½åŠ ã§ãã¾ã›ã‚“。';
$wb['policy_txt'] = 'スパムフィルター';
+$wb["dkim_txt"] = 'enable DKIM';
+$wb["dkim_private_txt"] = 'DKIM Private-key';
+$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
+$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
+$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
+$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
$wb['no_policy'] = '使ã‚ãªã„';
?>
diff --git a/interface/web/mail/lib/lang/ja_mail_user.lng b/interface/web/mail/lib/lang/ja_mail_user.lng
index f4b6c7089246d1c83f14495d0bd905eb25f92db8..6776f1c6d67b3059088cc83685bc0fdb98188e85 100644
--- a/interface/web/mail/lib/lang/ja_mail_user.lng
+++ b/interface/web/mail/lib/lang/ja_mail_user.lng
@@ -47,4 +47,10 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['no_backup_txt'] = 'No backup';
+$wb['daily_backup_txt'] = 'Daily';
+$wb['weekly_backup_txt'] = 'Weekly';
+$wb['monthly_backup_txt'] = 'Monthly';
?>
diff --git a/interface/web/mail/lib/lang/nl_mail_backup_list.lng b/interface/web/mail/lib/lang/nl_mail_backup_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..320ff5023ce51d69ccbf9e85b4982a2f126ba854
--- /dev/null
+++ b/interface/web/mail/lib/lang/nl_mail_backup_list.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['list_head_txt'] = 'Existing backups';
+$wb['date_txt'] = 'Date';
+$wb['backup_type_txt'] = 'Type';
+$wb['filename_txt'] = 'Backup file';
+$wb['restore_backup_txt'] = 'Restore';
+$wb['restore_info_txt'] = 'Restore of the backup has been started. This action takes several minutes to be completed.';
+$wb['restore_confirm_txt'] = 'Restoring may overwrite existing files in your mailbox. Do you really want to restore this backup?';
+$wb['download_pending_txt'] = 'There is already a pending backup download job.';
+$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
+$wb['filesize_txt'] = 'Filesize';
+?>
diff --git a/interface/web/mail/lib/lang/nl_mail_domain.lng b/interface/web/mail/lib/lang/nl_mail_domain.lng
index 431a634b1876e7812ae6fa6ffe1be3459f6ecde1..64a5f0630e3ed326cdcac8e539b2a0d4fe19ec07 100644
--- a/interface/web/mail/lib/lang/nl_mail_domain.lng
+++ b/interface/web/mail/lib/lang/nl_mail_domain.lng
@@ -10,4 +10,10 @@ $wb['client_txt'] = 'Klant';
$wb['limit_maildomain_txt'] = 'Het max. aantal e-mail domainen voor uw account is bereikt.';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- niet ingeschakeld -';
+$wb["dkim_txt"] = 'enable DKIM';
+$wb["dkim_private_txt"] = 'DKIM Private-key';
+$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
+$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
+$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
+$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
?>
diff --git a/interface/web/mail/lib/lang/nl_mail_user.lng b/interface/web/mail/lib/lang/nl_mail_user.lng
index ce1ba78fc69668f55aa99e24a706f2c7643ab1cd..1c1e5499f4924f7af5ba05ba82e604eb77a8d045 100644
--- a/interface/web/mail/lib/lang/nl_mail_user.lng
+++ b/interface/web/mail/lib/lang/nl_mail_user.lng
@@ -47,4 +47,10 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['no_backup_txt'] = 'No backup';
+$wb['daily_backup_txt'] = 'Daily';
+$wb['weekly_backup_txt'] = 'Weekly';
+$wb['monthly_backup_txt'] = 'Monthly';
?>
diff --git a/interface/web/mail/lib/lang/pl_mail_domain.lng b/interface/web/mail/lib/lang/pl_mail_domain.lng
index 6f9c68cdc64ba0a55299d1c645e395bc4ef41557..6b9ef00838b440656a844a15e6ec488c40e8ca45 100644
--- a/interface/web/mail/lib/lang/pl_mail_domain.lng
+++ b/interface/web/mail/lib/lang/pl_mail_domain.lng
@@ -10,4 +10,10 @@ $wb['client_txt'] = 'Klient';
$wb['limit_maildomain_txt'] = 'Maksymalna ilość domen e-mail dla Twojego konta została perzekroczona.';
$wb['policy_txt'] = 'Filtr spamu';
$wb['no_policy'] = '-nie używane-';
+$wb["dkim_txt"] = 'enable DKIM';
+$wb["dkim_private_txt"] = 'DKIM Private-key';
+$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
+$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
+$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
+$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
?>
diff --git a/interface/web/mail/lib/lang/pl_mail_user.lng b/interface/web/mail/lib/lang/pl_mail_user.lng
index 5fc7a38cf9de3503ddb5dd8b473ed8ce50ecc849..36edb0b1ff1c5477d3f4a2ed96c89e7b47e1a8c5 100644
--- a/interface/web/mail/lib/lang/pl_mail_user.lng
+++ b/interface/web/mail/lib/lang/pl_mail_user.lng
@@ -47,4 +47,10 @@ $wb['generate_password_txt'] = 'Generuj hasło';
$wb['repeat_password_txt'] = 'Powtórz hasło';
$wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
$wb['password_match_txt'] = 'Hasła pasują';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['no_backup_txt'] = 'No backup';
+$wb['daily_backup_txt'] = 'Daily';
+$wb['weekly_backup_txt'] = 'Weekly';
+$wb['monthly_backup_txt'] = 'Monthly';
?>
diff --git a/interface/web/mail/lib/lang/pt_mail_user.lng b/interface/web/mail/lib/lang/pt_mail_user.lng
index 29f750e4e3564e179d8ad652d49f7fd687c302b0..5c63fe0c968cf26cc6772409e1997a17af61e4db 100644
--- a/interface/web/mail/lib/lang/pt_mail_user.lng
+++ b/interface/web/mail/lib/lang/pt_mail_user.lng
@@ -47,4 +47,10 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['no_backup_txt'] = 'No backup';
+$wb['daily_backup_txt'] = 'Daily';
+$wb['weekly_backup_txt'] = 'Weekly';
+$wb['monthly_backup_txt'] = 'Monthly';
?>
diff --git a/interface/web/mail/lib/lang/ro_mail_domain.lng b/interface/web/mail/lib/lang/ro_mail_domain.lng
index ce579c2040a673ddf4ce1097f9d04a3e427fab44..b65a9da66e515ac9eac28ac9e6682bacca3a50dd 100644
--- a/interface/web/mail/lib/lang/ro_mail_domain.lng
+++ b/interface/web/mail/lib/lang/ro_mail_domain.lng
@@ -10,4 +10,10 @@ $wb['client_txt'] = 'Client';
$wb['limit_maildomain_txt'] = 'Numarul maxuim de conturi email-uri pe contul dumenavoastra a fost atins The max. number of email domains for your account is reached.';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- not enabled -';
+$wb["dkim_txt"] = 'enable DKIM';
+$wb["dkim_private_txt"] = 'DKIM Private-key';
+$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
+$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
+$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
+$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
?>
diff --git a/interface/web/mail/lib/lang/ro_mail_user.lng b/interface/web/mail/lib/lang/ro_mail_user.lng
index b7315b120ebd85778c8d28ff3e6c717ddac88fcf..4433727a3a3a60058746a61af413f54d88b112d3 100644
--- a/interface/web/mail/lib/lang/ro_mail_user.lng
+++ b/interface/web/mail/lib/lang/ro_mail_user.lng
@@ -47,4 +47,10 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['no_backup_txt'] = 'No backup';
+$wb['daily_backup_txt'] = 'Daily';
+$wb['weekly_backup_txt'] = 'Weekly';
+$wb['monthly_backup_txt'] = 'Monthly';
?>
diff --git a/interface/web/mail/lib/lang/ru_mail_backup_list.lng b/interface/web/mail/lib/lang/ru_mail_backup_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..320ff5023ce51d69ccbf9e85b4982a2f126ba854
--- /dev/null
+++ b/interface/web/mail/lib/lang/ru_mail_backup_list.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['list_head_txt'] = 'Existing backups';
+$wb['date_txt'] = 'Date';
+$wb['backup_type_txt'] = 'Type';
+$wb['filename_txt'] = 'Backup file';
+$wb['restore_backup_txt'] = 'Restore';
+$wb['restore_info_txt'] = 'Restore of the backup has been started. This action takes several minutes to be completed.';
+$wb['restore_confirm_txt'] = 'Restoring may overwrite existing files in your mailbox. Do you really want to restore this backup?';
+$wb['download_pending_txt'] = 'There is already a pending backup download job.';
+$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
+$wb['filesize_txt'] = 'Filesize';
+?>
diff --git a/interface/web/mail/lib/lang/ru_mail_user.lng b/interface/web/mail/lib/lang/ru_mail_user.lng
index 129fa802451f277b00dc08f098cfcbda1dfbb870..b6f3b1373b6a17de59c9d0b7f81ccb2dc8fc6439 100644
--- a/interface/web/mail/lib/lang/ru_mail_user.lng
+++ b/interface/web/mail/lib/lang/ru_mail_user.lng
@@ -47,4 +47,10 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['no_backup_txt'] = 'No backup';
+$wb['daily_backup_txt'] = 'Daily';
+$wb['weekly_backup_txt'] = 'Weekly';
+$wb['monthly_backup_txt'] = 'Monthly';
?>
diff --git a/interface/web/mail/lib/lang/se_mail_backup_list.lng b/interface/web/mail/lib/lang/se_mail_backup_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..320ff5023ce51d69ccbf9e85b4982a2f126ba854
--- /dev/null
+++ b/interface/web/mail/lib/lang/se_mail_backup_list.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['list_head_txt'] = 'Existing backups';
+$wb['date_txt'] = 'Date';
+$wb['backup_type_txt'] = 'Type';
+$wb['filename_txt'] = 'Backup file';
+$wb['restore_backup_txt'] = 'Restore';
+$wb['restore_info_txt'] = 'Restore of the backup has been started. This action takes several minutes to be completed.';
+$wb['restore_confirm_txt'] = 'Restoring may overwrite existing files in your mailbox. Do you really want to restore this backup?';
+$wb['download_pending_txt'] = 'There is already a pending backup download job.';
+$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
+$wb['filesize_txt'] = 'Filesize';
+?>
diff --git a/interface/web/mail/lib/lang/se_mail_domain.lng b/interface/web/mail/lib/lang/se_mail_domain.lng
index 926d21afcd5ae971b6b38865e5afa6af264e347e..220c9a4b2f18557896e709c695918ccdb77bf648 100644
--- a/interface/web/mail/lib/lang/se_mail_domain.lng
+++ b/interface/web/mail/lib/lang/se_mail_domain.lng
@@ -10,4 +10,10 @@ $wb['client_txt'] = 'Client';
$wb['limit_maildomain_txt'] = 'The max. number of email domains for your account is reached.';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- not enabled -';
+$wb["dkim_txt"] = 'enable DKIM';
+$wb["dkim_private_txt"] = 'DKIM Private-key';
+$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
+$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
+$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
+$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
?>
diff --git a/interface/web/mail/lib/lang/se_mail_user.lng b/interface/web/mail/lib/lang/se_mail_user.lng
index b32c69c42bc7c5a4b930b5f6880d0b652e3c2dbf..d8636216675135cb65126a2542a1219857d7f55b 100644
--- a/interface/web/mail/lib/lang/se_mail_user.lng
+++ b/interface/web/mail/lib/lang/se_mail_user.lng
@@ -47,4 +47,10 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['no_backup_txt'] = 'No backup';
+$wb['daily_backup_txt'] = 'Daily';
+$wb['weekly_backup_txt'] = 'Weekly';
+$wb['monthly_backup_txt'] = 'Monthly';
?>
diff --git a/interface/web/mail/lib/lang/sk_mail_backup_list.lng b/interface/web/mail/lib/lang/sk_mail_backup_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..320ff5023ce51d69ccbf9e85b4982a2f126ba854
--- /dev/null
+++ b/interface/web/mail/lib/lang/sk_mail_backup_list.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['list_head_txt'] = 'Existing backups';
+$wb['date_txt'] = 'Date';
+$wb['backup_type_txt'] = 'Type';
+$wb['filename_txt'] = 'Backup file';
+$wb['restore_backup_txt'] = 'Restore';
+$wb['restore_info_txt'] = 'Restore of the backup has been started. This action takes several minutes to be completed.';
+$wb['restore_confirm_txt'] = 'Restoring may overwrite existing files in your mailbox. Do you really want to restore this backup?';
+$wb['download_pending_txt'] = 'There is already a pending backup download job.';
+$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
+$wb['filesize_txt'] = 'Filesize';
+?>
diff --git a/interface/web/mail/lib/lang/sk_mail_domain.lng b/interface/web/mail/lib/lang/sk_mail_domain.lng
index 75faf7d9acdb513a4222954c069029f8c37fc5df..521678dd41b7eec2bb64e4a2ed02f20865149f48 100644
--- a/interface/web/mail/lib/lang/sk_mail_domain.lng
+++ b/interface/web/mail/lib/lang/sk_mail_domain.lng
@@ -8,6 +8,12 @@ $wb['domain_error_unique'] = 'Duplicitná Doména.';
$wb['domain_error_regex'] = 'Zlé doménové meno.';
$wb['client_txt'] = 'Klient';
$wb['limit_maildomain_txt'] = 'Max. poÄet e-mailových domén pre váš úÄet je dosiahnutý.';
+$wb["dkim_txt"] = 'enable DKIM';
+$wb["dkim_private_txt"] = 'DKIM Private-key';
+$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
+$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
+$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
+$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- Nie je aktivovaný -';
?>
diff --git a/interface/web/mail/lib/lang/sk_mail_user.lng b/interface/web/mail/lib/lang/sk_mail_user.lng
index f3eb99979f7dcd278db7993c1573e0d29c5b172a..cc54068a50359a9e8ec2c492c726498a3b1ff391 100644
--- a/interface/web/mail/lib/lang/sk_mail_user.lng
+++ b/interface/web/mail/lib/lang/sk_mail_user.lng
@@ -47,4 +47,10 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['no_backup_txt'] = 'No backup';
+$wb['daily_backup_txt'] = 'Daily';
+$wb['weekly_backup_txt'] = 'Weekly';
+$wb['monthly_backup_txt'] = 'Monthly';
?>
diff --git a/interface/web/mail/lib/lang/tr_mail_backup_list.lng b/interface/web/mail/lib/lang/tr_mail_backup_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..320ff5023ce51d69ccbf9e85b4982a2f126ba854
--- /dev/null
+++ b/interface/web/mail/lib/lang/tr_mail_backup_list.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['list_head_txt'] = 'Existing backups';
+$wb['date_txt'] = 'Date';
+$wb['backup_type_txt'] = 'Type';
+$wb['filename_txt'] = 'Backup file';
+$wb['restore_backup_txt'] = 'Restore';
+$wb['restore_info_txt'] = 'Restore of the backup has been started. This action takes several minutes to be completed.';
+$wb['restore_confirm_txt'] = 'Restoring may overwrite existing files in your mailbox. Do you really want to restore this backup?';
+$wb['download_pending_txt'] = 'There is already a pending backup download job.';
+$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
+$wb['filesize_txt'] = 'Filesize';
+?>
diff --git a/interface/web/mail/lib/lang/tr_mail_domain.lng b/interface/web/mail/lib/lang/tr_mail_domain.lng
index e8696816e0fdeed9b8b13334330b08203ae0c9a9..85138e11b16b3b5d7af0abd6fd235217139b07f0 100644
--- a/interface/web/mail/lib/lang/tr_mail_domain.lng
+++ b/interface/web/mail/lib/lang/tr_mail_domain.lng
@@ -10,4 +10,10 @@ $wb['client_txt'] = 'Müşteri';
$wb['limit_maildomain_txt'] = 'Hesabınızdaki max. email domain sayısına ulaştınız.';
$wb['policy_txt'] = 'Spam filtresi';
$wb['no_policy'] = '- aktif deÄŸil -';
+$wb["dkim_txt"] = 'enable DKIM';
+$wb["dkim_private_txt"] = 'DKIM Private-key';
+$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
+$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
+$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
+$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
?>
diff --git a/interface/web/mail/lib/lang/tr_mail_user.lng b/interface/web/mail/lib/lang/tr_mail_user.lng
index 88cf30b9ba74dcbe13c4b058155af115c82021a5..519150e7c4a0cc9168300b42053505ea026c5fb7 100644
--- a/interface/web/mail/lib/lang/tr_mail_user.lng
+++ b/interface/web/mail/lib/lang/tr_mail_user.lng
@@ -47,4 +47,10 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['no_backup_txt'] = 'No backup';
+$wb['daily_backup_txt'] = 'Daily';
+$wb['weekly_backup_txt'] = 'Weekly';
+$wb['monthly_backup_txt'] = 'Monthly';
?>
diff --git a/interface/web/sites/form/web_aliasdomain.tform.php b/interface/web/sites/form/web_childdomain.tform.php
similarity index 83%
rename from interface/web/sites/form/web_aliasdomain.tform.php
rename to interface/web/sites/form/web_childdomain.tform.php
index 2435ddc9ea30dd42425561b429b976b1eb6db663..1081a233d5eb8d27f2d3c6174ea8b631cffff02a 100644
--- a/interface/web/sites/form/web_aliasdomain.tform.php
+++ b/interface/web/sites/form/web_childdomain.tform.php
@@ -37,16 +37,18 @@
*/
+$childdomain_type = 'aliasdomain';
+if(isset($_SESSION['s']['var']['childdomain_type']) && $_SESSION['s']['var']['childdomain_type'] == 'subdomain') $childdomain_type = 'subdomain';
-$form["title"] = "Web Aliasdomain";
+$form["title"] = ($childdomain_type == 'subdomain' ? "Subdomain" : 'Web Aliasdomain');
$form["description"] = "";
-$form["name"] = "web_aliasdomain";
-$form["action"] = "web_aliasdomain_edit.php";
+$form["name"] = "web_childdomain";
+$form["action"] = "web_childdomain_edit.php";
$form["db_table"] = "web_domain";
$form["db_table_idx"] = "domain_id";
$form["db_history"] = "yes";
$form["tab_default"] = "domain";
-$form["list_default"] = "web_aliasdomain_list.php";
+$form["list_default"] = "web_childdomain_list.php";
$form["auth"] = 'yes'; // yes / no
$form["auth_preset"]["userid"] = 0; // 0 = id of the user, > 0 id must match with id of current user
@@ -58,7 +60,7 @@ $form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d =
$form["tabs"]['domain'] = array (
'title' => "Domain",
'width' => 100,
- 'template' => "templates/web_aliasdomain_edit.htm",
+ 'template' => "templates/web_childdomain_edit.htm",
'fields' => array (
//#################################
// Begin Datatable fields
@@ -86,7 +88,7 @@ $form["tabs"]['domain'] = array (
),
'validators' => array ( 0 => array ( 'type' => 'CUSTOM',
'class' => 'validate_domain',
- 'function' => 'alias_domain',
+ 'function' => ($childdomain_type == 'subdomain' ? 'sub_domain' : 'alias_domain'),
'errmsg'=> 'domain_error_regex'),
),
'default' => '',
@@ -106,13 +108,12 @@ $form["tabs"]['domain'] = array (
'formtype' => 'SELECT',
'default' => '',
'datasource' => array ( 'type' => 'SQL',
- 'querystring' => "SELECT domain_id,domain AS parent_domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
- // Commented out until {AUTHSQL::web_domain} is working
- //'querystring' => "SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id = server.server_id AND {AUTHSQL::web_domain} ORDER BY web_domain.domain",
+ 'querystring' => "SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id = server.server_id AND {AUTHSQL::web_domain} ORDER BY web_domain.domain",
'keyfield'=> 'domain_id',
'valuefield'=> 'parent_domain'
),
- 'value' => ''
+ 'value' => '',
+ 'searchable' => 2
),
'redirect_type' => array (
'datatype' => 'VARCHAR',
@@ -132,7 +133,21 @@ $form["tabs"]['domain'] = array (
'width' => '30',
'maxlength' => '255'
),
- 'subdomain' => array (
+ 'active' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'y',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
+ //#################################
+ // ENDE Datatable fields
+ //#################################
+ )
+);
+
+if($childdomain_type == 'aliasdomain') {
+ // additional fields for alias domains
+ $form["tabs"]['domain']['fields']['subdomain'] = array (
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
'default' => 'www',
@@ -142,31 +157,22 @@ $form["tabs"]['domain'] = array (
'errmsg'=> 'domain_error_autosub'),
),
'value' => array('none' => 'none_txt', 'www' => 'www.', '*' => '*.')
- ),
- 'seo_redirect' => array (
+ );
+ $form["tabs"]['domain']['fields']['seo_redirect'] = array (
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
'default' => '',
'value' => array('' => 'no_redirect_txt', 'non_www_to_www' => 'domain.tld => www.domain.tld', 'www_to_non_www' => 'www.domain.tld => domain.tld', '*_domain_tld_to_domain_tld' => '*.doman.tld => domain.tld', '*_domain_tld_to_www_domain_tld' => '*.domain.tld => www.domain.tld', '*_to_domain_tld' => '* => domain.tld', '*_to_www_domain_tld' => '* => www.domain.tld')
- ),
- 'active' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'CHECKBOX',
- 'default' => 'y',
- 'value' => array(0 => 'n', 1 => 'y')
- ),
- //#################################
- // ENDE Datatable fields
- //#################################
- )
-);
+ );
+
+}
if($_SESSION["s"]["user"]["typ"] == 'admin') {
$form["tabs"]['advanced'] = array (
'title' => "Options",
'width' => 100,
- 'template' => "templates/web_aliasdomain_advanced.htm",
+ 'template' => "templates/web_childdomain_advanced.htm",
'readonly' => false,
'fields' => array (
//#################################
diff --git a/interface/web/sites/form/web_subdomain.tform.php b/interface/web/sites/form/web_subdomain.tform.php
deleted file mode 100644
index ae520ded43e33a0dd706d10ae7a11f392b44d482..0000000000000000000000000000000000000000
--- a/interface/web/sites/form/web_subdomain.tform.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-/*
- Form Definition
-
- Tabledefinition
-
- Datatypes:
- - INTEGER (Forces the input to Int)
- - DOUBLE
- - CURRENCY (Formats the values to currency notation)
- - VARCHAR (no format check, maxlength: 255)
- - TEXT (no format check)
- - DATE (Dateformat, automatic conversion to timestamps)
-
- Formtype:
- - TEXT (Textfield)
- - TEXTAREA (Textarea)
- - PASSWORD (Password textfield, input is not shown when edited)
- - SELECT (Select option field)
- - RADIO
- - CHECKBOX
- - CHECKBOXARRAY
- - FILE
-
- VALUE:
- - Wert oder Array
-
- Hint:
- The ID field of the database table is not part of the datafield definition.
- The ID field must be always auto incement (int or bigint).
-
- Search:
- - searchable = 1 or searchable = 2 include the field in the search
- - searchable = 1: this field will be the title of the search result
- - searchable = 2: this field will be included in the description of the search result
-
-
-*/
-
-$form["title"] = "Subdomain";
-$form["description"] = "";
-$form["name"] = "web_subdomain";
-$form["action"] = "web_subdomain_edit.php";
-$form["db_table"] = "web_domain";
-$form["db_table_idx"] = "domain_id";
-$form["db_history"] = "yes";
-$form["tab_default"] = "domain";
-$form["list_default"] = "web_subdomain_list.php";
-$form["auth"] = 'yes'; // yes / no
-
-$form["auth_preset"]["userid"] = 0; // 0 = id of the user, > 0 id must match with id of current user
-$form["auth_preset"]["groupid"] = 0; // 0 = default groupid of the user, > 0 id must match with groupid of current user
-$form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update, d = delete
-$form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete
-$form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
-
-$form["tabs"]['domain'] = array (
- 'title' => "Domain",
- 'width' => 100,
- 'template' => "templates/web_subdomain_edit.htm",
- 'fields' => array (
- //#################################
- // Begin Datatable fields
- //#################################
- 'server_id' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'SELECT',
- 'default' => '',
- 'datasource' => array ( 'type' => 'SQL',
- 'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name',
- 'keyfield'=> 'server_id',
- 'valuefield'=> 'server_name'
- ),
- 'value' => ''
- ),
- 'domain' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'filters' => array( 0 => array( 'event' => 'SAVE',
- 'type' => 'IDNTOASCII'),
- 1 => array( 'event' => 'SHOW',
- 'type' => 'IDNTOUTF8'),
- 2 => array( 'event' => 'SAVE',
- 'type' => 'TOLOWER')
- ),
- 'validators' => array ( 0 => array ( 'type' => 'CUSTOM',
- 'class' => 'validate_domain',
- 'function' => 'sub_domain',
- 'errmsg'=> 'domain_error_regex'),
- ),
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255',
- 'searchable' => 1
- ),
- 'type' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => 'y',
- 'value' => array('vhost' => 'Site', 'alias' => 'Alias', 'subdomain' => 'Subdomain')
- ),
- 'parent_domain_id' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'SELECT',
- 'default' => '',
- 'datasource' => array ( 'type' => 'SQL',
- 'querystring' => "SELECT domain_id,domain AS parent_domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
- // Commented out until {AUTHSQL::web_domain} is working
- //'querystring' => "SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id = server.server_id AND {AUTHSQL::web_domain} ORDER BY web_domain.domain",
- 'keyfield'=> 'domain_id',
- 'valuefield'=> 'parent_domain'
- ),
- 'value' => '',
- 'searchable' => 2
- ),
- 'redirect_type' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => 'y',
- 'value' => array('' => 'no_redirect_txt', 'no' => 'no_flag_txt', 'R' => 'R', 'L' => 'L', 'R,L' => 'R,L', 'R=301,L' => 'R=301,L', 'last' => 'last', 'break' => 'break', 'redirect' => 'redirect', 'permanent' => 'permanent', 'proxy' => 'proxy')
- ),
- 'redirect_path' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '@^(([\.]{0})|((ftp|https?)://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(/(?!.*\.\.)[\w/_\.\-]{1,255}/))$@',
- 'errmsg'=> 'redirect_error_regex'),
- ),
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'active' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'CHECKBOX',
- 'default' => 'y',
- 'value' => array(0 => 'n', 1 => 'y')
- ),
- //#################################
- // ENDE Datatable fields
- //#################################
- )
-);
-
-if($_SESSION["s"]["user"]["typ"] == 'admin') {
-
- $form["tabs"]['advanced'] = array (
- 'title' => "Options",
- 'width' => 100,
- 'template' => "templates/web_subdomain_advanced.htm",
- 'readonly' => false,
- 'fields' => array (
- //#################################
- // Begin Datatable fields
- //#################################
- 'proxy_directives' => array (
- 'datatype' => 'TEXT',
- 'formtype' => 'TEXT',
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- //#################################
- // ENDE Datatable fields
- //#################################
- )
- );
-
-}
-
-
-?>
diff --git a/interface/web/sites/form/web_vhost_aliasdomain.tform.php b/interface/web/sites/form/web_vhost_aliasdomain.tform.php
deleted file mode 100644
index 00313fb743b4a840617e0e0543f4f8d59b46923d..0000000000000000000000000000000000000000
--- a/interface/web/sites/form/web_vhost_aliasdomain.tform.php
+++ /dev/null
@@ -1,737 +0,0 @@
-<?php
-
-/*
- Form Definition
-
- Tabledefinition
-
- Datatypes:
- - INTEGER (Forces the input to Int)
- - DOUBLE
- - CURRENCY (Formats the values to currency notation)
- - VARCHAR (no format check, maxlength: 255)
- - TEXT (no format check)
- - DATE (Dateformat, automatic conversion to timestamps)
-
- Formtype:
- - TEXT (Textfield)
- - TEXTAREA (Textarea)
- - PASSWORD (Password textfield, input is not shown when edited)
- - SELECT (Select option field)
- - RADIO
- - CHECKBOX
- - CHECKBOXARRAY
- - FILE
-
- VALUE:
- - Wert oder Array
-
- Hint:
- The ID field of the database table is not part of the datafield definition.
- The ID field must be always auto incement (int or bigint).
-
- Search:
- - searchable = 1 or searchable = 2 include the field in the search
- - searchable = 1: this field will be the title of the search result
- - searchable = 2: this field will be included in the description of the search result
-
-
-*/
-
-$form["title"] = "Aliasdomain";
-$form["description"] = "";
-$form["name"] = "web_vhost_aliasdomain";
-$form["action"] = "web_vhost_aliasdomain_edit.php";
-$form["db_table"] = "web_domain";
-$form["db_table_idx"] = "domain_id";
-$form["db_history"] = "yes";
-$form["tab_default"] = "domain";
-$form["list_default"] = "web_vhost_aliasdomain_list.php";
-$form["auth"] = 'yes'; // yes / no
-
-$form["auth_preset"]["userid"] = 0; // 0 = id of the user, > 0 id must match with id of current user
-$form["auth_preset"]["groupid"] = 0; // 0 = default groupid of the user, > 0 id must match with groupid of current user
-$form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update, d = delete
-$form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete
-$form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
-
-$wildcard_available = false;
-$ssl_available = true;
-if(!$app->auth->is_admin()) {
- $client_group_id = $_SESSION["s"]["user"]["default_group"];
- $client = $app->db->queryOneRecord("SELECT limit_wildcard, limit_ssl FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
-
- if($client['limit_ssl'] != 'y') $ssl_available = false;
-}
-
-$app->uses('getconf');
-$web_config = $app->getconf->get_global_config('sites');
-
-$form["tabs"]['domain'] = array (
- 'title' => "Domain",
- 'width' => 100,
- 'template' => "templates/web_vhost_aliasdomain_edit.htm",
- 'readonly' => false,
- 'fields' => array (
- //#################################
- // Begin Datatable fields
- //#################################
- 'server_id' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'SELECT',
- 'default' => '',
- 'datasource' => array ( 'type' => 'SQL',
- 'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND web_server = 1 AND {AUTHSQL} ORDER BY server_name',
- 'keyfield'=> 'server_id',
- 'valuefield'=> 'server_name'
- ),
- 'value' => ''
- ),
- 'ip_address' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => '',
- /*'datasource' => array ( 'type' => 'SQL',
- 'querystring' => "SELECT ip_address,ip_address FROM server_ip WHERE ip_type = 'IPv4' AND {AUTHSQL} ORDER BY ip_address",
- 'keyfield'=> 'ip_address',
- 'valuefield'=> 'ip_address'
- ),*/
- 'value' => '',
- 'searchable' => 2
- ),
- 'ipv6_address' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => '',
- /*'datasource' => array ( 'type' => 'SQL',
- 'querystring' => "SELECT ip_address,ip_address FROM server_ip WHERE ip_type = 'IPv6' AND {AUTHSQL} ORDER BY ip_address",
- 'keyfield'=> 'ip_address',
- 'valuefield'=> 'ip_address'
- ),*/
- 'value' => '',
- 'searchable' => 2
- ),
- 'domain' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'filters' => array( 0 => array( 'event' => 'SAVE',
- 'type' => 'IDNTOASCII'),
- 1 => array( 'event' => 'SHOW',
- 'type' => 'IDNTOUTF8'),
- 2 => array( 'event' => 'SAVE',
- 'type' => 'TOLOWER')
- ),
- 'validators' => array ( 0 => array ( 'type' => 'CUSTOM',
- 'class' => 'validate_domain',
- 'function' => 'alias_domain',
- 'errmsg'=> 'domain_error_regex'),
- ),
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255',
- 'searchable' => 1
- ),
- 'type' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => 'y',
- 'value' => array('vhost' => 'Site', 'alias' => 'Alias', 'vhostalias' => 'Alias', 'subdomain' => 'Subdomain', 'vhostsubdomain' => 'Subdomain')
- ),
- 'parent_domain_id' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'SELECT',
- 'default' => '',
- 'datasource' => array ( 'type' => 'SQL',
- 'querystring' => "SELECT domain_id,domain AS parent_domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
- // Commented out until {AUTHSQL::web_domain} is working
- //'querystring' => "SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id = server.server_id AND {AUTHSQL::web_domain} ORDER BY web_domain.domain",
- 'keyfield'=> 'domain_id',
- 'valuefield'=> 'parent_domain'
- ),
- 'value' => ''
- ),
- 'web_folder' => array (
- 'datatype' => 'VARCHAR',
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '@^((?!.*\.\.)[\w/_\.\-]{1,100})$@',
- 'errmsg'=> 'web_folder_error_regex'),
- ),
- 'formtype' => 'TEXT',
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'vhost_type' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => 'y',
- 'value' => array('name' => 'Namebased', 'ip' => 'IP-Based')
- ),
- 'hd_quota' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'TEXT',
- 'default' => '0',
- 'value' => '',
- 'width' => '7',
- 'maxlength' => '7'
- ),
- 'traffic_quota' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
- 'errmsg'=> 'traffic_quota_error_empty'),
- 1 => array ( 'type' => 'REGEX',
- 'regex' => '/^(\-1|[0-9]{1,10})$/',
- 'errmsg'=> 'traffic_quota_error_regex'),
- ),
- 'default' => '-1',
- 'value' => '',
- 'width' => '7',
- 'maxlength' => '7'
- ),
- 'cgi' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'CHECKBOX',
- 'default' => 'n',
- 'value' => array(0 => 'n', 1 => 'y')
- ),
- 'ssi' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'CHECKBOX',
- 'default' => 'n',
- 'value' => array(0 => 'n', 1 => 'y')
- ),
- 'suexec' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'CHECKBOX',
- 'default' => 'y',
- 'value' => array(0 => 'n', 1 => 'y')
- ),
- 'errordocs' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'CHECKBOX',
- 'default' => '1',
- 'value' => array(0 => '0', 1 => '1')
- ),
- 'subdomain' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => 'www',
- 'value' => ($wildcard_available ? array('none' => 'none_txt', 'www' => 'www.', '*' => '*.') : array('none' => 'none_txt', 'www' => 'www.'))
- ),
- 'ssl' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'CHECKBOX',
- 'default' => 'n',
- 'value' => array(0 => 'n', 1 => 'y')
- ),
- 'php' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => 'fast-cgi',
- 'valuelimit' => 'client:web_php_options',
- 'value' => array('no' => 'disabled_txt', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP', 'php-fpm' => 'PHP-FPM'),
- 'searchable' => 2
- ),
- 'fastcgi_php_version' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => '',
- /*'datasource' => array ( 'type' => 'SQL',
- 'querystring' => "SELECT ip_address,ip_address FROM server_ip WHERE ip_type = 'IPv4' AND {AUTHSQL} ORDER BY ip_address",
- 'keyfield'=> 'ip_address',
- 'valuefield'=> 'ip_address'
- ),*/
- 'value' => ''
- ),
- 'perl' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'CHECKBOX',
- 'default' => 'n',
- 'value' => array(0 => 'n', 1 => 'y')
- ),
- 'ruby' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'CHECKBOX',
- 'default' => 'n',
- 'value' => array(0 => 'n', 1 => 'y')
- ),
- 'python' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'CHECKBOX',
- 'default' => 'n',
- 'value' => array(0 => 'n', 1 => 'y')
- ),
- 'active' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'CHECKBOX',
- 'default' => 'y',
- 'value' => array(0 => 'n', 1 => 'y')
- ),
- //#################################
- // ENDE Datatable fields
- //#################################
- )
-);
-
-
-$form["tabs"]['redirect'] = array (
- 'title' => "Redirect",
- 'width' => 100,
- 'template' => "templates/web_vhost_aliasdomain_redirect.htm",
- 'readonly' => false,
- 'fields' => array (
- //#################################
- // Begin Datatable fields
- //#################################
- 'redirect_type' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => '',
- 'value' => array('' => 'no_redirect_txt', 'no' => 'no_flag_txt', 'R' => 'R', 'L' => 'L', 'R,L' => 'R,L', 'R=301,L' => 'R=301,L', 'last' => 'last', 'break' => 'break', 'redirect' => 'redirect', 'permanent' => 'permanent', 'proxy' => 'proxy')
- ),
- 'redirect_path' => array (
- 'datatype' => 'VARCHAR',
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '@^(([\.]{0})|((ftp|https?)://([-\w\.]+)+(:\d+)?(/([\w/_\.\,\-\+\?\~!:%]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(/(?!.*\.\.)[\w/_\.\-]{1,255}/))$@',
- 'errmsg'=> 'redirect_error_regex'),
- ),
- 'formtype' => 'TEXT',
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'seo_redirect' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => '',
- 'value' => array('' => 'no_redirect_txt', 'non_www_to_www' => 'domain.tld => www.domain.tld', 'www_to_non_www' => 'www.domain.tld => domain.tld', '*_domain_tld_to_domain_tld' => '*.doman.tld => domain.tld', '*_domain_tld_to_www_domain_tld' => '*.domain.tld => www.domain.tld', '*_to_domain_tld' => '* => domain.tld', '*_to_www_domain_tld' => '* => www.domain.tld')
- ),
- 'rewrite_rules' => array (
- 'datatype' => 'TEXT',
- 'formtype' => 'TEXT',
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- //#################################
- // ENDE Datatable fields
- //#################################
- )
-);
-
-if($ssl_available) {
- $form["tabs"]['ssl'] = array (
- 'title' => "SSL",
- 'width' => 100,
- 'template' => "templates/web_vhost_aliasdomain_ssl.htm",
- 'readonly' => false,
- 'fields' => array (
- //#################################
- // Begin Datatable fields
- //#################################
- 'ssl_state' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^(([\.]{0})|([a-zA-Z0-9\ \.\-\_\,]{1,255}))$/',
- 'errmsg'=> 'ssl_state_error_regex'),
- ),
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'ssl_locality' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^(([\.]{0})|([a-zA-Z0-9\ \.\-\_\,]{1,255}))$/',
- 'errmsg'=> 'ssl_locality_error_regex'),
- ),
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'ssl_organisation' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^(([\.]{0})|([a-zA-Z0-9\ \.\-\_\,]{1,255}))$/',
- 'errmsg'=> 'ssl_organisation_error_regex'),
- ),
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'ssl_organisation_unit' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^(([\.]{0})|([a-zA-Z0-9\ \.\-\_\,]{1,255}))$/',
- 'errmsg'=> 'ssl_organistaion_unit_error_regex'),
- ),
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- /*
- 'ssl_country' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^(([\.]{0})|([A-Z]{2,2}))$/',
- 'errmsg'=> 'ssl_country_error_regex'),
- ),
- 'default' => '',
- 'value' => '',
- 'width' => '2',
- 'maxlength' => '2'
- ),
- */
- 'ssl_country' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => '',
- 'datasource' => array ( 'type' => 'SQL',
- 'querystring' => 'SELECT iso,printable_name FROM country ORDER BY printable_name',
- 'keyfield'=> 'iso',
- 'valuefield'=> 'printable_name'
- ),
- 'value' => ''
- ),
- 'ssl_domain' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'ssl_key' => array (
- 'datatype' => 'TEXT',
- 'formtype' => 'TEXTAREA',
- 'default' => '',
- 'value' => '',
- 'cols' => '30',
- 'rows' => '10'
- ),
- 'ssl_request' => array (
- 'datatype' => 'TEXT',
- 'formtype' => 'TEXTAREA',
- 'default' => '',
- 'value' => '',
- 'cols' => '30',
- 'rows' => '10'
- ),
- 'ssl_cert' => array (
- 'datatype' => 'TEXT',
- 'formtype' => 'TEXTAREA',
- 'default' => '',
- 'value' => '',
- 'cols' => '30',
- 'rows' => '10'
- ),
- 'ssl_bundle' => array (
- 'datatype' => 'TEXT',
- 'formtype' => 'TEXTAREA',
- 'default' => '',
- 'value' => '',
- 'cols' => '30',
- 'rows' => '10'
- ),
- 'ssl_action' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => '',
- 'value' => array('' => 'none_txt', 'save' => 'save_certificate_txt', 'create' => 'create_certificate_txt', 'del' => 'delete_certificate_txt')
- ),
- //#################################
- // ENDE Datatable fields
- //#################################
- )
- );
-}
-
-//* Statistics
-$form["tabs"]['stats'] = array (
- 'title' => "Stats",
- 'width' => 100,
- 'template' => "templates/web_vhost_aliasdomain_stats.htm",
- 'readonly' => false,
- 'fields' => array (
- //#################################
- // Begin Datatable fields
- //#################################
- 'stats_password' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'PASSWORD',
- 'encryption' => 'CRYPT',
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'stats_type' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => 'webalizer',
- 'value' => array('webalizer' => 'Webalizer', 'awstats' => 'AWStats')
- ),
- //#################################
- // ENDE Datatable fields
- //#################################
- )
-);
-
-// if($_SESSION["s"]["user"]["typ"] == 'admin') {
-
-//* Backup
-$form["tabs"]['backup'] = array (
- 'title' => "Backup",
- 'width' => 100,
- 'template' => "templates/web_vhost_aliasdomain_backup.htm",
- 'readonly' => false,
- 'fields' => array (
- //#################################
- // Begin Datatable fields
- //#################################
- 'backup_interval' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => '',
- 'value' => array('none' => 'No backup', 'daily' => 'Daily', 'weekly' => 'Weekly', 'monthly' => 'Monthly')
- ),
- 'backup_copies' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'SELECT',
- 'default' => '',
- 'value' => array('1' => '1', '2' => '2', '3' => '3', '4' => '4', '5' => '5', '6' => '6', '7' => '7', '8' => '8', '9' => '9', '10' => '10')
- ),
- 'backup_excludes' => array (
- 'datatype' => 'VARCHAR',
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '@^(?!.*\.\.)[-a-zA-Z0-9_/.~,*]*$@',
- 'errmsg'=> 'backup_excludes_error_regex'),
- ),
- 'formtype' => 'TEXT',
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- //#################################
- // ENDE Datatable fields
- //#################################
- ),
- 'plugins' => array (
- 'backup_records' => array (
- 'class' => 'plugin_backuplist',
- 'options' => array(
- )
- )
- )
-);
-
-// }
-
-if($_SESSION["s"]["user"]["typ"] == 'admin'
- || ($web_config['reseller_can_use_options'] == 'y' && $app->auth->has_clients($_SESSION['s']['user']['userid']))) {
-
- $form["tabs"]['advanced'] = array (
- 'title' => "Options",
- 'width' => 100,
- 'template' => "templates/web_vhost_aliasdomain_advanced.htm",
- 'readonly' => false,
- 'fields' => array (
- //#################################
- // Begin Datatable fields
- //#################################
- 'document_root' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
- 'errmsg'=> 'documentroot_error_empty'),
- ),
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'system_user' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
- 'errmsg'=> 'sysuser_error_empty'),
- ),
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'system_group' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
- 'errmsg'=> 'sysgroup_error_empty'),
- ),
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'allow_override' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
- 'errmsg'=> 'allow_override_error_empty'),
- ),
- 'default' => 'All',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'php_fpm_use_socket' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'CHECKBOX',
- 'default' => 'n',
- 'value' => array(0 => 'n', 1 => 'y')
- ),
- 'pm' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => 'dynamic',
- 'value' => array('static' => 'static', 'dynamic' => 'dynamic', 'ondemand' => 'ondemand (PHP Version >= 5.3.9)')
- ),
- 'pm_max_children' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^([1-9][0-9]{0,10})$/',
- 'errmsg'=> 'pm_max_children_error_regex'),
- ),
- 'default' => '10',
- 'value' => '',
- 'width' => '3',
- 'maxlength' => '3'
- ),
- 'pm_start_servers' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^([1-9][0-9]{0,10})$/',
- 'errmsg'=> 'pm_start_servers_error_regex'),
- ),
- 'default' => '2',
- 'value' => '',
- 'width' => '3',
- 'maxlength' => '3'
- ),
- 'pm_min_spare_servers' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^([1-9][0-9]{0,10})$/',
- 'errmsg'=> 'pm_min_spare_servers_error_regex'),
- ),
- 'default' => '1',
- 'value' => '',
- 'width' => '3',
- 'maxlength' => '3'
- ),
- 'pm_max_spare_servers' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^([1-9][0-9]{0,10})$/',
- 'errmsg'=> 'pm_max_spare_servers_error_regex'),
- ),
- 'default' => '5',
- 'value' => '',
- 'width' => '3',
- 'maxlength' => '3'
- ),
- 'pm_process_idle_timeout' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^([1-9][0-9]{0,10})$/',
- 'errmsg'=> 'pm_process_idle_timeout_error_regex'),
- ),
- 'default' => '10',
- 'value' => '',
- 'width' => '3',
- 'maxlength' => '6'
- ),
- 'pm_max_requests' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^([0-9]{1,11})$/',
- 'errmsg'=> 'pm_max_requests_error_regex'),
- ),
- 'default' => '0',
- 'value' => '',
- 'width' => '3',
- 'maxlength' => '6'
- ),
- 'php_open_basedir' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- /*'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
- 'errmsg'=> 'php_open_basedir_error_empty'),
- ), */
- 'default' => 'All',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'custom_php_ini' => array (
- 'datatype' => 'TEXT',
- 'formtype' => 'TEXT',
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'apache_directives' => array (
- 'datatype' => 'TEXT',
- 'formtype' => 'TEXT',
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'nginx_directives' => array (
- 'datatype' => 'TEXT',
- 'formtype' => 'TEXT',
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'proxy_directives' => array (
- 'datatype' => 'TEXT',
- 'formtype' => 'TEXT',
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- //#################################
- // ENDE Datatable fields
- //#################################
- )
- );
-
-}
-
-
-?>
diff --git a/interface/web/sites/form/web_domain.tform.php b/interface/web/sites/form/web_vhost_domain.tform.php
similarity index 86%
rename from interface/web/sites/form/web_domain.tform.php
rename to interface/web/sites/form/web_vhost_domain.tform.php
index 84f8cd548d83766d0ae7a8ca68516e1f10af5eef..b5291810ae919479539d350fa2556e31636afba5 100644
--- a/interface/web/sites/form/web_domain.tform.php
+++ b/interface/web/sites/form/web_vhost_domain.tform.php
@@ -38,15 +38,31 @@
*/
-$form["title"] = "Web Domain";
+$vhostdomain_type = 'domain';
+$form_title = "Web Domain";
+$validator_function = 'web_domain';
+
+if(isset($_SESSION['s']['var']['vhostdomain_type'])) {
+ if($_SESSION['s']['var']['vhostdomain_type'] == 'subdomain') {
+ $vhostdomain_type = 'subdomain';
+ $form_title = "Subdomain";
+ $validator_function = 'sub_domain';
+ } elseif($_SESSION['s']['var']['vhostdomain_type'] == 'aliasdomain') {
+ $vhostdomain_type = 'aliasdomain';
+ $form_title = "Aliasdomain";
+ $validator_function = 'alias_domain';
+ }
+}
+
+$form["title"] = $form_title;
$form["description"] = "";
-$form["name"] = "web_domain";
-$form["action"] = "web_domain_edit.php";
+$form["name"] = "web_vhost_domain";
+$form["action"] = "web_vhost_domain_edit.php";
$form["db_table"] = "web_domain";
$form["db_table_idx"] = "domain_id";
$form["db_history"] = "yes";
$form["tab_default"] = "domain";
-$form["list_default"] = "web_domain_list.php";
+$form["list_default"] = "web_vhost_domain_list.php";
$form["auth"] = 'yes'; // yes / no
$form["auth_preset"]["userid"] = 0; // 0 = id of the user, > 0 id must match with id of current user
@@ -55,14 +71,16 @@ $form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update,
$form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete
$form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
+$web_domain_edit_readonly = false;
// Clients may not change the website basic settings if they are not resellers
if($app->auth->has_clients($_SESSION['s']['user']['userid']) || $app->auth->is_admin()) {
$web_domain_edit_readonly = false;
} else {
- $web_domain_edit_readonly = true;
+ if($vhostdomain_type == 'domain') $web_domain_edit_readonly = true;
}
$wildcard_available = true;
+if($vhostdomain_type != 'domain') $wildcard_available = false;
$ssl_available = true;
if(!$app->auth->is_admin()) {
$client_group_id = $_SESSION["s"]["user"]["default_group"];
@@ -78,7 +96,7 @@ $web_config = $app->getconf->get_global_config('sites');
$form["tabs"]['domain'] = array (
'title' => "Domain",
'width' => 100,
- 'template' => "templates/web_domain_edit.htm",
+ 'template' => "templates/web_vhost_domain_edit.htm",
'readonly' => $web_domain_edit_readonly,
'fields' => array (
//#################################
@@ -88,9 +106,6 @@ $form["tabs"]['domain'] = array (
'datatype' => 'INTEGER',
'formtype' => 'SELECT',
'default' => '',
- 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
- 'errmsg'=> 'no_server_error'),
- ),
'datasource' => array ( 'type' => 'SQL',
'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND web_server = 1 AND {AUTHSQL} ORDER BY server_name',
'keyfield'=> 'server_id',
@@ -134,7 +149,7 @@ $form["tabs"]['domain'] = array (
),
'validators' => array ( 0 => array ( 'type' => 'CUSTOM',
'class' => 'validate_domain',
- 'function' => 'web_domain',
+ 'function' => $validator_function,
'errmsg'=> 'domain_error_regex'),
),
'default' => '',
@@ -147,17 +162,12 @@ $form["tabs"]['domain'] = array (
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
'default' => 'y',
- 'value' => array('vhost' => 'Site', 'alias' => 'Alias')
+ 'value' => array('vhost' => 'Site', 'alias' => 'Alias', 'vhostalias' => 'Alias', 'subdomain' => 'Subdomain', 'vhostsubdomain' => 'Subdomain')
),
'parent_domain_id' => array (
'datatype' => 'INTEGER',
'formtype' => 'SELECT',
'default' => '',
- 'datasource' => array ( 'type' => 'SQL',
- 'querystring' => "SELECT domain_id,domain FROM web_domain WHERE type = 'site' AND {AUTHSQL} ORDER BY domain",
- 'keyfield'=> 'domain_id',
- 'valuefield'=> 'domain'
- ),
'value' => ''
),
'vhost_type' => array (
@@ -169,13 +179,7 @@ $form["tabs"]['domain'] = array (
'hd_quota' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
- 'errmsg'=> 'hd_quota_error_empty'),
- 1 => array ( 'type' => 'REGEX',
- 'regex' => '/^(\-1|[0-9]{1,10})$/',
- 'errmsg'=> 'hd_quota_error_regex'),
- ),
- 'default' => '-1',
+ 'default' => ($vhostdomain_type == 'domain' ? '-1' : '0'),
'value' => '',
'width' => '7',
'maxlength' => '7'
@@ -222,11 +226,6 @@ $form["tabs"]['domain'] = array (
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
'default' => 'www',
- 'validators' => array ( 0 => array ( 'type' => 'CUSTOM',
- 'class' => 'validate_domain',
- 'function' => 'web_domain_autosub',
- 'errmsg'=> 'domain_error_autosub'),
- ),
'value' => ($wildcard_available ? array('none' => 'none_txt', 'www' => 'www.', '*' => '*.') : array('none' => 'none_txt', 'www' => 'www.'))
),
'ssl' => array (
@@ -284,11 +283,66 @@ $form["tabs"]['domain'] = array (
)
);
+// add type-specific field attributes
+if($vhostdomain_type == 'domain') {
+ $form['tabs']['domain']['fields']['server_id']['validators'] = array(
+ 0 => array (
+ 'type' => 'NOTEMPTY',
+ 'errmsg'=> 'no_server_error'
+ ),
+ );
+ $form['tabs']['domain']['fields']['parent_domain_id']['datasource'] = array (
+ 'type' => 'SQL',
+ 'querystring' => "SELECT web_domain.domain_id,web_domain.domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
+ 'keyfield'=> 'domain_id',
+ 'valuefield'=> 'domain'
+ );
+ $form['tabs']['domain']['fields']['hd_quota']['validators'] = array (
+ 0 => array (
+ 'type' => 'NOTEMPTY',
+ 'errmsg'=> 'hd_quota_error_empty'
+ ),
+ 1 => array (
+ 'type' => 'REGEX',
+ 'regex' => '/^(\-1|[0-9]{1,10})$/',
+ 'errmsg'=> 'hd_quota_error_regex'
+ ),
+ );
+ $form['tabs']['domain']['fields']['subdomain']['validators'] = array(
+ 0 => array (
+ 'type' => 'CUSTOM',
+ 'class' => 'validate_domain',
+ 'function' => 'web_domain_autosub',
+ 'errmsg'=> 'domain_error_autosub'
+ ),
+ );
+} else {
+ $form['tabs']['domain']['fields']['parent_domain_id']['datasource'] = array (
+ 'type' => 'SQL',
+ 'querystring' => "SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id = server.server_id AND {AUTHSQL::web_domain} ORDER BY web_domain.domain",
+ 'keyfield'=> 'domain_id',
+ 'valuefield'=> 'parent_domain'
+ );
+ $form['tabs']['domain']['fields']['web_folder'] = array (
+ 'datatype' => 'VARCHAR',
+ 'validators' => array ( 0 => array ( 'type' => 'REGEX',
+ 'regex' => '@^((?!.*\.\.)[\w/_\.\-]{1,100})$@',
+ 'errmsg'=> 'web_folder_error_regex'),
+ ),
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'value' => '',
+ 'width' => '30',
+ 'maxlength' => '255'
+ );
+
+}
+
$form["tabs"]['redirect'] = array (
'title' => "Redirect",
'width' => 100,
- 'template' => "templates/web_domain_redirect.htm",
+ 'template' => "templates/web_vhost_domain_redirect.htm",
'readonly' => false,
'fields' => array (
//#################################
@@ -336,7 +390,7 @@ if($ssl_available) {
$form["tabs"]['ssl'] = array (
'title' => "SSL",
'width' => 100,
- 'template' => "templates/web_domain_ssl.htm",
+ 'template' => "templates/web_vhost_domain_ssl.htm",
'readonly' => false,
'fields' => array (
//#################################
@@ -472,7 +526,7 @@ if($ssl_available) {
$form["tabs"]['stats'] = array (
'title' => "Stats",
'width' => 100,
- 'template' => "templates/web_domain_stats.htm",
+ 'template' => "templates/web_vhost_domain_stats.htm",
'readonly' => false,
'fields' => array (
//#################################
@@ -505,7 +559,7 @@ $form["tabs"]['stats'] = array (
$form["tabs"]['backup'] = array (
'title' => "Backup",
'width' => 100,
- 'template' => "templates/web_domain_backup.htm",
+ 'template' => "templates/web_vhost_domain_backup.htm",
'readonly' => false,
'fields' => array (
//#################################
@@ -556,7 +610,7 @@ if($_SESSION["s"]["user"]["typ"] == 'admin'
$form["tabs"]['advanced'] = array (
'title' => "Options",
'width' => 100,
- 'template' => "templates/web_domain_advanced.htm",
+ 'template' => "templates/web_vhost_domain_advanced.htm",
'readonly' => false,
'fields' => array (
//#################################
diff --git a/interface/web/sites/form/web_vhost_subdomain.tform.php b/interface/web/sites/form/web_vhost_subdomain.tform.php
deleted file mode 100644
index b3c146cbaad09c98153c180533b787b46a9cd289..0000000000000000000000000000000000000000
--- a/interface/web/sites/form/web_vhost_subdomain.tform.php
+++ /dev/null
@@ -1,737 +0,0 @@
-<?php
-
-/*
- Form Definition
-
- Tabledefinition
-
- Datatypes:
- - INTEGER (Forces the input to Int)
- - DOUBLE
- - CURRENCY (Formats the values to currency notation)
- - VARCHAR (no format check, maxlength: 255)
- - TEXT (no format check)
- - DATE (Dateformat, automatic conversion to timestamps)
-
- Formtype:
- - TEXT (Textfield)
- - TEXTAREA (Textarea)
- - PASSWORD (Password textfield, input is not shown when edited)
- - SELECT (Select option field)
- - RADIO
- - CHECKBOX
- - CHECKBOXARRAY
- - FILE
-
- VALUE:
- - Wert oder Array
-
- Hint:
- The ID field of the database table is not part of the datafield definition.
- The ID field must be always auto incement (int or bigint).
-
- Search:
- - searchable = 1 or searchable = 2 include the field in the search
- - searchable = 1: this field will be the title of the search result
- - searchable = 2: this field will be included in the description of the search result
-
-
-*/
-
-$form["title"] = "Subdomain";
-$form["description"] = "";
-$form["name"] = "web_vhost_subdomain";
-$form["action"] = "web_vhost_subdomain_edit.php";
-$form["db_table"] = "web_domain";
-$form["db_table_idx"] = "domain_id";
-$form["db_history"] = "yes";
-$form["tab_default"] = "domain";
-$form["list_default"] = "web_vhost_subdomain_list.php";
-$form["auth"] = 'yes'; // yes / no
-
-$form["auth_preset"]["userid"] = 0; // 0 = id of the user, > 0 id must match with id of current user
-$form["auth_preset"]["groupid"] = 0; // 0 = default groupid of the user, > 0 id must match with groupid of current user
-$form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update, d = delete
-$form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete
-$form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
-
-$wildcard_available = false;
-$ssl_available = true;
-if(!$app->auth->is_admin()) {
- $client_group_id = $_SESSION["s"]["user"]["default_group"];
- $client = $app->db->queryOneRecord("SELECT limit_wildcard, limit_ssl FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
-
- if($client['limit_ssl'] != 'y') $ssl_available = false;
-}
-
-$app->uses('getconf');
-$web_config = $app->getconf->get_global_config('sites');
-
-$form["tabs"]['domain'] = array (
- 'title' => "Domain",
- 'width' => 100,
- 'template' => "templates/web_vhost_subdomain_edit.htm",
- 'readonly' => false,
- 'fields' => array (
- //#################################
- // Begin Datatable fields
- //#################################
- 'server_id' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'SELECT',
- 'default' => '',
- 'datasource' => array ( 'type' => 'SQL',
- 'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND web_server = 1 AND {AUTHSQL} ORDER BY server_name',
- 'keyfield'=> 'server_id',
- 'valuefield'=> 'server_name'
- ),
- 'value' => ''
- ),
- 'ip_address' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => '',
- /*'datasource' => array ( 'type' => 'SQL',
- 'querystring' => "SELECT ip_address,ip_address FROM server_ip WHERE ip_type = 'IPv4' AND {AUTHSQL} ORDER BY ip_address",
- 'keyfield'=> 'ip_address',
- 'valuefield'=> 'ip_address'
- ),*/
- 'value' => '',
- 'searchable' => 2
- ),
- 'ipv6_address' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => '',
- /*'datasource' => array ( 'type' => 'SQL',
- 'querystring' => "SELECT ip_address,ip_address FROM server_ip WHERE ip_type = 'IPv6' AND {AUTHSQL} ORDER BY ip_address",
- 'keyfield'=> 'ip_address',
- 'valuefield'=> 'ip_address'
- ),*/
- 'value' => '',
- 'searchable' => 2
- ),
- 'domain' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'filters' => array( 0 => array( 'event' => 'SAVE',
- 'type' => 'IDNTOASCII'),
- 1 => array( 'event' => 'SHOW',
- 'type' => 'IDNTOUTF8'),
- 2 => array( 'event' => 'SAVE',
- 'type' => 'TOLOWER')
- ),
- 'validators' => array ( 0 => array ( 'type' => 'CUSTOM',
- 'class' => 'validate_domain',
- 'function' => 'sub_domain',
- 'errmsg'=> 'domain_error_regex'),
- ),
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255',
- 'searchable' => 1
- ),
- 'type' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => 'y',
- 'value' => array('vhost' => 'Site', 'alias' => 'Alias', 'vhostalias' => 'Alias', 'subdomain' => 'Subdomain', 'vhostsubdomain' => 'Subdomain')
- ),
- 'parent_domain_id' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'SELECT',
- 'default' => '',
- 'datasource' => array ( 'type' => 'SQL',
- 'querystring' => "SELECT domain_id,domain AS parent_domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
- // Commented out until {AUTHSQL::web_domain} is working
- //'querystring' => "SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id = server.server_id AND {AUTHSQL::web_domain} ORDER BY web_domain.domain",
- 'keyfield'=> 'domain_id',
- 'valuefield'=> 'parent_domain'
- ),
- 'value' => ''
- ),
- 'web_folder' => array (
- 'datatype' => 'VARCHAR',
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '@^((?!.*\.\.)[\w/_\.\-]{1,100})$@',
- 'errmsg'=> 'web_folder_error_regex'),
- ),
- 'formtype' => 'TEXT',
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'vhost_type' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => 'y',
- 'value' => array('name' => 'Namebased', 'ip' => 'IP-Based')
- ),
- 'hd_quota' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'TEXT',
- 'default' => '0',
- 'value' => '',
- 'width' => '7',
- 'maxlength' => '7'
- ),
- 'traffic_quota' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
- 'errmsg'=> 'traffic_quota_error_empty'),
- 1 => array ( 'type' => 'REGEX',
- 'regex' => '/^(\-1|[0-9]{1,10})$/',
- 'errmsg'=> 'traffic_quota_error_regex'),
- ),
- 'default' => '-1',
- 'value' => '',
- 'width' => '7',
- 'maxlength' => '7'
- ),
- 'cgi' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'CHECKBOX',
- 'default' => 'n',
- 'value' => array(0 => 'n', 1 => 'y')
- ),
- 'ssi' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'CHECKBOX',
- 'default' => 'n',
- 'value' => array(0 => 'n', 1 => 'y')
- ),
- 'suexec' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'CHECKBOX',
- 'default' => 'y',
- 'value' => array(0 => 'n', 1 => 'y')
- ),
- 'errordocs' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'CHECKBOX',
- 'default' => '1',
- 'value' => array(0 => '0', 1 => '1')
- ),
- 'subdomain' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => 'www',
- 'value' => ($wildcard_available ? array('none' => 'none_txt', 'www' => 'www.', '*' => '*.') : array('none' => 'none_txt', 'www' => 'www.'))
- ),
- 'ssl' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'CHECKBOX',
- 'default' => 'n',
- 'value' => array(0 => 'n', 1 => 'y')
- ),
- 'php' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => 'fast-cgi',
- 'valuelimit' => 'client:web_php_options',
- 'value' => array('no' => 'disabled_txt', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP', 'php-fpm' => 'PHP-FPM'),
- 'searchable' => 2
- ),
- 'fastcgi_php_version' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => '',
- /*'datasource' => array ( 'type' => 'SQL',
- 'querystring' => "SELECT ip_address,ip_address FROM server_ip WHERE ip_type = 'IPv4' AND {AUTHSQL} ORDER BY ip_address",
- 'keyfield'=> 'ip_address',
- 'valuefield'=> 'ip_address'
- ),*/
- 'value' => ''
- ),
- 'perl' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'CHECKBOX',
- 'default' => 'n',
- 'value' => array(0 => 'n', 1 => 'y')
- ),
- 'ruby' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'CHECKBOX',
- 'default' => 'n',
- 'value' => array(0 => 'n', 1 => 'y')
- ),
- 'python' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'CHECKBOX',
- 'default' => 'n',
- 'value' => array(0 => 'n', 1 => 'y')
- ),
- 'active' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'CHECKBOX',
- 'default' => 'y',
- 'value' => array(0 => 'n', 1 => 'y')
- ),
- //#################################
- // ENDE Datatable fields
- //#################################
- )
-);
-
-
-$form["tabs"]['redirect'] = array (
- 'title' => "Redirect",
- 'width' => 100,
- 'template' => "templates/web_vhost_subdomain_redirect.htm",
- 'readonly' => false,
- 'fields' => array (
- //#################################
- // Begin Datatable fields
- //#################################
- 'redirect_type' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => '',
- 'value' => array('' => 'no_redirect_txt', 'no' => 'no_flag_txt', 'R' => 'R', 'L' => 'L', 'R,L' => 'R,L', 'R=301,L' => 'R=301,L', 'last' => 'last', 'break' => 'break', 'redirect' => 'redirect', 'permanent' => 'permanent', 'proxy' => 'proxy')
- ),
- 'redirect_path' => array (
- 'datatype' => 'VARCHAR',
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '@^(([\.]{0})|((ftp|https?)://([-\w\.]+)+(:\d+)?(/([\w/_\.\,\-\+\?\~!:%]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(/(?!.*\.\.)[\w/_\.\-]{1,255}/))$@',
- 'errmsg'=> 'redirect_error_regex'),
- ),
- 'formtype' => 'TEXT',
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'seo_redirect' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => '',
- 'value' => array('' => 'no_redirect_txt', 'non_www_to_www' => 'domain.tld => www.domain.tld', 'www_to_non_www' => 'www.domain.tld => domain.tld', '*_domain_tld_to_domain_tld' => '*.doman.tld => domain.tld', '*_domain_tld_to_www_domain_tld' => '*.domain.tld => www.domain.tld', '*_to_domain_tld' => '* => domain.tld', '*_to_www_domain_tld' => '* => www.domain.tld')
- ),
- 'rewrite_rules' => array (
- 'datatype' => 'TEXT',
- 'formtype' => 'TEXT',
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- //#################################
- // ENDE Datatable fields
- //#################################
- )
-);
-
-if($ssl_available) {
- $form["tabs"]['ssl'] = array (
- 'title' => "SSL",
- 'width' => 100,
- 'template' => "templates/web_vhost_subdomain_ssl.htm",
- 'readonly' => false,
- 'fields' => array (
- //#################################
- // Begin Datatable fields
- //#################################
- 'ssl_state' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^(([\.]{0})|([a-zA-Z0-9\ \.\-\_\,]{1,255}))$/',
- 'errmsg'=> 'ssl_state_error_regex'),
- ),
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'ssl_locality' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^(([\.]{0})|([a-zA-Z0-9\ \.\-\_\,]{1,255}))$/',
- 'errmsg'=> 'ssl_locality_error_regex'),
- ),
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'ssl_organisation' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^(([\.]{0})|([a-zA-Z0-9\ \.\-\_\,]{1,255}))$/',
- 'errmsg'=> 'ssl_organisation_error_regex'),
- ),
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'ssl_organisation_unit' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^(([\.]{0})|([a-zA-Z0-9\ \.\-\_\,]{1,255}))$/',
- 'errmsg'=> 'ssl_organistaion_unit_error_regex'),
- ),
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- /*
- 'ssl_country' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^(([\.]{0})|([A-Z]{2,2}))$/',
- 'errmsg'=> 'ssl_country_error_regex'),
- ),
- 'default' => '',
- 'value' => '',
- 'width' => '2',
- 'maxlength' => '2'
- ),
- */
- 'ssl_country' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => '',
- 'datasource' => array ( 'type' => 'SQL',
- 'querystring' => 'SELECT iso,printable_name FROM country ORDER BY printable_name',
- 'keyfield'=> 'iso',
- 'valuefield'=> 'printable_name'
- ),
- 'value' => ''
- ),
- 'ssl_domain' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'ssl_key' => array (
- 'datatype' => 'TEXT',
- 'formtype' => 'TEXTAREA',
- 'default' => '',
- 'value' => '',
- 'cols' => '30',
- 'rows' => '10'
- ),
- 'ssl_request' => array (
- 'datatype' => 'TEXT',
- 'formtype' => 'TEXTAREA',
- 'default' => '',
- 'value' => '',
- 'cols' => '30',
- 'rows' => '10'
- ),
- 'ssl_cert' => array (
- 'datatype' => 'TEXT',
- 'formtype' => 'TEXTAREA',
- 'default' => '',
- 'value' => '',
- 'cols' => '30',
- 'rows' => '10'
- ),
- 'ssl_bundle' => array (
- 'datatype' => 'TEXT',
- 'formtype' => 'TEXTAREA',
- 'default' => '',
- 'value' => '',
- 'cols' => '30',
- 'rows' => '10'
- ),
- 'ssl_action' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => '',
- 'value' => array('' => 'none_txt', 'save' => 'save_certificate_txt', 'create' => 'create_certificate_txt', 'del' => 'delete_certificate_txt')
- ),
- //#################################
- // ENDE Datatable fields
- //#################################
- )
- );
-}
-
-//* Statistics
-$form["tabs"]['stats'] = array (
- 'title' => "Stats",
- 'width' => 100,
- 'template' => "templates/web_vhost_subdomain_stats.htm",
- 'readonly' => false,
- 'fields' => array (
- //#################################
- // Begin Datatable fields
- //#################################
- 'stats_password' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'PASSWORD',
- 'encryption' => 'CRYPT',
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'stats_type' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => 'webalizer',
- 'value' => array('webalizer' => 'Webalizer', 'awstats' => 'AWStats')
- ),
- //#################################
- // ENDE Datatable fields
- //#################################
- )
-);
-
-// if($_SESSION["s"]["user"]["typ"] == 'admin') {
-
-//* Backup
-$form["tabs"]['backup'] = array (
- 'title' => "Backup",
- 'width' => 100,
- 'template' => "templates/web_vhost_subdomain_backup.htm",
- 'readonly' => false,
- 'fields' => array (
- //#################################
- // Begin Datatable fields
- //#################################
- 'backup_interval' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => '',
- 'value' => array('none' => 'No backup', 'daily' => 'Daily', 'weekly' => 'Weekly', 'monthly' => 'Monthly')
- ),
- 'backup_copies' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'SELECT',
- 'default' => '',
- 'value' => array('1' => '1', '2' => '2', '3' => '3', '4' => '4', '5' => '5', '6' => '6', '7' => '7', '8' => '8', '9' => '9', '10' => '10')
- ),
- 'backup_excludes' => array (
- 'datatype' => 'VARCHAR',
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '@^(?!.*\.\.)[-a-zA-Z0-9_/.~,*]*$@',
- 'errmsg'=> 'backup_excludes_error_regex'),
- ),
- 'formtype' => 'TEXT',
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- //#################################
- // ENDE Datatable fields
- //#################################
- ),
- 'plugins' => array (
- 'backup_records' => array (
- 'class' => 'plugin_backuplist',
- 'options' => array(
- )
- )
- )
-);
-
-// }
-
-if($_SESSION["s"]["user"]["typ"] == 'admin'
- || ($web_config['reseller_can_use_options'] == 'y' && $app->auth->has_clients($_SESSION['s']['user']['userid']))) {
-
- $form["tabs"]['advanced'] = array (
- 'title' => "Options",
- 'width' => 100,
- 'template' => "templates/web_vhost_subdomain_advanced.htm",
- 'readonly' => false,
- 'fields' => array (
- //#################################
- // Begin Datatable fields
- //#################################
- 'document_root' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
- 'errmsg'=> 'documentroot_error_empty'),
- ),
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'system_user' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
- 'errmsg'=> 'sysuser_error_empty'),
- ),
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'system_group' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
- 'errmsg'=> 'sysgroup_error_empty'),
- ),
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'allow_override' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
- 'errmsg'=> 'allow_override_error_empty'),
- ),
- 'default' => 'All',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'php_fpm_use_socket' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'CHECKBOX',
- 'default' => 'n',
- 'value' => array(0 => 'n', 1 => 'y')
- ),
- 'pm' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => 'dynamic',
- 'value' => array('static' => 'static', 'dynamic' => 'dynamic', 'ondemand' => 'ondemand (PHP Version >= 5.3.9)')
- ),
- 'pm_max_children' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^([1-9][0-9]{0,10})$/',
- 'errmsg'=> 'pm_max_children_error_regex'),
- ),
- 'default' => '10',
- 'value' => '',
- 'width' => '3',
- 'maxlength' => '3'
- ),
- 'pm_start_servers' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^([1-9][0-9]{0,10})$/',
- 'errmsg'=> 'pm_start_servers_error_regex'),
- ),
- 'default' => '2',
- 'value' => '',
- 'width' => '3',
- 'maxlength' => '3'
- ),
- 'pm_min_spare_servers' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^([1-9][0-9]{0,10})$/',
- 'errmsg'=> 'pm_min_spare_servers_error_regex'),
- ),
- 'default' => '1',
- 'value' => '',
- 'width' => '3',
- 'maxlength' => '3'
- ),
- 'pm_max_spare_servers' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^([1-9][0-9]{0,10})$/',
- 'errmsg'=> 'pm_max_spare_servers_error_regex'),
- ),
- 'default' => '5',
- 'value' => '',
- 'width' => '3',
- 'maxlength' => '3'
- ),
- 'pm_process_idle_timeout' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^([1-9][0-9]{0,10})$/',
- 'errmsg'=> 'pm_process_idle_timeout_error_regex'),
- ),
- 'default' => '10',
- 'value' => '',
- 'width' => '3',
- 'maxlength' => '6'
- ),
- 'pm_max_requests' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^([0-9]{1,11})$/',
- 'errmsg'=> 'pm_max_requests_error_regex'),
- ),
- 'default' => '0',
- 'value' => '',
- 'width' => '3',
- 'maxlength' => '6'
- ),
- 'php_open_basedir' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- /*'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
- 'errmsg'=> 'php_open_basedir_error_empty'),
- ), */
- 'default' => 'All',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'custom_php_ini' => array (
- 'datatype' => 'TEXT',
- 'formtype' => 'TEXT',
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'apache_directives' => array (
- 'datatype' => 'TEXT',
- 'formtype' => 'TEXT',
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'nginx_directives' => array (
- 'datatype' => 'TEXT',
- 'formtype' => 'TEXT',
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'proxy_directives' => array (
- 'datatype' => 'TEXT',
- 'formtype' => 'TEXT',
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- //#################################
- // ENDE Datatable fields
- //#################################
- )
- );
-
-}
-
-
-?>
diff --git a/interface/web/sites/lib/lang/br_web_aliasdomain.lng b/interface/web/sites/lib/lang/ar_web_childdomain.lng
similarity index 94%
rename from interface/web/sites/lib/lang/br_web_aliasdomain.lng
rename to interface/web/sites/lib/lang/ar_web_childdomain.lng
index 4149c711493e6b6f06d0e99656a1c65744d4ec46..85aef91916c7ac0d1ceecee32caa46c88390b755 100644
--- a/interface/web/sites/lib/lang/br_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/ar_web_childdomain.lng
@@ -1,20 +1,15 @@
<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
$wb['ssl_state_txt'] = 'State';
$wb['ssl_locality_txt'] = 'Locality';
$wb['ssl_organisation_txt'] = 'Organisation';
$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
$wb['ssl_request_txt'] = 'SSL Request';
$wb['ssl_cert_txt'] = 'SSL Certificate';
$wb['ssl_bundle_txt'] = 'SSL Bundle';
$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_txt'] = 'Domain';
$wb['type_txt'] = 'Type';
$wb['parent_domain_id_txt'] = 'Parent Website';
$wb['redirect_type_txt'] = 'Redirect Type';
@@ -23,15 +18,12 @@ $wb['active_txt'] = 'Active';
$wb['document_root_txt'] = 'Documentroot';
$wb['system_user_txt'] = 'Linux User';
$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['ip_address_txt'] = 'IP-Address';
$wb['vhost_type_txt'] = 'VHost Type';
$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quaota';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
@@ -39,10 +31,26 @@ $wb['client_txt'] = 'Client';
$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
+$wb['apache_directives_txt'] = 'Apache directives';
$wb['domain_error_empty'] = 'Domain is empty.';
$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
@@ -62,7 +70,6 @@ $wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid character
$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@ $wb['stats_type_txt'] = 'Webstatistics program';
$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
$wb['none_txt'] = 'None';
$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
$wb['save_certificate_txt'] = 'Save certificate';
$wb['create_certificate_txt'] = 'Create certificate';
$wb['delete_certificate_txt'] = 'Delete certificate';
@@ -109,7 +114,6 @@ $wb['password_match_txt'] = 'The passwords do match.';
$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
$wb['Domain'] = 'Aliasdomain';
+
?>
diff --git a/interface/web/sites/lib/lang/ar_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/ar_web_childdomain_list.lng
similarity index 74%
rename from interface/web/sites/lib/lang/ar_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/ar_web_childdomain_list.lng
index 8ea34c440978e1ec0920627b26e72315d713eda1..95a3b5f71a21f4a00f1e2ab067c5fa25f3f9a19a 100644
--- a/interface/web/sites/lib/lang/ar_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/ar_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Aliasdomain';
+$wb['list_head_txt'] = 'Subdomains';
$wb['active_txt'] = 'Active';
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['add_new_record_txt'] = 'Add new aliasdomain';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Add new subdomain';
$wb['domain_error_empty'] = 'Domain is empty.';
$wb['domain_error_unique'] = 'Domain must be unique.';
$wb['domain_error_regex'] = 'Domain name invalid.';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'None';
+
?>
diff --git a/interface/web/sites/lib/lang/ar_web_subdomain.lng b/interface/web/sites/lib/lang/ar_web_subdomain.lng
deleted file mode 100644
index fc21378f222c0d8ce599380e792cb3c8f713ea6a..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/ar_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IP-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quaota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/ar_web_subdomain_list.lng b/interface/web/sites/lib/lang/ar_web_subdomain_list.lng
deleted file mode 100644
index 1c16bcda288f146167a5a49221951769017f580b..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/ar_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Add new subdomain';
-?>
diff --git a/interface/web/sites/lib/lang/ar_web_vhost_aliasdomain_list.lng b/interface/web/sites/lib/lang/ar_web_vhost_aliasdomain_list.lng
deleted file mode 100644
index ae8bfec7a823f5df6ab606c4ff1f425ad578105a..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/ar_web_vhost_aliasdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Aliasdomain';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['add_new_record_txt'] = 'Add new aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/ar_web_domain.lng b/interface/web/sites/lib/lang/ar_web_vhost_domain.lng
similarity index 95%
rename from interface/web/sites/lib/lang/ar_web_domain.lng
rename to interface/web/sites/lib/lang/ar_web_vhost_domain.lng
index 3148cbbfc6fa0528c25a51e2f4dd20ac400986bc..7251f53b43351d460886f29ccfc5509cbca8e8f9 100644
--- a/interface/web/sites/lib/lang/ar_web_domain.lng
+++ b/interface/web/sites/lib/lang/ar_web_vhost_domain.lng
@@ -120,4 +120,10 @@ $wb['rewrite_rules_txt'] = 'Rewrite Rules';
$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['host_txt'] = 'Hostname';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+
?>
diff --git a/interface/web/sites/lib/lang/ar_web_domain_admin_list.lng b/interface/web/sites/lib/lang/ar_web_vhost_domain_admin_list.lng
similarity index 100%
rename from interface/web/sites/lib/lang/ar_web_domain_admin_list.lng
rename to interface/web/sites/lib/lang/ar_web_vhost_domain_admin_list.lng
diff --git a/interface/web/sites/lib/lang/ar_web_domain_list.lng b/interface/web/sites/lib/lang/ar_web_vhost_domain_list.lng
similarity index 83%
rename from interface/web/sites/lib/lang/ar_web_domain_list.lng
rename to interface/web/sites/lib/lang/ar_web_vhost_domain_list.lng
index 88ec412daabfb125db4038dc964c2fdec237e843..b8f85d3143cf1d6a3d0d78190f88b772738e7d62 100644
--- a/interface/web/sites/lib/lang/ar_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/ar_web_vhost_domain_list.lng
@@ -5,4 +5,6 @@ $wb['active_txt'] = 'Active';
$wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Domain';
$wb['add_new_record_txt'] = 'Add new website';
+$wb['parent_domain_id_txt'] = 'Website';
+
?>
diff --git a/interface/web/sites/lib/lang/ar_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/ar_web_vhost_subdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/ar_web_vhost_subdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/ar_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/ar_web_vhost_subdomain_list.lng
deleted file mode 100644
index 1c16bcda288f146167a5a49221951769017f580b..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/ar_web_vhost_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Add new subdomain';
-?>
diff --git a/interface/web/sites/lib/lang/bg_web_childdomain.lng b/interface/web/sites/lib/lang/bg_web_childdomain.lng
new file mode 100644
index 0000000000000000000000000000000000000000..4ff2ccb60f65d28c787e2bd48497c77a7196a318
--- /dev/null
+++ b/interface/web/sites/lib/lang/bg_web_childdomain.lng
@@ -0,0 +1,119 @@
+<?php
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'ОрганизациÑ';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Държава';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['server_id_txt'] = 'Сървър';
+$wb['domain_txt'] = 'Домейн';
+$wb['type_txt'] = 'Тип';
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['redirect_type_txt'] = 'Redirect Type';
+$wb['redirect_path_txt'] = 'Redirect Path';
+$wb['active_txt'] = 'Ðктивен';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux потребител';
+$wb['system_group_txt'] = 'Linux група';
+$wb['ip_address_txt'] = 'IP адреÑ';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Трафик квота';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Клиент';
+$wb['limit_web_domain_txt'] = 'ДоÑтигнат е макÑималниÑÑ‚ разрешен брой домейни.';
+$wb['limit_web_aliasdomain_txt'] = 'ДоÑтигнат е макÑималниÑÑ‚ разрешен брой aliasdomains.';
+$wb['limit_web_subdomain_txt'] = 'ДоÑтигнат е макÑималниÑÑ‚ разрешен брой поддомейни.';
+$wb['apache_directives_txt'] = 'Apache директиви';
+$wb['domain_error_empty'] = 'Ðе е поÑочен домейн.';
+$wb['domain_error_unique'] = 'Вече ÑъщеÑтвува такъв домейн.';
+$wb['domain_error_regex'] = 'Ðевалидно име на домейн.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Грешен път за редирект. ВалидниÑÑ‚ Ð°Ð´Ñ€ÐµÑ Ñ‚Ñ€Ñбва да бъде примерно: /test/ or http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'Без редирект';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -> www';
+$wb['www_to_non_www_txt'] = 'www -> non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
+$wb['Domain'] = 'Aliasdomain';
+
+?>
diff --git a/interface/web/sites/lib/lang/bg_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/bg_web_childdomain_list.lng
similarity index 75%
rename from interface/web/sites/lib/lang/bg_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/bg_web_childdomain_list.lng
index 975d75e3bb572a44622aade31ca9efa021c7f7a5..5c9d215e2b636707cb0fafed07f6408f7989f48e 100644
--- a/interface/web/sites/lib/lang/bg_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/bg_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Aliasdomain';
+$wb['list_head_txt'] = 'Поддомейни';
$wb['active_txt'] = 'Ðктивен';
$wb['server_id_txt'] = 'Сървър';
$wb['parent_domain_id_txt'] = 'Сайт';
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['add_new_record_txt'] = 'Ðов aliasdomain';
+$wb['domain_txt'] = 'Поддомейн';
+$wb['add_new_record_txt'] = 'Ðов поддомейн';
$wb['domain_error_empty'] = 'Ðе е поÑочен домейн.';
$wb['domain_error_unique'] = 'Домейнът вече ÑъщеÑтвува.';
$wb['domain_error_regex'] = 'Ðевалдно име на домейн.';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'None';
+
?>
diff --git a/interface/web/sites/lib/lang/bg_web_subdomain.lng b/interface/web/sites/lib/lang/bg_web_subdomain.lng
deleted file mode 100644
index 3beb3d2a5cba40f2685245f9d05db65f6eee7738..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/bg_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'ОрганизациÑ';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Държава';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['server_id_txt'] = 'Сървър';
-$wb['domain_txt'] = 'Домейн';
-$wb['type_txt'] = 'Тип';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Ðктивен';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux потребител';
-$wb['system_group_txt'] = 'Linux група';
-$wb['ip_address_txt'] = 'IP адреÑ';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Трафик квота';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Клиент';
-$wb['limit_web_domain_txt'] = 'ДоÑтигнат е макÑималниÑÑ‚ разрешен брой домейни.';
-$wb['limit_web_aliasdomain_txt'] = 'ДоÑтигнат е макÑималниÑÑ‚ разрешен брой aliasdomains.';
-$wb['limit_web_subdomain_txt'] = 'ДоÑтигнат е макÑималниÑÑ‚ разрешен брой поддомейни.';
-$wb['apache_directives_txt'] = 'Apache директиви';
-$wb['domain_error_empty'] = 'Ðе е поÑочен домейн.';
-$wb['domain_error_unique'] = 'Вече ÑъщеÑтвува такъв домейн.';
-$wb['domain_error_regex'] = 'Ðевалидно име на домейн.';
-$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Грешен път за редирект. ВалидниÑÑ‚ Ð°Ð´Ñ€ÐµÑ Ñ‚Ñ€Ñбва да бъде примерно: /test/ or http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'Без редирект';
-$wb['no_flag_txt'] = 'No flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/bg_web_subdomain_list.lng b/interface/web/sites/lib/lang/bg_web_subdomain_list.lng
deleted file mode 100644
index d08e40579f0ba319cee5fe7a8522a29013bba134..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/bg_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Поддомейни';
-$wb['active_txt'] = 'Ðктивен';
-$wb['server_id_txt'] = 'Сървър';
-$wb['parent_domain_id_txt'] = 'Сайт';
-$wb['domain_txt'] = 'Поддомейн';
-$wb['add_new_record_txt'] = 'Ðов поддомейн';
-?>
diff --git a/interface/web/sites/lib/lang/bg_web_vhost_aliasdomain.lng b/interface/web/sites/lib/lang/bg_web_vhost_aliasdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/bg_web_vhost_aliasdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/bg_web_vhost_aliasdomain_list.lng b/interface/web/sites/lib/lang/bg_web_vhost_aliasdomain_list.lng
deleted file mode 100644
index 8e60e143c29a1030a2767fa15c4d13b9b5957ccf..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/bg_web_vhost_aliasdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Aliasdomain';
-$wb['active_txt'] = 'Ðктивен';
-$wb['server_id_txt'] = 'Сървър';
-$wb['parent_domain_id_txt'] = 'Сайт';
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['add_new_record_txt'] = 'Ðов aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/bg_web_domain.lng b/interface/web/sites/lib/lang/bg_web_vhost_domain.lng
similarity index 95%
rename from interface/web/sites/lib/lang/bg_web_domain.lng
rename to interface/web/sites/lib/lang/bg_web_vhost_domain.lng
index dfc1dd07a36642b6247402e81c65a3f8f5ba111e..55f35df8a514015e177c630b87ecbcbbf8abe60d 100644
--- a/interface/web/sites/lib/lang/bg_web_domain.lng
+++ b/interface/web/sites/lib/lang/bg_web_vhost_domain.lng
@@ -120,4 +120,10 @@ $wb['rewrite_rules_txt'] = 'Rewrite Rules';
$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['host_txt'] = 'Hostname';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+
?>
diff --git a/interface/web/sites/lib/lang/bg_web_domain_admin_list.lng b/interface/web/sites/lib/lang/bg_web_vhost_domain_admin_list.lng
similarity index 100%
rename from interface/web/sites/lib/lang/bg_web_domain_admin_list.lng
rename to interface/web/sites/lib/lang/bg_web_vhost_domain_admin_list.lng
diff --git a/interface/web/sites/lib/lang/bg_web_domain_list.lng b/interface/web/sites/lib/lang/bg_web_vhost_domain_list.lng
similarity index 85%
rename from interface/web/sites/lib/lang/bg_web_domain_list.lng
rename to interface/web/sites/lib/lang/bg_web_vhost_domain_list.lng
index 57d63e5618f222dfa4ae9dc287f0c0c15ca400c1..a6a351b06ff287f4ab0617449fb9ca55fba3cefc 100644
--- a/interface/web/sites/lib/lang/bg_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/bg_web_vhost_domain_list.lng
@@ -5,4 +5,6 @@ $wb['active_txt'] = 'Ðктивен';
$wb['server_id_txt'] = 'Сървър';
$wb['domain_txt'] = 'Домейн';
$wb['add_new_record_txt'] = 'Ðов Ñайт';
+$wb['parent_domain_id_txt'] = 'Website';
+
?>
diff --git a/interface/web/sites/lib/lang/bg_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/bg_web_vhost_subdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/bg_web_vhost_subdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/bg_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/bg_web_vhost_subdomain_list.lng
deleted file mode 100644
index 1c16bcda288f146167a5a49221951769017f580b..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/bg_web_vhost_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Add new subdomain';
-?>
diff --git a/interface/web/sites/lib/lang/br_web_childdomain.lng b/interface/web/sites/lib/lang/br_web_childdomain.lng
new file mode 100644
index 0000000000000000000000000000000000000000..07a1f3fd689f8d5dfb32a0a624d68b4a01f7ea15
--- /dev/null
+++ b/interface/web/sites/lib/lang/br_web_childdomain.lng
@@ -0,0 +1,119 @@
+<?php
+$wb['ssl_state_txt'] = 'Estado';
+$wb['ssl_locality_txt'] = 'Localidade';
+$wb['ssl_organisation_txt'] = 'Empresa';
+$wb['ssl_organisation_unit_txt'] = 'Departamento';
+$wb['ssl_country_txt'] = 'PaÃs';
+$wb['ssl_request_txt'] = 'Requisição SSL';
+$wb['ssl_cert_txt'] = 'Certificado SSL';
+$wb['ssl_bundle_txt'] = 'Pacote SSL';
+$wb['ssl_action_txt'] = 'Ação SSL';
+$wb['server_id_txt'] = 'Servidor';
+$wb['domain_txt'] = 'DomÃnio';
+$wb['type_txt'] = 'Tipo';
+$wb['parent_domain_id_txt'] = 'Site Parente';
+$wb['redirect_type_txt'] = 'Tipo do Redirecionamento';
+$wb['redirect_path_txt'] = 'Caminho do Redirecionamento';
+$wb['active_txt'] = 'Ativo';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Usuário no Linux';
+$wb['system_group_txt'] = 'Grupo no Linux';
+$wb['ip_address_txt'] = 'Endereço-IP';
+$wb['vhost_type_txt'] = 'Tipo de VHost';
+$wb['hd_quota_txt'] = 'Cota de Disco';
+$wb['traffic_quota_txt'] = 'Cota de Tráfico';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Cliente';
+$wb['limit_web_domain_txt'] = 'O número máximo de domÃnios web para esta conta foi atingido.';
+$wb['limit_web_aliasdomain_txt'] = 'O número máximo de aliases para esta conta foi atingido.';
+$wb['limit_web_subdomain_txt'] = 'O número máximo de sub-domÃnios para esta conta foi atingido.';
+$wb['apache_directives_txt'] = 'Diretivas apache';
+$wb['domain_error_empty'] = 'DomÃnio em branco.';
+$wb['domain_error_unique'] = 'Já existe alias ou sub-domÃnio com este nome.';
+$wb['domain_error_regex'] = 'Nome de domÃnio inválido.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Caminho de redirecionamento inválido. Exemplo de caminho válido: /test/ ou http://www.dominio.ext/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -> www';
+$wb['www_to_non_www_txt'] = 'www -> non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
+$wb['Domain'] = 'Aliasdomain';
+
+?>
diff --git a/interface/web/sites/lib/lang/br_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/br_web_childdomain_list.lng
similarity index 73%
rename from interface/web/sites/lib/lang/br_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/br_web_childdomain_list.lng
index d75bddde385bd51f10461d5ebc7dc0666fe7f2df..b0e962ba7ae94ccc4a619138eb915ee161b72719 100644
--- a/interface/web/sites/lib/lang/br_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/br_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'DomÃnio Alias';
+$wb['list_head_txt'] = 'Sub-domÃnios';
$wb['active_txt'] = 'Ativo';
$wb['server_id_txt'] = 'Servidor';
$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'DomÃnio Alias';
-$wb['add_new_record_txt'] = 'Adcionar novo domÃnio alias';
+$wb['domain_txt'] = 'Sub-domÃnio';
+$wb['add_new_record_txt'] = 'Adcionar um novo sub-domÃnio';
$wb['domain_error_empty'] = 'DomÃnio em branco.';
$wb['domain_error_unique'] = 'O domÃnio deve ser único.';
$wb['domain_error_regex'] = 'Nome de domÃnio inválido.';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'Em Branco';
+
?>
diff --git a/interface/web/sites/lib/lang/br_web_subdomain.lng b/interface/web/sites/lib/lang/br_web_subdomain.lng
deleted file mode 100644
index 340735adfb45bfb853e56047b4da466992d74259..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/br_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Estado';
-$wb['ssl_locality_txt'] = 'Localidade';
-$wb['ssl_organisation_txt'] = 'Empresa';
-$wb['ssl_organisation_unit_txt'] = 'Departamento';
-$wb['ssl_country_txt'] = 'PaÃs';
-$wb['ssl_request_txt'] = 'Requisição SSL';
-$wb['ssl_cert_txt'] = 'Certificado SSL';
-$wb['ssl_bundle_txt'] = 'Pacote SSL';
-$wb['ssl_action_txt'] = 'Ação SSL';
-$wb['server_id_txt'] = 'Servidor';
-$wb['domain_txt'] = 'DomÃnio';
-$wb['type_txt'] = 'Tipo';
-$wb['parent_domain_id_txt'] = 'Site Parente';
-$wb['redirect_type_txt'] = 'Tipo do Redirecionamento';
-$wb['redirect_path_txt'] = 'Caminho do Redirecionamento';
-$wb['active_txt'] = 'Ativo';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Usuário no Linux';
-$wb['system_group_txt'] = 'Grupo no Linux';
-$wb['ip_address_txt'] = 'Endereço-IP';
-$wb['vhost_type_txt'] = 'Tipo de VHost';
-$wb['hd_quota_txt'] = 'Cota de Disco';
-$wb['traffic_quota_txt'] = 'Cota de Tráfico';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Cliente';
-$wb['limit_web_domain_txt'] = 'O número máximo de domÃnios web para esta conta foi atingido.';
-$wb['limit_web_aliasdomain_txt'] = 'O número máximo de aliases para esta conta foi atingido.';
-$wb['limit_web_subdomain_txt'] = 'O número máximo de sub-domÃnios para esta conta foi atingido.';
-$wb['apache_directives_txt'] = 'Diretivas apache';
-$wb['domain_error_empty'] = 'DomÃnio em branco.';
-$wb['domain_error_unique'] = 'Já existe alias ou sub-domÃnio com este nome.';
-$wb['domain_error_regex'] = 'Nome de domÃnio inválido.';
-$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Caminho de redirecionamento inválido. Exemplo de caminho válido: /test/ ou http://www.dominio.ext/test/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/br_web_subdomain_list.lng b/interface/web/sites/lib/lang/br_web_subdomain_list.lng
deleted file mode 100644
index 83511672af6d09da3b1301975658a18e758c943c..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/br_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Sub-domÃnios';
-$wb['active_txt'] = 'Ativo';
-$wb['server_id_txt'] = 'Servidor';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Sub-domÃnio';
-$wb['add_new_record_txt'] = 'Adcionar um novo sub-domÃnio';
-?>
diff --git a/interface/web/sites/lib/lang/br_web_vhost_aliasdomain.lng b/interface/web/sites/lib/lang/br_web_vhost_aliasdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/br_web_vhost_aliasdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/br_web_vhost_aliasdomain_list.lng b/interface/web/sites/lib/lang/br_web_vhost_aliasdomain_list.lng
deleted file mode 100644
index 78dbdd02282cefefe9fba8873a033ba32ac16322..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/br_web_vhost_aliasdomain_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-<?php
-$wb['list_head_txt'] = 'DomÃnio Alias';
-$wb['active_txt'] = 'Ativo';
-$wb['server_id_txt'] = 'Servidor';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'DomÃnio Alias';
-$wb['add_new_record_txt'] = 'Adcionar novo domÃnio alias';
-?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/br_web_domain.lng b/interface/web/sites/lib/lang/br_web_vhost_domain.lng
similarity index 95%
rename from interface/web/sites/lib/lang/br_web_domain.lng
rename to interface/web/sites/lib/lang/br_web_vhost_domain.lng
index 4feeb04191557d9c631cd8fd69d8691d610cad84..207224d86234cfd485474b6b1d4ef6696407ef9d 100644
--- a/interface/web/sites/lib/lang/br_web_domain.lng
+++ b/interface/web/sites/lib/lang/br_web_vhost_domain.lng
@@ -120,4 +120,10 @@ $wb['rewrite_rules_txt'] = 'Rewrite Rules';
$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['host_txt'] = 'Hostname';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+
?>
diff --git a/interface/web/sites/lib/lang/br_web_domain_admin_list.lng b/interface/web/sites/lib/lang/br_web_vhost_domain_admin_list.lng
similarity index 100%
rename from interface/web/sites/lib/lang/br_web_domain_admin_list.lng
rename to interface/web/sites/lib/lang/br_web_vhost_domain_admin_list.lng
diff --git a/interface/web/sites/lib/lang/br_web_domain_list.lng b/interface/web/sites/lib/lang/br_web_vhost_domain_list.lng
similarity index 84%
rename from interface/web/sites/lib/lang/br_web_domain_list.lng
rename to interface/web/sites/lib/lang/br_web_vhost_domain_list.lng
index dc520038755780f4d4d82f4630b478481f9ae3b7..b65a3caf8f6b15b768fef22e32876475b2cd6ff2 100644
--- a/interface/web/sites/lib/lang/br_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/br_web_vhost_domain_list.lng
@@ -5,4 +5,6 @@ $wb['active_txt'] = 'Ativo';
$wb['server_id_txt'] = 'Servidor';
$wb['domain_txt'] = 'DomÃnio';
$wb['add_new_record_txt'] = 'Adcionar um novo site';
+$wb['parent_domain_id_txt'] = 'Website';
+
?>
diff --git a/interface/web/sites/lib/lang/br_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/br_web_vhost_subdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/br_web_vhost_subdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/br_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/br_web_vhost_subdomain_list.lng
deleted file mode 100644
index 1c16bcda288f146167a5a49221951769017f580b..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/br_web_vhost_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Add new subdomain';
-?>
diff --git a/interface/web/sites/lib/lang/cz_web_aliasdomain.lng b/interface/web/sites/lib/lang/cz_web_childdomain.lng
similarity index 75%
rename from interface/web/sites/lib/lang/cz_web_aliasdomain.lng
rename to interface/web/sites/lib/lang/cz_web_childdomain.lng
index c82c428313f5e1f86157a5fcfcd89331b7d53e88..e91309f5dcf140af5668ffed72bdced5c8e3884a 100644
--- a/interface/web/sites/lib/lang/cz_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/cz_web_childdomain.lng
@@ -1,48 +1,56 @@
<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Interval zálohovánÃ';
-$wb['backup_copies_txt'] = 'PoÄet kopià zálohy';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['ssl_state_txt'] = 'Stát';
+$wb['ssl_locality_txt'] = 'Lokalita';
+$wb['ssl_organisation_txt'] = 'Organizace';
+$wb['ssl_organisation_unit_txt'] = 'OrganizaÄnà jednotka';
+$wb['ssl_country_txt'] = 'ZemÄ›';
+$wb['ssl_request_txt'] = 'SSL požadavek';
+$wb['ssl_cert_txt'] = 'SSL certifikát';
+$wb['ssl_bundle_txt'] = 'SSL bundle';
+$wb['ssl_action_txt'] = 'SSL akce';
$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['domain_txt'] = 'Doména';
+$wb['type_txt'] = 'Typ';
+$wb['parent_domain_id_txt'] = 'RodiÄovská web stránka';
$wb['redirect_type_txt'] = 'Typ pÅ™esmÄ›rovánÃ';
$wb['redirect_path_txt'] = 'Cesta pÅ™esmÄ›rovánÃ';
$wb['active_txt'] = 'AktivnÃ';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['document_root_txt'] = 'Kořenový adresář dokumentů';
+$wb['system_user_txt'] = 'Linuxový uživatel';
+$wb['system_group_txt'] = 'Linuxová skupina';
+$wb['ip_address_txt'] = 'IP adresa';
+$wb['vhost_type_txt'] = 'VHost typ';
+$wb['hd_quota_txt'] = 'Disková kvóta';
+$wb['traffic_quota_txt'] = 'Přenosová kvóta';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
+$wb['client_txt'] = 'Klient';
+$wb['limit_web_domain_txt'] = 'Dosažen maximálnà poÄet web domén pro Váš úÄet.';
+$wb['limit_web_aliasdomain_txt'] = 'Dosažen maximálnà poÄet alias domén pro Váš úÄet.';
+$wb['limit_web_subdomain_txt'] = 'Dosažen maximálnà poÄet subdomén pro Váš úÄet.';
+$wb['apache_directives_txt'] = 'Apache direktivy';
$wb['domain_error_empty'] = 'Doména je prázdná.';
-$wb['domain_error_unique'] = 'Webové stránky nebo sub-doména / alias-domény již existuje s tÃmto doménovým jménem.';
+$wb['domain_error_unique'] = 'Webová stránka nebo sub / alias doména s tÃmto doménovým jménem již existuje.';
$wb['domain_error_regex'] = 'Neplatné doménové jméno.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Neplatná cesta pÅ™esmÄ›rovánÃ. Platné pÅ™esmÄ›rovánà je napÅ™Ãklad: /test/ nebo http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'Žádné pÅ™esmÄ›rovánÃ';
+$wb['no_flag_txt'] = 'Žádný pÅ™Ãznak';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Interval zálohovánÃ';
+$wb['backup_copies_txt'] = 'PoÄet kopià zálohy';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
@@ -62,7 +70,6 @@ $wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid character
$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@ $wb['stats_type_txt'] = 'Webstatistics program';
$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
$wb['none_txt'] = 'None';
$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
$wb['save_certificate_txt'] = 'Save certificate';
$wb['create_certificate_txt'] = 'Create certificate';
$wb['delete_certificate_txt'] = 'Delete certificate';
@@ -109,8 +114,6 @@ $wb['password_match_txt'] = 'The passwords do match.';
$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
$wb['Domain'] = 'Aliasdomain';
-?>
+?>
diff --git a/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/cz_web_childdomain_list.lng
similarity index 76%
rename from interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/cz_web_childdomain_list.lng
index a3ae2a954d295921238cc6bc6d8b404b5d0e5190..323e565e771d84a2ca8aee67c5389a54115e1e43 100644
--- a/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_childdomain_list.lng
@@ -1,15 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Alias doména';
+$wb['list_head_txt'] = 'Subdomény';
$wb['active_txt'] = 'AktivnÃ';
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Webová stránka';
-$wb['domain_txt'] = 'Alias doména';
-$wb['add_new_record_txt'] = 'Přidat alias doménu';
+$wb['domain_txt'] = 'Subdoména';
+$wb['add_new_record_txt'] = 'Přidat subdoménu';
$wb['domain_error_empty'] = 'Doména je prázdná.';
$wb['domain_error_unique'] = 'Doména musà být unkátnÃ.';
$wb['domain_error_regex'] = 'Doménové jméno je chybné.';
$wb['no_redirect_txt'] = 'Žádné pÅ™esmÄ›rovánÃ';
$wb['no_flag_txt'] = 'Žádný pÅ™Ãznak';
$wb['none_txt'] = 'Žádná';
-?>
+?>
diff --git a/interface/web/sites/lib/lang/cz_web_subdomain.lng b/interface/web/sites/lib/lang/cz_web_subdomain.lng
deleted file mode 100644
index b40c927524b7c00aab7dc5836aa70e8875bdca7a..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/cz_web_subdomain.lng
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Stát';
-$wb['ssl_locality_txt'] = 'Lokalita';
-$wb['ssl_organisation_txt'] = 'Organizace';
-$wb['ssl_organisation_unit_txt'] = 'OrganizaÄnà jednotka';
-$wb['ssl_country_txt'] = 'ZemÄ›';
-$wb['ssl_request_txt'] = 'SSL požadavek';
-$wb['ssl_cert_txt'] = 'SSL certifikát';
-$wb['ssl_bundle_txt'] = 'SSL bundle';
-$wb['ssl_action_txt'] = 'SSL akce';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Doména';
-$wb['type_txt'] = 'Typ';
-$wb['parent_domain_id_txt'] = 'RodiÄovská web stránka';
-$wb['redirect_type_txt'] = 'Typ pÅ™esmÄ›rovánÃ';
-$wb['redirect_path_txt'] = 'Cesta pÅ™esmÄ›rovánÃ';
-$wb['active_txt'] = 'AktivnÃ';
-$wb['document_root_txt'] = 'Kořenový adresář dokumentů';
-$wb['system_user_txt'] = 'Linuxový uživatel';
-$wb['system_group_txt'] = 'Linuxová skupina';
-$wb['ip_address_txt'] = 'IP adresa';
-$wb['vhost_type_txt'] = 'VHost typ';
-$wb['hd_quota_txt'] = 'Disková kvóta';
-$wb['traffic_quota_txt'] = 'Přenosová kvóta';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Klient';
-$wb['limit_web_domain_txt'] = 'Dosažen maximálnà poÄet web domén pro Váš úÄet.';
-$wb['limit_web_aliasdomain_txt'] = 'Dosažen maximálnà poÄet alias domén pro Váš úÄet.';
-$wb['limit_web_subdomain_txt'] = 'Dosažen maximálnà poÄet subdomén pro Váš úÄet.';
-$wb['apache_directives_txt'] = 'Apache direktivy';
-$wb['domain_error_empty'] = 'Doména je prázdná.';
-$wb['domain_error_unique'] = 'Webová stránka nebo sub / alias doména s tÃmto doménovým jménem již existuje.';
-$wb['domain_error_regex'] = 'Neplatné doménové jméno.';
-$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Neplatná cesta pÅ™esmÄ›rovánÃ. Platné pÅ™esmÄ›rovánà je napÅ™Ãklad: /test/ nebo http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'Žádné pÅ™esmÄ›rovánÃ';
-$wb['no_flag_txt'] = 'Žádný pÅ™Ãznak';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
-
diff --git a/interface/web/sites/lib/lang/cz_web_subdomain_list.lng b/interface/web/sites/lib/lang/cz_web_subdomain_list.lng
deleted file mode 100644
index d1ad2834fecfd5e993c63aff525e1894baa82159..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/cz_web_subdomain_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomény';
-$wb['active_txt'] = 'AktivnÃ';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Webová stránka';
-$wb['domain_txt'] = 'Subdoména';
-$wb['add_new_record_txt'] = 'Přidat subdoménu';
-?>
-
diff --git a/interface/web/sites/lib/lang/cz_web_vhost_aliasdomain.lng b/interface/web/sites/lib/lang/cz_web_vhost_aliasdomain.lng
deleted file mode 100644
index ab47f26dc4238e5de6ed7ab52b0f1997319f3a26..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/cz_web_vhost_aliasdomain.lng
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Interval zálohovánÃ';
-$wb['backup_copies_txt'] = 'PoÄet záložnÃch kopiÃ';
-$wb['ssl_state_txt'] = 'Stát';
-$wb['ssl_locality_txt'] = 'Lokalita';
-$wb['ssl_organisation_txt'] = 'Organizace';
-$wb['ssl_organisation_unit_txt'] = 'OrganizaÄnà jednotka';
-$wb['ssl_country_txt'] = 'ZemÄ›';
-$wb['ssl_key_txt'] = 'SSL klÃÄ';
-$wb['ssl_request_txt'] = 'SSL požadavek';
-$wb['ssl_cert_txt'] = 'SSL certifikát';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL akce';
-$wb['ssl_domain_txt'] = 'SSL Doména';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Doména';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Verze';
-$wb['redirect_type_txt'] = 'Typ pÅ™esmÄ›rovánÃ';
-$wb['redirect_path_txt'] = 'Cesta pÅ™esmÄ›rovánÃ';
-$wb['active_txt'] = 'AktivnÃ';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Klient';
-$wb['limit_web_domain_txt'] = 'The max. PoÄet webových stránek for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Doména je prázdná.';
-$wb['domain_error_unique'] = 'Webové stránky nebo sub-doména / alias-domény již existuje s tÃmto doménovým jménem.';
-$wb['domain_error_regex'] = 'Neplatné doménové jméno.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Klient';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffik kvóta pÅ™ekroÄena';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Uložit certifikát';
-$wb['create_certificate_txt'] = 'Vytvořit certifikát';
-$wb['delete_certificate_txt'] = 'Smazat certifikát';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO pÅ™esmÄ›rovánÃ';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Kvóta pevného disku je neplatná.';
-$wb['traffic_quota_error_regex'] = 'Traffik kvóta je neplatná.';
-$wb['fastcgi_php_version_txt'] = 'PHP verze';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generovat heslo';
-$wb['repeat_password_txt'] = 'Opakujte heslo';
-$wb['password_mismatch_txt'] = 'Hesla se neshodujÃ.';
-$wb['password_match_txt'] = 'Hesla se shodujÃ.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
-
diff --git a/interface/web/sites/lib/lang/cz_web_vhost_aliasdomain_list.lng b/interface/web/sites/lib/lang/cz_web_vhost_aliasdomain_list.lng
deleted file mode 100644
index 08a25f2acedb39c4b825e836403ac311e1a824df..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/cz_web_vhost_aliasdomain_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Alias doména';
-$wb['active_txt'] = 'AktivnÃ';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Webová stránka';
-$wb['domain_txt'] = 'Alias doména';
-$wb['add_new_record_txt'] = 'Přidat alias doménu';
-?>
-
diff --git a/interface/web/sites/lib/lang/cz_web_domain.lng b/interface/web/sites/lib/lang/cz_web_vhost_domain.lng
similarity index 95%
rename from interface/web/sites/lib/lang/cz_web_domain.lng
rename to interface/web/sites/lib/lang/cz_web_vhost_domain.lng
index ab82df12ed9e5a6440668e1c2081537de79b161d..bab3b9e3750a22e10a146995436ccd420c3f40dd 100644
--- a/interface/web/sites/lib/lang/cz_web_domain.lng
+++ b/interface/web/sites/lib/lang/cz_web_vhost_domain.lng
@@ -120,5 +120,10 @@ $wb['rewrite_rules_txt'] = 'Rewrite Rules';
$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
-?>
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['host_txt'] = 'Hostname';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+?>
diff --git a/interface/web/sites/lib/lang/cz_web_domain_admin_list.lng b/interface/web/sites/lib/lang/cz_web_vhost_domain_admin_list.lng
similarity index 100%
rename from interface/web/sites/lib/lang/cz_web_domain_admin_list.lng
rename to interface/web/sites/lib/lang/cz_web_vhost_domain_admin_list.lng
diff --git a/interface/web/sites/lib/lang/cz_web_domain_list.lng b/interface/web/sites/lib/lang/cz_web_vhost_domain_list.lng
similarity index 82%
rename from interface/web/sites/lib/lang/cz_web_domain_list.lng
rename to interface/web/sites/lib/lang/cz_web_vhost_domain_list.lng
index 78296799a13356effaa5661c3316070858a7264f..1c3a0c952c47750cf0bed310b0118964d386d7d6 100644
--- a/interface/web/sites/lib/lang/cz_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_vhost_domain_list.lng
@@ -5,5 +5,6 @@ $wb['active_txt'] = 'AktivnÃ';
$wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Doména';
$wb['add_new_record_txt'] = 'Přidat webovou stránku';
-?>
+$wb['parent_domain_id_txt'] = 'Webové stránky';
+?>
diff --git a/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
deleted file mode 100644
index ab47f26dc4238e5de6ed7ab52b0f1997319f3a26..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Interval zálohovánÃ';
-$wb['backup_copies_txt'] = 'PoÄet záložnÃch kopiÃ';
-$wb['ssl_state_txt'] = 'Stát';
-$wb['ssl_locality_txt'] = 'Lokalita';
-$wb['ssl_organisation_txt'] = 'Organizace';
-$wb['ssl_organisation_unit_txt'] = 'OrganizaÄnà jednotka';
-$wb['ssl_country_txt'] = 'ZemÄ›';
-$wb['ssl_key_txt'] = 'SSL klÃÄ';
-$wb['ssl_request_txt'] = 'SSL požadavek';
-$wb['ssl_cert_txt'] = 'SSL certifikát';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL akce';
-$wb['ssl_domain_txt'] = 'SSL Doména';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Doména';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Verze';
-$wb['redirect_type_txt'] = 'Typ pÅ™esmÄ›rovánÃ';
-$wb['redirect_path_txt'] = 'Cesta pÅ™esmÄ›rovánÃ';
-$wb['active_txt'] = 'AktivnÃ';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Klient';
-$wb['limit_web_domain_txt'] = 'The max. PoÄet webových stránek for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Doména je prázdná.';
-$wb['domain_error_unique'] = 'Webové stránky nebo sub-doména / alias-domény již existuje s tÃmto doménovým jménem.';
-$wb['domain_error_regex'] = 'Neplatné doménové jméno.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Klient';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffik kvóta pÅ™ekroÄena';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Uložit certifikát';
-$wb['create_certificate_txt'] = 'Vytvořit certifikát';
-$wb['delete_certificate_txt'] = 'Smazat certifikát';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO pÅ™esmÄ›rovánÃ';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Kvóta pevného disku je neplatná.';
-$wb['traffic_quota_error_regex'] = 'Traffik kvóta je neplatná.';
-$wb['fastcgi_php_version_txt'] = 'PHP verze';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generovat heslo';
-$wb['repeat_password_txt'] = 'Opakujte heslo';
-$wb['password_mismatch_txt'] = 'Hesla se neshodujÃ.';
-$wb['password_match_txt'] = 'Hesla se shodujÃ.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
-
diff --git a/interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
deleted file mode 100644
index e15402b067a20571a9fc163333cd91f91ae01785..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomény';
-$wb['active_txt'] = 'AktivnÃ';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Webové stránky';
-$wb['domain_txt'] = 'Subdoména';
-$wb['add_new_record_txt'] = 'Přidat novou poddoménu';
-?>
-
diff --git a/interface/web/sites/lib/lang/de_web_aliasdomain.lng b/interface/web/sites/lib/lang/de_web_childdomain.lng
similarity index 84%
rename from interface/web/sites/lib/lang/de_web_aliasdomain.lng
rename to interface/web/sites/lib/lang/de_web_childdomain.lng
index 5889b17d5745a6082ee2ea40693551600c938941..435beae5a3e65e385fe608e7ea2e648101092ce4 100644
--- a/interface/web/sites/lib/lang/de_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/de_web_childdomain.lng
@@ -1,48 +1,56 @@
<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup-Intervall';
-$wb['backup_copies_txt'] = 'Anzahl der Backups';
$wb['ssl_state_txt'] = 'Bundesland';
$wb['ssl_locality_txt'] = 'Ort';
$wb['ssl_organisation_txt'] = 'Firma';
$wb['ssl_organisation_unit_txt'] = 'Abteilung';
$wb['ssl_country_txt'] = 'Land';
-$wb['ssl_key_txt'] = 'SSL-Schlüssel';
-$wb['ssl_request_txt'] = 'SSL-Anfrage';
-$wb['ssl_cert_txt'] = 'SSL-Zertifikat';
-$wb['ssl_bundle_txt'] = 'SSL-Bundle';
-$wb['ssl_action_txt'] = 'SSL-Aktion';
-$wb['ssl_domain_txt'] = 'SSL-Domain';
+$wb['ssl_request_txt'] = 'SSL Anfrage';
+$wb['ssl_cert_txt'] = 'SSL Zertifikat';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Aktion';
$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Ungültige Ordnerangabe. Bitte geben Sie keinen Schrägstrich ein.';
+$wb['domain_txt'] = 'Domain';
$wb['type_txt'] = 'Typ';
-$wb['parent_domain_id_txt'] = 'Hauptwebseite';
+$wb['parent_domain_id_txt'] = 'Zugehörige Webseite';
$wb['redirect_type_txt'] = 'Weiterleitungstyp';
$wb['redirect_path_txt'] = 'Weiterleitungsziel';
$wb['active_txt'] = 'Aktiv';
$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'System-Benutzer';
-$wb['system_group_txt'] = 'System-Gruppe';
-$wb['ip_address_txt'] = 'IPv4-Adresse';
-$wb['ipv6_address_txt'] = 'IPv6-Adresse';
+$wb['system_user_txt'] = 'Linux-Benutzer';
+$wb['system_group_txt'] = 'Linux-Gruppe';
+$wb['ip_address_txt'] = 'IP-Adresse';
$wb['vhost_type_txt'] = 'vHost-Typ';
-$wb['hd_quota_txt'] = 'Speicherplatz-Beschränkung';
-$wb['traffic_quota_txt'] = 'Datentransfer-Beschränkung';
+$wb['hd_quota_txt'] = 'Festplatten-Quota';
+$wb['traffic_quota_txt'] = 'Traffic-Quota';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Eigene Fehlerseiten';
-$wb['subdomain_txt'] = 'Automatische Subdomain';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
$wb['client_txt'] = 'Kunde';
-$wb['limit_web_domain_txt'] = 'Die max. Anzahl an Webdomains für Ihr Konto ist erreicht.';
-$wb['limit_web_aliasdomain_txt'] = 'Die max. Anzahl an Aliasdomains für Ihr Konto ist erreicht.';
-$wb['limit_web_subdomain_txt'] = 'Die max. Anzahl an Web Subdomains für Ihr Konto ist erreicht.';
+$wb['limit_web_domain_txt'] = 'Die max. Anzahl an Webdomains für Ihr Konto wurde erreicht.';
+$wb['limit_web_aliasdomain_txt'] = 'Die max. Anzahl an Aliasdomains für Ihr Konto wurde erreicht.';
+$wb['limit_web_subdomain_txt'] = 'Die max. Anzahl an Web-Subdomains für Ihr Konto wurde erreicht.';
$wb['apache_directives_txt'] = 'Apache-Direktiven';
$wb['domain_error_empty'] = 'Domain ist leer.';
-$wb['domain_error_unique'] = 'Es existiert bereits eine Webseite oder Sub- Aliasdomain mit diesem Domain-Namen.';
-$wb['domain_error_regex'] = 'Domain-Name ungültig.';
+$wb['domain_error_unique'] = 'Domain muss eindeutig sein.';
+$wb['domain_error_regex'] = 'Domain-Name ist ungültig.';
+$wb['domain_error_wildcard'] = 'Wildcard Subdomains sind nicht erlaubt.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Ungültiger Redirect-Pfad. Gültige Pfade sind beispielsweise: /test/ oder http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'Kein Redirect';
+$wb['no_flag_txt'] = 'Kein Flag';
+$wb['proxy_directives_txt'] = 'Proxy-Direktiven';
+$wb['available_proxy_directive_snippets_txt'] = 'Verfügbare Proxy Direktiven Schnipsel:';
+$wb['error_proxy_requires_url'] = 'Weiterleitungstyp \"proxy\" erfordert eine URL als Weiterleitungspfad.';
+$wb['backup_interval_txt'] = 'Backup-Intervall';
+$wb['backup_copies_txt'] = 'Anzahl der Backups';
+$wb['ssl_key_txt'] = 'SSL-Schlüssel';
+$wb['ssl_domain_txt'] = 'SSL-Domain';
+$wb['web_folder_error_regex'] = 'Ungültige Ordnerangabe. Bitte geben Sie keinen Schrägstrich ein.';
+$wb['ipv6_address_txt'] = 'IPv6-Adresse';
+$wb['errordocs_txt'] = 'Eigene Fehlerseiten';
+$wb['subdomain_txt'] = 'Automatische Subdomain';
$wb['domain_error_autosub'] = 'Es existiert bereits eine Subdomain mit diesen Einstellungen.';
$wb['hd_quota_error_empty'] = 'Speicherplatz-Beschränkung ist 0 oder leer.';
$wb['traffic_quota_error_empty'] = 'Datentransfer-Beschränkung ist leer.';
@@ -62,7 +70,6 @@ $wb['ssl_organisation_error_regex'] = 'Ungültige SSL-Firma. Mögliche Zeichen s
$wb['ssl_organistaion_unit_error_regex'] = 'Ungültige SSL-Abteilung. Mögliche Zeichen sind: a-z, 0-9 and .,-_';
$wb['ssl_country_error_regex'] = 'Ungültiges SSL-Land. Mögliche Zeichen sind: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Max. verfügbarer Datentransfer';
-$wb['redirect_error_regex'] = 'Ungültiges Weiterleitungsziel. Gültige Weiterleitungsziele sind zum Beispiel: /test/ oder http://www.domain.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Datentransfervolumen überschritten';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@ $wb['stats_type_txt'] = 'Webstatistiken-Programm';
$wb['custom_php_ini_txt'] = 'Benutzerdefinierte php.ini-Einstellungen';
$wb['none_txt'] = 'Keine';
$wb['disabled_txt'] = 'Deaktiviert';
-$wb['no_redirect_txt'] = 'Keine Weiterleitung';
-$wb['no_flag_txt'] = 'Kein Flag';
$wb['save_certificate_txt'] = 'Zertifikat speichern';
$wb['create_certificate_txt'] = 'Zertifikat erstellen';
$wb['delete_certificate_txt'] = 'Zertifikat löschen';
@@ -109,7 +114,6 @@ $wb['password_match_txt'] = 'Die Passwörter stimmer überein.';
$wb['available_php_directive_snippets_txt'] = 'Verfügbare PHP-Direktiven-Schnipsel:';
$wb['available_apache_directive_snippets_txt'] = 'Verfügbare Apache-Direktiven-Schnipsel:';
$wb['available_nginx_directive_snippets_txt'] = 'Verfügbare nginx-Direktiven-Schnipsel:';
-$wb['proxy_directives_txt'] = 'Proxy-Direktiven';
-$wb['available_proxy_directive_snippets_txt'] = 'Verfügbare Proxy-Direktiven-Schnipsel:';
$wb['Domain'] = 'Aliasdomain';
+
?>
diff --git a/interface/web/sites/lib/lang/de_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/de_web_childdomain_list.lng
similarity index 66%
rename from interface/web/sites/lib/lang/de_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/de_web_childdomain_list.lng
index 2f47883c1ca13fd8a094d2fc0cee98e2c78f2b98..836bf8f2214d3d220ca4166fbf5c13b0c7c921ed 100644
--- a/interface/web/sites/lib/lang/de_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/de_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Aliasdomain';
+$wb['list_head_txt'] = 'Subdomains';
$wb['active_txt'] = 'Aktiv';
$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Domain';
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['add_new_record_txt'] = 'Neue Aliasdomain hinzufügen';
+$wb['parent_domain_id_txt'] = 'Webseite';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Neue Subdomain hinzufügen';
$wb['domain_error_empty'] = 'Domain ist leer.';
$wb['domain_error_unique'] = 'Domain muss eindeutig sein.';
$wb['domain_error_regex'] = 'Domain Name ist ungültig.';
$wb['no_redirect_txt'] = 'Keine Weiterleitung';
$wb['no_flag_txt'] = 'Keine Optionen';
$wb['none_txt'] = 'Keine';
+
?>
diff --git a/interface/web/sites/lib/lang/de_web_subdomain.lng b/interface/web/sites/lib/lang/de_web_subdomain.lng
deleted file mode 100644
index 5c23f08a4dd903f2fc82c0af408e3f045d15e229..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/de_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Bundesland';
-$wb['ssl_locality_txt'] = 'Ort';
-$wb['ssl_organisation_txt'] = 'Firma';
-$wb['ssl_organisation_unit_txt'] = 'Abteilung';
-$wb['ssl_country_txt'] = 'Land';
-$wb['ssl_request_txt'] = 'SSL Anfrage';
-$wb['ssl_cert_txt'] = 'SSL Zertifikat';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Aktion';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['type_txt'] = 'Typ';
-$wb['parent_domain_id_txt'] = 'Zugehörige Webseite';
-$wb['redirect_type_txt'] = 'Weiterleitungstyp';
-$wb['redirect_path_txt'] = 'Weiterleitungsziel';
-$wb['active_txt'] = 'Aktiv';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux-Benutzer';
-$wb['system_group_txt'] = 'Linux-Gruppe';
-$wb['ip_address_txt'] = 'IP-Adresse';
-$wb['vhost_type_txt'] = 'vHost-Typ';
-$wb['hd_quota_txt'] = 'Festplatten-Quota';
-$wb['traffic_quota_txt'] = 'Traffic-Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Kunde';
-$wb['limit_web_domain_txt'] = 'Die max. Anzahl an Webdomains für Ihr Konto wurde erreicht.';
-$wb['limit_web_aliasdomain_txt'] = 'Die max. Anzahl an Aliasdomains für Ihr Konto wurde erreicht.';
-$wb['limit_web_subdomain_txt'] = 'Die max. Anzahl an Web-Subdomains für Ihr Konto wurde erreicht.';
-$wb['apache_directives_txt'] = 'Apache-Direktiven';
-$wb['domain_error_empty'] = 'Domain ist leer.';
-$wb['domain_error_unique'] = 'Domain muss eindeutig sein.';
-$wb['domain_error_regex'] = 'Domain-Name ist ungültig.';
-$wb['domain_error_wildcard'] = 'Wildcard Subdomains sind nicht erlaubt.';
-$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Ungültiger Redirect-Pfad. Gültige Pfade sind beispielsweise: /test/ oder http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'Kein Redirect';
-$wb['no_flag_txt'] = 'Kein Flag';
-$wb['proxy_directives_txt'] = 'Proxy-Direktiven';
-$wb['available_proxy_directive_snippets_txt'] = 'Verfügbare Proxy Direktiven Schnipsel:';
-$wb['error_proxy_requires_url'] = 'Weiterleitungstyp \\"proxy\\" erfordert eine URL als Weiterleitungspfad.';
-?>
diff --git a/interface/web/sites/lib/lang/de_web_subdomain_list.lng b/interface/web/sites/lib/lang/de_web_subdomain_list.lng
deleted file mode 100644
index 042b9f02c5b2b4a665d69472e9192f707b20ef00..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/de_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'Aktiv';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Webseite';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Neue Subdomain hinzufügen';
-?>
diff --git a/interface/web/sites/lib/lang/de_web_vhost_aliasdomain.lng b/interface/web/sites/lib/lang/de_web_vhost_aliasdomain.lng
deleted file mode 100644
index d234b401cdc949091be72631ea7e7880ca169c7e..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/de_web_vhost_aliasdomain.lng
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['web_folder_txt'] = 'Basisordner';
-$wb['web_folder_invalid_txt'] = 'Dieser Ordner darf nicht als Basisordner verwendet werden.';
-$wb['web_folder_unique_txt'] = 'Dieser Ordner wird bereits verwendet, bitte geben Sie einen anderen Basisordner an.';
-$wb['ssl_state_txt'] = 'Bundesland';
-$wb['ssl_locality_txt'] = 'Ort';
-$wb['ssl_organisation_txt'] = 'Firma';
-$wb['ssl_organisation_unit_txt'] = 'Abteilung';
-$wb['ssl_country_txt'] = 'Land';
-$wb['ssl_key_txt'] = 'SSL-Key';
-$wb['ssl_request_txt'] = 'SSL-Request';
-$wb['ssl_cert_txt'] = 'SSL-Zertifikat';
-$wb['ssl_bundle_txt'] = 'SSL-Bundle';
-$wb['ssl_action_txt'] = 'SSL-Aktion';
-$wb['server_id_txt'] = 'Server';
-$wb['type_txt'] = 'Typ';
-$wb['parent_domain_id_txt'] = 'Hauptwebseite';
-$wb['web_folder_error_regex'] = 'Ungültige Ordnerangabe, bitte keinen / eingeben.';
-$wb['redirect_type_txt'] = 'Redirect-Typ';
-$wb['redirect_path_txt'] = 'Redirect-Pfad';
-$wb['active_txt'] = 'Aktiv';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux-Benutzer';
-$wb['system_group_txt'] = 'Linux-Gruppe';
-$wb['ip_address_txt'] = 'IP Adresse';
-$wb['vhost_type_txt'] = 'vHost-Typ';
-$wb['hd_quota_txt'] = 'Festplatten-Quota';
-$wb['traffic_quota_txt'] = 'Traffic-Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Kunde';
-$wb['limit_web_domain_txt'] = 'Die max. Anzahl an Webdomains für Ihr Konto wurde erreicht.';
-$wb['limit_web_aliasdomain_txt'] = 'Die max. Anzahl an Aliasdomains für Ihr Konto wurde erreicht.';
-$wb['limit_web_subdomain_txt'] = 'Die max. Anzahl an Subdomains für Ihr Konto wurde erreicht.';
-$wb['apache_directives_txt'] = 'Apache-Direktiven';
-$wb['domain_error_empty'] = 'Domain ist leer.';
-$wb['domain_error_unique'] = 'Domain muss eindeutig sein';
-$wb['domain_error_regex'] = 'Domain-Name ungültig.';
-$wb['domain_error_wildcard'] = 'Wildcard-Subdomains sind nicht erlaubt.';
-$wb['hd_quota_error_empty'] = 'Harddisk-Quota ist leer.';
-$wb['traffic_quota_error_empty'] = 'Traffic-Quota ist leer.';
-$wb['errordocs_txt'] = 'Eigene Fehlerseiten';
-$wb['error_ssl_state_empty'] = 'Bundesland (SSL) ist leer.';
-$wb['error_ssl_locality_empty'] = 'Ort (SSL) ist leer.';
-$wb['error_ssl_organisation_empty'] = 'Organisation (SSL) ist leer.';
-$wb['error_ssl_organisation_unit_empty'] = 'Abteilung (SSL) ist leer.';
-$wb['error_ssl_country_empty'] = 'Land (SSL) ist leer.';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['client_group_id_txt'] = 'Kunde';
-$wb['stats_password_txt'] = 'Webstatistik-Passwort';
-$wb['ssl_domain_txt'] = 'SSL-Domain';
-$wb['allow_override_txt'] = 'Allow Override';
-$wb['limit_web_quota_free_txt'] = 'Max. mögliches Festplatten-Quota';
-$wb['ssl_state_error_regex'] = 'Ungültiges SSL-Bundesland. Gültige Zeichen sind: a-z, 0-9 und .,-_';
-$wb['ssl_locality_error_regex'] = 'Ungültiger SSL-Ort. Gülige Zeichen sind: a-z, 0-9 und .,-_';
-$wb['ssl_organisation_error_regex'] = 'Ungültige SSL-Firma. Gültige Zeichen sind: a-z, 0-9 und .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Ungültige SSL-Abteilung. Gültige Zeichen sind: a-z, 0-9 und .,-_';
-$wb['ssl_country_error_regex'] = 'Ungültiges SSL-Land. Gültige Zeichen sind: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. mögliches Traffic-Quota';
-$wb['redirect_error_regex'] = 'Ungültiger Redirect-Pfad. Gültige Angaben sind beispielsweise: /test/ oder http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['backup_interval_txt'] = 'Backup-Intervall';
-$wb['backup_copies_txt'] = 'Anzahl an Backups';
-$wb['traffic_quota_exceeded_txt'] = 'Max. Datentransfer verbraucht.';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistik-Benutzername';
-$wb['stats_type_txt'] = 'Webstatistik-Programm';
-$wb['custom_php_ini_txt'] = 'Individuelle php.ini-Einstellungen';
-$wb['error_ssl_cert_empty'] = 'SSL-Zertifikat-Feld ist leer.';
-$wb['none_txt'] = 'Keine';
-$wb['disabled_txt'] = 'Deaktiviert';
-$wb['no_redirect_txt'] = 'Kein Redirect';
-$wb['no_flag_txt'] = 'Kein Flag';
-$wb['save_certificate_txt'] = 'Zertifikat speichern';
-$wb['create_certificate_txt'] = 'Zertifikat erstellen';
-$wb['delete_certificate_txt'] = 'Zertifikat löschen';
-$wb['nginx_directives_txt'] = 'nginx-Direktiven';
-$wb['seo_redirect_txt'] = 'SEO-Redirect';
-$wb['non_www_to_www_txt'] = 'Nicht-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> Nicht-www';
-$wb['php_fpm_use_socket_txt'] = 'Benutze Socket für PHP-FPM';
-$wb['ipv6_address_txt'] = 'IPv6-Adresse';
-$wb['error_no_sni_txt'] = 'SNI für SSL ist auf diesem Server nicht aktiviert. Sie können daher nur ein SSL-Zertifikat pro IP-Adresse eintragen.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Die Werte der PHP-FPM pm Einstellungen müssen wie folgt sein: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children muß eine positive ganze Zahl sein.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers muß eine positive ganze Zahl sein.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers muß eine positive ganze Zahl sein.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers muß eine positive ganze Zahl sein.';
-$wb['hd_quota_error_regex'] = 'Harddisk-Quota ist ungültig.';
-$wb['traffic_quota_error_regex'] = 'Traffic-Quota ist ungültig.';
-$wb['fastcgi_php_version_txt'] = 'PHP-Version';
-$wb['pm_txt'] = 'PHP-FPM Prozess Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout muß eine positive ganze Zahl sein.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests muß eine ganze Zahl >= 0 sein.';
-$wb['pm_ondemand_hint_txt'] = 'Bitte beachten Sie, daß Ihre PHP Version >= 5.3.9 sein muß, wenn Sie den ondemand Prozess Manager nutzen möchten. Wenn Sie ondemand für eine ältere PHP-Version auswählen, wird PHP nicht mehr starten!';
-$wb['generate_password_txt'] = 'Passwort erzeugen';
-$wb['repeat_password_txt'] = 'Passwort wiederholen';
-$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
-$wb['password_match_txt'] = 'Die Passwörter stimmen überein.';
-$wb['available_php_directive_snippets_txt'] = 'Verfügbare PHP-Direktiven-Schnipsel:';
-$wb['available_apache_directive_snippets_txt'] = 'Verfügbare Apache-Direktiven-Schnipsel:';
-$wb['available_nginx_directive_snippets_txt'] = 'Verfügbare nginx-Direktiven-Schnipsel:';
-$wb['proxy_directives_txt'] = 'Proxy-Direktiven';
-$wb['available_proxy_directive_snippets_txt'] = 'Verfügbare Proxy-Direktiven-Schnipsel:';
-$wb['rewrite_rules_txt'] = 'Rewrite Rules';
-$wb['invalid_rewrite_rules_txt'] = 'Unzulässige Rewrite Rules';
-$wb['allowed_rewrite_rule_directives_txt'] = 'Erlaubte Direktiven:';
-$wb['configuration_error_txt'] = 'KONFIGURATIONSFEHLER';
-$wb['variables_txt'] = 'Variablen';
-$wb['backup_excludes_txt'] = 'Auszuschließende Verzeichnisse';
-$wb['backup_excludes_note_txt'] = '(Mehrere Verzeichnisse mit Kommas trennen. Beispiel: web/cache/*,web/backup)';
-$wb['backup_excludes_error_regex'] = 'Die auszuschließenden Verzeichnisse enthalten ungültige Zeichen.';
-?>
diff --git a/interface/web/sites/lib/lang/de_web_vhost_aliasdomain_list.lng b/interface/web/sites/lib/lang/de_web_vhost_aliasdomain_list.lng
deleted file mode 100644
index a5b5b3734f3b8248b83b052d2a48f556e5ab0447..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/de_web_vhost_aliasdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Aliasdomains';
-$wb['active_txt'] = 'Aktiv';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Domain';
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['add_new_record_txt'] = 'Neue Aliasdomain hinzufügen';
-?>
diff --git a/interface/web/sites/lib/lang/de_web_domain.lng b/interface/web/sites/lib/lang/de_web_vhost_domain.lng
similarity index 95%
rename from interface/web/sites/lib/lang/de_web_domain.lng
rename to interface/web/sites/lib/lang/de_web_vhost_domain.lng
index 069b1857b84b0e8c9319ca7d0cd08ac9b6b84a35..27f790f81b736dd463345309efd14f83d7cb9a76 100644
--- a/interface/web/sites/lib/lang/de_web_domain.lng
+++ b/interface/web/sites/lib/lang/de_web_vhost_domain.lng
@@ -126,4 +126,10 @@ $wb['added_date_txt'] = 'Hinzugefügt am';
$wb['backup_excludes_txt'] = 'Auszuschließende Verzeichnisse';
$wb['backup_excludes_note_txt'] = '(Mehrere Verzeichnisse mit Kommas trennen. Beispiel: web/cache/*,web/backup)';
$wb['backup_excludes_error_regex'] = 'Die auszuschließenden Verzeichnisse enthalten ungültige Zeichen.';
+$wb['web_folder_txt'] = 'Basisordner';
+$wb['web_folder_invalid_txt'] = 'Dieser Ordner darf nicht als Basisordner verwendet werden.';
+$wb['web_folder_unique_txt'] = 'Dieser Ordner wird bereits verwendet, bitte geben Sie einen anderen Basisordner an.';
+$wb['host_txt'] = 'Host';
+$wb['domain_error_wildcard'] = 'Wildcard-Subdomains sind nicht erlaubt.';
+
?>
diff --git a/interface/web/sites/lib/lang/de_web_domain_admin_list.lng b/interface/web/sites/lib/lang/de_web_vhost_domain_admin_list.lng
similarity index 100%
rename from interface/web/sites/lib/lang/de_web_domain_admin_list.lng
rename to interface/web/sites/lib/lang/de_web_vhost_domain_admin_list.lng
diff --git a/interface/web/sites/lib/lang/de_web_domain_list.lng b/interface/web/sites/lib/lang/de_web_vhost_domain_list.lng
similarity index 84%
rename from interface/web/sites/lib/lang/de_web_domain_list.lng
rename to interface/web/sites/lib/lang/de_web_vhost_domain_list.lng
index ce56a1cd1f132a26673dd1240064c03247d97747..4e3d99f8db72a8c9ed2b0971527682f3383cfd57 100644
--- a/interface/web/sites/lib/lang/de_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/de_web_vhost_domain_list.lng
@@ -5,4 +5,6 @@ $wb['active_txt'] = 'Aktiv';
$wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Domain';
$wb['add_new_record_txt'] = 'Neue Domain hinzufügen';
+$wb['parent_domain_id_txt'] = 'Webseite';
+
?>
diff --git a/interface/web/sites/lib/lang/de_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/de_web_vhost_subdomain.lng
deleted file mode 100644
index e43803fd25a8ee80d093dc0642340a410fe72dd9..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/de_web_vhost_subdomain.lng
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Zugehörige Webseite';
-$wb['web_folder_txt'] = 'Basisordner';
-$wb['web_folder_invalid_txt'] = 'Dieser Ordner darf nicht als Basisordner verwendet werden.';
-$wb['web_folder_unique_txt'] = 'Dieser Ordner wird bereits verwendet, bitte geben Sie einen anderen Basisordner an.';
-$wb['ssl_state_txt'] = 'Bundesland';
-$wb['ssl_locality_txt'] = 'Ort';
-$wb['ssl_organisation_txt'] = 'Firma';
-$wb['ssl_organisation_unit_txt'] = 'Abteilung';
-$wb['ssl_country_txt'] = 'Land';
-$wb['ssl_key_txt'] = 'SSL-Key';
-$wb['ssl_request_txt'] = 'SSL-Request';
-$wb['ssl_cert_txt'] = 'SSL-Zertifikat';
-$wb['ssl_bundle_txt'] = 'SSL-Bundle';
-$wb['ssl_action_txt'] = 'SSL-Aktion';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Host';
-$wb['type_txt'] = 'Typ';
-$wb['web_folder_error_regex'] = 'Ungültige Ordnerangabe, bitte keinen / eingeben.';
-$wb['redirect_type_txt'] = 'Redirect-Typ';
-$wb['redirect_path_txt'] = 'Redirect-Pfad';
-$wb['active_txt'] = 'Aktiv';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux-Benutzer';
-$wb['system_group_txt'] = 'Linux-Gruppe';
-$wb['ip_address_txt'] = 'IP Adresse';
-$wb['vhost_type_txt'] = 'vHost-Typ';
-$wb['hd_quota_txt'] = 'Festplatten-Quota';
-$wb['traffic_quota_txt'] = 'Traffic-Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Kunde';
-$wb['limit_web_domain_txt'] = 'Die max. Anzahl an Webdomains für Ihr Konto wurde erreicht.';
-$wb['limit_web_aliasdomain_txt'] = 'Die max. Anzahl an Aliasdomains für Ihr Konto wurde erreicht.';
-$wb['limit_web_subdomain_txt'] = 'Die max. Anzahl an Subdomains für Ihr Konto wurde erreicht.';
-$wb['apache_directives_txt'] = 'Apache-Direktiven';
-$wb['domain_error_empty'] = 'Domain ist leer.';
-$wb['domain_error_unique'] = 'Domain muss eindeutig sein';
-$wb['domain_error_regex'] = 'Domain-Name ungültig.';
-$wb['domain_error_wildcard'] = 'Wildcard-Subdomains sind nicht erlaubt.';
-$wb['hd_quota_error_empty'] = 'Harddisk-Quota ist leer.';
-$wb['traffic_quota_error_empty'] = 'Traffic-Quota ist leer.';
-$wb['errordocs_txt'] = 'Eigene Fehlerseiten';
-$wb['error_ssl_state_empty'] = 'Bundesland (SSL) ist leer.';
-$wb['error_ssl_locality_empty'] = 'Ort (SSL) ist leer.';
-$wb['error_ssl_organisation_empty'] = 'Organisation (SSL) ist leer.';
-$wb['error_ssl_organisation_unit_empty'] = 'Abteilung (SSL) ist leer.';
-$wb['error_ssl_country_empty'] = 'Land (SSL) ist leer.';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['client_group_id_txt'] = 'Kunde';
-$wb['stats_password_txt'] = 'Webstatistik-Passwort';
-$wb['ssl_domain_txt'] = 'SSL-Domain';
-$wb['allow_override_txt'] = 'Allow Override';
-$wb['limit_web_quota_free_txt'] = 'Max. mögliches Festplatten-Quota';
-$wb['ssl_state_error_regex'] = 'Ungültiges SSL-Bundesland. Gültige Zeichen sind: a-z, 0-9 und .,-_';
-$wb['ssl_locality_error_regex'] = 'Ungültiger SSL-Ort. Gülige Zeichen sind: a-z, 0-9 und .,-_';
-$wb['ssl_organisation_error_regex'] = 'Ungültige SSL-Firma. Gültige Zeichen sind: a-z, 0-9 und .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Ungültige SSL-Abteilung. Gültige Zeichen sind: a-z, 0-9 und .,-_';
-$wb['ssl_country_error_regex'] = 'Ungültiges SSL-Land. Gültige Zeichen sind: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. mögliches Traffic-Quota';
-$wb['redirect_error_regex'] = 'Ungültiger Redirect-Pfad. Gültige Angaben sind beispielsweise: /test/ oder http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['backup_interval_txt'] = 'Backup-Intervall';
-$wb['backup_copies_txt'] = 'Anzahl an Backups';
-$wb['traffic_quota_exceeded_txt'] = 'Max. Datentransfer verbraucht.';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistik-Benutzername';
-$wb['stats_type_txt'] = 'Webstatistik-Programm';
-$wb['custom_php_ini_txt'] = 'Individuelle php.ini-Einstellungen';
-$wb['error_ssl_cert_empty'] = 'SSL-Zertifikat-Feld ist leer.';
-$wb['none_txt'] = 'Keine';
-$wb['disabled_txt'] = 'Deaktiviert';
-$wb['no_redirect_txt'] = 'Kein Redirect';
-$wb['no_flag_txt'] = 'Kein Flag';
-$wb['save_certificate_txt'] = 'Zertifikat speichern';
-$wb['create_certificate_txt'] = 'Zertifikat erstellen';
-$wb['delete_certificate_txt'] = 'Zertifikat löschen';
-$wb['nginx_directives_txt'] = 'nginx-Direktiven';
-$wb['seo_redirect_txt'] = 'SEO-Redirect';
-$wb['non_www_to_www_txt'] = 'Nicht-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> Nicht-www';
-$wb['php_fpm_use_socket_txt'] = 'Benutze Socket für PHP-FPM';
-$wb['ipv6_address_txt'] = 'IPv6-Adresse';
-$wb['error_no_sni_txt'] = 'SNI für SSL ist auf diesem Server nicht aktiviert. Sie können daher nur ein SSL-Zertifikat pro IP-Adresse eintragen.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Die Werte der PHP-FPM pm Einstellungen müssen wie folgt sein: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children muß eine positive ganze Zahl sein.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers muß eine positive ganze Zahl sein.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers muß eine positive ganze Zahl sein.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers muß eine positive ganze Zahl sein.';
-$wb['hd_quota_error_regex'] = 'Harddisk-Quota ist ungültig.';
-$wb['traffic_quota_error_regex'] = 'Traffic-Quota ist ungültig.';
-$wb['fastcgi_php_version_txt'] = 'PHP-Version';
-$wb['pm_txt'] = 'PHP-FPM Prozess Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout muß eine positive ganze Zahl sein.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests muß eine ganze Zahl >= 0 sein.';
-$wb['pm_ondemand_hint_txt'] = 'Bitte beachten Sie, daß Ihre PHP Version >= 5.3.9 sein muß, wenn Sie den ondemand Prozess Manager nutzen möchten. Wenn Sie ondemand für eine ältere PHP-Version auswählen, wird PHP nicht mehr starten!';
-$wb['generate_password_txt'] = 'Passwort erzeugen';
-$wb['repeat_password_txt'] = 'Passwort wiederholen';
-$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
-$wb['password_match_txt'] = 'Die Passwörter stimmen überein.';
-$wb['available_php_directive_snippets_txt'] = 'Verfügbare PHP-Direktiven-Schnipsel:';
-$wb['available_apache_directive_snippets_txt'] = 'Verfügbare Apache-Direktiven-Schnipsel:';
-$wb['available_nginx_directive_snippets_txt'] = 'Verfügbare nginx-Direktiven-Schnipsel:';
-$wb['proxy_directives_txt'] = 'Proxy-Direktiven';
-$wb['available_proxy_directive_snippets_txt'] = 'Verfügbare Proxy-Direktiven-Schnipsel:';
-$wb['rewrite_rules_txt'] = 'Rewrite Rules';
-$wb['invalid_rewrite_rules_txt'] = 'Unzulässige Rewrite Rules';
-$wb['allowed_rewrite_rule_directives_txt'] = 'Erlaubte Direktiven:';
-$wb['configuration_error_txt'] = 'KONFIGURATIONSFEHLER';
-$wb['variables_txt'] = 'Variablen';
-$wb['backup_excludes_txt'] = 'Auszuschließende Verzeichnisse';
-$wb['backup_excludes_note_txt'] = '(Mehrere Verzeichnisse mit Kommas trennen. Beispiel: web/cache/*,web/backup)';
-$wb['backup_excludes_error_regex'] = 'Die auszuschließenden Verzeichnisse enthalten ungültige Zeichen.';
-?>
diff --git a/interface/web/sites/lib/lang/de_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/de_web_vhost_subdomain_list.lng
deleted file mode 100644
index 042b9f02c5b2b4a665d69472e9192f707b20ef00..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/de_web_vhost_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'Aktiv';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Webseite';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Neue Subdomain hinzufügen';
-?>
diff --git a/interface/web/sites/lib/lang/el_web_aliasdomain.lng b/interface/web/sites/lib/lang/el_web_childdomain.lng
similarity index 83%
rename from interface/web/sites/lib/lang/el_web_aliasdomain.lng
rename to interface/web/sites/lib/lang/el_web_childdomain.lng
index ba8c6900e2f7bb2e4d82f7938be9cc96359654bf..b57387285c9b9e15c89e2ae460a69ebf8a75d16b 100644
--- a/interface/web/sites/lib/lang/el_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/el_web_childdomain.lng
@@ -1,48 +1,56 @@
<?php
-$wb['domain_txt'] = 'Ψευδώνυμο domain';
-$wb['backup_interval_txt'] = 'ΧÏονικό διάστημα ΑντιγÏάφων Ασφαλείας';
-$wb['backup_copies_txt'] = 'Πλήθος ΑντιγÏάφων Ασφαλείας';
-$wb['ssl_state_txt'] = 'Κατάσταση';
+$wb['ssl_state_txt'] = 'ΠεÏιφÎÏεια';
$wb['ssl_locality_txt'] = 'Τοποθεσία';
$wb['ssl_organisation_txt'] = 'ΟÏγανισμός';
-$wb['ssl_organisation_unit_txt'] = 'Τμήμα ΟÏγανισμοÏ';
+$wb['ssl_organisation_unit_txt'] = 'Τμήμα οÏγανισμοÏ';
$wb['ssl_country_txt'] = 'ΧώÏα';
-$wb['ssl_key_txt'] = 'SSL Key';
$wb['ssl_request_txt'] = 'SSL Request';
$wb['ssl_cert_txt'] = 'SSL Certificate';
$wb['ssl_bundle_txt'] = 'SSL Bundle';
$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Εισάγατε μη ÎγκυÏο φάκελο. Μην εισάγετε την κάθετο.';
+$wb['domain_txt'] = 'Domain';
$wb['type_txt'] = 'ΤÏπος';
$wb['parent_domain_id_txt'] = 'Γονικό Website';
-$wb['redirect_type_txt'] = 'ΤÏπος ΑνακατεÏθυνσης';
-$wb['redirect_path_txt'] = 'ΔιαδÏομή ΑνακατεÏθυνσης';
-$wb['active_txt'] = 'ΕνεÏγό';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'ΧÏήστης Linux';
+$wb['redirect_type_txt'] = 'ΤÏπος ανακατεÏθυνσης';
+$wb['redirect_path_txt'] = 'ΔιαδÏομή ανακατεÏθυνσης';
+$wb['active_txt'] = 'ΕνεÏγή';
+$wb['document_root_txt'] = 'Ριζικός φάκελος';
+$wb['system_user_txt'] = 'Όνομα χÏήστη Linux';
$wb['system_group_txt'] = 'Ομάδα Linux';
-$wb['ip_address_txt'] = 'ΔιεÏθυνση IPv4';
-$wb['ipv6_address_txt'] = 'ΔιεÏθυνση IPv6';
+$wb['ip_address_txt'] = 'ΔιεÏθυνση IP';
$wb['vhost_type_txt'] = 'ΤÏπος VHost';
$wb['hd_quota_txt'] = 'ÎŒÏιο Î±Ï€Î¿Î¸Î·ÎºÎµÏ…Ï„Î¹ÎºÎ¿Ï Ï‡ÏŽÏου';
$wb['traffic_quota_txt'] = 'ÎŒÏιο μεταφοÏάς δεδομÎνων';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Î Ïοσωπικά ÎγγÏαφα σφάλματος';
-$wb['subdomain_txt'] = 'Αυτόματο-Subdomain';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
$wb['client_txt'] = 'Πελάτης';
-$wb['limit_web_domain_txt'] = 'Έχετε φτάσει το μÎγιστο πλήθος των web domains για τον λογαÏιασμό σας.';
-$wb['limit_web_aliasdomain_txt'] = 'Έχετε φτάσει το μÎγιστο πλήθος των ψευδωνÏμων domains για τον λογαÏιασμό σας.';
-$wb['limit_web_subdomain_txt'] = 'Έχετε φτάσει το μÎγιστο πλήθος των web subdomains για τον λογαÏιασμό σας.';
-$wb['apache_directives_txt'] = 'Apache Directives';
+$wb['limit_web_domain_txt'] = 'Έχετε φτάσει το μÎγιστο πλήθος των web domains του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ±Ï‚.';
+$wb['limit_web_aliasdomain_txt'] = 'Έχετε φτάσει το μÎγιστο πλήθος των aliasdomains του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ±Ï‚.';
+$wb['limit_web_subdomain_txt'] = 'Έχετε φτάσει το μÎγιστο πλήθος των web subdomains του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ±Ï‚.';
+$wb['apache_directives_txt'] = 'Apache directives';
$wb['domain_error_empty'] = 'Το Domain δεν Îχει οÏιστεί.';
-$wb['domain_error_unique'] = 'ΥπάÏχει ήδη Îνα website ή Îνα sub / aliasdomain με αυτό το όνομα domain.';
-$wb['domain_error_regex'] = 'Μη ÎγκυÏο Domain.';
+$wb['domain_error_unique'] = 'ΥπάÏχει ήδη Îνα website ή sub / aliasdomain με αυτό το όνομα.';
+$wb['domain_error_regex'] = 'Το όνομα του Domain δεν είναι ÎγκυÏο.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Η διαδÏομή ανακατεÏθυνσης δεν είναι ÎγκυÏη. ΈγκυÏες διαδÏομÎÏ‚ είναι για παÏάδειγμα οι: /test/ ή http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'ΧωÏίς ΑνακατεÏθυνση';
+$wb['no_flag_txt'] = 'ΧωÏίς Σημαία';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains δεν επιτÏÎπονται.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'ΔιαθÎσιμα Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Ο Ï„Ïπος ανακατεÏθυνσης \"proxy\" απαιτεί Îνα URL ως μονοπάτι ανακατεÏθυνσης.';
+$wb['backup_interval_txt'] = 'ΧÏονικό διάστημα ΑντιγÏάφων Ασφαλείας';
+$wb['backup_copies_txt'] = 'Πλήθος ΑντιγÏάφων Ασφαλείας';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Εισάγατε μη ÎγκυÏο φάκελο. Μην εισάγετε την κάθετο.';
+$wb['ipv6_address_txt'] = 'ΔιεÏθυνση IPv6';
+$wb['errordocs_txt'] = 'Î Ïοσωπικά ÎγγÏαφα σφάλματος';
+$wb['subdomain_txt'] = 'Αυτόματο-Subdomain';
$wb['domain_error_autosub'] = 'ΥπάÏχει ήδη Îνα subdomain με αυτÎÏ‚ τις Ïυθμίσεις.';
$wb['hd_quota_error_empty'] = 'Το ÏŒÏιο Î±Ï€Î¿Î¸Î·ÎºÎµÏ…Ï„Î¹ÎºÎ¿Ï Ï‡ÏŽÏου είναι 0 ή δεν Îχει οÏιστεί.';
$wb['traffic_quota_error_empty'] = 'Το ÏŒÏιο μεταφοÏάς δεδομÎνων δεν Îχει οÏιστεί.';
@@ -62,7 +70,6 @@ $wb['ssl_organisation_error_regex'] = 'ΆκυÏος ΟÏγανισμός SSL.
$wb['ssl_organistaion_unit_error_regex'] = 'ΆκυÏη μονάδα οÏÎ³Î±Î½Î¹ÏƒÎ¼Î¿Ï SSL. ΈγκυÏοι χαÏακτήÏες: a-z, 0-9 and .,-_';
$wb['ssl_country_error_regex'] = 'ΆκυÏη ΧώÏα SSL. ΈγκυÏοι χαÏακτήÏες: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'ÎœÎγιστο ÎŒÏιο μεταφοÏάς δεδομÎνων';
-$wb['redirect_error_regex'] = 'Μη ÎγκυÏη διαδÏομή ανακατεÏθυνσης. ΈγκυÏες τιμÎÏ‚ είναι: /test/ ή http://www.domain.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'ΞεπεÏάστηκε το ÏŒÏιο μεταφοÏάς δεδομÎνων';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@ $wb['stats_type_txt'] = 'Î ÏόγÏαμμα Στατιστικών Web';
$wb['custom_php_ini_txt'] = 'Î ÏοσαÏμοσμÎνες Ïυθμίσεις php.ini';
$wb['none_txt'] = 'ΚανÎνα';
$wb['disabled_txt'] = 'ΑπενεÏγοπ.';
-$wb['no_redirect_txt'] = 'ΧωÏίς ΑνακατεÏθυνση';
-$wb['no_flag_txt'] = 'ΧωÏίς Σημαία';
$wb['save_certificate_txt'] = 'Αποθήκευση ΠιστοποιητικοÏ';
$wb['create_certificate_txt'] = 'ΔημιουÏγία ΠιστοποιητικοÏ';
$wb['delete_certificate_txt'] = 'ΔιαγÏαφή ΠιστοποιητικοÏ';
@@ -109,7 +114,6 @@ $wb['password_match_txt'] = 'Τα Συνθηματικά ταιÏιάζουν.';
$wb['available_php_directive_snippets_txt'] = 'ΔιαθÎσιμα PHP Directive Snippets:';
$wb['available_apache_directive_snippets_txt'] = 'ΔιαθÎσιμα Apache Directive Snippets:';
$wb['available_nginx_directive_snippets_txt'] = 'ΔιαθÎσιμα nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'ΔιαθÎσιμα Proxy Directive Snippets:';
$wb['Domain'] = 'Ψευδώνυμο domain';
+
?>
diff --git a/interface/web/sites/lib/lang/el_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/el_web_childdomain_list.lng
similarity index 75%
rename from interface/web/sites/lib/lang/el_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/el_web_childdomain_list.lng
index 6ea60e8c20787e7b50fd058c6004f4d8151e38e1..1d0a54b54049f480db524e0f64350b0670af4709 100644
--- a/interface/web/sites/lib/lang/el_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/el_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Ψευδώνυμο domain';
+$wb['list_head_txt'] = 'Subdomains';
$wb['active_txt'] = 'ΕνεÏγό';
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Ψευδώνυμο domain';
-$wb['add_new_record_txt'] = 'ÎÎο ψευδωνÏμο domain';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'ÎÎο subdomain';
$wb['domain_error_empty'] = 'Το Domain δεν Îχει οÏιστεί.';
$wb['domain_error_unique'] = 'Το Domain Ï€ÏÎπει να είναι μοναδικό.';
$wb['domain_error_regex'] = 'Το όνομα Domain δεν είναι ÎγκυÏο.';
$wb['no_redirect_txt'] = 'ΧωÏίς ΑνακατεÏθυνση';
$wb['no_flag_txt'] = 'ΧωÏίς σημαία';
$wb['none_txt'] = 'ΚανÎνα';
+
?>
diff --git a/interface/web/sites/lib/lang/el_web_subdomain.lng b/interface/web/sites/lib/lang/el_web_subdomain.lng
deleted file mode 100644
index 6183fbabb8de27dcc1c9b6fedaab90b5eae4c831..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/el_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'ΠεÏιφÎÏεια';
-$wb['ssl_locality_txt'] = 'Τοποθεσία';
-$wb['ssl_organisation_txt'] = 'ΟÏγανισμός';
-$wb['ssl_organisation_unit_txt'] = 'Τμήμα οÏγανισμοÏ';
-$wb['ssl_country_txt'] = 'ΧώÏα';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['type_txt'] = 'ΤÏπος';
-$wb['parent_domain_id_txt'] = 'Γονικό Website';
-$wb['redirect_type_txt'] = 'ΤÏπος ανακατεÏθυνσης';
-$wb['redirect_path_txt'] = 'ΔιαδÏομή ανακατεÏθυνσης';
-$wb['active_txt'] = 'ΕνεÏγή';
-$wb['document_root_txt'] = 'Ριζικός φάκελος';
-$wb['system_user_txt'] = 'Όνομα χÏήστη Linux';
-$wb['system_group_txt'] = 'Ομάδα Linux';
-$wb['ip_address_txt'] = 'ΔιεÏθυνση IP';
-$wb['vhost_type_txt'] = 'ΤÏπος VHost';
-$wb['hd_quota_txt'] = 'ÎŒÏιο Î±Ï€Î¿Î¸Î·ÎºÎµÏ…Ï„Î¹ÎºÎ¿Ï Ï‡ÏŽÏου';
-$wb['traffic_quota_txt'] = 'ÎŒÏιο μεταφοÏάς δεδομÎνων';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Πελάτης';
-$wb['limit_web_domain_txt'] = 'Έχετε φτάσει το μÎγιστο πλήθος των web domains του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ±Ï‚.';
-$wb['limit_web_aliasdomain_txt'] = 'Έχετε φτάσει το μÎγιστο πλήθος των aliasdomains του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ±Ï‚.';
-$wb['limit_web_subdomain_txt'] = 'Έχετε φτάσει το μÎγιστο πλήθος των web subdomains του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ±Ï‚.';
-$wb['apache_directives_txt'] = 'Apache directives';
-$wb['domain_error_empty'] = 'Το Domain δεν Îχει οÏιστεί.';
-$wb['domain_error_unique'] = 'ΥπάÏχει ήδη Îνα website ή sub / aliasdomain με αυτό το όνομα.';
-$wb['domain_error_regex'] = 'Το όνομα του Domain δεν είναι ÎγκυÏο.';
-$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Η διαδÏομή ανακατεÏθυνσης δεν είναι ÎγκυÏη. ΈγκυÏες διαδÏομÎÏ‚ είναι για παÏάδειγμα οι: /test/ ή http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'ΧωÏίς ΑνακατεÏθυνση';
-$wb['no_flag_txt'] = 'ΧωÏίς Σημαία';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains δεν επιτÏÎπονται.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'ΔιαθÎσιμα Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Ο Ï„Ïπος ανακατεÏθυνσης \\"proxy\\" απαιτεί Îνα URL ως μονοπάτι ανακατεÏθυνσης.';
-?>
diff --git a/interface/web/sites/lib/lang/el_web_subdomain_list.lng b/interface/web/sites/lib/lang/el_web_subdomain_list.lng
deleted file mode 100644
index a4426cf3ce987eb5246773639412216a13782c87..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/el_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'ΕνεÏγό';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'ÎÎο subdomain';
-?>
diff --git a/interface/web/sites/lib/lang/el_web_vhost_aliasdomain.lng b/interface/web/sites/lib/lang/el_web_vhost_aliasdomain.lng
deleted file mode 100644
index 7381df6bf716073110fc94a84af85ea8ede2c936..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/el_web_vhost_aliasdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Γονικό Website';
-$wb['web_folder_txt'] = 'Φάκελος Web';
-$wb['web_folder_invalid_txt'] = 'Ο Φάκελος Web δεν είναι ÎγκυÏος, διαλÎξτε κάποιον άλλο.';
-$wb['web_folder_unique_txt'] = 'Ο Φάκελος Web χÏησιμοποιείται ήδη, διαλÎξτε κάποιον άλλο.';
-$wb['backup_interval_txt'] = 'ΧÏονικό διάστημα ΑντιγÏάφων Ασφαλείας';
-$wb['backup_copies_txt'] = 'Πλήθος ΑντιγÏάφων Ασφαλείας';
-$wb['ssl_state_txt'] = 'Κατάσταση';
-$wb['ssl_locality_txt'] = 'Τοποθεσία';
-$wb['ssl_organisation_txt'] = 'ΟÏγανισμός';
-$wb['ssl_organisation_unit_txt'] = 'Τμήμα ΟÏγανισμοÏ';
-$wb['ssl_country_txt'] = 'ΧώÏα';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Εισάγατε μη ÎγκυÏο φάκελο. Μην εισάγετε την κάθετο';
-$wb['type_txt'] = 'ΤÏπος';
-$wb['redirect_type_txt'] = 'ΤÏπος ΑνακατεÏθυνσης';
-$wb['redirect_path_txt'] = 'ΔιαδÏομή ΑνακατεÏθυνσης';
-$wb['active_txt'] = 'ΕνεÏγό';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'ΧÏήστης Linux';
-$wb['system_group_txt'] = 'Ομάδα Linux';
-$wb['ip_address_txt'] = 'ΔιεÏθυνση IP';
-$wb['ipv6_address_txt'] = 'ΔιεÏθυνση IPv6';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'ÎŒÏιο Î±Ï€Î¿Î¸Î·ÎºÎµÏ…Ï„Î¹ÎºÎ¿Ï Ï‡ÏŽÏου';
-$wb['traffic_quota_txt'] = 'ÎŒÏιο μεταφοÏάς δεδομÎνων';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Î Ïοσωπικά ÎγγÏαφα σφάλματος';
-$wb['subdomain_txt'] = 'Αυτόματο-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Πελάτης';
-$wb['limit_web_domain_txt'] = 'Έχετε φτάσει το μÎγιστο πλήθος των web domains για τον λογαÏιασμό σας.';
-$wb['limit_web_aliasdomain_txt'] = 'Έχετε φτάσει το μÎγιστο πλήθος των aliasdomains για τον λογαÏιασμό σας.';
-$wb['limit_web_subdomain_txt'] = 'Έχετε φτάσει το μÎγιστο πλήθος των web subdomains για τον λογαÏιασμό σας.';
-$wb['apache_directives_txt'] = 'Apache directives';
-$wb['domain_error_empty'] = 'Το Domain δεν Îχει οÏιστεί.';
-$wb['domain_error_unique'] = 'ΥπάÏχει ήδη Îνα website ή Îνα sub / aliasdomain με αυτό το όνομα domain.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Το ÏŒÏιο Î±Ï€Î¿Î¸Î·ÎºÎµÏ…Ï„Î¹ÎºÎ¿Ï Ï‡ÏŽÏου είναι 0 ή δεν Îχει οÏιστεί.';
-$wb['traffic_quota_error_empty'] = 'Το ÏŒÏιο μεταφοÏάς δεδομÎνων δεν Îχει οÏιστεί.';
-$wb['error_ssl_state_empty'] = 'Κενή πεÏιφÎÏεια SSL.';
-$wb['error_ssl_locality_empty'] = 'Κενή τοποθεσία SSL.';
-$wb['error_ssl_organisation_empty'] = 'Ο ΟÏγανισμός SSL δεν Îχει οÏιστεί.';
-$wb['error_ssl_organisation_unit_empty'] = 'Το SSL τμήμα ΟÏÎ³Î±Î½Î¹ÏƒÎ¼Î¿Ï Î´ÎµÎ½ Îχει οÏιστεί.';
-$wb['error_ssl_country_empty'] = 'Κενή χώÏα SSL.';
-$wb['error_ssl_cert_empty'] = 'Το πεδίο SSL Certificate δεν Îχει οÏιστεί';
-$wb['client_group_id_txt'] = 'Πελάτης';
-$wb['stats_password_txt'] = 'Συνθηματικο Στατιστικών Web';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'ÎŒÏιο Î±Ï€Î¿Î¸Î·ÎºÎµÏ…Ï„Î¹ÎºÎ¿Ï Ï‡ÏŽÏου';
-$wb['ssl_state_error_regex'] = 'ΆκυÏη πολιτεία-πεÏιφÎÏεια SSL. ΈγκυÏοι χαÏακτήÏες: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'ΆκυÏο SSL Locality. ΈγκυÏοι χαÏακτήÏες: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'ΆκυÏος ΟÏγανισμός SSL. ΈγκυÏοι χαÏακτήÏες: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'ΆκυÏη μονάδα οÏÎ³Î±Î½Î¹ÏƒÎ¼Î¿Ï SSL. ΈγκυÏοι χαÏακτήÏες: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'ΆκυÏη ΧώÏα SSL. ΈγκυÏοι χαÏακτήÏες: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'ÎŒÏιο μεταφοÏάς δεδομÎνων';
-$wb['redirect_error_regex'] = 'Μη ÎγκυÏη διαδÏομή ανακατεÏθυνσης. ΈγκυÏες τιμÎÏ‚ είναι: /test/ ή http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'ΞεπεÏάστηκε το ÏŒÏιο μεταφοÏάς δεδομÎνων';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Όνομα ΧÏήστη Στατιστικών Web';
-$wb['stats_type_txt'] = 'Î ÏόγÏαμμα Στατιστικών Web';
-$wb['custom_php_ini_txt'] = 'Î ÏοσαÏμοσμÎνες Ïυθμίσεις php.ini';
-$wb['none_txt'] = 'Καμία';
-$wb['disabled_txt'] = 'ΑπενεÏγοπ.';
-$wb['no_redirect_txt'] = 'ΧωÏίς ΑνακατεÏθυνση';
-$wb['no_flag_txt'] = 'ΧωÏίς Σημαία';
-$wb['save_certificate_txt'] = 'Αποθήκευση ΠιστοποιητικοÏ';
-$wb['create_certificate_txt'] = 'ΔημιουÏγία ΠιστοποιητικοÏ';
-$wb['delete_certificate_txt'] = 'ΔιαγÏαφή ΠιστοποιητικοÏ';
-$wb['nginx_directives_txt'] = 'ÎτιÏεκτίβες nginx';
-$wb['seo_redirect_txt'] = 'ΑνακατεÏθυνση SEO';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'ΧÏήση Socket Για PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'ΔημιουÏγία ΣυνθηματικοÏ';
-$wb['repeat_password_txt'] = 'Επανάληψη ΣυνθηματικοÏ';
-$wb['password_mismatch_txt'] = 'Τα Συνθηματικά δεν ταιÏιάζουν.';
-$wb['password_match_txt'] = 'Τα Συνθηματικά ταιÏιάζουν.';
-$wb['available_php_directive_snippets_txt'] = 'ΔιαθÎσιμα PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'ΔιαθÎσιμα Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'ΔιαθÎσιμα nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'ΔιαθÎσιμα Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/el_web_vhost_aliasdomain_list.lng b/interface/web/sites/lib/lang/el_web_vhost_aliasdomain_list.lng
deleted file mode 100644
index 4905e4240d966c4ebd5a2a25d83c482d2e636890..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/el_web_vhost_aliasdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Ψευδώνυμο domain';
-$wb['active_txt'] = 'ΕνεÏγό';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Ψευδώνυμο domain';
-$wb['add_new_record_txt'] = 'ÎÎο ψευδωνÏμο domain';
-?>
diff --git a/interface/web/sites/lib/lang/el_web_domain.lng b/interface/web/sites/lib/lang/el_web_vhost_domain.lng
similarity index 95%
rename from interface/web/sites/lib/lang/el_web_domain.lng
rename to interface/web/sites/lib/lang/el_web_vhost_domain.lng
index e515e59a2ec2186118477879fd3bfed101cbab38..3ced8e7db58b21bb0c5b53d59e8f27a662bbbe3c 100644
--- a/interface/web/sites/lib/lang/el_web_domain.lng
+++ b/interface/web/sites/lib/lang/el_web_vhost_domain.lng
@@ -120,4 +120,10 @@ $wb['rewrite_rules_txt'] = 'Rewrite Rules';
$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['web_folder_txt'] = 'Φάκελος Web';
+$wb['web_folder_invalid_txt'] = 'Ο Φάκελος Web δεν είναι ÎγκυÏος, διαλÎξτε κάποιον άλλο.';
+$wb['web_folder_unique_txt'] = 'Ο Φάκελος Web χÏησιμοποιείται ήδη, διαλÎξτε κάποιον άλλο.';
+$wb['host_txt'] = 'Hostname';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+
?>
diff --git a/interface/web/sites/lib/lang/el_web_domain_admin_list.lng b/interface/web/sites/lib/lang/el_web_vhost_domain_admin_list.lng
similarity index 100%
rename from interface/web/sites/lib/lang/el_web_domain_admin_list.lng
rename to interface/web/sites/lib/lang/el_web_vhost_domain_admin_list.lng
diff --git a/interface/web/sites/lib/lang/el_web_domain_list.lng b/interface/web/sites/lib/lang/el_web_vhost_domain_list.lng
similarity index 83%
rename from interface/web/sites/lib/lang/el_web_domain_list.lng
rename to interface/web/sites/lib/lang/el_web_vhost_domain_list.lng
index c3f42a94a5e33c0aef6809d9e4bfc1372b72b1da..3232d46a44bc4b7af19b3aebb3ca2ee59a8bb26c 100644
--- a/interface/web/sites/lib/lang/el_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/el_web_vhost_domain_list.lng
@@ -5,4 +5,6 @@ $wb['active_txt'] = 'ΕνεÏγό';
$wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Domain';
$wb['add_new_record_txt'] = 'ÎÎο website';
+$wb['parent_domain_id_txt'] = 'Website';
+
?>
diff --git a/interface/web/sites/lib/lang/el_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/el_web_vhost_subdomain.lng
deleted file mode 100644
index 7381df6bf716073110fc94a84af85ea8ede2c936..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/el_web_vhost_subdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Γονικό Website';
-$wb['web_folder_txt'] = 'Φάκελος Web';
-$wb['web_folder_invalid_txt'] = 'Ο Φάκελος Web δεν είναι ÎγκυÏος, διαλÎξτε κάποιον άλλο.';
-$wb['web_folder_unique_txt'] = 'Ο Φάκελος Web χÏησιμοποιείται ήδη, διαλÎξτε κάποιον άλλο.';
-$wb['backup_interval_txt'] = 'ΧÏονικό διάστημα ΑντιγÏάφων Ασφαλείας';
-$wb['backup_copies_txt'] = 'Πλήθος ΑντιγÏάφων Ασφαλείας';
-$wb['ssl_state_txt'] = 'Κατάσταση';
-$wb['ssl_locality_txt'] = 'Τοποθεσία';
-$wb['ssl_organisation_txt'] = 'ΟÏγανισμός';
-$wb['ssl_organisation_unit_txt'] = 'Τμήμα ΟÏγανισμοÏ';
-$wb['ssl_country_txt'] = 'ΧώÏα';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Εισάγατε μη ÎγκυÏο φάκελο. Μην εισάγετε την κάθετο';
-$wb['type_txt'] = 'ΤÏπος';
-$wb['redirect_type_txt'] = 'ΤÏπος ΑνακατεÏθυνσης';
-$wb['redirect_path_txt'] = 'ΔιαδÏομή ΑνακατεÏθυνσης';
-$wb['active_txt'] = 'ΕνεÏγό';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'ΧÏήστης Linux';
-$wb['system_group_txt'] = 'Ομάδα Linux';
-$wb['ip_address_txt'] = 'ΔιεÏθυνση IP';
-$wb['ipv6_address_txt'] = 'ΔιεÏθυνση IPv6';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'ÎŒÏιο Î±Ï€Î¿Î¸Î·ÎºÎµÏ…Ï„Î¹ÎºÎ¿Ï Ï‡ÏŽÏου';
-$wb['traffic_quota_txt'] = 'ÎŒÏιο μεταφοÏάς δεδομÎνων';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Î Ïοσωπικά ÎγγÏαφα σφάλματος';
-$wb['subdomain_txt'] = 'Αυτόματο-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Πελάτης';
-$wb['limit_web_domain_txt'] = 'Έχετε φτάσει το μÎγιστο πλήθος των web domains για τον λογαÏιασμό σας.';
-$wb['limit_web_aliasdomain_txt'] = 'Έχετε φτάσει το μÎγιστο πλήθος των aliasdomains για τον λογαÏιασμό σας.';
-$wb['limit_web_subdomain_txt'] = 'Έχετε φτάσει το μÎγιστο πλήθος των web subdomains για τον λογαÏιασμό σας.';
-$wb['apache_directives_txt'] = 'Apache directives';
-$wb['domain_error_empty'] = 'Το Domain δεν Îχει οÏιστεί.';
-$wb['domain_error_unique'] = 'ΥπάÏχει ήδη Îνα website ή Îνα sub / aliasdomain με αυτό το όνομα domain.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Το ÏŒÏιο Î±Ï€Î¿Î¸Î·ÎºÎµÏ…Ï„Î¹ÎºÎ¿Ï Ï‡ÏŽÏου είναι 0 ή δεν Îχει οÏιστεί.';
-$wb['traffic_quota_error_empty'] = 'Το ÏŒÏιο μεταφοÏάς δεδομÎνων δεν Îχει οÏιστεί.';
-$wb['error_ssl_state_empty'] = 'Κενή πεÏιφÎÏεια SSL.';
-$wb['error_ssl_locality_empty'] = 'Κενή τοποθεσία SSL.';
-$wb['error_ssl_organisation_empty'] = 'Ο ΟÏγανισμός SSL δεν Îχει οÏιστεί.';
-$wb['error_ssl_organisation_unit_empty'] = 'Το SSL τμήμα ΟÏÎ³Î±Î½Î¹ÏƒÎ¼Î¿Ï Î´ÎµÎ½ Îχει οÏιστεί.';
-$wb['error_ssl_country_empty'] = 'Κενή χώÏα SSL.';
-$wb['error_ssl_cert_empty'] = 'Το πεδίο SSL Certificate δεν Îχει οÏιστεί';
-$wb['client_group_id_txt'] = 'Πελάτης';
-$wb['stats_password_txt'] = 'Συνθηματικο Στατιστικών Web';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'ÎŒÏιο Î±Ï€Î¿Î¸Î·ÎºÎµÏ…Ï„Î¹ÎºÎ¿Ï Ï‡ÏŽÏου';
-$wb['ssl_state_error_regex'] = 'ΆκυÏη πολιτεία-πεÏιφÎÏεια SSL. ΈγκυÏοι χαÏακτήÏες: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'ΆκυÏο SSL Locality. ΈγκυÏοι χαÏακτήÏες: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'ΆκυÏος ΟÏγανισμός SSL. ΈγκυÏοι χαÏακτήÏες: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'ΆκυÏη μονάδα οÏÎ³Î±Î½Î¹ÏƒÎ¼Î¿Ï SSL. ΈγκυÏοι χαÏακτήÏες: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'ΆκυÏη ΧώÏα SSL. ΈγκυÏοι χαÏακτήÏες: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'ÎŒÏιο μεταφοÏάς δεδομÎνων';
-$wb['redirect_error_regex'] = 'Μη ÎγκυÏη διαδÏομή ανακατεÏθυνσης. ΈγκυÏες τιμÎÏ‚ είναι: /test/ ή http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'ΞεπεÏάστηκε το ÏŒÏιο μεταφοÏάς δεδομÎνων';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Όνομα ΧÏήστη Στατιστικών Web';
-$wb['stats_type_txt'] = 'Î ÏόγÏαμμα Στατιστικών Web';
-$wb['custom_php_ini_txt'] = 'Î ÏοσαÏμοσμÎνες Ïυθμίσεις php.ini';
-$wb['none_txt'] = 'Καμία';
-$wb['disabled_txt'] = 'ΑπενεÏγοπ.';
-$wb['no_redirect_txt'] = 'ΧωÏίς ΑνακατεÏθυνση';
-$wb['no_flag_txt'] = 'ΧωÏίς Σημαία';
-$wb['save_certificate_txt'] = 'Αποθήκευση ΠιστοποιητικοÏ';
-$wb['create_certificate_txt'] = 'ΔημιουÏγία ΠιστοποιητικοÏ';
-$wb['delete_certificate_txt'] = 'ΔιαγÏαφή ΠιστοποιητικοÏ';
-$wb['nginx_directives_txt'] = 'ÎτιÏεκτίβες nginx';
-$wb['seo_redirect_txt'] = 'ΑνακατεÏθυνση SEO';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'ΧÏήση Socket Για PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'ΔημιουÏγία ΣυνθηματικοÏ';
-$wb['repeat_password_txt'] = 'Επανάληψη ΣυνθηματικοÏ';
-$wb['password_mismatch_txt'] = 'Τα Συνθηματικά δεν ταιÏιάζουν.';
-$wb['password_match_txt'] = 'Τα Συνθηματικά ταιÏιάζουν.';
-$wb['available_php_directive_snippets_txt'] = 'ΔιαθÎσιμα PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'ΔιαθÎσιμα Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'ΔιαθÎσιμα nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'ΔιαθÎσιμα Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/el_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/el_web_vhost_subdomain_list.lng
deleted file mode 100644
index a4426cf3ce987eb5246773639412216a13782c87..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/el_web_vhost_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'ΕνεÏγό';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'ÎÎο subdomain';
-?>
diff --git a/interface/web/sites/lib/lang/en_web_aliasdomain.lng b/interface/web/sites/lib/lang/en_web_aliasdomain.lng
deleted file mode 100644
index eeae6770c6a516930c14d6ec6f67a10efc138b4a..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/en_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb["backup_interval_txt"] = 'Backup interval';
-$wb["backup_copies_txt"] = 'Number of backup copies';
-$wb["ssl_state_txt"] = 'State';
-$wb["ssl_locality_txt"] = 'Locality';
-$wb["ssl_organisation_txt"] = 'Organisation';
-$wb["ssl_organisation_unit_txt"] = 'Organisation Unit';
-$wb["ssl_country_txt"] = 'Country';
-$wb["ssl_key_txt"] = 'SSL Key';
-$wb["ssl_request_txt"] = 'SSL Request';
-$wb["ssl_cert_txt"] = 'SSL Certificate';
-$wb["ssl_bundle_txt"] = 'SSL Bundle';
-$wb["ssl_action_txt"] = 'SSL Action';
-$wb["ssl_domain_txt"] = 'SSL Domain';
-$wb["server_id_txt"] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb["type_txt"] = 'Type';
-$wb["parent_domain_id_txt"] = 'Parent Website';
-$wb["redirect_type_txt"] = 'Redirect Type';
-$wb["redirect_path_txt"] = 'Redirect Path';
-$wb["active_txt"] = 'Active';
-$wb["document_root_txt"] = 'Documentroot';
-$wb["system_user_txt"] = 'Linux User';
-$wb["system_group_txt"] = 'Linux Group';
-$wb["ip_address_txt"] = 'IPv4-Address';
-$wb["ipv6_address_txt"] = 'IPv6-Address';
-$wb["vhost_type_txt"] = 'VHost Type';
-$wb["hd_quota_txt"] = 'Harddisk Quota';
-$wb["traffic_quota_txt"] = 'Traffic Quota';
-$wb["cgi_txt"] = 'CGI';
-$wb["ssi_txt"] = 'SSI';
-$wb["errordocs_txt"] = 'Own Error-Documents';
-$wb["subdomain_txt"] = 'Auto-Subdomain';
-$wb["ssl_txt"] = 'SSL';
-$wb["suexec_txt"] = 'SuEXEC';
-$wb["php_txt"] = 'PHP';
-$wb["client_txt"] = 'Client';
-$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.';
-$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.';
-$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.';
-$wb["apache_directives_txt"] = 'Apache Directives';
-$wb["domain_error_empty"] = 'Domain is empty.';
-$wb["domain_error_unique"] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb["domain_error_regex"] = 'Domain name invalid.';
-$wb["domain_error_autosub"] = 'There is already a subdomain with these settings.';
-$wb["hd_quota_error_empty"] = 'Harddisk quota is 0 or empty.';
-$wb["traffic_quota_error_empty"] = 'Traffic quota is empty.';
-$wb["error_ssl_state_empty"] = 'SSL State is empty.';
-$wb["error_ssl_locality_empty"] = 'SSL Locality is empty.';
-$wb["error_ssl_organisation_empty"] = 'SSL Organisation is empty.';
-$wb["error_ssl_organisation_unit_empty"] = 'SSL Organisation Unit is empty.';
-$wb["error_ssl_country_empty"] = 'SSL Country is empty.';
-$wb["error_ssl_cert_empty"] = 'SSL Certificate field is empty';
-$wb["client_group_id_txt"] = 'Client';
-$wb["stats_password_txt"] = 'Set Webstatistics password';
-$wb["allow_override_txt"] = 'Apache AllowOverride';
-$wb["limit_web_quota_free_txt"] = 'Max. available Harddisk Quota';
-$wb["ssl_state_error_regex"] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb["ssl_locality_error_regex"] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb["ssl_organisation_error_regex"] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb["ssl_organistaion_unit_error_regex"] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb["ssl_country_error_regex"] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb["limit_traffic_quota_free_txt"] = 'Max. available Traffic Quota';
-$wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb["php_open_basedir_txt"] = 'PHP open_basedir';
-$wb["traffic_quota_exceeded_txt"] = 'Traffic quota exceeded';
-$wb["ruby_txt"] = 'Ruby';
-$wb["stats_user_txt"] = 'Webstatistics username';
-$wb["stats_type_txt"] = 'Webstatistics program';
-$wb["custom_php_ini_txt"] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb["nginx_directives_txt"] = 'nginx Directives';
-$wb["seo_redirect_txt"] = 'SEO Redirect';
-$wb["non_www_to_www_txt"] = 'Non-www -> www';
-$wb["www_to_non_www_txt"] = 'www -> non-www';
-$wb["php_fpm_use_socket_txt"] = 'Use Socket For PHP-FPM';
-$wb["error_no_sni_txt"] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb["python_txt"] = 'Python';
-$wb["perl_txt"] = 'Perl';
-$wb["pm_max_children_txt"] = 'PHP-FPM pm.max_children';
-$wb["pm_start_servers_txt"] = 'PHP-FPM pm.start_servers';
-$wb["pm_min_spare_servers_txt"] = 'PHP-FPM pm.min_spare_servers';
-$wb["pm_max_spare_servers_txt"] = 'PHP-FPM pm.max_spare_servers';
-$wb["error_php_fpm_pm_settings_txt"] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb["pm_max_children_error_regex"] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb["pm_start_servers_error_regex"] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb["pm_min_spare_servers_error_regex"] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb["pm_max_spare_servers_error_regex"] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb["hd_quota_error_regex"] = 'Harddisk quota is invalid.';
-$wb["traffic_quota_error_regex"] = 'Traffic quota is invalid.';
-$wb["fastcgi_php_version_txt"] = 'PHP Version';
-$wb["pm_txt"] = 'PHP-FPM Process Manager';
-$wb["pm_process_idle_timeout_txt"] = 'PHP-FPM pm.process_idle_timeout';
-$wb["pm_max_requests_txt"] = 'PHP-FPM pm.max_requests';
-$wb["pm_process_idle_timeout_error_regex"] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb["pm_max_requests_error_regex"] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb["pm_ondemand_hint_txt"] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/en_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/en_web_aliasdomain_list.lng
deleted file mode 100644
index 0635583078c65300293e819bd197a65294f3e468..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/en_web_aliasdomain_list.lng
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$wb["list_head_txt"] = 'Aliasdomain';
-$wb["active_txt"] = 'Active';
-$wb["server_id_txt"] = 'Server';
-$wb["parent_domain_id_txt"] = 'Website';
-$wb["domain_txt"] = 'Aliasdomain';
-$wb["add_new_record_txt"] = 'Add new aliasdomain';
-$wb["domain_error_empty"] = 'Domain is empty.';
-$wb["domain_error_unique"] = 'Domain must be unique.';
-$wb["domain_error_regex"] = 'Domain name invalid.';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['none_txt'] = 'None';
-?>
diff --git a/interface/web/sites/lib/lang/bg_web_aliasdomain.lng b/interface/web/sites/lib/lang/en_web_childdomain.lng
similarity index 94%
rename from interface/web/sites/lib/lang/bg_web_aliasdomain.lng
rename to interface/web/sites/lib/lang/en_web_childdomain.lng
index 4149c711493e6b6f06d0e99656a1c65744d4ec46..43c892958ca5d19aba328c44c1f7b63ac3e55288 100644
--- a/interface/web/sites/lib/lang/bg_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/en_web_childdomain.lng
@@ -1,20 +1,15 @@
<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
$wb['ssl_state_txt'] = 'State';
$wb['ssl_locality_txt'] = 'Locality';
$wb['ssl_organisation_txt'] = 'Organisation';
$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
$wb['ssl_request_txt'] = 'SSL Request';
$wb['ssl_cert_txt'] = 'SSL Certificate';
$wb['ssl_bundle_txt'] = 'SSL Bundle';
$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_txt'] = 'Domain';
$wb['type_txt'] = 'Type';
$wb['parent_domain_id_txt'] = 'Parent Website';
$wb['redirect_type_txt'] = 'Redirect Type';
@@ -23,15 +18,12 @@ $wb['active_txt'] = 'Active';
$wb['document_root_txt'] = 'Documentroot';
$wb['system_user_txt'] = 'Linux User';
$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['ip_address_txt'] = 'IP-Address';
$wb['vhost_type_txt'] = 'VHost Type';
$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quaota';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
@@ -39,10 +31,26 @@ $wb['client_txt'] = 'Client';
$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
+$wb['apache_directives_txt'] = 'Apache directives';
$wb['domain_error_empty'] = 'Domain is empty.';
$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type "proxy" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
@@ -62,7 +70,6 @@ $wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid character
$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@ $wb['stats_type_txt'] = 'Webstatistics program';
$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
$wb['none_txt'] = 'None';
$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
$wb['save_certificate_txt'] = 'Save certificate';
$wb['create_certificate_txt'] = 'Create certificate';
$wb['delete_certificate_txt'] = 'Delete certificate';
@@ -109,7 +114,6 @@ $wb['password_match_txt'] = 'The passwords do match.';
$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
$wb['Domain'] = 'Aliasdomain';
+
?>
diff --git a/interface/web/sites/lib/lang/it_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/en_web_childdomain_list.lng
similarity index 74%
rename from interface/web/sites/lib/lang/it_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/en_web_childdomain_list.lng
index 8ea34c440978e1ec0920627b26e72315d713eda1..95a3b5f71a21f4a00f1e2ab067c5fa25f3f9a19a 100644
--- a/interface/web/sites/lib/lang/it_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/en_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Aliasdomain';
+$wb['list_head_txt'] = 'Subdomains';
$wb['active_txt'] = 'Active';
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['add_new_record_txt'] = 'Add new aliasdomain';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Add new subdomain';
$wb['domain_error_empty'] = 'Domain is empty.';
$wb['domain_error_unique'] = 'Domain must be unique.';
$wb['domain_error_regex'] = 'Domain name invalid.';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'None';
+
?>
diff --git a/interface/web/sites/lib/lang/en_web_domain.lng b/interface/web/sites/lib/lang/en_web_domain.lng
deleted file mode 100644
index 8390066ab15497ab206cf4cc050544f11ebe04a8..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/en_web_domain.lng
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-$wb["backup_interval_txt"] = 'Backup interval';
-$wb["backup_copies_txt"] = 'Number of backup copies';
-$wb["ssl_state_txt"] = 'State';
-$wb["ssl_locality_txt"] = 'Locality';
-$wb["ssl_organisation_txt"] = 'Organisation';
-$wb["ssl_organisation_unit_txt"] = 'Organisation Unit';
-$wb["ssl_country_txt"] = 'Country';
-$wb["ssl_key_txt"] = 'SSL Key';
-$wb["ssl_request_txt"] = 'SSL Request';
-$wb["ssl_cert_txt"] = 'SSL Certificate';
-$wb["ssl_bundle_txt"] = 'SSL Bundle';
-$wb["ssl_action_txt"] = 'SSL Action';
-$wb["ssl_domain_txt"] = 'SSL Domain';
-$wb["server_id_txt"] = 'Server';
-$wb["domain_txt"] = 'Domain';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb["type_txt"] = 'Type';
-$wb["parent_domain_id_txt"] = 'Parent Website';
-$wb["redirect_type_txt"] = 'Redirect Type';
-$wb["redirect_path_txt"] = 'Redirect Path';
-$wb["active_txt"] = 'Active';
-$wb["document_root_txt"] = 'Documentroot';
-$wb["system_user_txt"] = 'Linux User';
-$wb["system_group_txt"] = 'Linux Group';
-$wb["ip_address_txt"] = 'IPv4-Address';
-$wb["ipv6_address_txt"] = 'IPv6-Address';
-$wb["vhost_type_txt"] = 'VHost Type';
-$wb["hd_quota_txt"] = 'Harddisk Quota';
-$wb["traffic_quota_txt"] = 'Traffic Quota';
-$wb["cgi_txt"] = 'CGI';
-$wb["ssi_txt"] = 'SSI';
-$wb["errordocs_txt"] = 'Own Error-Documents';
-$wb["subdomain_txt"] = 'Auto-Subdomain';
-$wb["ssl_txt"] = 'SSL';
-$wb["suexec_txt"] = 'SuEXEC';
-$wb["php_txt"] = 'PHP';
-$wb["client_txt"] = 'Client';
-$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.';
-$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.';
-$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.';
-$wb["apache_directives_txt"] = 'Apache Directives';
-$wb["domain_error_empty"] = 'Domain is empty.';
-$wb["domain_error_unique"] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb["domain_error_regex"] = 'Domain name invalid.';
-$wb["domain_error_autosub"] = 'There is already a subdomain with these settings.';
-$wb["hd_quota_error_empty"] = 'Harddisk quota is 0 or empty.';
-$wb["traffic_quota_error_empty"] = 'Traffic quota is empty.';
-$wb["error_ssl_state_empty"] = 'SSL State is empty.';
-$wb["error_ssl_locality_empty"] = 'SSL Locality is empty.';
-$wb["error_ssl_organisation_empty"] = 'SSL Organisation is empty.';
-$wb["error_ssl_organisation_unit_empty"] = 'SSL Organisation Unit is empty.';
-$wb["error_ssl_country_empty"] = 'SSL Country is empty.';
-$wb["error_ssl_cert_empty"] = 'SSL Certificate field is empty';
-$wb["client_group_id_txt"] = 'Client';
-$wb["stats_password_txt"] = 'Set Webstatistics password';
-$wb["allow_override_txt"] = 'Apache AllowOverride';
-$wb["limit_web_quota_free_txt"] = 'Max. available Harddisk Quota';
-$wb["ssl_state_error_regex"] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
-$wb["ssl_locality_error_regex"] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
-$wb["ssl_organisation_error_regex"] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
-$wb["ssl_organistaion_unit_error_regex"] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
-$wb["ssl_country_error_regex"] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb["limit_traffic_quota_free_txt"] = 'Max. available Traffic Quota';
-$wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb["php_open_basedir_txt"] = 'PHP open_basedir';
-$wb["traffic_quota_exceeded_txt"] = 'Traffic quota exceeded';
-$wb["ruby_txt"] = 'Ruby';
-$wb["stats_user_txt"] = 'Webstatistics username';
-$wb["stats_type_txt"] = 'Webstatistics program';
-$wb["custom_php_ini_txt"] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb["nginx_directives_txt"] = 'nginx Directives';
-$wb["seo_redirect_txt"] = 'SEO Redirect';
-$wb["non_www_to_www_txt"] = 'Non-www -> www';
-$wb["www_to_non_www_txt"] = 'www -> non-www';
-$wb["php_fpm_use_socket_txt"] = 'Use Socket For PHP-FPM';
-$wb["error_no_sni_txt"] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb["python_txt"] = 'Python';
-$wb["perl_txt"] = 'Perl';
-$wb["pm_max_children_txt"] = 'PHP-FPM pm.max_children';
-$wb["pm_start_servers_txt"] = 'PHP-FPM pm.start_servers';
-$wb["pm_min_spare_servers_txt"] = 'PHP-FPM pm.min_spare_servers';
-$wb["pm_max_spare_servers_txt"] = 'PHP-FPM pm.max_spare_servers';
-$wb["error_php_fpm_pm_settings_txt"] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb["pm_max_children_error_regex"] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb["pm_start_servers_error_regex"] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb["pm_min_spare_servers_error_regex"] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb["pm_max_spare_servers_error_regex"] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb["hd_quota_error_regex"] = 'Harddisk quota is invalid.';
-$wb["traffic_quota_error_regex"] = 'Traffic quota is invalid.';
-$wb["fastcgi_php_version_txt"] = 'PHP Version';
-$wb["pm_txt"] = 'PHP-FPM Process Manager';
-$wb["pm_process_idle_timeout_txt"] = 'PHP-FPM pm.process_idle_timeout';
-$wb["pm_max_requests_txt"] = 'PHP-FPM pm.max_requests';
-$wb["pm_process_idle_timeout_error_regex"] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb["pm_max_requests_error_regex"] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb["pm_ondemand_hint_txt"] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['no_server_error'] = 'No server selected.';
-$wb['no_backup_txt'] = 'No backup';
-$wb['daily_backup_txt'] = 'Daily';
-$wb['weekly_backup_txt'] = 'Weekly';
-$wb['monthly_backup_txt'] = 'Monthly';
-$wb['rewrite_rules_txt'] = 'Rewrite Rules';
-$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
-$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
-$wb['configuration_error_txt'] = "CONFIGURATION ERROR";
-$wb['server_chosen_not_ok'] = 'The selected server is not allowed for this account.';
-$wb['variables_txt'] = 'Variables';
-$wb['added_by_txt'] = 'Added by';
-$wb['added_date_txt'] = 'Added date';
-$wb['backup_excludes_txt'] = 'Excluded Directories';
-$wb['backup_excludes_note_txt'] = '(Separate multiple directories with commas. Example: web/cache/*,web/backup)';
-$wb['backup_excludes_error_regex'] = 'The excluded directories contain invalid characters.';
-?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/en_web_domain_list.lng b/interface/web/sites/lib/lang/en_web_domain_list.lng
deleted file mode 100644
index 493350e85c7bbc00c88b57ecaaccb3dab5a1cf7f..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/en_web_domain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb["list_head_txt"] = 'Websites';
-$wb["domain_id_txt"] = 'ID';
-$wb["active_txt"] = 'Active';
-$wb["server_id_txt"] = 'Server';
-$wb["domain_txt"] = 'Domain';
-$wb["add_new_record_txt"] = 'Add new website';
-?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/en_web_subdomain.lng b/interface/web/sites/lib/lang/en_web_subdomain.lng
deleted file mode 100644
index cd1c1fbfac6ad97cf3b3d1a811024d03063895e4..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/en_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb["ssl_state_txt"] = 'State';
-$wb["ssl_locality_txt"] = 'Locality';
-$wb["ssl_organisation_txt"] = 'Organisation';
-$wb["ssl_organisation_unit_txt"] = 'Organisation Unit';
-$wb["ssl_country_txt"] = 'Country';
-$wb["ssl_request_txt"] = 'SSL Request';
-$wb["ssl_cert_txt"] = 'SSL Certificate';
-$wb["ssl_bundle_txt"] = 'SSL Bundle';
-$wb["ssl_action_txt"] = 'SSL Action';
-$wb["server_id_txt"] = 'Server';
-$wb["domain_txt"] = 'Domain';
-$wb["type_txt"] = 'Type';
-$wb["parent_domain_id_txt"] = 'Parent Website';
-$wb["redirect_type_txt"] = 'Redirect Type';
-$wb["redirect_path_txt"] = 'Redirect Path';
-$wb["active_txt"] = 'Active';
-$wb["document_root_txt"] = 'Documentroot';
-$wb["system_user_txt"] = 'Linux User';
-$wb["system_group_txt"] = 'Linux Group';
-$wb["ip_address_txt"] = 'IP-Address';
-$wb["vhost_type_txt"] = 'VHost Type';
-$wb["hd_quota_txt"] = 'Harddisk Quota';
-$wb["traffic_quota_txt"] = 'Traffic Quaota';
-$wb["cgi_txt"] = 'CGI';
-$wb["ssi_txt"] = 'SSI';
-$wb["ssl_txt"] = 'SSL';
-$wb["suexec_txt"] = 'SuEXEC';
-$wb["php_txt"] = 'PHP';
-$wb["client_txt"] = 'Client';
-$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.';
-$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.';
-$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.';
-$wb["apache_directives_txt"] = 'Apache directives';
-$wb["domain_error_empty"] = 'Domain is empty.';
-$wb["domain_error_unique"] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb["domain_error_regex"] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb["host_txt"] = 'Host';
-$wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type "proxy" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/en_web_subdomain_list.lng b/interface/web/sites/lib/lang/en_web_subdomain_list.lng
deleted file mode 100644
index 8273dbd066713780708f9e2b68f58a4c726dee27..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/en_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb["list_head_txt"] = 'Subdomains';
-$wb["active_txt"] = 'Active';
-$wb["server_id_txt"] = 'Server';
-$wb["parent_domain_id_txt"] = 'Website';
-$wb["domain_txt"] = 'Subdomain';
-$wb["add_new_record_txt"] = 'Add new subdomain';
-?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/en_web_vhost_aliasdomain.lng b/interface/web/sites/lib/lang/en_web_vhost_aliasdomain.lng
deleted file mode 100644
index 3c9009ee156f03e1570912fb58859b3929408b0a..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/en_web_vhost_aliasdomain.lng
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-$wb["parent_domain_id_txt"] = 'Parent Website';
-$wb["web_folder_txt"] = 'Web folder';
-$wb["web_folder_invalid_txt"] = 'The web folder is invalid, please choose a different one.';
-$wb["web_folder_unique_txt"] = 'The web folder is already used, please choose a different one.';
-$wb["backup_interval_txt"] = 'Backup interval';
-$wb["backup_copies_txt"] = 'Number of backup copies';
-$wb["ssl_state_txt"] = 'State';
-$wb["ssl_locality_txt"] = 'Locality';
-$wb["ssl_organisation_txt"] = 'Organisation';
-$wb["ssl_organisation_unit_txt"] = 'Organisation Unit';
-$wb["ssl_country_txt"] = 'Country';
-$wb["ssl_key_txt"] = 'SSL Key';
-$wb["ssl_request_txt"] = 'SSL Request';
-$wb["ssl_cert_txt"] = 'SSL Certificate';
-$wb["ssl_bundle_txt"] = 'SSL Bundle';
-$wb["ssl_action_txt"] = 'SSL Action';
-$wb["ssl_domain_txt"] = 'SSL Domain';
-$wb["server_id_txt"] = 'Server';
-$wb["domain_txt"] = 'Domain';
-$wb["host_txt"] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb["type_txt"] = 'Type';
-$wb["parent_domain_id_txt"] = 'Parent Website';
-$wb["redirect_type_txt"] = 'Redirect Type';
-$wb["redirect_path_txt"] = 'Redirect Path';
-$wb["active_txt"] = 'Active';
-$wb["document_root_txt"] = 'Documentroot';
-$wb["system_user_txt"] = 'Linux User';
-$wb["system_group_txt"] = 'Linux Group';
-$wb["ip_address_txt"] = 'IPv4-Address';
-$wb["ipv6_address_txt"] = 'IPv6-Address';
-$wb["vhost_type_txt"] = 'VHost Type';
-$wb["hd_quota_txt"] = 'Harddisk Quota';
-$wb["traffic_quota_txt"] = 'Traffic Quota';
-$wb["cgi_txt"] = 'CGI';
-$wb["ssi_txt"] = 'SSI';
-$wb["errordocs_txt"] = 'Own Error-Documents';
-$wb["subdomain_txt"] = 'Auto-Subdomain';
-$wb["ssl_txt"] = 'SSL';
-$wb["suexec_txt"] = 'SuEXEC';
-$wb["php_txt"] = 'PHP';
-$wb["client_txt"] = 'Client';
-$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.';
-$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.';
-$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.';
-$wb["apache_directives_txt"] = 'Apache Directives';
-$wb["domain_error_empty"] = 'Domain is empty.';
-$wb["domain_error_unique"] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb["domain_error_regex"] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb["hd_quota_error_empty"] = 'Harddisk quota is 0 or empty.';
-$wb["traffic_quota_error_empty"] = 'Traffic quota is empty.';
-$wb["error_ssl_state_empty"] = 'SSL State is empty.';
-$wb["error_ssl_locality_empty"] = 'SSL Locality is empty.';
-$wb["error_ssl_organisation_empty"] = 'SSL Organisation is empty.';
-$wb["error_ssl_organisation_unit_empty"] = 'SSL Organisation Unit is empty.';
-$wb["error_ssl_country_empty"] = 'SSL Country is empty.';
-$wb["error_ssl_cert_empty"] = 'SSL Certificate field is empty';
-$wb["client_group_id_txt"] = 'Client';
-$wb["stats_password_txt"] = 'Set Webstatistics password';
-$wb["allow_override_txt"] = 'Apache AllowOverride';
-$wb["limit_web_quota_free_txt"] = 'Max. available Harddisk Quota';
-$wb["ssl_state_error_regex"] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb["ssl_locality_error_regex"] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb["ssl_organisation_error_regex"] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb["ssl_organistaion_unit_error_regex"] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb["ssl_country_error_regex"] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb["limit_traffic_quota_free_txt"] = 'Max. available Traffic Quota';
-$wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb["php_open_basedir_txt"] = 'PHP open_basedir';
-$wb["traffic_quota_exceeded_txt"] = 'Traffic quota exceeded';
-$wb["ruby_txt"] = 'Ruby';
-$wb["stats_user_txt"] = 'Webstatistics username';
-$wb["stats_type_txt"] = 'Webstatistics program';
-$wb["custom_php_ini_txt"] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb["nginx_directives_txt"] = 'nginx Directives';
-$wb["seo_redirect_txt"] = 'SEO Redirect';
-$wb["non_www_to_www_txt"] = 'Non-www -> www';
-$wb["www_to_non_www_txt"] = 'www -> non-www';
-$wb["php_fpm_use_socket_txt"] = 'Use Socket For PHP-FPM';
-$wb["error_no_sni_txt"] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb["python_txt"] = 'Python';
-$wb["perl_txt"] = 'Perl';
-$wb["pm_max_children_txt"] = 'PHP-FPM pm.max_children';
-$wb["pm_start_servers_txt"] = 'PHP-FPM pm.start_servers';
-$wb["pm_min_spare_servers_txt"] = 'PHP-FPM pm.min_spare_servers';
-$wb["pm_max_spare_servers_txt"] = 'PHP-FPM pm.max_spare_servers';
-$wb["error_php_fpm_pm_settings_txt"] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb["pm_max_children_error_regex"] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb["pm_start_servers_error_regex"] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb["pm_min_spare_servers_error_regex"] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb["pm_max_spare_servers_error_regex"] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb["hd_quota_error_regex"] = 'Harddisk quota is invalid.';
-$wb["traffic_quota_error_regex"] = 'Traffic quota is invalid.';
-$wb["fastcgi_php_version_txt"] = 'PHP Version';
-$wb["pm_txt"] = 'PHP-FPM Process Manager';
-$wb["pm_process_idle_timeout_txt"] = 'PHP-FPM pm.process_idle_timeout';
-$wb["pm_max_requests_txt"] = 'PHP-FPM pm.max_requests';
-$wb["pm_process_idle_timeout_error_regex"] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb["pm_max_requests_error_regex"] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb["pm_ondemand_hint_txt"] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['rewrite_rules_txt'] = 'Rewrite Rules';
-$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
-$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
-$wb['configuration_error_txt'] = "CONFIGURATION ERROR";
-$wb['variables_txt'] = 'Variables';
-$wb['backup_excludes_txt'] = 'Excluded Directories';
-$wb['backup_excludes_note_txt'] = '(Separate multiple directories with commas. Example: web/cache/*,web/backup)';
-$wb['backup_excludes_error_regex'] = 'The excluded directories contain invalid characters.';
-?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/en_web_vhost_aliasdomain_list.lng b/interface/web/sites/lib/lang/en_web_vhost_aliasdomain_list.lng
deleted file mode 100644
index 3699711f1c6347e0c63fce2213d890abd9edde53..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/en_web_vhost_aliasdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb["list_head_txt"] = 'Aliasdomain';
-$wb["active_txt"] = 'Active';
-$wb["server_id_txt"] = 'Server';
-$wb["parent_domain_id_txt"] = 'Website';
-$wb["domain_txt"] = 'Aliasdomain';
-$wb["add_new_record_txt"] = 'Add new aliasdomain';
-?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/ar_web_vhost_aliasdomain.lng b/interface/web/sites/lib/lang/en_web_vhost_domain.lng
similarity index 84%
rename from interface/web/sites/lib/lang/ar_web_vhost_aliasdomain.lng
rename to interface/web/sites/lib/lang/en_web_vhost_domain.lng
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..9f410e07c6ed7f41fc60458813f8aecfc10f2900 100644
--- a/interface/web/sites/lib/lang/ar_web_vhost_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/en_web_vhost_domain.lng
@@ -1,8 +1,4 @@
<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
$wb['backup_interval_txt'] = 'Backup interval';
$wb['backup_copies_txt'] = 'Number of backup copies';
$wb['ssl_state_txt'] = 'State';
@@ -18,9 +14,9 @@ $wb['ssl_action_txt'] = 'SSL Action';
$wb['ssl_domain_txt'] = 'SSL Domain';
$wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
$wb['type_txt'] = 'Type';
+$wb['parent_domain_id_txt'] = 'Parent Website';
$wb['redirect_type_txt'] = 'Redirect Type';
$wb['redirect_path_txt'] = 'Redirect Path';
$wb['active_txt'] = 'Active';
@@ -47,7 +43,7 @@ $wb['apache_directives_txt'] = 'Apache Directives';
$wb['domain_error_empty'] = 'Domain is empty.';
$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
$wb['error_ssl_state_empty'] = 'SSL State is empty.';
@@ -57,13 +53,13 @@ $wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
$wb['allow_override_txt'] = 'Apache AllowOverride';
$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
@@ -115,4 +111,26 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
$wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
+$wb['no_backup_txt'] = 'No backup';
+$wb['daily_backup_txt'] = 'Daily';
+$wb['weekly_backup_txt'] = 'Weekly';
+$wb['monthly_backup_txt'] = 'Monthly';
+$wb['rewrite_rules_txt'] = 'Rewrite Rules';
+$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
+$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['server_chosen_not_ok'] = 'The selected server is not allowed for this account.';
+$wb['variables_txt'] = 'Variables';
+$wb['added_by_txt'] = 'Added by';
+$wb['added_date_txt'] = 'Added date';
+$wb['backup_excludes_txt'] = 'Excluded Directories';
+$wb['backup_excludes_note_txt'] = '(Separate multiple directories with commas. Example: web/cache/*,web/backup)';
+$wb['backup_excludes_error_regex'] = 'The excluded directories contain invalid characters.';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['host_txt'] = 'Hostname';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+
?>
diff --git a/interface/web/sites/lib/lang/en_web_domain_admin_list.lng b/interface/web/sites/lib/lang/en_web_vhost_domain_admin_list.lng
similarity index 100%
rename from interface/web/sites/lib/lang/en_web_domain_admin_list.lng
rename to interface/web/sites/lib/lang/en_web_vhost_domain_admin_list.lng
diff --git a/interface/web/sites/lib/lang/se_web_domain_list.lng b/interface/web/sites/lib/lang/en_web_vhost_domain_list.lng
similarity index 83%
rename from interface/web/sites/lib/lang/se_web_domain_list.lng
rename to interface/web/sites/lib/lang/en_web_vhost_domain_list.lng
index 88ec412daabfb125db4038dc964c2fdec237e843..b8f85d3143cf1d6a3d0d78190f88b772738e7d62 100644
--- a/interface/web/sites/lib/lang/se_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/en_web_vhost_domain_list.lng
@@ -5,4 +5,6 @@ $wb['active_txt'] = 'Active';
$wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Domain';
$wb['add_new_record_txt'] = 'Add new website';
+$wb['parent_domain_id_txt'] = 'Website';
+
?>
diff --git a/interface/web/sites/lib/lang/en_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/en_web_vhost_subdomain.lng
deleted file mode 100644
index 3c9009ee156f03e1570912fb58859b3929408b0a..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/en_web_vhost_subdomain.lng
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-$wb["parent_domain_id_txt"] = 'Parent Website';
-$wb["web_folder_txt"] = 'Web folder';
-$wb["web_folder_invalid_txt"] = 'The web folder is invalid, please choose a different one.';
-$wb["web_folder_unique_txt"] = 'The web folder is already used, please choose a different one.';
-$wb["backup_interval_txt"] = 'Backup interval';
-$wb["backup_copies_txt"] = 'Number of backup copies';
-$wb["ssl_state_txt"] = 'State';
-$wb["ssl_locality_txt"] = 'Locality';
-$wb["ssl_organisation_txt"] = 'Organisation';
-$wb["ssl_organisation_unit_txt"] = 'Organisation Unit';
-$wb["ssl_country_txt"] = 'Country';
-$wb["ssl_key_txt"] = 'SSL Key';
-$wb["ssl_request_txt"] = 'SSL Request';
-$wb["ssl_cert_txt"] = 'SSL Certificate';
-$wb["ssl_bundle_txt"] = 'SSL Bundle';
-$wb["ssl_action_txt"] = 'SSL Action';
-$wb["ssl_domain_txt"] = 'SSL Domain';
-$wb["server_id_txt"] = 'Server';
-$wb["domain_txt"] = 'Domain';
-$wb["host_txt"] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb["type_txt"] = 'Type';
-$wb["parent_domain_id_txt"] = 'Parent Website';
-$wb["redirect_type_txt"] = 'Redirect Type';
-$wb["redirect_path_txt"] = 'Redirect Path';
-$wb["active_txt"] = 'Active';
-$wb["document_root_txt"] = 'Documentroot';
-$wb["system_user_txt"] = 'Linux User';
-$wb["system_group_txt"] = 'Linux Group';
-$wb["ip_address_txt"] = 'IPv4-Address';
-$wb["ipv6_address_txt"] = 'IPv6-Address';
-$wb["vhost_type_txt"] = 'VHost Type';
-$wb["hd_quota_txt"] = 'Harddisk Quota';
-$wb["traffic_quota_txt"] = 'Traffic Quota';
-$wb["cgi_txt"] = 'CGI';
-$wb["ssi_txt"] = 'SSI';
-$wb["errordocs_txt"] = 'Own Error-Documents';
-$wb["subdomain_txt"] = 'Auto-Subdomain';
-$wb["ssl_txt"] = 'SSL';
-$wb["suexec_txt"] = 'SuEXEC';
-$wb["php_txt"] = 'PHP';
-$wb["client_txt"] = 'Client';
-$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.';
-$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.';
-$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.';
-$wb["apache_directives_txt"] = 'Apache Directives';
-$wb["domain_error_empty"] = 'Domain is empty.';
-$wb["domain_error_unique"] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb["domain_error_regex"] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb["hd_quota_error_empty"] = 'Harddisk quota is 0 or empty.';
-$wb["traffic_quota_error_empty"] = 'Traffic quota is empty.';
-$wb["error_ssl_state_empty"] = 'SSL State is empty.';
-$wb["error_ssl_locality_empty"] = 'SSL Locality is empty.';
-$wb["error_ssl_organisation_empty"] = 'SSL Organisation is empty.';
-$wb["error_ssl_organisation_unit_empty"] = 'SSL Organisation Unit is empty.';
-$wb["error_ssl_country_empty"] = 'SSL Country is empty.';
-$wb["error_ssl_cert_empty"] = 'SSL Certificate field is empty';
-$wb["client_group_id_txt"] = 'Client';
-$wb["stats_password_txt"] = 'Set Webstatistics password';
-$wb["allow_override_txt"] = 'Apache AllowOverride';
-$wb["limit_web_quota_free_txt"] = 'Max. available Harddisk Quota';
-$wb["ssl_state_error_regex"] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb["ssl_locality_error_regex"] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb["ssl_organisation_error_regex"] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb["ssl_organistaion_unit_error_regex"] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb["ssl_country_error_regex"] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb["limit_traffic_quota_free_txt"] = 'Max. available Traffic Quota';
-$wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb["php_open_basedir_txt"] = 'PHP open_basedir';
-$wb["traffic_quota_exceeded_txt"] = 'Traffic quota exceeded';
-$wb["ruby_txt"] = 'Ruby';
-$wb["stats_user_txt"] = 'Webstatistics username';
-$wb["stats_type_txt"] = 'Webstatistics program';
-$wb["custom_php_ini_txt"] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb["nginx_directives_txt"] = 'nginx Directives';
-$wb["seo_redirect_txt"] = 'SEO Redirect';
-$wb["non_www_to_www_txt"] = 'Non-www -> www';
-$wb["www_to_non_www_txt"] = 'www -> non-www';
-$wb["php_fpm_use_socket_txt"] = 'Use Socket For PHP-FPM';
-$wb["error_no_sni_txt"] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb["python_txt"] = 'Python';
-$wb["perl_txt"] = 'Perl';
-$wb["pm_max_children_txt"] = 'PHP-FPM pm.max_children';
-$wb["pm_start_servers_txt"] = 'PHP-FPM pm.start_servers';
-$wb["pm_min_spare_servers_txt"] = 'PHP-FPM pm.min_spare_servers';
-$wb["pm_max_spare_servers_txt"] = 'PHP-FPM pm.max_spare_servers';
-$wb["error_php_fpm_pm_settings_txt"] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb["pm_max_children_error_regex"] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb["pm_start_servers_error_regex"] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb["pm_min_spare_servers_error_regex"] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb["pm_max_spare_servers_error_regex"] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb["hd_quota_error_regex"] = 'Harddisk quota is invalid.';
-$wb["traffic_quota_error_regex"] = 'Traffic quota is invalid.';
-$wb["fastcgi_php_version_txt"] = 'PHP Version';
-$wb["pm_txt"] = 'PHP-FPM Process Manager';
-$wb["pm_process_idle_timeout_txt"] = 'PHP-FPM pm.process_idle_timeout';
-$wb["pm_max_requests_txt"] = 'PHP-FPM pm.max_requests';
-$wb["pm_process_idle_timeout_error_regex"] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb["pm_max_requests_error_regex"] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb["pm_ondemand_hint_txt"] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['rewrite_rules_txt'] = 'Rewrite Rules';
-$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
-$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
-$wb['configuration_error_txt'] = "CONFIGURATION ERROR";
-$wb['variables_txt'] = 'Variables';
-$wb['backup_excludes_txt'] = 'Excluded Directories';
-$wb['backup_excludes_note_txt'] = '(Separate multiple directories with commas. Example: web/cache/*,web/backup)';
-$wb['backup_excludes_error_regex'] = 'The excluded directories contain invalid characters.';
-?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/en_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/en_web_vhost_subdomain_list.lng
deleted file mode 100644
index 8273dbd066713780708f9e2b68f58a4c726dee27..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/en_web_vhost_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb["list_head_txt"] = 'Subdomains';
-$wb["active_txt"] = 'Active';
-$wb["server_id_txt"] = 'Server';
-$wb["parent_domain_id_txt"] = 'Website';
-$wb["domain_txt"] = 'Subdomain';
-$wb["add_new_record_txt"] = 'Add new subdomain';
-?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/es_web_childdomain.lng b/interface/web/sites/lib/lang/es_web_childdomain.lng
new file mode 100644
index 0000000000000000000000000000000000000000..1619da9c716b976fefe71ea52533530d819bdb7d
--- /dev/null
+++ b/interface/web/sites/lib/lang/es_web_childdomain.lng
@@ -0,0 +1,119 @@
+<?php
+$wb['ssl_state_txt'] = 'Estado o provincia';
+$wb['ssl_locality_txt'] = 'Localidad';
+$wb['ssl_organisation_txt'] = 'Organización';
+$wb['ssl_organisation_unit_txt'] = 'Unidad de la organización';
+$wb['ssl_country_txt'] = 'PaÃs';
+$wb['ssl_request_txt'] = 'Solicitud SSL';
+$wb['ssl_cert_txt'] = 'Certificado SSL';
+$wb['ssl_bundle_txt'] = 'Paquete SSL (Bundle)';
+$wb['ssl_action_txt'] = 'Acción SSL';
+$wb['server_id_txt'] = 'Servidor';
+$wb['domain_txt'] = 'Dominio';
+$wb['type_txt'] = 'Tipo';
+$wb['parent_domain_id_txt'] = 'Sitio web padre';
+$wb['redirect_type_txt'] = 'Tipo de redirección';
+$wb['redirect_path_txt'] = 'Ruta de redirección';
+$wb['active_txt'] = 'Activar';
+$wb['document_root_txt'] = 'DocumentRoot';
+$wb['system_user_txt'] = 'Usuario Linux';
+$wb['system_group_txt'] = 'Grupo Linux';
+$wb['ip_address_txt'] = 'Dirección IP';
+$wb['vhost_type_txt'] = 'Tipo VHost';
+$wb['hd_quota_txt'] = 'Cuota de disco duro';
+$wb['traffic_quota_txt'] = 'Cuota de tráfico web';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Cliente';
+$wb['limit_web_domain_txt'] = 'Se ha alcanzado el número máximo de dominios web de su cuenta.';
+$wb['limit_web_aliasdomain_txt'] = 'Se ha alcanzado el número máximo de alias de dominio de su cuenta.';
+$wb['limit_web_subdomain_txt'] = 'Se ha alcanzado el número máximo de subdominios de su cuenta.';
+$wb['apache_directives_txt'] = 'Directivas de Apache';
+$wb['domain_error_empty'] = 'El dominio está vacÃo.';
+$wb['domain_error_unique'] = 'El dominio debe ser único.';
+$wb['domain_error_regex'] = 'El nombre de dominio no es válido.';
+$wb['host_txt'] = 'Alojamiento';
+$wb['redirect_error_regex'] = 'Redirección no válida ruta. Redirecciones válidos son por ejemplo: /test/ or http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'No redirigir';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -> www';
+$wb['www_to_non_www_txt'] = 'www -> non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
+$wb['Domain'] = 'Aliasdomain';
+
+?>
diff --git a/interface/web/sites/lib/lang/es_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/es_web_childdomain_list.lng
similarity index 73%
rename from interface/web/sites/lib/lang/es_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/es_web_childdomain_list.lng
index ba9cf8ec799b2687f5bd6e637310ca40bc00831c..2f9a171926673f61cf67a14b8bba453db44921f0 100644
--- a/interface/web/sites/lib/lang/es_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/es_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Alias de dominio';
+$wb['list_head_txt'] = 'Subdominio';
$wb['active_txt'] = 'Activar';
$wb['server_id_txt'] = 'Servidor';
$wb['parent_domain_id_txt'] = 'Sitio web';
-$wb['domain_txt'] = 'Alias de dominio';
-$wb['add_new_record_txt'] = 'Añadir nuevo alias de dominio';
+$wb['domain_txt'] = 'Subdominio';
+$wb['add_new_record_txt'] = 'Añadir nuevo subdominio';
$wb['domain_error_empty'] = 'El dominio está vacÃo';
$wb['domain_error_unique'] = 'El domino debe ser único';
$wb['domain_error_regex'] = 'El nombre de dominio no es válido';
$wb['no_redirect_txt'] = 'No redirigir';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'Ninguno';
+
?>
diff --git a/interface/web/sites/lib/lang/es_web_subdomain.lng b/interface/web/sites/lib/lang/es_web_subdomain.lng
deleted file mode 100644
index 1fa75e51b5743f230ddda2f9a26e07adbc23388f..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/es_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Estado o provincia';
-$wb['ssl_locality_txt'] = 'Localidad';
-$wb['ssl_organisation_txt'] = 'Organización';
-$wb['ssl_organisation_unit_txt'] = 'Unidad de la organización';
-$wb['ssl_country_txt'] = 'PaÃs';
-$wb['ssl_request_txt'] = 'Solicitud SSL';
-$wb['ssl_cert_txt'] = 'Certificado SSL';
-$wb['ssl_bundle_txt'] = 'Paquete SSL (Bundle)';
-$wb['ssl_action_txt'] = 'Acción SSL';
-$wb['server_id_txt'] = 'Servidor';
-$wb['domain_txt'] = 'Dominio';
-$wb['type_txt'] = 'Tipo';
-$wb['parent_domain_id_txt'] = 'Sitio web padre';
-$wb['redirect_type_txt'] = 'Tipo de redirección';
-$wb['redirect_path_txt'] = 'Ruta de redirección';
-$wb['active_txt'] = 'Activar';
-$wb['document_root_txt'] = 'DocumentRoot';
-$wb['system_user_txt'] = 'Usuario Linux';
-$wb['system_group_txt'] = 'Grupo Linux';
-$wb['ip_address_txt'] = 'Dirección IP';
-$wb['vhost_type_txt'] = 'Tipo VHost';
-$wb['hd_quota_txt'] = 'Cuota de disco duro';
-$wb['traffic_quota_txt'] = 'Cuota de tráfico web';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Cliente';
-$wb['limit_web_domain_txt'] = 'Se ha alcanzado el número máximo de dominios web de su cuenta.';
-$wb['limit_web_aliasdomain_txt'] = 'Se ha alcanzado el número máximo de alias de dominio de su cuenta.';
-$wb['limit_web_subdomain_txt'] = 'Se ha alcanzado el número máximo de subdominios de su cuenta.';
-$wb['apache_directives_txt'] = 'Directivas de Apache';
-$wb['domain_error_empty'] = 'El dominio está vacÃo.';
-$wb['domain_error_unique'] = 'El dominio debe ser único.';
-$wb['domain_error_regex'] = 'El nombre de dominio no es válido.';
-$wb['host_txt'] = 'Alojamiento';
-$wb['redirect_error_regex'] = 'Redirección no válida ruta. Redirecciones válidos son por ejemplo: /test/ or http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'No redirigir';
-$wb['no_flag_txt'] = 'No flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/es_web_subdomain_list.lng b/interface/web/sites/lib/lang/es_web_subdomain_list.lng
deleted file mode 100644
index 2b3afa50e799c9a12afb418b8afef2d51f7f4420..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/es_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdominio';
-$wb['active_txt'] = 'Activar';
-$wb['server_id_txt'] = 'Servidor';
-$wb['parent_domain_id_txt'] = 'Sitio web';
-$wb['domain_txt'] = 'Subdominio';
-$wb['add_new_record_txt'] = 'Añadir nuevo subdominio';
-?>
diff --git a/interface/web/sites/lib/lang/es_web_vhost_aliasdomain.lng b/interface/web/sites/lib/lang/es_web_vhost_aliasdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/es_web_vhost_aliasdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/es_web_vhost_aliasdomain_list.lng b/interface/web/sites/lib/lang/es_web_vhost_aliasdomain_list.lng
deleted file mode 100644
index 4b28a648e09646e38e06fe5cc58deb751b3a989f..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/es_web_vhost_aliasdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Alias de dominio';
-$wb['active_txt'] = 'Activar';
-$wb['server_id_txt'] = 'Servidor';
-$wb['parent_domain_id_txt'] = 'Sitio web';
-$wb['domain_txt'] = 'Alias de dominio';
-$wb['add_new_record_txt'] = 'Añadir nuevo alias de dominio';
-?>
diff --git a/interface/web/sites/lib/lang/es_web_domain.lng b/interface/web/sites/lib/lang/es_web_vhost_domain.lng
similarity index 95%
rename from interface/web/sites/lib/lang/es_web_domain.lng
rename to interface/web/sites/lib/lang/es_web_vhost_domain.lng
index 37695c57e9854ec0853c916e69a613ff287c7b03..b3113b082df09105e88fb94302a0acf9350ed359 100644
--- a/interface/web/sites/lib/lang/es_web_domain.lng
+++ b/interface/web/sites/lib/lang/es_web_vhost_domain.lng
@@ -120,4 +120,10 @@ $wb['rewrite_rules_txt'] = 'Rewrite Rules';
$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['host_txt'] = 'Hostname';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+
?>
diff --git a/interface/web/sites/lib/lang/es_web_domain_admin_list.lng b/interface/web/sites/lib/lang/es_web_vhost_domain_admin_list.lng
similarity index 100%
rename from interface/web/sites/lib/lang/es_web_domain_admin_list.lng
rename to interface/web/sites/lib/lang/es_web_vhost_domain_admin_list.lng
diff --git a/interface/web/sites/lib/lang/es_web_domain_list.lng b/interface/web/sites/lib/lang/es_web_vhost_domain_list.lng
similarity index 84%
rename from interface/web/sites/lib/lang/es_web_domain_list.lng
rename to interface/web/sites/lib/lang/es_web_vhost_domain_list.lng
index f0248c5fe8b8e02b12b8f1d1021a432503196d03..199b5b11b91e50b80a56da3d0e910c00dea4e8ba 100644
--- a/interface/web/sites/lib/lang/es_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/es_web_vhost_domain_list.lng
@@ -5,4 +5,6 @@ $wb['active_txt'] = 'Activar';
$wb['server_id_txt'] = 'Servidor';
$wb['domain_txt'] = 'Dominio';
$wb['add_new_record_txt'] = 'Añadir nuevo sitio web';
+$wb['parent_domain_id_txt'] = 'Website';
+
?>
diff --git a/interface/web/sites/lib/lang/es_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/es_web_vhost_subdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/es_web_vhost_subdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/es_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/es_web_vhost_subdomain_list.lng
deleted file mode 100644
index 1c16bcda288f146167a5a49221951769017f580b..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/es_web_vhost_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Add new subdomain';
-?>
diff --git a/interface/web/sites/lib/lang/fi_web_aliasdomain.lng b/interface/web/sites/lib/lang/fi_web_aliasdomain.lng
deleted file mode 100644
index 4149c711493e6b6f06d0e99656a1c65744d4ec46..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/fi_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/fi_web_childdomain.lng b/interface/web/sites/lib/lang/fi_web_childdomain.lng
new file mode 100755
index 0000000000000000000000000000000000000000..6da7297b4dd903a55da2aa771a7e75b73e3c2375
--- /dev/null
+++ b/interface/web/sites/lib/lang/fi_web_childdomain.lng
@@ -0,0 +1,119 @@
+<?php
+$wb['ssl_state_txt'] = 'Lääni';
+$wb['ssl_locality_txt'] = 'Lokaali';
+$wb['ssl_organisation_txt'] = 'Organisaatio';
+$wb['ssl_organisation_unit_txt'] = 'Organisaatoyksikkö';
+$wb['ssl_country_txt'] = 'Maa';
+$wb['ssl_request_txt'] = 'SSL-pyyntö';
+$wb['ssl_cert_txt'] = 'SSL-sertifikaatti';
+$wb['ssl_bundle_txt'] = 'SSL-paketti';
+$wb['ssl_action_txt'] = 'SSL-toiminto';
+$wb['server_id_txt'] = 'Palvelin';
+$wb['domain_txt'] = 'Verkkotunnus';
+$wb['type_txt'] = 'Tyyppi';
+$wb['parent_domain_id_txt'] = 'Pääsivu';
+$wb['redirect_type_txt'] = 'Edelleenohjauksen tyyppi';
+$wb['redirect_path_txt'] = 'Edelleenohjausosoite';
+$wb['active_txt'] = 'Käytössä';
+$wb['document_root_txt'] = 'Dokumentikansio';
+$wb['system_user_txt'] = 'Linux-käyttäjä';
+$wb['system_group_txt'] = 'Käyttäjäryhmä';
+$wb['ip_address_txt'] = 'IP-osoite';
+$wb['vhost_type_txt'] = 'Virtuaali-isännän tyyppi';
+$wb['hd_quota_txt'] = 'Levytila';
+$wb['traffic_quota_txt'] = 'Liikenneraja';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Asiakas';
+$wb['limit_web_domain_txt'] = 'Käytttäjätunnuksella on jo sallittu määrä verkkotunnuksia.';
+$wb['limit_web_aliasdomain_txt'] = 'Käytttäjätunnuksella on jo sallittu määrä aliasverkkotunnuksia.';
+$wb['limit_web_subdomain_txt'] = 'Käytttäjätunnuksella on jo sallittu määrä aliverkkotunnuksia.';
+$wb['apache_directives_txt'] = 'Apachen direktiivit';
+$wb['domain_error_empty'] = 'Verkkotunnus-kenttä on tyhjä.';
+$wb['domain_error_unique'] = 'Tämä verkkotunnus on jo olemassa.';
+$wb['domain_error_regex'] = 'Verkkotunnus on vääränlainen.';
+$wb['host_txt'] = 'Isäntäkone';
+$wb['redirect_error_regex'] = 'VIrheellinen edelleenohjausosoite. Kelvollisia ovat esimerkiksi: /testi/ tai http://www.domain.tld/testi/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -> www';
+$wb['www_to_non_www_txt'] = 'www -> non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
+$wb['Domain'] = 'Aliasdomain';
+
+?>
diff --git a/interface/web/sites/lib/lang/fi_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/fi_web_childdomain_list.lng
similarity index 65%
rename from interface/web/sites/lib/lang/fi_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/fi_web_childdomain_list.lng
index 623b06f09a6725cee33cd1c01e4cf33d0cf92d2a..97b62c6e806d68835eae1a839b49f1cbf6e8cba4 100755
--- a/interface/web/sites/lib/lang/fi_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/fi_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Aliasverkkotunnus';
+$wb['list_head_txt'] = 'Aliverkkotunnukset';
$wb['active_txt'] = 'Käytössä';
$wb['server_id_txt'] = 'Palvelin';
-$wb['parent_domain_id_txt'] = 'Sivusto';
-$wb['domain_txt'] = 'Aliasverkkotunnus';
-$wb['add_new_record_txt'] = 'Lisää uusi aliasverkkotunnus';
+$wb['parent_domain_id_txt'] = 'Pääverkkotunnus';
+$wb['domain_txt'] = 'Aliverkkotunnus';
+$wb['add_new_record_txt'] = 'Lisää uusi aliverkkotunnus';
$wb['domain_error_empty'] = 'Aliasverkkotunnus on tyhjä.';
$wb['domain_error_unique'] = 'Tämä aliasverkkotunnus on jo olemassa.';
$wb['domain_error_regex'] = 'Aliasverkkotunnus on vääränlainen.';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'None';
+
?>
diff --git a/interface/web/sites/lib/lang/fi_web_subdomain.lng b/interface/web/sites/lib/lang/fi_web_subdomain.lng
deleted file mode 100755
index b2003f0cfe8f3386b6d35f93ce40fb1f08f5279d..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/fi_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Lääni';
-$wb['ssl_locality_txt'] = 'Lokaali';
-$wb['ssl_organisation_txt'] = 'Organisaatio';
-$wb['ssl_organisation_unit_txt'] = 'Organisaatoyksikkö';
-$wb['ssl_country_txt'] = 'Maa';
-$wb['ssl_request_txt'] = 'SSL-pyyntö';
-$wb['ssl_cert_txt'] = 'SSL-sertifikaatti';
-$wb['ssl_bundle_txt'] = 'SSL-paketti';
-$wb['ssl_action_txt'] = 'SSL-toiminto';
-$wb['server_id_txt'] = 'Palvelin';
-$wb['domain_txt'] = 'Verkkotunnus';
-$wb['type_txt'] = 'Tyyppi';
-$wb['parent_domain_id_txt'] = 'Pääsivu';
-$wb['redirect_type_txt'] = 'Edelleenohjauksen tyyppi';
-$wb['redirect_path_txt'] = 'Edelleenohjausosoite';
-$wb['active_txt'] = 'Käytössä';
-$wb['document_root_txt'] = 'Dokumentikansio';
-$wb['system_user_txt'] = 'Linux-käyttäjä';
-$wb['system_group_txt'] = 'Käyttäjäryhmä';
-$wb['ip_address_txt'] = 'IP-osoite';
-$wb['vhost_type_txt'] = 'Virtuaali-isännän tyyppi';
-$wb['hd_quota_txt'] = 'Levytila';
-$wb['traffic_quota_txt'] = 'Liikenneraja';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Asiakas';
-$wb['limit_web_domain_txt'] = 'Käytttäjätunnuksella on jo sallittu määrä verkkotunnuksia.';
-$wb['limit_web_aliasdomain_txt'] = 'Käytttäjätunnuksella on jo sallittu määrä aliasverkkotunnuksia.';
-$wb['limit_web_subdomain_txt'] = 'Käytttäjätunnuksella on jo sallittu määrä aliverkkotunnuksia.';
-$wb['apache_directives_txt'] = 'Apachen direktiivit';
-$wb['domain_error_empty'] = 'Verkkotunnus-kenttä on tyhjä.';
-$wb['domain_error_unique'] = 'Tämä verkkotunnus on jo olemassa.';
-$wb['domain_error_regex'] = 'Verkkotunnus on vääränlainen.';
-$wb['host_txt'] = 'Isäntäkone';
-$wb['redirect_error_regex'] = 'VIrheellinen edelleenohjausosoite. Kelvollisia ovat esimerkiksi: /testi/ tai http://www.domain.tld/testi/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/fi_web_subdomain_list.lng b/interface/web/sites/lib/lang/fi_web_subdomain_list.lng
deleted file mode 100755
index 31fb17028aaad6c705eaf03022d7218d9d5bdd9e..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/fi_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Aliverkkotunnukset';
-$wb['active_txt'] = 'Käytössä';
-$wb['server_id_txt'] = 'Palvelin';
-$wb['parent_domain_id_txt'] = 'Pääverkkotunnus';
-$wb['domain_txt'] = 'Aliverkkotunnus';
-$wb['add_new_record_txt'] = 'Lisää uusi aliverkkotunnus';
-?>
diff --git a/interface/web/sites/lib/lang/fi_web_vhost_aliasdomain.lng b/interface/web/sites/lib/lang/fi_web_vhost_aliasdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/fi_web_vhost_aliasdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/fi_web_vhost_aliasdomain_list.lng b/interface/web/sites/lib/lang/fi_web_vhost_aliasdomain_list.lng
deleted file mode 100644
index bbea906d1b1af392b2ecced949259e67e06adee3..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/fi_web_vhost_aliasdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Aliasverkkotunnus';
-$wb['active_txt'] = 'Käytössä';
-$wb['server_id_txt'] = 'Palvelin';
-$wb['parent_domain_id_txt'] = 'Sivusto';
-$wb['domain_txt'] = 'Aliasverkkotunnus';
-$wb['add_new_record_txt'] = 'Lisää uusi aliasverkkotunnus';
-?>
diff --git a/interface/web/sites/lib/lang/fi_web_domain.lng b/interface/web/sites/lib/lang/fi_web_vhost_domain.lng
similarity index 95%
rename from interface/web/sites/lib/lang/fi_web_domain.lng
rename to interface/web/sites/lib/lang/fi_web_vhost_domain.lng
index b910463e71c9c99458a1529a6d86782811e901e5..20136b5a6a87b0d89da56bc75b80eb3e5c8e2d08 100755
--- a/interface/web/sites/lib/lang/fi_web_domain.lng
+++ b/interface/web/sites/lib/lang/fi_web_vhost_domain.lng
@@ -120,4 +120,10 @@ $wb['rewrite_rules_txt'] = 'Rewrite Rules';
$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['host_txt'] = 'Hostname';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+
?>
diff --git a/interface/web/sites/lib/lang/fi_web_domain_admin_list.lng b/interface/web/sites/lib/lang/fi_web_vhost_domain_admin_list.lng
similarity index 100%
rename from interface/web/sites/lib/lang/fi_web_domain_admin_list.lng
rename to interface/web/sites/lib/lang/fi_web_vhost_domain_admin_list.lng
diff --git a/interface/web/sites/lib/lang/fi_web_domain_list.lng b/interface/web/sites/lib/lang/fi_web_vhost_domain_list.lng
similarity index 85%
rename from interface/web/sites/lib/lang/fi_web_domain_list.lng
rename to interface/web/sites/lib/lang/fi_web_vhost_domain_list.lng
index 8f5691c2f8315fc08e96aeb0595fe78d269311bc..52c238cb1b55ed4ffa0b3f13e0e70b3a533fa598 100755
--- a/interface/web/sites/lib/lang/fi_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/fi_web_vhost_domain_list.lng
@@ -5,4 +5,6 @@ $wb['server_id_txt'] = 'Palvelin';
$wb['domain_txt'] = 'Verkkotunnus';
$wb['add_new_record_txt'] = 'Lisää uusi verkkotunnus';
$wb['domain_id_txt'] = 'Verkkotunnus';
+$wb['parent_domain_id_txt'] = 'Website';
+
?>
diff --git a/interface/web/sites/lib/lang/fi_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/fi_web_vhost_subdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/fi_web_vhost_subdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/fi_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/fi_web_vhost_subdomain_list.lng
deleted file mode 100644
index 1c16bcda288f146167a5a49221951769017f580b..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/fi_web_vhost_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Add new subdomain';
-?>
diff --git a/interface/web/sites/lib/lang/fr_web_aliasdomain.lng b/interface/web/sites/lib/lang/fr_web_aliasdomain.lng
deleted file mode 100644
index 4149c711493e6b6f06d0e99656a1c65744d4ec46..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/fr_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/fr_web_childdomain.lng b/interface/web/sites/lib/lang/fr_web_childdomain.lng
new file mode 100644
index 0000000000000000000000000000000000000000..3811620513775bfeb4c0ec91d0a471ab10630fad
--- /dev/null
+++ b/interface/web/sites/lib/lang/fr_web_childdomain.lng
@@ -0,0 +1,119 @@
+<?php
+$wb['ssl_state_txt'] = 'Pays';
+$wb['ssl_locality_txt'] = 'Lieu';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Unité dorganisation';
+$wb['ssl_country_txt'] = 'Pays';
+$wb['ssl_request_txt'] = 'Requête SSL';
+$wb['ssl_cert_txt'] = 'Certificat SSL';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'Action SSL';
+$wb['server_id_txt'] = 'Serveur';
+$wb['domain_txt'] = 'Domaine';
+$wb['type_txt'] = 'Type';
+$wb['parent_domain_id_txt'] = 'Site web parent';
+$wb['redirect_type_txt'] = 'Type de redirection';
+$wb['redirect_path_txt'] = 'Chemin de redirection';
+$wb['active_txt'] = 'Actif';
+$wb['document_root_txt'] = 'Racine du document';
+$wb['system_user_txt'] = 'Utilisateur Linux';
+$wb['system_group_txt'] = 'Groupe Linux';
+$wb['ip_address_txt'] = 'Adresse IP';
+$wb['vhost_type_txt'] = 'Type de VHost';
+$wb['hd_quota_txt'] = 'Quota disque';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$wb['limit_web_domain_txt'] = 'Le nombre maximum de noms de domaine pour votre compte a été atteint.';
+$wb['limit_web_aliasdomain_txt'] = 'Le nombre maximum d\'alias de domaine pour votre compte a été atteint.';
+$wb['limit_web_subdomain_txt'] = 'Le nombre maximum de sous-domaines pour votre compte a été atteint.';
+$wb['apache_directives_txt'] = 'Directives Apache';
+$wb['domain_error_empty'] = 'Le nom de domaine est vide.';
+$wb['domain_error_unique'] = 'Le nom de domaine doit être unique.';
+$wb['domain_error_regex'] = 'Le nom de domaine est invalide.';
+$wb['host_txt'] = 'Hôte';
+$wb['traffic_quota_txt'] = 'Quota de trafic';
+$wb['redirect_error_regex'] = 'Chemin de redirection invalide. Exemples de redirections valides: /test/ ou http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'Aucune redirecton';
+$wb['no_flag_txt'] = 'Aucun flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -> www';
+$wb['www_to_non_www_txt'] = 'www -> non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
+$wb['Domain'] = 'Aliasdomain';
+
+?>
diff --git a/interface/web/sites/lib/lang/fr_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/fr_web_childdomain_list.lng
similarity index 75%
rename from interface/web/sites/lib/lang/fr_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/fr_web_childdomain_list.lng
index 5837931f69aabf4877960114a8146ccc52fc97a1..4f8768bac0283efc9d635b0f99d5a2c58f7f83ca 100644
--- a/interface/web/sites/lib/lang/fr_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/fr_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Alias de domaine';
+$wb['list_head_txt'] = 'Sous-domaines';
$wb['active_txt'] = 'Actif';
$wb['server_id_txt'] = 'Serveur';
$wb['parent_domain_id_txt'] = 'Site web';
-$wb['domain_txt'] = 'Alias de domaine';
-$wb['add_new_record_txt'] = 'Nouvel alias de domaine';
+$wb['domain_txt'] = 'Sous-domaine';
+$wb['add_new_record_txt'] = 'Nouveau sous-domaine';
$wb['domain_error_empty'] = 'Le nom de domaine est vide.';
$wb['domain_error_unique'] = 'Le nom de domaine doit être unique.';
$wb['domain_error_regex'] = 'Le nom de domaine est invalide.';
$wb['no_redirect_txt'] = 'Aucune redirection';
$wb['no_flag_txt'] = 'Aucun flag';
$wb['none_txt'] = 'Aucun';
+
?>
diff --git a/interface/web/sites/lib/lang/fr_web_subdomain.lng b/interface/web/sites/lib/lang/fr_web_subdomain.lng
deleted file mode 100644
index e28106f5812e3cb019b94f47bbfe2be116f01920..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/fr_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Pays';
-$wb['ssl_locality_txt'] = 'Lieu';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Unité dorganisation';
-$wb['ssl_country_txt'] = 'Pays';
-$wb['ssl_request_txt'] = 'Requête SSL';
-$wb['ssl_cert_txt'] = 'Certificat SSL';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'Action SSL';
-$wb['server_id_txt'] = 'Serveur';
-$wb['domain_txt'] = 'Domaine';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Site web parent';
-$wb['redirect_type_txt'] = 'Type de redirection';
-$wb['redirect_path_txt'] = 'Chemin de redirection';
-$wb['active_txt'] = 'Actif';
-$wb['document_root_txt'] = 'Racine du document';
-$wb['system_user_txt'] = 'Utilisateur Linux';
-$wb['system_group_txt'] = 'Groupe Linux';
-$wb['ip_address_txt'] = 'Adresse IP';
-$wb['vhost_type_txt'] = 'Type de VHost';
-$wb['hd_quota_txt'] = 'Quota disque';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'Le nombre maximum de noms de domaine pour votre compte a été atteint.';
-$wb['limit_web_aliasdomain_txt'] = 'Le nombre maximum d\'alias de domaine pour votre compte a été atteint.';
-$wb['limit_web_subdomain_txt'] = 'Le nombre maximum de sous-domaines pour votre compte a été atteint.';
-$wb['apache_directives_txt'] = 'Directives Apache';
-$wb['domain_error_empty'] = 'Le nom de domaine est vide.';
-$wb['domain_error_unique'] = 'Le nom de domaine doit être unique.';
-$wb['domain_error_regex'] = 'Le nom de domaine est invalide.';
-$wb['host_txt'] = 'Hôte';
-$wb['traffic_quota_txt'] = 'Quota de trafic';
-$wb['redirect_error_regex'] = 'Chemin de redirection invalide. Exemples de redirections valides: /test/ ou http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'Aucune redirecton';
-$wb['no_flag_txt'] = 'Aucun flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/fr_web_subdomain_list.lng b/interface/web/sites/lib/lang/fr_web_subdomain_list.lng
deleted file mode 100644
index 9bfbd30f2ee8c619dd920925c8e478fba3ee576b..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/fr_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Sous-domaines';
-$wb['active_txt'] = 'Actif';
-$wb['server_id_txt'] = 'Serveur';
-$wb['parent_domain_id_txt'] = 'Site web';
-$wb['domain_txt'] = 'Sous-domaine';
-$wb['add_new_record_txt'] = 'Nouveau sous-domaine';
-?>
diff --git a/interface/web/sites/lib/lang/fr_web_vhost_aliasdomain.lng b/interface/web/sites/lib/lang/fr_web_vhost_aliasdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/fr_web_vhost_aliasdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/fr_web_vhost_aliasdomain_list.lng b/interface/web/sites/lib/lang/fr_web_vhost_aliasdomain_list.lng
deleted file mode 100644
index 0c6ab59b5cdf30a5baf0044d7a582baa823f0397..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/fr_web_vhost_aliasdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Alias de domaine';
-$wb['active_txt'] = 'Actif';
-$wb['server_id_txt'] = 'Serveur';
-$wb['parent_domain_id_txt'] = 'Site web';
-$wb['domain_txt'] = 'Alias de domaine';
-$wb['add_new_record_txt'] = 'Nouvel alias de domaine';
-?>
diff --git a/interface/web/sites/lib/lang/fr_web_domain.lng b/interface/web/sites/lib/lang/fr_web_vhost_domain.lng
similarity index 95%
rename from interface/web/sites/lib/lang/fr_web_domain.lng
rename to interface/web/sites/lib/lang/fr_web_vhost_domain.lng
index 79971f8598b6e67bf777ee2e648788ca5033599f..20f9b611265841ea88fc2f8ad415b90d734415a4 100644
--- a/interface/web/sites/lib/lang/fr_web_domain.lng
+++ b/interface/web/sites/lib/lang/fr_web_vhost_domain.lng
@@ -121,4 +121,10 @@ $wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
$wb['server_chosen_not_ok'] = 'Le serveur choisi n\'est pas autorisé pour ce compte.';
-?>
\ No newline at end of file
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['host_txt'] = 'Hostname';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+
+?>
diff --git a/interface/web/sites/lib/lang/fr_web_domain_admin_list.lng b/interface/web/sites/lib/lang/fr_web_vhost_domain_admin_list.lng
similarity index 100%
rename from interface/web/sites/lib/lang/fr_web_domain_admin_list.lng
rename to interface/web/sites/lib/lang/fr_web_vhost_domain_admin_list.lng
diff --git a/interface/web/sites/lib/lang/fr_web_domain_list.lng b/interface/web/sites/lib/lang/fr_web_vhost_domain_list.lng
similarity index 83%
rename from interface/web/sites/lib/lang/fr_web_domain_list.lng
rename to interface/web/sites/lib/lang/fr_web_vhost_domain_list.lng
index ddf66f8d91a84acc394ceace0f34a1be43486180..ba3584b27bf59cc0adf12db746f93ba28b15a581 100644
--- a/interface/web/sites/lib/lang/fr_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/fr_web_vhost_domain_list.lng
@@ -5,4 +5,6 @@ $wb['active_txt'] = 'Actif';
$wb['server_id_txt'] = 'Serveur';
$wb['domain_txt'] = 'Domaine';
$wb['add_new_record_txt'] = 'Nouveau site web';
+$wb['parent_domain_id_txt'] = 'Website';
+
?>
diff --git a/interface/web/sites/lib/lang/fr_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/fr_web_vhost_subdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/fr_web_vhost_subdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/fr_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/fr_web_vhost_subdomain_list.lng
deleted file mode 100644
index 1c16bcda288f146167a5a49221951769017f580b..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/fr_web_vhost_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Add new subdomain';
-?>
diff --git a/interface/web/sites/lib/lang/hr_web_aliasdomain.lng b/interface/web/sites/lib/lang/hr_web_aliasdomain.lng
deleted file mode 100644
index 4149c711493e6b6f06d0e99656a1c65744d4ec46..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/hr_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/hr_web_childdomain.lng b/interface/web/sites/lib/lang/hr_web_childdomain.lng
new file mode 100644
index 0000000000000000000000000000000000000000..6866b6f52b55ba3e657b450004bf2ed7bcbba809
--- /dev/null
+++ b/interface/web/sites/lib/lang/hr_web_childdomain.lng
@@ -0,0 +1,119 @@
+<?php
+$wb['ssl_state_txt'] = 'Županija';
+$wb['ssl_locality_txt'] = 'Lokacija';
+$wb['ssl_organisation_txt'] = 'Organizacija';
+$wb['ssl_organisation_unit_txt'] = 'Organizacijski dio';
+$wb['ssl_country_txt'] = 'Država';
+$wb['ssl_request_txt'] = 'SSL zahtjev';
+$wb['ssl_cert_txt'] = 'SSL certifikat';
+$wb['ssl_bundle_txt'] = 'SSL paket';
+$wb['ssl_action_txt'] = 'SSL akcija';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domena';
+$wb['type_txt'] = 'Vrsta';
+$wb['parent_domain_id_txt'] = 'PoÄetna web stranica';
+$wb['redirect_type_txt'] = 'Vrsta redirekcije';
+$wb['redirect_path_txt'] = 'Redirekcijska putanja';
+$wb['active_txt'] = 'Aktivno';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux korisnik';
+$wb['system_group_txt'] = 'Linux grupa';
+$wb['ip_address_txt'] = 'IP adresa';
+$wb['vhost_type_txt'] = 'Vrsta VHosta';
+$wb['hd_quota_txt'] = 'Kvota diska';
+$wb['traffic_quota_txt'] = 'Promet web stranice';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Klijent';
+$wb['limit_web_domain_txt'] = 'Iskorišten je maksimalan broj domena.';
+$wb['limit_web_aliasdomain_txt'] = 'Iskorišten je maksimalan broj alias domena.';
+$wb['limit_web_subdomain_txt'] = 'Iskorišten je maksimalan broj poddomena.';
+$wb['apache_directives_txt'] = 'Apache direktive';
+$wb['domain_error_empty'] = 'Naziv domene je prazan.';
+$wb['domain_error_unique'] = 'Već postoji web stranica ili poddomena / alias sa nazivom te domene.';
+$wb['domain_error_regex'] = 'Naziv domene je neispravan.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Neispravna putanja redirekcije. Ispravne redirekcije su npr.: /test/ ili http://www.domena.tld/test/';
+$wb['no_redirect_txt'] = 'Bez redirekcije';
+$wb['no_flag_txt'] = 'Bez markiranja';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -> www';
+$wb['www_to_non_www_txt'] = 'www -> non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
+$wb['Domain'] = 'Aliasdomain';
+
+?>
diff --git a/interface/web/sites/lib/lang/hr_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/hr_web_childdomain_list.lng
similarity index 75%
rename from interface/web/sites/lib/lang/hr_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/hr_web_childdomain_list.lng
index 0b45aff791bd99426887384c02ecbb6f8dcbdf00..c8a344bf2f516e5c60e452c2d492971098d1b850 100644
--- a/interface/web/sites/lib/lang/hr_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/hr_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Alias domena';
+$wb['list_head_txt'] = 'Poddomene';
$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Web stranica';
-$wb['domain_txt'] = 'Alias domena';
-$wb['add_new_record_txt'] = 'Dodaj novu alias domenu';
+$wb['domain_txt'] = 'Poddomena';
+$wb['add_new_record_txt'] = 'Dodaj novu poddomenu';
$wb['domain_error_empty'] = 'Domena nije upisana.';
$wb['domain_error_unique'] = 'Domena mora biti unikatna.';
$wb['domain_error_regex'] = 'Nazive domene nije ispravan.';
$wb['no_redirect_txt'] = 'Bez redirekcije';
$wb['no_flag_txt'] = 'Bez oznaÄavanja';
$wb['none_txt'] = 'Ništa';
+
?>
diff --git a/interface/web/sites/lib/lang/hr_web_subdomain.lng b/interface/web/sites/lib/lang/hr_web_subdomain.lng
deleted file mode 100644
index 5ea6fff25b369f3e0005d5756e3ef4319cce35fa..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/hr_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Županija';
-$wb['ssl_locality_txt'] = 'Lokacija';
-$wb['ssl_organisation_txt'] = 'Organizacija';
-$wb['ssl_organisation_unit_txt'] = 'Organizacijski dio';
-$wb['ssl_country_txt'] = 'Država';
-$wb['ssl_request_txt'] = 'SSL zahtjev';
-$wb['ssl_cert_txt'] = 'SSL certifikat';
-$wb['ssl_bundle_txt'] = 'SSL paket';
-$wb['ssl_action_txt'] = 'SSL akcija';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domena';
-$wb['type_txt'] = 'Vrsta';
-$wb['parent_domain_id_txt'] = 'PoÄetna web stranica';
-$wb['redirect_type_txt'] = 'Vrsta redirekcije';
-$wb['redirect_path_txt'] = 'Redirekcijska putanja';
-$wb['active_txt'] = 'Aktivno';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux korisnik';
-$wb['system_group_txt'] = 'Linux grupa';
-$wb['ip_address_txt'] = 'IP adresa';
-$wb['vhost_type_txt'] = 'Vrsta VHosta';
-$wb['hd_quota_txt'] = 'Kvota diska';
-$wb['traffic_quota_txt'] = 'Promet web stranice';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Klijent';
-$wb['limit_web_domain_txt'] = 'Iskorišten je maksimalan broj domena.';
-$wb['limit_web_aliasdomain_txt'] = 'Iskorišten je maksimalan broj alias domena.';
-$wb['limit_web_subdomain_txt'] = 'Iskorišten je maksimalan broj poddomena.';
-$wb['apache_directives_txt'] = 'Apache direktive';
-$wb['domain_error_empty'] = 'Naziv domene je prazan.';
-$wb['domain_error_unique'] = 'Već postoji web stranica ili poddomena / alias sa nazivom te domene.';
-$wb['domain_error_regex'] = 'Naziv domene je neispravan.';
-$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Neispravna putanja redirekcije. Ispravne redirekcije su npr.: /test/ ili http://www.domena.tld/test/';
-$wb['no_redirect_txt'] = 'Bez redirekcije';
-$wb['no_flag_txt'] = 'Bez markiranja';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/hr_web_subdomain_list.lng b/interface/web/sites/lib/lang/hr_web_subdomain_list.lng
deleted file mode 100644
index 942454e1175a03adc39506cc4a4a7b0966150ce2..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/hr_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Poddomene';
-$wb['active_txt'] = 'Aktivno';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Web stranica';
-$wb['domain_txt'] = 'Poddomena';
-$wb['add_new_record_txt'] = 'Dodaj novu poddomenu';
-?>
diff --git a/interface/web/sites/lib/lang/hr_web_vhost_aliasdomain.lng b/interface/web/sites/lib/lang/hr_web_vhost_aliasdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/hr_web_vhost_aliasdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/hr_web_vhost_aliasdomain_list.lng b/interface/web/sites/lib/lang/hr_web_vhost_aliasdomain_list.lng
deleted file mode 100644
index 79ee85dfe196de0d2fcf80dde66d461413780c0e..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/hr_web_vhost_aliasdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Alias domena';
-$wb['active_txt'] = 'Aktivno';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Web stranica';
-$wb['domain_txt'] = 'Alias domena';
-$wb['add_new_record_txt'] = 'Dodaj novu alias domenu';
-?>
diff --git a/interface/web/sites/lib/lang/hr_web_domain.lng b/interface/web/sites/lib/lang/hr_web_vhost_domain.lng
similarity index 95%
rename from interface/web/sites/lib/lang/hr_web_domain.lng
rename to interface/web/sites/lib/lang/hr_web_vhost_domain.lng
index b14d67a24808e326a374eeee658e05c024898b95..40743885e6ac4492c074821e9494264a004c3849 100644
--- a/interface/web/sites/lib/lang/hr_web_domain.lng
+++ b/interface/web/sites/lib/lang/hr_web_vhost_domain.lng
@@ -120,4 +120,10 @@ $wb['rewrite_rules_txt'] = 'Rewrite Rules';
$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['host_txt'] = 'Hostname';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+
?>
diff --git a/interface/web/sites/lib/lang/hr_web_domain_admin_list.lng b/interface/web/sites/lib/lang/hr_web_vhost_domain_admin_list.lng
similarity index 100%
rename from interface/web/sites/lib/lang/hr_web_domain_admin_list.lng
rename to interface/web/sites/lib/lang/hr_web_vhost_domain_admin_list.lng
diff --git a/interface/web/sites/lib/lang/hr_web_domain_list.lng b/interface/web/sites/lib/lang/hr_web_vhost_domain_list.lng
similarity index 84%
rename from interface/web/sites/lib/lang/hr_web_domain_list.lng
rename to interface/web/sites/lib/lang/hr_web_vhost_domain_list.lng
index 2f85d7cd45418d05c45b0c75bef72a4bdc2482ef..cbb82a63a52ceedf64bf9008150954f993897f0c 100644
--- a/interface/web/sites/lib/lang/hr_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/hr_web_vhost_domain_list.lng
@@ -5,4 +5,6 @@ $wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Domena';
$wb['add_new_record_txt'] = 'Dodaj novu web stranicu';
+$wb['parent_domain_id_txt'] = 'Website';
+
?>
diff --git a/interface/web/sites/lib/lang/hr_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/hr_web_vhost_subdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/hr_web_vhost_subdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/hr_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/hr_web_vhost_subdomain_list.lng
deleted file mode 100644
index 1c16bcda288f146167a5a49221951769017f580b..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/hr_web_vhost_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Add new subdomain';
-?>
diff --git a/interface/web/sites/lib/lang/hu_web_aliasdomain.lng b/interface/web/sites/lib/lang/hu_web_aliasdomain.lng
deleted file mode 100644
index 4149c711493e6b6f06d0e99656a1c65744d4ec46..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/hu_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/hu_web_childdomain.lng b/interface/web/sites/lib/lang/hu_web_childdomain.lng
new file mode 100644
index 0000000000000000000000000000000000000000..c156b2e52e975578e1ebae7ebb573ccd59e841db
--- /dev/null
+++ b/interface/web/sites/lib/lang/hu_web_childdomain.lng
@@ -0,0 +1,119 @@
+<?php
+$wb['ssl_state_txt'] = 'Megye';
+$wb['ssl_locality_txt'] = 'Város';
+$wb['ssl_organisation_txt'] = 'Cég';
+$wb['ssl_organisation_unit_txt'] = 'Osztály';
+$wb['ssl_country_txt'] = 'Ország';
+$wb['ssl_request_txt'] = 'SSL Kérés';
+$wb['ssl_cert_txt'] = 'SSL TanúsÃtvány';
+$wb['ssl_bundle_txt'] = 'SSL Csomag';
+$wb['ssl_action_txt'] = 'SSL Akció';
+$wb['server_id_txt'] = 'Szrver';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'TÃpus';
+$wb['parent_domain_id_txt'] = 'Szülő webhely';
+$wb['redirect_type_txt'] = 'ÃtirányÃtás tÃpusa';
+$wb['redirect_path_txt'] = 'Az Ãtirányitás útvonala';
+$wb['active_txt'] = 'AktÃv';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux Felhasználó';
+$wb['system_group_txt'] = 'Linux Csoport';
+$wb['ip_address_txt'] = 'IP-cÃm';
+$wb['vhost_type_txt'] = 'VHost TÃpus';
+$wb['hd_quota_txt'] = 'Tárhely Kvóta';
+$wb['traffic_quota_txt'] = 'Forgalom Kvóta';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Ügyfél';
+$wb['limit_web_domain_txt'] = 'Nincs több weboldal lehetőség.';
+$wb['limit_web_aliasdomain_txt'] = 'Nincs több aliasdomain lehetőség';
+$wb['limit_web_subdomain_txt'] = 'Nincs több aldomain lehetőség.';
+$wb['apache_directives_txt'] = 'Apache direktivák';
+$wb['domain_error_empty'] = 'A Domain üres';
+$wb['domain_error_unique'] = 'A Domain már foglalt.';
+$wb['domain_error_regex'] = 'A Domain név érvénytelen';
+$wb['host_txt'] = 'Ãllomás';
+$wb['no_redirect_txt'] = 'Nincs átirányÃtás';
+$wb['no_flag_txt'] = 'No flag';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -> www';
+$wb['www_to_non_www_txt'] = 'www -> non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
+$wb['Domain'] = 'Aliasdomain';
+
+?>
diff --git a/interface/web/sites/lib/lang/hu_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/hu_web_childdomain_list.lng
similarity index 66%
rename from interface/web/sites/lib/lang/hu_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/hu_web_childdomain_list.lng
index 955316b15421a4a5425c7f349daa94b91694eed2..e40ed1e600c5721e7780edeb8d23df5f55ee20ba 100644
--- a/interface/web/sites/lib/lang/hu_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/hu_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Aliasdomain';
+$wb['list_head_txt'] = 'Aldomainek';
$wb['active_txt'] = 'AktÃv';
$wb['server_id_txt'] = 'Szerver';
-$wb['parent_domain_id_txt'] = 'Webhely';
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['add_new_record_txt'] = 'Új Aliasdomain';
+$wb['parent_domain_id_txt'] = 'Weboldal';
+$wb['domain_txt'] = 'aldomain';
+$wb['add_new_record_txt'] = 'Új Aldomain';
$wb['domain_error_empty'] = 'Domain üres';
$wb['domain_error_unique'] = 'Domain már foglalt.';
$wb['domain_error_regex'] = 'Domain név hibás.';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'None';
+
?>
diff --git a/interface/web/sites/lib/lang/hu_web_subdomain.lng b/interface/web/sites/lib/lang/hu_web_subdomain.lng
deleted file mode 100644
index b629c3fe5d777a64c62b9bdce203a82356af8d65..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/hu_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Megye';
-$wb['ssl_locality_txt'] = 'Város';
-$wb['ssl_organisation_txt'] = 'Cég';
-$wb['ssl_organisation_unit_txt'] = 'Osztály';
-$wb['ssl_country_txt'] = 'Ország';
-$wb['ssl_request_txt'] = 'SSL Kérés';
-$wb['ssl_cert_txt'] = 'SSL TanúsÃtvány';
-$wb['ssl_bundle_txt'] = 'SSL Csomag';
-$wb['ssl_action_txt'] = 'SSL Akció';
-$wb['server_id_txt'] = 'Szrver';
-$wb['domain_txt'] = 'Domain';
-$wb['type_txt'] = 'TÃpus';
-$wb['parent_domain_id_txt'] = 'Szülő webhely';
-$wb['redirect_type_txt'] = 'ÃtirányÃtás tÃpusa';
-$wb['redirect_path_txt'] = 'Az Ãtirányitás útvonala';
-$wb['active_txt'] = 'AktÃv';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux Felhasználó';
-$wb['system_group_txt'] = 'Linux Csoport';
-$wb['ip_address_txt'] = 'IP-cÃm';
-$wb['vhost_type_txt'] = 'VHost TÃpus';
-$wb['hd_quota_txt'] = 'Tárhely Kvóta';
-$wb['traffic_quota_txt'] = 'Forgalom Kvóta';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Ügyfél';
-$wb['limit_web_domain_txt'] = 'Nincs több weboldal lehetőség.';
-$wb['limit_web_aliasdomain_txt'] = 'Nincs több aliasdomain lehetőség';
-$wb['limit_web_subdomain_txt'] = 'Nincs több aldomain lehetőség.';
-$wb['apache_directives_txt'] = 'Apache direktivák';
-$wb['domain_error_empty'] = 'A Domain üres';
-$wb['domain_error_unique'] = 'A Domain már foglalt.';
-$wb['domain_error_regex'] = 'A Domain név érvénytelen';
-$wb['host_txt'] = 'Ãllomás';
-$wb['no_redirect_txt'] = 'Nincs átirányÃtás';
-$wb['no_flag_txt'] = 'No flag';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/hu_web_subdomain_list.lng b/interface/web/sites/lib/lang/hu_web_subdomain_list.lng
deleted file mode 100644
index 65aade6d4b172d6986c093bc5029fa6a7310e528..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/hu_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Aldomainek';
-$wb['active_txt'] = 'AktÃv';
-$wb['server_id_txt'] = 'Szerver';
-$wb['parent_domain_id_txt'] = 'Weboldal';
-$wb['domain_txt'] = 'aldomain';
-$wb['add_new_record_txt'] = 'Új Aldomain';
-?>
diff --git a/interface/web/sites/lib/lang/hu_web_vhost_aliasdomain.lng b/interface/web/sites/lib/lang/hu_web_vhost_aliasdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/hu_web_vhost_aliasdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/hu_web_vhost_aliasdomain_list.lng b/interface/web/sites/lib/lang/hu_web_vhost_aliasdomain_list.lng
deleted file mode 100644
index 8fe58ed568ea47a77a36a3245347b8c4ff7bbac8..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/hu_web_vhost_aliasdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Aliasdomain';
-$wb['active_txt'] = 'AktÃv';
-$wb['server_id_txt'] = 'Szerver';
-$wb['parent_domain_id_txt'] = 'Webhely';
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['add_new_record_txt'] = 'Új Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/hu_web_domain.lng b/interface/web/sites/lib/lang/hu_web_vhost_domain.lng
similarity index 95%
rename from interface/web/sites/lib/lang/hu_web_domain.lng
rename to interface/web/sites/lib/lang/hu_web_vhost_domain.lng
index 0e53fae4d02fb7bfc152c2058f9be716734d0ca9..30236db6217e0bd913e374f7b4c24a94d4afd0e5 100644
--- a/interface/web/sites/lib/lang/hu_web_domain.lng
+++ b/interface/web/sites/lib/lang/hu_web_vhost_domain.lng
@@ -120,4 +120,10 @@ $wb['rewrite_rules_txt'] = 'Rewrite Rules';
$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['host_txt'] = 'Hostname';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+
?>
diff --git a/interface/web/sites/lib/lang/hu_web_domain_admin_list.lng b/interface/web/sites/lib/lang/hu_web_vhost_domain_admin_list.lng
similarity index 100%
rename from interface/web/sites/lib/lang/hu_web_domain_admin_list.lng
rename to interface/web/sites/lib/lang/hu_web_vhost_domain_admin_list.lng
diff --git a/interface/web/sites/lib/lang/hu_web_domain_list.lng b/interface/web/sites/lib/lang/hu_web_vhost_domain_list.lng
similarity index 83%
rename from interface/web/sites/lib/lang/hu_web_domain_list.lng
rename to interface/web/sites/lib/lang/hu_web_vhost_domain_list.lng
index 0363b1cc2efa8a57d3c87bb668310b15d5ec43d1..832fa634b31b7bef585edd0bf0dbd0e109b3a677 100644
--- a/interface/web/sites/lib/lang/hu_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/hu_web_vhost_domain_list.lng
@@ -5,4 +5,6 @@ $wb['active_txt'] = 'AktÃv';
$wb['server_id_txt'] = 'Szerver';
$wb['domain_txt'] = 'Domain';
$wb['add_new_record_txt'] = 'Új Webhely';
+$wb['parent_domain_id_txt'] = 'Website';
+
?>
diff --git a/interface/web/sites/lib/lang/hu_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/hu_web_vhost_subdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/hu_web_vhost_subdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/hu_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/hu_web_vhost_subdomain_list.lng
deleted file mode 100644
index 1c16bcda288f146167a5a49221951769017f580b..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/hu_web_vhost_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Add new subdomain';
-?>
diff --git a/interface/web/sites/lib/lang/id_web_aliasdomain.lng b/interface/web/sites/lib/lang/id_web_aliasdomain.lng
deleted file mode 100644
index 4149c711493e6b6f06d0e99656a1c65744d4ec46..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/id_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/id_web_childdomain.lng b/interface/web/sites/lib/lang/id_web_childdomain.lng
new file mode 100644
index 0000000000000000000000000000000000000000..91abd0a4d7361a22920b27514db40da94843eebc
--- /dev/null
+++ b/interface/web/sites/lib/lang/id_web_childdomain.lng
@@ -0,0 +1,119 @@
+<?php
+$wb['ssl_state_txt'] = 'Negara Bagian';
+$wb['ssl_locality_txt'] = 'Daerah';
+$wb['ssl_organisation_txt'] = 'Organisasi';
+$wb['ssl_organisation_unit_txt'] = 'Unit Organisasi';
+$wb['ssl_country_txt'] = 'Negara';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'Sertifikat SSL';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'Tipe';
+$wb['parent_domain_id_txt'] = 'Situs Web Induk';
+$wb['redirect_type_txt'] = 'Tipe Pengalihan';
+$wb['redirect_path_txt'] = 'Path Pengalihan';
+$wb['active_txt'] = 'Aktif';
+$wb['document_root_txt'] = 'Root Dokumen';
+$wb['system_user_txt'] = 'Pengguna Linux';
+$wb['system_group_txt'] = 'Grup Linux';
+$wb['ip_address_txt'] = 'Alamat IP';
+$wb['vhost_type_txt'] = 'Tipe VHost';
+$wb['hd_quota_txt'] = 'Kuota Harddisk';
+$wb['traffic_quota_txt'] = 'Kuota Trafik';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Klien';
+$wb['limit_web_domain_txt'] = 'Jumlah maks domain web untuk akun Anda telah tercapai.';
+$wb['limit_web_aliasdomain_txt'] = 'Jumlah maks aliasdomain untuk akun Anda telah tercapai.';
+$wb['limit_web_subdomain_txt'] = 'Jumlah maks subdomain web untuk akun Anda telah tercapai.';
+$wb['apache_directives_txt'] = 'Perintah-perintah Apache';
+$wb['domain_error_empty'] = 'Domain kosong.';
+$wb['domain_error_unique'] = 'Sudah ada situs web atau sub / aliasdomain pada nama domain ini.';
+$wb['domain_error_regex'] = 'Nama Domain tidak valid.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Path pengalihan tidak valid. Contoh pengalihan yang valid: /test/ or http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -> www';
+$wb['www_to_non_www_txt'] = 'www -> non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
+$wb['Domain'] = 'Aliasdomain';
+
+?>
diff --git a/interface/web/sites/lib/lang/id_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/id_web_childdomain_list.lng
similarity index 73%
rename from interface/web/sites/lib/lang/id_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/id_web_childdomain_list.lng
index e28071cbb3136b46ff9a3c7db8d7bee34f8e9c2c..27205198b6b36f2aa2e3bdfc8618b3e67e9977ed 100644
--- a/interface/web/sites/lib/lang/id_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/id_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Alias Domain';
+$wb['list_head_txt'] = 'Subdomain';
$wb['active_txt'] = 'Aktif';
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Situs Web';
-$wb['domain_txt'] = 'Alias Domain';
-$wb['add_new_record_txt'] = 'Tambah Alias Domain Baru';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Tambah Subdomain Baru';
$wb['domain_error_empty'] = 'Domain kosong.';
$wb['domain_error_unique'] = 'Domain harus unik.';
$wb['domain_error_regex'] = 'Nama Domain tidak valid.';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'None';
+
?>
diff --git a/interface/web/sites/lib/lang/id_web_subdomain.lng b/interface/web/sites/lib/lang/id_web_subdomain.lng
deleted file mode 100644
index 79672f6febe1807c515c33a3ca34dfd38254b47d..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/id_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Negara Bagian';
-$wb['ssl_locality_txt'] = 'Daerah';
-$wb['ssl_organisation_txt'] = 'Organisasi';
-$wb['ssl_organisation_unit_txt'] = 'Unit Organisasi';
-$wb['ssl_country_txt'] = 'Negara';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'Sertifikat SSL';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['type_txt'] = 'Tipe';
-$wb['parent_domain_id_txt'] = 'Situs Web Induk';
-$wb['redirect_type_txt'] = 'Tipe Pengalihan';
-$wb['redirect_path_txt'] = 'Path Pengalihan';
-$wb['active_txt'] = 'Aktif';
-$wb['document_root_txt'] = 'Root Dokumen';
-$wb['system_user_txt'] = 'Pengguna Linux';
-$wb['system_group_txt'] = 'Grup Linux';
-$wb['ip_address_txt'] = 'Alamat IP';
-$wb['vhost_type_txt'] = 'Tipe VHost';
-$wb['hd_quota_txt'] = 'Kuota Harddisk';
-$wb['traffic_quota_txt'] = 'Kuota Trafik';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Klien';
-$wb['limit_web_domain_txt'] = 'Jumlah maks domain web untuk akun Anda telah tercapai.';
-$wb['limit_web_aliasdomain_txt'] = 'Jumlah maks aliasdomain untuk akun Anda telah tercapai.';
-$wb['limit_web_subdomain_txt'] = 'Jumlah maks subdomain web untuk akun Anda telah tercapai.';
-$wb['apache_directives_txt'] = 'Perintah-perintah Apache';
-$wb['domain_error_empty'] = 'Domain kosong.';
-$wb['domain_error_unique'] = 'Sudah ada situs web atau sub / aliasdomain pada nama domain ini.';
-$wb['domain_error_regex'] = 'Nama Domain tidak valid.';
-$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Path pengalihan tidak valid. Contoh pengalihan yang valid: /test/ or http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/id_web_subdomain_list.lng b/interface/web/sites/lib/lang/id_web_subdomain_list.lng
deleted file mode 100644
index a231bc75606a56281792f0ed21b4f35f6b4085c7..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/id_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomain';
-$wb['active_txt'] = 'Aktif';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Situs Web';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Tambah Subdomain Baru';
-?>
diff --git a/interface/web/sites/lib/lang/id_web_vhost_aliasdomain.lng b/interface/web/sites/lib/lang/id_web_vhost_aliasdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/id_web_vhost_aliasdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/id_web_vhost_aliasdomain_list.lng b/interface/web/sites/lib/lang/id_web_vhost_aliasdomain_list.lng
deleted file mode 100644
index b4aa9e0a1aeb41a356f4f1107b3eda5d07b1ff8f..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/id_web_vhost_aliasdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Alias Domain';
-$wb['active_txt'] = 'Aktif';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Situs Web';
-$wb['domain_txt'] = 'Alias Domain';
-$wb['add_new_record_txt'] = 'Tambah Alias Domain Baru';
-?>
diff --git a/interface/web/sites/lib/lang/id_web_domain.lng b/interface/web/sites/lib/lang/id_web_vhost_domain.lng
similarity index 95%
rename from interface/web/sites/lib/lang/id_web_domain.lng
rename to interface/web/sites/lib/lang/id_web_vhost_domain.lng
index 0d240c93f5a77e1fc957417b8dca69d1ebec81f7..e633ec32a99385e4ae533dfcc946d8d03a26d7a8 100644
--- a/interface/web/sites/lib/lang/id_web_domain.lng
+++ b/interface/web/sites/lib/lang/id_web_vhost_domain.lng
@@ -120,4 +120,10 @@ $wb['rewrite_rules_txt'] = 'Rewrite Rules';
$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['host_txt'] = 'Hostname';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+
?>
diff --git a/interface/web/sites/lib/lang/id_web_domain_admin_list.lng b/interface/web/sites/lib/lang/id_web_vhost_domain_admin_list.lng
similarity index 100%
rename from interface/web/sites/lib/lang/id_web_domain_admin_list.lng
rename to interface/web/sites/lib/lang/id_web_vhost_domain_admin_list.lng
diff --git a/interface/web/sites/lib/lang/id_web_domain_list.lng b/interface/web/sites/lib/lang/id_web_vhost_domain_list.lng
similarity index 83%
rename from interface/web/sites/lib/lang/id_web_domain_list.lng
rename to interface/web/sites/lib/lang/id_web_vhost_domain_list.lng
index ba627a2f4a91fcfbdbee849c082cf06fef88dceb..080c9d89a6943427aadbcaab32c62c12c2764949 100644
--- a/interface/web/sites/lib/lang/id_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/id_web_vhost_domain_list.lng
@@ -5,4 +5,6 @@ $wb['active_txt'] = 'Aktif';
$wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Domain';
$wb['add_new_record_txt'] = 'Tambah Situs Web Baru';
+$wb['parent_domain_id_txt'] = 'Website';
+
?>
diff --git a/interface/web/sites/lib/lang/id_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/id_web_vhost_subdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/id_web_vhost_subdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/id_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/id_web_vhost_subdomain_list.lng
deleted file mode 100644
index 1c16bcda288f146167a5a49221951769017f580b..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/id_web_vhost_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Add new subdomain';
-?>
diff --git a/interface/web/sites/lib/lang/it_web_aliasdomain.lng b/interface/web/sites/lib/lang/it_web_aliasdomain.lng
deleted file mode 100644
index 4149c711493e6b6f06d0e99656a1c65744d4ec46..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/it_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng b/interface/web/sites/lib/lang/it_web_childdomain.lng
similarity index 87%
rename from interface/web/sites/lib/lang/ar_web_aliasdomain.lng
rename to interface/web/sites/lib/lang/it_web_childdomain.lng
index 4149c711493e6b6f06d0e99656a1c65744d4ec46..3a54ad314b0ad03cc6508c24dd3bfa828f4d4d59 100644
--- a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/it_web_childdomain.lng
@@ -1,48 +1,56 @@
<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
+$wb['ssl_state_txt'] = 'Stato';
$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_txt'] = 'Organizzazione';
$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
$wb['ssl_request_txt'] = 'SSL Request';
$wb['ssl_cert_txt'] = 'SSL Certificate';
$wb['ssl_bundle_txt'] = 'SSL Bundle';
$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
+$wb['domain_txt'] = 'Dominio';
+$wb['type_txt'] = 'Tipo';
$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
+$wb['redirect_type_txt'] = 'Tipo Redirect';
+$wb['redirect_path_txt'] = 'Percorso Redirect';
+$wb['active_txt'] = 'Attivo';
$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['system_user_txt'] = 'Utente Linux';
+$wb['system_group_txt'] = 'Gruppo Linux';
+$wb['ip_address_txt'] = 'Indirizzo IP';
+$wb['vhost_type_txt'] = 'Tipo VHost';
+$wb['hd_quota_txt'] = 'Quota Harddisk';
+$wb['traffic_quota_txt'] = 'Quota Traffico';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
+$wb['client_txt'] = 'Cliente';
$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
+$wb['apache_directives_txt'] = 'Direttive Apache';
$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_unique'] = 'Domain must be unique.';
$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
@@ -62,7 +70,6 @@ $wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid character
$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@ $wb['stats_type_txt'] = 'Webstatistics program';
$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
$wb['none_txt'] = 'None';
$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
$wb['save_certificate_txt'] = 'Save certificate';
$wb['create_certificate_txt'] = 'Create certificate';
$wb['delete_certificate_txt'] = 'Delete certificate';
@@ -109,7 +114,6 @@ $wb['password_match_txt'] = 'The passwords do match.';
$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
$wb['Domain'] = 'Aliasdomain';
+
?>
diff --git a/interface/web/sites/lib/lang/it_web_childdomain_list.lng b/interface/web/sites/lib/lang/it_web_childdomain_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..7d5ab04f36fcb0318575f7e5a37acba5400acdc5
--- /dev/null
+++ b/interface/web/sites/lib/lang/it_web_childdomain_list.lng
@@ -0,0 +1,15 @@
+<?php
+$wb['list_head_txt'] = 'Sottodomini';
+$wb['active_txt'] = 'Attivo';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Sito';
+$wb['domain_txt'] = 'Sottodominio';
+$wb['add_new_record_txt'] = 'Aggiungi nuovo sottodominio';
+$wb['domain_error_empty'] = 'Domain is empty.';
+$wb['domain_error_unique'] = 'Domain must be unique.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['none_txt'] = 'None';
+
+?>
diff --git a/interface/web/sites/lib/lang/it_web_subdomain.lng b/interface/web/sites/lib/lang/it_web_subdomain.lng
deleted file mode 100644
index 9069194ba59d047a123c7bdd7183004980e7465c..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/it_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Stato';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organizzazione';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Dominio';
-$wb['type_txt'] = 'Tipo';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Tipo Redirect';
-$wb['redirect_path_txt'] = 'Percorso Redirect';
-$wb['active_txt'] = 'Attivo';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Utente Linux';
-$wb['system_group_txt'] = 'Gruppo Linux';
-$wb['ip_address_txt'] = 'Indirizzo IP';
-$wb['vhost_type_txt'] = 'Tipo VHost';
-$wb['hd_quota_txt'] = 'Quota Harddisk';
-$wb['traffic_quota_txt'] = 'Quota Traffico';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Cliente';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Direttive Apache';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'Domain must be unique.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/it_web_subdomain_list.lng b/interface/web/sites/lib/lang/it_web_subdomain_list.lng
deleted file mode 100644
index 5ba43b029da8ccdd3ce735821d25af3b7ef0db2f..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/it_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Sottodomini';
-$wb['active_txt'] = 'Attivo';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Sito';
-$wb['domain_txt'] = 'Sottodominio';
-$wb['add_new_record_txt'] = 'Aggiungi nuovo sottodominio';
-?>
diff --git a/interface/web/sites/lib/lang/it_web_vhost_aliasdomain.lng b/interface/web/sites/lib/lang/it_web_vhost_aliasdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/it_web_vhost_aliasdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/it_web_vhost_aliasdomain_list.lng b/interface/web/sites/lib/lang/it_web_vhost_aliasdomain_list.lng
deleted file mode 100644
index ae8bfec7a823f5df6ab606c4ff1f425ad578105a..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/it_web_vhost_aliasdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Aliasdomain';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['add_new_record_txt'] = 'Add new aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/it_web_domain.lng b/interface/web/sites/lib/lang/it_web_vhost_domain.lng
similarity index 95%
rename from interface/web/sites/lib/lang/it_web_domain.lng
rename to interface/web/sites/lib/lang/it_web_vhost_domain.lng
index eb606872428ac19541a95b0b9da8488ffb61f536..77c0c00db8f5e8974772533c4f4e1dc2120eac69 100644
--- a/interface/web/sites/lib/lang/it_web_domain.lng
+++ b/interface/web/sites/lib/lang/it_web_vhost_domain.lng
@@ -120,4 +120,10 @@ $wb['rewrite_rules_txt'] = 'Rewrite Rules';
$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['host_txt'] = 'Hostname';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+
?>
diff --git a/interface/web/sites/lib/lang/it_web_domain_admin_list.lng b/interface/web/sites/lib/lang/it_web_vhost_domain_admin_list.lng
similarity index 100%
rename from interface/web/sites/lib/lang/it_web_domain_admin_list.lng
rename to interface/web/sites/lib/lang/it_web_vhost_domain_admin_list.lng
diff --git a/interface/web/sites/lib/lang/it_web_domain_list.lng b/interface/web/sites/lib/lang/it_web_vhost_domain_list.lng
similarity index 83%
rename from interface/web/sites/lib/lang/it_web_domain_list.lng
rename to interface/web/sites/lib/lang/it_web_vhost_domain_list.lng
index a7491480b775eb1b483498fda059fc2c1978fffd..4a4ef8a3fe2c8483c8cf83290e588c60a4522453 100644
--- a/interface/web/sites/lib/lang/it_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/it_web_vhost_domain_list.lng
@@ -5,4 +5,6 @@ $wb['active_txt'] = 'Attivo';
$wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Dominio';
$wb['add_new_record_txt'] = 'Aggiungi nuovo sito';
+$wb['parent_domain_id_txt'] = 'Website';
+
?>
diff --git a/interface/web/sites/lib/lang/it_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/it_web_vhost_subdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/it_web_vhost_subdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/it_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/it_web_vhost_subdomain_list.lng
deleted file mode 100644
index 1c16bcda288f146167a5a49221951769017f580b..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/it_web_vhost_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Add new subdomain';
-?>
diff --git a/interface/web/sites/lib/lang/ja_web_aliasdomain.lng b/interface/web/sites/lib/lang/ja_web_aliasdomain.lng
deleted file mode 100644
index 4149c711493e6b6f06d0e99656a1c65744d4ec46..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/ja_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/ja_web_childdomain.lng b/interface/web/sites/lib/lang/ja_web_childdomain.lng
new file mode 100644
index 0000000000000000000000000000000000000000..67451220489a31d73dee1162ad445f1b78c23e1c
--- /dev/null
+++ b/interface/web/sites/lib/lang/ja_web_childdomain.lng
@@ -0,0 +1,119 @@
+<?php
+$wb['ssl_state_txt'] = 'State（都é“府県）';
+$wb['ssl_locality_txt'] = 'Locality（地域）';
+$wb['ssl_organisation_txt'] = 'Organisation（組織）';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit（部署）';
+$wb['ssl_country_txt'] = 'Country（国）';
+$wb['ssl_request_txt'] = 'SSL CSR';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'Chainファイル';
+$wb['ssl_action_txt'] = 'SSL 証明書ã®æ“作';
+$wb['server_id_txt'] = 'サーãƒãƒ¼';
+$wb['domain_txt'] = 'ドメイン';
+$wb['type_txt'] = '種別';
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['redirect_type_txt'] = 'リダイレクトã®æ–¹å¼';
+$wb['redirect_path_txt'] = 'リダイレクト先';
+$wb['active_txt'] = '有効';
+$wb['document_root_txt'] = 'ドã‚ュメントルート';
+$wb['system_user_txt'] = 'Linuxユーザー';
+$wb['system_group_txt'] = 'Linuxグループ';
+$wb['ip_address_txt'] = 'IPアドレス';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'ディスクã®å®¹é‡';
+$wb['traffic_quota_txt'] = 'トラフィックã®è¨±å®¹é‡';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'クライアント';
+$wb['limit_web_domain_txt'] = 'ウェブドメインãŒæœ€å¤§æ•°ã«é”ã—ãŸãŸã‚ã€ã“ã‚Œä»¥ä¸Šè¿½åŠ ã§ãã¾ã›ã‚“。';
+$wb['limit_web_aliasdomain_txt'] = 'エイリアスドメインãŒæœ€å¤§æ•°ã«é”ã—ãŸç‚ºã€ã“ã‚Œä»¥ä¸Šè¿½åŠ ã§ãã¾ã›ã‚“。';
+$wb['limit_web_subdomain_txt'] = 'ウェブサブドメインãŒæœ€å¤§æ•°ã«é”ã—ã¾ã—ãŸã€‚';
+$wb['apache_directives_txt'] = 'Apache ディレクティブ';
+$wb['domain_error_empty'] = 'ドメインを指定ã—ã¦ãã ã•ã„';
+$wb['domain_error_unique'] = 'åŒåã®ã‚µãƒ–ドメインã¾ãŸã¯ã‚¨ã‚¤ãƒªã‚¢ã‚¹ãƒ‰ãƒ¡ã‚¤ãƒ³ãŒå˜åœ¨ã—ã¾ã™ã€‚';
+$wb['domain_error_regex'] = 'ドメインåãŒä¸æ£ã§ã™ã€‚';
+$wb['host_txt'] = 'ホスト';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -> www';
+$wb['www_to_non_www_txt'] = 'www -> non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
+$wb['Domain'] = 'Aliasdomain';
+
+?>
diff --git a/interface/web/sites/lib/lang/ja_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/ja_web_childdomain_list.lng
similarity index 73%
rename from interface/web/sites/lib/lang/ja_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/ja_web_childdomain_list.lng
index 111130259ceae946bcd23e7ab73f9120c088b62e..ebc1fd622960604ec34894dc88df40b61b4aac55 100644
--- a/interface/web/sites/lib/lang/ja_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/ja_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'エイリアスドメイン';
+$wb['list_head_txt'] = 'サブドメイン';
$wb['active_txt'] = '有効';
$wb['server_id_txt'] = 'サーãƒãƒ¼';
$wb['parent_domain_id_txt'] = 'ウェブサイト';
-$wb['domain_txt'] = 'エイリアスドメイン';
-$wb['add_new_record_txt'] = 'ã‚¨ã‚¤ãƒªã‚¢ã‚¹ãƒ‰ãƒ¡ã‚¤ãƒ³ã‚’è¿½åŠ ã™ã‚‹';
+$wb['domain_txt'] = 'サブドメイン';
+$wb['add_new_record_txt'] = 'ã‚µãƒ–ãƒ‰ãƒ¡ã‚¤ãƒ³ã‚’è¿½åŠ ã™ã‚‹';
$wb['domain_error_empty'] = 'ドメインを指定ã—ã¦ãã ã•ã„';
$wb['domain_error_unique'] = 'æ—¢ã«ç™»éŒ²æ¸ˆã¿ã®ãƒ‰ãƒ¡ã‚¤ãƒ³åã§ã™ã€‚別ã®åå‰ã«å¤‰æ›´ã—ã¦ãã ã•ã„。';
$wb['domain_error_regex'] = 'ドメインåãŒä¸æ£ã§ã™ã€‚';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'None';
+
?>
diff --git a/interface/web/sites/lib/lang/ja_web_subdomain.lng b/interface/web/sites/lib/lang/ja_web_subdomain.lng
deleted file mode 100644
index 7c0d55c94db363c15103c84e4d59005f68813489..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/ja_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'State（都é“府県）';
-$wb['ssl_locality_txt'] = 'Locality（地域）';
-$wb['ssl_organisation_txt'] = 'Organisation（組織）';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit（部署）';
-$wb['ssl_country_txt'] = 'Country（国）';
-$wb['ssl_request_txt'] = 'SSL CSR';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'Chainファイル';
-$wb['ssl_action_txt'] = 'SSL 証明書ã®æ“作';
-$wb['server_id_txt'] = 'サーãƒãƒ¼';
-$wb['domain_txt'] = 'ドメイン';
-$wb['type_txt'] = '種別';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'リダイレクトã®æ–¹å¼';
-$wb['redirect_path_txt'] = 'リダイレクト先';
-$wb['active_txt'] = '有効';
-$wb['document_root_txt'] = 'ドã‚ュメントルート';
-$wb['system_user_txt'] = 'Linuxユーザー';
-$wb['system_group_txt'] = 'Linuxグループ';
-$wb['ip_address_txt'] = 'IPアドレス';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'ディスクã®å®¹é‡';
-$wb['traffic_quota_txt'] = 'トラフィックã®è¨±å®¹é‡';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'クライアント';
-$wb['limit_web_domain_txt'] = 'ウェブドメインãŒæœ€å¤§æ•°ã«é”ã—ãŸãŸã‚ã€ã“ã‚Œä»¥ä¸Šè¿½åŠ ã§ãã¾ã›ã‚“。';
-$wb['limit_web_aliasdomain_txt'] = 'エイリアスドメインãŒæœ€å¤§æ•°ã«é”ã—ãŸç‚ºã€ã“ã‚Œä»¥ä¸Šè¿½åŠ ã§ãã¾ã›ã‚“。';
-$wb['limit_web_subdomain_txt'] = 'ウェブサブドメインãŒæœ€å¤§æ•°ã«é”ã—ã¾ã—ãŸã€‚';
-$wb['apache_directives_txt'] = 'Apache ディレクティブ';
-$wb['domain_error_empty'] = 'ドメインを指定ã—ã¦ãã ã•ã„';
-$wb['domain_error_unique'] = 'åŒåã®ã‚µãƒ–ドメインã¾ãŸã¯ã‚¨ã‚¤ãƒªã‚¢ã‚¹ãƒ‰ãƒ¡ã‚¤ãƒ³ãŒå˜åœ¨ã—ã¾ã™ã€‚';
-$wb['domain_error_regex'] = 'ドメインåãŒä¸æ£ã§ã™ã€‚';
-$wb['host_txt'] = 'ホスト';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/ja_web_subdomain_list.lng b/interface/web/sites/lib/lang/ja_web_subdomain_list.lng
deleted file mode 100644
index dc91127dc23b068e1b0c015b9e3e30d82d1db288..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/ja_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'サブドメイン';
-$wb['active_txt'] = '有効';
-$wb['server_id_txt'] = 'サーãƒãƒ¼';
-$wb['parent_domain_id_txt'] = 'ウェブサイト';
-$wb['domain_txt'] = 'サブドメイン';
-$wb['add_new_record_txt'] = 'ã‚µãƒ–ãƒ‰ãƒ¡ã‚¤ãƒ³ã‚’è¿½åŠ ã™ã‚‹';
-?>
diff --git a/interface/web/sites/lib/lang/ja_web_vhost_aliasdomain.lng b/interface/web/sites/lib/lang/ja_web_vhost_aliasdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/ja_web_vhost_aliasdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/ja_web_vhost_aliasdomain_list.lng b/interface/web/sites/lib/lang/ja_web_vhost_aliasdomain_list.lng
deleted file mode 100644
index 1407d49ae9841426ae3ba501eb2e20bee6c1c08e..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/ja_web_vhost_aliasdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'エイリアスドメイン';
-$wb['active_txt'] = '有効';
-$wb['server_id_txt'] = 'サーãƒãƒ¼';
-$wb['parent_domain_id_txt'] = 'ウェブサイト';
-$wb['domain_txt'] = 'エイリアスドメイン';
-$wb['add_new_record_txt'] = 'ã‚¨ã‚¤ãƒªã‚¢ã‚¹ãƒ‰ãƒ¡ã‚¤ãƒ³ã‚’è¿½åŠ ã™ã‚‹';
-?>
diff --git a/interface/web/sites/lib/lang/ja_web_domain.lng b/interface/web/sites/lib/lang/ja_web_vhost_domain.lng
similarity index 95%
rename from interface/web/sites/lib/lang/ja_web_domain.lng
rename to interface/web/sites/lib/lang/ja_web_vhost_domain.lng
index e0402c01c360e6739c72cadc876c838030c4c7a6..e6537ef46acef75b313ca1c6abaf832c971b2618 100644
--- a/interface/web/sites/lib/lang/ja_web_domain.lng
+++ b/interface/web/sites/lib/lang/ja_web_vhost_domain.lng
@@ -120,4 +120,10 @@ $wb['rewrite_rules_txt'] = 'Rewrite Rules';
$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['host_txt'] = 'Hostname';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+
?>
diff --git a/interface/web/sites/lib/lang/ja_web_domain_admin_list.lng b/interface/web/sites/lib/lang/ja_web_vhost_domain_admin_list.lng
similarity index 100%
rename from interface/web/sites/lib/lang/ja_web_domain_admin_list.lng
rename to interface/web/sites/lib/lang/ja_web_vhost_domain_admin_list.lng
diff --git a/interface/web/sites/lib/lang/ja_web_domain_list.lng b/interface/web/sites/lib/lang/ja_web_vhost_domain_list.lng
similarity index 85%
rename from interface/web/sites/lib/lang/ja_web_domain_list.lng
rename to interface/web/sites/lib/lang/ja_web_vhost_domain_list.lng
index e987d407d6159eb5ad1cd5e50cd02372810c40d6..b26a54892ff68221129471776746f3eb65c9004b 100644
--- a/interface/web/sites/lib/lang/ja_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/ja_web_vhost_domain_list.lng
@@ -5,4 +5,6 @@ $wb['active_txt'] = '有効';
$wb['server_id_txt'] = 'サーãƒãƒ¼';
$wb['domain_txt'] = 'ドメイン';
$wb['add_new_record_txt'] = 'ã‚¦ã‚§ãƒ–ã‚µã‚¤ãƒˆã‚’è¿½åŠ ã™ã‚‹';
+$wb['parent_domain_id_txt'] = 'Website';
+
?>
diff --git a/interface/web/sites/lib/lang/ja_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/ja_web_vhost_subdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/ja_web_vhost_subdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/ja_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/ja_web_vhost_subdomain_list.lng
deleted file mode 100644
index 1c16bcda288f146167a5a49221951769017f580b..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/ja_web_vhost_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Add new subdomain';
-?>
diff --git a/interface/web/sites/lib/lang/nl_web_aliasdomain.lng b/interface/web/sites/lib/lang/nl_web_aliasdomain.lng
deleted file mode 100644
index 4149c711493e6b6f06d0e99656a1c65744d4ec46..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/nl_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/nl_web_childdomain.lng b/interface/web/sites/lib/lang/nl_web_childdomain.lng
new file mode 100644
index 0000000000000000000000000000000000000000..cb9965dc135e03a52941f57cc82593f0bd378f64
--- /dev/null
+++ b/interface/web/sites/lib/lang/nl_web_childdomain.lng
@@ -0,0 +1,119 @@
+<?php
+$wb['ssl_state_txt'] = 'Provincie/staat';
+$wb['ssl_locality_txt'] = 'Plaatsnaam';
+$wb['ssl_organisation_txt'] = 'Organisatie';
+$wb['ssl_organisation_unit_txt'] = 'Organisatie afdeling';
+$wb['ssl_country_txt'] = 'Land';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificaat';
+$wb['ssl_bundle_txt'] = 'SSL Bundel';
+$wb['ssl_action_txt'] = 'SSL Actie';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domein';
+$wb['type_txt'] = 'Type';
+$wb['parent_domain_id_txt'] = 'Parent website';
+$wb['redirect_type_txt'] = 'Redirect type';
+$wb['redirect_path_txt'] = 'Redirect pad';
+$wb['active_txt'] = 'Actief';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux gebruiker';
+$wb['system_group_txt'] = 'Linux groep';
+$wb['ip_address_txt'] = 'IP-adres';
+$wb['vhost_type_txt'] = 'VHost type';
+$wb['hd_quota_txt'] = 'Harddisk quota';
+$wb['traffic_quota_txt'] = 'Traffic quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Klant';
+$wb['limit_web_domain_txt'] = 'Het max. aantal web domeinen voor uw account is bereikt.';
+$wb['limit_web_aliasdomain_txt'] = 'Het max. aantal aliasdomeinen voor uw account is bereikt.';
+$wb['limit_web_subdomain_txt'] = 'Het max. aantal web subdomeinen voor uw account is bereikt.';
+$wb['apache_directives_txt'] = 'Apache directives';
+$wb['domain_error_empty'] = 'Domein is niet ingvuld.';
+$wb['domain_error_unique'] = 'Er is al eenwebsite of sub / aliasdomein met deze domeinnaam.';
+$wb['domain_error_regex'] = 'Domainnaam ongeldig.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Ongeldig redirect pad. Geldige redirects zijn bijvoorbeeld: /test/ or http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -> www';
+$wb['www_to_non_www_txt'] = 'www -> non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
+$wb['Domain'] = 'Aliasdomain';
+
+?>
diff --git a/interface/web/sites/lib/lang/nl_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/nl_web_childdomain_list.lng
similarity index 73%
rename from interface/web/sites/lib/lang/nl_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/nl_web_childdomain_list.lng
index 4d713a4665a3204d1ea0ea57b2acb76acec8fd13..1b05bfeb06d28dad57c652a00676ec7085948cf9 100644
--- a/interface/web/sites/lib/lang/nl_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/nl_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Aliasdomein';
+$wb['list_head_txt'] = 'Subdomeinen';
$wb['active_txt'] = 'Actief';
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Aliasdomein';
-$wb['add_new_record_txt'] = 'Toevoegen nieuw aliasdomein';
+$wb['domain_txt'] = 'Subdomein';
+$wb['add_new_record_txt'] = 'Toevoegen nieuw subdomein';
$wb['domain_error_empty'] = 'Domein is niet ingvuld.';
$wb['domain_error_unique'] = 'Domein moet uniek zijn.';
$wb['domain_error_regex'] = 'Domeinnaam ongeldig.';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'None';
+
?>
diff --git a/interface/web/sites/lib/lang/nl_web_subdomain.lng b/interface/web/sites/lib/lang/nl_web_subdomain.lng
deleted file mode 100644
index 2fea49110cf6cb6133e23572fe414734c0625d4f..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/nl_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Provincie/staat';
-$wb['ssl_locality_txt'] = 'Plaatsnaam';
-$wb['ssl_organisation_txt'] = 'Organisatie';
-$wb['ssl_organisation_unit_txt'] = 'Organisatie afdeling';
-$wb['ssl_country_txt'] = 'Land';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificaat';
-$wb['ssl_bundle_txt'] = 'SSL Bundel';
-$wb['ssl_action_txt'] = 'SSL Actie';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domein';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent website';
-$wb['redirect_type_txt'] = 'Redirect type';
-$wb['redirect_path_txt'] = 'Redirect pad';
-$wb['active_txt'] = 'Actief';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux gebruiker';
-$wb['system_group_txt'] = 'Linux groep';
-$wb['ip_address_txt'] = 'IP-adres';
-$wb['vhost_type_txt'] = 'VHost type';
-$wb['hd_quota_txt'] = 'Harddisk quota';
-$wb['traffic_quota_txt'] = 'Traffic quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Klant';
-$wb['limit_web_domain_txt'] = 'Het max. aantal web domeinen voor uw account is bereikt.';
-$wb['limit_web_aliasdomain_txt'] = 'Het max. aantal aliasdomeinen voor uw account is bereikt.';
-$wb['limit_web_subdomain_txt'] = 'Het max. aantal web subdomeinen voor uw account is bereikt.';
-$wb['apache_directives_txt'] = 'Apache directives';
-$wb['domain_error_empty'] = 'Domein is niet ingvuld.';
-$wb['domain_error_unique'] = 'Er is al eenwebsite of sub / aliasdomein met deze domeinnaam.';
-$wb['domain_error_regex'] = 'Domainnaam ongeldig.';
-$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Ongeldig redirect pad. Geldige redirects zijn bijvoorbeeld: /test/ or http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/nl_web_subdomain_list.lng b/interface/web/sites/lib/lang/nl_web_subdomain_list.lng
deleted file mode 100644
index fbba7b9ff1410f8402856d3cca85d0a991f16a98..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/nl_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomeinen';
-$wb['active_txt'] = 'Actief';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomein';
-$wb['add_new_record_txt'] = 'Toevoegen nieuw subdomein';
-?>
diff --git a/interface/web/sites/lib/lang/nl_web_vhost_aliasdomain.lng b/interface/web/sites/lib/lang/nl_web_vhost_aliasdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/nl_web_vhost_aliasdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/nl_web_vhost_aliasdomain_list.lng b/interface/web/sites/lib/lang/nl_web_vhost_aliasdomain_list.lng
deleted file mode 100644
index 7a24c02a9a6f7a40758ebc98014ec56ac2442a0c..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/nl_web_vhost_aliasdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Aliasdomein';
-$wb['active_txt'] = 'Actief';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Aliasdomein';
-$wb['add_new_record_txt'] = 'Toevoegen nieuw aliasdomein';
-?>
diff --git a/interface/web/sites/lib/lang/nl_web_domain.lng b/interface/web/sites/lib/lang/nl_web_vhost_domain.lng
similarity index 95%
rename from interface/web/sites/lib/lang/nl_web_domain.lng
rename to interface/web/sites/lib/lang/nl_web_vhost_domain.lng
index 2d357819c0e9986e7fd7b33e570bec35ad2f325b..3e2ffda399e358364bd2a1ca82bf3f8fb8d6cc18 100644
--- a/interface/web/sites/lib/lang/nl_web_domain.lng
+++ b/interface/web/sites/lib/lang/nl_web_vhost_domain.lng
@@ -120,4 +120,10 @@ $wb['rewrite_rules_txt'] = 'Rewrite Rules';
$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['host_txt'] = 'Hostname';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+
?>
diff --git a/interface/web/sites/lib/lang/nl_web_domain_admin_list.lng b/interface/web/sites/lib/lang/nl_web_vhost_domain_admin_list.lng
similarity index 100%
rename from interface/web/sites/lib/lang/nl_web_domain_admin_list.lng
rename to interface/web/sites/lib/lang/nl_web_vhost_domain_admin_list.lng
diff --git a/interface/web/sites/lib/lang/nl_web_domain_list.lng b/interface/web/sites/lib/lang/nl_web_vhost_domain_list.lng
similarity index 84%
rename from interface/web/sites/lib/lang/nl_web_domain_list.lng
rename to interface/web/sites/lib/lang/nl_web_vhost_domain_list.lng
index 882373d1c9fa087cf25945621f2fd78cdabb8a94..f44597b2fbe083078c382a448c4bf8f957b7b261 100644
--- a/interface/web/sites/lib/lang/nl_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/nl_web_vhost_domain_list.lng
@@ -5,4 +5,6 @@ $wb['active_txt'] = 'Actief';
$wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Domein';
$wb['add_new_record_txt'] = 'Toevoegen nieuwe website';
+$wb['parent_domain_id_txt'] = 'Website';
+
?>
diff --git a/interface/web/sites/lib/lang/nl_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/nl_web_vhost_subdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/nl_web_vhost_subdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/nl_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/nl_web_vhost_subdomain_list.lng
deleted file mode 100644
index 1c16bcda288f146167a5a49221951769017f580b..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/nl_web_vhost_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Add new subdomain';
-?>
diff --git a/interface/web/sites/lib/lang/pl_web_aliasdomain.lng b/interface/web/sites/lib/lang/pl_web_childdomain.lng
similarity index 79%
rename from interface/web/sites/lib/lang/pl_web_aliasdomain.lng
rename to interface/web/sites/lib/lang/pl_web_childdomain.lng
index 19cd691bebf7ae8790e13ac6c382abda472de6fb..286a38a1a99e6c72196bc25db1994e7529553282 100644
--- a/interface/web/sites/lib/lang/pl_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/pl_web_childdomain.lng
@@ -1,48 +1,56 @@
<?php
-$wb['domain_txt'] = 'Alias domeny';
-$wb['backup_interval_txt'] = 'Częstotliwość tworzenia kopii zapasowych';
-$wb['backup_copies_txt'] = 'Liczba kopii';
-$wb['ssl_state_txt'] = 'Województwo';
+$wb['ssl_state_txt'] = 'Stan';
$wb['ssl_locality_txt'] = 'Lokalizacja';
$wb['ssl_organisation_txt'] = 'Organizacja';
$wb['ssl_organisation_unit_txt'] = 'Jednostka organizacji';
-$wb['ssl_country_txt'] = 'Kraj';
-$wb['ssl_key_txt'] = 'Klucz SSL';
+$wb['ssl_country_txt'] = 'Państwo';
$wb['ssl_request_txt'] = 'Żądanie SSL';
$wb['ssl_cert_txt'] = 'Certyfikat SSL';
-$wb['ssl_bundle_txt'] = 'Paczka SSL (bundle)';
+$wb['ssl_bundle_txt'] = 'Paczka SSL';
$wb['ssl_action_txt'] = 'Akcja SSL';
-$wb['ssl_domain_txt'] = 'Domena SSL';
$wb['server_id_txt'] = 'Serwer';
-$wb['web_folder_error_regex'] = 'Wpisano nieprawidłowy folder. Proszę nie wpisywać znaku slash: /';
-$wb['type_txt'] = 'Rodzaj';
-$wb['parent_domain_id_txt'] = 'Strona macierzysta';
-$wb['redirect_type_txt'] = 'Rodzaj przekierowania';
+$wb['domain_txt'] = 'Domena';
+$wb['type_txt'] = 'Typ';
+$wb['parent_domain_id_txt'] = 'Macierzysta strona www';
+$wb['redirect_type_txt'] = 'Typ przekierowania';
$wb['redirect_path_txt'] = 'Ścieżka przekierowania';
$wb['active_txt'] = 'Aktywny';
-$wb['document_root_txt'] = 'Document root';
-$wb['system_user_txt'] = 'Użytkownik systemowy';
-$wb['system_group_txt'] = 'Grupa systemowa';
-$wb['ip_address_txt'] = 'Adres IPv4';
-$wb['ipv6_address_txt'] = 'Adres IPv6';
-$wb['vhost_type_txt'] = 'Rodzaj VHosta';
-$wb['hd_quota_txt'] = 'Limit dysku';
-$wb['traffic_quota_txt'] = 'Limit transferu';
+$wb['document_root_txt'] = 'Główny katalog';
+$wb['system_user_txt'] = 'Użytkownik Linuksa';
+$wb['system_group_txt'] = 'Grupa Linux';
+$wb['ip_address_txt'] = 'Adres IP';
+$wb['vhost_type_txt'] = 'Typ wirtualnego hosta';
+$wb['hd_quota_txt'] = 'Limit twardego dysku';
+$wb['traffic_quota_txt'] = 'Limit ruchu na serwerze';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Własne strony błędów';
-$wb['subdomain_txt'] = 'Automatyczna subdomena';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
$wb['client_txt'] = 'Klient';
-$wb['limit_web_domain_txt'] = 'Maks. liczba domen web dla Twojego konta została już osiągnięta.';
-$wb['limit_web_aliasdomain_txt'] = 'Maks. liczba aliasów domen dla Twojego konta została już osiągnięta.';
-$wb['limit_web_subdomain_txt'] = 'Maks. liczba subdomen dla Twojego konta została już osiągnięta.';
+$wb['limit_web_domain_txt'] = 'Maksymalna ilość domen dla Twojego konta została przekroczona.';
+$wb['limit_web_aliasdomain_txt'] = 'Maksymalna ilość aliasów dla Twojego konta została przekroczona.';
+$wb['limit_web_subdomain_txt'] = 'Maksymalna ilość subdomen dla Twojego konta została przekroczona.';
$wb['apache_directives_txt'] = 'Dyrektywy Apache';
-$wb['domain_error_empty'] = 'Pole domena jest puste';
-$wb['domain_error_unique'] = 'Istnieje już strona z tą nazwą domeny/poddomeny.';
-$wb['domain_error_regex'] = 'Nazwa domeny jest pusta';
+$wb['domain_error_empty'] = 'Domena jest pusta.';
+$wb['domain_error_unique'] = 'Istnieje już domena, alias lub subdomena o podanej nazwie.';
+$wb['domain_error_regex'] = 'Nazwa domeny jest nieprawidłowa.';
+$wb['host_txt'] = 'Serwer';
+$wb['redirect_error_regex'] = 'Nieprawidłowa ścieżka przekierowania. Poprawne przekierowanie to np.: /test/ lub http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'Bez przekierowania';
+$wb['no_flag_txt'] = 'Bez flagi';
+$wb['domain_error_wildcard'] = 'Subdomeny typu wildcard nie sÄ… dozwolone';
+$wb['proxy_directives_txt'] = 'Dyrektywy Proxy';
+$wb['available_proxy_directive_snippets_txt'] = 'Dostępne konfiguracje dodatkowe Proxy';
+$wb['error_proxy_requires_url'] = 'Rodzaj przekierowania ';
+$wb['backup_interval_txt'] = 'Częstotliwość tworzenia kopii zapasowych';
+$wb['backup_copies_txt'] = 'Liczba kopii';
+$wb['ssl_key_txt'] = 'Klucz SSL';
+$wb['ssl_domain_txt'] = 'Domena SSL';
+$wb['web_folder_error_regex'] = 'Wpisano nieprawidłowy folder. Proszę nie wpisywać znaku slash: /';
+$wb['ipv6_address_txt'] = 'Adres IPv6';
+$wb['errordocs_txt'] = 'Własne strony błędów';
+$wb['subdomain_txt'] = 'Automatyczna subdomena';
$wb['domain_error_autosub'] = 'Istnieje już subdomena z tymi ustawieniami.';
$wb['hd_quota_error_empty'] = 'Limit dysku jest pusty lub wynosi 0.';
$wb['traffic_quota_error_empty'] = 'Limit transferu jest pusty.';
@@ -62,7 +70,6 @@ $wb['ssl_organisation_error_regex'] = 'Nieprawidłowa organizacja SSL. Dozwolone
$wb['ssl_organistaion_unit_error_regex'] = 'Nieprawidłowa jednostka SSL. Dozwolone znaki to: a-z, 0-9 i .,-_';
$wb['ssl_country_error_regex'] = 'Nieprawidłowy kraj SSL. Dozwolone znaki to: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Maks. dostępny limit transferu';
-$wb['redirect_error_regex'] = 'Nieprawidłowa ścieżka przekierowania. Przykładowe prawidłowe przekierowania: /test/ lub http://www.domena.pl/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Limit transferu został przekroczony';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@ $wb['stats_type_txt'] = 'Rodzaj statystyk';
$wb['custom_php_ini_txt'] = 'WÅ‚asne ustawienia php.ini';
$wb['none_txt'] = 'Brak';
$wb['disabled_txt'] = 'Wyłączone';
-$wb['no_redirect_txt'] = 'Bez przekierowania';
-$wb['no_flag_txt'] = 'Bez flagi';
$wb['save_certificate_txt'] = 'Zapisz certyfikat';
$wb['create_certificate_txt'] = 'Utwórz certyfikat';
$wb['delete_certificate_txt'] = 'Usuń certyfikat';
@@ -109,7 +114,6 @@ $wb['password_match_txt'] = 'Hasła są jednakowe';
$wb['available_php_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw PHP:';
$wb['available_apache_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw Apache:';
$wb['available_nginx_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw nginx:';
-$wb['proxy_directives_txt'] = 'Dyrektywny Proxy';
-$wb['available_proxy_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw Proxy:';
$wb['Domain'] = 'Alias domeny';
+
?>
diff --git a/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/pl_web_childdomain_list.lng
similarity index 75%
rename from interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/pl_web_childdomain_list.lng
index 5bdd8e8316d266b715c0ee69a42794e07541769f..8c01887e0a8928b3b35f22801a6d4bf21d5cc8ef 100644
--- a/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Alias domeny';
+$wb['list_head_txt'] = 'Subdomeny';
$wb['active_txt'] = 'Aktywny';
$wb['server_id_txt'] = 'Serwer';
$wb['parent_domain_id_txt'] = 'Strona www';
-$wb['domain_txt'] = 'Alias domeny';
-$wb['add_new_record_txt'] = 'Dodaj nowy alias domeny';
+$wb['domain_txt'] = 'Subdomena';
+$wb['add_new_record_txt'] = 'Dodaj nowÄ… subdomene';
$wb['domain_error_empty'] = 'Domena jest pusta.';
$wb['domain_error_unique'] = 'Domena musi być unikatowa.';
$wb['domain_error_regex'] = 'Nazwa domeny ma niepoprawny format.';
$wb['no_redirect_txt'] = 'Bez przekierowania';
$wb['no_flag_txt'] = 'Bez flagi';
$wb['none_txt'] = 'Brak';
+
?>
diff --git a/interface/web/sites/lib/lang/pl_web_subdomain.lng b/interface/web/sites/lib/lang/pl_web_subdomain.lng
deleted file mode 100644
index def9efb723be33c0c6d98e3f2bd2da5490a094be..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/pl_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Stan';
-$wb['ssl_locality_txt'] = 'Lokalizacja';
-$wb['ssl_organisation_txt'] = 'Organizacja';
-$wb['ssl_organisation_unit_txt'] = 'Jednostka organizacji';
-$wb['ssl_country_txt'] = 'Państwo';
-$wb['ssl_request_txt'] = 'Żądanie SSL';
-$wb['ssl_cert_txt'] = 'Certyfikat SSL';
-$wb['ssl_bundle_txt'] = 'Paczka SSL';
-$wb['ssl_action_txt'] = 'Akcja SSL';
-$wb['server_id_txt'] = 'Serwer';
-$wb['domain_txt'] = 'Domena';
-$wb['type_txt'] = 'Typ';
-$wb['parent_domain_id_txt'] = 'Macierzysta strona www';
-$wb['redirect_type_txt'] = 'Typ przekierowania';
-$wb['redirect_path_txt'] = 'Ścieżka przekierowania';
-$wb['active_txt'] = 'Aktywny';
-$wb['document_root_txt'] = 'Główny katalog';
-$wb['system_user_txt'] = 'Użytkownik Linuksa';
-$wb['system_group_txt'] = 'Grupa Linux';
-$wb['ip_address_txt'] = 'Adres IP';
-$wb['vhost_type_txt'] = 'Typ wirtualnego hosta';
-$wb['hd_quota_txt'] = 'Limit twardego dysku';
-$wb['traffic_quota_txt'] = 'Limit ruchu na serwerze';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Klient';
-$wb['limit_web_domain_txt'] = 'Maksymalna ilość domen dla Twojego konta została przekroczona.';
-$wb['limit_web_aliasdomain_txt'] = 'Maksymalna ilość aliasów dla Twojego konta została przekroczona.';
-$wb['limit_web_subdomain_txt'] = 'Maksymalna ilość subdomen dla Twojego konta została przekroczona.';
-$wb['apache_directives_txt'] = 'Dyrektywy Apache';
-$wb['domain_error_empty'] = 'Domena jest pusta.';
-$wb['domain_error_unique'] = 'Istnieje już domena, alias lub subdomena o podanej nazwie.';
-$wb['domain_error_regex'] = 'Nazwa domeny jest nieprawidłowa.';
-$wb['host_txt'] = 'Serwer';
-$wb['redirect_error_regex'] = 'Nieprawidłowa ścieżka przekierowania. Poprawne przekierowanie to np.: /test/ lub http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'Bez przekierowania';
-$wb['no_flag_txt'] = 'Bez flagi';
-$wb['domain_error_wildcard'] = 'Subdomeny typu wildcard nie sÄ… dozwolone';
-$wb['proxy_directives_txt'] = 'Dyrektywy Proxy';
-$wb['available_proxy_directive_snippets_txt'] = 'Dostępne konfiguracje dodatkowe Proxy';
-$wb['error_proxy_requires_url'] = 'Rodzaj przekierowania ';
-?>
diff --git a/interface/web/sites/lib/lang/pl_web_subdomain_list.lng b/interface/web/sites/lib/lang/pl_web_subdomain_list.lng
deleted file mode 100644
index 9ccb0a3c770dfe17c6d55f427577e50e87d0b215..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/pl_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomeny';
-$wb['active_txt'] = 'Aktywny';
-$wb['server_id_txt'] = 'Serwer';
-$wb['parent_domain_id_txt'] = 'Strona www';
-$wb['domain_txt'] = 'Subdomena';
-$wb['add_new_record_txt'] = 'Dodaj nowÄ… subdomene';
-?>
diff --git a/interface/web/sites/lib/lang/pl_web_vhost_aliasdomain.lng b/interface/web/sites/lib/lang/pl_web_vhost_aliasdomain.lng
deleted file mode 100644
index 8420a9d2b7fb93871968132b431a761fceefc7fd..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/pl_web_vhost_aliasdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Strona macierzysta';
-$wb['web_folder_txt'] = 'Folder strony';
-$wb['web_folder_invalid_txt'] = 'Folder strony jest nieprawidłowy, proszę wybrać inny.';
-$wb['web_folder_unique_txt'] = 'Folder strony jest już w użyciu, proszę wybrać inny.';
-$wb['backup_interval_txt'] = 'Częstotliwość kopii';
-$wb['backup_copies_txt'] = 'Liczba kopii zapasowych';
-$wb['ssl_state_txt'] = 'Województwo';
-$wb['ssl_locality_txt'] = 'Lokalizacja';
-$wb['ssl_organisation_txt'] = 'Ogranizacja';
-$wb['ssl_organisation_unit_txt'] = 'Jednostka organizacji';
-$wb['ssl_country_txt'] = 'Kraj';
-$wb['ssl_key_txt'] = 'Klucz SSL';
-$wb['ssl_request_txt'] = 'Żądanie SSL';
-$wb['ssl_cert_txt'] = 'Certyfikat SSL';
-$wb['ssl_bundle_txt'] = 'Pakiet SSL (Bundle)';
-$wb['ssl_action_txt'] = 'Czynność SSL';
-$wb['ssl_domain_txt'] = 'Domena SSL';
-$wb['server_id_txt'] = 'Serwer';
-$wb['domain_txt'] = 'Domena';
-$wb['host_txt'] = 'Nazwa hosta';
-$wb['web_folder_error_regex'] = 'Wpisano nieprawidłowy folder. Proszę nie dopisywać znaku slash: / ';
-$wb['type_txt'] = 'Rodzaj';
-$wb['redirect_type_txt'] = 'Rodzaj przekierowania';
-$wb['redirect_path_txt'] = 'Ścieżka przekierowania';
-$wb['active_txt'] = 'Aktywny';
-$wb['document_root_txt'] = 'Document root';
-$wb['system_user_txt'] = 'Użytkownik systemowy';
-$wb['system_group_txt'] = 'Grupa systemowa';
-$wb['ip_address_txt'] = 'Adres IPv4';
-$wb['ipv6_address_txt'] = 'Adres IPv6';
-$wb['vhost_type_txt'] = 'Typ VHosta';
-$wb['hd_quota_txt'] = 'Limit dysku';
-$wb['traffic_quota_txt'] = 'Limit transferu';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Własne strony błędów';
-$wb['subdomain_txt'] = 'Automatyczna subdomena';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Klient';
-$wb['limit_web_domain_txt'] = 'Maks. liczba domen dla Twojego konta została osiągnięta.';
-$wb['limit_web_aliasdomain_txt'] = 'Maks. liczba aliasów domen dla Twojego konta została osiągnięta.';
-$wb['limit_web_subdomain_txt'] = 'Maks. liczba poddomen dla Twojego konta została osiągnięta.';
-$wb['apache_directives_txt'] = 'Dyrektywy Apache';
-$wb['domain_error_empty'] = 'Pole domeny jest puste';
-$wb['domain_error_unique'] = 'Istnieje już strona z taką domeną lub subdomeną.';
-$wb['domain_error_regex'] = 'Nazwa domeny jest nieprawidłowa.';
-$wb['domain_error_wildcard'] = 'Subdomeny typu wildcard nie sÄ… dozwolone.';
-$wb['hd_quota_error_empty'] = 'Pole limitu dysku jest puste lub wynosi 0.';
-$wb['traffic_quota_error_empty'] = 'Pole limitu transferu jest puste.';
-$wb['error_ssl_state_empty'] = 'Pole województwa dla SSL jest puste.';
-$wb['error_ssl_locality_empty'] = 'Pole lokalizacji dla SSL jest puste.';
-$wb['error_ssl_organisation_empty'] = 'Pole organizacji dla SSL jest puste.';
-$wb['error_ssl_organisation_unit_empty'] = 'Pole jednostki dla SSL jest puste.';
-$wb['error_ssl_country_empty'] = 'Pole kraju dla SSL jest puste.';
-$wb['error_ssl_cert_empty'] = 'Pole certyfikatu SSL jest puste.';
-$wb['client_group_id_txt'] = 'Klient';
-$wb['stats_password_txt'] = 'Hasło do statystyk';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Maks. dostępny limit dysku';
-$wb['ssl_state_error_regex'] = 'Nieprawidłowe województwo SSL. Dozwolone znaki: a-z, 0-9 i .,-_';
-$wb['ssl_locality_error_regex'] = 'Nieprawidłowa lokalizacja SSL. Dozwolone znaki: a-z, 0-9 i .,-_';
-$wb['ssl_organisation_error_regex'] = 'Nieprawidłowa organizacja SSL. Dozwolone znaki: a-z, 0-9 i .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Nieprawidłowa jednostka SSL. Dozwolone znaki: a-z, 0-9 i .,-_';
-$wb['ssl_country_error_regex'] = 'Nieprawidłowy kraj SSL. Dozwolone znaki: a-z, 0-9 i .,-_';
-$wb['limit_traffic_quota_free_txt'] = 'Maks. dostępny limit transferu';
-$wb['redirect_error_regex'] = 'Nieprawidłowa ścieżka przekierowania. Przykładowe prawidłowe przekierowania: /test/ lub http://www.domena.pl/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Limit transferu został przekroczony';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Login do statystyk';
-$wb['stats_type_txt'] = 'Rodzaj statystyk';
-$wb['custom_php_ini_txt'] = 'WÅ‚asne ustawienia php.ini';
-$wb['none_txt'] = 'Brak';
-$wb['disabled_txt'] = 'Wyłączone';
-$wb['no_redirect_txt'] = 'Bez przekierowania';
-$wb['no_flag_txt'] = 'Bez flagi';
-$wb['save_certificate_txt'] = 'Zapisz certyfikat';
-$wb['create_certificate_txt'] = 'Utwórz certyfikat';
-$wb['delete_certificate_txt'] = 'Usuń certyfikat';
-$wb['nginx_directives_txt'] = 'Dyrektywy nginx';
-$wb['seo_redirect_txt'] = 'Przekierowanie SEO';
-$wb['non_www_to_www_txt'] = 'bez-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> bez-www';
-$wb['php_fpm_use_socket_txt'] = 'Użyj gniazda dla PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI dla SSL nie jest aktywowane dla tego serwera. Możesz włączyć tylko jeden certyfikat SSL dla jednego adresu IP.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Wartości ustawień PHP-FPM pm muszą być następujące: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children musi być dodatnią wartością całkowitą.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers musi być dodatnią wartością całkowitą.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers musi być dodatnią wartością całkowitą.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers musi być dodatnią wartością całkowitą.';
-$wb['hd_quota_error_regex'] = 'Limit dyski jest nieprawidłowy';
-$wb['traffic_quota_error_regex'] = 'Limit transferu jest nieprawidłowy';
-$wb['fastcgi_php_version_txt'] = 'Wersja PHP';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout musi być dodatnią wartością całkowitą.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests musi być wartością całkowitą >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Pamiętaj że musisz mieć wersję PHP >= 5.3.9 aby używać ondemand process manager. W przypadku starszej wersji PHP nie będzie działać w ogóle!';
-$wb['generate_password_txt'] = 'Generuj hasło';
-$wb['repeat_password_txt'] = 'Powtórz hasło';
-$wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
-$wb['password_match_txt'] = 'Hasła pasują do siebie';
-$wb['available_php_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw PHP:';
-$wb['available_apache_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw Apache:';
-$wb['available_nginx_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw nginx:';
-$wb['proxy_directives_txt'] = 'Dyrektywy Proxy';
-$wb['available_proxy_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw Proxy:';
-?>
diff --git a/interface/web/sites/lib/lang/pl_web_vhost_aliasdomain_list.lng b/interface/web/sites/lib/lang/pl_web_vhost_aliasdomain_list.lng
deleted file mode 100644
index 621b614fd7e6fc1b68f1372819fa272001acb660..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/pl_web_vhost_aliasdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Alias domeny';
-$wb['active_txt'] = 'Aktywny';
-$wb['server_id_txt'] = 'Serwer';
-$wb['parent_domain_id_txt'] = 'Strona www';
-$wb['domain_txt'] = 'Alias domeny';
-$wb['add_new_record_txt'] = 'Dodaj nowy alias domeny';
-?>
diff --git a/interface/web/sites/lib/lang/pl_web_domain.lng b/interface/web/sites/lib/lang/pl_web_vhost_domain.lng
similarity index 95%
rename from interface/web/sites/lib/lang/pl_web_domain.lng
rename to interface/web/sites/lib/lang/pl_web_vhost_domain.lng
index ae5c3e1cd3fd1e840521bfeb1aa42952f78ec224..5b56b1e0ef3034bb3a131e713cae2360788d7f2f 100644
--- a/interface/web/sites/lib/lang/pl_web_domain.lng
+++ b/interface/web/sites/lib/lang/pl_web_vhost_domain.lng
@@ -120,4 +120,10 @@ $wb['rewrite_rules_txt'] = 'Rewrite Rules';
$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['web_folder_txt'] = 'Folder strony';
+$wb['web_folder_invalid_txt'] = 'Folder strony jest nieprawidłowy, proszę wybrać inny.';
+$wb['web_folder_unique_txt'] = 'Folder strony jest już w użyciu, proszę wybrać inny.';
+$wb['host_txt'] = 'Nazwa hosta';
+$wb['domain_error_wildcard'] = 'Subdomeny typu wildcard nie sÄ… dozwolone.';
+
?>
diff --git a/interface/web/sites/lib/lang/pl_web_domain_admin_list.lng b/interface/web/sites/lib/lang/pl_web_vhost_domain_admin_list.lng
similarity index 100%
rename from interface/web/sites/lib/lang/pl_web_domain_admin_list.lng
rename to interface/web/sites/lib/lang/pl_web_vhost_domain_admin_list.lng
diff --git a/interface/web/sites/lib/lang/pl_web_domain_list.lng b/interface/web/sites/lib/lang/pl_web_vhost_domain_list.lng
similarity index 83%
rename from interface/web/sites/lib/lang/pl_web_domain_list.lng
rename to interface/web/sites/lib/lang/pl_web_vhost_domain_list.lng
index 62b7455ff349875cffd586aac2a615bfccc288af..6a5d709e1525e680b2d7d4dd046186a8369d7232 100644
--- a/interface/web/sites/lib/lang/pl_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_vhost_domain_list.lng
@@ -5,4 +5,6 @@ $wb['active_txt'] = 'Aktywny';
$wb['server_id_txt'] = 'Serwer';
$wb['domain_txt'] = 'Domena';
$wb['add_new_record_txt'] = 'Dodaj nowÄ… stronÄ™';
+$wb['parent_domain_id_txt'] = 'Website';
+
?>
diff --git a/interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng
deleted file mode 100644
index 8420a9d2b7fb93871968132b431a761fceefc7fd..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Strona macierzysta';
-$wb['web_folder_txt'] = 'Folder strony';
-$wb['web_folder_invalid_txt'] = 'Folder strony jest nieprawidłowy, proszę wybrać inny.';
-$wb['web_folder_unique_txt'] = 'Folder strony jest już w użyciu, proszę wybrać inny.';
-$wb['backup_interval_txt'] = 'Częstotliwość kopii';
-$wb['backup_copies_txt'] = 'Liczba kopii zapasowych';
-$wb['ssl_state_txt'] = 'Województwo';
-$wb['ssl_locality_txt'] = 'Lokalizacja';
-$wb['ssl_organisation_txt'] = 'Ogranizacja';
-$wb['ssl_organisation_unit_txt'] = 'Jednostka organizacji';
-$wb['ssl_country_txt'] = 'Kraj';
-$wb['ssl_key_txt'] = 'Klucz SSL';
-$wb['ssl_request_txt'] = 'Żądanie SSL';
-$wb['ssl_cert_txt'] = 'Certyfikat SSL';
-$wb['ssl_bundle_txt'] = 'Pakiet SSL (Bundle)';
-$wb['ssl_action_txt'] = 'Czynność SSL';
-$wb['ssl_domain_txt'] = 'Domena SSL';
-$wb['server_id_txt'] = 'Serwer';
-$wb['domain_txt'] = 'Domena';
-$wb['host_txt'] = 'Nazwa hosta';
-$wb['web_folder_error_regex'] = 'Wpisano nieprawidłowy folder. Proszę nie dopisywać znaku slash: / ';
-$wb['type_txt'] = 'Rodzaj';
-$wb['redirect_type_txt'] = 'Rodzaj przekierowania';
-$wb['redirect_path_txt'] = 'Ścieżka przekierowania';
-$wb['active_txt'] = 'Aktywny';
-$wb['document_root_txt'] = 'Document root';
-$wb['system_user_txt'] = 'Użytkownik systemowy';
-$wb['system_group_txt'] = 'Grupa systemowa';
-$wb['ip_address_txt'] = 'Adres IPv4';
-$wb['ipv6_address_txt'] = 'Adres IPv6';
-$wb['vhost_type_txt'] = 'Typ VHosta';
-$wb['hd_quota_txt'] = 'Limit dysku';
-$wb['traffic_quota_txt'] = 'Limit transferu';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Własne strony błędów';
-$wb['subdomain_txt'] = 'Automatyczna subdomena';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Klient';
-$wb['limit_web_domain_txt'] = 'Maks. liczba domen dla Twojego konta została osiągnięta.';
-$wb['limit_web_aliasdomain_txt'] = 'Maks. liczba aliasów domen dla Twojego konta została osiągnięta.';
-$wb['limit_web_subdomain_txt'] = 'Maks. liczba poddomen dla Twojego konta została osiągnięta.';
-$wb['apache_directives_txt'] = 'Dyrektywy Apache';
-$wb['domain_error_empty'] = 'Pole domeny jest puste';
-$wb['domain_error_unique'] = 'Istnieje już strona z taką domeną lub subdomeną.';
-$wb['domain_error_regex'] = 'Nazwa domeny jest nieprawidłowa.';
-$wb['domain_error_wildcard'] = 'Subdomeny typu wildcard nie sÄ… dozwolone.';
-$wb['hd_quota_error_empty'] = 'Pole limitu dysku jest puste lub wynosi 0.';
-$wb['traffic_quota_error_empty'] = 'Pole limitu transferu jest puste.';
-$wb['error_ssl_state_empty'] = 'Pole województwa dla SSL jest puste.';
-$wb['error_ssl_locality_empty'] = 'Pole lokalizacji dla SSL jest puste.';
-$wb['error_ssl_organisation_empty'] = 'Pole organizacji dla SSL jest puste.';
-$wb['error_ssl_organisation_unit_empty'] = 'Pole jednostki dla SSL jest puste.';
-$wb['error_ssl_country_empty'] = 'Pole kraju dla SSL jest puste.';
-$wb['error_ssl_cert_empty'] = 'Pole certyfikatu SSL jest puste.';
-$wb['client_group_id_txt'] = 'Klient';
-$wb['stats_password_txt'] = 'Hasło do statystyk';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Maks. dostępny limit dysku';
-$wb['ssl_state_error_regex'] = 'Nieprawidłowe województwo SSL. Dozwolone znaki: a-z, 0-9 i .,-_';
-$wb['ssl_locality_error_regex'] = 'Nieprawidłowa lokalizacja SSL. Dozwolone znaki: a-z, 0-9 i .,-_';
-$wb['ssl_organisation_error_regex'] = 'Nieprawidłowa organizacja SSL. Dozwolone znaki: a-z, 0-9 i .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Nieprawidłowa jednostka SSL. Dozwolone znaki: a-z, 0-9 i .,-_';
-$wb['ssl_country_error_regex'] = 'Nieprawidłowy kraj SSL. Dozwolone znaki: a-z, 0-9 i .,-_';
-$wb['limit_traffic_quota_free_txt'] = 'Maks. dostępny limit transferu';
-$wb['redirect_error_regex'] = 'Nieprawidłowa ścieżka przekierowania. Przykładowe prawidłowe przekierowania: /test/ lub http://www.domena.pl/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Limit transferu został przekroczony';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Login do statystyk';
-$wb['stats_type_txt'] = 'Rodzaj statystyk';
-$wb['custom_php_ini_txt'] = 'WÅ‚asne ustawienia php.ini';
-$wb['none_txt'] = 'Brak';
-$wb['disabled_txt'] = 'Wyłączone';
-$wb['no_redirect_txt'] = 'Bez przekierowania';
-$wb['no_flag_txt'] = 'Bez flagi';
-$wb['save_certificate_txt'] = 'Zapisz certyfikat';
-$wb['create_certificate_txt'] = 'Utwórz certyfikat';
-$wb['delete_certificate_txt'] = 'Usuń certyfikat';
-$wb['nginx_directives_txt'] = 'Dyrektywy nginx';
-$wb['seo_redirect_txt'] = 'Przekierowanie SEO';
-$wb['non_www_to_www_txt'] = 'bez-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> bez-www';
-$wb['php_fpm_use_socket_txt'] = 'Użyj gniazda dla PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI dla SSL nie jest aktywowane dla tego serwera. Możesz włączyć tylko jeden certyfikat SSL dla jednego adresu IP.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Wartości ustawień PHP-FPM pm muszą być następujące: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children musi być dodatnią wartością całkowitą.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers musi być dodatnią wartością całkowitą.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers musi być dodatnią wartością całkowitą.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers musi być dodatnią wartością całkowitą.';
-$wb['hd_quota_error_regex'] = 'Limit dyski jest nieprawidłowy';
-$wb['traffic_quota_error_regex'] = 'Limit transferu jest nieprawidłowy';
-$wb['fastcgi_php_version_txt'] = 'Wersja PHP';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout musi być dodatnią wartością całkowitą.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests musi być wartością całkowitą >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Pamiętaj że musisz mieć wersję PHP >= 5.3.9 aby używać ondemand process manager. W przypadku starszej wersji PHP nie będzie działać w ogóle!';
-$wb['generate_password_txt'] = 'Generuj hasło';
-$wb['repeat_password_txt'] = 'Powtórz hasło';
-$wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
-$wb['password_match_txt'] = 'Hasła pasują do siebie';
-$wb['available_php_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw PHP:';
-$wb['available_apache_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw Apache:';
-$wb['available_nginx_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw nginx:';
-$wb['proxy_directives_txt'] = 'Dyrektywy Proxy';
-$wb['available_proxy_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw Proxy:';
-?>
diff --git a/interface/web/sites/lib/lang/pl_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/pl_web_vhost_subdomain_list.lng
deleted file mode 100644
index 1c16bcda288f146167a5a49221951769017f580b..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/pl_web_vhost_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Add new subdomain';
-?>
diff --git a/interface/web/sites/lib/lang/pt_web_aliasdomain.lng b/interface/web/sites/lib/lang/pt_web_aliasdomain.lng
deleted file mode 100644
index 4149c711493e6b6f06d0e99656a1c65744d4ec46..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/pt_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/pt_web_childdomain.lng b/interface/web/sites/lib/lang/pt_web_childdomain.lng
new file mode 100644
index 0000000000000000000000000000000000000000..5e436bfa56fb08da162a90f651bd9757ce103390
--- /dev/null
+++ b/interface/web/sites/lib/lang/pt_web_childdomain.lng
@@ -0,0 +1,119 @@
+<?php
+$wb['ssl_state_txt'] = 'Estado';
+$wb['ssl_locality_txt'] = 'Localidade';
+$wb['ssl_organisation_txt'] = 'Empresa';
+$wb['ssl_organisation_unit_txt'] = 'Departamento';
+$wb['ssl_country_txt'] = 'PaÃs';
+$wb['ssl_request_txt'] = 'Requisição SSL';
+$wb['ssl_cert_txt'] = 'Certificado SSL';
+$wb['ssl_bundle_txt'] = 'Pacote SSL';
+$wb['ssl_action_txt'] = 'Acção SSL';
+$wb['server_id_txt'] = 'Servidor';
+$wb['domain_txt'] = 'DomÃnio';
+$wb['type_txt'] = 'Tipo';
+$wb['parent_domain_id_txt'] = 'Site Parente';
+$wb['redirect_type_txt'] = 'Tipo do Redireccionamento';
+$wb['redirect_path_txt'] = 'Pasta do Redireccionamento';
+$wb['active_txt'] = 'Activo';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Utilizador no Linux';
+$wb['system_group_txt'] = 'Grupo no Linux';
+$wb['ip_address_txt'] = 'Endereço-IP';
+$wb['vhost_type_txt'] = 'Tipo de VHost';
+$wb['hd_quota_txt'] = 'Cota de Disco';
+$wb['traffic_quota_txt'] = 'Cota de Tráfico';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Cliente';
+$wb['limit_web_domain_txt'] = 'O número máximo de domÃnios web para esta conta foi atingido.';
+$wb['limit_web_aliasdomain_txt'] = 'O número máximo de aliases para esta conta foi atingido.';
+$wb['limit_web_subdomain_txt'] = 'O número máximo de sub-domÃnios para esta conta foi atingido.';
+$wb['apache_directives_txt'] = 'Directivas apache';
+$wb['domain_error_empty'] = 'DomÃnio em branco.';
+$wb['domain_error_unique'] = 'Já existe um alias ou sub-domÃnio com este nome.';
+$wb['domain_error_regex'] = 'Nome de domÃnio inválido.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Pasta de redireccionamento inválida. Exemplos de redireccionamentos válidos: /test/ or http://www.dominio.pt/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -> www';
+$wb['www_to_non_www_txt'] = 'www -> non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
+$wb['Domain'] = 'Aliasdomain';
+
+?>
diff --git a/interface/web/sites/lib/lang/pt_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/pt_web_childdomain_list.lng
similarity index 73%
rename from interface/web/sites/lib/lang/pt_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/pt_web_childdomain_list.lng
index 435305ce1ba38cb957c3842eb633028ae1237e04..f95938591eb75d3a7e8eb1825d1944536722ad0d 100644
--- a/interface/web/sites/lib/lang/pt_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/pt_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'DomÃnio Alias';
+$wb['list_head_txt'] = 'Sub-domÃnios';
$wb['active_txt'] = 'Activo';
$wb['server_id_txt'] = 'Servidor';
$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'DomÃnio Alias';
-$wb['add_new_record_txt'] = 'Adicionar Alias de DomÃnio';
+$wb['domain_txt'] = 'Sub-domÃnio';
+$wb['add_new_record_txt'] = 'Adicionar um novo sub-domÃnio';
$wb['domain_error_empty'] = 'DomÃnio em branco.';
$wb['domain_error_unique'] = 'O domÃnio deve ser único.';
$wb['domain_error_regex'] = 'Nome de domÃnio inválido.';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'None';
+
?>
diff --git a/interface/web/sites/lib/lang/pt_web_subdomain.lng b/interface/web/sites/lib/lang/pt_web_subdomain.lng
deleted file mode 100644
index 570badca9822320087c88423b476ffbe4e1f8008..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/pt_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Estado';
-$wb['ssl_locality_txt'] = 'Localidade';
-$wb['ssl_organisation_txt'] = 'Empresa';
-$wb['ssl_organisation_unit_txt'] = 'Departamento';
-$wb['ssl_country_txt'] = 'PaÃs';
-$wb['ssl_request_txt'] = 'Requisição SSL';
-$wb['ssl_cert_txt'] = 'Certificado SSL';
-$wb['ssl_bundle_txt'] = 'Pacote SSL';
-$wb['ssl_action_txt'] = 'Acção SSL';
-$wb['server_id_txt'] = 'Servidor';
-$wb['domain_txt'] = 'DomÃnio';
-$wb['type_txt'] = 'Tipo';
-$wb['parent_domain_id_txt'] = 'Site Parente';
-$wb['redirect_type_txt'] = 'Tipo do Redireccionamento';
-$wb['redirect_path_txt'] = 'Pasta do Redireccionamento';
-$wb['active_txt'] = 'Activo';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Utilizador no Linux';
-$wb['system_group_txt'] = 'Grupo no Linux';
-$wb['ip_address_txt'] = 'Endereço-IP';
-$wb['vhost_type_txt'] = 'Tipo de VHost';
-$wb['hd_quota_txt'] = 'Cota de Disco';
-$wb['traffic_quota_txt'] = 'Cota de Tráfico';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Cliente';
-$wb['limit_web_domain_txt'] = 'O número máximo de domÃnios web para esta conta foi atingido.';
-$wb['limit_web_aliasdomain_txt'] = 'O número máximo de aliases para esta conta foi atingido.';
-$wb['limit_web_subdomain_txt'] = 'O número máximo de sub-domÃnios para esta conta foi atingido.';
-$wb['apache_directives_txt'] = 'Directivas apache';
-$wb['domain_error_empty'] = 'DomÃnio em branco.';
-$wb['domain_error_unique'] = 'Já existe um alias ou sub-domÃnio com este nome.';
-$wb['domain_error_regex'] = 'Nome de domÃnio inválido.';
-$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Pasta de redireccionamento inválida. Exemplos de redireccionamentos válidos: /test/ or http://www.dominio.pt/test/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/pt_web_subdomain_list.lng b/interface/web/sites/lib/lang/pt_web_subdomain_list.lng
deleted file mode 100644
index 37fa572ccf916911219dd6db84032962cb34b458..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/pt_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Sub-domÃnios';
-$wb['active_txt'] = 'Activo';
-$wb['server_id_txt'] = 'Servidor';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Sub-domÃnio';
-$wb['add_new_record_txt'] = 'Adicionar um novo sub-domÃnio';
-?>
diff --git a/interface/web/sites/lib/lang/pt_web_vhost_aliasdomain.lng b/interface/web/sites/lib/lang/pt_web_vhost_aliasdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/pt_web_vhost_aliasdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/pt_web_vhost_aliasdomain_list.lng b/interface/web/sites/lib/lang/pt_web_vhost_aliasdomain_list.lng
deleted file mode 100644
index b9dd27cbb9185d9ce0a1bf03915f16e1bc2e12dc..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/pt_web_vhost_aliasdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'DomÃnio Alias';
-$wb['active_txt'] = 'Activo';
-$wb['server_id_txt'] = 'Servidor';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'DomÃnio Alias';
-$wb['add_new_record_txt'] = 'Adicionar Alias de DomÃnio';
-?>
diff --git a/interface/web/sites/lib/lang/pt_web_domain.lng b/interface/web/sites/lib/lang/pt_web_vhost_domain.lng
similarity index 95%
rename from interface/web/sites/lib/lang/pt_web_domain.lng
rename to interface/web/sites/lib/lang/pt_web_vhost_domain.lng
index e7f3fd2fb098a858146037bd90ccbeebf744a08e..4aad704d9ba4e6372e5b6081c25552972cf0d54e 100644
--- a/interface/web/sites/lib/lang/pt_web_domain.lng
+++ b/interface/web/sites/lib/lang/pt_web_vhost_domain.lng
@@ -120,4 +120,10 @@ $wb['rewrite_rules_txt'] = 'Rewrite Rules';
$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['host_txt'] = 'Hostname';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+
?>
diff --git a/interface/web/sites/lib/lang/pt_web_domain_admin_list.lng b/interface/web/sites/lib/lang/pt_web_vhost_domain_admin_list.lng
similarity index 100%
rename from interface/web/sites/lib/lang/pt_web_domain_admin_list.lng
rename to interface/web/sites/lib/lang/pt_web_vhost_domain_admin_list.lng
diff --git a/interface/web/sites/lib/lang/pt_web_domain_list.lng b/interface/web/sites/lib/lang/pt_web_vhost_domain_list.lng
similarity index 84%
rename from interface/web/sites/lib/lang/pt_web_domain_list.lng
rename to interface/web/sites/lib/lang/pt_web_vhost_domain_list.lng
index 5fb91187cb5f99547916cc61d2f12b24893fafc5..9bbf3669b6d81303fe2c0873faa5bf9f15749d72 100644
--- a/interface/web/sites/lib/lang/pt_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/pt_web_vhost_domain_list.lng
@@ -5,4 +5,6 @@ $wb['active_txt'] = 'Activo';
$wb['server_id_txt'] = 'Servidor';
$wb['domain_txt'] = 'DomÃnio';
$wb['add_new_record_txt'] = 'Adicionar um novo site';
+$wb['parent_domain_id_txt'] = 'Website';
+
?>
diff --git a/interface/web/sites/lib/lang/pt_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/pt_web_vhost_subdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/pt_web_vhost_subdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/pt_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/pt_web_vhost_subdomain_list.lng
deleted file mode 100644
index 1c16bcda288f146167a5a49221951769017f580b..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/pt_web_vhost_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Add new subdomain';
-?>
diff --git a/interface/web/sites/lib/lang/ro_web_aliasdomain.lng b/interface/web/sites/lib/lang/ro_web_aliasdomain.lng
deleted file mode 100644
index 4149c711493e6b6f06d0e99656a1c65744d4ec46..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/ro_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/ro_web_childdomain.lng b/interface/web/sites/lib/lang/ro_web_childdomain.lng
new file mode 100644
index 0000000000000000000000000000000000000000..2f9fc742727aaec63ae73ee644292a3eb48be149
--- /dev/null
+++ b/interface/web/sites/lib/lang/ro_web_childdomain.lng
@@ -0,0 +1,119 @@
+<?php
+$wb['ssl_state_txt'] = 'Judet';
+$wb['ssl_locality_txt'] = 'Localitate';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Tara';
+$wb['ssl_request_txt'] = 'SSL Cerere';
+$wb['ssl_cert_txt'] = 'SSL Certificat';
+$wb['ssl_bundle_txt'] = 'SSL Bundle (pachet)';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'Type';
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['redirect_type_txt'] = 'Redirect Type';
+$wb['redirect_path_txt'] = 'Redirect Path';
+$wb['active_txt'] = 'Active';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux User';
+$wb['system_group_txt'] = 'Linux Group';
+$wb['ip_address_txt'] = 'IP-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quaota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$wb['limit_web_domain_txt'] = 'numarul maxim de web domnii a fost atins';
+$wb['limit_web_aliasdomain_txt'] = 'Numarul maxim de alias domain a fost atins';
+$wb['limit_web_subdomain_txt'] = 'numarul maxim de subdomenii a fost atins';
+$wb['apache_directives_txt'] = 'Apache directives';
+$wb['domain_error_empty'] = 'Domain necompletat';
+$wb['domain_error_unique'] = 'exista deja un domeniu sau subdomeniu asemanator';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -> www';
+$wb['www_to_non_www_txt'] = 'www -> non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
+$wb['Domain'] = 'Aliasdomain';
+
+?>
diff --git a/interface/web/sites/lib/lang/ro_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/ro_web_childdomain_list.lng
similarity index 73%
rename from interface/web/sites/lib/lang/ro_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/ro_web_childdomain_list.lng
index e83de5b94d5b5ef471096e08ebb018405f45e291..ad66cbfdb535152c4cbdc7f28e7e6baf1b15cd88 100644
--- a/interface/web/sites/lib/lang/ro_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/ro_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Aliasdomain';
+$wb['list_head_txt'] = 'Subdomenii';
$wb['active_txt'] = 'Active';
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['add_new_record_txt'] = 'Adauga un nou aliasdomain';
+$wb['domain_txt'] = 'Subdomeniu';
+$wb['add_new_record_txt'] = 'Adauga un nou subdomeniu';
$wb['domain_error_empty'] = 'Domain necompletat';
$wb['domain_error_unique'] = 'Domain trebuie sa fie unic';
$wb['domain_error_regex'] = 'Domain nume invalid.';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'None';
+
?>
diff --git a/interface/web/sites/lib/lang/ro_web_subdomain.lng b/interface/web/sites/lib/lang/ro_web_subdomain.lng
deleted file mode 100644
index 614f88631b61d3a0a44d05091261a58d36e149de..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/ro_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Judet';
-$wb['ssl_locality_txt'] = 'Localitate';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Tara';
-$wb['ssl_request_txt'] = 'SSL Cerere';
-$wb['ssl_cert_txt'] = 'SSL Certificat';
-$wb['ssl_bundle_txt'] = 'SSL Bundle (pachet)';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IP-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quaota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'numarul maxim de web domnii a fost atins';
-$wb['limit_web_aliasdomain_txt'] = 'Numarul maxim de alias domain a fost atins';
-$wb['limit_web_subdomain_txt'] = 'numarul maxim de subdomenii a fost atins';
-$wb['apache_directives_txt'] = 'Apache directives';
-$wb['domain_error_empty'] = 'Domain necompletat';
-$wb['domain_error_unique'] = 'exista deja un domeniu sau subdomeniu asemanator';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/ro_web_subdomain_list.lng b/interface/web/sites/lib/lang/ro_web_subdomain_list.lng
deleted file mode 100644
index 445ec6ca9987af1bcc42efe2addd19cf1d301896..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/ro_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomenii';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomeniu';
-$wb['add_new_record_txt'] = 'Adauga un nou subdomeniu';
-?>
diff --git a/interface/web/sites/lib/lang/ro_web_vhost_aliasdomain.lng b/interface/web/sites/lib/lang/ro_web_vhost_aliasdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/ro_web_vhost_aliasdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/ro_web_vhost_aliasdomain_list.lng b/interface/web/sites/lib/lang/ro_web_vhost_aliasdomain_list.lng
deleted file mode 100644
index f63f62e246da3d49b06c0db10c814a5505fb380a..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/ro_web_vhost_aliasdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Aliasdomain';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['add_new_record_txt'] = 'Adauga un nou aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/ro_web_domain.lng b/interface/web/sites/lib/lang/ro_web_vhost_domain.lng
similarity index 95%
rename from interface/web/sites/lib/lang/ro_web_domain.lng
rename to interface/web/sites/lib/lang/ro_web_vhost_domain.lng
index 4ff6a0d186eb696dc8449ee27e84871f02b836f8..dc1babbc72a090ecf4a8a581f5c6884d3a0ea20e 100644
--- a/interface/web/sites/lib/lang/ro_web_domain.lng
+++ b/interface/web/sites/lib/lang/ro_web_vhost_domain.lng
@@ -120,4 +120,10 @@ $wb['rewrite_rules_txt'] = 'Rewrite Rules';
$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['host_txt'] = 'Hostname';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+
?>
diff --git a/interface/web/sites/lib/lang/ro_web_domain_admin_list.lng b/interface/web/sites/lib/lang/ro_web_vhost_domain_admin_list.lng
similarity index 100%
rename from interface/web/sites/lib/lang/ro_web_domain_admin_list.lng
rename to interface/web/sites/lib/lang/ro_web_vhost_domain_admin_list.lng
diff --git a/interface/web/sites/lib/lang/ro_web_domain_list.lng b/interface/web/sites/lib/lang/ro_web_vhost_domain_list.lng
similarity index 84%
rename from interface/web/sites/lib/lang/ro_web_domain_list.lng
rename to interface/web/sites/lib/lang/ro_web_vhost_domain_list.lng
index e84427d2a0012085682dc68f8f39a7371c6dceac..cbae0a194ec2f175c32355f829e82ae94db2cb52 100644
--- a/interface/web/sites/lib/lang/ro_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/ro_web_vhost_domain_list.lng
@@ -5,4 +5,6 @@ $wb['active_txt'] = 'Active';
$wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Domain';
$wb['add_new_record_txt'] = 'Adauga un nou website';
+$wb['parent_domain_id_txt'] = 'Website';
+
?>
diff --git a/interface/web/sites/lib/lang/ro_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/ro_web_vhost_subdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/ro_web_vhost_subdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/ro_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/ro_web_vhost_subdomain_list.lng
deleted file mode 100644
index 1c16bcda288f146167a5a49221951769017f580b..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/ro_web_vhost_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Add new subdomain';
-?>
diff --git a/interface/web/sites/lib/lang/ru_web_aliasdomain.lng b/interface/web/sites/lib/lang/ru_web_aliasdomain.lng
deleted file mode 100644
index 4149c711493e6b6f06d0e99656a1c65744d4ec46..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/ru_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/ru_web_childdomain.lng b/interface/web/sites/lib/lang/ru_web_childdomain.lng
new file mode 100644
index 0000000000000000000000000000000000000000..78668f2a986411711dd12ea094bb2a09591fa503
--- /dev/null
+++ b/interface/web/sites/lib/lang/ru_web_childdomain.lng
@@ -0,0 +1,119 @@
+<?php
+$wb['ssl_state_txt'] = 'ОблаÑÑ‚ÑŒ/край';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'ОрганизациÑ';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Страна';
+$wb['ssl_request_txt'] = 'Ð—Ð°Ð¿Ñ€Ð¾Ñ SSL';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['server_id_txt'] = 'Сервер';
+$wb['domain_txt'] = 'Домен';
+$wb['type_txt'] = 'Тип';
+$wb['parent_domain_id_txt'] = 'РодительÑкий Web-Ñайт';
+$wb['redirect_type_txt'] = 'Т';
+$wb['redirect_path_txt'] = 'Путь редиректа';
+$wb['active_txt'] = 'Ðктивен?';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Пользователь Linux';
+$wb['system_group_txt'] = 'Группа Linux';
+$wb['ip_address_txt'] = 'IP-адреÑ';
+$wb['vhost_type_txt'] = 'VHost Тип';
+$wb['hd_quota_txt'] = 'Квота HDD';
+$wb['traffic_quota_txt'] = 'Квота трафика';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Клиент';
+$wb['limit_web_domain_txt'] = 'МакÑимальное чиÑло веб доменов доÑтигнуто.';
+$wb['limit_web_aliasdomain_txt'] = 'МакÑимальное чиÑло веб алиаÑов доÑтигнуто.';
+$wb['limit_web_subdomain_txt'] = 'МакÑимальное чиÑло веб Ñубдоменов доÑтигнуто.';
+$wb['apache_directives_txt'] = 'Директивы Apache';
+$wb['domain_error_empty'] = 'Домен пуÑтой.';
+$wb['domain_error_unique'] = 'Домен должен быть уникальным.';
+$wb['domain_error_regex'] = 'Ð˜Ð¼Ñ Ð´Ð¾Ð¼ÐµÐ½Ð° неправильно.';
+$wb['host_txt'] = 'ХоÑÑ‚';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -> www';
+$wb['www_to_non_www_txt'] = 'www -> non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
+$wb['Domain'] = 'Aliasdomain';
+
+?>
diff --git a/interface/web/sites/lib/lang/ru_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/ru_web_childdomain_list.lng
similarity index 71%
rename from interface/web/sites/lib/lang/ru_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/ru_web_childdomain_list.lng
index 70b449baa4e9866242d0b95821dedcc2a1949887..6ff710b7ca1589d6fa753174f93fc000d3076183 100644
--- a/interface/web/sites/lib/lang/ru_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/ru_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Доменные алиаÑÑ‹';
+$wb['list_head_txt'] = 'Субдомены';
$wb['active_txt'] = 'Ðктивен?';
$wb['server_id_txt'] = 'Сервер';
$wb['parent_domain_id_txt'] = 'Web-Ñайт';
-$wb['domain_txt'] = 'Доменный алиаÑ';
-$wb['add_new_record_txt'] = 'Добавить новый алиаÑ';
+$wb['domain_txt'] = 'Субдомен';
+$wb['add_new_record_txt'] = 'Добавить новый Субдомен';
$wb['domain_error_empty'] = 'Домен пуÑтой.';
$wb['domain_error_unique'] = 'Домен должен быть уникальным.';
$wb['domain_error_regex'] = 'Ð˜Ð¼Ñ Ð´Ð¾Ð¼ÐµÐ½Ð° неправильно.';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'None';
+
?>
diff --git a/interface/web/sites/lib/lang/ru_web_subdomain.lng b/interface/web/sites/lib/lang/ru_web_subdomain.lng
deleted file mode 100644
index 8972c6e590c81e783fde84cc922ce18a2e7258ad..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/ru_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'ОблаÑÑ‚ÑŒ/край';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'ОрганизациÑ';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Страна';
-$wb['ssl_request_txt'] = 'Ð—Ð°Ð¿Ñ€Ð¾Ñ SSL';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['server_id_txt'] = 'Сервер';
-$wb['domain_txt'] = 'Домен';
-$wb['type_txt'] = 'Тип';
-$wb['parent_domain_id_txt'] = 'РодительÑкий Web-Ñайт';
-$wb['redirect_type_txt'] = 'Т';
-$wb['redirect_path_txt'] = 'Путь редиректа';
-$wb['active_txt'] = 'Ðктивен?';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Пользователь Linux';
-$wb['system_group_txt'] = 'Группа Linux';
-$wb['ip_address_txt'] = 'IP-адреÑ';
-$wb['vhost_type_txt'] = 'VHost Тип';
-$wb['hd_quota_txt'] = 'Квота HDD';
-$wb['traffic_quota_txt'] = 'Квота трафика';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Клиент';
-$wb['limit_web_domain_txt'] = 'МакÑимальное чиÑло веб доменов доÑтигнуто.';
-$wb['limit_web_aliasdomain_txt'] = 'МакÑимальное чиÑло веб алиаÑов доÑтигнуто.';
-$wb['limit_web_subdomain_txt'] = 'МакÑимальное чиÑло веб Ñубдоменов доÑтигнуто.';
-$wb['apache_directives_txt'] = 'Директивы Apache';
-$wb['domain_error_empty'] = 'Домен пуÑтой.';
-$wb['domain_error_unique'] = 'Домен должен быть уникальным.';
-$wb['domain_error_regex'] = 'Ð˜Ð¼Ñ Ð´Ð¾Ð¼ÐµÐ½Ð° неправильно.';
-$wb['host_txt'] = 'ХоÑÑ‚';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/ru_web_subdomain_list.lng b/interface/web/sites/lib/lang/ru_web_subdomain_list.lng
deleted file mode 100644
index 86b42c6dedf96203ebc5bab72183f0cab758beb2..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/ru_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Субдомены';
-$wb['active_txt'] = 'Ðктивен?';
-$wb['server_id_txt'] = 'Сервер';
-$wb['parent_domain_id_txt'] = 'Web-Ñайт';
-$wb['domain_txt'] = 'Субдомен';
-$wb['add_new_record_txt'] = 'Добавить новый Субдомен';
-?>
diff --git a/interface/web/sites/lib/lang/ru_web_vhost_aliasdomain.lng b/interface/web/sites/lib/lang/ru_web_vhost_aliasdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/ru_web_vhost_aliasdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/ru_web_vhost_aliasdomain_list.lng b/interface/web/sites/lib/lang/ru_web_vhost_aliasdomain_list.lng
deleted file mode 100644
index 041c188eade0f3cc1a7f0bf69234055beac58926..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/ru_web_vhost_aliasdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Доменные алиаÑÑ‹';
-$wb['active_txt'] = 'Ðктивен?';
-$wb['server_id_txt'] = 'Сервер';
-$wb['parent_domain_id_txt'] = 'Web-Ñайт';
-$wb['domain_txt'] = 'Доменный алиаÑ';
-$wb['add_new_record_txt'] = 'Добавить новый алиаÑ';
-?>
diff --git a/interface/web/sites/lib/lang/ru_web_domain.lng b/interface/web/sites/lib/lang/ru_web_vhost_domain.lng
similarity index 95%
rename from interface/web/sites/lib/lang/ru_web_domain.lng
rename to interface/web/sites/lib/lang/ru_web_vhost_domain.lng
index 964d9f488b7335de8cf1b57d5f66026150cd962d..460596de25a7785108d1a70db728fefad3d4506f 100644
--- a/interface/web/sites/lib/lang/ru_web_domain.lng
+++ b/interface/web/sites/lib/lang/ru_web_vhost_domain.lng
@@ -120,4 +120,10 @@ $wb['rewrite_rules_txt'] = 'Rewrite Rules';
$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['host_txt'] = 'Hostname';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+
?>
diff --git a/interface/web/sites/lib/lang/ru_web_domain_admin_list.lng b/interface/web/sites/lib/lang/ru_web_vhost_domain_admin_list.lng
similarity index 100%
rename from interface/web/sites/lib/lang/ru_web_domain_admin_list.lng
rename to interface/web/sites/lib/lang/ru_web_vhost_domain_admin_list.lng
diff --git a/interface/web/sites/lib/lang/ru_web_domain_list.lng b/interface/web/sites/lib/lang/ru_web_vhost_domain_list.lng
similarity index 86%
rename from interface/web/sites/lib/lang/ru_web_domain_list.lng
rename to interface/web/sites/lib/lang/ru_web_vhost_domain_list.lng
index 018e3652e33029478b03050a35d618798010e9db..0d159e52fffa6f555661ab60cd9799f7b3bb59dc 100644
--- a/interface/web/sites/lib/lang/ru_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/ru_web_vhost_domain_list.lng
@@ -5,4 +5,6 @@ $wb['server_id_txt'] = 'Сервер';
$wb['domain_txt'] = 'Домен';
$wb['add_new_record_txt'] = 'Добавить новый вебÑайт';
$wb['domain_id_txt'] = 'ID';
+$wb['parent_domain_id_txt'] = 'Website';
+
?>
diff --git a/interface/web/sites/lib/lang/ru_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/ru_web_vhost_subdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/ru_web_vhost_subdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/ru_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/ru_web_vhost_subdomain_list.lng
deleted file mode 100644
index 1c16bcda288f146167a5a49221951769017f580b..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/ru_web_vhost_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Add new subdomain';
-?>
diff --git a/interface/web/sites/lib/lang/se_web_aliasdomain.lng b/interface/web/sites/lib/lang/se_web_aliasdomain.lng
deleted file mode 100644
index 4149c711493e6b6f06d0e99656a1c65744d4ec46..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/se_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/es_web_aliasdomain.lng b/interface/web/sites/lib/lang/se_web_childdomain.lng
similarity index 93%
rename from interface/web/sites/lib/lang/es_web_aliasdomain.lng
rename to interface/web/sites/lib/lang/se_web_childdomain.lng
index 4149c711493e6b6f06d0e99656a1c65744d4ec46..1d38d2a2c7e0e754a4c32a343f3a98c7a9a89852 100644
--- a/interface/web/sites/lib/lang/es_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/se_web_childdomain.lng
@@ -1,20 +1,15 @@
<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
$wb['ssl_state_txt'] = 'State';
$wb['ssl_locality_txt'] = 'Locality';
$wb['ssl_organisation_txt'] = 'Organisation';
$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
$wb['ssl_request_txt'] = 'SSL Request';
$wb['ssl_cert_txt'] = 'SSL Certificate';
$wb['ssl_bundle_txt'] = 'SSL Bundle';
$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_txt'] = 'Domain';
$wb['type_txt'] = 'Type';
$wb['parent_domain_id_txt'] = 'Parent Website';
$wb['redirect_type_txt'] = 'Redirect Type';
@@ -23,15 +18,12 @@ $wb['active_txt'] = 'Active';
$wb['document_root_txt'] = 'Documentroot';
$wb['system_user_txt'] = 'Linux User';
$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['ip_address_txt'] = 'IP-Address';
$wb['vhost_type_txt'] = 'VHost Type';
$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quaota';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
@@ -39,10 +31,26 @@ $wb['client_txt'] = 'Client';
$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
+$wb['apache_directives_txt'] = 'Apache directives';
$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_unique'] = 'Domain must be unique.';
$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
@@ -62,7 +70,6 @@ $wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid character
$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@ $wb['stats_type_txt'] = 'Webstatistics program';
$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
$wb['none_txt'] = 'None';
$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
$wb['save_certificate_txt'] = 'Save certificate';
$wb['create_certificate_txt'] = 'Create certificate';
$wb['delete_certificate_txt'] = 'Delete certificate';
@@ -109,7 +114,6 @@ $wb['password_match_txt'] = 'The passwords do match.';
$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
$wb['Domain'] = 'Aliasdomain';
+
?>
diff --git a/interface/web/sites/lib/lang/se_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/se_web_childdomain_list.lng
similarity index 74%
rename from interface/web/sites/lib/lang/se_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/se_web_childdomain_list.lng
index 8ea34c440978e1ec0920627b26e72315d713eda1..95a3b5f71a21f4a00f1e2ab067c5fa25f3f9a19a 100644
--- a/interface/web/sites/lib/lang/se_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/se_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Aliasdomain';
+$wb['list_head_txt'] = 'Subdomains';
$wb['active_txt'] = 'Active';
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['add_new_record_txt'] = 'Add new aliasdomain';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Add new subdomain';
$wb['domain_error_empty'] = 'Domain is empty.';
$wb['domain_error_unique'] = 'Domain must be unique.';
$wb['domain_error_regex'] = 'Domain name invalid.';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'None';
+
?>
diff --git a/interface/web/sites/lib/lang/se_web_subdomain.lng b/interface/web/sites/lib/lang/se_web_subdomain.lng
deleted file mode 100644
index d86c1665c3c9ff80d76be726cc5b89a07f969948..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/se_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IP-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quaota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'Domain must be unique.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/se_web_subdomain_list.lng b/interface/web/sites/lib/lang/se_web_subdomain_list.lng
deleted file mode 100644
index 1c16bcda288f146167a5a49221951769017f580b..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/se_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Add new subdomain';
-?>
diff --git a/interface/web/sites/lib/lang/se_web_vhost_aliasdomain.lng b/interface/web/sites/lib/lang/se_web_vhost_aliasdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/se_web_vhost_aliasdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/se_web_vhost_aliasdomain_list.lng b/interface/web/sites/lib/lang/se_web_vhost_aliasdomain_list.lng
deleted file mode 100644
index ae8bfec7a823f5df6ab606c4ff1f425ad578105a..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/se_web_vhost_aliasdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Aliasdomain';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['add_new_record_txt'] = 'Add new aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/se_web_domain.lng b/interface/web/sites/lib/lang/se_web_vhost_domain.lng
similarity index 95%
rename from interface/web/sites/lib/lang/se_web_domain.lng
rename to interface/web/sites/lib/lang/se_web_vhost_domain.lng
index 2d9e432374ae7815c587adeea09e599506e1a2fb..3b6c9c351c2bec190a930f36839eef3ba890987d 100644
--- a/interface/web/sites/lib/lang/se_web_domain.lng
+++ b/interface/web/sites/lib/lang/se_web_vhost_domain.lng
@@ -120,4 +120,10 @@ $wb['rewrite_rules_txt'] = 'Rewrite Rules';
$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['host_txt'] = 'Hostname';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+
?>
diff --git a/interface/web/sites/lib/lang/se_web_domain_admin_list.lng b/interface/web/sites/lib/lang/se_web_vhost_domain_admin_list.lng
similarity index 100%
rename from interface/web/sites/lib/lang/se_web_domain_admin_list.lng
rename to interface/web/sites/lib/lang/se_web_vhost_domain_admin_list.lng
diff --git a/interface/web/sites/lib/lang/se_web_vhost_domain_list.lng b/interface/web/sites/lib/lang/se_web_vhost_domain_list.lng
new file mode 100644
index 0000000000000000000000000000000000000000..b8f85d3143cf1d6a3d0d78190f88b772738e7d62
--- /dev/null
+++ b/interface/web/sites/lib/lang/se_web_vhost_domain_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['list_head_txt'] = 'Websites';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Add new website';
+$wb['parent_domain_id_txt'] = 'Website';
+
+?>
diff --git a/interface/web/sites/lib/lang/se_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/se_web_vhost_subdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/se_web_vhost_subdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/se_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/se_web_vhost_subdomain_list.lng
deleted file mode 100644
index 1c16bcda288f146167a5a49221951769017f580b..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/se_web_vhost_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Add new subdomain';
-?>
diff --git a/interface/web/sites/lib/lang/sk_web_aliasdomain.lng b/interface/web/sites/lib/lang/sk_web_aliasdomain.lng
deleted file mode 100644
index 4149c711493e6b6f06d0e99656a1c65744d4ec46..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/sk_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/sk_web_childdomain.lng b/interface/web/sites/lib/lang/sk_web_childdomain.lng
new file mode 100644
index 0000000000000000000000000000000000000000..d550c36176c7c66bea577d092690d612ff9c0303
--- /dev/null
+++ b/interface/web/sites/lib/lang/sk_web_childdomain.lng
@@ -0,0 +1,119 @@
+<?php
+$wb['ssl_state_txt'] = 'Štát';
+$wb['ssl_locality_txt'] = 'Lokalita';
+$wb['ssl_organisation_txt'] = 'Organizácia';
+$wb['ssl_organisation_unit_txt'] = 'OrganizaÄné zložky';
+$wb['ssl_country_txt'] = 'Krajina';
+$wb['ssl_request_txt'] = 'SSL Požiadavka';
+$wb['ssl_cert_txt'] = 'SSL Certifikát';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Akcia';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Doména';
+$wb['type_txt'] = 'Typ';
+$wb['parent_domain_id_txt'] = 'Materská webová stránka';
+$wb['redirect_type_txt'] = 'Typ presmerovanie';
+$wb['redirect_path_txt'] = 'Cesta presmerovania';
+$wb['active_txt'] = 'AktÃvne';
+$wb['document_root_txt'] = 'DocumentRoot';
+$wb['system_user_txt'] = 'Linuxový uživateľ';
+$wb['system_group_txt'] = 'Linuxová skupina';
+$wb['ip_address_txt'] = 'IP Adresa';
+$wb['vhost_type_txt'] = 'VHost Typ';
+$wb['hd_quota_txt'] = 'Harddisk Kvóta';
+$wb['traffic_quota_txt'] = 'Kvóta Vyťaženia';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Klient';
+$wb['limit_web_domain_txt'] = 'Max. poÄet internetových domén pre Váš úÄet je dosiahnutý.';
+$wb['limit_web_aliasdomain_txt'] = 'Max. alias domén pre Váš úÄet je dosiahnutý.';
+$wb['limit_web_subdomain_txt'] = 'Max. poÄet webových subdomén pre Váš úÄet je dosiahnutý.';
+$wb['apache_directives_txt'] = 'Apache smernÃce';
+$wb['domain_error_empty'] = 'Doména je prázdna.';
+$wb['domain_error_unique'] = 'Existuje už webová stránka alebo sub / alias doména k tejto doméne.';
+$wb['domain_error_regex'] = 'Doménové meno neplatné.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -> www';
+$wb['www_to_non_www_txt'] = 'www -> non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
+$wb['Domain'] = 'Aliasdomain';
+
+?>
diff --git a/interface/web/sites/lib/lang/sk_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/sk_web_childdomain_list.lng
similarity index 65%
rename from interface/web/sites/lib/lang/sk_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/sk_web_childdomain_list.lng
index 635213c357ee062b309254d00e8af24ef4ddaa22..87db149f2c3de8475aa7401c3b40701193a525cd 100644
--- a/interface/web/sites/lib/lang/sk_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/sk_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Alias doména';
+$wb['list_head_txt'] = 'Subdomény';
$wb['active_txt'] = 'AktÃvne';
$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Webstránky';
-$wb['domain_txt'] = 'Alias doména';
-$wb['add_new_record_txt'] = 'Pridať novú alias doménu';
+$wb['parent_domain_id_txt'] = 'Webstránka';
+$wb['domain_txt'] = 'Subdoména';
+$wb['add_new_record_txt'] = 'Pridať novú subdoménu';
$wb['domain_error_empty'] = 'Doména je prázdna.';
$wb['domain_error_unique'] = 'Doména musà byť unikátna.';
$wb['domain_error_regex'] = 'Doménové meno neplatné.';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'None';
+
?>
diff --git a/interface/web/sites/lib/lang/sk_web_subdomain.lng b/interface/web/sites/lib/lang/sk_web_subdomain.lng
deleted file mode 100644
index aa0a1b60aaa675197467a240fe5f9e134f44e691..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/sk_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Štát';
-$wb['ssl_locality_txt'] = 'Lokalita';
-$wb['ssl_organisation_txt'] = 'Organizácia';
-$wb['ssl_organisation_unit_txt'] = 'OrganizaÄné zložky';
-$wb['ssl_country_txt'] = 'Krajina';
-$wb['ssl_request_txt'] = 'SSL Požiadavka';
-$wb['ssl_cert_txt'] = 'SSL Certifikát';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Akcia';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Doména';
-$wb['type_txt'] = 'Typ';
-$wb['parent_domain_id_txt'] = 'Materská webová stránka';
-$wb['redirect_type_txt'] = 'Typ presmerovanie';
-$wb['redirect_path_txt'] = 'Cesta presmerovania';
-$wb['active_txt'] = 'AktÃvne';
-$wb['document_root_txt'] = 'DocumentRoot';
-$wb['system_user_txt'] = 'Linuxový uživateľ';
-$wb['system_group_txt'] = 'Linuxová skupina';
-$wb['ip_address_txt'] = 'IP Adresa';
-$wb['vhost_type_txt'] = 'VHost Typ';
-$wb['hd_quota_txt'] = 'Harddisk Kvóta';
-$wb['traffic_quota_txt'] = 'Kvóta Vyťaženia';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Klient';
-$wb['limit_web_domain_txt'] = 'Max. poÄet internetových domén pre Váš úÄet je dosiahnutý.';
-$wb['limit_web_aliasdomain_txt'] = 'Max. alias domén pre Váš úÄet je dosiahnutý.';
-$wb['limit_web_subdomain_txt'] = 'Max. poÄet webových subdomén pre Váš úÄet je dosiahnutý.';
-$wb['apache_directives_txt'] = 'Apache smernÃce';
-$wb['domain_error_empty'] = 'Doména je prázdna.';
-$wb['domain_error_unique'] = 'Existuje už webová stránka alebo sub / alias doména k tejto doméne.';
-$wb['domain_error_regex'] = 'Doménové meno neplatné.';
-$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/sk_web_subdomain_list.lng b/interface/web/sites/lib/lang/sk_web_subdomain_list.lng
deleted file mode 100644
index 5b4a3a5d2eb305ef0c4d7a75736ebe0c0b0608d7..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/sk_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomény';
-$wb['active_txt'] = 'AktÃvne';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Webstránka';
-$wb['domain_txt'] = 'Subdoména';
-$wb['add_new_record_txt'] = 'Pridať novú subdoménu';
-?>
diff --git a/interface/web/sites/lib/lang/sk_web_vhost_aliasdomain.lng b/interface/web/sites/lib/lang/sk_web_vhost_aliasdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/sk_web_vhost_aliasdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/sk_web_vhost_aliasdomain_list.lng b/interface/web/sites/lib/lang/sk_web_vhost_aliasdomain_list.lng
deleted file mode 100644
index c626f081e23317774f4c9aa05935aa83c912bad7..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/sk_web_vhost_aliasdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Alias doména';
-$wb['active_txt'] = 'AktÃvne';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Webstránky';
-$wb['domain_txt'] = 'Alias doména';
-$wb['add_new_record_txt'] = 'Pridať novú alias doménu';
-?>
diff --git a/interface/web/sites/lib/lang/sk_web_domain.lng b/interface/web/sites/lib/lang/sk_web_vhost_domain.lng
similarity index 95%
rename from interface/web/sites/lib/lang/sk_web_domain.lng
rename to interface/web/sites/lib/lang/sk_web_vhost_domain.lng
index 40b00bde65132897f7a80e9c19cf1dfd7713a2a3..f4234f80736f23a2dab9d42271412762938ab6b5 100644
--- a/interface/web/sites/lib/lang/sk_web_domain.lng
+++ b/interface/web/sites/lib/lang/sk_web_vhost_domain.lng
@@ -120,4 +120,10 @@ $wb['rewrite_rules_txt'] = 'Rewrite Rules';
$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['host_txt'] = 'Hostname';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+
?>
diff --git a/interface/web/sites/lib/lang/sk_web_domain_admin_list.lng b/interface/web/sites/lib/lang/sk_web_vhost_domain_admin_list.lng
similarity index 100%
rename from interface/web/sites/lib/lang/sk_web_domain_admin_list.lng
rename to interface/web/sites/lib/lang/sk_web_vhost_domain_admin_list.lng
diff --git a/interface/web/sites/lib/lang/sk_web_domain_list.lng b/interface/web/sites/lib/lang/sk_web_vhost_domain_list.lng
similarity index 84%
rename from interface/web/sites/lib/lang/sk_web_domain_list.lng
rename to interface/web/sites/lib/lang/sk_web_vhost_domain_list.lng
index 05a1d4f7b4ac23ec8392f99ea5347191e222d5f1..8b9c86f81d575b14e2c6cea6db3df6b5562d4314 100644
--- a/interface/web/sites/lib/lang/sk_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/sk_web_vhost_domain_list.lng
@@ -5,4 +5,6 @@ $wb['active_txt'] = 'AktÃvne';
$wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Doména';
$wb['add_new_record_txt'] = 'Pridať novú doménu';
+$wb['parent_domain_id_txt'] = 'Website';
+
?>
diff --git a/interface/web/sites/lib/lang/sk_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/sk_web_vhost_subdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/sk_web_vhost_subdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/sk_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/sk_web_vhost_subdomain_list.lng
deleted file mode 100644
index 1c16bcda288f146167a5a49221951769017f580b..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/sk_web_vhost_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Add new subdomain';
-?>
diff --git a/interface/web/sites/lib/lang/tr_web_aliasdomain.lng b/interface/web/sites/lib/lang/tr_web_aliasdomain.lng
deleted file mode 100644
index 4149c711493e6b6f06d0e99656a1c65744d4ec46..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/tr_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/tr_web_childdomain.lng b/interface/web/sites/lib/lang/tr_web_childdomain.lng
new file mode 100644
index 0000000000000000000000000000000000000000..56a020f37f09bb34c91ec23f49111cb534547a20
--- /dev/null
+++ b/interface/web/sites/lib/lang/tr_web_childdomain.lng
@@ -0,0 +1,119 @@
+<?php
+$wb['ssl_state_txt'] = 'Mevki';
+$wb['ssl_locality_txt'] = 'Semt';
+$wb['ssl_organisation_txt'] = 'Organizasyon';
+$wb['ssl_organisation_unit_txt'] = 'Organizasyon Unitesi';
+$wb['ssl_country_txt'] = 'Ãœlke';
+$wb['ssl_request_txt'] = 'SSL Ä°steÄŸi';
+$wb['ssl_cert_txt'] = 'SSL Sertifikası';
+$wb['ssl_bundle_txt'] = 'SSL Yığını';
+$wb['ssl_action_txt'] = 'SSL Eylemi';
+$wb['server_id_txt'] = 'Sunucu';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'Çeşit';
+$wb['parent_domain_id_txt'] = 'Ana Website';
+$wb['redirect_type_txt'] = 'Yönlendirme Çeşidi';
+$wb['redirect_path_txt'] = 'Yönlendirme Yolu';
+$wb['active_txt'] = 'Aktif';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux Kullanıcısı';
+$wb['system_group_txt'] = 'Linux Grubu';
+$wb['ip_address_txt'] = 'IP Adresleri';
+$wb['vhost_type_txt'] = 'VHost Çeşidi';
+$wb['hd_quota_txt'] = 'Harddisk Kotası';
+$wb['traffic_quota_txt'] = 'Trafik Kotası';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Müşteri';
+$wb['limit_web_domain_txt'] = 'Hesabınızdaki max. web domaini sayısına ulaştınız.';
+$wb['limit_web_aliasdomain_txt'] = 'Hesabınızdaki max. aliasdomain sayısına ulaştınız.';
+$wb['limit_web_subdomain_txt'] = 'Hesabınızdaki max. web subdomain sayısına ulaştınız.';
+$wb['apache_directives_txt'] = 'Apache direktifleri';
+$wb['domain_error_empty'] = 'Domain boÅŸ.';
+$wb['domain_error_unique'] = 'Bu isimde websitesi veya sub / aliasdomain zaten var.';
+$wb['domain_error_regex'] = 'Domain ismi geçersiz.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Geçersiz yönlendirme yolu. Geçerli yönlendirmeler örneğin: /test/ veya http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -> www';
+$wb['www_to_non_www_txt'] = 'www -> non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
+$wb['Domain'] = 'Aliasdomain';
+
+?>
diff --git a/interface/web/sites/lib/lang/tr_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/tr_web_childdomain_list.lng
similarity index 74%
rename from interface/web/sites/lib/lang/tr_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/tr_web_childdomain_list.lng
index fdb496d403061c5e03e4bf06b301f0ed08ba664d..0c6a6aff1604065b66e56fd353b88c004acbb64f 100644
--- a/interface/web/sites/lib/lang/tr_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/tr_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Aliasdomain';
+$wb['list_head_txt'] = 'Subdomainler';
$wb['active_txt'] = 'Aktif';
$wb['server_id_txt'] = 'Sunucu';
$wb['parent_domain_id_txt'] = 'Websitesi';
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['add_new_record_txt'] = 'Yeni Aliasdomain';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Yeni Subdomain';
$wb['domain_error_empty'] = 'Domain boÅŸ.';
$wb['domain_error_unique'] = 'Bu Domain zaten var.';
$wb['domain_error_regex'] = 'Geçersiz Domain.';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'None';
+
?>
diff --git a/interface/web/sites/lib/lang/tr_web_subdomain.lng b/interface/web/sites/lib/lang/tr_web_subdomain.lng
deleted file mode 100644
index c0191cfd00fab6b750e36b425458866aca05be80..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/tr_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Mevki';
-$wb['ssl_locality_txt'] = 'Semt';
-$wb['ssl_organisation_txt'] = 'Organizasyon';
-$wb['ssl_organisation_unit_txt'] = 'Organizasyon Unitesi';
-$wb['ssl_country_txt'] = 'Ãœlke';
-$wb['ssl_request_txt'] = 'SSL Ä°steÄŸi';
-$wb['ssl_cert_txt'] = 'SSL Sertifikası';
-$wb['ssl_bundle_txt'] = 'SSL Yığını';
-$wb['ssl_action_txt'] = 'SSL Eylemi';
-$wb['server_id_txt'] = 'Sunucu';
-$wb['domain_txt'] = 'Domain';
-$wb['type_txt'] = 'Çeşit';
-$wb['parent_domain_id_txt'] = 'Ana Website';
-$wb['redirect_type_txt'] = 'Yönlendirme Çeşidi';
-$wb['redirect_path_txt'] = 'Yönlendirme Yolu';
-$wb['active_txt'] = 'Aktif';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux Kullanıcısı';
-$wb['system_group_txt'] = 'Linux Grubu';
-$wb['ip_address_txt'] = 'IP Adresleri';
-$wb['vhost_type_txt'] = 'VHost Çeşidi';
-$wb['hd_quota_txt'] = 'Harddisk Kotası';
-$wb['traffic_quota_txt'] = 'Trafik Kotası';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Müşteri';
-$wb['limit_web_domain_txt'] = 'Hesabınızdaki max. web domaini sayısına ulaştınız.';
-$wb['limit_web_aliasdomain_txt'] = 'Hesabınızdaki max. aliasdomain sayısına ulaştınız.';
-$wb['limit_web_subdomain_txt'] = 'Hesabınızdaki max. web subdomain sayısına ulaştınız.';
-$wb['apache_directives_txt'] = 'Apache direktifleri';
-$wb['domain_error_empty'] = 'Domain boÅŸ.';
-$wb['domain_error_unique'] = 'Bu isimde websitesi veya sub / aliasdomain zaten var.';
-$wb['domain_error_regex'] = 'Domain ismi geçersiz.';
-$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Geçersiz yönlendirme yolu. Geçerli yönlendirmeler örneğin: /test/ veya http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/tr_web_subdomain_list.lng b/interface/web/sites/lib/lang/tr_web_subdomain_list.lng
deleted file mode 100644
index 44b7bbeecbfeb74438bb8285e4c9e95b0a28ef31..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/tr_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomainler';
-$wb['active_txt'] = 'Aktif';
-$wb['server_id_txt'] = 'Sunucu';
-$wb['parent_domain_id_txt'] = 'Websitesi';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Yeni Subdomain';
-?>
diff --git a/interface/web/sites/lib/lang/tr_web_vhost_aliasdomain.lng b/interface/web/sites/lib/lang/tr_web_vhost_aliasdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/tr_web_vhost_aliasdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/tr_web_vhost_aliasdomain_list.lng b/interface/web/sites/lib/lang/tr_web_vhost_aliasdomain_list.lng
deleted file mode 100644
index afe91af16ed28dd5e18fce92139ff6e5f0de3459..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/tr_web_vhost_aliasdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Aliasdomain';
-$wb['active_txt'] = 'Aktif';
-$wb['server_id_txt'] = 'Sunucu';
-$wb['parent_domain_id_txt'] = 'Websitesi';
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['add_new_record_txt'] = 'Yeni Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/tr_web_domain.lng b/interface/web/sites/lib/lang/tr_web_vhost_domain.lng
similarity index 95%
rename from interface/web/sites/lib/lang/tr_web_domain.lng
rename to interface/web/sites/lib/lang/tr_web_vhost_domain.lng
index 1b330059e93074d10204ee797c7ecbe55775afc3..695fb4f45ec2ce1d7e826313c243d1ac4653d0f0 100644
--- a/interface/web/sites/lib/lang/tr_web_domain.lng
+++ b/interface/web/sites/lib/lang/tr_web_vhost_domain.lng
@@ -120,4 +120,10 @@ $wb['rewrite_rules_txt'] = 'Rewrite Rules';
$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['host_txt'] = 'Hostname';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+
?>
diff --git a/interface/web/sites/lib/lang/tr_web_domain_admin_list.lng b/interface/web/sites/lib/lang/tr_web_vhost_domain_admin_list.lng
similarity index 100%
rename from interface/web/sites/lib/lang/tr_web_domain_admin_list.lng
rename to interface/web/sites/lib/lang/tr_web_vhost_domain_admin_list.lng
diff --git a/interface/web/sites/lib/lang/tr_web_domain_list.lng b/interface/web/sites/lib/lang/tr_web_vhost_domain_list.lng
similarity index 83%
rename from interface/web/sites/lib/lang/tr_web_domain_list.lng
rename to interface/web/sites/lib/lang/tr_web_vhost_domain_list.lng
index 8dbf8fd45076e3374f8c328321071848a6de6b7c..896902904b748eb223540c91f198659dbf5cebdc 100644
--- a/interface/web/sites/lib/lang/tr_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/tr_web_vhost_domain_list.lng
@@ -5,4 +5,6 @@ $wb['active_txt'] = 'Aktif';
$wb['server_id_txt'] = 'Sunucu';
$wb['domain_txt'] = 'Domain';
$wb['add_new_record_txt'] = 'Yeni Website';
+$wb['parent_domain_id_txt'] = 'Website';
+
?>
diff --git a/interface/web/sites/lib/lang/tr_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/tr_web_vhost_subdomain.lng
deleted file mode 100644
index b87c788126dbd5785e1b73ac049e6f04b5ee7735..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/tr_web_vhost_subdomain.lng
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-?>
diff --git a/interface/web/sites/lib/lang/tr_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/tr_web_vhost_subdomain_list.lng
deleted file mode 100644
index 1c16bcda288f146167a5a49221951769017f580b..0000000000000000000000000000000000000000
--- a/interface/web/sites/lib/lang/tr_web_vhost_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Add new subdomain';
-?>
diff --git a/interface/web/sites/lib/module.conf.php b/interface/web/sites/lib/module.conf.php
index 92e1c12747aac8c61ea950de66150288de39ebaa..0a61e06a1df8c3c2933a65dba62fad7cec229c31 100644
--- a/interface/web/sites/lib/module.conf.php
+++ b/interface/web/sites/lib/module.conf.php
@@ -15,7 +15,7 @@ if($app->auth->get_client_limit($userid, 'web_domain') != 0)
{
$items[] = array( 'title' => "Website",
'target' => 'content',
- 'link' => 'sites/web_domain_list.php',
+ 'link' => 'sites/web_vhost_domain_list.php?type=domain',
'html_id' => 'domain_list');
}
@@ -23,8 +23,8 @@ if($app->auth->get_client_limit($userid, 'web_subdomain') != 0)
{
$items[] = array( 'title' => "Subdomain",
'target' => 'content',
- 'link' => 'sites/web_subdomain_list.php',
- 'html_id' => 'subdomain_list');
+ 'link' => 'sites/web_childdomain_list.php?type=subdomain',
+ 'html_id' => 'childdomain_list');
// read web config
$app->uses('getconf');
@@ -32,8 +32,8 @@ if($app->auth->get_client_limit($userid, 'web_subdomain') != 0)
if($sys_config['vhost_subdomains'] == 'y') {
$items[] = array( 'title' => "Subdomain (Vhost)",
'target' => 'content',
- 'link' => 'sites/web_vhost_subdomain_list.php',
- 'html_id' => 'subdomain_list');
+ 'link' => 'sites/web_vhost_domain_list.php?type=subdomain',
+ 'html_id' => 'childdomain_list');
}
}
@@ -41,8 +41,8 @@ if($app->auth->get_client_limit($userid, 'web_aliasdomain') != 0)
{
$items[] = array( 'title' => "Aliasdomain",
'target' => 'content',
- 'link' => 'sites/web_aliasdomain_list.php',
- 'html_id' => 'aliasdomain_list');
+ 'link' => 'sites/web_childdomain_list.php?type=aliasdomain',
+ 'html_id' => 'childdomain_list');
// read web config
$app->uses('getconf');
@@ -50,8 +50,8 @@ if($app->auth->get_client_limit($userid, 'web_aliasdomain') != 0)
if($sys_config['vhost_aliasdomains'] == 'y') {
$items[] = array( 'title' => "Aliasdomain (Vhost)",
'target' => 'content',
- 'link' => 'sites/web_vhost_aliasdomain_list.php',
- 'html_id' => 'subdomain_list');
+ 'link' => 'sites/web_vhost_domain_list.php?type=aliasdomain',
+ 'html_id' => 'childdomain_list');
}
}
diff --git a/interface/web/sites/list/web_aliasdomain.list.php b/interface/web/sites/list/web_aliasdomain.list.php
deleted file mode 100644
index 713cfc0ca2aa3fbd47414c91196c654bfb7f1cea..0000000000000000000000000000000000000000
--- a/interface/web/sites/list/web_aliasdomain.list.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-/*
- Datatypes:
- - INTEGER
- - DOUBLE
- - CURRENCY
- - VARCHAR
- - TEXT
- - DATE
-*/
-
-
-
-// Name of the list
-$liste["name"] = "web_aliasdomain";
-
-// Database table
-$liste["table"] = "web_domain";
-
-// Index index field of the database table
-$liste["table_idx"] = "domain_id";
-
-// Search Field Prefix
-$liste["search_prefix"] = "search_";
-
-// Records per page
-$liste["records_per_page"] = "15";
-
-// Script File of the list
-$liste["file"] = "web_aliasdomain_list.php";
-
-// Script file of the edit form
-$liste["edit_file"] = "web_aliasdomain_edit.php";
-
-// Script File of the delete script
-$liste["delete_file"] = "web_aliasdomain_del.php";
-
-// Paging Template
-$liste["paging_tpl"] = "templates/paging.tpl.htm";
-
-// Enable auth
-$liste["auth"] = "yes";
-
-
-/*****************************************************
-* Suchfelder
-*****************************************************/
-
-
-$liste["item"][] = array( 'field' => "active",
- 'datatype' => "VARCHAR",
- 'formtype' => "SELECT",
- 'op' => "=",
- 'prefix' => "",
- 'suffix' => "",
- 'width' => "",
- 'value' => array('y' => "<div id=\"ir-Yes\" class=\"swap\"><span>Yes</span></div>", 'n' => "<div class=\"swap\" id=\"ir-No\"><span>No</span></div>"));
-
-
-$liste["item"][] = array( 'field' => "server_id",
- 'datatype' => "VARCHAR",
- 'formtype' => "SELECT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
- 'datasource' => array ( 'type' => 'SQL',
- 'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name',
- 'keyfield'=> 'server_id',
- 'valuefield'=> 'server_name'
- ),
- 'width' => "",
- 'value' => "");
-
-$liste["item"][] = array( 'field' => "parent_domain_id",
- 'datatype' => "VARCHAR",
- 'filters' => array( 0 => array( 'event' => 'SHOW',
- 'type' => 'IDNTOUTF8')
- ),
- 'formtype' => "SELECT",
- 'op' => "=",
- 'prefix' => "",
- 'suffix' => "",
- 'datasource' => array ( 'type' => 'SQL',
- 'querystring' => "SELECT domain_id,domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
- 'keyfield'=> 'domain_id',
- 'valuefield'=> 'domain'
- ),
- 'width' => "",
- 'value' => "");
-
-$liste["item"][] = array( 'field' => "domain",
- 'datatype' => "VARCHAR",
- 'filters' => array( 0 => array( 'event' => 'SHOW',
- 'type' => 'IDNTOUTF8')
- ),
- 'formtype' => "TEXT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
- 'width' => "",
- 'value' => "");
-
-
-?>
diff --git a/interface/web/sites/list/web_subdomain.list.php b/interface/web/sites/list/web_childdomain.list.php
similarity index 91%
rename from interface/web/sites/list/web_subdomain.list.php
rename to interface/web/sites/list/web_childdomain.list.php
index 2a47d77c2071f96fb1b73660e39e41ccc02c3c79..49167389d5336dd61d1a5f6031f43463c8360aff 100644
--- a/interface/web/sites/list/web_subdomain.list.php
+++ b/interface/web/sites/list/web_childdomain.list.php
@@ -13,7 +13,7 @@
// Name of the list
-$liste["name"] = "web_subdomain";
+$liste["name"] = "web_childdomain";
// Database table
$liste["table"] = "web_domain";
@@ -28,13 +28,13 @@ $liste["search_prefix"] = "search_";
$liste["records_per_page"] = "15";
// Script File of the list
-$liste["file"] = "web_subdomain_list.php";
+$liste["file"] = "web_childdomain_list.php";
// Script file of the edit form
-$liste["edit_file"] = "web_subdomain_edit.php";
+$liste["edit_file"] = "web_childdomain_edit.php";
// Script File of the delete script
-$liste["delete_file"] = "web_subdomain_del.php";
+$liste["delete_file"] = "web_childdomain_del.php";
// Paging Template
$liste["paging_tpl"] = "templates/paging.tpl.htm";
diff --git a/interface/web/sites/list/web_vhost_aliasdomain.list.php b/interface/web/sites/list/web_vhost_aliasdomain.list.php
deleted file mode 100644
index a9a044f864188dc76ffbb03b385b9f22a4f4d10c..0000000000000000000000000000000000000000
--- a/interface/web/sites/list/web_vhost_aliasdomain.list.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-/*
- Datatypes:
- - INTEGER
- - DOUBLE
- - CURRENCY
- - VARCHAR
- - TEXT
- - DATE
-*/
-
-
-
-// Name of the list
-$liste["name"] = "web_vhost_aliasdomain";
-
-// Database table
-$liste["table"] = "web_domain";
-
-// Index index field of the database table
-$liste["table_idx"] = "domain_id";
-
-// Search Field Prefix
-$liste["search_prefix"] = "search_";
-
-// Records per page
-$liste["records_per_page"] = "15";
-
-// Script File of the list
-$liste["file"] = "web_vhost_aliasdomain_list.php";
-
-// Script file of the edit form
-$liste["edit_file"] = "web_vhost_aliasdomain_edit.php";
-
-// Script File of the delete script
-$liste["delete_file"] = "web_vhost_aliasdomain_del.php";
-
-// Paging Template
-$liste["paging_tpl"] = "templates/paging.tpl.htm";
-
-// Enable auth
-$liste["auth"] = "yes";
-
-
-/*****************************************************
-* Suchfelder
-*****************************************************/
-
-
-$liste["item"][] = array( 'field' => "active",
- 'datatype' => "VARCHAR",
- 'formtype' => "SELECT",
- 'op' => "=",
- 'prefix' => "",
- 'suffix' => "",
- 'width' => "",
- 'value' => array('y' => "<div id=\"ir-Yes\" class=\"swap\"><span>Yes</span></div>", 'n' => "<div class=\"swap\" id=\"ir-No\"><span>No</span></div>"));
-
-
-$liste["item"][] = array( 'field' => "server_id",
- 'datatype' => "VARCHAR",
- 'formtype' => "SELECT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
- 'datasource' => array ( 'type' => 'SQL',
- 'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name',
- 'keyfield'=> 'server_id',
- 'valuefield'=> 'server_name'
- ),
- 'width' => "",
- 'value' => "");
-
-$liste["item"][] = array( 'field' => "parent_domain_id",
- 'datatype' => "VARCHAR",
- 'filters' => array( 0 => array( 'event' => 'SHOW',
- 'type' => 'IDNTOUTF8')
- ),
- 'formtype' => "SELECT",
- 'op' => "=",
- 'prefix' => "",
- 'suffix' => "",
- 'datasource' => array ( 'type' => 'SQL',
- 'querystring' => "SELECT domain_id,domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
- 'keyfield'=> 'domain_id',
- 'valuefield'=> 'domain'
- ),
- 'width' => "",
- 'value' => "");
-
-$liste["item"][] = array( 'field' => "domain",
- 'datatype' => "VARCHAR",
- 'filters' => array( 0 => array( 'event' => 'SHOW',
- 'type' => 'IDNTOUTF8')
- ),
- 'formtype' => "TEXT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
- 'width' => "",
- 'value' => "");
-
-
-?>
diff --git a/interface/web/sites/list/web_domain.list.php b/interface/web/sites/list/web_vhost_domain.list.php
similarity index 61%
rename from interface/web/sites/list/web_domain.list.php
rename to interface/web/sites/list/web_vhost_domain.list.php
index a455f54d3c9e3a5171a8171a638c98a2773e260f..f997d7b4108c9336ed6b77446d1763e21f427623 100644
--- a/interface/web/sites/list/web_domain.list.php
+++ b/interface/web/sites/list/web_vhost_domain.list.php
@@ -10,13 +10,22 @@
- DATE
*/
+$vhostdomain_type = 'domain';
+
+if(isset($_SESSION['s']['var']['vhostdomain_type'])) {
+ if($_SESSION['s']['var']['vhostdomain_type'] == 'subdomain') {
+ $vhostdomain_type = 'subdomain';
+ } elseif($_SESSION['s']['var']['vhostdomain_type'] == 'aliasdomain') {
+ $vhostdomain_type = 'aliasdomain';
+ }
+}
// Name of the list
if($_SESSION['s']['user']['typ'] == 'admin') {
- $liste["name"] = "web_domain_admin";
+ $liste["name"] = "web_vhost_domain_admin";
} else {
- $liste["name"] = "web_domain";
+ $liste["name"] = "web_vhost_domain";
}
// Database table
@@ -32,13 +41,13 @@ $liste["search_prefix"] = "search_";
$liste["records_per_page"] = "15";
// Script File of the list
-$liste["file"] = "web_domain_list.php";
+$liste["file"] = "web_vhost_domain_list.php";
// Script file of the edit form
-$liste["edit_file"] = "web_domain_edit.php";
+$liste["edit_file"] = "web_vhost_domain_edit.php";
// Script File of the delete script
-$liste["delete_file"] = "web_domain_del.php";
+$liste["delete_file"] = "web_vhost_domain_del.php";
// Paging Template
$liste["paging_tpl"] = "templates/paging.tpl.htm";
@@ -51,15 +60,16 @@ $liste["auth"] = "yes";
* Suchfelder
*****************************************************/
-$liste["item"][] = array( 'field' => "domain_id",
- 'datatype' => "INTEGER",
- 'formtype' => "TEXT",
- 'op' => "=",
- 'prefix' => "",
- 'suffix' => "",
- 'width' => "",
- 'value' => "");
-
+if($vhostdomain_type == 'domain') {
+ $liste["item"][] = array( 'field' => "domain_id",
+ 'datatype' => "INTEGER",
+ 'formtype' => "TEXT",
+ 'op' => "=",
+ 'prefix' => "",
+ 'suffix' => "",
+ 'width' => "",
+ 'value' => "");
+}
$liste["item"][] = array( 'field' => "active",
'datatype' => "VARCHAR",
@@ -70,7 +80,7 @@ $liste["item"][] = array( 'field' => "active",
'width' => "",
'value' => array('y' => "<div id=\"ir-Yes\" class=\"swap\"><span>Yes</span></div>", 'n' => "<div class=\"swap\" id=\"ir-No\"><span>No</span></div>"));
-if($_SESSION['s']['user']['typ'] == 'admin') {
+if($_SESSION['s']['user']['typ'] == 'admin' && $vhostdomain_type == 'domain') {
$liste["item"][] = array( 'field' => "sys_groupid",
'datatype' => "INTEGER",
'formtype' => "SELECT",
@@ -100,6 +110,26 @@ $liste["item"][] = array( 'field' => "server_id",
'width' => "",
'value' => "");
+if($vhostdomain_type != 'domain') {
+ $liste["item"][] = array( 'field' => "parent_domain_id",
+ 'datatype' => "VARCHAR",
+ 'filters' => array( 0 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8')
+ ),
+ 'formtype' => "SELECT",
+ 'op' => "=",
+ 'prefix' => "",
+ 'suffix' => "",
+ 'datasource' => array ( 'type' => 'SQL',
+ 'querystring' => "SELECT domain_id,domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
+ 'keyfield'=> 'domain_id',
+ 'valuefield'=> 'domain'
+ ),
+ 'width' => "",
+ 'value' => "");
+
+}
+
$liste["item"][] = array( 'field' => "domain",
'datatype' => "VARCHAR",
'filters' => array( 0 => array( 'event' => 'SHOW',
diff --git a/interface/web/sites/list/web_vhost_subdomain.list.php b/interface/web/sites/list/web_vhost_subdomain.list.php
deleted file mode 100644
index 975814d099454cd88853b92bae89c95660457d44..0000000000000000000000000000000000000000
--- a/interface/web/sites/list/web_vhost_subdomain.list.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-/*
- Datatypes:
- - INTEGER
- - DOUBLE
- - CURRENCY
- - VARCHAR
- - TEXT
- - DATE
-*/
-
-
-
-// Name of the list
-$liste["name"] = "web_vhost_subdomain";
-
-// Database table
-$liste["table"] = "web_domain";
-
-// Index index field of the database table
-$liste["table_idx"] = "domain_id";
-
-// Search Field Prefix
-$liste["search_prefix"] = "search_";
-
-// Records per page
-$liste["records_per_page"] = "15";
-
-// Script File of the list
-$liste["file"] = "web_vhost_subdomain_list.php";
-
-// Script file of the edit form
-$liste["edit_file"] = "web_vhost_subdomain_edit.php";
-
-// Script File of the delete script
-$liste["delete_file"] = "web_vhost_subdomain_del.php";
-
-// Paging Template
-$liste["paging_tpl"] = "templates/paging.tpl.htm";
-
-// Enable auth
-$liste["auth"] = "yes";
-
-
-/*****************************************************
-* Suchfelder
-*****************************************************/
-
-
-$liste["item"][] = array( 'field' => "active",
- 'datatype' => "VARCHAR",
- 'formtype' => "SELECT",
- 'op' => "=",
- 'prefix' => "",
- 'suffix' => "",
- 'width' => "",
- 'value' => array('y' => "<div id=\"ir-Yes\" class=\"swap\"><span>Yes</span></div>", 'n' => "<div class=\"swap\" id=\"ir-No\"><span>No</span></div>"));
-
-
-$liste["item"][] = array( 'field' => "server_id",
- 'datatype' => "VARCHAR",
- 'formtype' => "SELECT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
- 'datasource' => array ( 'type' => 'SQL',
- 'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name',
- 'keyfield'=> 'server_id',
- 'valuefield'=> 'server_name'
- ),
- 'width' => "",
- 'value' => "");
-
-$liste["item"][] = array( 'field' => "parent_domain_id",
- 'datatype' => "VARCHAR",
- 'filters' => array( 0 => array( 'event' => 'SHOW',
- 'type' => 'IDNTOUTF8')
- ),
- 'formtype' => "SELECT",
- 'op' => "=",
- 'prefix' => "",
- 'suffix' => "",
- 'datasource' => array ( 'type' => 'SQL',
- 'querystring' => "SELECT domain_id,domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
- 'keyfield'=> 'domain_id',
- 'valuefield'=> 'domain'
- ),
- 'width' => "",
- 'value' => "");
-
-$liste["item"][] = array( 'field' => "domain",
- 'datatype' => "VARCHAR",
- 'filters' => array( 0 => array( 'event' => 'SHOW',
- 'type' => 'IDNTOUTF8')
- ),
- 'formtype' => "TEXT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
- 'width' => "",
- 'value' => "");
-
-
-?>
diff --git a/interface/web/sites/templates/web_aliasdomain_edit.htm b/interface/web/sites/templates/web_aliasdomain_edit.htm
deleted file mode 100644
index 66c2c40dd2fe15556de312b1a58274beb52c0870..0000000000000000000000000000000000000000
--- a/interface/web/sites/templates/web_aliasdomain_edit.htm
+++ /dev/null
@@ -1,148 +0,0 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_web_domain">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="domain">{tmpl_var name='domain_txt'}</label>
- <tmpl_if name="domain_option">
- <select name="domain" id="domain" class="selectInput">
- {tmpl_var name='domain_option'}
- </select>
- <tmpl_else>
- <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
- </tmpl_if>
- </div>
- <div class="ctrlHolder">
- <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
- <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
- {tmpl_var name='parent_domain_id'}
- </select>
- </div>
- <div class="ctrlHolder">
- <label for="redirect_type">{tmpl_var name='redirect_type_txt'}</label>
- <select name="redirect_type" id="redirect_type" class="selectInput formLengthHalf">
- {tmpl_var name='redirect_type'}
- </select>
- </div>
- <div class="ctrlHolder">
- <label for="redirect_path">{tmpl_var name='redirect_path_txt'}</label>
- <input name="redirect_path" id="redirect_path" value="{tmpl_var name='redirect_path'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="subdomain">{tmpl_var name='subdomain_txt'}</label>
- <select name="subdomain" id="subdomain" class="selectInput formLengthHalf">
- {tmpl_var name='subdomain'}
- </select>
- </div>
- <div class="ctrlHolder">
- <label for="seo_redirect">{tmpl_var name='seo_redirect_txt'}</label>
- <select name="seo_redirect" id="seo_redirect" class="selectInput">
- {tmpl_var name='seo_redirect'}
- </select>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
- {tmpl_var name='active'}
- </div>
- </div>
- </fieldset>
-
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_aliasdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_aliasdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
-<script language="JavaScript" type="text/javascript">
- var webId = jQuery('#parent_domain_id').val();
- var serverId;
- getServerId(webId);
-
- jQuery('#parent_domain_id').change(function(){
- webId = $(this).val();
- getServerId(webId);
- });
-
- if(jQuery('#redirect_type').val() == 'proxy'){
- jQuery('.tabbox_tabs ul li:last').show();
- } else {
- jQuery('.tabbox_tabs ul li:last').hide();
- }
- jQuery('#redirect_type').change(function(){
- if(jQuery(this).val() == 'proxy'){
- jQuery('.tabbox_tabs ul li:last').show();
- } else {
- jQuery('.tabbox_tabs ul li:last').hide();
- }
- });
-
- function getServerId(webId){
- jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getserverid"}, function(data) {
- serverId = data.serverid;
- adjustForm(serverId);
- });
- }
-
- function adjustForm(serverId){
- jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
- var selected = jQuery('#redirect_type').val();
- if(data.servertype == "nginx"){
- jQuery("#redirect_type option[value='R']").attr('disabled','disabled');
- jQuery('#redirect_type option[value="L"]').attr('disabled','disabled');
- jQuery('#redirect_type option[value="R,L"]').attr('disabled','disabled');
- jQuery('#redirect_type option[value="R=301,L"]').attr('disabled','disabled');
-
- jQuery("#redirect_type option[value='R']").hide();
- jQuery('#redirect_type option[value="L"]').hide();
- jQuery('#redirect_type option[value="R,L"]').hide();
- jQuery('#redirect_type option[value="R=301,L"]').hide();
-
- jQuery('#redirect_type option[value="last"]').show();
- jQuery('#redirect_type option[value="break"]').show();
- jQuery('#redirect_type option[value="redirect"]').show();
- jQuery('#redirect_type option[value="permanent"]').show();
- jQuery('#redirect_type option[value="proxy"]').show();
-
- jQuery('#redirect_type option[value="last"]').attr('disabled',false);
- jQuery('#redirect_type option[value="break"]').attr('disabled',false);
- jQuery('#redirect_type option[value="redirect"]').attr('disabled',false);
- jQuery('#redirect_type option[value="permanent"]').attr('disabled',false);
- jQuery('#redirect_type option[value="proxy"]').attr('disabled',false);
-
- if(selected != "no" && selected != "" && selected != "last" && selected != "break" && selected != "redirect" && selected != "permanent" && selected != "proxy") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
- } else {
- jQuery('#redirect_type option[value="last"]').attr('disabled','disabled');
- jQuery('#redirect_type option[value="break"]').attr('disabled','disabled');
- jQuery('#redirect_type option[value="redirect"]').attr('disabled','disabled');
- jQuery('#redirect_type option[value="permanent"]').attr('disabled','disabled');
- jQuery('#redirect_type option[value="proxy"]').attr('disabled','disabled');
-
- jQuery('#redirect_type option[value="last"]').hide();
- jQuery('#redirect_type option[value="break"]').hide();
- jQuery('#redirect_type option[value="redirect"]').hide();
- jQuery('#redirect_type option[value="permanent"]').hide();
- jQuery('#redirect_type option[value="proxy"]').hide();
-
- jQuery('#redirect_type option[value="R"]').show();
- jQuery('#redirect_type option[value="L"]').show();
- jQuery('#redirect_type option[value="R,L"]').show();
- jQuery('#redirect_type option[value="R=301,L"]').show();
-
- jQuery('#redirect_type option[value="R"]').attr('disabled',false);
- jQuery('#redirect_type option[value="L"]').attr('disabled',false);
- jQuery('#redirect_type option[value="R,L"]').attr('disabled',false);
- jQuery('#redirect_type option[value="R=301,L"]').attr('disabled',false);
-
- if(selected != "no" && selected != "" && selected != "R" && selected != "L" && selected != "R,L" && selected != "R=301,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
- }
- });
- }
-
-</script>
\ No newline at end of file
diff --git a/interface/web/sites/templates/web_aliasdomain_advanced.htm b/interface/web/sites/templates/web_childdomain_advanced.htm
similarity index 89%
rename from interface/web/sites/templates/web_aliasdomain_advanced.htm
rename to interface/web/sites/templates/web_childdomain_advanced.htm
index 4c605ca94cc75433c8d1ebc6914f26aa999e83b7..d2704ed0d2074b00d483ee5f04d54b5a5345268b 100644
--- a/interface/web/sites/templates/web_aliasdomain_advanced.htm
+++ b/interface/web/sites/templates/web_childdomain_advanced.htm
@@ -1,7 +1,7 @@
<h2><tmpl_var name="list_head_txt"></h2>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_web_domain">
+<div class="panel panel_web_childdomain">
<div class="pnl_formsarea">
<fieldset class="inlineLabels"><legend>Options</legend>
@@ -14,8 +14,8 @@
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_aliasdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_aliasdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_childdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_childdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
</div>
</div>
@@ -34,4 +34,4 @@
});
}
-</script>
\ No newline at end of file
+</script>
diff --git a/interface/web/sites/templates/web_subdomain_edit.htm b/interface/web/sites/templates/web_childdomain_edit.htm
similarity index 78%
rename from interface/web/sites/templates/web_subdomain_edit.htm
rename to interface/web/sites/templates/web_childdomain_edit.htm
index a8abb213cb1bf9df40419620828d9b885fd57329..b0e0ebdd671ec311d2a369b6aad331e9c998774f 100644
--- a/interface/web/sites/templates/web_subdomain_edit.htm
+++ b/interface/web/sites/templates/web_childdomain_edit.htm
@@ -1,10 +1,11 @@
<h2><tmpl_var name="list_head_txt"></h2>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_web_subdomain">
+<div class="panel panel_web_childdomain">
<div class="pnl_formsarea">
<fieldset class="inlineLabels">
+ <tmpl_if name="childdomain_type" value="subdomain">
<tmpl_if name="domain_option">
<div class="ctrlHolder">
<label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
@@ -28,6 +29,25 @@
<select id="parent_domain_id" name="parent_domain_id" class="selectInput formLengthHalf">{tmpl_var name='parent_domain_id'}</select>
</div>
</tmpl_if>
+ <tmpl_else>
+ <div class="ctrlHolder">
+ <tmpl_if name="domain_option">
+ <label for="domain">{tmpl_var name='domain_txt'}</label>
+ <select name="domain" id="domain" class="selectInput">
+ {tmpl_var name='domain_option'}
+ </select>
+ <tmpl_else>
+ <label for="domain">{tmpl_var name='domain_txt'}</label>
+ <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
+ </tmpl_if>
+ </div>
+ <div class="ctrlHolder">
+ <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
+ <select id="parent_domain_id" name="parent_domain_id" class="selectInput">
+ {tmpl_var name='parent_domain_id'}
+ </select>
+ </div>
+ </tmpl_if>
<div class="ctrlHolder">
<label for="redirect_type">{tmpl_var name='redirect_type_txt'}</label>
<select name="redirect_type" id="redirect_type" class="selectInput formLengthHalf">
@@ -38,6 +58,20 @@
<label for="redirect_path">{tmpl_var name='redirect_path_txt'}</label>
<input name="redirect_path" id="redirect_path" value="{tmpl_var name='redirect_path'}" size="30" maxlength="255" type="text" class="textInput" />
</div>
+ <tmpl_if name="childdomain_type" value="aliasdomain">
+ <div class="ctrlHolder">
+ <label for="subdomain">{tmpl_var name='subdomain_txt'}</label>
+ <select name="subdomain" id="subdomain" class="selectInput formLengthHalf">
+ {tmpl_var name='subdomain'}
+ </select>
+ </div>
+ <div class="ctrlHolder">
+ <label for="seo_redirect">{tmpl_var name='seo_redirect_txt'}</label>
+ <select name="seo_redirect" id="seo_redirect" class="selectInput">
+ {tmpl_var name='seo_redirect'}
+ </select>
+ </div>
+ </tmpl_if>
<div class="ctrlHolder">
<p class="label">{tmpl_var name='active_txt'}</p>
<div class="multiField">
@@ -45,22 +79,21 @@
</div>
</div>
</fieldset>
-
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
-
+
<div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_subdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_subdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_childdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_childdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
</div>
</div>
</div>
<script language="JavaScript" type="text/javascript">
- //var webId = jQuery('input[name="id"]').val();
var webId = jQuery('#parent_domain_id').val();
var serverId;
getServerId(webId);
-
+
jQuery('#parent_domain_id').change(function(){
webId = $(this).val();
getServerId(webId);
@@ -78,14 +111,14 @@
jQuery('.tabbox_tabs ul li:last').hide();
}
});
-
+
function getServerId(webId){
jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getserverid"}, function(data) {
serverId = data.serverid;
adjustForm(serverId);
});
}
-
+
function adjustForm(serverId){
jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
var selected = jQuery('#redirect_type').val();
@@ -94,24 +127,24 @@
jQuery('#redirect_type option[value="L"]').attr('disabled','disabled');
jQuery('#redirect_type option[value="R,L"]').attr('disabled','disabled');
jQuery('#redirect_type option[value="R=301,L"]').attr('disabled','disabled');
-
+
jQuery("#redirect_type option[value='R']").hide();
jQuery('#redirect_type option[value="L"]').hide();
jQuery('#redirect_type option[value="R,L"]').hide();
jQuery('#redirect_type option[value="R=301,L"]').hide();
-
+
jQuery('#redirect_type option[value="last"]').show();
jQuery('#redirect_type option[value="break"]').show();
jQuery('#redirect_type option[value="redirect"]').show();
jQuery('#redirect_type option[value="permanent"]').show();
jQuery('#redirect_type option[value="proxy"]').show();
-
+
jQuery('#redirect_type option[value="last"]').attr('disabled',false);
jQuery('#redirect_type option[value="break"]').attr('disabled',false);
jQuery('#redirect_type option[value="redirect"]').attr('disabled',false);
jQuery('#redirect_type option[value="permanent"]').attr('disabled',false);
jQuery('#redirect_type option[value="proxy"]').attr('disabled',false);
-
+
if(selected != "no" && selected != "" && selected != "last" && selected != "break" && selected != "redirect" && selected != "permanent" && selected != "proxy") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
} else {
jQuery('#redirect_type option[value="last"]').attr('disabled','disabled');
@@ -119,26 +152,25 @@
jQuery('#redirect_type option[value="redirect"]').attr('disabled','disabled');
jQuery('#redirect_type option[value="permanent"]').attr('disabled','disabled');
jQuery('#redirect_type option[value="proxy"]').attr('disabled','disabled');
-
+
jQuery('#redirect_type option[value="last"]').hide();
jQuery('#redirect_type option[value="break"]').hide();
jQuery('#redirect_type option[value="redirect"]').hide();
jQuery('#redirect_type option[value="permanent"]').hide();
jQuery('#redirect_type option[value="proxy"]').hide();
-
+
jQuery('#redirect_type option[value="R"]').show();
jQuery('#redirect_type option[value="L"]').show();
jQuery('#redirect_type option[value="R,L"]').show();
jQuery('#redirect_type option[value="R=301,L"]').show();
-
+
jQuery('#redirect_type option[value="R"]').attr('disabled',false);
jQuery('#redirect_type option[value="L"]').attr('disabled',false);
jQuery('#redirect_type option[value="R,L"]').attr('disabled',false);
jQuery('#redirect_type option[value="R=301,L"]').attr('disabled',false);
-
+
if(selected != "no" && selected != "" && selected != "R" && selected != "L" && selected != "R,L" && selected != "R=301,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
}
});
}
-
</script>
\ No newline at end of file
diff --git a/interface/web/sites/templates/web_aliasdomain_list.htm b/interface/web/sites/templates/web_childdomain_list.htm
similarity index 84%
rename from interface/web/sites/templates/web_aliasdomain_list.htm
rename to interface/web/sites/templates/web_childdomain_list.htm
index e85eed61ca55c494bf3b6d356dfb38638eb5e0ff..08957696fe1480df0d9d92daf043e68aa3e9a90d 100644
--- a/interface/web/sites/templates/web_aliasdomain_list.htm
+++ b/interface/web/sites/templates/web_childdomain_list.htm
@@ -1,9 +1,9 @@
<h2><tmpl_var name="list_head_txt"></h2>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_web_aliasdomain">
+<div class="panel panel_list_web_childdomain">
- <div class="pnl_listsarea">
+ <div class="pnl_toolsarea">
<tmpl_if name='datalog_changes_count' op='>' value='0'>
<div>
<div class="systemmonitor-state state-info">
@@ -22,7 +22,7 @@
</tmpl_if>
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/web_aliasdomain_edit.php');">
+ <button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/web_childdomain_edit.php?type={tmpl_var name='childdomain_type'}');">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
</div>
@@ -46,19 +46,19 @@
<td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
<td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
<td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/web_aliasdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/web_childdomain_list.php?type={tmpl_var name="childdomain_type"}');"><span>{tmpl_var name="filter_txt"}</span></button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_parent_domain_id"><a href="#" onclick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
- <td class="tbl_col_domain"><a href="#" onclick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+ <td class="tbl_col_active"><a href="#" onclick="loadContent('sites/web_childdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+ <td class="tbl_col_server_id"><a href="#" onclick="loadContent('sites/web_childdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+ <td class="tbl_col_parent_domain_id"><a href="#" onclick="loadContent('sites/web_childdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
+ <td class="tbl_col_domain"><a href="#" onclick="loadContent('sites/web_childdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
<td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" href="javascript: del_record('sites/web_aliasdomain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+ <a class="button icons16 icoDelete" href="javascript: del_record('sites/web_childdomain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
</td>
</tr>
</tmpl_loop>
@@ -70,7 +70,7 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+ <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
diff --git a/interface/web/sites/templates/web_domain_admin_list.htm b/interface/web/sites/templates/web_domain_admin_list.htm
deleted file mode 100644
index fc280a583c25d9c7617bb3d25b4df338b43e7e26..0000000000000000000000000000000000000000
--- a/interface/web/sites/templates/web_domain_admin_list.htm
+++ /dev/null
@@ -1,66 +0,0 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-
-<div class="panel panel_list_web_domain_admin">
-
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/web_domain_edit.php');">
- <span>{tmpl_var name="add_new_record_txt"}</span>
- </button>
- </div>
- </fieldset>
- </div>
-
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_domain_id" scope="col"><tmpl_var name="domain_id_txt"></th>
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="sys_groupid_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
- </tr>
- <tr class="filter">
- <td class="tbl_col_domain_id"><input type="text" name="search_domain_id" size="4" value="{tmpl_var name='search_domain_id'}" /></td>
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_sys_groupid"><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/web_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
- </td>
- </tr>
- </thead>
- <tbody>
- <tmpl_loop name="records">
- <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_domain_id"><a href="#" onclick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain_id"}</a></td>
- <td class="tbl_col_active"><a href="#" onclick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_sys_groupid"><a href="#" onclick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sys_groupid"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_domain"><a href="#" onclick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a><a href="http://{tmpl_var name="domain"}" target="_blank" class="button icons16 icoLink"><span>Link</span></a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" href="javascript: del_record('sites/web_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
- </td>
- </tr>
- </tmpl_loop>
- <tmpl_unless name="records">
- <tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td colspan="6">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
- </tr>
- </tmpl_unless>
- </tbody>
- <tfoot>
- <tr>
- <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
- </tr>
- </tfoot>
- </table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
diff --git a/interface/web/sites/templates/web_subdomain_advanced.htm b/interface/web/sites/templates/web_subdomain_advanced.htm
deleted file mode 100644
index 3924362a362cf976c0ec1751c8413ca008bb59fa..0000000000000000000000000000000000000000
--- a/interface/web/sites/templates/web_subdomain_advanced.htm
+++ /dev/null
@@ -1,37 +0,0 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_web_subdomain">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Options</legend>
- <div class="ctrlHolder proxy">
- <label for="proxy_directives">{tmpl_var name='proxy_directives_txt'}</label>
- <textarea name="proxy_directives" id="proxy_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='proxy_directives'}</textarea> <b>{tmpl_var name="available_proxy_directive_snippets_txt"}</b><br><br> {tmpl_var name="proxy_directive_snippets_txt"}
- </div>
- </fieldset>
-
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_subdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_subdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
-<script language="JavaScript" type="text/javascript">
- var webId = jQuery('input[name="id"]').val();
- adjustForm();
-
- function adjustForm(){
- jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getredirecttype"}, function(data) {
- if(data.redirecttype == "proxy"){
- jQuery('.proxy').show();
- } else {
- jQuery('.proxy').hide();
- }
- });
- }
-
-</script>
diff --git a/interface/web/sites/templates/web_subdomain_list.htm b/interface/web/sites/templates/web_subdomain_list.htm
deleted file mode 100644
index cf3f874295f1e3f950b7783239ddc7dc38a22fd6..0000000000000000000000000000000000000000
--- a/interface/web/sites/templates/web_subdomain_list.htm
+++ /dev/null
@@ -1,81 +0,0 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_web_subdomain">
-
- <div class="pnl_toolsarea">
- <tmpl_if name='datalog_changes_count' op='>' value='0'>
- <div>
- <div class="systemmonitor-state state-info">
- <div class="status"></div>
- <div class="statusMsg">
- {tmpl_var name="datalog_changes_txt"}
- <ul>
- <tmpl_loop name="datalog_changes">
- <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
- </tmpl_loop>
- </ul>
- {tmpl_var name="datalog_changes_end_txt"}
- </div>
- </div><br />
- </div>
- </tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/web_subdomain_edit.php');">
- <span>{tmpl_var name="add_new_record_txt"}</span>
- </button>
- </div>
- </fieldset>
- </div>
-
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
- <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
- </tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
- <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/web_subdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
- </td>
- </tr>
- </thead>
- <tbody>
- <tmpl_loop name="records">
- <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_parent_domain_id"><a href="#" onclick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
- <td class="tbl_col_domain"><a href="#" onclick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" href="javascript: del_record('sites/web_subdomain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
- </td>
- </tr>
- </tmpl_loop>
- <tmpl_unless name="records">
- <tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td colspan="5">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
- </tr>
- </tmpl_unless>
- </tbody>
-
- <tfoot>
- <tr>
- <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
- </tr>
- </tfoot>
- </table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
diff --git a/interface/web/sites/templates/web_vhost_aliasdomain_advanced.htm b/interface/web/sites/templates/web_vhost_aliasdomain_advanced.htm
deleted file mode 100644
index 85f5027221f19a765fb7c975eabaa09b62d88437..0000000000000000000000000000000000000000
--- a/interface/web/sites/templates/web_vhost_aliasdomain_advanced.htm
+++ /dev/null
@@ -1,157 +0,0 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_web_domain">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <input name="document_root" id="document_root" value="{tmpl_var name='document_root'}" size="30" maxlength="255" type="hidden" class="textInput" />
- <div class="ctrlHolder">
- <label for="system_user">{tmpl_var name='system_user_txt'}</label>
- <label for="system_user">{tmpl_var name='system_user'}</label>
- <input name="system_user" id="system_user" value="{tmpl_var name='system_user'}" type="hidden" />
- </div>
- <div class="ctrlHolder">
- <label for="system_group">{tmpl_var name='system_group_txt'}</label>
- <label for="system_group">{tmpl_var name='system_group'}</label>
- <input name="system_group" id="system_group" value="{tmpl_var name='system_group'}" type="hidden" />
- </div>
- <div class="ctrlHolder apache">
- <label for="allow_override">{tmpl_var name='allow_override_txt'}</label>
- <input name="allow_override" id="allow_override" value="{tmpl_var name='allow_override'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="phpfpm">
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='php_fpm_use_socket_txt'}</p>
- <div class="multiField">
- {tmpl_var name='php_fpm_use_socket'}
- </div>
- </div>
- <div class="ctrlHolder">
- <label for="pm">{tmpl_var name='pm_txt'}</label>
- <select name="pm" id="pm" class="selectInput">
- {tmpl_var name='pm'}
- </select>
- </div>
- <div class="ctrlHolder pm_ondemand" style="background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px;">
- {tmpl_var name='pm_ondemand_hint_txt'}
- </div>
- <div class="ctrlHolder">
- <label for="pm_max_children">{tmpl_var name='pm_max_children_txt'}</label>
- <input name="pm_max_children" id="pm_max_children" value="{tmpl_var name='pm_max_children'}" size="3" maxlength="3" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder pm_dynamic">
- <label for="pm_start_servers">{tmpl_var name='pm_start_servers_txt'}</label>
- <input name="pm_start_servers" id="pm_start_servers" value="{tmpl_var name='pm_start_servers'}" size="3" maxlength="3" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder pm_dynamic">
- <label for="pm_min_spare_servers">{tmpl_var name='pm_min_spare_servers_txt'}</label>
- <input name="pm_min_spare_servers" id="pm_min_spare_servers" value="{tmpl_var name='pm_min_spare_servers'}" size="3" maxlength="3" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder pm_dynamic">
- <label for="pm_max_spare_servers">{tmpl_var name='pm_max_spare_servers_txt'}</label>
- <input name="pm_max_spare_servers" id="pm_max_spare_servers" value="{tmpl_var name='pm_max_spare_servers'}" size="3" maxlength="3" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder pm_ondemand">
- <label for="pm_process_idle_timeout">{tmpl_var name='pm_process_idle_timeout_txt'}</label>
- <input name="pm_process_idle_timeout" id="pm_process_idle_timeout" value="{tmpl_var name='pm_process_idle_timeout'}" size="3" maxlength="6" type="text" class="textInput formLengthLimit" /> s
- </div>
- <div class="ctrlHolder">
- <label for="pm_max_requests">{tmpl_var name='pm_max_requests_txt'}</label>
- <input name="pm_max_requests" id="pm_max_requests" value="{tmpl_var name='pm_max_requests'}" size="3" maxlength="6" type="text" class="textInput formLengthLimit" />
- </div>
- </div>
- <div class="ctrlHolder">
- <label for="php_open_basedir">{tmpl_var name='php_open_basedir_txt'}</label>
- <input name="php_open_basedir" id="php_open_basedir" value="{tmpl_var name='php_open_basedir'}" size="30" type="text" class="textInput" style="width:400px;" />
- </div>
- <div class="ctrlHolder">
- <label for="custom_php_ini">{tmpl_var name='custom_php_ini_txt'}</label>
- <textarea name="custom_php_ini" id="custom_php_ini" rows='10' cols='50' style="width:400px;">{tmpl_var name='custom_php_ini'}</textarea> <b>{tmpl_var name="available_php_directive_snippets_txt"}</b><br><br> {tmpl_var name="php_directive_snippets_txt"}
- </div>
- <div class="ctrlHolder apache">
- <label for="apache_directives">{tmpl_var name='apache_directives_txt'}</label>
- <textarea name="apache_directives" id="apache_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='apache_directives'}</textarea> <b>{tmpl_var name="available_apache_directive_snippets_txt"}</b><br><br> {tmpl_var name="apache_directive_snippets_txt"}
- </div>
- <div class="ctrlHolder nginx">
- <label for="nginx_directives">{tmpl_var name='nginx_directives_txt'}</label>
- <textarea name="nginx_directives" id="nginx_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='nginx_directives'}</textarea> <b>{tmpl_var name="available_nginx_directive_snippets_txt"}</b><br><br> {tmpl_var name="nginx_directive_snippets_txt"}<br>----<br><b> {tmpl_var name='variables_txt'}:</b> <a href="javascript:void(0);" class="addPlaceholder">{DOCROOT}</a>, <a href="javascript:void(0);" class="addPlaceholder">{FASTCGIPASS}</a>
- </div>
- <div class="ctrlHolder proxy">
- <label for="proxy_directives">{tmpl_var name='proxy_directives_txt'}</label>
- <textarea name="proxy_directives" id="proxy_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='proxy_directives'}</textarea> <b>{tmpl_var name="available_proxy_directive_snippets_txt"}</b><br><br> {tmpl_var name="proxy_directive_snippets_txt"}
- </div>
- </fieldset>
-
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_aliasdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_aliasdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
-<script language="JavaScript" type="text/javascript">
- var webId = jQuery('input[name="id"]').val();
- var serverId;
- getServerId();
- adjustForm();
-
- var pm = jQuery('#pm').val();
- pmMode(pm);
- jQuery('#pm').change(function(){
- pm = jQuery(this).val();
- pmMode(pm);
- });
-
- function pmMode(pm){
- switch(pm){
- case "static":
- jQuery('.pm_dynamic').add('.pm_ondemand').hide();
- jQuery('.pm_static').show();
- break;
- case "dynamic":
- jQuery('.pm_static').add('.pm_ondemand').hide();
- jQuery('.pm_dynamic').show();
- break;
- case "ondemand":
- jQuery('.pm_static').add('.pm_dynamic').hide();
- jQuery('.pm_ondemand').show();
- break;
- }
- }
-
- function getServerId(){
- jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getserverid"}, function(data) {
- serverId = data.serverid;
- });
- }
-
- function adjustForm(){
- jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
- if(data.servertype == "nginx"){
- jQuery('.nginx').show();
- jQuery('.apache').hide();
- } else {
- jQuery('.nginx').hide();
- jQuery('.apache').show();
- }
- });
- jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getphptype"}, function(data) {
- if(data.phptype == "php-fpm"){
- jQuery('.phpfpm').show();
- } else {
- jQuery('.phpfpm').hide();
- }
- });
- jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getredirecttype"}, function(data) {
- if(data.redirecttype == "proxy"){
- jQuery('.proxy').show();
- } else {
- jQuery('.proxy').hide();
- }
- });
- }
-
-</script>
\ No newline at end of file
diff --git a/interface/web/sites/templates/web_vhost_aliasdomain_backup.htm b/interface/web/sites/templates/web_vhost_aliasdomain_backup.htm
deleted file mode 100644
index 8a3b0c3afc120a8a64bdc8eb4a6895516187c766..0000000000000000000000000000000000000000
--- a/interface/web/sites/templates/web_vhost_aliasdomain_backup.htm
+++ /dev/null
@@ -1,36 +0,0 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_web_domain">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Backup</legend>
- <div class="ctrlHolder">
- <label for="backup_interval">{tmpl_var name='backup_interval_txt'}</label>
- <select name="backup_interval" id="backup_interval" class="selectInput">
- {tmpl_var name='backup_interval'}
- </select>
- </div>
- <div class="ctrlHolder">
- <label for="backup_copies">{tmpl_var name='backup_copies_txt'}</label>
- <select name="backup_copies" id="backup_copies" class="selectInput">
- {tmpl_var name='backup_copies'}
- </select>
- </div>
- <div class="ctrlHolder">
- <label for="backup_excludes">{tmpl_var name='backup_excludes_txt'}</label>
- <input name="backup_excludes" id="backup_excludes" value="{tmpl_var name='backup_excludes'}" size="30" type="text" class="textInput" /> {tmpl_var name='backup_excludes_note_txt'}
- </div>
- </fieldset>
-
- {tmpl_var name='backup_records'}
-
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_aliasdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_aliasdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
diff --git a/interface/web/sites/templates/web_vhost_aliasdomain_edit.htm b/interface/web/sites/templates/web_vhost_aliasdomain_edit.htm
deleted file mode 100644
index 936973ae1ad9ef5d14d412885da3b7cad29e44cb..0000000000000000000000000000000000000000
--- a/interface/web/sites/templates/web_vhost_aliasdomain_edit.htm
+++ /dev/null
@@ -1,227 +0,0 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_web_domain">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <input type="hidden" name="server_id" id="server_id" value="{tmpl_var name='server_id_value'}" />
- <div class="ctrlHolder">
- <label for="domain">{tmpl_var name='domain_txt'}</label>
- <tmpl_if name="domain_option">
- <select name="domain" id="domain" class="selectInput">
- {tmpl_var name='domain_option'}
- </select>
- <tmpl_else>
- <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
- </tmpl_if>
- </div>
- <div class="ctrlHolder">
- <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
- <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
- {tmpl_var name='parent_domain_id'}
- </select>
- </div>
- <div class="ctrlHolder">
- <label for="web_folder">{tmpl_var name='web_folder_txt'}</label>
- <input name="web_folder" id="web_folder" value="{tmpl_var name='web_folder'}" size="30" maxlength="100" type="text" class="textInput formLengthHalf"<tmpl_if name='fixed_folder' op='==' value='y'> readonly="readonly"</tmpl_if> />
- </div>
- <div class="ctrlHolder">
- <label for="traffic_quota">{tmpl_var name='traffic_quota_txt'}</label>
- <input name="traffic_quota" id="traffic_quota" value="{tmpl_var name='traffic_quota'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /> MB <tmpl_var name='traffic_quota_exceeded_txt'>
- </div>
- <tmpl_if name="limit_cgi" op="==" value="y"><div class="ctrlHolder">
- <p class="label">{tmpl_var name='cgi_txt'}</p>
- <div class="multiField">
- {tmpl_var name='cgi'}
- </div>
- </div></tmpl_if>
- <tmpl_if name="limit_ssi" op="==" value="y"><div class="ctrlHolder">
- <p class="label">{tmpl_var name='ssi_txt'}</p>
- <div class="multiField">
- {tmpl_var name='ssi'}
- </div>
- </div></tmpl_if>
- <tmpl_if name="limit_perl" op="==" value="y"><div class="ctrlHolder apache">
- <p class="label">{tmpl_var name='perl_txt'}</p>
- <div class="multiField">
- {tmpl_var name='perl'}
- </div>
- </div></tmpl_if>
- <tmpl_if name="limit_ruby" op="==" value="y"><div class="ctrlHolder apache">
- <p class="label">{tmpl_var name='ruby_txt'}</p>
- <div class="multiField">
- {tmpl_var name='ruby'}
- </div>
- </div></tmpl_if>
- <tmpl_if name="limit_python" op="==" value="y"><div class="ctrlHolder apache">
- <p class="label">{tmpl_var name='python_txt'}</p>
- <div class="multiField">
- {tmpl_var name='python'}
- </div>
- </div></tmpl_if>
- <tmpl_if name="force_suexec" op="==" value="n"><div class="ctrlHolder apache">
- <p class="label">{tmpl_var name='suexec_txt'}</p>
- <div class="multiField">
- {tmpl_var name='suexec'}
- </div>
- </div></tmpl_if>
- <tmpl_if name="limit_hterror" op="==" value="y"><div class="ctrlHolder">
- <p class="label">{tmpl_var name='errordocs_txt'}</p>
- <div class="multiField">
- {tmpl_var name='errordocs'}
- </div>
- </div></tmpl_if>
-
- <div class="ctrlHolder">
- <label for="subdomain">{tmpl_var name='subdomain_txt'}</label>
- <select name="subdomain" id="subdomain" class="selectInput formLengthHalf">
- {tmpl_var name='subdomain'}
- </select>
- </div>
- <tmpl_if name="limit_ssl" op="==" value="y"><div class="ctrlHolder">
- <p class="label">{tmpl_var name='ssl_txt'}</p>
- <div class="multiField">
- {tmpl_var name='ssl'}
- </div>
- </div></tmpl_if>
- <div class="ctrlHolder">
- <label for="php">{tmpl_var name='php_txt'}</label>
- <select name="php" id="php" class="selectInput formLengthHalf">
- {tmpl_var name='php'}
- </select>
- </div>
- <div class="ctrlHolder fastcgi_php_version">
- <label for="fastcgi_php_version">{tmpl_var name='fastcgi_php_version_txt'}</label>
- <select name="fastcgi_php_version" id="fastcgi_php_version" class="selectInput formLengthHalf">
- {tmpl_var name='fastcgi_php_version'}
- </select>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
- {tmpl_var name='active'}
- </div>
- </div>
- </fieldset>
-
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
- <div class="buttonHolder buttons">
- <button id="dom-edit-submit" class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_aliasdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
-<script language="JavaScript" type="text/javascript">
- var serverId;
- var clientGroupId = jQuery('#client_group_id').val();
- var serverIdDisabled = jQuery('#server_id_disabled').val();
- if(serverIdDisabled > 0){
- serverId = serverIdDisabled;
- } else {
- serverId = jQuery('#server_id').val();
- jQuery('#server_id').change(function(){
- serverId = $(this).val();
- adjustForm();
- reloadWebIP();
- reloadFastcgiPHPVersions();
- });
- }
- reloadServerId(true);
-
- jQuery('#client_group_id').change(function(){
- clientGroupId = $(this).val();
- reloadWebIP();
- });
-
- if(jQuery('#php').val() == 'fast-cgi' || jQuery('#php').val() == 'php-fpm'){
- jQuery('.fastcgi_php_version:hidden').show();
- } else {
- jQuery('.fastcgi_php_version:visible').hide();
- }
- jQuery('#php').change(function(){
- reloadFastcgiPHPVersions();
- if(jQuery(this).val() == 'fast-cgi' || jQuery(this).val() == 'php-fpm'){
- jQuery('.fastcgi_php_version:hidden').show();
- } else {
- jQuery('.fastcgi_php_version:visible').hide();
- }
- });
- jQuery('#parent_domain_id').change(function() {
- reloadServerId(false);
- });
-
- function reloadServerId(noFormChange) {
- var parentWebId = jQuery('#parent_domain_id').val();
- jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : parentWebId, type : "getserverid"}, function(data) {
- if(data.serverid) serverId = data.serverid;
- adjustForm(noFormChange);
- if(noFormChange) reloadFastcgiPHPVersions(noFormChange);
- });
- }
-
- function adjustForm(noFormChange){
- jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
- if(data.servertype == "nginx"){
- var selected = jQuery('#php').val();
- jQuery('.apache').hide();
- if(selected != "no" && selected != "php-fpm") {
- jQuery('#php option[value="php-fpm"]').attr('selected', 'selected').val('php-fpm');
- }
- jQuery('#php option[value="fast-cgi"]').hide();
- jQuery('#php option[value="cgi"]').hide();
- jQuery('#php option[value="mod"]').hide();
- jQuery('#php option[value="suphp"]').hide();
- } else {
- jQuery('.apache').show();
- jQuery('#php option[value="fast-cgi"]').show();
- jQuery('#php option[value="cgi"]').show();
- jQuery('#php option[value="mod"]').show();
- jQuery('#php option[value="suphp"]').show();
- }
- if(noFormChange) {
- resetFormChanged();
- jQuery('#php').addClass('no-page-form-change').change();
- jQuery('#php').removeClass('no-page-form-change');
- } else {
- jQuery('#php').change();
- }
- });
- }
-
- function reloadWebIP() {
- loadOptionInto('ip_address','sites/ajax_get_ip.php?ip_type=IPv4&server_id='+serverId+'&client_group_id='+clientGroupId);
- loadOptionInto('ipv6_address','sites/ajax_get_ip.php?ip_type=IPv6&server_id='+serverId+'&client_group_id='+clientGroupId);
- }
-
- function reloadFastcgiPHPVersions(noFormChange) {
- jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, php_type : jQuery('#php').val(), type : "getphpfastcgi"}, function(data) {
- var options = '<option value="">Default</option>';
- var phpfastcgiselected = '';
- $.each(data, function(key, val) {
- if($('#fastcgi_php_version').val() == key){
- phpfastcgiselected = ' selected="selected"';
- } else {
- phpfastcgiselected = '';
- }
- options += '<option value="'+key+'"'+phpfastcgiselected+'>'+val+'</option>';
- });
- $('#fastcgi_php_version').html(options).change();
- if(noFormChange) resetFormChanged();
- });
- }
-
- <tmpl_if name="readonly_tab">
- jQuery('div.panel_web_domain').find('fieldset').find('input,select,button').bind('click mousedown', function(e) { e.preventDefault(); }).focus(function() { $(this).blur(); });
- jQuery('#dom-edit-submit').click(function() {
- submitForm('pageForm','sites/web_vhost_aliasdomain_edit.php');
- });
- <tmpl_else>
- jQuery('#dom-edit-submit').click(function() {
- submitForm('pageForm','sites/web_vhost_aliasdomain_edit.php');
- });
- </tmpl_if>
-
-</script>
\ No newline at end of file
diff --git a/interface/web/sites/templates/web_vhost_aliasdomain_list.htm b/interface/web/sites/templates/web_vhost_aliasdomain_list.htm
deleted file mode 100644
index f07c4f39326583f4613ad3992a4a063d52b4eb26..0000000000000000000000000000000000000000
--- a/interface/web/sites/templates/web_vhost_aliasdomain_list.htm
+++ /dev/null
@@ -1,79 +0,0 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_web_aliasdomain">
-
- <div class="pnl_toolsarea">
- <tmpl_if name='datalog_changes_count' op='>' value='0'>
- <div>
- <div class="systemmonitor-state state-info">
- <div class="status"></div>
- <div class="statusMsg">
- {tmpl_var name="datalog_changes_txt"}
- <ul>
- <tmpl_loop name="datalog_changes">
- <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
- </tmpl_loop>
- </ul>
- {tmpl_var name="datalog_changes_end_txt"}
- </div>
- </div><br />
- </div>
- </tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/web_vhost_aliasdomain_edit.php');">
- <span>{tmpl_var name="add_new_record_txt"}</span>
- </button>
- </div>
- </fieldset>
- </div>
-
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr>
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
- <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
- </tr>
- <tr>
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
- <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
- <td class="tbl_col_buttons"><button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/web_vhost_aliasdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></td>
- </tr>
- </thead>
- <tbody>
- <tmpl_loop name="records">
- <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('sites/web_vhost_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('sites/web_vhost_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_parent_domain_id"><a href="#" onclick="loadContent('sites/web_vhost_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
- <td class="tbl_col_domain"><a href="#" onclick="loadContent('sites/web_vhost_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" href="javascript: del_record('sites/web_vhost_aliasdomain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
- </td>
- </tr>
- </tmpl_loop>
- <tmpl_unless name="records">
- <tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td colspan="5">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
- </tr>
- </tmpl_unless>
- </tbody>
-
- <tfoot>
- <tr>
- <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
- </tr>
- </tfoot>
- </table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
diff --git a/interface/web/sites/templates/web_vhost_aliasdomain_redirect.htm b/interface/web/sites/templates/web_vhost_aliasdomain_redirect.htm
deleted file mode 100644
index d1b8b307d84abd4aec7092c61e5dca258307c966..0000000000000000000000000000000000000000
--- a/interface/web/sites/templates/web_vhost_aliasdomain_redirect.htm
+++ /dev/null
@@ -1,84 +0,0 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_web_domain">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="redirect_type">{tmpl_var name='redirect_type_txt'}</label>
- <select name="redirect_type" id="redirect_type" class="selectInput formLengthHalf">
- {tmpl_var name='redirect_type'}
- </select>
- </div>
- <div class="ctrlHolder">
- <label for="redirect_path">{tmpl_var name='redirect_path_txt'}</label>
- <input name="redirect_path" id="redirect_path" value="{tmpl_var name='redirect_path'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="seo_redirect">{tmpl_var name='seo_redirect_txt'}</label>
- <select name="seo_redirect" id="seo_redirect" class="selectInput formLengthHalf">
- {tmpl_var name='seo_redirect'}
- </select>
- </div>
- <div class="ctrlHolder nginx">
- <label for="rewrite_rules">{tmpl_var name='rewrite_rules_txt'}</label>
- <textarea name="rewrite_rules" id="rewrite_rules" rows='10' cols='50' style="width:400px;">{tmpl_var name='rewrite_rules'}</textarea> <b>{tmpl_var name="allowed_rewrite_rule_directives_txt"}</b><br><br> break<br> if<br> return<br> rewrite<br> set<br><br> <a href="http://wiki.nginx.org/HttpRewriteModule" target="_blank">http://wiki.nginx.org/HttpRewriteModule</a>
- </div>
- </fieldset>
-
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_aliasdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_aliasdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
-<script language="JavaScript" type="text/javascript">
- var webId = jQuery('input[name="id"]').val();
- var serverId;
- getServerId(webId);
-
- function getServerId(webId){
- jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getserverid"}, function(data) {
- serverId = data.serverid;
- adjustForm(serverId);
- });
- }
-
- function adjustForm(serverId){
- jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
- var selected = jQuery('#redirect_type').val();
- if(data.servertype == "nginx"){
- jQuery("#redirect_type option[value='R']").attr('disabled','disabled');
- jQuery('#redirect_type option[value="L"]').attr('disabled','disabled');
- jQuery('#redirect_type option[value="R,L"]').attr('disabled','disabled');
- jQuery('#redirect_type option[value="R=301,L"]').attr('disabled','disabled');
-
- jQuery('#redirect_type option[value="R"]').hide();
- jQuery('#redirect_type option[value="L"]').hide();
- jQuery('#redirect_type option[value="R,L"]').hide();
- jQuery('#redirect_type option[value="R=301,L"]').hide();
- if(selected != "no" && selected != "" && selected != "last" && selected != "break" && selected != "redirect" && selected != "permanent" && selected != "proxy") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
- jQuery('.nginx').show();
- } else {
- jQuery('#redirect_type option[value="last"]').attr('disabled','disabled');
- jQuery('#redirect_type option[value="break"]').attr('disabled','disabled');
- jQuery('#redirect_type option[value="redirect"]').attr('disabled','disabled');
- jQuery('#redirect_type option[value="permanent"]').attr('disabled','disabled');
- jQuery('#redirect_type option[value="proxy"]').attr('disabled','disabled');
-
- jQuery('#redirect_type option[value="last"]').hide();
- jQuery('#redirect_type option[value="break"]').hide();
- jQuery('#redirect_type option[value="redirect"]').hide();
- jQuery('#redirect_type option[value="permanent"]').hide();
- jQuery('#redirect_type option[value="proxy"]').hide();
- if(selected != "no" && selected != "" && selected != "R" && selected != "L" && selected != "R,L" && selected != "R=301,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
- jQuery('.nginx').hide();
- }
- });
- }
-
-</script>
\ No newline at end of file
diff --git a/interface/web/sites/templates/web_vhost_aliasdomain_ssl.htm b/interface/web/sites/templates/web_vhost_aliasdomain_ssl.htm
deleted file mode 100644
index e442f3d0f3fe1fb3aeca4bfabb0220a1d1015e1e..0000000000000000000000000000000000000000
--- a/interface/web/sites/templates/web_vhost_aliasdomain_ssl.htm
+++ /dev/null
@@ -1,68 +0,0 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_web_domain">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="ssl_state">{tmpl_var name='ssl_state_txt'}</label>
- <input name="ssl_state" id="ssl_state" value="{tmpl_var name='ssl_state'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="ssl_locality">{tmpl_var name='ssl_locality_txt'}</label>
- <input name="ssl_locality" id="ssl_locality" value="{tmpl_var name='ssl_locality'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="ssl_organisation">{tmpl_var name='ssl_organisation_txt'}</label>
- <input name="ssl_organisation" id="ssl_organisation" value="{tmpl_var name='ssl_organisation'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="ssl_organisation_unit">{tmpl_var name='ssl_organisation_unit_txt'}</label>
- <input name="ssl_organisation_unit" id="ssl_organisation_unit" value="{tmpl_var name='ssl_organisation_unit'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="ssl_country">{tmpl_var name='ssl_country_txt'}</label>
- <select name="ssl_country" id="ssl_country" class="selectInput flags">
- {tmpl_var name='ssl_country'}
- </select>
- </div>
- <div class="ctrlHolder">
- <label for="client_group_id">{tmpl_var name='ssl_domain_txt'}</label>
- <select name="ssl_domain" id="ssl_domain" class="selectInput">
- {tmpl_var name='ssl_domain'}
- </select>
- </div>
- <div class="ctrlHolder">
- <label for="ssl_request">{tmpl_var name='ssl_key_txt'}</label>
- <textarea name="ssl_key" id="ssl_key" rows='10' cols='30'>{tmpl_var name='ssl_key'}</textarea>
- </div>
- <div class="ctrlHolder">
- <label for="ssl_request">{tmpl_var name='ssl_request_txt'}</label>
- <textarea name="ssl_request" id="ssl_request" rows='10' cols='30'>{tmpl_var name='ssl_request'}</textarea>
- </div>
- <div class="ctrlHolder">
- <label for="ssl_cert">{tmpl_var name='ssl_cert_txt'}</label>
- <textarea name="ssl_cert" id="ssl_cert" rows='10' cols='30'>{tmpl_var name='ssl_cert'}</textarea>
- </div>
- <div class="ctrlHolder">
- <label for="ssl_bundle">{tmpl_var name='ssl_bundle_txt'}</label>
- <textarea name="ssl_bundle" id="ssl_bundle" rows='10' cols='30'>{tmpl_var name='ssl_bundle'}</textarea>
- </div>
- <div class="ctrlHolder">
- <label for="ssl_action">{tmpl_var name='ssl_action_txt'}</label>
- <select name="ssl_action" id="ssl_action" class="selectInput formLengthHalf">
- {tmpl_var name='ssl_action'}
- </select>
- </div>
- </fieldset>
-
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_aliasdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_aliasdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
diff --git a/interface/web/sites/templates/web_vhost_aliasdomain_stats.htm b/interface/web/sites/templates/web_vhost_aliasdomain_stats.htm
deleted file mode 100644
index d4b06bde01220c36bba92eeaa97666c548d02c69..0000000000000000000000000000000000000000
--- a/interface/web/sites/templates/web_vhost_aliasdomain_stats.htm
+++ /dev/null
@@ -1,37 +0,0 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_web_domain">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='stats_user_txt'}</p><p class="value">admin</p>
- </div>
- <div class="ctrlHolder">
- <label for="stats_password">{tmpl_var name='stats_password_txt'}</label>
- <input name="stats_password" id="stats_password" value="{tmpl_var name='stats_password'}" size="15" maxlength="100" type="password" class="textInput" style="width:100px;" onkeyup="checkPassMatch('stats_password','repeat_password');" /> <a href="javascript:void(0);" onclick="generatePassword('stats_password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
- </div>
- <div class="ctrlHolder">
- <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
- <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;" onkeyup="checkPassMatch('stats_password','repeat_password');" />
- </div>
- <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
- <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
- <div class="ctrlHolder">
- <label for="stats_type">{tmpl_var name='stats_type_txt'}</label>
- <select name="stats_type" id="stats_type" class="selectInput" >
- {tmpl_var name='stats_type'}
- </select>
- </div>
- </fieldset>
-
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_aliasdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_aliasdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
diff --git a/interface/web/sites/templates/web_vhost_domain_admin_list.htm b/interface/web/sites/templates/web_vhost_domain_admin_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..1ec96a6d7fccf4cbe8407a81ca0205d7d647e104
--- /dev/null
+++ b/interface/web/sites/templates/web_vhost_domain_admin_list.htm
@@ -0,0 +1,69 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_web_vhost_domain_admin">
+
+ <div class="pnl_toolsarea">
+ <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+ <div class="buttons">
+ <button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/web_vhost_domain_edit.php?type={tmpl_var name='vhostdomain_type'}');">
+ <span>{tmpl_var name="add_new_record_txt"}</span>
+ </button>
+ </div>
+ </fieldset>
+ </div>
+
+ <div class="pnl_listarea">
+ <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+ <table class="list">
+ <thead>
+ <tr class="caption">
+ <tmpl_if name="vhostdomain_type" value="domain"><th class="tbl_col_domain_id" scope="col"><tmpl_var name="domain_id_txt"></th></tmpl_if>
+ <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+ <th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="sys_groupid_txt"></th>
+ <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+ <tmpl_if name="vhostdomain_type" op="!=" value="domain"><th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th></tmpl_if>
+ <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+ <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+ </tr>
+ <tr class="filter">
+ <tmpl_if name="vhostdomain_type" value="domain"><td class="tbl_col_domain_id"><input type="text" size="5" name="search_domain_id" value="{tmpl_var name='search_domain_id'}" /></td></tmpl_if>
+ <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td class="tbl_col_sys_groupid"><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
+ <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <tmpl_if name="vhostdomain_type" op="!=" value="domain"><td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td></tmpl_if>
+ <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+ <td class="tbl_col_buttons">
+ <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/web_vhost_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ </td>
+ </tr>
+ </thead>
+ <tbody>
+ <tmpl_loop name="records">
+ <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+ <tmpl_if name="vhostdomain_type" value="domain"><td class="tbl_col_domain_id"><a href="#" onclick="loadContent('sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}');">{tmpl_var name="domain_id"}</a></td></tmpl_if>
+ <td class="tbl_col_active"><a href="#" onclick="loadContent('sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}');">{tmpl_var name="active"}</a></td>
+ <td class="tbl_col_sys_groupid"><a href="#" onclick="loadContent('sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}');">{tmpl_var name="sys_groupid"}</a></td>
+ <td class="tbl_col_server_id"><a href="#" onclick="loadContent('sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}');">{tmpl_var name="server_id"}</a></td>
+ <tmpl_if name="vhostdomain_type" op="!=" value="domain"><td class="tbl_col_parent_domain_id"><a href="#" onclick="loadContent('sites/web_vhost_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td></tmpl_if>
+ <td class="tbl_col_domain"><a href="#" onclick="loadContent('sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}');">{tmpl_var name="domain"}</a><a href="http://{tmpl_var name="domain"}" target="_blank" class="button icons16 icoLink"><span>Link</span></a></td>
+ <td class="tbl_col_buttons">
+ <a class="button icons16 icoDelete" href="javascript: del_record('sites/web_vhost_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+ </td>
+ </tr>
+ </tmpl_loop>
+ <tmpl_unless name="records">
+ <tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+ <td colspan="6">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
+ </tr>
+ </tmpl_unless>
+ </tbody>
+ <tfoot>
+ <tr>
+ <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+ </tr>
+ </tfoot>
+ </table>
+ </fieldset>
+ </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/sites/templates/web_domain_advanced.htm b/interface/web/sites/templates/web_vhost_domain_advanced.htm
similarity index 98%
rename from interface/web/sites/templates/web_domain_advanced.htm
rename to interface/web/sites/templates/web_vhost_domain_advanced.htm
index 3a634e13dd0dea4e704692fc8b876dd4facdcace..2b680db04bb8d72848509e0f000d98c32d6a7f66 100644
--- a/interface/web/sites/templates/web_domain_advanced.htm
+++ b/interface/web/sites/templates/web_vhost_domain_advanced.htm
@@ -103,8 +103,8 @@
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
</div>
</div>
diff --git a/interface/web/sites/templates/web_domain_backup.htm b/interface/web/sites/templates/web_vhost_domain_backup.htm
similarity index 91%
rename from interface/web/sites/templates/web_domain_backup.htm
rename to interface/web/sites/templates/web_vhost_domain_backup.htm
index e5829e5a6f5360ff233db49f0edd1bff87d7d85c..7f573b874dedbb1c43b2e73c118246b0d65c3ce7 100644
--- a/interface/web/sites/templates/web_domain_backup.htm
+++ b/interface/web/sites/templates/web_vhost_domain_backup.htm
@@ -37,8 +37,8 @@
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
</div>
</div>
diff --git a/interface/web/sites/templates/web_domain_edit.htm b/interface/web/sites/templates/web_vhost_domain_edit.htm
similarity index 76%
rename from interface/web/sites/templates/web_domain_edit.htm
rename to interface/web/sites/templates/web_vhost_domain_edit.htm
index 2f973837d2558e6b5e9e98772ecf5ab85b22aec6..9f22ebdd45d5c965d32fa53120bb591b73877c7f 100644
--- a/interface/web/sites/templates/web_domain_edit.htm
+++ b/interface/web/sites/templates/web_vhost_domain_edit.htm
@@ -14,6 +14,7 @@
<div class="pnl_formsarea">
<fieldset class="inlineLabels">
+ <tmpl_if name="vhostdomain_type" value="domain">
<tmpl_if name="is_admin">
<div class="ctrlHolder">
<tmpl_if name="edit_disabled">
@@ -89,6 +90,60 @@
<label for="hd_quota">{tmpl_var name='hd_quota_txt'}</label>
<input name="hd_quota" id="hd_quota" value="{tmpl_var name='hd_quota'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /> MB
</div>
+ </tmpl_if>
+ <tmpl_if name="vhostdomain_type" value="subdomain">
+ <input type="hidden" name="server_id" id="server_id" value="{tmpl_var name='server_id_value'}" />
+ <tmpl_if name="domain_option">
+ <div class="ctrlHolder">
+ <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
+ <select id="parent_domain_id" name="parent_domain_id" class="selectInput formLengthHalf">{tmpl_var name='parent_domain_id'}</select>
+ </div>
+ </tmpl_if>
+ <div class="ctrlHolder">
+ <label for="domain">{tmpl_var name='host_txt'}</label>
+ <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+ </div>
+ <tmpl_if name="domain_option">
+ <div class="ctrlHolder">
+ <label for="sel_domain">{tmpl_var name='domain_txt'}</label>
+ <select name="sel_domain" id="sel_domain" class="selectInput">
+ {tmpl_var name='domain_option'}
+ </select>
+ </div>
+ <tmpl_else>
+ <div class="ctrlHolder">
+ <label for="parent_domain_id">{tmpl_var name='domain_txt'}</label>
+ <select id="parent_domain_id" name="parent_domain_id" class="selectInput formLengthHalf">{tmpl_var name='parent_domain_id'}</select>
+ </div>
+ </tmpl_if>
+ <div class="ctrlHolder">
+ <label for="web_folder">{tmpl_var name='web_folder_txt'}</label>
+ <input name="web_folder" id="web_folder" value="{tmpl_var name='web_folder'}" size="30" maxlength="100" type="text" class="textInput formLengthHalf"<tmpl_if name='fixed_folder' op='==' value='y'> readonly="readonly"</tmpl_if> />
+ </div>
+ </tmpl_if>
+ <tmpl_if name="vhostdomain_type" value="aliasdomain">
+ <input type="hidden" name="server_id" id="server_id" value="{tmpl_var name='server_id_value'}" />
+ <div class="ctrlHolder">
+ <label for="domain">{tmpl_var name='domain_txt'}</label>
+ <tmpl_if name="domain_option">
+ <select name="domain" id="domain" class="selectInput">
+ {tmpl_var name='domain_option'}
+ </select>
+ <tmpl_else>
+ <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
+ </tmpl_if>
+ </div>
+ <div class="ctrlHolder">
+ <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
+ <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
+ {tmpl_var name='parent_domain_id'}
+ </select>
+ </div>
+ <div class="ctrlHolder">
+ <label for="web_folder">{tmpl_var name='web_folder_txt'}</label>
+ <input name="web_folder" id="web_folder" value="{tmpl_var name='web_folder'}" size="30" maxlength="100" type="text" class="textInput formLengthHalf"<tmpl_if name='fixed_folder' op='==' value='y'> readonly="readonly"</tmpl_if> />
+ </div>
+ </tmpl_if>
<div class="ctrlHolder">
<label for="traffic_quota">{tmpl_var name='traffic_quota_txt'}</label>
<input name="traffic_quota" id="traffic_quota" value="{tmpl_var name='traffic_quota'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /> MB <tmpl_var name='traffic_quota_exceeded_txt'>
@@ -172,7 +227,7 @@
<div class="buttonHolder buttons">
<button id="dom-edit-submit" class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
</div>
</div>
@@ -216,7 +271,19 @@
jQuery('.fastcgi_php_version:visible').hide();
}
});
-
+ jQuery('#parent_domain_id').change(function() {
+ reloadServerId(false);
+ });
+
+ function reloadServerId(noFormChange) {
+ var parentWebId = jQuery('#parent_domain_id').val();
+ jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : parentWebId, type : "getserverid"}, function(data) {
+ if(data.serverid) serverId = data.serverid;
+ adjustForm(noFormChange);
+ if(noFormChange) reloadFastcgiPHPVersions(noFormChange);
+ });
+ }
+
function adjustForm(noFormChange){
jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
if(data.servertype == "nginx"){
@@ -271,11 +338,11 @@
<tmpl_if name="readonly_tab">
jQuery('div.panel_web_domain').find('fieldset').find('input,select,button').bind('click mousedown', function(e) { e.preventDefault(); }).focus(function() { $(this).blur(); });
jQuery('#dom-edit-submit').click(function() {
- submitForm('pageForm','sites/web_domain_edit.php');
+ submitForm('pageForm','sites/web_vhost_domain_edit.php');
});
<tmpl_else>
jQuery('#dom-edit-submit').click(function() {
- submitForm('pageForm','sites/web_domain_edit.php');
+ submitForm('pageForm','sites/web_vhost_domain_edit.php');
});
</tmpl_if>
diff --git a/interface/web/sites/templates/web_domain_list.htm b/interface/web/sites/templates/web_vhost_domain_list.htm
similarity index 59%
rename from interface/web/sites/templates/web_domain_list.htm
rename to interface/web/sites/templates/web_vhost_domain_list.htm
index b67b4ca4adf5400f511d73d83b896578f3577069..f486b2fd29d629704f19e7e94d82e0a85661558e 100644
--- a/interface/web/sites/templates/web_domain_list.htm
+++ b/interface/web/sites/templates/web_vhost_domain_list.htm
@@ -1,7 +1,7 @@
<h2><tmpl_var name="list_head_txt"></h2>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_web_domain">
+<div class="panel panel_list_web_vhost_domain">
<div class="pnl_toolsarea">
<tmpl_if name='datalog_changes_count' op='>' value='0'>
@@ -22,7 +22,7 @@
</tmpl_if>
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/web_domain_edit.php');">
+ <button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/web_vhost_domain_edit.php?type={tmpl_var name='vhostdomain_type'}');">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
</div>
@@ -34,31 +34,34 @@
<table class="list">
<thead>
<tr class="caption">
- <th class="tbl_col_domain_id" scope="col"><tmpl_var name="domain_id_txt"></th>
+ <tmpl_if name="vhostdomain_type" value="domain"><th class="tbl_col_domain_id" scope="col"><tmpl_var name="domain_id_txt"></th></tmpl_if>
<th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
<th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+ <tmpl_if name="vhostdomain_type" op="!=" value="domain"><th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th></tmpl_if>
<th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
<th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
</tr>
<tr class="filter">
- <td class="tbl_col_domain_id"><input type="text" size="5" name="search_domain_id" value="{tmpl_var name='search_domain_id'}" /></td>
+ <tmpl_if name="vhostdomain_type" value="domain"><td class="tbl_col_domain_id"><input type="text" size="5" name="search_domain_id" value="{tmpl_var name='search_domain_id'}" /></td></tmpl_if>
<td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
<td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <tmpl_if name="vhostdomain_type" op="!=" value="domain"><td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td></tmpl_if>
<td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
<td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/web_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/web_vhost_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_domain_id"><a href="#" onclick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain_id"}</a></td>
- <td class="tbl_col_active"><a href="#" onclick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_domain"><a href="#" onclick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a><a href="http://{tmpl_var name="domain"}" target="_blank" class="button icons16 icoLink"><span>Link</span></a></td>
+ <tmpl_if name="vhostdomain_type" value="domain"><td class="tbl_col_domain_id"><a href="#" onclick="loadContent('sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}');">{tmpl_var name="domain_id"}</a></td></tmpl_if>
+ <td class="tbl_col_active"><a href="#" onclick="loadContent('sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}');">{tmpl_var name="active"}</a></td>
+ <td class="tbl_col_server_id"><a href="#" onclick="loadContent('sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}');">{tmpl_var name="server_id"}</a></td>
+ <tmpl_if name="vhostdomain_type" op="!=" value="domain"><td class="tbl_col_parent_domain_id"><a href="#" onclick="loadContent('sites/web_vhost_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td></tmpl_if>
+ <td class="tbl_col_domain"><a href="#" onclick="loadContent('sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}');">{tmpl_var name="domain"}</a><a href="http://{tmpl_var name="domain"}" target="_blank" class="button icons16 icoLink"><span>Link</span></a></td>
<td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" href="javascript: del_record('sites/web_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+ <a class="button icons16 icoDelete" href="javascript: del_record('sites/web_vhost_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/sites/templates/web_domain_redirect.htm b/interface/web/sites/templates/web_vhost_domain_redirect.htm
similarity index 96%
rename from interface/web/sites/templates/web_domain_redirect.htm
rename to interface/web/sites/templates/web_vhost_domain_redirect.htm
index c0bd977e25bcf9024e5d9489e4ff9a677f6f0089..3cd8da3614c12bc94e15eedb75c1837380377616 100644
--- a/interface/web/sites/templates/web_domain_redirect.htm
+++ b/interface/web/sites/templates/web_vhost_domain_redirect.htm
@@ -39,8 +39,8 @@
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
</div>
</div>
diff --git a/interface/web/sites/templates/web_domain_ssl.htm b/interface/web/sites/templates/web_vhost_domain_ssl.htm
similarity index 95%
rename from interface/web/sites/templates/web_domain_ssl.htm
rename to interface/web/sites/templates/web_vhost_domain_ssl.htm
index 50d95d35069148a2504873ac0e945cb2d6b5d138..4869c19aa875e3117b28949e9c1802d915c54ac6 100644
--- a/interface/web/sites/templates/web_domain_ssl.htm
+++ b/interface/web/sites/templates/web_vhost_domain_ssl.htm
@@ -69,8 +69,8 @@
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
</div>
</div>
diff --git a/interface/web/sites/templates/web_domain_stats.htm b/interface/web/sites/templates/web_vhost_domain_stats.htm
similarity index 93%
rename from interface/web/sites/templates/web_domain_stats.htm
rename to interface/web/sites/templates/web_vhost_domain_stats.htm
index 769e088f8ac50d1cf6f54cb800ebafffab61d39f..43b072147757325ac404422c2d4bad1f68a357db 100644
--- a/interface/web/sites/templates/web_domain_stats.htm
+++ b/interface/web/sites/templates/web_vhost_domain_stats.htm
@@ -43,8 +43,8 @@
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
</div>
</div>
diff --git a/interface/web/sites/templates/web_vhost_subdomain_advanced.htm b/interface/web/sites/templates/web_vhost_subdomain_advanced.htm
deleted file mode 100644
index 52fb5c774dc6bebb951b03f8abb6c42153a3edc4..0000000000000000000000000000000000000000
--- a/interface/web/sites/templates/web_vhost_subdomain_advanced.htm
+++ /dev/null
@@ -1,157 +0,0 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_web_domain">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <input name="document_root" id="document_root" value="{tmpl_var name='document_root'}" size="30" maxlength="255" type="hidden" class="textInput" />
- <div class="ctrlHolder">
- <label for="system_user">{tmpl_var name='system_user_txt'}</label>
- <label for="system_user">{tmpl_var name='system_user'}</label>
- <input name="system_user" id="system_user" value="{tmpl_var name='system_user'}" type="hidden" />
- </div>
- <div class="ctrlHolder">
- <label for="system_group">{tmpl_var name='system_group_txt'}</label>
- <label for="system_group">{tmpl_var name='system_group'}</label>
- <input name="system_group" id="system_group" value="{tmpl_var name='system_group'}" type="hidden" />
- </div>
- <div class="ctrlHolder apache">
- <label for="allow_override">{tmpl_var name='allow_override_txt'}</label>
- <input name="allow_override" id="allow_override" value="{tmpl_var name='allow_override'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="phpfpm">
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='php_fpm_use_socket_txt'}</p>
- <div class="multiField">
- {tmpl_var name='php_fpm_use_socket'}
- </div>
- </div>
- <div class="ctrlHolder">
- <label for="pm">{tmpl_var name='pm_txt'}</label>
- <select name="pm" id="pm" class="selectInput">
- {tmpl_var name='pm'}
- </select>
- </div>
- <div class="ctrlHolder pm_ondemand" style="background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px;">
- {tmpl_var name='pm_ondemand_hint_txt'}
- </div>
- <div class="ctrlHolder">
- <label for="pm_max_children">{tmpl_var name='pm_max_children_txt'}</label>
- <input name="pm_max_children" id="pm_max_children" value="{tmpl_var name='pm_max_children'}" size="3" maxlength="3" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder pm_dynamic">
- <label for="pm_start_servers">{tmpl_var name='pm_start_servers_txt'}</label>
- <input name="pm_start_servers" id="pm_start_servers" value="{tmpl_var name='pm_start_servers'}" size="3" maxlength="3" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder pm_dynamic">
- <label for="pm_min_spare_servers">{tmpl_var name='pm_min_spare_servers_txt'}</label>
- <input name="pm_min_spare_servers" id="pm_min_spare_servers" value="{tmpl_var name='pm_min_spare_servers'}" size="3" maxlength="3" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder pm_dynamic">
- <label for="pm_max_spare_servers">{tmpl_var name='pm_max_spare_servers_txt'}</label>
- <input name="pm_max_spare_servers" id="pm_max_spare_servers" value="{tmpl_var name='pm_max_spare_servers'}" size="3" maxlength="3" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder pm_ondemand">
- <label for="pm_process_idle_timeout">{tmpl_var name='pm_process_idle_timeout_txt'}</label>
- <input name="pm_process_idle_timeout" id="pm_process_idle_timeout" value="{tmpl_var name='pm_process_idle_timeout'}" size="3" maxlength="6" type="text" class="textInput formLengthLimit" /> s
- </div>
- <div class="ctrlHolder">
- <label for="pm_max_requests">{tmpl_var name='pm_max_requests_txt'}</label>
- <input name="pm_max_requests" id="pm_max_requests" value="{tmpl_var name='pm_max_requests'}" size="3" maxlength="6" type="text" class="textInput formLengthLimit" />
- </div>
- </div>
- <div class="ctrlHolder">
- <label for="php_open_basedir">{tmpl_var name='php_open_basedir_txt'}</label>
- <input name="php_open_basedir" id="php_open_basedir" value="{tmpl_var name='php_open_basedir'}" size="30" type="text" class="textInput" style="width:400px;" />
- </div>
- <div class="ctrlHolder">
- <label for="custom_php_ini">{tmpl_var name='custom_php_ini_txt'}</label>
- <textarea name="custom_php_ini" id="custom_php_ini" rows='10' cols='50' style="width:400px;">{tmpl_var name='custom_php_ini'}</textarea> <b>{tmpl_var name="available_php_directive_snippets_txt"}</b><br><br> {tmpl_var name="php_directive_snippets_txt"}
- </div>
- <div class="ctrlHolder apache">
- <label for="apache_directives">{tmpl_var name='apache_directives_txt'}</label>
- <textarea name="apache_directives" id="apache_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='apache_directives'}</textarea> <b>{tmpl_var name="available_apache_directive_snippets_txt"}</b><br><br> {tmpl_var name="apache_directive_snippets_txt"}
- </div>
- <div class="ctrlHolder nginx">
- <label for="nginx_directives">{tmpl_var name='nginx_directives_txt'}</label>
- <textarea name="nginx_directives" id="nginx_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='nginx_directives'}</textarea> <b>{tmpl_var name="available_nginx_directive_snippets_txt"}</b><br><br> {tmpl_var name="nginx_directive_snippets_txt"}<br>----<br><b> {tmpl_var name='variables_txt'}:</b> <a href="javascript:void(0);" class="addPlaceholder">{DOCROOT}</a>, <a href="javascript:void(0);" class="addPlaceholder">{FASTCGIPASS}</a>
- </div>
- <div class="ctrlHolder proxy">
- <label for="proxy_directives">{tmpl_var name='proxy_directives_txt'}</label>
- <textarea name="proxy_directives" id="proxy_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='proxy_directives'}</textarea> <b>{tmpl_var name="available_proxy_directive_snippets_txt"}</b><br><br> {tmpl_var name="proxy_directive_snippets_txt"}
- </div>
- </fieldset>
-
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_subdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_subdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
-<script language="JavaScript" type="text/javascript">
- var webId = jQuery('input[name="id"]').val();
- var serverId;
- getServerId();
- adjustForm();
-
- var pm = jQuery('#pm').val();
- pmMode(pm);
- jQuery('#pm').change(function(){
- pm = jQuery(this).val();
- pmMode(pm);
- });
-
- function pmMode(pm){
- switch(pm){
- case "static":
- jQuery('.pm_dynamic').add('.pm_ondemand').hide();
- jQuery('.pm_static').show();
- break;
- case "dynamic":
- jQuery('.pm_static').add('.pm_ondemand').hide();
- jQuery('.pm_dynamic').show();
- break;
- case "ondemand":
- jQuery('.pm_static').add('.pm_dynamic').hide();
- jQuery('.pm_ondemand').show();
- break;
- }
- }
-
- function getServerId(){
- jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getserverid"}, function(data) {
- serverId = data.serverid;
- });
- }
-
- function adjustForm(){
- jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
- if(data.servertype == "nginx"){
- jQuery('.nginx').show();
- jQuery('.apache').hide();
- } else {
- jQuery('.nginx').hide();
- jQuery('.apache').show();
- }
- });
- jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getphptype"}, function(data) {
- if(data.phptype == "php-fpm"){
- jQuery('.phpfpm').show();
- } else {
- jQuery('.phpfpm').hide();
- }
- });
- jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getredirecttype"}, function(data) {
- if(data.redirecttype == "proxy"){
- jQuery('.proxy').show();
- } else {
- jQuery('.proxy').hide();
- }
- });
- }
-
-</script>
\ No newline at end of file
diff --git a/interface/web/sites/templates/web_vhost_subdomain_backup.htm b/interface/web/sites/templates/web_vhost_subdomain_backup.htm
deleted file mode 100644
index d76afdf685abf4e28f916713f647cc179c6c7ff3..0000000000000000000000000000000000000000
--- a/interface/web/sites/templates/web_vhost_subdomain_backup.htm
+++ /dev/null
@@ -1,36 +0,0 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_web_domain">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Backup</legend>
- <div class="ctrlHolder">
- <label for="backup_interval">{tmpl_var name='backup_interval_txt'}</label>
- <select name="backup_interval" id="backup_interval" class="selectInput">
- {tmpl_var name='backup_interval'}
- </select>
- </div>
- <div class="ctrlHolder">
- <label for="backup_copies">{tmpl_var name='backup_copies_txt'}</label>
- <select name="backup_copies" id="backup_copies" class="selectInput">
- {tmpl_var name='backup_copies'}
- </select>
- </div>
- <div class="ctrlHolder">
- <label for="backup_excludes">{tmpl_var name='backup_excludes_txt'}</label>
- <input name="backup_excludes" id="backup_excludes" value="{tmpl_var name='backup_excludes'}" size="30" type="text" class="textInput" /> {tmpl_var name='backup_excludes_note_txt'}
- </div>
- </fieldset>
-
- {tmpl_var name='backup_records'}
-
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_subdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_subdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
diff --git a/interface/web/sites/templates/web_vhost_subdomain_edit.htm b/interface/web/sites/templates/web_vhost_subdomain_edit.htm
deleted file mode 100644
index 8070e0092b42d8899b28d8a1b79556cc88077be8..0000000000000000000000000000000000000000
--- a/interface/web/sites/templates/web_vhost_subdomain_edit.htm
+++ /dev/null
@@ -1,234 +0,0 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_web_domain">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <input type="hidden" name="server_id" id="server_id" value="{tmpl_var name='server_id_value'}" />
- <tmpl_if name="domain_option">
- <div class="ctrlHolder">
- <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
- <select id="parent_domain_id" name="parent_domain_id" class="selectInput formLengthHalf">{tmpl_var name='parent_domain_id'}</select>
- </div>
- </tmpl_if>
- <div class="ctrlHolder">
- <label for="domain">{tmpl_var name='host_txt'}</label>
- <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
- </div>
- <tmpl_if name="domain_option">
- <div class="ctrlHolder">
- <label for="sel_domain">{tmpl_var name='domain_txt'}</label>
- <select name="sel_domain" id="sel_domain" class="selectInput">
- {tmpl_var name='domain_option'}
- </select>
- </div>
- <tmpl_else>
- <div class="ctrlHolder">
- <label for="parent_domain_id">{tmpl_var name='domain_txt'}</label>
- <select id="parent_domain_id" name="parent_domain_id" class="selectInput formLengthHalf">{tmpl_var name='parent_domain_id'}</select>
- </div>
- </tmpl_if>
- <div class="ctrlHolder">
- <label for="web_folder">{tmpl_var name='web_folder_txt'}</label>
- <input name="web_folder" id="web_folder" value="{tmpl_var name='web_folder'}" size="30" maxlength="100" type="text" class="textInput formLengthHalf"<tmpl_if name='fixed_folder' op='==' value='y'> readonly="readonly"</tmpl_if> />
- </div>
- <div class="ctrlHolder">
- <label for="traffic_quota">{tmpl_var name='traffic_quota_txt'}</label>
- <input name="traffic_quota" id="traffic_quota" value="{tmpl_var name='traffic_quota'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /> MB <tmpl_var name='traffic_quota_exceeded_txt'>
- </div>
- <tmpl_if name="limit_cgi" op="==" value="y"><div class="ctrlHolder">
- <p class="label">{tmpl_var name='cgi_txt'}</p>
- <div class="multiField">
- {tmpl_var name='cgi'}
- </div>
- </div></tmpl_if>
- <tmpl_if name="limit_ssi" op="==" value="y"><div class="ctrlHolder">
- <p class="label">{tmpl_var name='ssi_txt'}</p>
- <div class="multiField">
- {tmpl_var name='ssi'}
- </div>
- </div></tmpl_if>
- <tmpl_if name="limit_perl" op="==" value="y"><div class="ctrlHolder apache">
- <p class="label">{tmpl_var name='perl_txt'}</p>
- <div class="multiField">
- {tmpl_var name='perl'}
- </div>
- </div></tmpl_if>
- <tmpl_if name="limit_ruby" op="==" value="y"><div class="ctrlHolder apache">
- <p class="label">{tmpl_var name='ruby_txt'}</p>
- <div class="multiField">
- {tmpl_var name='ruby'}
- </div>
- </div></tmpl_if>
- <tmpl_if name="limit_python" op="==" value="y"><div class="ctrlHolder apache">
- <p class="label">{tmpl_var name='python_txt'}</p>
- <div class="multiField">
- {tmpl_var name='python'}
- </div>
- </div></tmpl_if>
- <tmpl_if name="force_suexec" op="==" value="n"><div class="ctrlHolder apache">
- <p class="label">{tmpl_var name='suexec_txt'}</p>
- <div class="multiField">
- {tmpl_var name='suexec'}
- </div>
- </div></tmpl_if>
- <tmpl_if name="limit_hterror" op="==" value="y"><div class="ctrlHolder">
- <p class="label">{tmpl_var name='errordocs_txt'}</p>
- <div class="multiField">
- {tmpl_var name='errordocs'}
- </div>
- </div></tmpl_if>
-
- <div class="ctrlHolder">
- <label for="subdomain">{tmpl_var name='subdomain_txt'}</label>
- <select name="subdomain" id="subdomain" class="selectInput formLengthHalf">
- {tmpl_var name='subdomain'}
- </select>
- </div>
- <tmpl_if name="limit_ssl" op="==" value="y"><div class="ctrlHolder">
- <p class="label">{tmpl_var name='ssl_txt'}</p>
- <div class="multiField">
- {tmpl_var name='ssl'}
- </div>
- </div></tmpl_if>
- <div class="ctrlHolder">
- <label for="php">{tmpl_var name='php_txt'}</label>
- <select name="php" id="php" class="selectInput formLengthHalf">
- {tmpl_var name='php'}
- </select>
- </div>
- <div class="ctrlHolder fastcgi_php_version">
- <label for="fastcgi_php_version">{tmpl_var name='fastcgi_php_version_txt'}</label>
- <select name="fastcgi_php_version" id="fastcgi_php_version" class="selectInput formLengthHalf">
- {tmpl_var name='fastcgi_php_version'}
- </select>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
- {tmpl_var name='active'}
- </div>
- </div>
- </fieldset>
-
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
- <div class="buttonHolder buttons">
- <button id="dom-edit-submit" class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_subdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
-<script language="JavaScript" type="text/javascript">
- var serverId;
- var clientGroupId = jQuery('#client_group_id').val();
- var serverIdDisabled = jQuery('#server_id_disabled').val();
- if(serverIdDisabled > 0){
- serverId = serverIdDisabled;
- } else {
- serverId = jQuery('#server_id').val();
- jQuery('#server_id').change(function(){
- serverId = $(this).val();
- adjustForm();
- reloadWebIP();
- reloadFastcgiPHPVersions();
- });
- }
- reloadServerId(true);
-
- jQuery('#client_group_id').change(function(){
- clientGroupId = $(this).val();
- reloadWebIP();
- });
-
- if(jQuery('#php').val() == 'fast-cgi' || jQuery('#php').val() == 'php-fpm'){
- jQuery('.fastcgi_php_version:hidden').show();
- } else {
- jQuery('.fastcgi_php_version:visible').hide();
- }
- jQuery('#php').change(function(){
- reloadFastcgiPHPVersions();
- if(jQuery(this).val() == 'fast-cgi' || jQuery(this).val() == 'php-fpm'){
- jQuery('.fastcgi_php_version:hidden').show();
- } else {
- jQuery('.fastcgi_php_version:visible').hide();
- }
- });
- jQuery('#parent_domain_id').change(function() {
- reloadServerId(false);
- });
-
- function reloadServerId(noFormChange) {
- var parentWebId = jQuery('#parent_domain_id').val();
- jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : parentWebId, type : "getserverid"}, function(data) {
- if(data.serverid) serverId = data.serverid;
- adjustForm(noFormChange);
- if(noFormChange) reloadFastcgiPHPVersions(noFormChange);
- });
- }
-
- function adjustForm(noFormChange){
- jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
- if(data.servertype == "nginx"){
- var selected = jQuery('#php').val();
- jQuery('.apache').hide();
- if(selected != "no" && selected != "php-fpm") {
- jQuery('#php option[value="php-fpm"]').attr('selected', 'selected').val('php-fpm');
- }
- jQuery('#php option[value="fast-cgi"]').hide();
- jQuery('#php option[value="cgi"]').hide();
- jQuery('#php option[value="mod"]').hide();
- jQuery('#php option[value="suphp"]').hide();
- } else {
- jQuery('.apache').show();
- jQuery('#php option[value="fast-cgi"]').show();
- jQuery('#php option[value="cgi"]').show();
- jQuery('#php option[value="mod"]').show();
- jQuery('#php option[value="suphp"]').show();
- }
- if(noFormChange) {
- resetFormChanged();
- jQuery('#php').addClass('no-page-form-change').change();
- jQuery('#php').removeClass('no-page-form-change');
- } else {
- jQuery('#php').change();
- }
- });
- }
-
- function reloadWebIP() {
- loadOptionInto('ip_address','sites/ajax_get_ip.php?ip_type=IPv4&server_id='+serverId+'&client_group_id='+clientGroupId);
- loadOptionInto('ipv6_address','sites/ajax_get_ip.php?ip_type=IPv6&server_id='+serverId+'&client_group_id='+clientGroupId);
- }
-
- function reloadFastcgiPHPVersions(noFormChange) {
- jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, php_type : jQuery('#php').val(), type : "getphpfastcgi"}, function(data) {
- var options = '<option value="">Default</option>';
- var phpfastcgiselected = '';
- $.each(data, function(key, val) {
- if($('#fastcgi_php_version').val() == key){
- phpfastcgiselected = ' selected="selected"';
- } else {
- phpfastcgiselected = '';
- }
- options += '<option value="'+key+'"'+phpfastcgiselected+'>'+val+'</option>';
- });
- $('#fastcgi_php_version').html(options).change();
- if(noFormChange) resetFormChanged();
- });
- }
-
- <tmpl_if name="readonly_tab">
- jQuery('div.panel_web_domain').find('fieldset').find('input,select,button').bind('click mousedown', function(e) { e.preventDefault(); }).focus(function() { $(this).blur(); });
- jQuery('#dom-edit-submit').click(function() {
- submitForm('pageForm','sites/web_vhost_subdomain_edit.php');
- });
- <tmpl_else>
- jQuery('#dom-edit-submit').click(function() {
- submitForm('pageForm','sites/web_vhost_subdomain_edit.php');
- });
- </tmpl_if>
-
-</script>
\ No newline at end of file
diff --git a/interface/web/sites/templates/web_vhost_subdomain_list.htm b/interface/web/sites/templates/web_vhost_subdomain_list.htm
deleted file mode 100644
index 4c7a72eef7a4076e67bcdaad79b987b1934454a8..0000000000000000000000000000000000000000
--- a/interface/web/sites/templates/web_vhost_subdomain_list.htm
+++ /dev/null
@@ -1,79 +0,0 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_web_subdomain">
-
- <div class="pnl_toolsarea">
- <tmpl_if name='datalog_changes_count' op='>' value='0'>
- <div>
- <div class="systemmonitor-state state-info">
- <div class="status"></div>
- <div class="statusMsg">
- {tmpl_var name="datalog_changes_txt"}
- <ul>
- <tmpl_loop name="datalog_changes">
- <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
- </tmpl_loop>
- </ul>
- {tmpl_var name="datalog_changes_end_txt"}
- </div>
- </div><br />
- </div>
- </tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/web_vhost_subdomain_edit.php');">
- <span>{tmpl_var name="add_new_record_txt"}</span>
- </button>
- </div>
- </fieldset>
- </div>
-
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr>
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
- <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
- </tr>
- <tr>
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
- <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
- <td class="tbl_col_buttons"><button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/web_vhost_subdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></td>
- </tr>
- </thead>
- <tbody>
- <tmpl_loop name="records">
- <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('sites/web_vhost_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('sites/web_vhost_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_parent_domain_id"><a href="#" onclick="loadContent('sites/web_vhost_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
- <td class="tbl_col_domain"><a href="#" onclick="loadContent('sites/web_vhost_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" href="javascript: del_record('sites/web_vhost_subdomain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
- </td>
- </tr>
- </tmpl_loop>
- <tmpl_unless name="records">
- <tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td colspan="5">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
- </tr>
- </tmpl_unless>
- </tbody>
-
- <tfoot>
- <tr>
- <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
- </tr>
- </tfoot>
- </table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
diff --git a/interface/web/sites/templates/web_vhost_subdomain_redirect.htm b/interface/web/sites/templates/web_vhost_subdomain_redirect.htm
deleted file mode 100644
index c00b8667480f748b1356a63178189e106f84abf6..0000000000000000000000000000000000000000
--- a/interface/web/sites/templates/web_vhost_subdomain_redirect.htm
+++ /dev/null
@@ -1,84 +0,0 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_web_domain">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="redirect_type">{tmpl_var name='redirect_type_txt'}</label>
- <select name="redirect_type" id="redirect_type" class="selectInput formLengthHalf">
- {tmpl_var name='redirect_type'}
- </select>
- </div>
- <div class="ctrlHolder">
- <label for="redirect_path">{tmpl_var name='redirect_path_txt'}</label>
- <input name="redirect_path" id="redirect_path" value="{tmpl_var name='redirect_path'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="seo_redirect">{tmpl_var name='seo_redirect_txt'}</label>
- <select name="seo_redirect" id="seo_redirect" class="selectInput formLengthHalf">
- {tmpl_var name='seo_redirect'}
- </select>
- </div>
- <div class="ctrlHolder nginx">
- <label for="rewrite_rules">{tmpl_var name='rewrite_rules_txt'}</label>
- <textarea name="rewrite_rules" id="rewrite_rules" rows='10' cols='50' style="width:400px;">{tmpl_var name='rewrite_rules'}</textarea> <b>{tmpl_var name="allowed_rewrite_rule_directives_txt"}</b><br><br> break<br> if<br> return<br> rewrite<br> set<br><br> <a href="http://wiki.nginx.org/HttpRewriteModule" target="_blank">http://wiki.nginx.org/HttpRewriteModule</a>
- </div>
- </fieldset>
-
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_subdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_subdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
-<script language="JavaScript" type="text/javascript">
- var webId = jQuery('input[name="id"]').val();
- var serverId;
- getServerId(webId);
-
- function getServerId(webId){
- jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getserverid"}, function(data) {
- serverId = data.serverid;
- adjustForm(serverId);
- });
- }
-
- function adjustForm(serverId){
- jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
- var selected = jQuery('#redirect_type').val();
- if(data.servertype == "nginx"){
- jQuery("#redirect_type option[value='R']").attr('disabled','disabled');
- jQuery('#redirect_type option[value="L"]').attr('disabled','disabled');
- jQuery('#redirect_type option[value="R,L"]').attr('disabled','disabled');
- jQuery('#redirect_type option[value="R=301,L"]').attr('disabled','disabled');
-
- jQuery('#redirect_type option[value="R"]').hide();
- jQuery('#redirect_type option[value="L"]').hide();
- jQuery('#redirect_type option[value="R,L"]').hide();
- jQuery('#redirect_type option[value="R=301,L"]').hide();
- if(selected != "no" && selected != "" && selected != "last" && selected != "break" && selected != "redirect" && selected != "permanent" && selected != "proxy") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
- jQuery('.nginx').show();
- } else {
- jQuery('#redirect_type option[value="last"]').attr('disabled','disabled');
- jQuery('#redirect_type option[value="break"]').attr('disabled','disabled');
- jQuery('#redirect_type option[value="redirect"]').attr('disabled','disabled');
- jQuery('#redirect_type option[value="permanent"]').attr('disabled','disabled');
- jQuery('#redirect_type option[value="proxy"]').attr('disabled','disabled');
-
- jQuery('#redirect_type option[value="last"]').hide();
- jQuery('#redirect_type option[value="break"]').hide();
- jQuery('#redirect_type option[value="redirect"]').hide();
- jQuery('#redirect_type option[value="permanent"]').hide();
- jQuery('#redirect_type option[value="proxy"]').hide();
- if(selected != "no" && selected != "" && selected != "R" && selected != "L" && selected != "R,L" && selected != "R=301,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
- jQuery('.nginx').hide();
- }
- });
- }
-
-</script>
\ No newline at end of file
diff --git a/interface/web/sites/templates/web_vhost_subdomain_ssl.htm b/interface/web/sites/templates/web_vhost_subdomain_ssl.htm
deleted file mode 100644
index e5b13c1d0db33855d199f6faab2ff1d9e1563908..0000000000000000000000000000000000000000
--- a/interface/web/sites/templates/web_vhost_subdomain_ssl.htm
+++ /dev/null
@@ -1,68 +0,0 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_web_domain">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="ssl_state">{tmpl_var name='ssl_state_txt'}</label>
- <input name="ssl_state" id="ssl_state" value="{tmpl_var name='ssl_state'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="ssl_locality">{tmpl_var name='ssl_locality_txt'}</label>
- <input name="ssl_locality" id="ssl_locality" value="{tmpl_var name='ssl_locality'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="ssl_organisation">{tmpl_var name='ssl_organisation_txt'}</label>
- <input name="ssl_organisation" id="ssl_organisation" value="{tmpl_var name='ssl_organisation'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="ssl_organisation_unit">{tmpl_var name='ssl_organisation_unit_txt'}</label>
- <input name="ssl_organisation_unit" id="ssl_organisation_unit" value="{tmpl_var name='ssl_organisation_unit'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="ssl_country">{tmpl_var name='ssl_country_txt'}</label>
- <select name="ssl_country" id="ssl_country" class="selectInput flags">
- {tmpl_var name='ssl_country'}
- </select>
- </div>
- <div class="ctrlHolder">
- <label for="client_group_id">{tmpl_var name='ssl_domain_txt'}</label>
- <select name="ssl_domain" id="ssl_domain" class="selectInput">
- {tmpl_var name='ssl_domain'}
- </select>
- </div>
- <div class="ctrlHolder">
- <label for="ssl_request">{tmpl_var name='ssl_key_txt'}</label>
- <textarea name="ssl_key" id="ssl_key" rows='10' cols='30'>{tmpl_var name='ssl_key'}</textarea>
- </div>
- <div class="ctrlHolder">
- <label for="ssl_request">{tmpl_var name='ssl_request_txt'}</label>
- <textarea name="ssl_request" id="ssl_request" rows='10' cols='30'>{tmpl_var name='ssl_request'}</textarea>
- </div>
- <div class="ctrlHolder">
- <label for="ssl_cert">{tmpl_var name='ssl_cert_txt'}</label>
- <textarea name="ssl_cert" id="ssl_cert" rows='10' cols='30'>{tmpl_var name='ssl_cert'}</textarea>
- </div>
- <div class="ctrlHolder">
- <label for="ssl_bundle">{tmpl_var name='ssl_bundle_txt'}</label>
- <textarea name="ssl_bundle" id="ssl_bundle" rows='10' cols='30'>{tmpl_var name='ssl_bundle'}</textarea>
- </div>
- <div class="ctrlHolder">
- <label for="ssl_action">{tmpl_var name='ssl_action_txt'}</label>
- <select name="ssl_action" id="ssl_action" class="selectInput formLengthHalf">
- {tmpl_var name='ssl_action'}
- </select>
- </div>
- </fieldset>
-
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_subdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_subdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
diff --git a/interface/web/sites/templates/web_vhost_subdomain_stats.htm b/interface/web/sites/templates/web_vhost_subdomain_stats.htm
deleted file mode 100644
index aa1605e434f04c3a89c5f2192e15de3bc4880b3d..0000000000000000000000000000000000000000
--- a/interface/web/sites/templates/web_vhost_subdomain_stats.htm
+++ /dev/null
@@ -1,37 +0,0 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_web_domain">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='stats_user_txt'}</p><p class="value">admin</p>
- </div>
- <div class="ctrlHolder">
- <label for="stats_password">{tmpl_var name='stats_password_txt'}</label>
- <input name="stats_password" id="stats_password" value="{tmpl_var name='stats_password'}" size="15" maxlength="100" type="password" class="textInput" style="width:100px;" onkeyup="checkPassMatch('stats_password','repeat_password');" /> <a href="javascript:void(0);" onclick="generatePassword('stats_password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
- </div>
- <div class="ctrlHolder">
- <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
- <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;" onkeyup="checkPassMatch('stats_password','repeat_password');" />
- </div>
- <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
- <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
- <div class="ctrlHolder">
- <label for="stats_type">{tmpl_var name='stats_type_txt'}</label>
- <select name="stats_type" id="stats_type" class="selectInput" >
- {tmpl_var name='stats_type'}
- </select>
- </div>
- </fieldset>
-
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_subdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_subdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
diff --git a/interface/web/sites/web_aliasdomain_del.php b/interface/web/sites/web_aliasdomain_del.php
index 6793eba2fc4660f72b23768b7f2005b2ba67fa4a..d9a4228afbcd06f62afe36cb1f37f1475f3aeeb3 100644
--- a/interface/web/sites/web_aliasdomain_del.php
+++ b/interface/web/sites/web_aliasdomain_del.php
@@ -1,51 +1,6 @@
<?php
-/*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
-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
-******************************************/
-
-$list_def_file = "list/web_aliasdomain.list.php";
-$tform_def_file = "form/web_aliasdomain.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('sites');
-
-$app->uses("tform_actions");
-$app->tform_actions->onDelete();
+/* this file is no longer used. */
+die();
?>
diff --git a/interface/web/sites/web_aliasdomain_edit.php b/interface/web/sites/web_aliasdomain_edit.php
index e618a43494ffca3eaef43082955e8baa2e1f94de..d9a4228afbcd06f62afe36cb1f37f1475f3aeeb3 100644
--- a/interface/web/sites/web_aliasdomain_edit.php
+++ b/interface/web/sites/web_aliasdomain_edit.php
@@ -1,191 +1,6 @@
<?php
-/*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
-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/web_aliasdomain.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('sites');
-
-// Loading classes
-$app->uses('tpl,tform,tform_actions,tools_sites');
-$app->load('tform_actions');
-
-class page_action extends tform_actions {
-
- var $parent_domain_record;
-
- function onShowNew() {
- global $app, $conf;
-
- // we will check only users, not admins
- if($_SESSION["s"]["user"]["typ"] == 'user') {
- if(!$app->tform->checkClientLimit('limit_web_aliasdomain',"(type = 'alias' OR type = 'vhostalias')")) {
- $app->error($app->tform->wordbook["limit_web_aliasdomain_txt"]);
- }
- if(!$app->tform->checkResellerLimit('limit_web_aliasdomain',"(type = 'alias' OR type = 'vhostalias')")) {
- $app->error('Reseller: '.$app->tform->wordbook["limit_web_aliasdomain_txt"]);
- }
- }
-
- parent::onShowNew();
- }
-
- function onShowEnd() {
- global $app, $conf;
-
- /*
- * Now we have to check, if we should use the domain-module to select the domain
- * or not
- */
- $app->uses('ini_parser,getconf');
- $settings = $app->getconf->get_global_config('domains');
- if ($settings['use_domain_module'] == 'y') {
- /*
- * The domain-module is in use.
- */
- $domains = $app->tools_sites->getDomainModuleDomains();
- $domain_select = '';
- if(is_array($domains) && sizeof($domains) > 0) {
- /* We have domains in the list, so create the drop-down-list */
- foreach( $domains as $domain) {
- $domain_select .= "<option value=" . $domain['domain_id'] ;
- if ($domain['domain'] == $this->dataRecord["domain"]) {
- $domain_select .= " selected";
- }
- $domain_select .= ">" . $app->functions->idn_decode($domain['domain']) . "</option>\r\n";
- }
- }
- else {
- /*
- * We have no domains in the domain-list. This means, we can not add ANY new domain.
- * To avoid, that the variable "domain_option" is empty and so the user can
- * free enter a domain, we have to create a empty option!
- */
- $domain_select .= "<option value=''></option>\r\n";
- }
- $app->tpl->setVar("domain_option", $domain_select);
- }
-
- if($_SESSION["s"]["user"]["typ"] == 'admin') {
- // Directive Snippets
- $proxy_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'proxy' AND active = 'y'");
- $proxy_directive_snippets_txt = '';
- if(is_array($proxy_directive_snippets) && !empty($proxy_directive_snippets)){
- foreach($proxy_directive_snippets as $proxy_directive_snippet){
- $proxy_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$proxy_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$proxy_directive_snippet['snippet'].'</pre></a> ';
- }
- }
- if($proxy_directive_snippets_txt == '') $proxy_directive_snippets_txt = '------';
- $app->tpl->setVar("proxy_directive_snippets_txt", $proxy_directive_snippets_txt);
- }
-
- parent::onShowEnd();
-
- }
-
- function onSubmit() {
- global $app, $conf;
-
- /* check if the domain module is used - and check if the selected domain can be used! */
- $app->uses('ini_parser,getconf');
- $settings = $app->getconf->get_global_config('domains');
- if ($settings['use_domain_module'] == 'y') {
- $domain_check = $app->tools_sites->checkDomainModuleDomain($this->dataRecord['domain']);
- if(!$domain_check) {
- // invalid domain selected
- $app->tform->errorMessage .= $app->tform->lng("domain_error_empty")."<br />";
- } else {
- $this->dataRecord['domain'] = $domain_check;
- }
- }
-
- // nginx: if redirect type is proxy and redirect path is no URL, display error
- if($this->dataRecord["redirect_type"] == 'proxy' && substr($this->dataRecord['redirect_path'], 0, 1) == '/'){
- $app->tform->errorMessage .= $app->tform->lng("error_proxy_requires_url")."<br />";
- }
-
- // Get the record of the parent domain
- $parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ? AND ".$app->tform->getAuthSQL('r'), @$this->dataRecord["parent_domain_id"]);
- if(!$parent_domain || $parent_domain['domain_id'] != @$this->dataRecord['parent_domain_id']) $app->tform->errorMessage .= $app->tform->lng("no_domain_perm");
-
- // Set a few fixed values
- $this->dataRecord["type"] = 'alias';
- $this->dataRecord["server_id"] = $parent_domain["server_id"];
- //$this->dataRecord["domain"] = $this->dataRecord["domain"].'.'.$parent_domain["domain"];
-
- $this->parent_domain_record = $parent_domain;
-
- //* make sure that the domain is lowercase
- if(isset($this->dataRecord["domain"])) $this->dataRecord["domain"] = strtolower($this->dataRecord["domain"]);
-
- parent::onSubmit();
- }
-
- function onAfterInsert() {
- global $app, $conf;
-
- $app->db->query('UPDATE web_domain SET sys_groupid = ? WHERE domain_id = ?', $this->parent_domain_record['sys_groupid'], $this->id);
-
- }
-
- function onAfterUpdate() {
- global $app, $conf;
-
- //* Check if parent domain has been changed
- if($this->dataRecord['parent_domain_id'] != $this->oldDataRecord['parent_domain_id']) {
-
- //* Update the domain owner
- $app->db->query('UPDATE web_domain SET sys_groupid = ? WHERE domain_id = ?', $this->parent_domain_record['sys_groupid'], $this->id);
-
- //* Update the old website, so that the vhost alias gets removed
- //* We force the update by inserting a transaction record without changes manually.
- $old_website = $app->db->queryOneRecord('SELECT * FROM web_domain WHERE domain_id = ?', $this->oldDataRecord['domain_id']);
- $app->db->datalogSave('web_domain', 'UPDATE', 'domain_id', $this->oldDataRecord['parent_domain_id'], $old_website, $old_website, true);
- }
-
- }
-
-}
-
-$page = new page_action;
-$page->onLoad();
+/* this file is no longer used. */
+die();
?>
diff --git a/interface/web/sites/web_aliasdomain_list.php b/interface/web/sites/web_aliasdomain_list.php
index e99e0ce0f617a9bf5da3873d59ecdde43cd480e9..8c644544fcc4aa01baf7b9e91e9315cb5d6aaad9 100644
--- a/interface/web/sites/web_aliasdomain_list.php
+++ b/interface/web/sites/web_aliasdomain_list.php
@@ -1,55 +1,7 @@
<?php
-/*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
-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.
-*/
-
-require_once '../../lib/config.inc.php';
-require_once '../../lib/app.inc.php';
-
-/******************************************
-* Begin Form configuration
-******************************************/
-
-$list_def_file = "list/web_aliasdomain.list.php";
-
-/******************************************
-* End Form configuration
-******************************************/
-
-//* Check permissions for module
-$app->auth->check_module_permissions('sites');
-
-$app->uses('listform_actions');
-
-// Limit the results to alias domains
-$app->listform_actions->SQLExtWhere = "web_domain.type = 'alias'";
-$app->listform_actions->SQLOrderBy = 'ORDER BY web_domain.domain';
-$app->listform_actions->onLoad();
+/* this file is no longer used. */
+die();
?>
diff --git a/interface/web/sites/web_domain_list.php b/interface/web/sites/web_childdomain_del.php
similarity index 77%
rename from interface/web/sites/web_domain_list.php
rename to interface/web/sites/web_childdomain_del.php
index 301ec961a4e8332c6fa7d4c56f31aa0d78561b44..e1bdaec5c0ff0eee66457cefb472844df066a96e 100644
--- a/interface/web/sites/web_domain_list.php
+++ b/interface/web/sites/web_childdomain_del.php
@@ -28,32 +28,31 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-require_once '../../lib/config.inc.php';
-require_once '../../lib/app.inc.php';
-
/******************************************
* Begin Form configuration
******************************************/
-$list_def_file = "list/web_domain.list.php";
+$list_def_file = "list/web_childdomain.list.php";
+$tform_def_file = "form/web_childdomain.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('sites');
-$app->load('listform_actions');
-
-
-class list_action extends listform_actions {
+//* Get and set the child domain type - store in session
+$show_type = 'aliasdomain';
+if(isset($_GET['type']) && $_GET['type'] == 'subdomain') $show_type = 'subdomain';
+elseif(!isset($_GET['type']) && isset($_SESSION['s']['var']['childdomain_type']) && $_SESSION['s']['var']['childdomain_type'] == 'subdomain') $show_type = 'subdomain';
-}
+$_SESSION['s']['var']['childdomain_type'] = $show_type;
-$list = new list_action;
-$list->SQLExtWhere = "web_domain.type = 'vhost' AND web_domain.parent_domain_id = '0'";
-$list->SQLOrderBy = 'ORDER BY web_domain.domain';
-$list->onLoad();
+$app->uses("tform_actions");
+$app->tform_actions->onDelete();
?>
diff --git a/interface/web/sites/web_childdomain_edit.php b/interface/web/sites/web_childdomain_edit.php
new file mode 100644
index 0000000000000000000000000000000000000000..435b9018c009c827d173156a04d2aefc028efa8b
--- /dev/null
+++ b/interface/web/sites/web_childdomain_edit.php
@@ -0,0 +1,243 @@
+<?php
+/*
+Copyright (c) 2007, Till Brehm, projektfarm Gmbh
+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/web_childdomain.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('sites');
+
+// Loading classes
+$app->uses('tpl,tform,tform_actions,tools_sites');
+$app->load('tform_actions');
+
+class page_action extends tform_actions {
+
+ var $parent_domain_record;
+ var $_childdomain_type;
+
+ function onLoad() {
+ //* Get and set the child domain type - store in session
+ $show_type = 'aliasdomain';
+ if(isset($_GET['type']) && $_GET['type'] == 'subdomain') $show_type = 'subdomain';
+ elseif(!isset($_GET['type']) && isset($_SESSION['s']['var']['childdomain_type']) && $_SESSION['s']['var']['childdomain_type'] == 'subdomain') $show_type = 'subdomain';
+
+ $_SESSION['s']['var']['childdomain_type'] = $show_type;
+ $this->_childdomain_type = $show_type;
+
+ parent::onLoad();
+ }
+
+ function onShowNew() {
+ global $app, $conf;
+
+ // we will check only users, not admins
+ if($_SESSION["s"]["user"]["typ"] == 'user') {
+ if($this->_childdomain_type == 'subdomain') {
+ if(!$app->tform->checkClientLimit('limit_web_subdomain', "(type = 'subdomain' OR type = 'vhostsubdomain')")) {
+ $app->error($app->tform->wordbook["limit_web_subdomain_txt"]);
+ }
+ if(!$app->tform->checkResellerLimit('limit_web_subdomain', "(type = 'subdomain' OR type = 'vhostsubdomain')")) {
+ $app->error('Reseller: '.$app->tform->wordbook["limit_web_subdomain_txt"]);
+ }
+ } else {
+ if(!$app->tform->checkClientLimit('limit_web_aliasdomain', "(type = 'alias' OR type = 'vhostalias')")) {
+ $app->error($app->tform->wordbook["limit_web_aliasdomain_txt"]);
+ }
+ if(!$app->tform->checkResellerLimit('limit_web_aliasdomain', "(type = 'alias' OR type = 'vhostalias')")) {
+ $app->error('Reseller: '.$app->tform->wordbook["limit_web_aliasdomain_txt"]);
+ }
+ }
+ }
+
+ $app->tpl->setVar('childdomain_type', $this->_childdomain_type);
+
+ parent::onShowNew();
+ }
+
+ function onShowEnd() {
+ global $app, $conf;
+
+ /*
+ * Now we have to check, if we should use the domain-module to select the domain
+ * or not
+ */
+ $app->uses('ini_parser,getconf');
+ $settings = $app->getconf->get_global_config('domains');
+ if ($settings['use_domain_module'] == 'y') {
+ /*
+ * The domain-module is in use.
+ */
+ $domains = $app->tools_sites->getDomainModuleDomains();
+ $domain_select = '';
+ $selected_domain = '';
+ if(is_array($domains) && sizeof($domains) > 0) {
+ /* We have domains in the list, so create the drop-down-list */
+ foreach( $domains as $domain) {
+ $domain_select .= "<option value=" . $domain['domain_id'] ;
+ if ($this->_childdomain_type == 'subdomain' && '.' . $domain['domain'] == substr($this->dataRecord["domain"], -strlen($domain['domain']) - 1)) {
+ $domain_select .= " selected";
+ $selected_domain = $domain['domain'];
+ } elseif($this->_childdomain_type == 'aliasdomain' && $domain['domain'] == $this->dataRecord["domain"]) {
+ $domain_select .= " selected";
+ }
+ $domain_select .= ">" . $app->functions->idn_decode($domain['domain']) . "</option>\r\n";
+ }
+ }
+ else {
+ /*
+ * We have no domains in the domain-list. This means, we can not add ANY new domain.
+ * To avoid, that the variable "domain_option" is empty and so the user can
+ * free enter a domain, we have to create a empty option!
+ */
+ $domain_select .= "<option value=''></option>\r\n";
+ }
+ $app->tpl->setVar("domain_option", $domain_select);
+ if($this->_childdomain_type == 'subdomain') {
+ $this->dataRecord['domain'] = substr($this->dataRecord["domain"], 0, strlen($this->dataRecord['domain']) - strlen($selected_domain) - 1);
+ }
+ } else {
+ if($this->_childdomain_type == 'subdomain') {
+ // Get the record of the parent domain
+ $parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]));
+
+ // remove the parent domain part of the domain name before we show it in the text field.
+ $this->dataRecord["domain"] = str_replace('.'.$parent_domain["domain"], '', $this->dataRecord["domain"]);
+ }
+ }
+ if($this->_childdomain_type == 'subdomain') $app->tpl->setVar("domain", $this->dataRecord["domain"]);
+
+ if($_SESSION["s"]["user"]["typ"] == 'admin') {
+ // Directive Snippets
+ $proxy_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'proxy' AND active = 'y'");
+ $proxy_directive_snippets_txt = '';
+ if(is_array($proxy_directive_snippets) && !empty($proxy_directive_snippets)){
+ foreach($proxy_directive_snippets as $proxy_directive_snippet){
+ $proxy_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$proxy_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$proxy_directive_snippet['snippet'].'</pre></a> ';
+ }
+ }
+ if($proxy_directive_snippets_txt == '') $proxy_directive_snippets_txt = '------';
+ $app->tpl->setVar("proxy_directive_snippets_txt", $proxy_directive_snippets_txt);
+ }
+
+ $app->tpl->setVar('childdomain_type', $this->_childdomain_type);
+
+ parent::onShowEnd();
+
+ }
+
+ function onSubmit() {
+ global $app, $conf;
+
+ // Get the record of the parent domain
+ $parent_domain = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]) . " AND ".$app->tform->getAuthSQL('r'));
+ if(!$parent_domain || $parent_domain['domain_id'] != @$this->dataRecord['parent_domain_id']) $app->tform->errorMessage .= $app->tform->lng("no_domain_perm");
+ /* check if the domain module is used - and check if the selected domain can be used! */
+ $app->uses('ini_parser,getconf');
+ $settings = $app->getconf->get_global_config('domains');
+ if ($settings['use_domain_module'] == 'y') {
+ // get the record of the domain module domain
+ if($this->_childdomain_type == 'subdomain') {
+ $domain = $app->tools_sites->checkDomainModuleDomain($this->dataRecord['sel_domain']);
+ if(!$domain) {
+ $app->tform->errorMessage .= $app->tform->lng("domain_error_empty")."<br />";
+ } else {
+ $this->dataRecord['domain'] = $this->dataRecord['domain'] . '.' . $domain;
+ }
+ } else {
+ $domain_check = $app->tools_sites->checkDomainModuleDomain($this->dataRecord['domain']);
+ if(!$domain_check) {
+ // invalid domain selected
+ $app->tform->errorMessage .= $app->tform->lng("domain_error_empty")."<br />";
+ } else {
+ $this->dataRecord['domain'] = $domain_check;
+ }
+ }
+ } else {
+ if($this->_childdomain_type == 'subdomain') $this->dataRecord["domain"] = $this->dataRecord["domain"].'.'.$parent_domain["domain"];
+ }
+
+ // nginx: if redirect type is proxy and redirect path is no URL, display error
+ if($this->dataRecord["redirect_type"] == 'proxy' && substr($this->dataRecord['redirect_path'], 0, 1) == '/'){
+ $app->tform->errorMessage .= $app->tform->lng("error_proxy_requires_url")."<br />";
+ }
+
+ // Set a few fixed values
+ $this->dataRecord["type"] = ($this->_childdomain_type == 'subdomain' ? 'subdomain' : 'alias');
+ $this->dataRecord["server_id"] = $parent_domain["server_id"];
+
+ $this->parent_domain_record = $parent_domain;
+
+ //* make sure that the domain is lowercase
+ if(isset($this->dataRecord["domain"])) $this->dataRecord["domain"] = strtolower($this->dataRecord["domain"]);
+
+ parent::onSubmit();
+ }
+
+ function onAfterInsert() {
+ global $app, $conf;
+
+ $app->db->query('UPDATE web_domain SET sys_groupid = ? WHERE domain_id = ?', $this->parent_domain_record['sys_groupid'], $this->id);
+
+ }
+
+ function onAfterUpdate() {
+ global $app, $conf;
+
+ //* Check if parent domain has been changed
+ if($this->dataRecord['parent_domain_id'] != $this->oldDataRecord['parent_domain_id']) {
+
+ //* Update the domain owner
+ $app->db->query('UPDATE web_domain SET sys_groupid = ? WHERE domain_id = ?', $this->parent_domain_record['sys_groupid'], $this->id);
+
+ //* Update the old website, so that the vhost alias gets removed
+ //* We force the update by inserting a transaction record without changes manually.
+ $old_website = $app->db->queryOneRecord('SELECT * FROM web_domain WHERE domain_id = '.$app->functions->intval($this->oldDataRecord['domain_id']));
+ $app->db->datalogSave('web_domain', 'UPDATE', 'domain_id', $app->functions->intval($this->oldDataRecord['parent_domain_id']), $old_website, $old_website, true);
+ }
+
+ }
+
+}
+
+$page = new page_action;
+$page->onLoad();
+
+?>
diff --git a/interface/web/sites/web_vhost_aliasdomain_list.php b/interface/web/sites/web_childdomain_list.php
similarity index 70%
rename from interface/web/sites/web_vhost_aliasdomain_list.php
rename to interface/web/sites/web_childdomain_list.php
index 52033a15b1d2d5baf2ddf4f8b4dd567283e0bfc2..a4e953c07e99115de6a14da7952e14d8e42fed66 100644
--- a/interface/web/sites/web_vhost_aliasdomain_list.php
+++ b/interface/web/sites/web_childdomain_list.php
@@ -35,7 +35,7 @@ require_once '../../lib/app.inc.php';
* Begin Form configuration
******************************************/
-$list_def_file = "list/web_vhost_aliasdomain.list.php";
+$list_def_file = "list/web_childdomain.list.php";
/******************************************
* End Form configuration
@@ -46,10 +46,28 @@ $app->auth->check_module_permissions('sites');
$app->uses('listform_actions');
+//* Get and set the child domain type - store in session
+$show_type = 'aliasdomain';
+if(isset($_GET['type']) && $_GET['type'] == 'subdomain') $show_type = 'subdomain';
+elseif(!isset($_GET['type']) && isset($_SESSION['s']['var']['childdomain_type']) && $_SESSION['s']['var']['childdomain_type'] == 'subdomain') $show_type = 'subdomain';
+
+$_SESSION['s']['var']['childdomain_type'] = $show_type;
+
+class list_action extends listform_actions {
+ function onShow() {
+ global $app;
+ $app->tpl->setVar('childdomain_type', $_SESSION['s']['var']['childdomain_type']);
+
+ parent::onShow();
+ }
+}
+
+
+$list = new list_action;
// Limit the results to alias domains
-$app->listform_actions->SQLExtWhere = "web_domain.type = 'vhostalias'";
-$app->listform_actions->SQLOrderBy = 'ORDER BY web_domain.domain';
-$app->listform_actions->onLoad();
+$list->SQLExtWhere = "web_domain.type = '" . ($show_type == 'subdomain' ? 'subdomain' : 'alias') . "'";
+$list->SQLOrderBy = 'ORDER BY web_domain.domain';
+$list->onLoad();
?>
diff --git a/interface/web/sites/web_domain_del.php b/interface/web/sites/web_domain_del.php
deleted file mode 100644
index 7ee5d13e4532211cd62afe8727b89c7094265533..0000000000000000000000000000000000000000
--- a/interface/web/sites/web_domain_del.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-/*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
-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
-******************************************/
-
-$list_def_file = "list/web_domain.list.php";
-$tform_def_file = "form/web_domain.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('sites');
-
-$app->uses('tpl,tform,tform_actions');
-$app->load('tform_actions');
-
-class page_action extends tform_actions {
-
- function onBeforeDelete() {
- global $app; $conf;
-
- if($app->tform->checkPerm($this->id, 'd') == false) $app->error($app->lng('error_no_delete_permission'));
-
- //* Delete all records that belong to this web.
- $records = $app->db->queryAllRecords("SELECT domain_id FROM web_domain WHERE parent_domain_id = '".$app->functions->intval($this->id)."' AND type != 'vhost'");
- foreach($records as $rec) {
- $app->db->datalogDelete('web_domain', 'domain_id', $rec['domain_id']);
- }
-
- //* Delete all records that belong to this web.
- $records = $app->db->queryAllRecords("SELECT ftp_user_id FROM ftp_user WHERE parent_domain_id = '".$app->functions->intval($this->id)."'");
- foreach($records as $rec) {
- $app->db->datalogDelete('ftp_user', 'ftp_user_id', $rec['ftp_user_id']);
- }
-
- //* Delete all records that belong to this web.
- $records = $app->db->queryAllRecords("SELECT shell_user_id FROM shell_user WHERE parent_domain_id = '".$app->functions->intval($this->id)."'");
- foreach($records as $rec) {
- $app->db->datalogDelete('shell_user', 'shell_user_id', $rec['shell_user_id']);
- }
-
- //* Delete all records that belong to this web.
- $records = $app->db->queryAllRecords("SELECT id FROM cron WHERE parent_domain_id = '".$app->functions->intval($this->id)."'");
- foreach($records as $rec) {
- $app->db->datalogDelete('cron', 'id', $rec['id']);
- }
-
- //* Delete all records that belong to this web
- $records = $app->db->queryAllRecords("SELECT webdav_user_id FROM webdav_user WHERE parent_domain_id = '".$app->functions->intval($this->id)."'");
- foreach($records as $rec) {
- $app->db->datalogDelete('webdav_user', 'webdav_user_id', $rec['webdav_user_id']);
- }
-
- //* Delete all records that belong to this web
- $records = $app->db->queryAllRecords("SELECT backup_id FROM web_backup WHERE parent_domain_id = '".$app->functions->intval($this->id)."'");
- foreach($records as $rec) {
- $app->db->datalogDelete('web_backup', 'backup_id', $rec['backup_id']);
- }
-
- //* Delete all records that belog to this web.
- $web_domain = $app->db->queryOneRecord("SELECT domain FROM web_domain WHERE domain_id = ".$app->functions->intval($this->id));
- if($web_domain['domain'] != ''){
- $aps_instances = $app->db->queryAllRecords("SELECT instance_id FROM aps_instances_settings WHERE name = 'main_domain' AND value = '".$app->db->quote($web_domain['domain'])."'");
- if(is_array($aps_instances) && !empty($aps_instances)){
- foreach($aps_instances as $aps_instance){
- if($aps_instance['instance_id'] > 0){
- $app->db->datalogDelete('aps_instances_settings', 'instance_id', $aps_instance['instance_id']);
- $app->db->datalogDelete('aps_instances', 'id', $aps_instance['instance_id']);
- }
- }
- }
- }
-
- //* Delete all web folders
- $records = $app->db->queryAllRecords("SELECT web_folder_id FROM web_folder WHERE parent_domain_id = '".$app->functions->intval($this->id)."'");
- foreach($records as $rec) {
- //* Delete all web folder users
- $records2 = $app->db->queryAllRecords("SELECT web_folder_user_id FROM web_folder_user WHERE web_folder_id = '".$app->functions->intval($rec['web_folder_id'])."'");
- foreach($records2 as $rec2) {
- $app->db->datalogDelete('web_folder_user', 'web_folder_user_id', $rec2['web_folder_user_id']);
- }
- $app->db->datalogDelete('web_folder', 'web_folder_id', $rec['web_folder_id']);
- }
- }
-
-}
-
-$page = new page_action;
-$page->onDelete();
-
-?>
diff --git a/interface/web/sites/web_subdomain_del.php b/interface/web/sites/web_subdomain_del.php
index 18e7e52dbce7f180ea6a428904bdf2cffe6fee92..d9a4228afbcd06f62afe36cb1f37f1475f3aeeb3 100644
--- a/interface/web/sites/web_subdomain_del.php
+++ b/interface/web/sites/web_subdomain_del.php
@@ -1,51 +1,6 @@
<?php
-/*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
-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
-******************************************/
-
-$list_def_file = "list/web_subdomain.list.php";
-$tform_def_file = "form/web_subdomain.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('sites');
-
-$app->uses("tform_actions");
-$app->tform_actions->onDelete();
+/* this file is no longer used. */
+die();
?>
diff --git a/interface/web/sites/web_subdomain_edit.php b/interface/web/sites/web_subdomain_edit.php
index 1ed4344668ec29dbf57c722502a4884da84e6698..d9a4228afbcd06f62afe36cb1f37f1475f3aeeb3 100644
--- a/interface/web/sites/web_subdomain_edit.php
+++ b/interface/web/sites/web_subdomain_edit.php
@@ -1,198 +1,6 @@
<?php
-/*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
-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/web_subdomain.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('sites');
-
-// Loading classes
-$app->uses('tpl,tform,tform_actions,tools_sites');
-$app->load('tform_actions');
-
-class page_action extends tform_actions {
-
- var $parent_domain_record;
-
- function onShowNew() {
- global $app, $conf;
-
- // we will check only users, not admins
- if($_SESSION["s"]["user"]["typ"] == 'user') {
- if(!$app->tform->checkClientLimit('limit_web_subdomain', "(type = 'subdomain' OR type = 'vhostsubdomain')")) {
- $app->error($app->tform->wordbook["limit_web_subdomain_txt"]);
- }
- if(!$app->tform->checkResellerLimit('limit_web_subdomain', "(type = 'subdomain' OR type = 'vhostsubdomain')")) {
- $app->error('Reseller: '.$app->tform->wordbook["limit_web_subdomain_txt"]);
- }
- }
-
- parent::onShowNew();
- }
-
- function onShowEnd() {
- global $app, $conf;
-
- $app->uses('ini_parser,getconf');
- $settings = $app->getconf->get_global_config('domains');
- if ($settings['use_domain_module'] == 'y') {
- /*
- * The domain-module is in use.
- */
- $domains = $app->tools_sites->getDomainModuleDomains();
- $domain_select = '';
- $selected_domain = '';
- if(is_array($domains) && sizeof($domains) > 0) {
- /* We have domains in the list, so create the drop-down-list */
- foreach( $domains as $domain) {
- $domain_select .= "<option value=" . $domain['domain_id'] ;
- if ('.' . $domain['domain'] == substr($this->dataRecord["domain"], -strlen($domain['domain']) - 1)) {
- $domain_select .= " selected";
- $selected_domain = $domain['domain'];
- }
- $domain_select .= ">" . $app->functions->idn_decode($domain['domain']) . "</option>\r\n";
- }
- }
- else {
- /*
- * We have no domains in the domain-list. This means, we can not add ANY new domain.
- * To avoid, that the variable "domain_option" is empty and so the user can
- * free enter a domain, we have to create a empty option!
- */
- $domain_select .= "<option value=''></option>\r\n";
- }
- $app->tpl->setVar("domain_option", $domain_select);
- $this->dataRecord['domain'] = substr($this->dataRecord["domain"], 0, strlen($this->dataRecord['domain']) - strlen($selected_domain) - 1);
- } else {
-
- // Get the record of the parent domain
- $parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]));
-
- // remove the parent domain part of the domain name before we show it in the text field.
- $this->dataRecord["domain"] = str_replace('.'.$parent_domain["domain"], '', $this->dataRecord["domain"]);
- }
- $app->tpl->setVar("domain", $this->dataRecord["domain"]);
-
- if($_SESSION["s"]["user"]["typ"] == 'admin') {
- // Directive Snippets
- $proxy_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'proxy' AND active = 'y'");
- $proxy_directive_snippets_txt = '';
- if(is_array($proxy_directive_snippets) && !empty($proxy_directive_snippets)){
- foreach($proxy_directive_snippets as $proxy_directive_snippet){
- $proxy_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$proxy_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$proxy_directive_snippet['snippet'].'</pre></a> ';
- }
- }
- if($proxy_directive_snippets_txt == '') $proxy_directive_snippets_txt = '------';
- $app->tpl->setVar("proxy_directive_snippets_txt", $proxy_directive_snippets_txt);
- }
-
- parent::onShowEnd();
-
- }
-
- function onSubmit() {
- global $app, $conf;
-
- // Get the record of the parent domain
- $parent_domain = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]) . " AND ".$app->tform->getAuthSQL('r'));
- if(!$parent_domain || $parent_domain['domain_id'] != @$this->dataRecord['parent_domain_id']) $app->tform->errorMessage .= $app->tform->lng("no_domain_perm");
-
- $app->uses('ini_parser,getconf');
- $settings = $app->getconf->get_global_config('domains');
- if ($settings['use_domain_module'] == 'y') {
- // get the record of the domain module domain
- $domain = $app->tools_sites->checkDomainModuleDomain($this->dataRecord['sel_domain']);
- if(!$domain) {
- $app->tform->errorMessage .= $app->tform->lng("domain_error_empty")."<br />";
- } else {
- $this->dataRecord['domain'] = $this->dataRecord['domain'] . '.' . $domain;
- }
- } else {
- $this->dataRecord["domain"] = $this->dataRecord["domain"].'.'.$parent_domain["domain"];
- }
-
- // nginx: if redirect type is proxy and redirect path is no URL, display error
- if($this->dataRecord["redirect_type"] == 'proxy' && substr($this->dataRecord['redirect_path'], 0, 1) == '/'){
- $app->tform->errorMessage .= $app->tform->lng("error_proxy_requires_url")."<br />";
- }
-
- // Set a few fixed values
- $this->dataRecord["type"] = 'subdomain';
- $this->dataRecord["server_id"] = $parent_domain["server_id"];
-
- $this->parent_domain_record = $parent_domain;
-
- //* make sure that the domain is lowercase
- if(isset($this->dataRecord["domain"])) $this->dataRecord["domain"] = strtolower($this->dataRecord["domain"]);
-
- parent::onSubmit();
- }
-
- function onAfterInsert() {
- global $app, $conf;
-
- $app->db->query('UPDATE web_domain SET sys_groupid = '.$app->functions->intval($this->parent_domain_record['sys_groupid']).' WHERE domain_id = '.$this->id);
-
- }
-
- function onAfterUpdate() {
- global $app, $conf;
-
- //* Check if parent domain has been changed
- if($this->dataRecord['parent_domain_id'] != $this->oldDataRecord['parent_domain_id']) {
-
- //* Update the domain owner
- $app->db->query('UPDATE web_domain SET sys_groupid = '.$app->functions->intval($this->parent_domain_record['sys_groupid']).' WHERE domain_id = '.$this->id);
-
- //* Update the old website, so that the vhost alias gets removed
- //* We force the update by inserting a transaction record without changes manually.
- $old_website = $app->db->queryOneRecord('SELECT * FROM web_domain WHERE domain_id = '.$app->functions->intval($this->oldDataRecord['domain_id']));
- $app->db->datalogSave('web_domain', 'UPDATE', 'domain_id', $app->functions->intval($this->oldDataRecord['parent_domain_id']), $old_website, $old_website, true);
- }
-
- }
-
-}
-
-$page = new page_action;
-$page->onLoad();
+/* this file is no longer used. */
+die();
?>
diff --git a/interface/web/sites/web_subdomain_list.php b/interface/web/sites/web_subdomain_list.php
index 716511e63e4dd2757a4f4936553ad5381883cb17..d9a4228afbcd06f62afe36cb1f37f1475f3aeeb3 100644
--- a/interface/web/sites/web_subdomain_list.php
+++ b/interface/web/sites/web_subdomain_list.php
@@ -1,55 +1,6 @@
<?php
-/*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
-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.
-*/
-
-require_once '../../lib/config.inc.php';
-require_once '../../lib/app.inc.php';
-
-/******************************************
-* Begin Form configuration
-******************************************/
-
-$list_def_file = "list/web_subdomain.list.php";
-
-/******************************************
-* End Form configuration
-******************************************/
-
-//* Check permissions for module
-$app->auth->check_module_permissions('sites');
-
-$app->uses('listform_actions');
-
-// Limit the results to alias domains
-$app->listform_actions->SQLExtWhere = "web_domain.type = 'subdomain'";
-$app->listform_actions->SQLOrderBy = 'ORDER BY web_domain.domain';
-$app->listform_actions->onLoad();
-
+/* this file is no longer used. */
+die();
?>
diff --git a/interface/web/sites/web_vhost_aliasdomain_del.php b/interface/web/sites/web_vhost_aliasdomain_del.php
deleted file mode 100644
index 2d288dd83326f8cba6343fe9a7447483cab4ef56..0000000000000000000000000000000000000000
--- a/interface/web/sites/web_vhost_aliasdomain_del.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
-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
-******************************************/
-
-$list_def_file = "list/web_vhost_aliasdomain.list.php";
-$tform_def_file = "form/web_vhost_aliasdomain.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('sites');
-
-$app->uses('tpl,tform,tform_actions');
-$app->load("tform_actions");
-class page_action extends tform_actions {
-
- function onBeforeDelete() {
- global $app; $conf;
-
- //* Delete all web folders
- $records = $app->db->queryAllRecords("SELECT web_folder_id FROM web_folder WHERE parent_domain_id = '".$app->functions->intval($this->id)."'");
- foreach($records as $rec) {
- //* Delete all web folder users
- $records2 = $app->db->queryAllRecords("SELECT web_folder_user_id FROM web_folder_user WHERE web_folder_id = '".$app->functions->intval($rec['web_folder_id'])."'");
- foreach($records2 as $rec2) {
- $app->db->datalogDelete('web_folder_user', 'web_folder_user_id', $rec2['web_folder_user_id']);
- }
- $app->db->datalogDelete('web_folder', 'web_folder_id', $rec['web_folder_id']);
- }
-
- }
-
-}
-
-$page = new page_action;
-$page->onDelete();
-
-?>
diff --git a/interface/web/sites/web_vhost_aliasdomain_edit.php b/interface/web/sites/web_vhost_aliasdomain_edit.php
deleted file mode 100644
index e8d5d546e3a8e4b5d16203fc2f48e7185f7b86b3..0000000000000000000000000000000000000000
--- a/interface/web/sites/web_vhost_aliasdomain_edit.php
+++ /dev/null
@@ -1,663 +0,0 @@
-<?php
-/*
-Copyright (c) 2007 - 2009, Till Brehm, projektfarm Gmbh
-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/web_vhost_aliasdomain.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('sites');
-
-// Loading classes
-$app->uses('tpl,tform,tform_actions,tools_sites');
-$app->load('tform_actions');
-
-class page_action extends tform_actions {
-
- //* Returna a "3/2/1" path hash from a numeric id '123'
- function id_hash($id, $levels) {
- $hash = "" . $id % 10 ;
- $id /= 10 ;
- $levels -- ;
- while ( $levels > 0 ) {
- $hash .= "/" . $id % 10 ;
- $id /= 10 ;
- $levels-- ;
- }
- return $hash;
- }
-
- function onShowNew() {
- global $app, $conf;
-
- // we will check only users, not admins
- if($_SESSION["s"]["user"]["typ"] == 'user') {
- if(!$app->tform->checkClientLimit('limit_web_aliasdomain', "(type = 'alias' OR type = 'vhostalias')")) {
- $app->error($app->tform->wordbook["limit_web_aliasdomain_txt"]);
- }
- if(!$app->tform->checkResellerLimit('limit_web_aliasdomain', "(type = 'alias' OR type = 'vhostalias')")) {
- $app->error('Reseller: '.$app->tform->wordbook["limit_web_aliasdomain_txt"]);
- }
- }
- parent::onShowNew();
- }
-
- function onShowEnd() {
- global $app, $conf;
-
- $app->uses('ini_parser,getconf');
-
- $read_limits = array('limit_cgi', 'limit_ssi', 'limit_perl', 'limit_ruby', 'limit_python', 'force_suexec', 'limit_hterror', 'limit_wildcard', 'limit_ssl');
-
- $parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]));
-
- //* Client: If the logged in user is not admin and has no sub clients (no reseller)
- if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) {
-
- // Get the limits of the client
- $client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
- $client = $app->db->queryOneRecord("SELECT client.limit_web_aliasdomain, client.default_webserver, client." . implode(", client.", $read_limits) . " FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
-
- //* Get global web config
- $web_config = $app->getconf->get_server_config($parent_domain['server_id'], 'web');
-
- //PHP Version Selection (FastCGI)
- $server_type = 'apache';
- if(!empty($web_config['server_type'])) $server_type = $web_config['server_type'];
- if($server_type == 'nginx' && $this->dataRecord['php'] == 'fast-cgi') $this->dataRecord['php'] = 'php-fpm';
- if($this->dataRecord['php'] == 'php-fpm'){
- $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ".$app->functions->intval($parent_domain['server_id'])." AND (client_id = 0 OR client_id=".$app->functions->intval($_SESSION['s']['user']['client_id']).")");
- }
- if($this->dataRecord['php'] == 'fast-cgi'){
- $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ".$app->functions->intval($parent_domain['server_id'])." AND (client_id = 0 OR client_id=".$app->functions->intval($_SESSION['s']['user']['client_id']).")");
- }
- $php_select = "<option value=''>Default</option>";
- if(is_array($php_records) && !empty($php_records)) {
- foreach( $php_records as $php_record) {
- if($this->dataRecord['php'] == 'php-fpm'){
- $php_version = $php_record['name'].':'.$php_record['php_fpm_init_script'].':'.$php_record['php_fpm_ini_dir'].':'.$php_record['php_fpm_pool_dir'];
- } else {
- $php_version = $php_record['name'].':'.$php_record['php_fastcgi_binary'].':'.$php_record['php_fastcgi_ini_dir'];
- }
- $selected = ($php_version == $this->dataRecord["fastcgi_php_version"])?'SELECTED':'';
- $php_select .= "<option value='$php_version' $selected>".$php_record['name']."</option>\r\n";
- }
- }
- $app->tpl->setVar("fastcgi_php_version", $php_select);
- unset($php_records);
-
- // add limits to template to be able to hide settings
- foreach($read_limits as $limit) $app->tpl->setVar($limit, $client[$limit]);
-
-
- //* Reseller: If the logged in user is not admin and has sub clients (is a reseller)
- } elseif ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
-
- // Get the limits of the client
- $client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
- $client = $app->db->queryOneRecord("SELECT client.client_id, client.limit_web_aliasdomain, client.default_webserver, client.contact_name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname, sys_group.name, client." . implode(", client.", $read_limits) . " FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
-
- //* Get global web config
- $web_config = $app->getconf->get_server_config($parent_domain['server_id'], 'web');
-
- //PHP Version Selection (FastCGI)
- $server_type = 'apache';
- if(!empty($web_config['server_type'])) $server_type = $web_config['server_type'];
- if($server_type == 'nginx' && $this->dataRecord['php'] == 'fast-cgi') $this->dataRecord['php'] = 'php-fpm';
- if($this->dataRecord['php'] == 'php-fpm'){
- $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ".$app->functions->intval($parent_domain['server_id'])." AND (client_id = 0 OR client_id=".$app->functions->intval($_SESSION['s']['user']['client_id']).")");
- }
- if($this->dataRecord['php'] == 'fast-cgi') {
- $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ".$app->functions->intval($parent_domain['server_id'])." AND (client_id = 0 OR client_id=".$app->functions->intval($_SESSION['s']['user']['client_id']).")");
- }
- $php_select = "<option value=''>Default</option>";
- if(is_array($php_records) && !empty($php_records)) {
- foreach( $php_records as $php_record) {
- if($this->dataRecord['php'] == 'php-fpm'){
- $php_version = $php_record['name'].':'.$php_record['php_fpm_init_script'].':'.$php_record['php_fpm_ini_dir'].':'.$php_record['php_fpm_pool_dir'];
- } else {
- $php_version = $php_record['name'].':'.$php_record['php_fastcgi_binary'].':'.$php_record['php_fastcgi_ini_dir'];
- }
- $selected = ($php_version == $this->dataRecord["fastcgi_php_version"])?'SELECTED':'';
- $php_select .= "<option value='$php_version' $selected>".$php_record['name']."</option>\r\n";
- }
- }
- $app->tpl->setVar("fastcgi_php_version", $php_select);
- unset($php_records);
-
- // add limits to template to be able to hide settings
- foreach($read_limits as $limit) $app->tpl->setVar($limit, $client[$limit]);
-
- $sites_config = $app->getconf->get_global_config('sites');
- if($sites_config['reseller_can_use_options']) {
- // Directive Snippets
- $php_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'php' AND active = 'y'");
- $php_directive_snippets_txt = '';
- if(is_array($php_directive_snippets) && !empty($php_directive_snippets)){
- foreach($php_directive_snippets as $php_directive_snippet){
- $php_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$php_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$php_directive_snippet['snippet'].'</pre></a> ';
- }
- }
- if($php_directive_snippets_txt == '') $php_directive_snippets_txt = '------';
- $app->tpl->setVar("php_directive_snippets_txt", $php_directive_snippets_txt);
-
- if($server_type == 'apache'){
- $apache_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'apache' AND active = 'y'");
- $apache_directive_snippets_txt = '';
- if(is_array($apache_directive_snippets) && !empty($apache_directive_snippets)){
- foreach($apache_directive_snippets as $apache_directive_snippet){
- $apache_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$apache_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$apache_directive_snippet['snippet'].'</pre></a> ';
- }
- }
- if($apache_directive_snippets_txt == '') $apache_directive_snippets_txt = '------';
- $app->tpl->setVar("apache_directive_snippets_txt", $apache_directive_snippets_txt);
- }
-
- if($server_type == 'nginx'){
- $nginx_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'nginx' AND active = 'y'");
- $nginx_directive_snippets_txt = '';
- if(is_array($nginx_directive_snippets) && !empty($nginx_directive_snippets)){
- foreach($nginx_directive_snippets as $nginx_directive_snippet){
- $nginx_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$nginx_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$nginx_directive_snippet['snippet'].'</pre></a> ';
- }
- }
- if($nginx_directive_snippets_txt == '') $nginx_directive_snippets_txt = '------';
- $app->tpl->setVar("nginx_directive_snippets_txt", $nginx_directive_snippets_txt);
- }
-
- $proxy_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'proxy' AND active = 'y'");
- $proxy_directive_snippets_txt = '';
- if(is_array($proxy_directive_snippets) && !empty($proxy_directive_snippets)){
- foreach($proxy_directive_snippets as $proxy_directive_snippet){
- $proxy_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$proxy_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$proxy_directive_snippet['snippet'].'</pre></a> ';
- }
- }
- if($proxy_directive_snippets_txt == '') $proxy_directive_snippets_txt = '------';
- $app->tpl->setVar("proxy_directive_snippets_txt", $proxy_directive_snippets_txt);
- }
-
- //* Admin: If the logged in user is admin
- } else {
-
- //* get global web config
- $web_config = $app->getconf->get_server_config($parent_domain['server_id'], 'web');
-
- //PHP Version Selection (FastCGI)
- $server_type = 'apache';
- if(!empty($web_config['server_type'])) $server_type = $web_config['server_type'];
- if($server_type == 'nginx' && $this->dataRecord['php'] == 'fast-cgi') $this->dataRecord['php'] = 'php-fpm';
- if($this->dataRecord['php'] == 'php-fpm'){
- $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = " . $app->functions->intval($parent_domain['server_id']));
- }
- if($this->dataRecord['php'] == 'fast-cgi') {
- $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = " . $app->functions->intval($parent_domain['server_id']));
- }
- $php_select = "<option value=''>Default</option>";
- if(is_array($php_records) && !empty($php_records)) {
- foreach( $php_records as $php_record) {
- if($this->dataRecord['php'] == 'php-fpm'){
- $php_version = $php_record['name'].':'.$php_record['php_fpm_init_script'].':'.$php_record['php_fpm_ini_dir'].':'.$php_record['php_fpm_pool_dir'];
- } else {
- $php_version = $php_record['name'].':'.$php_record['php_fastcgi_binary'].':'.$php_record['php_fastcgi_ini_dir'];
- }
- $selected = ($php_version == $this->dataRecord["fastcgi_php_version"])?'SELECTED':'';
- $php_select .= "<option value='$php_version' $selected>".$php_record['name']."</option>\r\n";
- }
- }
- $app->tpl->setVar("fastcgi_php_version", $php_select);
- unset($php_records);
-
- foreach($read_limits as $limit) $app->tpl->setVar($limit, ($limit == 'force_suexec' ? 'n' : 'y'));
-
- // Directive Snippets
- $php_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'php' AND active = 'y'");
- $php_directive_snippets_txt = '';
- if(is_array($php_directive_snippets) && !empty($php_directive_snippets)){
- foreach($php_directive_snippets as $php_directive_snippet){
- $php_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$php_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$php_directive_snippet['snippet'].'</pre></a> ';
- }
- }
- if($php_directive_snippets_txt == '') $php_directive_snippets_txt = '------';
- $app->tpl->setVar("php_directive_snippets_txt", $php_directive_snippets_txt);
-
- if($server_type == 'apache'){
- $apache_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'apache' AND active = 'y'");
- $apache_directive_snippets_txt = '';
- if(is_array($apache_directive_snippets) && !empty($apache_directive_snippets)){
- foreach($apache_directive_snippets as $apache_directive_snippet){
- $apache_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$apache_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$apache_directive_snippet['snippet'].'</pre></a> ';
- }
- }
- if($apache_directive_snippets_txt == '') $apache_directive_snippets_txt = '------';
- $app->tpl->setVar("apache_directive_snippets_txt", $apache_directive_snippets_txt);
- }
-
- if($server_type == 'nginx'){
- $nginx_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'nginx' AND active = 'y'");
- $nginx_directive_snippets_txt = '';
- if(is_array($nginx_directive_snippets) && !empty($nginx_directive_snippets)){
- foreach($nginx_directive_snippets as $nginx_directive_snippet){
- $nginx_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$nginx_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$nginx_directive_snippet['snippet'].'</pre></a> ';
- }
- }
- if($nginx_directive_snippets_txt == '') $nginx_directive_snippets_txt = '------';
- $app->tpl->setVar("nginx_directive_snippets_txt", $nginx_directive_snippets_txt);
- }
-
- $proxy_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'proxy' AND active = 'y'");
- $proxy_directive_snippets_txt = '';
- if(is_array($proxy_directive_snippets) && !empty($proxy_directive_snippets)){
- foreach($proxy_directive_snippets as $proxy_directive_snippet){
- $proxy_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$proxy_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$proxy_directive_snippet['snippet'].'</pre></a> ';
- }
- }
- if($proxy_directive_snippets_txt == '') $proxy_directive_snippets_txt = '------';
- $app->tpl->setVar("proxy_directive_snippets_txt", $proxy_directive_snippets_txt);
- }
-
- $ssl_domain_select = '';
- $tmp = $app->db->queryOneRecord("SELECT domain FROM web_domain WHERE domain_id = ".$this->id);
- $ssl_domains = array($tmp["domain"], 'www.'.$tmp["domain"]);
- if(is_array($ssl_domains)) {
- foreach( $ssl_domains as $ssl_domain) {
- $selected = ($ssl_domain == $this->dataRecord['ssl_domain'])?'SELECTED':'';
- $ssl_domain_select .= "<option value='$ssl_domain' $selected>$ssl_domain</option>\r\n";
- }
- }
-
- if($this->id > 0) {
- $app->tpl->setVar('fixed_folder', 'y');
- $app->tpl->setVar('server_id_value', $parent_domain['server_id']);
- } else {
- $app->tpl->setVar('fixed_folder', 'n');
- $app->tpl->setVar('server_id_value', $parent_domain['server_id']);
- }
-
- $app->tpl->setVar("ssl_domain", $ssl_domain_select);
- unset($ssl_domain_select);
- unset($ssl_domains);
- unset($ssl_domain);
-
- $tmp_txt = ($this->dataRecord['traffic_quota_lock'] == 'y')?'<b>('.$app->tform->lng('traffic_quota_exceeded_txt').')</b>':'';
- $app->tpl->setVar("traffic_quota_exceeded_txt", $tmp_txt);
-
-
- $app->uses('ini_parser,getconf');
- $settings = $app->getconf->get_global_config('domains');
- if ($settings['use_domain_module'] == 'y') {
- /*
- * The domain-module is in use.
- */
- $domains = $app->tools_sites->getDomainModuleDomains();
- $domain_select = '';
- $selected_domain = '';
- if(is_array($domains) && sizeof($domains) > 0) {
- /* We have domains in the list, so create the drop-down-list */
- foreach( $domains as $domain) {
- $domain_select .= "<option value=" . $domain['domain_id'] ;
- if ('.' . $domain['domain'] == substr($this->dataRecord["domain"], -strlen($domain['domain']) - 1)) {
- $domain_select .= " selected";
- $selected_domain = $domain['domain'];
- }
- $domain_select .= ">" . $app->functions->idn_decode($domain['domain']) . "</option>\r\n";
- }
- }
- else {
- /*
- * We have no domains in the domain-list. This means, we can not add ANY new domain.
- * To avoid, that the variable "domain_option" is empty and so the user can
- * free enter a domain, we have to create a empty option!
- */
- $domain_select .= "<option value=''></option>\r\n";
- }
- $app->tpl->setVar("domain_option", $domain_select);
- $this->dataRecord['domain'] = substr($this->dataRecord["domain"], 0, strlen($this->dataRecord['domain']) - strlen($selected_domain) - 1);
- } else {
-
- // remove the parent domain part of the domain name before we show it in the text field.
- $this->dataRecord["domain"] = str_replace('.'.$parent_domain["domain"], '', $this->dataRecord["domain"]);
- }
- $app->tpl->setVar("domain", $this->dataRecord["domain"]);
-
- parent::onShowEnd();
- }
-
- function onSubmit() {
- global $app, $conf;
-
- // Get the record of the parent domain
- if(!@$this->dataRecord["parent_domain_id"] && $this->id) {
- $tmp = $app->db->queryOneRecord("SELECT parent_domain_id FROM web_domain WHERE domain_id = ".$app->functions->intval($this->id));
- if($tmp) $this->dataRecord["parent_domain_id"] = $tmp['parent_domain_id'];
- unset($tmp);
- }
-
- $parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]) . " AND ".$app->tform->getAuthSQL('r'));
- if(!$parent_domain || $parent_domain['domain_id'] != @$this->dataRecord['parent_domain_id']) $app->tform->errorMessage .= $app->tform->lng("no_domain_perm");
-
- // Set a few fixed values
- $this->dataRecord["type"] = 'vhostalias';
- $this->dataRecord["server_id"] = $parent_domain["server_id"];
- $this->dataRecord["ip_address"] = $parent_domain["ip_address"];
- $this->dataRecord["ipv6_address"] = $parent_domain["ipv6_address"];
- $this->dataRecord["client_group_id"] = $parent_domain["client_group_id"];
- $this->dataRecord["vhost_type"] = 'name';
-
- $this->parent_domain_record = $parent_domain;
-
- $read_limits = array('limit_cgi', 'limit_ssi', 'limit_perl', 'limit_ruby', 'limit_python', 'force_suexec', 'limit_hterror', 'limit_wildcard', 'limit_ssl');
-
- if($app->tform->getCurrentTab() == 'domain') {
-
- /* check if the domain module is used - and check if the selected domain can be used! */
- $app->uses('ini_parser,getconf');
- $settings = $app->getconf->get_global_config('domains');
- if ($settings['use_domain_module'] == 'y') {
- $domain_check = $app->tools_sites->checkDomainModuleDomain($this->dataRecord['domain']);
- if(!$domain_check) {
- // invalid domain selected
- $app->tform->errorMessage .= $app->tform->lng("domain_error_empty")."<br />";
- } else {
- $this->dataRecord['domain'] = $domain_check;
- }
- }
-
- $this->dataRecord['web_folder'] = strtolower($this->dataRecord['web_folder']);
- if(substr($this->dataRecord['web_folder'], 0, 1) === '/') $this->dataRecord['web_folder'] = substr($this->dataRecord['web_folder'], 1);
- if(substr($this->dataRecord['web_folder'], -1) === '/') $this->dataRecord['web_folder'] = substr($this->dataRecord['web_folder'], 0, -1);
- $forbidden_folders = array('', 'cgi-bin', 'log', 'private', 'ssl', 'tmp', 'webdav');
- $check_folder = strtolower($this->dataRecord['web_folder']);
- if(substr($check_folder, 0, 1) === '/') $check_folder = substr($check_folder, 1); // strip / at beginning to check against forbidden entries
- if(strpos($check_folder, '/') !== false) $check_folder = substr($check_folder, 0, strpos($check_folder, '/')); // get the first part of the path to check it
- if(in_array($check_folder, $forbidden_folders)) {
- $app->tform->errorMessage .= $app->tform->lng("web_folder_invalid_txt")."<br>";
- }
-
- // vhostaliasdomains do not have a quota of their own
- $this->dataRecord["hd_quota"] = 0;
-
- // check for duplicate folder usage
- /*
- $check = $app->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_domain` WHERE `type` = 'vhostalias' AND `parent_domain_id` = '" . $app->functions->intval($this->dataRecord['parent_domain_id']) . "' AND `web_folder` = '" . $app->db->quote($this->dataRecord['web_folder']) . "' AND `domain_id` != '" . $app->functions->intval($this->id) . "'");
- if($check && $check['cnt'] > 0) {
- $app->tform->errorMessage .= $app->tform->lng("web_folder_unique_txt")."<br>";
- }
- */
- } else {
- $this->dataRecord["domain"] = $this->dataRecord["domain"].'.'.$parent_domain["domain"];
- }
-
- if($_SESSION["s"]["user"]["typ"] != 'admin') {
- // Get the limits of the client
- $client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
- $client = $app->db->queryOneRecord("SELECT limit_traffic_quota, limit_web_aliasdomain, default_webserver, parent_client_id, limit_web_quota, client." . implode(", client.", $read_limits) . " FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
-
- if($client['limit_cgi'] != 'y') $this->dataRecord['cgi'] = '-';
- if($client['limit_ssi'] != 'y') $this->dataRecord['ssi'] = '-';
- if($client['limit_perl'] != 'y') $this->dataRecord['perl'] = '-';
- if($client['limit_ruby'] != 'y') $this->dataRecord['ruby'] = '-';
- if($client['limit_python'] != 'y') $this->dataRecord['python'] = '-';
- if($client['force_suexec'] != 'n') $this->dataRecord['suexec'] = 'y';
- if($client['limit_hterror'] != 'y') $this->dataRecord['errordocs'] = '-';
- if($client['limit_wildcard'] != 'y' && $this->dataRecord['subdomain'] == '*') $this->dataRecord['subdomain'] = '-';
- if($client['limit_ssl'] != 'y') $this->dataRecord['ssl'] = '-';
-
- // only generate quota and traffic warnings if value has changed
- if($this->id > 0) {
- $old_web_values = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$app->functions->intval($this->id));
- } else {
- $old_web_values = $_POST;
- }
-
- //* Check the traffic quota of the client
- if(isset($_POST["traffic_quota"]) && $client["limit_traffic_quota"] > 0 && $_POST["traffic_quota"] != $old_web_values["traffic_quota"]) {
- $tmp = $app->db->queryOneRecord("SELECT sum(traffic_quota) as trafficquota FROM web_domain WHERE domain_id != ".$app->functions->intval($this->id)." AND ".$app->tform->getAuthSQL('u'));
- $trafficquota = $tmp["trafficquota"];
- $new_traffic_quota = $app->functions->intval($this->dataRecord["traffic_quota"]);
- if(($trafficquota + $new_traffic_quota > $client["limit_traffic_quota"]) || ($new_traffic_quota < 0 && $client["limit_traffic_quota"] >= 0)) {
- $max_free_quota = floor($client["limit_traffic_quota"] - $trafficquota);
- if($max_free_quota < 0) $max_free_quota = 0;
- $app->tform->errorMessage .= $app->tform->lng("limit_traffic_quota_free_txt").": ".$max_free_quota." MB<br>";
- // Set the quota field to the max free space
- $this->dataRecord["traffic_quota"] = $max_free_quota;
- }
- unset($tmp);
- unset($tmp_quota);
- }
-
- if($client['parent_client_id'] > 0) {
- // Get the limits of the reseller
- $reseller = $app->db->queryOneRecord("SELECT limit_traffic_quota, limit_web_aliasdomain, default_webserver, limit_web_quota FROM client WHERE client_id = ".$app->functions->intval($client['parent_client_id']));
-
- //* Check the traffic quota of the client
- if(isset($_POST["traffic_quota"]) && $reseller["limit_traffic_quota"] > 0 && $_POST["traffic_quota"] != $old_web_values["traffic_quota"]) {
- $tmp = $app->db->queryOneRecord("SELECT sum(traffic_quota) as trafficquota FROM web_domain WHERE domain_id != ".$app->functions->intval($this->id)." AND ".$app->tform->getAuthSQL('u'));
- $trafficquota = $tmp["trafficquota"];
- $new_traffic_quota = $app->functions->intval($this->dataRecord["traffic_quota"]);
- if(($trafficquota + $new_traffic_quota > $reseller["limit_traffic_quota"]) || ($new_traffic_quota < 0 && $reseller["limit_traffic_quota"] >= 0)) {
- $max_free_quota = floor($reseller["limit_traffic_quota"] - $trafficquota);
- if($max_free_quota < 0) $max_free_quota = 0;
- $app->tform->errorMessage .= $app->tform->lng("limit_traffic_quota_free_txt").": ".$max_free_quota." MB<br>";
- // Set the quota field to the max free space
- $this->dataRecord["traffic_quota"] = $max_free_quota;
- }
- unset($tmp);
- unset($tmp_quota);
- }
- }
-
- // When the record is updated
- if($this->id > 0) {
- // restore the server ID if the user is not admin and record is edited
- $tmp = $app->db->queryOneRecord("SELECT server_id, `web_folder`, `cgi`, `ssi`, `perl`, `ruby`, `python`, `suexec`, `errordocs`, `subdomain`, `ssl` FROM web_domain WHERE domain_id = ".$app->functions->intval($this->id));
- $this->dataRecord['web_folder'] = $tmp['web_folder']; // cannot be changed!
-
- // set the settings to current if not provided (or cleared due to limits)
- if($this->dataRecord['cgi'] == '-') $this->dataRecord['cgi'] = $tmp['cgi'];
- if($this->dataRecord['ssi'] == '-') $this->dataRecord['ssi'] = $tmp['ssi'];
- if($this->dataRecord['perl'] == '-') $this->dataRecord['perl'] = $tmp['perl'];
- if($this->dataRecord['ruby'] == '-') $this->dataRecord['ruby'] = $tmp['ruby'];
- if($this->dataRecord['python'] == '-') $this->dataRecord['python'] = $tmp['python'];
- if($this->dataRecord['suexec'] == '-') $this->dataRecord['suexec'] = $tmp['suexec'];
- if($this->dataRecord['errordocs'] == '-') $this->dataRecord['errordocs'] = $tmp['errordocs'];
- if($this->dataRecord['subdomain'] == '-') $this->dataRecord['subdomain'] = $tmp['subdomain'];
- if($this->dataRecord['ssl'] == '-') $this->dataRecord['ssl'] = $tmp['ssl'];
-
- unset($tmp);
- // When the record is inserted
- } else {
- // Check if the user may add another web_domain
- if($client["limit_web_aliasdomain"] >= 0) {
- $tmp = $app->db->queryOneRecord("SELECT count(domain_id) as number FROM web_domain WHERE sys_groupid = $client_group_id and (type = 'alias' OR type = 'vhostalias')");
- if($tmp["number"] >= $client["limit_web_aliasdomain"]) {
- $app->error($app->tform->wordbook["limit_web_aliasdomain_txt"]);
- }
- }
- }
- }
-
- //* make sure that the domain is lowercase
- if(isset($this->dataRecord["domain"])) $this->dataRecord["domain"] = strtolower($this->dataRecord["domain"]);
-
- //* get the server config for this server
- $app->uses("getconf");
- $web_config = $app->getconf->get_server_config($app->functions->intval(isset($this->dataRecord["server_id"]) ? $this->dataRecord["server_id"] : 0), 'web');
- //* Check for duplicate ssl certs per IP if SNI is disabled
- if(isset($this->dataRecord['ssl']) && $this->dataRecord['ssl'] == 'y' && $web_config['enable_sni'] != 'y') {
- $sql = "SELECT count(domain_id) as number FROM web_domain WHERE `ssl` = 'y' AND ip_address = '".$app->db->quote($this->dataRecord['ip_address'])."' and domain_id != ".$this->id;
- $tmp = $app->db->queryOneRecord($sql);
- if($tmp['number'] > 0) $app->tform->errorMessage .= $app->tform->lng("error_no_sni_txt");
- }
-
- // Check if pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0
- if(isset($this->dataRecord['pm_max_children']) && $this->dataRecord['pm'] == 'dynamic') {
- if($app->functions->intval($this->dataRecord['pm_max_children'], true) >= $app->functions->intval($this->dataRecord['pm_max_spare_servers'], true) && $app->functions->intval($this->dataRecord['pm_max_spare_servers'], true) >= $app->functions->intval($this->dataRecord['pm_start_servers'], true) && $app->functions->intval($this->dataRecord['pm_start_servers'], true) >= $app->functions->intval($this->dataRecord['pm_min_spare_servers'], true) && $app->functions->intval($this->dataRecord['pm_min_spare_servers'], true) > 0){
-
- } else {
- $app->tform->errorMessage .= $app->tform->lng("error_php_fpm_pm_settings_txt").'<br>';
- }
- }
-
- // Check rewrite rules
- $server_type = $web_config['server_type'];
-
- if($server_type == 'nginx' && isset($this->dataRecord['rewrite_rules']) && trim($this->dataRecord['rewrite_rules']) != '') {
- $rewrite_rules = trim($this->dataRecord['rewrite_rules']);
- $rewrites_are_valid = true;
- // use this counter to make sure all curly brackets are properly closed
- $if_level = 0;
- // Make sure we only have Unix linebreaks
- $rewrite_rules = str_replace("\r\n", "\n", $rewrite_rules);
- $rewrite_rules = str_replace("\r", "\n", $rewrite_rules);
- $rewrite_rule_lines = explode("\n", $rewrite_rules);
- if(is_array($rewrite_rule_lines) && !empty($rewrite_rule_lines)){
- foreach($rewrite_rule_lines as $rewrite_rule_line){
- // ignore comments
- if(substr(ltrim($rewrite_rule_line), 0, 1) == '#') continue;
- // empty lines
- if(trim($rewrite_rule_line) == '') continue;
- // rewrite
- if(preg_match('@^\s*rewrite\s+(^/)?\S+(\$)?\s+\S+(\s+(last|break|redirect|permanent|))?\s*;\s*$@', $rewrite_rule_line)) continue;
- // if
- if(preg_match('@^\s*if\s+\(\s*\$\S+(\s+(\!?(=|~|~\*))\s+(\S+|\".+\"))?\s*\)\s*\{\s*$@', $rewrite_rule_line)){
- $if_level += 1;
- continue;
- }
- // if - check for files, directories, etc.
- if(preg_match('@^\s*if\s+\(\s*\!?-(f|d|e|x)\s+\S+\s*\)\s*\{\s*$@', $rewrite_rule_line)){
- $if_level += 1;
- continue;
- }
- // break
- if(preg_match('@^\s*break\s*;\s*$@', $rewrite_rule_line)){
- continue;
- }
- // return code [ text ]
- if(preg_match('@^\s*return\s+\d\d\d.*;\s*$@', $rewrite_rule_line)) continue;
- // return code URL
- // return URL
- if(preg_match('@^\s*return(\s+\d\d\d)?\s+(http|https|ftp)\://([a-zA-Z0-9\.\-]+(\:[a-zA-Z0-9\.&%\$\-]+)*\@)*((25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9])\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[0-9])|localhost|([a-zA-Z0-9\-]+\.)*[a-zA-Z0-9\-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(\:[0-9]+)*(/($|[a-zA-Z0-9\.\,\?\'\\\+&%\$#\=~_\-]+))*\s*;\s*$@', $rewrite_rule_line)) continue;
- // set
- if(preg_match('@^\s*set\s+\$\S+\s+\S+\s*;\s*$@', $rewrite_rule_line)) continue;
- // closing curly bracket
- if(trim($rewrite_rule_line) == '}'){
- $if_level -= 1;
- continue;
- }
- $rewrites_are_valid = false;
- break;
- }
- }
-
- if(!$rewrites_are_valid || $if_level != 0){
- $app->tform->errorMessage .= $app->tform->lng("invalid_rewrite_rules_txt").'<br>';
- }
- }
-
- parent::onSubmit();
- }
-
- function onAfterInsert() {
- global $app, $conf;
-
- // Get configuration for the web system
- $app->uses("getconf");
- $web_rec = $app->tform->getDataRecord($this->id);
- $web_config = $app->getconf->get_server_config($app->functions->intval($web_rec["server_id"]), 'web');
- //var_dump($this->parent_domain_record, $web_rec);
- // Set the values for document_root, system_user and system_group
- $system_user = $app->db->quote($this->parent_domain_record['system_user']);
- $system_group = $app->db->quote($this->parent_domain_record['system_group']);
- $document_root = $app->db->quote($this->parent_domain_record['document_root']);
- $php_open_basedir = str_replace("[website_path]/web", $document_root.'/'.$web_rec['web_folder'], $web_config["php_open_basedir"]);
- $php_open_basedir = str_replace("[website_domain]/web", $web_rec['domain'].'/'.$web_rec['web_folder'], $php_open_basedir);
- $php_open_basedir = str_replace("[website_path]", $document_root, $php_open_basedir);
- $php_open_basedir = $app->db->quote(str_replace("[website_domain]", $web_rec['domain'], $php_open_basedir));
- $htaccess_allow_override = $app->db->quote($this->parent_domain_record['allow_override']);
-
- $sql = "UPDATE web_domain SET sys_groupid = ".$app->functions->intval($this->parent_domain_record['sys_groupid']).",system_user = '$system_user', system_group = '$system_group', document_root = '$document_root', allow_override = '$htaccess_allow_override', php_open_basedir = '$php_open_basedir' WHERE domain_id = ".$this->id;
- $app->db->query($sql);
- }
-
- function onBeforeUpdate () {
- global $app, $conf;
-
- //* Check that all fields for the SSL cert creation are filled
- if(isset($this->dataRecord['ssl_action']) && $this->dataRecord['ssl_action'] == 'create') {
- if($this->dataRecord['ssl_state'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_state_empty').'<br />';
- if($this->dataRecord['ssl_locality'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_locality_empty').'<br />';
- if($this->dataRecord['ssl_organisation'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_organisation_empty').'<br />';
- if($this->dataRecord['ssl_organisation_unit'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_organisation_unit_empty').'<br />';
- if($this->dataRecord['ssl_country'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_country_empty').'<br />';
- }
-
- if(isset($this->dataRecord['ssl_action']) && $this->dataRecord['ssl_action'] == 'save') {
- if(trim($this->dataRecord['ssl_cert']) == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_cert_empty').'<br />';
- }
-
- }
-
- function onAfterUpdate() {
- global $app, $conf;
-
- // Get configuration for the web system
- $app->uses("getconf");
- $web_rec = $app->tform->getDataRecord($this->id);
- $web_config = $app->getconf->get_server_config($app->functions->intval($web_rec["server_id"]), 'web');
-
- // Set the values for document_root, system_user and system_group
- $system_user = $app->db->quote($this->parent_domain_record['system_user']);
- $system_group = $app->db->quote($this->parent_domain_record['system_group']);
- $document_root = $app->db->quote($this->parent_domain_record['document_root']);
- $php_open_basedir = str_replace("[website_path]/web", $document_root.'/'.$web_rec['web_folder'], $web_config["php_open_basedir"]);
- $php_open_basedir = str_replace("[website_domain]/web", $web_rec['domain'].'/'.$web_rec['web_folder'], $php_open_basedir);
- $php_open_basedir = str_replace("[website_path]", $document_root, $php_open_basedir);
- $php_open_basedir = $app->db->quote(str_replace("[website_domain]", $web_rec['domain'], $php_open_basedir));
- $htaccess_allow_override = $app->db->quote($this->parent_domain_record['allow_override']);
-
- $sql = "UPDATE web_domain SET sys_groupid = ".$app->functions->intval($this->parent_domain_record['sys_groupid']).",system_user = '$system_user', system_group = '$system_group', document_root = '$document_root', allow_override = '$htaccess_allow_override', php_open_basedir = '$php_open_basedir' WHERE domain_id = ".$this->id;
- $app->db->query($sql);
- }
-
-}
-
-$page = new page_action;
-$page->onLoad();
-
-?>
diff --git a/interface/web/sites/web_vhost_domain_del.php b/interface/web/sites/web_vhost_domain_del.php
new file mode 100644
index 0000000000000000000000000000000000000000..25c7425b11df96b3e0e8ef9190b95d823706246b
--- /dev/null
+++ b/interface/web/sites/web_vhost_domain_del.php
@@ -0,0 +1,142 @@
+<?php
+
+/*
+Copyright (c) 2007, Till Brehm, projektfarm Gmbh
+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
+******************************************/
+
+$list_def_file = "list/web_vhost_domain.list.php";
+$tform_def_file = "form/web_vhost_domain.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('sites');
+
+$app->uses('tpl,tform,tform_actions');
+$app->load('tform_actions');
+
+//* Get and set the vhost domain type - store in session
+$show_type = 'domain';
+if(isset($_GET['type']) && $_GET['type'] == 'subdomain') {
+ $show_type = 'subdomain';
+} elseif(isset($_GET['type']) && $_GET['type'] == 'aliasdomain') {
+ $show_type = 'aliasdomain';
+} elseif(!isset($_GET['type']) && isset($_SESSION['s']['var']['vhostdomain_type']) && $_SESSION['s']['var']['vhostdomain_type'] == 'subdomain') {
+ $show_type = 'subdomain';
+} elseif(!isset($_GET['type']) && isset($_SESSION['s']['var']['vhostdomain_type']) && $_SESSION['s']['var']['vhostdomain_type'] == 'aliasdomain') {
+ $show_type = 'aliasdomain';
+}
+
+$_SESSION['s']['var']['vhostdomain_type'] = $show_type;
+
+
+class page_action extends tform_actions {
+
+ function onBeforeDelete() {
+ global $app; $conf;
+
+ if($_SESSION['s']['var']['vhostdomain_type'] == 'domain') {
+ if($app->tform->checkPerm($this->id, 'd') == false) $app->error($app->lng('error_no_delete_permission'));
+
+ //* Delete all records that belong to this web.
+ $records = $app->db->queryAllRecords("SELECT domain_id FROM web_domain WHERE parent_domain_id = '".$app->functions->intval($this->id)."' AND type != 'vhost'");
+ foreach($records as $rec) {
+ $app->db->datalogDelete('web_domain', 'domain_id', $rec['domain_id']);
+ }
+
+ //* Delete all records that belong to this web.
+ $records = $app->db->queryAllRecords("SELECT ftp_user_id FROM ftp_user WHERE parent_domain_id = '".$app->functions->intval($this->id)."'");
+ foreach($records as $rec) {
+ $app->db->datalogDelete('ftp_user', 'ftp_user_id', $rec['ftp_user_id']);
+ }
+
+ //* Delete all records that belong to this web.
+ $records = $app->db->queryAllRecords("SELECT shell_user_id FROM shell_user WHERE parent_domain_id = '".$app->functions->intval($this->id)."'");
+ foreach($records as $rec) {
+ $app->db->datalogDelete('shell_user', 'shell_user_id', $rec['shell_user_id']);
+ }
+
+ //* Delete all records that belong to this web.
+ $records = $app->db->queryAllRecords("SELECT id FROM cron WHERE parent_domain_id = '".$app->functions->intval($this->id)."'");
+ foreach($records as $rec) {
+ $app->db->datalogDelete('cron', 'id', $rec['id']);
+ }
+
+ //* Delete all records that belong to this web
+ $records = $app->db->queryAllRecords("SELECT webdav_user_id FROM webdav_user WHERE parent_domain_id = '".$app->functions->intval($this->id)."'");
+ foreach($records as $rec) {
+ $app->db->datalogDelete('webdav_user', 'webdav_user_id', $rec['webdav_user_id']);
+ }
+
+ //* Delete all records that belong to this web
+ $records = $app->db->queryAllRecords("SELECT backup_id FROM web_backup WHERE parent_domain_id = '".$app->functions->intval($this->id)."'");
+ foreach($records as $rec) {
+ $app->db->datalogDelete('web_backup', 'backup_id', $rec['backup_id']);
+ }
+
+ //* Delete all records that belog to this web.
+ $web_domain = $app->db->queryOneRecord("SELECT domain FROM web_domain WHERE domain_id = ".$app->functions->intval($this->id));
+ if($web_domain['domain'] != ''){
+ $aps_instances = $app->db->queryAllRecords("SELECT instance_id FROM aps_instances_settings WHERE name = 'main_domain' AND value = '".$app->db->quote($web_domain['domain'])."'");
+ if(is_array($aps_instances) && !empty($aps_instances)){
+ foreach($aps_instances as $aps_instance){
+ if($aps_instance['instance_id'] > 0){
+ $app->db->datalogDelete('aps_instances_settings', 'instance_id', $aps_instance['instance_id']);
+ $app->db->datalogDelete('aps_instances', 'id', $aps_instance['instance_id']);
+ }
+ }
+ }
+ }
+ }
+
+ //* Delete all web folders
+ $records = $app->db->queryAllRecords("SELECT web_folder_id FROM web_folder WHERE parent_domain_id = '".$app->functions->intval($this->id)."'");
+ foreach($records as $rec) {
+ //* Delete all web folder users
+ $records2 = $app->db->queryAllRecords("SELECT web_folder_user_id FROM web_folder_user WHERE web_folder_id = '".$app->functions->intval($rec['web_folder_id'])."'");
+ foreach($records2 as $rec2) {
+ $app->db->datalogDelete('web_folder_user', 'web_folder_user_id', $rec2['web_folder_user_id']);
+ }
+ $app->db->datalogDelete('web_folder', 'web_folder_id', $rec['web_folder_id']);
+ }
+ }
+
+}
+
+$page = new page_action;
+$page->onDelete();
+
+?>
diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_vhost_domain_edit.php
similarity index 64%
rename from interface/web/sites/web_domain_edit.php
rename to interface/web/sites/web_vhost_domain_edit.php
index 76738957e1b02d2db37c24f7af7463fa9a2c7655..b671c330ea9c0090a759755828e6f31b63da917d 100644
--- a/interface/web/sites/web_domain_edit.php
+++ b/interface/web/sites/web_vhost_domain_edit.php
@@ -32,7 +32,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* Begin Form configuration
******************************************/
-$tform_def_file = "form/web_domain.tform.php";
+$tform_def_file = "form/web_vhost_domain.tform.php";
/******************************************
* End Form configuration
@@ -49,6 +49,7 @@ $app->uses('tpl,tform,tform_actions,tools_sites');
$app->load('tform_actions');
class page_action extends tform_actions {
+ var $_vhostdomain_type = 'domain';
//* Returna a "3/2/1" path hash from a numeric id '123'
function id_hash($id, $levels) {
@@ -63,18 +64,51 @@ class page_action extends tform_actions {
return $hash;
}
+ function onLoad() {
+ $show_type = 'domain';
+ if(isset($_GET['type']) && $_GET['type'] == 'subdomain') {
+ $show_type = 'subdomain';
+ } elseif(isset($_GET['type']) && $_GET['type'] == 'aliasdomain') {
+ $show_type = 'aliasdomain';
+ } elseif(!isset($_GET['type']) && isset($_SESSION['s']['var']['vhostdomain_type']) && $_SESSION['s']['var']['vhostdomain_type'] == 'subdomain') {
+ $show_type = 'subdomain';
+ } elseif(!isset($_GET['type']) && isset($_SESSION['s']['var']['vhostdomain_type']) && $_SESSION['s']['var']['vhostdomain_type'] == 'aliasdomain') {
+ $show_type = 'aliasdomain';
+ }
+
+ $_SESSION['s']['var']['vhostdomain_type'] = $show_type;
+ $this->_vhostdomain_type = $show_type;
+
+ parent::onLoad();
+ }
+
function onShowNew() {
global $app, $conf;
// we will check only users, not admins
if($_SESSION["s"]["user"]["typ"] == 'user') {
- if(!$app->tform->checkClientLimit('limit_web_domain', "type = 'vhost'")) {
- $app->error($app->tform->wordbook["limit_web_domain_txt"]);
- }
- if(!$app->tform->checkResellerLimit('limit_web_domain', "type = 'vhost'")) {
- $app->error('Reseller: '.$app->tform->wordbook["limit_web_domain_txt"]);
+ if($this->_vhostdomain_type == 'domain') {
+ if(!$app->tform->checkClientLimit('limit_web_domain', "type = 'vhost'")) {
+ $app->error($app->tform->wordbook["limit_web_domain_txt"]);
+ }
+ if(!$app->tform->checkResellerLimit('limit_web_domain', "type = 'vhost'")) {
+ $app->error('Reseller: '.$app->tform->wordbook["limit_web_domain_txt"]);
+ }
+ } elseif($this->_vhostdomain_type == 'subdomain') {
+ if(!$app->tform->checkClientLimit('limit_web_subdomain', "(type = 'subdomain' OR type = 'vhostsubdomain')")) {
+ $app->error($app->tform->wordbook["limit_web_subdomain_txt"]);
+ }
+ if(!$app->tform->checkResellerLimit('limit_web_subdomain', "(type = 'subdomain' OR type = 'vhostsubdomain')")) {
+ $app->error('Reseller: '.$app->tform->wordbook["limit_web_subdomain_txt"]);
+ }
+ } elseif($this->_vhostdomain_type == 'aliasdomain') {
+ if(!$app->tform->checkClientLimit('limit_web_aliasdomain', "(type = 'alias' OR type = 'vhostalias')")) {
+ $app->error($app->tform->wordbook["limit_web_aliasdomain_txt"]);
+ }
+ if(!$app->tform->checkResellerLimit('limit_web_aliasdomain', "(type = 'alias' OR type = 'vhostalias')")) {
+ $app->error('Reseller: '.$app->tform->wordbook["limit_web_aliasdomain_txt"]);
+ }
}
-
// Get the limits of the client
$client_group_id = $_SESSION["s"]["user"]["default_group"];
$client = $app->db->queryOneRecord("SELECT client.web_servers FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
@@ -84,6 +118,7 @@ class page_action extends tform_actions {
}
$app->tform->formDef['tabs']['domain']['readonly'] = false;
+ $app->tpl->setVar('vhostdomain_type', $this->_vhostdomain_type);
parent::onShowNew();
}
@@ -94,15 +129,22 @@ class page_action extends tform_actions {
$read_limits = array('limit_cgi', 'limit_ssi', 'limit_perl', 'limit_ruby', 'limit_python', 'force_suexec', 'limit_hterror', 'limit_wildcard', 'limit_ssl');
+ if($this->_vhostdomain_type != 'domain') $parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]));
+
//* Client: If the logged in user is not admin and has no sub clients (no reseller)
if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) {
// Get the limits of the client
- $client_group_id = $_SESSION["s"]["user"]["default_group"];
- $client = $app->db->queryOneRecord("SELECT client.limit_web_domain, client.web_servers, client." . implode(", client.", $read_limits) . " FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
+ $client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
+ if($this->_vhostdomain_type == 'domain') {
+ $client = $app->db->queryOneRecord("SELECT client.limit_web_domain, client.web_servers, client." . implode(", client.", $read_limits) . " FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
+ } elseif($this->_vhostdomain_type == 'subdomain') {
+ $client = $app->db->queryOneRecord("SELECT client.limit_web_subdomain, client.web_servers, client.default_webserver, client." . implode(", client.", $read_limits) . " FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
+ } elseif($this->_vhostdomain_type == 'aliasdomain') {
+ $client = $app->db->queryOneRecord("SELECT client.limit_web_aliasdomain, client.web_servers, client.default_webserver, client." . implode(", client.", $read_limits) . " FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
+ }
$client['web_servers_ids'] = explode(',', $client['web_servers']);
-
$only_one_server = count($client['web_servers_ids']) === 1;
$app->tpl->setVar('only_one_server', $only_one_server);
@@ -178,11 +220,21 @@ class page_action extends tform_actions {
$server_type = 'apache';
if(!empty($web_config['server_type'])) $server_type = $web_config['server_type'];
if($server_type == 'nginx' && $this->dataRecord['php'] == 'fast-cgi') $this->dataRecord['php'] = 'php-fpm';
- if($this->dataRecord['php'] == 'php-fpm'){
- $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ".($this->id > 0 ? $app->functions->intval($this->dataRecord['server_id']) : $app->functions->intval($client['default_webserver']))." AND (client_id = 0 OR client_id=".$app->functions->intval($_SESSION['s']['user']['client_id']).")");
- }
- if($this->dataRecord['php'] == 'fast-cgi'){
- $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ".($this->id > 0 ? $app->functions->intval($this->dataRecord['server_id']) : $app->functions->intval($client['default_webserver']))." AND (client_id = 0 OR client_id=".$app->functions->intval($_SESSION['s']['user']['client_id']).")");
+
+ if($this->_vhostdomain_type == 'domain') {
+ if($this->dataRecord['php'] == 'php-fpm'){
+ $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ".($this->id > 0 ? $app->functions->intval($this->dataRecord['server_id']) : $app->functions->intval($client['default_webserver']))." AND (client_id = 0 OR client_id=".$app->functions->intval($_SESSION['s']['user']['client_id']).")");
+ }
+ if($this->dataRecord['php'] == 'fast-cgi'){
+ $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ".($this->id > 0 ? $app->functions->intval($this->dataRecord['server_id']) : $app->functions->intval($client['default_webserver']))." AND (client_id = 0 OR client_id=".$app->functions->intval($_SESSION['s']['user']['client_id']).")");
+ }
+ } else {
+ if($this->dataRecord['php'] == 'php-fpm'){
+ $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ".$app->functions->intval($parent_domain['server_id'])." AND (client_id = 0 OR client_id=".$app->functions->intval($_SESSION['s']['user']['client_id']).")");
+ }
+ if($this->dataRecord['php'] == 'fast-cgi'){
+ $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ".$app->functions->intval($parent_domain['server_id'])." AND (client_id = 0 OR client_id=".$app->functions->intval($_SESSION['s']['user']['client_id']).")");
+ }
}
$php_select = "<option value=''>Default</option>";
if(is_array($php_records) && !empty($php_records)) {
@@ -208,7 +260,18 @@ class page_action extends tform_actions {
// Get the limits of the client
$client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
- $client = $app->db->queryOneRecord("SELECT client.client_id, client.limit_web_domain, client.default_webserver, client.contact_name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname, sys_group.name, client." . implode(", client.", $read_limits) . " FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
+
+ if($this->_vhostdomain_type == 'domain') {
+ $client = $app->db->queryOneRecord("SELECT client.client_id, client.limit_web_domain, client.web_servers, client.default_webserver, client.contact_name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname, sys_group.name, client." . implode(", client.", $read_limits) . " FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
+ $app->tpl->setVar('only_one_server', $only_one_server);
+ } elseif($this->_vhostdomain_type == 'subdomain') {
+ $client = $app->db->queryOneRecord("SELECT client.client_id, client.limit_web_subdomain, client.web_servers, client.default_webserver, client.contact_name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname, sys_group.name, client." . implode(", client.", $read_limits) . " FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
+ } elseif($this->_vhostdomain_type == 'aliasdomain') {
+ $client = $app->db->queryOneRecord("SELECT client.client_id, client.limit_web_aliasdomain, client.web_servers, client.default_webserver, client.contact_name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname, sys_group.name, client." . implode(", client.", $read_limits) . " FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
+ }
+
+ $client['web_servers_ids'] = explode(',', $client['web_servers']);
+ $only_one_server = count($client['web_servers_ids']) === 1;
//* Get global web config
foreach ($client['web_servers_ids'] as $web_server_id) {
@@ -291,11 +354,20 @@ class page_action extends tform_actions {
$selected_client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE groupid = ".$app->functions->intval($selected_client_group_id));
//$sql_where = " AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id']." OR client_id = ".intval($selected_client['client_id']).")";
$sql_where = " AND (client_id = 0 OR client_id = ".intval($selected_client['client_id']).")";
- if($this->dataRecord['php'] == 'php-fpm'){
- $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ".($this->id > 0 ? $app->functions->intval($this->dataRecord['server_id']) : $app->functions->intval($client['default_webserver'])).$sql_where);
- }
- if($this->dataRecord['php'] == 'fast-cgi') {
- $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ".($this->id > 0 ? $app->functions->intval($this->dataRecord['server_id']) : $app->functions->intval($client['default_webserver'])).$sql_where);
+ if($this->_vhostdomain_type == 'domain') {
+ if($this->dataRecord['php'] == 'php-fpm'){
+ $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ".($this->id > 0 ? $app->functions->intval($this->dataRecord['server_id']) : $app->functions->intval($client['default_webserver'])).$sql_where);
+ }
+ if($this->dataRecord['php'] == 'fast-cgi') {
+ $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ".($this->id > 0 ? $app->functions->intval($this->dataRecord['server_id']) : $app->functions->intval($client['default_webserver'])).$sql_where);
+ }
+ } else {
+ if($this->dataRecord['php'] == 'php-fpm'){
+ $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ".$app->functions->intval($parent_domain['server_id'])." AND (client_id = 0 OR client_id=".$app->functions->intval($_SESSION['s']['user']['client_id']).")");
+ }
+ if($this->dataRecord['php'] == 'fast-cgi') {
+ $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ".$app->functions->intval($parent_domain['server_id'])." AND (client_id = 0 OR client_id=".$app->functions->intval($_SESSION['s']['user']['client_id']).")");
+ }
}
$php_select = "<option value=''>Default</option>";
if(is_array($php_records) && !empty($php_records)) {
@@ -366,23 +438,28 @@ class page_action extends tform_actions {
//* Admin: If the logged in user is admin
} else {
- // The user is admin, so we fill in all IP addresses of the server
- if($this->id > 0) {
- if(!isset($this->dataRecord["server_id"])){
- $tmp = $app->db->queryOneRecord("SELECT server_id FROM web_domain WHERE domain_id = ".$app->functions->intval($this->id));
- $this->dataRecord["server_id"] = $tmp["server_id"];
- unset($tmp);
+ if($this->_vhostdomain_type == 'domain') {
+ // The user is admin, so we fill in all IP addresses of the server
+ if($this->id > 0) {
+ if(!isset($this->dataRecord["server_id"])){
+ $tmp = $app->db->queryOneRecord("SELECT server_id FROM web_domain WHERE domain_id = ".$app->functions->intval($this->id));
+ $this->dataRecord["server_id"] = $tmp["server_id"];
+ unset($tmp);
+ }
+ $server_id = intval(@$this->dataRecord["server_id"]);
+ } else {
+ // Get the first server ID
+ $tmp = $app->db->queryOneRecord("SELECT server_id FROM server WHERE web_server = 1 ORDER BY server_name LIMIT 0,1");
+ $server_id = intval($tmp['server_id']);
}
- $server_id = intval(@$this->dataRecord["server_id"]);
+
+ //* get global web config
+ $web_config = $app->getconf->get_server_config($server_id, 'web');
} else {
- // Get the first server ID
- $tmp = $app->db->queryOneRecord("SELECT server_id FROM server WHERE web_server = 1 ORDER BY server_name LIMIT 0,1");
- $server_id = intval($tmp['server_id']);
+ //* get global web config
+ $web_config = $app->getconf->get_server_config($parent_domain['server_id'], 'web');
}
- //* get global web config
- $web_config = $app->getconf->get_server_config($server_id, 'web');
-
//* Fill the IPv4 select field
$sql = "SELECT ip_address FROM server_ip WHERE ip_type = 'IPv4' AND server_id = ".$app->functions->intval($server_id);
$ips = $app->db->queryAllRecords($sql);
@@ -437,11 +514,20 @@ class page_action extends tform_actions {
$selected_client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE groupid = ".$app->functions->intval($selected_client_group_id));
//$sql_where = " AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id']." OR client_id = ".intval($selected_client['client_id']).")";
$sql_where = " AND (client_id = 0 OR client_id = ".$app->functions->intval($selected_client['client_id']).")";
- if($this->dataRecord['php'] == 'php-fpm'){
- $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = $server_id".$sql_where);
- }
- if($this->dataRecord['php'] == 'fast-cgi') {
- $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ".$app->functions->intval($server_id).$sql_where);
+ if($this->_vhostdomain_type == 'domain') {
+ if($this->dataRecord['php'] == 'php-fpm'){
+ $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = $server_id".$sql_where);
+ }
+ if($this->dataRecord['php'] == 'fast-cgi') {
+ $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ".$app->functions->intval($server_id).$sql_where);
+ }
+ } else {
+ if($this->dataRecord['php'] == 'php-fpm'){
+ $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = " . $app->functions->intval($parent_domain['server_id']));
+ }
+ if($this->dataRecord['php'] == 'fast-cgi') {
+ $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = " . $app->functions->intval($parent_domain['server_id']));
+ }
}
$php_select = "<option value=''>Default</option>";
if(is_array($php_records) && !empty($php_records)) {
@@ -523,9 +609,13 @@ class page_action extends tform_actions {
if($this->id > 0) {
//* we are editing a existing record
$app->tpl->setVar("edit_disabled", 1);
- $app->tpl->setVar("server_id_value", $this->dataRecord["server_id"]);
+ $app->tpl->setVar('fixed_folder', 'y');
+ if($this->_vhostdomain_type == 'domain') $app->tpl->setVar("server_id_value", $this->dataRecord["server_id"]);
+ else $app->tpl->setVar('server_id_value', $parent_domain['server_id']);
} else {
$app->tpl->setVar("edit_disabled", 0);
+ $app->tpl->setVar('fixed_folder', 'n');
+ if($this->_vhostdomain_type != 'domain') $app->tpl->setVar('server_id_value', $parent_domain['server_id']);
}
$tmp_txt = ($this->dataRecord['traffic_quota_lock'] == 'y')?'<b>('.$app->tform->lng('traffic_quota_exceeded_txt').')</b>':'';
@@ -535,6 +625,7 @@ class page_action extends tform_actions {
* Now we have to check, if we should use the domain-module to select the domain
* or not
*/
+ $app->uses('ini_parser,getconf');
$settings = $app->getconf->get_global_config('domains');
if ($settings['use_domain_module'] == 'y') {
/*
@@ -542,11 +633,17 @@ class page_action extends tform_actions {
*/
$domains = $app->tools_sites->getDomainModuleDomains();
$domain_select = '';
+ $selected_domain = '';
if(is_array($domains) && sizeof($domains) > 0) {
/* We have domains in the list, so create the drop-down-list */
foreach( $domains as $domain) {
$domain_select .= "<option value=" . $domain['domain_id'] ;
- if ($domain['domain'] == $this->dataRecord["domain"]) {
+ if ($this->_vhostdomain_type == 'subdomain' && '.' . $domain['domain'] == substr($this->dataRecord["domain"], -strlen($domain['domain']) - 1)) {
+ $domain_select .= " selected";
+ $selected_domain = $domain['domain'];
+ } elseif($this->_vhostdomain_type == 'aliasdomain' && $domain['domain'] == $this->dataRecord["domain"]) {
+ $domain_select .= " selected";
+ } elseif($this->_vhostdomain_type == 'domain' && $domain['domain'] == $this->dataRecord["domain"]) {
$domain_select .= " selected";
}
$domain_select .= ">" . $app->functions->idn_decode($domain['domain']) . "</option>\r\n";
@@ -562,6 +659,7 @@ class page_action extends tform_actions {
}
$app->tpl->setVar("domain_option", $domain_select);
}
+ if($this->_vhostdomain_type != 'domain') $app->tpl->setVar("domain", $this->dataRecord["domain"]);
// check for configuration errors in sys_datalog
if($this->id > 0) {
@@ -573,6 +671,8 @@ class page_action extends tform_actions {
}
}
}
+
+ $app->tpl->setVar('vhostdomain_type', $this->_vhostdomain_type);
parent::onShowEnd();
}
@@ -586,38 +686,86 @@ class page_action extends tform_actions {
function onSubmit() {
global $app, $conf;
+ // Set a few fixed values
+ $this->dataRecord["vhost_type"] = 'name';
+ if($this->_vhostdomain_type == 'domain') {
+ $this->dataRecord["parent_domain_id"] = 0;
+ $this->dataRecord["type"] = 'vhost';
+ } else {
+ // Get the record of the parent domain
+ if(!@$this->dataRecord["parent_domain_id"] && $this->id) {
+ $tmp = $app->db->queryOneRecord("SELECT parent_domain_id FROM web_domain WHERE domain_id = ".$app->functions->intval($this->id));
+ if($tmp) $this->dataRecord["parent_domain_id"] = $tmp['parent_domain_id'];
+ unset($tmp);
+ }
+
+ $parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]) . " AND ".$app->tform->getAuthSQL('r'));
+ if(!$parent_domain || $parent_domain['domain_id'] != @$this->dataRecord['parent_domain_id']) $app->tform->errorMessage .= $app->tform->lng("no_domain_perm");
+
+ if($this->_vhostdomain_type == 'subdomain') {
+ $this->dataRecord["type"] = 'vhostsubdomain';
+ } else {
+ $this->dataRecord["type"] = 'vhostalias';
+ }
+ $this->dataRecord["server_id"] = $parent_domain["server_id"];
+ $this->dataRecord["ip_address"] = $parent_domain["ip_address"];
+ $this->dataRecord["ipv6_address"] = $parent_domain["ipv6_address"];
+ $this->dataRecord["client_group_id"] = $parent_domain["client_group_id"];
+
+ $this->parent_domain_record = $parent_domain;
+ }
+
+ $read_limits = array('limit_cgi', 'limit_ssi', 'limit_perl', 'limit_ruby', 'limit_python', 'force_suexec', 'limit_hterror', 'limit_wildcard', 'limit_ssl');
+
/* check if the domain module is used - and check if the selected domain can be used! */
if($app->tform->getCurrentTab() == 'domain') {
$app->uses('ini_parser,getconf');
$settings = $app->getconf->get_global_config('domains');
if ($settings['use_domain_module'] == 'y') {
- $domain_check = $app->tools_sites->checkDomainModuleDomain($this->dataRecord['domain']);
+ if($this->_vhostdomain_type == 'subdomain') $domain_check = $app->tools_sites->checkDomainModuleDomain($this->dataRecord['sel_domain']);
+ else $domain_check = $app->tools_sites->checkDomainModuleDomain($this->dataRecord['domain']);
if(!$domain_check) {
// invalid domain selected
$app->tform->errorMessage .= $app->tform->lng("domain_error_empty")."<br />";
} else {
- $this->dataRecord['domain'] = $domain_check;
+ if($this->_vhostdomain_type == 'subdomain') $this->dataRecord['domain'] = $this->dataRecord['domain'] . '.' . $domain_check;
+ else $this->dataRecord['domain'] = $domain_check;
}
+ } else {
+ if($this->_vhostdomain_type == 'subdomain') $this->dataRecord["domain"] = $this->dataRecord["domain"].'.'.$parent_domain["domain"];
}
- }
- // nginx: if redirect type is proxy and redirect path is no URL, display error
- //if($this->dataRecord["redirect_type"] == 'proxy' && substr($this->dataRecord['redirect_path'],0,1) == '/'){
- // $app->tform->errorMessage .= $app->tform->lng("error_proxy_requires_url")."<br />";
- //}
+ if($this->_vhostdomain_type != 'domain') {
+ $this->dataRecord['web_folder'] = strtolower($this->dataRecord['web_folder']);
+ if(substr($this->dataRecord['web_folder'], 0, 1) === '/') $this->dataRecord['web_folder'] = substr($this->dataRecord['web_folder'], 1);
+ if(substr($this->dataRecord['web_folder'], -1) === '/') $this->dataRecord['web_folder'] = substr($this->dataRecord['web_folder'], 0, -1);
+ $forbidden_folders = array('', 'cgi-bin', 'log', 'private', 'ssl', 'tmp', 'webdav');
+ $check_folder = strtolower($this->dataRecord['web_folder']);
+ if(substr($check_folder, 0, 1) === '/') $check_folder = substr($check_folder, 1); // strip / at beginning to check against forbidden entries
+ if(strpos($check_folder, '/') !== false) $check_folder = substr($check_folder, 0, strpos($check_folder, '/')); // get the first part of the path to check it
+ if(in_array($check_folder, $forbidden_folders)) {
+ $app->tform->errorMessage .= $app->tform->lng("web_folder_invalid_txt")."<br>";
+ }
- // Set a few fixed values
- $this->dataRecord["parent_domain_id"] = 0;
- $this->dataRecord["type"] = 'vhost';
- $this->dataRecord["vhost_type"] = 'name';
+ // vhostaliasdomains do not have a quota of their own
+ $this->dataRecord["hd_quota"] = 0;
+
+ // check for duplicate folder usage
+ /*
+ $check = $app->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_domain` WHERE `type` = 'vhostalias' AND `parent_domain_id` = '" . $app->functions->intval($this->dataRecord['parent_domain_id']) . "' AND `web_folder` = '" . $app->db->quote($this->dataRecord['web_folder']) . "' AND `domain_id` != '" . $app->functions->intval($this->id) . "'");
+ if($check && $check['cnt'] > 0) {
+ $app->tform->errorMessage .= $app->tform->lng("web_folder_unique_txt")."<br>";
+ }
+ */
+ }
+ }
- $read_limits = array('limit_cgi', 'limit_ssi', 'limit_perl', 'limit_ruby', 'limit_python', 'force_suexec', 'limit_hterror', 'limit_wildcard', 'limit_ssl');
if($_SESSION["s"]["user"]["typ"] != 'admin') {
// Get the limits of the client
- $client_group_id = $_SESSION["s"]["user"]["default_group"];
- $client = $app->db->queryOneRecord("SELECT limit_traffic_quota, limit_web_domain, web_servers, parent_client_id, limit_web_quota, client." . implode(", client.", $read_limits) . " FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
+ $client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
+ $client = $app->db->queryOneRecord("SELECT limit_traffic_quota, limit_web_domain, limit_web_aliasdomain, limit_web_subdomain, web_servers, parent_client_id, limit_web_quota, client." . implode(", client.", $read_limits) . " FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
$client['web_servers_ids'] = explode(',', $client['web_servers']);
@@ -634,24 +782,26 @@ class page_action extends tform_actions {
// only generate quota and traffic warnings if value has changed
if($this->id > 0) {
$old_web_values = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$app->functions->intval($this->id));
- } else {
+ } else {
$old_web_values = array();
}
-
- //* Check the website quota of the client
- if(isset($_POST["hd_quota"]) && $client["limit_web_quota"] >= 0 && $_POST["hd_quota"] != $old_web_values["hd_quota"]) {
- $tmp = $app->db->queryOneRecord("SELECT sum(hd_quota) as webquota FROM web_domain WHERE domain_id != ".$app->functions->intval($this->id)." AND type = 'vhost' AND ".$app->tform->getAuthSQL('u'));
- $webquota = $tmp["webquota"];
- $new_web_quota = $app->functions->intval($this->dataRecord["hd_quota"]);
- if(($webquota + $new_web_quota > $client["limit_web_quota"]) || ($new_web_quota < 0 && $client["limit_web_quota"] >= 0)) {
- $max_free_quota = floor($client["limit_web_quota"] - $webquota);
- if($max_free_quota < 0) $max_free_quota = 0;
- $app->tform->errorMessage .= $app->tform->lng("limit_web_quota_free_txt").": ".$max_free_quota." MB<br>";
- // Set the quota field to the max free space
- $this->dataRecord["hd_quota"] = $max_free_quota;
+
+ if($this->_vhostdomain_type == 'domain') {
+ //* Check the website quota of the client
+ if(isset($_POST["hd_quota"]) && $client["limit_web_quota"] >= 0 && $_POST["hd_quota"] != $old_web_values["hd_quota"]) {
+ $tmp = $app->db->queryOneRecord("SELECT sum(hd_quota) as webquota FROM web_domain WHERE domain_id != ".$app->functions->intval($this->id)." AND type = 'vhost' AND ".$app->tform->getAuthSQL('u'));
+ $webquota = $tmp["webquota"];
+ $new_web_quota = $app->functions->intval($this->dataRecord["hd_quota"]);
+ if(($webquota + $new_web_quota > $client["limit_web_quota"]) || ($new_web_quota < 0 && $client["limit_web_quota"] >= 0)) {
+ $max_free_quota = floor($client["limit_web_quota"] - $webquota);
+ if($max_free_quota < 0) $max_free_quota = 0;
+ $app->tform->errorMessage .= $app->tform->lng("limit_web_quota_free_txt").": ".$max_free_quota." MB<br>";
+ // Set the quota field to the max free space
+ $this->dataRecord["hd_quota"] = $max_free_quota;
+ }
+ unset($tmp);
+ unset($tmp_quota);
}
- unset($tmp);
- unset($tmp_quota);
}
//* Check the traffic quota of the client
@@ -672,22 +822,24 @@ class page_action extends tform_actions {
if($client['parent_client_id'] > 0) {
// Get the limits of the reseller
- $reseller = $app->db->queryOneRecord("SELECT limit_traffic_quota, limit_web_domain, web_servers, limit_web_quota FROM client WHERE client_id = ".$client['parent_client_id']);
-
- //* Check the website quota of the client
- if(isset($_POST["hd_quota"]) && $reseller["limit_web_quota"] >= 0 && $_POST["hd_quota"] != $old_web_values["hd_quota"]) {
- $tmp = $app->db->queryOneRecord("SELECT sum(hd_quota) as webquota FROM web_domain WHERE domain_id != ".$app->functions->intval($this->id)." AND type = 'vhost' AND ".$app->tform->getAuthSQL('u'));
- $webquota = $tmp["webquota"];
- $new_web_quota = $app->functions->intval($this->dataRecord["hd_quota"]);
- if(($webquota + $new_web_quota > $reseller["limit_web_quota"]) || ($new_web_quota < 0 && $reseller["limit_web_quota"] >= 0)) {
- $max_free_quota = floor($reseller["limit_web_quota"] - $webquota);
- if($max_free_quota < 0) $max_free_quota = 0;
- $app->tform->errorMessage .= $app->tform->lng("limit_web_quota_free_txt").": ".$max_free_quota." MB<br>";
- // Set the quota field to the max free space
- $this->dataRecord["hd_quota"] = $max_free_quota;
+ $reseller = $app->db->queryOneRecord("SELECT limit_traffic_quota, limit_web_domain, limit_web_aliasdomain, limit_web_subdomain, web_servers, limit_web_quota FROM client WHERE client_id = ".$client['parent_client_id']);
+
+ if($this->_vhostdomain_type == 'domain') {
+ //* Check the website quota of the client
+ if(isset($_POST["hd_quota"]) && $reseller["limit_web_quota"] >= 0 && $_POST["hd_quota"] != $old_web_values["hd_quota"]) {
+ $tmp = $app->db->queryOneRecord("SELECT sum(hd_quota) as webquota FROM web_domain WHERE domain_id != ".$app->functions->intval($this->id)." AND type = 'vhost' AND ".$app->tform->getAuthSQL('u'));
+ $webquota = $tmp["webquota"];
+ $new_web_quota = $app->functions->intval($this->dataRecord["hd_quota"]);
+ if(($webquota + $new_web_quota > $reseller["limit_web_quota"]) || ($new_web_quota < 0 && $reseller["limit_web_quota"] >= 0)) {
+ $max_free_quota = floor($reseller["limit_web_quota"] - $webquota);
+ if($max_free_quota < 0) $max_free_quota = 0;
+ $app->tform->errorMessage .= $app->tform->lng("limit_web_quota_free_txt").": ".$max_free_quota." MB<br>";
+ // Set the quota field to the max free space
+ $this->dataRecord["hd_quota"] = $max_free_quota;
+ }
+ unset($tmp);
+ unset($tmp_quota);
}
- unset($tmp);
- unset($tmp_quota);
}
//* Check the traffic quota of the client
@@ -710,8 +862,9 @@ class page_action extends tform_actions {
// When the record is updated
if($this->id > 0) {
// restore the server ID if the user is not admin and record is edited
- $tmp = $app->db->queryOneRecord("SELECT server_id, `cgi`, `ssi`, `perl`, `ruby`, `python`, `suexec`, `errordocs`, `subdomain`, `ssl` FROM web_domain WHERE domain_id = ".$app->functions->intval($this->id));
+ $tmp = $app->db->queryOneRecord("SELECT server_id, `web_folder`, `cgi`, `ssi`, `perl`, `ruby`, `python`, `suexec`, `errordocs`, `subdomain`, `ssl` FROM web_domain WHERE domain_id = ".$app->functions->intval($this->id));
$this->dataRecord["server_id"] = $tmp["server_id"];
+ $this->dataRecord['web_folder'] = $tmp['web_folder']; // cannot be changed!
// set the settings to current if not provided (or cleared due to limits)
if($this->dataRecord['cgi'] == '-') $this->dataRecord['cgi'] = $tmp['cgi'];
@@ -727,26 +880,37 @@ class page_action extends tform_actions {
unset($tmp);
// When the record is inserted
} else {
- //* display an error if chosen server is not allowed for this client
- if (!is_array($client['web_servers_ids']) || !in_array($this->dataRecord['server_id'], $client['web_servers_ids'])) {
- $app->error($app->tform->wordbook['server_chosen_not_ok']);
+ if($this->_vhostdomain_type == 'domain') {
+ //* display an error if chosen server is not allowed for this client
+ if (!is_array($client['web_servers_ids']) || !in_array($this->dataRecord['server_id'], $client['web_servers_ids'])) {
+ $app->error($app->tform->wordbook['server_chosen_not_ok']);
+ }
}
// Check if the user may add another web_domain
- if($client["limit_web_domain"] >= 0) {
+ if($this->_vhostdomain_type == 'domain' && $client["limit_web_domain"] >= 0) {
$tmp = $app->db->queryOneRecord("SELECT count(domain_id) as number FROM web_domain WHERE sys_groupid = $client_group_id and type = 'vhost'");
if($tmp["number"] >= $client["limit_web_domain"]) {
$app->error($app->tform->wordbook["limit_web_domain_txt"]);
}
+ } elseif($this->_vhostdomain_type == 'aliasdomain' && $client["limit_web_aliasdomain"] >= 0) {
+ $tmp = $app->db->queryOneRecord("SELECT count(domain_id) as number FROM web_domain WHERE sys_groupid = $client_group_id and (type = 'alias' OR type = 'vhostalias')");
+ if($tmp["number"] >= $client["limit_web_aliasdomain"]) {
+ $app->error($app->tform->wordbook["limit_web_aliasdomain_txt"]);
+ }
+ } elseif($this->_vhostdomain_type == 'subdomain' && $client["limit_web_subdomain"] >= 0) {
+ $tmp = $app->db->queryOneRecord("SELECT count(domain_id) as number FROM web_domain WHERE sys_groupid = $client_group_id and (type = 'subdomain' OR type = 'vhostsubdomain')");
+ if($tmp["number"] >= $client["limit_web_subdomain"]) {
+ $app->error($app->tform->wordbook["limit_web_subdomain_txt"]);
+ }
}
-
}
// Clients may not set the client_group_id, so we unset them if user is not a admin and the client is not a reseller
if(!$app->auth->has_clients($_SESSION['s']['user']['userid'])) unset($this->dataRecord["client_group_id"]);
}
- //* make sure that the email domain is lowercase
+ //* make sure that the domain is lowercase
if(isset($this->dataRecord["domain"])) $this->dataRecord["domain"] = strtolower($this->dataRecord["domain"]);
//* get the server config for this server
@@ -853,73 +1017,93 @@ class page_action extends tform_actions {
$app->uses("getconf");
$web_rec = $app->tform->getDataRecord($this->id);
$web_config = $app->getconf->get_server_config($app->functions->intval($web_rec["server_id"]), 'web');
- $document_root = str_replace("[website_id]", $this->id, $web_config["website_path"]);
- $document_root = str_replace("[website_idhash_1]", $this->id_hash($page_form->id, 1), $document_root);
- $document_root = str_replace("[website_idhash_2]", $this->id_hash($page_form->id, 1), $document_root);
- $document_root = str_replace("[website_idhash_3]", $this->id_hash($page_form->id, 1), $document_root);
- $document_root = str_replace("[website_idhash_4]", $this->id_hash($page_form->id, 1), $document_root);
- // get the ID of the client
- if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) {
- $client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
- $client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = $client_group_id");
- $client_id = $app->functions->intval($client["client_id"]);
- } else {
- //$client_id = $app->functions->intval($this->dataRecord["client_group_id"]);
- $client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = ".$app->functions->intval($this->dataRecord["client_group_id"]));
- $client_id = $app->functions->intval($client["client_id"]);
+ if($this->_vhostdomain_type == 'domain') {
+ $document_root = str_replace("[website_id]", $this->id, $web_config["website_path"]);
+ $document_root = str_replace("[website_idhash_1]", $this->id_hash($page_form->id, 1), $document_root);
+ $document_root = str_replace("[website_idhash_2]", $this->id_hash($page_form->id, 1), $document_root);
+ $document_root = str_replace("[website_idhash_3]", $this->id_hash($page_form->id, 1), $document_root);
+ $document_root = str_replace("[website_idhash_4]", $this->id_hash($page_form->id, 1), $document_root);
+
+ // get the ID of the client
+ if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) {
+ $client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
+ $client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = $client_group_id");
+ $client_id = $app->functions->intval($client["client_id"]);
+ } else {
+ //$client_id = $app->functions->intval($this->dataRecord["client_group_id"]);
+ $client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = ".$app->functions->intval($this->dataRecord["client_group_id"]));
+ $client_id = $app->functions->intval($client["client_id"]);
+ }
+
+ // Set the values for document_root, system_user and system_group
+ $system_user = $app->db->quote('web'.$this->id);
+ $system_group = $app->db->quote('client'.$client_id);
+ $document_root = str_replace("[client_id]", $client_id, $document_root);
+ $document_root = str_replace("[client_idhash_1]", $this->id_hash($client_id, 1), $document_root);
+ $document_root = str_replace("[client_idhash_2]", $this->id_hash($client_id, 2), $document_root);
+ $document_root = str_replace("[client_idhash_3]", $this->id_hash($client_id, 3), $document_root);
+ $document_root = str_replace("[client_idhash_4]", $this->id_hash($client_id, 4), $document_root);
+ $document_root = $app->db->quote($document_root);
+ $php_open_basedir = str_replace("[website_path]", $document_root, $web_config["php_open_basedir"]);
+ $php_open_basedir = $app->db->quote(str_replace("[website_domain]", $web_rec['domain'], $php_open_basedir));
+ $htaccess_allow_override = $app->db->quote($web_config["htaccess_allow_override"]);
+ $added_date = date($app->lng('conf_format_dateshort'));
+ $added_by = $app->db->quote($_SESSION['s']['user']['username']);
+
+ $sql = "UPDATE web_domain SET system_user = '$system_user', system_group = '$system_group', document_root = '$document_root', allow_override = '$htaccess_allow_override', php_open_basedir = '$php_open_basedir', added_date = '$added_date', added_by = '$added_by' WHERE domain_id = ".$this->id;
+ } else {
+ // Set the values for document_root, system_user and system_group
+ $system_user = $app->db->quote($this->parent_domain_record['system_user']);
+ $system_group = $app->db->quote($this->parent_domain_record['system_group']);
+ $document_root = $app->db->quote($this->parent_domain_record['document_root']);
+ $php_open_basedir = str_replace("[website_path]/web", $document_root.'/'.$web_rec['web_folder'], $web_config["php_open_basedir"]);
+ $php_open_basedir = str_replace("[website_domain]/web", $web_rec['domain'].'/'.$web_rec['web_folder'], $php_open_basedir);
+ $php_open_basedir = str_replace("[website_path]", $document_root, $php_open_basedir);
+ $php_open_basedir = $app->db->quote(str_replace("[website_domain]", $web_rec['domain'], $php_open_basedir));
+ $htaccess_allow_override = $app->db->quote($this->parent_domain_record['allow_override']);
+ $added_date = date($app->lng('conf_format_dateshort'));
+ $added_by = $app->db->quote($_SESSION['s']['user']['username']);
+
+ $sql = "UPDATE web_domain SET sys_groupid = ".$app->functions->intval($this->parent_domain_record['sys_groupid']).",system_user = '$system_user', system_group = '$system_group', document_root = '$document_root', allow_override = '$htaccess_allow_override', php_open_basedir = '$php_open_basedir', added_date = '$added_date', added_by = '$added_by' WHERE domain_id = ".$this->id;
}
- // Set the values for document_root, system_user and system_group
- $system_user = $app->db->quote('web'.$this->id);
- $system_group = $app->db->quote('client'.$client_id);
- $document_root = str_replace("[client_id]", $client_id, $document_root);
- $document_root = str_replace("[client_idhash_1]", $this->id_hash($client_id, 1), $document_root);
- $document_root = str_replace("[client_idhash_2]", $this->id_hash($client_id, 2), $document_root);
- $document_root = str_replace("[client_idhash_3]", $this->id_hash($client_id, 3), $document_root);
- $document_root = str_replace("[client_idhash_4]", $this->id_hash($client_id, 4), $document_root);
- $document_root = $app->db->quote($document_root);
- $php_open_basedir = str_replace("[website_path]", $document_root, $web_config["php_open_basedir"]);
- $php_open_basedir = $app->db->quote(str_replace("[website_domain]", $web_rec['domain'], $php_open_basedir));
- $htaccess_allow_override = $app->db->quote($web_config["htaccess_allow_override"]);
- $added_date = date($app->lng('conf_format_dateshort'));
- $added_by = $app->db->quote($_SESSION['s']['user']['username']);
-
- $sql = "UPDATE web_domain SET system_user = '$system_user', system_group = '$system_group', document_root = '$document_root', allow_override = '$htaccess_allow_override', php_open_basedir = '$php_open_basedir', added_date = '$added_date', added_by = '$added_by' WHERE domain_id = ".$this->id;
$app->db->query($sql);
}
function onBeforeUpdate () {
global $app, $conf;
- //* Check if the server has been changed
- // We do this only for the admin or reseller users, as normal clients can not change the server ID anyway
- if($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
- if (isset($this->dataRecord["server_id"])) {
- $rec = $app->db->queryOneRecord("SELECT server_id from web_domain WHERE domain_id = ".$this->id);
- if($rec['server_id'] != $this->dataRecord["server_id"]) {
+ if($this->_vhostdomain_type == 'domain') {
+ //* Check if the server has been changed
+ // We do this only for the admin or reseller users, as normal clients can not change the server ID anyway
+ if($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
+ if (isset($this->dataRecord["server_id"])) {
+ $rec = $app->db->queryOneRecord("SELECT server_id from web_domain WHERE domain_id = ".$this->id);
+ if($rec['server_id'] != $this->dataRecord["server_id"]) {
+ //* Add a error message and switch back to old server
+ $app->tform->errorMessage .= $app->lng('The Server can not be changed.');
+ $this->dataRecord["server_id"] = $rec['server_id'];
+ }
+ unset($rec);
+ }
+ //* If the user is neither admin nor reseller
+ } else {
+ //* We do not allow users to change a domain which has been created by the admin
+ $rec = $app->db->queryOneRecord("SELECT sys_perm_group, domain, ip_address, ipv6_address from web_domain WHERE domain_id = ".$this->id);
+ if(isset($this->dataRecord["domain"]) && $rec['domain'] != $this->dataRecord["domain"] && $app->tform->checkPerm($this->id, 'u')) {
//* Add a error message and switch back to old server
- $app->tform->errorMessage .= $app->lng('The Server can not be changed.');
- $this->dataRecord["server_id"] = $rec['server_id'];
+ $app->tform->errorMessage .= $app->lng('The Domain can not be changed. Please ask your Administrator if you want to change the domain name.');
+ $this->dataRecord["domain"] = $rec['domain'];
+ }
+ if(isset($this->dataRecord["ip_address"]) && $rec['ip_address'] != $this->dataRecord["ip_address"] && $rec['sys_perm_group'] != 'riud') {
+ $this->dataRecord["ip_address"] = $rec['ip_address'];
+ }
+ if(isset($this->dataRecord["ipv6_address"]) && $rec['ipv6_address'] != $this->dataRecord["ipv6_address"] && $rec['sys_perm_group'] != 'riud') {
+ $this->dataRecord["ipv6_address"] = $rec['ipv6_address'];
}
unset($rec);
}
- //* If the user is neither admin nor reseller
- } else {
- //* We do not allow users to change a domain which has been created by the admin
- $rec = $app->db->queryOneRecord("SELECT sys_perm_group, domain, ip_address, ipv6_address from web_domain WHERE domain_id = ".$this->id);
- if(isset($this->dataRecord["domain"]) && $rec['domain'] != $this->dataRecord["domain"] && $app->tform->checkPerm($this->id, 'u')) {
- //* Add a error message and switch back to old server
- $app->tform->errorMessage .= $app->lng('The Domain can not be changed. Please ask your Administrator if you want to change the domain name.');
- $this->dataRecord["domain"] = $rec['domain'];
- }
- if(isset($this->dataRecord["ip_address"]) && $rec['ip_address'] != $this->dataRecord["ip_address"] && $rec['sys_perm_group'] != 'riud') {
- $this->dataRecord["ip_address"] = $rec['ip_address'];
- }
- if(isset($this->dataRecord["ipv6_address"]) && $rec['ipv6_address'] != $this->dataRecord["ipv6_address"] && $rec['sys_perm_group'] != 'riud') {
- $this->dataRecord["ipv6_address"] = $rec['ipv6_address'];
- }
- unset($rec);
}
//* Check that all fields for the SSL cert creation are filled
@@ -937,195 +1121,6 @@ class page_action extends tform_actions {
}
- function onAfterUpdate() {
- global $app, $conf;
-
- // make sure that the record belongs to the client group and not the admin group when a admin inserts it
- // also make sure that the user can not delete domain created by a admin
- if($_SESSION["s"]["user"]["typ"] == 'admin' && isset($this->dataRecord["client_group_id"])) {
- $client_group_id = $app->functions->intval($this->dataRecord["client_group_id"]);
- $app->db->query("UPDATE web_domain SET sys_groupid = $client_group_id, sys_perm_group = 'ru' WHERE domain_id = ".$this->id);
- }
- if($app->auth->has_clients($_SESSION['s']['user']['userid']) && isset($this->dataRecord["client_group_id"])) {
- $client_group_id = $app->functions->intval($this->dataRecord["client_group_id"]);
- $app->db->query("UPDATE web_domain SET sys_groupid = $client_group_id, sys_perm_group = 'riud' WHERE domain_id = ".$this->id);
- }
-
- // Get configuration for the web system
- $app->uses("getconf");
- $web_rec = $app->tform->getDataRecord($this->id);
- $web_config = $app->getconf->get_server_config($app->functions->intval($web_rec["server_id"]), 'web');
- $document_root = str_replace("[website_id]", $this->id, $web_config["website_path"]);
- $page_formid = isset($page_form->id) ? $page_form->id : '';
- $document_root = str_replace("[website_idhash_1]", $this->id_hash($page_formid, 1), $document_root);
- $document_root = str_replace("[website_idhash_2]", $this->id_hash($page_formid, 1), $document_root);
- $document_root = str_replace("[website_idhash_3]", $this->id_hash($page_formid, 1), $document_root);
- $document_root = str_replace("[website_idhash_4]", $this->id_hash($page_formid, 1), $document_root);
-
- // get the ID of the client
- if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) {
- $client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
- $client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = $client_group_id");
- $client_id = $app->functions->intval($client["client_id"]);
- } elseif (isset($this->dataRecord["client_group_id"])) {
- $client_group_id = $this->dataRecord["client_group_id"];
- $client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = ".$app->functions->intval(@$this->dataRecord["client_group_id"]));
- $client_id = $app->functions->intval($client["client_id"]);
- } else {
- $client_group_id = $web_rec['sys_groupid'];
- $client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = ".$app->functions->intval($client_group_id));
- $client_id = $app->functions->intval($client["client_id"]);
- }
-
- if(($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) && isset($this->dataRecord["client_group_id"]) && $this->dataRecord["client_group_id"] != $this->oldDataRecord["sys_groupid"]) {
- // Set the values for document_root, system_user and system_group
- $system_user = $app->db->quote('web'.$this->id);
- $system_group = $app->db->quote('client'.$client_id);
- $document_root = str_replace("[client_id]", $client_id, $document_root);
- $document_root = str_replace("[client_idhash_1]", $this->id_hash($client_id, 1), $document_root);
- $document_root = str_replace("[client_idhash_2]", $this->id_hash($client_id, 2), $document_root);
- $document_root = str_replace("[client_idhash_3]", $this->id_hash($client_id, 3), $document_root);
- $document_root = str_replace("[client_idhash_4]", $this->id_hash($client_id, 4), $document_root);
- $document_root = $app->db->quote($document_root);
-
- $sql = "UPDATE web_domain SET system_user = '$system_user', system_group = '$system_group', document_root = '$document_root' WHERE domain_id = ".$this->id;
- //$sql = "UPDATE web_domain SET system_user = '$system_user', system_group = '$system_group' WHERE domain_id = ".$this->id;
- $app->db->query($sql);
-
- // Update the FTP user(s) too
- $records = $app->db->queryAllRecords("SELECT ftp_user_id FROM ftp_user WHERE parent_domain_id = ".$this->id);
- foreach($records as $rec) {
- $app->db->datalogUpdate('ftp_user', "sys_userid = '".$app->functions->intval($web_rec['sys_userid'])."', sys_groupid = '".$app->functions->intval($web_rec['sys_groupid'])."', uid = '$system_user', gid = '$system_group', dir = '$document_root'", 'ftp_user_id', $app->functions->intval($rec['ftp_user_id']));
- }
- unset($records);
- unset($rec);
-
- // Update the Shell user(s) too
- $records = $app->db->queryAllRecords("SELECT shell_user_id FROM shell_user WHERE parent_domain_id = ".$this->id);
- foreach($records as $rec) {
- $app->db->datalogUpdate('shell_user', "sys_userid = '".$web_rec['sys_userid']."', sys_groupid = '".$web_rec['sys_groupid']."', puser = '$system_user', pgroup = '$system_group', dir = '$document_root'", 'shell_user_id', $app->functions->intval($rec['shell_user_id']));
- }
- unset($records);
- unset($rec);
-
- //* Update all subdomains and alias domains
- $records = $app->db->queryAllRecords("SELECT domain_id, `domain`, `type`, `web_folder` FROM web_domain WHERE parent_domain_id = ".$this->id);
- foreach($records as $rec) {
- $update_columns = "sys_userid = '".$web_rec['sys_userid']."', sys_groupid = '".$web_rec['sys_groupid']."'";
- if($rec['type'] == 'vhostsubdomain' || $rec['type'] == 'vhostalias') {
- $php_open_basedir = str_replace("[website_path]/web", $document_root.'/'.$rec['web_folder'], $web_config["php_open_basedir"]);
- $php_open_basedir = str_replace("[website_domain]/web", $rec['domain'].'/'.$rec['web_folder'], $php_open_basedir);
- $php_open_basedir = str_replace("[website_path]", $document_root, $php_open_basedir);
- $php_open_basedir = $app->db->quote(str_replace("[website_domain]", $rec['domain'], $php_open_basedir));
-
- $update_columns .= ", document_root = '".$document_root."', `php_open_basedir` = '".$php_open_basedir."'";
- }
- $app->db->datalogUpdate('web_domain', $update_columns, 'domain_id', $rec['domain_id']);
- }
- unset($records);
- unset($rec);
-
- //* Update all databases
- $records = $app->db->queryAllRecords("SELECT database_id FROM web_database WHERE parent_domain_id = ".$this->id);
- foreach($records as $rec) {
- $app->db->datalogUpdate('web_database', "sys_userid = '".$app->functions->intval($web_rec['sys_userid'])."', sys_groupid = '".$app->functions->intval($web_rec['sys_groupid'])."'", 'database_id', $app->functions->intval($rec['database_id']));
- }
- unset($records);
- unset($rec);
-
- }
-
- //* If the domain name has been changed, we will have to change all subdomains + APS instances
- if(!empty($this->dataRecord["domain"]) && !empty($this->oldDataRecord["domain"]) && $this->dataRecord["domain"] != $this->oldDataRecord["domain"]) {
- $records = $app->db->queryAllRecords("SELECT domain_id,domain FROM web_domain WHERE (type = 'subdomain' OR type = 'vhostsubdomain' OR type = 'vhostalias') AND domain LIKE '%.".$app->db->quote($this->oldDataRecord["domain"])."'");
- foreach($records as $rec) {
- $subdomain = $app->db->quote(str_replace($this->oldDataRecord["domain"], $this->dataRecord["domain"], $rec['domain']));
- $app->db->datalogUpdate('web_domain', "domain = '".$subdomain."'", 'domain_id', $rec['domain_id']);
- }
- unset($records);
- unset($rec);
- unset($subdomain);
-
- // Update APS instances
- $records = $app->db->queryAllRecords("SELECT id, instance_id FROM aps_instances_settings WHERE name = 'main_domain' AND value = '".$app->db->quote($this->oldDataRecord["domain"])."'");
- if(is_array($records) && !empty($records)){
- foreach($records as $rec){
- $app->db->datalogUpdate('aps_instances_settings', "value = '".$app->db->quote($this->dataRecord["domain"])."'", 'id', $rec['id']);
- // Reinstall of package needed?
- //$app->db->datalogUpdate('aps_instances', "instance_status = '1'", 'id', $rec['instance_id']);
- }
- }
- unset($records);
- unset($rec);
- }
-
- //* Set allow_override if empty
- if($web_rec['allow_override'] == '') {
- $sql = "UPDATE web_domain SET allow_override = '".$app->db->quote($web_config["htaccess_allow_override"])."' WHERE domain_id = ".$this->id;
- $app->db->query($sql);
- }
-
- //* Set php_open_basedir if empty or domain or client has been changed
- if(empty($web_rec['php_open_basedir']) ||
- (!empty($this->dataRecord["domain"]) && !empty($this->oldDataRecord["domain"]) && $this->dataRecord["domain"] != $this->oldDataRecord["domain"])) {
- $php_open_basedir = $web_rec['php_open_basedir'];
- $php_open_basedir = $app->db->quote(str_replace($this->oldDataRecord['domain'], $web_rec['domain'], $php_open_basedir));
- $sql = "UPDATE web_domain SET php_open_basedir = '$php_open_basedir' WHERE domain_id = ".$this->id;
- $app->db->query($sql);
- }
- if(empty($web_rec['php_open_basedir']) ||
- (isset($this->dataRecord["client_group_id"]) && $this->dataRecord["client_group_id"] != $this->oldDataRecord["sys_groupid"])) {
- $document_root = $app->db->quote(str_replace("[client_id]", $client_id, $document_root));
- $php_open_basedir = str_replace("[website_path]", $document_root, $web_config["php_open_basedir"]);
- $php_open_basedir = $app->db->quote(str_replace("[website_domain]", $web_rec['domain'], $php_open_basedir));
- $sql = "UPDATE web_domain SET php_open_basedir = '$php_open_basedir' WHERE domain_id = ".$this->id;
- $app->db->query($sql);
- }
-
- //* Change database backup options when web backup options have been changed
- if(isset($this->dataRecord['backup_interval']) && ($this->dataRecord['backup_interval'] != $this->oldDataRecord['backup_interval'] || $this->dataRecord['backup_copies'] != $this->oldDataRecord['backup_copies'])) {
- //* Update all databases
- $backup_interval = $app->functions->intval($this->dataRecord['backup_interval']);
- $backup_copies = $app->functions->intval($this->dataRecord['backup_copies']);
- $records = $app->db->queryAllRecords("SELECT database_id FROM web_database WHERE parent_domain_id = ".$this->id);
- foreach($records as $rec) {
- $app->db->datalogUpdate('web_database', "backup_interval = '$backup_interval', backup_copies = '$backup_copies'", 'database_id', $rec['database_id']);
- }
- unset($records);
- unset($rec);
- unset($backup_copies);
- unset($backup_interval);
- }
-
- //* Change vhost subdomain and alias ip/ipv6 if domain ip/ipv6 has changed
- if(isset($this->dataRecord['ip_address']) && ($this->dataRecord['ip_address'] != $this->oldDataRecord['ip_address'] || $this->dataRecord['ipv6_address'] != $this->oldDataRecord['ipv6_address'])) {
- $records = $app->db->queryAllRecords("SELECT domain_id FROM web_domain WHERE (type = 'vhostsubdomain' OR type = 'vhostalias') AND parent_domain_id = ".$this->id);
- foreach($records as $rec) {
- $app->db->datalogUpdate('web_domain', "ip_address = '".$app->db->quote($web_rec['ip_address'])."', ipv6_address = '".$app->db->quote($web_rec['ipv6_address'])."'", 'domain_id', $rec['domain_id']);
- }
- unset($records);
- unset($rec);
- }
- }
-
- function onAfterDelete() {
- global $app, $conf;
-
- // Delete the sub and alias domains
- $child_domains = $app->db->queryAllRecords("SELECT * FROM web_domain WHERE parent_domain_id = ".$this->id);
- foreach($child_domains as $d) {
- // Saving record to datalog when db_history enabled
- if($app->tform->formDef["db_history"] == 'yes') {
- $app->tform->datalogSave('DELETE', $d["domain_id"], $d, array());
- }
-
- $app->db->query("DELETE FROM web_domain WHERE domain_id = ".$app->functions->intval($d["domain_id"])." LIMIT 0,1");
- }
- unset($child_domains);
- unset($d);
-
- }
-
}
$page = new page_action;
diff --git a/interface/web/sites/web_vhost_subdomain_del.php b/interface/web/sites/web_vhost_domain_list.php
similarity index 59%
rename from interface/web/sites/web_vhost_subdomain_del.php
rename to interface/web/sites/web_vhost_domain_list.php
index f64ff6647d78c0968650b47468ae9b74cac6fc75..f2089e210b1e45611e56ddd5ee72554c282cc677 100644
--- a/interface/web/sites/web_vhost_subdomain_del.php
+++ b/interface/web/sites/web_vhost_domain_list.php
@@ -28,46 +28,56 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+require_once '../../lib/config.inc.php';
+require_once '../../lib/app.inc.php';
+
/******************************************
* Begin Form configuration
******************************************/
-$list_def_file = "list/web_vhost_subdomain.list.php";
-$tform_def_file = "form/web_vhost_subdomain.tform.php";
+$list_def_file = "list/web_vhost_domain.list.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('sites');
-$app->uses('tpl,tform,tform_actions');
-$app->load("tform_actions");
-class page_action extends tform_actions {
-
- function onBeforeDelete() {
- global $app; $conf;
+$app->load('listform_actions');
+
+//* Get and set the vhost domain type - store in session
+$query_type = 'vhost';
+$show_type = 'domain';
+if(isset($_GET['type']) && $_GET['type'] == 'subdomain') {
+ $show_type = 'subdomain';
+ $query_type = 'vhostsubdomain';
+} elseif(isset($_GET['type']) && $_GET['type'] == 'aliasdomain') {
+ $show_type = 'aliasdomain';
+ $query_type = 'vhostalias';
+} elseif(!isset($_GET['type']) && isset($_SESSION['s']['var']['vhostdomain_type']) && $_SESSION['s']['var']['vhostdomain_type'] == 'subdomain') {
+ $show_type = 'subdomain';
+ $query_type = 'vhostsubdomain';
+} elseif(!isset($_GET['type']) && isset($_SESSION['s']['var']['vhostdomain_type']) && $_SESSION['s']['var']['vhostdomain_type'] == 'aliasdomain') {
+ $show_type = 'aliasdomain';
+ $query_type = 'vhostalias';
+}
- //* Delete all web folders
- $records = $app->db->queryAllRecords("SELECT web_folder_id FROM web_folder WHERE parent_domain_id = '".$app->functions->intval($this->id)."'");
- foreach($records as $rec) {
- //* Delete all web folder users
- $records2 = $app->db->queryAllRecords("SELECT web_folder_user_id FROM web_folder_user WHERE web_folder_id = '".$app->functions->intval($rec['web_folder_id'])."'");
- foreach($records2 as $rec2) {
- $app->db->datalogDelete('web_folder_user', 'web_folder_user_id', $rec2['web_folder_user_id']);
- }
- $app->db->datalogDelete('web_folder', 'web_folder_id', $rec['web_folder_id']);
- }
+$_SESSION['s']['var']['vhostdomain_type'] = $show_type;
+class list_action extends listform_actions {
+ function onShow() {
+ global $app;
+ $app->tpl->setVar('vhostdomain_type', $_SESSION['s']['var']['vhostdomain_type']);
+
+ parent::onShow();
}
}
-$page = new page_action;
-$page->onDelete();
+$list = new list_action;
+$list->SQLExtWhere = "web_domain.type = '" . $query_type . "'" . ($show_type != 'domain' ? " AND web_domain.parent_domain_id = '0'" : "");
+$list->SQLOrderBy = 'ORDER BY web_domain.domain';
+$list->onLoad();
?>
diff --git a/interface/web/sites/web_vhost_subdomain_edit.php b/interface/web/sites/web_vhost_subdomain_edit.php
deleted file mode 100644
index 3a228c5dac668a74828b5bc7f6a39d991aab4ef9..0000000000000000000000000000000000000000
--- a/interface/web/sites/web_vhost_subdomain_edit.php
+++ /dev/null
@@ -1,666 +0,0 @@
-<?php
-/*
-Copyright (c) 2007 - 2009, Till Brehm, projektfarm Gmbh
-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/web_vhost_subdomain.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('sites');
-
-// Loading classes
-$app->uses('tpl,tform,tform_actions,tools_sites');
-$app->load('tform_actions');
-
-class page_action extends tform_actions {
-
- //* Returna a "3/2/1" path hash from a numeric id '123'
- function id_hash($id, $levels) {
- $hash = "" . $id % 10 ;
- $id /= 10 ;
- $levels -- ;
- while ( $levels > 0 ) {
- $hash .= "/" . $id % 10 ;
- $id /= 10 ;
- $levels-- ;
- }
- return $hash;
- }
-
- function onShowNew() {
- global $app, $conf;
-
- // we will check only users, not admins
- if($_SESSION["s"]["user"]["typ"] == 'user') {
- if(!$app->tform->checkClientLimit('limit_web_subdomain', "(type = 'subdomain' OR type = 'vhostsubdomain')")) {
- $app->error($app->tform->wordbook["limit_web_subdomain_txt"]);
- }
- if(!$app->tform->checkResellerLimit('limit_web_subdomain', "(type = 'subdomain' OR type = 'vhostsubdomain')")) {
- $app->error('Reseller: '.$app->tform->wordbook["limit_web_subdomain_txt"]);
- }
- }
- parent::onShowNew();
- }
-
- function onShowEnd() {
- global $app, $conf;
-
- $app->uses('ini_parser,getconf');
-
- $read_limits = array('limit_cgi', 'limit_ssi', 'limit_perl', 'limit_ruby', 'limit_python', 'force_suexec', 'limit_hterror', 'limit_wildcard', 'limit_ssl');
-
- $parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]));
-
- //* Client: If the logged in user is not admin and has no sub clients (no reseller)
- if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) {
-
- // Get the limits of the client
- $client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
- $client = $app->db->queryOneRecord("SELECT client.limit_web_subdomain, client.default_webserver, client." . implode(", client.", $read_limits) . " FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
-
- //* Get global web config
- $web_config = $app->getconf->get_server_config($parent_domain['server_id'], 'web');
-
- //PHP Version Selection (FastCGI)
- $server_type = 'apache';
- if(!empty($web_config['server_type'])) $server_type = $web_config['server_type'];
- if($server_type == 'nginx' && $this->dataRecord['php'] == 'fast-cgi') $this->dataRecord['php'] = 'php-fpm';
- if($this->dataRecord['php'] == 'php-fpm'){
- $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ".$app->functions->intval($parent_domain['server_id'])." AND (client_id = 0 OR client_id=".$app->functions->intval($_SESSION['s']['user']['client_id']).")");
- }
- if($this->dataRecord['php'] == 'fast-cgi'){
- $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ".$app->functions->intval($parent_domain['server_id'])." AND (client_id = 0 OR client_id=".$app->functions->intval($_SESSION['s']['user']['client_id']).")");
- }
- $php_select = "<option value=''>Default</option>";
- if(is_array($php_records) && !empty($php_records)) {
- foreach( $php_records as $php_record) {
- if($this->dataRecord['php'] == 'php-fpm'){
- $php_version = $php_record['name'].':'.$php_record['php_fpm_init_script'].':'.$php_record['php_fpm_ini_dir'].':'.$php_record['php_fpm_pool_dir'];
- } else {
- $php_version = $php_record['name'].':'.$php_record['php_fastcgi_binary'].':'.$php_record['php_fastcgi_ini_dir'];
- }
- $selected = ($php_version == $this->dataRecord["fastcgi_php_version"])?'SELECTED':'';
- $php_select .= "<option value='$php_version' $selected>".$php_record['name']."</option>\r\n";
- }
- }
- $app->tpl->setVar("fastcgi_php_version", $php_select);
- unset($php_records);
-
- // add limits to template to be able to hide settings
- foreach($read_limits as $limit) $app->tpl->setVar($limit, $client[$limit]);
-
-
- //* Reseller: If the logged in user is not admin and has sub clients (is a reseller)
- } elseif ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
-
- // Get the limits of the client
- $client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
- $client = $app->db->queryOneRecord("SELECT client.client_id, client.limit_web_subdomain, client.default_webserver, client.contact_name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname, sys_group.name, client." . implode(", client.", $read_limits) . " FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
-
- //* Get global web config
- $web_config = $app->getconf->get_server_config($parent_domain['server_id'], 'web');
-
- //PHP Version Selection (FastCGI)
- $server_type = 'apache';
- if(!empty($web_config['server_type'])) $server_type = $web_config['server_type'];
- if($server_type == 'nginx' && $this->dataRecord['php'] == 'fast-cgi') $this->dataRecord['php'] = 'php-fpm';
- if($this->dataRecord['php'] == 'php-fpm'){
- $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ".$app->functions->intval($parent_domain['server_id'])." AND (client_id = 0 OR client_id=".$app->functions->intval($_SESSION['s']['user']['client_id']).")");
- }
- if($this->dataRecord['php'] == 'fast-cgi') {
- $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ".$app->functions->intval($parent_domain['server_id'])." AND (client_id = 0 OR client_id=".$app->functions->intval($_SESSION['s']['user']['client_id']).")");
- }
- $php_select = "<option value=''>Default</option>";
- if(is_array($php_records) && !empty($php_records)) {
- foreach( $php_records as $php_record) {
- if($this->dataRecord['php'] == 'php-fpm'){
- $php_version = $php_record['name'].':'.$php_record['php_fpm_init_script'].':'.$php_record['php_fpm_ini_dir'].':'.$php_record['php_fpm_pool_dir'];
- } else {
- $php_version = $php_record['name'].':'.$php_record['php_fastcgi_binary'].':'.$php_record['php_fastcgi_ini_dir'];
- }
- $selected = ($php_version == $this->dataRecord["fastcgi_php_version"])?'SELECTED':'';
- $php_select .= "<option value='$php_version' $selected>".$php_record['name']."</option>\r\n";
- }
- }
- $app->tpl->setVar("fastcgi_php_version", $php_select);
- unset($php_records);
-
- // add limits to template to be able to hide settings
- foreach($read_limits as $limit) $app->tpl->setVar($limit, $client[$limit]);
-
- $sites_config = $app->getconf->get_global_config('sites');
- if($sites_config['reseller_can_use_options']) {
- // Directive Snippets
- $php_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'php' AND active = 'y'");
- $php_directive_snippets_txt = '';
- if(is_array($php_directive_snippets) && !empty($php_directive_snippets)){
- foreach($php_directive_snippets as $php_directive_snippet){
- $php_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$php_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$php_directive_snippet['snippet'].'</pre></a> ';
- }
- }
- if($php_directive_snippets_txt == '') $php_directive_snippets_txt = '------';
- $app->tpl->setVar("php_directive_snippets_txt", $php_directive_snippets_txt);
-
- if($server_type == 'apache'){
- $apache_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'apache' AND active = 'y'");
- $apache_directive_snippets_txt = '';
- if(is_array($apache_directive_snippets) && !empty($apache_directive_snippets)){
- foreach($apache_directive_snippets as $apache_directive_snippet){
- $apache_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$apache_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$apache_directive_snippet['snippet'].'</pre></a> ';
- }
- }
- if($apache_directive_snippets_txt == '') $apache_directive_snippets_txt = '------';
- $app->tpl->setVar("apache_directive_snippets_txt", $apache_directive_snippets_txt);
- }
-
- if($server_type == 'nginx'){
- $nginx_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'nginx' AND active = 'y'");
- $nginx_directive_snippets_txt = '';
- if(is_array($nginx_directive_snippets) && !empty($nginx_directive_snippets)){
- foreach($nginx_directive_snippets as $nginx_directive_snippet){
- $nginx_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$nginx_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$nginx_directive_snippet['snippet'].'</pre></a> ';
- }
- }
- if($nginx_directive_snippets_txt == '') $nginx_directive_snippets_txt = '------';
- $app->tpl->setVar("nginx_directive_snippets_txt", $nginx_directive_snippets_txt);
- }
-
- $proxy_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'proxy' AND active = 'y'");
- $proxy_directive_snippets_txt = '';
- if(is_array($proxy_directive_snippets) && !empty($proxy_directive_snippets)){
- foreach($proxy_directive_snippets as $proxy_directive_snippet){
- $proxy_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$proxy_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$proxy_directive_snippet['snippet'].'</pre></a> ';
- }
- }
- if($proxy_directive_snippets_txt == '') $proxy_directive_snippets_txt = '------';
- $app->tpl->setVar("proxy_directive_snippets_txt", $proxy_directive_snippets_txt);
- }
-
- //* Admin: If the logged in user is admin
- } else {
-
- //* get global web config
- $web_config = $app->getconf->get_server_config($parent_domain['server_id'], 'web');
-
- //PHP Version Selection (FastCGI)
- $server_type = 'apache';
- if(!empty($web_config['server_type'])) $server_type = $web_config['server_type'];
- if($server_type == 'nginx' && $this->dataRecord['php'] == 'fast-cgi') $this->dataRecord['php'] = 'php-fpm';
- if($this->dataRecord['php'] == 'php-fpm'){
- $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = " . $app->functions->intval($parent_domain['server_id']));
- }
- if($this->dataRecord['php'] == 'fast-cgi') {
- $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = " . $app->functions->intval($parent_domain['server_id']));
- }
- $php_select = "<option value=''>Default</option>";
- if(is_array($php_records) && !empty($php_records)) {
- foreach( $php_records as $php_record) {
- if($this->dataRecord['php'] == 'php-fpm'){
- $php_version = $php_record['name'].':'.$php_record['php_fpm_init_script'].':'.$php_record['php_fpm_ini_dir'].':'.$php_record['php_fpm_pool_dir'];
- } else {
- $php_version = $php_record['name'].':'.$php_record['php_fastcgi_binary'].':'.$php_record['php_fastcgi_ini_dir'];
- }
- $selected = ($php_version == $this->dataRecord["fastcgi_php_version"])?'SELECTED':'';
- $php_select .= "<option value='$php_version' $selected>".$php_record['name']."</option>\r\n";
- }
- }
- $app->tpl->setVar("fastcgi_php_version", $php_select);
- unset($php_records);
-
- foreach($read_limits as $limit) $app->tpl->setVar($limit, ($limit == 'force_suexec' ? 'n' : 'y'));
-
- // Directive Snippets
- $php_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'php' AND active = 'y'");
- $php_directive_snippets_txt = '';
- if(is_array($php_directive_snippets) && !empty($php_directive_snippets)){
- foreach($php_directive_snippets as $php_directive_snippet){
- $php_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$php_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$php_directive_snippet['snippet'].'</pre></a> ';
- }
- }
- if($php_directive_snippets_txt == '') $php_directive_snippets_txt = '------';
- $app->tpl->setVar("php_directive_snippets_txt", $php_directive_snippets_txt);
-
- if($server_type == 'apache'){
- $apache_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'apache' AND active = 'y'");
- $apache_directive_snippets_txt = '';
- if(is_array($apache_directive_snippets) && !empty($apache_directive_snippets)){
- foreach($apache_directive_snippets as $apache_directive_snippet){
- $apache_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$apache_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$apache_directive_snippet['snippet'].'</pre></a> ';
- }
- }
- if($apache_directive_snippets_txt == '') $apache_directive_snippets_txt = '------';
- $app->tpl->setVar("apache_directive_snippets_txt", $apache_directive_snippets_txt);
- }
-
- if($server_type == 'nginx'){
- $nginx_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'nginx' AND active = 'y'");
- $nginx_directive_snippets_txt = '';
- if(is_array($nginx_directive_snippets) && !empty($nginx_directive_snippets)){
- foreach($nginx_directive_snippets as $nginx_directive_snippet){
- $nginx_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$nginx_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$nginx_directive_snippet['snippet'].'</pre></a> ';
- }
- }
- if($nginx_directive_snippets_txt == '') $nginx_directive_snippets_txt = '------';
- $app->tpl->setVar("nginx_directive_snippets_txt", $nginx_directive_snippets_txt);
- }
-
- $proxy_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'proxy' AND active = 'y'");
- $proxy_directive_snippets_txt = '';
- if(is_array($proxy_directive_snippets) && !empty($proxy_directive_snippets)){
- foreach($proxy_directive_snippets as $proxy_directive_snippet){
- $proxy_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$proxy_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$proxy_directive_snippet['snippet'].'</pre></a> ';
- }
- }
- if($proxy_directive_snippets_txt == '') $proxy_directive_snippets_txt = '------';
- $app->tpl->setVar("proxy_directive_snippets_txt", $proxy_directive_snippets_txt);
- }
-
- $ssl_domain_select = '';
- $tmp = $app->db->queryOneRecord("SELECT domain FROM web_domain WHERE domain_id = ".$this->id);
- $ssl_domains = array($tmp["domain"], 'www.'.$tmp["domain"]);
- if(is_array($ssl_domains)) {
- foreach( $ssl_domains as $ssl_domain) {
- $selected = ($ssl_domain == $this->dataRecord['ssl_domain'])?'SELECTED':'';
- $ssl_domain_select .= "<option value='$ssl_domain' $selected>$ssl_domain</option>\r\n";
- }
- }
-
- if($this->id > 0) {
- $app->tpl->setVar('fixed_folder', 'y');
- $app->tpl->setVar('server_id_value', $parent_domain['server_id']);
- } else {
- $app->tpl->setVar('fixed_folder', 'n');
- $app->tpl->setVar('server_id_value', $parent_domain['server_id']);
- }
-
- $app->tpl->setVar("ssl_domain", $ssl_domain_select);
- unset($ssl_domain_select);
- unset($ssl_domains);
- unset($ssl_domain);
-
- $tmp_txt = ($this->dataRecord['traffic_quota_lock'] == 'y')?'<b>('.$app->tform->lng('traffic_quota_exceeded_txt').')</b>':'';
- $app->tpl->setVar("traffic_quota_exceeded_txt", $tmp_txt);
-
-
- $app->uses('ini_parser,getconf');
- $settings = $app->getconf->get_global_config('domains');
- if ($settings['use_domain_module'] == 'y') {
- /*
- * The domain-module is in use.
- */
- $domains = $app->tools_sites->getDomainModuleDomains();
- $domain_select = '';
- $selected_domain = '';
- if(is_array($domains) && sizeof($domains) > 0) {
- /* We have domains in the list, so create the drop-down-list */
- foreach( $domains as $domain) {
- $domain_select .= "<option value=" . $domain['domain_id'] ;
- if ('.' . $domain['domain'] == substr($this->dataRecord["domain"], -strlen($domain['domain']) - 1)) {
- $domain_select .= " selected";
- $selected_domain = $domain['domain'];
- }
- $domain_select .= ">" . $app->functions->idn_decode($domain['domain']) . "</option>\r\n";
- }
- }
- else {
- /*
- * We have no domains in the domain-list. This means, we can not add ANY new domain.
- * To avoid, that the variable "domain_option" is empty and so the user can
- * free enter a domain, we have to create a empty option!
- */
- $domain_select .= "<option value=''></option>\r\n";
- }
- $app->tpl->setVar("domain_option", $domain_select);
- $this->dataRecord['domain'] = substr($this->dataRecord["domain"], 0, strlen($this->dataRecord['domain']) - strlen($selected_domain) - 1);
- } else {
-
- // remove the parent domain part of the domain name before we show it in the text field.
- $this->dataRecord["domain"] = str_replace('.'.$parent_domain["domain"], '', $this->dataRecord["domain"]);
- }
- $app->tpl->setVar("domain", $this->dataRecord["domain"]);
-
- parent::onShowEnd();
- }
-
- function onSubmit() {
- global $app, $conf;
-
- // Get the record of the parent domain
- if(!@$this->dataRecord["parent_domain_id"] && $this->id) {
- $tmp = $app->db->queryOneRecord("SELECT parent_domain_id FROM web_domain WHERE domain_id = ".$app->functions->intval($this->id));
- if($tmp) $this->dataRecord["parent_domain_id"] = $tmp['parent_domain_id'];
- unset($tmp);
- }
-
- $parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]) . " AND ".$app->tform->getAuthSQL('r'));
- if(!$parent_domain || $parent_domain['domain_id'] != @$this->dataRecord['parent_domain_id']) $app->tform->errorMessage .= $app->tform->lng("no_domain_perm");
-
- // Set a few fixed values
- $this->dataRecord["type"] = 'vhostsubdomain';
- $this->dataRecord["server_id"] = $parent_domain["server_id"];
- $this->dataRecord["ip_address"] = $parent_domain["ip_address"];
- $this->dataRecord["ipv6_address"] = $parent_domain["ipv6_address"];
- $this->dataRecord["client_group_id"] = $parent_domain["client_group_id"];
- $this->dataRecord["vhost_type"] = 'name';
-
- $this->parent_domain_record = $parent_domain;
-
- $read_limits = array('limit_cgi', 'limit_ssi', 'limit_perl', 'limit_ruby', 'limit_python', 'force_suexec', 'limit_hterror', 'limit_wildcard', 'limit_ssl');
-
- if($app->tform->getCurrentTab() == 'domain') {
-
- /* check if the domain module is used - and check if the selected domain can be used! */
- $app->uses('ini_parser,getconf');
- $settings = $app->getconf->get_global_config('domains');
- if ($settings['use_domain_module'] == 'y') {
- $domain_check = $app->tools_sites->checkDomainModuleDomain($this->dataRecord['sel_domain']);
- if(!$domain_check) {
- // invalid domain selected
- $app->tform->errorMessage .= $app->tform->lng("domain_error_empty")."<br />";
- } else {
- $this->dataRecord['domain'] = $this->dataRecord['domain'] . '.' . $domain_check;
- }
- } else {
- $this->dataRecord["domain"] = $this->dataRecord["domain"].'.'.$parent_domain["domain"];
- }
-
-
- $this->dataRecord['web_folder'] = strtolower($this->dataRecord['web_folder']);
- if(substr($this->dataRecord['web_folder'], 0, 1) === '/') $this->dataRecord['web_folder'] = substr($this->dataRecord['web_folder'], 1);
- if(substr($this->dataRecord['web_folder'], -1) === '/') $this->dataRecord['web_folder'] = substr($this->dataRecord['web_folder'], 0, -1);
- $forbidden_folders = array('', 'cgi-bin', 'log', 'private', 'ssl', 'tmp', 'webdav');
- $check_folder = strtolower($this->dataRecord['web_folder']);
- if(substr($check_folder, 0, 1) === '/') $check_folder = substr($check_folder, 1); // strip / at beginning to check against forbidden entries
- if(strpos($check_folder, '/') !== false) $check_folder = substr($check_folder, 0, strpos($check_folder, '/')); // get the first part of the path to check it
- if(in_array($check_folder, $forbidden_folders)) {
- $app->tform->errorMessage .= $app->tform->lng("web_folder_invalid_txt")."<br>";
- }
-
- // vhostsubdomains do not have a quota of their own
- $this->dataRecord["hd_quota"] = 0;
-
- // check for duplicate folder usage
- /*
- $check = $app->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_domain` WHERE `type` = 'vhostsubdomain' AND `parent_domain_id` = '" . $app->functions->intval($this->dataRecord['parent_domain_id']) . "' AND `web_folder` = '" . $app->db->quote($this->dataRecord['web_folder']) . "' AND `domain_id` != '" . $app->functions->intval($this->id) . "'");
- if($check && $check['cnt'] > 0) {
- $app->tform->errorMessage .= $app->tform->lng("web_folder_unique_txt")."<br>";
- }
- */
- } else {
- $this->dataRecord["domain"] = $this->dataRecord["domain"].'.'.$parent_domain["domain"];
- }
-
- if($_SESSION["s"]["user"]["typ"] != 'admin') {
- // Get the limits of the client
- $client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
- $client = $app->db->queryOneRecord("SELECT limit_traffic_quota, limit_web_subdomain, default_webserver, parent_client_id, limit_web_quota, client." . implode(", client.", $read_limits) . " FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
-
- if($client['limit_cgi'] != 'y') $this->dataRecord['cgi'] = '-';
- if($client['limit_ssi'] != 'y') $this->dataRecord['ssi'] = '-';
- if($client['limit_perl'] != 'y') $this->dataRecord['perl'] = '-';
- if($client['limit_ruby'] != 'y') $this->dataRecord['ruby'] = '-';
- if($client['limit_python'] != 'y') $this->dataRecord['python'] = '-';
- if($client['force_suexec'] != 'n') $this->dataRecord['suexec'] = 'y';
- if($client['limit_hterror'] != 'y') $this->dataRecord['errordocs'] = '-';
- if($client['limit_wildcard'] != 'y' && $this->dataRecord['subdomain'] == '*') $this->dataRecord['subdomain'] = '-';
- if($client['limit_ssl'] != 'y') $this->dataRecord['ssl'] = '-';
-
- // only generate quota and traffic warnings if value has changed
- if($this->id > 0) {
- $old_web_values = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$app->functions->intval($this->id));
- } else {
- $old_web_values = $_POST;
- }
-
- //* Check the traffic quota of the client
- if(isset($_POST["traffic_quota"]) && $client["limit_traffic_quota"] > 0 && $_POST["traffic_quota"] != $old_web_values["traffic_quota"]) {
- $tmp = $app->db->queryOneRecord("SELECT sum(traffic_quota) as trafficquota FROM web_domain WHERE domain_id != ".$app->functions->intval($this->id)." AND ".$app->tform->getAuthSQL('u'));
- $trafficquota = $tmp["trafficquota"];
- $new_traffic_quota = $app->functions->intval($this->dataRecord["traffic_quota"]);
- if(($trafficquota + $new_traffic_quota > $client["limit_traffic_quota"]) || ($new_traffic_quota < 0 && $client["limit_traffic_quota"] >= 0)) {
- $max_free_quota = floor($client["limit_traffic_quota"] - $trafficquota);
- if($max_free_quota < 0) $max_free_quota = 0;
- $app->tform->errorMessage .= $app->tform->lng("limit_traffic_quota_free_txt").": ".$max_free_quota." MB<br>";
- // Set the quota field to the max free space
- $this->dataRecord["traffic_quota"] = $max_free_quota;
- }
- unset($tmp);
- unset($tmp_quota);
- }
-
- if($client['parent_client_id'] > 0) {
- // Get the limits of the reseller
- $reseller = $app->db->queryOneRecord("SELECT limit_traffic_quota, limit_web_subdomain, default_webserver, limit_web_quota FROM client WHERE client_id = ".$app->functions->intval($client['parent_client_id']));
-
- //* Check the traffic quota of the client
- if(isset($_POST["traffic_quota"]) && $reseller["limit_traffic_quota"] > 0 && $_POST["traffic_quota"] != $old_web_values["traffic_quota"]) {
- $tmp = $app->db->queryOneRecord("SELECT sum(traffic_quota) as trafficquota FROM web_domain WHERE domain_id != ".$app->functions->intval($this->id)." AND ".$app->tform->getAuthSQL('u'));
- $trafficquota = $tmp["trafficquota"];
- $new_traffic_quota = $app->functions->intval($this->dataRecord["traffic_quota"]);
- if(($trafficquota + $new_traffic_quota > $reseller["limit_traffic_quota"]) || ($new_traffic_quota < 0 && $reseller["limit_traffic_quota"] >= 0)) {
- $max_free_quota = floor($reseller["limit_traffic_quota"] - $trafficquota);
- if($max_free_quota < 0) $max_free_quota = 0;
- $app->tform->errorMessage .= $app->tform->lng("limit_traffic_quota_free_txt").": ".$max_free_quota." MB<br>";
- // Set the quota field to the max free space
- $this->dataRecord["traffic_quota"] = $max_free_quota;
- }
- unset($tmp);
- unset($tmp_quota);
- }
- }
-
- // When the record is updated
- if($this->id > 0) {
- // restore the server ID if the user is not admin and record is edited
- $tmp = $app->db->queryOneRecord("SELECT server_id, `web_folder`, `cgi`, `ssi`, `perl`, `ruby`, `python`, `suexec`, `errordocs`, `subdomain`, `ssl` FROM web_domain WHERE domain_id = ".$app->functions->intval($this->id));
- $this->dataRecord['web_folder'] = $tmp['web_folder']; // cannot be changed!
-
- // set the settings to current if not provided (or cleared due to limits)
- if($this->dataRecord['cgi'] == '-') $this->dataRecord['cgi'] = $tmp['cgi'];
- if($this->dataRecord['ssi'] == '-') $this->dataRecord['ssi'] = $tmp['ssi'];
- if($this->dataRecord['perl'] == '-') $this->dataRecord['perl'] = $tmp['perl'];
- if($this->dataRecord['ruby'] == '-') $this->dataRecord['ruby'] = $tmp['ruby'];
- if($this->dataRecord['python'] == '-') $this->dataRecord['python'] = $tmp['python'];
- if($this->dataRecord['suexec'] == '-') $this->dataRecord['suexec'] = $tmp['suexec'];
- if($this->dataRecord['errordocs'] == '-') $this->dataRecord['errordocs'] = $tmp['errordocs'];
- if($this->dataRecord['subdomain'] == '-') $this->dataRecord['subdomain'] = $tmp['subdomain'];
- if($this->dataRecord['ssl'] == '-') $this->dataRecord['ssl'] = $tmp['ssl'];
-
- unset($tmp);
- // When the record is inserted
- } else {
- // Check if the user may add another web_domain
- if($client["limit_web_subdomain"] >= 0) {
- $tmp = $app->db->queryOneRecord("SELECT count(domain_id) as number FROM web_domain WHERE sys_groupid = $client_group_id and (type = 'subdomain' OR type = 'vhostsubdomain')");
- if($tmp["number"] >= $client["limit_web_subdomain"]) {
- $app->error($app->tform->wordbook["limit_web_subdomain_txt"]);
- }
- }
- }
- }
-
- //* make sure that the domain is lowercase
- if(isset($this->dataRecord["domain"])) $this->dataRecord["domain"] = strtolower($this->dataRecord["domain"]);
-
- //* get the server config for this server
- $app->uses("getconf");
- $web_config = $app->getconf->get_server_config($app->functions->intval(isset($this->dataRecord["server_id"]) ? $this->dataRecord["server_id"] : 0), 'web');
- //* Check for duplicate ssl certs per IP if SNI is disabled
- if(isset($this->dataRecord['ssl']) && $this->dataRecord['ssl'] == 'y' && $web_config['enable_sni'] != 'y') {
- $sql = "SELECT count(domain_id) as number FROM web_domain WHERE `ssl` = 'y' AND ip_address = '".$app->db->quote($this->dataRecord['ip_address'])."' and domain_id != ".$this->id;
- $tmp = $app->db->queryOneRecord($sql);
- if($tmp['number'] > 0) $app->tform->errorMessage .= $app->tform->lng("error_no_sni_txt");
- }
-
- // Check if pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0
- if(isset($this->dataRecord['pm_max_children']) && $this->dataRecord['pm'] == 'dynamic') {
- if($app->functions->intval($this->dataRecord['pm_max_children'], true) >= $app->functions->intval($this->dataRecord['pm_max_spare_servers'], true) && $app->functions->intval($this->dataRecord['pm_max_spare_servers'], true) >= $app->functions->intval($this->dataRecord['pm_start_servers'], true) && $app->functions->intval($this->dataRecord['pm_start_servers'], true) >= $app->functions->intval($this->dataRecord['pm_min_spare_servers'], true) && $app->functions->intval($this->dataRecord['pm_min_spare_servers'], true) > 0){
-
- } else {
- $app->tform->errorMessage .= $app->tform->lng("error_php_fpm_pm_settings_txt").'<br>';
- }
- }
-
- // Check rewrite rules
- $server_type = $web_config['server_type'];
-
- if($server_type == 'nginx' && isset($this->dataRecord['rewrite_rules']) && trim($this->dataRecord['rewrite_rules']) != '') {
- $rewrite_rules = trim($this->dataRecord['rewrite_rules']);
- $rewrites_are_valid = true;
- // use this counter to make sure all curly brackets are properly closed
- $if_level = 0;
- // Make sure we only have Unix linebreaks
- $rewrite_rules = str_replace("\r\n", "\n", $rewrite_rules);
- $rewrite_rules = str_replace("\r", "\n", $rewrite_rules);
- $rewrite_rule_lines = explode("\n", $rewrite_rules);
- if(is_array($rewrite_rule_lines) && !empty($rewrite_rule_lines)){
- foreach($rewrite_rule_lines as $rewrite_rule_line){
- // ignore comments
- if(substr(ltrim($rewrite_rule_line), 0, 1) == '#') continue;
- // empty lines
- if(trim($rewrite_rule_line) == '') continue;
- // rewrite
- if(preg_match('@^\s*rewrite\s+(^/)?\S+(\$)?\s+\S+(\s+(last|break|redirect|permanent|))?\s*;\s*$@', $rewrite_rule_line)) continue;
- // if
- if(preg_match('@^\s*if\s+\(\s*\$\S+(\s+(\!?(=|~|~\*))\s+(\S+|\".+\"))?\s*\)\s*\{\s*$@', $rewrite_rule_line)){
- $if_level += 1;
- continue;
- }
- // if - check for files, directories, etc.
- if(preg_match('@^\s*if\s+\(\s*\!?-(f|d|e|x)\s+\S+\s*\)\s*\{\s*$@', $rewrite_rule_line)){
- $if_level += 1;
- continue;
- }
- // break
- if(preg_match('@^\s*break\s*;\s*$@', $rewrite_rule_line)){
- continue;
- }
- // return code [ text ]
- if(preg_match('@^\s*return\s+\d\d\d.*;\s*$@', $rewrite_rule_line)) continue;
- // return code URL
- // return URL
- if(preg_match('@^\s*return(\s+\d\d\d)?\s+(http|https|ftp)\://([a-zA-Z0-9\.\-]+(\:[a-zA-Z0-9\.&%\$\-]+)*\@)*((25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9])\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[0-9])|localhost|([a-zA-Z0-9\-]+\.)*[a-zA-Z0-9\-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(\:[0-9]+)*(/($|[a-zA-Z0-9\.\,\?\'\\\+&%\$#\=~_\-]+))*\s*;\s*$@', $rewrite_rule_line)) continue;
- // set
- if(preg_match('@^\s*set\s+\$\S+\s+\S+\s*;\s*$@', $rewrite_rule_line)) continue;
- // closing curly bracket
- if(trim($rewrite_rule_line) == '}'){
- $if_level -= 1;
- continue;
- }
- $rewrites_are_valid = false;
- break;
- }
- }
-
- if(!$rewrites_are_valid || $if_level != 0){
- $app->tform->errorMessage .= $app->tform->lng("invalid_rewrite_rules_txt").'<br>';
- }
- }
-
- parent::onSubmit();
- }
-
- function onAfterInsert() {
- global $app, $conf;
-
- // Get configuration for the web system
- $app->uses("getconf");
- $web_rec = $app->tform->getDataRecord($this->id);
- $web_config = $app->getconf->get_server_config($app->functions->intval($web_rec["server_id"]), 'web');
- //var_dump($this->parent_domain_record, $web_rec);
- // Set the values for document_root, system_user and system_group
- $system_user = $app->db->quote($this->parent_domain_record['system_user']);
- $system_group = $app->db->quote($this->parent_domain_record['system_group']);
- $document_root = $app->db->quote($this->parent_domain_record['document_root']);
- $php_open_basedir = str_replace("[website_path]/web", $document_root.'/'.$web_rec['web_folder'], $web_config["php_open_basedir"]);
- $php_open_basedir = str_replace("[website_domain]/web", $web_rec['domain'].'/'.$web_rec['web_folder'], $php_open_basedir);
- $php_open_basedir = str_replace("[website_path]", $document_root, $php_open_basedir);
- $php_open_basedir = $app->db->quote(str_replace("[website_domain]", $web_rec['domain'], $php_open_basedir));
- $htaccess_allow_override = $app->db->quote($this->parent_domain_record['allow_override']);
-
- $sql = "UPDATE web_domain SET sys_groupid = ".$app->functions->intval($this->parent_domain_record['sys_groupid']).",system_user = '$system_user', system_group = '$system_group', document_root = '$document_root', allow_override = '$htaccess_allow_override', php_open_basedir = '$php_open_basedir' WHERE domain_id = ".$this->id;
- $app->db->query($sql);
- }
-
- function onBeforeUpdate () {
- global $app, $conf;
-
- //* Check that all fields for the SSL cert creation are filled
- if(isset($this->dataRecord['ssl_action']) && $this->dataRecord['ssl_action'] == 'create') {
- if($this->dataRecord['ssl_state'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_state_empty').'<br />';
- if($this->dataRecord['ssl_locality'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_locality_empty').'<br />';
- if($this->dataRecord['ssl_organisation'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_organisation_empty').'<br />';
- if($this->dataRecord['ssl_organisation_unit'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_organisation_unit_empty').'<br />';
- if($this->dataRecord['ssl_country'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_country_empty').'<br />';
- }
-
- if(isset($this->dataRecord['ssl_action']) && $this->dataRecord['ssl_action'] == 'save') {
- if(trim($this->dataRecord['ssl_cert']) == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_cert_empty').'<br />';
- }
-
- }
-
- function onAfterUpdate() {
- global $app, $conf;
-
- // Get configuration for the web system
- $app->uses("getconf");
- $web_rec = $app->tform->getDataRecord($this->id);
- $web_config = $app->getconf->get_server_config($app->functions->intval($web_rec["server_id"]), 'web');
-
- // Set the values for document_root, system_user and system_group
- $system_user = $app->db->quote($this->parent_domain_record['system_user']);
- $system_group = $app->db->quote($this->parent_domain_record['system_group']);
- $document_root = $app->db->quote($this->parent_domain_record['document_root']);
- $php_open_basedir = str_replace("[website_path]/web", $document_root.'/'.$web_rec['web_folder'], $web_config["php_open_basedir"]);
- $php_open_basedir = str_replace("[website_domain]/web", $web_rec['domain'].'/'.$web_rec['web_folder'], $php_open_basedir);
- $php_open_basedir = str_replace("[website_path]", $document_root, $php_open_basedir);
- $php_open_basedir = $app->db->quote(str_replace("[website_domain]", $web_rec['domain'], $php_open_basedir));
- $htaccess_allow_override = $app->db->quote($this->parent_domain_record['allow_override']);
-
- $sql = "UPDATE web_domain SET sys_groupid = ".$app->functions->intval($this->parent_domain_record['sys_groupid']).",system_user = '$system_user', system_group = '$system_group', document_root = '$document_root', allow_override = '$htaccess_allow_override', php_open_basedir = '$php_open_basedir' WHERE domain_id = ".$this->id;
- $app->db->query($sql);
- }
-
-}
-
-$page = new page_action;
-$page->onLoad();
-
-?>
diff --git a/interface/web/sites/web_vhost_subdomain_list.php b/interface/web/sites/web_vhost_subdomain_list.php
deleted file mode 100644
index 6f68d7bbf4fc14bd530f49d4a58081d37ad00852..0000000000000000000000000000000000000000
--- a/interface/web/sites/web_vhost_subdomain_list.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
-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.
-*/
-
-require_once '../../lib/config.inc.php';
-require_once '../../lib/app.inc.php';
-
-/******************************************
-* Begin Form configuration
-******************************************/
-
-$list_def_file = "list/web_vhost_subdomain.list.php";
-
-/******************************************
-* End Form configuration
-******************************************/
-
-//* Check permissions for module
-$app->auth->check_module_permissions('sites');
-
-$app->uses('listform_actions');
-
-// Limit the results to alias domains
-$app->listform_actions->SQLExtWhere = "web_domain.type = 'vhostsubdomain'";
-$app->listform_actions->SQLOrderBy = 'ORDER BY web_domain.domain';
-$app->listform_actions->onLoad();
-
-
-?>
diff --git a/interface/web/themes/blue/templates/main.tpl.htm b/interface/web/themes/blue/templates/main.tpl.htm
index 37841c2fdf1c8f955c963a4db96243a325315e7b..8d6ffde13cc1e8af8574abd15349282a001ee6a4 100644
--- a/interface/web/themes/blue/templates/main.tpl.htm
+++ b/interface/web/themes/blue/templates/main.tpl.htm
@@ -14,7 +14,6 @@
<link rel="shortcut icon" href="/themes/default/images/favicon.ico" />
<script type="text/javascript" src="js/jquery-1.6.3.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
- <script type="text/javascript" src="js/chosen/chosen.jquery.min.js"></script>
<script type="text/javascript" src="js/scrigo.js.php"></script>
<script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
<script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>
diff --git a/interface/web/themes/default-304/templates/main.tpl.htm b/interface/web/themes/default-304/templates/main.tpl.htm
index 58be4dece984dd0f4bb0064673f0441bdd334dd6..862693badae953f09f8b9d4b1787b5ca6ffa04cb 100644
--- a/interface/web/themes/default-304/templates/main.tpl.htm
+++ b/interface/web/themes/default-304/templates/main.tpl.htm
@@ -58,7 +58,6 @@
<link rel="shortcut icon" href="/themes/default/images/favicon.ico" />
<script type="text/javascript" src="js/jquery-1.6.3.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
- <script type="text/javascript" src="js/chosen/chosen.jquery.min.js"></script>
<script type="text/javascript" src="js/scrigo.js.php"></script>
<script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
<script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index 92c16c7cb4d1bf9df2a2e9fca1b6687d0c9420d3..8c20f75656765bd1637adca6513e7e4ea9c3fb44 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -14,7 +14,6 @@
<link rel="shortcut icon" href="/themes/default/images/favicon.ico" />
<script type="text/javascript" src="js/jquery-1.6.3.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
- <script type="text/javascript" src="js/chosen/chosen.jquery.min.js"></script>
<script type="text/javascript" src="js/scrigo.js.php"></script>
<script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
<script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>
diff --git a/interface/web/themes/default_64_navimg/templates/main.tpl.htm b/interface/web/themes/default_64_navimg/templates/main.tpl.htm
index b91f15b232fd5326e9de78ada642cde3f5ad8f62..c0180e1e95cb565a2f93ef839d820899fc9fd738 100644
--- a/interface/web/themes/default_64_navimg/templates/main.tpl.htm
+++ b/interface/web/themes/default_64_navimg/templates/main.tpl.htm
@@ -59,8 +59,7 @@
<link rel="shortcut icon" href="/themes/default_304/images/favicon.ico" />
<script type="text/javascript" src="js/jquery-1.6.3.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
- <script type="text/javascript" src="js/chosen/chosen.jquery.min.js"></script>
- <script type="text/javascript" src="js/scrigo.js.php"></script>
+ <script type="text/javascript" src="js/scrigo.js.php"></script>
<script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
<script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>
<script type="text/javascript" src="js/jquery.tipsy.js"></script>
diff --git a/interface/web/themes/default_combobox/templates/main.tpl.htm b/interface/web/themes/default_combobox/templates/main.tpl.htm
index 02830afa3cebce2defb2748c6808632684d84521..142794e07ae03b31afce26c3001b936e3471ab94 100644
--- a/interface/web/themes/default_combobox/templates/main.tpl.htm
+++ b/interface/web/themes/default_combobox/templates/main.tpl.htm
@@ -59,8 +59,7 @@
<link rel="shortcut icon" href="/themes/default_304/images/favicon.ico" />
<script type="text/javascript" src="js/jquery-1.6.3.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
- <script type="text/javascript" src="js/chosen/chosen.jquery.min.js"></script>
- <script type="text/javascript" src="js/scrigo.js.php"></script>
+ <script type="text/javascript" src="js/scrigo.js.php"></script>
<script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
<script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>
<script type="text/javascript" src="js/jquery.tipsy.js"></script>
diff --git a/interface/web/themes/default_no_navimg/templates/main.tpl.htm b/interface/web/themes/default_no_navimg/templates/main.tpl.htm
index bd5ace99e869b7ceff2f2ab4762c690e26f9df22..5f45a0af9ebf5985af7acd9eada91e0345fc64b8 100644
--- a/interface/web/themes/default_no_navimg/templates/main.tpl.htm
+++ b/interface/web/themes/default_no_navimg/templates/main.tpl.htm
@@ -59,8 +59,7 @@
<link rel="shortcut icon" href="/themes/default_304/images/favicon.ico" />
<script type="text/javascript" src="js/jquery-1.6.3.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
- <script type="text/javascript" src="js/chosen/chosen.jquery.min.js"></script>
- <script type="text/javascript" src="js/scrigo.js.php"></script>
+ <script type="text/javascript" src="js/scrigo.js.php"></script>
<script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
<script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>
<script type="text/javascript" src="js/jquery.tipsy.js"></script>
diff --git a/server/lib/classes/cron.d/500-backup_mail.inc.php b/server/lib/classes/cron.d/500-backup_mail.inc.php
index fa1fa5c510c579118923e3fefbba0b3abfbf4442..f95f815a707a5293b87343e28c6b5f11e14199a1 100644
--- a/server/lib/classes/cron.d/500-backup_mail.inc.php
+++ b/server/lib/classes/cron.d/500-backup_mail.inc.php
@@ -50,10 +50,13 @@ class cronjob_backup extends cronjob {
global $app, $conf;
$server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
+ $mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
+
$backup_dir = $server_config['backup_dir'];
+ $backup_dir_permissions =0750;
+
$backup_mode = $server_config['backup_mode'];
if($backup_mode == '') $backup_mode = 'userzip';
- $backup_dir_permissions =0750;
if($backup_dir != '') {
//* mount backup directory, if necessary
@@ -67,32 +70,35 @@ class cronjob_backup extends cronjob {
}
}
- $mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
-
- if(!is_dir($backup_dir)) {
- mkdir(escapeshellcmd($backup_dir), $backup_dir_permissions, true);
- } else {
- chmod(escapeshellcmd($backup_dir), $backup_dir_permissions);
- }
-
- $sql="SELECT * FROM mail_user JOIN mail_domain ON (mail_domain.active='y' AND mail_user.email like concat('%',mail_domain.domain)) WHERE mail_user.server_id=".$conf['server_id']." AND maildir <> '' ORDER BY mail_domain.domain_id";
+ $sql = "SELECT * FROM mail_user WHERE server_id = '".intval($conf['server_id'])."' AND maildir <> ''";
$records = $app->db->queryAllRecords($sql);
+
if(is_array($records) && $run_backups) {
+ if(!is_dir($backup_dir)) {
+ mkdir(escapeshellcmd($backup_dir), $backup_dir_permissions, true);
+ } else {
+ chmod(escapeshellcmd($backup_dir), $backup_dir_permissions);
+ }
+
foreach($records as $rec) {
//* Do the mailbox backup
if($rec['backup_interval'] == 'daily' or ($rec['backup_interval'] == 'weekly' && date('w') == 0) or ($rec['backup_interval'] == 'monthly' && date('d') == '01')) {
- $mail_backup_dir = $backup_dir.'/mail'.$rec['domain_id'];
+ $sql = "SELECT * FROM mail_domain WHERE domain = '".$app->db->quote(explode("@",$rec['email'])[1])."'";
+ $domain_rec=$app->db->queryOneRecord($sql);
+ $mail_backup_dir = $backup_dir.'/mail'.$domain_rec['domain_id'];
if(!is_dir($mail_backup_dir)) mkdir($mail_backup_dir, 0750);
chmod($mail_backup_dir, $backup_dir_permissions);
+ $mail_backup_file = 'mail'.$rec['mailuser_id'].'_'.date('Y-m-d_H-i');
+
$domain_dir=explode('/',$rec['maildir']);
$_temp=array_pop($domain_dir);unset($_temp);
$domain_dir=implode('/',$domain_dir);
- $source_dir=array_pop(explode('/',$rec['maildir']));
- $mail_backup_file = 'mail'.$rec['mailuser_id'].'_'.date('Y-m-d_H-i');
+ $source_dir=array_pop(explode('/',$rec['maildir']));
+ //* create archives
if($backup_mode == 'userzip') {
$mail_backup_file.='.zip';
exec('cd '.$rec['homedir'].' && zip -b /tmp -r '.$mail_backup_dir.'/'.$mail_backup_file.' '.$source_dir.' > /dev/nul');
@@ -106,7 +112,7 @@ class cronjob_backup extends cronjob {
chgrp($mail_backup_dir.'/'.$mail_backup_file, 'root');
chmod($mail_backup_dir.'/'.$mail_backup_file, 0640);
/* Insert mail backup record in database */
- $sql = "INSERT INTO mail_backup (server_id,parent_domain_id,mailuser_id,backup_mode,tstamp,filename,filesize) VALUES (".$conf['server_id'].",".$rec['domain_id'].",".$rec['mailuser_id'].",'".$backup_mode."',".time().",'".$app->db->quote($mail_backup_file)."','".$app->functions->formatBytes(filesize($mail_backup_dir.'/'.$mail_backup_file))."')";
+ $sql = "INSERT INTO mail_backup (server_id,parent_domain_id,mailuser_id,backup_mode,tstamp,filename,filesize) VALUES (".$conf['server_id'].",".$domain_rec['domain_id'].",".$rec['mailuser_id'].",'".$backup_mode."',".time().",'".$app->db->quote($mail_backup_file)."','".$app->functions->formatBytes(filesize($mail_backup_dir.'/'.$mail_backup_file))."')";
$app->db->query($sql);
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
} else {
@@ -128,7 +134,7 @@ class cronjob_backup extends cronjob {
for ($n = $backup_copies; $n <= 10; $n++) {
if(isset($files[$n]) && is_file($mail_backup_dir.'/'.$files[$n])) {
unlink($mail_backup_dir.'/'.$files[$n]);
- $sql = "DELETE FROM mail_backup WHERE server_id = ".$conf['server_id']." AND parent_domain_id = ".$rec['domain_id']." AND filename = '".$app->db->quote($files[$n])."'";
+ $sql = "DELETE FROM mail_backup WHERE server_id = ".$conf['server_id']." AND parent_domain_id = ".$domain_rec['domain_id']." AND filename = '".$app->db->quote($files[$n])."'";
$app->db->query($sql);
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
}
@@ -139,7 +145,7 @@ class cronjob_backup extends cronjob {
/* Remove inactive backups */
if($rec['backup_interval'] == 'none') {
/* remove backups from db */
- $sql = "DELETE FROM mail_backup WHERE server_id = ".$conf['server_id']." AND parent_domain_id = ".$rec['domain_id']." AND mailuser_id = ".$rec['mailuser_id'];
+ $sql = "DELETE FROM mail_backup WHERE server_id = ".$conf['server_id']." AND parent_domain_id = ".$domain_rec['domain_id']." AND mailuser_id = ".$rec['mailuser_id'];
$app->db->query($sql);
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
/* remove archives */