From 9b155852f4a352ddb793ac4252702170b6509c17 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sun, 11 May 2014 17:39:51 -0400
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
---
interface/web/sites/lib/lang/el_web_folder_user.lng | 10
interface/web/sites/lib/lang/el_aps_update_packagelist.lng | 8
interface/web/tools/lib/lang/el_index.lng | 4
interface/web/mail/lib/lang/es_mail_get.lng | 1
interface/web/client/lib/lang/fr_client_message.lng | 30
interface/web/monitor/lib/lang/fr_datalog_list.lng | 2
interface/web/dns/lib/lang/el_dns_mx.lng | 2
interface/web/sites/lib/lang/hr_cron.lng | 2
interface/web/mail/form/mail_get.tform.php | 2
interface/web/mail/lib/lang/el_mail_transport_list.lng | 4
interface/web/sites/cron_edit.php | 14
interface/web/dashboard/lib/lang/el.lng | 2
interface/web/sites/lib/lang/fr_shell_user.lng | 18
interface/web/client/lib/lang/nl_client.lng | 1
interface/web/dns/lib/lang/fr_dns_mx.lng | 2
interface/web/client/lib/lang/tr_client.lng | 1
interface/web/mail/lib/lang/el_mail_transport.lng | 2
interface/web/mailuser/lib/lang/el_mail_user_filter_list.lng | 12
interface/web/mail/lib/lang/pl_mail_get.lng | 1
interface/web/sites/lib/lang/pl_cron.lng | 2
interface/web/admin/lib/lang/el_remote_action.lng | 4
interface/web/client/lib/lang/ja_reseller.lng | 1
interface/web/dns/lib/lang/el_dns_import.lng | 20
interface/web/admin/lib/lang/el_users.lng | 12
interface/web/dns/templates/dns_soa_list.htm | 4
interface/web/client/lib/lang/el_client.lng | 77
interface/web/designer/lib/lang/fr_form_list.lng | 2
interface/web/sites/web_vhost_domain_edit.php | 4
interface/web/mail/lib/lang/el_mail_forward.lng | 2
interface/web/mail/lib/lang/ro_mail_get.lng | 1
interface/web/client/lib/lang/fr_clients_list.lng | 4
interface/web/mail/lib/lang/de_mail_domain.lng | 2
interface/web/mail/lib/lang/pl_mail_domain.lng | 2
interface/web/dns/lib/lang/es_dns_dkim.lng | 1
interface/web/admin/lib/lang/el_system_config.lng | 22
interface/web/client/lib/lang/fr_client.lng | 89
interface/web/dns/dns_dkim_get.php | 21
interface/web/sites/lib/lang/fr_aps.lng | 98
interface/web/help/lib/lang/el_help_faq_list.lng | 2
server/server.php | 18
interface/web/client/lib/lang/hr_client.lng | 1
interface/web/client/lib/lang/ja_client_template.lng | 1
interface/web/client/lib/lang/es_client.lng | 1
interface/web/dns/lib/lang/tr_dns_dkim.lng | 1
interface/web/sites/lib/lang/fr.lng | 22
interface/web/client/lib/lang/hu_reseller.lng | 1
interface/web/mail/lib/lang/es_mail_domain.lng | 2
install/lib/update.lib.php | 15
interface/web/client/lib/lang/cz_client_template.lng | 3
interface/web/client/lib/lang/tr_reseller.lng | 1
interface/web/mail/lib/lang/br_mail_domain.lng | 2
interface/web/mail/form/mail_domain.tform.php | 12
interface/web/tools/lib/lang/el_usersettings.lng | 10
interface/web/client/lib/lang/ar_reseller.lng | 1
interface/web/client/lib/lang/se_client_template.lng | 1
interface/web/client/lib/lang/bg_client.lng | 1
interface/web/client/lib/lang/el.lng | 24
interface/web/mail/lib/lang/it_mail_domain.lng | 2
interface/web/client/lib/lang/se_client.lng | 1
interface/web/tools/lib/lang/el_import_ispconfig.lng | 42
interface/web/client/lib/lang/el_domain_list.lng | 2
interface/web/sites/lib/lang/fr_cron.lng | 2
interface/web/sites/lib/lang/id_cron.lng | 2
interface/web/admin/lib/lang/el_firewall.lng | 2
interface/web/dns/dns_soa_edit.php | 4
interface/web/vm/lib/lang/fr_openvz_ip.lng | 12
server/conf/hhvm_starter.master | 69
install/sql/incremental/upd_0073.sql | 4
interface/web/admin/lib/lang/el_server_ip.lng | 2
interface/lib/lang/el.lng | 128
interface/web/dns/lib/lang/fr_dns_wizard.lng | 16
interface/web/sites/lib/lang/se_cron.lng | 2
interface/web/client/lib/lang/fr_client_circle.lng | 12
interface/web/dns/lib/lang/el.lng | 4
interface/web/sites/lib/lang/tr_cron.lng | 2
interface/web/client/lib/lang/el_client_circle_list.lng | 16
interface/web/client/lib/lang/nl_client_template.lng | 1
interface/web/dns/lib/lang/el_dns_hinfo.lng | 2
interface/web/client/lib/lang/hu_client_template.lng | 1
interface/web/dns/lib/lang/cz_dns_dkim.lng | 1
interface/web/client/lib/lang/pt_client_template.lng | 1
interface/web/js/dns_dkim.js | 1
interface/web/mail/lib/lang/tr_mail_get.lng | 1
interface/web/admin/lib/lang/el.lng | 12
interface/web/mail/lib/lang/el_user_quota_stats_list.lng | 2
interface/web/vm/lib/lang/el_openvz_template.lng | 20
interface/web/dashboard/lib/lang/el_dashlet_mailquota.lng | 12
interface/web/mail/lib/lang/el_mail_user.lng | 20
interface/web/sites/lib/lang/el_database_user_list.lng | 6
interface/web/mail/lib/lang/cz_mail_get.lng | 1
interface/web/vm/lib/lang/fr_openvz_template.lng | 132
interface/web/client/lib/lang/fr_domain.lng | 2
interface/web/vm/lib/lang/fr_openvz_ostemplate.lng | 16
interface/web/dns/lib/lang/el_dns_wizard.lng | 18
interface/web/mail/lib/lang/sk_mail_get.lng | 1
interface/web/client/lib/lang/en_client.lng | 1
interface/web/mail/lib/lang/en_mail_domain.lng | 4
install/sql/ispconfig3.sql | 334 ++--
interface/web/admin/lib/lang/el_server_config.lng | 72
interface/web/sites/lib/lang/pt_cron.lng | 2
interface/web/vm/lib/lang/fr_openvz_vm_list.lng | 10
server/plugins-available/apache2_plugin.inc.php | 61
interface/web/dns/dns_wizard.php | 12
interface/web/sites/lib/lang/fr_web_folder_user.lng | 12
interface/web/client/lib/lang/se_reseller.lng | 1
interface/web/sites/database_user_edit.php | 4
interface/web/sites/lib/lang/hu_cron.lng | 2
interface/lib/classes/ispcmail.inc.php | 10
interface/web/sites/lib/lang/fr_aps_instances_list.lng | 18
interface/web/client/lib/lang/it_client.lng | 1
interface/web/dns/lib/lang/hr_dns_dkim.lng | 1
interface/web/mail/lib/lang/el_mail_user_list.lng | 2
interface/web/sites/lib/lang/it_cron.lng | 2
server/plugins-available/mail_plugin_dkim.inc.php | 31
interface/web/admin/lib/lang/el_software_package.lng | 8
interface/web/monitor/lib/lang/el_datalog_list.lng | 10
interface/web/mail/lib/lang/it_mail_get.lng | 1
interface/web/mailuser/lib/lang/el_mail_user_cc.lng | 8
interface/web/mailuser/lib/lang/el_index.lng | 18
interface/web/admin/lib/lang/el_directive_snippets.lng | 10
interface/web/client/lib/lang/bg_client_template.lng | 1
interface/web/client/lib/lang/fr_resellers_list.lng | 8
interface/web/client/lib/lang/pl_reseller.lng | 1
interface/web/themes/blue/ispconfig_version | 2
interface/web/client/lib/lang/fr_client_template_list.lng | 2
interface/web/client/domain_edit.php | 4
interface/web/sites/lib/lang/bg_cron.lng | 2
install/sql/incremental/upd_0050.sql | 17
interface/web/sites/lib/lang/el_cron.lng | 4
interface/web/mailuser/lib/lang/el_mail_user_spamfilter.lng | 8
interface/web/mail/lib/lang/el_mail_alias.lng | 4
interface/web/tools/lib/lang/el_resync.lng | 22
interface/web/dns/lib/lang/el_dns_alias.lng | 2
interface/web/admin/lib/lang/el_software_update_list.lng | 2
interface/web/dashboard/lib/lang/el_dashlet_limits.lng | 50
interface/web/client/lib/lang/el_client_template.lng | 39
interface/web/dns/lib/lang/el_dns_soa.lng | 14
interface/web/mail/lib/lang/bg_mail_get.lng | 1
interface/web/sites/lib/lang/el_ftp_user.lng | 14
interface/web/sites/lib/lang/el_web_childdomain.lng | 9
interface/web/vm/lib/lang/fr_openvz_ostemplate_list.lng | 8
interface/web/client/lib/lang/ru_reseller.lng | 1
interface/web/dns/lib/lang/en_dns_dkim.lng | 1
interface/web/client/lib/lang/ar_client_template.lng | 1
interface/web/client/lib/lang/en_reseller.lng | 1
interface/web/mail/lib/lang/ar_mail_domain.lng | 2
interface/web/sites/lib/lang/el_user_quota_stats_list.lng | 2
interface/web/client/lib/lang/sk_client_template.lng | 1
interface/web/client/lib/lang/ru_client_template.lng | 1
interface/web/client/lib/lang/pt_reseller.lng | 1
interface/web/client/client_edit.php | 8
interface/web/dns/lib/lang/fr_dns_dkim.lng | 1
interface/web/client/templates/reseller_edit_limits.htm | 6
interface/web/admin/lib/lang/el_users_list.lng | 2
interface/web/client/lib/lang/tr_client_template.lng | 1
interface/web/client/lib/lang/fr_client_template.lng | 55
interface/web/dns/lib/lang/nl_dns_dkim.lng | 1
interface/web/sites/lib/lang/es_cron.lng | 2
server/plugins-available/nginx_plugin.inc.php | 49
interface/web/mail/lib/lang/el_mail_get.lng | 5
interface/web/client/lib/lang/ar_client.lng | 1
interface/web/dashboard/lib/lang/fr_dashlet_mailquota.lng | 10
interface/web/client/lib/lang/id_client_template.lng | 1
interface/web/vm/openvz_vm_edit.php | 4
interface/web/sites/lib/lang/ro_cron.lng | 2
interface/web/sites/lib/lang/fr_aps_packages_list.lng | 10
interface/web/mail/lib/lang/ja_mail_get.lng | 1
interface/web/client/lib/lang/nl_reseller.lng | 1
interface/web/sites/lib/lang/sk_cron.lng | 2
interface/web/sites/lib/lang/el_database.lng | 44
interface/web/mail/templates/mail_domain_edit.htm | 4
interface/web/sites/lib/lang/el_web_childdomain_list.lng | 1
interface/web/mail/lib/lang/el_mail_domain_catchall.lng | 4
interface/web/vm/lib/lang/fr_openvz_action.lng | 28
server/mods-available/web_module.inc.php | 12
interface/web/client/form/client_template.tform.php | 8
interface/web/mail/lib/lang/id_mail_domain.lng | 2
interface/web/client/lib/lang/fr_reseller.lng | 88
interface/web/client/lib/lang/fr.lng | 26
interface/web/dns/lib/lang/se_dns_dkim.lng | 1
interface/web/client/lib/lang/hr_reseller.lng | 1
interface/web/mail/lib/lang/se_mail_get.lng | 1
interface/web/mail/lib/lang/fr_mail_user_stats_list.lng | 2
interface/web/sites/lib/lang/el_web_backup_list.lng | 26
interface/web/client/lib/lang/el_resellers_list.lng | 4
interface/web/dashboard/lib/lang/el_dashlet_quota.lng | 12
interface/web/client/lib/lang/cz_reseller.lng | 1
interface/web/client/lib/lang/hr_client_template.lng | 1
interface/web/mail/lib/lang/el_spamfilter_users.lng | 4
interface/web/designer/lib/lang/fr_module_show.lng | 6
server/conf/vhost.conf.master | 30
interface/web/dns/lib/lang/el_dns_srv.lng | 28
interface/web/mail/lib/lang/ro_mail_domain.lng | 2
interface/web/mail/lib/lang/de_mail_get.lng | 3
interface/web/mailuser/lib/lang/el_mail_user_password.lng | 14
interface/web/client/lib/lang/en_client_template.lng | 1
interface/web/login/lib/lang/el.lng | 14
interface/web/client/lib/lang/fi_client.lng | 1
interface/web/sites/lib/lang/ar_cron.lng | 2
interface/web/sites/lib/lang/el_shell_user_list.lng | 4
interface/web/sites/lib/lang/br_cron.lng | 2
interface/web/sites/lib/lang/ru_cron.lng | 2
interface/web/vm/lib/lang/fr_openvz_template_list.lng | 6
interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng | 22
interface/web/client/lib/lang/it_reseller.lng | 1
interface/web/mailuser/lib/lang/el_mail_user_filter.lng | 36
interface/web/dns/lib/lang/de_dns_dkim.lng | 1
interface/web/dns/dns_import.php | 4
interface/web/mail/lib/lang/nl_mail_domain.lng | 2
interface/web/client/lib/lang/ro_client.lng | 1
interface/web/sites/lib/lang/el_shell_user.lng | 18
interface/web/client/lib/lang/de_client_template.lng | 1
interface/web/sites/lib/lang/el_database_user.lng | 42
interface/web/dns/lib/lang/fr_dns_a_list.lng | 2
interface/web/admin/lib/lang/fr_system_config.lng | 2
interface/web/client/form/reseller.tform.php | 8
interface/web/vm/lib/lang/el_openvz_ip.lng | 2
server/conf/php_fpm_pool.conf.master | 2
interface/web/dashboard/templates/dashboard.htm | 2
interface/web/mail/lib/lang/sk_mail_domain.lng | 3
interface/web/sites/lib/lang/fr_webdav_user.lng | 12
server/conf/nginx_vhost.conf.master | 13
interface/web/dns/lib/lang/fr.lng | 4
interface/web/dns/lib/lang/hu_dns_dkim.lng | 1
interface/web/mail/lib/lang/el_mail_spamfilter.lng | 6
install/sql/incremental/upd_0075.sql | 80 +
interface/web/help/lib/lang/fr_help_faq_list.lng | 2
interface/web/mail/lib/lang/el.lng | 4
interface/web/mail/lib/lang/id_mail_get.lng | 1
interface/web/sites/lib/lang/fi_cron.lng | 2
interface/web/client/lib/lang/hu_client.lng | 1
interface/web/client/lib/lang/ro_client_template.lng | 1
interface/web/dns/lib/lang/ru_dns_dkim.lng | 1
interface/web/mail/lib/lang/fr_mail_user.lng | 2
interface/web/sites/templates/web_vhost_domain_edit.htm | 2
interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php | 26
interface/web/admin/lib/lang/el_server_php_list.lng | 8
interface/web/dns/lib/lang/ar_dns_dkim.lng | 1
interface/web/dns/lib/lang/id_dns_dkim.lng | 1
interface/web/mail/lib/lang/hu_mail_get.lng | 1
interface/web/client/lib/lang/id_client.lng | 1
interface/web/mail/lib/lang/se_mail_domain.lng | 2
interface/web/sites/lib/lang/el_web_sites_stats_list.lng | 2
interface/web/mail/lib/lang/ar_mail_get.lng | 1
interface/web/mailuser/lib/lang/el.lng | 14
interface/web/client/templates/client_template_edit_limits.htm | 6
interface/web/client/lib/lang/br_reseller.lng | 1
interface/web/client/templates/client_edit_limits.htm | 6
interface/web/client/lib/lang/it_client_template.lng | 1
interface/web/mail/lib/lang/fi_mail_get.lng | 1
interface/web/admin/lib/lang/el_tpl_default_admin.lng | 26
interface/web/client/lib/lang/ru_client.lng | 1
interface/web/client/lib/lang/de_reseller.lng | 1
interface/web/dns/lib/lang/br_dns_dkim.lng | 1
interface/web/dns/lib/lang/fr_dns_import.lng | 22
interface/web/sites/lib/lang/el_database_user_admin_list.lng | 8
interface/web/dns/lib/lang/el_dns_slave.lng | 2
interface/web/mail/lib/lang/br_mail_get.lng | 1
interface/web/mail/lib/lang/pt_mail_domain.lng | 8
interface/web/dns/lib/lang/fi_dns_dkim.lng | 1
interface/web/client/lib/lang/fr_client_del.lng | 4
install/sql/incremental/upd_0071.sql | 3
interface/web/admin/lib/lang/el_directive_snippets_list.lng | 8
interface/web/client/lib/lang/id_reseller.lng | 1
interface/web/client/lib/lang/pt_client.lng | 1
interface/web/mail/mail_mailinglist_edit.php | 4
interface/web/sites/lib/lang/el_aps_packages_list.lng | 12
interface/lib/lang/fr.lng | 128
interface/web/help/lib/lang/fr_support_message.lng | 10
interface/web/dns/lib/lang/fr_dns_slave.lng | 4
interface/web/sites/lib/lang/fr_user_quota_stats_list.lng | 2
interface/web/dns/lib/lang/fr_dns_soa.lng | 16
interface/web/mail/lib/lang/cz_mail_domain.lng | 2
interface/web/mail/lib/lang/fr_mail_domain.lng | 4
interface/web/dns/lib/lang/ja_dns_dkim.lng | 1
interface/web/sites/lib/lang/fr_web_vhost_domain.lng | 78
interface/web/mail/lib/lang/bg_mail_domain.lng | 2
install/sql/incremental/upd_0003.sql | 1
interface/web/client/lib/lang/es_reseller.lng | 1
install/lib/installer_base.lib.php | 10
install/tpl/fedora_dovecot2.conf.master | 1
interface/web/dns/lib/lang/sk_dns_dkim.lng | 1
interface/web/mail/lib/lang/hr_mail_domain.lng | 2
interface/web/mail/lib/lang/hr_mail_get.lng | 1
interface/web/vm/lib/lang/el_openvz_ip_list.lng | 2
interface/web/vm/lib/lang/el_openvz_vm.lng | 8
interface/web/client/lib/lang/es_client_template.lng | 1
interface/web/client/lib/lang/fi_reseller.lng | 1
interface/web/sites/form/web_vhost_domain.tform.php | 93
TODO.txt | 4
interface/web/client/lib/lang/cz_client.lng | 1
interface/web/dns/dns_dkim_edit.php | 8
interface/web/dns/form/dns_srv.tform.php | 2
interface/web/mail/lib/lang/el_mail_mailinglist.lng | 18
interface/web/sites/lib/lang/el_aps_instances_list.lng | 22
interface/web/dns/lib/lang/fr_dns_srv.lng | 4
interface/web/client/lib/lang/el_client_message.lng | 32
interface/web/client/lib/lang/ja_client.lng | 1
interface/web/help/lib/lang/fr_help_faq_sections_list.lng | 2
interface/web/dns/dns_slave_edit.php | 4
interface/web/mail/lib/lang/fi_mail_domain.lng | 2
interface/web/client/lib/lang/de_client.lng | 1
interface/web/dns/lib/lang/it_dns_dkim.lng | 1
interface/web/mail/lib/lang/hu_mail_domain.lng | 2
interface/web/client/lib/lang/br_client_template.lng | 1
interface/web/sites/lib/lang/cz_cron.lng | 2
interface/web/mail/lib/lang/ru_mail_get.lng | 1
interface/web/admin/lib/lang/el_software_package_list.lng | 4
interface/web/client/lib/lang/el_clients_list.lng | 4
interface/web/monitor/lib/lang/el.lng | 14
interface/web/client/lib/lang/pl_client_template.lng | 1
interface/web/tools/lib/lang/el.lng | 8
interface/web/designer/lib/lang/el_form_edit.lng | 10
interface/web/sites/lib/lang/el_aps.lng | 110
interface/web/sites/lib/lang/de_cron.lng | 2
interface/web/mail/lib/lang/en_mail_get.lng | 1
interface/web/vm/lib/lang/fr_openvz_ip_list.lng | 8
interface/web/designer/lib/lang/fr_module_list.lng | 2
interface/web/client/lib/lang/el_reseller.lng | 63
interface/web/vm/lib/lang/fr_openvz_vm.lng | 62
interface/web/admin/lib/lang/el_server_php.lng | 22
interface/web/login/lib/lang/fr.lng | 14
install/sql/incremental/upd_0068.sql | 2
interface/web/dns/templates/dns_dkim_edit.htm | 6
interface/web/mail/templates/mail_get_edit.htm | 2
interface/web/sites/lib/lang/fr_ftp_user.lng | 12
install/sql/incremental/upd_0074.sql | 250 +++
interface/web/client/lib/lang/bg_reseller.lng | 1
interface/web/dashboard/lib/lang/fr_dashlet_quota.lng | 12
interface/web/dns/lib/lang/bg_dns_dkim.lng | 1
interface/web/tools/lib/lang/el_tpl_default.lng | 10
interface/web/client/lib/lang/ro_reseller.lng | 1
interface/web/sites/lib/lang/nl_cron.lng | 2
interface/web/sites/lib/lang/el_webdav_user.lng | 14
interface/web/designer/lib/lang/fr_form_show.lng | 2
interface/web/tools/lib/lang/el_interface.lng | 10
interface/web/client/lib/lang/br_client.lng | 1
interface/web/sites/lib/lang/el.lng | 24
interface/web/sites/lib/lang/el_web_vhost_domain.lng | 40
interface/web/client/lib/lang/fr_client_circle_list.lng | 14
interface/web/mail/lib/lang/nl_mail_get.lng | 1
interface/web/client/lib/lang/fi_client_template.lng | 1
interface/web/tools/interface_settings.php | 2
interface/web/sites/lib/lang/en_cron.lng | 2
interface/web/client/form/client.tform.php | 8
interface/web/mail/mail_domain_edit.php | 4
interface/web/mail/lib/lang/fr_mail_get.lng | 3
interface/web/client/lib/lang/sk_client.lng | 1
interface/web/client/lib/lang/el_client_circle.lng | 14
interface/web/designer/lib/lang/cz_module_edit.lng | 2
interface/web/mail/lib/lang/tr_mail_domain.lng | 2
interface/web/admin/lib/lang/el_remote_user.lng | 10
interface/web/sites/lib/lang/ja_cron.lng | 2
interface/web/admin/form/firewall.tform.php | 2
interface/web/client/lib/lang/pl_client.lng | 1
interface/web/monitor/lib/lang/fr.lng | 16
install/dist/lib/debian60.lib.php | 2
interface/web/client/lib/lang/sk_reseller.lng | 1
interface/web/dns/lib/lang/en_dns_soa_list.lng | 1
interface/web/mail/lib/lang/pt_mail_get.lng | 1
360 files changed, 2,580 insertions(+), 1,745 deletions(-)
diff --git a/TODO.txt b/TODO.txt
index 9902ef3..6dcae10 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -22,10 +22,6 @@
Server
--------------------------------------
-- Add a backend plugin to configure network card settings. The IP address
- settings are stored in the server_ip table.
--- This works now on Debian and Ubuntu Linux.
-
Mail module
--------------------------------------
diff --git a/install/dist/lib/debian60.lib.php b/install/dist/lib/debian60.lib.php
index 61c3073..1ddb602 100644
--- a/install/dist/lib/debian60.lib.php
+++ b/install/dist/lib/debian60.lib.php
@@ -118,7 +118,7 @@
chgrp($config_dir.'/'.$configfile, 'root');
// Dovecot shall ignore mounts in website directory
- exec("doveadm mount add '/var/www/*' ignore");
+ if(is_installed('doveadm')) exec("doveadm mount add '/var/www/*' ignore > /dev/null 2> /dev/null");
}
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 2fa7585..7669572 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -633,6 +633,7 @@
//* Create aliasaes
exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
+ if(is_file('/var/lib/mailman/data/virtual-mailman')) exec('postmap /var/lib/mailman/data/virtual-mailman');
}
@@ -1007,7 +1008,7 @@
chgrp($config_dir.'/'.$configfile, 'root');
// Dovecot shall ignore mounts in website directory
- exec("doveadm mount add '/var/www/*' ignore");
+ if(is_installed('doveadm')) exec("doveadm mount add '/var/www/*' ignore > /dev/null 2> /dev/null");
}
@@ -2136,6 +2137,13 @@
//* Remove Domain module as its functions are available in the client module now
if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain');
+
+ //* Disable rkhunter run and update in debian cronjob as ispconfig is running and updating rkhunter
+ if(is_file('/etc/default/rkhunter')) {
+ replaceLine('/etc/default/rkhunter', 'CRON_DAILY_RUN="yes"', 'CRON_DAILY_RUN="no"', 1, 0);
+ replaceLine('/etc/default/rkhunter', 'CRON_DB_UPDATE="yes"', 'CRON_DB_UPDATE="no"', 1, 0);
+ }
+
}
diff --git a/install/lib/update.lib.php b/install/lib/update.lib.php
index 678faf9..f81ed45 100644
--- a/install/lib/update.lib.php
+++ b/install/lib/update.lib.php
@@ -29,10 +29,10 @@
//* Installer patch stub class
class installer_patch_update {
- protected function onBeforeSQL() {
+ public function onBeforeSQL() {
}
- protected function onAfterSQL() {
+ public function onAfterSQL() {
}
}
@@ -164,6 +164,9 @@
$next_db_version = intval($current_db_version + 1);
$sql_patch_filename = realpath(dirname(__FILE__).'/../').'/sql/incremental/upd_'.str_pad($next_db_version, 4, '0', STR_PAD_LEFT).'.sql';
$php_patch_filename = realpath(dirname(__FILE__).'/../').'/patches/upd_'.str_pad($next_db_version, 4, '0', STR_PAD_LEFT).'.php';
+
+ // comma separated list of version numbers were a update has to be done silently
+ $silent_update_versions = '75';
if(is_file($sql_patch_filename)) {
@@ -186,10 +189,14 @@
//* Load patch file into database
if( !empty($conf["mysql"]["admin_password"]) ) {
- system("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." ".escapeshellarg($conf['mysql']['database'])." < ".$sql_patch_filename);
+ $cmd = "mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." ".escapeshellarg($conf['mysql']['database'])." < ".$sql_patch_filename;
} else {
- system("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." ".escapeshellarg($conf['mysql']['database'])." < ".$sql_patch_filename);
+ $cmd = "mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." ".escapeshellarg($conf['mysql']['database'])." < ".$sql_patch_filename;
}
+
+ if(in_array($next_db_version,explode(',',$silent_update_versions))) $cmd .= ' > /dev/null 2> /dev/null';
+ system($cmd);
+
swriteln($inst->lng('Loading SQL patch file').': '.$sql_patch_filename);
//* Exec onAfterSQL function
diff --git a/install/sql/incremental/upd_0003.sql b/install/sql/incremental/upd_0003.sql
index bf058aa..e70c3f4 100644
--- a/install/sql/incremental/upd_0003.sql
+++ b/install/sql/incremental/upd_0003.sql
@@ -1,2 +1 @@
-ALTER TABLE `software_package` ADD `package_remote_functions` TEXT NULL AFTER `package_requires_db`;
ALTER TABLE `client` ADD `customer_no` VARCHAR( 64 ) NULL AFTER `contact_name` , ADD `vat_id` VARCHAR( 64 ) NULL AFTER `customer_no`;
\ No newline at end of file
diff --git a/install/sql/incremental/upd_0050.sql b/install/sql/incremental/upd_0050.sql
index d0caf42..bc31868 100644
--- a/install/sql/incremental/upd_0050.sql
+++ b/install/sql/incremental/upd_0050.sql
@@ -1,2 +1,19 @@
+CREATE TABLE IF NOT EXISTS `dns_slave` (
+ `id` int(10) unsigned NOT NULL auto_increment,
+ `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
+ `server_id` int(11) NOT NULL default '1',
+ `origin` varchar(255) NOT NULL DEFAULT '',
+ `ns` varchar(255) NOT NULL DEFAULT '',
+ `active` enum('N','Y') NOT NULL DEFAULT 'N',
+ `xfer` varchar(255) NOT NULL DEFAULT '',
+ PRIMARY KEY (`id`),
+ KEY `origin` (`origin`),
+ KEY `active` (`active`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
ALTER TABLE `dns_slave` DROP INDEX `origin`;
ALTER TABLE `dns_slave` ADD CONSTRAINT `slave` UNIQUE (`origin`,`server_id`);
\ No newline at end of file
diff --git a/install/sql/incremental/upd_0068.sql b/install/sql/incremental/upd_0068.sql
index ab6425b..adce5c2 100644
--- a/install/sql/incremental/upd_0068.sql
+++ b/install/sql/incremental/upd_0068.sql
@@ -1,4 +1,4 @@
-ALTER TABLE `dbispconfig`.`web_domain` ADD UNIQUE `serverdomain` ( `server_id` , `domain` );
+ALTER TABLE `web_domain` ADD UNIQUE `serverdomain` ( `server_id` , `domain` );
ALTER TABLE `dns_rr` DROP KEY rr,
CHANGE `name` `name` VARCHAR( 128 ) NOT NULL,
diff --git a/install/sql/incremental/upd_0071.sql b/install/sql/incremental/upd_0071.sql
index b4bafd8..265361a 100644
--- a/install/sql/incremental/upd_0071.sql
+++ b/install/sql/incremental/upd_0071.sql
@@ -3,5 +3,4 @@
ALTER TABLE `client_template`
ADD `limit_database_quota` int(11) NOT NULL default '-1' AFTER `limit_database`;
ALTER TABLE `web_database`
- ADD `database_quota` int(11) unsigned DEFAULT NULL AFTER `database_name_prefix`,
- ADD `last_quota_notification` date NULL default NULL;
+ ADD `database_quota` int(11) unsigned DEFAULT NULL AFTER `database_name_prefix`;
diff --git a/install/sql/incremental/upd_0073.sql b/install/sql/incremental/upd_0073.sql
new file mode 100644
index 0000000..3ed9a5d
--- /dev/null
+++ b/install/sql/incremental/upd_0073.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `client_template` ADD `limit_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y' AFTER `limit_webdav_user`;
+ALTER TABLE `client` ADD `limit_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y' AFTER `limit_webdav_user`;
+ALTER TABLE `web_domain` CHANGE `php_fpm_use_socket` `php_fpm_use_socket` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y';
+ALTER TABLE `mail_domain` ADD `dkim_selector` VARCHAR(63) NOT NULL DEFAULT 'default' AFTER `dkim`;
diff --git a/install/sql/incremental/upd_0074.sql b/install/sql/incremental/upd_0074.sql
new file mode 100644
index 0000000..21aba81
--- /dev/null
+++ b/install/sql/incremental/upd_0074.sql
@@ -0,0 +1,250 @@
+ALTER TABLE `aps_instances`
+ CHANGE `customer_id` `customer_id` int(4) NOT NULL DEFAULT '0',
+ CHANGE `package_id` `package_id` int(4) NOT NULL DEFAULT '0',
+ CHANGE `instance_status` `instance_status` int(4) NOT NULL DEFAULT '0';
+
+ALTER TABLE `aps_instances_settings`
+ CHANGE `instance_id` `instance_id` int(4) NOT NULL DEFAULT '0',
+ CHANGE `name` `name` varchar(255) NOT NULL DEFAULT '',
+ CHANGE `value` `value` text;
+
+ALTER TABLE `aps_packages`
+ CHANGE `path` `path` varchar(255) NOT NULL DEFAULT '',
+ CHANGE `name` `name` varchar(255) NOT NULL DEFAULT '',
+ CHANGE `category` `category` varchar(255) NOT NULL DEFAULT '',
+ CHANGE `version` `version` varchar(20) NOT NULL DEFAULT '',
+ CHANGE `release` `release` int(4) NOT NULL DEFAULT '0',
+ CHANGE `package_url` `package_url` TEXT;
+
+ALTER TABLE `aps_settings`
+ CHANGE `name` `name` varchar(255) NOT NULL DEFAULT '',
+ CHANGE `value` `value` text;
+
+ALTER TABLE `attempts_login`
+ CHANGE `ip` `ip` varchar(39) NOT NULL DEFAULT '';
+
+ALTER TABLE `client`
+ CHANGE `internet` `internet` varchar(255) NOT NULL DEFAULT '',
+ CHANGE `mail_servers` `mail_servers` blob,
+ CHANGE `web_servers` `web_servers` blob,
+ CHANGE `db_servers` `db_servers` blob,
+ CHANGE `dns_servers` `dns_servers` blob,
+ CHANGE `template_additional` `template_additional` text;
+
+ALTER TABLE `client_template`
+ CHANGE `template_name` `template_name` varchar(64) NOT NULL DEFAULT '';
+
+ALTER TABLE `country`
+ CHANGE `iso` `iso` char(2) NOT NULL DEFAULT '',
+ CHANGE `name` `name` varchar(64) NOT NULL DEFAULT '',
+ CHANGE `printable_name` `printable_name` varchar(64) NOT NULL DEFAULT '';
+
+ALTER TABLE `cron`
+ CHANGE `command` `command` TEXT;
+
+ALTER TABLE `dns_rr`
+ CHANGE `sys_userid` `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
+ CHANGE `sys_groupid` `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
+ CHANGE `sys_perm_user` `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
+ CHANGE `sys_perm_group` `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
+ CHANGE `sys_perm_other` `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
+ CHANGE `zone` `zone` int(11) unsigned NOT NULL DEFAULT '0',
+ CHANGE `name` `name` varchar(64) NOT NULL DEFAULT '',
+ CHANGE `data` `data` varchar(255) NOT NULL DEFAULT '';
+
+ALTER TABLE `dns_slave`
+ CHANGE `sys_userid` `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
+ CHANGE `sys_groupid` `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
+ CHANGE `sys_perm_user` `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
+ CHANGE `sys_perm_group` `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
+ CHANGE `sys_perm_other` `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
+ CHANGE `origin` `origin` varchar(255) NOT NULL DEFAULT '',
+ CHANGE `ns` `ns` varchar(255) NOT NULL DEFAULT '',
+ CHANGE `active` `active` enum('N','Y') NOT NULL DEFAULT 'N',
+ CHANGE `xfer` `xfer` varchar(255) NOT NULL DEFAULT '';
+
+ALTER TABLE `dns_soa`
+ CHANGE `sys_userid` `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
+ CHANGE `sys_groupid` `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
+ CHANGE `sys_perm_user` `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
+ CHANGE `sys_perm_group` `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
+ CHANGE `sys_perm_other` `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
+ CHANGE `origin` `origin` varchar(255) NOT NULL DEFAULT '',
+ CHANGE `ns` `ns` varchar(255) NOT NULL DEFAULT '',
+ CHANGE `mbox` `mbox` varchar(255) NOT NULL DEFAULT '',
+ CHANGE `active` `active` enum('N','Y') NOT NULL DEFAULT 'N',
+ CHANGE `xfer` `xfer` varchar(255) NOT NULL DEFAULT '';
+
+ALTER TABLE `mail_access`
+ CHANGE `source` `source` varchar(255) NOT NULL DEFAULT '',
+ CHANGE `access` `access` varchar(255) NOT NULL DEFAULT '',
+ CHANGE `type` `type` set('recipient','sender','client') NOT NULL DEFAULT 'recipient';
+
+ALTER TABLE `mail_backup`
+ CHANGE `server_id` `server_id` int(10) unsigned NOT NULL DEFAULT '0',
+ CHANGE `parent_domain_id` `parent_domain_id` int(10) unsigned NOT NULL DEFAULT '0',
+ CHANGE `mailuser_id` `mailuser_id` int(10) unsigned NOT NULL DEFAULT '0',
+ CHANGE `tstamp` `tstamp` int(10) unsigned NOT NULL DEFAULT '0',
+ CHANGE `filename` `filename` varchar(255) NOT NULL DEFAULT '',
+ CHANGE `filesize` `filesize` VARCHAR(10) NOT NULL DEFAULT '';
+
+ALTER TABLE `mail_domain`
+ CHANGE `active` `active` enum('n','y') NOT NULL DEFAULT 'n';
+
+ALTER TABLE `mail_forwarding`
+ CHANGE `source` `source` varchar(255) NOT NULL DEFAULT '',
+ CHANGE `active` `active` enum('n','y') NOT NULL DEFAULT 'n';
+
+ALTER TABLE `mail_mailinglist`
+ CHANGE `sys_perm_user` `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
+ CHANGE `sys_perm_group` `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
+ CHANGE `sys_perm_other` `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
+ CHANGE `domain` `domain` varchar(255) NOT NULL DEFAULT '',
+ CHANGE `listname` `listname` varchar(255) NOT NULL DEFAULT '',
+ CHANGE `email` `email` varchar(255) NOT NULL DEFAULT '',
+ CHANGE `password` `password` varchar(255) NOT NULL DEFAULT '';
+
+ALTER TABLE `mail_traffic`
+ CHANGE `mailuser_id` `mailuser_id` int(11) unsigned NOT NULL DEFAULT '0',
+ CHANGE `month` `month` char(7) NOT NULL DEFAULT '',
+ CHANGE `traffic` `traffic` bigint(20) unsigned NOT NULL DEFAULT '0';
+
+ALTER TABLE `mail_transport`
+ CHANGE `transport` `transport` varchar(255) NOT NULL DEFAULT '',
+ CHANGE `active` `active` enum('n','y') NOT NULL DEFAULT 'n';
+
+ALTER TABLE `mail_user`
+ CHANGE `login` `login` varchar(255) NOT NULL default '',
+ CHANGE `password` `password` varchar(255) NOT NULL default '',
+ CHANGE `homedir` `homedir` varchar(255) NOT NULL default '',
+ CHANGE `postfix` `postfix` enum('n','y') NOT NULL default 'y',
+ CHANGE `access` `access` enum('n','y') NOT NULL default 'y';
+
+ALTER TABLE `monitor_data`
+ CHANGE `server_id` `server_id` int(11) unsigned NOT NULL default '0',
+ CHANGE `type` `type` varchar(255) NOT NULL default '',
+ CHANGE `created` `created` int(11) unsigned NOT NULL default '0',
+ CHANGE `data` `data` mediumtext;
+
+ALTER TABLE `openvz_ostemplate`
+ CHANGE `template_file` `template_file` varchar(255) NOT NULL DEFAULT '';
+
+ALTER TABLE `openvz_traffic`
+ CHANGE `veid` `veid` int(11) NOT NULL DEFAULT '0',
+ CHANGE `traffic_date` `traffic_date` date NOT NULL DEFAULT '0000-00-00';
+
+ALTER TABLE `openvz_vm`
+ CHANGE `veid` `veid` int(10) unsigned NOT NULL DEFAULT '0',
+ CHANGE `ip_address` `ip_address` varchar(255) NOT NULL DEFAULT '',
+ CHANGE `active_until_date` `active_until_date` date NOT NULL DEFAULT '0000-00-00',
+ CHANGE `capability` `capability` text,
+ CHANGE `config` `config` mediumtext;
+
+ALTER TABLE `remote_session`
+ CHANGE `remote_session` `remote_session` varchar(64) NOT NULL DEFAULT '',
+ CHANGE `remote_userid` `remote_userid` int(11) unsigned NOT NULL DEFAULT '0',
+ CHANGE `remote_functions` `remote_functions` text,
+ CHANGE `tstamp` `tstamp` int(10) unsigned NOT NULL DEFAULT '0';
+
+ALTER TABLE `remote_user`
+ CHANGE `remote_username` `remote_username` varchar(64) NOT NULL DEFAULT '',
+ CHANGE `remote_password` `remote_password` varchar(64) NOT NULL DEFAULT '',
+ CHANGE `remote_functions` `remote_functions` text;
+
+ALTER TABLE `server`
+ CHANGE `config` `config` text;
+
+ALTER TABLE `shell_user`
+ CHANGE `chroot` `chroot` varchar(255) NOT NULL DEFAULT '',
+ CHANGE `ssh_rsa` `ssh_rsa` text;
+
+ALTER TABLE `software_update`
+ CHANGE `software_repo_id` `software_repo_id` int(11) unsigned NOT NULL DEFAULT '0',
+ CHANGE `package_name` `package_name` varchar(64) NOT NULL DEFAULT '',
+ CHANGE `update_url` `update_url` varchar(255) NOT NULL DEFAULT '',
+ CHANGE `update_md5` `update_md5` varchar(255) NOT NULL DEFAULT '',
+ CHANGE `update_dependencies` `update_dependencies` varchar(255) NOT NULL DEFAULT '',
+ CHANGE `update_title` `update_title` varchar(64) NOT NULL DEFAULT '';
+
+ALTER TABLE `software_update_inst`
+ CHANGE `package_name` `package_name` varchar(64) NOT NULL DEFAULT '',
+ CHANGE `server_id` `server_id` int(11) unsigned NOT NULL DEFAULT '0';
+
+ALTER TABLE `spamfilter_policy`
+ CHANGE `sys_userid` `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
+ CHANGE `sys_groupid` `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
+ CHANGE `sys_perm_user` `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
+ CHANGE `sys_perm_group` `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
+ CHANGE `sys_perm_other` `sys_perm_other` varchar(5) NOT NULL DEFAULT '';
+
+
+ALTER TABLE `spamfilter_users`
+ CHANGE `sys_userid` `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
+ CHANGE `sys_groupid` `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
+ CHANGE `sys_perm_user` `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
+ CHANGE `sys_perm_group` `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
+ CHANGE `sys_perm_other` `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
+ CHANGE `server_id` `server_id` int(11) unsigned NOT NULL DEFAULT '0',
+ CHANGE `email` `email` varchar(255) NOT NULL DEFAULT '';
+
+ALTER TABLE `spamfilter_wblist`
+ CHANGE `sys_userid` `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
+ CHANGE `sys_groupid` `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
+ CHANGE `sys_perm_user` `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
+ CHANGE `sys_perm_group` `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
+ CHANGE `sys_perm_other` `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
+ CHANGE `server_id` `server_id` int(11) unsigned NOT NULL DEFAULT '0',
+ CHANGE `rid` `rid` int(11) unsigned NOT NULL DEFAULT '0',
+ CHANGE `email` `email` varchar(255) NOT NULL DEFAULT '',
+ CHANGE `priority` `priority` tinyint(3) unsigned NOT NULL DEFAULT '0';
+
+ALTER TABLE `sys_config`
+ CHANGE `group` `group` varchar(64) NOT NULL DEFAULT '',
+ CHANGE `name` `name` varchar(64) NOT NULL DEFAULT '',
+ CHANGE `value` `value` varchar(255) NOT NULL DEFAULT '';
+
+ALTER TABLE `sys_cron`
+ CHANGE `name` `name` varchar(50) NOT NULL DEFAULT '';
+
+ALTER TABLE `sys_datalog`
+ CHANGE `server_id` `server_id` int(11) unsigned NOT NULL DEFAULT '0',
+ CHANGE `data` `data` longtext;
+
+ALTER TABLE `sys_group`
+ CHANGE `description` `description` text;
+
+ALTER TABLE `sys_ini`
+ CHANGE `config` `config` longtext;
+
+ALTER TABLE `sys_log`
+ CHANGE `tstamp` `tstamp` int(11) unsigned NOT NULL DEFAULT '0';
+
+ALTER TABLE `sys_remoteaction`
+ CHANGE `server_id` `server_id` int(11) unsigned NOT NULL DEFAULT '0',
+ CHANGE `tstamp` `tstamp` int(11) NOT NULL DEFAULT '0',
+ CHANGE `action_type` `action_type` varchar(20) NOT NULL DEFAULT '',
+ CHANGE `action_param` `action_param` mediumtext,
+ CHANGE `action_state` `action_state` enum('pending','ok','warning','error') NOT NULL DEFAULT 'pending',
+ CHANGE `response` `response` mediumtext;
+
+ALTER TABLE `sys_theme`
+ CHANGE `tpl_name` `tpl_name` varchar(32) NOT NULL DEFAULT '',
+ CHANGE `username` `username` varchar(64) NOT NULL DEFAULT '',
+ CHANGE `logo_url` `logo_url` varchar(255) NOT NULL DEFAULT '';
+
+ALTER TABLE `sys_user`
+ CHANGE `groups` `groups` TEXT;
+
+ALTER TABLE `web_backup`
+ CHANGE `server_id` `server_id` int(10) unsigned NOT NULL DEFAULT '0',
+ CHANGE `parent_domain_id` `parent_domain_id` int(10) unsigned NOT NULL DEFAULT '0',
+ CHANGE `tstamp` `tstamp` int(10) unsigned NOT NULL DEFAULT '0',
+ CHANGE `filename` `filename` varchar(255) NOT NULL DEFAULT '',
+ CHANGE `filesize` `filesize` VARCHAR(10) NOT NULL DEFAULT '';
+
+ALTER TABLE `web_database`
+ CHANGE `remote_ips` `remote_ips` text;
+
+ALTER TABLE `web_traffic`
+ CHANGE `hostname` `hostname` varchar(255) NOT NULL DEFAULT '',
+ CHANGE `traffic_date` `traffic_date` date NOT NULL DEFAULT '0000-00-00';
diff --git a/install/sql/incremental/upd_0075.sql b/install/sql/incremental/upd_0075.sql
new file mode 100644
index 0000000..acca4e6
--- /dev/null
+++ b/install/sql/incremental/upd_0075.sql
@@ -0,0 +1,80 @@
+ALTER TABLE `web_database` ADD `last_quota_notification` date NULL default NULL AFTER `database_quota`;
+
+ALTER TABLE `ftp_user` CHANGE `username_prefix` `username_prefix` varchar(50) NOT NULL DEFAULT '';
+
+ALTER TABLE `mail_domain` CHANGE `dkim` `dkim` enum('n','y') NOT NULL DEFAULT 'n';
+ALTER TABLE `mail_forwarding` CHANGE `destination` `destination` text;
+ALTER TABLE `mail_user`
+ CHANGE `uid` `uid` int(11) unsigned NOT NULL DEFAULT '5000',
+ CHANGE `gid` `gid` int(11) unsigned NOT NULL DEFAULT '5000';
+
+ALTER TABLE `server`
+ CHANGE `proxy_server` `proxy_server` tinyint(1) NOT NULL DEFAULT '0',
+ CHANGE `firewall_server` `firewall_server` tinyint(1) NOT NULL DEFAULT '0',
+ CHANGE `dbversion` `dbversion` int(11) unsigned NOT NULL DEFAULT '1';
+
+ALTER TABLE `server_ip`
+ CHANGE `virtualhost_port` `virtualhost_port` varchar(255) DEFAULT '80,443';
+
+ALTER TABLE `shell_user`
+ CHANGE `username_prefix` `username_prefix` varchar(50) NOT NULL DEFAULT '';
+
+ALTER TABLE `client` ADD `limit_dns_slave_zone` int(11) NOT NULL DEFAULT '-1' AFTER `default_slave_dnsserver`;
+ALTER TABLE `client_template` ADD `limit_dns_slave_zone` int(11) NOT NULL DEFAULT '-1' AFTER `limit_dns_zone`;
+
+ALTER TABLE `client`
+ CHANGE `id_rsa` `id_rsa` varchar(2000) NOT NULL DEFAULT '',
+ CHANGE `ssh_rsa` `ssh_rsa` varchar(600) NOT NULL DEFAULT '';
+
+ALTER TABLE `software_package` CHANGE `software_repo_id` `software_repo_id` int(11) unsigned NOT NULL DEFAULT '0';
+ALTER TABLE `software_package` ADD `package_installable` enum('yes','no','key') NOT NULL default 'yes' AFTER `package_type`;
+ALTER TABLE `software_package` ADD `package_requires_db` enum('no','mysql') NOT NULL default 'no' AFTER `package_installable`;
+ALTER TABLE `software_package` ADD `package_remote_functions` TEXT NULL AFTER `package_requires_db`;
+ALTER TABLE `software_package` ADD `package_key` varchar(255) NOT NULL DEFAULT '' AFTER `package_remote_functions`;
+ALTER TABLE `software_package` ADD `package_config` text AFTER `package_key`;
+
+ALTER TABLE `software_package`
+ CHANGE `package_name` `package_name` varchar(64) NOT NULL DEFAULT '',
+ CHANGE `package_title` `package_title` varchar(64) NOT NULL DEFAULT '',
+ CHANGE `package_key` `package_key` varchar(255) NOT NULL DEFAULT '';
+
+INSERT IGNORE INTO `sys_config` (`group`, `name`, `value`) VALUES ('interface', 'session_timeout', '0');
+
+ALTER TABLE `sys_datalog` CHANGE `status` `status` set('pending','ok','warning','error') NOT NULL DEFAULT 'ok';
+
+ALTER TABLE `sys_session` CHANGE `session_id` `session_id` varchar(64) NOT NULL DEFAULT '';
+
+ALTER TABLE `sys_user` CHANGE `language` `language` varchar(2) NOT NULL DEFAULT 'en';
+ALTER TABLE `sys_user`
+ ADD `id_rsa` varchar(2000) NOT NULL DEFAULT '' AFTER `client_id`,
+ ADD `ssh_rsa` varchar(600) NOT NULL DEFAULT '' AFTER `id_rsa`;
+
+ALTER TABLE `webdav_user` CHANGE `username_prefix` `username_prefix` varchar(50) NOT NULL DEFAULT '';
+
+ALTER TABLE `web_database` CHANGE `database_name_prefix` `database_name_prefix` varchar(50) NOT NULL DEFAULT '';
+
+ALTER TABLE `web_database_user` CHANGE `database_user_prefix` `database_user_prefix` varchar(50) NOT NULL DEFAULT '';
+
+ALTER TABLE `web_domain` DROP COLUMN `document_root_www`;
+ALTER TABLE `web_domain`
+ CHANGE `ssl_key` `ssl_key` mediumtext,
+ CHANGE `apache_directives` `apache_directives` mediumtext,
+ CHANGE `php_open_basedir` `php_open_basedir` mediumtext,
+ CHANGE `custom_php_ini` `custom_php_ini` mediumtext;
+
+CREATE TABLE IF NOT EXISTS `dns_slave` (
+ `id` int(10) unsigned NOT NULL auto_increment,
+ `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
+ `server_id` int(11) NOT NULL default '1',
+ `origin` varchar(255) NOT NULL DEFAULT '',
+ `ns` varchar(255) NOT NULL DEFAULT '',
+ `active` enum('N','Y') NOT NULL DEFAULT 'N',
+ `xfer` varchar(255) NOT NULL DEFAULT '',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `slave` (`origin`,`server_id`),
+ KEY `active` (`active`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 459e0f3..3c1f0c5 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -65,9 +65,9 @@
`sys_perm_group` varchar(5) DEFAULT NULL,
`sys_perm_other` varchar(5) DEFAULT NULL,
`server_id` int(11) NOT NULL DEFAULT '0',
- `customer_id` int(4) NOT NULL,
- `package_id` int(4) NOT NULL,
- `instance_status` int(4) NOT NULL,
+ `customer_id` int(4) NOT NULL DEFAULT '0',
+ `package_id` int(4) NOT NULL DEFAULT '0',
+ `instance_status` int(4) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
@@ -80,9 +80,9 @@
CREATE TABLE IF NOT EXISTS `aps_instances_settings` (
`id` int(4) NOT NULL AUTO_INCREMENT,
`server_id` int(11) NOT NULL DEFAULT '0',
- `instance_id` int(4) NOT NULL,
- `name` varchar(255) NOT NULL,
- `value` text NOT NULL,
+ `instance_id` int(4) NOT NULL DEFAULT '0',
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `value` text,
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
@@ -94,12 +94,12 @@
CREATE TABLE IF NOT EXISTS `aps_packages` (
`id` int(4) NOT NULL AUTO_INCREMENT,
- `path` varchar(255) NOT NULL,
- `name` varchar(255) NOT NULL,
- `category` varchar(255) NOT NULL,
- `version` varchar(20) NOT NULL,
- `release` int(4) NOT NULL,
- `package_url` TEXT NOT NULL,
+ `path` varchar(255) NOT NULL DEFAULT '',
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `category` varchar(255) NOT NULL DEFAULT '',
+ `version` varchar(20) NOT NULL DEFAULT '',
+ `release` int(4) NOT NULL DEFAULT '0',
+ `package_url` TEXT,
`package_status` int(1) NOT NULL DEFAULT '2',
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
@@ -112,8 +112,8 @@
CREATE TABLE IF NOT EXISTS `aps_settings` (
`id` int(4) NOT NULL AUTO_INCREMENT,
- `name` varchar(255) NOT NULL,
- `value` text NOT NULL,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `value` text,
PRIMARY KEY (`id`),
UNIQUE KEY `name` (`name`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
@@ -125,7 +125,7 @@
--
CREATE TABLE `attempts_login` (
- `ip` varchar(39) NOT NULL,
+ `ip` varchar(39) NOT NULL DEFAULT '',
`times` int(11) DEFAULT NULL,
`login_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
@@ -158,7 +158,7 @@
`mobile` varchar(32) DEFAULT NULL,
`fax` varchar(32) DEFAULT NULL,
`email` varchar(255) DEFAULT NULL,
- `internet` varchar(255) NOT NULL,
+ `internet` varchar(255) NOT NULL DEFAULT '',
`icq` varchar(16) DEFAULT NULL,
`notes` text,
`bank_account_owner` varchar(255) DEFAULT NULL,
@@ -169,7 +169,7 @@
`bank_account_swift` varchar(255) DEFAULT NULL,
`paypal_email` varchar(255) DEFAULT NULL,
`default_mailserver` int(11) unsigned NOT NULL DEFAULT '1',
- `mail_servers` blob NOT NULL,
+ `mail_servers` blob,
`limit_maildomain` int(11) NOT NULL DEFAULT '-1',
`limit_mailbox` int(11) NOT NULL DEFAULT '-1',
`limit_mailalias` int(11) NOT NULL DEFAULT '-1',
@@ -184,7 +184,7 @@
`limit_spamfilter_user` int(11) NOT NULL DEFAULT '0',
`limit_spamfilter_policy` int(11) NOT NULL DEFAULT '0',
`default_webserver` int(11) unsigned NOT NULL DEFAULT '1',
- `web_servers` blob NOT NULL,
+ `web_servers` blob,
`limit_web_ip` text,
`limit_web_domain` int(11) NOT NULL DEFAULT '-1',
`limit_web_quota` int(11) NOT NULL DEFAULT '-1',
@@ -204,15 +204,16 @@
`limit_shell_user` int(11) NOT NULL DEFAULT '0',
`ssh_chroot` varchar(255) NOT NULL DEFAULT 'no,jailkit,ssh-chroot',
`limit_webdav_user` int(11) NOT NULL DEFAULT '0',
+ `limit_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y',
`limit_aps` int(11) NOT NULL DEFAULT '-1',
`default_dnsserver` int(11) unsigned NOT NULL DEFAULT '1',
- `db_servers` blob NOT NULL,
+ `db_servers` blob,
`limit_dns_zone` int(11) NOT NULL DEFAULT '-1',
`default_slave_dnsserver` int(11) unsigned NOT NULL DEFAULT '1',
`limit_dns_slave_zone` int(11) NOT NULL DEFAULT '-1',
`limit_dns_record` int(11) NOT NULL DEFAULT '-1',
`default_dbserver` int(11) NOT NULL DEFAULT '1',
- `dns_servers` blob NOT NULL,
+ `dns_servers` blob,
`limit_database` int(11) NOT NULL DEFAULT '-1',
`limit_database_quota` int(11) NOT NULL default '-1',
`limit_cron` int(11) NOT NULL DEFAULT '0',
@@ -230,7 +231,7 @@
`language` char(2) NOT NULL DEFAULT 'en',
`usertheme` varchar(32) NOT NULL DEFAULT 'default',
`template_master` int(11) unsigned NOT NULL DEFAULT '0',
- `template_additional` text NOT NULL,
+ `template_additional` text,
`created_at` bigint(20) DEFAULT NULL,
`locked` enum('n','y') NOT NULL DEFAULT 'n',
`canceled` enum('n','y') NOT NULL DEFAULT 'n',
@@ -279,7 +280,7 @@
`sys_perm_user` varchar(5) default NULL,
`sys_perm_group` varchar(5) default NULL,
`sys_perm_other` varchar(5) default NULL,
- `template_name` varchar(64) NOT NULL,
+ `template_name` varchar(64) NOT NULL DEFAULT '',
`template_type` varchar(1) NOT NULL default 'm',
`limit_maildomain` int(11) NOT NULL default '-1',
`limit_mailbox` int(11) NOT NULL default '-1',
@@ -313,6 +314,7 @@
`limit_shell_user` int(11) NOT NULL default '0',
`ssh_chroot` varchar(255) NOT NULL DEFAULT 'no',
`limit_webdav_user` int(11) NOT NULL default '0',
+ `limit_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y',
`limit_aps` int(11) NOT NULL DEFAULT '-1',
`limit_dns_zone` int(11) NOT NULL default '-1',
`limit_dns_slave_zone` int(11) NOT NULL default '-1',
@@ -375,9 +377,9 @@
--
CREATE TABLE `country` (
- `iso` char(2) NOT NULL,
- `name` varchar(64) NOT NULL,
- `printable_name` varchar(64) NOT NULL,
+ `iso` char(2) NOT NULL DEFAULT '',
+ `name` varchar(64) NOT NULL DEFAULT '',
+ `printable_name` varchar(64) NOT NULL DEFAULT '',
`iso3` char(3) DEFAULT NULL,
`numcode` smallint(6) DEFAULT NULL,
`eu` enum('n','y') NOT NULL DEFAULT 'n',
@@ -399,7 +401,7 @@
`server_id` int(11) unsigned NOT NULL default '0',
`parent_domain_id` int(11) unsigned NOT NULL default '0',
`type` enum('url','chrooted','full') NOT NULL default 'url',
- `command` TEXT NOT NULL,
+ `command` TEXT,
`run_min` varchar(100) NULL,
`run_hour` varchar(100) NULL,
`run_mday` varchar(100) NULL,
@@ -438,16 +440,16 @@
CREATE TABLE `dns_rr` (
`id` int(11) unsigned NOT NULL auto_increment,
- `sys_userid` int(11) unsigned NOT NULL,
- `sys_groupid` int(11) unsigned NOT NULL,
- `sys_perm_user` varchar(5) NOT NULL,
- `sys_perm_group` varchar(5) NOT NULL,
- `sys_perm_other` varchar(5) NOT NULL,
+ `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
`server_id` int(11) NOT NULL default '1',
- `zone` int(11) unsigned NOT NULL,
- `name` varchar(64) NOT NULL,
+ `zone` int(11) unsigned NOT NULL DEFAULT '0',
+ `name` varchar(64) NOT NULL DEFAULT '',
`type` enum('A','AAAA','ALIAS','CNAME','HINFO','MX','NAPTR','NS','PTR','RP','SRV','TXT') default NULL,
- `data` varchar(255) NOT NULL,
+ `data` varchar(255) NOT NULL DEFAULT '',
`aux` int(11) unsigned NOT NULL default '0',
`ttl` int(11) unsigned NOT NULL default '86400',
`active` enum('N','Y') NOT NULL default 'Y',
@@ -465,16 +467,16 @@
CREATE TABLE `dns_slave` (
`id` int(10) unsigned NOT NULL auto_increment,
- `sys_userid` int(11) unsigned NOT NULL,
- `sys_groupid` int(11) unsigned NOT NULL,
- `sys_perm_user` varchar(5) NOT NULL,
- `sys_perm_group` varchar(5) NOT NULL,
- `sys_perm_other` varchar(5) NOT NULL,
+ `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
`server_id` int(11) NOT NULL default '1',
- `origin` varchar(255) NOT NULL,
- `ns` varchar(255) NOT NULL,
- `active` enum('N','Y') NOT NULL,
- `xfer` varchar(255) NOT NULL,
+ `origin` varchar(255) NOT NULL DEFAULT '',
+ `ns` varchar(255) NOT NULL DEFAULT '',
+ `active` enum('N','Y') NOT NULL DEFAULT 'N',
+ `xfer` varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY (`id`),
UNIQUE KEY `slave` (`origin`,`server_id`),
KEY `active` (`active`)
@@ -488,23 +490,23 @@
CREATE TABLE `dns_soa` (
`id` int(10) unsigned NOT NULL auto_increment,
- `sys_userid` int(11) unsigned NOT NULL,
- `sys_groupid` int(11) unsigned NOT NULL,
- `sys_perm_user` varchar(5) NOT NULL,
- `sys_perm_group` varchar(5) NOT NULL,
- `sys_perm_other` varchar(5) NOT NULL,
+ `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
`server_id` int(11) NOT NULL default '1',
- `origin` varchar(255) NOT NULL,
- `ns` varchar(255) NOT NULL,
- `mbox` varchar(255) NOT NULL,
+ `origin` varchar(255) NOT NULL DEFAULT '',
+ `ns` varchar(255) NOT NULL DEFAULT '',
+ `mbox` varchar(255) NOT NULL DEFAULT '',
`serial` int(11) unsigned NOT NULL default '1',
`refresh` int(11) unsigned NOT NULL default '28800',
`retry` int(11) unsigned NOT NULL default '7200',
`expire` int(11) unsigned NOT NULL default '604800',
`minimum` int(11) unsigned NOT NULL default '86400',
`ttl` int(11) unsigned NOT NULL default '86400',
- `active` enum('N','Y') NOT NULL,
- `xfer` varchar(255) NOT NULL,
+ `active` enum('N','Y') NOT NULL DEFAULT 'N',
+ `xfer` varchar(255) NOT NULL DEFAULT '',
`also_notify` varchar(255) default NULL,
`update_acl` varchar(255) default NULL,
PRIMARY KEY (`id`),
@@ -676,9 +678,9 @@
`sys_perm_group` varchar(5) NOT NULL default '',
`sys_perm_other` varchar(5) NOT NULL default '',
`server_id` int(11) NOT NULL default '0',
- `source` varchar(255) NOT NULL,
- `access` varchar(255) NOT NULL,
- `type` set('recipient','sender','client') NOT NULL,
+ `source` varchar(255) NOT NULL DEFAULT '',
+ `access` varchar(255) NOT NULL DEFAULT '',
+ `type` set('recipient','sender','client') NOT NULL DEFAULT 'recipient',
`active` enum('n','y') NOT NULL default 'y',
PRIMARY KEY (`access_id`),
KEY `server_id` (`server_id`,`source`)
@@ -692,13 +694,13 @@
CREATE TABLE `mail_backup` (
`backup_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `server_id` int(10) unsigned NOT NULL,
- `parent_domain_id` int(10) unsigned NOT NULL,
- `mailuser_id` int(10) unsigned NOT NULL,
+ `server_id` int(10) unsigned NOT NULL DEFAULT '0',
+ `parent_domain_id` int(10) unsigned NOT NULL DEFAULT '0',
+ `mailuser_id` int(10) unsigned NOT NULL DEFAULT '0',
`backup_mode` varchar(64) NOT NULL DEFAULT '',
- `tstamp` int(10) unsigned NOT NULL,
- `filename` varchar(255) NOT NULL,
- `filesize` VARCHAR(10) NOT NULL,
+ `tstamp` int(10) unsigned NOT NULL DEFAULT '0',
+ `filename` varchar(255) NOT NULL DEFAULT '',
+ `filesize` VARCHAR(10) NOT NULL DEFAULT '',
PRIMARY KEY (`backup_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -740,9 +742,10 @@
`server_id` int(11) unsigned NOT NULL default '0',
`domain` varchar(255) NOT NULL default '',
`dkim` ENUM( 'n', 'y' ) NOT NULL default 'n',
+ `dkim_selector` varchar(63) NOT NULL DEFAULT 'default',
`dkim_private` mediumtext NULL,
`dkim_public` mediumtext NULL,
- `active` enum('n','y') NOT NULL,
+ `active` enum('n','y') NOT NULL DEFAULT 'n',
PRIMARY KEY (`domain_id`),
KEY `server_id` (`server_id`,`domain`),
KEY `domain_active` (`domain`,`active`)
@@ -762,10 +765,10 @@
`sys_perm_group` varchar(5) NOT NULL default '',
`sys_perm_other` varchar(5) NOT NULL default '',
`server_id` int(11) unsigned NOT NULL default '0',
- `source` varchar(255) NOT NULL,
+ `source` varchar(255) NOT NULL DEFAULT '',
`destination` text,
`type` enum('alias','aliasdomain','forward','catchall') NOT NULL default 'alias',
- `active` enum('n','y') NOT NULL,
+ `active` enum('n','y') NOT NULL DEFAULT 'n',
PRIMARY KEY (`forwarding_id`),
KEY `server_id` (`server_id`,`source`),
KEY `type` (`type`)
@@ -806,14 +809,14 @@
`mailinglist_id` int(11) unsigned NOT NULL auto_increment,
`sys_userid` int(11) unsigned NOT NULL default '0',
`sys_groupid` int(11) unsigned NOT NULL default '0',
- `sys_perm_user` varchar(5) NOT NULL,
- `sys_perm_group` varchar(5) NOT NULL,
- `sys_perm_other` varchar(5) NOT NULL,
+ `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
`server_id` int(11) unsigned NOT NULL default '0',
- `domain` varchar(255) NOT NULL,
- `listname` varchar(255) NOT NULL,
- `email` varchar(255) NOT NULL,
- `password` varchar(255) NOT NULL,
+ `domain` varchar(255) NOT NULL DEFAULT '',
+ `listname` varchar(255) NOT NULL DEFAULT '',
+ `email` varchar(255) NOT NULL DEFAULT '',
+ `password` varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY (`mailinglist_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -845,9 +848,9 @@
CREATE TABLE `mail_traffic` (
`traffic_id` int(11) unsigned NOT NULL auto_increment,
- `mailuser_id` int(11) unsigned NOT NULL,
- `month` char(7) NOT NULL,
- `traffic` bigint(20) unsigned NOT NULL,
+ `mailuser_id` int(11) unsigned NOT NULL DEFAULT '0',
+ `month` char(7) NOT NULL DEFAULT '',
+ `traffic` bigint(20) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`traffic_id`),
KEY `mailuser_id` (`mailuser_id`,`month`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -867,9 +870,9 @@
`sys_perm_other` varchar(5) NOT NULL default '',
`server_id` int(11) unsigned NOT NULL default '0',
`domain` varchar(255) NOT NULL default '',
- `transport` varchar(255) NOT NULL,
+ `transport` varchar(255) NOT NULL DEFAULT '',
`sort_order` int(11) unsigned NOT NULL default '5',
- `active` enum('n','y') NOT NULL,
+ `active` enum('n','y') NOT NULL DEFAULT 'n',
PRIMARY KEY (`transport_id`),
KEY `server_id` (`server_id`,`transport`),
KEY `server_id_2` (`server_id`,`domain`)
@@ -890,15 +893,15 @@
`sys_perm_other` varchar(5) NOT NULL default '',
`server_id` int(11) unsigned NOT NULL default '0',
`email` varchar(255) NOT NULL default '',
- `login` varchar(255) NOT NULL,
- `password` varchar(255) NOT NULL,
+ `login` varchar(255) NOT NULL default '',
+ `password` varchar(255) NOT NULL default '',
`name` varchar(255) NOT NULL default '',
`uid` int(11) unsigned NOT NULL default '5000',
`gid` int(11) unsigned NOT NULL default '5000',
`maildir` varchar(255) NOT NULL default '',
`quota` bigint(20) NOT NULL default '-1',
`cc` varchar(255) NOT NULL default '',
- `homedir` varchar(255) NOT NULL,
+ `homedir` varchar(255) NOT NULL default '',
`autoresponder` enum('n','y') NOT NULL default 'n',
`autoresponder_start_date` datetime NOT NULL default '0000-00-00 00:00:00',
`autoresponder_end_date` datetime NOT NULL default '0000-00-00 00:00:00',
@@ -906,8 +909,8 @@
`autoresponder_text` mediumtext NULL,
`move_junk` enum('n','y') NOT NULL default 'n',
`custom_mailfilter` mediumtext,
- `postfix` enum('n','y') NOT NULL,
- `access` enum('n','y') NOT NULL,
+ `postfix` enum('n','y') NOT NULL default 'y',
+ `access` enum('n','y') NOT NULL default 'y',
`disableimap` enum('n','y') NOT NULL default 'n',
`disablepop3` enum('n','y') NOT NULL default 'n',
`disabledeliver` enum('n','y') NOT NULL default 'n',
@@ -956,10 +959,10 @@
--
CREATE TABLE `monitor_data` (
- `server_id` int(11) unsigned NOT NULL,
- `type` varchar(255) NOT NULL,
- `created` int(11) unsigned NOT NULL,
- `data` mediumtext NOT NULL,
+ `server_id` int(11) unsigned NOT NULL default '0',
+ `type` varchar(255) NOT NULL default '',
+ `created` int(11) unsigned NOT NULL default '0',
+ `data` mediumtext,
`state` enum('no_state','unknown','ok','info','warning','critical','error') NOT NULL DEFAULT 'unknown',
PRIMARY KEY (`server_id`,`type`,`created`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
@@ -1002,7 +1005,7 @@
`sys_perm_group` varchar(5) DEFAULT NULL,
`sys_perm_other` varchar(5) DEFAULT NULL,
`template_name` varchar(255) DEFAULT NULL,
- `template_file` varchar(255) NOT NULL,
+ `template_file` varchar(255) NOT NULL DEFAULT '',
`server_id` int(11) NOT NULL DEFAULT '0',
`allservers` varchar(255) NOT NULL DEFAULT 'y',
`active` varchar(255) NOT NULL DEFAULT 'y',
@@ -1083,8 +1086,8 @@
--
CREATE TABLE IF NOT EXISTS `openvz_traffic` (
- `veid` int(11) NOT NULL,
- `traffic_date` date NOT NULL,
+ `veid` int(11) NOT NULL DEFAULT '0',
+ `traffic_date` date NOT NULL DEFAULT '0000-00-00',
`traffic_bytes` bigint(32) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`veid`,`traffic_date`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1108,15 +1111,15 @@
`sys_perm_group` varchar(5) DEFAULT NULL,
`sys_perm_other` varchar(5) DEFAULT NULL,
`server_id` int(11) NOT NULL DEFAULT '0',
- `veid` int(10) unsigned NOT NULL,
+ `veid` int(10) unsigned NOT NULL DEFAULT '0',
`ostemplate_id` int(11) NOT NULL DEFAULT '0',
`template_id` int(11) NOT NULL DEFAULT '0',
- `ip_address` varchar(255) NOT NULL,
+ `ip_address` varchar(255) NOT NULL DEFAULT '',
`hostname` varchar(255) DEFAULT NULL,
`vm_password` varchar(255) DEFAULT NULL,
`start_boot` varchar(255) NOT NULL DEFAULT 'y',
`active` varchar(255) NOT NULL DEFAULT 'y',
- `active_until_date` date NOT NULL,
+ `active_until_date` date NOT NULL DEFAULT '0000-00-00',
`description` text,
`diskspace` int(11) NOT NULL DEFAULT '0',
`traffic` int(11) NOT NULL DEFAULT '-1',
@@ -1129,8 +1132,8 @@
`io_priority` int(11) NOT NULL DEFAULT '4',
`nameserver` varchar(255) NOT NULL DEFAULT '8.8.8.8 8.8.4.4',
`create_dns` varchar(1) NOT NULL DEFAULT 'n',
- `capability` text NOT NULL,
- `config` mediumtext NOT NULL,
+ `capability` text,
+ `config` mediumtext,
PRIMARY KEY (`vm_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
@@ -1145,11 +1148,11 @@
--
CREATE TABLE `remote_session` (
- `remote_session` varchar(64) NOT NULL,
- `remote_userid` int(11) unsigned NOT NULL,
- `remote_functions` text NOT NULL,
+ `remote_session` varchar(64) NOT NULL DEFAULT '',
+ `remote_userid` int(11) unsigned NOT NULL DEFAULT '0',
+ `remote_functions` text,
`client_login` tinyint(1) unsigned NOT NULL default '0',
- `tstamp` int(10) unsigned NOT NULL,
+ `tstamp` int(10) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`remote_session`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
@@ -1166,9 +1169,9 @@
`sys_perm_user` varchar(5) default NULL,
`sys_perm_group` varchar(5) default NULL,
`sys_perm_other` varchar(5) default NULL,
- `remote_username` varchar(64) NOT NULL,
- `remote_password` varchar(64) NOT NULL,
- `remote_functions` text NOT NULL,
+ `remote_username` varchar(64) NOT NULL DEFAULT '',
+ `remote_password` varchar(64) NOT NULL DEFAULT '',
+ `remote_functions` text,
PRIMARY KEY (`remote_userid`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -1194,7 +1197,7 @@
`vserver_server` tinyint(1) NOT NULL default '0',
`proxy_server` tinyint(1) NOT NULL default '0',
`firewall_server` tinyint(1) NOT NULL default '0',
- `config` text NOT NULL,
+ `config` text,
`updated` bigint(20) unsigned NOT NULL default '0',
`mirror_server_id` int(11) unsigned NOT NULL default '0',
`dbversion` int(11) unsigned NOT NULL default '1',
@@ -1273,8 +1276,8 @@
`pgroup` varchar(255) default NULL,
`shell` varchar(255) NOT NULL default '/bin/bash',
`dir` varchar(255) default NULL,
- `chroot` varchar(255) NOT NULL,
- `ssh_rsa` text NOT NULL,
+ `chroot` varchar(255) NOT NULL DEFAULT '',
+ `ssh_rsa` text,
PRIMARY KEY (`shell_user_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -1286,16 +1289,16 @@
CREATE TABLE `software_package` (
`package_id` int(11) unsigned NOT NULL auto_increment,
- `software_repo_id` int(11) unsigned NOT NULL,
- `package_name` varchar(64) NOT NULL,
- `package_title` varchar(64) NOT NULL,
+ `software_repo_id` int(11) unsigned NOT NULL DEFAULT '0',
+ `package_name` varchar(64) NOT NULL DEFAULT '',
+ `package_title` varchar(64) NOT NULL DEFAULT '',
`package_description` text,
`package_version` varchar(8) default NULL,
`package_type` enum('ispconfig','app','web') NOT NULL default 'app',
`package_installable` enum('yes','no','key') NOT NULL default 'yes',
`package_requires_db` enum('no','mysql') NOT NULL default 'no',
`package_remote_functions` text,
- `package_key` varchar(255) NOT NULL,
+ `package_key` varchar(255) NOT NULL DEFAULT '',
`package_config` text,
PRIMARY KEY (`package_id`),
UNIQUE KEY `package_name` (`package_name`)
@@ -1330,12 +1333,12 @@
CREATE TABLE `software_update` (
`software_update_id` int(11) unsigned NOT NULL auto_increment,
- `software_repo_id` int(11) unsigned NOT NULL,
- `package_name` varchar(64) NOT NULL,
- `update_url` varchar(255) NOT NULL,
- `update_md5` varchar(255) NOT NULL,
- `update_dependencies` varchar(255) NOT NULL,
- `update_title` varchar(64) NOT NULL,
+ `software_repo_id` int(11) unsigned NOT NULL DEFAULT '0',
+ `package_name` varchar(64) NOT NULL DEFAULT '',
+ `update_url` varchar(255) NOT NULL DEFAULT '',
+ `update_md5` varchar(255) NOT NULL DEFAULT '',
+ `update_dependencies` varchar(255) NOT NULL DEFAULT '',
+ `update_title` varchar(64) NOT NULL DEFAULT '',
`v1` tinyint(1) NOT NULL default '0',
`v2` tinyint(1) NOT NULL default '0',
`v3` tinyint(1) NOT NULL default '0',
@@ -1353,8 +1356,8 @@
CREATE TABLE `software_update_inst` (
`software_update_inst_id` int(11) unsigned NOT NULL auto_increment,
`software_update_id` int(11) unsigned NOT NULL default '0',
- `package_name` varchar(64) NOT NULL,
- `server_id` int(11) unsigned NOT NULL,
+ `package_name` varchar(64) NOT NULL DEFAULT '',
+ `server_id` int(11) unsigned NOT NULL DEFAULT '0',
`status` enum('none','installing','installed','deleting','deleted','failed') NOT NULL default 'none',
PRIMARY KEY (`software_update_inst_id`),
UNIQUE KEY `software_update_id` (`software_update_id`,`package_name`,`server_id`)
@@ -1368,11 +1371,11 @@
CREATE TABLE `spamfilter_policy` (
`id` int(11) unsigned NOT NULL auto_increment,
- `sys_userid` int(11) unsigned NOT NULL,
- `sys_groupid` int(11) unsigned NOT NULL,
- `sys_perm_user` varchar(5) NOT NULL,
- `sys_perm_group` varchar(5) NOT NULL,
- `sys_perm_other` varchar(5) NOT NULL,
+ `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
`policy_name` varchar(64) default NULL,
`virus_lover` enum('N','Y') default NULL,
`spam_lover` enum('N','Y') default NULL,
@@ -1426,15 +1429,15 @@
CREATE TABLE `spamfilter_users` (
`id` int(11) unsigned NOT NULL auto_increment,
- `sys_userid` int(11) unsigned NOT NULL,
- `sys_groupid` int(11) unsigned NOT NULL,
- `sys_perm_user` varchar(5) NOT NULL,
- `sys_perm_group` varchar(5) NOT NULL,
- `sys_perm_other` varchar(5) NOT NULL,
- `server_id` int(11) unsigned NOT NULL,
+ `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
+ `server_id` int(11) unsigned NOT NULL DEFAULT '0',
`priority` tinyint(3) unsigned NOT NULL default '7',
`policy_id` int(11) unsigned NOT NULL default '1',
- `email` varchar(255) NOT NULL,
+ `email` varchar(255) NOT NULL DEFAULT '',
`fullname` varchar(64) default NULL,
`local` varchar(1) default NULL,
PRIMARY KEY (`id`),
@@ -1449,16 +1452,16 @@
CREATE TABLE `spamfilter_wblist` (
`wblist_id` int(11) unsigned NOT NULL auto_increment,
- `sys_userid` int(11) unsigned NOT NULL,
- `sys_groupid` int(11) unsigned NOT NULL,
- `sys_perm_user` varchar(5) NOT NULL,
- `sys_perm_group` varchar(5) NOT NULL,
- `sys_perm_other` varchar(5) NOT NULL,
- `server_id` int(11) unsigned NOT NULL,
+ `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
+ `server_id` int(11) unsigned NOT NULL DEFAULT '0',
`wb` enum('W','B') NOT NULL default 'W',
- `rid` int(11) unsigned NOT NULL,
- `email` varchar(255) NOT NULL,
- `priority` tinyint(3) unsigned NOT NULL,
+ `rid` int(11) unsigned NOT NULL DEFAULT '0',
+ `email` varchar(255) NOT NULL DEFAULT '',
+ `priority` tinyint(3) unsigned NOT NULL DEFAULT '0',
`active` enum('y','n') NOT NULL default 'y',
PRIMARY KEY (`wblist_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -1491,9 +1494,9 @@
--
CREATE TABLE `sys_config` (
- `group` varchar(64) NOT NULL,
- `name` varchar(64) NOT NULL,
- `value` varchar(255) NOT NULL,
+ `group` varchar(64) NOT NULL DEFAULT '',
+ `name` varchar(64) NOT NULL DEFAULT '',
+ `value` varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY (`group`, `name`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1505,7 +1508,7 @@
--
CREATE TABLE IF NOT EXISTS `sys_cron` (
- `name` varchar(50) NOT NULL,
+ `name` varchar(50) NOT NULL DEFAULT '',
`last_run` datetime NULL DEFAULT NULL,
`next_run` datetime NULL DEFAULT NULL,
`running` tinyint(1) UNSIGNED NOT NULL DEFAULT '0',
@@ -1521,13 +1524,13 @@
CREATE TABLE `sys_datalog` (
`datalog_id` int(11) unsigned NOT NULL auto_increment,
- `server_id` int(11) unsigned NOT NULL,
+ `server_id` int(11) unsigned NOT NULL DEFAULT '0',
`dbtable` varchar(255) NOT NULL default '',
`dbidx` varchar(255) NOT NULL default '',
`action` char(1) NOT NULL default '',
`tstamp` int(11) NOT NULL default '0',
`user` varchar(255) NOT NULL default '',
- `data` longtext NOT NULL,
+ `data` longtext,
`status` set('pending','ok','warning','error') NOT NULL default 'ok',
`error` mediumtext,
PRIMARY KEY (`datalog_id`),
@@ -1587,7 +1590,7 @@
CREATE TABLE `sys_group` (
`groupid` int(11) unsigned NOT NULL auto_increment,
`name` varchar(64) NOT NULL default '',
- `description` text NOT NULL,
+ `description` text,
`client_id` int(11) unsigned NOT NULL default '0',
PRIMARY KEY (`groupid`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -1600,7 +1603,7 @@
CREATE TABLE `sys_ini` (
`sysini_id` int(11) unsigned NOT NULL auto_increment,
- `config` longtext NOT NULL,
+ `config` longtext,
PRIMARY KEY (`sysini_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -1615,7 +1618,7 @@
`server_id` int(11) unsigned NOT NULL default '0',
`datalog_id` int(11) unsigned NOT NULL default '0',
`loglevel` tinyint(4) NOT NULL default '0',
- `tstamp` int(11) unsigned NOT NULL,
+ `tstamp` int(11) unsigned NOT NULL DEFAULT '0',
`message` text,
PRIMARY KEY (`syslog_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -1628,12 +1631,12 @@
CREATE TABLE `sys_remoteaction` (
`action_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
- `server_id` int(11) unsigned NOT NULL,
- `tstamp` int(11) NOT NULL,
- `action_type` varchar(20) NOT NULL,
- `action_param` mediumtext NOT NULL,
- `action_state` enum('pending','ok','warning','error') NOT NULL,
- `response` mediumtext NOT NULL,
+ `server_id` int(11) unsigned NOT NULL DEFAULT '0',
+ `tstamp` int(11) NOT NULL DEFAULT '0',
+ `action_type` varchar(20) NOT NULL DEFAULT '',
+ `action_param` mediumtext,
+ `action_state` enum('pending','ok','warning','error') NOT NULL DEFAULT 'pending',
+ `response` mediumtext,
PRIMARY KEY (`action_id`),
KEY `server_id` (`server_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -1667,9 +1670,9 @@
`sys_perm_group` varchar(5) DEFAULT NULL,
`sys_perm_other` varchar(5) DEFAULT NULL,
`var_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
- `tpl_name` varchar(32) NOT NULL,
- `username` varchar(64) NOT NULL,
- `logo_url` varchar(255) NOT NULL,
+ `tpl_name` varchar(32) NOT NULL DEFAULT '',
+ `username` varchar(64) NOT NULL DEFAULT '',
+ `logo_url` varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY (`var_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
@@ -1694,7 +1697,7 @@
`typ` varchar(16) NOT NULL default 'user',
`active` tinyint(1) NOT NULL default '1',
`language` varchar(2) NOT NULL default 'en',
- `groups` TEXT NOT NULL,
+ `groups` TEXT,
`default_group` int(11) unsigned NOT NULL default '0',
`client_id` int(11) unsigned NOT NULL default '0',
`id_rsa` VARCHAR( 2000 ) NOT NULL default '',
@@ -1733,13 +1736,13 @@
CREATE TABLE `web_backup` (
`backup_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `server_id` int(10) unsigned NOT NULL,
- `parent_domain_id` int(10) unsigned NOT NULL,
+ `server_id` int(10) unsigned NOT NULL DEFAULT '0',
+ `parent_domain_id` int(10) unsigned NOT NULL DEFAULT '0',
`backup_type` enum('web','mysql','mongodb') NOT NULL DEFAULT 'web',
`backup_mode` varchar(64) NOT NULL DEFAULT '',
- `tstamp` int(10) unsigned NOT NULL,
- `filename` varchar(255) NOT NULL,
- `filesize` VARCHAR(10) NOT NULL,
+ `tstamp` int(10) unsigned NOT NULL DEFAULT '0',
+ `filename` varchar(255) NOT NULL DEFAULT '',
+ `filesize` VARCHAR(10) NOT NULL DEFAULT '',
PRIMARY KEY (`backup_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -1762,11 +1765,12 @@
`database_name` varchar(64) DEFAULT NULL,
`database_name_prefix` varchar(50) NOT NULL default '',
`database_quota` int(11) unsigned DEFAULT NULL,
+ `last_quota_notification` date NULL default NULL,
`database_user_id` int(11) unsigned DEFAULT NULL,
`database_ro_user_id` int(11) unsigned DEFAULT NULL,
`database_charset` varchar(64) DEFAULT NULL,
`remote_access` enum('n','y') NOT NULL DEFAULT 'y',
- `remote_ips` text NOT NULL,
+ `remote_ips` text,
`backup_interval` VARCHAR( 255 ) NOT NULL DEFAULT 'none',
`backup_copies` INT NOT NULL DEFAULT '1',
`active` enum('n','y') NOT NULL DEFAULT 'y',
@@ -1852,7 +1856,7 @@
`allow_override` varchar(255) NOT NULL default 'All',
`apache_directives` mediumtext,
`nginx_directives` mediumtext,
- `php_fpm_use_socket` ENUM('n','y') NOT NULL DEFAULT 'n',
+ `php_fpm_use_socket` ENUM('n','y') NOT NULL DEFAULT 'y',
`pm` enum('static','dynamic','ondemand') NOT NULL DEFAULT 'dynamic',
`pm_max_children` int(11) NOT NULL DEFAULT '10',
`pm_start_servers` int(11) NOT NULL DEFAULT '2',
@@ -1934,8 +1938,8 @@
--
CREATE TABLE `web_traffic` (
- `hostname` varchar(255) NOT NULL,
- `traffic_date` date NOT NULL,
+ `hostname` varchar(255) NOT NULL DEFAULT '',
+ `traffic_date` date NOT NULL DEFAULT '0000-00-00',
`traffic_bytes` bigint(32) unsigned NOT NULL default '0',
PRIMARY KEY (`hostname`,`traffic_date`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
diff --git a/install/tpl/fedora_dovecot2.conf.master b/install/tpl/fedora_dovecot2.conf.master
index 0d91006..b0d365e 100644
--- a/install/tpl/fedora_dovecot2.conf.master
+++ b/install/tpl/fedora_dovecot2.conf.master
@@ -51,6 +51,7 @@
}
protocol lda {
mail_plugins = sieve quota
+ postmaster_address = root@localhost
}
protocol lmtp {
postmaster_address = webmaster@localhost
diff --git a/interface/lib/classes/ispcmail.inc.php b/interface/lib/classes/ispcmail.inc.php
index 308d9df..930aabb 100644
--- a/interface/lib/classes/ispcmail.inc.php
+++ b/interface/lib/classes/ispcmail.inc.php
@@ -593,17 +593,17 @@
$response = fgets($this->_smtp_conn, 515);
if(empty($this->_smtp_conn)) return false;
+ //Say Hello to SMTP
+ if($this->smtp_helo == '') $this->detectHelo();
+ fputs($this->_smtp_conn, 'HELO ' . $this->smtp_helo . $this->_crlf);
+ $response = fgets($this->_smtp_conn, 515);
+
// ENCRYPTED?
if($this->smtp_crypt == 'tls') {
fputs($this->_smtp_conn, 'STARTTLS' . $this->_crlf);
fgets($this->_smtp_conn, 515);
stream_socket_enable_crypto($this->_smtp_conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT);
}
-
- //Say Hello to SMTP
- if($this->smtp_helo == '') $this->detectHelo();
- fputs($this->_smtp_conn, 'HELO ' . $this->smtp_helo . $this->_crlf);
- $response = fgets($this->_smtp_conn, 515);
//AUTH LOGIN
fputs($this->_smtp_conn, 'AUTH LOGIN' . $this->_crlf);
diff --git a/interface/lib/lang/el.lng b/interface/lib/lang/el.lng
index ea62001..5f7cb70 100644
--- a/interface/lib/lang/el.lng
+++ b/interface/lib/lang/el.lng
@@ -69,70 +69,70 @@
$wb['monthnamesshort_nov'] = 'Νοε';
$wb['monthnamesshort_dec'] = 'Δεκ';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
-$wb['logout_txt'] = 'Αποσύνδεση';
-$wb['submit_confirmation'] = 'Είστε σίγουροι ότι θέλετε να κάνετε αυτή την ενέργεια?';
+$wb['logout_txt'] = 'Logout';
+$wb['submit_confirmation'] = 'Do you really want to perform this action?';
$wb['top_menu_mailuser'] = 'Mailuser';
-$wb['globalsearch_resultslimit_of_txt'] = 'από';
-$wb['globalsearch_resultslimit_results_txt'] = 'αποτελέσματα';
-$wb['globalsearch_noresults_text_txt'] = 'Δεν υπάρχουν αποτελέσματα.';
-$wb['globalsearch_noresults_limit_txt'] = '0 αποτελέσματα';
-$wb['globalsearch_searchfield_watermark_txt'] = 'Αναζήτηση';
-$wb['globalsearch_suggestions_text_txt'] = 'Προτάσεις';
-$wb['global_tabchange_warning_txt'] = 'Τα τροποποιημένα δεδομένα σε αυτή την καρτέλα θα αλλάξουν οριστικά αν πατήσετε ΟΚ. Πατήσετε Άκυρο για να μην συμβεί αυτό..';
-$wb['global_tabchange_discard_txt'] = 'Έχετε μη αποθηκευμένες αλλαγές σε αυτή την καρτέλα. Οι αλλαγές θα χαθούν αν συνεχίσετε.';
-$wb['datalog_changes_txt'] = 'Οι επόμενες αλλαγές δεν έχουν προωθηθεί στους servers:';
-$wb['datalog_changes_end_txt'] = 'Η αποθήκευση των ενημερώσεων μπορεί να διαρκέσει μεχρι και ένα λεπτό. Παρακαλούμε να είστε υπομονετικοί.';
-$wb['datalog_status_i_web_database'] = 'Δημιουργία νέας Βάσης Δεδομένων (ΒΔ)';
-$wb['datalog_status_u_web_database'] = 'Ενημέρωση Βάσης Δεδομένων';
-$wb['datalog_status_d_web_database'] = 'Διαγραφή Βάσης Δεδομένων';
-$wb['datalog_status_i_web_database_user'] = 'Δημιουργία χρήστη για την Βάση Δεδομένων';
-$wb['datalog_status_u_web_database_user'] = 'Ενημέρωση χρήστη Βάσης Δεδομένων';
-$wb['datalog_status_d_web_database_user'] = 'Διαγραφή χρήστη Βάσης Δεδομένων';
-$wb['datalog_status_i_web_domain'] = 'Δημιουργία νέου website';
-$wb['datalog_status_u_web_domain'] = 'Ενημέρωση ρυθμίσεων website';
-$wb['datalog_status_d_web_domain'] = 'Διαγραφή website';
-$wb['datalog_status_i_ftp_user'] = 'Δημιουργία χρήστη FTP';
-$wb['datalog_status_u_ftp_user'] = 'Ενημέρωση FTP user';
-$wb['datalog_status_d_ftp_user'] = 'Διαγραφή FTP user';
-$wb['datalog_status_i_mail_domain'] = 'Δημιουργία email domain';
-$wb['datalog_status_u_mail_domain'] = 'Ενημέρωση email domain';
-$wb['datalog_status_d_mail_domain'] = 'Διαγραφή email domain';
-$wb['datalog_status_i_mail_user'] = 'Δημιουργία χρήστη email';
-$wb['datalog_status_u_mail_user'] = 'Ενημέρωση χρήστη email';
-$wb['datalog_status_d_mail_user'] = 'Διαγραφή χρήστη email';
-$wb['datalog_status_i_mail_forwarding'] = 'Δημιουργία διεύθυνσης email';
-$wb['datalog_status_u_mail_forwarding'] = 'Ενημέρωση διεύθυνσης email';
-$wb['datalog_status_d_mail_forwarding'] = 'Διαγραφή διεύθυνσης email';
-$wb['datalog_status_i_dns_rr'] = 'Δημιουργία εγγραφής DNS';
-$wb['datalog_status_u_dns_rr'] = 'Ενημέρωση εγγραφής DNS';
-$wb['datalog_status_d_dns_rr'] = 'Διαγραφή εγγραφής DNS';
-$wb['datalog_status_i_dns_soa'] = 'Δημιουργία ζώνης DNS';
-$wb['datalog_status_u_dns_soa'] = 'Ενημέρωση ζώνης DNS';
-$wb['datalog_status_d_dns_soa'] = 'Διαγραφή ζώνης DNS';
-$wb['datalog_status_i_cron'] = 'Δημιουργία εργασίας cron';
-$wb['datalog_status_u_cron'] = 'Ενημέρωση εργασίας cron';
-$wb['datalog_status_d_cron'] = 'Διαγραφή εργασίας cron';
-$wb['datalog_status_i_mail_get'] = 'Δημιουργία δημιουργία λογαριασμού mail fetcher';
-$wb['datalog_status_u_mail_get'] = 'Ενημέρωση δημιουργία λογαριασμού mail fetcher';
-$wb['datalog_status_d_mail_get'] = 'Διαγραφή δημιουργία λογαριασμού mail fetcher';
-$wb['datalog_status_i_mail_mailinglist'] = 'Δημιουργία λίστας mail';
-$wb['datalog_status_u_mail_mailinglist'] = 'Ενημέρωση λίστας mail';
-$wb['datalog_status_d_mail_mailinglist'] = 'Διαγραφή λίστας mail';
-$wb['datalog_status_i_shell_user'] = 'Δημιουργία χρήστη shell';
-$wb['datalog_status_u_shell_user'] = 'Ενημέρωση χρήστη shell';
-$wb['datalog_status_d_shell_user'] = 'Διαγραφή χρήστη shell';
-$wb['datalog_status_i_web_folder'] = 'Δημιουργία προστασίας φακέλου';
-$wb['datalog_status_u_web_folder'] = 'Ενημέρωση προστασίας φακέλου';
-$wb['datalog_status_d_web_folder'] = 'Διαγραφή προστασίας φακέλου';
-$wb['datalog_status_i_web_folder_user'] = 'Δημιουργία χρήστη προστασίας φακέλου';
-$wb['datalog_status_u_web_folder_user'] = 'Ενημέρωση χρήστη προστασίας φακέλου';
-$wb['datalog_status_d_web_folder_user'] = 'Διαγραφή χρήστη προστασίας φακέλου';
-$wb['datalog_status_i_spamfilter_users'] = 'Δημιουργία ρυθμίσεων φίλτρου spam';
-$wb['datalog_status_u_spamfilter_users'] = 'Ενημέρωση ρυθμίσεων φίλτρου spam';
-$wb['datalog_status_d_spamfilter_users'] = 'Διαγραφή ρυθμίσεων φίλτρου spam';
-$wb['login_as_txt'] = 'Είσοδος ως';
-$wb['no_domain_perm'] = 'Δεν έχετε δικαιώματα για αυτό το domain.';
-$wb['no_destination_perm'] = 'Δεν έχετε δικαιώματα για αυτόν τον προορισμό.';
+$wb['globalsearch_resultslimit_of_txt'] = 'of';
+$wb['globalsearch_resultslimit_results_txt'] = 'results';
+$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['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
+$wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.';
+$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
+$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
+$wb['datalog_status_i_web_database'] = 'Create new database';
+$wb['datalog_status_u_web_database'] = 'Update database';
+$wb['datalog_status_d_web_database'] = 'Delete database';
+$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
+$wb['datalog_status_u_web_database_user'] = 'Update database user';
+$wb['datalog_status_d_web_database_user'] = 'Delete database user';
+$wb['datalog_status_i_web_domain'] = 'Create new website';
+$wb['datalog_status_u_web_domain'] = 'Update website settings';
+$wb['datalog_status_d_web_domain'] = 'Delete website';
+$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
+$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
+$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
+$wb['datalog_status_i_mail_domain'] = 'Create email domain';
+$wb['datalog_status_u_mail_domain'] = 'Update email domain';
+$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
+$wb['datalog_status_i_mail_user'] = 'Create email user';
+$wb['datalog_status_u_mail_user'] = 'Update email user';
+$wb['datalog_status_d_mail_user'] = 'Delete email user';
+$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
+$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
+$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
+$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
+$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
+$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
+$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
+$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
+$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
+$wb['datalog_status_i_cron'] = 'Create cron job';
+$wb['datalog_status_u_cron'] = 'Update cron job';
+$wb['datalog_status_d_cron'] = 'Delete cron job';
+$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
+$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
+$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
+$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
+$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
+$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
+$wb['datalog_status_i_shell_user'] = 'Create shell user';
+$wb['datalog_status_u_shell_user'] = 'Update shell user';
+$wb['datalog_status_d_shell_user'] = 'Delete shell user';
+$wb['datalog_status_i_web_folder'] = 'Create folder protection';
+$wb['datalog_status_u_web_folder'] = 'Update folder protection';
+$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
+$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
+$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
+$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
+$wb['datalog_status_i_spamfilter_users'] = 'Create spam filter settings';
+$wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings';
+$wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings';
+$wb['login_as_txt'] = 'Log in as';
+$wb['no_domain_perm'] = 'You have no permission for this domain.';
+$wb['no_destination_perm'] = 'You have no permission for this destination.';
$wb['client_you_are_locked'] = 'You have no permission to change any settings.';
$wb['gender_m_txt'] = 'Mr.';
$wb['gender_f_txt'] = 'Ms.';
@@ -145,6 +145,6 @@
$wb['strength_3'] = 'Good';
$wb['strength_4'] = 'Strong';
$wb['strength_5'] = 'Very Strong';
-$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \\"{strength}\\".';
+$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \"{strength}\".';
$wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
?>
diff --git a/interface/lib/lang/fr.lng b/interface/lib/lang/fr.lng
index 4ee0d6b..f344dc3 100644
--- a/interface/lib/lang/fr.lng
+++ b/interface/lib/lang/fr.lng
@@ -68,71 +68,71 @@
$wb['monthnamesshort_dec'] = 'Dec';
$wb['datepicker_nextText'] = 'Suivant';
$wb['datepicker_prevText'] = 'Précédent';
-$wb['logout_txt'] = 'Logout';
-$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
-$wb['submit_confirmation'] = 'Do you really want to perform this action?';
+$wb['logout_txt'] = 'Se déconnecter';
+$wb['conf_format_dateshort_human_readable'] = 'dd-mm-yyyy';
+$wb['submit_confirmation'] = 'Voulez-vous vraiment effectuer cette action ?';
$wb['top_menu_mailuser'] = 'Mailuser';
-$wb['globalsearch_resultslimit_of_txt'] = 'of';
-$wb['globalsearch_resultslimit_results_txt'] = 'results';
-$wb['globalsearch_noresults_text_txt'] = 'No results.';
-$wb['globalsearch_noresults_limit_txt'] = '0 results';
-$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
+$wb['globalsearch_resultslimit_of_txt'] = 'de';
+$wb['globalsearch_resultslimit_results_txt'] = 'resultats';
+$wb['globalsearch_noresults_text_txt'] = 'Aucun resultat.';
+$wb['globalsearch_noresults_limit_txt'] = '0 resultat';
+$wb['globalsearch_searchfield_watermark_txt'] = 'Rechercher';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
-$wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
-$wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.';
-$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
-$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
-$wb['datalog_status_i_web_database'] = 'Create new database';
-$wb['datalog_status_u_web_database'] = 'Update database';
-$wb['datalog_status_d_web_database'] = 'Delete database';
-$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
-$wb['datalog_status_u_web_database_user'] = 'Update database user';
-$wb['datalog_status_d_web_database_user'] = 'Delete database user';
-$wb['datalog_status_i_web_domain'] = 'Create new website';
-$wb['datalog_status_u_web_domain'] = 'Update website settings';
-$wb['datalog_status_d_web_domain'] = 'Delete website';
-$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
-$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
-$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
-$wb['datalog_status_i_mail_domain'] = 'Create email domain';
-$wb['datalog_status_u_mail_domain'] = 'Update email domain';
-$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
-$wb['datalog_status_i_mail_user'] = 'Create email user';
-$wb['datalog_status_u_mail_user'] = 'Update email user';
-$wb['datalog_status_d_mail_user'] = 'Delete email user';
-$wb['datalog_status_i_spamfilter_users'] = 'Create spam filter settings';
-$wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings';
-$wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings';
-$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
-$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
-$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
-$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
-$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
-$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
-$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
-$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
-$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
-$wb['datalog_status_i_cron'] = 'Create cron job';
-$wb['datalog_status_u_cron'] = 'Update cron job';
-$wb['datalog_status_d_cron'] = 'Delete cron job';
-$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
-$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
-$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
-$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
-$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
-$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
-$wb['datalog_status_i_shell_user'] = 'Create shell user';
-$wb['datalog_status_u_shell_user'] = 'Update shell user';
-$wb['datalog_status_d_shell_user'] = 'Delete shell user';
-$wb['datalog_status_i_web_folder'] = 'Create folder protection';
-$wb['datalog_status_u_web_folder'] = 'Update folder protection';
-$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
-$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
-$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
-$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
-$wb['login_as_txt'] = 'Log in as';
-$wb['no_domain_perm'] = 'You have no permission for this domain.';
-$wb['no_destination_perm'] = 'You have no permission for this destination.';
+$wb['global_tabchange_warning_txt'] = 'Les données seront modifiées si vous cliquez sur OK. Cliquez sur annuler pour ne rien modifier.';
+$wb['global_tabchange_discard_txt'] = 'Vous avez des données modifiées non enregistrées dans cet onglet. Les modifications seront perdues si vous continuez.';
+$wb['datalog_changes_txt'] = 'Les modifications n\'ont pas encore été appliquées à tous les serveurs:';
+$wb['datalog_changes_end_txt'] = 'Les mises à jour peuvent prendre jusqu\'à 1 minute. Merci de patienter.';
+$wb['datalog_status_i_web_database'] = 'Créer une nouvelle base de données';
+$wb['datalog_status_u_web_database'] = 'Modifier une base de données';
+$wb['datalog_status_d_web_database'] = 'Supprimer une base de données';
+$wb['datalog_status_i_web_database_user'] = 'Créer un utilisateur de base de données';
+$wb['datalog_status_u_web_database_user'] = 'Modifier un utilisateur de base de données';
+$wb['datalog_status_d_web_database_user'] = 'Supprimer un utilisateur de base de données';
+$wb['datalog_status_i_web_domain'] = 'Créer un nouveau site';
+$wb['datalog_status_u_web_domain'] = 'Mettre à jour la configuration du site';
+$wb['datalog_status_d_web_domain'] = 'Supprimer le site';
+$wb['datalog_status_i_ftp_user'] = 'Créer un utilisateur FTP';
+$wb['datalog_status_u_ftp_user'] = 'Modifier un utilisateur FTP';
+$wb['datalog_status_d_ftp_user'] = 'Supprimer un utilisateur FTP';
+$wb['datalog_status_i_mail_domain'] = 'Créer un domaine email';
+$wb['datalog_status_u_mail_domain'] = 'Modifier un domaine email';
+$wb['datalog_status_d_mail_domain'] = 'Supprimer un domaine email';
+$wb['datalog_status_i_mail_user'] = 'Créer un utilisateur email';
+$wb['datalog_status_u_mail_user'] = 'Modifier un utilisateur email';
+$wb['datalog_status_d_mail_user'] = 'Supprimer un utilisateur email';
+$wb['datalog_status_i_spamfilter_users'] = 'Créer un filtre anti-spam';
+$wb['datalog_status_u_spamfilter_users'] = 'Modifier un filtre anti-spam';
+$wb['datalog_status_d_spamfilter_users'] = 'Supprimer un filtre anti-spam';
+$wb['datalog_status_i_mail_forwarding'] = 'Créer une adresse email';
+$wb['datalog_status_u_mail_forwarding'] = 'Modifier une adresse email';
+$wb['datalog_status_d_mail_forwarding'] = 'Supprimer une adresse email';
+$wb['datalog_status_i_dns_rr'] = 'Créer un enregistrement DNS';
+$wb['datalog_status_u_dns_rr'] = 'Modifier un enregistrement DNS';
+$wb['datalog_status_d_dns_rr'] = 'Supprimer un enregistrement DNS';
+$wb['datalog_status_i_dns_soa'] = 'Créer une zone DNS';
+$wb['datalog_status_u_dns_soa'] = 'Modifier une zone DNS';
+$wb['datalog_status_d_dns_soa'] = 'Supprimer une zone DNS';
+$wb['datalog_status_i_cron'] = 'Créer une tâche cron';
+$wb['datalog_status_u_cron'] = 'Modifier une tâche cron';
+$wb['datalog_status_d_cron'] = 'Supprimer une tâche cron';
+$wb['datalog_status_i_mail_get'] = 'Créer un compte mail récupérateur';
+$wb['datalog_status_u_mail_get'] = 'Modifier un compte mail récupérateur';
+$wb['datalog_status_d_mail_get'] = 'Supprimer un compte mail récupérateur';
+$wb['datalog_status_i_mail_mailinglist'] = 'Créer une liste d\'envoi';
+$wb['datalog_status_u_mail_mailinglist'] = 'Modifier une liste d\'envoi';
+$wb['datalog_status_d_mail_mailinglist'] = 'Supprimer une liste d\'envoi';
+$wb['datalog_status_i_shell_user'] = 'Créer un utilisateur Shell';
+$wb['datalog_status_u_shell_user'] = 'Modifier un utilisateur Shell';
+$wb['datalog_status_d_shell_user'] = 'Supprimer un utilisateur Shell';
+$wb['datalog_status_i_web_folder'] = 'Créer un dossier protégé';
+$wb['datalog_status_u_web_folder'] = 'Modifier un dossier protégé';
+$wb['datalog_status_d_web_folder'] = 'Supprimer un dossier protégé';
+$wb['datalog_status_i_web_folder_user'] = 'Créer un utilisateur de dossier protégé';
+$wb['datalog_status_u_web_folder_user'] = 'Modifier un utilisateur de dossier protégé';
+$wb['datalog_status_d_web_folder_user'] = 'Supprimer un utilisateur de dossier protégé';
+$wb['login_as_txt'] = 'Connexion en tant que';
+$wb['no_domain_perm'] = 'Vous n\'avez pas de permission pour ce domaine.';
+$wb['no_destination_perm'] = 'Vous n\'avez pas de permission pour cette destination.';
$wb['client_you_are_locked'] = 'You have no permission to change any settings.';
$wb['gender_m_txt'] = 'Mr.';
$wb['gender_f_txt'] = 'Ms.';
@@ -145,6 +145,6 @@
$wb['strength_3'] = 'Good';
$wb['strength_4'] = 'Strong';
$wb['strength_5'] = 'Very Strong';
-$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \\"{strength}\\".';
+$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \"{strength}\".';
$wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
?>
diff --git a/interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php b/interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php
index d1adf95..2764269 100644
--- a/interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php
+++ b/interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php
@@ -228,19 +228,21 @@
$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']) . "'");
+ if(isset($page_form->dataRecord["parent_domain_id"]) && $page_form->dataRecord["parent_domain_id"] != $page_form->oldDataRecord["parent_domain_id"]) {
+ $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);
+ // 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/form/firewall.tform.php b/interface/web/admin/form/firewall.tform.php
index 0bef6eb..ce7d2db 100644
--- a/interface/web/admin/form/firewall.tform.php
+++ b/interface/web/admin/form/firewall.tform.php
@@ -79,7 +79,7 @@
'regex' => '/^[\s0-9\,\:]{0,255}$/',
'errmsg'=> 'tcp_ports_error_regex'),
),
- 'default' => '20,21,22,25,53,80,110,143,443,993,995,3306,8080,8081,10000',
+ 'default' => '20,21,22,25,53,80,110,143,443,587,993,995,3306,8080,8081,10000',
'value' => '',
'width' => '30',
'maxlength' => '255'
diff --git a/interface/web/admin/lib/lang/el.lng b/interface/web/admin/lib/lang/el.lng
index 4926ef2..010a550 100644
--- a/interface/web/admin/lib/lang/el.lng
+++ b/interface/web/admin/lib/lang/el.lng
@@ -26,14 +26,13 @@
$wb['FastCGI'] = 'FastCGI';
$wb['Jailkit'] = 'Jailkit';
$wb['Rescue'] = 'Rescue';
-$wb['Server IP addresses'] = 'Διευθύνσεις IP Server';
-$wb['Additional PHP Versions'] = 'Πρόσθετες εκδόσεις PHP';
-$wb['Directive Snippets'] = 'Directive Snippets';
+$wb['Server IP addresses'] = 'Server IP addresses';
+$wb['Additional PHP Versions'] = 'Additional PHP Versions';
$wb['Firewall'] = 'Firewall';
-$wb['Interface'] = 'Διεπαφή';
-$wb['Interface Config'] = 'Βασική Διαμόρφωση';
+$wb['Interface'] = 'Interface';
+$wb['Interface Config'] = 'Main Config';
$wb['Domains'] = 'Domains';
-$wb['Misc'] = 'Διάφορα';
+$wb['Misc'] = 'Misc';
$wb['Software'] = 'Εφαρμογές & Πρόσθετα';
$wb['Repositories'] = 'Αποθετήρια';
$wb['Packages'] = 'Πακέτα';
@@ -47,4 +46,5 @@
$wb['Remote Actions'] = 'Απομακρυσμένες Ενέργειες';
$wb['Do OS-Update'] = 'Αναβάθμιση λειτουργικού συστήματος';
$wb['Do ISPConfig-Update'] = 'Αναβάθμιση ISPConfig';
+$wb['Directive Snippets'] = 'Directive Snippets';
?>
diff --git a/interface/web/admin/lib/lang/el_directive_snippets.lng b/interface/web/admin/lib/lang/el_directive_snippets.lng
index 684640f..0f09c12 100644
--- a/interface/web/admin/lib/lang/el_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/el_directive_snippets.lng
@@ -1,10 +1,10 @@
<?php
$wb['Directive Snippets'] = 'Directive Snippets';
-$wb['name_txt'] = 'Όνομα Snippet';
-$wb['type_txt'] = 'Τύπος';
+$wb['name_txt'] = 'Name of Snippet';
+$wb['type_txt'] = 'Type';
$wb['snippet_txt'] = 'Snippet';
-$wb['active_txt'] = 'Ενεργό';
-$wb['directive_snippets_name_empty'] = 'Παρακαλούμε ορίστε όνομα snippet.';
-$wb['directive_snippets_name_error_unique'] = 'Υπάρχει ήδη ένα directive snippet με αυτό το όνομα.';
+$wb['active_txt'] = 'Active';
+$wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
+$wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
$wb['variables_txt'] = 'Variables';
?>
diff --git a/interface/web/admin/lib/lang/el_directive_snippets_list.lng b/interface/web/admin/lib/lang/el_directive_snippets_list.lng
index 1461c4e..4124ea3 100644
--- a/interface/web/admin/lib/lang/el_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/el_directive_snippets_list.lng
@@ -1,7 +1,7 @@
<?php
$wb['list_head_txt'] = 'Directive Snippets';
-$wb['active_txt'] = 'Ενεργό';
-$wb['name_txt'] = 'Όνομα Snippet';
-$wb['type_txt'] = 'Τύπος';
-$wb['add_new_record_txt'] = 'Προσθήκη Directive Snippet';
+$wb['active_txt'] = 'Active';
+$wb['name_txt'] = 'Name of Snippet';
+$wb['type_txt'] = 'Type';
+$wb['add_new_record_txt'] = 'Add Directive Snippet';
?>
diff --git a/interface/web/admin/lib/lang/el_firewall.lng b/interface/web/admin/lib/lang/el_firewall.lng
index a0003f4..ff31bab 100644
--- a/interface/web/admin/lib/lang/el_firewall.lng
+++ b/interface/web/admin/lib/lang/el_firewall.lng
@@ -5,7 +5,7 @@
$wb['tcp_port_help_txt'] = 'Χωρισμένες με κόμα';
$wb['udp_port_help_txt'] = 'Χωρισμένες με κόμα';
$wb['active_txt'] = 'Ενεργό';
-$wb['firewall_error_unique'] = 'Υπάρχει ήδη μια εγγραφή firewall για αυτό τον server.';
+$wb['firewall_error_unique'] = 'Υπάρχει ήδη μια εγγραφή firewall για αυτό τον σερωερ server.';
$wb['tcp_ports_error_regex'] = 'Οι χαρακτήρες δεν επιτρέπονται στον ορισμό θυρών tcp. Επιτρέπονται μόνο αριθμοί, : και ,.';
$wb['udp_ports_error_regex'] = 'Οι χαρακτήρες δεν επιτρέπονται στον ορισμό θυρών udp. Επιτρέπονται μόνο αριθμοί, : και ,.';
?>
diff --git a/interface/web/admin/lib/lang/el_remote_action.lng b/interface/web/admin/lib/lang/el_remote_action.lng
index 4d94878..e4f97cb 100644
--- a/interface/web/admin/lib/lang/el_remote_action.lng
+++ b/interface/web/admin/lib/lang/el_remote_action.lng
@@ -7,6 +7,6 @@
$wb['do_ispcupdate_desc'] = 'Αυτή η ενέργεια κάνει αναβάθμιση στο ISPConfig3 στον επιλεγμένο σας server.<br><br><strong>ΧΡΗΣΙΜΟΠΟΙΗΣΤΕ ΤΟ ΜΕ ΔΙΚΗ ΣΑΣ ΕΥΘΥΝΗ!</strong>';
$wb['action_scheduled'] = 'Η ενέργεια προγραμματίστηκε για εκτέλεση';
$wb['select_all_server'] = 'Σε όλους τους servers';
-$wb['ispconfig_update_title'] = 'Οδηγίες ενημέρωσης ISPConfig';
-$wb['ispconfig_update_text'] = 'Εισέλθετε ως χρήστης root σε κάποιο κέλυφος στον server σας και εκτελέστε την εντολή<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />για να εκκινήστε την ενημέρωση του ISPConfig.<br /><br /><a href=\'http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/\' target=\'_blank\'>Πατήστε εδώ για λεπτομερείς οδηγίες</a>';
+$wb['ispconfig_update_title'] = 'ISPConfig update instructions';
+$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=\'http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/\' target=\'_blank\'>Click here for detailed update instructins</a>';
?>
diff --git a/interface/web/admin/lib/lang/el_remote_user.lng b/interface/web/admin/lib/lang/el_remote_user.lng
index 8b79d61..ddffd70 100644
--- a/interface/web/admin/lib/lang/el_remote_user.lng
+++ b/interface/web/admin/lib/lang/el_remote_user.lng
@@ -5,7 +5,7 @@
$wb['username_error_unique'] = 'Το όνομα χρήστη πρέπει να είναι μοναδικό';
$wb['username_error_empty'] = 'Το όνομα χρήστη δεν μπορεί να είναι κενό';
$wb['password_error_empty'] = 'Το συνθηματικό δεν μπορεί να είναι κενό';
-$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού';
+$wb['password_strength_txt'] = 'Δύναμη συνθηματικού';
$wb['Mail domain functions'] = 'Ενέργειες Mail domain';
$wb['Mail user functions'] = 'Ενέργειες Χρήστη Mail';
$wb['Mail alias functions'] = 'Ενέργειες Ψευδωνύμου Mail';
@@ -40,8 +40,8 @@
$wb['DNS srv functions'] = 'Ενέργειες εγγραφών srv του DNS';
$wb['DNS txt functions'] = 'Ενέργειες εγγραφών txt του DNS';
$wb['Mail mailing list functions'] = 'Ενέργειες Mail mailinglist';
-$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού';
-$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού';
-$wb['password_mismatch_txt'] = 'Τα Συνθηματικά δεν ταιριάζουν.';
-$wb['password_match_txt'] = 'Τα Συνθηματικά ταιριάζουν.';
+$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.';
?>
diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng
index 7ec8787..da3f99c5 100644
--- a/interface/web/admin/lib/lang/el_server_config.lng
+++ b/interface/web/admin/lib/lang/el_server_config.lng
@@ -149,45 +149,45 @@
$wb['rescue_description_txt'] = '<b>Πληροφορία:</b> Αν θέλετε να τερματίσετε την MySQL πρέπει να επιλέξετε την επιλογή Απενεργοποίηση εποπτείας MySQL και μετά να περιμένετε 2-3 λεπτά.<br>Αν δεν περιμένετε 2-3 λεπτά, η εποπτεία και αποκατάσταση θα προσπαθήσει να επανεκκινήσει την MySQL!';
$wb['enable_sni_txt'] = 'Ενεργοποίηση SNI';
$wb['do_not_try_rescue_httpd_txt'] = 'Απενεργοποίηση εποπτείας HTTPD';
-$wb['set_folder_permissions_on_update_txt'] = 'Ορισμός δικαιωμάτων φακέλων κατά την ενημέρωση';
-$wb['add_web_users_to_sshusers_group_txt'] = 'Προσθήκη των χρηστών web στην ομάδα -sshusers-';
-$wb['connect_userid_to_webid_txt'] = 'Σύνδεση Linux userid στο webid';
-$wb['connect_userid_to_webid_start_txt'] = 'ID εκκίνησης για την σύνδεση userid/webid';
-$wb['website_autoalias_txt'] = 'Αυτόματο ψευδώνυμο Website';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
+$wb['website_autoalias_txt'] = 'Website auto alias';
$wb['website_autoalias_note_txt'] = 'Placeholders:';
-$wb['backup_mode_txt'] = 'Κατάσταση Backup';
-$wb['backup_mode_userzip'] = 'Να γίνει αντίγραφο ασφαλείας των αρχείων web που ανήκουν στον χρήστη web με τον μορφότυπο zip';
-$wb['backup_mode_rootgz'] = 'Να γίνει αντίγραφο ασφαλείας όλων των αρχείων στον φάκελο web ως χρήστης root';
-$wb['realtime_blackhole_list_txt'] = 'Λίστα Blackhole παρόχων πραγματικού χρόνου (RBL)';
-$wb['realtime_blackhole_list_note_txt'] = '(Διαχωρισμός RBL\'s με κόμματα)';
-$wb['ssl_settings_txt'] = 'Ρυθμίσεις SSL';
-$wb['permissions_txt'] = 'Δικαιώματα';
-$wb['php_settings_txt'] = 'Ρυθμίσεις PHP';
-$wb['apps_vhost_settings_txt'] = 'Ρυθμίσεις Apps Vhost';
-$wb['awstats_settings_txt'] = 'Ρυθμίσεις AWStats';
+$wb['backup_mode_txt'] = 'Backup mode';
+$wb['backup_mode_userzip'] = 'Backup web files owned by web user as zip';
+$wb['backup_mode_rootgz'] = 'Backup all files in web directory as root user';
+$wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List';
+$wb['realtime_blackhole_list_note_txt'] = '(Separate RBL\'s with commas)';
+$wb['ssl_settings_txt'] = 'SSL Settings';
+$wb['permissions_txt'] = 'Permissions';
+$wb['php_settings_txt'] = 'PHP Settings';
+$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings';
+$wb['awstats_settings_txt'] = 'AWStats Settings';
$wb['firewall_txt'] = 'Firewall';
-$wb['mailbox_quota_stats_txt'] = 'Στατιστικά χρήσης χώρου θυρίδας Mail';
-$wb['enable_ip_wildcard_txt'] = 'Ενεργοποίηση IP wildcard (*)';
-$wb['web_folder_protection_txt'] = 'Να γίνουν οι φάκελοι web αμετάβλητοι (εκτεταμένες ιδιότητες)';
-$wb['overtraffic_notify_admin_txt'] = 'Αποστολή ειδοποιήσεων υπέρβασης ορίου μεταφοράς δεδομένων στον διαχειριστή';
-$wb['overtraffic_notify_client_txt'] = 'Αποστολή ειδοποιήσεων υπέρβασης ορίου μεταφοράς δεδομένων στον πελάτη';
-$wb['rbl_error_regex'] = 'Παρακαλούμε ορίστε έγκυρα RBL hostnames.';
-$wb['overquota_notify_admin_txt'] = 'Αποστολή προειδοποιήσεων ορίων στον διαχειριστή';
-$wb['overquota_notify_client_txt'] = 'Αποστολή προειδοποιήσεων ορίων στον πελάτη';
-$wb['overquota_notify_onok_txt'] = 'Αποστολή ΟΚ μηνυμάτων ορίων στον πελάτη';
-$wb['overquota_notify_freq_txt'] = 'Αποστολή προειδοποιήσεων κάθε Χ ημέρες';
-$wb['overquota_notify_freq_note_txt'] = '0 = αποστολή μηνύματος μόνο μία φορά, (οχι επαναληπτικά μηνύματα)';
-$wb['admin_notify_events_txt'] = 'Αποστολή email στον διαχειριστή, ξεκινώντας από το ακόλουθο επίπεδο';
-$wb['no_notifications_txt'] = 'Χωρίς Ειδοποιήσεις';
-$wb['monit_url_txt'] = 'URL Monit';
-$wb['monit_user_txt'] = 'Χρήστης Monit';
-$wb['monit_password_txt'] = 'Συνθηματικό Monit';
-$wb['monit_url_error_regex'] = 'Μη έγκυρο URL Monit';
+$wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics';
+$wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
+$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
+$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
+$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
+$wb['overquota_notify_admin_txt'] = 'Send quota warnings to admin';
+$wb['overquota_notify_client_txt'] = 'Send quota warnings to client';
+$wb['overquota_notify_onok_txt'] = 'Send quota ok message to client';
+$wb['overquota_notify_freq_txt'] = 'Send quota warning each X days';
+$wb['overquota_notify_freq_note_txt'] = '0 = send message just once, no repeated messages';
+$wb['admin_notify_events_txt'] = 'Send email to admin starting with the following level';
+$wb['no_notifications_txt'] = 'No Notifications';
+$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['monit_url_note_txt'] = 'Placeholder:';
-$wb['munin_url_txt'] = 'URL Munin';
-$wb['munin_user_txt'] = 'Χρήστης Munin';
-$wb['munin_password_txt'] = 'Συνθηματικό Munin';
-$wb['munin_url_error_regex'] = 'Μη έγκυρο URL Munin';
+$wb['munin_url_txt'] = 'Munin URL';
+$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_dir_is_mount_txt'] = 'Backup directory is a mount?';
$wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
diff --git a/interface/web/admin/lib/lang/el_server_ip.lng b/interface/web/admin/lib/lang/el_server_ip.lng
index c858124..212f432 100644
--- a/interface/web/admin/lib/lang/el_server_ip.lng
+++ b/interface/web/admin/lib/lang/el_server_ip.lng
@@ -7,5 +7,5 @@
$wb['client_id_txt'] = 'Πελάτης';
$wb['ip_type_txt'] = 'Τύπος';
$wb['virtualhost_port_txt'] = 'Θύρες HTTP';
-$wb['error_port_syntax'] = 'Μη έγκυροι χαρακτήρες στο πεδίο θύρας, παρακαλούμε εισάγετε μόνο αριθμούς χωρισμένους με κόμματα. Παράδειγμα: 80,443';
+$wb['error_port_syntax'] = 'Invalid chars in port field, please enter only comma separated numbers. Example: 80,443';
?>
diff --git a/interface/web/admin/lib/lang/el_server_php.lng b/interface/web/admin/lib/lang/el_server_php.lng
index be99452..addbfa4 100644
--- a/interface/web/admin/lib/lang/el_server_php.lng
+++ b/interface/web/admin/lib/lang/el_server_php.lng
@@ -1,16 +1,16 @@
<?php
$wb['server_id_txt'] = 'Server';
-$wb['client_id_txt'] = 'Πελάτης';
-$wb['name_txt'] = 'Όνομα PHP';
-$wb['Name'] = 'Όνομα';
+$wb['client_id_txt'] = 'Client';
+$wb['name_txt'] = 'PHP Name';
+$wb['Name'] = 'Name';
$wb['FastCGI Settings'] = 'FastCGI Settings';
$wb['PHP-FPM Settings'] = 'PHP-FPM Settings';
-$wb['Additional PHP Versions'] = 'Πρόσθετες εκδόσεις PHP';
-$wb['Form to edit additional PHP versions'] = 'Φόρμα για την επεξεργασία επιπλέον εκδόσεων PHP';
-$wb['server_php_name_error_empty'] = 'Πρέπει να ορίσετε το πειο Όνομα.';
-$wb['php_fastcgi_binary_txt'] = 'Διαδρομή για το εκτελέσιμο PHP FastCGI';
-$wb['php_fastcgi_ini_dir_txt'] = 'Διαδρομή για τον φάκελο php.ini';
-$wb['php_fpm_init_script_txt'] = 'Διαδρομή για το init script PHP-FPM';
-$wb['php_fpm_ini_dir_txt'] = 'Διαδρομή για τον φάκελο php.ini';
-$wb['php_fpm_pool_dir_txt'] = 'Διαδρομή για τον φάκελο PHP-FPM';
+$wb['Additional PHP Versions'] = 'Additional PHP Versions';
+$wb['Form to edit additional PHP versions'] = 'Form to edit additional PHP versions';
+$wb['server_php_name_error_empty'] = 'The Name field must not be empty.';
+$wb['php_fastcgi_binary_txt'] = 'Path to the PHP FastCGI binary';
+$wb['php_fastcgi_ini_dir_txt'] = 'Path to the php.ini directory';
+$wb['php_fpm_init_script_txt'] = 'Path to the PHP-FPM init script';
+$wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory';
+$wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory';
?>
diff --git a/interface/web/admin/lib/lang/el_server_php_list.lng b/interface/web/admin/lib/lang/el_server_php_list.lng
index 06c17a3..b402fd1 100644
--- a/interface/web/admin/lib/lang/el_server_php_list.lng
+++ b/interface/web/admin/lib/lang/el_server_php_list.lng
@@ -1,7 +1,7 @@
<?php
-$wb['list_head_txt'] = 'Πρόσθετες εκδόσεις PHP';
+$wb['list_head_txt'] = 'Additional PHP Versions';
$wb['server_id_txt'] = 'Server';
-$wb['add_new_record_txt'] = 'Προσθήκη νέας έκδοσης PHP';
-$wb['client_id_txt'] = 'Πελάτης';
-$wb['name_txt'] = 'Όνομα PHP';
+$wb['add_new_record_txt'] = 'Add new PHP version';
+$wb['client_id_txt'] = 'Client';
+$wb['name_txt'] = 'PHP Name';
?>
diff --git a/interface/web/admin/lib/lang/el_software_package.lng b/interface/web/admin/lib/lang/el_software_package.lng
index 16be47e..faffe38 100644
--- a/interface/web/admin/lib/lang/el_software_package.lng
+++ b/interface/web/admin/lib/lang/el_software_package.lng
@@ -1,6 +1,6 @@
<?php
-$wb['package_title_txt'] = 'Τίτλος Πακέτου';
-$wb['package_key_txt'] = 'Κλειδί Πακέτου';
-$wb['Software Package'] = 'Πακέτο Λογισμικού';
-$wb['Modify software package details'] = 'Επεξεργασία λεπτομερειών Πακέτου';
+$wb['package_title_txt'] = 'Package Title';
+$wb['package_key_txt'] = 'Package Key';
+$wb['Software Package'] = 'Software Package';
+$wb['Modify software package details'] = 'Modify software package details';
?>
diff --git a/interface/web/admin/lib/lang/el_software_package_list.lng b/interface/web/admin/lib/lang/el_software_package_list.lng
index 515dbb7..1553ea1 100644
--- a/interface/web/admin/lib/lang/el_software_package_list.lng
+++ b/interface/web/admin/lib/lang/el_software_package_list.lng
@@ -5,9 +5,9 @@
$wb['package_description_txt'] = 'Περιγραφή';
$wb['action_txt'] = 'Ενέργεια';
$wb['toolsarea_head_txt'] = 'Πακέτα';
-$wb['repoupdate_txt'] = 'Ενημέρωση λίστας πακέτων';
+$wb['repoupdate_txt'] = 'Ενημέρωση λίστας πακκέτων';
$wb['package_id_txt'] = 'τοπικό App-ID';
-$wb['no_packages_txt'] = 'Δεν υπάρχουν διαθέσιμα πακέτα';
+$wb['no_packages_txt'] = 'No packages available';
$wb['edit_txt'] = 'Edit';
$wb['delete_txt'] = 'Delete';
?>
diff --git a/interface/web/admin/lib/lang/el_software_update_list.lng b/interface/web/admin/lib/lang/el_software_update_list.lng
index 69c7026..42100d0 100644
--- a/interface/web/admin/lib/lang/el_software_update_list.lng
+++ b/interface/web/admin/lib/lang/el_software_update_list.lng
@@ -5,5 +5,5 @@
$wb['update_title_txt'] = 'Ενημέρωση';
$wb['version_txt'] = 'Έκδοση';
$wb['action_txt'] = 'Ενέργεια';
-$wb['no_updates_txt'] = 'Δεν υπάρχουν διαθέσιμες ενημερώσεις';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/el_system_config.lng b/interface/web/admin/lib/lang/el_system_config.lng
index f754137..8cb675c 100644
--- a/interface/web/admin/lib/lang/el_system_config.lng
+++ b/interface/web/admin/lib/lang/el_system_config.lng
@@ -1,8 +1,8 @@
<?php
$wb['system_config_desc_txt'] = '';
-$wb['dashboard_atom_url_admin_txt'] = 'URL ροής atom του Dashboard (διαχειριστής)';
-$wb['dashboard_atom_url_reseller_txt'] = 'URL ροής atom του Dashboard (μεταπωλητής)';
-$wb['dashboard_atom_url_client_txt'] = 'URL ροής atom του Dashboard (πελάτης)';
+$wb['dashboard_atom_url_admin_txt'] = 'Dashboard atom feed URL (admin)';
+$wb['dashboard_atom_url_reseller_txt'] = 'Dashboard atom feed URL (reseller)';
+$wb['dashboard_atom_url_client_txt'] = 'Dashboard atom feed URL (client)';
$wb['warning'] = 'Επεξεργαστείτε τις τιμές με προσοχή! ΜΗΝ αφαιρείτε τα προθέματα σε συστήματα με περισσότερους από έναν πελάτες.';
$wb['dbname_prefix_txt'] = 'Πρόθεμα Ονόματος Βάσης Δεδομένων';
$wb['dbuser_prefix_txt'] = 'Πρόθεμα Χρήστη Βάσης Δεδομένων';
@@ -14,22 +14,22 @@
$wb['ftpuser_prefix_error_regex'] = 'Δεν επιτρέπονται χαρακτήρες στο πρόθεμα του Χρήστη ftp.';
$wb['shelluser_prefix_error_regex'] = 'Δεν επιτρέπονται χαρακτήρες στο πρόθεμα του Χρήστη Shell.';
$wb['webdavuser_prefix_error_regex'] = 'Δεν επιτρέπονται χαρακτήρες στο πρόθεμα του Χρήστη Webdav.';
-$wb['dblist_phpmyadmin_link_txt'] = 'Σύνδεσμος για το phpmyadmin στη λίστα των βάσεων δεδομένων';
-$wb['mailboxlist_webmail_link_txt'] = 'Σύνδεσμος για το webmail στην λίστα των θυρίδων mail';
+$wb['dblist_phpmyadmin_link_txt'] = 'Link για το phpmyadmin στη λίστα των βάσεων δεδομένων';
+$wb['mailboxlist_webmail_link_txt'] = 'Link για το webmail στην λίστα των θυρίδων mail';
$wb['webmail_url_txt'] = 'URL του Webmail';
$wb['phpmyadmin_url_txt'] = 'URL του PHPMyAdmin';
$wb['use_domain_module_txt'] = 'Χρήση του αρθρώματος-domain για την προσθήκη νέων domains';
$wb['use_domain_module_hint'] = 'Αν χρησιμοποιήσετε αυτό το άρθρωμα, οι πελάτες σας μπορούν μόνο να διαλέξουν ένα από τα domains που δημιούργησε για αυτούς ο διαχειριστής. Δεν μπορούν να επεξεργαστούν ελεύθερα τα πεδία του domain.Πρέπει να επανασυνδεθείτε αν αλλάξετε αυτή την τιμή, για να γίνουν οι αλλαγές σας, ορατές.';
$wb['new_domain_txt'] = 'HTML για την δημιουργία domain';
$wb['webftp_url_txt'] = 'URL του WebFTP';
-$wb['enable_custom_login_txt'] = 'Αποδοχή προσαρμοσμένου ονόματος εισόδου';
-$wb['mailmailinglist_link_txt'] = 'Σύνδεσμος της λίστας mail στις λίστες mail';
+$wb['enable_custom_login_txt'] = 'Αποδοχή προσαρμοσμένου ονόματος login';
+$wb['mailmailinglist_link_txt'] = 'Link to mailing list in Mailing list list';
$wb['mailmailinglist_url_txt'] = 'URL της Mailing list ';
$wb['admin_mail_txt'] = 'e-mail Διαχειριστών';
-$wb['monitor_key_txt'] = 'keyword εποπτείας';
+$wb['monitor_key_txt'] = 'Monitor keyword';
$wb['admin_name_txt'] = 'Όνομα Administrator';
-$wb['maintenance_mode_txt'] = 'Κατάσταση συντήρησης';
-$wb['smtp_enabled_txt'] = 'Χρήση SMTP για την αποστολή mail συστήματος';
+$wb['maintenance_mode_txt'] = 'Maintenance Mode';
+$wb['smtp_enabled_txt'] = 'Use SMTP to send system mails';
$wb['smtp_host_txt'] = 'SMTP host';
$wb['smtp_port_txt'] = 'SMTP θύρα';
$wb['smtp_user_txt'] = 'SMTP χρήστης';
@@ -66,7 +66,7 @@
$wb['customer_no_start_txt'] = 'Customer No. start value';
$wb['customer_no_counter_txt'] = 'Customer No. counter';
$wb['session_timeout_txt'] = 'Session timeout (minutes)';
-$wb['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"';
+$wb['session_allow_endless_txt'] = 'Enable \"stay logged in\"';
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
diff --git a/interface/web/admin/lib/lang/el_tpl_default_admin.lng b/interface/web/admin/lib/lang/el_tpl_default_admin.lng
index 88053db..eee3af5 100644
--- a/interface/web/admin/lib/lang/el_tpl_default_admin.lng
+++ b/interface/web/admin/lib/lang/el_tpl_default_admin.lng
@@ -2,17 +2,17 @@
$wb['tpl_default_admin_head_txt'] = 'Global Default-Theme Settings';
$wb['tpl_default_admin_desc_txt'] = '';
$wb['server_id_txt'] = 'Server';
-$wb['client_id_txt'] = 'Πελάτης';
-$wb['name_txt'] = 'Όνομα PHP';
-$wb['Name'] = 'Όνομα';
-$wb['FastCGI Settings'] = 'Ρυθμίσεις FastCGI';
-$wb['PHP-FPM Settings'] = 'Ρυθμίσεις PHP-FPM';
-$wb['Additional PHP Versions'] = 'Πρόσθετες εκδόσεις PHP';
-$wb['Form to edit additional PHP versions'] = 'Φόρμα για την επεξεργασία επιπλέον εκδόσεων PHP';
-$wb['server_php_name_error_empty'] = 'Πρέπει να ορίσετε το πειο Όνομα.';
-$wb['php_fastcgi_binary_txt'] = 'Διαδρομή για το εκτελέσιμο PHP FastCGI';
-$wb['php_fastcgi_ini_dir_txt'] = 'Διαδρομή για τον φάκελο php.ini';
-$wb['php_fpm_init_script_txt'] = 'Διαδρομή για το init script PHP-FPM';
-$wb['php_fpm_ini_dir_txt'] = 'Διαδρομή για τον φάκελο του php.ini';
-$wb['php_fpm_pool_dir_txt'] = 'Διαδρομή για τον φάκελο PHP-FPM';
+$wb['client_id_txt'] = 'Client';
+$wb['name_txt'] = 'PHP Name';
+$wb['Name'] = 'Name';
+$wb['FastCGI Settings'] = 'FastCGI Settings';
+$wb['PHP-FPM Settings'] = 'PHP-FPM Settings';
+$wb['Additional PHP Versions'] = 'Additional PHP Versions';
+$wb['Form to edit additional PHP versions'] = 'Form to edit additional PHP versions';
+$wb['server_php_name_error_empty'] = 'The Name field must not be empty.';
+$wb['php_fastcgi_binary_txt'] = 'Path to the PHP FastCGI binary';
+$wb['php_fastcgi_ini_dir_txt'] = 'Path to the php.ini directory';
+$wb['php_fpm_init_script_txt'] = 'Path to the PHP-FPM init script';
+$wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory';
+$wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory';
?>
diff --git a/interface/web/admin/lib/lang/el_users.lng b/interface/web/admin/lib/lang/el_users.lng
index 6b73a15..3485981 100644
--- a/interface/web/admin/lib/lang/el_users.lng
+++ b/interface/web/admin/lib/lang/el_users.lng
@@ -4,7 +4,7 @@
$wb['username_empty'] = 'Το όνομα χρήστη δεν έχει οριστεί.';
$wb['username_unique'] = 'Υπάρχει ήδη ένας χρήστης με αυτό το όνομα χρήστη.';
$wb['passwort_txt'] = 'Συνθηματικό';
-$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού';
+$wb['password_strength_txt'] = 'Δύναμη Συνθηματικού';
$wb['modules_txt'] = 'Άρθρωμα';
$wb['startmodule_txt'] = 'Άρθρωμα Εκκίνησης';
$wb['app_theme_txt'] = 'Θεματική Παραλλαγή';
@@ -25,10 +25,10 @@
$wb['groups_txt'] = 'Ομάδες';
$wb['default_group_txt'] = 'Προκαθορισμένη Ομάδα';
$wb['startmodule_err'] = 'Το άρθρωμα εκκίνησης δεν υπάρχει στα διαθέσιμα αρθρώματα.';
-$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού';
-$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού';
-$wb['password_mismatch_txt'] = 'Τα Συνθηματικά δεν ταιριάζουν.';
-$wb['password_match_txt'] = 'Τα Συνθηματικά ταιριάζουν.';
-$wb['username_error_collision'] = 'Το όνομα χρήστη δεν μπορεί να αρχίζει από την λέξη -web- ή την λέξη -web- ακολουθούμενη από αριθμό.';
+$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['username_error_collision'] = 'The username may not be web or web plus a number.\\"';
$wb['client_not_admin_err'] = 'A user that belongs to a client can not be set to type: admin';
?>
diff --git a/interface/web/admin/lib/lang/el_users_list.lng b/interface/web/admin/lib/lang/el_users_list.lng
index a1b33ca..b61af25 100644
--- a/interface/web/admin/lib/lang/el_users_list.lng
+++ b/interface/web/admin/lib/lang/el_users_list.lng
@@ -5,5 +5,5 @@
$wb['active_txt'] = 'Active';
$wb['add_new_record_txt'] = 'Νέος Χρήστης';
$wb['warning_txt'] = '<b>ΠΡΟΕΙΔΟΠΟΙΗΣΗ:</b>Μην επεξεργάζεστε καμία ρύθμιση χρήστη εδώ. Χρησιμοποιήστε τις ρυθμίσεις Πελάτη - και Μεταπωλητή στο άρθρωμα Πελάτης. Η επεξεργασία ομάδων και χρηστών εδώ, μπορεί να προκαλέσει απώλεια δεδομένων!';
-$wb['groups_txt'] = 'Ομάδες';
+$wb['groups_txt'] = 'Groups';
?>
diff --git a/interface/web/admin/lib/lang/fr_system_config.lng b/interface/web/admin/lib/lang/fr_system_config.lng
index b6db6d7..778068d 100644
--- a/interface/web/admin/lib/lang/fr_system_config.lng
+++ b/interface/web/admin/lib/lang/fr_system_config.lng
@@ -66,7 +66,7 @@
$wb['customer_no_start_txt'] = 'Customer No. start value';
$wb['customer_no_counter_txt'] = 'Customer No. counter';
$wb['session_timeout_txt'] = 'Session timeout (minutes)';
-$wb['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"';
+$wb['session_allow_endless_txt'] = 'Enable \"stay logged in\"';
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
diff --git a/interface/web/client/client_edit.php b/interface/web/client/client_edit.php
index ba5743f..54b8d1d 100644
--- a/interface/web/client/client_edit.php
+++ b/interface/web/client/client_edit.php
@@ -223,7 +223,7 @@
if($app->auth->is_admin()) {
// Fill the client select field
- $sql = "SELECT client.client_id, sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 AND client.limit_client > 0 ORDER BY sys_group.name";
+ $sql = "SELECT client.client_id, sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 AND client.limit_client > 0 ORDER BY client.company_name, client.contact_name, sys_group.name";
$clients = $app->db->queryAllRecords($sql);
$client_select = "<option value='0'>- ".$app->tform->lng('none_txt')." -</option>";
//$tmp_data_record = $app->tform->getDataRecord($this->id);
@@ -352,8 +352,8 @@
$subject = str_replace('{password}', $this->dataRecord['password'], $subject);
break;
case 'gender':
- $message = str_replace('{salutation}', $wb['gender_'.$val.'_txt'], $message);
- $subject = str_replace('{salutation}', $wb['gender_'.$val.'_txt'], $subject);
+ $message = str_replace('{salutation}', $app->tform->lng('gender_'.$val.'_txt'), $message);
+ $subject = str_replace('{salutation}', $app->tform->lng('gender_'.$val.'_txt'), $subject);
break;
default:
$message = str_replace('{'.$key.'}', $val, $message);
@@ -364,7 +364,7 @@
//* Get sender address
if($app->auth->is_admin()) {
$app->uses('getconf');
- $system_config = $app->getconf->get_global_config();
+ $system_config = $app->getconf->get_global_config('mail');
$from = $system_config['admin_mail'];
} else {
$client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
diff --git a/interface/web/client/domain_edit.php b/interface/web/client/domain_edit.php
index 7b24e46..cca5c2d 100644
--- a/interface/web/client/domain_edit.php
+++ b/interface/web/client/domain_edit.php
@@ -81,7 +81,7 @@
if($_SESSION["s"]["user"]["typ"] == 'admin') {
// Getting Clients of the user
//$sql = "SELECT groupid, name FROM sys_group WHERE client_id > 0 ORDER BY name";
- $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY sys_group.name";
+ $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY client.company_name, client.contact_name, sys_group.name";
$clients = $app->db->queryAllRecords($sql);
$client_select = '';
if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= "<option value='0'></option>";
@@ -100,7 +100,7 @@
$client = $app->db->queryOneRecord("SELECT client.client_id, 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 FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
// Fill the client select field
- $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY sys_group.name";
+ $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY client.company_name, client.contact_name, sys_group.name";
//die($sql);
$records = $app->db->queryAllRecords($sql);
$tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$app->functions->intval($client['client_id']));
diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
index 3afbb09..5764266 100644
--- a/interface/web/client/form/client.tform.php
+++ b/interface/web/client/form/client.tform.php
@@ -823,7 +823,7 @@
'default' => '',
'separator' => ',',
'valuelimit' => 'client:web_php_options',
- 'value' => array('no' => 'Disabled', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP', 'php-fpm' => 'PHP-FPM')
+ 'value' => array('no' => 'Disabled', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP', 'php-fpm' => 'PHP-FPM', 'hhvm' => 'HHVM')
),
'limit_cgi' => array (
'datatype' => 'VARCHAR',
@@ -960,6 +960,12 @@
'rows' => '',
'cols' => ''
),
+ 'limit_backup' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'y',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
'default_dnsserver' => array (
'datatype' => 'INTEGER',
'formtype' => 'SELECT',
diff --git a/interface/web/client/form/client_template.tform.php b/interface/web/client/form/client_template.tform.php
index f55b501..dff2dcf 100644
--- a/interface/web/client/form/client_template.tform.php
+++ b/interface/web/client/form/client_template.tform.php
@@ -345,7 +345,7 @@
'default' => '',
'separator' => ',',
'valuelimit' => 'client:web_php_options',
- 'value' => array('no' => 'Disabled', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP', 'php-fpm' => 'PHP-FPM')
+ 'value' => array('no' => 'Disabled', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP', 'php-fpm' => 'PHP-FPM', 'hhvm' => 'HHVM')
),
'limit_cgi' => array (
'datatype' => 'VARCHAR',
@@ -485,6 +485,12 @@
'rows' => '',
'cols' => ''
),
+ 'limit_backup' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'y',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
'limit_dns_zone' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php
index 09c831b..fa469c9 100644
--- a/interface/web/client/form/reseller.tform.php
+++ b/interface/web/client/form/reseller.tform.php
@@ -818,7 +818,7 @@
),
'default' => '',
'separator' => ',',
- 'value' => array('no' => 'Disabled', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP', 'php-fpm' => 'PHP-FPM')
+ 'value' => array('no' => 'Disabled', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP', 'php-fpm' => 'PHP-FPM', 'hhvm' => 'HHVM')
),
'limit_cgi' => array (
'datatype' => 'VARCHAR',
@@ -954,6 +954,12 @@
'rows' => '',
'cols' => ''
),
+ 'limit_backup' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'y',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
'default_dnsserver' => array (
'datatype' => 'INTEGER',
'formtype' => 'SELECT',
diff --git a/interface/web/client/lib/lang/ar_client.lng b/interface/web/client/lib/lang/ar_client.lng
index eea1322..6f14c60 100644
--- a/interface/web/client/lib/lang/ar_client.lng
+++ b/interface/web/client/lib/lang/ar_client.lng
@@ -95,6 +95,7 @@
$wb['limit_trafficquota_error_notint'] = 'Traffic Quota must be a number.';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['customer_no_txt'] = 'Customer No.';
$wb['vat_id_txt'] = 'VAT ID';
$wb['required_fields_txt'] = '* Required fields';
diff --git a/interface/web/client/lib/lang/ar_client_template.lng b/interface/web/client/lib/lang/ar_client_template.lng
index 8169c1b..97a01c7 100644
--- a/interface/web/client/lib/lang/ar_client_template.lng
+++ b/interface/web/client/lib/lang/ar_client_template.lng
@@ -60,6 +60,7 @@
$wb['template_del_aborted_txt'] = 'Delete aborted. There is still a client which has this template selected.';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
diff --git a/interface/web/client/lib/lang/ar_reseller.lng b/interface/web/client/lib/lang/ar_reseller.lng
index 7fab36d..5269311 100644
--- a/interface/web/client/lib/lang/ar_reseller.lng
+++ b/interface/web/client/lib/lang/ar_reseller.lng
@@ -98,6 +98,7 @@
$wb['required_fields_txt'] = '* Required fields';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
$wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
diff --git a/interface/web/client/lib/lang/bg_client.lng b/interface/web/client/lib/lang/bg_client.lng
index c28dac5..61f28de 100644
--- a/interface/web/client/lib/lang/bg_client.lng
+++ b/interface/web/client/lib/lang/bg_client.lng
@@ -95,6 +95,7 @@
$wb['limit_trafficquota_error_notint'] = 'Трафик квота трябва да е число';
$wb['limit_webdav_user_txt'] = 'макс. брой на Webdav потребители';
$wb['limit_webdav_user_error_notint'] = 'The webdav user трябва да е число';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['customer_no_txt'] = 'Клиент No.';
$wb['vat_id_txt'] = 'ДДС Номер:';
$wb['required_fields_txt'] = '* Задължителни полета';
diff --git a/interface/web/client/lib/lang/bg_client_template.lng b/interface/web/client/lib/lang/bg_client_template.lng
index af36580..2456d8e 100644
--- a/interface/web/client/lib/lang/bg_client_template.lng
+++ b/interface/web/client/lib/lang/bg_client_template.lng
@@ -60,6 +60,7 @@
$wb['template_del_aborted_txt'] = 'Изтриването е прекратено. There is still a client which has this template selected.';
$wb['limit_webdav_user_txt'] = 'Макс. брой на Webdav потребители';
$wb['limit_webdav_user_error_notint'] = 'The webdav user трябва да е число';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record трябва да е число';
$wb['limit_openvz_vm_txt'] = 'Макс. брой на Виртуалните сървъри';
diff --git a/interface/web/client/lib/lang/bg_reseller.lng b/interface/web/client/lib/lang/bg_reseller.lng
index c9bbd76..c0a239a 100644
--- a/interface/web/client/lib/lang/bg_reseller.lng
+++ b/interface/web/client/lib/lang/bg_reseller.lng
@@ -98,6 +98,7 @@
$wb['required_fields_txt'] = '* Задължителни полета';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user трябва да е число';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_mailmailinglist_txt'] = 'Макс. брой наmailing lists';
$wb['limit_mailaliasdomain_txt'] = 'Макс. брой на domain aliases';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record трябва да е число';
diff --git a/interface/web/client/lib/lang/br_client.lng b/interface/web/client/lib/lang/br_client.lng
index dc5f4f1..265752e 100644
--- a/interface/web/client/lib/lang/br_client.lng
+++ b/interface/web/client/lib/lang/br_client.lng
@@ -95,6 +95,7 @@
$wb['limit_trafficquota_error_notint'] = 'A cota de tráfego precisa ser um número..';
$wb['limit_webdav_user_txt'] = 'Número máximo de usuários Webdav';
$wb['limit_webdav_user_error_notint'] = 'O limite de usuários webdav deve ser um número.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['customer_no_txt'] = 'Código do cliente.';
$wb['vat_id_txt'] = 'VAT ID';
$wb['required_fields_txt'] = '* Campos requeridos';
diff --git a/interface/web/client/lib/lang/br_client_template.lng b/interface/web/client/lib/lang/br_client_template.lng
index 4a16a13..4bbc1e9 100644
--- a/interface/web/client/lib/lang/br_client_template.lng
+++ b/interface/web/client/lib/lang/br_client_template.lng
@@ -60,6 +60,7 @@
$wb['template_del_aborted_txt'] = 'Remoção abortada. Ainda existem clientes com o gabarito selecionado.';
$wb['limit_webdav_user_txt'] = 'Número máximo de usuários Webdav';
$wb['limit_webdav_user_error_notint'] = 'O número de usuários webdav deve ser um número.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_mailmailinglist_txt'] = 'Número máximo de mailing lists';
$wb['limit_mailmailinglist_error_notint'] = 'O limite de mailing list deve ser um número.';
$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
diff --git a/interface/web/client/lib/lang/br_reseller.lng b/interface/web/client/lib/lang/br_reseller.lng
index 7313b2f..d0aea72 100644
--- a/interface/web/client/lib/lang/br_reseller.lng
+++ b/interface/web/client/lib/lang/br_reseller.lng
@@ -100,6 +100,7 @@
$wb['limit_mailmailinglist_error_notint'] = 'O número máximo de mailing list deve ser um número.';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
$wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template';
diff --git a/interface/web/client/lib/lang/cz_client.lng b/interface/web/client/lib/lang/cz_client.lng
index b08fb92..92f95a0 100644
--- a/interface/web/client/lib/lang/cz_client.lng
+++ b/interface/web/client/lib/lang/cz_client.lng
@@ -95,6 +95,7 @@
$wb['limit_trafficquota_error_notint'] = 'Přenosová kvót musí být číslo.';
$wb['limit_webdav_user_txt'] = 'Max. počet Webdav uživatelů';
$wb['limit_webdav_user_error_notint'] = 'Limit WebDAV uživatelů musí být číslo.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['customer_no_txt'] = 'Zákaznické číslo';
$wb['vat_id_txt'] = 'DIČ';
$wb['required_fields_txt'] = '* Povinná pole';
diff --git a/interface/web/client/lib/lang/cz_client_template.lng b/interface/web/client/lib/lang/cz_client_template.lng
index 543a110..0695f20 100644
--- a/interface/web/client/lib/lang/cz_client_template.lng
+++ b/interface/web/client/lib/lang/cz_client_template.lng
@@ -57,9 +57,10 @@
$wb['limit_traffic_quota_txt'] = 'Přenosová kvóta';
$wb['limit_trafficquota_error_notint'] = 'Přenosová kvót musí být číslo.';
$wb['template_del_aborted_txt'] = 'Smazání přerušeno. Stále existuje klient, který používá tuto šablonu.';
-$wb['limit_webdav_user_txt'] = 'Max. počet Webdav uživatelů';
$wb['limit_shell_user_error_notint'] = 'Limit shell uživatelů musí být číslo.';
+$wb['limit_webdav_user_txt'] = 'Max. počet Webdav uživatelů';
$wb['limit_webdav_user_error_notint'] = 'Limit WebDAV uživatelů musí být číslo.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_mailmailinglist_txt'] = 'Max. počet e-mailových konferencí';
$wb['limit_mailmailinglist_error_notint'] = 'Limit pro e-mailové konference musí být číslo.';
$wb['limit_openvz_vm_txt'] = 'Max. počet virtuálních serverů';
diff --git a/interface/web/client/lib/lang/cz_reseller.lng b/interface/web/client/lib/lang/cz_reseller.lng
index 50611f8..49f5449 100644
--- a/interface/web/client/lib/lang/cz_reseller.lng
+++ b/interface/web/client/lib/lang/cz_reseller.lng
@@ -98,6 +98,7 @@
$wb['required_fields_txt'] = '* Povinná pole';
$wb['limit_webdav_user_txt'] = 'Max. počet Webdav uživatelů';
$wb['limit_webdav_user_error_notint'] = 'Limit WebDAV uživatelů musí být číslo.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_mailmailinglist_txt'] = 'Max. počet e-mailových konferencí';
$wb['limit_mailaliasdomain_txt'] = 'Max. počet doménových aliasů';
$wb['limit_mailmailinglist_error_notint'] = 'Limit pro e-mailové konference musí být číslo.';
diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng
index 36ad247..62bd311 100644
--- a/interface/web/client/lib/lang/de_client.lng
+++ b/interface/web/client/lib/lang/de_client.lng
@@ -106,6 +106,7 @@
$wb['limit_dns_slave_zone_txt'] = 'Max. Anzahl an Secondary DNS Zonen';
$wb['limit_webdav_user_txt'] = 'Max. Anzahl an WebDAV Benutzern';
$wb['limit_webdav_user_error_notint'] = 'Das WebDAV Benutzer Limit muss eine Zahl sein.';
+$wb['limit_backup_txt'] = 'Backupfunktion verfügbar';
$wb['limit_dns_slave_zone_error_notint'] = 'Das Secondary DNS Zonen Limit muss eine Zahl sein.';
$wb['customer_no_txt'] = 'Kundennummer';
$wb['vat_id_txt'] = 'USt-ID';
diff --git a/interface/web/client/lib/lang/de_client_template.lng b/interface/web/client/lib/lang/de_client_template.lng
index ee04dd7..1fbd0ab 100644
--- a/interface/web/client/lib/lang/de_client_template.lng
+++ b/interface/web/client/lib/lang/de_client_template.lng
@@ -57,6 +57,7 @@
$wb['limit_dns_slave_zone_txt'] = 'Max. Anzahl an Zweiter DNS Zonen';
$wb['limit_webdav_user_txt'] = 'Max. Anzahl an WebDAV Benutzern';
$wb['limit_webdav_user_error_notint'] = 'Das WebDAV Benutzer Limit muss eine Zahl sein.';
+$wb['limit_backup_txt'] = 'Backupfunktion verfügbar';
$wb['limit_dns_slave_zone_error_notint'] = 'Das Zweiter DNS Zonen Limit muss eine Zahl sein.';
$wb['limit_dns_record_error_notint'] = 'Das DNS Eintrag Limit muss eine Zahl sein.';
$wb['template_del_aborted_txt'] = 'Löschung abgebrochen. Ein Kunde hat die Vorlage noch ausgewählt.';
diff --git a/interface/web/client/lib/lang/de_reseller.lng b/interface/web/client/lib/lang/de_reseller.lng
index 658e218..b3ba52f 100644
--- a/interface/web/client/lib/lang/de_reseller.lng
+++ b/interface/web/client/lib/lang/de_reseller.lng
@@ -109,6 +109,7 @@
$wb['required_fields_txt'] = '* Benötigte Felder';
$wb['limit_webdav_user_txt'] = 'Max. Anzahl an WebDAV Benutzern';
$wb['limit_webdav_user_error_notint'] = 'Das WebDAV Benutzer Limit muss eine Zahl sein.';
+$wb['limit_backup_txt'] = 'Backupfunktion verfügbar';
$wb['limit_mailmailinglist_txt'] = 'Max. Anzahl an Mailinglisten';
$wb['limit_mailaliasdomain_txt'] = 'Max. Anzahl an E-Mail Domain Aliasse';
$wb['limit_mailmailinglist_error_notint'] = 'Das Mailinglisten Limit muss eine Zahl sein.';
diff --git a/interface/web/client/lib/lang/el.lng b/interface/web/client/lib/lang/el.lng
index fe70d3f..ee9e354 100644
--- a/interface/web/client/lib/lang/el.lng
+++ b/interface/web/client/lib/lang/el.lng
@@ -5,22 +5,22 @@
$wb['Add Client'] = 'Νέος Πελάτης';
$wb['Edit Client'] = 'Επεξεργασία Πελάτη';
$wb['Clients'] = 'Πελάτες';
-$wb['Templates'] = 'Templates';
-$wb['Limit-Templates'] = 'Limit-Templates';
$wb['Add Reseller'] = 'Νέος Μεταπωλητής';
$wb['Edit Reseller'] = 'Επεξεργασία Μεταπωλητή';
$wb['Resellers'] = 'Μεταπωλητές';
$wb['error_has_clients'] = 'Ο Μεταπωλητής έχει πελάτες. Διαγράψτε πρώτα τους πελάτες.';
-$wb['add_additional_template_txt'] = 'Προσθήκη πρόσθετου προτύπου';
-$wb['delete_additional_template_txt'] = 'Διαγραφή πρόσθετου προτύπου';
-$wb['Messaging'] = 'Μηνύματα';
-$wb['Send email'] = 'Αποστολή Email';
-$wb['Edit Client Circle'] = 'Επεξεργασία Κύκλου Πελάτη';
+$wb['add_additional_template_txt'] = 'Add additional template';
+$wb['delete_additional_template_txt'] = 'Delete additional template';
+$wb['Messaging'] = 'Messaging';
+$wb['Send email'] = 'Send Email';
+$wb['Edit Client Circle'] = 'Edit Client Circle';
$wb['Domains'] = 'Domains';
$wb['domain_txt'] = 'Domain';
-$wb['client_txt'] = 'Πελάτης';
-$wb['error_domain_in mailuse'] = 'Το domain δεν μπορεί να διαγραφεί γιατί χρησιμοποιείται ως mail-domain';
-$wb['error_domain_in webuse'] = 'Το domain δεν μπορεί να διαγραφεί γιατί χρησιμοποιείται ως web-domain';
-$wb['error_client_can_not_add_domain'] = 'Δεν μπορείτε να προσθέσετε νέο domain';
-$wb['error_client_group_id_empty'] = 'Πρέπει να επιλέξετε έναν πελάτη<br>';
+$wb['client_txt'] = 'Client';
+$wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is in use as mail-domain';
+$wb['error_domain_in webuse'] = 'This domain cannot be deleted, because it is in use as web-domain';
+$wb['error_client_can_not_add_domain'] = 'You cannot add a new domain';
+$wb['error_client_group_id_empty'] = 'You have to select a customer<br>';
+$wb['Templates'] = 'Templates';
+$wb['Limit-Templates'] = 'Limit-Templates';
?>
diff --git a/interface/web/client/lib/lang/el_client.lng b/interface/web/client/lib/lang/el_client.lng
index 72fae7e..e68db31 100644
--- a/interface/web/client/lib/lang/el_client.lng
+++ b/interface/web/client/lib/lang/el_client.lng
@@ -17,7 +17,7 @@
$wb['contact_name_txt'] = 'Πρόσωπο Επικοινωνίας';
$wb['username_txt'] = 'Όνομα Χρήστη';
$wb['password_txt'] = 'Συνθηματικό';
-$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού';
+$wb['password_strength_txt'] = 'Δύναμη συνθηματικού';
$wb['language_txt'] = 'Γλώσσα';
$wb['usertheme_txt'] = 'Θεματική Παραλλαγή';
$wb['street_txt'] = 'Οδός';
@@ -58,6 +58,7 @@
$wb['limit_dns_record_txt'] = 'Όριο εγγραφών DNS';
$wb['limit_shell_user_txt'] = 'Όριο χρηστών Shell';
$wb['limit_webdav_user_txt'] = 'Όριο χρηστών Webdav';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_client_txt'] = 'Όριο Πελατών';
$wb['username_error_empty'] = 'ΤΟ Όνομα Χρήστη δεν έχει οριστεί';
$wb['username_error_unique'] = 'Το Όνομα Χρήστη πρέπει να είναι μοναδικό';
@@ -93,8 +94,8 @@
$wb['web_php_options_txt'] = 'Ρυθμίσεις PHP';
$wb['limit_client_error'] = 'Το μέγιστο πλήθος πελατών εξαντλήθηκε.';
$wb['limit_web_quota_txt'] = 'Όριο χώρου Web';
-$wb['limit_traffic_quota_txt'] = 'Όριο μεταφοράς δεδομένων';
-$wb['limit_trafficquota_error_notint'] = 'Το Όριο μεταφοράς δεδομένων πρέπει να είναι αριθμός.';
+$wb['limit_traffic_quota_txt'] = 'Όριο κίνησης δεδομένων';
+$wb['limit_trafficquota_error_notint'] = 'Το Όριο κίνησης δεδομένων πρέπει να είναι αριθμός.';
$wb['customer_no_txt'] = 'Κωδ. Πελάτη';
$wb['vat_id_txt'] = 'Α.Φ.Μ';
$wb['required_fields_txt'] = '* Υποχρεωτικά Πεδία';
@@ -104,45 +105,45 @@
$wb['limit_openvz_vm_txt'] = 'Μέγιστο πλήθος εικονικών servers';
$wb['limit_openvz_vm_template_id_txt'] = 'Εξαναγκασμός προτύπου εικονικού server';
$wb['limit_openvz_vm_error_notint'] = 'Το όριο εικονικών server πρέπει να είναι αριθμός.';
-$wb['web_php_options_notempty'] = 'Δεν επιλέχθηκαν επιλογές PHP. Επιλέξτε τουλάχιστον μία επιλογή PHP.';
-$wb['ssh_chroot_notempty'] = 'Δεν επιλέχθηκαν επιλογές SSH chroot. Επιλέξτε τουλάχιστον μία επιλογή SSH.';
-$wb['username_error_collision'] = 'Το όνομα χρήστη δεν μπορεί να αρχίζει από την λέξη -web- ή την λέξη -web- ακολουθούμενη από αριθμό.';
-$wb['add_additional_template_txt'] = 'Προσθήκη πρόσθετου προτύπου';
-$wb['delete_additional_template_txt'] = 'Διαγραφή πρόσθετου προτύπου';
-$wb['limit_cgi_txt'] = 'Διαθέσιμο CGI';
-$wb['limit_ssi_txt'] = 'Διαθέσιμο SSI';
-$wb['limit_perl_txt'] = 'Διαθέσιμη Perl';
+$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.';
+$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.';
+$wb['username_error_collision'] = 'The username may not start with the word -web- or -web- followed by a number.';
+$wb['add_additional_template_txt'] = 'Add additional template';
+$wb['delete_additional_template_txt'] = 'Delete additional template';
+$wb['limit_cgi_txt'] = 'CGI available';
+$wb['limit_ssi_txt'] = 'SSI available';
+$wb['limit_perl_txt'] = 'Perl available';
$wb['limit_ruby_txt'] = 'Ruby available';
-$wb['limit_python_txt'] = 'Διαθέσιμη Python';
-$wb['force_suexec_txt'] = 'Εξαναγκασμός SuEXEC';
-$wb['limit_hterror_txt'] = 'Διαθέσιμα έγγραφα προσαρμοσμένων μηνυμάτων σφάλματος';
+$wb['limit_python_txt'] = 'Python available';
+$wb['force_suexec_txt'] = 'SuEXEC forced';
+$wb['limit_hterror_txt'] = 'Custom error docs available';
$wb['limit_wildcard_txt'] = 'Wildcard subdomain available';
-$wb['limit_ssl_txt'] = 'Διαθέσιμο SSL';
-$wb['bank_account_number_txt'] = 'Αρ. Λογαριασμού Τράπεζας.';
-$wb['bank_code_txt'] = 'Κωδικός Τράπεζας';
-$wb['bank_name_txt'] = 'Όνομα Τράπεζας';
+$wb['limit_ssl_txt'] = 'SSL available';
+$wb['bank_account_number_txt'] = 'Bank account no.';
+$wb['bank_code_txt'] = 'Bank code';
+$wb['bank_name_txt'] = 'Bank name';
$wb['bank_account_iban_txt'] = 'IBAN';
-$wb['bank_account_swift_txt'] = 'BIC/Swift';
-$wb['web_limits_txt'] = 'Όρια Web';
-$wb['email_limits_txt'] = 'Όρια Email';
-$wb['database_limits_txt'] = 'Όρια Βάσεων Δεδομένων';
-$wb['cron_job_limits_txt'] = 'Όρια Εργασιών Cron';
-$wb['dns_limits_txt'] = 'Όρια DNS';
-$wb['virtualization_limits_txt'] = 'Όρια Virtualization';
-$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού';
-$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού';
-$wb['password_mismatch_txt'] = 'Τα συνθηματικά δεν ταιριάζουν.';
-$wb['password_match_txt'] = 'Τα συνθηματικά ταιριάζουν.';
-$wb['active_template_additional_txt'] = 'Ενεργά Πρόσθετα';
-$wb['bank_account_owner_txt'] = 'Ιδιοκτήτης Λογαριασμού Τράπεζας';
-$wb['email_error_isemail'] = 'Παρακαλούμε εισάγετε έγκυρη διεύθυνση email.';
-$wb['customer_no_error_unique'] = 'Ο κωδικός πελάτη πρέπει να είναι μοναδικός (ή άδειος).';
-$wb['paypal_email_error_isemail'] = 'Παρακαλούμε εισάγετε έγκυρη διεύθυνση email PayPal.';
+$wb['bank_account_swift_txt'] = 'BIC / Swift';
+$wb['web_limits_txt'] = 'Web Limits';
+$wb['email_limits_txt'] = 'Email Limits';
+$wb['database_limits_txt'] = 'Database Limits';
+$wb['cron_job_limits_txt'] = 'Cron Job Limits';
+$wb['dns_limits_txt'] = 'DNS Limits';
+$wb['virtualization_limits_txt'] = 'Virtualization Limits';
+$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['active_template_additional_txt'] = 'Active Addons';
+$wb['bank_account_owner_txt'] = 'Bank account owner';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
+$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
-$wb['err_msg_master_tpl_set'] = 'Όλες οι ρυθμίσεις προσαρμοσμένων ορίων θα αγνοηθούν αν κάποιο βασικό πρότυπο, εκτός του \\"Custom\\", είναι επιλεγμένο.';
-$wb['aps_limits_txt'] = 'Όρια APS Installer';
-$wb['limit_aps_txt'] = 'Μέγιστο πλήθος ενεργών APS';
-$wb['limit_aps_error_notint'] = 'Το μέγιστο πλήθος ενεργών APS πρέπει να είναι αριθμός.';
+$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
$wb['locked_txt'] = 'Locked (disables all webs etc.)';
$wb['canceled_txt'] = 'Canceled (disables client login)';
diff --git a/interface/web/client/lib/lang/el_client_circle.lng b/interface/web/client/lib/lang/el_client_circle.lng
index 54aa0bc..f98a144 100644
--- a/interface/web/client/lib/lang/el_client_circle.lng
+++ b/interface/web/client/lib/lang/el_client_circle.lng
@@ -1,9 +1,9 @@
<?php
-$wb['Client Circle'] = 'Κύκλος Πελάτη';
-$wb['Circle'] = 'Κύκλος';
-$wb['circle_txt'] = 'Κύκλος';
-$wb['circle_name_txt'] = 'Όνομα Κύκλου';
-$wb['client_ids_txt'] = 'Πελάτες/Μεταπωλητές';
-$wb['description_txt'] = 'Περιγραφή';
-$wb['active_txt'] = 'Ενεργός';
+$wb['Client Circle'] = 'Client Circle';
+$wb['Circle'] = 'Circle';
+$wb['circle_txt'] = 'Circle';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['client_ids_txt'] = 'Clients/Resellers';
+$wb['description_txt'] = 'Description';
+$wb['active_txt'] = 'Active';
?>
diff --git a/interface/web/client/lib/lang/el_client_circle_list.lng b/interface/web/client/lib/lang/el_client_circle_list.lng
index cb7ef18..00fd0b3 100644
--- a/interface/web/client/lib/lang/el_client_circle_list.lng
+++ b/interface/web/client/lib/lang/el_client_circle_list.lng
@@ -1,10 +1,10 @@
<?php
-$wb['list_head_txt'] = 'Κύκλοι πελατών';
-$wb['circle_id_txt'] = 'ID Κύκλου';
-$wb['circle_name_txt'] = 'Όνομα Κύκλου';
-$wb['description_txt'] = 'Περιγραφή';
-$wb['add_new_record_txt'] = 'Προσθήκη νέου Κύκλου';
-$wb['filter_txt'] = 'Φίλτρο';
-$wb['delete_txt'] = 'Διαγραφή';
-$wb['active_txt'] = 'Ενεργός';
+$wb['list_head_txt'] = 'Client Circles';
+$wb['circle_id_txt'] = 'Circle ID';
+$wb['circle_name_txt'] = 'Circle Name';
+$wb['description_txt'] = 'Description';
+$wb['add_new_record_txt'] = 'Add new circle';
+$wb['filter_txt'] = 'Filter';
+$wb['delete_txt'] = 'Delete';
+$wb['active_txt'] = 'Active';
?>
diff --git a/interface/web/client/lib/lang/el_client_message.lng b/interface/web/client/lib/lang/el_client_message.lng
index 844f054..6b2a872 100644
--- a/interface/web/client/lib/lang/el_client_message.lng
+++ b/interface/web/client/lib/lang/el_client_message.lng
@@ -1,20 +1,20 @@
<?php
-$wb['btn_send_txt'] = 'Αποστολή email';
-$wb['btn_cancel_txt'] = 'Άκυρο';
-$wb['sender_txt'] = 'Διεύθυνση email αποστολέα';
-$wb['subject_txt'] = 'Θέμα';
-$wb['message_txt'] = 'Μήνυμα';
-$wb['form_legend_client_txt'] = 'Αποστολή μηνύματος email σε όλους τους πελάτες.';
-$wb['form_legend_admin_txt'] = 'Αποστολή μηνύματος email σε όλους τους πελάτες και τους μεταπωλητές.';
-$wb['sender_invalid_error'] = 'Η Διεύθυνση email αποστολέα δεν είναι έγκυρη.';
-$wb['subject_invalid_error'] = 'Το θέμα είναι άδειο.';
-$wb['message_invalid_error'] = 'Το μήνυμα είναι άδειο.';
-$wb['email_sent_to_txt'] = 'Το Email εστάλει σε:';
-$wb['page_head_txt'] = 'Αποστολή πληροφοριών πελάτη';
-$wb['recipient_txt'] = 'Παραλήπτης';
-$wb['all_clients_resellers_txt'] = 'Όλοι οι πελάτες και οι μεταπωλητές';
-$wb['all_clients_txt'] = 'Όλοι οι πελάτες';
-$wb['variables_txt'] = 'Μεταβλητές:';
+$wb['btn_send_txt'] = 'Send email';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['sender_txt'] = 'Sender email address';
+$wb['subject_txt'] = 'Subject';
+$wb['message_txt'] = 'Message';
+$wb['form_legend_client_txt'] = 'Send email message to all clients.';
+$wb['form_legend_admin_txt'] = 'Send email message to all clients and resellers.';
+$wb['sender_invalid_error'] = 'Sender email invalid.';
+$wb['subject_invalid_error'] = 'Subject is empty.';
+$wb['message_invalid_error'] = 'Message is empty.';
+$wb['email_sent_to_txt'] = 'Email sent to:';
+$wb['page_head_txt'] = 'Send customer information';
+$wb['recipient_txt'] = 'Recipient';
+$wb['all_clients_resellers_txt'] = 'All clients and resellers';
+$wb['all_clients_txt'] = 'All clients';
+$wb['variables_txt'] = 'Variables:';
$wb['gender_m_txt'] = 'Mr.';
$wb['gender_f_txt'] = 'Ms.';
?>
diff --git a/interface/web/client/lib/lang/el_client_template.lng b/interface/web/client/lib/lang/el_client_template.lng
index 3dc0e77..5c9917c 100644
--- a/interface/web/client/lib/lang/el_client_template.lng
+++ b/interface/web/client/lib/lang/el_client_template.lng
@@ -29,6 +29,7 @@
$wb['limit_dns_record_txt'] = 'Όριο εγγραφών DNS';
$wb['limit_shell_user_txt'] = 'Όριο χρηστών Shell';
$wb['limit_webdav_user_txt'] = 'Όριο χρηστών Webdav';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_client_txt'] = 'Όριο Πελατών';
$wb['limit_maildomain_error_notint'] = 'Το όριο email domain πρέπει να είναι αριθμός.';
$wb['limit_mailbox_error_notint'] = 'Το όριο θυρίδων πρέπει να είναι αριθμός.';
@@ -57,8 +58,8 @@
$wb['limit_cron_error_frequency'] = 'Το όριο συχνότητας των εργασιών cron πρέπει να είναι αριθμός.';
$wb['error_template_name_empty'] = 'Παρακαλούμε εισάγετε ένα όνομα Προτύπου';
$wb['limit_web_quota_txt'] = 'Όριο Web';
-$wb['limit_traffic_quota_txt'] = 'Όριο μεταφοράς δεδομένων';
-$wb['limit_trafficquota_error_notint'] = 'Το Όριο μεταφοράς δεδομένων πρέπει να είναι αριθμός.';
+$wb['limit_traffic_quota_txt'] = 'Όριο Κίνησης δεδομένων';
+$wb['limit_trafficquota_error_notint'] = 'Το Όριο Κίνησης δεδομένων πρέπει να είναι αριθμός.';
$wb['template_del_aborted_txt'] = 'Η διαγραφή ακυρώθηκε. Υπάρχει τουλάχιστον ένας πελάτης που έχει το πρότυπο ενεργοποιημένο.';
$wb['limit_mailmailinglist_txt'] = 'Μέγιστο πλήθος mailing lists';
$wb['limit_mailmailinglist_error_notint'] = 'Το πλήθος εγγραφών της mailing list πρέπει να είναι αριθμός.';
@@ -69,24 +70,24 @@
$wb['web_php_options_txt'] = 'Επιλογές PHP';
$wb['template_type_txt'] = 'Τύπος προτύπου';
$wb['template_name_txt'] = 'Όνομα προτύπου';
-$wb['limit_cgi_txt'] = 'Διάθεση CGI';
-$wb['limit_ssi_txt'] = 'Διάθεση SSI';
-$wb['limit_perl_txt'] = 'Διάθεση Perl';
-$wb['limit_ruby_txt'] = 'Διάθεση Ruby';
-$wb['limit_python_txt'] = 'Διάθεση Python';
-$wb['force_suexec_txt'] = 'Εξαναγκασμός SuEXEC';
-$wb['limit_hterror_txt'] = 'Διάθεση προσαρμοσμένων αρχείων σφάλματος';
+$wb['limit_cgi_txt'] = 'CGI available';
+$wb['limit_ssi_txt'] = 'SSI available';
+$wb['limit_perl_txt'] = 'Perl available';
+$wb['limit_ruby_txt'] = 'Ruby available';
+$wb['limit_python_txt'] = 'Python available';
+$wb['force_suexec_txt'] = 'SuEXEC forced';
+$wb['limit_hterror_txt'] = 'Custom error docs available';
$wb['limit_wildcard_txt'] = 'Wildcard subdomain available';
-$wb['limit_ssl_txt'] = 'Διαθέσιμο SSL';
-$wb['web_limits_txt'] = 'Όρια Web';
-$wb['email_limits_txt'] = 'Όρια Email';
-$wb['database_limits_txt'] = 'Όρια Βάσεων Δεδομένων';
-$wb['cron_job_limits_txt'] = 'Όρια εργασιών Cron';
-$wb['dns_limits_txt'] = 'Όρια DNS';
-$wb['virtualization_limits_txt'] = 'Όρια Virtualization';
-$wb['aps_limits_txt'] = 'Όρια APS Installer';
-$wb['limit_aps_txt'] = 'Μέγιστο πλήθος ενεργών APS';
-$wb['limit_aps_error_notint'] = 'Το μέγιστο πλήθος ενεργών APS πρέπει να είναι αριθμός.';
+$wb['limit_ssl_txt'] = 'SSL available';
+$wb['web_limits_txt'] = 'Web Limits';
+$wb['email_limits_txt'] = 'Email Limits';
+$wb['database_limits_txt'] = 'Database Limits';
+$wb['cron_job_limits_txt'] = 'Cron Job Limits';
+$wb['dns_limits_txt'] = 'DNS Limits';
+$wb['virtualization_limits_txt'] = 'Virtualization Limits';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
$wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
$wb['client_limits_txt'] = 'Client Limits';
?>
diff --git a/interface/web/client/lib/lang/el_clients_list.lng b/interface/web/client/lib/lang/el_clients_list.lng
index bda0870..56abc62 100644
--- a/interface/web/client/lib/lang/el_clients_list.lng
+++ b/interface/web/client/lib/lang/el_clients_list.lng
@@ -6,6 +6,6 @@
$wb['city_txt'] = 'Πόλη';
$wb['country_txt'] = 'Χώρα';
$wb['add_new_record_txt'] = 'Νέος Πελάτης';
-$wb['username_txt'] = 'Όνομα Χρήστη';
-$wb['customer_no_txt'] = 'Αρ. Πελάτη';
+$wb['username_txt'] = 'Username';
+$wb['customer_no_txt'] = 'Customer No.';
?>
diff --git a/interface/web/client/lib/lang/el_domain_list.lng b/interface/web/client/lib/lang/el_domain_list.lng
index b152f93..507f895 100644
--- a/interface/web/client/lib/lang/el_domain_list.lng
+++ b/interface/web/client/lib/lang/el_domain_list.lng
@@ -2,5 +2,5 @@
$wb['list_head_txt'] = 'Domains';
$wb['add_new_record_txt'] = 'Νέο Domain';
$wb['domain_txt'] = 'Domain';
-$wb['user_txt'] = 'Πελάτης';
+$wb['user_txt'] = 'Client';
?>
diff --git a/interface/web/client/lib/lang/el_reseller.lng b/interface/web/client/lib/lang/el_reseller.lng
index f89efa5..eec08b7 100644
--- a/interface/web/client/lib/lang/el_reseller.lng
+++ b/interface/web/client/lib/lang/el_reseller.lng
@@ -16,7 +16,7 @@
$wb['contact_name_txt'] = 'Πρόσωπο Επικοινωνίας';
$wb['username_txt'] = 'Όνομα Χρήστη';
$wb['password_txt'] = 'Συνθηματικό';
-$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού';
+$wb['password_strength_txt'] = 'Δύναμη Συνθηματικού';
$wb['language_txt'] = 'Γλώσσα';
$wb['usertheme_txt'] = 'Θεματική Παραλλαγή';
$wb['street_txt'] = 'Οδός';
@@ -91,13 +91,14 @@
$wb['limit_client_error'] = 'Έχετε φτάσει το μέγιστο πλήθος πελατών.';
$wb['limit_client_error_positive'] = 'Το πλήθος πελατών πρέπει να είναι > 0';
$wb['limit_web_quota_txt'] = 'Όριο χώρου Web';
-$wb['limit_traffic_quota_txt'] = 'Όριο μεταφοράς δεδομένων';
+$wb['limit_traffic_quota_txt'] = 'Όριο ταχύτητας';
$wb['limit_trafficquota_error_notint'] = 'Το Όριο ταχύτητας πρέπει να είναι αριθμός.';
$wb['customer_no_txt'] = 'Α/Α Πελάτη';
$wb['vat_id_txt'] = 'Α.Φ.Μ.';
$wb['required_fields_txt'] = '* Υποχρεωτικά Πεδία';
$wb['limit_webdav_user_txt'] = 'Μέγιστο πλήθος χρηστών Webdav';
$wb['limit_webdav_user_error_notint'] = 'Το όριο χρηστών webdav user πρέπει να είναι αριθμός.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_mailmailinglist_txt'] = 'Μέγιστο πλήθος mailing lists';
$wb['limit_mailaliasdomain_txt'] = 'Μέγιστο πλήθος ψευδονύμων domain';
$wb['limit_mailmailinglist_error_notint'] = 'Το πλήθος εγγραφών της mailing list πρέπει να είναι αριθμός.';
@@ -109,39 +110,39 @@
$wb['username_error_collision'] = 'The username may not start with the word -web- or -web- followed by a number.';
$wb['add_additional_template_txt'] = 'Add additional template';
$wb['delete_additional_template_txt'] = 'Delete additional template';
-$wb['limit_cgi_txt'] = 'Διαθέσιμο CGI';
-$wb['limit_ssi_txt'] = 'Διαθέσιμο SSI';
-$wb['limit_perl_txt'] = 'Διαθέσιμη Perl';
-$wb['limit_ruby_txt'] = 'Διαθέσιμη Ruby';
-$wb['limit_python_txt'] = 'Διαθέσιμη Python';
-$wb['force_suexec_txt'] = 'Εξαναγκασμός SuEXEC';
-$wb['limit_hterror_txt'] = 'Διαθέσιμα έγγραφα προσαρμοσμένων μηνυμάτων σφάλματος';
+$wb['limit_cgi_txt'] = 'CGI available';
+$wb['limit_ssi_txt'] = 'SSI available';
+$wb['limit_perl_txt'] = 'Perl available';
+$wb['limit_ruby_txt'] = 'Ruby available';
+$wb['limit_python_txt'] = 'Python available';
+$wb['force_suexec_txt'] = 'SuEXEC forced';
+$wb['limit_hterror_txt'] = 'Custom error docs available';
$wb['limit_wildcard_txt'] = 'Wildcard subdomain available';
$wb['limit_ssl_txt'] = 'SSL available';
-$wb['web_limits_txt'] = 'Όρια Web';
-$wb['email_limits_txt'] = 'Όρια Email';
-$wb['database_limits_txt'] = 'Όρια Βάσεων Δεδομένων';
-$wb['cron_job_limits_txt'] = 'Όρια Εργασιών Cron';
-$wb['dns_limits_txt'] = 'Όρια DNS';
-$wb['virtualization_limits_txt'] = 'Όρια Virtualization';
-$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού';
-$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού';
-$wb['password_mismatch_txt'] = 'Τα συνθηματικά δεν ταιριάζουν.';
-$wb['password_match_txt'] = 'Τα συνθηματικά ταιριάζουν.';
-$wb['email_error_isemail'] = 'Παρακαλούμε εισάγετε έγκυρη διεύθυνση email.';
-$wb['customer_no_error_unique'] = 'Ο κωδικός πελάτη πρέπει να είναι μοναδικός (ή άδειος).';
-$wb['paypal_email_error_isemail'] = 'Παρακαλούμε εισάγετε έγκυρη διεύθυνση email PayPal.';
+$wb['web_limits_txt'] = 'Web Limits';
+$wb['email_limits_txt'] = 'Email Limits';
+$wb['database_limits_txt'] = 'Database Limits';
+$wb['cron_job_limits_txt'] = 'Cron Job Limits';
+$wb['dns_limits_txt'] = 'DNS Limits';
+$wb['virtualization_limits_txt'] = 'Virtualization Limits';
+$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['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
+$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
$wb['company_id_txt'] = 'Company/Entrepreneur ID';
-$wb['bank_account_number_txt'] = 'Αριθμός Τραπεζικού Λογαριασμού.';
-$wb['bank_account_owner_txt'] = 'Ιδιοκτήτης Λογαριασμού Τράπεζας';
-$wb['bank_code_txt'] = 'Κωδικός Τράπεζας';
-$wb['bank_name_txt'] = 'Όνομα Τράπεζας';
+$wb['bank_account_number_txt'] = 'Bank account no.';
+$wb['bank_account_owner_txt'] = 'Bank account owner';
+$wb['bank_code_txt'] = 'Bank code';
+$wb['bank_name_txt'] = 'Bank name';
$wb['bank_account_iban_txt'] = 'IBAN';
-$wb['bank_account_swift_txt'] = 'BIC/Swift';
-$wb['aps_limits_txt'] = 'Όρια Εγκαταστάτη APS';
-$wb['limit_aps_txt'] = 'Μέγιστο πλήθος ενεργών APS';
-$wb['limit_aps_error_notint'] = 'Το μέγιστο πλήθος ενεργών APS πρέπει να είναι αριθμός.';
+$wb['bank_account_swift_txt'] = 'BIC / Swift';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
$wb['locked_txt'] = 'Locked';
$wb['canceled_txt'] = 'Canceled';
@@ -157,5 +158,5 @@
$wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
$wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
$wb['client_limits_txt'] = 'Client Limits';
-$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \"custom\" is selected.';
?>
diff --git a/interface/web/client/lib/lang/el_resellers_list.lng b/interface/web/client/lib/lang/el_resellers_list.lng
index 73e3527..74edc05 100644
--- a/interface/web/client/lib/lang/el_resellers_list.lng
+++ b/interface/web/client/lib/lang/el_resellers_list.lng
@@ -6,6 +6,6 @@
$wb['city_txt'] = 'Πόλη';
$wb['country_txt'] = 'Χώρα';
$wb['add_new_record_txt'] = 'Νεός Μεταπωλητής';
-$wb['customer_no_txt'] = 'Αρ. Πελάτη';
-$wb['username_txt'] = 'Όνομα χρήστη';
+$wb['customer_no_txt'] = 'Customer No.';
+$wb['username_txt'] = 'Username';
?>
diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng
index 7e8dd65..c94ab12 100644
--- a/interface/web/client/lib/lang/en_client.lng
+++ b/interface/web/client/lib/lang/en_client.lng
@@ -59,6 +59,7 @@
$wb["limit_dns_record_txt"] = 'Max. number DNS records';
$wb["limit_shell_user_txt"] = 'Max. number of Shell users';
$wb["limit_webdav_user_txt"] = 'Max. number of Webdav users';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb["limit_client_txt"] = 'Max. number of Clients';
$wb["username_error_empty"] = 'Username is empty.';
$wb["username_error_unique"] = 'The username must be unique.';
diff --git a/interface/web/client/lib/lang/en_client_template.lng b/interface/web/client/lib/lang/en_client_template.lng
index 3c6691d..5d8c3f3 100644
--- a/interface/web/client/lib/lang/en_client_template.lng
+++ b/interface/web/client/lib/lang/en_client_template.lng
@@ -32,6 +32,7 @@
$wb["limit_dns_record_txt"] = 'Max. number DNS records';
$wb["limit_shell_user_txt"] = 'Max. number of Shell users';
$wb["limit_webdav_user_txt"] = 'Max. number of Webdav users';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb["limit_client_txt"] = 'Max. number of Clients';
$wb["limit_maildomain_error_notint"] = 'The email domain limit must be a number.';
$wb["limit_mailmailinglist_error_notint"] = 'The mailing list record limit must be a number.';
diff --git a/interface/web/client/lib/lang/en_reseller.lng b/interface/web/client/lib/lang/en_reseller.lng
index 3b478e4..6291c0b 100644
--- a/interface/web/client/lib/lang/en_reseller.lng
+++ b/interface/web/client/lib/lang/en_reseller.lng
@@ -59,6 +59,7 @@
$wb["limit_dns_record_txt"] = 'Max. number DNS records';
$wb["limit_shell_user_txt"] = 'Max. number of Shell users';
$wb["limit_webdav_user_txt"] = 'Max. number of Webdav users';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb["limit_client_txt"] = 'Max. number of Clients';
$wb["username_error_empty"] = 'Username is empty.';
$wb["username_error_unique"] = 'The username must be unique.';
diff --git a/interface/web/client/lib/lang/es_client.lng b/interface/web/client/lib/lang/es_client.lng
index 4a4acfe..c17dd30 100644
--- a/interface/web/client/lib/lang/es_client.lng
+++ b/interface/web/client/lib/lang/es_client.lng
@@ -97,6 +97,7 @@
$wb['limit_trafficquota_error_notint'] = 'Cuota Tráfico debe ser un número.';
$wb['limit_webdav_user_txt'] = 'Numero máximo de usuarios Webdav';
$wb['limit_webdav_user_error_notint'] = 'El límite de usuarios Webdav debe ser un número.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['customer_no_txt'] = 'Número Cliente';
$wb['vat_id_txt'] = 'VAT ID';
$wb['required_fields_txt'] = '* Campos Requeridos';
diff --git a/interface/web/client/lib/lang/es_client_template.lng b/interface/web/client/lib/lang/es_client_template.lng
index ebd6974..7dc88be 100644
--- a/interface/web/client/lib/lang/es_client_template.lng
+++ b/interface/web/client/lib/lang/es_client_template.lng
@@ -60,6 +60,7 @@
$wb['template_del_aborted_txt'] = 'Eliminación abortada. Hay un cliente que tiene esta plantilla seleccionada.';
$wb['limit_webdav_user_txt'] = 'Número máximo de usuarios Webdav';
$wb['limit_webdav_user_error_notint'] = 'La lista de correo límite de registro debe ser un número.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_mailmailinglist_txt'] = 'Max. número de listas de correo';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
$wb['limit_openvz_vm_txt'] = 'Max. número de servidores virtuales';
diff --git a/interface/web/client/lib/lang/es_reseller.lng b/interface/web/client/lib/lang/es_reseller.lng
index 0d1dd75..5c38086 100644
--- a/interface/web/client/lib/lang/es_reseller.lng
+++ b/interface/web/client/lib/lang/es_reseller.lng
@@ -99,6 +99,7 @@
$wb['required_fields_txt'] = '* Campos Requeridos';
$wb['limit_webdav_user_txt'] = 'Numero máximo de usuarios Webdav';
$wb['limit_webdav_user_error_notint'] = 'El límite de usuarios Webdav debe ser un número.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['company_txt'] = 'Compañia';
$wb['limit_mailmailinglist_error_notint'] = 'La lista de correo límite de registro debe ser un número.';
$wb['limit_openvz_vm_txt'] = 'Max. número de servidores virtuales';
diff --git a/interface/web/client/lib/lang/fi_client.lng b/interface/web/client/lib/lang/fi_client.lng
index b428c63..f4b5dfa 100755
--- a/interface/web/client/lib/lang/fi_client.lng
+++ b/interface/web/client/lib/lang/fi_client.lng
@@ -95,6 +95,7 @@
$wb['limit_trafficquota_error_notint'] = 'Liikennerajan pitää olle numeerinen.';
$wb['limit_webdav_user_txt'] = 'Webdav-käyttäjien enimmäismäärä';
$wb['limit_webdav_user_error_notint'] = 'Webdav-käyttäjien rajan pitää olla numeerinen.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['customer_no_txt'] = 'Customer No.';
$wb['vat_id_txt'] = 'VAT ID';
$wb['required_fields_txt'] = '* Required fields';
diff --git a/interface/web/client/lib/lang/fi_client_template.lng b/interface/web/client/lib/lang/fi_client_template.lng
index 050b82e..5a55688 100755
--- a/interface/web/client/lib/lang/fi_client_template.lng
+++ b/interface/web/client/lib/lang/fi_client_template.lng
@@ -60,6 +60,7 @@
$wb['template_del_aborted_txt'] = 'Poistaminen keskeytetty. Jollakin asiakkaalla on tämä malli valittuna.';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
diff --git a/interface/web/client/lib/lang/fi_reseller.lng b/interface/web/client/lib/lang/fi_reseller.lng
index 4e05c97..fb5d968 100644
--- a/interface/web/client/lib/lang/fi_reseller.lng
+++ b/interface/web/client/lib/lang/fi_reseller.lng
@@ -98,6 +98,7 @@
$wb['required_fields_txt'] = '* Required fields';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
$wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
diff --git a/interface/web/client/lib/lang/fr.lng b/interface/web/client/lib/lang/fr.lng
index 02d06df..dba251c 100644
--- a/interface/web/client/lib/lang/fr.lng
+++ b/interface/web/client/lib/lang/fr.lng
@@ -5,22 +5,22 @@
$wb['Add Client'] = 'Ajouter un Client';
$wb['Edit Client'] = 'Editer un Client';
$wb['Clients'] = 'Clients';
-$wb['Templates'] = 'Templates';
-$wb['Limit-Templates'] = 'Limit-Templates';
$wb['Add Reseller'] = 'Ajouter un Revendeur';
$wb['Edit Reseller'] = 'Editer un Revendeur';
$wb['Resellers'] = 'Revendeurs';
$wb['error_has_clients'] = 'Ce revendeur a des clients. Effacez dabord les clients de ce revendeur.';
-$wb['add_additional_template_txt'] = 'Add additional template';
-$wb['delete_additional_template_txt'] = 'Delete additional template';
-$wb['Messaging'] = 'Messaging';
-$wb['Send email'] = 'Send Email';
-$wb['Edit Client Circle'] = 'Edit Client Circle';
-$wb['Domains'] = 'Domains';
-$wb['domain_txt'] = 'Domain';
+$wb['add_additional_template_txt'] = 'Ajouter un modèle';
+$wb['delete_additional_template_txt'] = 'Supprimer un modèle';
+$wb['Messaging'] = 'Messagerie';
+$wb['Send email'] = 'Envoyer un email';
+$wb['Edit Client Circle'] = 'Editer les groupes clients';
+$wb['Domains'] = 'Domaines';
+$wb['domain_txt'] = 'Domaine';
$wb['client_txt'] = 'Client';
-$wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is in use as mail-domain';
-$wb['error_domain_in webuse'] = 'This domain cannot be deleted, because it is in use as web-domain';
-$wb['error_client_can_not_add_domain'] = 'You cannot add a new domain';
-$wb['error_client_group_id_empty'] = 'You have to select a customer<br>';
+$wb['error_domain_in mailuse'] = 'Ce domaine ne peut pas être supprimé, il est utilisé par un compte email';
+$wb['error_domain_in webuse'] = 'Ce domaine ne peut pas être supprimé, il est utilisé par un site Web';
+$wb['error_client_can_not_add_domain'] = 'Vous ne pouvez pas ajouter de nouveau domaine';
+$wb['error_client_group_id_empty'] = 'Vous devez sélectionner un client<br>';
+$wb['Templates'] = 'Templates';
+$wb['Limit-Templates'] = 'Limit-Templates';
?>
diff --git a/interface/web/client/lib/lang/fr_client.lng b/interface/web/client/lib/lang/fr_client.lng
index 9a8f42a..ffb062d 100644
--- a/interface/web/client/lib/lang/fr_client.lng
+++ b/interface/web/client/lib/lang/fr_client.lng
@@ -91,6 +91,7 @@
$wb['limit_webdav_user_txt'] = 'Nombre max d\'utilisateurs webdav';
$wb['limit_mailaliasdomain_error_notint'] = 'La limite d\'alias de domaine email doit être un nombre.';
$wb['limit_webdav_user_error_notint'] = 'La limite d\'utilisateurs webdav doit être un nombre.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_dns_slave_zone_error_notint'] = 'La limite de zones DNS secondaire doit être un nombre.';
$wb['limit_web_quota_txt'] = 'Quota web';
$wb['limit_traffic_quota_txt'] = 'Quota de trafic';
@@ -98,52 +99,52 @@
$wb['customer_no_txt'] = 'No. Client';
$wb['vat_id_txt'] = 'Numéro de TVA';
$wb['required_fields_txt'] = '* Champs requis';
-$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
-$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
-$wb['company_id_txt'] = 'Company/Entrepreneur ID';
-$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
-$wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template';
-$wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.';
-$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.';
-$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.';
-$wb['username_error_collision'] = 'The username may not start with the word -web- or -web- followed by a number.';
-$wb['add_additional_template_txt'] = 'Add additional template';
-$wb['delete_additional_template_txt'] = 'Delete additional template';
-$wb['limit_cgi_txt'] = 'CGI available';
-$wb['limit_ssi_txt'] = 'SSI available';
-$wb['limit_perl_txt'] = 'Perl available';
-$wb['limit_ruby_txt'] = 'Ruby available';
-$wb['limit_python_txt'] = 'Python available';
-$wb['force_suexec_txt'] = 'SuEXEC forced';
-$wb['limit_hterror_txt'] = 'Custom error docs available';
-$wb['limit_wildcard_txt'] = 'Wildcard subdomain available';
-$wb['limit_ssl_txt'] = 'SSL available';
-$wb['bank_account_number_txt'] = 'Bank account no.';
-$wb['bank_code_txt'] = 'Bank code';
-$wb['bank_name_txt'] = 'Bank name';
+$wb['limit_mailmailinglist_txt'] = 'Nombre max de listes d\'email.';
+$wb['limit_mailmailinglist_error_notint'] = 'La limite de listes d\'email doit être un nombre';
+$wb['company_id_txt'] = 'ID Entreprise/Dirigeant';
+$wb['limit_openvz_vm_txt'] = 'Nombre max de serveurs virtuels.';
+$wb['limit_openvz_vm_template_id_txt'] = 'Forcer le modèle de serveur virtuel.';
+$wb['limit_openvz_vm_error_notint'] = 'La limite de serveurs virtuels doit être un nombre.';
+$wb['web_php_options_notempty'] = 'Aucune option PHP choisie. Sélectonnez au moins une option PHP.';
+$wb['ssh_chroot_notempty'] = 'Aucune option SSH chroot choisie. Sélectionnez au moins une option SSH.';
+$wb['username_error_collision'] = 'Le nom d\'utilisateur ne peut pas commencer par -web- ou -web- followed suivi d\'un nombre.';
+$wb['add_additional_template_txt'] = 'Ajouter un modèle';
+$wb['delete_additional_template_txt'] = 'Supprimer un modèle';
+$wb['limit_cgi_txt'] = 'CGI autorisé';
+$wb['limit_ssi_txt'] = 'SSI autorisé';
+$wb['limit_perl_txt'] = 'Perl autorisé';
+$wb['limit_ruby_txt'] = 'Ruby autorisé';
+$wb['limit_python_txt'] = 'Python autorisé';
+$wb['force_suexec_txt'] = 'Forcer le SuEXEC';
+$wb['limit_hterror_txt'] = 'Documents d\'erreurs personnalisés autorisés';
+$wb['limit_wildcard_txt'] = 'Sous-domaine joker autorisé';
+$wb['limit_ssl_txt'] = 'SSL autorisé';
+$wb['bank_account_number_txt'] = 'Numéro de compte bancaire';
+$wb['bank_code_txt'] = 'Code banque';
+$wb['bank_name_txt'] = 'Nom de la banque';
$wb['bank_account_iban_txt'] = 'IBAN';
$wb['bank_account_swift_txt'] = 'BIC / Swift';
-$wb['web_limits_txt'] = 'Web Limits';
-$wb['email_limits_txt'] = 'Email Limits';
-$wb['database_limits_txt'] = 'Database Limits';
-$wb['cron_job_limits_txt'] = 'Cron Job Limits';
-$wb['dns_limits_txt'] = 'DNS Limits';
-$wb['virtualization_limits_txt'] = 'Virtualization Limits';
-$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['active_template_additional_txt'] = 'Active Addons';
-$wb['bank_account_owner_txt'] = 'Bank account owner';
-$wb['email_error_isemail'] = 'Please enter a valid email address.';
-$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
-$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
-$wb['paypal_email_txt'] = 'PayPal Email';
-$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
-$wb['aps_limits_txt'] = 'APS Installer Limits';
-$wb['limit_aps_txt'] = 'Max. number of APS instances';
-$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
-$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['web_limits_txt'] = 'Limites Web';
+$wb['email_limits_txt'] = 'Limites d\'emails';
+$wb['database_limits_txt'] = 'Limite de bases de données';
+$wb['cron_job_limits_txt'] = 'Limites de tâches CRON';
+$wb['dns_limits_txt'] = 'Limites DNS';
+$wb['virtualization_limits_txt'] = 'Limites de virtualisation';
+$wb['generate_password_txt'] = 'Genérer un mot de passe';
+$wb['repeat_password_txt'] = 'Vérification du mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
+$wb['active_template_additional_txt'] = 'Addons actifs';
+$wb['bank_account_owner_txt'] = 'Titulaire du compte bancaire';
+$wb['email_error_isemail'] = 'Saisissez une adresse email valide.';
+$wb['customer_no_error_unique'] = 'Le numéro client doit être unique (ou vide).';
+$wb['paypal_email_error_isemail'] = 'Saisissez un compte Paypal valide.';
+$wb['paypal_email_txt'] = 'Compte Paypal';
+$wb['err_msg_master_tpl_set'] = 'Les paramètres de limites personnalisés seront ignorés si un modèle maître autre que \"custom\" est sélectionné.';
+$wb['aps_limits_txt'] = 'Nombre max d\'Installeur APS';
+$wb['limit_aps_txt'] = 'Nombre max d\'instances APS';
+$wb['limit_aps_error_notint'] = 'La limite d\'instances APS doit être un nombre';
+$wb['default_slave_dnsserver_txt'] = 'Serveur DNS secondaire par défaut';
$wb['locked_txt'] = 'Locked (disables all webs etc.)';
$wb['canceled_txt'] = 'Canceled (disables client login)';
$wb['gender_txt'] = 'Title';
diff --git a/interface/web/client/lib/lang/fr_client_circle.lng b/interface/web/client/lib/lang/fr_client_circle.lng
index f98a144..75288e6 100644
--- a/interface/web/client/lib/lang/fr_client_circle.lng
+++ b/interface/web/client/lib/lang/fr_client_circle.lng
@@ -1,9 +1,9 @@
<?php
-$wb['Client Circle'] = 'Client Circle';
-$wb['Circle'] = 'Circle';
-$wb['circle_txt'] = 'Circle';
-$wb['circle_name_txt'] = 'Circle Name';
-$wb['client_ids_txt'] = 'Clients/Resellers';
+$wb['Client Circle'] = 'Groupe client';
+$wb['Circle'] = 'Groupe';
+$wb['circle_txt'] = 'Groupe';
+$wb['circle_name_txt'] = 'Nom du groupe';
+$wb['client_ids_txt'] = 'Clients/Revendeurs';
$wb['description_txt'] = 'Description';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Actif';
?>
diff --git a/interface/web/client/lib/lang/fr_client_circle_list.lng b/interface/web/client/lib/lang/fr_client_circle_list.lng
index 00fd0b3..0db291a 100644
--- a/interface/web/client/lib/lang/fr_client_circle_list.lng
+++ b/interface/web/client/lib/lang/fr_client_circle_list.lng
@@ -1,10 +1,10 @@
<?php
-$wb['list_head_txt'] = 'Client Circles';
-$wb['circle_id_txt'] = 'Circle ID';
-$wb['circle_name_txt'] = 'Circle Name';
+$wb['list_head_txt'] = 'Groupes clients';
+$wb['circle_id_txt'] = 'ID du groupe';
+$wb['circle_name_txt'] = 'Nom du groupe';
$wb['description_txt'] = 'Description';
-$wb['add_new_record_txt'] = 'Add new circle';
-$wb['filter_txt'] = 'Filter';
-$wb['delete_txt'] = 'Delete';
-$wb['active_txt'] = 'Active';
+$wb['add_new_record_txt'] = 'Ajouter un nouveau groupe';
+$wb['filter_txt'] = 'Filtrer';
+$wb['delete_txt'] = 'Supprimer';
+$wb['active_txt'] = 'Actif';
?>
diff --git a/interface/web/client/lib/lang/fr_client_del.lng b/interface/web/client/lib/lang/fr_client_del.lng
index de7757a..2ec2d87 100644
--- a/interface/web/client/lib/lang/fr_client_del.lng
+++ b/interface/web/client/lib/lang/fr_client_del.lng
@@ -1,7 +1,7 @@
<?php
-$wb['confirm_action_txt'] = 'Confirmer laction';
+$wb['confirm_action_txt'] = 'Confirmer l\'action';
$wb['delete_explanation'] = 'Cette action va supprimer le nombre d\'enregistrements suivants associés avec le client';
$wb['btn_save_txt'] = 'Effacer le client';
$wb['btn_cancel_txt'] = 'Annuler sans effacer le client';
-$wb['confirm_client_delete_txt'] = 'Are you sure you want to delete this client?';
+$wb['confirm_client_delete_txt'] = 'Confirmez-vous la suppression de ce client ?';
?>
diff --git a/interface/web/client/lib/lang/fr_client_message.lng b/interface/web/client/lib/lang/fr_client_message.lng
index 6b2a872..7ba9a66 100644
--- a/interface/web/client/lib/lang/fr_client_message.lng
+++ b/interface/web/client/lib/lang/fr_client_message.lng
@@ -1,20 +1,20 @@
<?php
-$wb['btn_send_txt'] = 'Send email';
-$wb['btn_cancel_txt'] = 'Cancel';
-$wb['sender_txt'] = 'Sender email address';
-$wb['subject_txt'] = 'Subject';
+$wb['btn_send_txt'] = 'Envoyer';
+$wb['btn_cancel_txt'] = 'Annuler';
+$wb['sender_txt'] = 'Adresse email de l\'expéditeur';
+$wb['subject_txt'] = 'Objet';
$wb['message_txt'] = 'Message';
-$wb['form_legend_client_txt'] = 'Send email message to all clients.';
-$wb['form_legend_admin_txt'] = 'Send email message to all clients and resellers.';
-$wb['sender_invalid_error'] = 'Sender email invalid.';
-$wb['subject_invalid_error'] = 'Subject is empty.';
-$wb['message_invalid_error'] = 'Message is empty.';
-$wb['email_sent_to_txt'] = 'Email sent to:';
-$wb['page_head_txt'] = 'Send customer information';
-$wb['recipient_txt'] = 'Recipient';
-$wb['all_clients_resellers_txt'] = 'All clients and resellers';
-$wb['all_clients_txt'] = 'All clients';
-$wb['variables_txt'] = 'Variables:';
+$wb['form_legend_client_txt'] = 'Envoyer l\'email à tous les clients';
+$wb['form_legend_admin_txt'] = 'Envoyer l\'email à tous les clients et revendeurs';
+$wb['sender_invalid_error'] = 'Adresse d\'expédition invalide.';
+$wb['subject_invalid_error'] = 'L\'objet est vide.';
+$wb['message_invalid_error'] = 'Le message est vide.';
+$wb['email_sent_to_txt'] = 'Email envoyé à :';
+$wb['page_head_txt'] = 'Envoyer les informations client';
+$wb['recipient_txt'] = 'Destinataire';
+$wb['all_clients_resellers_txt'] = 'Tous les clients et revendeurs';
+$wb['all_clients_txt'] = 'Tous les clients';
+$wb['variables_txt'] = 'Variables :';
$wb['gender_m_txt'] = 'Mr.';
$wb['gender_f_txt'] = 'Ms.';
?>
diff --git a/interface/web/client/lib/lang/fr_client_template.lng b/interface/web/client/lib/lang/fr_client_template.lng
index 55f8b6a..429941c 100644
--- a/interface/web/client/lib/lang/fr_client_template.lng
+++ b/interface/web/client/lib/lang/fr_client_template.lng
@@ -54,39 +54,40 @@
$wb['limit_webdav_user_txt'] = 'Nombre max. d\'utilisateurs Webdav';
$wb['limit_mailaliasdomain_error_notint'] = 'La limite d\'alias de domaine doit être un nombre.';
$wb['limit_webdav_user_error_notint'] = 'La limite d\'utilisateurs webdav doit être un nombre.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_dns_slave_zone_error_notint'] = 'La limite de zones DNS secondaires doit être un nombre.';
$wb['limit_dns_record_error_notint'] = 'Le nombre d\'enregistrements DNS limite doit être un nombre.';
$wb['limit_web_quota_txt'] = 'Quota web';
$wb['limit_traffic_quota_txt'] = 'Quota de trafic';
$wb['limit_trafficquota_error_notint'] = 'le quota de trafic doit être un nombre.';
$wb['template_del_aborted_txt'] = 'Supression annulée. Il y a toujours un client qui a ce gabarit sélectionné.';
-$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
-$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
-$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
-$wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template';
-$wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.';
-$wb['ssh_chroot_txt'] = 'SSH-Chroot Options';
-$wb['web_php_options_txt'] = 'PHP Options';
-$wb['template_type_txt'] = 'Template type';
-$wb['template_name_txt'] = 'Template name';
-$wb['limit_cgi_txt'] = 'CGI available';
-$wb['limit_ssi_txt'] = 'SSI available';
-$wb['limit_perl_txt'] = 'Perl available';
-$wb['limit_ruby_txt'] = 'Ruby available';
-$wb['limit_python_txt'] = 'Python available';
-$wb['force_suexec_txt'] = 'SuEXEC forced';
-$wb['limit_hterror_txt'] = 'Custom error docs available';
-$wb['limit_wildcard_txt'] = 'Wildcard subdomain available';
-$wb['limit_ssl_txt'] = 'SSL available';
-$wb['web_limits_txt'] = 'Web Limits';
-$wb['email_limits_txt'] = 'Email Limits';
-$wb['database_limits_txt'] = 'Database Limits';
-$wb['cron_job_limits_txt'] = 'Cron Job Limits';
-$wb['dns_limits_txt'] = 'DNS Limits';
-$wb['virtualization_limits_txt'] = 'Virtualization Limits';
-$wb['aps_limits_txt'] = 'APS Installer Limits';
-$wb['limit_aps_txt'] = 'Max. number of APS instances';
-$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
+$wb['limit_mailmailinglist_txt'] = 'Nombre max de listes d\'emails';
+$wb['limit_mailmailinglist_error_notint'] = 'La limite de listes d\'emails doit être un nombre.';
+$wb['limit_openvz_vm_txt'] = 'Nombre max de serveurs virtuels';
+$wb['limit_openvz_vm_template_id_txt'] = 'Forcer le modèle de serveur virtuel';
+$wb['limit_openvz_vm_error_notint'] = 'La limite de serveurs virtuels doit être un nombre.';
+$wb['ssh_chroot_txt'] = 'Options SSH-Chroot';
+$wb['web_php_options_txt'] = 'Options PHP';
+$wb['template_type_txt'] = 'Modèle type';
+$wb['template_name_txt'] = 'Nom du modèle';
+$wb['limit_cgi_txt'] = 'CGI autorisé';
+$wb['limit_ssi_txt'] = 'SSI autorisé';
+$wb['limit_perl_txt'] = 'Perl autorisé';
+$wb['limit_ruby_txt'] = 'Ruby autorisé';
+$wb['limit_python_txt'] = 'Python autorisé';
+$wb['force_suexec_txt'] = 'Forcer le SuEXEC';
+$wb['limit_hterror_txt'] = 'Documents d\'erreurs personnalisés autorisés';
+$wb['limit_wildcard_txt'] = 'Sous-domaine joker autorisé';
+$wb['limit_ssl_txt'] = 'SSL autorisé';
+$wb['web_limits_txt'] = 'Limite Web';
+$wb['email_limits_txt'] = 'Limite d\'emails';
+$wb['database_limits_txt'] = 'Limite de bases de données';
+$wb['cron_job_limits_txt'] = 'Limite de tâches CRON';
+$wb['dns_limits_txt'] = 'Limite DNS';
+$wb['virtualization_limits_txt'] = 'Limite de virtualisations';
+$wb['aps_limits_txt'] = 'Limite d\'installeurs APS';
+$wb['limit_aps_txt'] = 'Nombre max d\'instances APS';
+$wb['limit_aps_error_notint'] = 'La limite d\'instances APS doit être un nombre.';
$wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
$wb['client_limits_txt'] = 'Client Limits';
?>
diff --git a/interface/web/client/lib/lang/fr_client_template_list.lng b/interface/web/client/lib/lang/fr_client_template_list.lng
index 571b870..b531501 100644
--- a/interface/web/client/lib/lang/fr_client_template_list.lng
+++ b/interface/web/client/lib/lang/fr_client_template_list.lng
@@ -2,5 +2,5 @@
$wb['list_head_txt'] = 'Modèles de clients';
$wb['template_type_txt'] = 'Type';
$wb['template_name_txt'] = 'Nom du modèle';
-$wb['template_id_txt'] = 'Template ID';
+$wb['template_id_txt'] = 'ID du modèle';
?>
diff --git a/interface/web/client/lib/lang/fr_clients_list.lng b/interface/web/client/lib/lang/fr_clients_list.lng
index 5252bc5..e3503f3 100644
--- a/interface/web/client/lib/lang/fr_clients_list.lng
+++ b/interface/web/client/lib/lang/fr_clients_list.lng
@@ -6,6 +6,6 @@
$wb['city_txt'] = 'Ville';
$wb['country_txt'] = 'Pays';
$wb['add_new_record_txt'] = 'Ajouter un nouveau client';
-$wb['username_txt'] = 'Username';
-$wb['customer_no_txt'] = 'Customer No.';
+$wb['username_txt'] = 'Nom d\'utilisateur';
+$wb['customer_no_txt'] = 'Numéro client';
?>
diff --git a/interface/web/client/lib/lang/fr_domain.lng b/interface/web/client/lib/lang/fr_domain.lng
index 4465c83..f94d21b 100644
--- a/interface/web/client/lib/lang/fr_domain.lng
+++ b/interface/web/client/lib/lang/fr_domain.lng
@@ -1,6 +1,6 @@
<?php
$wb['domain_error_empty'] = 'Le nom de domaine est vide';
$wb['domain_error_unique'] = 'Ce nom de domaine existe déjà';
-$wb['domain_error_regex'] = 'Ce nom de domaine nest pas autorisé';
+$wb['domain_error_regex'] = 'Ce nom de domaine n\'est pas autorisé';
$wb['Domain'] = 'Domaine';
?>
diff --git a/interface/web/client/lib/lang/fr_reseller.lng b/interface/web/client/lib/lang/fr_reseller.lng
index c02f813..ac42cb8 100644
--- a/interface/web/client/lib/lang/fr_reseller.lng
+++ b/interface/web/client/lib/lang/fr_reseller.lng
@@ -17,7 +17,7 @@
$wb['username_txt'] = 'Nom d\'utilisateur';
$wb['password_txt'] = 'Mot de passe';
$wb['password_strength_txt'] = 'Force du mot de passe';
-$wb['language_txt'] = 'Langage';
+$wb['language_txt'] = 'Langue';
$wb['usertheme_txt'] = 'Thème';
$wb['street_txt'] = 'Rue';
$wb['zip_txt'] = 'Code Postal';
@@ -99,50 +99,50 @@
$wb['limit_mailaliasdomain_txt'] = 'Nombre max d\'alias de domaine';
$wb['limit_webdav_user_txt'] = 'Nombre max d\'utilisateurs Webdav';
$wb['limit_webdav_user_error_notint'] = 'La limite d\'utilisateurs Webdav doit être un nombre.';
-$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
-$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
-$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
-$wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template';
-$wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.';
-$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.';
-$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.';
-$wb['username_error_collision'] = 'The username may not start with the word -web- or -web- followed by a number.';
-$wb['add_additional_template_txt'] = 'Add additional template';
-$wb['delete_additional_template_txt'] = 'Delete additional template';
-$wb['limit_cgi_txt'] = 'CGI available';
-$wb['limit_ssi_txt'] = 'SSI available';
-$wb['limit_perl_txt'] = 'Perl available';
-$wb['limit_ruby_txt'] = 'Ruby available';
-$wb['limit_python_txt'] = 'Python available';
-$wb['force_suexec_txt'] = 'SuEXEC forced';
-$wb['limit_hterror_txt'] = 'Custom error docs available';
-$wb['limit_wildcard_txt'] = 'Wildcard subdomain available';
-$wb['limit_ssl_txt'] = 'SSL available';
-$wb['web_limits_txt'] = 'Web Limits';
-$wb['email_limits_txt'] = 'Email Limits';
-$wb['database_limits_txt'] = 'Database Limits';
-$wb['cron_job_limits_txt'] = 'Cron Job Limits';
-$wb['dns_limits_txt'] = 'DNS Limits';
-$wb['virtualization_limits_txt'] = 'Virtualization Limits';
-$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['email_error_isemail'] = 'Please enter a valid email address.';
-$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
-$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
-$wb['paypal_email_txt'] = 'PayPal Email';
-$wb['company_id_txt'] = 'Company/Entrepreneur ID';
-$wb['bank_account_number_txt'] = 'Bank account no.';
-$wb['bank_account_owner_txt'] = 'Bank account owner';
-$wb['bank_code_txt'] = 'Bank code';
-$wb['bank_name_txt'] = 'Bank name';
+$wb['limit_mailmailinglist_txt'] = 'Nombre max de listes d\'emails';
+$wb['limit_mailmailinglist_error_notint'] = 'La limite d\'enregistrement de liste d\'emails doit être un nombre.';
+$wb['limit_openvz_vm_txt'] = 'Nombre max de serveurs virtuels.';
+$wb['limit_openvz_vm_template_id_txt'] = 'Forcer le modèle de serveur virtuel.';
+$wb['limit_openvz_vm_error_notint'] = 'La limite de serveurs virtuels doit être un nombre.';
+$wb['web_php_options_notempty'] = 'Aucune option PHP choisie. Selectionnez au moins une option PHP.';
+$wb['ssh_chroot_notempty'] = 'Aucune option SSH chroot choisie. Selectionnez au moins une option SSH.';
+$wb['username_error_collision'] = 'Le nom d\'utilisateur ne devrait pas commencer par le mot -web- ou -web- suivi d\'un nombre.';
+$wb['add_additional_template_txt'] = 'Ajouter un modèle';
+$wb['delete_additional_template_txt'] = 'Supprimer un modèle';
+$wb['limit_cgi_txt'] = 'CGI autorisé';
+$wb['limit_ssi_txt'] = 'SSI autorisé';
+$wb['limit_perl_txt'] = 'Perl autorisé';
+$wb['limit_ruby_txt'] = 'Ruby autorisé';
+$wb['limit_python_txt'] = 'Python autorisé';
+$wb['force_suexec_txt'] = 'SuEXEC forcé';
+$wb['limit_hterror_txt'] = 'Documents d\'erreurs personnalisés autorisés';
+$wb['limit_wildcard_txt'] = 'Sous-domaine Joker autorisé';
+$wb['limit_ssl_txt'] = 'SSL autorisé';
+$wb['web_limits_txt'] = 'Limites Web';
+$wb['email_limits_txt'] = 'Limites emails';
+$wb['database_limits_txt'] = 'Limites de bases de données';
+$wb['cron_job_limits_txt'] = 'Limites de tâches CRON';
+$wb['dns_limits_txt'] = 'Limites DNS';
+$wb['virtualization_limits_txt'] = 'Limites de virtualisation';
+$wb['generate_password_txt'] = 'Générer un mot de passe';
+$wb['repeat_password_txt'] = 'Répétez le mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
+$wb['email_error_isemail'] = 'Saisissez une adresse email valide.';
+$wb['customer_no_error_unique'] = 'Le numéro de client doit être unique (ou vide).';
+$wb['paypal_email_error_isemail'] = 'Saisissez un compte Paypal valide.';
+$wb['paypal_email_txt'] = 'Compte Paypal';
+$wb['company_id_txt'] = 'ID entreprise/dirigeant';
+$wb['bank_account_number_txt'] = 'Numéro de compte bancaire';
+$wb['bank_account_owner_txt'] = 'Titulaire du compte bancaire';
+$wb['bank_code_txt'] = 'Code banque';
+$wb['bank_name_txt'] = 'Nom de la banque';
$wb['bank_account_iban_txt'] = 'IBAN';
$wb['bank_account_swift_txt'] = 'BIC / Swift';
-$wb['aps_limits_txt'] = 'APS Installer Limits';
-$wb['limit_aps_txt'] = 'Max. number of APS instances';
-$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
-$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['aps_limits_txt'] = 'Limites d\'installeur APS';
+$wb['limit_aps_txt'] = 'Nombre max d\'instances APS';
+$wb['limit_aps_error_notint'] = 'La limite d\'instances APS doit être un nombre.';
+$wb['default_slave_dnsserver_txt'] = 'Serveur DNS secondaire par défaut';
$wb['locked_txt'] = 'Locked';
$wb['canceled_txt'] = 'Canceled';
$wb['gender_m_txt'] = 'Mr.';
@@ -173,5 +173,5 @@
$wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
$wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
$wb['client_limits_txt'] = 'Client Limits';
-$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \"custom\" is selected.';
?>
diff --git a/interface/web/client/lib/lang/fr_resellers_list.lng b/interface/web/client/lib/lang/fr_resellers_list.lng
index 537600a..b477e47 100644
--- a/interface/web/client/lib/lang/fr_resellers_list.lng
+++ b/interface/web/client/lib/lang/fr_resellers_list.lng
@@ -1,11 +1,11 @@
<?php
-$wb['list_head_txt'] = 'Clients';
+$wb['list_head_txt'] = 'Revendeurs';
$wb['client_id_txt'] = 'ID';
$wb['company_name_txt'] = 'Nom de l\'entreprise';
$wb['contact_name_txt'] = 'Nom du contact';
$wb['city_txt'] = 'Ville';
$wb['country_txt'] = 'Pays';
-$wb['add_new_record_txt'] = 'Ajouter un nouveau client';
-$wb['customer_no_txt'] = 'Customer No.';
-$wb['username_txt'] = 'Username';
+$wb['add_new_record_txt'] = 'Ajouter un nouveau revendeur';
+$wb['customer_no_txt'] = 'Revendeur No.';
+$wb['username_txt'] = 'Nom d\'utilisateur';
?>
diff --git a/interface/web/client/lib/lang/hr_client.lng b/interface/web/client/lib/lang/hr_client.lng
index e1bbc10..66357a5 100644
--- a/interface/web/client/lib/lang/hr_client.lng
+++ b/interface/web/client/lib/lang/hr_client.lng
@@ -58,6 +58,7 @@
$wb['limit_dns_record_txt'] = 'Maksimalan broj DNS zapisa';
$wb['limit_shell_user_txt'] = 'Maksimalan broj Shell računa';
$wb['limit_webdav_user_txt'] = 'Maksimalan broj Webdav računa';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_client_txt'] = 'Maksimalan broj klijenata';
$wb['username_error_empty'] = 'Korisničko ime nije upisano.';
$wb['username_error_unique'] = 'Korisničko ime se već koristi.';
diff --git a/interface/web/client/lib/lang/hr_client_template.lng b/interface/web/client/lib/lang/hr_client_template.lng
index b631e51..a9b22aa 100644
--- a/interface/web/client/lib/lang/hr_client_template.lng
+++ b/interface/web/client/lib/lang/hr_client_template.lng
@@ -29,6 +29,7 @@
$wb['limit_dns_record_txt'] = 'Maksimalan broj DNS zapisa';
$wb['limit_shell_user_txt'] = 'Maksimalan broj Shell računa';
$wb['limit_webdav_user_txt'] = 'Maksimalan broj Webdav računa';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_client_txt'] = 'Maksimalan broj klijenata';
$wb['limit_maildomain_error_notint'] = 'Limit email domena mora biti znamenka.';
$wb['limit_mailbox_error_notint'] = 'Limit mailboxeva mora biti znamenka.';
diff --git a/interface/web/client/lib/lang/hr_reseller.lng b/interface/web/client/lib/lang/hr_reseller.lng
index 319c2a5..277f34a 100644
--- a/interface/web/client/lib/lang/hr_reseller.lng
+++ b/interface/web/client/lib/lang/hr_reseller.lng
@@ -58,6 +58,7 @@
$wb['limit_dns_record_txt'] = 'Maksimalan broj DNS zapisa';
$wb['limit_shell_user_txt'] = 'Maksimalan broj Shell računa';
$wb['limit_webdav_user_txt'] = 'Maksimalan broj Webdav računa';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_client_txt'] = 'Maksimalan broj klijenata';
$wb['username_error_empty'] = 'Korisničko ime nije upisano.';
$wb['username_error_unique'] = 'Korisničko ime se već koristi.';
diff --git a/interface/web/client/lib/lang/hu_client.lng b/interface/web/client/lib/lang/hu_client.lng
index 5f27f72..91017a7 100644
--- a/interface/web/client/lib/lang/hu_client.lng
+++ b/interface/web/client/lib/lang/hu_client.lng
@@ -95,6 +95,7 @@
$wb['limit_trafficquota_error_notint'] = 'Traffic Quota must be a number.';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['customer_no_txt'] = 'Ügyfélszám';
$wb['vat_id_txt'] = 'VAT ID';
$wb['required_fields_txt'] = '* Kötelező mező';
diff --git a/interface/web/client/lib/lang/hu_client_template.lng b/interface/web/client/lib/lang/hu_client_template.lng
index 4b68a7f..aeeae7c 100644
--- a/interface/web/client/lib/lang/hu_client_template.lng
+++ b/interface/web/client/lib/lang/hu_client_template.lng
@@ -60,6 +60,7 @@
$wb['template_del_aborted_txt'] = 'Delete aborted. There is still a client which has this template selected.';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
diff --git a/interface/web/client/lib/lang/hu_reseller.lng b/interface/web/client/lib/lang/hu_reseller.lng
index 7db0d4e..f9c61a7 100644
--- a/interface/web/client/lib/lang/hu_reseller.lng
+++ b/interface/web/client/lib/lang/hu_reseller.lng
@@ -101,6 +101,7 @@
$wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
$wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template';
$wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.';
diff --git a/interface/web/client/lib/lang/id_client.lng b/interface/web/client/lib/lang/id_client.lng
index a5c9477..a72da01 100644
--- a/interface/web/client/lib/lang/id_client.lng
+++ b/interface/web/client/lib/lang/id_client.lng
@@ -94,6 +94,7 @@
$wb['limit_dns_slave_zone_txt'] = 'Jumlah maks zona DNS Sekunder';
$wb['limit_webdav_user_txt'] = 'Jumlah maks pengguna Webdav';
$wb['limit_webdav_user_error_notint'] = 'Batasan pengguna webdav harus berupa angka.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_dns_slave_zone_error_notint'] = 'Batasan zona slave dns harus berupa angka.';
$wb['customer_no_txt'] = 'No. Pelanggan';
$wb['vat_id_txt'] = 'VAT ID';
diff --git a/interface/web/client/lib/lang/id_client_template.lng b/interface/web/client/lib/lang/id_client_template.lng
index 960c573..452a2c7 100644
--- a/interface/web/client/lib/lang/id_client_template.lng
+++ b/interface/web/client/lib/lang/id_client_template.lng
@@ -58,6 +58,7 @@
$wb['limit_dns_slave_zone_txt'] = 'Jumlah maks zona DNS sekunder';
$wb['limit_webdav_user_txt'] = 'Jumlah maks pengguna Webdav';
$wb['limit_webdav_user_error_notint'] = 'Batasan pengguna webdav harus berupa angka.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_dns_slave_zone_error_notint'] = 'Batasan zona slave dns harus berupa angka.';
$wb['limit_dns_record_error_notint'] = 'Batasan record dns harus berupa angka.';
$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
diff --git a/interface/web/client/lib/lang/id_reseller.lng b/interface/web/client/lib/lang/id_reseller.lng
index 4214e3c..334212a 100644
--- a/interface/web/client/lib/lang/id_reseller.lng
+++ b/interface/web/client/lib/lang/id_reseller.lng
@@ -98,6 +98,7 @@
$wb['required_fields_txt'] = '* Kolom yang dibutuhkan';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
$wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
diff --git a/interface/web/client/lib/lang/it_client.lng b/interface/web/client/lib/lang/it_client.lng
index 6d8684f..4015170 100644
--- a/interface/web/client/lib/lang/it_client.lng
+++ b/interface/web/client/lib/lang/it_client.lng
@@ -95,6 +95,7 @@
$wb['limit_trafficquota_error_notint'] = 'Traffic Quota must be a number.';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['customer_no_txt'] = 'Customer No.';
$wb['vat_id_txt'] = 'P. IVA';
$wb['required_fields_txt'] = '* Required fields';
diff --git a/interface/web/client/lib/lang/it_client_template.lng b/interface/web/client/lib/lang/it_client_template.lng
index f51a0f7..ad167f6 100644
--- a/interface/web/client/lib/lang/it_client_template.lng
+++ b/interface/web/client/lib/lang/it_client_template.lng
@@ -60,6 +60,7 @@
$wb['template_del_aborted_txt'] = 'Eliminazione annullata. Esiste almeno un cliente che ha questo template attivo.';
$wb['limit_webdav_user_txt'] = 'Num. massimo utenti webdav';
$wb['limit_webdav_user_error_notint'] = 'Il limite utenti webdav devessere un numero.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['template_type_txt'] = 'Template type';
$wb['template_name_txt'] = 'Template name';
$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
diff --git a/interface/web/client/lib/lang/it_reseller.lng b/interface/web/client/lib/lang/it_reseller.lng
index 7fab36d..5269311 100644
--- a/interface/web/client/lib/lang/it_reseller.lng
+++ b/interface/web/client/lib/lang/it_reseller.lng
@@ -98,6 +98,7 @@
$wb['required_fields_txt'] = '* Required fields';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
$wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
diff --git a/interface/web/client/lib/lang/ja_client.lng b/interface/web/client/lib/lang/ja_client.lng
index 32de0b3..8189572 100644
--- a/interface/web/client/lib/lang/ja_client.lng
+++ b/interface/web/client/lib/lang/ja_client.lng
@@ -95,6 +95,7 @@
$wb['limit_trafficquota_error_notint'] = 'Traffic Quota must be a number.';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['customer_no_txt'] = 'Customer No.';
$wb['vat_id_txt'] = 'VAT ID';
$wb['required_fields_txt'] = '* Required fields';
diff --git a/interface/web/client/lib/lang/ja_client_template.lng b/interface/web/client/lib/lang/ja_client_template.lng
index 7a23165..1044e91 100644
--- a/interface/web/client/lib/lang/ja_client_template.lng
+++ b/interface/web/client/lib/lang/ja_client_template.lng
@@ -60,6 +60,7 @@
$wb['template_del_aborted_txt'] = 'Delete aborted. There is still a client which has this template selected.';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
diff --git a/interface/web/client/lib/lang/ja_reseller.lng b/interface/web/client/lib/lang/ja_reseller.lng
index ca3668b..b089126 100644
--- a/interface/web/client/lib/lang/ja_reseller.lng
+++ b/interface/web/client/lib/lang/ja_reseller.lng
@@ -98,6 +98,7 @@
$wb['required_fields_txt'] = '* Required fields';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
$wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
diff --git a/interface/web/client/lib/lang/nl_client.lng b/interface/web/client/lib/lang/nl_client.lng
index 00893c4..899a1f6 100644
--- a/interface/web/client/lib/lang/nl_client.lng
+++ b/interface/web/client/lib/lang/nl_client.lng
@@ -58,6 +58,7 @@
$wb['limit_dns_record_txt'] = 'Max. aantal DNS records';
$wb['limit_shell_user_txt'] = 'Max.aantal Shell users';
$wb['limit_webdav_user_txt'] = 'Max. aantal of Webdav users';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_client_txt'] = 'Max. aantal klanten';
$wb['username_error_empty'] = 'Gebruikersnaam is niet ingvuld.';
$wb['username_error_unique'] = 'De gebruikersnaam moet uniek zijn.';
diff --git a/interface/web/client/lib/lang/nl_client_template.lng b/interface/web/client/lib/lang/nl_client_template.lng
index 092b4a2..e3316be 100644
--- a/interface/web/client/lib/lang/nl_client_template.lng
+++ b/interface/web/client/lib/lang/nl_client_template.lng
@@ -29,6 +29,7 @@
$wb['limit_dns_record_txt'] = 'Max. aantal DNS records';
$wb['limit_shell_user_txt'] = 'Max. aantal Shell users';
$wb['limit_webdav_user_txt'] = 'Max. aantal Webdav users';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_client_txt'] = 'Max. aantal Clients';
$wb['limit_maildomain_error_notint'] = 'Het e-mail domein limiet moet een numerieke waarde zijn.';
$wb['limit_mailbox_error_notint'] = 'De mailbox limiet moet een numerieke waarde zijm.';
diff --git a/interface/web/client/lib/lang/nl_reseller.lng b/interface/web/client/lib/lang/nl_reseller.lng
index 425fedf..3a74771 100644
--- a/interface/web/client/lib/lang/nl_reseller.lng
+++ b/interface/web/client/lib/lang/nl_reseller.lng
@@ -98,6 +98,7 @@
$wb['required_fields_txt'] = '* Verplichte velden';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
$wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
diff --git a/interface/web/client/lib/lang/pl_client.lng b/interface/web/client/lib/lang/pl_client.lng
index 5d777b0..d870081 100644
--- a/interface/web/client/lib/lang/pl_client.lng
+++ b/interface/web/client/lib/lang/pl_client.lng
@@ -95,6 +95,7 @@
$wb['limit_trafficquota_error_notint'] = 'Limit transferu musi być liczbą.';
$wb['limit_webdav_user_txt'] = 'Maksymalna ilość użytkowników webdav';
$wb['limit_webdav_user_error_notint'] = 'Limit użytkowników webdav musi być liczbą.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['customer_no_txt'] = 'Klient nr';
$wb['vat_id_txt'] = 'NIP';
$wb['required_fields_txt'] = '* Wymagane pola';
diff --git a/interface/web/client/lib/lang/pl_client_template.lng b/interface/web/client/lib/lang/pl_client_template.lng
index 4dc2d7a..55e377d 100644
--- a/interface/web/client/lib/lang/pl_client_template.lng
+++ b/interface/web/client/lib/lang/pl_client_template.lng
@@ -60,6 +60,7 @@
$wb['template_del_aborted_txt'] = 'Usuwanie przerwane. Istnieje klient używający ciągle tego szablonu.';
$wb['limit_webdav_user_txt'] = 'Maksymalna ilość kont webdav';
$wb['limit_webdav_user_error_notint'] = 'Limit kont webdav musi być liczbą.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_mailmailinglist_txt'] = 'Maks. liczba list mailingowych';
$wb['limit_mailmailinglist_error_notint'] = 'Limit list mailingowych musi być liczbą';
$wb['limit_openvz_vm_txt'] = 'Maks. liczba wirtualnych serwerów';
diff --git a/interface/web/client/lib/lang/pl_reseller.lng b/interface/web/client/lib/lang/pl_reseller.lng
index 2a31336..03c47d7 100644
--- a/interface/web/client/lib/lang/pl_reseller.lng
+++ b/interface/web/client/lib/lang/pl_reseller.lng
@@ -98,6 +98,7 @@
$wb['required_fields_txt'] = '* Wymagane pola';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_mailmailinglist_txt'] = 'Maks. ilość list mailingowych';
$wb['limit_mailaliasdomain_txt'] = 'Maks. ilość aliasów domen e-mail';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
diff --git a/interface/web/client/lib/lang/pt_client.lng b/interface/web/client/lib/lang/pt_client.lng
index f505915..30e8571 100644
--- a/interface/web/client/lib/lang/pt_client.lng
+++ b/interface/web/client/lib/lang/pt_client.lng
@@ -95,6 +95,7 @@
$wb['limit_trafficquota_error_notint'] = 'A cota de tráfego precisa ser um número..';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['customer_no_txt'] = 'Customer No.';
$wb['vat_id_txt'] = 'VAT ID';
$wb['required_fields_txt'] = '* Required fields';
diff --git a/interface/web/client/lib/lang/pt_client_template.lng b/interface/web/client/lib/lang/pt_client_template.lng
index 6e902b2..e3d81ae 100644
--- a/interface/web/client/lib/lang/pt_client_template.lng
+++ b/interface/web/client/lib/lang/pt_client_template.lng
@@ -60,6 +60,7 @@
$wb['template_del_aborted_txt'] = 'Delete aborted. There is still a client which has this template selected.';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
diff --git a/interface/web/client/lib/lang/pt_reseller.lng b/interface/web/client/lib/lang/pt_reseller.lng
index 600033e..51a8bd8 100644
--- a/interface/web/client/lib/lang/pt_reseller.lng
+++ b/interface/web/client/lib/lang/pt_reseller.lng
@@ -98,6 +98,7 @@
$wb['required_fields_txt'] = '* Required fields';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
$wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
diff --git a/interface/web/client/lib/lang/ro_client.lng b/interface/web/client/lib/lang/ro_client.lng
index 372e29a..ec3138b 100644
--- a/interface/web/client/lib/lang/ro_client.lng
+++ b/interface/web/client/lib/lang/ro_client.lng
@@ -95,6 +95,7 @@
$wb['limit_trafficquota_error_notint'] = 'Traffic Quota must be a number.';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['customer_no_txt'] = 'Customer No.';
$wb['vat_id_txt'] = 'VAT ID';
$wb['required_fields_txt'] = '* Required fields';
diff --git a/interface/web/client/lib/lang/ro_client_template.lng b/interface/web/client/lib/lang/ro_client_template.lng
index a562b51..19338fe 100644
--- a/interface/web/client/lib/lang/ro_client_template.lng
+++ b/interface/web/client/lib/lang/ro_client_template.lng
@@ -60,6 +60,7 @@
$wb['template_del_aborted_txt'] = 'Delete aborted. There is still a client which has this template selected.';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
diff --git a/interface/web/client/lib/lang/ro_reseller.lng b/interface/web/client/lib/lang/ro_reseller.lng
index 7fab36d..5269311 100644
--- a/interface/web/client/lib/lang/ro_reseller.lng
+++ b/interface/web/client/lib/lang/ro_reseller.lng
@@ -98,6 +98,7 @@
$wb['required_fields_txt'] = '* Required fields';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
$wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
diff --git a/interface/web/client/lib/lang/ru_client.lng b/interface/web/client/lib/lang/ru_client.lng
index 603e845..780f1d7 100644
--- a/interface/web/client/lib/lang/ru_client.lng
+++ b/interface/web/client/lib/lang/ru_client.lng
@@ -95,6 +95,7 @@
$wb['limit_trafficquota_error_notint'] = 'Квота трафика должна быть числом.';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['customer_no_txt'] = 'Customer No.';
$wb['vat_id_txt'] = 'VAT ID';
$wb['required_fields_txt'] = '* Required fields';
diff --git a/interface/web/client/lib/lang/ru_client_template.lng b/interface/web/client/lib/lang/ru_client_template.lng
index 663b68a..a20e9ae 100644
--- a/interface/web/client/lib/lang/ru_client_template.lng
+++ b/interface/web/client/lib/lang/ru_client_template.lng
@@ -60,6 +60,7 @@
$wb['template_del_aborted_txt'] = 'Delete aborted. There is still a client which has this template selected.';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
diff --git a/interface/web/client/lib/lang/ru_reseller.lng b/interface/web/client/lib/lang/ru_reseller.lng
index 3a0cc93..cf16435 100644
--- a/interface/web/client/lib/lang/ru_reseller.lng
+++ b/interface/web/client/lib/lang/ru_reseller.lng
@@ -98,6 +98,7 @@
$wb['required_fields_txt'] = '* Required fields';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
diff --git a/interface/web/client/lib/lang/se_client.lng b/interface/web/client/lib/lang/se_client.lng
index feb8a9f..9f4f995 100644
--- a/interface/web/client/lib/lang/se_client.lng
+++ b/interface/web/client/lib/lang/se_client.lng
@@ -95,6 +95,7 @@
$wb['limit_trafficquota_error_notint'] = 'Traffic Quota must be a number.';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['customer_no_txt'] = 'Customer No.';
$wb['vat_id_txt'] = 'VAT ID';
$wb['required_fields_txt'] = '* Required fields';
diff --git a/interface/web/client/lib/lang/se_client_template.lng b/interface/web/client/lib/lang/se_client_template.lng
index 353960c..59d4d89 100644
--- a/interface/web/client/lib/lang/se_client_template.lng
+++ b/interface/web/client/lib/lang/se_client_template.lng
@@ -60,6 +60,7 @@
$wb['template_del_aborted_txt'] = 'Delete aborted. There is still a client which has this template selected.';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
diff --git a/interface/web/client/lib/lang/se_reseller.lng b/interface/web/client/lib/lang/se_reseller.lng
index 7fab36d..5269311 100644
--- a/interface/web/client/lib/lang/se_reseller.lng
+++ b/interface/web/client/lib/lang/se_reseller.lng
@@ -98,6 +98,7 @@
$wb['required_fields_txt'] = '* Required fields';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
$wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
diff --git a/interface/web/client/lib/lang/sk_client.lng b/interface/web/client/lib/lang/sk_client.lng
index 295611e..1bb9b0d 100644
--- a/interface/web/client/lib/lang/sk_client.lng
+++ b/interface/web/client/lib/lang/sk_client.lng
@@ -94,6 +94,7 @@
$wb['limit_dns_slave_zone_txt'] = 'Max. number of secondary DNS zones';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_dns_slave_zone_error_notint'] = 'The dns slave zone limit must be a number.';
$wb['customer_no_txt'] = 'Customer No.';
$wb['vat_id_txt'] = 'VAT ID';
diff --git a/interface/web/client/lib/lang/sk_client_template.lng b/interface/web/client/lib/lang/sk_client_template.lng
index f16b489..f281dea 100644
--- a/interface/web/client/lib/lang/sk_client_template.lng
+++ b/interface/web/client/lib/lang/sk_client_template.lng
@@ -57,6 +57,7 @@
$wb['limit_dns_slave_zone_txt'] = 'Max. number of secondary DNS zones';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_dns_slave_zone_error_notint'] = 'The dns slave zone limit must be a number.';
$wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
$wb['template_del_aborted_txt'] = 'Delete aborted. There is still a client which has this template selected.';
diff --git a/interface/web/client/lib/lang/sk_reseller.lng b/interface/web/client/lib/lang/sk_reseller.lng
index b569202..e215544 100644
--- a/interface/web/client/lib/lang/sk_reseller.lng
+++ b/interface/web/client/lib/lang/sk_reseller.lng
@@ -98,6 +98,7 @@
$wb['required_fields_txt'] = '* Required fields';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
$wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
diff --git a/interface/web/client/lib/lang/tr_client.lng b/interface/web/client/lib/lang/tr_client.lng
index 877180d..4cc9d67 100644
--- a/interface/web/client/lib/lang/tr_client.lng
+++ b/interface/web/client/lib/lang/tr_client.lng
@@ -95,6 +95,7 @@
$wb['limit_trafficquota_error_notint'] = 'Trafik kotası sayı olmak zorunda.';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['customer_no_txt'] = 'Customer No.';
$wb['vat_id_txt'] = 'VAT ID';
$wb['required_fields_txt'] = '* Required fields';
diff --git a/interface/web/client/lib/lang/tr_client_template.lng b/interface/web/client/lib/lang/tr_client_template.lng
index 3cf3e70..09e65c0 100644
--- a/interface/web/client/lib/lang/tr_client_template.lng
+++ b/interface/web/client/lib/lang/tr_client_template.lng
@@ -59,6 +59,7 @@
$wb['limit_trafficquota_error_notint'] = 'Trafik kotası sayı olmak zorunda.';
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['template_del_aborted_txt'] = 'Delete aborted. There is still a client which has this template selected.';
$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
diff --git a/interface/web/client/lib/lang/tr_reseller.lng b/interface/web/client/lib/lang/tr_reseller.lng
index a11de9d..6e451df 100644
--- a/interface/web/client/lib/lang/tr_reseller.lng
+++ b/interface/web/client/lib/lang/tr_reseller.lng
@@ -101,6 +101,7 @@
$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
+$wb['limit_backup_txt'] = 'Backupfunction available';
$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
$wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template';
$wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.';
diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm
index 01dae64..311fd52 100644
--- a/interface/web/client/templates/client_edit_limits.htm
+++ b/interface/web/client/templates/client_edit_limits.htm
@@ -151,6 +151,12 @@
<label for="limit_webdav_user">{tmpl_var name='limit_webdav_user_txt'}</label>
<input name="limit_webdav_user" id="limit_webdav_user" value="{tmpl_var name='limit_webdav_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
</div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='limit_backup_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='limit_backup'}
+ </div>
+ </div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='email_limits_txt'}<em></em></div>
<div style="display:none;">
diff --git a/interface/web/client/templates/client_template_edit_limits.htm b/interface/web/client/templates/client_template_edit_limits.htm
index 2440146..dc83c6e 100644
--- a/interface/web/client/templates/client_template_edit_limits.htm
+++ b/interface/web/client/templates/client_template_edit_limits.htm
@@ -105,6 +105,12 @@
<label for="limit_webdav_user">{tmpl_var name='limit_webdav_user_txt'}</label>
<input name="limit_webdav_user" id="limit_webdav_user" value="{tmpl_var name='limit_webdav_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
</div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='limit_backup_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='limit_backup'}
+ </div>
+ </div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='email_limits_txt'}<em></em></div>
<div style="display:none;">
diff --git a/interface/web/client/templates/reseller_edit_limits.htm b/interface/web/client/templates/reseller_edit_limits.htm
index d5ff205..55652d5 100644
--- a/interface/web/client/templates/reseller_edit_limits.htm
+++ b/interface/web/client/templates/reseller_edit_limits.htm
@@ -159,6 +159,12 @@
<label for="limit_webdav_user">{tmpl_var name='limit_webdav_user_txt'}</label>
<input name="limit_webdav_user" id="limit_webdav_user" value="{tmpl_var name='limit_webdav_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
</div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='limit_backup_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='limit_backup'}
+ </div>
+ </div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='email_limits_txt'}<em></em></div>
<div style="display:none;">
diff --git a/interface/web/dashboard/lib/lang/el.lng b/interface/web/dashboard/lib/lang/el.lng
index 144becd..134b9b5 100644
--- a/interface/web/dashboard/lib/lang/el.lng
+++ b/interface/web/dashboard/lib/lang/el.lng
@@ -1,4 +1,4 @@
<?php
$wb['welcome_user_txt'] = 'Καλωσήρθατε %s';
-$wb['available_modules_txt'] = 'Διαθέσιμα αρθρώματα';
+$wb['available_modules_txt'] = 'Διαθέσιμες επιλογές';
?>
diff --git a/interface/web/dashboard/lib/lang/el_dashlet_limits.lng b/interface/web/dashboard/lib/lang/el_dashlet_limits.lng
index 4fcf6cf..fc373ea 100644
--- a/interface/web/dashboard/lib/lang/el_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/el_dashlet_limits.lng
@@ -2,29 +2,29 @@
$wb['limits_txt'] = 'Όρια Λογαριασμών';
$wb['of_txt'] = 'από';
$wb['unlimited_txt'] = 'Απεριόριστα';
-$wb['limit_maildomain_txt'] = 'Πλήθος email domains';
-$wb['limit_mailbox_txt'] = 'Πλήθος θυρίδων';
-$wb['limit_mailalias_txt'] = 'Πλήθος ψευδωνύμων email';
-$wb['limit_mailaliasdomain_txt'] = 'Πλήθος ψευδωνύμων domain';
-$wb['limit_mailforward_txt'] = 'Πλήθος email forwarders';
-$wb['limit_mailcatchall_txt'] = 'Πλήθος λογαριασμών email catchall';
-$wb['limit_mailrouting_txt'] = 'Πλήθος δρομολογήσεων email';
-$wb['limit_mailfilter_txt'] = 'Πλήθος φίλτρων email';
-$wb['limit_fetchmail_txt'] = 'Πλήθος λογαριασμών fetchmail';
-$wb['limit_spamfilter_wblist_txt'] = 'Πλήθος φίλτρων spamfilter white / blacklist';
-$wb['limit_spamfilter_user_txt'] = 'Πλήθος χρηστών spamfilter';
-$wb['limit_spamfilter_policy_txt'] = 'Πλήθος πολιτικών spamfilter';
-$wb['limit_cron_txt'] = 'Πλήθος εργασιών cron';
-$wb['limit_web_domain_txt'] = 'Πλήθος web domains';
-$wb['limit_web_aliasdomain_txt'] = 'Πλήθος ψευδωνύμων web domain';
-$wb['limit_web_subdomain_txt'] = 'Πλήθος web subdomains';
-$wb['limit_ftp_user_txt'] = 'Πλήθος χρηστών FTP';
-$wb['limit_dns_zone_txt'] = 'Πλήθος ζωνών DNS';
-$wb['limit_dns_slave_zone_txt'] = 'Πλήθος δευτερεύουσων ζωνών DNS';
-$wb['limit_dns_record_txt'] = 'Πλήθος εγγραφών DNS';
-$wb['limit_shell_user_txt'] = 'Πλήθος χρηστών Κελύφους';
-$wb['limit_webdav_user_txt'] = 'Πλήθος χρηστών Webdav';
-$wb['limit_client_txt'] = 'Πλήθος Πελατών';
-$wb['limit_database_txt'] = 'Πλήθος Βάσεων Δεδομένων';
-$wb['limit_mailmailinglist_txt'] = 'Πλήθος λιστών mail';
+$wb['limit_maildomain_txt'] = 'Αριθμός email domains';
+$wb['limit_mailbox_txt'] = 'Αριθμός θυρίδων';
+$wb['limit_mailalias_txt'] = 'Αριθμός ψευδωνύμων email';
+$wb['limit_mailaliasdomain_txt'] = 'Αριθμός ψευδωνύμων domain';
+$wb['limit_mailforward_txt'] = 'Αριθμός email forwarders';
+$wb['limit_mailcatchall_txt'] = 'Αριθμός λογαριασμών email catchall';
+$wb['limit_mailrouting_txt'] = 'Αριθμός δρομολογήσεων email';
+$wb['limit_mailfilter_txt'] = 'Αριθμός φίλτρων email';
+$wb['limit_fetchmail_txt'] = 'Αριθμός λογαριασμών fetchmail';
+$wb['limit_spamfilter_wblist_txt'] = 'Αριθμός φίλτρων spamfilter white / blacklist';
+$wb['limit_spamfilter_user_txt'] = 'Αριθμός χρηστών spamfilter';
+$wb['limit_spamfilter_policy_txt'] = 'Αριθμός πολιτικών spamfilter';
+$wb['limit_cron_txt'] = 'Αριθμός εργασιών cron';
+$wb['limit_web_domain_txt'] = 'Αριθμός web domains';
+$wb['limit_web_aliasdomain_txt'] = 'Αριθμός ψευδωνύμων web domain';
+$wb['limit_web_subdomain_txt'] = 'Αριθμός web subdomains';
+$wb['limit_ftp_user_txt'] = 'Αριθμός χρηστών FTP';
+$wb['limit_dns_zone_txt'] = 'Αριθμός ζωνών DNS';
+$wb['limit_dns_slave_zone_txt'] = 'Αριθμός δευτερεύουσων ζωνών DNS';
+$wb['limit_dns_record_txt'] = 'Αριθμός εγγραφών DNS';
+$wb['limit_shell_user_txt'] = 'Αριθμός χρηστών Shell';
+$wb['limit_webdav_user_txt'] = 'Αριθμός χρηστών Webdav';
+$wb['limit_client_txt'] = 'Αριθμός Πελατών';
+$wb['limit_database_txt'] = 'Αριθμός Databases';
+$wb['limit_mailmailinglist_txt'] = 'Αριθμός λιστών ηλ. αλληλογραφίας';
?>
diff --git a/interface/web/dashboard/lib/lang/el_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/el_dashlet_mailquota.lng
index 0bea37b..1ab1e66 100644
--- a/interface/web/dashboard/lib/lang/el_dashlet_mailquota.lng
+++ b/interface/web/dashboard/lib/lang/el_dashlet_mailquota.lng
@@ -1,8 +1,8 @@
<?php
-$wb['mailquota_txt'] = 'Όρια Mailbox';
-$wb['email_txt'] = 'Διεύθυνση Email';
-$wb['name_txt'] = 'Όνομα';
-$wb['used_txt'] = 'Χώρος σε χρήση';
-$wb['quota_txt'] = 'Όριο';
-$wb['no_email_accounts_txt'] = 'Δεν βρέθηκαν λογαριασμοί email.';
+$wb['mailquota_txt'] = 'Mailbox Quota';
+$wb['email_txt'] = 'Email Address';
+$wb['name_txt'] = 'Name';
+$wb['used_txt'] = 'Used Space';
+$wb['quota_txt'] = 'Quota';
+$wb['no_email_accounts_txt'] = 'No email accounts found.';
?>
diff --git a/interface/web/dashboard/lib/lang/el_dashlet_quota.lng b/interface/web/dashboard/lib/lang/el_dashlet_quota.lng
index d56647b..de7b5a8 100644
--- a/interface/web/dashboard/lib/lang/el_dashlet_quota.lng
+++ b/interface/web/dashboard/lib/lang/el_dashlet_quota.lng
@@ -1,8 +1,8 @@
<?php
-$wb['quota_txt'] = 'Όρια χρήσης δίσκου για Website';
-$wb['domain_txt'] = 'Domain/Website';
-$wb['used_txt'] = 'Χώρος σε χρήση';
-$wb['hard_txt'] = 'Απόλυτο Όριο';
-$wb['soft_txt'] = 'Διαλακτικό Όριο';
-$wb['no_sites_txt'] = 'Δεν βρέθηκαν websites.';
+$wb['quota_txt'] = 'Website Harddisk Quota';
+$wb['domain_txt'] = 'Domain / Website';
+$wb['used_txt'] = 'Used space';
+$wb['hard_txt'] = 'Hard limit';
+$wb['soft_txt'] = 'Soft limit';
+$wb['no_sites_txt'] = 'No web sites found.';
?>
diff --git a/interface/web/dashboard/lib/lang/fr_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/fr_dashlet_mailquota.lng
index 1ab1e66..d18317c 100644
--- a/interface/web/dashboard/lib/lang/fr_dashlet_mailquota.lng
+++ b/interface/web/dashboard/lib/lang/fr_dashlet_mailquota.lng
@@ -1,8 +1,8 @@
<?php
-$wb['mailquota_txt'] = 'Mailbox Quota';
-$wb['email_txt'] = 'Email Address';
-$wb['name_txt'] = 'Name';
-$wb['used_txt'] = 'Used Space';
+$wb['mailquota_txt'] = 'Quota de la boite mail';
+$wb['email_txt'] = 'Adresse Email';
+$wb['name_txt'] = 'Nom';
+$wb['used_txt'] = 'Espace utilisé';
$wb['quota_txt'] = 'Quota';
-$wb['no_email_accounts_txt'] = 'No email accounts found.';
+$wb['no_email_accounts_txt'] = 'Aucun compte mail trouvé.';
?>
diff --git a/interface/web/dashboard/lib/lang/fr_dashlet_quota.lng b/interface/web/dashboard/lib/lang/fr_dashlet_quota.lng
index de7b5a8..674057e 100644
--- a/interface/web/dashboard/lib/lang/fr_dashlet_quota.lng
+++ b/interface/web/dashboard/lib/lang/fr_dashlet_quota.lng
@@ -1,8 +1,8 @@
<?php
-$wb['quota_txt'] = 'Website Harddisk Quota';
-$wb['domain_txt'] = 'Domain / Website';
-$wb['used_txt'] = 'Used space';
-$wb['hard_txt'] = 'Hard limit';
-$wb['soft_txt'] = 'Soft limit';
-$wb['no_sites_txt'] = 'No web sites found.';
+$wb['quota_txt'] = 'Quota disque dur du site Web';
+$wb['domain_txt'] = 'Domaine / Site Web';
+$wb['used_txt'] = 'Espace utilisé';
+$wb['hard_txt'] = 'Limite Hard';
+$wb['soft_txt'] = 'Limite Soft';
+$wb['no_sites_txt'] = 'Aucun site Web trouvé.';
?>
diff --git a/interface/web/dashboard/templates/dashboard.htm b/interface/web/dashboard/templates/dashboard.htm
index c8c3145..231fb54 100644
--- a/interface/web/dashboard/templates/dashboard.htm
+++ b/interface/web/dashboard/templates/dashboard.htm
@@ -41,7 +41,7 @@
</tmpl_if>
</tmpl_loop>
</div>
- <div style="float:left; width:350px;padding-left:15px;">
+ <div style="float:right; width:350px;padding-left:15px;">
<tmpl_loop name='rightcol'>
{tmpl_var name='content'}
<tmpl_if name='content'>
diff --git a/interface/web/designer/lib/lang/cz_module_edit.lng b/interface/web/designer/lib/lang/cz_module_edit.lng
index 302c601..972bc2c 100644
--- a/interface/web/designer/lib/lang/cz_module_edit.lng
+++ b/interface/web/designer/lib/lang/cz_module_edit.lng
@@ -17,6 +17,6 @@
<b>NaviFrame:</b> If module_tree.tpl.htm selected as template file, enter here the path to the script file for the left frame.<br>
<b>Default page:</b> These page will be shown when the module is opened.<br>
<b>Tab width:</b> Width of the Tabs in the main navigation. The field is empty by default. You can enter values absolute in pixel (e.g 20) or relative (e.g 20%).<br>
-<b>Hint:</b> All paths are relative to the directory \"web\".
+<b>Hint:</b> All paths are relative to the directory \\"web\\".
';
?>
diff --git a/interface/web/designer/lib/lang/el_form_edit.lng b/interface/web/designer/lib/lang/el_form_edit.lng
index 2c2673a..04ebc02 100644
--- a/interface/web/designer/lib/lang/el_form_edit.lng
+++ b/interface/web/designer/lib/lang/el_form_edit.lng
@@ -16,9 +16,9 @@
$wb['tab_default_txt'] = 'Προεπιλεγμένη Καρτέλα';
$wb['list_default_txt'] = 'Προεπιλεγμένη Λίστα';
$wb['auth_txt'] = 'Δικαιώματα';
-$wb['auth_preset_userid_txt'] = 'ID Χρήστη';
-$wb['auth_preset_groupid_txt'] = 'ID Ομάδας';
-$wb['auth_preset_perm_user_txt'] = 'Δικαιώμ. Χρήστη';
-$wb['auth_preset_perm_group_txt'] = 'Δικαιώμ. Ομάδας';
-$wb['auth_preset_perm_other_txt'] = 'Δικαιώμ. Άλλων';
+$wb['auth_preset_userid_txt'] = 'UserID';
+$wb['auth_preset_groupid_txt'] = 'GroupID';
+$wb['auth_preset_perm_user_txt'] = 'Perm. User';
+$wb['auth_preset_perm_group_txt'] = 'Perm. Group';
+$wb['auth_preset_perm_other_txt'] = 'Perm. Other';
?>
diff --git a/interface/web/designer/lib/lang/fr_form_list.lng b/interface/web/designer/lib/lang/fr_form_list.lng
index a61e61a..3162115 100644
--- a/interface/web/designer/lib/lang/fr_form_list.lng
+++ b/interface/web/designer/lib/lang/fr_form_list.lng
@@ -1,5 +1,5 @@
<?php
-$wb['list_head_txt'] = 'Formulaire dadministration';
+$wb['list_head_txt'] = 'Formulaire d\'administration';
$wb['form_txt'] = 'Formulaire';
$wb['module_txt'] = 'Module';
$wb['title_txt'] = 'Titre';
diff --git a/interface/web/designer/lib/lang/fr_form_show.lng b/interface/web/designer/lib/lang/fr_form_show.lng
index 3cb420f..c2cd94b 100644
--- a/interface/web/designer/lib/lang/fr_form_show.lng
+++ b/interface/web/designer/lib/lang/fr_form_show.lng
@@ -14,5 +14,5 @@
$wb['description_txt'] = 'Description';
$wb['module_del_txt'] = 'Effacer le module et tous ses sous-répertoires';
$wb['menu_del_txt'] = 'Effacer le menu et toutes ses entrées';
-$wb['item_del_txt'] = 'Effacer lentrée';
+$wb['item_del_txt'] = 'Effacer l\'entrée';
?>
diff --git a/interface/web/designer/lib/lang/fr_module_list.lng b/interface/web/designer/lib/lang/fr_module_list.lng
index 927c65e..d493fdc 100644
--- a/interface/web/designer/lib/lang/fr_module_list.lng
+++ b/interface/web/designer/lib/lang/fr_module_list.lng
@@ -1,5 +1,5 @@
<?php
-$wb['list_head_txt'] = 'Module dadministration';
+$wb['list_head_txt'] = 'Module d\'administration';
$wb['module_txt'] = 'Module';
$wb['title_txt'] = 'Titre';
?>
diff --git a/interface/web/designer/lib/lang/fr_module_show.lng b/interface/web/designer/lib/lang/fr_module_show.lng
index c9c8570..8c14adb 100644
--- a/interface/web/designer/lib/lang/fr_module_show.lng
+++ b/interface/web/designer/lib/lang/fr_module_show.lng
@@ -10,7 +10,7 @@
$wb['up_txt'] = 'Monter';
$wb['down_txt'] = 'Descendre';
$wb['module_txt'] = 'Module';
-$wb['module_del_txt'] = 'Voulez-vous supprimer le module et tous les fichiers et sous-dossier du module ';
-$wb['menu_del_txt'] = 'Voulez-vous supprimer le menu avec tous ses sous-menus ';
-$wb['item_del_txt'] = 'Voulez-vous supprimer lentrée de menu ';
+$wb['module_del_txt'] = 'Voulez-vous supprimer le module et tous les fichiers et sous-dossier du module ?';
+$wb['menu_del_txt'] = 'Voulez-vous supprimer le menu avec tous ses sous-menus ?';
+$wb['item_del_txt'] = 'Voulez-vous supprimer l\'entrée de menu ?';
?>
diff --git a/interface/web/dns/dns_dkim_edit.php b/interface/web/dns/dns_dkim_edit.php
index a0bd4f8..71741d0 100644
--- a/interface/web/dns/dns_dkim_edit.php
+++ b/interface/web/dns/dns_dkim_edit.php
@@ -97,9 +97,10 @@
$this->dataRecord["server_id"] = $soa["server_id"];
// add dkim-settings to the public-key in the txt-record
- if (!empty($this->dataRecord['data'])) $this->dataRecord['data']='v=DKIM1; t=s; p='.$this->dataRecord['data'];
- $this->dataRecord['name']='default._domainkey.'.$this->dataRecord['name'];
-
+ if (!empty($this->dataRecord['data'])) {
+ $this->dataRecord['data']='v=DKIM1; t=s; p='.$this->dataRecord['data'];
+ $this->dataRecord['name']=$this->dataRecord['selector'].'._domainkey.'.$this->dataRecord['name'];
+ }
// Update the serial number and timestamp of the RR record
$soa = $app->db->queryOneRecord("SELECT serial FROM dns_rr WHERE id = ?", $this->id);
$this->dataRecord["serial"] = $app->validate_dns->increase_serial($soa["serial"]);
@@ -109,6 +110,7 @@
$check=$app->db->queryOneRecord("SELECT * FROM dns_rr WHERE zone = ? AND type = ? AND data = ? AND name = ?", $this->dataRecord['zone'], $this->dataRecord['type'], $this->dataRecord['data'], $this->dataRecord['name']);
if ($check!='') $app->tform->errorMessage .= $app->tform->wordbook["record_exists_txt"];
if (empty($this->dataRecord['data'])) $app->tform->errorMessage .= $app->tform->wordbook["dkim_disabled_txt"];
+
parent::onSubmit();
}
diff --git a/interface/web/dns/dns_dkim_get.php b/interface/web/dns/dns_dkim_get.php
index 1bfa511..9c33ce2 100644
--- a/interface/web/dns/dns_dkim_get.php
+++ b/interface/web/dns/dns_dkim_get.php
@@ -67,33 +67,20 @@
return $vars;
}
-/**
-* This function formats the public-key
-* @param array $pubkey
-* @return string public-key
-*/
-function pub_key($pubkey) {
- $public_key='';
- foreach($pubkey as $values) $public_key=$public_key.$values;
- return $public_key;
-}
-
$_POST=getRealPost();
if (ctype_digit($_POST['zone'])) {
// Get the parent soa record of the domain
- $soa = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ? AND ".$app->tform->getAuthSQL('r'), $_POST['zone']);
+ $soa = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ? and ?'", $app->db->quote($_POST['zone']), $app->tform->getAuthSQL('r'));
- $public_key=$app->db->queryOneRecord("SELECT dkim_public FROM mail_domain WHERE domain = ? AND dkim = 'Y' AND ".$app->tform->getAuthSQL('r'), substr_replace($soa['origin'],'',-1));
-
- $public_key=pub_key($public_key);
-
- $public_key=str_replace(array('-----BEGIN PUBLIC KEY-----','-----END PUBLIC KEY-----',"\r","\n"),'',$public_key);
+ $sql=$app->db->queryOneRecord("SELECT dkim_public, dkim_selector FROM mail_domain WHERE domain = ? AND dkim = 'Y' AND ?", substr_replace($soa['origin'],'',-1), $app->tform->getAuthSQL('r'));
+ $public_key=str_replace(array('-----BEGIN PUBLIC KEY-----','-----END PUBLIC KEY-----',"\r","\n"),'',$sql['dkim_public']);
echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
echo "<formatname>\n";
echo "<data>".$public_key."</data>\n";
echo "<name>".$soa['origin']."</name>\n";
+ echo "<selector>".$sql['dkim_selector']."</selector>\n";
echo "</formatname>\n";
}
?>
diff --git a/interface/web/dns/dns_import.php b/interface/web/dns/dns_import.php
index b8b4f1b..c78e41a 100644
--- a/interface/web/dns/dns_import.php
+++ b/interface/web/dns/dns_import.php
@@ -87,7 +87,7 @@
$app->tpl->setVar("server_id", $server_id_option);
// load the list of clients
- $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY sys_group.name";
+ $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY client.company_name, client.contact_name, sys_group.name";
$clients = $app->db->queryAllRecords($sql);
$client_select = '';
if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= "<option value='0'></option>";
@@ -109,7 +109,7 @@
// load the list of clients
- $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".intval($client['client_id']);
+ $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".intval($client['client_id'])." ORDER BY client.company_name, client.contact_name, sys_group.name";
$clients = $app->db->queryAllRecords($sql);
$tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".intval($client['client_id']));
$client_select = '<option value="'.$tmp['groupid'].'">'.$client['contactname'].'</option>';
diff --git a/interface/web/dns/dns_slave_edit.php b/interface/web/dns/dns_slave_edit.php
index ecf825d..dfca92e 100644
--- a/interface/web/dns/dns_slave_edit.php
+++ b/interface/web/dns/dns_slave_edit.php
@@ -72,7 +72,7 @@
// If user is admin, we will allow him to select to whom this record belongs
if($_SESSION["s"]["user"]["typ"] == 'admin') {
// Getting Domains of the user
- $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY sys_group.name";
+ $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY client.company_name, client.contact_name, sys_group.name";
$clients = $app->db->queryAllRecords($sql);
$client_select = '';
if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= "<option value='0'></option>";
@@ -91,7 +91,7 @@
$client = $app->db->queryOneRecord("SELECT client.client_id, sys_group.name, 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 FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
// Fill the client select field
- $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY sys_group.name";
+ $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY client.company_name, client.contact_name, sys_group.name";
$clients = $app->db->queryAllRecords($sql);
$tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$client['client_id']);
$client_select = '<option value="'.$tmp['groupid'].'">'.$client['contactname'].'</option>';
diff --git a/interface/web/dns/dns_soa_edit.php b/interface/web/dns/dns_soa_edit.php
index b66babb..17c704e 100644
--- a/interface/web/dns/dns_soa_edit.php
+++ b/interface/web/dns/dns_soa_edit.php
@@ -82,7 +82,7 @@
// If user is admin, we will allow him to select to whom this record belongs
if($_SESSION["s"]["user"]["typ"] == 'admin') {
// Getting Domains of the user
- $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY sys_group.name";
+ $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY client.company_name, client.contact_name, sys_group.name";
$clients = $app->db->queryAllRecords($sql);
$client_select = '';
if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= "<option value='0'></option>";
@@ -101,7 +101,7 @@
$client = $app->db->queryOneRecord("SELECT client.client_id, 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 FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
// Fill the client select field
- $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY sys_group.name";
+ $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY client.company_name, client.contact_name, sys_group.name";
$clients = $app->db->queryAllRecords($sql);
$tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$client['client_id']);
$client_select = '<option value="'.$tmp['groupid'].'">'.$client['contactname'].'</option>';
diff --git a/interface/web/dns/dns_wizard.php b/interface/web/dns/dns_wizard.php
index 844686e..370d3df 100644
--- a/interface/web/dns/dns_wizard.php
+++ b/interface/web/dns/dns_wizard.php
@@ -83,7 +83,7 @@
$app->tpl->setVar("server_id", $server_id_option);
// load the list of clients
- $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY sys_group.name";
+ $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY client.company_name, client.contact_name, sys_group.name";
$clients = $app->db->queryAllRecords($sql);
$client_select = '';
if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= "<option value='0'></option>";
@@ -105,7 +105,7 @@
// load the list of clients
- $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$app->functions->intval($client['client_id']);
+ $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$app->functions->intval($client['client_id'])." ORDER BY client.company_name, client.contact_name, sys_group.name";
$clients = $app->db->queryAllRecords($sql);
$tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$app->functions->intval($client['client_id']));
$client_select = '<option value="'.$tmp['groupid'].'">'.$client['contactname'].'</option>';
@@ -245,10 +245,12 @@
if($_POST['ns2'] != '') $tpl_content = str_replace('{NS2}', $_POST['ns2'], $tpl_content);
if($_POST['email'] != '') $tpl_content = str_replace('{EMAIL}', $_POST['email'], $tpl_content);
if(isset($_POST['dkim']) && preg_match('/^[\w\.\-\/]{2,255}\.[a-zA-Z0-9\-]{2,30}[\.]{0,1}$/', $_POST['domain'])) {
- $public_key=$app->db->queryOneRecord("SELECT dkim_public FROM mail_domain WHERE domain = ? AND dkim = 'y' AND ".$app->tform->getAuthSQL('r'), $_POST['domain']);
+ $sql = $app->db->queryOneRecord("SELECT dkim_public, dkim_selecotr FROM mail_domain WHERE domain = ? AND dkim = 'y' AND ".$app->tform->getAuthSQL('r'), $_POST['domain']);
+ $public_key = $sql['dkim_public'];
if ($public_key!='') {
- $dns_record=str_replace(array("\r\n", "\n", "\r", "-----BEGIN PUBLIC KEY-----", "-----END PUBLIC KEY-----"), '', $public_key['dkim_public']);
- $tpl_content .= "\n".'TXT|default._domainkey.'.$_POST['domain'].'.|v=DKIM1; t=s; p='.$dns_record;
+ if (empty($sql['dkim_selector'])) $sql['dkim_selector'] = 'default';
+ $dns_record=str_replace(array("\r\n", "\n", "\r", "-----BEGIN PUBLIC KEY-----", "-----END PUBLIC KEY-----"), '', $public_key);
+ $tpl_content .= "\n".'TXT|'.$sql['dkim_selector'].'._domainkey.'.$_POST['domain'].'.|v=DKIM1; t=s; p='.$dns_record;
}
}
diff --git a/interface/web/dns/form/dns_srv.tform.php b/interface/web/dns/form/dns_srv.tform.php
index 2741a5f..2f35fd5 100644
--- a/interface/web/dns/form/dns_srv.tform.php
+++ b/interface/web/dns/form/dns_srv.tform.php
@@ -86,7 +86,7 @@
'type' => 'TOLOWER')
),
'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^[a-zA-Z0-9\.\-]{0,255}$/',
+ 'regex' => '/^[a-zA-Z0-9\.\-_]{0,255}$/',
'errmsg'=> 'name_error_regex'),
),
'default' => '',
diff --git a/interface/web/dns/lib/lang/ar_dns_dkim.lng b/interface/web/dns/lib/lang/ar_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/ar_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/ar_dns_dkim.lng
@@ -7,4 +7,5 @@
$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.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/bg_dns_dkim.lng b/interface/web/dns/lib/lang/bg_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/bg_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/bg_dns_dkim.lng
@@ -7,4 +7,5 @@
$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.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/br_dns_dkim.lng b/interface/web/dns/lib/lang/br_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/br_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/br_dns_dkim.lng
@@ -7,4 +7,5 @@
$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.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/cz_dns_dkim.lng b/interface/web/dns/lib/lang/cz_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/cz_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/cz_dns_dkim.lng
@@ -7,4 +7,5 @@
$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.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/de_dns_dkim.lng b/interface/web/dns/lib/lang/de_dns_dkim.lng
index d1ba493..f139762 100644
--- a/interface/web/dns/lib/lang/de_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/de_dns_dkim.lng
@@ -7,4 +7,5 @@
$wb["limit_dns_record_txt"] = 'Die max. Anzahl von DNS Eintraegen fuer den Account ist erreicht.';
$wb["no_zone_perm"] = 'Fehlende Berechtigung zum Hinzufuegen eines Eintrags zur DNS-Zone.';
$wb['ttl_range_error'] = 'Min. TTL time ist 60 Sekunden.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/el.lng b/interface/web/dns/lib/lang/el.lng
index 3b3bfe8..f76afed 100644
--- a/interface/web/dns/lib/lang/el.lng
+++ b/interface/web/dns/lib/lang/el.lng
@@ -17,6 +17,6 @@
$wb['DNS Wizard'] = 'Οδηγός DNS';
$wb['Add DNS Zone'] = 'Νέα ζώνη DNS';
$wb['Templates'] = 'Πρότυπα';
-$wb['Secondary Zones'] = 'Δευτερεύουσες Ζώνες';
-$wb['Import Zone File'] = 'Εισαγωγή Αρχείου Ζώνης';
+$wb['Secondary Zones'] = 'Secondary Zones';
+$wb['Import Zone File'] = 'Import Zone File';
?>
diff --git a/interface/web/dns/lib/lang/el_dns_alias.lng b/interface/web/dns/lib/lang/el_dns_alias.lng
index 178ee34..2e05e47 100644
--- a/interface/web/dns/lib/lang/el_dns_alias.lng
+++ b/interface/web/dns/lib/lang/el_dns_alias.lng
@@ -11,6 +11,6 @@
$wb['name_error_empty'] = 'Το hostname δεν έχει οριστεί';
$wb['name_error_regex'] = 'Το hostname έχει λάθος μορφοποίηση';
$wb['data_error_empty'] = 'Το hostname Προορισμός δεν έχει οριστεί';
-$wb['data_error_regex'] = 'Το hostname Προορισμός δεν έχει σωστή μορφοποίηση';
+$wb['data_error_regex'] = 'Το hostname Προορισμός έχει λάθος μορφοποίηση';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
?>
diff --git a/interface/web/dns/lib/lang/el_dns_hinfo.lng b/interface/web/dns/lib/lang/el_dns_hinfo.lng
index 02fa662..173b16f 100644
--- a/interface/web/dns/lib/lang/el_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/el_dns_hinfo.lng
@@ -11,6 +11,6 @@
$wb['name_error_empty'] = 'Το hostname δεν έχει οριστεί';
$wb['name_error_regex'] = 'Το hostname δεν έχει σωστή μορφοποίηση';
$wb['data_error_empty'] = 'Οι πληροφορίες του Host είναι κενές';
-$wb['data_error_regex'] = 'Οι πληροφορίες Host δεν έχουν έγκυρη μορφοποίηση';
+$wb['data_error_regex'] = 'Οι πληροφορίες Host έχουν μη έγκυρη μορφοποίηση';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
?>
diff --git a/interface/web/dns/lib/lang/el_dns_import.lng b/interface/web/dns/lib/lang/el_dns_import.lng
index 84608d1..2d1fe08 100644
--- a/interface/web/dns/lib/lang/el_dns_import.lng
+++ b/interface/web/dns/lib/lang/el_dns_import.lng
@@ -1,14 +1,14 @@
<?php
$wb['server_id_txt'] = 'Server';
-$wb['client_txt'] = 'Πελάτης';
-$wb['btn_save_txt'] = 'Εισαγωγή Αρχείου Ζώνης';
-$wb['btn_cancel_txt'] = 'Άκυρο';
+$wb['client_txt'] = 'Client';
+$wb['btn_save_txt'] = 'Import Zonefile';
+$wb['btn_cancel_txt'] = 'Cancel';
$wb['domain_txt'] = 'Domain';
-$wb['zone_file_successfully_imported_txt'] = 'Το αρχείο ζώνης έχει εισαχθεί με επιτυχία!';
-$wb['error_no_valid_zone_file_txt'] = 'Φαίνεται ότι το αρχείο ζώνης δεν είναι έγκυρο!';
-$wb['zonefile_to_import_txt'] = 'Αρχείο Ζώνης';
-$wb['domain_field_desc_txt'] = 'Μπορεί να μείνει κενό αν το όνομα domain είναι στο όνομα αρχείου λη στα περιεχόμενά του.';
-$wb['title'] = 'Εισαγωγή Αρχείων Ζώνης';
-$wb['no_file_uploaded_error'] = 'Δεν μεταφορτώθηκε αρχείο ζώνης';
-$wb['zone_file_import_txt'] = 'Εισαγωγή Αρχείου Ζώνης';
+$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
+$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
+$wb['zonefile_to_import_txt'] = 'Zone File';
+$wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
+$wb['title'] = 'Import Zone Files';
+$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
+$wb['zone_file_import_txt'] = 'Zone File Import';
?>
diff --git a/interface/web/dns/lib/lang/el_dns_mx.lng b/interface/web/dns/lib/lang/el_dns_mx.lng
index 4d51409..fac8830 100644
--- a/interface/web/dns/lib/lang/el_dns_mx.lng
+++ b/interface/web/dns/lib/lang/el_dns_mx.lng
@@ -13,6 +13,6 @@
$wb['name_error_regex'] = 'Το hostname δεν έχει σωστή μορφοποίηση.';
$wb['data_error_empty'] = 'Το hostname Mailserver δεν έχει οριστεί';
$wb['data_error_regex'] = 'Mailserver hostname με μη έγκυρη μορφοποίηση';
-$wb['duplicate_mx_record_txt'] = 'Διπλοεγγραφή MX.';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
?>
diff --git a/interface/web/dns/lib/lang/el_dns_slave.lng b/interface/web/dns/lib/lang/el_dns_slave.lng
index 979c466..64db975 100644
--- a/interface/web/dns/lib/lang/el_dns_slave.lng
+++ b/interface/web/dns/lib/lang/el_dns_slave.lng
@@ -13,5 +13,5 @@
$wb['ns_error_regex'] = 'Ο NS δεν έχει έγκυρη μορφοποίηση.';
$wb['eg_domain_tld'] = 'π.χ. domain.tld.';
$wb['ipv4_form_txt'] = 'μορφή IPv4 - π.χ. 1.2.3.4';
-$wb['secondary_zone_txt'] = 'Δευτερεύουσα Ζώνη DNS';
+$wb['secondary_zone_txt'] = 'Secondary DNS Zone';
?>
diff --git a/interface/web/dns/lib/lang/el_dns_soa.lng b/interface/web/dns/lib/lang/el_dns_soa.lng
index 045270a..87d5fc7 100644
--- a/interface/web/dns/lib/lang/el_dns_soa.lng
+++ b/interface/web/dns/lib/lang/el_dns_soa.lng
@@ -28,11 +28,11 @@
$wb['eg_domain_tld'] = 'π.χ. domain.tld';
$wb['eg_ns1_domain_tld'] = 'π.χ. ns1.domain.tld';
$wb['eg_webmaster_domain_tld'] = 'π.χ. webmaster@domain.tld';
-$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'Το Domain Δεν μπορεί να αλλαχθεί. Παρακαλούμε επικοινωνήστε με τον Διαχειριστή σας αν θέλετε να γίνει η αλλαγή του ονόματος.';
-$wb['refresh_range_error'] = 'Ελάχιστος χρόνος Ανανέωσης είναι τα 60 δευτερόλεπτα.';
-$wb['retry_range_error'] = 'Ελάχιστος χρόνος Επανάληψης είναι τα 60 δευτερόλεπτα.';
-$wb['expire_range_error'] = 'Ελάχιστος χρόνος Λήξης είναι τα 60 δευτερόλεπτα.';
-$wb['minimum_range_error'] = 'Ελάχιστος χρόνος Ελαχίστου είναι τα 60 δευτερόλεπτα.';
-$wb['ttl_range_error'] = 'Ελάχιστος χρόνος TTL είναι τα 60 δευτερόλεπτα.';
-$wb['xfer_error_regex'] = 'Επιπλέον Ειδοποίηση: Παρακαλούμε χρησιμοποιείστε μια διεύθυσνη IP.';
+$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.';
+$wb['refresh_range_error'] = 'Min. Refresh time is 60 seconds.';
+$wb['retry_range_error'] = 'Min. Retry time is 60 seconds.';
+$wb['expire_range_error'] = 'Min. Expire time is 60 seconds.';
+$wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
?>
diff --git a/interface/web/dns/lib/lang/el_dns_srv.lng b/interface/web/dns/lib/lang/el_dns_srv.lng
index 132c77e..53f25af 100644
--- a/interface/web/dns/lib/lang/el_dns_srv.lng
+++ b/interface/web/dns/lib/lang/el_dns_srv.lng
@@ -1,20 +1,20 @@
<?php
$wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Ζώνη';
+$wb['zone_txt'] = 'Ζώνη';
$wb['name_txt'] = 'Hostname';
-$wb['type_txt'] = 'τύπος';
-$wb['target_txt'] = 'Στόχος';
-$wb['weight_txt'] = 'Βάρος';
-$wb['port_txt'] = 'Θύρα';
+$wb['type_txt'] = 'τ�πος';
+$wb['target_txt'] = 'Target';
+$wb['weight_txt'] = 'Weight';
+$wb['port_txt'] = 'Port';
$wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Ενεργή';
-$wb['aux_txt'] = 'Προτερεότητα';
-$wb['limit_dns_record_txt'] = 'Έχετε φτάσει στο μέγιστο πλήθος εγγραφών DNS για τον λογιαριασμό σας.';
-$wb['no_zone_perm'] = 'Δεν έχετε δικαίωμα να προσθέσετε εγγραφές σε αυτή την ζώνη DNS.';
-$wb['name_error_empty'] = 'Το hostname είναι άδειο.';
-$wb['name_error_regex'] = 'Το hostname δεν έχει έγκυρη μορφοποίηση.';
-$wb['data_error_empty'] = 'Άδεια εγγραφή Server';
-$wb['data_error_regex'] = 'Η εγγραφή Server δεν έχει έγκυρη μορφοποίηση';
-$wb['srv_error_regex'] = 'Μη έγκυρη μορφοποίηση εγγραφής Server. Η εγγραφή Server πρέπει να περιέχει 3 κομμάτια χαρακτήρων χωρισμένα με κενά.';
+$wb['active_txt'] = 'Ενε�γή';
+$wb['aux_txt'] = 'Π�οτε�αιότητα';
+$wb['limit_dns_record_txt'] = 'Έχετε φτάσει το μÎγιστο πλήθος των εγγÏ�αφών DNS για τον λογαÏ�ιασμό σας.';
+$wb['no_zone_perm'] = 'Δεν Îχετε δικαίωμα να Ï€Ï�οσθÎσετε εγγÏ�αφÎÏ‚ σε αυτή τη ζώνη.';
+$wb['name_error_empty'] = 'Το hostname δεν Îχει οÏ�ιστεί.';
+$wb['name_error_regex'] = 'Το hostname δεν Îχει σωστή μοÏ�φοποίηση.';
+$wb['data_error_empty'] = 'Η εγγ�αφή Server είναι κενή';
+$wb['data_error_regex'] = 'ΕγγÏ�αφή Server με μη ÎγκυÏ�η μοÏ�φοποίηση';
+$wb['srv_error_regex'] = 'ΕγγÏ�αφή Server με μη ÎγκυÏ�η μοÏ�φοποίηση. Η εγγÏ�αφή Server Ï€Ï�Îπει να πεÏ�ιÎχει 3 λÎξεις χωÏ�ισμÎνες με κενά.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
?>
diff --git a/interface/web/dns/lib/lang/el_dns_wizard.lng b/interface/web/dns/lib/lang/el_dns_wizard.lng
index 2b177e6..96bea29 100644
--- a/interface/web/dns/lib/lang/el_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/el_dns_wizard.lng
@@ -28,13 +28,13 @@
$wb['error_ns1_regex'] = 'Ο NS1 περιέχει μη επιτρεπόμενους χαρακτήρες';
$wb['error_ns2_regex'] = 'Ο NS2 περιέχει μη επιτρεπόμενους χαρακτήρες';
$wb['error_email_regex'] = 'Το Email δεν περιέχει μια έγκυρη διεύθυνση.';
-$wb['dns_zone_txt'] = 'Ζώνη DNS';
-$wb['globalsearch_resultslimit_of_txt'] = 'από';
-$wb['globalsearch_resultslimit_results_txt'] = 'αποτελέσματα';
-$wb['globalsearch_noresults_text_txt'] = 'Δεν υπάρχουν αποτελέσματα.';
-$wb['globalsearch_noresults_limit_txt'] = '0 αποτελέσματα';
-$wb['globalsearch_searchfield_watermark_txt'] = 'Αναζήτηση';
-$wb['globalsearch_suggestions_text_txt'] = 'Προτάσεις';
-$wb['list_head_txt'] = 'Οδηγός Ζώνης DNS';
-$wb['list_desc_txt'] = 'Δημιουργία Ζώνης DNS Zone μέσω Οδηγού';
+$wb['dns_zone_txt'] = 'DNS Zone';
+$wb['globalsearch_resultslimit_of_txt'] = 'of';
+$wb['globalsearch_resultslimit_results_txt'] = 'results';
+$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['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/en_dns_dkim.lng b/interface/web/dns/lib/lang/en_dns_dkim.lng
index 62025f8..b89f024 100644
--- a/interface/web/dns/lib/lang/en_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/en_dns_dkim.lng
@@ -7,4 +7,5 @@
$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.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/en_dns_soa_list.lng b/interface/web/dns/lib/lang/en_dns_soa_list.lng
index 9920382..95f9a9b 100644
--- a/interface/web/dns/lib/lang/en_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/en_dns_soa_list.lng
@@ -7,4 +7,5 @@
$wb["mbox_txt"] = 'Email';
$wb["add_new_record_wizard_txt"] = 'Add new DNS Zone with Wizard';
$wb["add_new_record_txt"] = 'Add new DNS Zone manually';
+$wb["import_zone_file_txt"] = 'Import Zone File';
?>
diff --git a/interface/web/dns/lib/lang/es_dns_dkim.lng b/interface/web/dns/lib/lang/es_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/es_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/es_dns_dkim.lng
@@ -7,4 +7,5 @@
$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.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/fi_dns_dkim.lng b/interface/web/dns/lib/lang/fi_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/fi_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/fi_dns_dkim.lng
@@ -7,4 +7,5 @@
$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.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/fr.lng b/interface/web/dns/lib/lang/fr.lng
index 6ec30d3..bfed1eb 100644
--- a/interface/web/dns/lib/lang/fr.lng
+++ b/interface/web/dns/lib/lang/fr.lng
@@ -17,6 +17,6 @@
$wb['DNS Wizard'] = 'Assistant DNS';
$wb['Add DNS Zone'] = 'Ajout zone DNS';
$wb['Templates'] = 'Modèles';
-$wb['Secondary Zones'] = 'Secondary Zones';
-$wb['Import Zone File'] = 'Import Zone File';
+$wb['Secondary Zones'] = 'Zones secondaires';
+$wb['Import Zone File'] = 'Importer un fichier de Zone';
?>
diff --git a/interface/web/dns/lib/lang/fr_dns_a_list.lng b/interface/web/dns/lib/lang/fr_dns_a_list.lng
index f0a5356..67eb1b7 100644
--- a/interface/web/dns/lib/lang/fr_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/fr_dns_a_list.lng
@@ -11,5 +11,5 @@
$wb['add_new_record_txt'] = 'Ajouter un nouvel enregistrement A';
$wb['page_txt'] = 'Page';
$wb['page_of_txt'] = 'de';
-$wb['delete_confirmation'] = 'Voulez-vous vraiment supprimer cet enregistrement';
+$wb['delete_confirmation'] = 'Voulez-vous vraiment supprimer cet enregistrement ?';
?>
diff --git a/interface/web/dns/lib/lang/fr_dns_dkim.lng b/interface/web/dns/lib/lang/fr_dns_dkim.lng
index 6b2c687..19dd5ea 100644
--- a/interface/web/dns/lib/lang/fr_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/fr_dns_dkim.lng
@@ -6,4 +6,5 @@
$wb["limit_dns_record_txt"] = 'Le nombre max. d\'enregistrement DNS pour votre compte à été atteint.';
$wb["no_zone_perm"] = 'Vous n\'avez pas la permission d\'ajouter un enregistrement à cette Zone DNS.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/fr_dns_import.lng b/interface/web/dns/lib/lang/fr_dns_import.lng
index 6352c24..24584c0 100644
--- a/interface/web/dns/lib/lang/fr_dns_import.lng
+++ b/interface/web/dns/lib/lang/fr_dns_import.lng
@@ -1,16 +1,16 @@
<?php
$wb['server_id_txt'] = 'Server';
$wb['client_txt'] = 'Client';
-$wb['btn_save_txt'] = 'Import Zonefile';
-$wb['btn_cancel_txt'] = 'Cancel';
-$wb['domain_txt'] = 'Domain';
-$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
-$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
-$wb['zonefile_to_import_txt'] = 'Zone File';
-$wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
-$wb['title'] = 'Import Zone Files';
-$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
-$wb['zone_file_import_txt'] = 'Zone File Import';
$wb['error_no_server_id'] = 'Aucun serveur fourni.';
$wb['error_not_allowed_server_id'] = 'Le serveur choisi n\'est pas autorisé pour ce compte.';
-?>
\ No newline at end of file
+$wb['btn_save_txt'] = 'Importer un fichier de Zone';
+$wb['btn_cancel_txt'] = 'Annuler';
+$wb['domain_txt'] = 'Domaine';
+$wb['zone_file_successfully_imported_txt'] = 'Le fichier de Zone a été importé avec succès !';
+$wb['error_no_valid_zone_file_txt'] = 'Le fichier de Zone semble être invalide !';
+$wb['zonefile_to_import_txt'] = 'Fichier de Zone';
+$wb['domain_field_desc_txt'] = 'Peut-être laissé vide si le nom de domaine est dans le nom de fichier ou dans le contenu du fichier de Zone.';
+$wb['title'] = 'Importer des fichiers de Zone';
+$wb['no_file_uploaded_error'] = 'Aucun fichier de Zone téléchargé';
+$wb['zone_file_import_txt'] = 'Importer un fichier de Zone';
+?>
diff --git a/interface/web/dns/lib/lang/fr_dns_mx.lng b/interface/web/dns/lib/lang/fr_dns_mx.lng
index a8b0730..2253ffe 100644
--- a/interface/web/dns/lib/lang/fr_dns_mx.lng
+++ b/interface/web/dns/lib/lang/fr_dns_mx.lng
@@ -13,6 +13,6 @@
$wb['name_error_regex'] = 'Le format du nom d\'hôte est invalide.';
$wb['data_error_empty'] = 'Le nom d\'hôte du serveur mail est vide';
$wb['data_error_regex'] = 'Le format du nom d\'hôte du serveur mail est invalide';
-$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
+$wb['duplicate_mx_record_txt'] = 'Enregistrement MX dupliqué.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
?>
diff --git a/interface/web/dns/lib/lang/fr_dns_slave.lng b/interface/web/dns/lib/lang/fr_dns_slave.lng
index 6762a21..887cc7d 100644
--- a/interface/web/dns/lib/lang/fr_dns_slave.lng
+++ b/interface/web/dns/lib/lang/fr_dns_slave.lng
@@ -2,7 +2,7 @@
$wb['server_id_txt'] = 'Serveur';
$wb['origin_txt'] = 'Zone DNS';
$wb['ns_txt'] = 'NS';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Actif';
$wb['limit_dns_slave_zone_txt'] = 'Le nombre maximal de zones DNS secondaire pour votre compte est atteint.';
$wb['client_txt'] = 'Client';
$wb['xfer_txt'] = 'Autoriser les transferts de zone de <br />ces IPs (liste séparée par des virgules)';
@@ -13,5 +13,5 @@
$wb['ns_error_regex'] = 'Le format de l\'enregistrement NS est invalide.';
$wb['eg_domain_tld'] = 'ex. domain.tld.';
$wb['ipv4_form_txt'] = 'Format IPv4 - ex. 1.2.3.4';
-$wb['secondary_zone_txt'] = 'Secondary DNS Zone';
+$wb['secondary_zone_txt'] = 'Zone DNS secondaire';
?>
diff --git a/interface/web/dns/lib/lang/fr_dns_soa.lng b/interface/web/dns/lib/lang/fr_dns_soa.lng
index 97e1ea0..a3410ae 100644
--- a/interface/web/dns/lib/lang/fr_dns_soa.lng
+++ b/interface/web/dns/lib/lang/fr_dns_soa.lng
@@ -28,12 +28,12 @@
$wb['eg_domain_tld'] = 'ex. domain.tld';
$wb['eg_ns1_domain_tld'] = 'ex. ns1.domain.tld';
$wb['eg_webmaster_domain_tld'] = 'ex. webmaster@domain.tld';
-$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.';
-$wb['refresh_range_error'] = 'Min. Refresh time is 60 seconds.';
-$wb['retry_range_error'] = 'Min. Retry time is 60 seconds.';
-$wb['expire_range_error'] = 'Min. Expire time is 60 seconds.';
-$wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.';
-$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
-$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
$wb['error_not_allowed_server_id'] = 'Le serveur choisi n\'est pas autorisé pour ce compte.';
-?>
\ No newline at end of file
+$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'Le domaine ne peut pas être modifié. Veuillez contacter votre administrateur si vous souhaitez modifier le nom de domaine.';
+$wb['refresh_range_error'] = 'Le temps de refresh minimum est 60 secondes.';
+$wb['retry_range_error'] = 'Le temps de retry minimum est 60 secondes.';
+$wb['expire_range_error'] = 'Le temps de expire minimum est 60 secondes.';
+$wb['minimum_range_error'] = 'Le temps Minimum minimum est 60 secondes.';
+$wb['ttl_range_error'] = 'La TTL minimum est 60 secondes.';
+$wb['xfer_error_regex'] = 'A noter également : Veuillez utiliser une adresse IP.';
+?>
diff --git a/interface/web/dns/lib/lang/fr_dns_srv.lng b/interface/web/dns/lib/lang/fr_dns_srv.lng
index 6d9dbf0..55f2484 100644
--- a/interface/web/dns/lib/lang/fr_dns_srv.lng
+++ b/interface/web/dns/lib/lang/fr_dns_srv.lng
@@ -3,8 +3,8 @@
$wb['zone_txt'] = 'Zone';
$wb['name_txt'] = 'Nom d\'hôte';
$wb['type_txt'] = 'type';
-$wb['target_txt'] = 'Target';
-$wb['weight_txt'] = 'Weight';
+$wb['target_txt'] = 'Cible';
+$wb['weight_txt'] = 'Poids';
$wb['port_txt'] = 'Port';
$wb['ttl_txt'] = 'TTL';
$wb['active_txt'] = 'Actif';
diff --git a/interface/web/dns/lib/lang/fr_dns_wizard.lng b/interface/web/dns/lib/lang/fr_dns_wizard.lng
index 02f55f1..74c5d84 100644
--- a/interface/web/dns/lib/lang/fr_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/fr_dns_wizard.lng
@@ -29,15 +29,15 @@
$wb['error_ns1_regex'] = 'NS1 contient des caractères invalides.';
$wb['error_ns2_regex'] = 'NS2 contient des caractères invalides.';
$wb['error_email_regex'] = 'L\'email ne contient pas une adresse email valide.';
-$wb['dns_zone_txt'] = 'DNS Zone';
-$wb['globalsearch_resultslimit_of_txt'] = 'of';
-$wb['globalsearch_resultslimit_results_txt'] = 'results';
-$wb['globalsearch_noresults_text_txt'] = 'No results.';
-$wb['globalsearch_noresults_limit_txt'] = '0 results';
-$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
+$wb['dns_zone_txt'] = 'Zone DNS';
+$wb['globalsearch_resultslimit_of_txt'] = 'de';
+$wb['globalsearch_resultslimit_results_txt'] = 'resultats';
+$wb['globalsearch_noresults_text_txt'] = 'Pas de résultat.';
+$wb['globalsearch_noresults_limit_txt'] = '0 resultat';
+$wb['globalsearch_searchfield_watermark_txt'] = 'Chercher';
$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['error_no_server_id'] = 'Aucun serveur fourni.';
$wb['error_not_allowed_server_id'] = 'Le serveur choisi n\'est pas autorisé pour ce compte.';
+$wb['list_head_txt'] = 'Assistant Zone DNS';
+$wb['list_desc_txt'] = 'Créer une Zone DNS via l\'assistant';
?>
diff --git a/interface/web/dns/lib/lang/hr_dns_dkim.lng b/interface/web/dns/lib/lang/hr_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/hr_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/hr_dns_dkim.lng
@@ -7,4 +7,5 @@
$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.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/hu_dns_dkim.lng b/interface/web/dns/lib/lang/hu_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/hu_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/hu_dns_dkim.lng
@@ -7,4 +7,5 @@
$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.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/id_dns_dkim.lng b/interface/web/dns/lib/lang/id_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/id_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/id_dns_dkim.lng
@@ -7,4 +7,5 @@
$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.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/it_dns_dkim.lng b/interface/web/dns/lib/lang/it_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/it_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/it_dns_dkim.lng
@@ -7,4 +7,5 @@
$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.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/ja_dns_dkim.lng b/interface/web/dns/lib/lang/ja_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/ja_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/ja_dns_dkim.lng
@@ -7,4 +7,5 @@
$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.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/nl_dns_dkim.lng b/interface/web/dns/lib/lang/nl_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/nl_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/nl_dns_dkim.lng
@@ -7,4 +7,5 @@
$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.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/ru_dns_dkim.lng b/interface/web/dns/lib/lang/ru_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/ru_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/ru_dns_dkim.lng
@@ -7,4 +7,5 @@
$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.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/se_dns_dkim.lng b/interface/web/dns/lib/lang/se_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/se_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/se_dns_dkim.lng
@@ -7,4 +7,5 @@
$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.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/sk_dns_dkim.lng b/interface/web/dns/lib/lang/sk_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/sk_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/sk_dns_dkim.lng
@@ -7,4 +7,5 @@
$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.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/tr_dns_dkim.lng b/interface/web/dns/lib/lang/tr_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/tr_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/tr_dns_dkim.lng
@@ -7,4 +7,5 @@
$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.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/templates/dns_dkim_edit.htm b/interface/web/dns/templates/dns_dkim_edit.htm
index 3f89320..052f6d5 100644
--- a/interface/web/dns/templates/dns_dkim_edit.htm
+++ b/interface/web/dns/templates/dns_dkim_edit.htm
@@ -6,8 +6,12 @@
<fieldset class="inlineLabels">
<div class="ctrlHolder">
<label for="data">{tmpl_var name='public_key_txt'}</label>
- <textarea name="data" id="data" readonly>{tmpl_var name='public_key'}</textarea>
+ <textarea name="data" id="data" >{tmpl_var name='public_key'}</textarea>
</div>
+ <div class="ctrlHolder">
+ <label for="selector">{tmpl_var name='selector_txt'}</label>
+ <input name="selector" id="selector" value="{tmpl_var name='selector'}" size="20" maxlength="63" type="text" class="textInput" />
+ </div>
<div class="ctrlHolder">
<label for="ttl">{tmpl_var name='ttl_txt'}</label>
<input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
diff --git a/interface/web/dns/templates/dns_soa_list.htm b/interface/web/dns/templates/dns_soa_list.htm
index 5d4e772..0429407 100644
--- a/interface/web/dns/templates/dns_soa_list.htm
+++ b/interface/web/dns/templates/dns_soa_list.htm
@@ -24,7 +24,7 @@
<div class="buttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_wizard.php');"><span>{tmpl_var name="add_new_record_wizard_txt"}</span></button>
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_soa_edit.php');"><span>{tmpl_var name="add_new_record_txt"}</span></button>
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_import.php');"><span>Import Zone File</span></button>
+ <button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_import.php');"><span>{tmpl_var name="import_zone_file_txt"}</span></button>
</div>
</fieldset>
</div>
@@ -80,4 +80,4 @@
</fieldset>
</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/interface/web/help/lib/lang/el_help_faq_list.lng b/interface/web/help/lib/lang/el_help_faq_list.lng
index 30405c5..b6c7b46 100644
--- a/interface/web/help/lib/lang/el_help_faq_list.lng
+++ b/interface/web/help/lib/lang/el_help_faq_list.lng
@@ -1,3 +1,3 @@
<?php
-$wb['edit_txt'] = 'Επεξεργασία';
+$wb['edit_txt'] = 'Edit';
?>
diff --git a/interface/web/help/lib/lang/fr_help_faq_list.lng b/interface/web/help/lib/lang/fr_help_faq_list.lng
index b6c7b46..6af86cf 100644
--- a/interface/web/help/lib/lang/fr_help_faq_list.lng
+++ b/interface/web/help/lib/lang/fr_help_faq_list.lng
@@ -1,3 +1,3 @@
<?php
-$wb['edit_txt'] = 'Edit';
+$wb['edit_txt'] = 'Editer';
?>
diff --git a/interface/web/help/lib/lang/fr_help_faq_sections_list.lng b/interface/web/help/lib/lang/fr_help_faq_sections_list.lng
index a99ab07..a15c2ea 100644
--- a/interface/web/help/lib/lang/fr_help_faq_sections_list.lng
+++ b/interface/web/help/lib/lang/fr_help_faq_sections_list.lng
@@ -1,5 +1,5 @@
<?php
-$wb['faq_section_name_txt'] = 'Nome de la Section';
+$wb['faq_section_name_txt'] = 'Nom de la Section';
$wb['faq_delete_txt'] = 'Supprimer';
$wb['faq_edit_txt'] = 'Editer';
$wb['faq_sections_txt'] = 'Sections';
diff --git a/interface/web/help/lib/lang/fr_support_message.lng b/interface/web/help/lib/lang/fr_support_message.lng
index 9f9dbe8..10d37a9 100644
--- a/interface/web/help/lib/lang/fr_support_message.lng
+++ b/interface/web/help/lib/lang/fr_support_message.lng
@@ -6,10 +6,10 @@
$wb['tstamp_txt'] = 'Timestamp';
$wb['reply_txt'] = 'Répondre';
$wb['date_txt'] = 'Date';
-$wb['support_request_subject_txt'] = 'Support Request';
-$wb['support_request_txt'] = 'You have got a support request. Please don\'t reply to this email, but process the support request inside ISPConfig.';
-$wb['answer_to_support_request_txt'] = 'You have got a reply to your support request. Please don\'t reply to this email, but process the message inside ISPConfig.';
+$wb['support_request_subject_txt'] = 'Demande d\'assistance';
+$wb['support_request_txt'] = 'Vous avez une demande d\'assistance. Merci de ne pas répondre directement à cet email, mais de gérer la demande d\'assistance dans ISPConfig.';
+$wb['answer_to_support_request_txt'] = 'Vous avez une réponse à votre demande d\'assistance. Merci de ne pas répondre directement à cet email, mais de gérer la demande d\'assistance dans ISPConfig.';
$wb['answer_to_support_request_sent_txt'] = 'Your reply to the support request has been sent. Please don\'t reply to this email.';
-$wb['support_request_sent_txt'] = 'Your support request has been sent. Please don\'t reply to this email.';
-$wb['recipient_or_sender_email_address_not_valid_txt'] = 'The message could not be sent because the recipient and/or the sender email address is not valid.';
+$wb['support_request_sent_txt'] = 'Votre réponse à la demande d\'assistance a été envoyée. Merci de ne pas répondre à cet email.';
+$wb['recipient_or_sender_email_address_not_valid_txt'] = 'Le message n\'a pas pu être envoyé parce que l\'adresse email du destinataire et/ou de l\'émetteur est invalide.';
?>
diff --git a/interface/web/js/dns_dkim.js b/interface/web/js/dns_dkim.js
index 2811dbc..58f8dcf 100644
--- a/interface/web/js/dns_dkim.js
+++ b/interface/web/js/dns_dkim.js
@@ -60,6 +60,7 @@
else {
document.getElementsByName('data')[0].value = request.responseXML.getElementsByTagName('data')[0].firstChild.nodeValue;
document.getElementsByName('name')[0].value = request.responseXML.getElementsByTagName('name')[0].firstChild.nodeValue;
+ document.getElementsByName('selector')[0].value = request.responseXML.getElementsByTagName('selector')[0].firstChild.nodeValue;
}
break;
default:
diff --git a/interface/web/login/lib/lang/el.lng b/interface/web/login/lib/lang/el.lng
index 2dc5ce5..95e1db2 100644
--- a/interface/web/login/lib/lang/el.lng
+++ b/interface/web/login/lib/lang/el.lng
@@ -14,14 +14,14 @@
$wb['username_txt'] = 'Όνομα χρήστη';
$wb['password_txt'] = 'Συνθηματικό';
$wb['login_button_txt'] = 'Είσοδος';
-$wb['pw_lost_txt'] = 'Χαμένο Συνθηματικό';
-$wb['error_maintenance_mode'] = 'Αυτή η εγκατάσταση ISPConfig βρίσκεται σε κατάσταση συντήρησης. Ευχαριστούμε για την υπομονή σας.';
-$wb['login_txt'] = 'Είσοδος';
-$wb['pw_reset_txt'] = 'Αρχικοποίηση Συνθηματικού';
-$wb['pw_button_txt'] = 'Επαναποστολή Συνθηματικού';
+$wb['pw_lost_txt'] = 'Password lost';
+$wb['error_maintenance_mode'] = 'This ISPConfig installation is currently under maintenance. We should be back shortly. Thank you for your patience.';
+$wb['login_txt'] = 'Login';
+$wb['pw_reset_txt'] = 'Password reset';
+$wb['pw_button_txt'] = 'Resend password';
$wb['email_txt'] = 'Email';
-$wb['theme_not_compatible'] = 'Η επιλεγμένη θεματική παραλλαγή δεν είναι συμβατη με την τρέχουσα έκδοση ISPConfig. Παρακαλούμε ελέξτε για πιο πρόσφατη έκδοση.<br />Η προεπιλεγμένη θεματική παραλλαγή ενεργοποιήθηκε αυτόματα.';
-$wb['back_txt'] = 'Επιστροφή';
+$wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.<br />The default theme as been activated automatically.';
+$wb['back_txt'] = 'Back';
$wb['email_error'] = 'Email contains unallowed characters or has a invalid format.';
$wb['stay_logged_in_txt'] = 'Keep me logged in';
?>
diff --git a/interface/web/login/lib/lang/fr.lng b/interface/web/login/lib/lang/fr.lng
index 69ca7cd..98aef7d 100644
--- a/interface/web/login/lib/lang/fr.lng
+++ b/interface/web/login/lib/lang/fr.lng
@@ -1,7 +1,7 @@
<?php
$wb['error_user_password_empty'] = 'Le nom d\'utilisateur ou le mot de passe sont vides.';
$wb['error_user_password_incorrect'] = 'Le nom d\'utilisateur ou le mot de passe sont incorrects.';
-$wb['error_user_blocked'] = 'Lutilisateur a été bloqué.';
+$wb['error_user_blocked'] = 'L\'utilisateur a été bloqué.';
$wb['error_user_too_many_logins'] = 'Trop de tentatives effectuées, essayez dans 15 minutes.';
$wb['pass_reset_txt'] = 'Un nouveau mot de passe vous sera envoyé à votre adresse e-mail si celle-ci correspond à celle dans votre espace client.';
$wb['pw_reset'] = 'Le mot de passe a été réinitialisé, et vous a été envoyé à votre adresse e-mail.';
@@ -14,14 +14,14 @@
$wb['username_txt'] = 'Nom d\'utilisateur';
$wb['password_txt'] = 'Mot de passe';
$wb['login_button_txt'] = 'Connexion';
-$wb['pw_lost_txt'] = 'Password lost';
-$wb['error_maintenance_mode'] = 'This ISPConfig installation is currently under maintenance. We should be back shortly. Thank you for your patience.';
+$wb['pw_lost_txt'] = 'Mot de passe perdu';
+$wb['error_maintenance_mode'] = 'Cette installation de ISPConfig est actuellement en maintenance. Nous serons de retour bientôt. Merci pour votre patience.';
$wb['login_txt'] = 'Login';
-$wb['pw_reset_txt'] = 'Password reset';
-$wb['pw_button_txt'] = 'Resend password';
+$wb['pw_reset_txt'] = 'Réinitialiser le mot de passe';
+$wb['pw_button_txt'] = 'Renvoyer le mot de passe';
$wb['email_txt'] = 'Email';
-$wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.<br />The default theme as been activated automatically.';
-$wb['back_txt'] = 'Back';
+$wb['theme_not_compatible'] = 'Le thème choisi n\'est pas compatible avecla version courante de ISPConfig. Veuillez chercher une nouvelle version du thème.<br />Le thème par defaut a été automatiquement activé.';
+$wb['back_txt'] = 'Retour';
$wb['email_error'] = 'Email contains unallowed characters or has a invalid format.';
$wb['stay_logged_in_txt'] = 'Keep me logged in';
?>
diff --git a/interface/web/mail/form/mail_domain.tform.php b/interface/web/mail/form/mail_domain.tform.php
index 398b76e..5a63d84 100644
--- a/interface/web/mail/form/mail_domain.tform.php
+++ b/interface/web/mail/form/mail_domain.tform.php
@@ -125,6 +125,18 @@
'cols' => '30',
'rows' => '10'
),
+ 'dkim_selector' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => 'default',
+ 'value' => 'default',
+ 'width' => '20',
+ 'maxlength' => '63',
+ 'validators' => array ( 0 => array ( 'type' => 'REGEX',
+ 'regex' => '/^[a-z0-9]{0,63}$/',
+ 'errmsg'=> 'dkim_selector_error'),
+ ),
+ ),
'active' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
diff --git a/interface/web/mail/form/mail_get.tform.php b/interface/web/mail/form/mail_get.tform.php
index 7ed9699..a74ff23 100644
--- a/interface/web/mail/form/mail_get.tform.php
+++ b/interface/web/mail/form/mail_get.tform.php
@@ -129,7 +129,7 @@
'source_delete' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
- 'default' => 'y',
+ 'default' => 'n',
'value' => array(0 => 'n', 1 => 'y')
),
'source_read_all' => array (
diff --git a/interface/web/mail/lib/lang/ar_mail_domain.lng b/interface/web/mail/lib/lang/ar_mail_domain.lng
index c0f30d2..e6d30f4 100644
--- a/interface/web/mail/lib/lang/ar_mail_domain.lng
+++ b/interface/web/mail/lib/lang/ar_mail_domain.lng
@@ -16,4 +16,6 @@
$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['dkim_selector_txt'] = 'DKIM-Selector';
+$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
?>
diff --git a/interface/web/mail/lib/lang/ar_mail_get.lng b/interface/web/mail/lib/lang/ar_mail_get.lng
index 09ef84e..8ae7712 100644
--- a/interface/web/mail/lib/lang/ar_mail_get.lng
+++ b/interface/web/mail/lib/lang/ar_mail_get.lng
@@ -15,4 +15,5 @@
$wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
?>
diff --git a/interface/web/mail/lib/lang/bg_mail_domain.lng b/interface/web/mail/lib/lang/bg_mail_domain.lng
index 4c028ad..6c0523e 100644
--- a/interface/web/mail/lib/lang/bg_mail_domain.lng
+++ b/interface/web/mail/lib/lang/bg_mail_domain.lng
@@ -13,6 +13,8 @@
$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_selector_txt'] = 'DKIM-Selector';
+$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
$wb['policy_txt'] = 'Спамфилтър';
$wb['no_policy'] = '- не е разрешен -';
diff --git a/interface/web/mail/lib/lang/bg_mail_get.lng b/interface/web/mail/lib/lang/bg_mail_get.lng
index c615c1d..e1b1935 100644
--- a/interface/web/mail/lib/lang/bg_mail_get.lng
+++ b/interface/web/mail/lib/lang/bg_mail_get.lng
@@ -15,4 +15,5 @@
$wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
?>
diff --git a/interface/web/mail/lib/lang/br_mail_domain.lng b/interface/web/mail/lib/lang/br_mail_domain.lng
index 7f320be..e13288a 100644
--- a/interface/web/mail/lib/lang/br_mail_domain.lng
+++ b/interface/web/mail/lib/lang/br_mail_domain.lng
@@ -16,4 +16,6 @@
$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['dkim_selector_txt'] = 'DKIM-Selector';
+$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
?>
diff --git a/interface/web/mail/lib/lang/br_mail_get.lng b/interface/web/mail/lib/lang/br_mail_get.lng
index 0593b10..801aebc 100644
--- a/interface/web/mail/lib/lang/br_mail_get.lng
+++ b/interface/web/mail/lib/lang/br_mail_get.lng
@@ -15,4 +15,5 @@
$wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
?>
diff --git a/interface/web/mail/lib/lang/cz_mail_domain.lng b/interface/web/mail/lib/lang/cz_mail_domain.lng
index 49457e2..41766f5 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain.lng
@@ -14,6 +14,8 @@
$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['dkim_selector_txt'] = 'DKIM-Selector';
+$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
$wb['policy_txt'] = 'Spamový filtr';
$wb['no_policy'] = '- nepovoleno -';
?>
diff --git a/interface/web/mail/lib/lang/cz_mail_get.lng b/interface/web/mail/lib/lang/cz_mail_get.lng
index 51b9f34..c0914da 100644
--- a/interface/web/mail/lib/lang/cz_mail_get.lng
+++ b/interface/web/mail/lib/lang/cz_mail_get.lng
@@ -15,4 +15,5 @@
$wb['source_server_error_regex'] = 'POP3/IMAP server není validní doménový název.';
$wb['source_read_all_txt'] = 'Načíst všechny e-maily (včetně již přečtené pošty)';
$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
?>
diff --git a/interface/web/mail/lib/lang/de_mail_domain.lng b/interface/web/mail/lib/lang/de_mail_domain.lng
index 6d05728..37cb08e 100644
--- a/interface/web/mail/lib/lang/de_mail_domain.lng
+++ b/interface/web/mail/lib/lang/de_mail_domain.lng
@@ -16,4 +16,6 @@
$wb['limit_maildomain_txt'] = 'Die maximale Anzahl an E-Mail Domains für Ihr Konto wurde erreicht.';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- nicht aktiviert -';
+$wb['dkim_selector_txt'] = 'DKIM-Selector';
+$wb['dkim_selector_error'] = 'Ungültiger DKIM-Selector. Verwenden Sie nur alphanumerische Zeichen (a-z oder 0-9)';
?>
diff --git a/interface/web/mail/lib/lang/de_mail_get.lng b/interface/web/mail/lib/lang/de_mail_get.lng
index fd4e10e..38ff4f8 100644
--- a/interface/web/mail/lib/lang/de_mail_get.lng
+++ b/interface/web/mail/lib/lang/de_mail_get.lng
@@ -5,6 +5,7 @@
$wb['source_username_txt'] = 'Benutzername';
$wb['source_password_txt'] = 'Passwort';
$wb['source_delete_txt'] = 'E-Mails nach Empfang löschen';
+$wb['source_delete_note_txt'] = 'Bitte prüfen Sie erst, ob das Abholen funktioniert, bevor Sie diese Option aktivieren.';
$wb['destination_txt'] = 'Ziel';
$wb['active_txt'] = 'Aktiv';
$wb['limit_fetchmail_txt'] = 'Die maximale Anzahl an Sammelkonto Einträgen für Ihr Konto wurde erreicht.';
@@ -14,5 +15,5 @@
$wb['destination_error_isemail'] = 'Kein Ziel gewählt.';
$wb['source_server_error_regex'] = 'POP3/IMAP Server ist kein gültiger Domainname.';
$wb['source_read_all_txt'] = 'Alle E-Mails abrufen (inkl. bereits gelesene E-Mails)';
-$wb['error_delete_read_all_combination'] = 'Unzulässige Kombination von Optionen. Sie können \"E-Mails nach Empfang löschen\" = nein nicht zusammen mit \"Alle E-Mails abrufen (inkl. bereits gelesene E-Mails)\" = ja benutzen.';
+$wb['error_delete_read_all_combination'] = 'Unzulässige Kombination von Optionen. Sie können: E-Mails nach Empfang löschen = nein nicht zusammen mit: Alle E-Mails abrufen (inkl. bereits gelesene E-Mails) = ja benutzen.';
?>
diff --git a/interface/web/mail/lib/lang/el.lng b/interface/web/mail/lib/lang/el.lng
index 74c51a8..f8cadc6 100644
--- a/interface/web/mail/lib/lang/el.lng
+++ b/interface/web/mail/lib/lang/el.lng
@@ -11,7 +11,7 @@
$wb['Get Email'] = 'Λήψη Email';
$wb['Spamfilter'] = 'Φίλτρο Spam';
$wb['Email Routing'] = 'Δρομολόγηση Email';
-$wb['Email transport'] = 'Δρομολογήση Email';
+$wb['Email transport'] = 'Μεταφορά Email';
$wb['Mailbox'] = 'Θυρίδα';
$wb['Autoresponder'] = 'Αυτόματη απάντηση';
$wb['Mail Filter'] = 'Φίλτρο Mail';
@@ -44,5 +44,5 @@
$wb['Global Filters'] = 'Καθολικά Φίλτρα';
$wb['Domain Alias'] = 'Ψευδώνυμο Domain';
$wb['Relay Recipients'] = 'Παραλήπτες Relay';
-$wb['Mailbox quota'] = 'Όριο θυρίδας Mail';
+$wb['Mailbox quota'] = 'Mailbox quota';
?>
diff --git a/interface/web/mail/lib/lang/el_mail_alias.lng b/interface/web/mail/lib/lang/el_mail_alias.lng
index 48d35a0..7915af4 100644
--- a/interface/web/mail/lib/lang/el_mail_alias.lng
+++ b/interface/web/mail/lib/lang/el_mail_alias.lng
@@ -9,6 +9,6 @@
$wb['limit_mailalias_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των ψευδωνύμων email για τον λογαριασμό σας.';
$wb['duplicate_mailbox_txt'] = 'Υπάρχει ήδη μια θυρίδα με αυτή τη διεύθυνση email';
$wb['domain_txt'] = 'Domain';
-$wb['duplicate_email_alias_txt'] = 'Το ψευδώνυμο για το email υπάρχει ήδη.';
-$wb['source_txt'] = 'Ψευδώνυμο';
+$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
+$wb['source_txt'] = 'Alias';
?>
diff --git a/interface/web/mail/lib/lang/el_mail_domain_catchall.lng b/interface/web/mail/lib/lang/el_mail_domain_catchall.lng
index fc5c0d7..43c0bdf 100644
--- a/interface/web/mail/lib/lang/el_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/el_mail_domain_catchall.lng
@@ -6,6 +6,6 @@
$wb['no_domain_perm'] = 'Δεν έχετε δικαιώματα για αυτό το domain.';
$wb['domain_error_regex'] = 'Μη έγκρυρο όνομα domain ή το όνομα περιέχει μη επιτρεπόμενους χαρακτήρες';
$wb['limit_mailcatchall_txt'] = 'Το μέγιστο πλήθος των email catchall για τον λογαριασμό σας, έχει εξαντληθεί.';
-$wb['source_txt'] = 'Πηγή';
-$wb['destination_error_isemail'] = 'Ο προορισμός δεν είναι έγκυρη διεύθυνση email.';
+$wb['source_txt'] = 'Source';
+$wb['destination_error_isemail'] = 'Destination is no valid email address.';
?>
diff --git a/interface/web/mail/lib/lang/el_mail_forward.lng b/interface/web/mail/lib/lang/el_mail_forward.lng
index 78ce691..ba16617 100644
--- a/interface/web/mail/lib/lang/el_mail_forward.lng
+++ b/interface/web/mail/lib/lang/el_mail_forward.lng
@@ -5,5 +5,5 @@
$wb['limit_mailforward_txt'] = 'Το μέγιστο πλήθος των email forwarders για τον λογαρισμό σας, έχει εξαντληθεί';
$wb['duplicate_mailbox_txt'] = 'Υπάρχει ήδη μια θυρίδα με αυτή τη διεύθυνση email';
$wb['domain_txt'] = 'Domain';
-$wb['source_txt'] = 'Πηγή Email';
+$wb['source_txt'] = 'Source Email';
?>
diff --git a/interface/web/mail/lib/lang/el_mail_get.lng b/interface/web/mail/lib/lang/el_mail_get.lng
index 1ba5c20..0ec9645 100644
--- a/interface/web/mail/lib/lang/el_mail_get.lng
+++ b/interface/web/mail/lib/lang/el_mail_get.lng
@@ -4,7 +4,7 @@
$wb['source_server_txt'] = 'Pop3/Imap Server';
$wb['source_username_txt'] = 'Όνομα Χρήστη';
$wb['source_password_txt'] = 'Συνθηματικό';
-$wb['source_delete_txt'] = 'Διαγραφή email μετά την ανάκτηση';
+$wb['source_delete_txt'] = 'Διαγραφή email μετά την απόκτηση';
$wb['destination_txt'] = 'Προορισμός';
$wb['active_txt'] = 'Ενεργός';
$wb['limit_fetchmail_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των εγγραφών Fetchmail για τον λογαριασμό σας.';
@@ -14,5 +14,6 @@
$wb['destination_error_isemail'] = 'Δεν επιλέχθηκε προορισμός.';
$wb['source_server_error_regex'] = 'Το όνομα του Pop3/Imap Server δεν είναι έγκυρο.';
$wb['source_read_all_txt'] = 'Ανάκτηση όλων των emails (συμπερ. αναγνωσμένων mails)';
-$wb['error_delete_read_all_combination'] = 'Μη έγκυρος συνδυασμός επιλογών. Δεν μπορείτε να χρησιμοποιήσετε την επιλογή \\"Διαγραφή email μετά την ανάκτηση\\" = ΟΧΙ μαζί με \\"Ανάκτηση όλων των emails\\" = ΝΑΙ';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
?>
diff --git a/interface/web/mail/lib/lang/el_mail_mailinglist.lng b/interface/web/mail/lib/lang/el_mail_mailinglist.lng
index 6384e11..1942ea5 100644
--- a/interface/web/mail/lib/lang/el_mail_mailinglist.lng
+++ b/interface/web/mail/lib/lang/el_mail_mailinglist.lng
@@ -2,21 +2,21 @@
$wb['limit_mailmailinglist_txt'] = 'Το όριο ξεπεράστηκε.';
$wb['domain_error_empty'] = 'Το Domain είναι άδειο.';
$wb['listname_error_empty'] = 'Η λίστα είναι άδεια.';
-$wb['domain_error_regex'] = 'Το όνομα domain δεν είναι έγκυρο';
+$wb['domain_error_regex'] = 'Το όνομα domain δεν είναι έγκυρο/';
$wb['email_in_use_txt'] = 'Το email χρησιμοποιείται ήδη.';
$wb['no_domain_perm'] = 'Δεν έχετε δικαιώματα σε αυτό το domain.';
-$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού';
+$wb['password_strength_txt'] = 'Δύναμη συνθηματικού';
$wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Domain';
$wb['listname_txt'] = 'Όνομα λίστας';
$wb['client_txt'] = 'Πελάτης';
$wb['email_txt'] = 'Email';
$wb['password_txt'] = 'Συνθηματικό';
-$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού';
-$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού';
-$wb['password_mismatch_txt'] = 'Τα συνθηματικά δεν ταιριάζουν.';
-$wb['password_match_txt'] = 'Τα συνθηματικά ταιριάζουν.';
-$wb['listname_error_unique'] = 'Υπάρχει ήδη μια λίστα mail με αυτό το όνομα στον server. Παρακαλούμε επιλέξτε ένα διαφορετικό όνομα.';
-$wb['email_error_isemail'] = 'Η διεύθυνση email δεν είναι έγκυρη';
-$wb['mailinglist_txt'] = 'Λίστα Mail';
+$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['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.';
+$wb['email_error_isemail'] = 'Email address is invalid.';
+$wb['mailinglist_txt'] = 'Mailing list';
?>
diff --git a/interface/web/mail/lib/lang/el_mail_spamfilter.lng b/interface/web/mail/lib/lang/el_mail_spamfilter.lng
index 5c6d904..48c4eaa 100644
--- a/interface/web/mail/lib/lang/el_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/el_mail_spamfilter.lng
@@ -1,12 +1,12 @@
<?php
$wb['email_txt'] = 'Email';
-$wb['spam_rewrite_score_int_txt'] = 'Σκορ Επανεγγραφής';
+$wb['spam_rewrite_score_int_txt'] = 'Σκορ Επανεγγαφής';
$wb['spam_redirect_score_int_txt'] = 'Σκορ Ανακατεύθυνσης';
$wb['spam_delete_score_int_txt'] = 'Σκορ Διαγραφής';
-$wb['spam_rewrite_subject_txt'] = 'Επανεγγραφή τίτλου';
+$wb['spam_rewrite_subject_txt'] = 'Επανεγγαφή τίτλου';
$wb['spam_redirect_maildir_txt'] = 'Ανακατεύθυνση θυρίδας';
$wb['active_txt'] = 'Ενεργό';
-$wb['spam_rewrite_txt'] = 'Επανεγγραφή τίτλου πάνω από αυτό το σκορ.';
+$wb['spam_rewrite_txt'] = 'Επανεγγαφή τίτλου πάνω από αυτό το σκορ.';
$wb['spam_redirect_txt'] = 'Ανακατεύθυνση email με μεγαλύτερο σκορ σε αυτή την θυρίδα.';
$wb['spam_delete_txt'] = 'Διαγραφή email με μεγαλύτερο σκορ';
$wb['disable_txt'] = 'Σημείωση: Για να απενεργοποιήσετε μια επιλογή φίλτρου, βάλτε για σκορ 0.00.';
diff --git a/interface/web/mail/lib/lang/el_mail_transport.lng b/interface/web/mail/lib/lang/el_mail_transport.lng
index 8f6c290..1b1a5c7 100644
--- a/interface/web/mail/lib/lang/el_mail_transport.lng
+++ b/interface/web/mail/lib/lang/el_mail_transport.lng
@@ -7,5 +7,5 @@
$wb['sort_order_txt'] = 'Ταξινόμηση κατά';
$wb['active_txt'] = 'Ενεργό';
$wb['limit_mailrouting_txt'] = 'Το μέγιστο πλήθος των δρομολογήσεων email για τον λογαριασμό σας, εξαντλήθηκε.';
-$wb['transport_txt'] = 'Δρομολογήση';
+$wb['transport_txt'] = 'Transport';
?>
diff --git a/interface/web/mail/lib/lang/el_mail_transport_list.lng b/interface/web/mail/lib/lang/el_mail_transport_list.lng
index d809edf..249eee9 100644
--- a/interface/web/mail/lib/lang/el_mail_transport_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_transport_list.lng
@@ -3,7 +3,7 @@
$wb['active_txt'] = 'Ενεργό';
$wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Domain';
-$wb['transport_txt'] = 'Δρομολογήση';
+$wb['transport_txt'] = 'Μεταφορά';
$wb['sort_order_txt'] = 'Ταξινόμηση κατά';
-$wb['add_new_record_txt'] = 'Νέα Δρομολογήση';
+$wb['add_new_record_txt'] = 'Νέα μεταφορά';
?>
diff --git a/interface/web/mail/lib/lang/el_mail_user.lng b/interface/web/mail/lib/lang/el_mail_user.lng
index e59dd1c..147874c 100644
--- a/interface/web/mail/lib/lang/el_mail_user.lng
+++ b/interface/web/mail/lib/lang/el_mail_user.lng
@@ -2,7 +2,7 @@
$wb['custom_mailfilter_txt'] = 'Προσαρμοσμένο φίλτρο';
$wb['email_txt'] = 'Email';
$wb['cryptpwd_txt'] = 'Συνθηματικό';
-$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού';
+$wb['password_strength_txt'] = 'Δύναμη Συνθηματικού';
$wb['active_txt'] = 'Ενεργό';
$wb['email_error_isemail'] = 'Η διεύθυνση Email δεν είναι έγκυρη.';
$wb['email_error_unique'] = 'Διπλή διεύθυνση Email.';
@@ -16,13 +16,13 @@
$wb['error_no_pwd'] = 'Το συνθηματικό δεν έχει οριστεί.';
$wb['quota_error_isint'] = 'Το μέγεθος της θυρίδας πρέπει να είναι αριθμός.';
$wb['quota_txt'] = 'Όριο χώρου';
-$wb['server_id_txt'] = 'Server_id';
+$wb['server_id_txt'] = 'Aerver_id';
$wb['password_txt'] = 'Συνθηματικό';
$wb['maildir_txt'] = 'Maildir';
$wb['postfix_txt'] = 'Ενεργοποίηση Λήψης';
$wb['access_txt'] = 'Ενεργοποίηση Πρόσβασης';
$wb['policy_txt'] = 'Φίλτρο Spam';
-$wb['no_policy'] = '- ανενεργό -';
+$wb['no_policy'] = '- ανενεργή -';
$wb['limit_mailbox_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των θυρίδων για τον λογαριασμό σας.';
$wb['limit_mailquota_txt'] = 'Έχετε φτάσει στο μέγεστο χώρο της θυρίδα σας.Ο μέγιστος διαθέσιμος χώρος σε MB είναι';
$wb['disableimap_txt'] = 'Απενεργοποίηση IMAP';
@@ -41,13 +41,13 @@
$wb['login_error_regex'] = 'Έγγυροι χαρακτήρες είναι οι A-Z, a-z, 0-9, ., _ και -.';
$wb['login_txt'] = 'Login (προαιτερικά)';
$wb['error_login_email_txt'] = 'Το όνομα δεν επιτρέπεται. Παρακαλούμε εισάγεται ένα διαφορετικό όνομα ή χρησιμοποιείστε την διεύθυνση e-mail.';
-$wb['autoresponder_subject_txt'] = 'Θέμα Email';
-$wb['autoresponder_subject'] = 'Εκτός γραφείου';
-$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού';
-$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού';
-$wb['password_mismatch_txt'] = 'Τα συνθηματικά δεν ταιριάζουν.';
-$wb['password_match_txt'] = 'Τα συνθηματικά ταιριάζουν.';
+$wb['autoresponder_subject_txt'] = 'Email Subject';
+$wb['autoresponder_subject'] = 'Out of office reply';
+$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['disablesmtp_txt'] = 'Disable SMTP (sending)';
$wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
$wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
-$wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
?>
diff --git a/interface/web/mail/lib/lang/el_mail_user_list.lng b/interface/web/mail/lib/lang/el_mail_user_list.lng
index 09613b4..7e3f57b 100644
--- a/interface/web/mail/lib/lang/el_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_user_list.lng
@@ -4,5 +4,5 @@
$wb['autoresponder_txt'] = 'Αυτόματη απάντηση';
$wb['add_new_record_txt'] = 'Νέα Θυρίδα';
$wb['name_txt'] = 'Πραγματικό Όνομα';
-$wb['login_txt'] = 'Είσοδος';
+$wb['login_txt'] = 'Login';
?>
diff --git a/interface/web/mail/lib/lang/el_spamfilter_users.lng b/interface/web/mail/lib/lang/el_spamfilter_users.lng
index 1a39474..b6da2d1 100644
--- a/interface/web/mail/lib/lang/el_spamfilter_users.lng
+++ b/interface/web/mail/lib/lang/el_spamfilter_users.lng
@@ -5,8 +5,8 @@
$wb['email_txt'] = 'Email (Μοτίβο)';
$wb['fullname_txt'] = 'Όνομα';
$wb['local_txt'] = 'Τοπικός';
-$wb['email_error_notempty'] = 'Η διεύθυνση email δεν πρέπει να είναι κενή.';
-$wb['fullname_error_notempty'] = 'Το όνομα δεν πρέπει να είναι κενό.';
+$wb['email_error_notempty'] = 'The email address must not be empty.';
+$wb['fullname_error_notempty'] = 'The name must not be empty.';
$wb['10 - highest'] = '10 - highest';
$wb['5 - medium'] = '5 - medium';
$wb['1 - lowest'] = '1 - lowest';
diff --git a/interface/web/mail/lib/lang/el_user_quota_stats_list.lng b/interface/web/mail/lib/lang/el_user_quota_stats_list.lng
index 2e8651f..8c40407 100755
--- a/interface/web/mail/lib/lang/el_user_quota_stats_list.lng
+++ b/interface/web/mail/lib/lang/el_user_quota_stats_list.lng
@@ -4,5 +4,5 @@
$wb['name_txt'] = 'Όνομα';
$wb['email_txt'] = 'Διεύθυνση Email';
$wb['used_txt'] = 'Χώρος σε χρήση';
-$wb['percentage_txt'] = 'Χρήση %';
+$wb['percentage_txt'] = 'Used %';
?>
diff --git a/interface/web/mail/lib/lang/en_mail_domain.lng b/interface/web/mail/lib/lang/en_mail_domain.lng
index 852f419..fba0ca9 100644
--- a/interface/web/mail/lib/lang/en_mail_domain.lng
+++ b/interface/web/mail/lib/lang/en_mail_domain.lng
@@ -18,4 +18,6 @@
$wb["policy_txt"] = 'Spamfilter';
$wb["no_policy"] = '- not enabled -';
$wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
-?>
\ No newline at end of file
+$wb['dkim_selector_txt'] = 'DKIM-Selector';
+$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
+?>
diff --git a/interface/web/mail/lib/lang/en_mail_get.lng b/interface/web/mail/lib/lang/en_mail_get.lng
index 85bf147..60c88ae 100644
--- a/interface/web/mail/lib/lang/en_mail_get.lng
+++ b/interface/web/mail/lib/lang/en_mail_get.lng
@@ -5,6 +5,7 @@
$wb["source_username_txt"] = 'Username';
$wb["source_password_txt"] = 'Password';
$wb["source_delete_txt"] = 'Delete emails after retrieval';
+$wb["source_delete_note_txt"] = 'Please check first if email retrieval works, before you activate this option.';
$wb["source_read_all_txt"] = 'Retrieve all emails (incl. read mails)';
$wb["destination_txt"] = 'Destination';
$wb["active_txt"] = 'Active';
diff --git a/interface/web/mail/lib/lang/es_mail_domain.lng b/interface/web/mail/lib/lang/es_mail_domain.lng
index 529d707..5b33de6 100644
--- a/interface/web/mail/lib/lang/es_mail_domain.lng
+++ b/interface/web/mail/lib/lang/es_mail_domain.lng
@@ -16,4 +16,6 @@
$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['dkim_selector_txt'] = 'DKIM-Selector';
+$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
?>
diff --git a/interface/web/mail/lib/lang/es_mail_get.lng b/interface/web/mail/lib/lang/es_mail_get.lng
index 64db403..91a4c26 100644
--- a/interface/web/mail/lib/lang/es_mail_get.lng
+++ b/interface/web/mail/lib/lang/es_mail_get.lng
@@ -15,4 +15,5 @@
$wb['source_server_error_regex'] = 'Servidor POP3/IMAP no es un nombre de dominio válido.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \'Delete emails after retrieval\' = no together with \'Retrieve all emails\' = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
?>
diff --git a/interface/web/mail/lib/lang/fi_mail_domain.lng b/interface/web/mail/lib/lang/fi_mail_domain.lng
index 9bebd46..2ddda26 100755
--- a/interface/web/mail/lib/lang/fi_mail_domain.lng
+++ b/interface/web/mail/lib/lang/fi_mail_domain.lng
@@ -16,4 +16,6 @@
$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['dkim_selector_txt'] = 'DKIM-Selector';
+$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
?>
diff --git a/interface/web/mail/lib/lang/fi_mail_get.lng b/interface/web/mail/lib/lang/fi_mail_get.lng
index 065d149..063a37b 100755
--- a/interface/web/mail/lib/lang/fi_mail_get.lng
+++ b/interface/web/mail/lib/lang/fi_mail_get.lng
@@ -15,4 +15,5 @@
$wb['source_server_error_regex'] = 'Pop3/Imap-palvelin ei ole kelvollinen osoite.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
?>
diff --git a/interface/web/mail/lib/lang/fr_mail_domain.lng b/interface/web/mail/lib/lang/fr_mail_domain.lng
index 2fe0f78..ee64ffa 100644
--- a/interface/web/mail/lib/lang/fr_mail_domain.lng
+++ b/interface/web/mail/lib/lang/fr_mail_domain.lng
@@ -18,4 +18,6 @@
$wb['policy_txt'] = 'Filtre antispam';
$wb['no_policy'] = '- inactif -';
$wb['error_not_allowed_server_id'] = 'Le serveur choisi n\'est pas autorisé pour ce compte.';
-?>
\ No newline at end of file
+$wb['dkim_selector_txt'] = 'DKIM-Selector';
+$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
+?>
diff --git a/interface/web/mail/lib/lang/fr_mail_get.lng b/interface/web/mail/lib/lang/fr_mail_get.lng
index b009745..6779ce3 100644
--- a/interface/web/mail/lib/lang/fr_mail_get.lng
+++ b/interface/web/mail/lib/lang/fr_mail_get.lng
@@ -14,5 +14,6 @@
$wb['destination_error_isemail'] = 'Pas de destination sélectionnée.';
$wb['source_server_error_regex'] = 'Le serveur POP3 / IMAP n\'est pas un nom de domaine valide.';
$wb['source_read_all_txt'] = 'Récupérer tous les emails (incl. les emails lus)';
-$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['error_delete_read_all_combination'] = 'Combinaison d\'options non autorisée. Vous ne pouvez pas utiliser \"Supprimer les emails après récupération\" = non avec \"Récupérer tous les emails\" = oui';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
?>
diff --git a/interface/web/mail/lib/lang/fr_mail_user.lng b/interface/web/mail/lib/lang/fr_mail_user.lng
index 945fb8c..8ed01af 100644
--- a/interface/web/mail/lib/lang/fr_mail_user.lng
+++ b/interface/web/mail/lib/lang/fr_mail_user.lng
@@ -53,7 +53,7 @@
$wb['daily_backup_txt'] = 'Daily';
$wb['weekly_backup_txt'] = 'Weekly';
$wb['monthly_backup_txt'] = 'Monthly';
+$wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
$wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
$wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
-$wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
?>
diff --git a/interface/web/mail/lib/lang/fr_mail_user_stats_list.lng b/interface/web/mail/lib/lang/fr_mail_user_stats_list.lng
index 9e5b4b9..8d32083 100644
--- a/interface/web/mail/lib/lang/fr_mail_user_stats_list.lng
+++ b/interface/web/mail/lib/lang/fr_mail_user_stats_list.lng
@@ -4,5 +4,5 @@
$wb['this_month_txt'] = 'Le mois en cours';
$wb['last_month_txt'] = 'Le mois dernier';
$wb['this_year_txt'] = 'L\'année en cours';
-$wb['last_year_txt'] = 'Lannée dernière';
+$wb['last_year_txt'] = 'L\'année dernière';
?>
diff --git a/interface/web/mail/lib/lang/hr_mail_domain.lng b/interface/web/mail/lib/lang/hr_mail_domain.lng
index 214edee..ce0d7b0 100644
--- a/interface/web/mail/lib/lang/hr_mail_domain.lng
+++ b/interface/web/mail/lib/lang/hr_mail_domain.lng
@@ -16,4 +16,6 @@
$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['dkim_selector_txt'] = 'DKIM-Selector';
+$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
?>
diff --git a/interface/web/mail/lib/lang/hr_mail_get.lng b/interface/web/mail/lib/lang/hr_mail_get.lng
index 6d14eab..18c53a4 100644
--- a/interface/web/mail/lib/lang/hr_mail_get.lng
+++ b/interface/web/mail/lib/lang/hr_mail_get.lng
@@ -15,4 +15,5 @@
$wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
?>
diff --git a/interface/web/mail/lib/lang/hu_mail_domain.lng b/interface/web/mail/lib/lang/hu_mail_domain.lng
index 2ad4913..d912710 100644
--- a/interface/web/mail/lib/lang/hu_mail_domain.lng
+++ b/interface/web/mail/lib/lang/hu_mail_domain.lng
@@ -16,4 +16,6 @@
$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['dkim_selector_txt'] = 'DKIM-Selector';
+$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
?>
diff --git a/interface/web/mail/lib/lang/hu_mail_get.lng b/interface/web/mail/lib/lang/hu_mail_get.lng
index d3b2a12..59cb26d 100644
--- a/interface/web/mail/lib/lang/hu_mail_get.lng
+++ b/interface/web/mail/lib/lang/hu_mail_get.lng
@@ -15,4 +15,5 @@
$wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
?>
diff --git a/interface/web/mail/lib/lang/id_mail_domain.lng b/interface/web/mail/lib/lang/id_mail_domain.lng
index 265bfc9..a0232a4 100644
--- a/interface/web/mail/lib/lang/id_mail_domain.lng
+++ b/interface/web/mail/lib/lang/id_mail_domain.lng
@@ -16,4 +16,6 @@
$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['dkim_selector_txt'] = 'DKIM-Selector';
+$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
?>
diff --git a/interface/web/mail/lib/lang/id_mail_get.lng b/interface/web/mail/lib/lang/id_mail_get.lng
index 1d191c0..cec2466 100644
--- a/interface/web/mail/lib/lang/id_mail_get.lng
+++ b/interface/web/mail/lib/lang/id_mail_get.lng
@@ -15,4 +15,5 @@
$wb['source_server_error_regex'] = 'Server Pop3/Imap bukan merupakan nama domain yang valid.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
?>
diff --git a/interface/web/mail/lib/lang/it_mail_domain.lng b/interface/web/mail/lib/lang/it_mail_domain.lng
index 8223dba..7b49aa0 100644
--- a/interface/web/mail/lib/lang/it_mail_domain.lng
+++ b/interface/web/mail/lib/lang/it_mail_domain.lng
@@ -16,4 +16,6 @@
$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['dkim_selector_txt'] = 'DKIM-Selector';
+$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
?>
diff --git a/interface/web/mail/lib/lang/it_mail_get.lng b/interface/web/mail/lib/lang/it_mail_get.lng
index 09ef84e..8ae7712 100644
--- a/interface/web/mail/lib/lang/it_mail_get.lng
+++ b/interface/web/mail/lib/lang/it_mail_get.lng
@@ -15,4 +15,5 @@
$wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
?>
diff --git a/interface/web/mail/lib/lang/ja_mail_get.lng b/interface/web/mail/lib/lang/ja_mail_get.lng
index d5f5c5c..3c5c9ec 100644
--- a/interface/web/mail/lib/lang/ja_mail_get.lng
+++ b/interface/web/mail/lib/lang/ja_mail_get.lng
@@ -15,4 +15,5 @@
$wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
?>
diff --git a/interface/web/mail/lib/lang/nl_mail_domain.lng b/interface/web/mail/lib/lang/nl_mail_domain.lng
index 64a5f06..698d4e7 100644
--- a/interface/web/mail/lib/lang/nl_mail_domain.lng
+++ b/interface/web/mail/lib/lang/nl_mail_domain.lng
@@ -16,4 +16,6 @@
$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['dkim_selector_txt'] = 'DKIM-Selector';
+$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
?>
diff --git a/interface/web/mail/lib/lang/nl_mail_get.lng b/interface/web/mail/lib/lang/nl_mail_get.lng
index e62b547..5cbeab1 100644
--- a/interface/web/mail/lib/lang/nl_mail_get.lng
+++ b/interface/web/mail/lib/lang/nl_mail_get.lng
@@ -15,4 +15,5 @@
$wb['source_server_error_regex'] = 'Pop3/Imap server is geen geldige domeinnaam.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
?>
diff --git a/interface/web/mail/lib/lang/pl_mail_domain.lng b/interface/web/mail/lib/lang/pl_mail_domain.lng
index 6b9ef00..ac839b8 100644
--- a/interface/web/mail/lib/lang/pl_mail_domain.lng
+++ b/interface/web/mail/lib/lang/pl_mail_domain.lng
@@ -16,4 +16,6 @@
$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['dkim_selector_txt'] = 'DKIM-Selector';
+$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
?>
diff --git a/interface/web/mail/lib/lang/pl_mail_get.lng b/interface/web/mail/lib/lang/pl_mail_get.lng
index fdac040..8916449 100644
--- a/interface/web/mail/lib/lang/pl_mail_get.lng
+++ b/interface/web/mail/lib/lang/pl_mail_get.lng
@@ -15,4 +15,5 @@
$wb['source_server_error_regex'] = 'Serwer Pop3/Imap nie jest poprawną nazwą domenową.';
$wb['source_read_all_txt'] = 'Pobierz wszystkie maile (razem z przeczytanymi)';
$wb['error_delete_read_all_combination'] = 'Nieprawidłowa kombinacja opcji. Nie możesz użyć jednocześnie opcji Delete emails after retrieval = no razem z Retrieve all emails = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
?>
diff --git a/interface/web/mail/lib/lang/pt_mail_domain.lng b/interface/web/mail/lib/lang/pt_mail_domain.lng
index b90463e..4311c81 100644
--- a/interface/web/mail/lib/lang/pt_mail_domain.lng
+++ b/interface/web/mail/lib/lang/pt_mail_domain.lng
@@ -10,4 +10,12 @@
$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'] = '- desactivado -';
+$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['dkim_selector_txt'] = 'DKIM-Selector';
+$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
?>
diff --git a/interface/web/mail/lib/lang/pt_mail_get.lng b/interface/web/mail/lib/lang/pt_mail_get.lng
index c52ed1b..883279a 100644
--- a/interface/web/mail/lib/lang/pt_mail_get.lng
+++ b/interface/web/mail/lib/lang/pt_mail_get.lng
@@ -15,4 +15,5 @@
$wb['source_server_error_regex'] = 'Servidor Pop3/Imap não é um nome de domínio válido.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
?>
diff --git a/interface/web/mail/lib/lang/ro_mail_domain.lng b/interface/web/mail/lib/lang/ro_mail_domain.lng
index b65a9da..e2296c3 100644
--- a/interface/web/mail/lib/lang/ro_mail_domain.lng
+++ b/interface/web/mail/lib/lang/ro_mail_domain.lng
@@ -16,4 +16,6 @@
$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['dkim_selector_txt'] = 'DKIM-Selector';
+$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
?>
diff --git a/interface/web/mail/lib/lang/ro_mail_get.lng b/interface/web/mail/lib/lang/ro_mail_get.lng
index fe58991..5e0a590 100644
--- a/interface/web/mail/lib/lang/ro_mail_get.lng
+++ b/interface/web/mail/lib/lang/ro_mail_get.lng
@@ -15,4 +15,5 @@
$wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
?>
diff --git a/interface/web/mail/lib/lang/ru_mail_get.lng b/interface/web/mail/lib/lang/ru_mail_get.lng
index f805f11..dfc846b 100644
--- a/interface/web/mail/lib/lang/ru_mail_get.lng
+++ b/interface/web/mail/lib/lang/ru_mail_get.lng
@@ -15,4 +15,5 @@
$wb['source_server_error_regex'] = 'Неверное доменное имя для сервера Pop3/Imap.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
?>
diff --git a/interface/web/mail/lib/lang/se_mail_domain.lng b/interface/web/mail/lib/lang/se_mail_domain.lng
index 220c9a4..aa42c12 100644
--- a/interface/web/mail/lib/lang/se_mail_domain.lng
+++ b/interface/web/mail/lib/lang/se_mail_domain.lng
@@ -16,4 +16,6 @@
$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['dkim_selector_txt'] = 'DKIM-Selector';
+$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
?>
diff --git a/interface/web/mail/lib/lang/se_mail_get.lng b/interface/web/mail/lib/lang/se_mail_get.lng
index 09ef84e..8ae7712 100644
--- a/interface/web/mail/lib/lang/se_mail_get.lng
+++ b/interface/web/mail/lib/lang/se_mail_get.lng
@@ -15,4 +15,5 @@
$wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
?>
diff --git a/interface/web/mail/lib/lang/sk_mail_domain.lng b/interface/web/mail/lib/lang/sk_mail_domain.lng
index 521678d..2f11883 100644
--- a/interface/web/mail/lib/lang/sk_mail_domain.lng
+++ b/interface/web/mail/lib/lang/sk_mail_domain.lng
@@ -14,6 +14,9 @@
$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['dkim_selector_txt'] = 'DKIM-Selector';
+$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
+
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- Nie je aktivovaný -';
?>
diff --git a/interface/web/mail/lib/lang/sk_mail_get.lng b/interface/web/mail/lib/lang/sk_mail_get.lng
index 96fc31c..e438999 100644
--- a/interface/web/mail/lib/lang/sk_mail_get.lng
+++ b/interface/web/mail/lib/lang/sk_mail_get.lng
@@ -15,4 +15,5 @@
$wb['source_server_error_regex'] = 'Pop3/Imap Server nie je valídne doménové meno.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
?>
diff --git a/interface/web/mail/lib/lang/tr_mail_domain.lng b/interface/web/mail/lib/lang/tr_mail_domain.lng
index 85138e1..5f61509 100644
--- a/interface/web/mail/lib/lang/tr_mail_domain.lng
+++ b/interface/web/mail/lib/lang/tr_mail_domain.lng
@@ -16,4 +16,6 @@
$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['dkim_selector_txt'] = 'DKIM-Selector';
+$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
?>
diff --git a/interface/web/mail/lib/lang/tr_mail_get.lng b/interface/web/mail/lib/lang/tr_mail_get.lng
index 18748af..8acb361 100644
--- a/interface/web/mail/lib/lang/tr_mail_get.lng
+++ b/interface/web/mail/lib/lang/tr_mail_get.lng
@@ -15,4 +15,5 @@
$wb['source_server_error_regex'] = 'Pop3/Imap Sunucu geçerli bir domaine sahip değil.';
$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
?>
diff --git a/interface/web/mail/mail_domain_edit.php b/interface/web/mail/mail_domain_edit.php
index 05ab453..8220c2c 100644
--- a/interface/web/mail/mail_domain_edit.php
+++ b/interface/web/mail/mail_domain_edit.php
@@ -71,7 +71,7 @@
if($_SESSION["s"]["user"]["typ"] == 'admin') {
// Getting Clients of the user
- $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY sys_group.name";
+ $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY client.company_name, client.contact_name, sys_group.name";
$clients = $app->db->queryAllRecords($sql);
$client_select = '';
@@ -97,7 +97,7 @@
unset($tmp);
// Fill the client select field
- $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$app->functions->intval($client['client_id'])." ORDER BY sys_group.name";
+ $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$app->functions->intval($client['client_id'])." ORDER BY client.company_name, client.contact_name, sys_group.name";
$clients = $app->db->queryAllRecords($sql);
$tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$app->functions->intval($client['client_id']));
$client_select = '<option value="'.$tmp['groupid'].'">'.$client['contactname'].'</option>';
diff --git a/interface/web/mail/mail_mailinglist_edit.php b/interface/web/mail/mail_mailinglist_edit.php
index 3c9cf95..1e03ea6 100644
--- a/interface/web/mail/mail_mailinglist_edit.php
+++ b/interface/web/mail/mail_mailinglist_edit.php
@@ -72,7 +72,7 @@
if($_SESSION["s"]["user"]["typ"] == 'admin') {
// Getting Clients of the user
- $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY sys_group.name";
+ $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY client.company_name, client.contact_name, sys_group.name";
$clients = $app->db->queryAllRecords($sql);
$client_select = '';
if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= "<option value='0'></option>";
@@ -92,7 +92,7 @@
$client = $app->db->queryOneRecord("SELECT client.client_id, client.contact_name, client.default_mailserver, 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 FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id order by contact_name");
// Fill the client select field
- $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".intval($client['client_id'])." ORDER BY sys_group.name";
+ $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".intval($client['client_id'])." ORDER BY client.company_name, client.contact_name, sys_group.name";
$clients = $app->db->queryAllRecords($sql);
$tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".intval($client['client_id']));
$client_select = '<option value="'.$tmp['groupid'].'">'.$client['contactname'].'</option>';
diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm
index c5230b0..12ff756 100644
--- a/interface/web/mail/templates/mail_domain_edit.htm
+++ b/interface/web/mail/templates/mail_domain_edit.htm
@@ -87,6 +87,10 @@
</div>
</div>
<div class="ctrlHolder">
+ <label for="dkim_selector">{tmpl_var name='dkim_selector_txt'}</label>
+ <input name="dkim_selector" id="dkim_selector" value="{tmpl_var name='dkim_selector'}" size="20" maxlength="63" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder">
<label for="dkim_private">{tmpl_var name='dkim_private_txt'}</label>
<textarea name="dkim_private" id="dkim_private" rows='10' cols='30'>{tmpl_var name='dkim_private'}</textarea>
<a href="javascript:setRequest('create','{tmpl_var name='domain'}')">{tmpl_var name='dkim_generate_txt'}</a>
diff --git a/interface/web/mail/templates/mail_get_edit.htm b/interface/web/mail/templates/mail_get_edit.htm
index e1cba90..1f5e6a9 100644
--- a/interface/web/mail/templates/mail_get_edit.htm
+++ b/interface/web/mail/templates/mail_get_edit.htm
@@ -26,7 +26,7 @@
<div class="ctrlHolder">
<p class="label">{tmpl_var name='source_delete_txt'}</p>
<div class="multiField">
- {tmpl_var name='source_delete'}
+ {tmpl_var name='source_delete'} {tmpl_var name="source_delete_note_txt"}
</div>
</div>
<div class="ctrlHolder">
diff --git a/interface/web/mailuser/lib/lang/el.lng b/interface/web/mailuser/lib/lang/el.lng
index fae2ad9..114dec9 100644
--- a/interface/web/mailuser/lib/lang/el.lng
+++ b/interface/web/mailuser/lib/lang/el.lng
@@ -1,9 +1,9 @@
<?php
-$wb['Email Account'] = 'Λογαριασμός Email';
-$wb['Overview'] = 'Επισκόπηση';
-$wb['Password'] = 'Συνθηματικό';
-$wb['Autoresponder'] = 'Αυτόματη Απάντηση';
-$wb['Send copy'] = 'Αποστολή Αντιγράφου';
-$wb['Spamfilter'] = 'Φίλτρο Spam';
-$wb['Email Filters'] = 'Φίλτρα Email';
+$wb['Email Account'] = 'Email Account';
+$wb['Overview'] = 'Overview';
+$wb['Password'] = 'Password';
+$wb['Autoresponder'] = 'Autoresponder';
+$wb['Send copy'] = 'Send copy';
+$wb['Spamfilter'] = 'Spamfilter';
+$wb['Email Filters'] = 'Email Filters';
?>
diff --git a/interface/web/mailuser/lib/lang/el_index.lng b/interface/web/mailuser/lib/lang/el_index.lng
index b182b45..29fe9ea 100644
--- a/interface/web/mailuser/lib/lang/el_index.lng
+++ b/interface/web/mailuser/lib/lang/el_index.lng
@@ -1,12 +1,12 @@
<?php
-$wb['page_head_txt'] = 'Ρυθμίσεις θυρίδας Email';
-$wb['page_desc_txt'] = 'Εδώ μπορείτε να ρυθμίσετε τον λογαριασμό email.';
-$wb['email_txt'] = 'Διεύθυνση Email';
-$wb['login_txt'] = 'Είσοδος';
-$wb['server_address_txt'] = 'Διεύθυνση Mailserver';
-$wb['cc_txt'] = 'Αποστολή αντιγράφου σε (CC)';
-$wb['quota_txt'] = 'Μέγεθος θυρίδας Email';
-$wb['unlimited_txt'] = 'Απεριόριστο';
+$wb['page_head_txt'] = 'Mailbox settings';
+$wb['page_desc_txt'] = 'Here you can edit the settings for the email account.';
+$wb['email_txt'] = 'Email address';
+$wb['login_txt'] = 'Login';
+$wb['server_address_txt'] = 'Mailserver address';
+$wb['cc_txt'] = 'Send copy to (CC)';
+$wb['quota_txt'] = 'Mailbox size';
+$wb['unlimited_txt'] = 'Unlimited';
$wb['mb_txt'] = 'MB';
-$wb['none_txt'] = 'Κανένα';
+$wb['none_txt'] = 'None';
?>
diff --git a/interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng
index 529ba60..79f386a 100644
--- a/interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng
@@ -1,13 +1,13 @@
<?php
-$wb['mailbox_autoresponder_txt'] = 'Αυτόματη Απάντηση';
-$wb['autoresponder_subject'] = 'Απάντηση όταν είστε εκτός γραφείου';
-$wb['autoresponder_text_txt'] = 'Κείμενο';
-$wb['autoresponder_txt'] = 'Ενεργή';
-$wb['autoresponder_start_date_txt'] = 'Έναρξη στις';
-$wb['autoresponder_start_date_isfuture'] = 'Η ημερομηνία έναρξης δεν μπορεί να είναι στο παρελθόν.';
-$wb['autoresponder_end_date_txt'] = 'Τέλος στις';
-$wb['autoresponder_end_date_isgreater'] = 'Η ημερομηνία τέλους πρέπει να οριστεί και να είναι μετά την ημερομηνία έναρξης.';
-$wb['autoresponder_active'] = 'Ενεργοποίηση αυτόματης απάντησης';
-$wb['now_txt'] = 'Τώρα';
-$wb['autoresponder_subject_txt'] = 'Αυτόματη Απάντηση';
+$wb['mailbox_autoresponder_txt'] = 'Autoresponder';
+$wb['autoresponder_subject'] = 'Out of office reply';
+$wb['autoresponder_text_txt'] = 'Text';
+$wb['autoresponder_txt'] = 'Active';
+$wb['autoresponder_start_date_txt'] = 'Start on';
+$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
+$wb['autoresponder_end_date_txt'] = 'End by';
+$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
+$wb['autoresponder_active'] = 'Enable the autoresponder';
+$wb['now_txt'] = 'Now';
+$wb['autoresponder_subject_txt'] = 'Betreff';
?>
diff --git a/interface/web/mailuser/lib/lang/el_mail_user_cc.lng b/interface/web/mailuser/lib/lang/el_mail_user_cc.lng
index 819101e..8187788 100644
--- a/interface/web/mailuser/lib/lang/el_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/el_mail_user_cc.lng
@@ -1,9 +1,9 @@
<?php
-$wb['mailbox_cc_txt'] = 'Αποστολή αντιγράφου στο email';
-$wb['cc_txt'] = 'Αποστολή αντιγράφου σε';
+$wb['mailbox_cc_txt'] = 'Send copy to email address';
+$wb['cc_txt'] = 'Send copy to';
$wb['email_txt'] = 'Email';
-$wb['cc_error_isemail'] = 'Μη έγκυρη διεύθυνση Email στο πεδίο -Αποστολή αντιγράφου σε-';
-$wb['email_is_cc_error'] = 'Η διεύθυνση Email και η -Αποστολή αντιγράφου στο email- δεν μπορούν να είναι ίδιες.';
+$wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
+$wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
$wb['name_optional_txt'] = '(Optional)';
$wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
?>
diff --git a/interface/web/mailuser/lib/lang/el_mail_user_filter.lng b/interface/web/mailuser/lib/lang/el_mail_user_filter.lng
index bec79e6..2e74ffd 100644
--- a/interface/web/mailuser/lib/lang/el_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/el_mail_user_filter.lng
@@ -1,20 +1,20 @@
<?php
-$wb['rulename_txt'] = 'Όνομα';
-$wb['action_txt'] = 'Ενέργεια';
-$wb['target_txt'] = 'Φάκελος';
-$wb['active_txt'] = 'Ενεργό';
-$wb['rulename_error_empty'] = 'Το όνομα είναι κενό.';
-$wb['searchterm_is_empty'] = 'Ο όρος αναζήτησης είναι κενός.';
-$wb['source_txt'] = 'Πηγή';
-$wb['target_error_regex'] = 'Ο στόχος μπορεί να περιέχει μόνο αυτούς τους χαρακτήρες: a-z, 0-9, -, ., _, και {κενό}';
-$wb['limit_mailfilter_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος φίλτρων mail.';
-$wb['subject_txt'] = 'Θέμα';
-$wb['from_txt'] = 'Από';
-$wb['to_txt'] = 'Προς';
-$wb['contains_txt'] = 'Περιέχει';
-$wb['is_txt'] = 'Είναι';
-$wb['begins_with_txt'] = 'Ξεκινά με';
-$wb['ends_with_txt'] = 'Τελειώνει με';
-$wb['move_to_txt'] = 'Μετακίνηση σε';
-$wb['delete_txt'] = 'Διαγραφή';
+$wb['rulename_txt'] = 'Name';
+$wb['action_txt'] = 'Action';
+$wb['target_txt'] = 'Folder';
+$wb['active_txt'] = 'Active';
+$wb['rulename_error_empty'] = 'Name is empty.';
+$wb['searchterm_is_empty'] = 'Search term is empty.';
+$wb['source_txt'] = 'Source';
+$wb['target_error_regex'] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
+$wb['limit_mailfilter_txt'] = 'The max. number of mailfilters is reached.';
+$wb['subject_txt'] = 'Subject';
+$wb['from_txt'] = 'From';
+$wb['to_txt'] = 'To';
+$wb['contains_txt'] = 'Contains';
+$wb['is_txt'] = 'Is';
+$wb['begins_with_txt'] = 'Begins with';
+$wb['ends_with_txt'] = 'Ends with';
+$wb['move_to_txt'] = 'Move to';
+$wb['delete_txt'] = 'Delete';
?>
diff --git a/interface/web/mailuser/lib/lang/el_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/el_mail_user_filter_list.lng
index dd2ae1d..fb6b9df 100644
--- a/interface/web/mailuser/lib/lang/el_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/el_mail_user_filter_list.lng
@@ -1,8 +1,8 @@
<?php
-$wb['list_head_txt'] = 'Κανόνες Φίλτρων Email';
-$wb['rulename_txt'] = 'Όνομα';
-$wb['add_new_record_txt'] = 'Προσθήκη νέου Φίλτρου';
-$wb['page_txt'] = 'Σελίδα';
-$wb['page_of_txt'] = 'από';
-$wb['delete_confirmation'] = 'Είστε σίγουροι ότι θέλετε να διαγράψετε το Φίλτρο Mail?';
+$wb['list_head_txt'] = 'Email filter rules';
+$wb['rulename_txt'] = 'Name';
+$wb['add_new_record_txt'] = 'Add new Filter';
+$wb['page_txt'] = 'Page';
+$wb['page_of_txt'] = 'of';
+$wb['delete_confirmation'] = 'Do you really want to delete the mailfilter?';
?>
diff --git a/interface/web/mailuser/lib/lang/el_mail_user_password.lng b/interface/web/mailuser/lib/lang/el_mail_user_password.lng
index 61b9761..cdf9674 100644
--- a/interface/web/mailuser/lib/lang/el_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/el_mail_user_password.lng
@@ -1,10 +1,10 @@
<?php
-$wb['mailbox_password_txt'] = 'Συνθηματικό θυρίδας Mail';
-$wb['password_txt'] = 'Συνθηματικό';
-$wb['password_strength_txt'] = 'Δϋναμη Συνθηματικού';
+$wb['mailbox_password_txt'] = 'Mailbox password';
+$wb['password_txt'] = 'Password';
+$wb['password_strength_txt'] = 'Password strength';
$wb['email_txt'] = 'Email';
-$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού';
-$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού';
-$wb['password_mismatch_txt'] = 'Τα Συνθηματικά δεν ταιριάζουν.';
-$wb['password_match_txt'] = 'Τα Συνθηματικά δεν ταιριάζουν.';
+$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.';
?>
diff --git a/interface/web/mailuser/lib/lang/el_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/el_mail_user_spamfilter.lng
index 15ea90c..be4bad9 100644
--- a/interface/web/mailuser/lib/lang/el_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/el_mail_user_spamfilter.lng
@@ -1,7 +1,7 @@
<?php
-$wb['mailbox_spamfilter_txt'] = 'Φίλτρο Spam';
-$wb['spamfilter_txt'] = 'Φίλτρο Spam';
+$wb['mailbox_spamfilter_txt'] = 'Spamfilter';
+$wb['spamfilter_txt'] = 'Spamfilter';
$wb['email_txt'] = 'Email';
-$wb['no_policy'] = '- ανενεργό -';
-$wb['policy_txt'] = 'Πολιτική';
+$wb['no_policy'] = '- not enabled -';
+$wb['policy_txt'] = 'Policy';
?>
diff --git a/interface/web/monitor/lib/lang/el.lng b/interface/web/monitor/lib/lang/el.lng
index eb91a59..d840b6b 100644
--- a/interface/web/monitor/lib/lang/el.lng
+++ b/interface/web/monitor/lib/lang/el.lng
@@ -145,11 +145,11 @@
$wb['Show fail2ban-Log'] = 'Εμφάνιση fail2ban-Log';
$wb['Show IPTables'] = 'Εμφάνιση IPTables';
$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter';
-$wb['monitor_serverstate_raidresync_txt'] = 'Το RAID βρίσκεται σε κατάσταση επανασυγχρονισμού';
-$wb['Show Monit'] = 'Εμφάνιση Monit';
-$wb['no_monit_url_defined_txt'] = 'Δεν καθορίστηκε URL για το Monit.';
-$wb['no_permissions_to_view_monit_txt'] = 'Δεν επιτρέπεται η πρόσβαση στο Monit.';
-$wb['Show Munin'] = 'Εμφάνιση Munin';
-$wb['no_munin_url_defined_txt'] = 'Δεν καθορίστηκε URL για το Munin.';
-$wb['no_permissions_to_view_munin_txt'] = 'Δεν επιτρέπεται η πρόσβαση στο Munin.';
+$wb['monitor_serverstate_raidresync_txt'] = 'Your RAID is in RESYNC mode';
+$wb['Show Monit'] = 'Show Monit';
+$wb['no_monit_url_defined_txt'] = 'No Monit URL defined.';
+$wb['no_permissions_to_view_monit_txt'] = 'You are not allowed to access Monit.';
+$wb['Show Munin'] = 'Show Munin';
+$wb['no_munin_url_defined_txt'] = 'No Munin URL defined.';
+$wb['no_permissions_to_view_munin_txt'] = 'You are not allowed to access Munin.';
?>
diff --git a/interface/web/monitor/lib/lang/el_datalog_list.lng b/interface/web/monitor/lib/lang/el_datalog_list.lng
index f2a5d32..8ad63ff 100644
--- a/interface/web/monitor/lib/lang/el_datalog_list.lng
+++ b/interface/web/monitor/lib/lang/el_datalog_list.lng
@@ -1,8 +1,8 @@
<?php
-$wb['list_head_txt'] = 'Ουρά Ενεργειών';
-$wb['tstamp_txt'] = 'Ημερομηνία';
+$wb['list_head_txt'] = 'Jobqueue';
+$wb['tstamp_txt'] = 'Date';
$wb['server_id_txt'] = 'Server';
-$wb['dbtable_txt'] = 'Πίνακας DB';
-$wb['action_txt'] = 'Ενέργεια';
-$wb['status_txt'] = 'Κατάσταση';
+$wb['dbtable_txt'] = 'DB Table';
+$wb['action_txt'] = 'Action';
+$wb['status_txt'] = 'Status';
?>
diff --git a/interface/web/monitor/lib/lang/fr.lng b/interface/web/monitor/lib/lang/fr.lng
index d98a6f6..16d12d4 100644
--- a/interface/web/monitor/lib/lang/fr.lng
+++ b/interface/web/monitor/lib/lang/fr.lng
@@ -5,8 +5,8 @@
$wb['System load 5 minutes'] = 'Charge du système sur 5 minutes';
$wb['System load 15 minutes'] = 'Charge du système sur 15 minutes';
$wb['Server Load'] = 'Charge du serveur';
-$wb['Disk usage'] = 'Usage disque';
-$wb['Memory usage'] = 'Utilisation mémoire';
+$wb['Disk usage'] = 'Utilisation du disque';
+$wb['Memory usage'] = 'Utilisation de la mémoire';
$wb['no_data_serverload_txt'] = 'Aucune donnée concernant la charge du serveur actuellement. Réésayez plus tard.';
$wb['no_data_memusage_txt'] = 'Aucune donnée concernant lutilisation mémoire actuellement. Réésayez plus tard.';
$wb['no_data_diskusage_txt'] = 'Aucune donnée concernant lusage disque actuellement. Réésayez plus tard.';
@@ -146,15 +146,15 @@
$wb['monitor_title_beancounter_txt'] = 'Compteur OpenVz VE';
$wb['monitor_updates_nosupport_txt'] = 'Votre distribution nest pas supportée par le moniteur';
$wb['monitor_beancounter_nosupport_txt'] = 'Ce serveur n\'est pas un VE OpenVz et n\'a pas d\'information de compteur';
-$wb['Show Monit'] = 'Show Monit';
-$wb['no_monit_url_defined_txt'] = 'No Monit URL defined.';
-$wb['no_permissions_to_view_monit_txt'] = 'You are not allowed to access Monit.';
-$wb['Show Munin'] = 'Show Munin';
-$wb['no_munin_url_defined_txt'] = 'No Munin URL defined.';
-$wb['no_permissions_to_view_munin_txt'] = 'You are not allowed to access Munin.';
$wb['no_data_database_size_txt'] = 'No data about the database usage available at the moment. Please check again later.';
$wb['monitor_database_name_txt'] = 'Database';
$wb['monitor_database_size_txt'] = 'Size';
$wb['monitor_database_client_txt'] = 'Client';
$wb['monitor_database_domain_txt'] = 'Domain';
+$wb['Show Monit'] = 'Afficher Monit';
+$wb['no_monit_url_defined_txt'] = 'Aucune URL définie pour Monit.';
+$wb['no_permissions_to_view_monit_txt'] = 'Vous n\'avez pas la permission d\'accéder à Monit.';
+$wb['Show Munin'] = 'Afficher Munin';
+$wb['no_munin_url_defined_txt'] = 'Aucune URL définie pour Munin.';
+$wb['no_permissions_to_view_munin_txt'] = 'Vous n\'avez pas la permission d\'accéder à Munin.';
?>
diff --git a/interface/web/monitor/lib/lang/fr_datalog_list.lng b/interface/web/monitor/lib/lang/fr_datalog_list.lng
index e47b9f0..32fd5d9 100644
--- a/interface/web/monitor/lib/lang/fr_datalog_list.lng
+++ b/interface/web/monitor/lib/lang/fr_datalog_list.lng
@@ -4,5 +4,5 @@
$wb['server_id_txt'] = 'Serveur';
$wb['dbtable_txt'] = 'Table DB';
$wb['action_txt'] = 'Action';
-$wb['status_txt'] = 'Status';
+$wb['status_txt'] = 'Statut';
?>
diff --git a/interface/web/sites/cron_edit.php b/interface/web/sites/cron_edit.php
index 092c7dd..6ec02c7 100644
--- a/interface/web/sites/cron_edit.php
+++ b/interface/web/sites/cron_edit.php
@@ -140,13 +140,18 @@
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_cron_frequency FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
+ $client = $app->db->queryOneRecord("SELECT limit_cron_frequency, limit_cron_type FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
if($client["limit_cron_frequency"] > 1) {
if($app->tform->cron_min_freq < $client["limit_cron_frequency"]) {
$app->error($app->tform->wordbook["limit_cron_frequency_txt"]);
$has_error = true;
}
+ }
+
+ if($client["limit_cron_type"] == 'url' && $this->dataRecord["type"] != 'url') {
+ $app->error($app->tform->wordbook["limit_cron_url_txt"]);
+ $has_error = true;
}
}
@@ -165,7 +170,7 @@
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_cron_frequency FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
+ $client = $app->db->queryOneRecord("SELECT limit_cron_frequency, limit_cron_type FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
if($client["limit_cron_frequency"] > 1) {
if($app->tform->cron_min_freq < $client["limit_cron_frequency"]) {
@@ -173,6 +178,11 @@
$has_error = true;
}
}
+
+ if($client["limit_cron_type"] == 'url' && $this->dataRecord["type"] != 'url') {
+ $app->error($app->tform->wordbook["limit_cron_url_txt"]);
+ $has_error = true;
+ }
}
if($has_error == true) {
diff --git a/interface/web/sites/database_user_edit.php b/interface/web/sites/database_user_edit.php
index 30996e5..75422ca 100644
--- a/interface/web/sites/database_user_edit.php
+++ b/interface/web/sites/database_user_edit.php
@@ -69,7 +69,7 @@
$client = $app->db->queryOneRecord("SELECT client.company_name, client.contact_name, client.client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
// Fill the client select field
- $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$app->functions->intval($client['client_id'])." ORDER BY sys_group.name";
+ $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$app->functions->intval($client['client_id'])." ORDER BY client.company_name, client.contact_name, sys_group.name";
$records = $app->db->queryAllRecords($sql);
$tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$app->functions->intval($client['client_id']));
$client_select = '<option value="'.$tmp['groupid'].'">'.$client['contact_name'].'</option>';
@@ -83,7 +83,7 @@
$app->tpl->setVar("client_group_id", $client_select);
} elseif($_SESSION["s"]["user"]["typ"] == 'admin') {
// Fill the client select field
- $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY sys_group.name";
+ $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY client.company_name, client.contact_name, sys_group.name";
$clients = $app->db->queryAllRecords($sql);
$client_select = "<option value='0'></option>";
//$tmp_data_record = $app->tform->getDataRecord($this->id);
diff --git a/interface/web/sites/form/web_vhost_domain.tform.php b/interface/web/sites/form/web_vhost_domain.tform.php
index 937a596..1ae1188 100644
--- a/interface/web/sites/form/web_vhost_domain.tform.php
+++ b/interface/web/sites/form/web_vhost_domain.tform.php
@@ -82,12 +82,14 @@
$wildcard_available = true;
if($vhostdomain_type != 'domain') $wildcard_available = false;
$ssl_available = true;
+$backup_available = ($vhostdomain_type == 'domain');
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");
+ $client = $app->db->queryOneRecord("SELECT limit_wildcard, limit_ssl, limit_backup FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
if($client['limit_wildcard'] != 'y') $wildcard_available = false;
if($client['limit_ssl'] != 'y') $ssl_available = false;
+ if($client['limit_backup'] != 'y') $backup_available = false;
}
$app->uses('getconf');
@@ -239,7 +241,7 @@
'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'),
+ 'value' => array('no' => 'disabled_txt', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP', 'php-fpm' => 'PHP-FPM', 'hhvm' => 'HHVM'),
'searchable' => 2
),
'fastcgi_php_version' => array (
@@ -561,56 +563,55 @@
)
);
-// if($_SESSION["s"]["user"]["typ"] == 'admin') {
//* Backup
-$form["tabs"]['backup'] = array (
- 'title' => "Backup",
- 'width' => 100,
- 'template' => "templates/web_vhost_domain_backup.htm",
- 'readonly' => false,
- 'fields' => array (
- //#################################
- // Begin Datatable fields
- //#################################
- 'backup_interval' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => '',
- 'value' => array('none' => 'no_backup_txt', 'daily' => 'daily_backup_txt', 'weekly' => 'weekly_backup_txt', 'monthly' => 'monthly_backup_txt')
- ),
- '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'),
+if ($backup_available) {
+ $form["tabs"]['backup'] = array (
+ 'title' => "Backup",
+ 'width' => 100,
+ 'template' => "templates/web_domain_backup.htm",
+ 'readonly' => false,
+ 'fields' => array (
+ //#################################
+ // Begin Datatable fields
+ //#################################
+ 'backup_interval' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'SELECT',
+ 'default' => '',
+ 'value' => array('none' => 'no_backup_txt', 'daily' => 'daily_backup_txt', 'weekly' => 'weekly_backup_txt', 'monthly' => 'monthly_backup_txt')
),
- 'formtype' => 'TEXT',
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
+ '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
+ //#################################
),
- //#################################
- // ENDE Datatable fields
- //#################################
- ),
- 'plugins' => array (
- 'backup_records' => array (
- 'class' => 'plugin_backuplist',
- 'options' => array(
+ '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']))) {
diff --git a/interface/web/sites/lib/lang/ar_cron.lng b/interface/web/sites/lib/lang/ar_cron.lng
index 01f418f..369c3b8 100644
--- a/interface/web/sites/lib/lang/ar_cron.lng
+++ b/interface/web/sites/lib/lang/ar_cron.lng
@@ -19,4 +19,6 @@
$wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
$wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
$wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
?>
diff --git a/interface/web/sites/lib/lang/bg_cron.lng b/interface/web/sites/lib/lang/bg_cron.lng
index 64c4315..e44f26c 100644
--- a/interface/web/sites/lib/lang/bg_cron.lng
+++ b/interface/web/sites/lib/lang/bg_cron.lng
@@ -19,4 +19,6 @@
$wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
$wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
$wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
?>
diff --git a/interface/web/sites/lib/lang/br_cron.lng b/interface/web/sites/lib/lang/br_cron.lng
index 13592b3..dc7b49b 100644
--- a/interface/web/sites/lib/lang/br_cron.lng
+++ b/interface/web/sites/lib/lang/br_cron.lng
@@ -19,4 +19,6 @@
$wb['command_error_format'] = 'Formato de comando inválido. Somente endereços url http/https são permitidos.';
$wb['unknown_fieldtype_error'] = 'Um tipo desconhecido de campo foi usado.';
$wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
?>
diff --git a/interface/web/sites/lib/lang/cz_cron.lng b/interface/web/sites/lib/lang/cz_cron.lng
index fab238d..fd4ec4d 100644
--- a/interface/web/sites/lib/lang/cz_cron.lng
+++ b/interface/web/sites/lib/lang/cz_cron.lng
@@ -19,4 +19,6 @@
$wb['command_error_format'] = 'Chybná formát příkazu. V případě URL je povoleno volání pouze http/https.';
$wb['unknown_fieldtype_error'] = 'Bylo použito pole neznámého typu.';
$wb['server_id_error_empty'] = 'ID serveru je prázdné.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
?>
diff --git a/interface/web/sites/lib/lang/de_cron.lng b/interface/web/sites/lib/lang/de_cron.lng
index 8be69ee..5a039f9 100644
--- a/interface/web/sites/lib/lang/de_cron.lng
+++ b/interface/web/sites/lib/lang/de_cron.lng
@@ -21,4 +21,6 @@
$wb['server_id_error_empty'] = 'Die Server-ID ist leer.';
$wb['command_hint_txt'] = 'z. B. /var/www/clients/clientX/webY/myscript.sh oder http://www.mydomain.com/path/script.php. Der Platzhalter [web_root] wird durch /var/www/clients/clientX/webY/web ersetzt.';
$wb['log_output_txt'] = 'Ausgabe loggen';
+$wb['limit_cron_url_txt'] = 'Es sind nur URL cronjobs möglich. Der Cron-Befehl muss mit http:// beginnen.';
+$wb['command_error_empty'] = 'Befehl ist leer.';
?>
diff --git a/interface/web/sites/lib/lang/el.lng b/interface/web/sites/lib/lang/el.lng
index f7d1e4f..2d72614 100644
--- a/interface/web/sites/lib/lang/el.lng
+++ b/interface/web/sites/lib/lang/el.lng
@@ -4,17 +4,17 @@
$wb['Subdomain'] = 'Subdomain για το website';
$wb['Aliasdomain'] = 'Ψευδώνυμο domain για το website';
$wb['Database'] = 'Βάση Δεδομένων';
-$wb['Web Access'] = 'Πρόσβαση Web';
+$wb['Web Access'] = 'Web Access';
$wb['FTP-User'] = 'Χρήστης FTP';
$wb['Webdav-User'] = 'Χρήστης Webdav';
-$wb['Folder'] = 'Προστατευμένοι Φάκελοι';
-$wb['Folder users'] = 'Χρήστες Προστατευμένων Φακέλων';
-$wb['Command Line'] = 'Γραμμή Εντολών';
-$wb['Shell-User'] = 'Χρήστης Κελύφους';
+$wb['Folder'] = 'Protected Folders';
+$wb['Folder users'] = 'Protected Folder Users';
+$wb['Command Line'] = 'Command Line';
+$wb['Shell-User'] = 'Χρήστης Shell';
$wb['Cron Jobs'] = 'Εργασίες Cron';
$wb['Statistics'] = 'Στατιστικά';
$wb['Web traffic'] = 'Κίνηση Web';
-$wb['Website quota (Harddisk)'] = 'Όριο δίσκου Website (Δίσκος)';
+$wb['Website quota (Harddisk)'] = 'Όριο δίσκου Website (Harddisk)';
$wb['Cron'] = 'Cron';
$wb['Stats'] = 'Στατιστικά';
$wb['Shell'] = 'Shell';
@@ -25,11 +25,11 @@
$wb['Redirect'] = 'Ανακατεύθυνση';
$wb['SSL'] = 'SSL';
$wb['Sites'] = 'Sites';
-$wb['Database User'] = 'Χρήστες Βάσης Δεδομένων';
-$wb['APS Installer'] = 'Εγκαταστάτης APS';
-$wb['Available packages'] = 'Διαθέσιμα Πακέτα';
-$wb['Installed packages'] = 'Εγκατεστημένα Πακέτα';
-$wb['Update Packagelist'] = 'Ενημέρωση Λίστας Πακέτων';
+$wb['Database User'] = 'Database Users';
+$wb['APS Installer'] = 'APS Installer';
+$wb['Available packages'] = 'Available packages';
+$wb['Installed packages'] = 'Installed packages';
+$wb['Update Packagelist'] = 'Update Packagelist';
$wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)';
-$wb['error_proxy_requires_url'] = 'Ο τύπος ανακατεύθυνσης \\"proxy\\" απαιτεί ένα URL ως το μονοπάτι ανακατεύθυνσης.';
+$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
?>
diff --git a/interface/web/sites/lib/lang/el_aps.lng b/interface/web/sites/lib/lang/el_aps.lng
index ee6105e..29fb7b6 100644
--- a/interface/web/sites/lib/lang/el_aps.lng
+++ b/interface/web/sites/lib/lang/el_aps.lng
@@ -1,58 +1,58 @@
<?php
-$wb['overview_txt'] = 'Επισκόπηση';
-$wb['administration_txt'] = 'Διαχείριση';
-$wb['available_packages_txt'] = 'Διαθέσιμα Πακέτα';
-$wb['installed_packages_txt'] = 'Εγκατεστημένα Πακέτα';
-$wb['yes_txt'] = 'Ναι';
-$wb['no_txt'] = 'Όχι';
-$wb['invalid_id_txt'] = 'Δεν έχει εισαχθεί έγκυρο ID.';
-$wb['details_txt'] = 'Λεπτομέρειες';
-$wb['version_txt'] = 'Έκδοση';
-$wb['category_txt'] = 'Κατηγορία';
-$wb['homepage_txt'] = 'Αρχική Σελίδα';
-$wb['supported_languages_txt'] = 'Υποστηριζόμενες Γλώσσες';
-$wb['description_txt'] = 'Περιγραφή';
-$wb['config_script_txt'] = 'Script Ρυθμίσεων';
-$wb['installed_size_txt'] = 'Μέγεθος μετά την εγκατάσταση';
-$wb['license_txt'] = 'Άδεια Χρήσης';
+$wb['overview_txt'] = 'Overview';
+$wb['administration_txt'] = 'Administration';
+$wb['available_packages_txt'] = 'Available packages';
+$wb['installed_packages_txt'] = 'Installed packages';
+$wb['yes_txt'] = 'Yes';
+$wb['no_txt'] = 'No';
+$wb['invalid_id_txt'] = 'No valid ID has been provided.';
+$wb['details_txt'] = 'Details';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['homepage_txt'] = 'Homepage';
+$wb['supported_languages_txt'] = 'Supported languages';
+$wb['description_txt'] = 'Description';
+$wb['config_script_txt'] = 'Configuration script';
+$wb['installed_size_txt'] = 'Size after installation';
+$wb['license_txt'] = 'License';
$wb['screenshots_txt'] = 'Screenshots';
-$wb['changelog_txt'] = 'Αρχείο αλλαγών έκδοσης';
-$wb['server_requirements_txt'] = 'Απαιτήσεις Server';
-$wb['php_extensions_txt'] = 'Επεκτάσεις PHP';
-$wb['php_settings_txt'] = 'Ρυθμίσεις PHP';
-$wb['supported_php_versions_txt'] = 'Υποστηριζόμενες Εκδόσεις PHP';
-$wb['database_txt'] = 'Βάση Δεδομένων';
-$wb['settings_txt'] = 'Ρυθμίσεις';
-$wb['install_package_txt'] = 'Εγκατάσταση Πακέτου';
-$wb['installation_txt'] = 'Εγκατάσταση';
-$wb['install_location_txt'] = 'Τοποθεσία Εγκατάστασης';
-$wb['acceptance_txt'] = 'Αποδοχή';
-$wb['acceptance_text_txt'] = 'Ναι, διάβασα την άδεια χρήσης και συμφωνώ.';
-$wb['install_language_txt'] = 'Γλώσσα διεπαφής';
-$wb['new_database_password_txt'] = 'Νέο συνθηματικό βάσης δεδομένων';
-$wb['basic_settings_txt'] = 'Βασικές Ρυθμίσεις';
-$wb['package_settings_txt'] = 'Ρυθμίσεις πακέτου';
-$wb['error_main_domain'] = 'ΤΟ domain της διαδρομής εγκατάστασης δεν είναι έγκυρο.';
-$wb['error_no_main_location'] = 'Δεν δώσατε έγκρυρη διαδρομή εγκατάστασης.';
-$wb['error_inv_main_location'] = 'Ο φάκελος στην τοποθεσία δεν είναι έγκυρος.';
-$wb['error_license_agreement'] = 'ΓΙα να συνεχίσετε πρέπει να αποδεχθείτε την άδεια χρήσης.';
-$wb['error_no_database_pw'] = 'Δεν δώσατε έγκυρο συνθηματικό Βάσης Δεδομένων.';
-$wb['error_short_database_pw'] = 'Παρακαλούμε, επιλέξτε μεγαλύτερο συνθηματικό Βάσης Δεδομένων.';
-$wb['error_no_value_for'] = 'Το πεδίο \\"%s\\" δεν πρέπει να είναι κενό.';
-$wb['error_short_value_for'] = 'Το πεδίο \\"%s\\" απαιτεί μεγαλύτερη τιμή.';
-$wb['error_long_value_for'] = 'Το πεδίο \\"%s\\" απαιτεί μικρότερη τιμή.';
-$wb['error_inv_value_for'] = 'Εισάγατε μη έγκυρη τιμή για το πεδίο \\"%s\\".';
-$wb['error_inv_email_for'] = 'Εισάγατε μη έγκυρη διεύθυνση mail για το πεδίο \\"%s\\".';
-$wb['error_inv_domain_for'] = 'Εισάγατε μη έγκυρο domain για το πεδίο \\"%s\\".';
-$wb['error_inv_integer_for'] = 'Εισάγατε μη έγκυρο ακέραιο αριθμό για το πεδίο \\"%s\\".';
-$wb['error_inv_float_for'] = 'Εισάγατε μη έγκυρο πραγματικό αριθμό για το πεδίο \\"%s\\".';
-$wb['error_used_location'] = 'Η διαδρομή εγκατάστασης περιέχει ήδη ένα εγκατεστημένο πακέτο.';
-$wb['installation_task_txt'] = 'Η εγκατάσταση προγραμματίστηκε';
-$wb['installation_error_txt'] = 'Σφάλμα εγκατάστασης';
-$wb['installation_success_txt'] = 'Η εγκατάσταση έγινε';
-$wb['installation_remove_txt'] = 'Η απεγκατάσταση προγραμματίστηκε';
-$wb['packagelist_update_finished_txt'] = 'Η ενημέρωση της λίστας APS τελείωσε.';
-$wb['btn_install_txt'] = 'Εγκατάσταση';
-$wb['btn_cancel_txt'] = 'Άκυρο';
-$wb['limit_aps_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος εγκαταστάσεων APS για τον λογαριασμό σας.';
+$wb['changelog_txt'] = 'Changelog';
+$wb['server_requirements_txt'] = 'Server requirements';
+$wb['php_extensions_txt'] = 'PHP extensions';
+$wb['php_settings_txt'] = 'PHP settings';
+$wb['supported_php_versions_txt'] = 'Supported PHP versions';
+$wb['database_txt'] = 'Database';
+$wb['settings_txt'] = 'Settings';
+$wb['install_package_txt'] = 'Install this package';
+$wb['installation_txt'] = 'Installation';
+$wb['install_location_txt'] = 'Install location';
+$wb['acceptance_txt'] = 'Acceptance';
+$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
+$wb['install_language_txt'] = 'Interface language';
+$wb['new_database_password_txt'] = 'New database password';
+$wb['basic_settings_txt'] = 'Basic settings';
+$wb['package_settings_txt'] = 'Package settings';
+$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
+$wb['error_no_main_location'] = 'You have provided no valid installation path.';
+$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
+$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
+$wb['error_no_database_pw'] = 'You have provided no valid database password.';
+$wb['error_short_database_pw'] = 'Please choose a longer database password.';
+$wb['error_no_value_for'] = 'The field \\"%s\\" must not be empty.';
+$wb['error_short_value_for'] = 'The field \\"%s\\" requires a longer input value.';
+$wb['error_long_value_for'] = 'The field \\"%s\\" requires a shorter input value.';
+$wb['error_inv_value_for'] = 'You have entered an invalid value for the field \\"%s\\".';
+$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field \\"%s\\".';
+$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field \\"%s\\".';
+$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field \\"%s\\".';
+$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field \\"%s\\".';
+$wb['error_used_location'] = 'The installation path already contains a package installation.';
+$wb['installation_task_txt'] = 'Install planned';
+$wb['installation_error_txt'] = 'Install error';
+$wb['installation_success_txt'] = 'Installed';
+$wb['installation_remove_txt'] = 'Removal planned';
+$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
+$wb['btn_install_txt'] = 'Install';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
?>
diff --git a/interface/web/sites/lib/lang/el_aps_instances_list.lng b/interface/web/sites/lib/lang/el_aps_instances_list.lng
index 55e0aba..052d834 100644
--- a/interface/web/sites/lib/lang/el_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/el_aps_instances_list.lng
@@ -1,13 +1,13 @@
<?php
-$wb['list_head_txt'] = 'Εγκατεστημένα Πακέτα';
-$wb['name_txt'] = 'Όνομα';
-$wb['version_txt'] = 'Έκδοση';
-$wb['customer_txt'] = 'Πελάτης';
-$wb['status_txt'] = 'Κατάσταση';
-$wb['install_location_txt'] = 'Τοποθεσία εγκατάστασης';
-$wb['pkg_delete_confirmation'] = 'Θέλετε οπωσδήποτε να διαγράψετε αυτή την εγκατάσταση?';
-$wb['pkg_reinstall_confirmation'] = 'Θέλετε οπωσδήποτε να ξανακάνετε την εγκατάσταση αυτού του πακέτου με τις ίδιες ρυθμίσεις?';
-$wb['filter_txt'] = 'Αναζήτηση';
-$wb['delete_txt'] = 'Διαγραφή';
-$wb['reinstall_txt'] = 'Επανεγκατάσταση';
+$wb['list_head_txt'] = 'Installed packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['customer_txt'] = 'Client';
+$wb['status_txt'] = 'Status';
+$wb['install_location_txt'] = 'Install location';
+$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
+$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
+$wb['filter_txt'] = 'Search';
+$wb['delete_txt'] = 'Delete';
+$wb['reinstall_txt'] = 'Reinstall';
?>
diff --git a/interface/web/sites/lib/lang/el_aps_packages_list.lng b/interface/web/sites/lib/lang/el_aps_packages_list.lng
index 4226d90..68c3780 100644
--- a/interface/web/sites/lib/lang/el_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/el_aps_packages_list.lng
@@ -1,8 +1,8 @@
<?php
-$wb['list_head_txt'] = 'Διαθέσιμα Πακέτα';
-$wb['name_txt'] = 'Όνομα';
-$wb['version_txt'] = 'Έκδοση';
-$wb['category_txt'] = 'Κατηγορία';
-$wb['status_txt'] = 'Ξεκλείδωτο';
-$wb['filter_txt'] = 'Αναζήτηση';
+$wb['list_head_txt'] = 'Available packages';
+$wb['name_txt'] = 'Name';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Category';
+$wb['status_txt'] = 'Unlocked';
+$wb['filter_txt'] = 'Search';
?>
diff --git a/interface/web/sites/lib/lang/el_aps_update_packagelist.lng b/interface/web/sites/lib/lang/el_aps_update_packagelist.lng
index ffe73d0..ce9fcf6 100644
--- a/interface/web/sites/lib/lang/el_aps_update_packagelist.lng
+++ b/interface/web/sites/lib/lang/el_aps_update_packagelist.lng
@@ -1,7 +1,7 @@
<?php
-$wb['head_txt'] = 'Ενημέρωση λίστας πακέτων';
+$wb['head_txt'] = 'Update Packagelist';
$wb['list_desc_txt'] = '';
-$wb['btn_start_txt'] = 'Ενημέρωση λίστας πακέτων';
-$wb['btn_cancel_txt'] = 'Άκυρο';
-$wb['legend_txt'] = 'Εδώ μπορείτε να ενημερώσετε την λίστα των διαθέσιμων πακέτων. Η εργασία μπορεί να διαρκέσει μέχρι και πέντε λεπτά. Μπορείτε να φύγετε από την σελίδα αν θέλετε,η εργασία θα συνεχίζεται στο παρασκήνιο.';
+$wb['btn_start_txt'] = 'Update Packagelist';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['legend_txt'] = 'Here you can update the list of available packages. Please note that this can take up to five minutes. You can leave this page if you like; the process will continue in the background.';
?>
diff --git a/interface/web/sites/lib/lang/el_cron.lng b/interface/web/sites/lib/lang/el_cron.lng
index a839760..0ee35b9 100644
--- a/interface/web/sites/lib/lang/el_cron.lng
+++ b/interface/web/sites/lib/lang/el_cron.lng
@@ -17,6 +17,8 @@
$wb['run_month_error_format'] = 'Η μορφοποίηση για τους μήνες δεν είναι έγκυρη';
$wb['run_wday_error_format'] = 'Η μορφοποίηση για τις ημέρες της εβδομάδας δεν είναι έγκυρη';
$wb['command_error_format'] = 'Η μορφοποίηση για την εντολή δεν είναι έγκυρη. Παρακαλούμε σημειώστε ότι στην περίπτωση του url μόνο τα http/https επιτρέπονται.';
-$wb['unknown_fieldtype_error'] = 'Χρησιμοποιήθηκε άγνωστος τύπος πεδίου.';
+$wb['unknown_fieldtype_error'] = 'Χρησιμοποιήθηκε άγνωστός τύπος πεδίου.';
$wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
?>
diff --git a/interface/web/sites/lib/lang/el_database.lng b/interface/web/sites/lib/lang/el_database.lng
index 4776b59..14f05ea 100644
--- a/interface/web/sites/lib/lang/el_database.lng
+++ b/interface/web/sites/lib/lang/el_database.lng
@@ -4,7 +4,7 @@
$wb['database_name_txt'] = 'Όνομα Βάσης Δεδομένων';
$wb['database_user_txt'] = 'Όνομα Χρήστη Βάσης Δεδομένων';
$wb['database_password_txt'] = 'Συνθηματικό Βάσης Δεδομένων';
-$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού';
+$wb['password_strength_txt'] = 'Δύναμη συνθηματικού';
$wb['database_charset_txt'] = 'Κωδικοποίηση Χαρακτήρων Βάσης Δεδομένων';
$wb['remote_access_txt'] = 'Απομακρυσμένη πρόσβαση';
$wb['remote_ips_txt'] = 'Διευθύνσεις IP απομ. πρόσβασης (χωρισμένες με , και αφήστε κενό για <i>οποιαδήποτε</i>)';
@@ -14,7 +14,7 @@
$wb['database_name_error_empty'] = 'Το όνομα της βάσης δεδομένων δεν έχει οριστεί.';
$wb['database_name_error_unique'] = 'Υπάρχει ήδη μία βάση δεδομένων με αυτό το όνομα στον server. Για να φτιάξετε ένα μοναδικό όνομα, π.χ. βάλτε μπροστά από το όνομα της, το όνομα του domain.';
$wb['database_name_error_regex'] = 'Μή έγκυρο όνομα βάσης δεδομένων. Το όνομα της βάσης μπορεί να περιέχει αυτούς τους χαρακτήρες: a-z, A-Z, 0-9 και την κάτω παύλα. Μέγεθος: 2 - 64 χαρακτήρες.';
-$wb['database_user_error_empty'] = 'Το όνομα χρήστη δεν έχει οριστεί.';
+$wb['database_user_error_empty'] = 'Το όνομα της βάσης δεδομένων δεν έχει οριστεί.';
$wb['database_user_error_unique'] = 'Υπάρχει ήδη ένας χρήστης με αυτό το όνομα στον server. Για να φτιάξετε ένα μοναδικό όνομα, π.χ. βάλτε μπροστά από το όνομα, το όνομα του domain.';
$wb['database_user_error_regex'] = 'Μη έγκυρο όνομα χρήστη. Το όνομα χρήστη μπορεί να περιέχει αυτούς τους χαρακτήρες: a-z, A-Z, 0-9 και την κάτω παύλα. Μέγεθος: 2 - 64 χαρακτήρες.';
$wb['limit_database_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των βάσεων δεδομένων.';
@@ -23,24 +23,24 @@
$wb['database_name_error_len'] = 'Το όνομα της βάσης δεδομένων - {db} - είναι πολύ μεγάλο. Το συνολικό μέγιστο μέγεθος δεν μπορεί να ξεπερνά τους 64 χαρακτήρες.';
$wb['database_user_error_len'] = 'Το όνομα χρήστη της βάσης δεδομένων - {user}- είναι πολύ μεγάλο. Το συνολικό μέγιστο μέγεθος δεν μπορεί να ξεπερνά τους 16 χαρακτήρες.';
$wb['parent_domain_id_txt'] = 'Site';
-$wb['database_site_error_empty'] = 'Επιλέξτε το site στο οποίο ανήκει η βάση δεδομένων.';
-$wb['select_site_txt'] = '- Επιλογή Site -';
-$wb['btn_save_txt'] = 'Αποθήκευση';
-$wb['btn_cancel_txt'] = 'Άκυρο';
-$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού';
-$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού';
-$wb['password_mismatch_txt'] = 'Τα Συνθηματικά δεν ταιριάζουν.';
-$wb['password_match_txt'] = 'Τα Συνθηματικά ταιριάζουν.';
-$wb['globalsearch_resultslimit_of_txt'] = 'από';
-$wb['globalsearch_resultslimit_results_txt'] = 'αποτελέσματα';
-$wb['globalsearch_noresults_text_txt'] = 'Δεν υπάρχουν αποτελέσματα.';
-$wb['globalsearch_noresults_limit_txt'] = '0 αποτελέσματα';
-$wb['globalsearch_searchfield_watermark_txt'] = 'Αναζήτηση';
-$wb['globalsearch_suggestions_text_txt'] = 'Προτάσεις';
-$wb['database_ro_user_txt'] = 'Χρήστης Βάσης δεδομένων μόνο για άναγνωση';
-$wb['optional_txt'] = 'προαιρετικό';
-$wb['select_dbuser_txt'] = 'Επιλογή χρήστη Βάσης Δεδομένων';
-$wb['no_dbuser_txt'] = 'Κανένας';
-$wb['database_client_differs_txt'] = 'Ο πελάτης του γονικού website και η Βάση Δεδομένων δεν ταιριάζουν.';
-$wb['database_user_missing_txt'] = 'Παρακαλούμε επιλέξτε ένα χρήστη για αυτή την Βάση Δεδομένων.';
+$wb['database_site_error_empty'] = 'Select the site to which the database belongs.';
+$wb['select_site_txt'] = '- Select Site -';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$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['globalsearch_resultslimit_of_txt'] = 'of';
+$wb['globalsearch_resultslimit_results_txt'] = 'results';
+$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['database_ro_user_txt'] = 'Read-only database user';
+$wb['optional_txt'] = 'optional';
+$wb['select_dbuser_txt'] = 'Select database user';
+$wb['no_dbuser_txt'] = 'None';
+$wb['database_client_differs_txt'] = 'The client of the parent web and the database do not match.';
+$wb['database_user_missing_txt'] = 'Please select a database user for this database.';
?>
diff --git a/interface/web/sites/lib/lang/el_database_user.lng b/interface/web/sites/lib/lang/el_database_user.lng
index e6d8e13..66a0718 100644
--- a/interface/web/sites/lib/lang/el_database_user.lng
+++ b/interface/web/sites/lib/lang/el_database_user.lng
@@ -1,23 +1,23 @@
<?php
-$wb['database_user_txt'] = 'Όνομα Χρήστη Βάσης Δεδομένων';
-$wb['database_password_txt'] = 'Συνθηματικό Βάσης Δεδομένων';
-$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού';
-$wb['client_txt'] = 'Πελάτης';
-$wb['active_txt'] = 'Ενεργή';
-$wb['database_user_error_empty'] = 'Το όνομα χρήστη δεν έχει οριστεί.';
-$wb['database_user_error_unique'] = 'Υπάρχει ήδη ένας χρήστης με αυτό το όνομα στον server. Για να φτιάξετε ένα μοναδικό όνομα, π.χ. βάλτε μπροστά από το όνομα, το όνομα του domain.';
-$wb['database_user_error_regex'] = 'Μη έγκυρο όνομα χρήστη. Το όνομα χρήστη μπορεί να περιέχει αυτούς τους χαρακτήρες: a-z, A-Z, 0-9 και την κάτω παύλα. Μέγεθος: 2 - 64 χαρακτήρες.';
-$wb['database_user_error_len'] = 'Το όνομα χρήστη της βάσης δεδομένων - {user}- είναι πολύ μεγάλο. Το συνολικό μέγιστο μέγεθος δεν μπορεί να ξεπερνά τους 16 χαρακτήρες.';
-$wb['btn_save_txt'] = 'Αποθήκευση';
-$wb['btn_cancel_txt'] = 'Άκυρο';
-$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού';
-$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού';
-$wb['password_mismatch_txt'] = 'Τα Συνθηματικά δεν ταιριάζουν.';
-$wb['password_match_txt'] = 'Τα Συνθηματικά ταιριάζουν.';
-$wb['globalsearch_resultslimit_of_txt'] = 'από';
-$wb['globalsearch_resultslimit_results_txt'] = 'αποτελέσματα';
-$wb['globalsearch_noresults_text_txt'] = 'Δεν υπάρχουν αποτελέσματα.';
-$wb['globalsearch_noresults_limit_txt'] = '0 αποτελέσματα';
-$wb['globalsearch_searchfield_watermark_txt'] = 'Αναζήτηση';
-$wb['globalsearch_suggestions_text_txt'] = 'Προτάσεις';
+$wb['database_user_txt'] = 'Database user';
+$wb['database_password_txt'] = 'Database password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['client_txt'] = 'Client';
+$wb['active_txt'] = 'Active';
+$wb['database_user_error_empty'] = 'Database user is empty.';
+$wb['database_user_error_unique'] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
+$wb['database_user_error_regex'] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
+$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$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['globalsearch_resultslimit_of_txt'] = 'of';
+$wb['globalsearch_resultslimit_results_txt'] = 'results';
+$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';
?>
diff --git a/interface/web/sites/lib/lang/el_database_user_admin_list.lng b/interface/web/sites/lib/lang/el_database_user_admin_list.lng
index 02a4c41..d7f88c4 100644
--- a/interface/web/sites/lib/lang/el_database_user_admin_list.lng
+++ b/interface/web/sites/lib/lang/el_database_user_admin_list.lng
@@ -1,6 +1,6 @@
<?php
-$wb['list_head_txt'] = 'Χρήστης Βάσης Δεδομένων';
-$wb['database_user_txt'] = 'Χρήστης Βάσης Δεδομένων';
-$wb['add_new_record_txt'] = 'Προσθήκη νέου χρήστη';
-$wb['sys_groupid_txt'] = 'Πελάτης';
+$wb['list_head_txt'] = 'Database User';
+$wb['database_user_txt'] = 'Database user';
+$wb['add_new_record_txt'] = 'Add new User';
+$wb['sys_groupid_txt'] = 'Client';
?>
diff --git a/interface/web/sites/lib/lang/el_database_user_list.lng b/interface/web/sites/lib/lang/el_database_user_list.lng
index b1bb376..8c22649 100644
--- a/interface/web/sites/lib/lang/el_database_user_list.lng
+++ b/interface/web/sites/lib/lang/el_database_user_list.lng
@@ -1,5 +1,5 @@
<?php
-$wb['list_head_txt'] = 'Χρήστης Βάσης Δεδομένων';
-$wb['database_user_txt'] = 'Χρήστης Βάσης Δεδομένων';
-$wb['add_new_record_txt'] = 'Προσθήκη νέου χρήστη';
+$wb['list_head_txt'] = 'Database user';
+$wb['database_user_txt'] = 'Database user';
+$wb['add_new_record_txt'] = 'Add new user';
?>
diff --git a/interface/web/sites/lib/lang/el_ftp_user.lng b/interface/web/sites/lib/lang/el_ftp_user.lng
index d65aef5..2f89d27 100644
--- a/interface/web/sites/lib/lang/el_ftp_user.lng
+++ b/interface/web/sites/lib/lang/el_ftp_user.lng
@@ -12,7 +12,7 @@
$wb['parent_domain_id_txt'] = 'Website';
$wb['username_txt'] = 'Όνομα Χρήστη';
$wb['password_txt'] = 'Συνθηματικό';
-$wb['password_strength_txt'] = 'Ισχύς Συνθηματικου';
+$wb['password_strength_txt'] = 'Δύναμη Συνθηματικου';
$wb['quota_size_txt'] = 'Όριο χρήσης αποθηκευτικού χώρου';
$wb['active_txt'] = 'Ενεργός';
$wb['limit_ftp_user_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των χρηστών FTP για τον λογαριασμό σας.';
@@ -25,10 +25,10 @@
$wb['directory_error_notinweb'] = 'Ο φάκελος δεν βρίσκεται μέσα στον ριζικό φάκελο web.';
$wb['parent_domain_id_error_empty'] = 'Δεν επιλέχθηκε website.';
$wb['quota_size_error_regex'] = 'Όριο: εισάγετε -1 για απεριόριστα ή έναν αριθμό > 0';
-$wb['dir_dot_error'] = 'Δεν επιτρέπονται .. στη διαδρομη.';
-$wb['dir_slashdot_error'] = 'Δεν επιτρέπεται ./ στη διαδρομη.';
-$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού';
-$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού';
-$wb['password_mismatch_txt'] = 'Τα Συνθηματικά δεν ταιριάζουν.';
-$wb['password_match_txt'] = 'Τα Συνθηματικά ταιριάζουν.';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
+$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.';
?>
diff --git a/interface/web/sites/lib/lang/el_shell_user.lng b/interface/web/sites/lib/lang/el_shell_user.lng
index 6513f99..3c3ea31 100644
--- a/interface/web/sites/lib/lang/el_shell_user.lng
+++ b/interface/web/sites/lib/lang/el_shell_user.lng
@@ -1,14 +1,14 @@
<?php
$wb['puser_txt'] = 'Όνομα χρήστη Web';
$wb['pgroup_txt'] = 'Ομάδα Web';
-$wb['shell_txt'] = 'Κέλυφος';
+$wb['shell_txt'] = 'Shell';
$wb['dir_txt'] = 'Φάκελος';
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Site';
$wb['username_txt'] = 'Όνομα χρήστη';
$wb['password_txt'] = 'Συνθηματικό';
-$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού';
-$wb['chroot_txt'] = 'Κέλυφος Chroot';
+$wb['password_strength_txt'] = 'Δύναμη συνθηματικού';
+$wb['chroot_txt'] = 'Chroot Shell';
$wb['quota_size_txt'] = 'Όρια';
$wb['active_txt'] = 'Ενεργός';
$wb['username_error_empty'] = 'Το όνομα χρήστη δεν έχει οριστεί';
@@ -20,12 +20,12 @@
$wb['limit_shell_user_txt'] = 'Φτάσατε το μέγιστο πλήθος τον λογαριασμών Shell';
$wb['parent_domain_id_error_empty'] = 'Δεν επιλέχθηκε website';
$wb['ssh_rsa_txt'] = 'Δημόσιο Κλειδί SSH-RSA (για key-based logins)';
-$wb['dir_dot_error'] = 'Δεν επιτρέπονται .. στη διαδρομη.';
-$wb['dir_slashdot_error'] = 'Δεν επιτρέπεται ./ στη διαδρομη.';
-$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού';
-$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού';
-$wb['password_mismatch_txt'] = 'Τα Συνθηματικά δεν ταιριάζουν.';
-$wb['password_match_txt'] = 'Τα Συνθηματικά ταιριάζουν.';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
+$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['username_must_not_exceed_32_chars_txt'] = 'The username must not exceed 32 characters.';
$wb['username_not_allowed_txt'] = 'The username is not allowed.';
?>
diff --git a/interface/web/sites/lib/lang/el_shell_user_list.lng b/interface/web/sites/lib/lang/el_shell_user_list.lng
index d0b7a16..5468905 100644
--- a/interface/web/sites/lib/lang/el_shell_user_list.lng
+++ b/interface/web/sites/lib/lang/el_shell_user_list.lng
@@ -1,8 +1,8 @@
<?php
-$wb['list_head_txt'] = 'Χρήστης Κελύφους';
+$wb['list_head_txt'] = 'Χρήστης Shell';
$wb['active_txt'] = 'Ενεργός';
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Site';
$wb['username_txt'] = 'Όνομα Χρήστη';
-$wb['add_new_record_txt'] = 'Νεός χρήστης Κελύφους';
+$wb['add_new_record_txt'] = 'Νεός χρήστης Shell';
?>
diff --git a/interface/web/sites/lib/lang/el_user_quota_stats_list.lng b/interface/web/sites/lib/lang/el_user_quota_stats_list.lng
index 5b83022..a4b080e 100644
--- a/interface/web/sites/lib/lang/el_user_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/el_user_quota_stats_list.lng
@@ -5,5 +5,5 @@
$wb['used_txt'] = 'Χρησιμοποιούμενος χώρος';
$wb['hard_txt'] = 'Απόλυτο όριο';
$wb['soft_txt'] = 'Διαλακτικό όριο';
-$wb['files_txt'] = 'Μεμονωμένα Αρχεία';
+$wb['files_txt'] = 'Single files';
?>
diff --git a/interface/web/sites/lib/lang/el_web_backup_list.lng b/interface/web/sites/lib/lang/el_web_backup_list.lng
index 2fa2a77..9a10ca6 100644
--- a/interface/web/sites/lib/lang/el_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/el_web_backup_list.lng
@@ -1,15 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Υπάρχοντα Αντίγραφα Ασφαλείας';
-$wb['date_txt'] = 'Ημερομηνία';
-$wb['backup_type_txt'] = 'Τύπος';
-$wb['filename_txt'] = 'Αρχείο Αντιγράφου Ασφαλείας';
-$wb['restore_backup_txt'] = 'Επαναφορά Αντιγράφου Ασφαλείας';
-$wb['download_backup_txt'] = 'Μεταφόρτωση Αντιγράφου Ασφαλείας';
-$wb['download_info_txt'] = 'Το Αντιγράφου Ασφαλείας θα είναι διαθέσιμο για μεταφόρτωση στον φάκελο Αντιγράφων Ασφαλείας του website σε λίγα λεπτά.';
-$wb['restore_info_txt'] = 'Η επαναφορά του Αντιγράφου Ασφαλείας ξεκίνησε. Η ενέργεια απαιτεί πολλά λεπτά για την ολοκλήρωσή της.';
-$wb['restore_confirm_txt'] = 'Η επαναφορά θα αντικαταστήσει αρχεία στο website. Είστε σίγουροι ότι θέλετε να κάνετε επαναφορά του Αντιγράφου Ασφαλείας?';
-$wb['download_pending_txt'] = 'Υπάρχει ήδη σε αναμονή μια εργασία μεταφόρτωσης Αντιγράφου Ασφαλείας.';
-$wb['restore_pending_txt'] = 'Υπάρχει ήδη σε αναμονή μια εργασία επαναφοράς Αντιγράφου Ασφαλείας.';
-$wb['backup_type_mysql'] = 'Βάση Δεδομένων MySQL';
-$wb['backup_type_web'] = 'Αρχεία Website';
+$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 backup';
+$wb['download_backup_txt'] = 'Download backup';
+$wb['download_info_txt'] = 'The backup file will be available for download in the backup folder of the website in a few minutes.';
+$wb['restore_info_txt'] = 'Restore of the backup has been started. This action takes several minutes to be completed.';
+$wb['restore_confirm_txt'] = 'Restoring will overwrite existing files in your website. 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['backup_type_mysql'] = 'MySQL Database';
+$wb['backup_type_web'] = 'Website files';
?>
diff --git a/interface/web/sites/lib/lang/el_web_childdomain.lng b/interface/web/sites/lib/lang/el_web_childdomain.lng
index b573872..b9d97b7 100644
--- a/interface/web/sites/lib/lang/el_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/el_web_childdomain.lng
@@ -4,6 +4,10 @@
$wb['ssl_organisation_txt'] = 'Οργανισμός';
$wb['ssl_organisation_unit_txt'] = 'Τμήμα οργανισμού';
$wb['ssl_country_txt'] = 'Χώρα';
+$wb['domain_txt'] = 'Aliasdomain';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
$wb['ssl_request_txt'] = 'SSL Request';
$wb['ssl_cert_txt'] = 'SSL Certificate';
$wb['ssl_bundle_txt'] = 'SSL Bundle';
@@ -71,7 +75,7 @@
$wb['ssl_country_error_regex'] = 'Άκυρη Χώρα SSL. Έγκυροι χαρακτήρες: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Μέγιστο Όριο μεταφοράς δεδομένων';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Ξεπεράστηκε το όριο μεταφοράς δεδομένων';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
$wb['ruby_txt'] = 'Ruby';
$wb['stats_user_txt'] = 'Όνομα Χρήστη Στατιστικών Web';
$wb['stats_type_txt'] = 'Πρόγραμμα Στατιστικών Web';
@@ -82,7 +86,7 @@
$wb['create_certificate_txt'] = 'Δημιουργία Πιστοποιητικού';
$wb['delete_certificate_txt'] = 'Διαγραφή Πιστοποιητικού';
$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'Ανακατεύθυνση SEO';
+$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';
@@ -115,5 +119,4 @@
$wb['available_apache_directive_snippets_txt'] = 'Διαθέσιμα Apache Directive Snippets:';
$wb['available_nginx_directive_snippets_txt'] = 'Διαθέσιμα nginx Directive Snippets:';
$wb['Domain'] = 'Ψευδώνυμο domain';
-
?>
diff --git a/interface/web/sites/lib/lang/el_web_childdomain_list.lng b/interface/web/sites/lib/lang/el_web_childdomain_list.lng
index 1d0a54b..a868b5b 100644
--- a/interface/web/sites/lib/lang/el_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/el_web_childdomain_list.lng
@@ -11,5 +11,4 @@
$wb['no_redirect_txt'] = 'Χωρίς Ανακατεύθυνση';
$wb['no_flag_txt'] = 'Χωρίς σημαία';
$wb['none_txt'] = 'Κανένα';
-
?>
diff --git a/interface/web/sites/lib/lang/el_web_folder_user.lng b/interface/web/sites/lib/lang/el_web_folder_user.lng
index e55f957..2dc4257 100644
--- a/interface/web/sites/lib/lang/el_web_folder_user.lng
+++ b/interface/web/sites/lib/lang/el_web_folder_user.lng
@@ -4,11 +4,11 @@
$wb['password_txt'] = 'Συνθηματικό';
$wb['active_txt'] = 'Ενεργός';
$wb['folder_error_empty'] = 'Δεν επιλέχθηκε φάκελος web.';
-$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού';
-$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού';
-$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού';
-$wb['password_mismatch_txt'] = 'Τα Συνθηματικά δεν ταιριάζουν.';
-$wb['password_match_txt'] = 'Τα Συνθηματικά ταιριάζουν.';
+$wb['password_strength_txt'] = 'Password strength';
+$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['no_folder_perm'] = 'You have no permission for this folder.';
$wb['error_user_exists_already_txt'] = 'There is already a record for this user.';
?>
diff --git a/interface/web/sites/lib/lang/el_web_sites_stats_list.lng b/interface/web/sites/lib/lang/el_web_sites_stats_list.lng
index dc58324..9916646 100644
--- a/interface/web/sites/lib/lang/el_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/el_web_sites_stats_list.lng
@@ -5,5 +5,5 @@
$wb['last_month_txt'] = 'Το τελευταίο μήνα';
$wb['this_year_txt'] = 'Αυτό το χρόνο';
$wb['last_year_txt'] = 'Τον τελευταίο χρόνο';
-$wb['sum_txt'] = 'Σύνολο';
+$wb['sum_txt'] = 'Sum';
?>
diff --git a/interface/web/sites/lib/lang/el_web_vhost_domain.lng b/interface/web/sites/lib/lang/el_web_vhost_domain.lng
index fa8b6cc..660bc0c 100644
--- a/interface/web/sites/lib/lang/el_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/el_web_vhost_domain.lng
@@ -1,5 +1,5 @@
<?php
-$wb['backup_interval_txt'] = 'Προγραμματισμός Αντιγράφων Ασφαλείας';
+$wb['backup_interval_txt'] = 'Προγραμματισμός Backup';
$wb['backup_copies_txt'] = 'Πλήθος αντιγράφων';
$wb['ssl_state_txt'] = 'Κατάσταση';
$wb['ssl_locality_txt'] = 'Τοποθεσία';
@@ -24,11 +24,11 @@
$wb['ip_address_txt'] = 'Διεύθυνση IP';
$wb['vhost_type_txt'] = 'VHost Type';
$wb['hd_quota_txt'] = 'Όριο αποθηκευτικού χώρου';
-$wb['traffic_quota_txt'] = 'Όριο μεταφοράς δεδομένων';
+$wb['traffic_quota_txt'] = 'Όριο κίνησης';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
$wb['errordocs_txt'] = 'Προσωπικά έγγραφα σφάλματος';
-$wb['subdomain_txt'] = 'Αυτόματο-Subdomain';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
@@ -41,7 +41,7 @@
$wb['domain_error_unique'] = 'Υπάρχει ήδη ένα website ή ένα sub / aliasdomain με αυτό το όνομα domain.';
$wb['domain_error_regex'] = 'Domain name invalid.';
$wb['hd_quota_error_empty'] = 'Το όριο αποθηκευτικού χώρου είναι 0 ή δεν έχει οριστεί.';
-$wb['traffic_quota_error_empty'] = 'Το όριο μεταφοράς δεδομένων δεν έχει οριστεί.';
+$wb['traffic_quota_error_empty'] = 'Το όριο κίνησης δεν έχει οριστεί.';
$wb['error_ssl_state_empty'] = 'Κενή περιφέρεια SSL.';
$wb['error_ssl_locality_empty'] = 'Κενή τοποθεσία SSL.';
$wb['error_ssl_organisation_empty'] = 'Ο Οργανισμός SSL δεν έχει οριστεί.';
@@ -57,10 +57,10 @@
$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['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['traffic_quota_exceeded_txt'] = 'Ξεπεράστηκε το όριο κίνησης δεδομένων';
$wb['ruby_txt'] = 'Ruby';
$wb['stats_user_txt'] = 'Όνομα Χρήστη Στατιστικών Web';
$wb['stats_type_txt'] = 'Πρόγραμμα Στατιστικών Web';
@@ -89,29 +89,29 @@
$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'] = 'Το όριο χρήσης δίσκου δεν είναι έγκυρο.';
-$wb['traffic_quota_error_regex'] = 'Το όριο μεταφοράς δεδομένων δεν είναι έγκυρο.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
$wb['ssl_key_txt'] = 'SSL Key';
$wb['perl_txt'] = 'Perl';
-$wb['fastcgi_php_version_txt'] = 'Έκδοση PHP';
+$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['web_folder_error_regex'] = 'Εισάγατε μη έγκυρο φάκελο. Μην εισάγετε την κάθετο';
-$wb['domain_error_autosub'] = 'Υπάρχει ήδη ένα subdomain με αυτές τις ρυθμίσεις.';
-$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['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['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$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'] = 'Διαθέσιμα Proxy Directive Snippets:';
-$wb['no_server_error'] = 'Δεν επιλέχθηκε server.';
+$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';
diff --git a/interface/web/sites/lib/lang/el_webdav_user.lng b/interface/web/sites/lib/lang/el_webdav_user.lng
index bf7e10f..b33b553 100644
--- a/interface/web/sites/lib/lang/el_webdav_user.lng
+++ b/interface/web/sites/lib/lang/el_webdav_user.lng
@@ -4,7 +4,7 @@
$wb['parent_domain_id_txt'] = 'Website';
$wb['username_txt'] = 'Όνομα Χρήστη';
$wb['password_txt'] = 'Συνθηματικό';
-$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού';
+$wb['password_strength_txt'] = 'Δύναμη Συνθηματικού';
$wb['active_txt'] = 'Ενεργός';
$wb['limit_webdav_user_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των webdav users για τον λογαριασμό σας.';
$wb['username_error_empty'] = 'Όνομα Χρήστη δεν έχει οριστεί.';
@@ -12,10 +12,10 @@
$wb['username_error_regex'] = 'Το Όνομα Χρήστη περιέχει μη επιτρεπόμενους χαρακτήρες.';
$wb['directory_error_empty'] = 'Ο φάκελος δεν έχει οριστεί.';
$wb['parent_domain_id_error_empty'] = 'Δεν επιλέχθηκε website.';
-$wb['dir_dot_error'] = 'Δεν επιτρέπονται οι .. στην διαδρομή.';
-$wb['dir_slashdot_error'] = 'Δεν επιτρέπεται το ./ στην διαδρομή.';
-$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού';
-$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού';
-$wb['password_mismatch_txt'] = 'Τα συνθηματικά δεν ταιριάζουν.';
-$wb['password_match_txt'] = 'Τα συνθηματικά ταιριάζουν.';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
+$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.';
?>
diff --git a/interface/web/sites/lib/lang/en_cron.lng b/interface/web/sites/lib/lang/en_cron.lng
index 6f3074a..2d224ba 100644
--- a/interface/web/sites/lib/lang/en_cron.lng
+++ b/interface/web/sites/lib/lang/en_cron.lng
@@ -21,4 +21,6 @@
$wb['server_id_error_empty'] = 'The server ID is empty.';
$wb['command_hint_txt'] = 'e.g. /var/www/clients/clientX/webY/myscript.sh or http://www.mydomain.com/path/script.php, you can use [web_root] placeholder that is replaced by /var/www/clients/clientX/webY/web.';
$wb['log_output_txt'] = 'Log output';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/es_cron.lng b/interface/web/sites/lib/lang/es_cron.lng
index 46a0abd..436c947 100644
--- a/interface/web/sites/lib/lang/es_cron.lng
+++ b/interface/web/sites/lib/lang/es_cron.lng
@@ -19,4 +19,6 @@
$wb['command_error_format'] = 'Formato de comando no válido. En el caso de las llamadas a URLs sólo se permite http o https.';
$wb['unknown_fieldtype_error'] = 'Se ha usado un tipo de campo desconocido.';
$wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
?>
diff --git a/interface/web/sites/lib/lang/fi_cron.lng b/interface/web/sites/lib/lang/fi_cron.lng
index ef6a5a3..f07ea7b 100644
--- a/interface/web/sites/lib/lang/fi_cron.lng
+++ b/interface/web/sites/lib/lang/fi_cron.lng
@@ -19,4 +19,6 @@
$wb['command_error_format'] = 'Komento-asetus on vääranlainen. Huomaa että url-komennoissa vain http/https-osoitteet ovat sallittuja.';
$wb['unknown_fieldtype_error'] = 'Käytetty tuntematonta kenttätyyppiä.';
$wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
?>
diff --git a/interface/web/sites/lib/lang/fr.lng b/interface/web/sites/lib/lang/fr.lng
index a7f4576..c914ef0 100644
--- a/interface/web/sites/lib/lang/fr.lng
+++ b/interface/web/sites/lib/lang/fr.lng
@@ -4,12 +4,12 @@
$wb['Subdomain'] = 'Sous-domaine';
$wb['Aliasdomain'] = 'Alias';
$wb['Database'] = 'Base de données';
-$wb['Web Access'] = 'Web Access';
+$wb['Web Access'] = 'Accès aux sites Web';
$wb['FTP-User'] = 'Utilisateur FTP';
$wb['Webdav-User'] = 'Utilisateur WebDav';
-$wb['Folder'] = 'Protected Folders';
-$wb['Folder users'] = 'Protected Folder Users';
-$wb['Command Line'] = 'Command Line';
+$wb['Folder'] = 'Dossiers protégés';
+$wb['Folder users'] = 'Utilisateurs de dossiers protégés';
+$wb['Command Line'] = 'Ligne de commande';
$wb['Shell-User'] = 'Utilisateur Shell';
$wb['Cron Jobs'] = 'Tâches cron';
$wb['Statistics'] = 'Statistiques';
@@ -25,11 +25,11 @@
$wb['Redirect'] = 'Redirection';
$wb['SSL'] = 'SSL';
$wb['Sites'] = 'Sites';
-$wb['Database User'] = 'Database Users';
-$wb['APS Installer'] = 'APS Installer';
-$wb['Available packages'] = 'Available packages';
-$wb['Installed packages'] = 'Installed packages';
-$wb['Update Packagelist'] = 'Update Packagelist';
-$wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
+$wb['Database User'] = 'Utilisateurs de bases de données';
+$wb['APS Installer'] = 'Installeur APS';
+$wb['Available packages'] = 'Packages disponibles';
+$wb['Installed packages'] = 'Packages installés';
+$wb['Update Packagelist'] = 'Mise à jour de la liste des packages';
+$wb['Subdomain (Vhost)'] = 'Sous-domaine (Vhost)';
+$wb['error_proxy_requires_url'] = 'Type de redirection \"proxy\" nécessite une URL comme chemin de redirection.';
?>
diff --git a/interface/web/sites/lib/lang/fr_aps.lng b/interface/web/sites/lib/lang/fr_aps.lng
index 29fb7b6..eb268b0 100644
--- a/interface/web/sites/lib/lang/fr_aps.lng
+++ b/interface/web/sites/lib/lang/fr_aps.lng
@@ -1,58 +1,58 @@
<?php
-$wb['overview_txt'] = 'Overview';
+$wb['overview_txt'] = 'Vue d\'ensemble';
$wb['administration_txt'] = 'Administration';
-$wb['available_packages_txt'] = 'Available packages';
-$wb['installed_packages_txt'] = 'Installed packages';
-$wb['yes_txt'] = 'Yes';
-$wb['no_txt'] = 'No';
-$wb['invalid_id_txt'] = 'No valid ID has been provided.';
+$wb['available_packages_txt'] = 'Packages disponibles';
+$wb['installed_packages_txt'] = 'Packages installés';
+$wb['yes_txt'] = 'Oui';
+$wb['no_txt'] = 'Non';
+$wb['invalid_id_txt'] = 'Aucun ID valide n\'a été fourni.';
$wb['details_txt'] = 'Details';
$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['homepage_txt'] = 'Homepage';
-$wb['supported_languages_txt'] = 'Supported languages';
+$wb['category_txt'] = 'Categorie';
+$wb['homepage_txt'] = 'Page d\'accueil';
+$wb['supported_languages_txt'] = 'Langues supportées';
$wb['description_txt'] = 'Description';
-$wb['config_script_txt'] = 'Configuration script';
-$wb['installed_size_txt'] = 'Size after installation';
-$wb['license_txt'] = 'License';
+$wb['config_script_txt'] = 'Script de configuration';
+$wb['installed_size_txt'] = 'Taille après installation';
+$wb['license_txt'] = 'Licence';
$wb['screenshots_txt'] = 'Screenshots';
$wb['changelog_txt'] = 'Changelog';
-$wb['server_requirements_txt'] = 'Server requirements';
-$wb['php_extensions_txt'] = 'PHP extensions';
-$wb['php_settings_txt'] = 'PHP settings';
-$wb['supported_php_versions_txt'] = 'Supported PHP versions';
-$wb['database_txt'] = 'Database';
-$wb['settings_txt'] = 'Settings';
-$wb['install_package_txt'] = 'Install this package';
+$wb['server_requirements_txt'] = 'Configuration serveur requise';
+$wb['php_extensions_txt'] = 'Extensions PHP';
+$wb['php_settings_txt'] = 'Configuration PHP';
+$wb['supported_php_versions_txt'] = 'Versions PHP supportées';
+$wb['database_txt'] = 'Base de données';
+$wb['settings_txt'] = 'Configuration';
+$wb['install_package_txt'] = 'Installer ce package';
$wb['installation_txt'] = 'Installation';
-$wb['install_location_txt'] = 'Install location';
-$wb['acceptance_txt'] = 'Acceptance';
-$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
-$wb['install_language_txt'] = 'Interface language';
-$wb['new_database_password_txt'] = 'New database password';
-$wb['basic_settings_txt'] = 'Basic settings';
-$wb['package_settings_txt'] = 'Package settings';
-$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
-$wb['error_no_main_location'] = 'You have provided no valid installation path.';
-$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
-$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
-$wb['error_no_database_pw'] = 'You have provided no valid database password.';
-$wb['error_short_database_pw'] = 'Please choose a longer database password.';
-$wb['error_no_value_for'] = 'The field \\"%s\\" must not be empty.';
-$wb['error_short_value_for'] = 'The field \\"%s\\" requires a longer input value.';
-$wb['error_long_value_for'] = 'The field \\"%s\\" requires a shorter input value.';
-$wb['error_inv_value_for'] = 'You have entered an invalid value for the field \\"%s\\".';
-$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field \\"%s\\".';
-$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field \\"%s\\".';
-$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field \\"%s\\".';
-$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field \\"%s\\".';
-$wb['error_used_location'] = 'The installation path already contains a package installation.';
-$wb['installation_task_txt'] = 'Install planned';
-$wb['installation_error_txt'] = 'Install error';
-$wb['installation_success_txt'] = 'Installed';
-$wb['installation_remove_txt'] = 'Removal planned';
-$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
-$wb['btn_install_txt'] = 'Install';
-$wb['btn_cancel_txt'] = 'Cancel';
-$wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
+$wb['install_location_txt'] = 'Chemin d\'installation';
+$wb['acceptance_txt'] = 'Conditions d\'utilisation (licence)';
+$wb['acceptance_text_txt'] = 'Oui, j\'ai lu les conditions d\'utilisation (licence) et les accepte.';
+$wb['install_language_txt'] = 'Langue de l\'interface';
+$wb['new_database_password_txt'] = 'Nouveau mot de passe BDD';
+$wb['basic_settings_txt'] = 'Configuration de base';
+$wb['package_settings_txt'] = 'Configuration du package';
+$wb['error_main_domain'] = 'Le domaine du chemin d\'installation est invalide.';
+$wb['error_no_main_location'] = 'Vous n\'avez fourni aucun chemin d\'installation valide.';
+$wb['error_inv_main_location'] = 'Le dossier d\'installation choisi est invalide.';
+$wb['error_license_agreement'] = 'Avant de continuer, vous devez accepter les conditions d\'utilisation (licence).';
+$wb['error_no_database_pw'] = 'Vous n\'avez pas renseigné de mot de passe BDD valide.';
+$wb['error_short_database_pw'] = 'Veuillez saisir un mot de passe BDD plus long.';
+$wb['error_no_value_for'] = 'Le champ \"%s\" ne peut pas être vide.';
+$wb['error_short_value_for'] = 'Le champ \"%s\" nécessite une valeur plus longue.';
+$wb['error_long_value_for'] = 'Le champ \"%s\" nécessite une valeur plus courte.';
+$wb['error_inv_value_for'] = 'Vous avez saisi une valeur invalide pour le champ \"%s\".';
+$wb['error_inv_email_for'] = 'L\'adresse email saisie pour le champ \"%s\" est invalide.';
+$wb['error_inv_domain_for'] = 'Le domaine saisi pour le champ \"%s\" est invalide.';
+$wb['error_inv_integer_for'] = 'Le nombre saisi pour le champ \"%s\" est invalide.';
+$wb['error_inv_float_for'] = 'La décimale saisie pour le champ \"%s\" est invalide.';
+$wb['error_used_location'] = 'Le chemin de destination contient déjà un package d\'installation.';
+$wb['installation_task_txt'] = 'Installation prévue';
+$wb['installation_error_txt'] = 'Erreur d\'installation';
+$wb['installation_success_txt'] = 'Installé';
+$wb['installation_remove_txt'] = 'Désinstallation prévue';
+$wb['packagelist_update_finished_txt'] = 'Mise à jour APS Packagelist terminée.';
+$wb['btn_install_txt'] = 'Installer';
+$wb['btn_cancel_txt'] = 'Annuler';
+$wb['limit_aps_txt'] = 'Le nombre max d\'instances APS pour votre compte a été atteint.';
?>
diff --git a/interface/web/sites/lib/lang/fr_aps_instances_list.lng b/interface/web/sites/lib/lang/fr_aps_instances_list.lng
index 052d834..6a2dba1 100644
--- a/interface/web/sites/lib/lang/fr_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/fr_aps_instances_list.lng
@@ -1,13 +1,13 @@
<?php
-$wb['list_head_txt'] = 'Installed packages';
-$wb['name_txt'] = 'Name';
+$wb['list_head_txt'] = 'Packages installés';
+$wb['name_txt'] = 'Nom';
$wb['version_txt'] = 'Version';
$wb['customer_txt'] = 'Client';
-$wb['status_txt'] = 'Status';
-$wb['install_location_txt'] = 'Install location';
-$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
-$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
-$wb['filter_txt'] = 'Search';
-$wb['delete_txt'] = 'Delete';
-$wb['reinstall_txt'] = 'Reinstall';
+$wb['status_txt'] = 'Statut';
+$wb['install_location_txt'] = 'Chemin d\'installation';
+$wb['pkg_delete_confirmation'] = 'Etes-vous sûr de vouloir supprimer cette installation ?';
+$wb['pkg_reinstall_confirmation'] = 'Etes-vous sûr de vouloir réinstaller ce package avec la même configuration ?';
+$wb['filter_txt'] = 'Chercher';
+$wb['delete_txt'] = 'Supprimer';
+$wb['reinstall_txt'] = 'Réinstaller';
?>
diff --git a/interface/web/sites/lib/lang/fr_aps_packages_list.lng b/interface/web/sites/lib/lang/fr_aps_packages_list.lng
index 68c3780..24fb0b9 100644
--- a/interface/web/sites/lib/lang/fr_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/fr_aps_packages_list.lng
@@ -1,8 +1,8 @@
<?php
-$wb['list_head_txt'] = 'Available packages';
-$wb['name_txt'] = 'Name';
+$wb['list_head_txt'] = 'Packages disponibles';
+$wb['name_txt'] = 'Nom';
$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['status_txt'] = 'Unlocked';
-$wb['filter_txt'] = 'Search';
+$wb['category_txt'] = 'Categorie';
+$wb['status_txt'] = 'Dévérouillé';
+$wb['filter_txt'] = 'Chercher';
?>
diff --git a/interface/web/sites/lib/lang/fr_cron.lng b/interface/web/sites/lib/lang/fr_cron.lng
index 7520548..41a0b82 100644
--- a/interface/web/sites/lib/lang/fr_cron.lng
+++ b/interface/web/sites/lib/lang/fr_cron.lng
@@ -19,4 +19,6 @@
$wb['command_error_format'] = 'Format de la commande invalide.';
$wb['unknown_fieldtype_error'] = 'Un champ inconnu a été utilisé';
$wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
?>
diff --git a/interface/web/sites/lib/lang/fr_ftp_user.lng b/interface/web/sites/lib/lang/fr_ftp_user.lng
index 9d52e3e..5d00f4b 100644
--- a/interface/web/sites/lib/lang/fr_ftp_user.lng
+++ b/interface/web/sites/lib/lang/fr_ftp_user.lng
@@ -25,10 +25,10 @@
$wb['directory_error_notinweb'] = 'Le répertoire nest pas dans la racine web.';
$wb['parent_domain_id_error_empty'] = 'Pas de site web sélectionné.';
$wb['quota_size_error_regex'] = 'Quota: entrez -1 pour illimité ou un nombre > 0';
-$wb['dir_dot_error'] = 'No .. in path allowed.';
-$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
-$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['dir_dot_error'] = 'Les .. sont interdits.';
+$wb['dir_slashdot_error'] = 'Les ./ sont interdits.';
+$wb['generate_password_txt'] = 'Générer un mot de passe';
+$wb['repeat_password_txt'] = 'Vérification du mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
?>
diff --git a/interface/web/sites/lib/lang/fr_shell_user.lng b/interface/web/sites/lib/lang/fr_shell_user.lng
index 1fbc93c..3f967f8 100644
--- a/interface/web/sites/lib/lang/fr_shell_user.lng
+++ b/interface/web/sites/lib/lang/fr_shell_user.lng
@@ -6,7 +6,7 @@
$wb['username_txt'] = 'Nom d\'utilisateur';
$wb['password_txt'] = 'Mot de passe';
$wb['password_strength_txt'] = 'Force du mot de passe';
-$wb['chroot_txt'] = 'Chrotter le shell';
+$wb['chroot_txt'] = 'Chrooter le shell';
$wb['quota_size_txt'] = 'Quota';
$wb['active_txt'] = 'Actif';
$wb['username_error_empty'] = 'Le nom d\'utilisateur est vide.';
@@ -20,12 +20,12 @@
$wb['puser_txt'] = 'Utilisateur web';
$wb['pgroup_txt'] = 'Groupe web';
$wb['ssh_rsa_txt'] = 'Clé publique SSH-RSA (pour les authentifications par clé)';
-$wb['dir_dot_error'] = 'No .. in path allowed.';
-$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
-$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['username_must_not_exceed_32_chars_txt'] = 'The username must not exceed 32 characters.';
-$wb['username_not_allowed_txt'] = 'The username is not allowed.';
+$wb['dir_dot_error'] = 'Les .. sont interdits.';
+$wb['dir_slashdot_error'] = 'Les ./ sont interdits.';
+$wb['generate_password_txt'] = 'Générer un mot de passe';
+$wb['repeat_password_txt'] = 'Vérification du mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
+$wb['username_must_not_exceed_32_chars_txt'] = 'Le nom d\'utilisateur ne doit pas dépasser 32 caractères.';
+$wb['username_not_allowed_txt'] = 'Le nom d\'utilisateur est interdit.';
?>
diff --git a/interface/web/sites/lib/lang/fr_user_quota_stats_list.lng b/interface/web/sites/lib/lang/fr_user_quota_stats_list.lng
index f21d0bf..2d8f496 100644
--- a/interface/web/sites/lib/lang/fr_user_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/fr_user_quota_stats_list.lng
@@ -5,5 +5,5 @@
$wb['used_txt'] = 'Espace utilisé';
$wb['hard_txt'] = 'Limite dure';
$wb['soft_txt'] = 'Limite douce';
-$wb['files_txt'] = 'Single files';
+$wb['files_txt'] = 'Fichiers individuels';
?>
diff --git a/interface/web/sites/lib/lang/fr_web_folder_user.lng b/interface/web/sites/lib/lang/fr_web_folder_user.lng
index a4c0704..560d07e 100644
--- a/interface/web/sites/lib/lang/fr_web_folder_user.lng
+++ b/interface/web/sites/lib/lang/fr_web_folder_user.lng
@@ -4,11 +4,11 @@
$wb['password_txt'] = 'Mot de passe';
$wb['active_txt'] = 'Actif';
$wb['folder_error_empty'] = 'Aucun dossier web sélectionné.';
-$wb['password_strength_txt'] = 'Password strength';
-$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['no_folder_perm'] = 'You have no permission for this folder.';
+$wb['password_strength_txt'] = 'Force du mot de passe';
+$wb['generate_password_txt'] = 'Générer un mot de passe';
+$wb['repeat_password_txt'] = 'Vérification du mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
+$wb['no_folder_perm'] = 'Vous n\'avez pas les permissions pour ce dossier.';
$wb['error_user_exists_already_txt'] = 'There is already a record for this user.';
?>
diff --git a/interface/web/sites/lib/lang/fr_web_vhost_domain.lng b/interface/web/sites/lib/lang/fr_web_vhost_domain.lng
index f465bb6..af02be4 100644
--- a/interface/web/sites/lib/lang/fr_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/fr_web_vhost_domain.lng
@@ -2,7 +2,7 @@
$wb['ssl_state_txt'] = 'État/département';
$wb['ssl_locality_txt'] = 'Localité';
$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Unité dorganisation';
+$wb['ssl_organisation_unit_txt'] = 'Unité d\'organisation';
$wb['ssl_country_txt'] = 'Pays';
$wb['ssl_request_txt'] = 'Requête SSL';
$wb['ssl_cert_txt'] = 'Certificat SSL';
@@ -38,8 +38,8 @@
$wb['hd_quota_error_empty'] = 'Le quota disque est vide.';
$wb['error_ssl_state_empty'] = 'Létat du SSL est vide.';
$wb['error_ssl_locality_empty'] = 'La localité du SSL est vide.';
-$wb['error_ssl_organisation_empty'] = 'Lorganisation du SSL est vide.';
-$wb['error_ssl_organisation_unit_empty'] = 'Lunité dorganisation du SSL est vide.';
+$wb['error_ssl_organisation_empty'] = 'L\'organisation du SSL est vide.';
+$wb['error_ssl_organisation_unit_empty'] = 'L\'unité d\'organisation du SSL est vide.';
$wb['error_ssl_country_empty'] = 'Le pays du SSL est vide.';
$wb['subdomain_txt'] = 'Auto sous-domaine';
$wb['client_group_id_txt'] = 'Client';
@@ -74,51 +74,51 @@
$wb['create_certificate_txt'] = 'Créer le certificat';
$wb['delete_certificate_txt'] = 'Supprimer le certificat';
$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['seo_redirect_txt'] = 'Redirection 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'] = '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['php_fpm_use_socket_txt'] = 'Utiliser Socket pour PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI pour SSL n\'est pas activé sur ce serveur. Vous ne pouvez activer qu\'un seul certificat SSL par adresse IP.';
$wb['python_txt'] = 'Python';
$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['ssl_key_txt'] = 'SSL Key';
+$wb['error_php_fpm_pm_settings_txt'] = 'Les valeurs de configuration de PHP-FPM pm doivent être comme suit : pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'La valeur PHP-FPM pm.max_children doit être un entier positif.';
+$wb['pm_start_servers_error_regex'] = 'La valeur de PHP-FPM pm.start_servers doit être un entier positif.';
+$wb['pm_min_spare_servers_error_regex'] = 'La valeur de PHP-FPM pm.min_spare_servers doit être un entier positif.';
+$wb['pm_max_spare_servers_error_regex'] = 'La valeur de PHP-FPM pm.max_spare_servers doit être un entier positif.';
+$wb['hd_quota_error_regex'] = 'Le quota de disque dur est invalide.';
+$wb['traffic_quota_error_regex'] = 'Le quota de trafic est invalide.';
+$wb['ssl_key_txt'] = 'Clé SSL';
$wb['perl_txt'] = 'Perl';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['fastcgi_php_version_txt'] = 'Version de PHP';
+$wb['pm_txt'] = 'Manager de process PHP-FPM';
$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['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$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['pm_process_idle_timeout_error_regex'] = 'La valeur de PHP-FPM pm.process_idle_timeout doit être un entier positif.';
+$wb['pm_max_requests_error_regex'] = 'La valeur de PHP-FPM pm.max_requests doit être un entier positif >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Votre version de PHP doit être >= 5.3.9 pour utiliser le manager de process ondemand. Si vous choisissez ondemand avec une version de PHP plus ancienne, PHP ne pourra plus démarrer !';
+$wb['generate_password_txt'] = 'Générer un mot de passe';
+$wb['repeat_password_txt'] = 'Vérification du mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
+$wb['web_folder_error_regex'] = 'Le dossier saisi est invalide. Ne saisissez pas de ./ (slash).';
+$wb['domain_error_autosub'] = 'Un sous-domaine avec cette configuration existe déjà.';
+$wb['available_php_directive_snippets_txt'] = 'Directives PHP Snippets disponibles :';
+$wb['available_apache_directive_snippets_txt'] = 'Directives Apache Snippets disponibles :';
+$wb['available_nginx_directive_snippets_txt'] = 'Directives nginx Snippets disponibles :';
+$wb['proxy_directives_txt'] = 'Directives Proxy';
+$wb['available_proxy_directive_snippets_txt'] = 'Directives Proxy Snippets disponibles :';
+$wb['no_server_error'] = 'Aucun serveur sélectionné.';
+$wb['no_backup_txt'] = 'Pas de Backup';
+$wb['daily_backup_txt'] = 'Quotidien';
+$wb['weekly_backup_txt'] = 'Hebdomadaire';
+$wb['monthly_backup_txt'] = 'Mensuel';
+$wb['rewrite_rules_txt'] = 'Règles de réécriture';
+$wb['invalid_rewrite_rules_txt'] = 'Règles de réécriture incorrectes';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Directives autorisées :';
$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
$wb['server_chosen_not_ok'] = 'Le serveur choisi n\'est pas autorisé pour ce compte.';
$wb['web_folder_txt'] = 'Web folder';
@@ -134,4 +134,4 @@
$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['invalid_custom_php_ini_settings_txt'] = 'Invalid php.ini settings';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/fr_webdav_user.lng b/interface/web/sites/lib/lang/fr_webdav_user.lng
index 2397093..e8bf197 100644
--- a/interface/web/sites/lib/lang/fr_webdav_user.lng
+++ b/interface/web/sites/lib/lang/fr_webdav_user.lng
@@ -12,10 +12,10 @@
$wb['username_error_regex'] = 'Le nom d\'utilisateur contient des caractères non autorisés.';
$wb['directory_error_empty'] = 'Dossier vide.';
$wb['parent_domain_id_error_empty'] = 'Aucun site web sélectionné.';
-$wb['dir_dot_error'] = 'No .. in path allowed.';
-$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
-$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['dir_dot_error'] = 'Les .. ne sont pas autorisés.';
+$wb['dir_slashdot_error'] = 'Les ./ ne sont pas autorisés.';
+$wb['generate_password_txt'] = 'Générer un mot de passe';
+$wb['repeat_password_txt'] = 'Vérification du mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
?>
diff --git a/interface/web/sites/lib/lang/hr_cron.lng b/interface/web/sites/lib/lang/hr_cron.lng
index 4d7af06..de37668 100644
--- a/interface/web/sites/lib/lang/hr_cron.lng
+++ b/interface/web/sites/lib/lang/hr_cron.lng
@@ -19,4 +19,6 @@
$wb['command_error_format'] = 'Pogrešan format komande. U slučaju pozivanja URL-a koristite samo http/https.';
$wb['unknown_fieldtype_error'] = 'Koristi se nepoznata vrsta polja.';
$wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
?>
diff --git a/interface/web/sites/lib/lang/hu_cron.lng b/interface/web/sites/lib/lang/hu_cron.lng
index 5a45181..fdb2f23 100644
--- a/interface/web/sites/lib/lang/hu_cron.lng
+++ b/interface/web/sites/lib/lang/hu_cron.lng
@@ -19,4 +19,6 @@
$wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
$wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
$wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
?>
diff --git a/interface/web/sites/lib/lang/id_cron.lng b/interface/web/sites/lib/lang/id_cron.lng
index 074e0a5..ce2bfee 100644
--- a/interface/web/sites/lib/lang/id_cron.lng
+++ b/interface/web/sites/lib/lang/id_cron.lng
@@ -19,4 +19,6 @@
$wb['command_error_format'] = 'Format perintah tidak valid. Harap dicatat untuk kasus pemanggilan url hanya http/https yang diizinkan.';
$wb['unknown_fieldtype_error'] = 'Telah digunakan tipe kolom yang tidak dikenal.';
$wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
?>
diff --git a/interface/web/sites/lib/lang/it_cron.lng b/interface/web/sites/lib/lang/it_cron.lng
index 01f418f..369c3b8 100644
--- a/interface/web/sites/lib/lang/it_cron.lng
+++ b/interface/web/sites/lib/lang/it_cron.lng
@@ -19,4 +19,6 @@
$wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
$wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
$wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
?>
diff --git a/interface/web/sites/lib/lang/ja_cron.lng b/interface/web/sites/lib/lang/ja_cron.lng
index 01f418f..369c3b8 100644
--- a/interface/web/sites/lib/lang/ja_cron.lng
+++ b/interface/web/sites/lib/lang/ja_cron.lng
@@ -19,4 +19,6 @@
$wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
$wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
$wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
?>
diff --git a/interface/web/sites/lib/lang/nl_cron.lng b/interface/web/sites/lib/lang/nl_cron.lng
index 8767000..caa712d 100644
--- a/interface/web/sites/lib/lang/nl_cron.lng
+++ b/interface/web/sites/lib/lang/nl_cron.lng
@@ -19,4 +19,6 @@
$wb['command_error_format'] = 'Ongeldig commando formaat. Opmerking: in het geval van een url call, alleen http/https is toegestaan.';
$wb['unknown_fieldtype_error'] = 'Een onbekend veld type is gebruikt.';
$wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
?>
diff --git a/interface/web/sites/lib/lang/pl_cron.lng b/interface/web/sites/lib/lang/pl_cron.lng
index 2e64b06..853091c 100644
--- a/interface/web/sites/lib/lang/pl_cron.lng
+++ b/interface/web/sites/lib/lang/pl_cron.lng
@@ -19,4 +19,6 @@
$wb['command_error_format'] = 'Niepoprawny format polecenia. W zbiorze url może być tylko adres http/https który ma pozwolenie.';
$wb['unknown_fieldtype_error'] = 'Został użyty niepoprawny format pola.';
$wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
?>
diff --git a/interface/web/sites/lib/lang/pt_cron.lng b/interface/web/sites/lib/lang/pt_cron.lng
index 99454e2..a8f1abd 100644
--- a/interface/web/sites/lib/lang/pt_cron.lng
+++ b/interface/web/sites/lib/lang/pt_cron.lng
@@ -19,4 +19,6 @@
$wb['command_error_format'] = 'Formato de comando inválido. Apenas endereços url http/https são permitidos.';
$wb['unknown_fieldtype_error'] = 'Um tipo desconhecido de campo foi usado.';
$wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
?>
diff --git a/interface/web/sites/lib/lang/ro_cron.lng b/interface/web/sites/lib/lang/ro_cron.lng
index 01f418f..369c3b8 100644
--- a/interface/web/sites/lib/lang/ro_cron.lng
+++ b/interface/web/sites/lib/lang/ro_cron.lng
@@ -19,4 +19,6 @@
$wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
$wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
$wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
?>
diff --git a/interface/web/sites/lib/lang/ru_cron.lng b/interface/web/sites/lib/lang/ru_cron.lng
index 08592d3..a439d36 100644
--- a/interface/web/sites/lib/lang/ru_cron.lng
+++ b/interface/web/sites/lib/lang/ru_cron.lng
@@ -19,4 +19,6 @@
$wb['command_error_format'] = 'Неверный формат команды. Учтите, что тип вызов url может быть только http/https.';
$wb['unknown_fieldtype_error'] = 'Неверный тип поля был использован.';
$wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
?>
diff --git a/interface/web/sites/lib/lang/se_cron.lng b/interface/web/sites/lib/lang/se_cron.lng
index 01f418f..369c3b8 100644
--- a/interface/web/sites/lib/lang/se_cron.lng
+++ b/interface/web/sites/lib/lang/se_cron.lng
@@ -19,4 +19,6 @@
$wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
$wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
$wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
?>
diff --git a/interface/web/sites/lib/lang/sk_cron.lng b/interface/web/sites/lib/lang/sk_cron.lng
index 8fda8ae..364fe81 100644
--- a/interface/web/sites/lib/lang/sk_cron.lng
+++ b/interface/web/sites/lib/lang/sk_cron.lng
@@ -19,4 +19,6 @@
$wb['command_error_format'] = 'Neplatn� form�t pr�kazu. Upozor?ujeme, �e v pr�pade url volania iba http / https, s� povolen�.';
$wb['unknown_fieldtype_error'] = 'Nezn�my druh pola bol pou�it�.';
$wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
?>
diff --git a/interface/web/sites/lib/lang/tr_cron.lng b/interface/web/sites/lib/lang/tr_cron.lng
index 6b11491..1f61554 100644
--- a/interface/web/sites/lib/lang/tr_cron.lng
+++ b/interface/web/sites/lib/lang/tr_cron.lng
@@ -19,4 +19,6 @@
$wb['command_error_format'] = 'Komut formatı geçersiz. Url sadece http/https çağırabilir.';
$wb['unknown_fieldtype_error'] = 'Bilinmeyen bir alan tipi kullanıldı.';
$wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
+$wb['command_error_empty'] = 'Command is empty.';
?>
diff --git a/interface/web/sites/templates/web_vhost_domain_edit.htm b/interface/web/sites/templates/web_vhost_domain_edit.htm
index 9f22ebd..7c9c720 100644
--- a/interface/web/sites/templates/web_vhost_domain_edit.htm
+++ b/interface/web/sites/templates/web_vhost_domain_edit.htm
@@ -289,7 +289,7 @@
if(data.servertype == "nginx"){
var selected = jQuery('#php').val();
jQuery('.apache').hide();
- if(selected != "no" && selected != "php-fpm") {
+ if(selected != "no" && selected != "php-fpm" && selected != "hhvm") {
jQuery('#php option[value="php-fpm"]').attr('selected', 'selected').val('php-fpm');
}
jQuery('#php option[value="fast-cgi"]').hide();
diff --git a/interface/web/sites/web_vhost_domain_edit.php b/interface/web/sites/web_vhost_domain_edit.php
index 2e26246..de731bd 100644
--- a/interface/web/sites/web_vhost_domain_edit.php
+++ b/interface/web/sites/web_vhost_domain_edit.php
@@ -291,7 +291,7 @@
unset($options_web_servers);
// Fill the client select field
- $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY sys_group.name";
+ $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY client.company_name, client.contact_name, sys_group.name";
$records = $app->db->queryAllRecords($sql);
$tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$app->functions->intval($client['client_id']));
$client_select = '<option value="'.$tmp['groupid'].'">'.$client['contactname'].'</option>';
@@ -491,7 +491,7 @@
unset($ips);
// Fill the client select field
- $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY sys_group.name";
+ $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY client.company_name, client.contact_name, sys_group.name";
$clients = $app->db->queryAllRecords($sql);
$client_select = "<option value='0'></option>";
//$tmp_data_record = $app->tform->getDataRecord($this->id);
diff --git a/interface/web/themes/blue/ispconfig_version b/interface/web/themes/blue/ispconfig_version
index a3f1437..e46f818 100644
--- a/interface/web/themes/blue/ispconfig_version
+++ b/interface/web/themes/blue/ispconfig_version
@@ -1 +1 @@
-3.1dev
\ No newline at end of file
+3.1dev
diff --git a/interface/web/tools/interface_settings.php b/interface/web/tools/interface_settings.php
index bc9c780..d7a1333 100644
--- a/interface/web/tools/interface_settings.php
+++ b/interface/web/tools/interface_settings.php
@@ -126,7 +126,7 @@
print '<script type="text/javascript">document.location.reload();</script>';
exit;
}
- else parent::onShow();
+ //else parent::onShow();
}
diff --git a/interface/web/tools/lib/lang/el.lng b/interface/web/tools/lib/lang/el.lng
index 80e6295..0f44f70 100644
--- a/interface/web/tools/lib/lang/el.lng
+++ b/interface/web/tools/lib/lang/el.lng
@@ -4,10 +4,10 @@
$wb['ISPConfig Tools'] = 'Εργαλεία ISPConfig';
$wb['Password and Language'] = 'Συνθηματικό και Γλώσσα';
$wb['ispconfig_tools_note'] = 'Το άρθρωμα σας επιτρέπει να αλλάξετε το συνθηματικό και την γλώσσα και να ξεκινήσετε έναν επανασυγχρονισμό των εγγραφών DNS.';
-$wb['Resync'] = 'Επανασυγχρονισμός';
-$wb['Sync Tools'] = 'Εργαλεία Συγχρονισμού';
-$wb['Import'] = 'Εισαγωγή';
+$wb['Resync'] = 'Resync';
+$wb['Sync Tools'] = 'Sync Tools';
+$wb['Import'] = 'Import';
$wb['ISPConfig 3 mail'] = 'ISPConfig 3 mail';
$wb['PDNS Tupa'] = 'PowerDNS Tupa';
-$wb['Interface'] = 'Διεπαφή';
+$wb['Interface'] = 'Interface';
?>
diff --git a/interface/web/tools/lib/lang/el_import_ispconfig.lng b/interface/web/tools/lib/lang/el_import_ispconfig.lng
index 1c80ac6..ce47c4d 100644
--- a/interface/web/tools/lib/lang/el_import_ispconfig.lng
+++ b/interface/web/tools/lib/lang/el_import_ispconfig.lng
@@ -1,23 +1,23 @@
<?php
-$wb['head_txt'] = 'Εισαγωγή ρυθμίσεων email από ISPConfig 3';
-$wb['legend_txt'] = 'Λεπτομέρειες σύνδεσης απομακρυσμένου server';
-$wb['legend2_txt'] = 'Εισαγωγή domain email';
-$wb['resync_sites_txt'] = 'Επανασυγχρονισμός Websites';
-$wb['resync_ftp_txt'] = 'Επανασυγχρονισμός χρηστών FTP';
-$wb['resync_shell_txt'] = 'Επανασυγχρονισμός χρηστών shell';
-$wb['resync_cron_txt'] = 'Επανασυγχρονισμός εργασιών cron';
-$wb['resync_db_txt'] = 'Επανασυγχρονισμός ρυθμίσεων ΒΔ πελατών';
-$wb['resync_mailbox_txt'] = 'Επανασυγχρονισμός θυρίδων Mail';
-$wb['resync_dns_txt'] = 'Επανασυγχρονισμός εγγραφών DNS';
-$wb['btn_start_txt'] = 'Εκκίνηση Εισαγωγής';
-$wb['btn_connect_txt'] = 'Σύνδεση στον απομακρυσμένο server';
-$wb['btn_cancel_txt'] = 'Άκυρο';
-$wb['client_group_id_txt'] = 'Τοπικός πελάτης';
-$wb['mail_domain_txt'] = 'Απομακρυσμένο domain email';
-$wb['import_mailbox_txt'] = 'Εισαγωγή θυρίδας mail';
-$wb['import_aliasdomain_txt'] = 'Εισαγωγή ψευδωνύμου domain';
-$wb['import_alias_txt'] = 'Εισαγωγή ψευδωνύμου email';
-$wb['import_forward_txt'] = 'Εισαγωγή προώθησης';
-$wb['import_user_filter_txt'] = 'Εισαγωγή φίλτρων χρήστη';
-$wb['import_spamfilter_txt'] = 'Εισαγωγή φίλτρων spam';
+$wb['head_txt'] = 'Import email configuration from ISPConfig 3';
+$wb['legend_txt'] = 'Remote server connection details';
+$wb['legend2_txt'] = 'Import email domain';
+$wb['resync_sites_txt'] = 'Resync Websites';
+$wb['resync_ftp_txt'] = 'Resync FTP users';
+$wb['resync_shell_txt'] = 'Resync shell users';
+$wb['resync_cron_txt'] = 'Resync cronjobs';
+$wb['resync_db_txt'] = 'Resync clientdb config';
+$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
+$wb['resync_dns_txt'] = 'Resync DNS records';
+$wb['btn_start_txt'] = 'Start Import';
+$wb['btn_connect_txt'] = 'Connect to remote server';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['client_group_id_txt'] = 'Local client';
+$wb['mail_domain_txt'] = 'Remote email domain';
+$wb['import_mailbox_txt'] = 'Import mailbox';
+$wb['import_aliasdomain_txt'] = 'Import alias domain';
+$wb['import_alias_txt'] = 'Import email alias';
+$wb['import_forward_txt'] = 'Import forward';
+$wb['import_user_filter_txt'] = 'Import user filter';
+$wb['import_spamfilter_txt'] = 'Import spamfilter';
?>
diff --git a/interface/web/tools/lib/lang/el_index.lng b/interface/web/tools/lib/lang/el_index.lng
index ce794cc..a3ef38f 100644
--- a/interface/web/tools/lib/lang/el_index.lng
+++ b/interface/web/tools/lib/lang/el_index.lng
@@ -1,4 +1,4 @@
<?php
-$wb['page_head_txt'] = 'Εργαλεία ISPConfig';
-$wb['page_desc_txt'] = 'Αλλαγή ρυθμίσεων χρήστη';
+$wb['page_head_txt'] = 'ISPConfig Tools';
+$wb['page_desc_txt'] = 'Change user settings';
?>
diff --git a/interface/web/tools/lib/lang/el_interface.lng b/interface/web/tools/lib/lang/el_interface.lng
index 9b53146..aab4fc8 100644
--- a/interface/web/tools/lib/lang/el_interface.lng
+++ b/interface/web/tools/lib/lang/el_interface.lng
@@ -1,7 +1,7 @@
<?php
-$wb['interface_head_txt'] = 'Ρυθμίσεις διεπαφής';
-$wb['interface_desc_txt'] = 'Τροποποιήστε την διεπαφή σας';
-$wb['language_txt'] = 'Γλώσσα';
-$wb['startmodule_txt'] = 'Άρθρωμα Εκκίνησης';
-$wb['app_theme_txt'] = 'Σχεδίαση';
+$wb['interface_head_txt'] = 'Interface Settings';
+$wb['interface_desc_txt'] = 'Modify your interface';
+$wb['language_txt'] = 'Language';
+$wb['startmodule_txt'] = 'Startmodule';
+$wb['app_theme_txt'] = 'Design';
?>
diff --git a/interface/web/tools/lib/lang/el_resync.lng b/interface/web/tools/lib/lang/el_resync.lng
index 8194fe5..dd8a216 100644
--- a/interface/web/tools/lib/lang/el_resync.lng
+++ b/interface/web/tools/lib/lang/el_resync.lng
@@ -1,14 +1,14 @@
<?php
-$wb['head_txt'] = 'Εργαλείο επανασυγχρονισμού';
-$wb['legend_txt'] = 'Επανασυγχρονισμός';
-$wb['resync_sites_txt'] = 'Επανασυγχρονισμός Websites';
-$wb['resync_ftp_txt'] = 'Επανασυγχρονισμός χρηστών FTP';
-$wb['resync_shell_txt'] = 'Επανασυγχρονισμός χρηστών shell';
-$wb['resync_cron_txt'] = 'Επανασυγχρονισμός εργασιών cron';
-$wb['resync_db_txt'] = 'Επανασυγχρονισμός ρυθμίσεων ΒΔ πελατών';
-$wb['resync_mailbox_txt'] = 'Επανασυγχρονισμός θυρίδων Mail';
-$wb['resync_dns_txt'] = 'Επανασυγχρονισμός εγγραφών DNS';
-$wb['btn_start_txt'] = 'Εκκίνηση';
-$wb['btn_cancel_txt'] = 'Άκυρο';
+$wb['head_txt'] = 'Resync Tool';
+$wb['legend_txt'] = 'Resync';
+$wb['resync_sites_txt'] = 'Resync Websites';
+$wb['resync_ftp_txt'] = 'Resync FTP users';
+$wb['resync_shell_txt'] = 'Resync shell users';
+$wb['resync_cron_txt'] = 'Resync cronjobs';
+$wb['resync_db_txt'] = 'Resync clientdb config';
+$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
+$wb['resync_dns_txt'] = 'Resync DNS records';
+$wb['btn_start_txt'] = 'Start';
+$wb['btn_cancel_txt'] = 'Cancel';
$wb['resync_client_txt'] = 'Resync Client records';
?>
diff --git a/interface/web/tools/lib/lang/el_tpl_default.lng b/interface/web/tools/lib/lang/el_tpl_default.lng
index 45c78e9..c062463 100644
--- a/interface/web/tools/lib/lang/el_tpl_default.lng
+++ b/interface/web/tools/lib/lang/el_tpl_default.lng
@@ -1,7 +1,7 @@
<?php
-$wb['list_head_txt'] = 'Προεπιλεγμένες ρυθμίσεις θεματικής παραλλαγής';
-$wb['list_desc_txt'] = 'Παραμετροποίηση ρυθμίσεων Προεπιλεγμένης θεματικής παραλλαγής';
-$wb['no_settings_txt'] = 'Δεν υπάρχουν ρυθμίσεις για την Προεπιλεγμένη θεματική παραλλαγή.';
-$wb['btn_start_txt'] = 'Αποθήκευση';
-$wb['btn_cancel_txt'] = 'Επιστροφή';
+$wb['list_head_txt'] = 'Default Theme settings';
+$wb['list_desc_txt'] = 'Modify default-theme specific options';
+$wb['no_settings_txt'] = 'There are no settings for the default theme.';
+$wb['btn_start_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Back';
?>
diff --git a/interface/web/tools/lib/lang/el_usersettings.lng b/interface/web/tools/lib/lang/el_usersettings.lng
index 55f24e9..d2321b0 100644
--- a/interface/web/tools/lib/lang/el_usersettings.lng
+++ b/interface/web/tools/lib/lang/el_usersettings.lng
@@ -1,12 +1,12 @@
<?php
$wb['passwort_txt'] = 'Συνθηματικό';
-$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού';
+$wb['password_strength_txt'] = 'Δύναμη συνθηματικού';
$wb['language_txt'] = 'Γλώσσα';
$wb['password_mismatch'] = 'Το συνθηματικό στο δεύτερο πεδίο δεν ταιριάζει με το συνθηματικό στο πρώτο πεδίο.';
$wb['Form to edit the user password and language.'] = 'Φόρμα επεξεργασίας συνθηματικού και γλώσσας';
$wb['Settings'] = 'Ρυθμίσεις';
-$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού';
-$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού';
-$wb['password_mismatch_txt'] = 'Τα Συνθηματικά δεν ταιριάζουν.';
-$wb['password_match_txt'] = 'Τα Συνθηματικά ταιριάζουν.';
+$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.';
?>
diff --git a/interface/web/vm/lib/lang/el_openvz_ip.lng b/interface/web/vm/lib/lang/el_openvz_ip.lng
index a602f6d..8aecd92 100644
--- a/interface/web/vm/lib/lang/el_openvz_ip.lng
+++ b/interface/web/vm/lib/lang/el_openvz_ip.lng
@@ -2,7 +2,7 @@
$wb['server_id_txt'] = 'Hostserver';
$wb['ip_address_txt'] = 'Διεύθυνση IP';
$wb['vm_id_txt'] = 'Εικονικός server';
-$wb['reserved_txt'] = 'Κατειλημμένη';
+$wb['reserved_txt'] = 'Reserved';
$wb['ip_error_wrong'] = 'Παρακαλούμε συμπληρώστε μια έγκυρη διεύθυνση IPv4.';
$wb['ip_error_unique'] = 'Η διεύθυνση IP υπάρχει ήδη.';
$wb['IP address'] = 'Διεύθυνση IP';
diff --git a/interface/web/vm/lib/lang/el_openvz_ip_list.lng b/interface/web/vm/lib/lang/el_openvz_ip_list.lng
index 168100c..5af2ea0 100644
--- a/interface/web/vm/lib/lang/el_openvz_ip_list.lng
+++ b/interface/web/vm/lib/lang/el_openvz_ip_list.lng
@@ -2,6 +2,6 @@
$wb['list_head_txt'] = 'Διευθύνσεις IP OpenVZ';
$wb['server_id_txt'] = 'Server';
$wb['ip_address_txt'] = 'Διεύθυνση IP';
-$wb['reserved_txt'] = 'Σε χρήση';
+$wb['reserved_txt'] = 'Reserved';
$wb['vm_id_txt'] = 'VM';
?>
diff --git a/interface/web/vm/lib/lang/el_openvz_template.lng b/interface/web/vm/lib/lang/el_openvz_template.lng
index 9442546..afe2bcd 100644
--- a/interface/web/vm/lib/lang/el_openvz_template.lng
+++ b/interface/web/vm/lib/lang/el_openvz_template.lng
@@ -23,20 +23,20 @@
$wb['swappages_txt'] = 'Swappages';
$wb['hostname_txt'] = 'Hostname';
$wb['nameserver_txt'] = 'Nameserver(s)';
-$wb['nameserver_desc_txt'] = '(Διαχωρισμός με κενό)';
-$wb['capability_txt'] = 'Δυνατότητα';
-$wb['template_name_txt'] = 'Όνομα Προτύπου';
-$wb['diskspace_txt'] = 'Χώρος Δϊσκου';
-$wb['ram_txt'] = 'RAM (εγγυημένη)';
-$wb['ram_burst_txt'] = 'RAM (στιγμιαία)';
+$wb['nameserver_desc_txt'] = '(separated by whitespace)';
+$wb['capability_txt'] = 'Capability';
+$wb['template_name_txt'] = 'Template name';
+$wb['diskspace_txt'] = 'Diskspace';
+$wb['ram_txt'] = 'RAM (guaranteed)';
+$wb['ram_burst_txt'] = 'RAM (burst)';
$wb['cpu_units_txt'] = 'Μονάδες CPU';
$wb['cpu_num_txt'] = 'Αριθμός CPU';
$wb['cpu_limit_txt'] = 'Όριο CPU %';
$wb['io_priority_txt'] = 'Προτεραιότητα Ε/Ε';
-$wb['active_txt'] = 'Εν Ενεργεία';
+$wb['active_txt'] = 'Active';
$wb['description_txt'] = 'Περιγραφή';
$wb['numproc_desc_txt'] = 'Πλήθος διεργασιών και νημάτων.';
-$wb['numtcpsock_desc_txt'] = 'Πλήθος TCP sockets.';
+$wb['numtcpsock_desc_txt'] = 'Number of TCP sockets.';
$wb['numothersock_desc_txt'] = 'Number of sockets other than TCP.';
$wb['vmguarpages_desc_txt'] = 'Memory allocation guarantee, in pages.';
$wb['kmemsize_desc_txt'] = 'Size of unswappable kernel memory, allocated for processes in this container.';
@@ -88,6 +88,6 @@
$wb['dcachesize_error_empty'] = 'Dcachesize is empty.';
$wb['numiptent_error_empty'] = 'Numiptent is empty.';
$wb['swappages_error_empty'] = 'Swappages is empty.';
-$wb['Template'] = 'Πρότυπο';
-$wb['Advanced'] = 'Για προχωρημένους';
+$wb['Template'] = 'Template';
+$wb['Advanced'] = 'Advanced';
?>
diff --git a/interface/web/vm/lib/lang/el_openvz_vm.lng b/interface/web/vm/lib/lang/el_openvz_vm.lng
index 37c7ce0..4c7950a 100644
--- a/interface/web/vm/lib/lang/el_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/el_openvz_vm.lng
@@ -27,12 +27,12 @@
$wb['vm_password_error_empty'] = 'Το συνθηματικό VM είναι κενό.';
$wb['veid_error_empty'] = 'Το VEID είναι κενό.';
$wb['veid_error_unique'] = 'Το VEID υπάρχει ήδη.';
-$wb['diskspace_error_empty'] = 'Το Χώρος Δίσκου είναι κενό.';
+$wb['diskspace_error_empty'] = 'Το Diskspace είναι κενό.';
$wb['ram_error_empty'] = 'Το RAM (εγγυημένη) είναι κενό.';
$wb['ram_burst_error_empty'] = 'Το RAM (burst) είναι κενό.';
-$wb['cpu_units_error_empty'] = 'Το Μονάδες CPU είναι κενό.';
-$wb['cpu_num_error_empty'] = 'Το Αριθμός CPU είναι κενό.';
-$wb['cpu_limit_error_empty'] = 'Το Όριο CPU είναι κενό.';
+$wb['cpu_units_error_empty'] = 'Το μονάδες CPU είναι κενό.';
+$wb['cpu_num_error_empty'] = 'Το αριθμός CPU είναι κενό.';
+$wb['cpu_limit_error_empty'] = 'Το όριο CPU είναι κενό.';
$wb['io_priority_error_empty'] = 'Το Προτεραιότητα Ε/Ε είναι κενό.';
$wb['template_nameserver_error_empty'] = 'Το Nameserver(s) είναι κενό.';
$wb['Virtual server'] = 'Εικονικός server';
diff --git a/interface/web/vm/lib/lang/fr_openvz_action.lng b/interface/web/vm/lib/lang/fr_openvz_action.lng
index 52f7328..22b6b07 100644
--- a/interface/web/vm/lib/lang/fr_openvz_action.lng
+++ b/interface/web/vm/lib/lang/fr_openvz_action.lng
@@ -1,16 +1,16 @@
<?php
-$wb['head_txt'] = 'Virtual server actions for VM:';
-$wb['start_txt'] = 'Start virtual server';
-$wb['stop_txt'] = 'Stop virtual server';
-$wb['restart_txt'] = 'Restart virtual server';
-$wb['ostemplate_txt'] = 'Create OSTemplate';
-$wb['ostemplate_desc_txt'] = '(example: debian-6.0-i386-custom)';
-$wb['btn_save_txt'] = 'Execute selected action';
-$wb['btn_cancel_txt'] = 'Cancel';
-$wb['start_exec_txt'] = 'Start command has been sent to the VM host server. It may take a minute until the VM is started.';
-$wb['stop_exec_txt'] = 'Stop command has been sent to the VM host server. It may take a minute until the VM is stopped.';
-$wb['restart_exec_txt'] = 'Restart command has been sent to the VM host server. It may take a minute until the VM is restarted.';
-$wb['ostemplate_name_error'] = 'The OSTemplate name conatains unallowed characters.';
-$wb['ostemplate_name_unique_error'] = 'There is already a OSTemplate with that name.';
-$wb['ostemplate_exec_txt'] = 'The command to create a OSTemplate has been sent to the host server. It will take several minutes until the OSTemplate has been created.';
+$wb['head_txt'] = 'Serveur virtuel actions pour la VM :';
+$wb['start_txt'] = 'Démarrer le serveur virtuel';
+$wb['stop_txt'] = 'Arrêter le serveur virtuel';
+$wb['restart_txt'] = 'Redémarrer le serveur virtuel';
+$wb['ostemplate_txt'] = 'Créer un modèle OS (OSTemplate)';
+$wb['ostemplate_desc_txt'] = '(exemple: debian-6.0-i386-custom)';
+$wb['btn_save_txt'] = 'Lancer l\'action sélectionnée';
+$wb['btn_cancel_txt'] = 'Annuler';
+$wb['start_exec_txt'] = 'La commande de démarrage a été envoyée au serveur hôte de la machine virtuelle. Cela peut prendre 1 minute avant que la VM ne démarre.';
+$wb['stop_exec_txt'] = 'La commande d\'arrêt a été envoyée au serveur hôte de la machine virtuelle. Cela peut prendre 1 minute avant que la VM ne s\'arrête.';
+$wb['restart_exec_txt'] = 'La commande de redémarrage a été envoyée au serveur hôte de la machine virtuelle. Cela peut prendre 1 minute avant que la VM ne redémarre.';
+$wb['ostemplate_name_error'] = 'Le nom de modèle OS (OSTemplate) contient des caractères interdits.';
+$wb['ostemplate_name_unique_error'] = 'Un modèle OS (OSTemplate) avec ce nom existe déjà.';
+$wb['ostemplate_exec_txt'] = 'La commande pour créer un modèle OS (OSTemplate) a été envoyée au serveur hôte. Cela peut prendre 1 minutes avant que le modèle OS (OSTemplate) ne soit créé.';
?>
diff --git a/interface/web/vm/lib/lang/fr_openvz_ip.lng b/interface/web/vm/lib/lang/fr_openvz_ip.lng
index 6016681..9aa6f97 100644
--- a/interface/web/vm/lib/lang/fr_openvz_ip.lng
+++ b/interface/web/vm/lib/lang/fr_openvz_ip.lng
@@ -1,9 +1,9 @@
<?php
$wb['server_id_txt'] = 'Hostserver';
-$wb['ip_address_txt'] = 'IP address';
-$wb['vm_id_txt'] = 'Virtual server';
-$wb['reserved_txt'] = 'Reserved';
-$wb['ip_error_wrong'] = 'Please fill in a valid IPv4 address.';
-$wb['ip_error_unique'] = 'This IP address does already exist.';
-$wb['IP address'] = 'IP address';
+$wb['ip_address_txt'] = 'Adresse IP';
+$wb['vm_id_txt'] = 'Serveur virtuel';
+$wb['reserved_txt'] = 'Reservé';
+$wb['ip_error_wrong'] = 'Renseignez une adresse IPv4 valide.';
+$wb['ip_error_unique'] = 'L\'adresse IP existe déjà.';
+$wb['IP address'] = 'Adresse IP';
?>
diff --git a/interface/web/vm/lib/lang/fr_openvz_ip_list.lng b/interface/web/vm/lib/lang/fr_openvz_ip_list.lng
index e6a3a68..4f1d370 100644
--- a/interface/web/vm/lib/lang/fr_openvz_ip_list.lng
+++ b/interface/web/vm/lib/lang/fr_openvz_ip_list.lng
@@ -1,7 +1,7 @@
<?php
-$wb['list_head_txt'] = 'OpenVZ IP addresses';
-$wb['server_id_txt'] = 'Server';
-$wb['ip_address_txt'] = 'IP address';
-$wb['reserved_txt'] = 'Reserved';
+$wb['list_head_txt'] = 'Adresses IP OpenVZ';
+$wb['server_id_txt'] = 'Serveur';
+$wb['ip_address_txt'] = 'Adresse IP';
+$wb['reserved_txt'] = 'Reservé';
$wb['vm_id_txt'] = 'VM';
?>
diff --git a/interface/web/vm/lib/lang/fr_openvz_ostemplate.lng b/interface/web/vm/lib/lang/fr_openvz_ostemplate.lng
index 256750f..ba9193d 100644
--- a/interface/web/vm/lib/lang/fr_openvz_ostemplate.lng
+++ b/interface/web/vm/lib/lang/fr_openvz_ostemplate.lng
@@ -1,11 +1,11 @@
<?php
-$wb['template_name_txt'] = 'Template name';
-$wb['template_file_txt'] = 'Template filename';
-$wb['server_id_txt'] = 'Server';
-$wb['allservers_txt'] = 'Exists on all servers';
-$wb['active_txt'] = 'Active';
+$wb['template_name_txt'] = 'Nom du modèle';
+$wb['template_file_txt'] = 'Nom de fichier modèle';
+$wb['server_id_txt'] = 'Serveur';
+$wb['allservers_txt'] = 'Existe sur tous les serveurs';
+$wb['active_txt'] = 'Actif';
$wb['description_txt'] = 'Description';
-$wb['template_name_error_empty'] = 'Template name is empty.';
-$wb['template_file_error_empty'] = 'Template filename is empty.';
-$wb['Template'] = 'Template';
+$wb['template_name_error_empty'] = 'Le modèle est vide.';
+$wb['template_file_error_empty'] = 'Le nom de fichier modèle est vide.';
+$wb['Template'] = 'Modèle';
?>
diff --git a/interface/web/vm/lib/lang/fr_openvz_ostemplate_list.lng b/interface/web/vm/lib/lang/fr_openvz_ostemplate_list.lng
index 6471ec0..377713c 100644
--- a/interface/web/vm/lib/lang/fr_openvz_ostemplate_list.lng
+++ b/interface/web/vm/lib/lang/fr_openvz_ostemplate_list.lng
@@ -1,8 +1,8 @@
<?php
$wb['list_head_txt'] = 'OpenVZ OSTemplate';
-$wb['active_txt'] = 'Active';
-$wb['template_name_txt'] = 'Template name';
-$wb['server_id_txt'] = 'Server';
-$wb['allservers_txt'] = 'Exists on all servers';
+$wb['active_txt'] = 'Actif';
+$wb['template_name_txt'] = 'Nom du modèle';
+$wb['server_id_txt'] = 'Serveur';
+$wb['allservers_txt'] = 'Existe sur tous les serveurs';
$wb['ostemplate_id_txt'] = 'ID';
?>
diff --git a/interface/web/vm/lib/lang/fr_openvz_template.lng b/interface/web/vm/lib/lang/fr_openvz_template.lng
index d285512..d33091b 100644
--- a/interface/web/vm/lib/lang/fr_openvz_template.lng
+++ b/interface/web/vm/lib/lang/fr_openvz_template.lng
@@ -21,73 +21,73 @@
$wb['dcachesize_txt'] = 'Dcachesize';
$wb['numiptent_txt'] = 'Numiptent';
$wb['swappages_txt'] = 'Swappages';
-$wb['hostname_txt'] = 'Hostname';
+$wb['hostname_txt'] = 'Nom de domaine';
$wb['nameserver_txt'] = 'Nameserver(s)';
-$wb['nameserver_desc_txt'] = '(separated by whitespace)';
-$wb['capability_txt'] = 'Capability';
-$wb['template_name_txt'] = 'Template name';
-$wb['diskspace_txt'] = 'Diskspace';
-$wb['ram_txt'] = 'RAM (guaranteed)';
+$wb['nameserver_desc_txt'] = '(séparés par des espaces)';
+$wb['capability_txt'] = 'Capacité';
+$wb['template_name_txt'] = 'Nom du modèle';
+$wb['diskspace_txt'] = 'Espace disque';
+$wb['ram_txt'] = 'RAM (garantie)';
$wb['ram_burst_txt'] = 'RAM (burst)';
-$wb['cpu_units_txt'] = 'CPU units';
-$wb['cpu_num_txt'] = 'CPU cores';
-$wb['cpu_limit_txt'] = 'CPU limit %';
-$wb['io_priority_txt'] = 'I/O priority';
-$wb['active_txt'] = 'Active';
+$wb['cpu_units_txt'] = 'Nombre de CPU';
+$wb['cpu_num_txt'] = 'Coeurs CPU';
+$wb['cpu_limit_txt'] = 'Limite CPU en %';
+$wb['io_priority_txt'] = 'I/O priorité';
+$wb['active_txt'] = 'Actif';
$wb['description_txt'] = 'Description';
-$wb['numproc_desc_txt'] = 'Number of processes and threads.';
-$wb['numtcpsock_desc_txt'] = 'Number of TCP sockets.';
-$wb['numothersock_desc_txt'] = 'Number of sockets other than TCP.';
-$wb['vmguarpages_desc_txt'] = 'Memory allocation guarantee, in pages.';
-$wb['kmemsize_desc_txt'] = 'Size of unswappable kernel memory, allocated for processes in this container.';
-$wb['tcpsndbuf_desc_txt'] = 'Total size of TCP send buffers.';
-$wb['tcprcvbuf_desc_txt'] = 'Total size of TCP receive buffers.';
-$wb['othersockbuf_desc_txt'] = 'Total size of UNIX-domain socket buffers, UDP and other datagram protocol send buffers.';
-$wb['dgramrcvbuf_desc_txt'] = 'Receive buffers of UDP and other datagram protocols.';
-$wb['oomguarpages_desc_txt'] = 'The guaranteed amount of memory for the case the memory is over-booked (out-of-memory kill guarantee), in pages.';
-$wb['privvmpages_desc_txt'] = 'Memory allocation limit, in pages.';
-$wb['lockedpages_desc_txt'] = 'Process pages not allowed to be swapped out (pages locked by mlock(2)).';
-$wb['shmpages_desc_txt'] = 'Total size of shared memory (IPC, shared anonymous mappings and tmpfs objects), in pages.';
-$wb['physpages_desc_txt'] = 'Total number of RAM pages used by processes.';
-$wb['numfile_desc_txt'] = 'Number of open files.';
-$wb['numflock_desc_txt'] = 'Number of file locks.';
-$wb['numpty_desc_txt'] = 'Number of pseudo-terminals.';
-$wb['numsiginfo_desc_txt'] = 'Number of siginfo structures.';
-$wb['dcachesize_desc_txt'] = 'Total size of dentry and inode structures locked in memory.';
-$wb['numiptent_desc_txt'] = 'Number of NETFILTER (IP packet filtering) entries.';
-$wb['swappages_desc_txt'] = 'Amount of swap space to show in container.';
-$wb['create_dns_txt'] = 'Create DNS for hostname';
-$wb['template_name_error_empty'] = 'Template name is empty.';
-$wb['diskspace_error_empty'] = 'Diskspace is empty.';
-$wb['ram_error_empty'] = 'RAM (guaranteed) is empty.';
-$wb['ram_burst_error_empty'] = 'RAM (burst) is empty.';
-$wb['cpu_units_error_empty'] = 'CPU units is empty.';
-$wb['cpu_num_error_empty'] = 'CPU cores is empty.';
-$wb['cpu_limit_error_empty'] = 'CPU limit % is empty.';
-$wb['io_priority_error_empty'] = 'I/O priority is empty.';
-$wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
-$wb['numproc_error_empty'] = 'Numproc is empty.';
-$wb['numtcpsock_error_empty'] = 'Numtcpsock is empty.';
-$wb['numothersock_error_empty'] = 'Numothersock is empty.';
-$wb['vmguarpages_error_empty'] = 'Vmguarpages is empty.';
-$wb['kmemsize_error_empty'] = 'Kmemsize is empty.';
-$wb['tcpsndbuf_error_empty'] = 'Tcpsndbuf is empty.';
-$wb['tcprcvbuf_error_empty'] = 'Tcprcvbuf is empty.';
-$wb['othersockbuf_error_empty'] = 'Othersockbuf is empty.';
-$wb['dgramrcvbuf_error_empty'] = 'Dgramrcvbuf is empty.';
-$wb['oomguarpages_error_empty'] = 'Oomguarpages is empty.';
-$wb['privvmpages_error_empty'] = 'Privvmpages is empty.';
-$wb['lockedpages_error_empty'] = 'Lockedpages is empty.';
-$wb['shmpages_error_empty'] = 'Shmpages is empty.';
-$wb['physpages_error_empty'] = 'Physpages is empty.';
-$wb['numfile_error_empty'] = 'Numfile is empty.';
-$wb['avnumproc_error_empty'] = 'Avnumproc is empty.';
-$wb['numflock_error_empty'] = 'Numflock is empty.';
-$wb['numpty_error_empty'] = 'Numpty is empty.';
-$wb['numsiginfo_error_empty'] = 'Numsiginfo is empty.';
-$wb['dcachesize_error_empty'] = 'Dcachesize is empty.';
-$wb['numiptent_error_empty'] = 'Numiptent is empty.';
-$wb['swappages_error_empty'] = 'Swappages is empty.';
-$wb['Template'] = 'Template';
-$wb['Advanced'] = 'Advanced';
+$wb['numproc_desc_txt'] = 'Nombre de process et de threads.';
+$wb['numtcpsock_desc_txt'] = 'Nombre de sockets TCP.';
+$wb['numothersock_desc_txt'] = 'Nombre de sockets autres que TCP.';
+$wb['vmguarpages_desc_txt'] = 'Allocation de la mémoire garantie, en pages.';
+$wb['kmemsize_desc_txt'] = 'Taille de la mémoire du noyau non swappable, allouée pour les processus dans ce conteneur.';
+$wb['tcpsndbuf_desc_txt'] = 'Taille totale des tampons d\'envois TCP.';
+$wb['tcprcvbuf_desc_txt'] = 'Taille totale des tampons de réceptions TCP.';
+$wb['othersockbuf_desc_txt'] = 'Taille totale de tampons sockets UNIX-domain, UDP et autres protocoles tampons d\'envois datagram.';
+$wb['dgramrcvbuf_desc_txt'] = 'Tampons de réceptions UDP et autres protocoles datagram.';
+$wb['oomguarpages_desc_txt'] = 'La quantité de mémoire garantie dans la cas ou la mémoire est saturée (suppression de l\'excédent de mémoire garantie), en pages.';
+$wb['privvmpages_desc_txt'] = 'Allocation mémoire limite, en pages.';
+$wb['lockedpages_desc_txt'] = 'Les process de pages ne sont pas autorisés au swap (pages vérouillées par mlock(2)).';
+$wb['shmpages_desc_txt'] = 'Taille totale de la mémoire partagée (IPC, mappings anonymes partagés et objets TMPFS), en pages.';
+$wb['physpages_desc_txt'] = 'Taille totale de la RAM utilisée par les process.';
+$wb['numfile_desc_txt'] = 'Nombre de fichiers ouverts.';
+$wb['numflock_desc_txt'] = 'Nombre de fichiers vérouillés.';
+$wb['numpty_desc_txt'] = 'Nombre de pseudo-terminals.';
+$wb['numsiginfo_desc_txt'] = 'Nombre de structures siginfo.';
+$wb['dcachesize_desc_txt'] = 'Taille totale de dentry et structures inode vérouillés en mémoire.';
+$wb['numiptent_desc_txt'] = 'Nombre d\'entrées NETFILTER (IP packet filtering).';
+$wb['swappages_desc_txt'] = 'Quantité d\'espace de swap à afficher dans le conteneur.';
+$wb['create_dns_txt'] = 'Créer un DNS pour le nom de domaine.';
+$wb['template_name_error_empty'] = 'Le nom de modèle est vide.';
+$wb['diskspace_error_empty'] = 'L\'espace disque est vide.';
+$wb['ram_error_empty'] = 'RAM (garantie) est vide.';
+$wb['ram_burst_error_empty'] = 'RAM (burst) est vide.';
+$wb['cpu_units_error_empty'] = 'Le nombre de CPU est vide.';
+$wb['cpu_num_error_empty'] = 'Le nombre de coeursCPU est vide.';
+$wb['cpu_limit_error_empty'] = 'La limite de CPU en % est vide.';
+$wb['io_priority_error_empty'] = 'La priorité I/O est vide.';
+$wb['template_nameserver_error_empty'] = 'Nameserver(s) est vide.';
+$wb['numproc_error_empty'] = 'Numproc est vide.';
+$wb['numtcpsock_error_empty'] = 'Numtcpsock est vide.';
+$wb['numothersock_error_empty'] = 'Numothersock est vide.';
+$wb['vmguarpages_error_empty'] = 'Vmguarpages est vide.';
+$wb['kmemsize_error_empty'] = 'Kmemsize est vide.';
+$wb['tcpsndbuf_error_empty'] = 'Tcpsndbuf est vide.';
+$wb['tcprcvbuf_error_empty'] = 'Tcprcvbuf est vide.';
+$wb['othersockbuf_error_empty'] = 'Othersockbuf est vide.';
+$wb['dgramrcvbuf_error_empty'] = 'Dgramrcvbuf est vide.';
+$wb['oomguarpages_error_empty'] = 'Oomguarpages est vide.';
+$wb['privvmpages_error_empty'] = 'Privvmpages est vide.';
+$wb['lockedpages_error_empty'] = 'Lockedpages est vide.';
+$wb['shmpages_error_empty'] = 'Shmpages est vide.';
+$wb['physpages_error_empty'] = 'Physpages est vide.';
+$wb['numfile_error_empty'] = 'Numfile est vide.';
+$wb['avnumproc_error_empty'] = 'Avnumproc est vide.';
+$wb['numflock_error_empty'] = 'Numflock est vide.';
+$wb['numpty_error_empty'] = 'Numpty est vide.';
+$wb['numsiginfo_error_empty'] = 'Numsiginfo est vide.';
+$wb['dcachesize_error_empty'] = 'Dcachesize est vide.';
+$wb['numiptent_error_empty'] = 'Numiptent est vide.';
+$wb['swappages_error_empty'] = 'Swappages est vide.';
+$wb['Template'] = 'Modèle';
+$wb['Advanced'] = 'Avancé';
?>
diff --git a/interface/web/vm/lib/lang/fr_openvz_template_list.lng b/interface/web/vm/lib/lang/fr_openvz_template_list.lng
index de4045c..c4ce4ed 100644
--- a/interface/web/vm/lib/lang/fr_openvz_template_list.lng
+++ b/interface/web/vm/lib/lang/fr_openvz_template_list.lng
@@ -1,5 +1,5 @@
<?php
-$wb['list_head_txt'] = 'OpenVZ Virtual Machine Template';
-$wb['active_txt'] = 'Active';
-$wb['template_name_txt'] = 'Template name';
+$wb['list_head_txt'] = 'Modèle de machine virtuelle OpenVZ';
+$wb['active_txt'] = 'Actif';
+$wb['template_name_txt'] = 'Nom du modèle';
?>
diff --git a/interface/web/vm/lib/lang/fr_openvz_vm.lng b/interface/web/vm/lib/lang/fr_openvz_vm.lng
index f2be022..f3d69c1 100644
--- a/interface/web/vm/lib/lang/fr_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/fr_openvz_vm.lng
@@ -1,40 +1,40 @@
<?php
-$wb['diskspace_txt'] = 'Diskspace';
-$wb['ram_txt'] = 'RAM (guaranteed)';
+$wb['diskspace_txt'] = 'Espace disque';
+$wb['ram_txt'] = 'RAM (garantie)';
$wb['ram_burst_txt'] = 'RAM (burst)';
-$wb['cpu_units_txt'] = 'CPU units';
-$wb['cpu_num_txt'] = 'CPU number';
-$wb['cpu_limit_txt'] = 'CPU limit';
-$wb['io_priority_txt'] = 'I/O priority';
+$wb['cpu_units_txt'] = 'Unités CPU';
+$wb['cpu_num_txt'] = 'Nombre de CPU';
+$wb['cpu_limit_txt'] = 'Limite CPU';
+$wb['io_priority_txt'] = 'Priorités I/O';
$wb['nameserver_txt'] = 'Nameserver(s)';
-$wb['nameserver_desc_txt'] = '(separated by whitespace)';
-$wb['capability_txt'] = 'Capability';
+$wb['nameserver_desc_txt'] = '(séparés par un espace)';
+$wb['capability_txt'] = 'Capacité';
$wb['server_id_txt'] = 'Hostserver';
-$wb['ostemplate_id_txt'] = 'OSTemplate';
-$wb['template_id_txt'] = 'Template';
-$wb['ip_address_txt'] = 'IP address';
+$wb['ostemplate_id_txt'] = 'Modèle OS (OSTemplate)';
+$wb['template_id_txt'] = 'Modèle';
+$wb['ip_address_txt'] = 'Adresse IP';
$wb['hostname_txt'] = 'Hostname';
-$wb['vm_password_txt'] = 'VM Password';
-$wb['start_boot_txt'] = 'Start at boot';
-$wb['active_txt'] = 'Active';
+$wb['vm_password_txt'] = 'Mot de passe de la VM';
+$wb['start_boot_txt'] = 'Lancer au démarrage';
+$wb['active_txt'] = 'Actif';
$wb['description_txt'] = 'Description';
$wb['client_group_id_txt'] = 'Client';
$wb['veid_txt'] = 'VEID';
-$wb['create_dns_txt'] = 'Create DNS for hostname';
-$wb['active_until_date_txt'] = 'Active until date';
-$wb['ip_address_error_empty'] = 'IP address is empty.';
-$wb['hostname_error_empty'] = 'Hostname is empty.';
-$wb['vm_password_error_empty'] = 'VM Password is empty.';
-$wb['veid_error_empty'] = 'VEID is empty.';
-$wb['veid_error_unique'] = 'VEID does already exist.';
-$wb['diskspace_error_empty'] = 'Diskspace is empty.';
-$wb['ram_error_empty'] = 'RAM (guaranteed) is empty.';
-$wb['ram_burst_error_empty'] = 'RAM (burst) is empty.';
-$wb['cpu_units_error_empty'] = 'CPU units is empty.';
-$wb['cpu_num_error_empty'] = 'CPU number is empty.';
-$wb['cpu_limit_error_empty'] = 'CPU limit is empty.';
-$wb['io_priority_error_empty'] = 'I/O priority is empty.';
-$wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
-$wb['Virtual server'] = 'Virtual server';
-$wb['Advanced'] = 'Advanced';
+$wb['create_dns_txt'] = 'Créer un DNS pour le nom de domaine';
+$wb['active_until_date_txt'] = 'Actif jusqu\'à';
+$wb['ip_address_error_empty'] = 'L\'addresse IP est vide.';
+$wb['hostname_error_empty'] = 'Hostname est vide.';
+$wb['vm_password_error_empty'] = 'Le mot de passe de la VM est vide.';
+$wb['veid_error_empty'] = 'VEID est vide.';
+$wb['veid_error_unique'] = 'VEID existe déjà.';
+$wb['diskspace_error_empty'] = 'L\'espace disque est vide.';
+$wb['ram_error_empty'] = 'RAM (garantie) est vide.';
+$wb['ram_burst_error_empty'] = 'RAM (burst) est vide.';
+$wb['cpu_units_error_empty'] = 'Unités CPU est vide.';
+$wb['cpu_num_error_empty'] = 'Le nombre de CPU est vide.';
+$wb['cpu_limit_error_empty'] = 'La limite CPU est vide.';
+$wb['io_priority_error_empty'] = 'Les priorités I/O sont vides.';
+$wb['template_nameserver_error_empty'] = 'Nameserver(s) est vide.';
+$wb['Virtual server'] = 'Serveur virtuel';
+$wb['Advanced'] = 'Avancé';
?>
diff --git a/interface/web/vm/lib/lang/fr_openvz_vm_list.lng b/interface/web/vm/lib/lang/fr_openvz_vm_list.lng
index 2238e2b..9a6f78f 100644
--- a/interface/web/vm/lib/lang/fr_openvz_vm_list.lng
+++ b/interface/web/vm/lib/lang/fr_openvz_vm_list.lng
@@ -1,10 +1,10 @@
<?php
-$wb['list_head_txt'] = 'Virtual server';
-$wb['active_txt'] = 'Active';
+$wb['list_head_txt'] = 'Serveur virtuel';
+$wb['active_txt'] = 'Actif';
$wb['server_id_txt'] = 'Hostserver';
-$wb['ostemplate_id_txt'] = 'OSTemplate';
-$wb['template_id_txt'] = 'Template';
+$wb['ostemplate_id_txt'] = 'Modèle OS (OSTemplate)';
+$wb['template_id_txt'] = 'Modèle';
$wb['hostname_txt'] = 'Hostname';
-$wb['ip_address_txt'] = 'IP address';
+$wb['ip_address_txt'] = 'Adresse IP';
$wb['veid_txt'] = 'VEID';
?>
diff --git a/interface/web/vm/openvz_vm_edit.php b/interface/web/vm/openvz_vm_edit.php
index c49396e..bd7c1d2 100644
--- a/interface/web/vm/openvz_vm_edit.php
+++ b/interface/web/vm/openvz_vm_edit.php
@@ -100,7 +100,7 @@
//* Fill the client select field
- $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$app->functions->intval($client['client_id'])." ORDER BY sys_group.name";
+ $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$app->functions->intval($client['client_id'])." ORDER BY client.company_name, client.contact_name, sys_group.name";
$records = $app->db->queryAllRecords($sql);
$tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$app->functions->intval($client['client_id']));
$client_select = '<option value="'.$tmp['groupid'].'">'.$client['contactname'].'</option>';
@@ -132,7 +132,7 @@
} else {
//* Fill the client select field
- $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY sys_group.name";
+ $sql = "SELECT sys_group.groupid, sys_group.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 FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY client.company_name, client.contact_name, sys_group.name";
$clients = $app->db->queryAllRecords($sql);
$client_select = "<option value='0'></option>";
//$tmp_data_record = $app->tform->getDataRecord($this->id);
diff --git a/server/conf/hhvm_starter.master b/server/conf/hhvm_starter.master
new file mode 100644
index 0000000..c64711b
--- /dev/null
+++ b/server/conf/hhvm_starter.master
@@ -0,0 +1,69 @@
+#!/bin/bash
+#
+# /etc/init.d/hhvm_{SYSTEM_USER}
+#
+### BEGIN INIT INFO
+# Provides: hhvm_{SYSTEM_USER}
+# Required-Start: $remote_fs $network
+# Required-Stop: $remote_fs $network
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Description: Starts The HHVM FastCGI Daemon
+### END INIT INFO
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="HHVM FastCGI Daemon"
+NAME=hhvm
+
+do_start()
+{
+ if [ ! -d /var/run/hhvm ]; then
+ mkdir -p -m0777 /var/run/hhvm
+ else
+ chmod 777 /var/run/hhvm
+ fi
+
+ if [[ -e "/var/run/hhvm/hhvm_{SYSTEM_USER}.pid" ]] ; then
+ kill -0 `cat /var/run/hhvm/hhvm_{SYSTEM_USER}.pid` >/dev/null 2>&1 ;
+ case "$?" in
+ 0)
+ return 1
+ ;;
+ esac
+ fi
+
+ umask 017
+ sudo -u {SYSTEM_USER} touch /var/run/hhvm/hhvm_{SYSTEM_USER}.pid
+ /usr/bin/hhvm --mode daemon -vServer.Type=fastcgi --user {SYSTEM_USER} -vServer.FileSocket=/var/run/hhvm/hhvm.{SYSTEM_USER}.sock -vLog.Level=Warning -vLog.UseLogFile=false -vRepo.Central.Path=/var/run/hhvm/hhvm.{SYSTEM_USER}.hhbc -vPidFile=/var/run/hhvm/hhvm_{SYSTEM_USER}.pid & echo $! > /var/run/hhvm/hhvm_{SYSTEM_USER}.pid
+}
+
+do_stop()
+{
+ if [[ -e "/var/run/hhvm/hhvm_{SYSTEM_USER}.pid" ]] ; then
+ kill -SIGTERM `cat /var/run/hhvm/hhvm_{SYSTEM_USER}.pid` >/dev/null 2>&1 ;
+ fi
+ rm -f /var/run/hhvm/hhvm.{SYSTEM_USER}.sock /var/run/hhvm/hhvm.{SYSTEM_USER}.hhbc /var/run/hhvm/hhvm_{SYSTEM_USER}.pid
+}
+
+case "$1" in
+ start)
+ do_start
+ ;;
+ stop)
+ do_stop
+ ;;
+ restart|force-reload)
+ do_stop
+ case "$?" in
+ 0|1)
+ do_start
+ ;;
+ *)
+ ;;
+ esac
+ ;;
+ *)
+ exit 3
+ ;;
+esac
+
+:
diff --git a/server/conf/nginx_vhost.conf.master b/server/conf/nginx_vhost.conf.master
index 6e3d853..0a089f9 100644
--- a/server/conf/nginx_vhost.conf.master
+++ b/server/conf/nginx_vhost.conf.master
@@ -152,9 +152,22 @@
fastcgi_intercept_errors on;
}
</tmpl_else>
+ <tmpl_if name='php' op='==' value='hhvm'>
+ location @php {
+ try_files $uri =404;
+ include /etc/nginx/fastcgi_params;
+ fastcgi_pass unix:/var/run/hhvm/hhvm.<tmpl_var name='system_user'>.sock;
+ fastcgi_index index.php;
+ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+ #fastcgi_param PATH_INFO $fastcgi_script_name;
+ fastcgi_intercept_errors on;
+ }
+ </tmpl_else>
+
location @php {
deny all;
}
+ </tmpl_if>
</tmpl_if>
<tmpl_if name='cgi' op='==' value='y'>
diff --git a/server/conf/php_fpm_pool.conf.master b/server/conf/php_fpm_pool.conf.master
index 37edbb7..a7a4c64 100644
--- a/server/conf/php_fpm_pool.conf.master
+++ b/server/conf/php_fpm_pool.conf.master
@@ -8,7 +8,7 @@
listen = <tmpl_var name='fpm_socket'>
listen.owner = <tmpl_var name='fpm_user'>
listen.group = <tmpl_var name='fpm_group'>
-listen.mode = 0660
+listen.mode = <tmpl_vare name='fpm_listen_mode'>
</tmpl_if>
user = <tmpl_var name='fpm_user'>
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index e7305e4..c4269d9 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -20,7 +20,11 @@
<tmpl_if name='php' op='==' value='php-fpm'>
DocumentRoot <tmpl_var name='web_document_root'>
</tmpl_else>
- DocumentRoot <tmpl_var name='web_document_root_www'>
+ <tmpl_if name='php' op='==' value='hhvm'>
+ DocumentRoot <tmpl_var name='web_document_root'>
+ </tmpl_else>
+ DocumentRoot <tmpl_var name='web_document_root_www'>
+ </tmpl_if>
</tmpl_if>
</tmpl_if>
</tmpl_if>
@@ -307,7 +311,7 @@
<FilesMatch "\.php[345]?$">
SetHandler php5-fcgi
</FilesMatch>
- Action php5-fcgi /php5-fcgi
+ Action php5-fcgi /php5-fcgi virtual
Alias /php5-fcgi {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'}
<tmpl_if name='use_tcp'>
FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -host 127.0.0.1:<tmpl_var name='fpm_port'> -pass-header Authorization
@@ -318,6 +322,28 @@
</IfModule>
</tmpl_if>
+<tmpl_if name='php' op='==' value='hhvm'>
+ <IfModule mod_fastcgi.c>
+ <Directory {tmpl_var name='document_root'}/cgi-bin>
+ <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
+ Require all granted
+ <tmpl_else>
+ Order allow,deny
+ Allow from all
+ </tmpl_if>
+ </Directory>
+ <FilesMatch "\.php[345]?$">
+ SetHandler hhvm-fcgi
+ </FilesMatch>
+ <FilesMatch "\.hh$">
+ SetHandler hhvm-fcgi
+ </FilesMatch>
+ Action hhvm-fcgi /hhvm-fcgi virtual
+ Alias /hhvm-fcgi {tmpl_var name='document_root'}/cgi-bin/hhvm-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'}
+ FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/hhvm-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -socket /var/run/hhvm/hhvm.<tmpl_var name='system_user'>.sock -pass-header Authorization
+ </IfModule>
+</tmpl_if>
+
<tmpl_if name="rewrite_enabled">
RewriteEngine on
<tmpl_if name='seo_redirect_enabled'>
diff --git a/server/mods-available/web_module.inc.php b/server/mods-available/web_module.inc.php
index 680b592..c31aa67 100644
--- a/server/mods-available/web_module.inc.php
+++ b/server/mods-available/web_module.inc.php
@@ -235,6 +235,18 @@
} else {
$path_parts = pathinfo($init_script);
$initcommand = $app->system->getinitcommand($path_parts['basename'], $action, $path_parts['dirname']);
+
+ if($action == 'reload' && $init_script == $conf['init_scripts'].'/'.$web_config['php_fpm_init_script']) {
+ // we have to do a workaround because of buggy ubuntu fpm reload handling
+ // @see: https://bugs.launchpad.net/ubuntu/+source/php5/+bug/1242376
+ if(file_exists('/etc/os-release')) {
+ $tmp = file_get_contents('/etc/os-release');
+ if(preg_match('/^ID=ubuntu/m', $tmp) && preg_match('/^VERSION_ID="14\.04"/m', $tmp)) {
+ $initcommand = '/sbin/start-stop-daemon --stop --signal USR2 --quiet --pidfile /var/run/php5-fpm.pid --name php5-fpm';
+ }
+ unset($tmp);
+ }
+ }
}
$retval = array('output' => '', 'retval' => 0);
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 18c4ded..f1a08af 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -104,7 +104,7 @@
/* $data contains an array with these keys:
* file -> full path of changed php_ini
- * mode -> web_domain php modes to change (mod, fast-cgi, php-fpm or '' for all except 'mod')
+ * mode -> web_domain php modes to change (mod, fast-cgi, php-fpm, hhvm or '' for all except 'mod')
* php_version -> php ini path that changed (additional php versions)
*/
@@ -118,6 +118,11 @@
}
} elseif($data['mode'] == 'php-fpm') {
$qrystr .= " AND php = 'php-fpm'";
+ if($data['php_version']) {
+ $qrystr .= " AND fastcgi_php_version LIKE '%:" . $app->db->quote($data['php_version']) . ":%'";
+ }
+ } elseif($data['mode'] == 'hhvm') {
+ $qrystr .= " AND php = 'hhvm'";
if($data['php_version']) {
$qrystr .= " AND fastcgi_php_version LIKE '%:" . $app->db->quote($data['php_version']) . ":%'";
}
@@ -444,13 +449,26 @@
$web_folder = 'web';
$log_folder = 'log';
+ $old_web_folder = 'web';
+ $old_log_folder = 'log';
if($data['new']['type'] == 'vhostsubdomain' || $data['new']['type'] == 'vhostalias') {
+ // new one
$tmp = $app->db->queryOneRecord('SELECT `domain` FROM web_domain WHERE domain_id = '.intval($data['new']['parent_domain_id']));
$subdomain_host = preg_replace('/^(.*)\.' . preg_quote($tmp['domain'], '/') . '$/', '$1', $data['new']['domain']);
if($subdomain_host == '') $subdomain_host = 'web'.$data['new']['domain_id'];
$web_folder = $data['new']['web_folder'];
$log_folder .= '/' . $subdomain_host;
unset($tmp);
+
+ if(isset($data['old']['parent_domain_id'])) {
+ // old one
+ $tmp = $app->db->queryOneRecord('SELECT `domain` FROM web_domain WHERE domain_id = '.intval($data['old']['parent_domain_id']));
+ $subdomain_host = preg_replace('/^(.*)\.' . preg_quote($tmp['domain'], '/') . '$/', '$1', $data['old']['domain']);
+ if($subdomain_host == '') $subdomain_host = 'web'.$data['old']['domain_id'];
+ $old_web_folder = $data['old']['web_folder'];
+ $old_log_folder .= '/' . $subdomain_host;
+ unset($tmp);
+ }
}
// Create group and user, if not exist
@@ -562,9 +580,9 @@
if($apache_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' '.$command);
//* Change the log mount
- $fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$log_folder.' none bind';
+ $fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$old_log_folder.' none bind';
$app->system->removeLine('/etc/fstab', $fstab_line);
- $fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$log_folder.' none bind,nobootwait';
+ $fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$old_log_folder.' none bind,nobootwait';
$app->system->removeLine('/etc/fstab', $fstab_line);
$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nobootwait,_netdev 0 0';
$app->system->replaceLine('/etc/fstab', $fstab_line, $fstab_line, 1, 1);
@@ -596,14 +614,14 @@
// Remove the symlink for the site, if site is renamed
if($this->action == 'update' && $data['old']['domain'] != '' && $data['new']['domain'] != $data['old']['domain']) {
if(is_dir('/var/log/ispconfig/httpd/'.$data['old']['domain'])) exec('rm -rf /var/log/ispconfig/httpd/'.$data['old']['domain']);
- if(is_link($data['old']['document_root'].'/'.$log_folder)) $app->system->unlink($data['old']['document_root'].'/'.$log_folder);
+ if(is_link($data['old']['document_root'].'/'.$old_log_folder)) $app->system->unlink($data['old']['document_root'].'/'.$old_log_folder);
//* remove old log mount
- $fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$log_folder.' none bind';
+ $fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$old_log_folder.' none bind';
$app->system->removeLine('/etc/fstab', $fstab_line);
//* Unmount log directory
- exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder));
+ exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$old_log_folder));
}
//* Create the log dir if nescessary and mount it
@@ -1305,7 +1323,7 @@
* PHP-FPM
*/
// Support for multiple PHP versions
- if($data['new']['php'] == 'php-fpm'){
+ if($data['new']['php'] == 'php-fpm' || $data['new']['php'] == 'hhvm'){
if(trim($data['new']['fastcgi_php_version']) != ''){
$default_php_fpm = false;
list($custom_php_fpm_name, $custom_php_fpm_init_script, $custom_php_fpm_ini_dir, $custom_php_fpm_pool_dir) = explode(':', trim($data['new']['fastcgi_php_version']));
@@ -1314,7 +1332,7 @@
$default_php_fpm = true;
}
} else {
- if(trim($data['old']['fastcgi_php_version']) != '' && $data['old']['php'] == 'php-fpm'){
+ if(trim($data['old']['fastcgi_php_version']) != '' && ($data['old']['php'] == 'php-fpm' || $data['old']['php'] == 'hhvm')){
$default_php_fpm = false;
list($custom_php_fpm_name, $custom_php_fpm_init_script, $custom_php_fpm_ini_dir, $custom_php_fpm_pool_dir) = explode(':', trim($data['old']['fastcgi_php_version']));
if(substr($custom_php_fpm_ini_dir, -1) != '/') $custom_php_fpm_ini_dir .= '/';
@@ -1573,6 +1591,7 @@
}
$this->php_fpm_pool_update($data, $web_config, $pool_dir, $pool_name, $socket_dir);
+ $this->hhvm_update($data, $web_config);
if($web_config['check_apache_config'] == 'y') {
//* Test if apache starts with the new configuration file
@@ -1713,7 +1732,6 @@
//* Unset action to clean it for next processed vhost.
$this->action = '';
-
}
function delete($event_name, $data) {
@@ -1921,6 +1939,8 @@
// remove PHP-FPM pool
if ($data['old']['php'] == 'php-fpm') {
$this->php_fpm_pool_delete($data, $web_config);
+ } elseif($data['old']['php'] == 'hhvm') {
+ $this->hhvm_update($data, $web_config);
}
//remove the php cgi starter script if available
@@ -2710,6 +2730,28 @@
}
}
+ private function hhvm_update($data, $web_config) {
+ global $app, $conf;
+
+ if(file_exists($conf['rootpath'] . '/conf-custom/hhvm_starter.master')) {
+ $content = file_get_contents($conf['rootpath'] . '/conf-custom/hhvm_starter.master');
+ } else {
+ $content = file_get_contents($conf['rootpath'] . '/conf/hhvm_starter.master');
+ }
+
+ if($data['new']['php'] == 'hhvm' && $data['old']['php'] != 'hhvm') {
+ $content = str_replace('{SYSTEM_USER}', $data['new']['system_user'], $content);
+ file_put_contents('/etc/init.d/hhvm_' . $data['new']['system_user'], $content);
+ exec('chmod +x /etc/init.d/hhvm_' . $data['new']['system_user'] . ' >/dev/null 2>&1');
+ exec('/usr/sbin/update-rc.d hhvm_' . $data['new']['system_user'] . ' defaults >/dev/null 2>&1');
+ exec('/etc/init.d/hhvm_' . $data['new']['system_user'] . ' start >/dev/null 2>&1');
+ } elseif($data['new']['php'] != 'hhvm' && $data['old']['php'] == 'hhvm') {
+ exec('/etc/init.d/hhvm_' . $data['old']['system_user'] . ' stop >/dev/null 2>&1');
+ exec('/usr/sbin/update-rc.d hhvm_' . $data['old']['system_user'] . ' remove >/dev/null 2>&1');
+ unlink('/etc/init.d/hhvm_' . $data['old']['system_user'] . ' >/dev/null 2>&1');
+ }
+ }
+
//* Update the PHP-FPM pool configuration file
private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name, $socket_dir) {
global $app, $conf;
@@ -2770,6 +2812,7 @@
$fpm_socket = $socket_dir.$pool_name.'.sock';
$tpl->setVar('fpm_socket', $fpm_socket);
+ $tpl->setVar('fpm_listen_mode', '0600');
$tpl->setVar('fpm_pool', $pool_name);
$tpl->setVar('fpm_port', $web_config['php_fpm_start_port'] + $data['new']['domain_id'] - 1);
diff --git a/server/plugins-available/mail_plugin_dkim.inc.php b/server/plugins-available/mail_plugin_dkim.inc.php
index cd106fe..0f0f6ef 100644
--- a/server/plugins-available/mail_plugin_dkim.inc.php
+++ b/server/plugins-available/mail_plugin_dkim.inc.php
@@ -205,19 +205,21 @@
* This function adds the entry to the amavisd-config
* @param string $key_domain mail-domain
*/
- function add_to_amavis($key_domain) {
+ function add_to_amavis($key_domain, $selector, $old_selector) {
global $app, $mail_config;
+ if (empty($selector)) $selector = 'default';
$restart = false;
- $selector = 'default';
$amavis_configfile = $this->get_amavis_config();
+
+ $search_regex = "/(\n|\r)?dkim_key\(\'".$key_domain."\',\ \'(".$selector."|".$old_selector."){1}?\'.*/";
//* If we are using seperate config-files with amavis remove existing keys from 50-user to avoid duplicate keys
if (substr_compare($amavis_configfile, '60-dkim', -7) === 0) {
$temp_configfile = str_replace('60-dkim', '50-user', $amavis_configfile);
$temp_config = file_get_contents($temp_configfile);
- if (preg_match("/(\n|\r)?dkim_key.*".$key_domain.".*/", $temp_config)) {
- $temp_config = preg_replace("/(\n|\r)?dkim_key.*".$key_domain.".*(\n|\r)?/", '', $temp_config)."\n";
+ if (preg_match($search_regex, $temp_config)) {
+ $temp_config = preg_replace($search_regex, '', $temp_config)."\n";
file_put_contents($temp_configfile, $temp_config);
}
unset($temp_configfile);
@@ -226,7 +228,7 @@
$key_value="dkim_key('".$key_domain."', '".$selector."', '".$mail_config['dkim_path']."/".$key_domain.".private');\n";
$amavis_config = file_get_contents($amavis_configfile);
- $amavis_config = preg_replace("/(\n|\r)?dkim_key.*".$key_domain.".*/", '', $amavis_config).$key_value;
+ $amavis_config = preg_replace($search_regex, '', $amavis_config).$key_value;
if (file_put_contents($amavis_configfile, $amavis_config)) {
$app->log('Adding DKIM Private-key to amavis-config.', LOGLEVEL_DEBUG);
@@ -249,8 +251,10 @@
$amavis_configfile = $this->get_amavis_config();
$amavis_config = file_get_contents($amavis_configfile);
- if (preg_match("/(\n|\r)?dkim_key.*".$key_domain.".*/", $amavis_config)) {
- $amavis_config = preg_replace("/(\n|\r)?dkim_key.*".$key_domain.".*(\n|\r)?/", '', $amavis_config);
+ $search_regex = "/(\n|\r)?dkim_key.*".$key_domain.".*(\n|\r)?/";
+
+ if (preg_match($search_regex, $amavis_config)) {
+ $amavis_config = preg_replace($search_regex, '', $amavis_config);
file_put_contents($amavis_configfile, $amavis_config);
$app->log('Deleted the DKIM settings from amavis-config for '.$key_domain.'.', LOGLEVEL_DEBUG);
$restart = true;
@@ -260,8 +264,8 @@
if (substr_compare($amavis_configfile, '60-dkim', -7) === 0) {
$temp_configfile = str_replace('60-dkim', '50-user', $amavis_configfile);
$temp_config = file_get_contents($temp_configfile);
- if (preg_match("/(\n|\r)?dkim_key.*".$key_domain.".*/", $temp_config)) {
- $temp_config = preg_replace("/dkim_key.*".$key_domain.".*/", '', $temp_config);
+ if (preg_match($search_regex, $temp_config)) {
+ $temp_config = preg_replace($search_regex, '', $temp_config);
file_put_contents($temp_configfile, $temp_config);
$restart = true;
}
@@ -283,7 +287,7 @@
if ( substr($mail_config['dkim_path'], strlen($mail_config['dkim_path'])-1) == '/' )
$mail_config['dkim_path'] = substr($mail_config['dkim_path'], 0, strlen($mail_config['dkim_path'])-1);
if ($this->write_dkim_key($mail_config['dkim_path']."/".$data['new']['domain'], $data['new']['dkim_private'], $data['new']['domain'])) {
- if ($this->add_to_amavis($data['new']['domain'])) {
+ if ($this->add_to_amavis($data['new']['domain'], $data['new']['dkim_selector'], $data['old']['dkim_selector'] )) {
$this->restart_amavis();
} else {
$this->remove_dkim_key($mail_config['dkim_path']."/".$data['new']['domain'], $data['new']['domain']);
@@ -291,9 +295,6 @@
} else {
$app->log('Error saving the DKIM Private-key for '.$data['new']['domain'].' - DKIM is not enabled for the domain.', LOGLEVEL_ERROR);
}
- }
- else {
- $app->log('DKIM for '.$data['new']['domain'].' not written to disk - domain is inactive', LOGLEVEL_DEBUG);
}
}
@@ -360,6 +361,10 @@
if ($data['new']['dkim_private'] != $data['old']['dkim_private'] && $data['new']['dkim'] == 'y') {
$this->add_dkim($data);
}
+ /* new selector */
+ if ($data['new']['dkim_selector'] != $data['old']['dkim_selector'] && $data['new']['dkim'] == 'y') {
+ $this->add_dkim($data);
+ }
/* new domain-name */
if ($data['new']['domain'] != $data['old']['domain']) {
$this->remove_dkim($data['old']);
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index 851a251..eb12488 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -362,13 +362,26 @@
$web_folder = 'web';
$log_folder = 'log';
+ $old_web_folder = 'web';
+ $old_log_folder = 'log';
if($data['new']['type'] == 'vhostsubdomain' || $data['new']['type'] == 'vhostalias') {
+ // new one
$tmp = $app->db->queryOneRecord('SELECT `domain` FROM web_domain WHERE domain_id = '.intval($data['new']['parent_domain_id']));
$subdomain_host = preg_replace('/^(.*)\.' . preg_quote($tmp['domain'], '/') . '$/', '$1', $data['new']['domain']);
if($subdomain_host == '') $subdomain_host = 'web'.$data['new']['domain_id'];
$web_folder = $data['new']['web_folder'];
$log_folder .= '/' . $subdomain_host;
unset($tmp);
+
+ if(isset($data['old']['parent_domain_id'])) {
+ // old one
+ $tmp = $app->db->queryOneRecord('SELECT `domain` FROM web_domain WHERE domain_id = '.intval($data['old']['parent_domain_id']));
+ $subdomain_host = preg_replace('/^(.*)\.' . preg_quote($tmp['domain'], '/') . '$/', '$1', $data['old']['domain']);
+ if($subdomain_host == '') $subdomain_host = 'web'.$data['old']['domain_id'];
+ $old_web_folder = $data['old']['web_folder'];
+ $old_log_folder .= '/' . $subdomain_host;
+ unset($tmp);
+ }
}
// Create group and user, if not exist
@@ -477,9 +490,9 @@
if($nginx_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' '.$command);
//* Change the log mount
- $fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$log_folder.' none bind';
+ $fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$old_log_folder.' none bind';
$app->system->removeLine('/etc/fstab', $fstab_line);
- $fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$log_folder.' none bind,nobootwait';
+ $fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$old_log_folder.' none bind,nobootwait';
$app->system->removeLine('/etc/fstab', $fstab_line);
$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nobootwait,_netdev 0 0';
$app->system->replaceLine('/etc/fstab', $fstab_line, $fstab_line, 1, 1);
@@ -511,14 +524,14 @@
// Remove the symlink for the site, if site is renamed
if($this->action == 'update' && $data['old']['domain'] != '' && $data['new']['domain'] != $data['old']['domain']) {
if(is_dir('/var/log/ispconfig/httpd/'.$data['old']['domain'])) exec('rm -rf /var/log/ispconfig/httpd/'.$data['old']['domain']);
- if(is_link($data['old']['document_root'].'/'.$log_folder)) $app->system->unlink($data['old']['document_root'].'/'.$log_folder);
+ if(is_link($data['old']['document_root'].'/'.$old_log_folder)) $app->system->unlink($data['old']['document_root'].'/'.$old_log_folder);
//* remove old log mount
- $fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$log_folder.' none bind';
+ $fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$old_log_folder.' none bind';
$app->system->removeLine('/etc/fstab', $fstab_line);
//* Unmount log directory
- exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder));
+ exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$old_log_folder));
}
//* Create the log dir if nescessary and mount it
@@ -1631,6 +1644,7 @@
}
$this->php_fpm_pool_update($data, $web_config, $pool_dir, $pool_name, $socket_dir);
+ $this->hhvm_update($data, $web_config);
if($web_config['check_apache_config'] == 'y') {
//* Test if nginx starts with the new configuration file
@@ -1941,6 +1955,8 @@
// remove PHP-FPM pool
if ($data['old']['php'] == 'php-fpm') {
$this->php_fpm_pool_delete($data, $web_config);
+ } elseif($data['old']['php'] == 'hhvm') {
+ $this->hhvm_update($data, $web_config);
}
//remove the php cgi starter script if available
@@ -2288,6 +2304,28 @@
}
}
+ private function hhvm_update($data, $web_config) {
+ global $app, $conf;
+
+ if(file_exists($conf['rootpath'] . '/conf-custom/hhvm_starter.master')) {
+ $content = file_get_contents($conf['rootpath'] . '/conf-custom/hhvm_starter.master');
+ } else {
+ $content = file_get_contents($conf['rootpath'] . '/conf/hhvm_starter.master');
+ }
+
+ if($data['new']['php'] == 'hhvm' && $data['old']['php'] != 'hhvm') {
+ $content = str_replace('{SYSTEM_USER}', $data['new']['system_user'], $content);
+ file_put_contents('/etc/init.d/hhvm_' . $data['new']['system_user'], $content);
+ exec('chmod +x /etc/init.d/hhvm_' . $data['new']['system_user'] . ' >/dev/null 2>&1');
+ exec('/usr/sbin/update-rc.d hhvm_' . $data['new']['system_user'] . ' defaults >/dev/null 2>&1');
+ exec('/etc/init.d/hhvm_' . $data['new']['system_user'] . ' start >/dev/null 2>&1');
+ } elseif($data['new']['php'] != 'hhvm' && $data['old']['php'] == 'hhvm') {
+ exec('/etc/init.d/hhvm_' . $data['old']['system_user'] . ' stop >/dev/null 2>&1');
+ exec('/usr/sbin/update-rc.d hhvm_' . $data['old']['system_user'] . ' remove >/dev/null 2>&1');
+ unlink('/etc/init.d/hhvm_' . $data['old']['system_user'] . ' >/dev/null 2>&1');
+ }
+ }
+
//* Update the PHP-FPM pool configuration file
private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name, $socket_dir) {
global $app, $conf;
@@ -2353,6 +2391,7 @@
$fpm_socket = $socket_dir.$pool_name.'.sock';
$tpl->setVar('fpm_socket', $fpm_socket);
+ $tpl->setVar('fpm_listen_mode', '0660');
$tpl->setVar('fpm_pool', $pool_name);
$tpl->setVar('fpm_port', $web_config['php_fpm_start_port'] + $data['new']['domain_id'] - 1);
diff --git a/server/server.php b/server/server.php
index ab25404..2c4ca3b 100644
--- a/server/server.php
+++ b/server/server.php
@@ -128,22 +128,18 @@
// Check whether another instance of this script is already running
if (is_file($conf['temppath'] . $conf['fs_div'] . '.ispconfig_lock')) {
clearstatcache();
- for ($i = 0; $i < 120; $i++) { // Wait max. 1200 sec, then retry
- if (is_file($conf['temppath'] . $conf['fs_div'] . '.ispconfig_lock')) {
- exec("ps aux | grep '/usr/local/ispconfig/server/[s]erver.php' | wc -l", $check);
- if (intval($check[0]) > 1) { // 1 because this is 2nd instance!
- $app->log('There is already an instance of server.php running. Exiting.', LOGLEVEL_DEBUG);
- exit;
- }
- $app->log('There is already a lockfile set. Waiting another 10 seconds...', LOGLEVEL_DEBUG);
- sleep(10);
- clearstatcache();
+ $pid = trim(file_get_contents($conf['temppath'] . $conf['fs_div'] . '.ispconfig_lock'));
+ if(preg_match('/^[0-9]+$/', $pid)) {
+ if(file_exists('/proc/' . $pid)) {
+ $app->log('There is already an instance of server.php running with pid ' . $pid . '.', LOGLEVEL_DEBUG);
+ exit;
}
}
+ $app->log('There is already a lockfile set, but no process running with this pid (' . $pid . '). Continuing.', LOGLEVEL_WARN);
}
// Set Lockfile
-@touch($conf['temppath'] . $conf['fs_div'] . '.ispconfig_lock');
+@file_put_contents($conf['temppath'] . $conf['fs_div'] . '.ispconfig_lock', getmypid());
$app->log('Set Lock: ' . $conf['temppath'] . $conf['fs_div'] . '.ispconfig_lock', LOGLEVEL_DEBUG);
/** Do we need to start the core-modules */
--
Gitblit v1.9.1