From 10b4c85a7686da07bddb5779f8ceea48acdf412e Mon Sep 17 00:00:00 2001 From: tbrehm Date: Thu, 3 Jan 2013 11:51:45 +0000 Subject: [PATCH] Merged revisons 3687-3748 from 3.0.5 stable branch. --- install/dist/lib/fedora.lib.php | 9 +- install/dist/lib/gentoo.lib.php | 9 +- install/dist/lib/opensuse.lib.php | 9 +- install/lib/installer_base.lib.php | 5 + install/sql/incremental/upd_0046.sql | 11 + install/sql/ispconfig3.sql | 5 + install/tpl/apache_ispconfig.vhost.master | 2 + install/tpl/server.ini.master | 1 - install/tpl/system.ini.master | 5 + .../lib/classes/aps_guicontroller.inc.php | 14 +- interface/lib/classes/functions.inc.php | 2 +- .../lib/classes/listform_actions.inc.php | 3 +- interface/lib/classes/remoting.inc.php | 118 +++++- interface/lib/classes/remoting_lib.inc.php | 8 +- interface/lib/classes/tform.inc.php | 4 +- interface/lib/classes/tools_sites.inc.php | 51 ++- interface/lib/classes/validate_client.inc.php | 3 +- interface/lib/classes/validate_domain.inc.php | 161 +++++++- interface/lib/lang/ar.lng | 3 + interface/lib/lang/bg.lng | 3 + interface/lib/lang/br.lng | 3 + interface/lib/lang/cz.lng | 99 ++--- interface/lib/lang/el.lng | 3 + interface/lib/lang/es.lng | 47 +-- interface/lib/lang/fi.lng | 3 + interface/lib/lang/fr.lng | 52 +++ interface/lib/lang/hr.lng | 3 + interface/lib/lang/hu.lng | 3 + interface/lib/lang/id.lng | 3 + interface/lib/lang/it.lng | 3 + interface/lib/lang/ja.lng | 3 + interface/lib/lang/nl.lng | 3 + interface/lib/lang/pl.lng | 3 + interface/lib/lang/pt.lng | 3 + interface/lib/lang/ro.lng | 3 + interface/lib/lang/ru.lng | 3 + interface/lib/lang/se.lng | 3 + interface/lib/lang/sk.lng | 3 + interface/lib/lang/tr.lng | 3 + .../web/admin/form/server_config.tform.php | 4 +- .../web/admin/form/system_config.tform.php | 18 + interface/web/admin/form/users.tform.php | 4 + .../web/admin/lib/lang/ar_server_config.lng | 3 + .../web/admin/lib/lang/ar_system_config.lng | 5 + interface/web/admin/lib/lang/ar_users.lng | 1 + .../admin/lib/lang/bg_directive_snippets.lng | 16 +- .../lib/lang/bg_directive_snippets_list.lng | 12 +- .../web/admin/lib/lang/bg_server_config.lng | 3 + .../web/admin/lib/lang/bg_system_config.lng | 5 + interface/web/admin/lib/lang/bg_users.lng | 1 + .../admin/lib/lang/br_directive_snippets.lng | 16 +- .../lib/lang/br_directive_snippets_list.lng | 12 +- .../web/admin/lib/lang/br_server_config.lng | 3 + .../web/admin/lib/lang/br_system_config.lng | 5 + interface/web/admin/lib/lang/br_users.lng | 1 + interface/web/admin/lib/lang/cz.lng | 2 +- .../admin/lib/lang/cz_language_complete.lng | 2 +- .../web/admin/lib/lang/cz_package_install.lng | 6 +- .../web/admin/lib/lang/cz_remote_user.lng | 2 +- interface/web/admin/lib/lang/cz_server.lng | 8 +- .../web/admin/lib/lang/cz_server_config.lng | 67 ++-- .../web/admin/lib/lang/cz_server_ip_list.lng | 2 +- .../web/admin/lib/lang/cz_server_php.lng | 22 +- .../web/admin/lib/lang/cz_server_php_list.lng | 8 +- .../web/admin/lib/lang/cz_system_config.lng | 13 +- .../admin/lib/lang/cz_tpl_default_admin.lng | 22 +- interface/web/admin/lib/lang/cz_users.lng | 5 +- .../web/admin/lib/lang/cz_users_list.lng | 6 +- .../web/admin/lib/lang/de_server_config.lng | 3 + .../web/admin/lib/lang/de_system_config.lng | 5 + interface/web/admin/lib/lang/de_users.lng | 1 + .../web/admin/lib/lang/el_server_config.lng | 3 + .../web/admin/lib/lang/el_system_config.lng | 5 + interface/web/admin/lib/lang/el_users.lng | 1 + .../web/admin/lib/lang/en_system_config.lng | 4 + interface/web/admin/lib/lang/en_users.lng | 1 + interface/web/admin/lib/lang/es.lng | 64 ++-- .../admin/lib/lang/es_directive_snippets.lng | 16 +- .../lib/lang/es_directive_snippets_list.lng | 12 +- .../web/admin/lib/lang/es_groups_list.lng | 2 +- interface/web/admin/lib/lang/es_iptables.lng | 18 +- .../web/admin/lib/lang/es_iptables_list.lng | 20 +- .../web/admin/lib/lang/es_language_import.lng | 2 +- .../web/admin/lib/lang/es_remote_action.lng | 20 +- .../web/admin/lib/lang/es_remote_user.lng | 72 ++-- interface/web/admin/lib/lang/es_server.lng | 10 +- .../web/admin/lib/lang/es_server_config.lng | 195 +++++----- interface/web/admin/lib/lang/es_server_ip.lng | 8 +- .../web/admin/lib/lang/es_server_ip_list.lng | 4 +- .../web/admin/lib/lang/es_server_list.lng | 2 +- .../lib/lang/es_software_package_install.lng | 8 +- .../web/admin/lib/lang/es_system_config.lng | 49 +-- interface/web/admin/lib/lang/es_users.lng | 1 + .../web/admin/lib/lang/es_users_list.lng | 6 +- .../admin/lib/lang/fi_directive_snippets.lng | 16 +- .../lib/lang/fi_directive_snippets_list.lng | 12 +- .../web/admin/lib/lang/fi_server_config.lng | 3 + .../web/admin/lib/lang/fi_system_config.lng | 5 + interface/web/admin/lib/lang/fi_users.lng | 1 + interface/web/admin/lib/lang/fr.lng | 1 + .../admin/lib/lang/fr_directive_snippets.lng | 9 + .../lib/lang/fr_directive_snippets_list.lng | 7 + .../web/admin/lib/lang/fr_server_config.lng | 343 +++++++++--------- .../web/admin/lib/lang/fr_system_config.lng | 11 + interface/web/admin/lib/lang/fr_users.lng | 1 + .../web/admin/lib/lang/hr_server_config.lng | 3 + .../web/admin/lib/lang/hr_system_config.lng | 5 + interface/web/admin/lib/lang/hr_users.lng | 1 + .../admin/lib/lang/hu_directive_snippets.lng | 16 +- .../lib/lang/hu_directive_snippets_list.lng | 12 +- .../web/admin/lib/lang/hu_server_config.lng | 3 + .../web/admin/lib/lang/hu_system_config.lng | 5 + interface/web/admin/lib/lang/hu_users.lng | 1 + .../web/admin/lib/lang/id_server_config.lng | 3 + .../web/admin/lib/lang/id_system_config.lng | 5 + interface/web/admin/lib/lang/id_users.lng | 1 + .../admin/lib/lang/it_directive_snippets.lng | 16 +- .../lib/lang/it_directive_snippets_list.lng | 12 +- .../web/admin/lib/lang/it_server_config.lng | 3 + .../web/admin/lib/lang/it_system_config.lng | 5 + interface/web/admin/lib/lang/it_users.lng | 1 + .../admin/lib/lang/ja_directive_snippets.lng | 16 +- .../lib/lang/ja_directive_snippets_list.lng | 12 +- .../web/admin/lib/lang/ja_server_config.lng | 3 + .../web/admin/lib/lang/ja_system_config.lng | 5 + interface/web/admin/lib/lang/ja_users.lng | 1 + .../admin/lib/lang/nl_directive_snippets.lng | 16 +- .../lib/lang/nl_directive_snippets_list.lng | 12 +- .../web/admin/lib/lang/nl_server_config.lng | 3 + .../web/admin/lib/lang/nl_system_config.lng | 5 + interface/web/admin/lib/lang/nl_users.lng | 1 + .../admin/lib/lang/pl_directive_snippets.lng | 16 +- .../lib/lang/pl_directive_snippets_list.lng | 12 +- .../web/admin/lib/lang/pl_server_config.lng | 3 + .../web/admin/lib/lang/pl_system_config.lng | 5 + interface/web/admin/lib/lang/pl_users.lng | 1 + .../admin/lib/lang/pt_directive_snippets.lng | 16 +- .../lib/lang/pt_directive_snippets_list.lng | 12 +- .../web/admin/lib/lang/pt_server_config.lng | 3 + .../web/admin/lib/lang/pt_system_config.lng | 5 + interface/web/admin/lib/lang/pt_users.lng | 1 + .../admin/lib/lang/ro_directive_snippets.lng | 16 +- .../lib/lang/ro_directive_snippets_list.lng | 12 +- .../web/admin/lib/lang/ro_server_config.lng | 3 + .../web/admin/lib/lang/ro_system_config.lng | 5 + interface/web/admin/lib/lang/ro_users.lng | 1 + .../admin/lib/lang/ru_directive_snippets.lng | 16 +- .../lib/lang/ru_directive_snippets_list.lng | 12 +- .../web/admin/lib/lang/ru_server_config.lng | 3 + .../web/admin/lib/lang/ru_system_config.lng | 5 + interface/web/admin/lib/lang/ru_users.lng | 1 + .../admin/lib/lang/se_directive_snippets.lng | 16 +- .../lib/lang/se_directive_snippets_list.lng | 12 +- .../web/admin/lib/lang/se_server_config.lng | 3 + .../web/admin/lib/lang/se_system_config.lng | 5 + interface/web/admin/lib/lang/se_users.lng | 1 + .../admin/lib/lang/sk_directive_snippets.lng | 16 +- .../lib/lang/sk_directive_snippets_list.lng | 12 +- .../web/admin/lib/lang/sk_server_config.lng | 3 + .../web/admin/lib/lang/sk_system_config.lng | 5 + interface/web/admin/lib/lang/sk_users.lng | 1 + .../web/admin/lib/lang/tr_server_config.lng | 3 + .../web/admin/lib/lang/tr_system_config.lng | 5 + interface/web/admin/lib/lang/tr_users.lng | 1 + interface/web/admin/server_config_edit.php | 10 + interface/web/admin/system_config_edit.php | 28 ++ .../templates/server_config_web_edit.htm | 6 +- .../templates/system_config_misc_edit.htm | 12 + .../templates/system_config_sites_edit.htm | 6 + interface/web/client/lib/lang/ar_client.lng | 3 + .../web/client/lib/lang/ar_clients_list.lng | 1 + interface/web/client/lib/lang/ar_reseller.lng | 9 + .../web/client/lib/lang/ar_resellers_list.lng | 2 + interface/web/client/lib/lang/bg_client.lng | 3 + .../web/client/lib/lang/bg_clients_list.lng | 1 + interface/web/client/lib/lang/bg_reseller.lng | 9 + .../web/client/lib/lang/bg_resellers_list.lng | 2 + interface/web/client/lib/lang/br_client.lng | 3 + .../web/client/lib/lang/br_clients_list.lng | 1 + interface/web/client/lib/lang/br_reseller.lng | 9 + .../web/client/lib/lang/br_resellers_list.lng | 2 + interface/web/client/lib/lang/cz.lng | 6 +- interface/web/client/lib/lang/cz_client.lng | 57 +-- .../web/client/lib/lang/cz_client_circle.lng | 2 +- .../web/client/lib/lang/cz_client_message.lng | 32 +- .../client/lib/lang/cz_client_template.lng | 34 +- .../web/client/lib/lang/cz_clients_list.lng | 3 +- interface/web/client/lib/lang/cz_domain.lng | 8 +- .../web/client/lib/lang/cz_domain_list.lng | 8 +- interface/web/client/lib/lang/cz_reseller.lng | 33 +- .../web/client/lib/lang/cz_resellers_list.lng | 2 + interface/web/client/lib/lang/de_client.lng | 1 + .../web/client/lib/lang/de_clients_list.lng | 1 + .../web/client/lib/lang/de_resellers_list.lng | 2 + interface/web/client/lib/lang/el_client.lng | 3 + .../web/client/lib/lang/el_clients_list.lng | 1 + interface/web/client/lib/lang/el_reseller.lng | 9 + .../web/client/lib/lang/el_resellers_list.lng | 2 + interface/web/client/lib/lang/en_client.lng | 3 +- .../client/lib/lang/en_client_template.lng | 2 +- .../web/client/lib/lang/en_clients_list.lng | 1 + .../web/client/lib/lang/en_resellers_list.lng | 2 + interface/web/client/lib/lang/es.lng | 8 +- interface/web/client/lib/lang/es_client.lng | 21 +- .../web/client/lib/lang/es_client_message.lng | 22 +- .../client/lib/lang/es_client_template.lng | 18 +- .../web/client/lib/lang/es_clients_list.lng | 3 +- interface/web/client/lib/lang/es_reseller.lng | 25 +- .../web/client/lib/lang/es_resellers_list.lng | 2 + interface/web/client/lib/lang/fi_client.lng | 3 + .../web/client/lib/lang/fi_clients_list.lng | 1 + interface/web/client/lib/lang/fi_reseller.lng | 9 + .../web/client/lib/lang/fi_resellers_list.lng | 2 + interface/web/client/lib/lang/fr_client.lng | 7 + .../web/client/lib/lang/fr_client_circle.lng | 16 +- .../client/lib/lang/fr_client_circle_list.lng | 18 +- .../web/client/lib/lang/fr_clients_list.lng | 1 + interface/web/client/lib/lang/fr_reseller.lng | 11 + .../web/client/lib/lang/fr_resellers_list.lng | 2 + interface/web/client/lib/lang/hr_client.lng | 3 + .../web/client/lib/lang/hr_clients_list.lng | 1 + interface/web/client/lib/lang/hr_reseller.lng | 9 + .../web/client/lib/lang/hr_resellers_list.lng | 2 + interface/web/client/lib/lang/hu_client.lng | 3 + .../web/client/lib/lang/hu_clients_list.lng | 1 + interface/web/client/lib/lang/hu_reseller.lng | 9 + .../web/client/lib/lang/hu_resellers_list.lng | 2 + interface/web/client/lib/lang/id_client.lng | 3 + .../web/client/lib/lang/id_clients_list.lng | 1 + interface/web/client/lib/lang/id_reseller.lng | 9 + .../web/client/lib/lang/id_resellers_list.lng | 2 + interface/web/client/lib/lang/it_client.lng | 3 + .../web/client/lib/lang/it_clients_list.lng | 1 + interface/web/client/lib/lang/it_reseller.lng | 9 + .../web/client/lib/lang/it_resellers_list.lng | 2 + interface/web/client/lib/lang/ja_client.lng | 3 + .../web/client/lib/lang/ja_clients_list.lng | 1 + interface/web/client/lib/lang/ja_reseller.lng | 9 + .../web/client/lib/lang/ja_resellers_list.lng | 2 + interface/web/client/lib/lang/nl_client.lng | 3 + .../web/client/lib/lang/nl_clients_list.lng | 1 + interface/web/client/lib/lang/nl_reseller.lng | 9 + .../web/client/lib/lang/nl_resellers_list.lng | 2 + interface/web/client/lib/lang/pl_client.lng | 3 + .../web/client/lib/lang/pl_clients_list.lng | 1 + interface/web/client/lib/lang/pl_reseller.lng | 9 + .../web/client/lib/lang/pl_resellers_list.lng | 2 + interface/web/client/lib/lang/pt_client.lng | 3 + .../web/client/lib/lang/pt_clients_list.lng | 1 + interface/web/client/lib/lang/pt_reseller.lng | 9 + .../web/client/lib/lang/pt_resellers_list.lng | 2 + interface/web/client/lib/lang/ro_client.lng | 3 + .../web/client/lib/lang/ro_clients_list.lng | 1 + interface/web/client/lib/lang/ro_reseller.lng | 9 + .../web/client/lib/lang/ro_resellers_list.lng | 2 + interface/web/client/lib/lang/ru_client.lng | 3 + .../web/client/lib/lang/ru_clients_list.lng | 1 + interface/web/client/lib/lang/ru_reseller.lng | 9 + .../web/client/lib/lang/ru_resellers_list.lng | 2 + interface/web/client/lib/lang/se_client.lng | 3 + .../web/client/lib/lang/se_clients_list.lng | 1 + interface/web/client/lib/lang/se_reseller.lng | 9 + .../web/client/lib/lang/se_resellers_list.lng | 2 + interface/web/client/lib/lang/sk_client.lng | 3 + .../web/client/lib/lang/sk_clients_list.lng | 1 + interface/web/client/lib/lang/sk_reseller.lng | 9 + .../web/client/lib/lang/sk_resellers_list.lng | 2 + interface/web/client/lib/lang/tr_client.lng | 3 + .../web/client/lib/lang/tr_clients_list.lng | 1 + interface/web/client/lib/lang/tr_reseller.lng | 9 + .../web/client/lib/lang/tr_resellers_list.lng | 2 + interface/web/client/list/client.list.php | 11 +- interface/web/client/list/reseller.list.php | 18 + .../client/templates/client_edit_limits.htm | 25 +- .../web/client/templates/clients_list.htm | 13 +- .../web/client/templates/resellers_list.htm | 12 +- .../dashboard/lib/lang/en_dashlet_limits.lng | 2 +- interface/web/dashboard/lib/lang/es.lng | 2 +- .../dashboard/lib/lang/es_dashlet_modules.lng | 2 +- interface/web/dns/dns_wizard.php | 8 +- interface/web/dns/form/dns_slave.tform.php | 9 +- interface/web/dns/form/dns_soa.tform.php | 4 + interface/web/dns/lib/lang/cz_dns_mx.lng | 12 +- interface/web/dns/lib/lang/cz_dns_ptr.lng | 2 +- interface/web/dns/lib/lang/cz_dns_slave.lng | 2 +- interface/web/dns/lib/lang/cz_dns_soa.lng | 2 +- .../web/dns/lib/lang/cz_dns_soa_list.lng | 2 +- interface/web/dns/lib/lang/cz_dns_srv.lng | 20 +- interface/web/dns/lib/lang/cz_dns_wizard.lng | 20 +- interface/web/dns/lib/lang/de_dns_slave.lng | 2 +- interface/web/dns/lib/lang/de_dns_soa.lng | 2 +- interface/web/dns/lib/lang/en_dns_slave.lng | 2 +- interface/web/dns/lib/lang/es.lng | 4 +- interface/web/dns/lib/lang/es_dns_a_list.lng | 2 +- interface/web/dns/lib/lang/es_dns_cname.lng | 2 +- interface/web/dns/lib/lang/es_dns_import.lng | 20 +- .../web/dns/lib/lang/es_dns_slave_list.lng | 2 +- interface/web/dns/lib/lang/es_dns_soa.lng | 12 +- interface/web/dns/lib/lang/es_dns_wizard.lng | 4 +- interface/web/dns/lib/lang/fr_dns_wizard.lng | 2 + .../web/help/lib/lang/cz_help_faq_list.lng | 2 +- interface/web/help/lib/lang/es.lng | 12 +- .../web/help/lib/lang/es_help_faq_list.lng | 2 +- .../web/help/lib/lang/es_support_message.lng | 4 +- .../templates/faq_manage_questions_list.htm | 7 + .../web/help/templates/faq_sections_edit.htm | 2 +- .../web/help/templates/help_faq_list.htm | 2 +- .../help/templates/help_faq_sections_list.htm | 9 +- .../help/templates/support_message_edit.htm | 2 +- .../help/templates/support_message_view.htm | 2 +- interface/web/js/scrigo.js.php | 20 + interface/web/login/lib/lang/es.lng | 12 +- interface/web/login/lib/lang/fr.lng | 1 + .../web/mail/form/mail_mailinglist.tform.php | 2 + interface/web/mail/form/mail_user.tform.php | 8 +- .../web/mail/lib/lang/ar_mail_mailinglist.lng | 2 + .../web/mail/lib/lang/bg_mail_mailinglist.lng | 2 + .../web/mail/lib/lang/br_mail_mailinglist.lng | 2 + interface/web/mail/lib/lang/cz.lng | 28 +- interface/web/mail/lib/lang/cz_mail_alias.lng | 14 +- .../web/mail/lib/lang/cz_mail_alias_list.lng | 2 +- .../web/mail/lib/lang/cz_mail_aliasdomain.lng | 2 +- .../web/mail/lib/lang/cz_mail_blacklist.lng | 2 +- .../mail/lib/lang/cz_mail_blacklist_list.lng | 4 +- .../web/mail/lib/lang/cz_mail_domain.lng | 6 +- .../mail/lib/lang/cz_mail_domain_catchall.lng | 10 +- .../web/mail/lib/lang/cz_mail_forward.lng | 8 +- .../mail/lib/lang/cz_mail_forward_list.lng | 2 +- interface/web/mail/lib/lang/cz_mail_get.lng | 4 +- .../web/mail/lib/lang/cz_mail_get_list.lng | 2 +- .../web/mail/lib/lang/cz_mail_mailinglist.lng | 24 +- .../lib/lang/cz_mail_mailinglist_list.lng | 6 +- .../mail/lib/lang/cz_mail_relay_recipient.lng | 2 +- .../web/mail/lib/lang/cz_mail_spamfilter.lng | 12 +- .../mail/lib/lang/cz_mail_spamfilter_list.lng | 4 +- .../web/mail/lib/lang/cz_mail_transport.lng | 2 +- interface/web/mail/lib/lang/cz_mail_user.lng | 2 +- .../lib/lang/cz_mail_user_filter_list.lng | 2 +- .../web/mail/lib/lang/cz_mail_whitelist.lng | 2 +- .../mail/lib/lang/cz_mail_whitelist_list.lng | 2 +- .../mail/lib/lang/cz_spamfilter_config.lng | 2 +- .../web/mail/lib/lang/cz_spamfilter_users.lng | 2 +- .../lib/lang/cz_spamfilter_users_list.lng | 6 +- .../mail/lib/lang/cz_spamfilter_whitelist.lng | 2 +- .../lib/lang/cz_spamfilter_whitelist_list.lng | 4 +- .../lib/lang/cz_user_quota_stats_list.lng | 10 +- interface/web/mail/lib/lang/de.lng | 1 + .../web/mail/lib/lang/de_mail_mailinglist.lng | 2 + .../web/mail/lib/lang/el_mail_mailinglist.lng | 2 + interface/web/mail/lib/lang/en.lng | 2 +- .../web/mail/lib/lang/en_mail_mailinglist.lng | 2 + interface/web/mail/lib/lang/es_mail_alias.lng | 4 +- .../web/mail/lib/lang/es_mail_aliasdomain.lng | 2 +- .../web/mail/lib/lang/es_mail_forward.lng | 2 +- interface/web/mail/lib/lang/es_mail_get.lng | 2 +- .../web/mail/lib/lang/es_mail_get_list.lng | 2 +- .../web/mail/lib/lang/es_mail_mailinglist.lng | 28 +- .../lib/lang/es_mail_mailinglist_list.lng | 6 +- interface/web/mail/lib/lang/es_mail_user.lng | 60 +-- .../web/mail/lib/lang/es_mail_user_filter.lng | 22 +- .../web/mail/lib/lang/es_mail_user_list.lng | 2 +- .../web/mail/lib/lang/fi_mail_mailinglist.lng | 2 + .../web/mail/lib/lang/fr_mail_mailinglist.lng | 2 + .../web/mail/lib/lang/hr_mail_mailinglist.lng | 2 + .../web/mail/lib/lang/hu_mail_mailinglist.lng | 2 + .../web/mail/lib/lang/id_mail_mailinglist.lng | 2 + .../web/mail/lib/lang/it_mail_mailinglist.lng | 2 + .../web/mail/lib/lang/ja_mail_mailinglist.lng | 2 + .../web/mail/lib/lang/nl_mail_mailinglist.lng | 2 + .../web/mail/lib/lang/pl_mail_mailinglist.lng | 2 + .../web/mail/lib/lang/pt_mail_mailinglist.lng | 2 + .../web/mail/lib/lang/ro_mail_mailinglist.lng | 2 + .../web/mail/lib/lang/ru_mail_mailinglist.lng | 2 + .../web/mail/lib/lang/se_mail_mailinglist.lng | 2 + .../web/mail/lib/lang/sk_mail_mailinglist.lng | 2 + .../web/mail/lib/lang/tr_mail_mailinglist.lng | 2 + interface/web/mail/lib/remote.conf.php | 1 + interface/web/mail/mail_domain_del.php | 2 +- interface/web/mail/mail_domain_edit.php | 23 +- interface/web/mail/mail_user_edit.php | 6 + .../templates/mail_domain_catchall_edit.htm | 2 +- interface/web/mailuser/lib/lang/cz.lng | 2 +- interface/web/mailuser/lib/lang/fr.lng | 16 +- interface/web/mailuser/lib/lang/fr_index.lng | 22 +- .../lib/lang/fr_mail_user_autoresponder.lng | 18 +- .../web/mailuser/lib/lang/fr_mail_user_cc.lng | 12 +- .../mailuser/lib/lang/fr_mail_user_filter.lng | 18 +- .../lib/lang/fr_mail_user_filter_list.lng | 14 +- .../lib/lang/fr_mail_user_password.lng | 10 +- .../lib/lang/fr_mail_user_spamfilter.lng | 12 +- interface/web/monitor/lib/lang/cz.lng | 14 +- interface/web/monitor/lib/lang/es.lng | 24 +- interface/web/sites/ajax_get_json.php | 20 + interface/web/sites/aps_do_operation.php | 6 +- .../web/sites/aps_installedpackages_list.php | 3 +- interface/web/sites/database_edit.php | 14 +- interface/web/sites/database_user_edit.php | 17 +- interface/web/sites/form/database.tform.php | 8 + .../web/sites/form/database_user.tform.php | 8 + interface/web/sites/form/ftp_user.tform.php | 8 + interface/web/sites/form/shell_user.tform.php | 8 + .../web/sites/form/webdav_user.tform.php | 8 + interface/web/sites/ftp_user_edit.php | 16 +- interface/web/sites/lib/lang/ar_database.lng | 1 + .../web/sites/lib/lang/ar_web_domain.lng | 2 + .../web/sites/lib/lang/ar_web_subdomain.lng | 2 + .../sites/lib/lang/ar_web_vhost_subdomain.lng | 5 + interface/web/sites/lib/lang/bg_database.lng | 1 + .../web/sites/lib/lang/bg_database_user.lng | 34 +- .../lib/lang/bg_database_user_admin_list.lng | 10 +- .../sites/lib/lang/bg_database_user_list.lng | 8 +- .../web/sites/lib/lang/bg_web_domain.lng | 2 + .../web/sites/lib/lang/bg_web_subdomain.lng | 2 + .../sites/lib/lang/bg_web_vhost_subdomain.lng | 204 ++++++----- .../lib/lang/bg_web_vhost_subdomain_list.lng | 14 +- interface/web/sites/lib/lang/br_aps.lng | 16 +- interface/web/sites/lib/lang/br_database.lng | 1 + .../web/sites/lib/lang/br_database_user.lng | 34 +- .../lib/lang/br_database_user_admin_list.lng | 10 +- .../sites/lib/lang/br_database_user_list.lng | 8 +- .../web/sites/lib/lang/br_web_domain.lng | 2 + .../web/sites/lib/lang/br_web_subdomain.lng | 2 + .../sites/lib/lang/br_web_vhost_subdomain.lng | 204 ++++++----- .../lib/lang/br_web_vhost_subdomain_list.lng | 14 +- interface/web/sites/lib/lang/cz.lng | 10 +- .../sites/lib/lang/cz_aps_instances_list.lng | 20 +- .../sites/lib/lang/cz_aps_packages_list.lng | 12 +- interface/web/sites/lib/lang/cz_cron_list.lng | 2 +- interface/web/sites/lib/lang/cz_database.lng | 1 + .../lib/lang/cz_user_quota_stats_list.lng | 2 +- .../web/sites/lib/lang/cz_web_aliasdomain.lng | 2 +- .../web/sites/lib/lang/cz_web_domain.lng | 2 + .../web/sites/lib/lang/cz_web_folder_user.lng | 4 +- .../lib/lang/cz_web_sites_stats_list.lng | 2 +- .../web/sites/lib/lang/cz_web_subdomain.lng | 2 + .../sites/lib/lang/cz_web_vhost_subdomain.lng | 11 +- .../web/sites/lib/lang/cz_webdav_user.lng | 4 +- interface/web/sites/lib/lang/el_database.lng | 1 + .../web/sites/lib/lang/el_web_domain.lng | 2 + .../web/sites/lib/lang/el_web_subdomain.lng | 2 + .../sites/lib/lang/el_web_vhost_subdomain.lng | 5 + interface/web/sites/lib/lang/en.lng | 1 + interface/web/sites/lib/lang/es.lng | 36 +- interface/web/sites/lib/lang/es_aps.lng | 16 +- interface/web/sites/lib/lang/es_cron_list.lng | 2 +- interface/web/sites/lib/lang/es_database.lng | 9 +- .../web/sites/lib/lang/es_database_user.lng | 34 +- .../lib/lang/es_database_user_admin_list.lng | 10 +- .../sites/lib/lang/es_database_user_list.lng | 8 +- interface/web/sites/lib/lang/es_ftp_user.lng | 6 +- .../web/sites/lib/lang/es_shell_user.lng | 8 +- .../web/sites/lib/lang/es_shell_user_list.lng | 12 +- .../lib/lang/es_web_aliasdomain_list.lng | 4 +- .../web/sites/lib/lang/es_web_domain.lng | 126 +++---- .../web/sites/lib/lang/es_web_folder.lng | 10 +- .../web/sites/lib/lang/es_web_folder_list.lng | 10 +- .../web/sites/lib/lang/es_web_folder_user.lng | 10 +- .../lib/lang/es_web_folder_user_list.lng | 8 +- .../web/sites/lib/lang/es_web_subdomain.lng | 6 +- .../sites/lib/lang/es_web_vhost_subdomain.lng | 204 ++++++----- .../lib/lang/es_web_vhost_subdomain_list.lng | 14 +- .../web/sites/lib/lang/es_webdav_user.lng | 26 +- .../sites/lib/lang/es_webdav_user_list.lng | 12 +- interface/web/sites/lib/lang/fi_aps.lng | 16 +- interface/web/sites/lib/lang/fi_database.lng | 1 + .../web/sites/lib/lang/fi_database_user.lng | 34 +- .../lib/lang/fi_database_user_admin_list.lng | 10 +- .../sites/lib/lang/fi_database_user_list.lng | 8 +- .../web/sites/lib/lang/fi_web_domain.lng | 2 + .../web/sites/lib/lang/fi_web_subdomain.lng | 2 + .../sites/lib/lang/fi_web_vhost_subdomain.lng | 204 ++++++----- .../lib/lang/fi_web_vhost_subdomain_list.lng | 14 +- interface/web/sites/lib/lang/fr.lng | 6 +- interface/web/sites/lib/lang/fr_aps.lng | 114 +++--- .../sites/lib/lang/fr_aps_instances_list.lng | 26 +- .../sites/lib/lang/fr_aps_packages_list.lng | 16 +- interface/web/sites/lib/lang/fr_database.lng | 5 + .../web/sites/lib/lang/fr_database_user.lng | 23 ++ .../lib/lang/fr_database_user_admin_list.lng | 6 + .../sites/lib/lang/fr_database_user_list.lng | 5 + .../web/sites/lib/lang/fr_web_aliasdomain.lng | 3 + .../web/sites/lib/lang/fr_web_backup_list.lng | 3 +- .../web/sites/lib/lang/fr_web_domain.lng | 7 + .../lib/lang/fr_web_sites_stats_list.lng | 1 + .../web/sites/lib/lang/fr_web_subdomain.lng | 3 + .../sites/lib/lang/fr_web_vhost_subdomain.lng | 119 ++++++ .../lib/lang/fr_web_vhost_subdomain_list.lng | 8 + interface/web/sites/lib/lang/hr_database.lng | 1 + .../web/sites/lib/lang/hr_web_domain.lng | 2 + .../web/sites/lib/lang/hr_web_subdomain.lng | 2 + .../sites/lib/lang/hr_web_vhost_subdomain.lng | 5 + interface/web/sites/lib/lang/hu_aps.lng | 16 +- interface/web/sites/lib/lang/hu_database.lng | 1 + .../web/sites/lib/lang/hu_database_user.lng | 34 +- .../lib/lang/hu_database_user_admin_list.lng | 10 +- .../sites/lib/lang/hu_database_user_list.lng | 8 +- .../web/sites/lib/lang/hu_web_domain.lng | 2 + .../web/sites/lib/lang/hu_web_subdomain.lng | 2 + .../sites/lib/lang/hu_web_vhost_subdomain.lng | 204 ++++++----- .../lib/lang/hu_web_vhost_subdomain_list.lng | 14 +- interface/web/sites/lib/lang/id_database.lng | 1 + .../web/sites/lib/lang/id_web_domain.lng | 2 + .../web/sites/lib/lang/id_web_subdomain.lng | 2 + .../sites/lib/lang/id_web_vhost_subdomain.lng | 5 + interface/web/sites/lib/lang/it_aps.lng | 16 +- interface/web/sites/lib/lang/it_database.lng | 1 + .../web/sites/lib/lang/it_database_user.lng | 34 +- .../lib/lang/it_database_user_admin_list.lng | 10 +- .../sites/lib/lang/it_database_user_list.lng | 8 +- .../web/sites/lib/lang/it_web_domain.lng | 2 + .../web/sites/lib/lang/it_web_subdomain.lng | 2 + .../sites/lib/lang/it_web_vhost_subdomain.lng | 204 ++++++----- .../lib/lang/it_web_vhost_subdomain_list.lng | 14 +- interface/web/sites/lib/lang/ja_aps.lng | 16 +- interface/web/sites/lib/lang/ja_database.lng | 1 + .../web/sites/lib/lang/ja_database_user.lng | 34 +- .../lib/lang/ja_database_user_admin_list.lng | 10 +- .../sites/lib/lang/ja_database_user_list.lng | 8 +- .../web/sites/lib/lang/ja_web_domain.lng | 2 + .../web/sites/lib/lang/ja_web_subdomain.lng | 2 + .../sites/lib/lang/ja_web_vhost_subdomain.lng | 204 ++++++----- .../lib/lang/ja_web_vhost_subdomain_list.lng | 14 +- interface/web/sites/lib/lang/nl_aps.lng | 16 +- interface/web/sites/lib/lang/nl_database.lng | 1 + .../web/sites/lib/lang/nl_database_user.lng | 34 +- .../lib/lang/nl_database_user_admin_list.lng | 10 +- .../sites/lib/lang/nl_database_user_list.lng | 8 +- .../web/sites/lib/lang/nl_web_domain.lng | 2 + .../web/sites/lib/lang/nl_web_subdomain.lng | 2 + .../sites/lib/lang/nl_web_vhost_subdomain.lng | 204 ++++++----- .../lib/lang/nl_web_vhost_subdomain_list.lng | 14 +- interface/web/sites/lib/lang/pl_aps.lng | 16 +- interface/web/sites/lib/lang/pl_database.lng | 1 + .../web/sites/lib/lang/pl_database_user.lng | 34 +- .../lib/lang/pl_database_user_admin_list.lng | 10 +- .../sites/lib/lang/pl_database_user_list.lng | 8 +- .../web/sites/lib/lang/pl_web_domain.lng | 2 + .../web/sites/lib/lang/pl_web_subdomain.lng | 2 + .../sites/lib/lang/pl_web_vhost_subdomain.lng | 204 ++++++----- .../lib/lang/pl_web_vhost_subdomain_list.lng | 14 +- interface/web/sites/lib/lang/pt_aps.lng | 16 +- interface/web/sites/lib/lang/pt_database.lng | 1 + .../web/sites/lib/lang/pt_database_user.lng | 34 +- .../lib/lang/pt_database_user_admin_list.lng | 10 +- .../sites/lib/lang/pt_database_user_list.lng | 8 +- .../web/sites/lib/lang/pt_web_domain.lng | 2 + .../web/sites/lib/lang/pt_web_subdomain.lng | 2 + .../sites/lib/lang/pt_web_vhost_subdomain.lng | 204 ++++++----- .../lib/lang/pt_web_vhost_subdomain_list.lng | 14 +- interface/web/sites/lib/lang/ro_aps.lng | 16 +- interface/web/sites/lib/lang/ro_database.lng | 1 + .../web/sites/lib/lang/ro_database_user.lng | 34 +- .../lib/lang/ro_database_user_admin_list.lng | 10 +- .../sites/lib/lang/ro_database_user_list.lng | 8 +- .../web/sites/lib/lang/ro_web_domain.lng | 2 + .../web/sites/lib/lang/ro_web_subdomain.lng | 2 + .../sites/lib/lang/ro_web_vhost_subdomain.lng | 204 ++++++----- .../lib/lang/ro_web_vhost_subdomain_list.lng | 14 +- interface/web/sites/lib/lang/ru_aps.lng | 16 +- interface/web/sites/lib/lang/ru_database.lng | 1 + .../web/sites/lib/lang/ru_database_user.lng | 34 +- .../lib/lang/ru_database_user_admin_list.lng | 10 +- .../sites/lib/lang/ru_database_user_list.lng | 8 +- .../web/sites/lib/lang/ru_web_domain.lng | 2 + .../web/sites/lib/lang/ru_web_subdomain.lng | 2 + .../sites/lib/lang/ru_web_vhost_subdomain.lng | 204 ++++++----- .../lib/lang/ru_web_vhost_subdomain_list.lng | 14 +- interface/web/sites/lib/lang/se_aps.lng | 16 +- interface/web/sites/lib/lang/se_database.lng | 1 + .../web/sites/lib/lang/se_database_user.lng | 34 +- .../lib/lang/se_database_user_admin_list.lng | 10 +- .../sites/lib/lang/se_database_user_list.lng | 8 +- .../web/sites/lib/lang/se_web_domain.lng | 2 + .../web/sites/lib/lang/se_web_subdomain.lng | 2 + .../sites/lib/lang/se_web_vhost_subdomain.lng | 204 ++++++----- .../lib/lang/se_web_vhost_subdomain_list.lng | 14 +- interface/web/sites/lib/lang/sk_aps.lng | 16 +- interface/web/sites/lib/lang/sk_database.lng | 1 + .../web/sites/lib/lang/sk_database_user.lng | 34 +- .../lib/lang/sk_database_user_admin_list.lng | 10 +- .../sites/lib/lang/sk_database_user_list.lng | 8 +- .../web/sites/lib/lang/sk_web_domain.lng | 2 + .../web/sites/lib/lang/sk_web_subdomain.lng | 2 + .../sites/lib/lang/sk_web_vhost_subdomain.lng | 204 ++++++----- .../lib/lang/sk_web_vhost_subdomain_list.lng | 14 +- interface/web/sites/lib/lang/tr_database.lng | 1 + .../web/sites/lib/lang/tr_web_domain.lng | 2 + .../web/sites/lib/lang/tr_web_subdomain.lng | 2 + .../sites/lib/lang/tr_web_vhost_subdomain.lng | 5 + .../sites/list/aps_installedpackages.list.php | 14 +- interface/web/sites/shell_user_edit.php | 14 +- .../sites/templates/aps_instances_list.htm | 8 +- .../web/sites/templates/ftp_user_advanced.htm | 4 +- .../web/sites/templates/web_domain_edit.htm | 14 +- interface/web/sites/web_aliasdomain_edit.php | 23 +- interface/web/sites/web_domain_edit.php | 35 +- interface/web/sites/web_subdomain_edit.php | 17 +- .../web/sites/web_vhost_subdomain_edit.php | 23 +- interface/web/sites/webdav_user_edit.php | 14 +- interface/web/tools/lib/lang/es.lng | 8 +- .../tools/lib/lang/es_import_ispconfig.lng | 42 +-- interface/web/tools/lib/lang/es_resync.lng | 16 +- interface/web/tools/lib/lang/fr_index.lng | 2 +- interface/web/tools/lib/lang/fr_interface.lng | 12 +- .../web/tools/lib/lang/fr_tpl_default.lng | 12 +- .../web/tools/lib/menu.d/import.menu.php | 3 +- .../web/tools/templates/dns_import_tupa.htm | 9 +- interface/web/vm/lib/lang/cz.lng | 8 +- interface/web/vm/lib/lang/cz_openvz_ip.lng | 14 +- .../vm/lib/lang/cz_openvz_ostemplate_list.lng | 6 +- .../web/vm/lib/lang/cz_openvz_template.lng | 14 +- interface/web/vm/lib/lang/cz_openvz_vm.lng | 58 +-- .../web/vm/lib/lang/cz_openvz_vm_list.lng | 12 +- interface/web/vm/lib/lang/es.lng | 8 +- .../web/vm/lib/lang/es_openvz_action.lng | 26 +- interface/web/vm/lib/lang/es_openvz_ip.lng | 14 +- .../web/vm/lib/lang/es_openvz_ip_list.lng | 6 +- .../web/vm/lib/lang/es_openvz_ostemplate.lng | 18 +- .../vm/lib/lang/es_openvz_ostemplate_list.lng | 8 +- .../web/vm/lib/lang/es_openvz_template.lng | 86 ++--- .../vm/lib/lang/es_openvz_template_list.lng | 4 +- interface/web/vm/lib/lang/es_openvz_vm.lng | 68 ++-- .../web/vm/lib/lang/es_openvz_vm_list.lng | 12 +- remoting_client/API-docs/navigation.html | 4 + .../API-docs/sites_database_add.html | 5 +- .../API-docs/sites_database_user_add.html | 31 ++ .../API-docs/sites_database_user_delete.html | 29 ++ .../API-docs/sites_database_user_get.html | 29 ++ .../API-docs/sites_database_user_update.html | 31 ++ .../examples/sites_database_add.php | 6 +- .../examples/sites_database_user_add.php | 39 ++ .../examples/sites_database_user_delete.php | 36 ++ .../examples/sites_database_user_get.php | 34 ++ .../examples/sites_database_user_update.php | 42 +++ ...inx_reverse_proxy_plugin.vhost.conf.master | 125 +++++++ server/conf/vhost.conf.master | 2 +- server/cron_daily.php | 10 +- server/lib/classes/aps_installer.inc.php | 3 +- .../plugins-available/apache2_plugin.inc.php | 30 +- server/plugins-available/aps_plugin.inc.php | 4 + .../mysql_clientdb_plugin.inc.php | 2 + server/plugins-available/nginx_plugin.inc.php | 30 +- 642 files changed, 5966 insertions(+), 3895 deletions(-) create mode 100644 install/sql/incremental/upd_0046.sql create mode 100644 interface/web/admin/lib/lang/fr_directive_snippets.lng create mode 100644 interface/web/admin/lib/lang/fr_directive_snippets_list.lng create mode 100644 interface/web/sites/lib/lang/fr_database_user.lng create mode 100644 interface/web/sites/lib/lang/fr_database_user_admin_list.lng create mode 100644 interface/web/sites/lib/lang/fr_database_user_list.lng create mode 100644 interface/web/sites/lib/lang/fr_web_aliasdomain.lng create mode 100644 interface/web/sites/lib/lang/fr_web_vhost_subdomain.lng create mode 100644 interface/web/sites/lib/lang/fr_web_vhost_subdomain_list.lng create mode 100644 remoting_client/API-docs/sites_database_user_add.html create mode 100644 remoting_client/API-docs/sites_database_user_delete.html create mode 100644 remoting_client/API-docs/sites_database_user_get.html create mode 100644 remoting_client/API-docs/sites_database_user_update.html create mode 100644 remoting_client/examples/sites_database_user_add.php create mode 100644 remoting_client/examples/sites_database_user_delete.php create mode 100644 remoting_client/examples/sites_database_user_get.php create mode 100644 remoting_client/examples/sites_database_user_update.php create mode 100644 server/conf/nginx_reverse_proxy_plugin.vhost.conf.master diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php index 964d17bfd6..a4bc4d5bc8 100644 --- a/install/dist/lib/fedora.lib.php +++ b/install/dist/lib/fedora.lib.php @@ -941,6 +941,11 @@ class installer_dist extends installer_base { } else { $content = str_replace('{ssl_comment}', '#', $content); } + if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key') && is_file($install_dir.'/interface/ssl/ispserver.bundle')) { + $content = str_replace('{ssl_bundle_comment}', '', $content); + } else { + $content = str_replace('{ssl_bundle_comment}', '#', $content); + } wf("$vhost_conf_dir/ispconfig.vhost", $content); @@ -972,11 +977,11 @@ class installer_dist extends installer_base { $content = str_replace('{vhost_port}', $conf['nginx']['vhost_port'], $content); if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key')) { - $content = str_replace('{ssl_on}', ' ssl', $content); + $content = str_replace('{ssl_on}', ' on', $content); $content = str_replace('{ssl_comment}', '', $content); $content = str_replace('{fastcgi_ssl}', 'on', $content); } else { - $content = str_replace('{ssl_on}', '', $content); + $content = str_replace('{ssl_on}', ' off', $content); $content = str_replace('{ssl_comment}', '#', $content); $content = str_replace('{fastcgi_ssl}', 'off', $content); } diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php index db2cf6e1a7..ea03589e13 100644 --- a/install/dist/lib/gentoo.lib.php +++ b/install/dist/lib/gentoo.lib.php @@ -929,6 +929,11 @@ class installer extends installer_base } else { $content = str_replace('{ssl_comment}', '#', $content); } + if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key') && is_file($install_dir.'/interface/ssl/ispserver.bundle')) { + $content = str_replace('{ssl_bundle_comment}', '', $content); + } else { + $content = str_replace('{ssl_bundle_comment}', '#', $content); + } $vhost_path = $conf['apache']['vhost_conf_dir'].'/ispconfig.vhost'; $this->write_config_file($vhost_path, $content); @@ -954,11 +959,11 @@ class installer extends installer_base $content = str_replace('{vhost_port}', $conf['nginx']['vhost_port'], $content); if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key')) { - $content = str_replace('{ssl_on}', ' ssl', $content); + $content = str_replace('{ssl_on}', ' on', $content); $content = str_replace('{ssl_comment}', '', $content); $content = str_replace('{fastcgi_ssl}', 'on', $content); } else { - $content = str_replace('{ssl_on}', '', $content); + $content = str_replace('{ssl_on}', ' off', $content); $content = str_replace('{ssl_comment}', '#', $content); $content = str_replace('{fastcgi_ssl}', 'off', $content); } diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php index 97a2a6f729..32c1e79f4a 100644 --- a/install/dist/lib/opensuse.lib.php +++ b/install/dist/lib/opensuse.lib.php @@ -977,6 +977,11 @@ class installer_dist extends installer_base { } else { $content = str_replace('{ssl_comment}', '#', $content); } + if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key') && is_file($install_dir.'/interface/ssl/ispserver.bundle')) { + $content = str_replace('{ssl_bundle_comment}', '', $content); + } else { + $content = str_replace('{ssl_bundle_comment}', '#', $content); + } $content = str_replace('/var/www/', '/srv/www/', $content); @@ -1015,11 +1020,11 @@ class installer_dist extends installer_base { $content = str_replace('{vhost_port}', $conf['nginx']['vhost_port'], $content); if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key')) { - $content = str_replace('{ssl_on}', ' ssl', $content); + $content = str_replace('{ssl_on}', ' on', $content); $content = str_replace('{ssl_comment}', '', $content); $content = str_replace('{fastcgi_ssl}', 'on', $content); } else { - $content = str_replace('{ssl_on}', '', $content); + $content = str_replace('{ssl_on}', ' off', $content); $content = str_replace('{ssl_comment}', '#', $content); $content = str_replace('{fastcgi_ssl}', 'off', $content); } diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 65cafa915d..815985d303 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -1885,6 +1885,11 @@ class installer_base { } else { $content = str_replace('{ssl_comment}', '#', $content); } + if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key') && is_file($install_dir.'/interface/ssl/ispserver.bundle')) { + $content = str_replace('{ssl_bundle_comment}', '', $content); + } else { + $content = str_replace('{ssl_bundle_comment}', '#', $content); + } wf($vhost_conf_dir.'/ispconfig.vhost', $content); diff --git a/install/sql/incremental/upd_0046.sql b/install/sql/incremental/upd_0046.sql new file mode 100644 index 0000000000..2addef6c4f --- /dev/null +++ b/install/sql/incremental/upd_0046.sql @@ -0,0 +1,11 @@ + +ALTER TABLE `web_database` ADD `database_name_prefix` VARCHAR( 50 ) NOT NULL AFTER `database_name`; +UPDATE `web_database` SET `database_name_prefix` = '#' WHERE 1; +ALTER TABLE `web_database_user` ADD `database_user_prefix` VARCHAR( 50 ) NOT NULL AFTER `database_user`; +UPDATE `web_database_user` SET `database_user_prefix` = '#' WHERE 1; +ALTER TABLE `ftp_user` ADD `username_prefix` VARCHAR( 50 ) NOT NULL AFTER `username`; +UPDATE `ftp_user` SET `username_prefix` = '#' WHERE 1; +ALTER TABLE `shell_user` ADD `username_prefix` VARCHAR( 50 ) NOT NULL AFTER `username`; +UPDATE `shell_user` SET `username_prefix` = '#' WHERE 1; +ALTER TABLE `webdav_user` ADD `username_prefix` VARCHAR( 50 ) NOT NULL AFTER `username`; +UPDATE `webdav_user` SET `username_prefix` = '#' WHERE 1; \ No newline at end of file diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index 64cbb3984b..ce304b38d8 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -526,6 +526,7 @@ CREATE TABLE `ftp_user` ( `server_id` int(11) unsigned NOT NULL default '0', `parent_domain_id` int(11) unsigned NOT NULL default '0', `username` varchar(64) default NULL, + `username_prefix` varchar(50) NOT NULL default '', `password` varchar(64) default NULL, `quota_size` bigint(20) NOT NULL default '-1', `active` enum('n','y') NOT NULL default 'y', @@ -1179,6 +1180,7 @@ CREATE TABLE `shell_user` ( `server_id` int(11) unsigned NOT NULL default '0', `parent_domain_id` int(11) unsigned NOT NULL default '0', `username` varchar(64) default NULL, + `username_prefix` varchar(50) NOT NULL default '', `password` varchar(64) default NULL, `quota_size` bigint(20) NOT NULL default '-1', `active` enum('n','y') NOT NULL default 'y', @@ -1608,6 +1610,7 @@ CREATE TABLE `webdav_user` ( `server_id` int(11) unsigned NOT NULL DEFAULT '0', `parent_domain_id` int(11) unsigned NOT NULL DEFAULT '0', `username` varchar(64) DEFAULT NULL, + `username_prefix` varchar(50) NOT NULL default '', `password` varchar(64) DEFAULT NULL, `active` enum('n','y') NOT NULL DEFAULT 'y', `dir` varchar(255) DEFAULT NULL, @@ -1648,6 +1651,7 @@ CREATE TABLE `web_database` ( `parent_domain_id` int(11) unsigned NOT NULL DEFAULT '0', `type` varchar(16) NOT NULL DEFAULT 'y', `database_name` varchar(64) DEFAULT NULL, + `database_name_prefix` varchar(50) NOT NULL default '', `database_user_id` int(11) unsigned DEFAULT NULL, `database_ro_user_id` int(11) unsigned DEFAULT NULL, `database_charset` varchar(64) DEFAULT NULL, @@ -1676,6 +1680,7 @@ CREATE TABLE IF NOT EXISTS `web_database_user` ( `sys_perm_other` varchar(5) DEFAULT NULL, `server_id` int(11) UNSIGNED NOT NULL DEFAULT '0', `database_user` varchar(64) DEFAULT NULL, + `database_user_prefix` varchar(50) NOT NULL default '', `database_password` varchar(64) DEFAULT NULL, PRIMARY KEY (`database_user_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master index 4d59dfead4..0385427a6d 100644 --- a/install/tpl/apache_ispconfig.vhost.master +++ b/install/tpl/apache_ispconfig.vhost.master @@ -25,6 +25,7 @@ NameVirtualHost *:{vhost_port} Order allow,deny Allow from all + IPCCommTimeout 7200 # @@ -52,6 +53,7 @@ NameVirtualHost *:{vhost_port} {ssl_comment}SSLEngine On {ssl_comment}SSLCertificateFile /usr/local/ispconfig/interface/ssl/ispserver.crt {ssl_comment}SSLCertificateKeyFile /usr/local/ispconfig/interface/ssl/ispserver.key + {ssl_bundle_comment}SSLCACertificateFile /usr/local/ispconfig/interface/ssl/ispserver.bundle diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master index 9b55ef78a9..4dae4f67fc 100644 --- a/install/tpl/server.ini.master +++ b/install/tpl/server.ini.master @@ -44,7 +44,6 @@ website_basedir=/var/www website_path=/var/www/clients/client[client_id]/web[website_id] website_symlinks=/var/www/[website_domain]/:/var/www/clients/client[client_id]/[website_domain]/ website_symlinks_rel=n -vhost_rewrite_v6=n vhost_conf_dir=/etc/apache2/sites-available vhost_conf_enabled_dir=/etc/apache2/sites-enabled nginx_vhost_conf_dir=/etc/nginx/sites-available diff --git a/install/tpl/system.ini.master b/install/tpl/system.ini.master index f72bf4d44d..599369a189 100644 --- a/install/tpl/system.ini.master +++ b/install/tpl/system.ini.master @@ -22,6 +22,7 @@ webdavuser_prefix=[CLIENTNAME] dblist_phpmyadmin_link=y phpmyadmin_url=/phpmyadmin webftp_url= +client_username_web_check_disabled=n [tools] @@ -34,4 +35,8 @@ dashboard_atom_url_admin=http://www.ispconfig.org/atom dashboard_atom_url_reseller=http://www.ispconfig.org/atom dashboard_atom_url_client=http://www.ispconfig.org/atom monitor_key= +tab_change_discard=n +tab_change_warning=n +use_loadindicator=y +use_combobox=y maintenance_mode=n diff --git a/interface/lib/classes/aps_guicontroller.inc.php b/interface/lib/classes/aps_guicontroller.inc.php index c5feec4742..0f1fd10069 100644 --- a/interface/lib/classes/aps_guicontroller.inc.php +++ b/interface/lib/classes/aps_guicontroller.inc.php @@ -285,7 +285,7 @@ class ApsGUIController extends ApsBase } //* Find a free db username for the app for($n = 1; $n <= 1000; $n++) { - $mysql_db_user = ($dbname_prefix != '' ? $dbname_prefix.'aps'.$n : uniqid('aps')); + $mysql_db_user = ($dbuser_prefix != '' ? $dbuser_prefix.'aps'.$n : uniqid('aps')); $tmp = $app->db->queryOneRecord("SELECT count(database_user_id) as number FROM web_database_user WHERE database_user = '".$app->db->quote($mysql_db_user)."'"); if($tmp['number'] == 0) break; } @@ -293,13 +293,13 @@ class ApsGUIController extends ApsBase $mysql_db_password = $settings['main_database_password']; //* Create the mysql database user - $insert_data = "(`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_id`, `database_user`, `database_password`) - VALUES( ".$websrv['sys_userid'].", ".$websrv['sys_groupid'].", 'riud', '".$websrv['sys_perm_group']."', '', 0, '$mysql_db_user', PASSWORD('$mysql_db_password'))"; + $insert_data = "(`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_id`, `database_user`, `database_user_prefix`, `database_password`) + VALUES( ".$websrv['sys_userid'].", ".$websrv['sys_groupid'].", 'riud', '".$websrv['sys_perm_group']."', '', 0, '$mysql_db_user', '".$app->db->quote($dbuser_prefix) . "', PASSWORD('$mysql_db_password'))"; $mysql_db_user_id = $app->db->datalogInsert('web_database_user', $insert_data, 'database_user_id'); //* Create the mysql database - $insert_data = "(`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_id`, `parent_domain_id`, `type`, `database_name`, `database_user_id`, `database_ro_user_id`, `database_charset`, `remote_access`, `remote_ips`, `backup_copies`, `active`, `backup_interval`) - VALUES( ".$websrv['sys_userid'].", ".$websrv['sys_groupid'].", 'riud', '".$websrv['sys_perm_group']."', '', $mysql_db_server_id, ".$websrv['domain_id'].", 'mysql', '$mysql_db_name', '$mysql_db_user_id', 0, '', '$mysql_db_remote_access', '$mysql_db_remote_ips', ".$websrv['backup_copies'].", 'y', '".$websrv['backup_interval']."')"; + $insert_data = "(`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_id`, `parent_domain_id`, `type`, `database_name`, `database_name_prefix`, `database_user_id`, `database_ro_user_id`, `database_charset`, `remote_access`, `remote_ips`, `backup_copies`, `active`, `backup_interval`) + VALUES( ".$websrv['sys_userid'].", ".$websrv['sys_groupid'].", 'riud', '".$websrv['sys_perm_group']."', '', $mysql_db_server_id, ".$websrv['domain_id'].", 'mysql', '$mysql_db_name', '" . $app->db->quote($dbname_prefix) . "', '$mysql_db_user_id', 0, '', '$mysql_db_remote_access', '$mysql_db_remote_ips', ".$websrv['backup_copies'].", 'y', '".$websrv['backup_interval']."')"; $app->db->datalogInsert('web_database', $insert_data, 'database_id'); //* Add db details to package settings @@ -542,7 +542,7 @@ class ApsGUIController extends ApsBase // is not empty for further validation if(!empty($doc_root)) { - $used_path = $docroot['document_root']; + $used_path = $doc_root['document_root']; if(substr($used_path, -1) != '/') $used_path .= '/'; $location_for_domain = $app->db->queryOneRecord("SELECT value @@ -550,7 +550,7 @@ class ApsGUIController extends ApsBase AND instance_id = '".$app->db->quote($instance_domains[$i]['instance_id'])."';"); // The location might be empty but the DB return must not be false! - if($location_for_domain) $used_path .= $location_for_domain['value']; + if($location_for_domain) $used_path .= $location_for_domain['value']; if($new_path == $used_path) { diff --git a/interface/lib/classes/functions.inc.php b/interface/lib/classes/functions.inc.php index 0801c1c370..a79942d630 100644 --- a/interface/lib/classes/functions.inc.php +++ b/interface/lib/classes/functions.inc.php @@ -303,7 +303,7 @@ class functions { } public function intval($string, $force_numeric = false) { - if(intval($string) == 2147483647) { + if(intval($string) == 2147483647 || ($string > 0 && intval($string) < 0)) { if($force_numeric == true) return floatval($string); elseif(preg_match('/^([-]?)[0]*([1-9][0-9]*)([^0-9].*)*$/', $string, $match)) return $match[1].$match[2]; else return 0; diff --git a/interface/lib/classes/listform_actions.inc.php b/interface/lib/classes/listform_actions.inc.php index 9c3e4b3dd6..ed689ebda7 100644 --- a/interface/lib/classes/listform_actions.inc.php +++ b/interface/lib/classes/listform_actions.inc.php @@ -142,7 +142,8 @@ class listform_actions { if($_SESSION['s']['user']['typ'] == "admin") { $sql_where = ''; } else { - $sql_where = $app->tform->getAuthSQL('r').' and'; + $sql_where = $app->tform->getAuthSQL('r', $app->listform->listDef['table']).' and'; + //$sql_where = $app->tform->getAuthSQL('r').' and'; } } if($this->SQLExtWhere != '') { diff --git a/interface/lib/classes/remoting.inc.php b/interface/lib/classes/remoting.inc.php index 0b2877e57d..ed7c3ed764 100644 --- a/interface/lib/classes/remoting.inc.php +++ b/interface/lib/classes/remoting.inc.php @@ -244,6 +244,55 @@ class remoting { return $affected_rows; } + //* Get alias details + public function mail_aliasdomain_get($session_id, $primary_id) + { + global $app; + + if(!$this->checkPerm($session_id, 'mail_aliasdomain_get')) { + $this->server->fault('permission_denied', 'You do not have the permissions to access this function.'); + return false; + } + $app->uses('remoting_lib'); + $app->remoting_lib->loadFormDef('../mail/form/mail_aliasdomain.tform.php'); + return $app->remoting_lib->getDataRecord($primary_id); + } + + //* aliasy email + public function mail_aliasdomain_add($session_id, $client_id, $params) + { + if (!$this->checkPerm($session_id, 'mail_aliasdomain_add')) + { + $this->server->fault('permission_denied','You do not have the permissions to access this function.'); + return false; + } + $affected_rows = $this->insertQuery('../mail/form/mail_aliasdomain.tform.php', $client_id, $params); + return $affected_rows; + } + + + public function mail_aliasdomain_update($session_id, $client_id, $primary_id, $params) + { + if (!$this->checkPerm($session_id, 'mail_aliasdomain_update')) + { + $this->server->fault('permission_denied','You do not have the permissions to access this function.'); + return false; + } + $affected_rows = $this->updateQuery('../mail/form/mail_aliasdomain.tform.php', $client_id, $primary_id, $params); + return $affected_rows; + } + + public function mail_aliasdomain_delete($session_id, $primary_id) + { + if (!$this->checkPerm($session_id, 'mail_aliasdomain_delete')) + { + $this->server->fault('permission_denied','You do not have the permissions to access this function.'); + return false; + } + $affected_rows = $this->deleteQuery('../mail/form/mail_aliasdomain.tform.php', $primary_id); + return $affected_rows; + } + //* Get mail mailinglist details public function mail_mailinglist_get($session_id, $primary_id) { @@ -432,11 +481,21 @@ class remoting { //* aliasy email public function mail_alias_add($session_id, $client_id, $params) { + global $app; + if (!$this->checkPerm($session_id, 'mail_alias_add')) { $this->server->fault('permission_denied','You do not have the permissions to access this function.'); return false; } + + //* Check if there is no active mailbox with this address + $tmp = $app->db->queryOneRecord("SELECT count(mailuser_id) as number FROM mail_user WHERE postfix = 'y' AND email = '".$app->db->quote($params["source"])."'"); + if($tmp['number'] > 0) { + $this->server->fault('duplicate','There is already a mailbox with this email address.'); + } + unset($tmp); + $affected_rows = $this->insertQuery('../mail/form/mail_alias.tform.php', $client_id, $params); return $affected_rows; } @@ -444,13 +503,23 @@ class remoting { public function mail_alias_update($session_id, $client_id, $primary_id, $params) { - if (!$this->checkPerm($session_id, 'mail_alias_update')) - { - $this->server->fault('permission_denied','You do not have the permissions to access this function.'); - return false; - } - $affected_rows = $this->updateQuery('../mail/form/mail_alias.tform.php', $client_id, $primary_id, $params); - return $affected_rows; + global $app; + + if (!$this->checkPerm($session_id, 'mail_alias_update')) + { + $this->server->fault('permission_denied','You do not have the permissions to access this function.'); + return false; + } + + //* Check if there is no active mailbox with this address + $tmp = $app->db->queryOneRecord("SELECT count(mailuser_id) as number FROM mail_user WHERE postfix = 'y' AND email = '".$app->db->quote($params["source"])."'"); + if($tmp['number'] > 0) { + $this->server->fault('duplicate','There is already a mailbox with this email address.'); + } + unset($tmp); + + $affected_rows = $this->updateQuery('../mail/form/mail_alias.tform.php', $client_id, $primary_id, $params); + return $affected_rows; } public function mail_alias_delete($session_id, $primary_id) @@ -1363,23 +1432,56 @@ class remoting { //* Update a record public function sites_database_user_update($session_id, $client_id, $primary_id, $params) { + global $app; + if(!$this->checkPerm($session_id, 'sites_database_user_update')) { $this->server->fault('permission_denied', 'You do not have the permissions to access this function.'); return false; } + $app->uses('remoting_lib'); + $app->remoting_lib->loadFormDef('../sites/form/database_user.tform.php'); + $old_rec = $app->remoting_lib->getDataRecord($primary_id); + + $result = $this->updateQuery('../sites/form/database_user.tform.php', $client_id, $primary_id, $params); + + $new_rec = $app->remoting_lib->getDataRecord($primary_id); + + $records = $app->db->queryAllRecords("SELECT DISTINCT server_id FROM web_database WHERE database_user_id = '".$app->functions->intval($primary_id)."' UNION SELECT DISTINCT server_id FROM web_database WHERE database_ro_user_id = '".$app->functions->intval($primary_id)."'"); + foreach($records as $rec) { + $tmp_rec = $new_rec; + $tmp_rec['server_id'] = $rec['server_id']; + $app->remoting_lib->datalogSave('UPDATE', $primary_id, $old_rec, $tmp_rec); + } + unset($new_rec); + unset($old_rec); + unset($records); - return $this->updateQuery('../sites/form/database_user.tform.php', $client_id, $primary_id, $params); + return $result; } //* Delete a record public function sites_database_user_delete($session_id, $primary_id) { + global $app; + if(!$this->checkPerm($session_id, 'sites_database_user_delete')) { $this->server->fault('permission_denied', 'You do not have the permissions to access this function.'); return false; } + $app->db->datalogDelete('web_database_user', 'database_user_id', $primary_id); $affected_rows = $this->deleteQuery('../sites/form/database_user.tform.php',$primary_id); + + $records = $app->db->queryAllRecords("SELECT database_id FROM web_database WHERE database_user_id = '".$app->functions->intval($primary_id)."'"); + foreach($records as $rec) { + $app->db->datalogUpdate('web_database','database_user_id=NULL','database_id', $rec['database_id']); + + } + $records = $app->db->queryAllRecords("SELECT database_id FROM web_database WHERE database_ro_user_id = '".$app->functions->intval($primary_id)."'"); + foreach($records as $rec) { + $app->db->datalogUpdate('web_database','database_ro_user_id=NULL','database_id', $rec['database_id']); + } + return $affected_rows; } diff --git a/interface/lib/classes/remoting_lib.inc.php b/interface/lib/classes/remoting_lib.inc.php index 9726b75a0f..617250caee 100644 --- a/interface/lib/classes/remoting_lib.inc.php +++ b/interface/lib/classes/remoting_lib.inc.php @@ -114,6 +114,7 @@ class remoting_lib { var $sys_default_group; var $sys_groups; var $client_id; + var $dataRecord; //* Load the form definition from file. @@ -390,6 +391,7 @@ class remoting_lib { if($dbencode == true) $new_record[$key] = $app->db->quote($new_record[$key]); } } + if(isset($record['_ispconfig_pw_crypted'])) $new_record['_ispconfig_pw_crypted'] = $record['_ispconfig_pw_crypted']; // this one is not in form definitions! return $new_record; } @@ -655,6 +657,7 @@ class remoting_lib { $this->action = $action; $this->primary_id = $primary_id; + $this->dataRecord = $record; $record = $this->encode($record,true); $sql_insert_key = ''; @@ -845,7 +848,7 @@ class remoting_lib { $language = $app->db->quote($params["language"]); $groupid = $app->db->datalogInsert('sys_group', "(name,description,client_id) VALUES ('$username','','$insert_id')", 'groupid'); $groups = $groupid; - $password = $app->auth->crypt_password(stripslashes($password)); + if(!isset($params['_ispconfig_pw_crypted']) || $params['_ispconfig_pw_crypted'] != 1) $password = $app->auth->crypt_password(stripslashes($password)); $sql1 = "INSERT INTO sys_user (username,passwort,modules,startmodule,app_theme,typ,active,language,groups,default_group,client_id) VALUES ('$username','$password','$modules','$startmodule','$usertheme','$type','$active','$language',$groups,$groupid,$insert_id)"; $app->db->query($sql1); @@ -856,7 +859,8 @@ class remoting_lib { $username = $app->db->quote($params["username"]); $clear_password = $app->db->quote($params["password"]); $client_id = $app->functions->intval($client_id); - $password = $app->auth->crypt_password(stripslashes($clear_password)); + if(!isset($params['_ispconfig_pw_crypted']) || $params['_ispconfig_pw_crypted'] != 1) $password = $app->auth->crypt_password(stripslashes($clear_password)); + else $password = $clear_password; if ($clear_password) $pwstring = ", passwort = '$password'"; else $pwstring ="" ; $sql = "UPDATE sys_user set username = '$username' $pwstring WHERE client_id = $client_id"; $app->db->query($sql); diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php index b0b727ca28..c51e3e16f1 100644 --- a/interface/lib/classes/tform.inc.php +++ b/interface/lib/classes/tform.inc.php @@ -687,7 +687,7 @@ class tform { } break; case 'INTEGER': - $new_record[$key] = (isset($record[$key]))?$app->functions->intval($record[$key]):0; + $new_record[$key] = (isset($record[$key]))?$app->functions->intval($record[$key]):0; //if($new_record[$key] != $record[$key]) $new_record[$key] = $field['default']; //if($key == 'refresh') die($record[$key]); break; @@ -856,7 +856,7 @@ class tform { } break; case 'ISINT': - if(function_exists('filter_var')) { + if(function_exists('filter_var') && $field_value < 2147483647) { if($field_value != '' && filter_var($field_value, FILTER_VALIDATE_INT) === false) { $errmsg = $validator['errmsg']; if(isset($this->wordbook[$errmsg])) { diff --git a/interface/lib/classes/tools_sites.inc.php b/interface/lib/classes/tools_sites.inc.php index b4407541ac..deb57f5e33 100644 --- a/interface/lib/classes/tools_sites.inc.php +++ b/interface/lib/classes/tools_sites.inc.php @@ -54,7 +54,29 @@ class tools_sites { } return $name; } - + + function removePrefix($name, $currentPrefix, $globalPrefix) { + if($name == "") return ""; + + if($currentPrefix === '') return $name; // empty prefix, do not change name + if($currentPrefix === '#') $currentPrefix = $globalPrefix; // entry has no prefix set, maybe it was created before this function was introduced + + if($currentPrefix === '') return $name; // no current prefix and global prefix is empty -> nothing to remove here. + + return preg_replace('/^' . preg_quote($currentPrefix, '/') . '/', '', $name); // return name without prefix + } + + function getPrefix($currentPrefix, $userPrefix, $adminPrefix = false) { + global $app; + + if($currentPrefix !== '#') return $currentPrefix; // return the currently set prefix for this entry (# = no prefix set yet) + + if($adminPrefix === false) $adminPrefix = $userPrefix; + + if($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) return $adminPrefix; + else return $userPrefix; + } + function getClientName($dataRecord) { global $app, $conf; if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) { @@ -121,6 +143,33 @@ class tools_sites { } return $res; } + + function getDomainModuleDomains() { + global $app; + + $sql = "SELECT domain_id, domain FROM domain WHERE"; + if ($_SESSION["s"]["user"]["typ"] == 'admin') { + $sql .= " 1"; + } else { + $groups = ( $_SESSION["s"]["user"]["groups"] ) ? $_SESSION["s"]["user"]["groups"] : 0; + $sql .= " sys_groupid IN (".$groups.")"; + } + $sql .= " ORDER BY domain"; + return $app->db->queryAllRecords($sql); + } + + function checkDomainModuleDomain($domain_id) { + global $app; + + $sql = "SELECT domain_id, domain FROM domain WHERE domain_id = " . $app->functions->intval($domain_id); + if ($_SESSION["s"]["user"]["typ"] != 'admin') { + $groups = ( $_SESSION["s"]["user"]["groups"] ) ? $_SESSION["s"]["user"]["groups"] : 0; + $sql .= " AND sys_groupid IN (".$groups.")"; + } + $domain = $app->db->queryOneRecord($sql); + if(!$domain || !$domain['domain_id']) return false; + return $domain['domain']; + } } ?> diff --git a/interface/lib/classes/validate_client.inc.php b/interface/lib/classes/validate_client.inc.php index 9b0546a600..36370abaeb 100644 --- a/interface/lib/classes/validate_client.inc.php +++ b/interface/lib/classes/validate_client.inc.php @@ -81,7 +81,8 @@ class validate_client { ($global_config['ftpuser_prefix'] == '[CLIENTNAME]' || $global_config['ftpuser_prefix'] == '' || $global_config['shelluser_prefix'] == '[CLIENTNAME]' || - $global_config['shelluser_prefix'] == '' )) { + $global_config['shelluser_prefix'] == '' ) && + $global_config['client_username_web_check_disabled'] == 'n') { $errmsg = $validator['errmsg']; if(isset($app->tform->wordbook[$errmsg])) { return $app->tform->wordbook[$errmsg]."
\r\n"; diff --git a/interface/lib/classes/validate_domain.inc.php b/interface/lib/classes/validate_domain.inc.php index e70f1618fd..42c9c57a0e 100644 --- a/interface/lib/classes/validate_domain.inc.php +++ b/interface/lib/classes/validate_domain.inc.php @@ -106,20 +106,171 @@ class validate_domain { /* check if the domain hostname is unique (keep in mind the auto subdomains!) */ function _check_unique($domain_name, $only_domain = false) { - global $app; + global $app, $page; if(isset($app->remoting_lib->primary_id)) { $primary_id = $app->remoting_lib->primary_id; + $domain = $app->remoting_lib->dataRecord; } else { $primary_id = $app->tform->primary_id; + $domain = $page->dataRecord; } + + if($domain['ip_address'] == '' || $domain['ipv6_address'] == ''){ + if($domain['parent_domain_id'] > 0){ + $parent_domain = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$domain['parent_domain_id']); + } + } + + // check if domain has alias/subdomains - if we move a web to another IP, make sure alias/subdomains are checked as well + $aliassubdomains = $app->db->queryAllRecords("SELECT * FROM web_domain WHERE parent_domain_id = ".$app->functions->intval($primary_id)." AND (type = 'alias' OR type = 'subdomain')"); + $additional_sql1 = ''; + $additional_sql2 = ''; + if(is_array($aliassubdomains) && !empty($aliassubdomains)){ + foreach($aliassubdomains as $aliassubdomain){ + $additional_sql1 .= " OR `domain` = '".$app->db->quote($aliassubdomain['domain'])."'"; + $additional_sql2 .= " OR CONCAT(`subdomain`, '.', `domain`) = '".$app->db->quote($aliassubdomain['domain'])."'"; + } + } + + //$check = $app->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_domain` WHERE `domain` = '" . $app->db->quote($domain_name) . "' AND `domain_id` != " . $app->functions->intval($primary_id)); + //if($check['cnt'] > 0) return false; + + // we can have the same domain on different servers or different IPs, so we have to check for identical domains on the same IP (or wildcard IPs) + $checks = $app->db->queryAllRecords("SELECT * FROM `web_domain` WHERE (`domain` = '" . $app->db->quote($domain_name) . "'".$additional_sql1.") AND `server_id` = ".$domain['server_id']." AND `domain_id` != " . $app->functions->intval($primary_id).($additional_sql1 != '' ? " AND `parent_domain_id` != ".$app->functions->intval($primary_id) : "")); + + if(is_array($checks) && !empty($checks)){ + foreach($checks as $check){ + if($domain['ip_address'] == '*') return false; + if($check['ip_address'] == '*') return false; + if($domain['ip_address'] != '' && $check['ip_address'] == $domain['ip_address']) return false; + if($domain['ipv6_address'] != '' && $check['ipv6_address'] == $domain['ipv6_address']) return false; + // if alias/subdomain: check IP addresses of parent domain + if($check['ip_address'] == '' || $check['ipv6_address'] == ''){ + if($check['parent_domain_id'] > 0){ + $check_parent_domain = $app->db->queryOneRecord("SELECT * FROM `web_domain` WHERE `domain_id` = ".$check['parent_domain_id']); + } + } + + if($domain['ip_address'] == '' && $check['ip_address'] != ''){ + if(is_array($parent_domain) && !empty($parent_domain)){ + if($parent_domain['ip_address'] == '*') return false; + if($parent_domain['ip_address'] != '' && $check['ip_address'] == $parent_domain['ip_address']) return false; + } + } + + if($domain['ip_address'] == '' && $check['ip_address'] == ''){ + if($check['parent_domain_id'] > 0){ + if(is_array($check_parent_domain) && !empty($check_parent_domain)){ + if($check_parent_domain['ip_address'] == '*') return false; + } + } + if(is_array($parent_domain) && !empty($parent_domain)){ + if($parent_domain['ip_address'] == '*') return false; + if($parent_domain['ip_address'] != '' && $check_parent_domain['ip_address'] == $parent_domain['ip_address']) return false; + } + } + + if($check['ip_address'] == '' && $domain['ip_address'] != ''){ + if($check['parent_domain_id'] > 0){ + if(is_array($check_parent_domain) && !empty($check_parent_domain)){ + if($check_parent_domain['ip_address'] == '*') return false; + if($check_parent_domain['ip_address'] != '' && $check_parent_domain['ip_address'] == $domain['ip_address']) return false; + } + } + } + + if($domain['ipv6_address'] == '' && $check['ipv6_address'] != ''){ + if(is_array($parent_domain) && !empty($parent_domain)){ + if($parent_domain['ipv6_address'] != '' && $check['ipv6_address'] == $parent_domain['ipv6_address']) return false; + } + } + + if($domain['ipv6_address'] == '' && $check['ipv6_address'] == ''){ + if(is_array($parent_domain) && !empty($parent_domain)){ + if($parent_domain['ipv6_address'] != '' && $check_parent_domain['ipv6_address'] == $parent_domain['ipv6_address']) return false; + } + } + + if($check['ipv6_address'] == '' && $domain['ipv6_address'] != ''){ + if($check['parent_domain_id'] > 0){ + if(is_array($check_parent_domain) && !empty($check_parent_domain)){ + if($check_parent_domain['ipv6_address'] != '' && $check_parent_domain['ipv6_address'] == $domain['ipv6_address']) return false; + } + } + } + } + } - $check = $app->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_domain` WHERE `domain` = '" . $app->db->quote($domain_name) . "' AND `domain_id` != " . $app->functions->intval($primary_id)); - if($check['cnt'] > 0) return false; if($only_domain == false) { - $check = $app->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_domain` WHERE CONCAT(`subdomain`, '.', `domain`) = '" . $app->db->quote($domain_name) . "' AND `domain_id` != " . $app->functions->intval($primary_id)); - if($check['cnt'] > 0) return false; + //$check = $app->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_domain` WHERE CONCAT(`subdomain`, '.', `domain`) = '" . $app->db->quote($domain_name) . "' AND `domain_id` != " . $app->functions->intval($primary_id)); + //if($check['cnt'] > 0) return false; + // we can have the same domain on different servers or different IPs, so we have to check for identical domains on the same IP (or wildcard IPs) + $checks = $app->db->queryAllRecords("SELECT * FROM `web_domain` WHERE (CONCAT(`subdomain`, '.', `domain`) = '" . $app->db->quote($domain_name) . "'".$additional_sql2.") AND `server_id` = ".$domain['server_id']." AND `domain_id` != " . $app->functions->intval($primary_id).($additional_sql2 != '' ? " AND `parent_domain_id` != ".$app->functions->intval($primary_id) : "")); + if(is_array($checks) && !empty($checks)){ + foreach($checks as $check){ + if($domain['ip_address'] == '*') return false; + if($check['ip_address'] == '*') return false; + if($domain['ip_address'] != '' && $check['ip_address'] == $domain['ip_address']) return false; + if($domain['ipv6_address'] != '' && $check['ipv6_address'] == $domain['ipv6_address']) return false; + // if alias/subdomain: check IP addresses of parent domain + if($check['ip_address'] == '' || $check['ipv6_address'] == ''){ + if($check['parent_domain_id'] > 0){ + $check_parent_domain = $app->db->queryOneRecord("SELECT * FROM `web_domain` WHERE `domain_id` = ".$check['parent_domain_id']); + } + } + + if($domain['ip_address'] == '' && $check['ip_address'] != ''){ + if(is_array($parent_domain) && !empty($parent_domain)){ + if($parent_domain['ip_address'] == '*') return false; + if($parent_domain['ip_address'] != '' && $check['ip_address'] == $parent_domain['ip_address']) return false; + } + } + + if($domain['ip_address'] == '' && $check['ip_address'] == ''){ + if($check['parent_domain_id'] > 0){ + if(is_array($check_parent_domain) && !empty($check_parent_domain)){ + if($check_parent_domain['ip_address'] == '*') return false; + } + } + if(is_array($parent_domain) && !empty($parent_domain)){ + if($parent_domain['ip_address'] == '*') return false; + if($parent_domain['ip_address'] != '' && $check_parent_domain['ip_address'] == $parent_domain['ip_address']) return false; + } + } + + if($check['ip_address'] == '' && $domain['ip_address'] != ''){ + if($check['parent_domain_id'] > 0){ + if(is_array($check_parent_domain) && !empty($check_parent_domain)){ + if($check_parent_domain['ip_address'] == '*') return false; + if($check_parent_domain['ip_address'] != '' && $check_parent_domain['ip_address'] == $domain['ip_address']) return false; + } + } + } + + if($domain['ipv6_address'] == '' && $check['ipv6_address'] != ''){ + if(is_array($parent_domain) && !empty($parent_domain)){ + if($parent_domain['ipv6_address'] != '' && $check['ipv6_address'] == $parent_domain['ipv6_address']) return false; + } + } + + if($domain['ipv6_address'] == '' && $check['ipv6_address'] == ''){ + if(is_array($parent_domain) && !empty($parent_domain)){ + if($parent_domain['ipv6_address'] != '' && $check_parent_domain['ipv6_address'] == $parent_domain['ipv6_address']) return false; + } + } + + if($check['ipv6_address'] == '' && $domain['ipv6_address'] != ''){ + if($check['parent_domain_id'] > 0){ + if(is_array($check_parent_domain) && !empty($check_parent_domain)){ + if($check_parent_domain['ipv6_address'] != '' && $check_parent_domain['ipv6_address'] == $domain['ipv6_address']) return false; + } + } + } + } + } + } return true; diff --git a/interface/lib/lang/ar.lng b/interface/lib/lang/ar.lng index de01446fd3..4de5e8b075 100644 --- a/interface/lib/lang/ar.lng +++ b/interface/lib/lang/ar.lng @@ -127,4 +127,7 @@ $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'; ?> diff --git a/interface/lib/lang/bg.lng b/interface/lib/lang/bg.lng index d05ce81c9b..70cee5ec18 100644 --- a/interface/lib/lang/bg.lng +++ b/interface/lib/lang/bg.lng @@ -127,4 +127,7 @@ $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'; ?> diff --git a/interface/lib/lang/br.lng b/interface/lib/lang/br.lng index 29428f45bf..45d98ac696 100644 --- a/interface/lib/lang/br.lng +++ b/interface/lib/lang/br.lng @@ -127,4 +127,7 @@ $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'; ?> diff --git a/interface/lib/lang/cz.lng b/interface/lib/lang/cz.lng index 582f57b1f4..0179788277 100644 --- a/interface/lib/lang/cz.lng +++ b/interface/lib/lang/cz.lng @@ -72,7 +72,7 @@ $wb['logout_txt'] = 'Odhlášení'; $wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd'; $wb['submit_confirmation'] = 'Opravdu chcete provést tuto akci ?'; $wb['top_menu_mailuser'] = 'E-malový uživatel'; -$wb['globalsearch_resultslimit_of_txt'] = 'of'; +$wb['globalsearch_resultslimit_of_txt'] = 'z'; $wb['globalsearch_resultslimit_results_txt'] = 'výsledky'; $wb['globalsearch_noresults_text_txt'] = 'Žádné výsledky.'; $wb['globalsearch_noresults_limit_txt'] = '0 výsledků'; @@ -80,51 +80,54 @@ $wb['globalsearch_searchfield_watermark_txt'] = 'Vyhledávání'; $wb['globalsearch_suggestions_text_txt'] = 'Návrhy'; $wb['global_tabchange_warning_txt'] = 'Změněné údaje v této záložce se změní, pokud stisknete tlačítko OK. Pokud zmáčknete tlačítko zrušit, změny nebudou provedeny.'; $wb['global_tabchange_discard_txt'] = 'Máte neuložené změny v této záložce. Změny budou zahozeny, pokud budete pokračovat.'; -$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_changes_txt'] = 'Následující Vaše požadavky (změny nastavení), které se provádějí na serverech:'; +$wb['datalog_changes_end_txt'] = 'Provedení Vašich požadavků (změn nastavení) může trvat až jednu minutu. Prosím, buďte trpěliví.'; +$wb['datalog_status_i_web_database'] = 'Vytvoření nové databáze'; +$wb['datalog_status_u_web_database'] = 'Aktualizace nastavení databáze'; +$wb['datalog_status_d_web_database'] = 'Odstranění databáze'; +$wb['datalog_status_i_web_database_user'] = 'Vytvoření databázového uživatele pro databázi'; +$wb['datalog_status_u_web_database_user'] = 'Aktualizace nastavení databázového uživatele'; +$wb['datalog_status_d_web_database_user'] = 'Odstranění uživatele databáze'; +$wb['datalog_status_i_web_domain'] = 'Vytvoření nové webové stránky'; +$wb['datalog_status_u_web_domain'] = 'Aktualizace nastavení webové stránky'; +$wb['datalog_status_d_web_domain'] = 'Odstranění webové stránky'; +$wb['datalog_status_i_ftp_user'] = 'Vytvoření FTP uživatele'; +$wb['datalog_status_u_ftp_user'] = 'Aktualizace nastavení FTP uživatele'; +$wb['datalog_status_d_ftp_user'] = 'Odstranění FTP uživatele'; +$wb['datalog_status_i_mail_domain'] = 'Vytvoření e-mailové domény'; +$wb['datalog_status_u_mail_domain'] = 'Aktualizace nastavení e-mailové domény'; +$wb['datalog_status_d_mail_domain'] = 'Odstranění e-mailové domény'; +$wb['datalog_status_i_mail_user'] = 'Vytvoření e-mailového uživatele'; +$wb['datalog_status_u_mail_user'] = 'Aktualizace nastavení e-mailového uživatele'; +$wb['datalog_status_d_mail_user'] = 'Odstranění e-mailového uživatele'; +$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'] = 'Vytvoření e-mailového nebo doménového aliasu'; +$wb['datalog_status_u_mail_forwarding'] = 'Aktualizace nastavení e-mailového nebo doménového aliasu'; +$wb['datalog_status_d_mail_forwarding'] = 'Odstranění e-mailového nebo doménového aliasu'; +$wb['datalog_status_i_dns_rr'] = 'Vytvoření DNS záznamu'; +$wb['datalog_status_u_dns_rr'] = 'Aktualizace nastavení DNS záznamu'; +$wb['datalog_status_d_dns_rr'] = 'Odstranění DNS záznamu'; +$wb['datalog_status_i_dns_soa'] = 'Vytvoření DNS zóny'; +$wb['datalog_status_u_dns_soa'] = 'Aktualizace nastavení DNS zóny'; +$wb['datalog_status_d_dns_soa'] = 'Odstranění DNS zóny'; +$wb['datalog_status_i_cron'] = 'Vytvoření shell uživatele'; +$wb['datalog_status_u_cron'] = 'Aktualizace nastavení shell uživatele'; +$wb['datalog_status_d_cron'] = 'Odstranění shell uživatele'; +$wb['datalog_status_i_mail_get'] = 'Vytvoření účtu pro získávání externí e-mailové pošty'; +$wb['datalog_status_u_mail_get'] = 'Aktualizace nastavení účtu pro získávání externí e-mailové pošty'; +$wb['datalog_status_d_mail_get'] = 'Odstranění účtu pro získávání externí e-mailové pošty'; +$wb['datalog_status_i_mail_mailinglist'] = 'Vytvoření e-mailové konference (mailinglist)'; +$wb['datalog_status_u_mail_mailinglist'] = 'Aktualizace nastavení e-mailové konference (mailinglist)'; +$wb['datalog_status_d_mail_mailinglist'] = 'Odstranění e-mailové konference (mailinglist)'; +$wb['datalog_status_i_shell_user'] = 'Vytvoření shell uživatele'; +$wb['datalog_status_u_shell_user'] = 'Aktualizace nastavení shell uživatele'; +$wb['datalog_status_d_shell_user'] = 'Odstranění shell uživatele'; +$wb['datalog_status_i_web_folder'] = 'Vytvoření chráněného adresáře heslem'; +$wb['datalog_status_u_web_folder'] = 'Aktualizace nastavení chráněného adresáře heslem'; +$wb['datalog_status_d_web_folder'] = 'Odstranění chráněného adresáře heslem'; +$wb['datalog_status_i_web_folder_user'] = 'Vytvoření uživatele pro adresáře chráněné heslem'; +$wb['datalog_status_u_web_folder_user'] = 'Aktualizace nastavení uživatele pro adresáře chráněné heslem'; +$wb['datalog_status_d_web_folder_user'] = 'Odstranění uživatele pro adresáře chráněné heslem'; ?> diff --git a/interface/lib/lang/el.lng b/interface/lib/lang/el.lng index ee79b81bc0..5e111fdf77 100644 --- a/interface/lib/lang/el.lng +++ b/interface/lib/lang/el.lng @@ -127,4 +127,7 @@ $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'; ?> diff --git a/interface/lib/lang/es.lng b/interface/lib/lang/es.lng index c2b8d08357..4d1f95a672 100644 --- a/interface/lib/lang/es.lng +++ b/interface/lib/lang/es.lng @@ -4,8 +4,7 @@ $wb['conf_format_datelong'] = 'l dS of F Y'; $wb['conf_format_timeshort'] = 'H:i'; $wb['conf_format_timelong'] = 'H:i:s'; $wb['conf_format_datetime'] = 'Y-m-d H:i'; -$wb['number_format_decimals'] = '4'; -$wb['number_format_decimals_client'] = '2'; +$wb['number_format_decimals'] = '2'; $wb['number_format_dec_point'] = '.'; $wb['number_format_thousands_sep'] = ''; $wb['error_301'] = 'Modulo no permitido para el usuario actual.'; @@ -40,37 +39,38 @@ $wb['top_menu_domain'] = 'Dominios'; $wb['top_menu_dashboard'] = 'Inicio'; $wb['latest_news_txt'] = 'Noticias'; $wb['top_menu_vm'] = 'VServer'; -$wb['daynamesmin_su'] = 'Su'; -$wb['daynamesmin_mo'] = 'Mo'; -$wb['daynamesmin_tu'] = 'Tu'; -$wb['daynamesmin_we'] = 'We'; -$wb['daynamesmin_th'] = 'Th'; -$wb['daynamesmin_fr'] = 'Fr'; +$wb['daynamesmin_su'] = 'Do'; +$wb['daynamesmin_mo'] = 'Lu'; +$wb['daynamesmin_tu'] = 'Mar'; +$wb['daynamesmin_we'] = 'Mi'; +$wb['daynamesmin_th'] = 'Ju'; +$wb['daynamesmin_fr'] = 'Vi'; $wb['daynamesmin_sa'] = 'Sa'; -$wb['daynames_sunday'] = 'Sunday'; -$wb['daynames_monday'] = 'Monday'; -$wb['daynames_tuesday'] = 'Tuesday'; -$wb['daynames_wednesday'] = 'Wednesday'; -$wb['daynames_thursday'] = 'Thursday'; -$wb['daynames_friday'] = 'Friday'; -$wb['daynames_saturday'] = 'Saturday'; -$wb['monthnamesshort_jan'] = 'Jan'; +$wb['daynames_sunday'] = 'Domingo'; +$wb['daynames_monday'] = 'Lunes'; +$wb['daynames_tuesday'] = 'Martes'; +$wb['daynames_wednesday'] = 'Miercoles'; +$wb['daynames_thursday'] = 'Jueves'; +$wb['daynames_friday'] = 'Viernes'; +$wb['daynames_saturday'] = 'Sabado'; +$wb['monthnamesshort_jan'] = 'Ene'; $wb['monthnamesshort_feb'] = 'Feb'; $wb['monthnamesshort_mar'] = 'Mar'; -$wb['monthnamesshort_apr'] = 'Apr'; +$wb['monthnamesshort_apr'] = 'Abr'; $wb['monthnamesshort_may'] = 'May'; $wb['monthnamesshort_jun'] = 'Jun'; $wb['monthnamesshort_jul'] = 'Jul'; -$wb['monthnamesshort_aug'] = 'Aug'; +$wb['monthnamesshort_aug'] = 'Ago'; $wb['monthnamesshort_sep'] = 'Sep'; $wb['monthnamesshort_oct'] = 'Oct'; $wb['monthnamesshort_nov'] = 'Nov'; $wb['monthnamesshort_dec'] = 'Dec'; -$wb['datepicker_nextText'] = 'Next'; -$wb['datepicker_prevText'] = 'Prev'; -$wb['logout_txt'] = 'Logout'; +$wb['datepicker_nextText'] = 'Próximo'; +$wb['datepicker_prevText'] = 'Anterior'; +$wb['logout_txt'] = 'SALIR'; $wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd'; -$wb['submit_confirmation'] = 'Do you really want to perform this action?'; +$wb['submit_confirmation'] = '¿Realmente desea realizar esta acción?'; +$wb['number_format_decimals_client'] = '2'; $wb['top_menu_mailuser'] = 'Mailuser'; $wb['globalsearch_resultslimit_of_txt'] = 'of'; $wb['globalsearch_resultslimit_results_txt'] = 'results'; @@ -100,6 +100,9 @@ $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'; diff --git a/interface/lib/lang/fi.lng b/interface/lib/lang/fi.lng index 74cf33b3a0..07879d43f5 100755 --- a/interface/lib/lang/fi.lng +++ b/interface/lib/lang/fi.lng @@ -127,4 +127,7 @@ $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'; ?> diff --git a/interface/lib/lang/fr.lng b/interface/lib/lang/fr.lng index 64abfa23d8..06106427bd 100644 --- a/interface/lib/lang/fr.lng +++ b/interface/lib/lang/fr.lng @@ -78,4 +78,56 @@ $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_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'; ?> diff --git a/interface/lib/lang/hr.lng b/interface/lib/lang/hr.lng index 2726e3f04b..266e9082ac 100644 --- a/interface/lib/lang/hr.lng +++ b/interface/lib/lang/hr.lng @@ -127,4 +127,7 @@ $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'; ?> diff --git a/interface/lib/lang/hu.lng b/interface/lib/lang/hu.lng index 2746241c55..37048ae649 100644 --- a/interface/lib/lang/hu.lng +++ b/interface/lib/lang/hu.lng @@ -127,4 +127,7 @@ $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'; ?> diff --git a/interface/lib/lang/id.lng b/interface/lib/lang/id.lng index b51d039c74..2f9deaf15f 100644 --- a/interface/lib/lang/id.lng +++ b/interface/lib/lang/id.lng @@ -127,4 +127,7 @@ $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'; ?> diff --git a/interface/lib/lang/it.lng b/interface/lib/lang/it.lng index e4073d1bc6..57eccb8175 100644 --- a/interface/lib/lang/it.lng +++ b/interface/lib/lang/it.lng @@ -127,4 +127,7 @@ $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'; ?> diff --git a/interface/lib/lang/ja.lng b/interface/lib/lang/ja.lng index 6b6fb6e269..2404093942 100644 --- a/interface/lib/lang/ja.lng +++ b/interface/lib/lang/ja.lng @@ -127,4 +127,7 @@ $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'; ?> diff --git a/interface/lib/lang/nl.lng b/interface/lib/lang/nl.lng index 0270287098..2fca64be8e 100644 --- a/interface/lib/lang/nl.lng +++ b/interface/lib/lang/nl.lng @@ -127,4 +127,7 @@ $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'; ?> diff --git a/interface/lib/lang/pl.lng b/interface/lib/lang/pl.lng index 104a01d44c..ccc2139432 100644 --- a/interface/lib/lang/pl.lng +++ b/interface/lib/lang/pl.lng @@ -127,4 +127,7 @@ $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'; ?> diff --git a/interface/lib/lang/pt.lng b/interface/lib/lang/pt.lng index 0f44b4315a..10b3df0d23 100644 --- a/interface/lib/lang/pt.lng +++ b/interface/lib/lang/pt.lng @@ -127,4 +127,7 @@ $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'; ?> diff --git a/interface/lib/lang/ro.lng b/interface/lib/lang/ro.lng index 1c46c22edb..a222b37c9a 100644 --- a/interface/lib/lang/ro.lng +++ b/interface/lib/lang/ro.lng @@ -127,4 +127,7 @@ $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'; ?> diff --git a/interface/lib/lang/ru.lng b/interface/lib/lang/ru.lng index 7ed33db2ac..45c361ce74 100644 --- a/interface/lib/lang/ru.lng +++ b/interface/lib/lang/ru.lng @@ -127,4 +127,7 @@ $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'; ?> diff --git a/interface/lib/lang/se.lng b/interface/lib/lang/se.lng index 8004b2b924..dfccc7914f 100644 --- a/interface/lib/lang/se.lng +++ b/interface/lib/lang/se.lng @@ -127,4 +127,7 @@ $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'; ?> diff --git a/interface/lib/lang/sk.lng b/interface/lib/lang/sk.lng index 08542cce93..f71bb4450a 100644 --- a/interface/lib/lang/sk.lng +++ b/interface/lib/lang/sk.lng @@ -127,4 +127,7 @@ $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'; ?> diff --git a/interface/lib/lang/tr.lng b/interface/lib/lang/tr.lng index 8f73db0947..a6a4acfba5 100644 --- a/interface/lib/lang/tr.lng +++ b/interface/lib/lang/tr.lng @@ -127,4 +127,7 @@ $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'; ?> diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php index 0025d99833..c52096dafe 100644 --- a/interface/web/admin/form/server_config.tform.php +++ b/interface/web/admin/form/server_config.tform.php @@ -413,7 +413,7 @@ $form["tabs"]['web'] = array( 'width' => '40', 'maxlength' => '255' ), - +/* 'vhost_rewrite_v6' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'CHECKBOX', @@ -422,7 +422,7 @@ $form["tabs"]['web'] = array( ), - +*/ 'vhost_conf_dir' => array( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php index 7020ee2b14..fb0fc7f7b3 100644 --- a/interface/web/admin/form/system_config.tform.php +++ b/interface/web/admin/form/system_config.tform.php @@ -154,6 +154,12 @@ $form["tabs"]['sites'] = array ( 'default' => 'n', 'value' => array(0 => 'n',1 => 'y') ), + 'client_username_web_check_disabled' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'n', + 'value' => array(0 => 'n',1 => 'y') + ), ################################## # ENDE Datatable fields ################################## @@ -384,6 +390,18 @@ $form["tabs"]['misc'] = array ( 'default' => 'n', 'value' => array(0 => 'n',1 => 'y') ), + 'use_loadindicator' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'y', + 'value' => array(0 => 'n',1 => 'y') + ), + 'use_combobox' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'y', + 'value' => array(0 => 'n',1 => 'y') + ), 'maintenance_mode' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'CHECKBOX', diff --git a/interface/web/admin/form/users.tform.php b/interface/web/admin/form/users.tform.php index dc445d58e3..b6ff5f3bdf 100644 --- a/interface/web/admin/form/users.tform.php +++ b/interface/web/admin/form/users.tform.php @@ -146,6 +146,10 @@ $form['tabs']['users'] = array ( 2 => array ( 'type' => 'REGEX', 'regex' => '/^[\w\.\-\_]{0,64}$/', 'errmsg'=> 'username_err'), + 3 => array ( 'type' => 'CUSTOM', + 'class' => 'validate_client', + 'function' => 'username_collision', + 'errmsg'=> 'username_error_collision'), ), 'regex' => '', 'errmsg' => '', diff --git a/interface/web/admin/lib/lang/ar_server_config.lng b/interface/web/admin/lib/lang/ar_server_config.lng index ef609bb052..1ad2bd8275 100644 --- a/interface/web/admin/lib/lang/ar_server_config.lng +++ b/interface/web/admin/lib/lang/ar_server_config.lng @@ -170,4 +170,7 @@ $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['v6_prefix_txt'] = 'IPv6 Prefix'; +$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror'; +$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.'; ?> diff --git a/interface/web/admin/lib/lang/ar_system_config.lng b/interface/web/admin/lib/lang/ar_system_config.lng index 2380eeff9a..66352ef12b 100644 --- a/interface/web/admin/lib/lang/ar_system_config.lng +++ b/interface/web/admin/lib/lang/ar_system_config.lng @@ -41,4 +41,9 @@ $wb['tab_change_warning_txt'] = 'Tab change warning'; $wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.'; $wb['vhost_subdomains_txt'] = 'Create Subdomains as web site'; $wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!'; +$wb['phpmyadmin_url_error_regex'] = 'Invalid phpmyadmin URL'; +$wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; +$wb['use_loadindicator_txt'] = 'Use Load Indicator'; +$wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; +$wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; ?> diff --git a/interface/web/admin/lib/lang/ar_users.lng b/interface/web/admin/lib/lang/ar_users.lng index 06474e0129..8abda49849 100644 --- a/interface/web/admin/lib/lang/ar_users.lng +++ b/interface/web/admin/lib/lang/ar_users.lng @@ -29,4 +29,5 @@ $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.\"'; ?> diff --git a/interface/web/admin/lib/lang/bg_directive_snippets.lng b/interface/web/admin/lib/lang/bg_directive_snippets.lng index ee40ab06f9..d836ab0da0 100644 --- a/interface/web/admin/lib/lang/bg_directive_snippets.lng +++ b/interface/web/admin/lib/lang/bg_directive_snippets.lng @@ -1,9 +1,9 @@ \ No newline at end of file +$wb['Directive Snippets'] = 'Directive Snippets'; +$wb['name_txt'] = 'Name of Snippet'; +$wb['type_txt'] = 'Type'; +$wb['snippet_txt'] = '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.'; +?> diff --git a/interface/web/admin/lib/lang/bg_directive_snippets_list.lng b/interface/web/admin/lib/lang/bg_directive_snippets_list.lng index 702e7e2504..4124ea3464 100644 --- a/interface/web/admin/lib/lang/bg_directive_snippets_list.lng +++ b/interface/web/admin/lib/lang/bg_directive_snippets_list.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Directive Snippets'; +$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/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng index 5c2b5f6c5d..d35ad21ab8 100644 --- a/interface/web/admin/lib/lang/bg_server_config.lng +++ b/interface/web/admin/lib/lang/bg_server_config.lng @@ -170,4 +170,7 @@ $wb['website_autoalias_txt'] = 'Website auto alias'; $wb['website_autoalias_note_txt'] = 'Placeholders:'; $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin'; $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client'; +$wb['v6_prefix_txt'] = 'IPv6 Prefix'; +$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror'; +$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.'; ?> diff --git a/interface/web/admin/lib/lang/bg_system_config.lng b/interface/web/admin/lib/lang/bg_system_config.lng index f29dcf0ac9..4f6622ff45 100644 --- a/interface/web/admin/lib/lang/bg_system_config.lng +++ b/interface/web/admin/lib/lang/bg_system_config.lng @@ -41,4 +41,9 @@ $wb['tab_change_warning_txt'] = 'Tab change warning'; $wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.'; $wb['vhost_subdomains_txt'] = 'Create Subdomains as web site'; $wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!'; +$wb['phpmyadmin_url_error_regex'] = 'Invalid phpmyadmin URL'; +$wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; +$wb['use_loadindicator_txt'] = 'Use Load Indicator'; +$wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; +$wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; ?> diff --git a/interface/web/admin/lib/lang/bg_users.lng b/interface/web/admin/lib/lang/bg_users.lng index 053fedb7d2..b5dcbca37d 100644 --- a/interface/web/admin/lib/lang/bg_users.lng +++ b/interface/web/admin/lib/lang/bg_users.lng @@ -29,4 +29,5 @@ $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.\"'; ?> diff --git a/interface/web/admin/lib/lang/br_directive_snippets.lng b/interface/web/admin/lib/lang/br_directive_snippets.lng index ee40ab06f9..d836ab0da0 100644 --- a/interface/web/admin/lib/lang/br_directive_snippets.lng +++ b/interface/web/admin/lib/lang/br_directive_snippets.lng @@ -1,9 +1,9 @@ \ No newline at end of file +$wb['Directive Snippets'] = 'Directive Snippets'; +$wb['name_txt'] = 'Name of Snippet'; +$wb['type_txt'] = 'Type'; +$wb['snippet_txt'] = '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.'; +?> diff --git a/interface/web/admin/lib/lang/br_directive_snippets_list.lng b/interface/web/admin/lib/lang/br_directive_snippets_list.lng index 702e7e2504..4124ea3464 100644 --- a/interface/web/admin/lib/lang/br_directive_snippets_list.lng +++ b/interface/web/admin/lib/lang/br_directive_snippets_list.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Directive Snippets'; +$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/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng index c7237996be..25026796ae 100644 --- a/interface/web/admin/lib/lang/br_server_config.lng +++ b/interface/web/admin/lib/lang/br_server_config.lng @@ -170,4 +170,7 @@ $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['v6_prefix_txt'] = 'IPv6 Prefix'; +$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror'; +$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.'; ?> diff --git a/interface/web/admin/lib/lang/br_system_config.lng b/interface/web/admin/lib/lang/br_system_config.lng index bde177d001..d6ef3d50ee 100644 --- a/interface/web/admin/lib/lang/br_system_config.lng +++ b/interface/web/admin/lib/lang/br_system_config.lng @@ -41,4 +41,9 @@ $wb['tab_change_warning_txt'] = 'Tab change warning'; $wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.'; $wb['vhost_subdomains_txt'] = 'Create Subdomains as web site'; $wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!'; +$wb['phpmyadmin_url_error_regex'] = 'Invalid phpmyadmin URL'; +$wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; +$wb['use_loadindicator_txt'] = 'Use Load Indicator'; +$wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; +$wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; ?> diff --git a/interface/web/admin/lib/lang/br_users.lng b/interface/web/admin/lib/lang/br_users.lng index b6e0cdd33c..c5f3d07c41 100644 --- a/interface/web/admin/lib/lang/br_users.lng +++ b/interface/web/admin/lib/lang/br_users.lng @@ -29,4 +29,5 @@ $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.\"'; ?> diff --git a/interface/web/admin/lib/lang/cz.lng b/interface/web/admin/lib/lang/cz.lng index 404c273671..c531b68847 100644 --- a/interface/web/admin/lib/lang/cz.lng +++ b/interface/web/admin/lib/lang/cz.lng @@ -25,7 +25,7 @@ $wb['Getmail'] = 'Getmail'; $wb['Web'] = 'Web'; $wb['FastCGI'] = 'FastCGI'; $wb['Jailkit'] = 'Jailkit'; -$wb['Rescue'] = 'Zachrána'; +$wb['Rescue'] = 'Monitorování'; $wb['Server IP addresses'] = 'IP adresy serveru'; $wb['Additional PHP Versions'] = 'Další PHP verze'; $wb['Firewall'] = 'Firewall'; diff --git a/interface/web/admin/lib/lang/cz_language_complete.lng b/interface/web/admin/lib/lang/cz_language_complete.lng index f1e6f4924e..2967693ae8 100644 --- a/interface/web/admin/lib/lang/cz_language_complete.lng +++ b/interface/web/admin/lib/lang/cz_language_complete.lng @@ -1,6 +1,6 @@ Toto přidá chybějící řetězce z anglického hlavního souboru do vybraného jazykového souboru.
V nových verzích ISPConfigu vznikají nové moduly a položky, které chybějí ve starších jazykových souborech a takto je doplníte k překladu.'; +$wb['list_desc_txt'] = 'Sloučit vybraný jazykový soubor s hlavním anglickým jazykovým souborem.
Toto přidá chybějící řetězce z anglického hlavního souboru do vybraného jazykového souboru. Odebere také zrušené řetezce.
V nových verzích ISPConfigu vznikají nové moduly a položky, které chybějí ve starších jazykových souborech a takto je doplníte k překladu.'; $wb['language_select_txt'] = 'Vybrat jazyk k doplnění'; $wb['btn_save_txt'] = 'Sloučit / doplnit jazykový soubor'; $wb['btn_cancel_txt'] = 'Zpět'; diff --git a/interface/web/admin/lib/lang/cz_package_install.lng b/interface/web/admin/lib/lang/cz_package_install.lng index 3375bd51c0..0d5162eabd 100644 --- a/interface/web/admin/lib/lang/cz_package_install.lng +++ b/interface/web/admin/lib/lang/cz_package_install.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/admin/lib/lang/cz_remote_user.lng b/interface/web/admin/lib/lang/cz_remote_user.lng index f764fc73e8..b62526dc83 100644 --- a/interface/web/admin/lib/lang/cz_remote_user.lng +++ b/interface/web/admin/lib/lang/cz_remote_user.lng @@ -39,7 +39,7 @@ $wb['DNS ptr functions'] = 'Funkce DNS PTR'; $wb['DNS rp functions'] = 'Funkce DNS RP'; $wb['DNS srv functions'] = 'Funkce DNS SRV'; $wb['DNS txt functions'] = 'Funkce DNS TXT'; -$wb['Mail mailing list functions'] = 'Mail mailinglist functions'; +$wb['Mail mailing list functions'] = 'Funkce e-mailové konference (mailinglist)'; $wb['generate_password_txt'] = 'Generovat heslo'; $wb['repeat_password_txt'] = 'Opakujte heslo'; $wb['password_mismatch_txt'] = 'Hesla se neshodují.'; diff --git a/interface/web/admin/lib/lang/cz_server.lng b/interface/web/admin/lib/lang/cz_server.lng index a087656a1c..337e9ca2e1 100644 --- a/interface/web/admin/lib/lang/cz_server.lng +++ b/interface/web/admin/lib/lang/cz_server.lng @@ -1,12 +1,12 @@ Getmail cesta k adresáři kde jsou umístěny konfigurace'; $wb['fastcgi_starter_path_txt'] = 'FastCGI starter cesta'; $wb['fastcgi_starter_script_txt'] = 'FastCGI starter skript'; $wb['fastcgi_alias_txt'] = 'FastCGI alias'; -$wb['fastcgi_phpini_path_txt'] = 'FastCGI php.ini cesta'; +$wb['fastcgi_phpini_path_txt'] = 'FastCGI cesta k adresáři kde je umístěn php.ini'; $wb['fastcgi_children_txt'] = 'FastCGI děti'; $wb['fastcgi_max_requests_txt'] = 'FastCGI max. požadavků'; -$wb['fastcgi_bin_txt'] = 'FastCGI bin'; +$wb['fastcgi_bin_txt'] = 'FastCGI cesta k binarnímu balíčku'; $wb['module_txt'] = 'Modul'; $wb['maildir_path_txt'] = 'Cesta k mail adresáři'; $wb['homedir_path_txt'] = 'Cesta k domácímu adresáři'; @@ -32,15 +32,15 @@ $wb['message_size_limit_txt'] = 'Limit velikosti zprávy'; $wb['ip_address_txt'] = 'IP adresa'; $wb['netmask_txt'] = 'Maska'; $wb['gateway_txt'] = 'Brána'; -$wb['hostname_txt'] = 'Hostname'; -$wb['nameservers_txt'] = 'Jmenné servery'; +$wb['hostname_txt'] = 'Název hostitele (hostname)'; +$wb['nameservers_txt'] = 'Jmenné servery (DNS)'; $wb['auto_network_configuration_txt'] = 'Konfigurace sítě'; $wb['ip_address_error_wrong'] = 'Neplatný formát IP adresy.'; $wb['netmask_error_wrong'] = 'Neplatný formát síťové masky.'; $wb['gateway_error_wrong'] = 'Neplatný formát brány.'; -$wb['hostname_error_empty'] = 'Hostname je prázdný.'; +$wb['hostname_error_empty'] = 'Název hostitele (hostname) je prázdný.'; $wb['nameservers_error_empty'] = 'Jmenný server je prázdný.'; -$wb['config_dir_txt'] = 'Vlogger config adresář'; +$wb['config_dir_txt'] = 'Vlogger cesta k adresáři kde je umístěna konfigurace'; $wb['init_script_txt'] = 'Název cron init skriptu'; $wb['crontab_dir_txt'] = 'Cesta k individuálním cron tabulkám'; $wb['wget_txt'] = 'Cesta k wget programu'; @@ -71,23 +71,23 @@ $wb['awstats_data_dir_txt'] = 'awstats data folder'; $wb['awstats_pl_txt'] = 'awstats.pl script'; $wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl script'; $wb['backup_dir_txt'] = 'Adresář pro zálohy'; -$wb['named_conf_local_path_txt'] = 'BIND named.conf.local path'; -$wb['php_ini_path_cgi_txt'] = 'CGI php.ini path'; -$wb['php_ini_path_apache_txt'] = 'Apache php.ini path'; -$wb['check_apache_config_txt'] = 'Test apache configuration on restart'; -$wb['CA_path_txt'] = 'CA Path'; -$wb['CA_pass_txt'] = 'CA passphrase'; -$wb['ufw_enable_txt'] = 'Enable'; -$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules'; -$wb['ufw_ipv6_txt'] = 'Enable IPv6'; -$wb['ufw_default_input_policy_txt'] = 'Default Input Policy'; +$wb['named_conf_local_path_txt'] = 'Cesta k BIND named.conf.local'; +$wb['php_ini_path_cgi_txt'] = 'Cesta k CGI php.ini'; +$wb['php_ini_path_apache_txt'] = 'Cesta k Apache php.ini'; +$wb['check_apache_config_txt'] = 'Provést test konfigurace apache před restartováním'; +$wb['CA_path_txt'] = 'CA cesta'; +$wb['CA_pass_txt'] = 'CA heslo'; +$wb['ufw_enable_txt'] = 'Aktivovat'; +$wb['ufw_manage_builtins_txt'] = 'Správa vestavěných pravidel'; +$wb['ufw_ipv6_txt'] = 'Aktivovat IPv6'; +$wb['ufw_default_input_policy_txt'] = 'Standardní vstupní politika'; $wb['ufw_default_output_policy_txt'] = 'Default Output Policy'; $wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy'; $wb['ufw_default_application_policy_txt'] = 'Default Application Policy'; -$wb['ufw_log_level_txt'] = 'Log Level'; +$wb['ufw_log_level_txt'] = 'Úroveň logování'; $wb['network_config_warning_txt'] = 'Možnost konfigurace sítě je k dispozici pouze pro Debian a Ubuntu servery. Nepoužívejte tuto volbu, pokud vaše síťové rozhraní není eth0.'; $wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax'; -$wb['server_type_txt'] = 'Server Type'; +$wb['server_type_txt'] = 'Typ serveru'; $wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir'; $wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir'; $wb['nginx_user_txt'] = 'Nginx user'; @@ -143,11 +143,11 @@ $wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.'; $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory'; $wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.'; $wb['try_rescue_txt'] = 'Povolit monitorování služeb a restartovat při selhání'; -$wb['do_not_try_rescue_mysql_txt'] = 'Zakázat MySQL sledování'; -$wb['do_not_try_rescue_mail_txt'] = 'Zakázat E-mail sledování'; -$wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
if you do not wait 2-3 minutes, rescue will try to restart mysql!'; -$wb['enable_sni_txt'] = 'Enable SNI'; -$wb['do_not_try_rescue_httpd_txt'] = 'Zakázat HTTPD sledování'; +$wb['do_not_try_rescue_mysql_txt'] = 'Zakázat MySQL monitorování'; +$wb['do_not_try_rescue_mail_txt'] = 'Zakázat E-mail monitorování'; +$wb['rescue_description_txt'] = 'Informace: Pokud chcete např. vypnout MySQL zatrhněte políčko \\"Zakázat MySQL monitorování\\" změna se provede do 2-3 minut.
Pokud nepočkáte 2-3 minuty, monitorování restartuje mysql!!'; +$wb['enable_sni_txt'] = 'Aktivovat SNI'; +$wb['do_not_try_rescue_httpd_txt'] = 'Zakázat HTTPD monitorování'; $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'; @@ -159,15 +159,18 @@ $wb['backup_mode_userzip'] = 'Zálohování všech souborů v adresáři web jak $wb['backup_mode_rootgz'] = 'Zálohování všech souborů v adresáři web jako uživatel root'; $wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List'; $wb['realtime_blackhole_list_note_txt'] = '(Samostatná RBL se odděluje čárkou)'; -$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['ssl_settings_txt'] = 'SSL Nastavení'; +$wb['permissions_txt'] = 'Nastavit oprávnění'; +$wb['php_settings_txt'] = 'PHP Nastavení'; +$wb['apps_vhost_settings_txt'] = 'Apps Vhost Nastavení'; +$wb['awstats_settings_txt'] = 'AWStats Nastavení'; $wb['firewall_txt'] = 'Firewall'; $wb['mailbox_quota_stats_txt'] = 'Statistika kvóty poštovní schránky'; -$wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; +$wb['enable_ip_wildcard_txt'] = 'Aktivovat 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['overtraffic_notify_admin_txt'] = 'Při překročení limitu přenesených dat, poslat oznámení adminovi'; +$wb['overtraffic_notify_client_txt'] = 'Při překročení limitu přenesených dat, poslat oznámení klientovi'; +$wb['v6_prefix_txt'] = 'IPv6 Prefix'; +$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror'; +$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.'; ?> diff --git a/interface/web/admin/lib/lang/cz_server_ip_list.lng b/interface/web/admin/lib/lang/cz_server_ip_list.lng index 21589c7d6e..a5b3bf8668 100644 --- a/interface/web/admin/lib/lang/cz_server_ip_list.lng +++ b/interface/web/admin/lib/lang/cz_server_ip_list.lng @@ -3,7 +3,7 @@ $wb['list_head_txt'] = 'IP adresy'; $wb['server_id_txt'] = 'Server'; $wb['ip_address_txt'] = 'IP adresa'; $wb['add_new_record_txt'] = 'Přidat IP adresu'; -$wb['client_id_txt'] = 'Client'; +$wb['client_id_txt'] = 'Klient'; $wb['virtualhost_txt'] = 'HTTP Vhost'; $wb['virtualhost_port_txt'] = 'HTTP Ports'; $wb['ip_type_txt'] = 'Type'; diff --git a/interface/web/admin/lib/lang/cz_server_php.lng b/interface/web/admin/lib/lang/cz_server_php.lng index addbfa4935..2393f31f0f 100644 --- a/interface/web/admin/lib/lang/cz_server_php.lng +++ b/interface/web/admin/lib/lang/cz_server_php.lng @@ -1,16 +1,16 @@ diff --git a/interface/web/admin/lib/lang/cz_server_php_list.lng b/interface/web/admin/lib/lang/cz_server_php_list.lng index b402fd1ed1..cc3ae1f226 100644 --- a/interface/web/admin/lib/lang/cz_server_php_list.lng +++ b/interface/web/admin/lib/lang/cz_server_php_list.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/admin/lib/lang/cz_system_config.lng b/interface/web/admin/lib/lang/cz_system_config.lng index 7182593e88..83dc8694fd 100644 --- a/interface/web/admin/lib/lang/cz_system_config.lng +++ b/interface/web/admin/lib/lang/cz_system_config.lng @@ -35,10 +35,15 @@ $wb['smtp_port_txt'] = 'SMTP port'; $wb['smtp_user_txt'] = 'SMTP uživatel'; $wb['smtp_pass_txt'] = 'SMTP heslo'; $wb['smtp_crypt_txt'] = 'Použít SSL/TLS šifrované spojení pro SMTP'; -$wb['smtp_missing_admin_mail_txt'] = 'Please enter the admin name and admin mail address if you want to use smtp mail sending.'; -$wb['tab_change_discard_txt'] = 'Discard changes on tab change'; +$wb['smtp_missing_admin_mail_txt'] = 'Zadejte prosím jméno správce a admin e-mailovou adresu, pokud chcete používat poštu SMTP pro odesílání.'; +$wb['tab_change_discard_txt'] = 'Zahodit změny na záložce změny'; $wb['tab_change_warning_txt'] = 'Záložka změna varování'; -$wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.'; -$wb['vhost_subdomains_txt'] = 'Create Subdomains as web site'; +$wb['tab_change_warning_note_txt'] = 'Zobrazit varování na kartě změny ve formách úprav případné data byla změněna uživatelem.'; +$wb['vhost_subdomains_txt'] = 'Vytvořit subdomény jako webové stránky'; $wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!'; +$wb['phpmyadmin_url_error_regex'] = 'Neplatná phpmyadmin URL'; +$wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; +$wb['use_loadindicator_txt'] = 'Use Load Indicator'; +$wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; +$wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; ?> diff --git a/interface/web/admin/lib/lang/cz_tpl_default_admin.lng b/interface/web/admin/lib/lang/cz_tpl_default_admin.lng index 46b2988b5a..592d5c081a 100644 --- a/interface/web/admin/lib/lang/cz_tpl_default_admin.lng +++ b/interface/web/admin/lib/lang/cz_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'] = 'Client'; -$wb['name_txt'] = 'PHP Name'; -$wb['Name'] = 'Name'; -$wb['FastCGI Settings'] = 'FastCGI Settings'; -$wb['PHP-FPM Settings'] = 'PHP-FPM Settings'; +$wb['client_id_txt'] = 'Klient'; +$wb['name_txt'] = 'Název PHP verze'; +$wb['Name'] = 'Název'; +$wb['FastCGI Settings'] = 'FastCGI nastavení'; +$wb['PHP-FPM Settings'] = 'PHP-FPM nastavení'; $wb['Additional PHP Versions'] = 'Další PHP verze'; $wb['Form to edit additional PHP versions'] = 'Formulář pro úpravu další PHP verzí'; -$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'; +$wb['server_php_name_error_empty'] = 'Název pole nesmí být prázdné.'; +$wb['php_fastcgi_binary_txt'] = 'Cesta k binarnímu balíčku PHP FastCGI'; +$wb['php_fastcgi_ini_dir_txt'] = 'Cesta k adresáři ve kterém je umístěn php.ini'; +$wb['php_fpm_init_script_txt'] = 'Cesta k PHP-FPM init skriptu'; +$wb['php_fpm_ini_dir_txt'] = 'Cesta k adresáři ve kterém je umístěn php.ini'; +$wb['php_fpm_pool_dir_txt'] = 'Cesta k PHP-FPM společnému (pool) adresáři'; ?> diff --git a/interface/web/admin/lib/lang/cz_users.lng b/interface/web/admin/lib/lang/cz_users.lng index fc50add99f..b1ff4b1e12 100644 --- a/interface/web/admin/lib/lang/cz_users.lng +++ b/interface/web/admin/lib/lang/cz_users.lng @@ -7,7 +7,7 @@ $wb['passwort_txt'] = 'Heslo'; $wb['password_strength_txt'] = 'Bezpečnost hesla'; $wb['modules_txt'] = 'Modul'; $wb['startmodule_txt'] = 'Výchozí modul'; -$wb['app_theme_txt'] = 'Design'; +$wb['app_theme_txt'] = 'Výchozí grafické téma'; $wb['typ_txt'] = 'Typ'; $wb['active_txt'] = 'Aktivní'; $wb['language_txt'] = 'Jazyk'; @@ -18,7 +18,7 @@ $wb['strasse_txt'] = 'Ulice'; $wb['ort_txt'] = 'Město'; $wb['plz_txt'] = 'PSČ'; $wb['land_txt'] = 'Stát'; -$wb['email_txt'] = 'Email'; +$wb['email_txt'] = 'E-mail'; $wb['url_txt'] = 'URL'; $wb['telefon_txt'] = 'Telefon'; $wb['fax_txt'] = 'Fax'; @@ -29,4 +29,5 @@ $wb['generate_password_txt'] = 'Generovat heslo'; $wb['repeat_password_txt'] = 'Opakujte heslo'; $wb['password_mismatch_txt'] = 'Hesla se neshodují.'; $wb['password_match_txt'] = 'Hesla se shodují.'; +$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"'; ?> diff --git a/interface/web/admin/lib/lang/cz_users_list.lng b/interface/web/admin/lib/lang/cz_users_list.lng index ab5db38ec9..e5a7d1e4de 100644 --- a/interface/web/admin/lib/lang/cz_users_list.lng +++ b/interface/web/admin/lib/lang/cz_users_list.lng @@ -1,9 +1,9 @@ VAROVÁNÍ: Zde neupravujte uživatelská nastavení. Užijte klientská a distributorská nastavení v klientském modulu. Úprava uživatelý nebo skupin zde může způsobit ztrátu dat!'; -$wb['groups_txt'] = 'Groups'; +$wb['warning_txt'] = 'VAROVÁNÍ: Zde neupravujte uživatelská nastavení. Užijte klientská a distributorská nastavení v klientském modulu. Úprava uživatelů nebo skupin zde může způsobit ztrátu dat!'; +$wb['groups_txt'] = 'Skupiny'; ?> diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng index e0864f18f0..18a1e38ae4 100644 --- a/interface/web/admin/lib/lang/de_server_config.lng +++ b/interface/web/admin/lib/lang/de_server_config.lng @@ -170,6 +170,9 @@ $wb['enable_ip_wildcard_txt'] = 'IP Adressen Wildcard (*) aktivieren'; $wb['web_folder_protection_txt'] = 'Webverzeichnis unveränderlich machen (erweiterte Attribute)'; $wb['overtraffic_notify_admin_txt'] = 'Überschreiten des Transfer Limits an den Administrator senden'; $wb['overtraffic_notify_client_txt'] = 'Überschreiten des Transfer Limits an den Kunden senden'; +$wb['v6_prefix_txt'] = 'IPv6 Präfix'; +$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 auf dem Mirror'; +$wb['v6_prefix_wrong'] = 'Falsches IPv6 Netzmasken Format.'; $wb['php_ini_check_minutes_txt'] = 'Prüfe System php.ini Dateien auf Änderungen alle'; $wb['php_ini_check_minutes_info_txt'] = 'Minute(n) (0 deaktiviert diese Funktion)'; $wb['php_ini_check_minutes_error_empty'] = 'Der Wert für die Einstellung der php.ini Prüfung ist ungültig.'; diff --git a/interface/web/admin/lib/lang/de_system_config.lng b/interface/web/admin/lib/lang/de_system_config.lng index e9c854bf27..53b540ad40 100644 --- a/interface/web/admin/lib/lang/de_system_config.lng +++ b/interface/web/admin/lib/lang/de_system_config.lng @@ -41,4 +41,9 @@ $wb['smtp_port_txt'] = 'SMTP Port'; $wb['smtp_user_txt'] = 'SMTP Benutzer'; $wb['smtp_pass_txt'] = 'SMTP Passwort'; $wb['smtp_crypt_txt'] = 'SSL/TLS verschlüsselte Verbindung für SMTP'; +$wb['use_combobox_txt'] = 'jQuery UI Combobox benutzen'; +$wb['use_loadindicator_txt'] = 'Laden-Grafik anzeigen'; +$wb['f5_to_reload_js_txt'] = 'Wenn Sie den Wert ändern, müssen Sie F5 drücken, damit der Browser die JavaScript-Libraries neu lädt, oder Ihren Browser-Cache leeren.'; +$wb['phpmyadmin_url_error_regex'] = 'Falsche phpMyAdmin URL'; +$wb['client_username_web_check_disabled_txt'] = 'Deaktiviere die Kunden Benutzername Überprüfung für den Begriff web.'; ?> diff --git a/interface/web/admin/lib/lang/de_users.lng b/interface/web/admin/lib/lang/de_users.lng index 1ead952e53..413a402814 100644 --- a/interface/web/admin/lib/lang/de_users.lng +++ b/interface/web/admin/lib/lang/de_users.lng @@ -29,4 +29,5 @@ $wb['generate_password_txt'] = 'Passwort erzeugen'; $wb['repeat_password_txt'] = 'Passwort wiederholen'; $wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; $wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; +$wb['username_error_collision'] = 'Der Benutzername darf nicht web oder web gefolgt von einer Zahl sein.'; ?> diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng index 5768d3f79c..c580600fe7 100644 --- a/interface/web/admin/lib/lang/el_server_config.lng +++ b/interface/web/admin/lib/lang/el_server_config.lng @@ -170,4 +170,7 @@ $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['v6_prefix_txt'] = 'IPv6 Prefix'; +$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror'; +$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.'; ?> diff --git a/interface/web/admin/lib/lang/el_system_config.lng b/interface/web/admin/lib/lang/el_system_config.lng index ef186aab18..18dd8c5383 100644 --- a/interface/web/admin/lib/lang/el_system_config.lng +++ b/interface/web/admin/lib/lang/el_system_config.lng @@ -41,4 +41,9 @@ $wb['tab_change_warning_txt'] = 'Tab change warning'; $wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.'; $wb['vhost_subdomains_txt'] = 'Create Subdomains as web site'; $wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!'; +$wb['phpmyadmin_url_error_regex'] = 'Invalid phpmyadmin URL'; +$wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; +$wb['use_loadindicator_txt'] = 'Use Load Indicator'; +$wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; +$wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; ?> diff --git a/interface/web/admin/lib/lang/el_users.lng b/interface/web/admin/lib/lang/el_users.lng index 24d24368d0..993d697b1e 100644 --- a/interface/web/admin/lib/lang/el_users.lng +++ b/interface/web/admin/lib/lang/el_users.lng @@ -29,4 +29,5 @@ $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.\"'; ?> diff --git a/interface/web/admin/lib/lang/en_system_config.lng b/interface/web/admin/lib/lang/en_system_config.lng index 6957bc5c38..03ce902373 100644 --- a/interface/web/admin/lib/lang/en_system_config.lng +++ b/interface/web/admin/lib/lang/en_system_config.lng @@ -42,4 +42,8 @@ $wb['smtp_user_txt'] = 'SMTP user'; $wb['smtp_pass_txt'] = 'SMTP password'; $wb['smtp_crypt_txt'] = 'Use SSL/TLS encrypted connection for SMTP'; $wb['phpmyadmin_url_error_regex'] = 'Invalid phpmyadmin URL'; +$wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; +$wb['use_loadindicator_txt'] = 'Use Load Indicator'; +$wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; +$wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; ?> diff --git a/interface/web/admin/lib/lang/en_users.lng b/interface/web/admin/lib/lang/en_users.lng index c6a418e0f3..9eec3222a5 100644 --- a/interface/web/admin/lib/lang/en_users.lng +++ b/interface/web/admin/lib/lang/en_users.lng @@ -29,4 +29,5 @@ $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."'; ?> diff --git a/interface/web/admin/lib/lang/es.lng b/interface/web/admin/lib/lang/es.lng index dba64b42cb..cdb4e27956 100644 --- a/interface/web/admin/lib/lang/es.lng +++ b/interface/web/admin/lib/lang/es.lng @@ -1,50 +1,50 @@ diff --git a/interface/web/admin/lib/lang/es_directive_snippets.lng b/interface/web/admin/lib/lang/es_directive_snippets.lng index ee40ab06f9..d836ab0da0 100644 --- a/interface/web/admin/lib/lang/es_directive_snippets.lng +++ b/interface/web/admin/lib/lang/es_directive_snippets.lng @@ -1,9 +1,9 @@ \ No newline at end of file +$wb['Directive Snippets'] = 'Directive Snippets'; +$wb['name_txt'] = 'Name of Snippet'; +$wb['type_txt'] = 'Type'; +$wb['snippet_txt'] = '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.'; +?> diff --git a/interface/web/admin/lib/lang/es_directive_snippets_list.lng b/interface/web/admin/lib/lang/es_directive_snippets_list.lng index 702e7e2504..4124ea3464 100644 --- a/interface/web/admin/lib/lang/es_directive_snippets_list.lng +++ b/interface/web/admin/lib/lang/es_directive_snippets_list.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Directive Snippets'; +$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/es_groups_list.lng b/interface/web/admin/lib/lang/es_groups_list.lng index f36c4d8587..b6276390b9 100644 --- a/interface/web/admin/lib/lang/es_groups_list.lng +++ b/interface/web/admin/lib/lang/es_groups_list.lng @@ -3,5 +3,5 @@ $wb['list_head_txt'] = 'Grupos de usuarios del sistema'; $wb['description_txt'] = 'Descripción'; $wb['name_txt'] = 'Grupo'; $wb['add_new_record_txt'] = 'Añadir nuevo grupo'; -$wb['warning_txt'] = 'WARNING: Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!'; +$wb['warning_txt'] = 'AVISO: ¡No modifique las configuraciones de usuario aquí! Utilice las opciones del cliente y distribuidor en el módulo cliente en su lugar. Cualquier modificación o cambio de usuarios o grupos aquí puede causar la pérdida de datos'; ?> diff --git a/interface/web/admin/lib/lang/es_iptables.lng b/interface/web/admin/lib/lang/es_iptables.lng index 40760b9498..c7b4d9756b 100644 --- a/interface/web/admin/lib/lang/es_iptables.lng +++ b/interface/web/admin/lib/lang/es_iptables.lng @@ -1,13 +1,13 @@ diff --git a/interface/web/admin/lib/lang/es_iptables_list.lng b/interface/web/admin/lib/lang/es_iptables_list.lng index 15c8baddcb..7598994acb 100644 --- a/interface/web/admin/lib/lang/es_iptables_list.lng +++ b/interface/web/admin/lib/lang/es_iptables_list.lng @@ -1,15 +1,15 @@ diff --git a/interface/web/admin/lib/lang/es_language_import.lng b/interface/web/admin/lib/lang/es_language_import.lng index 87b465e141..7f2b25bc7b 100644 --- a/interface/web/admin/lib/lang/es_language_import.lng +++ b/interface/web/admin/lib/lang/es_language_import.lng @@ -4,5 +4,5 @@ $wb['language_import_txt'] = 'Elija el fichero de idioma'; $wb['btn_save_txt'] = 'Importar el fichero de idioma'; $wb['language_overwrite_txt'] = 'Sobreescribir los ficheros, si existen'; $wb['btn_cancel_txt'] = 'Atrás'; -$wb['ignore_version_txt'] = 'Skip ISPConfig version check'; +$wb['ignore_version_txt'] = 'Saltar comprobación de la versión ISPConfig'; ?> diff --git a/interface/web/admin/lib/lang/es_remote_action.lng b/interface/web/admin/lib/lang/es_remote_action.lng index f268527084..5abe2348a9 100644 --- a/interface/web/admin/lib/lang/es_remote_action.lng +++ b/interface/web/admin/lib/lang/es_remote_action.lng @@ -1,12 +1,12 @@
USE THIS AT YOUR OWN RISK!'; -$wb['do_ispcupdate_caption'] = 'Do ISPConfig 3 - Update at remote server'; -$wb['do_ispcupdate_desc'] = 'This action does a ISPConfig3 update at your selected server.

USE THIS AT YOUR OWN RISK!'; -$wb['action_scheduled'] = 'The action is scheduled for execution'; -$wb['select_all_server'] = 'All server'; -$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

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; +$wb['select_server_txt'] = 'Seleccionar servidor'; +$wb['btn_do_txt'] = 'Ejecutar acción'; +$wb['do_osupdate_caption'] = 'Hacer OS-Update el servidor remoto'; +$wb['do_osupdate_desc'] = 'Esta acción hace un aptitude upgrade-y en su servidor seleccionado
USAR ESTE BAJO SU PROPIO RIESGO '; +$wb['do_ispcupdate_caption'] = 'Es ISPConfig 3 - Actualización en el servidor remoto'; +$wb['do_ispcupdate_desc'] = 'Esta acción hace una actualización de ISPConfig3 en su servidor seleccionado
USAR ESTE BAJO SU PROPIO RIESGO'; +$wb['action_scheduled'] = 'La acción está prevista para su ejecución'; +$wb['select_all_server'] = 'Todos los servidores'; +$wb['ispconfig_update_title'] = 'Instrucciones para actualizar ISPConfig'; +$wb['ispconfig_update_text'] = 'Inicie sesión como usuario root en el terminal de su servidor y ejecutar el comando

ispconfig_update.sh

para iniciar la actualización de ISPConfig. Haga clic aquí para información detallada para actualizar'; ?> diff --git a/interface/web/admin/lib/lang/es_remote_user.lng b/interface/web/admin/lib/lang/es_remote_user.lng index fda0e2cec0..739543a8e3 100644 --- a/interface/web/admin/lib/lang/es_remote_user.lng +++ b/interface/web/admin/lib/lang/es_remote_user.lng @@ -3,43 +3,43 @@ $wb['username_txt'] = 'Nombre de usuario:'; $wb['password_txt'] = 'Contraseña:'; $wb['function_txt'] = 'Funciones:'; $wb['username_error_unique'] = 'El nombre de usuario debe ser único'; -$wb['username_error_empty'] = 'El nombre de usuario no puede estar vacío'; -$wb['password_error_empty'] = 'La contraseña no puede estar vacía'; +$wb['username_error_empty'] = 'El nombre de usuario no puede está vacío.'; +$wb['password_error_empty'] = 'La contraseña no puede está vacío.'; $wb['password_strength_txt'] = 'Fortaleza de la contraseña:'; -$wb['Mail domain functions'] = 'Mail domain functions'; -$wb['Mail user functions'] = 'Mail user functions'; -$wb['Mail alias functions'] = 'Mail alias functions'; -$wb['Mail forward functions'] = 'Mail forward functions'; -$wb['Mail catchall functions'] = 'Mail catchall functions'; -$wb['Mail transport functions'] = 'Mail transport functions'; -$wb['Mail whitelist functions'] = 'Mail whitelist functions'; -$wb['Mail blacklist functions'] = 'Mail blacklist functions'; -$wb['Mail spamfilter user functions'] = 'Mail spamfilter user functions'; -$wb['Mail spamfilter policy functions'] = 'Mail spamfilter policy functions'; -$wb['Mail fetchmail functions'] = 'Mail fetchmail functions'; -$wb['Mail user filter functions'] = 'Mail user filter functions'; -$wb['Mail filter functions'] = 'Mail filter functions'; -$wb['Client functions'] = 'Client functions'; -$wb['Sites cron functions'] = 'Sites cron functions'; -$wb['Sites database functions'] = 'Sites database functions'; -$wb['Sites FTP-User functions'] = 'Sites FTP-User functions'; -$wb['Sites Shell-User functions'] = 'Sites Shell-User functions'; -$wb['Sites Domain functions'] = 'Sites Domain functions'; -$wb['Sites Aliasdomain functions'] = 'Sites Aliasdomain functions'; -$wb['Sites Subdomain functions'] = 'Sites Subdomain functions'; -$wb['DNS zone functions'] = 'DNS zone functions'; -$wb['DNS a functions'] = 'DNS a functions'; -$wb['DNS aaaa functions'] = 'DNS aaaa functions'; -$wb['DNS alias functions'] = 'DNS alias functions'; -$wb['DNS cname functions'] = 'DNS cname functions'; -$wb['DNS hinfo functions'] = 'DNS hinfo functions'; -$wb['DNS mx functions'] = 'DNS mx functions'; -$wb['DNS ns functions'] = 'DNS ns functions'; -$wb['DNS ptr functions'] = 'DNS ptr functions'; -$wb['DNS rp functions'] = 'DNS rp functions'; -$wb['DNS srv functions'] = 'DNS srv functions'; -$wb['DNS txt functions'] = 'DNS txt functions'; -$wb['Mail mailing list functions'] = 'Mail mailinglist functions'; +$wb['Mail domain functions'] = 'Funciones del dominio de correo'; +$wb['Mail user functions'] = 'Funciones de usuario de correo'; +$wb['Mail alias functions'] = 'Funciones de alias de correo'; +$wb['Mail forward functions'] = 'Funciones de forward'; +$wb['Mail catchall functions'] = 'Funciones de catchall'; +$wb['Mail transport functions'] = 'Funciones de transport'; +$wb['Mail whitelist functions'] = 'Funciones de whitelist'; +$wb['Mail blacklist functions'] = 'Funciones de blacklist'; +$wb['Mail spamfilter user functions'] = 'Funciones de spamfilter usuario'; +$wb['Mail spamfilter policy functions'] = 'Funciones de politica spamfilter'; +$wb['Mail fetchmail functions'] = 'Funciones de fetchmail'; +$wb['Mail user filter functions'] = 'Funciones de usuario de filter'; +$wb['Mail filter functions'] = 'Funciones de filter'; +$wb['Client functions'] = 'Funciones del Cliente'; +$wb['Sites cron functions'] = 'Funciones de cron'; +$wb['Sites database functions'] = 'Funciones de bases de datos'; +$wb['Sites FTP-User functions'] = 'Funciones Sites FTP-User'; +$wb['Sites Shell-User functions'] = 'Funciones de Shell-User'; +$wb['Sites Domain functions'] = 'Funciones de Dominio'; +$wb['Sites Aliasdomain functions'] = 'Funciones de Aliasdominio'; +$wb['Sites Subdomain functions'] = 'Funciones de Subdominio'; +$wb['DNS zone functions'] = 'Funciones de zona'; +$wb['DNS a functions'] = 'Funciones de DNS'; +$wb['DNS aaaa functions'] = 'Funciones de aaaa'; +$wb['DNS alias functions'] = 'Funciones de DNS alias'; +$wb['DNS cname functions'] = 'Funciones de cname'; +$wb['DNS hinfo functions'] = 'Funciones de hinfo'; +$wb['DNS mx functions'] = 'Funciones de mx'; +$wb['DNS ns functions'] = 'Funciones de ns'; +$wb['DNS ptr functions'] = 'Funciones de ptr'; +$wb['DNS rp functions'] = 'Funciones de rp'; +$wb['DNS srv functions'] = 'Funciones de srv'; +$wb['DNS txt functions'] = 'Funciones de txt'; +$wb['Mail mailing list functions'] = 'Funciones de mailinglist'; $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; diff --git a/interface/web/admin/lib/lang/es_server.lng b/interface/web/admin/lib/lang/es_server.lng index d5a223ca93..2b961195ff 100644 --- a/interface/web/admin/lib/lang/es_server.lng +++ b/interface/web/admin/lib/lang/es_server.lng @@ -6,10 +6,10 @@ $wb['web_server_txt'] = 'Servidor web'; $wb['dns_server_txt'] = 'Servidor DNS'; $wb['file_server_txt'] = 'Servidor de ficheros'; $wb['db_server_txt'] = 'Servidor de bases de datos'; -$wb['vserver_server_txt'] = 'ServidorVirtual-Servidor'; +$wb['vserver_server_txt'] = 'Servidor-Virtual'; $wb['active_txt'] = 'Activar'; -$wb['mirror_server_id_txt'] = 'Is mirror of Server'; -$wb['- None -'] = '- None -'; -$wb['proxy_server_txt'] = 'Proxy-Server'; -$wb['firewall_server_txt'] = 'Firewall-Server'; +$wb['mirror_server_id_txt'] = 'Es el espejo del Servidor'; +$wb['- None -'] = '- Ninguno -'; +$wb['proxy_server_txt'] = 'Servidor-Proxy'; +$wb['firewall_server_txt'] = 'Servidor-Cortafuegos'; ?> diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng index 454f2cd660..9a25490c32 100644 --- a/interface/web/admin/lib/lang/es_server_config.lng +++ b/interface/web/admin/lib/lang/es_server_config.lng @@ -1,10 +1,10 @@ Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
if you do not wait 2-3 minutes, rescue will try to restart mysql!'; -$wb['enable_sni_txt'] = 'Enable SNI'; -$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring'; -$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['php_fpm_start_port_error_empty'] = 'PHP-FPM start port está vacío.'; +$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directorio'; +$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directorio está vacío.'; +$wb['try_rescue_txt'] = 'Habilitar el servicio de monitoreo y reiniciar en caso de fallo'; +$wb['do_not_try_rescue_mysql_txt'] = 'Desactivar el seguimiento de MySQL'; +$wb['do_not_try_rescue_mail_txt'] = 'Desactivar el seguimiento de Ecorreo'; +$wb['rescue_description_txt'] = 'Información: ¡Si desea apagar mysql tiene que seleccionar la casilla de verificación Deshabilitar MySQL monitor y esperar 2-3 minutos.
Si usted no espera 2-3 minutos, el rescate se intenta reiniciar mysql!'; +$wb['enable_sni_txt'] = 'Habilitar SNI'; +$wb['do_not_try_rescue_httpd_txt'] = 'Desactivar el seguimiento de HTTPD'; +$wb['set_folder_permissions_on_update_txt'] = 'Juego de permisos de las carpetas de actualización'; +$wb['add_web_users_to_sshusers_group_txt'] = 'Añadir usuarios de la web a los sshusers del grupo'; +$wb['connect_userid_to_webid_txt'] = 'Connect ID de usuario de Linux para webid'; +$wb['connect_userid_to_webid_start_txt'] = 'Inicio de identificación para identificación de usuario/webid conexión'; $wb['website_autoalias_txt'] = 'Website auto alias'; $wb['website_autoalias_note_txt'] = 'Placeholders:'; $wb['backup_mode_txt'] = 'Backup mode'; @@ -170,4 +170,7 @@ $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['v6_prefix_txt'] = 'IPv6 Prefix'; +$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror'; +$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.'; ?> diff --git a/interface/web/admin/lib/lang/es_server_ip.lng b/interface/web/admin/lib/lang/es_server_ip.lng index 6a09bc55e5..14935f19fb 100644 --- a/interface/web/admin/lib/lang/es_server_ip.lng +++ b/interface/web/admin/lib/lang/es_server_ip.lng @@ -4,8 +4,8 @@ $wb['ip_address_txt'] = 'Dirección IP'; $wb['virtualhost_txt'] = 'NameVirtualHost HTTP'; $wb['ip_error_wrong'] = 'Dirección IP no válida'; $wb['ip_error_unique'] = 'La dirección IP debe ser única'; -$wb['client_id_txt'] = 'Client'; -$wb['ip_type_txt'] = 'Type'; -$wb['virtualhost_port_txt'] = 'HTTP Ports'; -$wb['error_port_syntax'] = 'Invalid chars in port field, please enter only comma separated numbers. Example: 80,443'; +$wb['client_id_txt'] = 'Cliente'; +$wb['ip_type_txt'] = 'Tipo'; +$wb['virtualhost_port_txt'] = 'Puertos HTTP'; +$wb['error_port_syntax'] = 'Caracteres no válidos en el campo Puerto, introduzca números separados por comas solo. Ejemplo: 80,443'; ?> diff --git a/interface/web/admin/lib/lang/es_server_ip_list.lng b/interface/web/admin/lib/lang/es_server_ip_list.lng index dab7167727..8aee59de81 100644 --- a/interface/web/admin/lib/lang/es_server_ip_list.lng +++ b/interface/web/admin/lib/lang/es_server_ip_list.lng @@ -3,8 +3,8 @@ $wb['list_head_txt'] = 'Dirección IP'; $wb['server_id_txt'] = 'Servidor'; $wb['ip_address_txt'] = 'Dirección IP'; $wb['add_new_record_txt'] = 'Añadir nueva dirección IP'; -$wb['client_id_txt'] = 'Client'; +$wb['client_id_txt'] = 'Cliente'; $wb['virtualhost_txt'] = 'HTTP Vhost'; $wb['virtualhost_port_txt'] = 'HTTP Ports'; -$wb['ip_type_txt'] = 'Type'; +$wb['ip_type_txt'] = 'Tipo'; ?> diff --git a/interface/web/admin/lib/lang/es_server_list.lng b/interface/web/admin/lib/lang/es_server_list.lng index 677831903f..2c68cb8d1f 100644 --- a/interface/web/admin/lib/lang/es_server_list.lng +++ b/interface/web/admin/lib/lang/es_server_list.lng @@ -9,5 +9,5 @@ $wb['db_server_txt'] = 'BD'; $wb['vserver_server_txt'] = 'VServer'; $wb['add_new_record_txt'] = 'Añadir nuevo servidor'; $wb['proxy_server_txt'] = 'Proxy'; -$wb['firewall_server_txt'] = 'Firewall'; +$wb['firewall_server_txt'] = 'Cortafuegos'; ?> diff --git a/interface/web/admin/lib/lang/es_software_package_install.lng b/interface/web/admin/lib/lang/es_software_package_install.lng index 5c8b756434..5bb176405e 100644 --- a/interface/web/admin/lib/lang/es_software_package_install.lng +++ b/interface/web/admin/lib/lang/es_software_package_install.lng @@ -1,6 +1,6 @@ diff --git a/interface/web/admin/lib/lang/es_system_config.lng b/interface/web/admin/lib/lang/es_system_config.lng index 8a45a9f1a2..dfa5d650f7 100644 --- a/interface/web/admin/lib/lang/es_system_config.lng +++ b/interface/web/admin/lib/lang/es_system_config.lng @@ -1,6 +1,5 @@ diff --git a/interface/web/admin/lib/lang/es_users.lng b/interface/web/admin/lib/lang/es_users.lng index e00bb9a86c..eee23b1c57 100644 --- a/interface/web/admin/lib/lang/es_users.lng +++ b/interface/web/admin/lib/lang/es_users.lng @@ -29,4 +29,5 @@ $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.\"'; ?> diff --git a/interface/web/admin/lib/lang/es_users_list.lng b/interface/web/admin/lib/lang/es_users_list.lng index dae382ea4a..d8bb7bf782 100644 --- a/interface/web/admin/lib/lang/es_users_list.lng +++ b/interface/web/admin/lib/lang/es_users_list.lng @@ -1,9 +1,9 @@ WARNING: Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!'; +$wb['warning_txt'] = 'AVISO: ¡No modifique ninguna configuración de usuario aquí. Utilice las opciones del cliente y distribuidor en el módulo de clientes en su lugar. Cualquier modificación de los usuarios o grupos aquí, puede causar pérdida de datos!'; +$wb['client_id_txt'] = 'User ID'; +$wb['active_txt'] = 'Active'; $wb['groups_txt'] = 'Groups'; ?> diff --git a/interface/web/admin/lib/lang/fi_directive_snippets.lng b/interface/web/admin/lib/lang/fi_directive_snippets.lng index ee40ab06f9..d836ab0da0 100644 --- a/interface/web/admin/lib/lang/fi_directive_snippets.lng +++ b/interface/web/admin/lib/lang/fi_directive_snippets.lng @@ -1,9 +1,9 @@ \ No newline at end of file +$wb['Directive Snippets'] = 'Directive Snippets'; +$wb['name_txt'] = 'Name of Snippet'; +$wb['type_txt'] = 'Type'; +$wb['snippet_txt'] = '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.'; +?> diff --git a/interface/web/admin/lib/lang/fi_directive_snippets_list.lng b/interface/web/admin/lib/lang/fi_directive_snippets_list.lng index 702e7e2504..4124ea3464 100644 --- a/interface/web/admin/lib/lang/fi_directive_snippets_list.lng +++ b/interface/web/admin/lib/lang/fi_directive_snippets_list.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Directive Snippets'; +$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/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng index d56ca7508d..4865f2a9e8 100755 --- a/interface/web/admin/lib/lang/fi_server_config.lng +++ b/interface/web/admin/lib/lang/fi_server_config.lng @@ -170,4 +170,7 @@ $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['v6_prefix_txt'] = 'IPv6 Prefix'; +$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror'; +$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.'; ?> diff --git a/interface/web/admin/lib/lang/fi_system_config.lng b/interface/web/admin/lib/lang/fi_system_config.lng index af8d9564d8..bff1a97608 100755 --- a/interface/web/admin/lib/lang/fi_system_config.lng +++ b/interface/web/admin/lib/lang/fi_system_config.lng @@ -41,4 +41,9 @@ $wb['tab_change_warning_txt'] = 'Tab change warning'; $wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.'; $wb['vhost_subdomains_txt'] = 'Create Subdomains as web site'; $wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!'; +$wb['phpmyadmin_url_error_regex'] = 'Invalid phpmyadmin URL'; +$wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; +$wb['use_loadindicator_txt'] = 'Use Load Indicator'; +$wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; +$wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; ?> diff --git a/interface/web/admin/lib/lang/fi_users.lng b/interface/web/admin/lib/lang/fi_users.lng index 01b2d98e96..c123ca998e 100755 --- a/interface/web/admin/lib/lang/fi_users.lng +++ b/interface/web/admin/lib/lang/fi_users.lng @@ -29,4 +29,5 @@ $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.\"'; ?> diff --git a/interface/web/admin/lib/lang/fr.lng b/interface/web/admin/lib/lang/fr.lng index c97785d610..339dfc3239 100644 --- a/interface/web/admin/lib/lang/fr.lng +++ b/interface/web/admin/lib/lang/fr.lng @@ -46,4 +46,5 @@ $wb['Import'] = 'Importer'; $wb['Remote Actions'] = 'Actions distantes'; $wb['Do OS-Update'] = 'Mise à jour de l\'OS'; $wb['Do ISPConfig-Update'] = 'Mise à jour ISPConfig'; +$wb['Directive Snippets'] = 'Directive Snippets'; ?> diff --git a/interface/web/admin/lib/lang/fr_directive_snippets.lng b/interface/web/admin/lib/lang/fr_directive_snippets.lng new file mode 100644 index 0000000000..ee40ab06f9 --- /dev/null +++ b/interface/web/admin/lib/lang/fr_directive_snippets.lng @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/interface/web/admin/lib/lang/fr_directive_snippets_list.lng b/interface/web/admin/lib/lang/fr_directive_snippets_list.lng new file mode 100644 index 0000000000..702e7e2504 --- /dev/null +++ b/interface/web/admin/lib/lang/fr_directive_snippets_list.lng @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/interface/web/admin/lib/lang/fr_server_config.lng b/interface/web/admin/lib/lang/fr_server_config.lng index 7b6585354b..ce25160f0e 100644 --- a/interface/web/admin/lib/lang/fr_server_config.lng +++ b/interface/web/admin/lib/lang/fr_server_config.lng @@ -1,171 +1,176 @@ Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
if you do not wait 2-3 minutes, rescue will try to restart mysql!"; -$wb['enable_sni_txt'] = "Enable SNI"; -$wb['do_not_try_rescue_httpd_txt'] = "Disable HTTPD monitoring"; -$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 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'] = "Mailbox quota statistics"; -$wb['enable_ip_wildcard_txt'] = "Enable IP wildcard (*)"; -$wb['web_folder_protection_txt'] = "Make web folders immutable (extended attributes)"; +$wb['jailkit_chroot_home_txt'] = 'Accueil du chroot Jailkit'; +$wb['jailkit_chroot_app_sections_txt'] = 'Sections des applications chrootées Jailkit'; +$wb['jailkit_chroot_app_programs_txt'] = 'Applications chrootées Jailkit'; +$wb['website_path_txt'] = 'Chemin du site web'; +$wb['website_symlinks_txt'] = 'Liens symboliques du site web'; +$wb['website_symlinks_rel_txt'] = 'Make relative symlinks'; +$wb['vhost_conf_dir_txt'] = 'Répertoire de configuration des VHosts'; +$wb['vhost_conf_enabled_dir_txt'] = 'Répertoire de configuration des VHosts actifs'; +$wb['getmail_config_dir_txt'] = 'Répertoire de configuration de Getmail'; +$wb['fastcgi_starter_path_txt'] = 'Chemin du lanceur de FastCGI'; +$wb['fastcgi_starter_script_txt'] = 'Script lanceur de FastCGI'; +$wb['fastcgi_alias_txt'] = 'Alias de FastCGI'; +$wb['fastcgi_phpini_path_txt'] = 'Chemin du php.ini de FastCGI'; +$wb['fastcgi_children_txt'] = 'Enfant de FastCGI'; +$wb['fastcgi_max_requests_txt'] = 'Nombre maximal de requêtes FastCGI'; +$wb['fastcgi_bin_txt'] = 'Exécutable FastCGI'; +$wb['module_txt'] = 'Module'; +$wb['maildir_path_txt'] = 'Chemin Maildir'; +$wb['homedir_path_txt'] = 'Chemin Homedir'; +$wb['mailuser_uid_txt'] = 'UID de l\'utilisateur mail'; +$wb['mailuser_gid_txt'] = 'GID de l\'utilisateur mail'; +$wb['mailuser_name_txt'] = 'Nom d\'utilisateur mail'; +$wb['mailuser_group_txt'] = 'Groupe de l\'utilisateur mail'; +$wb['relayhost_txt'] = 'Hôte de relais'; +$wb['relayhost_user_txt'] = 'Utilisateur du relais'; +$wb['relayhost_password_txt'] = 'Mot de passe du relais'; +$wb['mailbox_size_limit_txt'] = 'Taille maximale de la boite mail'; +$wb['message_size_limit_txt'] = 'Taille maximale des messages'; +$wb['ip_address_txt'] = 'Adresse IP'; +$wb['netmask_txt'] = 'Masque de réseau'; +$wb['gateway_txt'] = 'Passerelle'; +$wb['hostname_txt'] = 'Hôte'; +$wb['nameservers_txt'] = 'Serveurs de nom'; +$wb['auto_network_configuration_txt'] = 'Configuration du réseau'; +$wb['website_basedir_txt'] = 'Répertoire de base web'; +$wb['ip_address_error_wrong'] = 'Format de ladresse IP invalide.'; +$wb['netmask_error_wrong'] = 'Format du masque de réseau invalide.'; +$wb['gateway_error_wrong'] = 'Format de la passerelle invalide.'; +$wb['hostname_error_empty'] = 'Lhôte est vide.'; +$wb['nameservers_error_empty'] = 'Le serveur de nom est vide.'; +$wb['jailkit_chroot_cron_programs_txt'] = 'Applications Cron Jailkit chrootées'; +$wb['config_dir_txt'] = 'Répertoire de configuration'; +$wb['init_script_txt'] = 'Nom du script Cron de lancement'; +$wb['crontab_dir_txt'] = 'Chemin des différentes tables Cron'; +$wb['wget_txt'] = 'Chemin du programme wget'; +$wb['security_level_txt'] = 'Niveau de sécurité'; +$wb['web_user_txt'] = 'Utilisateur Apache'; +$wb['web_group_txt'] = 'Groupe Apache'; +$wb['loglevel_txt'] = 'Loglevel'; +$wb['apps_vhost_port_txt'] = 'Port Apps-vhost'; +$wb['apps_vhost_ip_txt'] = 'IP Apps-vhost'; +$wb['apps_vhost_servername_txt'] = ' Domaine Apps-vhost'; +$wb['bind_user_txt'] = 'Utilisateur BIND'; +$wb['bind_group_txt'] = 'Groupe BIND'; +$wb['bind_zonefiles_dir_txt'] = 'Dossier pour les zones BIND'; +$wb['named_conf_path_txt'] = 'Chemin named.conf BIND'; +$wb['bind_user_error_empty'] = 'Lutilisateur BIND est vide.'; +$wb['bind_group_error_empty'] = 'Le groupe BIND est vide.'; +$wb['bind_zonefiles_dir_error_empty'] = 'Le dossier de zones BIND est vide.'; +$wb['named_conf_path_error_empty'] = 'Le chemin du named.conf BIND est vide.'; +$wb['named_conf_local_path_error_empty'] = 'Le chemin du named.conf.local BIND est vide.'; +$wb['mail_filter_syntax_txt'] = 'Syntaxe filtre email'; +$wb['pop3_imap_daemon_txt'] = 'Démon POP3/IMAP'; +$wb['php_open_basedir_txt'] = 'open_basedir PHP'; +$wb['php_open_basedir_error_empty'] = 'lopen_basedir PHP est vide.'; +$wb['htaccess_allow_override_txt'] = 'AllowOverride .htaccess'; +$wb['htaccess_allow_override_error_empty'] = 'lAllowOverride .htaccess est vide.'; +$wb['awstats_conf_dir_txt'] = 'Dossier de configuration AWstats'; +$wb['awstats_data_dir_txt'] = 'Dossier de données AWstats'; +$wb['awstats_pl_txt'] = 'Script awstats.pl'; +$wb['awstats_buildstaticpages_pl_txt'] = 'Script awstats_buildstaticpages.pl'; +$wb['backup_dir_txt'] = 'Dossier de sauvegarde'; +$wb['named_conf_local_path_txt'] = 'Chemin named.conf.local BIND'; +$wb['php_ini_path_cgi_txt'] = 'Chemin php.ini CGI'; +$wb['php_ini_path_apache_txt'] = 'Chemin php.ini Apache'; +$wb['check_apache_config_txt'] = 'Tester la configuration Apache au redémarrage'; +$wb['ufw_enable_txt'] = 'Enable'; +$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules'; +$wb['ufw_ipv6_txt'] = 'Enable IPv6'; +$wb['ufw_default_input_policy_txt'] = 'Default Input Policy'; +$wb['ufw_default_output_policy_txt'] = 'Default Output Policy'; +$wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy'; +$wb['ufw_default_application_policy_txt'] = 'Default Application Policy'; +$wb['ufw_log_level_txt'] = 'Log Level'; +$wb['network_config_warning_txt'] = 'The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.'; +$wb['CA_path_txt'] = 'CA Path'; +$wb['CA_pass_txt'] = 'CA passphrase'; +$wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax'; +$wb['server_type_txt'] = 'Server Type'; +$wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir'; +$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir'; +$wb['nginx_user_txt'] = 'Nginx user'; +$wb['nginx_group_txt'] = 'Nginx group'; +$wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket'; +$wb['backup_dir_error_empty'] = 'Backup directory is empty.'; +$wb['maildir_path_error_empty'] = 'Maildir Path is empty.'; +$wb['homedir_path_error_empty'] = 'Homedir Path is empty.'; +$wb['mailuser_uid_error_empty'] = 'Mailuser UID is empty.'; +$wb['mailuser_gid_error_empty'] = 'Mailuser GID is empty.'; +$wb['mailuser_name_error_empty'] = 'Mailuser Name is empty.'; +$wb['mailuser_group_error_empty'] = 'Mailuser Group is empty.'; +$wb['getmail_config_dir_error_empty'] = 'Getmail config dir is empty.'; +$wb['website_basedir_error_empty'] = 'Website basedir is empty.'; +$wb['website_path_error_empty'] = 'Website path is empty.'; +$wb['website_symlinks_error_empty'] = 'Website symlinks is empty.'; +$wb['vhost_conf_dir_error_empty'] = 'Vhost config dir is empty.'; +$wb['vhost_conf_enabled_dir_error_empty'] = 'Vhost config enabled dir is empty.'; +$wb['nginx_vhost_conf_dir_error_empty'] = 'Nginx Vhost config dir is empty.'; +$wb['nginx_vhost_conf_enabled_dir_error_empty'] = 'Nginx Vhost config enabled dir is empty.'; +$wb['apache_user_error_empty'] = 'Apache user is empty.'; +$wb['apache_group_error_empty'] = 'Apache group is empty.'; +$wb['nginx_user_error_empty'] = 'Nginx user is empty.'; +$wb['nginx_group_error_empty'] = 'Nginx group is empty.'; +$wb['php_ini_path_apache_error_empty'] = 'Apache php.ini path is empty.'; +$wb['php_ini_path_cgi_error_empty'] = 'CGI php.ini path is empty.'; +$wb['nginx_cgi_socket_empty'] = 'Nginx CGI Socket is empty.'; +$wb['apps_vhost_port_error_empty'] = 'Apps-vhost port is empty.'; +$wb['apps_vhost_ip_error_empty'] = 'Apps-vhost IP is empty.'; +$wb['fastcgi_starter_path_error_empty'] = 'FastCGI starter path is empty.'; +$wb['fastcgi_starter_script_error_empty'] = 'FastCGI starter script is empty.'; +$wb['fastcgi_alias_error_empty'] = 'FastCGI Alias is empty.'; +$wb['fastcgi_phpini_path_error_empty'] = 'FastCGI php.ini Path is empty.'; +$wb['fastcgi_children_error_empty'] = 'FastCGI Children is empty.'; +$wb['fastcgi_max_requests_error_empty'] = 'FastCGI max. Requests is empty.'; +$wb['fastcgi_bin_error_empty'] = 'FastCGI Bin is empty.'; +$wb['jailkit_chroot_home_error_empty'] = 'Jailkit chroot home is empty.'; +$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sections is empty.'; +$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applications is empty.'; +$wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit cron chrooted applications is empty.'; +$wb['vlogger_config_dir_error_empty'] = 'Config directory is empty.'; +$wb['cron_init_script_error_empty'] = 'Cron init script name is empty.'; +$wb['crontab_dir_error_empty'] = 'Path for individual crontabs is empty.'; +$wb['cron_wget_error_empty'] = 'Path to wget program is empty.'; +$wb['php_fpm_init_script_txt'] = 'PHP-FPM init script'; +$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM init script is empty.'; +$wb['php_fpm_ini_path_txt'] = 'PHP-FPM php.ini path'; +$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM php.ini path is empty.'; +$wb['php_fpm_pool_dir_txt'] = 'PHP-FPM pool directory'; +$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM pool directory is empty.'; +$wb['php_fpm_start_port_txt'] = 'PHP-FPM start port'; +$wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.'; +$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory'; +$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.'; +$wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure'; +$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring'; +$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; +$wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
if you do not wait 2-3 minutes, rescue will try to restart mysql!'; +$wb['enable_sni_txt'] = 'Enable SNI'; +$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring'; +$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 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'] = '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['v6_prefix_txt'] = 'IPv6 Prefix'; +$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror'; +$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.'; ?> diff --git a/interface/web/admin/lib/lang/fr_system_config.lng b/interface/web/admin/lib/lang/fr_system_config.lng index e15d84c28a..10c7d3f044 100644 --- a/interface/web/admin/lib/lang/fr_system_config.lng +++ b/interface/web/admin/lib/lang/fr_system_config.lng @@ -35,4 +35,15 @@ $wb['smtp_port_txt'] = 'SMTP port'; $wb['smtp_user_txt'] = 'SMTP user'; $wb['smtp_pass_txt'] = 'SMTP password'; $wb['smtp_crypt_txt'] = 'Use SSL/TLS encrypted connection for SMTP'; +$wb['smtp_missing_admin_mail_txt'] = 'Please enter the admin name and admin mail address if you want to use smtp mail sending.'; +$wb['tab_change_discard_txt'] = 'Discard changes on tab change'; +$wb['tab_change_warning_txt'] = 'Tab change warning'; +$wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.'; +$wb['vhost_subdomains_txt'] = 'Create Subdomains as web site'; +$wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!'; +$wb['phpmyadmin_url_error_regex'] = 'Invalid phpmyadmin URL'; +$wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; +$wb['use_loadindicator_txt'] = 'Use Load Indicator'; +$wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; +$wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; ?> diff --git a/interface/web/admin/lib/lang/fr_users.lng b/interface/web/admin/lib/lang/fr_users.lng index 3b6ec120f9..85e24cfc17 100644 --- a/interface/web/admin/lib/lang/fr_users.lng +++ b/interface/web/admin/lib/lang/fr_users.lng @@ -29,4 +29,5 @@ $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.\"'; ?> diff --git a/interface/web/admin/lib/lang/hr_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng index 5c9e7d0ed9..79a0397aa7 100644 --- a/interface/web/admin/lib/lang/hr_server_config.lng +++ b/interface/web/admin/lib/lang/hr_server_config.lng @@ -170,4 +170,7 @@ $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['v6_prefix_txt'] = 'IPv6 Prefix'; +$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror'; +$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.'; ?> diff --git a/interface/web/admin/lib/lang/hr_system_config.lng b/interface/web/admin/lib/lang/hr_system_config.lng index 30afbf9771..d552e190fb 100644 --- a/interface/web/admin/lib/lang/hr_system_config.lng +++ b/interface/web/admin/lib/lang/hr_system_config.lng @@ -41,4 +41,9 @@ $wb['tab_change_warning_txt'] = 'Tab change warning'; $wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.'; $wb['vhost_subdomains_txt'] = 'Create Subdomains as web site'; $wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!'; +$wb['phpmyadmin_url_error_regex'] = 'Invalid phpmyadmin URL'; +$wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; +$wb['use_loadindicator_txt'] = 'Use Load Indicator'; +$wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; +$wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; ?> diff --git a/interface/web/admin/lib/lang/hr_users.lng b/interface/web/admin/lib/lang/hr_users.lng index 2547c3f134..4f0f1e9844 100644 --- a/interface/web/admin/lib/lang/hr_users.lng +++ b/interface/web/admin/lib/lang/hr_users.lng @@ -29,4 +29,5 @@ $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.\"'; ?> diff --git a/interface/web/admin/lib/lang/hu_directive_snippets.lng b/interface/web/admin/lib/lang/hu_directive_snippets.lng index ee40ab06f9..d836ab0da0 100644 --- a/interface/web/admin/lib/lang/hu_directive_snippets.lng +++ b/interface/web/admin/lib/lang/hu_directive_snippets.lng @@ -1,9 +1,9 @@ \ No newline at end of file +$wb['Directive Snippets'] = 'Directive Snippets'; +$wb['name_txt'] = 'Name of Snippet'; +$wb['type_txt'] = 'Type'; +$wb['snippet_txt'] = '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.'; +?> diff --git a/interface/web/admin/lib/lang/hu_directive_snippets_list.lng b/interface/web/admin/lib/lang/hu_directive_snippets_list.lng index 702e7e2504..4124ea3464 100644 --- a/interface/web/admin/lib/lang/hu_directive_snippets_list.lng +++ b/interface/web/admin/lib/lang/hu_directive_snippets_list.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Directive Snippets'; +$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/hu_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng index c3a6806a84..7cb7938603 100644 --- a/interface/web/admin/lib/lang/hu_server_config.lng +++ b/interface/web/admin/lib/lang/hu_server_config.lng @@ -170,4 +170,7 @@ $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['v6_prefix_txt'] = 'IPv6 Prefix'; +$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror'; +$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.'; ?> diff --git a/interface/web/admin/lib/lang/hu_system_config.lng b/interface/web/admin/lib/lang/hu_system_config.lng index 582c2e7832..e2e189bfeb 100644 --- a/interface/web/admin/lib/lang/hu_system_config.lng +++ b/interface/web/admin/lib/lang/hu_system_config.lng @@ -41,4 +41,9 @@ $wb['tab_change_warning_txt'] = 'Tab change warning'; $wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.'; $wb['vhost_subdomains_txt'] = 'Create Subdomains as web site'; $wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!'; +$wb['phpmyadmin_url_error_regex'] = 'Invalid phpmyadmin URL'; +$wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; +$wb['use_loadindicator_txt'] = 'Use Load Indicator'; +$wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; +$wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; ?> diff --git a/interface/web/admin/lib/lang/hu_users.lng b/interface/web/admin/lib/lang/hu_users.lng index c9852bd078..9ffde21701 100644 --- a/interface/web/admin/lib/lang/hu_users.lng +++ b/interface/web/admin/lib/lang/hu_users.lng @@ -29,4 +29,5 @@ $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.\"'; ?> diff --git a/interface/web/admin/lib/lang/id_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng index 34ea127fe8..c875b78122 100644 --- a/interface/web/admin/lib/lang/id_server_config.lng +++ b/interface/web/admin/lib/lang/id_server_config.lng @@ -170,4 +170,7 @@ $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['v6_prefix_txt'] = 'IPv6 Prefix'; +$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror'; +$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.'; ?> diff --git a/interface/web/admin/lib/lang/id_system_config.lng b/interface/web/admin/lib/lang/id_system_config.lng index 218cc64875..66eb60503b 100644 --- a/interface/web/admin/lib/lang/id_system_config.lng +++ b/interface/web/admin/lib/lang/id_system_config.lng @@ -41,4 +41,9 @@ $wb['tab_change_warning_txt'] = 'Tab change warning'; $wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.'; $wb['vhost_subdomains_txt'] = 'Create Subdomains as web site'; $wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!'; +$wb['phpmyadmin_url_error_regex'] = 'Invalid phpmyadmin URL'; +$wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; +$wb['use_loadindicator_txt'] = 'Use Load Indicator'; +$wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; +$wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; ?> diff --git a/interface/web/admin/lib/lang/id_users.lng b/interface/web/admin/lib/lang/id_users.lng index 300d699d34..1703841da2 100644 --- a/interface/web/admin/lib/lang/id_users.lng +++ b/interface/web/admin/lib/lang/id_users.lng @@ -29,4 +29,5 @@ $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.\"'; ?> diff --git a/interface/web/admin/lib/lang/it_directive_snippets.lng b/interface/web/admin/lib/lang/it_directive_snippets.lng index ee40ab06f9..d836ab0da0 100644 --- a/interface/web/admin/lib/lang/it_directive_snippets.lng +++ b/interface/web/admin/lib/lang/it_directive_snippets.lng @@ -1,9 +1,9 @@ \ No newline at end of file +$wb['Directive Snippets'] = 'Directive Snippets'; +$wb['name_txt'] = 'Name of Snippet'; +$wb['type_txt'] = 'Type'; +$wb['snippet_txt'] = '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.'; +?> diff --git a/interface/web/admin/lib/lang/it_directive_snippets_list.lng b/interface/web/admin/lib/lang/it_directive_snippets_list.lng index 702e7e2504..4124ea3464 100644 --- a/interface/web/admin/lib/lang/it_directive_snippets_list.lng +++ b/interface/web/admin/lib/lang/it_directive_snippets_list.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Directive Snippets'; +$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/it_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng index 9a32425b42..0b5e31f45c 100644 --- a/interface/web/admin/lib/lang/it_server_config.lng +++ b/interface/web/admin/lib/lang/it_server_config.lng @@ -170,4 +170,7 @@ $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['v6_prefix_txt'] = 'IPv6 Prefix'; +$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror'; +$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.'; ?> diff --git a/interface/web/admin/lib/lang/it_system_config.lng b/interface/web/admin/lib/lang/it_system_config.lng index 215c8a8857..33b3aa38eb 100644 --- a/interface/web/admin/lib/lang/it_system_config.lng +++ b/interface/web/admin/lib/lang/it_system_config.lng @@ -41,4 +41,9 @@ $wb['tab_change_warning_txt'] = 'Tab change warning'; $wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.'; $wb['vhost_subdomains_txt'] = 'Create Subdomains as web site'; $wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!'; +$wb['phpmyadmin_url_error_regex'] = 'Invalid phpmyadmin URL'; +$wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; +$wb['use_loadindicator_txt'] = 'Use Load Indicator'; +$wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; +$wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; ?> diff --git a/interface/web/admin/lib/lang/it_users.lng b/interface/web/admin/lib/lang/it_users.lng index 842a324c49..3e141ed436 100644 --- a/interface/web/admin/lib/lang/it_users.lng +++ b/interface/web/admin/lib/lang/it_users.lng @@ -29,4 +29,5 @@ $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.\"'; ?> diff --git a/interface/web/admin/lib/lang/ja_directive_snippets.lng b/interface/web/admin/lib/lang/ja_directive_snippets.lng index ee40ab06f9..d836ab0da0 100644 --- a/interface/web/admin/lib/lang/ja_directive_snippets.lng +++ b/interface/web/admin/lib/lang/ja_directive_snippets.lng @@ -1,9 +1,9 @@ \ No newline at end of file +$wb['Directive Snippets'] = 'Directive Snippets'; +$wb['name_txt'] = 'Name of Snippet'; +$wb['type_txt'] = 'Type'; +$wb['snippet_txt'] = '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.'; +?> diff --git a/interface/web/admin/lib/lang/ja_directive_snippets_list.lng b/interface/web/admin/lib/lang/ja_directive_snippets_list.lng index 702e7e2504..4124ea3464 100644 --- a/interface/web/admin/lib/lang/ja_directive_snippets_list.lng +++ b/interface/web/admin/lib/lang/ja_directive_snippets_list.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Directive Snippets'; +$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/ja_server_config.lng b/interface/web/admin/lib/lang/ja_server_config.lng index 2cd8c38a31..09536687f4 100644 --- a/interface/web/admin/lib/lang/ja_server_config.lng +++ b/interface/web/admin/lib/lang/ja_server_config.lng @@ -170,4 +170,7 @@ $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['v6_prefix_txt'] = 'IPv6 Prefix'; +$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror'; +$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.'; ?> diff --git a/interface/web/admin/lib/lang/ja_system_config.lng b/interface/web/admin/lib/lang/ja_system_config.lng index 7e950f8791..15b4d3c5be 100644 --- a/interface/web/admin/lib/lang/ja_system_config.lng +++ b/interface/web/admin/lib/lang/ja_system_config.lng @@ -41,4 +41,9 @@ $wb['tab_change_warning_txt'] = 'Tab change warning'; $wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.'; $wb['vhost_subdomains_txt'] = 'Create Subdomains as web site'; $wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!'; +$wb['phpmyadmin_url_error_regex'] = 'Invalid phpmyadmin URL'; +$wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; +$wb['use_loadindicator_txt'] = 'Use Load Indicator'; +$wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; +$wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; ?> diff --git a/interface/web/admin/lib/lang/ja_users.lng b/interface/web/admin/lib/lang/ja_users.lng index 5729018e77..d70389fe8a 100644 --- a/interface/web/admin/lib/lang/ja_users.lng +++ b/interface/web/admin/lib/lang/ja_users.lng @@ -29,4 +29,5 @@ $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.\"'; ?> diff --git a/interface/web/admin/lib/lang/nl_directive_snippets.lng b/interface/web/admin/lib/lang/nl_directive_snippets.lng index ee40ab06f9..d836ab0da0 100644 --- a/interface/web/admin/lib/lang/nl_directive_snippets.lng +++ b/interface/web/admin/lib/lang/nl_directive_snippets.lng @@ -1,9 +1,9 @@ \ No newline at end of file +$wb['Directive Snippets'] = 'Directive Snippets'; +$wb['name_txt'] = 'Name of Snippet'; +$wb['type_txt'] = 'Type'; +$wb['snippet_txt'] = '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.'; +?> diff --git a/interface/web/admin/lib/lang/nl_directive_snippets_list.lng b/interface/web/admin/lib/lang/nl_directive_snippets_list.lng index 702e7e2504..4124ea3464 100644 --- a/interface/web/admin/lib/lang/nl_directive_snippets_list.lng +++ b/interface/web/admin/lib/lang/nl_directive_snippets_list.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Directive Snippets'; +$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/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng index 4cb3092562..f178da32a6 100644 --- a/interface/web/admin/lib/lang/nl_server_config.lng +++ b/interface/web/admin/lib/lang/nl_server_config.lng @@ -170,4 +170,7 @@ $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['v6_prefix_txt'] = 'IPv6 Prefix'; +$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror'; +$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.'; ?> diff --git a/interface/web/admin/lib/lang/nl_system_config.lng b/interface/web/admin/lib/lang/nl_system_config.lng index 3ed66233cf..673664cc7b 100644 --- a/interface/web/admin/lib/lang/nl_system_config.lng +++ b/interface/web/admin/lib/lang/nl_system_config.lng @@ -41,4 +41,9 @@ $wb['tab_change_warning_txt'] = 'Tab change warning'; $wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.'; $wb['vhost_subdomains_txt'] = 'Create Subdomains as web site'; $wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!'; +$wb['phpmyadmin_url_error_regex'] = 'Invalid phpmyadmin URL'; +$wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; +$wb['use_loadindicator_txt'] = 'Use Load Indicator'; +$wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; +$wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; ?> diff --git a/interface/web/admin/lib/lang/nl_users.lng b/interface/web/admin/lib/lang/nl_users.lng index f516467033..613802f169 100644 --- a/interface/web/admin/lib/lang/nl_users.lng +++ b/interface/web/admin/lib/lang/nl_users.lng @@ -29,4 +29,5 @@ $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.\"'; ?> diff --git a/interface/web/admin/lib/lang/pl_directive_snippets.lng b/interface/web/admin/lib/lang/pl_directive_snippets.lng index ee40ab06f9..d836ab0da0 100644 --- a/interface/web/admin/lib/lang/pl_directive_snippets.lng +++ b/interface/web/admin/lib/lang/pl_directive_snippets.lng @@ -1,9 +1,9 @@ \ No newline at end of file +$wb['Directive Snippets'] = 'Directive Snippets'; +$wb['name_txt'] = 'Name of Snippet'; +$wb['type_txt'] = 'Type'; +$wb['snippet_txt'] = '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.'; +?> diff --git a/interface/web/admin/lib/lang/pl_directive_snippets_list.lng b/interface/web/admin/lib/lang/pl_directive_snippets_list.lng index 702e7e2504..4124ea3464 100644 --- a/interface/web/admin/lib/lang/pl_directive_snippets_list.lng +++ b/interface/web/admin/lib/lang/pl_directive_snippets_list.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Directive Snippets'; +$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/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng index ac1d280e28..586a64e0fc 100644 --- a/interface/web/admin/lib/lang/pl_server_config.lng +++ b/interface/web/admin/lib/lang/pl_server_config.lng @@ -170,4 +170,7 @@ $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['v6_prefix_txt'] = 'IPv6 Prefix'; +$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror'; +$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.'; ?> diff --git a/interface/web/admin/lib/lang/pl_system_config.lng b/interface/web/admin/lib/lang/pl_system_config.lng index 3437ed39c7..904c983888 100644 --- a/interface/web/admin/lib/lang/pl_system_config.lng +++ b/interface/web/admin/lib/lang/pl_system_config.lng @@ -41,4 +41,9 @@ $wb['tab_change_warning_txt'] = 'Tab change warning'; $wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.'; $wb['vhost_subdomains_txt'] = 'Create Subdomains as web site'; $wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!'; +$wb['phpmyadmin_url_error_regex'] = 'Invalid phpmyadmin URL'; +$wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; +$wb['use_loadindicator_txt'] = 'Use Load Indicator'; +$wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; +$wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; ?> diff --git a/interface/web/admin/lib/lang/pl_users.lng b/interface/web/admin/lib/lang/pl_users.lng index 666834394f..477eab2c40 100644 --- a/interface/web/admin/lib/lang/pl_users.lng +++ b/interface/web/admin/lib/lang/pl_users.lng @@ -29,4 +29,5 @@ $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.\"'; ?> diff --git a/interface/web/admin/lib/lang/pt_directive_snippets.lng b/interface/web/admin/lib/lang/pt_directive_snippets.lng index ee40ab06f9..d836ab0da0 100644 --- a/interface/web/admin/lib/lang/pt_directive_snippets.lng +++ b/interface/web/admin/lib/lang/pt_directive_snippets.lng @@ -1,9 +1,9 @@ \ No newline at end of file +$wb['Directive Snippets'] = 'Directive Snippets'; +$wb['name_txt'] = 'Name of Snippet'; +$wb['type_txt'] = 'Type'; +$wb['snippet_txt'] = '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.'; +?> diff --git a/interface/web/admin/lib/lang/pt_directive_snippets_list.lng b/interface/web/admin/lib/lang/pt_directive_snippets_list.lng index 702e7e2504..4124ea3464 100644 --- a/interface/web/admin/lib/lang/pt_directive_snippets_list.lng +++ b/interface/web/admin/lib/lang/pt_directive_snippets_list.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Directive Snippets'; +$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/pt_server_config.lng b/interface/web/admin/lib/lang/pt_server_config.lng index 3470e28a72..f434b0ffcb 100644 --- a/interface/web/admin/lib/lang/pt_server_config.lng +++ b/interface/web/admin/lib/lang/pt_server_config.lng @@ -170,4 +170,7 @@ $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['v6_prefix_txt'] = 'IPv6 Prefix'; +$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror'; +$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.'; ?> diff --git a/interface/web/admin/lib/lang/pt_system_config.lng b/interface/web/admin/lib/lang/pt_system_config.lng index c12685f8bc..2b32bab6ac 100644 --- a/interface/web/admin/lib/lang/pt_system_config.lng +++ b/interface/web/admin/lib/lang/pt_system_config.lng @@ -41,4 +41,9 @@ $wb['tab_change_warning_txt'] = 'Tab change warning'; $wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.'; $wb['vhost_subdomains_txt'] = 'Create Subdomains as web site'; $wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!'; +$wb['phpmyadmin_url_error_regex'] = 'Invalid phpmyadmin URL'; +$wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; +$wb['use_loadindicator_txt'] = 'Use Load Indicator'; +$wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; +$wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; ?> diff --git a/interface/web/admin/lib/lang/pt_users.lng b/interface/web/admin/lib/lang/pt_users.lng index 345af4c73d..e09048d6c2 100644 --- a/interface/web/admin/lib/lang/pt_users.lng +++ b/interface/web/admin/lib/lang/pt_users.lng @@ -29,4 +29,5 @@ $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.\"'; ?> diff --git a/interface/web/admin/lib/lang/ro_directive_snippets.lng b/interface/web/admin/lib/lang/ro_directive_snippets.lng index ee40ab06f9..d836ab0da0 100644 --- a/interface/web/admin/lib/lang/ro_directive_snippets.lng +++ b/interface/web/admin/lib/lang/ro_directive_snippets.lng @@ -1,9 +1,9 @@ \ No newline at end of file +$wb['Directive Snippets'] = 'Directive Snippets'; +$wb['name_txt'] = 'Name of Snippet'; +$wb['type_txt'] = 'Type'; +$wb['snippet_txt'] = '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.'; +?> diff --git a/interface/web/admin/lib/lang/ro_directive_snippets_list.lng b/interface/web/admin/lib/lang/ro_directive_snippets_list.lng index 702e7e2504..4124ea3464 100644 --- a/interface/web/admin/lib/lang/ro_directive_snippets_list.lng +++ b/interface/web/admin/lib/lang/ro_directive_snippets_list.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Directive Snippets'; +$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/ro_server_config.lng b/interface/web/admin/lib/lang/ro_server_config.lng index 56ce46cc5a..26f1b89cc6 100644 --- a/interface/web/admin/lib/lang/ro_server_config.lng +++ b/interface/web/admin/lib/lang/ro_server_config.lng @@ -170,4 +170,7 @@ $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['v6_prefix_txt'] = 'IPv6 Prefix'; +$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror'; +$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.'; ?> diff --git a/interface/web/admin/lib/lang/ro_system_config.lng b/interface/web/admin/lib/lang/ro_system_config.lng index 9bfdf76c7e..86887aed3f 100644 --- a/interface/web/admin/lib/lang/ro_system_config.lng +++ b/interface/web/admin/lib/lang/ro_system_config.lng @@ -41,4 +41,9 @@ $wb['tab_change_warning_txt'] = 'Tab change warning'; $wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.'; $wb['vhost_subdomains_txt'] = 'Create Subdomains as web site'; $wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!'; +$wb['phpmyadmin_url_error_regex'] = 'Invalid phpmyadmin URL'; +$wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; +$wb['use_loadindicator_txt'] = 'Use Load Indicator'; +$wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; +$wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; ?> diff --git a/interface/web/admin/lib/lang/ro_users.lng b/interface/web/admin/lib/lang/ro_users.lng index 06474e0129..8abda49849 100644 --- a/interface/web/admin/lib/lang/ro_users.lng +++ b/interface/web/admin/lib/lang/ro_users.lng @@ -29,4 +29,5 @@ $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.\"'; ?> diff --git a/interface/web/admin/lib/lang/ru_directive_snippets.lng b/interface/web/admin/lib/lang/ru_directive_snippets.lng index ee40ab06f9..d836ab0da0 100644 --- a/interface/web/admin/lib/lang/ru_directive_snippets.lng +++ b/interface/web/admin/lib/lang/ru_directive_snippets.lng @@ -1,9 +1,9 @@ \ No newline at end of file +$wb['Directive Snippets'] = 'Directive Snippets'; +$wb['name_txt'] = 'Name of Snippet'; +$wb['type_txt'] = 'Type'; +$wb['snippet_txt'] = '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.'; +?> diff --git a/interface/web/admin/lib/lang/ru_directive_snippets_list.lng b/interface/web/admin/lib/lang/ru_directive_snippets_list.lng index 702e7e2504..4124ea3464 100644 --- a/interface/web/admin/lib/lang/ru_directive_snippets_list.lng +++ b/interface/web/admin/lib/lang/ru_directive_snippets_list.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Directive Snippets'; +$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/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng index fd76bf6db6..8745232546 100644 --- a/interface/web/admin/lib/lang/ru_server_config.lng +++ b/interface/web/admin/lib/lang/ru_server_config.lng @@ -170,4 +170,7 @@ $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['v6_prefix_txt'] = 'IPv6 Prefix'; +$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror'; +$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.'; ?> diff --git a/interface/web/admin/lib/lang/ru_system_config.lng b/interface/web/admin/lib/lang/ru_system_config.lng index 39b7139e67..c17a0086e4 100644 --- a/interface/web/admin/lib/lang/ru_system_config.lng +++ b/interface/web/admin/lib/lang/ru_system_config.lng @@ -41,4 +41,9 @@ $wb['tab_change_warning_txt'] = 'Tab change warning'; $wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.'; $wb['vhost_subdomains_txt'] = 'Create Subdomains as web site'; $wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!'; +$wb['phpmyadmin_url_error_regex'] = 'Invalid phpmyadmin URL'; +$wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; +$wb['use_loadindicator_txt'] = 'Use Load Indicator'; +$wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; +$wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; ?> diff --git a/interface/web/admin/lib/lang/ru_users.lng b/interface/web/admin/lib/lang/ru_users.lng index 722cf479cf..6156d22359 100644 --- a/interface/web/admin/lib/lang/ru_users.lng +++ b/interface/web/admin/lib/lang/ru_users.lng @@ -29,4 +29,5 @@ $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.\"'; ?> diff --git a/interface/web/admin/lib/lang/se_directive_snippets.lng b/interface/web/admin/lib/lang/se_directive_snippets.lng index ee40ab06f9..d836ab0da0 100644 --- a/interface/web/admin/lib/lang/se_directive_snippets.lng +++ b/interface/web/admin/lib/lang/se_directive_snippets.lng @@ -1,9 +1,9 @@ \ No newline at end of file +$wb['Directive Snippets'] = 'Directive Snippets'; +$wb['name_txt'] = 'Name of Snippet'; +$wb['type_txt'] = 'Type'; +$wb['snippet_txt'] = '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.'; +?> diff --git a/interface/web/admin/lib/lang/se_directive_snippets_list.lng b/interface/web/admin/lib/lang/se_directive_snippets_list.lng index 702e7e2504..4124ea3464 100644 --- a/interface/web/admin/lib/lang/se_directive_snippets_list.lng +++ b/interface/web/admin/lib/lang/se_directive_snippets_list.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Directive Snippets'; +$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/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng index 0d16cedb90..5baef7e364 100644 --- a/interface/web/admin/lib/lang/se_server_config.lng +++ b/interface/web/admin/lib/lang/se_server_config.lng @@ -170,4 +170,7 @@ $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['v6_prefix_txt'] = 'IPv6 Prefix'; +$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror'; +$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.'; ?> diff --git a/interface/web/admin/lib/lang/se_system_config.lng b/interface/web/admin/lib/lang/se_system_config.lng index 9bfdf76c7e..86887aed3f 100644 --- a/interface/web/admin/lib/lang/se_system_config.lng +++ b/interface/web/admin/lib/lang/se_system_config.lng @@ -41,4 +41,9 @@ $wb['tab_change_warning_txt'] = 'Tab change warning'; $wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.'; $wb['vhost_subdomains_txt'] = 'Create Subdomains as web site'; $wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!'; +$wb['phpmyadmin_url_error_regex'] = 'Invalid phpmyadmin URL'; +$wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; +$wb['use_loadindicator_txt'] = 'Use Load Indicator'; +$wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; +$wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; ?> diff --git a/interface/web/admin/lib/lang/se_users.lng b/interface/web/admin/lib/lang/se_users.lng index 9b60363ddd..5d92d301df 100644 --- a/interface/web/admin/lib/lang/se_users.lng +++ b/interface/web/admin/lib/lang/se_users.lng @@ -29,4 +29,5 @@ $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.\"'; ?> diff --git a/interface/web/admin/lib/lang/sk_directive_snippets.lng b/interface/web/admin/lib/lang/sk_directive_snippets.lng index ee40ab06f9..d836ab0da0 100644 --- a/interface/web/admin/lib/lang/sk_directive_snippets.lng +++ b/interface/web/admin/lib/lang/sk_directive_snippets.lng @@ -1,9 +1,9 @@ \ No newline at end of file +$wb['Directive Snippets'] = 'Directive Snippets'; +$wb['name_txt'] = 'Name of Snippet'; +$wb['type_txt'] = 'Type'; +$wb['snippet_txt'] = '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.'; +?> diff --git a/interface/web/admin/lib/lang/sk_directive_snippets_list.lng b/interface/web/admin/lib/lang/sk_directive_snippets_list.lng index 702e7e2504..4124ea3464 100644 --- a/interface/web/admin/lib/lang/sk_directive_snippets_list.lng +++ b/interface/web/admin/lib/lang/sk_directive_snippets_list.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Directive Snippets'; +$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/sk_server_config.lng b/interface/web/admin/lib/lang/sk_server_config.lng index d2f27c7cbe..92841b8c2d 100644 --- a/interface/web/admin/lib/lang/sk_server_config.lng +++ b/interface/web/admin/lib/lang/sk_server_config.lng @@ -170,4 +170,7 @@ $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['v6_prefix_txt'] = 'IPv6 Prefix'; +$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror'; +$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.'; ?> diff --git a/interface/web/admin/lib/lang/sk_system_config.lng b/interface/web/admin/lib/lang/sk_system_config.lng index 4be9ebdbad..f8c7b3cf12 100644 --- a/interface/web/admin/lib/lang/sk_system_config.lng +++ b/interface/web/admin/lib/lang/sk_system_config.lng @@ -41,4 +41,9 @@ $wb['tab_change_warning_txt'] = 'Tab change warning'; $wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.'; $wb['vhost_subdomains_txt'] = 'Create Subdomains as web site'; $wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!'; +$wb['phpmyadmin_url_error_regex'] = 'Invalid phpmyadmin URL'; +$wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; +$wb['use_loadindicator_txt'] = 'Use Load Indicator'; +$wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; +$wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; ?> diff --git a/interface/web/admin/lib/lang/sk_users.lng b/interface/web/admin/lib/lang/sk_users.lng index f81c830eb3..fc389c5562 100644 --- a/interface/web/admin/lib/lang/sk_users.lng +++ b/interface/web/admin/lib/lang/sk_users.lng @@ -29,4 +29,5 @@ $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.\"'; ?> diff --git a/interface/web/admin/lib/lang/tr_server_config.lng b/interface/web/admin/lib/lang/tr_server_config.lng index a949490201..c897210873 100644 --- a/interface/web/admin/lib/lang/tr_server_config.lng +++ b/interface/web/admin/lib/lang/tr_server_config.lng @@ -170,4 +170,7 @@ $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['v6_prefix_txt'] = 'IPv6 Prefix'; +$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror'; +$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.'; ?> diff --git a/interface/web/admin/lib/lang/tr_system_config.lng b/interface/web/admin/lib/lang/tr_system_config.lng index b07dfd47fe..0184815994 100644 --- a/interface/web/admin/lib/lang/tr_system_config.lng +++ b/interface/web/admin/lib/lang/tr_system_config.lng @@ -41,4 +41,9 @@ $wb['tab_change_warning_txt'] = 'Tab change warning'; $wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.'; $wb['vhost_subdomains_txt'] = 'Create Subdomains as web site'; $wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!'; +$wb['phpmyadmin_url_error_regex'] = 'Invalid phpmyadmin URL'; +$wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; +$wb['use_loadindicator_txt'] = 'Use Load Indicator'; +$wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; +$wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; ?> diff --git a/interface/web/admin/lib/lang/tr_users.lng b/interface/web/admin/lib/lang/tr_users.lng index 2541330448..455d8c7987 100644 --- a/interface/web/admin/lib/lang/tr_users.lng +++ b/interface/web/admin/lib/lang/tr_users.lng @@ -29,4 +29,5 @@ $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.\"'; ?> diff --git a/interface/web/admin/server_config_edit.php b/interface/web/admin/server_config_edit.php index c034da1550..2ebf0a1774 100644 --- a/interface/web/admin/server_config_edit.php +++ b/interface/web/admin/server_config_edit.php @@ -81,6 +81,16 @@ class page_action extends tform_actions { $server_id = $this->id; $server_config_array = $app->getconf->get_server_config($server_id); + + foreach($app->tform->formDef['tabs'][$section]['fields'] as $key => $field) { + if ($field['formtype'] == 'CHECKBOX') { + if($this->dataRecord[$key] == '') { + // if a checkbox is not set, we set it to the unchecked value + $this->dataRecord[$key] = $field['value'][0]; + } + } + } + $server_config_array[$section] = $app->tform->encode($this->dataRecord,$section); $server_config_str = $app->ini_parser->get_ini_string($server_config_array); diff --git a/interface/web/admin/system_config_edit.php b/interface/web/admin/system_config_edit.php index 0a75028d0c..b83e704d4a 100644 --- a/interface/web/admin/system_config_edit.php +++ b/interface/web/admin/system_config_edit.php @@ -50,6 +50,7 @@ $app->load('tform_actions'); class page_action extends tform_actions { + //var $_js_changed = false; function onShowEdit() { global $app, $conf; @@ -105,6 +106,22 @@ class page_action extends tform_actions { $section = $app->tform->getCurrentTab(); $server_config_array = $app->getconf->get_global_config(); + + foreach($app->tform->formDef['tabs'][$section]['fields'] as $key => $field) { + if ($field['formtype'] == 'CHECKBOX') { + if($this->dataRecord[$key] == '') { + // if a checkbox is not set, we set it to the unchecked value + $this->dataRecord[$key] = $field['value'][0]; + } + } + } + + /* + if((isset($this->dataRecord['use_loadindicator']) && $this->dataRecord['use_loadindicator'] != $server_config_array[$section]['use_loadindicator']) || (isset($this->dataRecord['use_combobox']) && $this->dataRecord['use_combobox'] != $server_config_array[$section]['use_combobox'])){ + $this->_js_changed = true; + } + */ + $new_config = $app->tform->encode($this->dataRecord,$section); if($section == 'sites' && $new_config['vhost_subdomains'] != 'y' && $server_config_array['vhost_subdomains'] == 'y') { // check for existing vhost subdomains, if found the mode cannot be disabled @@ -146,6 +163,17 @@ class page_action extends tform_actions { } } + /* + function onAfterUpdate() { + if($this->_js_changed == true) { + // not the best way, but it works + header('Content-Type: text/html'); + print ''; + exit; + } + } + */ + } $app->tform_actions = new page_action; diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm index 3b19161891..35b2ed4139 100644 --- a/interface/web/admin/templates/server_config_web_edit.htm +++ b/interface/web/admin/templates/server_config_web_edit.htm @@ -34,13 +34,15 @@
 {tmpl_var name='website_autoalias_note_txt'} [client_id], [client_username], [website_id], [website_domain] -
+ +
diff --git a/interface/web/admin/templates/system_config_misc_edit.htm b/interface/web/admin/templates/system_config_misc_edit.htm index 3bdd72ee90..16f6052c30 100644 --- a/interface/web/admin/templates/system_config_misc_edit.htm +++ b/interface/web/admin/templates/system_config_misc_edit.htm @@ -32,6 +32,18 @@
{tmpl_var name='tab_change_warning'}
{tmpl_var name='tab_change_warning_note_txt'}
+
+
+

{tmpl_var name='use_loadindicator_txt'}

+
+ {tmpl_var name='use_loadindicator'}
{tmpl_var name='f5_to_reload_js_txt'} +
+
+
+

{tmpl_var name='use_combobox_txt'}

+
+ {tmpl_var name='use_combobox'}
{tmpl_var name='f5_to_reload_js_txt'} +

{tmpl_var name='maintenance_mode_txt'}

diff --git a/interface/web/admin/templates/system_config_sites_edit.htm b/interface/web/admin/templates/system_config_sites_edit.htm index ba1796fcdd..8a97e52f88 100644 --- a/interface/web/admin/templates/system_config_sites_edit.htm +++ b/interface/web/admin/templates/system_config_sites_edit.htm @@ -44,6 +44,12 @@
{tmpl_var name='vhost_subdomains'} {tmpl_var name='vhost_subdomains_note_txt'}
+
+
+

{tmpl_var name='client_username_web_check_disabled_txt'}

+
+ {tmpl_var name='client_username_web_check_disabled'} +
diff --git a/interface/web/client/lib/lang/ar_client.lng b/interface/web/client/lib/lang/ar_client.lng index ed601bccae..aab26b28fd 100644 --- a/interface/web/client/lib/lang/ar_client.lng +++ b/interface/web/client/lib/lang/ar_client.lng @@ -137,4 +137,7 @@ $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.'; ?> diff --git a/interface/web/client/lib/lang/ar_clients_list.lng b/interface/web/client/lib/lang/ar_clients_list.lng index a1c0f8766b..f2c22fb8a5 100644 --- a/interface/web/client/lib/lang/ar_clients_list.lng +++ b/interface/web/client/lib/lang/ar_clients_list.lng @@ -7,4 +7,5 @@ $wb['city_txt'] = 'City'; $wb['country_txt'] = 'Country'; $wb['add_new_record_txt'] = 'Add new client'; $wb['username_txt'] = 'Username'; +$wb['customer_no_txt'] = 'Customer No.'; ?> diff --git a/interface/web/client/lib/lang/ar_reseller.lng b/interface/web/client/lib/lang/ar_reseller.lng index 98dacd971d..6d8f0e4d34 100644 --- a/interface/web/client/lib/lang/ar_reseller.lng +++ b/interface/web/client/lib/lang/ar_reseller.lng @@ -130,4 +130,13 @@ $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['bank_account_iban_txt'] = 'IBAN'; +$wb['bank_account_swift_txt'] = 'BIC / Swift'; ?> diff --git a/interface/web/client/lib/lang/ar_resellers_list.lng b/interface/web/client/lib/lang/ar_resellers_list.lng index 34d0896699..598342be9a 100644 --- a/interface/web/client/lib/lang/ar_resellers_list.lng +++ b/interface/web/client/lib/lang/ar_resellers_list.lng @@ -6,4 +6,6 @@ $wb['contact_name_txt'] = 'Contact name'; $wb['city_txt'] = 'City'; $wb['country_txt'] = 'Country'; $wb['add_new_record_txt'] = 'Add new reseller'; +$wb['customer_no_txt'] = 'Customer No.'; +$wb['username_txt'] = 'Username'; ?> diff --git a/interface/web/client/lib/lang/bg_client.lng b/interface/web/client/lib/lang/bg_client.lng index c959d52048..5b4e19ad66 100644 --- a/interface/web/client/lib/lang/bg_client.lng +++ b/interface/web/client/lib/lang/bg_client.lng @@ -137,4 +137,7 @@ $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.'; ?> diff --git a/interface/web/client/lib/lang/bg_clients_list.lng b/interface/web/client/lib/lang/bg_clients_list.lng index 7a83249763..b3ec44e034 100644 --- a/interface/web/client/lib/lang/bg_clients_list.lng +++ b/interface/web/client/lib/lang/bg_clients_list.lng @@ -7,4 +7,5 @@ $wb['city_txt'] = 'Град'; $wb['country_txt'] = 'Държава'; $wb['add_new_record_txt'] = 'Добави нов клиент'; $wb['username_txt'] = 'Потребителско име'; +$wb['customer_no_txt'] = 'Customer No.'; ?> diff --git a/interface/web/client/lib/lang/bg_reseller.lng b/interface/web/client/lib/lang/bg_reseller.lng index 5506da3af9..3c8a6da648 100644 --- a/interface/web/client/lib/lang/bg_reseller.lng +++ b/interface/web/client/lib/lang/bg_reseller.lng @@ -130,4 +130,13 @@ $wb['limit_wildcard_txt'] = 'Wildcard subdomain available'; $wb['limit_ssl_txt'] = 'SSL available'; $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['bank_account_iban_txt'] = 'IBAN'; +$wb['bank_account_swift_txt'] = 'BIC / Swift'; ?> diff --git a/interface/web/client/lib/lang/bg_resellers_list.lng b/interface/web/client/lib/lang/bg_resellers_list.lng index a51d5d5f42..cc0f5e1f48 100644 --- a/interface/web/client/lib/lang/bg_resellers_list.lng +++ b/interface/web/client/lib/lang/bg_resellers_list.lng @@ -6,4 +6,6 @@ $wb['contact_name_txt'] = 'Име за контакти'; $wb['city_txt'] = 'Град'; $wb['country_txt'] = 'Страна'; $wb['add_new_record_txt'] = 'Добави нов дилър'; +$wb['customer_no_txt'] = 'Customer No.'; +$wb['username_txt'] = 'Username'; ?> diff --git a/interface/web/client/lib/lang/br_client.lng b/interface/web/client/lib/lang/br_client.lng index b1aedcebfa..bbdcb0c692 100644 --- a/interface/web/client/lib/lang/br_client.lng +++ b/interface/web/client/lib/lang/br_client.lng @@ -137,4 +137,7 @@ $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.'; ?> diff --git a/interface/web/client/lib/lang/br_clients_list.lng b/interface/web/client/lib/lang/br_clients_list.lng index d0a4dbcc56..f16f6aee9e 100644 --- a/interface/web/client/lib/lang/br_clients_list.lng +++ b/interface/web/client/lib/lang/br_clients_list.lng @@ -7,4 +7,5 @@ $wb['city_txt'] = 'Cidade'; $wb['country_txt'] = 'País'; $wb['add_new_record_txt'] = 'Adcionar novo cliente'; $wb['username_txt'] = 'Username'; +$wb['customer_no_txt'] = 'Customer No.'; ?> diff --git a/interface/web/client/lib/lang/br_reseller.lng b/interface/web/client/lib/lang/br_reseller.lng index 4e21ef52fd..fc055df06b 100644 --- a/interface/web/client/lib/lang/br_reseller.lng +++ b/interface/web/client/lib/lang/br_reseller.lng @@ -130,4 +130,13 @@ $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['bank_account_iban_txt'] = 'IBAN'; +$wb['bank_account_swift_txt'] = 'BIC / Swift'; ?> diff --git a/interface/web/client/lib/lang/br_resellers_list.lng b/interface/web/client/lib/lang/br_resellers_list.lng index 053d7229d4..a57555f25d 100644 --- a/interface/web/client/lib/lang/br_resellers_list.lng +++ b/interface/web/client/lib/lang/br_resellers_list.lng @@ -6,4 +6,6 @@ $wb['contact_name_txt'] = 'Contato'; $wb['city_txt'] = 'Cidade'; $wb['country_txt'] = 'País'; $wb['add_new_record_txt'] = 'Adcionar um novo revendedor'; +$wb['customer_no_txt'] = 'Customer No.'; +$wb['username_txt'] = 'Username'; ?> diff --git a/interface/web/client/lib/lang/cz.lng b/interface/web/client/lib/lang/cz.lng index 80d90b1ab4..d9abdff460 100644 --- a/interface/web/client/lib/lang/cz.lng +++ b/interface/web/client/lib/lang/cz.lng @@ -1,5 +1,4 @@ '; +$wb['Client'] = 'Client'; ?> diff --git a/interface/web/client/lib/lang/cz_client.lng b/interface/web/client/lib/lang/cz_client.lng index 0d481e2a73..eb5e20d45b 100644 --- a/interface/web/client/lib/lang/cz_client.lng +++ b/interface/web/client/lib/lang/cz_client.lng @@ -8,11 +8,11 @@ $wb['limit_mailcatchall_txt'] = 'Max. počet emailových košů'; $wb['limit_mailrouting_txt'] = 'Max. počet emailových směrování'; $wb['limit_mailfilter_txt'] = 'Max. počet emailových filtrů'; $wb['limit_fetchmail_txt'] = 'Max. počet účtů externího získávání emailů'; -$wb['limit_mailquota_txt'] = 'Mailbox kvóta'; +$wb['limit_mailquota_txt'] = 'Kvóty poštovních schránek'; $wb['limit_spamfilter_wblist_txt'] = 'Max. počet spamfiltrových bílých / černých listinových filtrů'; $wb['limit_spamfilter_user_txt'] = 'Max. počet spamflitrových uživatelů'; $wb['limit_spamfilter_policy_txt'] = 'Max. počet spamfiltrových politik'; -$wb['default_mailserver_txt'] = 'Výchozí mailserver'; +$wb['default_mailserver_txt'] = 'Výchozí e-mailserver'; $wb['company_name_txt'] = 'Název společnosti'; $wb['contact_name_txt'] = 'Název kontaktu'; $wb['username_txt'] = 'Uživatelské jméno'; @@ -28,7 +28,7 @@ $wb['country_txt'] = 'Země'; $wb['telephone_txt'] = 'Telefon'; $wb['mobile_txt'] = 'Mobilní telefon'; $wb['fax_txt'] = 'Fax'; -$wb['email_txt'] = 'Kontaktní email na klienta'; +$wb['email_txt'] = 'Kontaktní e-mail na klienta'; $wb['internet_txt'] = 'WWW stránky klienta'; $wb['icq_txt'] = 'ICQ'; $wb['notes_txt'] = 'Poznámky'; @@ -88,18 +88,18 @@ $wb['username_error_regex'] = 'Uživatelské jméno obsahuje neplatné znaky.'; $wb['template_master_txt'] = 'Hlavní šablona'; $wb['template_additional_txt'] = 'Addon šablona'; $wb['ssh_chroot_txt'] = 'SSH chroot volby'; -$wb['web_php_options_txt'] = 'PHP volby'; -$wb['limit_client_error'] = 'Max. počet kleintů dosažen.'; -$wb['limit_web_quota_txt'] = 'Web kvóta'; +$wb['web_php_options_txt'] = 'PHP - dostupné volby pro klienta'; +$wb['limit_client_error'] = 'Max. počet klientů dosažen.'; +$wb['limit_web_quota_txt'] = 'Webová kvóta'; $wb['limit_traffic_quota_txt'] = 'Přenosová kvóta'; $wb['limit_trafficquota_error_notint'] = 'Přenosová kvót musí být číslo.'; -$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_webdav_user_txt'] = 'Max. počet WebDAV uživatelů'; +$wb['limit_webdav_user_error_notint'] = 'Limit pro WebDAV uživatele musí být číslo.'; $wb['customer_no_txt'] = 'Zákaznické číslo'; $wb['vat_id_txt'] = 'DIČ'; $wb['required_fields_txt'] = '* Povinná pole'; $wb['company_id_txt'] = 'IČO'; -$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists'; +$wb['limit_mailmailinglist_txt'] = 'Max. počet e-mailovových konferencí (mailinglist)'; $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'; @@ -107,34 +107,37 @@ $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['add_additional_template_txt'] = 'Přidat další šablonu'; +$wb['delete_additional_template_txt'] = 'Odstranit další šablonu'; +$wb['limit_cgi_txt'] = 'CGI - dostupná volba pro klienta'; +$wb['limit_ssi_txt'] = 'SSI - dostupná volba pro klienta'; +$wb['limit_perl_txt'] = 'Perl - dostupná volba pro klienta'; +$wb['limit_ruby_txt'] = 'Ruby - dostupná volba pro klienta'; +$wb['limit_python_txt'] = 'Python - dostupná volba pro klienta'; +$wb['force_suexec_txt'] = 'SuEXEC - vynucená volba u klienta'; $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'] = 'Číslo účtu'; +$wb['limit_ssl_txt'] = 'SSL - dostupná volba pro klienta'; +$wb['bank_account_number_txt'] = 'Číslo bankovního účtu'; $wb['bank_code_txt'] = 'Kód banky'; $wb['bank_name_txt'] = 'Název banky'; $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['web_limits_txt'] = 'Web nastavení limitů'; +$wb['email_limits_txt'] = 'E-mail nastavení limitů '; +$wb['database_limits_txt'] = 'Databáze nastavení limitů'; +$wb['cron_job_limits_txt'] = 'Cron úlohy nastavení limitů'; +$wb['dns_limits_txt'] = 'DNS nastavení limitů'; +$wb['virtualization_limits_txt'] = 'Virtualizace nastavení limitů'; $wb['generate_password_txt'] = 'Generovat heslo'; $wb['repeat_password_txt'] = 'Opakujte heslo'; $wb['password_mismatch_txt'] = 'Hesla se neshodují.'; $wb['password_match_txt'] = 'Hesla se shodují.'; $wb['active_template_additional_txt'] = 'Active Addons'; $wb['bank_account_owner_txt'] = 'Bankovní účet vlastníka'; -$wb['email_error_isemail'] = 'Please enter a valid email address.'; -$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).'; +$wb['email_error_isemail'] = 'Zadejte prosím platnou e-mailovou adresu.'; +$wb['customer_no_error_unique'] = 'Číslo zákazníka musí být unikátní (nebo prázdné).'; +$wb['paypal_email_error_isemail'] = 'Zadejte prosím platnou PayPal e-mailovou adresu.'; +$wb['paypal_email_txt'] = 'PayPal E-mail'; +$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/cz_client_circle.lng b/interface/web/client/lib/lang/cz_client_circle.lng index 7b89ab6eb5..107b2a559b 100644 --- a/interface/web/client/lib/lang/cz_client_circle.lng +++ b/interface/web/client/lib/lang/cz_client_circle.lng @@ -1,5 +1,5 @@ diff --git a/interface/web/client/lib/lang/cz_client_template.lng b/interface/web/client/lib/lang/cz_client_template.lng index 6413e36191..1877887e9a 100644 --- a/interface/web/client/lib/lang/cz_client_template.lng +++ b/interface/web/client/lib/lang/cz_client_template.lng @@ -9,7 +9,7 @@ $wb['limit_mailcatchall_txt'] = 'Max. počet emailových košů'; $wb['limit_mailrouting_txt'] = 'Max. počet emailových směrování'; $wb['limit_mailfilter_txt'] = 'Max. počet emailových filtrů'; $wb['limit_fetchmail_txt'] = 'Max. počet účtů externího získávání emailů'; -$wb['limit_mailquota_txt'] = 'Mailbox kvóta'; +$wb['limit_mailquota_txt'] = 'Kvóty poštovních schránek'; $wb['limit_spamfilter_wblist_txt'] = 'Max. počet spamfiltrových bílých / černých listinových filtrů'; $wb['limit_spamfilter_user_txt'] = 'Max. počet spamflitrových uživatelů'; $wb['limit_spamfilter_policy_txt'] = 'Max. počet spamfiltrových politik'; @@ -66,22 +66,22 @@ $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['web_php_options_txt'] = 'PHP - dostupné volby pro klienta'; +$wb['template_type_txt'] = 'Typ šablony'; +$wb['template_name_txt'] = 'Název šablony'; +$wb['limit_cgi_txt'] = 'CGI - dostupná volba pro klienta'; +$wb['limit_ssi_txt'] = 'SSI - dostupná volba pro klienta'; +$wb['limit_perl_txt'] = 'Perl - dostupná volba pro klienta'; +$wb['limit_ruby_txt'] = 'Ruby - dostupná volba pro klienta'; +$wb['limit_python_txt'] = 'Python - dostupná volba pro klienta'; +$wb['force_suexec_txt'] = 'SuEXEC - vynucená volba u klienta'; $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['limit_ssl_txt'] = 'SSL - dostupná volba pro klienta'; +$wb['web_limits_txt'] = 'Web nastavení limitů'; +$wb['email_limits_txt'] = 'E-mail nastavení limitů'; +$wb['database_limits_txt'] = 'Databáze nastavení limitů'; +$wb['cron_job_limits_txt'] = 'Cron úlohy nastavení limitů'; +$wb['dns_limits_txt'] = 'DNS nastavení limitů'; +$wb['virtualization_limits_txt'] = 'Virtualizace nastavení limitů'; ?> diff --git a/interface/web/client/lib/lang/cz_clients_list.lng b/interface/web/client/lib/lang/cz_clients_list.lng index fc6d48eb8d..f2f92b88eb 100644 --- a/interface/web/client/lib/lang/cz_clients_list.lng +++ b/interface/web/client/lib/lang/cz_clients_list.lng @@ -6,5 +6,6 @@ $wb['contact_name_txt'] = 'Název kontaktu'; $wb['city_txt'] = 'Město'; $wb['country_txt'] = 'Stát'; $wb['add_new_record_txt'] = 'Přidat klienta'; -$wb['username_txt'] = 'Username'; +$wb['username_txt'] = 'Uživatelské jméno'; +$wb['customer_no_txt'] = 'Customer No.'; ?> diff --git a/interface/web/client/lib/lang/cz_domain.lng b/interface/web/client/lib/lang/cz_domain.lng index a66a2258af..4b1845bc26 100644 --- a/interface/web/client/lib/lang/cz_domain.lng +++ b/interface/web/client/lib/lang/cz_domain.lng @@ -1,6 +1,6 @@ diff --git a/interface/web/client/lib/lang/cz_domain_list.lng b/interface/web/client/lib/lang/cz_domain_list.lng index d2262b61f5..6cf7376bd4 100644 --- a/interface/web/client/lib/lang/cz_domain_list.lng +++ b/interface/web/client/lib/lang/cz_domain_list.lng @@ -1,6 +1,6 @@ diff --git a/interface/web/client/lib/lang/cz_reseller.lng b/interface/web/client/lib/lang/cz_reseller.lng index 0d7f2a6ec7..d8703fbbb5 100644 --- a/interface/web/client/lib/lang/cz_reseller.lng +++ b/interface/web/client/lib/lang/cz_reseller.lng @@ -1,13 +1,13 @@ diff --git a/interface/web/client/lib/lang/cz_resellers_list.lng b/interface/web/client/lib/lang/cz_resellers_list.lng index 8d85b8019c..c14cee7b93 100644 --- a/interface/web/client/lib/lang/cz_resellers_list.lng +++ b/interface/web/client/lib/lang/cz_resellers_list.lng @@ -6,4 +6,6 @@ $wb['contact_name_txt'] = 'Název kontaktu'; $wb['city_txt'] = 'Město'; $wb['country_txt'] = 'Stát'; $wb['add_new_record_txt'] = 'Přidat distributora'; +$wb['customer_no_txt'] = 'Customer No.'; +$wb['username_txt'] = 'Username'; ?> diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng index 4728d3e2ba..1f752efd9f 100644 --- a/interface/web/client/lib/lang/de_client.lng +++ b/interface/web/client/lib/lang/de_client.lng @@ -139,4 +139,5 @@ $wb['customer_no_error_unique'] = 'Die Kundennummer muß einzigartig sein (oder $wb['email_error_isemail'] = 'Bitte geben Sie eine gültige Email-Adresse an.'; $wb['paypal_email_error_isemail'] = 'Bitte geben Sie eine gültige PayPal-E-Mail-Adresse an.'; $wb['paypal_email_txt'] = 'PayPal-E-Mail'; +$wb['err_msg_master_tpl_set'] = 'Die hier eingestellten Werte werden ignoriert, wenn als Mastervorlage nicht \"Custom\" gewählt ist.'; ?> diff --git a/interface/web/client/lib/lang/de_clients_list.lng b/interface/web/client/lib/lang/de_clients_list.lng index 44c42cd2e6..a6bdd6a205 100644 --- a/interface/web/client/lib/lang/de_clients_list.lng +++ b/interface/web/client/lib/lang/de_clients_list.lng @@ -7,4 +7,5 @@ $wb['city_txt'] = 'Ort'; $wb['country_txt'] = 'Land'; $wb['add_new_record_txt'] = 'Kunden hinzufügen'; $wb['username_txt'] = 'Benutzername'; +$wb['customer_no_txt'] = 'Kundennummer'; ?> diff --git a/interface/web/client/lib/lang/de_resellers_list.lng b/interface/web/client/lib/lang/de_resellers_list.lng index f9084e0eba..0f688c54b5 100644 --- a/interface/web/client/lib/lang/de_resellers_list.lng +++ b/interface/web/client/lib/lang/de_resellers_list.lng @@ -6,4 +6,6 @@ $wb['contact_name_txt'] = 'Kontakt'; $wb['city_txt'] = 'Ort'; $wb['country_txt'] = 'Land'; $wb['add_new_record_txt'] = 'Neuen Reseller hinzufügen'; +$wb['customer_no_txt'] = 'Kundennummer'; +$wb['username_txt'] = 'Benutzername'; ?> diff --git a/interface/web/client/lib/lang/el_client.lng b/interface/web/client/lib/lang/el_client.lng index 9334c3dd32..641746e480 100644 --- a/interface/web/client/lib/lang/el_client.lng +++ b/interface/web/client/lib/lang/el_client.lng @@ -137,4 +137,7 @@ $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.'; ?> diff --git a/interface/web/client/lib/lang/el_clients_list.lng b/interface/web/client/lib/lang/el_clients_list.lng index 5b80e283da..56abc6218b 100644 --- a/interface/web/client/lib/lang/el_clients_list.lng +++ b/interface/web/client/lib/lang/el_clients_list.lng @@ -7,4 +7,5 @@ $wb['city_txt'] = 'Πόλη'; $wb['country_txt'] = 'Χώρα'; $wb['add_new_record_txt'] = 'Νέος Πελάτης'; $wb['username_txt'] = 'Username'; +$wb['customer_no_txt'] = 'Customer No.'; ?> diff --git a/interface/web/client/lib/lang/el_reseller.lng b/interface/web/client/lib/lang/el_reseller.lng index 8f96b30d7f..246299979e 100644 --- a/interface/web/client/lib/lang/el_reseller.lng +++ b/interface/web/client/lib/lang/el_reseller.lng @@ -130,4 +130,13 @@ $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['bank_account_iban_txt'] = 'IBAN'; +$wb['bank_account_swift_txt'] = 'BIC / Swift'; ?> diff --git a/interface/web/client/lib/lang/el_resellers_list.lng b/interface/web/client/lib/lang/el_resellers_list.lng index 78f7c23892..74edc051a6 100644 --- a/interface/web/client/lib/lang/el_resellers_list.lng +++ b/interface/web/client/lib/lang/el_resellers_list.lng @@ -6,4 +6,6 @@ $wb['contact_name_txt'] = 'Πρόσωπο Επικοινωνίας'; $wb['city_txt'] = 'Πόλη'; $wb['country_txt'] = 'Χώρα'; $wb['add_new_record_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 bae3df65d6..62ad8415e2 100644 --- a/interface/web/client/lib/lang/en_client.lng +++ b/interface/web/client/lib/lang/en_client.lng @@ -12,7 +12,7 @@ $wb["limit_fetchmail_txt"] = 'Max. number of fetchmail accounts'; $wb["limit_mailquota_txt"] = 'Mailbox quota'; $wb["limit_spamfilter_wblist_txt"] = 'Max. number of spamfilter white / blacklist filters'; $wb["limit_spamfilter_user_txt"] = 'Max. number of spamfilter users'; -$wb["limit_spamfilter_policy_txt"] = 'Max. number of spamfilter policys'; +$wb["limit_spamfilter_policy_txt"] = 'Max. number of spamfilter policies'; $wb["default_mailserver_txt"] = 'Default Mailserver'; $wb["company_name_txt"] = 'Company name'; $wb["contact_name_txt"] = 'Contact name'; @@ -142,4 +142,5 @@ $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.'; ?> diff --git a/interface/web/client/lib/lang/en_client_template.lng b/interface/web/client/lib/lang/en_client_template.lng index 3303eaebc4..434f94e862 100644 --- a/interface/web/client/lib/lang/en_client_template.lng +++ b/interface/web/client/lib/lang/en_client_template.lng @@ -15,7 +15,7 @@ $wb["limit_fetchmail_txt"] = 'Max. number of fetchmail accounts'; $wb["limit_mailquota_txt"] = 'Mailbox quota'; $wb["limit_spamfilter_wblist_txt"] = 'Max. number of spamfilter white / blacklist filters'; $wb["limit_spamfilter_user_txt"] = 'Max. number of spamfilter users'; -$wb["limit_spamfilter_policy_txt"] = 'Max. number of spamfilter policys'; +$wb["limit_spamfilter_policy_txt"] = 'Max. number of spamfilter policies'; $wb["limit_domain_txt"] = 'limit_domain'; $wb["limit_subdomain_txt"] = 'limit_subdomain'; $wb["limit_webquota_txt"] = 'limit_webquota'; diff --git a/interface/web/client/lib/lang/en_clients_list.lng b/interface/web/client/lib/lang/en_clients_list.lng index 89764ab069..c9156d5c8c 100644 --- a/interface/web/client/lib/lang/en_clients_list.lng +++ b/interface/web/client/lib/lang/en_clients_list.lng @@ -7,4 +7,5 @@ $wb["username_txt"] = 'Username'; $wb["city_txt"] = 'City'; $wb["country_txt"] = 'Country'; $wb["add_new_record_txt"] = 'Add new client'; +$wb["customer_no_txt"] = 'Customer No.'; ?> \ No newline at end of file diff --git a/interface/web/client/lib/lang/en_resellers_list.lng b/interface/web/client/lib/lang/en_resellers_list.lng index 523a467c58..a7d2537a1d 100644 --- a/interface/web/client/lib/lang/en_resellers_list.lng +++ b/interface/web/client/lib/lang/en_resellers_list.lng @@ -6,4 +6,6 @@ $wb["contact_name_txt"] = 'Contact name'; $wb["city_txt"] = 'City'; $wb["country_txt"] = 'Country'; $wb["add_new_record_txt"] = 'Add new reseller'; +$wb["customer_no_txt"] = 'Customer No.'; +$wb["username_txt"] = 'Username'; ?> \ No newline at end of file diff --git a/interface/web/client/lib/lang/es.lng b/interface/web/client/lib/lang/es.lng index 608a16dcd7..fb636c358b 100644 --- a/interface/web/client/lib/lang/es.lng +++ b/interface/web/client/lib/lang/es.lng @@ -9,10 +9,10 @@ $wb['Edit Client-Templates'] = 'Editar plantillas de clientes'; $wb['Add Reseller'] = 'Añadir revendedor'; $wb['Edit Reseller'] = 'Editar revendedor'; $wb['Resellers'] = 'Revendedores'; -$wb['error_has_clients'] = 'This reseller has clients. Delete the clients of the reseller first.'; -$wb['add_additional_template_txt'] = 'Add additional template'; -$wb['delete_additional_template_txt'] = 'Delete additional template'; -$wb['Messaging'] = 'Messaging'; +$wb['error_has_clients'] = 'Este revendedor tiene clientes. Eliminar los clientes del revendedor primero.'; +$wb['add_additional_template_txt'] = 'Añadir plantilla adicional'; +$wb['delete_additional_template_txt'] = 'Eliminar plantilla adicional'; +$wb['Messaging'] = 'Mensajes'; $wb['Send email'] = 'Send Email'; $wb['Edit Client Circle'] = 'Edit Client Circle'; $wb['Domains'] = 'Domains'; diff --git a/interface/web/client/lib/lang/es_client.lng b/interface/web/client/lib/lang/es_client.lng index ed2117d1e5..c9255e8600 100644 --- a/interface/web/client/lib/lang/es_client.lng +++ b/interface/web/client/lib/lang/es_client.lng @@ -100,13 +100,14 @@ $wb['limit_webdav_user_error_notint'] = 'El límite de usuarios Webdav debe ser $wb['customer_no_txt'] = 'Número Cliente'; $wb['vat_id_txt'] = 'VAT ID'; $wb['required_fields_txt'] = '* Campos Requeridos'; -$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['limit_mailmailinglist_error_notint'] = 'El límite de registro de la lista de correo debe ser un número.'; +$wb['limit_openvz_vm_txt'] = 'Max. número de servidores virtuales'; +$wb['limit_openvz_vm_template_id_txt'] = 'Fuerza plantilla de servidor virtual'; +$wb['limit_openvz_vm_error_notint'] = 'El límite del servidor virtual debe ser un número.'; +$wb['web_php_options_notempty'] = 'No hay opción de PHP(s) seleccionado. Seleccione al menos una opción de PHP.'; +$wb['ssh_chroot_notempty'] = 'No hay opción chroot SSH seleccionado. Seleccione al menos una opción SSH.'; +$wb['username_error_collision'] = 'El nombre de usuario no puede comenzar con la palabra -web- o web- seguida de un número.'; +$wb['active_template_additional_txt'] = 'Active Addons'; $wb['add_additional_template_txt'] = 'Add additional template'; $wb['delete_additional_template_txt'] = 'Delete additional template'; $wb['limit_cgi_txt'] = 'CGI available'; @@ -119,6 +120,7 @@ $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_account_owner_txt'] = 'Bank account owner'; $wb['bank_code_txt'] = 'Bank code'; $wb['bank_name_txt'] = 'Bank name'; $wb['bank_account_iban_txt'] = 'IBAN'; @@ -133,8 +135,9 @@ $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.'; ?> diff --git a/interface/web/client/lib/lang/es_client_message.lng b/interface/web/client/lib/lang/es_client_message.lng index 12f491ec1d..413d471674 100644 --- a/interface/web/client/lib/lang/es_client_message.lng +++ b/interface/web/client/lib/lang/es_client_message.lng @@ -1,15 +1,15 @@ diff --git a/interface/web/client/lib/lang/es_reseller.lng b/interface/web/client/lib/lang/es_reseller.lng index 1b41712deb..a82a73386e 100644 --- a/interface/web/client/lib/lang/es_reseller.lng +++ b/interface/web/client/lib/lang/es_reseller.lng @@ -99,14 +99,14 @@ $wb['vat_id_txt'] = 'VAT ID'; $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['company_txt'] = 'Company'; -$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['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'; +$wb['limit_openvz_vm_template_id_txt'] = 'Fuerza plantilla de servidor virtual'; +$wb['limit_openvz_vm_error_notint'] = 'El límite del servidor virtual debe ser un número.'; +$wb['web_php_options_notempty'] = 'No hay opción de PHP (s) seleccionado. Seleccione al menos una opción de PHP.'; +$wb['ssh_chroot_notempty'] = 'No hay opción chroot SSH seleccionado. Seleccione al menos una opción SSH.'; +$wb['username_error_collision'] = 'El nombre de usuario no puede comenzar con la palabra -web- o -web- seguida de un número.'; $wb['add_additional_template_txt'] = 'Add additional template'; $wb['delete_additional_template_txt'] = 'Delete additional template'; $wb['limit_cgi_txt'] = 'CGI available'; @@ -130,4 +130,13 @@ $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['bank_account_iban_txt'] = 'IBAN'; +$wb['bank_account_swift_txt'] = 'BIC / Swift'; ?> diff --git a/interface/web/client/lib/lang/es_resellers_list.lng b/interface/web/client/lib/lang/es_resellers_list.lng index 797d9d07a2..0bcf4466b3 100644 --- a/interface/web/client/lib/lang/es_resellers_list.lng +++ b/interface/web/client/lib/lang/es_resellers_list.lng @@ -6,4 +6,6 @@ $wb['contact_name_txt'] = 'Nombre de contacto'; $wb['city_txt'] = 'Localidad'; $wb['country_txt'] = 'País'; $wb['add_new_record_txt'] = 'Añadir un nuevo revendedor'; +$wb['customer_no_txt'] = 'Customer No.'; +$wb['username_txt'] = 'Username'; ?> diff --git a/interface/web/client/lib/lang/fi_client.lng b/interface/web/client/lib/lang/fi_client.lng index 0a7850bdef..5908aa9c8b 100755 --- a/interface/web/client/lib/lang/fi_client.lng +++ b/interface/web/client/lib/lang/fi_client.lng @@ -137,4 +137,7 @@ $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.'; ?> diff --git a/interface/web/client/lib/lang/fi_clients_list.lng b/interface/web/client/lib/lang/fi_clients_list.lng index 55d2bb67c3..92999113bf 100755 --- a/interface/web/client/lib/lang/fi_clients_list.lng +++ b/interface/web/client/lib/lang/fi_clients_list.lng @@ -7,4 +7,5 @@ $wb['country_txt'] = 'Maa'; $wb['client_id_txt'] = 'Tunnus'; $wb['add_new_record_txt'] = 'Add new client'; $wb['username_txt'] = 'Username'; +$wb['customer_no_txt'] = 'Customer No.'; ?> diff --git a/interface/web/client/lib/lang/fi_reseller.lng b/interface/web/client/lib/lang/fi_reseller.lng index f805a724e1..35c2a67954 100644 --- a/interface/web/client/lib/lang/fi_reseller.lng +++ b/interface/web/client/lib/lang/fi_reseller.lng @@ -130,4 +130,13 @@ $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['bank_account_iban_txt'] = 'IBAN'; +$wb['bank_account_swift_txt'] = 'BIC / Swift'; ?> diff --git a/interface/web/client/lib/lang/fi_resellers_list.lng b/interface/web/client/lib/lang/fi_resellers_list.lng index c76661a938..95ca01ce6f 100644 --- a/interface/web/client/lib/lang/fi_resellers_list.lng +++ b/interface/web/client/lib/lang/fi_resellers_list.lng @@ -6,4 +6,6 @@ $wb['contact_name_txt'] = 'Yhteyshenkilö'; $wb['city_txt'] = 'Kaupunki'; $wb['country_txt'] = 'Maa'; $wb['add_new_record_txt'] = 'Lisää uusi jälleenmyyjä'; +$wb['customer_no_txt'] = 'Customer No.'; +$wb['username_txt'] = 'Username'; ?> diff --git a/interface/web/client/lib/lang/fr_client.lng b/interface/web/client/lib/lang/fr_client.lng index 3574d53be9..7a174e80f7 100644 --- a/interface/web/client/lib/lang/fr_client.lng +++ b/interface/web/client/lib/lang/fr_client.lng @@ -133,4 +133,11 @@ $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.'; ?> diff --git a/interface/web/client/lib/lang/fr_client_circle.lng b/interface/web/client/lib/lang/fr_client_circle.lng index 80fd704c08..f98a1447fc 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 @@ \ No newline at end of file +$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/fr_client_circle_list.lng b/interface/web/client/lib/lang/fr_client_circle_list.lng index 266aced829..00fd0b3998 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 @@ \ No newline at end of file +$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/fr_clients_list.lng b/interface/web/client/lib/lang/fr_clients_list.lng index 05d7cb9326..5252bc55ee 100644 --- a/interface/web/client/lib/lang/fr_clients_list.lng +++ b/interface/web/client/lib/lang/fr_clients_list.lng @@ -7,4 +7,5 @@ $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.'; ?> diff --git a/interface/web/client/lib/lang/fr_reseller.lng b/interface/web/client/lib/lang/fr_reseller.lng index 9b94eb9398..5c9699befa 100644 --- a/interface/web/client/lib/lang/fr_reseller.lng +++ b/interface/web/client/lib/lang/fr_reseller.lng @@ -128,4 +128,15 @@ $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['bank_account_iban_txt'] = 'IBAN'; +$wb['bank_account_swift_txt'] = 'BIC / Swift'; ?> diff --git a/interface/web/client/lib/lang/fr_resellers_list.lng b/interface/web/client/lib/lang/fr_resellers_list.lng index 954bd10eda..537600aa13 100644 --- a/interface/web/client/lib/lang/fr_resellers_list.lng +++ b/interface/web/client/lib/lang/fr_resellers_list.lng @@ -6,4 +6,6 @@ $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'; ?> diff --git a/interface/web/client/lib/lang/hr_client.lng b/interface/web/client/lib/lang/hr_client.lng index 2b329011d6..d6f3f76c3b 100644 --- a/interface/web/client/lib/lang/hr_client.lng +++ b/interface/web/client/lib/lang/hr_client.lng @@ -137,4 +137,7 @@ $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.'; ?> diff --git a/interface/web/client/lib/lang/hr_clients_list.lng b/interface/web/client/lib/lang/hr_clients_list.lng index 6039798e12..a733692285 100644 --- a/interface/web/client/lib/lang/hr_clients_list.lng +++ b/interface/web/client/lib/lang/hr_clients_list.lng @@ -7,4 +7,5 @@ $wb['city_txt'] = 'Grad'; $wb['country_txt'] = 'Država'; $wb['add_new_record_txt'] = 'Dodaj klijenta'; $wb['username_txt'] = 'Korisničko ime'; +$wb['customer_no_txt'] = 'Customer No.'; ?> diff --git a/interface/web/client/lib/lang/hr_reseller.lng b/interface/web/client/lib/lang/hr_reseller.lng index 29db6ef33a..d63005fcc2 100644 --- a/interface/web/client/lib/lang/hr_reseller.lng +++ b/interface/web/client/lib/lang/hr_reseller.lng @@ -130,4 +130,13 @@ $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['bank_account_iban_txt'] = 'IBAN'; +$wb['bank_account_swift_txt'] = 'BIC / Swift'; ?> diff --git a/interface/web/client/lib/lang/hr_resellers_list.lng b/interface/web/client/lib/lang/hr_resellers_list.lng index ebdf7dd43d..bd26b348ac 100644 --- a/interface/web/client/lib/lang/hr_resellers_list.lng +++ b/interface/web/client/lib/lang/hr_resellers_list.lng @@ -6,4 +6,6 @@ $wb['contact_name_txt'] = 'Kontakt osoba'; $wb['city_txt'] = 'Grad'; $wb['country_txt'] = 'Država'; $wb['add_new_record_txt'] = 'Dodaj novog preprodavača'; +$wb['customer_no_txt'] = 'Customer No.'; +$wb['username_txt'] = 'Username'; ?> diff --git a/interface/web/client/lib/lang/hu_client.lng b/interface/web/client/lib/lang/hu_client.lng index d5565405ec..5c7668fc03 100644 --- a/interface/web/client/lib/lang/hu_client.lng +++ b/interface/web/client/lib/lang/hu_client.lng @@ -137,4 +137,7 @@ $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.'; ?> diff --git a/interface/web/client/lib/lang/hu_clients_list.lng b/interface/web/client/lib/lang/hu_clients_list.lng index 9cba270de6..c4a0762ef8 100644 --- a/interface/web/client/lib/lang/hu_clients_list.lng +++ b/interface/web/client/lib/lang/hu_clients_list.lng @@ -7,4 +7,5 @@ $wb['city_txt'] = 'Város'; $wb['country_txt'] = 'Ország'; $wb['add_new_record_txt'] = 'Új Ügyfél hozzáadása'; $wb['username_txt'] = 'Username'; +$wb['customer_no_txt'] = 'Customer No.'; ?> diff --git a/interface/web/client/lib/lang/hu_reseller.lng b/interface/web/client/lib/lang/hu_reseller.lng index b978b314f1..47a08eb0bb 100644 --- a/interface/web/client/lib/lang/hu_reseller.lng +++ b/interface/web/client/lib/lang/hu_reseller.lng @@ -130,4 +130,13 @@ $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['bank_account_iban_txt'] = 'IBAN'; +$wb['bank_account_swift_txt'] = 'BIC / Swift'; ?> diff --git a/interface/web/client/lib/lang/hu_resellers_list.lng b/interface/web/client/lib/lang/hu_resellers_list.lng index b6cf589df9..0b16d9d079 100644 --- a/interface/web/client/lib/lang/hu_resellers_list.lng +++ b/interface/web/client/lib/lang/hu_resellers_list.lng @@ -6,4 +6,6 @@ $wb['contact_name_txt'] = 'Kapcsolattartó'; $wb['city_txt'] = 'Város'; $wb['country_txt'] = 'Ország'; $wb['add_new_record_txt'] = 'Új Viszonteladó'; +$wb['customer_no_txt'] = 'Customer No.'; +$wb['username_txt'] = 'Username'; ?> diff --git a/interface/web/client/lib/lang/id_client.lng b/interface/web/client/lib/lang/id_client.lng index 37859dd9f0..a346cd8b03 100644 --- a/interface/web/client/lib/lang/id_client.lng +++ b/interface/web/client/lib/lang/id_client.lng @@ -137,4 +137,7 @@ $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.'; ?> diff --git a/interface/web/client/lib/lang/id_clients_list.lng b/interface/web/client/lib/lang/id_clients_list.lng index 99ce4b5c73..380339fe8c 100644 --- a/interface/web/client/lib/lang/id_clients_list.lng +++ b/interface/web/client/lib/lang/id_clients_list.lng @@ -7,4 +7,5 @@ $wb['city_txt'] = 'Kota'; $wb['country_txt'] = 'Negara'; $wb['add_new_record_txt'] = 'Tambah Klien Baru'; $wb['username_txt'] = 'Username'; +$wb['customer_no_txt'] = 'Customer No.'; ?> diff --git a/interface/web/client/lib/lang/id_reseller.lng b/interface/web/client/lib/lang/id_reseller.lng index 2ff564b08b..b49f85aff3 100644 --- a/interface/web/client/lib/lang/id_reseller.lng +++ b/interface/web/client/lib/lang/id_reseller.lng @@ -130,4 +130,13 @@ $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['bank_account_iban_txt'] = 'IBAN'; +$wb['bank_account_swift_txt'] = 'BIC / Swift'; ?> diff --git a/interface/web/client/lib/lang/id_resellers_list.lng b/interface/web/client/lib/lang/id_resellers_list.lng index 8d06193cc7..05a792031a 100644 --- a/interface/web/client/lib/lang/id_resellers_list.lng +++ b/interface/web/client/lib/lang/id_resellers_list.lng @@ -6,4 +6,6 @@ $wb['contact_name_txt'] = 'Nama Kontak'; $wb['city_txt'] = 'Kota'; $wb['country_txt'] = 'Negara'; $wb['add_new_record_txt'] = 'Tambah Reseller Baru'; +$wb['customer_no_txt'] = 'Customer No.'; +$wb['username_txt'] = 'Username'; ?> diff --git a/interface/web/client/lib/lang/it_client.lng b/interface/web/client/lib/lang/it_client.lng index 7ed990bb46..9312ada551 100644 --- a/interface/web/client/lib/lang/it_client.lng +++ b/interface/web/client/lib/lang/it_client.lng @@ -137,4 +137,7 @@ $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.'; ?> diff --git a/interface/web/client/lib/lang/it_clients_list.lng b/interface/web/client/lib/lang/it_clients_list.lng index 9cf1a558e4..c924577a06 100644 --- a/interface/web/client/lib/lang/it_clients_list.lng +++ b/interface/web/client/lib/lang/it_clients_list.lng @@ -7,4 +7,5 @@ $wb['city_txt'] = 'Città'; $wb['country_txt'] = 'Stato'; $wb['add_new_record_txt'] = 'Aggiungi nuovo cliente'; $wb['username_txt'] = 'Username'; +$wb['customer_no_txt'] = 'Customer No.'; ?> diff --git a/interface/web/client/lib/lang/it_reseller.lng b/interface/web/client/lib/lang/it_reseller.lng index 98dacd971d..6d8f0e4d34 100644 --- a/interface/web/client/lib/lang/it_reseller.lng +++ b/interface/web/client/lib/lang/it_reseller.lng @@ -130,4 +130,13 @@ $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['bank_account_iban_txt'] = 'IBAN'; +$wb['bank_account_swift_txt'] = 'BIC / Swift'; ?> diff --git a/interface/web/client/lib/lang/it_resellers_list.lng b/interface/web/client/lib/lang/it_resellers_list.lng index 368a012631..3e74292053 100644 --- a/interface/web/client/lib/lang/it_resellers_list.lng +++ b/interface/web/client/lib/lang/it_resellers_list.lng @@ -6,4 +6,6 @@ $wb['contact_name_txt'] = 'Contatto'; $wb['city_txt'] = 'Città'; $wb['country_txt'] = 'Nazione'; $wb['add_new_record_txt'] = 'Aggiungi nuovo rivenditore'; +$wb['customer_no_txt'] = 'Customer No.'; +$wb['username_txt'] = 'Username'; ?> diff --git a/interface/web/client/lib/lang/ja_client.lng b/interface/web/client/lib/lang/ja_client.lng index 6d9efc94ba..74aa3409e8 100644 --- a/interface/web/client/lib/lang/ja_client.lng +++ b/interface/web/client/lib/lang/ja_client.lng @@ -137,4 +137,7 @@ $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.'; ?> diff --git a/interface/web/client/lib/lang/ja_clients_list.lng b/interface/web/client/lib/lang/ja_clients_list.lng index f6401cd9be..9bb5bbdffc 100644 --- a/interface/web/client/lib/lang/ja_clients_list.lng +++ b/interface/web/client/lib/lang/ja_clients_list.lng @@ -7,4 +7,5 @@ $wb['city_txt'] = '市区町村'; $wb['country_txt'] = '国'; $wb['add_new_record_txt'] = 'クライアントを追加する'; $wb['username_txt'] = 'Username'; +$wb['customer_no_txt'] = 'Customer No.'; ?> diff --git a/interface/web/client/lib/lang/ja_reseller.lng b/interface/web/client/lib/lang/ja_reseller.lng index 44fa319ee6..0d750b29c0 100644 --- a/interface/web/client/lib/lang/ja_reseller.lng +++ b/interface/web/client/lib/lang/ja_reseller.lng @@ -130,4 +130,13 @@ $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['bank_account_iban_txt'] = 'IBAN'; +$wb['bank_account_swift_txt'] = 'BIC / Swift'; ?> diff --git a/interface/web/client/lib/lang/ja_resellers_list.lng b/interface/web/client/lib/lang/ja_resellers_list.lng index 2f6e6ec945..bf37f09a4c 100644 --- a/interface/web/client/lib/lang/ja_resellers_list.lng +++ b/interface/web/client/lib/lang/ja_resellers_list.lng @@ -6,4 +6,6 @@ $wb['contact_name_txt'] = '担当者名'; $wb['city_txt'] = '市区町村'; $wb['country_txt'] = '国'; $wb['add_new_record_txt'] = 'リセラーを追加する'; +$wb['customer_no_txt'] = 'Customer No.'; +$wb['username_txt'] = 'Username'; ?> diff --git a/interface/web/client/lib/lang/nl_client.lng b/interface/web/client/lib/lang/nl_client.lng index 7472fb4141..62e43bc332 100644 --- a/interface/web/client/lib/lang/nl_client.lng +++ b/interface/web/client/lib/lang/nl_client.lng @@ -137,4 +137,7 @@ $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.'; ?> diff --git a/interface/web/client/lib/lang/nl_clients_list.lng b/interface/web/client/lib/lang/nl_clients_list.lng index 34183da0bd..25d537db8e 100644 --- a/interface/web/client/lib/lang/nl_clients_list.lng +++ b/interface/web/client/lib/lang/nl_clients_list.lng @@ -7,4 +7,5 @@ $wb['city_txt'] = 'Plaatsnaam'; $wb['country_txt'] = 'Land'; $wb['add_new_record_txt'] = 'Toevoegen nieuwe klant'; $wb['username_txt'] = 'Username'; +$wb['customer_no_txt'] = 'Customer No.'; ?> diff --git a/interface/web/client/lib/lang/nl_reseller.lng b/interface/web/client/lib/lang/nl_reseller.lng index 225f8daa10..96c8e62be3 100644 --- a/interface/web/client/lib/lang/nl_reseller.lng +++ b/interface/web/client/lib/lang/nl_reseller.lng @@ -130,4 +130,13 @@ $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['bank_account_iban_txt'] = 'IBAN'; +$wb['bank_account_swift_txt'] = 'BIC / Swift'; ?> diff --git a/interface/web/client/lib/lang/nl_resellers_list.lng b/interface/web/client/lib/lang/nl_resellers_list.lng index b030c6c92a..6360eecbe6 100644 --- a/interface/web/client/lib/lang/nl_resellers_list.lng +++ b/interface/web/client/lib/lang/nl_resellers_list.lng @@ -6,4 +6,6 @@ $wb['contact_name_txt'] = 'Contactnaam'; $wb['city_txt'] = 'Plaatsnaam'; $wb['country_txt'] = 'Land'; $wb['add_new_record_txt'] = 'Toevoegen nieuwe reseller'; +$wb['customer_no_txt'] = 'Customer No.'; +$wb['username_txt'] = 'Username'; ?> diff --git a/interface/web/client/lib/lang/pl_client.lng b/interface/web/client/lib/lang/pl_client.lng index e53b5a31f0..b7a5d339f5 100644 --- a/interface/web/client/lib/lang/pl_client.lng +++ b/interface/web/client/lib/lang/pl_client.lng @@ -137,4 +137,7 @@ $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.'; ?> diff --git a/interface/web/client/lib/lang/pl_clients_list.lng b/interface/web/client/lib/lang/pl_clients_list.lng index a9fad58597..026aecdfa4 100644 --- a/interface/web/client/lib/lang/pl_clients_list.lng +++ b/interface/web/client/lib/lang/pl_clients_list.lng @@ -7,4 +7,5 @@ $wb['city_txt'] = 'Miasto'; $wb['country_txt'] = 'Kraj'; $wb['add_new_record_txt'] = 'Dodaj nowego klienta'; $wb['username_txt'] = 'Login'; +$wb['customer_no_txt'] = 'Customer No.'; ?> diff --git a/interface/web/client/lib/lang/pl_reseller.lng b/interface/web/client/lib/lang/pl_reseller.lng index fc89794dcd..3145e59fc1 100644 --- a/interface/web/client/lib/lang/pl_reseller.lng +++ b/interface/web/client/lib/lang/pl_reseller.lng @@ -130,4 +130,13 @@ $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['bank_account_iban_txt'] = 'IBAN'; +$wb['bank_account_swift_txt'] = 'BIC / Swift'; ?> diff --git a/interface/web/client/lib/lang/pl_resellers_list.lng b/interface/web/client/lib/lang/pl_resellers_list.lng index fecbc20b4f..d26c35f9a9 100644 --- a/interface/web/client/lib/lang/pl_resellers_list.lng +++ b/interface/web/client/lib/lang/pl_resellers_list.lng @@ -6,4 +6,6 @@ $wb['contact_name_txt'] = 'Nazwa kontaktu'; $wb['city_txt'] = 'Miasto'; $wb['country_txt'] = 'Państwo'; $wb['add_new_record_txt'] = 'Dodaj nowego resellera'; +$wb['customer_no_txt'] = 'Customer No.'; +$wb['username_txt'] = 'Username'; ?> diff --git a/interface/web/client/lib/lang/pt_client.lng b/interface/web/client/lib/lang/pt_client.lng index db30f1c7e1..30283d5f2a 100644 --- a/interface/web/client/lib/lang/pt_client.lng +++ b/interface/web/client/lib/lang/pt_client.lng @@ -137,4 +137,7 @@ $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.'; ?> diff --git a/interface/web/client/lib/lang/pt_clients_list.lng b/interface/web/client/lib/lang/pt_clients_list.lng index da4cbcc316..4c5218bd5a 100644 --- a/interface/web/client/lib/lang/pt_clients_list.lng +++ b/interface/web/client/lib/lang/pt_clients_list.lng @@ -7,4 +7,5 @@ $wb['city_txt'] = 'Cidade'; $wb['country_txt'] = 'País'; $wb['add_new_record_txt'] = 'Adicionar Cliente'; $wb['username_txt'] = 'Username'; +$wb['customer_no_txt'] = 'Customer No.'; ?> diff --git a/interface/web/client/lib/lang/pt_reseller.lng b/interface/web/client/lib/lang/pt_reseller.lng index a6744f0b42..87bd1434d1 100644 --- a/interface/web/client/lib/lang/pt_reseller.lng +++ b/interface/web/client/lib/lang/pt_reseller.lng @@ -130,4 +130,13 @@ $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['bank_account_iban_txt'] = 'IBAN'; +$wb['bank_account_swift_txt'] = 'BIC / Swift'; ?> diff --git a/interface/web/client/lib/lang/pt_resellers_list.lng b/interface/web/client/lib/lang/pt_resellers_list.lng index 04203e7b66..668b310eb8 100644 --- a/interface/web/client/lib/lang/pt_resellers_list.lng +++ b/interface/web/client/lib/lang/pt_resellers_list.lng @@ -6,4 +6,6 @@ $wb['contact_name_txt'] = 'Contato'; $wb['city_txt'] = 'Cidade'; $wb['country_txt'] = 'País'; $wb['add_new_record_txt'] = 'Adicionar um novo revendedor'; +$wb['customer_no_txt'] = 'Customer No.'; +$wb['username_txt'] = 'Username'; ?> diff --git a/interface/web/client/lib/lang/ro_client.lng b/interface/web/client/lib/lang/ro_client.lng index 64af158bbd..f091e85a8d 100644 --- a/interface/web/client/lib/lang/ro_client.lng +++ b/interface/web/client/lib/lang/ro_client.lng @@ -137,4 +137,7 @@ $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.'; ?> diff --git a/interface/web/client/lib/lang/ro_clients_list.lng b/interface/web/client/lib/lang/ro_clients_list.lng index 160be80a54..d74ea1725f 100644 --- a/interface/web/client/lib/lang/ro_clients_list.lng +++ b/interface/web/client/lib/lang/ro_clients_list.lng @@ -7,4 +7,5 @@ $wb['city_txt'] = 'Oras'; $wb['country_txt'] = 'Tara'; $wb['add_new_record_txt'] = 'Adauga client nou'; $wb['username_txt'] = 'Username'; +$wb['customer_no_txt'] = 'Customer No.'; ?> diff --git a/interface/web/client/lib/lang/ro_reseller.lng b/interface/web/client/lib/lang/ro_reseller.lng index 98dacd971d..6d8f0e4d34 100644 --- a/interface/web/client/lib/lang/ro_reseller.lng +++ b/interface/web/client/lib/lang/ro_reseller.lng @@ -130,4 +130,13 @@ $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['bank_account_iban_txt'] = 'IBAN'; +$wb['bank_account_swift_txt'] = 'BIC / Swift'; ?> diff --git a/interface/web/client/lib/lang/ro_resellers_list.lng b/interface/web/client/lib/lang/ro_resellers_list.lng index 34d0896699..598342be9a 100644 --- a/interface/web/client/lib/lang/ro_resellers_list.lng +++ b/interface/web/client/lib/lang/ro_resellers_list.lng @@ -6,4 +6,6 @@ $wb['contact_name_txt'] = 'Contact name'; $wb['city_txt'] = 'City'; $wb['country_txt'] = 'Country'; $wb['add_new_record_txt'] = 'Add new reseller'; +$wb['customer_no_txt'] = 'Customer No.'; +$wb['username_txt'] = 'Username'; ?> diff --git a/interface/web/client/lib/lang/ru_client.lng b/interface/web/client/lib/lang/ru_client.lng index 62a8f3f2dc..5c3a63037f 100644 --- a/interface/web/client/lib/lang/ru_client.lng +++ b/interface/web/client/lib/lang/ru_client.lng @@ -137,4 +137,7 @@ $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.'; ?> diff --git a/interface/web/client/lib/lang/ru_clients_list.lng b/interface/web/client/lib/lang/ru_clients_list.lng index 01fdf61bf6..5087f39b52 100644 --- a/interface/web/client/lib/lang/ru_clients_list.lng +++ b/interface/web/client/lib/lang/ru_clients_list.lng @@ -7,4 +7,5 @@ $wb['country_txt'] = 'Страна'; $wb['client_id_txt'] = 'ID'; $wb['add_new_record_txt'] = 'Добавить клиента'; $wb['username_txt'] = 'Username'; +$wb['customer_no_txt'] = 'Customer No.'; ?> diff --git a/interface/web/client/lib/lang/ru_reseller.lng b/interface/web/client/lib/lang/ru_reseller.lng index f728e7841e..f4fdada447 100644 --- a/interface/web/client/lib/lang/ru_reseller.lng +++ b/interface/web/client/lib/lang/ru_reseller.lng @@ -130,4 +130,13 @@ $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['bank_account_iban_txt'] = 'IBAN'; +$wb['bank_account_swift_txt'] = 'BIC / Swift'; ?> diff --git a/interface/web/client/lib/lang/ru_resellers_list.lng b/interface/web/client/lib/lang/ru_resellers_list.lng index 7db8343241..64ac381e50 100644 --- a/interface/web/client/lib/lang/ru_resellers_list.lng +++ b/interface/web/client/lib/lang/ru_resellers_list.lng @@ -6,4 +6,6 @@ $wb['contact_name_txt'] = 'Контактное лицо'; $wb['city_txt'] = 'Город'; $wb['country_txt'] = 'Страна'; $wb['add_new_record_txt'] = 'Добавить реселлера'; +$wb['customer_no_txt'] = 'Customer No.'; +$wb['username_txt'] = 'Username'; ?> diff --git a/interface/web/client/lib/lang/se_client.lng b/interface/web/client/lib/lang/se_client.lng index 47f36c7738..ce964232d9 100644 --- a/interface/web/client/lib/lang/se_client.lng +++ b/interface/web/client/lib/lang/se_client.lng @@ -137,4 +137,7 @@ $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.'; ?> diff --git a/interface/web/client/lib/lang/se_clients_list.lng b/interface/web/client/lib/lang/se_clients_list.lng index a1c0f8766b..f2c22fb8a5 100644 --- a/interface/web/client/lib/lang/se_clients_list.lng +++ b/interface/web/client/lib/lang/se_clients_list.lng @@ -7,4 +7,5 @@ $wb['city_txt'] = 'City'; $wb['country_txt'] = 'Country'; $wb['add_new_record_txt'] = 'Add new client'; $wb['username_txt'] = 'Username'; +$wb['customer_no_txt'] = 'Customer No.'; ?> diff --git a/interface/web/client/lib/lang/se_reseller.lng b/interface/web/client/lib/lang/se_reseller.lng index 98dacd971d..6d8f0e4d34 100644 --- a/interface/web/client/lib/lang/se_reseller.lng +++ b/interface/web/client/lib/lang/se_reseller.lng @@ -130,4 +130,13 @@ $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['bank_account_iban_txt'] = 'IBAN'; +$wb['bank_account_swift_txt'] = 'BIC / Swift'; ?> diff --git a/interface/web/client/lib/lang/se_resellers_list.lng b/interface/web/client/lib/lang/se_resellers_list.lng index 34d0896699..598342be9a 100644 --- a/interface/web/client/lib/lang/se_resellers_list.lng +++ b/interface/web/client/lib/lang/se_resellers_list.lng @@ -6,4 +6,6 @@ $wb['contact_name_txt'] = 'Contact name'; $wb['city_txt'] = 'City'; $wb['country_txt'] = 'Country'; $wb['add_new_record_txt'] = 'Add new reseller'; +$wb['customer_no_txt'] = 'Customer No.'; +$wb['username_txt'] = 'Username'; ?> diff --git a/interface/web/client/lib/lang/sk_client.lng b/interface/web/client/lib/lang/sk_client.lng index 98b3b63c38..01e9f4d62d 100644 --- a/interface/web/client/lib/lang/sk_client.lng +++ b/interface/web/client/lib/lang/sk_client.lng @@ -137,4 +137,7 @@ $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.'; ?> diff --git a/interface/web/client/lib/lang/sk_clients_list.lng b/interface/web/client/lib/lang/sk_clients_list.lng index 21481f9823..10eb6323af 100644 --- a/interface/web/client/lib/lang/sk_clients_list.lng +++ b/interface/web/client/lib/lang/sk_clients_list.lng @@ -7,4 +7,5 @@ $wb['city_txt'] = 'Mesto'; $wb['country_txt'] = 'Krajina'; $wb['add_new_record_txt'] = 'Pridať nového klienta'; $wb['username_txt'] = 'Username'; +$wb['customer_no_txt'] = 'Customer No.'; ?> diff --git a/interface/web/client/lib/lang/sk_reseller.lng b/interface/web/client/lib/lang/sk_reseller.lng index fa9fcd25e4..1ee0c4a666 100644 --- a/interface/web/client/lib/lang/sk_reseller.lng +++ b/interface/web/client/lib/lang/sk_reseller.lng @@ -130,4 +130,13 @@ $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['bank_account_iban_txt'] = 'IBAN'; +$wb['bank_account_swift_txt'] = 'BIC / Swift'; ?> diff --git a/interface/web/client/lib/lang/sk_resellers_list.lng b/interface/web/client/lib/lang/sk_resellers_list.lng index 062f540fad..c218e56fed 100644 --- a/interface/web/client/lib/lang/sk_resellers_list.lng +++ b/interface/web/client/lib/lang/sk_resellers_list.lng @@ -6,4 +6,6 @@ $wb['contact_name_txt'] = 'Meno kontaktnej osoby'; $wb['city_txt'] = 'Mesto'; $wb['country_txt'] = 'Krajina'; $wb['add_new_record_txt'] = 'Pridať nového predajcu'; +$wb['customer_no_txt'] = 'Customer No.'; +$wb['username_txt'] = 'Username'; ?> diff --git a/interface/web/client/lib/lang/tr_client.lng b/interface/web/client/lib/lang/tr_client.lng index 96b890c58f..9c058f4089 100644 --- a/interface/web/client/lib/lang/tr_client.lng +++ b/interface/web/client/lib/lang/tr_client.lng @@ -137,4 +137,7 @@ $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.'; ?> diff --git a/interface/web/client/lib/lang/tr_clients_list.lng b/interface/web/client/lib/lang/tr_clients_list.lng index fc2ba14996..bd74b417ad 100644 --- a/interface/web/client/lib/lang/tr_clients_list.lng +++ b/interface/web/client/lib/lang/tr_clients_list.lng @@ -7,4 +7,5 @@ $wb['city_txt'] = 'Şehir'; $wb['country_txt'] = 'Ülke'; $wb['add_new_record_txt'] = 'Yeni Müşteri'; $wb['username_txt'] = 'Username'; +$wb['customer_no_txt'] = 'Customer No.'; ?> diff --git a/interface/web/client/lib/lang/tr_reseller.lng b/interface/web/client/lib/lang/tr_reseller.lng index f272a8c5c4..b6677703fc 100644 --- a/interface/web/client/lib/lang/tr_reseller.lng +++ b/interface/web/client/lib/lang/tr_reseller.lng @@ -130,4 +130,13 @@ $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['bank_account_iban_txt'] = 'IBAN'; +$wb['bank_account_swift_txt'] = 'BIC / Swift'; ?> diff --git a/interface/web/client/lib/lang/tr_resellers_list.lng b/interface/web/client/lib/lang/tr_resellers_list.lng index ccb8fd1541..d84fdee694 100644 --- a/interface/web/client/lib/lang/tr_resellers_list.lng +++ b/interface/web/client/lib/lang/tr_resellers_list.lng @@ -6,4 +6,6 @@ $wb['contact_name_txt'] = 'Kontak adı'; $wb['city_txt'] = 'Şehir'; $wb['country_txt'] = 'Ülke'; $wb['add_new_record_txt'] = 'Yeni Reseller'; +$wb['customer_no_txt'] = 'Customer No.'; +$wb['username_txt'] = 'Username'; ?> diff --git a/interface/web/client/list/client.list.php b/interface/web/client/list/client.list.php index 900f753e6f..0169810e41 100644 --- a/interface/web/client/list/client.list.php +++ b/interface/web/client/list/client.list.php @@ -72,7 +72,16 @@ $liste["item"][] = array( 'field' => "contact_name", 'prefix' => "%", 'suffix' => "%", 'width' => "", - 'value' => ""); + 'value' => ""); + +$liste["item"][] = array( 'field' => "customer_no", + 'datatype' => "VARCHAR", + 'formtype' => "TEXT", + 'op' => "like", + 'prefix' => "%", + 'suffix' => "%", + 'width' => "", + 'value' => ""); $liste["item"][] = array( 'field' => "username", 'datatype' => "VARCHAR", diff --git a/interface/web/client/list/reseller.list.php b/interface/web/client/list/reseller.list.php index e1368647e4..67ae88274c 100644 --- a/interface/web/client/list/reseller.list.php +++ b/interface/web/client/list/reseller.list.php @@ -73,6 +73,24 @@ $liste["item"][] = array( 'field' => "contact_name", 'suffix' => "%", 'width' => "", 'value' => ""); + +$liste["item"][] = array( 'field' => "customer_no", + 'datatype' => "VARCHAR", + 'formtype' => "TEXT", + 'op' => "like", + 'prefix' => "%", + 'suffix' => "%", + 'width' => "", + 'value' => ""); + +$liste["item"][] = array( 'field' => "username", + 'datatype' => "VARCHAR", + 'formtype' => "TEXT", + 'op' => "like", + 'prefix' => "%", + 'suffix' => "%", + 'width' => "", + 'value' => ""); $liste["item"][] = array( 'field' => "city", 'datatype' => "VARCHAR", diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm index 4aae4739c0..c05d6bb344 100644 --- a/interface/web/client/templates/client_edit_limits.htm +++ b/interface/web/client/templates/client_edit_limits.htm @@ -288,4 +288,27 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/interface/web/client/templates/clients_list.htm b/interface/web/client/templates/clients_list.htm index 507303a608..6164d3d3b0 100644 --- a/interface/web/client/templates/clients_list.htm +++ b/interface/web/client/templates/clients_list.htm @@ -21,6 +21,7 @@ + @@ -28,10 +29,11 @@ - - - - + + + + + @@ -44,6 +46,7 @@ {tmpl_var name="client_id"} {tmpl_var name="company_name"} {tmpl_var name="contact_name"} + {tmpl_var name="customer_no"} {tmpl_var name="username"} {tmpl_var name="city"}
{tmpl_var name="country"} @@ -58,7 +61,7 @@ - + diff --git a/interface/web/client/templates/resellers_list.htm b/interface/web/client/templates/resellers_list.htm index e223bf2492..2e5dfc7f7b 100644 --- a/interface/web/client/templates/resellers_list.htm +++ b/interface/web/client/templates/resellers_list.htm @@ -21,14 +21,18 @@ + + {tmpl_var name='search_limit'} - - + + + + @@ -42,6 +46,8 @@ {tmpl_var name="client_id"} {tmpl_var name="company_name"} {tmpl_var name="contact_name"} + {tmpl_var name="customer_no"} + {tmpl_var name="username"} {tmpl_var name="city"}
{tmpl_var name="country"} @@ -53,7 +59,7 @@ - + diff --git a/interface/web/dashboard/lib/lang/en_dashlet_limits.lng b/interface/web/dashboard/lib/lang/en_dashlet_limits.lng index a73fe64b8e..f6d8ed8840 100644 --- a/interface/web/dashboard/lib/lang/en_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/en_dashlet_limits.lng @@ -14,7 +14,7 @@ $wb["limit_mailfilter_txt"] = 'Number of email filters'; $wb["limit_fetchmail_txt"] = 'Number of fetchmail accounts'; $wb["limit_spamfilter_wblist_txt"] = 'Number of spamfilter white / blacklist filters'; $wb["limit_spamfilter_user_txt"] = 'Number of spamfilter users'; -$wb["limit_spamfilter_policy_txt"] = 'Number of spamfilter policys'; +$wb["limit_spamfilter_policy_txt"] = 'Number of spamfilter policies'; $wb["limit_cron_txt"] = 'Number of cron jobs'; $wb["limit_web_domain_txt"] = 'Number of web domains'; $wb["limit_web_aliasdomain_txt"] = 'Number of web aliasdomains'; diff --git a/interface/web/dashboard/lib/lang/es.lng b/interface/web/dashboard/lib/lang/es.lng index 9e85368a22..9f6bbdd283 100644 --- a/interface/web/dashboard/lib/lang/es.lng +++ b/interface/web/dashboard/lib/lang/es.lng @@ -1,4 +1,4 @@ diff --git a/interface/web/dashboard/lib/lang/es_dashlet_modules.lng b/interface/web/dashboard/lib/lang/es_dashlet_modules.lng index 7e22afbb43..66987b207a 100644 --- a/interface/web/dashboard/lib/lang/es_dashlet_modules.lng +++ b/interface/web/dashboard/lib/lang/es_dashlet_modules.lng @@ -1,3 +1,3 @@ diff --git a/interface/web/dns/dns_wizard.php b/interface/web/dns/dns_wizard.php index 216e084ceb..d8404a8285 100644 --- a/interface/web/dns/dns_wizard.php +++ b/interface/web/dns/dns_wizard.php @@ -138,12 +138,12 @@ if($_POST['create'] == 1) { if(isset($_POST['ns2']) && $_POST['ns2'] == '') $error .= $app->lng('error_ns2_empty').'
'; if(isset($_POST['email']) && $_POST['email'] == '') $error .= $app->lng('error_email_empty').'
'; - if(isset($_POST['domain']) && !preg_match('/^[\w\.\-]{2,64}\.[a-zA-Z0-9\-]{2,30}[\.]{0,1}$/',$_POST['domain'])) $error .= $app->lng('error_domain_regex').'
'; - if(isset($_POST['ns1']) && !preg_match('/^[\w\.\-]{2,64}\.[a-zA-Z0-9]{2,30}[\.]{0,1}$/',$_POST['ns1'])) $error .= $app->lng('error_ns1_regex').'
'; - if(isset($_POST['ns2']) && !preg_match('/^[\w\.\-]{2,64}\.[a-zA-Z0-9]{2,30}[\.]{0,1}$/',$_POST['ns2'])) $error .= $app->lng('error_ns2_regex').'
'; + if(isset($_POST['domain']) && !preg_match('/^[\w\.\-]{2,64}\.[a-zA-Z0-9\-]{2,30}$/',$_POST['domain'])) $error .= $app->lng('error_domain_regex').'
'; + if(isset($_POST['ns1']) && !preg_match('/^[\w\.\-]{2,64}\.[a-zA-Z0-9]{2,30}$/',$_POST['ns1'])) $error .= $app->lng('error_ns1_regex').'
'; + if(isset($_POST['ns2']) && !preg_match('/^[\w\.\-]{2,64}\.[a-zA-Z0-9]{2,30}$/',$_POST['ns2'])) $error .= $app->lng('error_ns2_regex').'
'; if(isset($_POST['email']) && !preg_match('/^\w+[\w.-]*\w+@\w+[\w.-]*\w+\.[a-z0-9\-]{2,30}$/i',$_POST['email'])) $error .= $app->lng('error_email_regex').'
'; - // make sure that the record belongs to the clinet group and not the admin group when a dmin inserts it + // make sure that the record belongs to the client group and not the admin group when admin inserts it if($_SESSION["s"]["user"]["typ"] == 'admin' && isset($_POST['client_group_id'])) { $sys_groupid = $app->functions->intval($_POST['client_group_id']); } elseif($app->auth->has_clients($_SESSION['s']['user']['userid']) && isset($_POST['client_group_id'])) { diff --git a/interface/web/dns/form/dns_slave.tform.php b/interface/web/dns/form/dns_slave.tform.php index 038f26bd9d..744aa87f99 100644 --- a/interface/web/dns/form/dns_slave.tform.php +++ b/interface/web/dns/form/dns_slave.tform.php @@ -106,15 +106,8 @@ $form["tabs"]['dns_slave'] = array ( 'ns' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', - 'filters' => array( 0 => array( 'event' => 'SAVE', - 'type' => 'IDNTOASCII'), - 1 => array( 'event' => 'SHOW', - 'type' => 'IDNTOUTF8'), - 2 => array( 'event' => 'SAVE', - 'type' => 'TOLOWER') - ), 'validators' => array ( 0 => array ( 'type' => 'REGEX', - 'regex' => '/^[\w\.\-]{1,255}$/', + 'regex' => '/^[0-9\.]{1,255}$/', 'errmsg'=> 'ns_error_regex'), ), 'default' => '', diff --git a/interface/web/dns/form/dns_soa.tform.php b/interface/web/dns/form/dns_soa.tform.php index 4481d5aa47..c8306aeee7 100644 --- a/interface/web/dns/form/dns_soa.tform.php +++ b/interface/web/dns/form/dns_soa.tform.php @@ -217,6 +217,10 @@ $form["tabs"]['dns_soa'] = array ( 'xfer' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'REGEX', + 'regex' => '/^[0-9\.\,]{0,255}$/', + 'errmsg'=> 'xfer_error_regex'), + ), 'default' => '', 'value' => '', 'width' => '30', diff --git a/interface/web/dns/lib/lang/cz_dns_mx.lng b/interface/web/dns/lib/lang/cz_dns_mx.lng index 9bb5ce280e..b04bc66a2f 100644 --- a/interface/web/dns/lib/lang/cz_dns_mx.lng +++ b/interface/web/dns/lib/lang/cz_dns_mx.lng @@ -1,16 +1,16 @@ diff --git a/interface/web/dns/lib/lang/cz_dns_ptr.lng b/interface/web/dns/lib/lang/cz_dns_ptr.lng index 9617ea5852..d7b19e523d 100644 --- a/interface/web/dns/lib/lang/cz_dns_ptr.lng +++ b/interface/web/dns/lib/lang/cz_dns_ptr.lng @@ -3,7 +3,7 @@ $wb['server_id_txt'] = 'Server'; $wb['zone_txt'] = 'Zóna'; $wb['name_txt'] = 'Název'; $wb['type_txt'] = 'Typ'; -$wb['data_txt'] = 'Kanonický hostname'; +$wb['data_txt'] = 'Kanonický Název hostitele (hostname)'; $wb['ttl_txt'] = 'TTL'; $wb['active_txt'] = 'Aktivní'; $wb['limit_dns_record_txt'] = 'Dosažen maximální počet DNS záznamů pro Váš účet.'; diff --git a/interface/web/dns/lib/lang/cz_dns_slave.lng b/interface/web/dns/lib/lang/cz_dns_slave.lng index 5416100af0..16617f6c59 100644 --- a/interface/web/dns/lib/lang/cz_dns_slave.lng +++ b/interface/web/dns/lib/lang/cz_dns_slave.lng @@ -13,5 +13,5 @@ $wb['origin_error_regex'] = 'Zóna má neplatný formát.'; $wb['ns_error_regex'] = 'NS má neplatný formát.'; $wb['eg_domain_tld'] = 'např. domena.cz'; $wb['ipv4_form_txt'] = 'IPV4 formát, např. 1.2.3.4'; -$wb['secondary_zone_txt'] = 'Secondary DNS Zone'; +$wb['secondary_zone_txt'] = 'Sekundární DNS zóna'; ?> diff --git a/interface/web/dns/lib/lang/cz_dns_soa.lng b/interface/web/dns/lib/lang/cz_dns_soa.lng index 0ce2bc8636..829d5f5b45 100644 --- a/interface/web/dns/lib/lang/cz_dns_soa.lng +++ b/interface/web/dns/lib/lang/cz_dns_soa.lng @@ -2,7 +2,7 @@ $wb['server_id_txt'] = 'Server'; $wb['origin_txt'] = 'Zóna (SOA záznam)'; $wb['ns_txt'] = 'NS'; -$wb['mbox_txt'] = 'Email'; +$wb['mbox_txt'] = 'E-mail'; $wb['serial_txt'] = 'Serial'; $wb['refresh_txt'] = 'Refresh'; $wb['retry_txt'] = 'Retry'; diff --git a/interface/web/dns/lib/lang/cz_dns_soa_list.lng b/interface/web/dns/lib/lang/cz_dns_soa_list.lng index 10648a7ec9..beba8a22b2 100644 --- a/interface/web/dns/lib/lang/cz_dns_soa_list.lng +++ b/interface/web/dns/lib/lang/cz_dns_soa_list.lng @@ -4,7 +4,7 @@ $wb['active_txt'] = 'Aktivní'; $wb['server_id_txt'] = 'Server'; $wb['origin_txt'] = 'Zóna'; $wb['ns_txt'] = 'NS'; -$wb['mbox_txt'] = 'Email'; +$wb['mbox_txt'] = 'E-mail'; $wb['add_new_record_txt'] = 'Přidat DNS zónu (SOA záznam)'; $wb['add_new_record_wizard_txt'] = 'Přidat DNS zónu (dle šablony)'; ?> diff --git a/interface/web/dns/lib/lang/cz_dns_srv.lng b/interface/web/dns/lib/lang/cz_dns_srv.lng index a8459fe7ff..8ab784a2a0 100644 --- a/interface/web/dns/lib/lang/cz_dns_srv.lng +++ b/interface/web/dns/lib/lang/cz_dns_srv.lng @@ -1,19 +1,19 @@ diff --git a/interface/web/dns/lib/lang/cz_dns_wizard.lng b/interface/web/dns/lib/lang/cz_dns_wizard.lng index 930163b4d2..dcfc0ba2c8 100644 --- a/interface/web/dns/lib/lang/cz_dns_wizard.lng +++ b/interface/web/dns/lib/lang/cz_dns_wizard.lng @@ -5,7 +5,7 @@ $wb['client_txt'] = 'Klient'; $wb['btn_save_txt'] = 'Vytvořit DNS záznam'; $wb['btn_cancel_txt'] = 'Zrušit'; $wb['domain_txt'] = 'Doména'; -$wb['email_txt'] = 'Email'; +$wb['email_txt'] = 'E-mail'; $wb['ns1_txt'] = 'NS 1'; $wb['ns2_txt'] = 'NS 2'; $wb['ip_txt'] = 'IP adresa'; @@ -26,13 +26,13 @@ $wb['error_domain_regex'] = 'Doména obsahuje neplatné znaky.'; $wb['error_ns1_regex'] = 'NS1 obsahuje neplatné znaky.'; $wb['error_ns2_regex'] = 'NS2 obsahuje neplatné znaky.'; $wb['error_email_regex'] = 'Email neobsahuje platnou emailovou adresu.'; -$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'; +$wb['dns_zone_txt'] = 'DNS Zóna'; +$wb['globalsearch_resultslimit_of_txt'] = 'z'; +$wb['globalsearch_resultslimit_results_txt'] = 'výsledky'; +$wb['globalsearch_noresults_text_txt'] = 'Žádné výsledky.'; +$wb['globalsearch_noresults_limit_txt'] = '0 výsledků'; +$wb['globalsearch_searchfield_watermark_txt'] = 'Hledat'; +$wb['globalsearch_suggestions_text_txt'] = 'Návrhy'; +$wb['list_head_txt'] = 'DNS Průvodce vytvořením zóny'; +$wb['list_desc_txt'] = 'Vytvoření zóny DNS pomocí průvodce'; ?> diff --git a/interface/web/dns/lib/lang/de_dns_slave.lng b/interface/web/dns/lib/lang/de_dns_slave.lng index 724d8a3b20..007e4f4f6e 100644 --- a/interface/web/dns/lib/lang/de_dns_slave.lng +++ b/interface/web/dns/lib/lang/de_dns_slave.lng @@ -2,7 +2,7 @@ $wb['server_id_txt'] = 'Server'; $wb['origin_txt'] = 'DNS Zone'; $wb['secondary_zone_txt'] = 'Secondary DNS Zone'; -$wb['ns_txt'] = 'NS'; +$wb['ns_txt'] = 'NS (IP-Adresse)'; $wb['active_txt'] = 'Aktiv'; $wb['limit_dns_slave_zone_txt'] = 'Die maximale Anzahl an Secondary DNS Zonen für Ihr Konto wurde erreicht.'; $wb['client_txt'] = 'Kunde'; diff --git a/interface/web/dns/lib/lang/de_dns_soa.lng b/interface/web/dns/lib/lang/de_dns_soa.lng index 6fdc875659..554c2fdcb4 100644 --- a/interface/web/dns/lib/lang/de_dns_soa.lng +++ b/interface/web/dns/lib/lang/de_dns_soa.lng @@ -9,7 +9,7 @@ $wb['retry_txt'] = 'Retry'; $wb['expire_txt'] = 'Expire'; $wb['minimum_txt'] = 'Minimum'; $wb['ttl_txt'] = 'TTL'; -$wb['xfer_txt'] = 'Zonentransfer zu diesen IPs erlauben (mit Beistrich getrennte Liste)'; +$wb['xfer_txt'] = 'Zonentransfer zu diesen IPs erlauben (mit Komma getrennte Liste)'; $wb['active_txt'] = 'Aktiv'; $wb['limit_dns_zone_txt'] = 'Die maximale Anzahl an DNS-Einträgen für ihr Konto wurde erreicht.'; $wb['client_txt'] = 'Kunde'; diff --git a/interface/web/dns/lib/lang/en_dns_slave.lng b/interface/web/dns/lib/lang/en_dns_slave.lng index 64875fb7a1..fc27ee9379 100644 --- a/interface/web/dns/lib/lang/en_dns_slave.lng +++ b/interface/web/dns/lib/lang/en_dns_slave.lng @@ -2,7 +2,7 @@ $wb["server_id_txt"] = 'Server'; $wb["origin_txt"] = 'DNS-Zone'; $wb["secondary_zone_txt"] = 'Secondary DNS Zone'; -$wb["ns_txt"] = 'NS'; +$wb["ns_txt"] = 'NS (IP-address)'; $wb["active_txt"] = 'Active'; $wb["limit_dns_slave_zone_txt"] = 'The max. number of Secondary DNS zones for your account is reached.'; $wb["client_txt"] = 'Client'; diff --git a/interface/web/dns/lib/lang/es.lng b/interface/web/dns/lib/lang/es.lng index 889f129dc8..1a3a008e16 100644 --- a/interface/web/dns/lib/lang/es.lng +++ b/interface/web/dns/lib/lang/es.lng @@ -17,6 +17,6 @@ $wb['DNS TXT'] = 'DNS TXT'; $wb['DNS Wizard'] = 'Asistente DNS'; $wb['Add DNS Zone'] = 'Agregar Zona DNS'; $wb['Templates'] = 'Plantillas'; -$wb['Secondary Zones'] = 'Secondary Zones'; -$wb['Import Zone File'] = 'Import Zone File'; +$wb['Secondary Zones'] = 'Zonas secundarias'; +$wb['Import Zone File'] = 'Zona de importación de archivo'; ?> diff --git a/interface/web/dns/lib/lang/es_dns_a_list.lng b/interface/web/dns/lib/lang/es_dns_a_list.lng index 184a7a17b2..f9e8e1fd40 100644 --- a/interface/web/dns/lib/lang/es_dns_a_list.lng +++ b/interface/web/dns/lib/lang/es_dns_a_list.lng @@ -6,10 +6,10 @@ $wb['zone_txt'] = 'Zona'; $wb['name_txt'] = 'Nombre'; $wb['data_txt'] = 'Fecha'; $wb['aux_txt'] = 'Prioridad'; -$wb['ttl_txt'] = 'TTL'; $wb['type_txt'] = 'Tipo'; $wb['add_new_record_txt'] = 'Añadir nuevo registro A'; $wb['page_txt'] = 'Página'; $wb['page_of_txt'] = 'de'; $wb['delete_confirmation'] = '¿Realmente desea eliminar este registro?'; +$wb['ttl_txt'] = 'TTL'; ?> diff --git a/interface/web/dns/lib/lang/es_dns_cname.lng b/interface/web/dns/lib/lang/es_dns_cname.lng index 463039c9d6..95e3126e86 100644 --- a/interface/web/dns/lib/lang/es_dns_cname.lng +++ b/interface/web/dns/lib/lang/es_dns_cname.lng @@ -12,5 +12,5 @@ $wb['name_error_empty'] = 'El nombre de la máquina está vacío.'; $wb['name_error_regex'] = 'El nombre de la máquina tiene un registro incorrecto.'; $wb['data_error_empty'] = 'El nombre de la máquina de destino está vacío.'; $wb['data_error_regex'] = 'El nombre de la máquina de destino tiene un formato no válido.'; -$wb['data_error_duplicate'] = 'Duplicate A-Record or CNAME-Record'; +$wb['data_error_duplicate'] = 'Duplicar el registro A o el registro CNAME'; ?> diff --git a/interface/web/dns/lib/lang/es_dns_import.lng b/interface/web/dns/lib/lang/es_dns_import.lng index 2d1fe083ea..b3bee50798 100644 --- a/interface/web/dns/lib/lang/es_dns_import.lng +++ b/interface/web/dns/lib/lang/es_dns_import.lng @@ -1,14 +1,14 @@ diff --git a/interface/web/dns/lib/lang/es_dns_slave_list.lng b/interface/web/dns/lib/lang/es_dns_slave_list.lng index 4a7a0c2b11..2ae15bd5dc 100644 --- a/interface/web/dns/lib/lang/es_dns_slave_list.lng +++ b/interface/web/dns/lib/lang/es_dns_slave_list.lng @@ -5,5 +5,5 @@ $wb['server_id_txt'] = 'Servidor'; $wb['origin_txt'] = 'Zona'; $wb['ns_txt'] = 'NS'; $wb['add_new_record_txt'] = 'Añadir nueva zona DNS secundaria'; -$wb['eg_domain_tld'] = 'e.g. domain.tld.'; +$wb['eg_domain_tld'] = 'ej. domain.tld.'; ?> diff --git a/interface/web/dns/lib/lang/es_dns_soa.lng b/interface/web/dns/lib/lang/es_dns_soa.lng index 9897c7c4aa..9511223c82 100644 --- a/interface/web/dns/lib/lang/es_dns_soa.lng +++ b/interface/web/dns/lib/lang/es_dns_soa.lng @@ -22,13 +22,13 @@ $wb['ns_error_regex'] = 'Formato de NS no válido.'; $wb['mbox_error_empty'] = 'Correo vacío.'; $wb['mbox_error_regex'] = 'Formato de correo no válido.'; $wb['also_notify_txt'] = 'Notificar también a'; -$wb['also_notify_error_regex'] = 'Please use an IP address.'; +$wb['also_notify_error_regex'] = 'Por favor, utilice una dirección IP.'; $wb['update_acl_txt'] = 'Actualizar ACL'; -$wb['seconds_txt'] = 'Seconds'; -$wb['eg_domain_tld'] = 'e.g. domain.tld'; -$wb['eg_ns1_domain_tld'] = 'e.g. ns1.domain.tld'; -$wb['eg_webmaster_domain_tld'] = 'e.g. 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['seconds_txt'] = 'Segundos'; +$wb['eg_domain_tld'] = 'ej. domain.tld'; +$wb['eg_ns1_domain_tld'] = 'ej. ns1.domain.tld'; +$wb['eg_webmaster_domain_tld'] = 'ej. webmaster@domain.tld'; +$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'El dominio no puede ser cambiado. Por favor, pregunte a su administrador si desea cambiar el nombre de dominio.'; $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.'; diff --git a/interface/web/dns/lib/lang/es_dns_wizard.lng b/interface/web/dns/lib/lang/es_dns_wizard.lng index fbf47ec36c..4b58a0af64 100644 --- a/interface/web/dns/lib/lang/es_dns_wizard.lng +++ b/interface/web/dns/lib/lang/es_dns_wizard.lng @@ -26,6 +26,8 @@ $wb['error_domain_regex'] = 'El dominio contiene caracteres inválidos.'; $wb['error_ns1_regex'] = 'NS1 contiene caracteres inválidos.'; $wb['error_ns2_regex'] = 'NS2 contiene caracteres inválidos.'; $wb['error_email_regex'] = 'El campo Correo no contiene una dirección válida.'; +$wb['list_head_txt'] = 'DNS Zone Wizard'; +$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard'; $wb['dns_zone_txt'] = 'DNS Zone'; $wb['globalsearch_resultslimit_of_txt'] = 'of'; $wb['globalsearch_resultslimit_results_txt'] = 'results'; @@ -33,6 +35,4 @@ $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/fr_dns_wizard.lng b/interface/web/dns/lib/lang/fr_dns_wizard.lng index 396172109b..db2f0e4132 100644 --- a/interface/web/dns/lib/lang/fr_dns_wizard.lng +++ b/interface/web/dns/lib/lang/fr_dns_wizard.lng @@ -33,4 +33,6 @@ $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/help/lib/lang/cz_help_faq_list.lng b/interface/web/help/lib/lang/cz_help_faq_list.lng index b6c7b460b9..923d9b892a 100644 --- a/interface/web/help/lib/lang/cz_help_faq_list.lng +++ b/interface/web/help/lib/lang/cz_help_faq_list.lng @@ -1,3 +1,3 @@ diff --git a/interface/web/help/lib/lang/es.lng b/interface/web/help/lib/lang/es.lng index fb6439f4f8..ff123b1a1e 100644 --- a/interface/web/help/lib/lang/es.lng +++ b/interface/web/help/lib/lang/es.lng @@ -4,11 +4,11 @@ $wb['Message'] = 'Mensaje'; $wb['Send message'] = 'Enviar mensaje'; $wb['View messages'] = 'Ver mensajes'; $wb['Support'] = 'Soporte'; -$wb['About ISPConfig'] = 'About ISPConfig'; +$wb['About ISPConfig'] = 'Acerca de ISPConfig'; $wb['Version'] = 'Version'; -$wb['Frequently Asked Questions'] = 'Frequently Asked Questions'; -$wb['FAQ Sections'] = 'FAQ Sections'; -$wb['Manage Sections'] = 'Manage Sections'; -$wb['Add a Question & Answer Pair'] = 'Add a Question & Answer Pair'; -$wb['Manage Questions'] = 'Manage Questions'; +$wb['Frequently Asked Questions'] = 'Preguntas frecuentes'; +$wb['FAQ Sections'] = 'Secciones FAQ'; +$wb['Manage Sections'] = 'Gestionar las Secciones'; +$wb['Add a Question & Answer Pair'] = 'Añadir un par de preguntas y respuestas'; +$wb['Manage Questions'] = 'Administrar preguntas'; ?> diff --git a/interface/web/help/lib/lang/es_help_faq_list.lng b/interface/web/help/lib/lang/es_help_faq_list.lng index b6c7b460b9..64a02c0a74 100644 --- a/interface/web/help/lib/lang/es_help_faq_list.lng +++ b/interface/web/help/lib/lang/es_help_faq_list.lng @@ -1,3 +1,3 @@ diff --git a/interface/web/help/lib/lang/es_support_message.lng b/interface/web/help/lib/lang/es_support_message.lng index 6adeb2d916..4f6c552a21 100644 --- a/interface/web/help/lib/lang/es_support_message.lng +++ b/interface/web/help/lib/lang/es_support_message.lng @@ -3,6 +3,6 @@ $wb['recipient_id_txt'] = 'ID Destinatario'; $wb['sender_id_txt'] = 'ID Remitente'; $wb['subject_txt'] = 'Asunto'; $wb['message_txt'] = 'Mensaje'; -$wb['tstamp_txt'] = 'Marcadetiempo'; -$wb['reply_txt'] = 'Reply'; +$wb['tstamp_txt'] = 'Marca de tiempo'; +$wb['reply_txt'] = 'Responder'; ?> diff --git a/interface/web/help/templates/faq_manage_questions_list.htm b/interface/web/help/templates/faq_manage_questions_list.htm index 4907b73d78..39aa31a5ac 100644 --- a/interface/web/help/templates/faq_manage_questions_list.htm +++ b/interface/web/help/templates/faq_manage_questions_list.htm @@ -22,6 +22,7 @@ {tmpl_var name="faq_edit_txt"} + {tmpl_var name='hf_question'} @@ -34,6 +35,12 @@ + + + + + + diff --git a/interface/web/help/templates/faq_sections_edit.htm b/interface/web/help/templates/faq_sections_edit.htm index 0597c14b93..b4c2754741 100644 --- a/interface/web/help/templates/faq_sections_edit.htm +++ b/interface/web/help/templates/faq_sections_edit.htm @@ -1,7 +1,7 @@
-
Section +
{tmpl_var name='faq_section_name_txt'}
diff --git a/interface/web/help/templates/help_faq_list.htm b/interface/web/help/templates/help_faq_list.htm index 298874654b..50d46fc375 100644 --- a/interface/web/help/templates/help_faq_list.htm +++ b/interface/web/help/templates/help_faq_list.htm @@ -5,7 +5,7 @@ {tmpl_var name='hf_answer'}

- Delete + {tmpl_var name="delete_txt"} {tmpl_var name="edit_txt"}

diff --git a/interface/web/help/templates/help_faq_sections_list.htm b/interface/web/help/templates/help_faq_sections_list.htm index 9166f13141..950c1679b1 100644 --- a/interface/web/help/templates/help_faq_sections_list.htm +++ b/interface/web/help/templates/help_faq_sections_list.htm @@ -23,9 +23,10 @@ {tmpl_var name="faq_edit_txt"} + - {tmpl_var name='hfs_name'} + {tmpl_var name='hfs_name'} {tmpl_var name="faq_delete_txt"} @@ -34,6 +35,12 @@ + + + + + +
diff --git a/interface/web/help/templates/support_message_edit.htm b/interface/web/help/templates/support_message_edit.htm index a7c2647574..c3f23a3c38 100644 --- a/interface/web/help/templates/support_message_edit.htm +++ b/interface/web/help/templates/support_message_edit.htm @@ -4,7 +4,7 @@
-
Message +
{tmpl_var name='message_txt'}
{tmpl_var name='email_domain'} diff --git a/interface/web/mailuser/lib/lang/cz.lng b/interface/web/mailuser/lib/lang/cz.lng index d610b3f875..1c16fb2e59 100644 --- a/interface/web/mailuser/lib/lang/cz.lng +++ b/interface/web/mailuser/lib/lang/cz.lng @@ -1,9 +1,9 @@ diff --git a/interface/web/mailuser/lib/lang/fr.lng b/interface/web/mailuser/lib/lang/fr.lng index 5b711141e5..114dec9b91 100644 --- a/interface/web/mailuser/lib/lang/fr.lng +++ b/interface/web/mailuser/lib/lang/fr.lng @@ -1,9 +1,9 @@ \ No newline at end of file +$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/fr_index.lng b/interface/web/mailuser/lib/lang/fr_index.lng index 35c6aae8ef..29fe9ea4f3 100644 --- a/interface/web/mailuser/lib/lang/fr_index.lng +++ b/interface/web/mailuser/lib/lang/fr_index.lng @@ -1,12 +1,12 @@ \ No newline at end of file +$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'] = 'None'; +?> diff --git a/interface/web/mailuser/lib/lang/fr_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/fr_mail_user_autoresponder.lng index a736abf690..79f386a7dc 100644 --- a/interface/web/mailuser/lib/lang/fr_mail_user_autoresponder.lng +++ b/interface/web/mailuser/lib/lang/fr_mail_user_autoresponder.lng @@ -1,13 +1,13 @@ diff --git a/interface/web/mailuser/lib/lang/fr_mail_user_cc.lng b/interface/web/mailuser/lib/lang/fr_mail_user_cc.lng index 0073c71647..dc2165a4fc 100644 --- a/interface/web/mailuser/lib/lang/fr_mail_user_cc.lng +++ b/interface/web/mailuser/lib/lang/fr_mail_user_cc.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['mailbox_cc_txt'] = 'Send copy to email address'; +$wb['cc_txt'] = 'Send copy to'; +$wb['email_txt'] = '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.'; +?> diff --git a/interface/web/mailuser/lib/lang/fr_mail_user_filter.lng b/interface/web/mailuser/lib/lang/fr_mail_user_filter.lng index 296a47ec57..2e74ffd4f7 100644 --- a/interface/web/mailuser/lib/lang/fr_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/fr_mail_user_filter.lng @@ -1,13 +1,13 @@ \ No newline at end of file +$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/fr_mail_user_password.lng b/interface/web/mailuser/lib/lang/fr_mail_user_password.lng index 43c114a81c..cdf9674e70 100644 --- a/interface/web/mailuser/lib/lang/fr_mail_user_password.lng +++ b/interface/web/mailuser/lib/lang/fr_mail_user_password.lng @@ -1,10 +1,10 @@ \ No newline at end of file +?> diff --git a/interface/web/mailuser/lib/lang/fr_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/fr_mail_user_spamfilter.lng index 8f95dd37a7..be4bad9050 100644 --- a/interface/web/mailuser/lib/lang/fr_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/fr_mail_user_spamfilter.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$wb['mailbox_spamfilter_txt'] = 'Spamfilter'; +$wb['spamfilter_txt'] = 'Spamfilter'; +$wb['email_txt'] = 'Email'; +$wb['no_policy'] = '- not enabled -'; +$wb['policy_txt'] = 'Policy'; +?> diff --git a/interface/web/monitor/lib/lang/cz.lng b/interface/web/monitor/lib/lang/cz.lng index 821909d284..587409cf84 100644 --- a/interface/web/monitor/lib/lang/cz.lng +++ b/interface/web/monitor/lib/lang/cz.lng @@ -134,16 +134,16 @@ $wb['monitor_title_raidstate_txt'] = 'Stav pole RAID'; $wb['monitor_title_rkhunterlog_txt'] = 'RKHunter log'; $wb['monitor_title_fail2ban_txt'] = 'Fail2Ban log'; $wb['monitor_updates_nosupport_txt'] = 'Vaše distribuce nepodporuje toto monitorování'; -$wb['monitor_nosupportedraid1_txt'] = 'At the moment, we support mdadm or mpt-status for monitoring the RAID.
We cant find any of them at your server.

This means we can not support your RAID yet.'; -$wb['monitor_serverstate_beancounterok_txt'] = 'The beancounter is ok'; +$wb['monitor_nosupportedraid1_txt'] = 'V současné době, podporujeme nástroje mdadm nebo MPT-stav pro sledování sofwarových RAID polí.
Nemůžeme najít žádné z nich na serveru.

To znamená, že nemůžeme monitorovat váš RAID.'; +$wb['monitor_serverstate_beancounterok_txt'] = 'Soubor čítačů (limitů) je v pořádku'; $wb['monitor_serverstate_beancounterinfo_txt'] = 'There are vew failure in the beancounter'; -$wb['monitor_serverstate_beancounterwarning_txt'] = 'There are some failure in the beancounter'; -$wb['monitor_serverstate_beancountercritical_txt'] = 'There are many failure in the beancounter'; -$wb['monitor_serverstate_beancountererror_txt'] = 'There are too much failure in the beancounter'; -$wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; +$wb['monitor_serverstate_beancounterwarning_txt'] = 'Některé čítače (limity) vykazují selhání.'; +$wb['monitor_serverstate_beancountercritical_txt'] = 'Existuje mnoho selhání čítačů (limitů)'; +$wb['monitor_serverstate_beancountererror_txt'] = 'Existuje příliš mnoho selhání čítačů (limitů)'; +$wb['monitor_title_beancounter_txt'] = 'OpenVz VE čítače (limity)'; $wb['monitor_beancounter_nosupport_txt'] = 'This server is not a OpenVz VE and has no beancounter information'; $wb['monitor_title_iptables_txt'] = 'IPTables Pravidla'; $wb['Show fail2ban-Log'] = 'Zobrazit Fail2Ban Log'; $wb['Show IPTables'] = 'Zobrazit IPTables pravidla'; -$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; +$wb['Show OpenVz VE BeanCounter'] = 'Ukázat OpenVz VE čítače (limity)'; ?> diff --git a/interface/web/monitor/lib/lang/es.lng b/interface/web/monitor/lib/lang/es.lng index 2d6815b84a..64c6cd7ad7 100644 --- a/interface/web/monitor/lib/lang/es.lng +++ b/interface/web/monitor/lib/lang/es.lng @@ -133,17 +133,17 @@ $wb['monitor_title_mailq_txt'] = 'Cola de correo'; $wb['monitor_title_raidstate_txt'] = 'Estado del RAID'; $wb['monitor_title_rkhunterlog_txt'] = 'Registro de RKHunter'; $wb['monitor_updates_nosupport_txt'] = 'Su distribución no es soportada por este monitorizador'; -$wb['monitor_title_fail2ban_txt'] = 'Fail2Ban Log'; -$wb['monitor_nosupportedraid1_txt'] = 'At the moment, we support mdadm or mpt-status for monitoring the RAID.
We cant find any of them at your server.

This means we can not support your RAID yet.'; -$wb['monitor_serverstate_beancounterok_txt'] = 'The beancounter is ok'; -$wb['monitor_serverstate_beancounterinfo_txt'] = 'There are vew failure in the beancounter'; -$wb['monitor_serverstate_beancounterwarning_txt'] = 'There are some failure in the beancounter'; -$wb['monitor_serverstate_beancountercritical_txt'] = 'There are many failure in the beancounter'; -$wb['monitor_serverstate_beancountererror_txt'] = 'There are too much failure in the beancounter'; +$wb['monitor_title_fail2ban_txt'] = 'Registro de Fail2Ban'; +$wb['monitor_nosupportedraid1_txt'] = 'Por el momento, apoyamos mdadm para supervisar el RAID.
No encontramos ningún RAID en su servidor.
Esto significa que no podemos monitorizar su RAID todavía.'; +$wb['monitor_serverstate_beancounterok_txt'] = 'El Beancounter es correcto'; +$wb['monitor_serverstate_beancounterinfo_txt'] = 'Hay fracaso en el Beancounter'; +$wb['monitor_serverstate_beancounterwarning_txt'] = 'Hay algún fallo en el Beancounter'; +$wb['monitor_serverstate_beancountercritical_txt'] = 'Hay muchos fallos en el Beancounter'; +$wb['monitor_serverstate_beancountererror_txt'] = 'No falta mucho en el Beancounter'; $wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; -$wb['monitor_beancounter_nosupport_txt'] = 'This server is not a OpenVz VE and has no beancounter information'; -$wb['monitor_title_iptables_txt'] = 'IPTables Rules'; -$wb['Show fail2ban-Log'] = 'Show fail2ban-Log'; -$wb['Show IPTables'] = 'Show IPTables'; -$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; +$wb['monitor_beancounter_nosupport_txt'] = 'Este servidor no es un VE OpenVZ y no tiene información Beancounter'; +$wb['monitor_title_iptables_txt'] = 'Reglas de IPTables'; +$wb['Show fail2ban-Log'] = 'Mostrar el registro de Fail2ban'; +$wb['Show IPTables'] = 'Mostrar IPTables'; +$wb['Show OpenVz VE BeanCounter'] = 'Mostrar OpenVz VE BeanCounter'; ?> diff --git a/interface/web/sites/ajax_get_json.php b/interface/web/sites/ajax_get_json.php index 1194596fd4..f7bbc71cd5 100644 --- a/interface/web/sites/ajax_get_json.php +++ b/interface/web/sites/ajax_get_json.php @@ -148,6 +148,26 @@ $type = $_GET["type"]; if(substr($json,-1) == ',') $json = substr($json,0,-1); $json .= '}'; } + + if($type == 'get_use_combobox'){ + $json = '{"usecombobox":"'; + $use_combobox = 'y'; + $server_config_array = $app->getconf->get_global_config(); + if($server_config_array['misc']['use_combobox'] != 'y') $use_combobox = 'n'; + $json .= $use_combobox; + unset($server_config_array); + $json .= '"}'; + } + + if($type == 'get_use_loadindicator'){ + $json = '{"useloadindicator":"'; + $use_loadindicator = 'y'; + $server_config_array = $app->getconf->get_global_config(); + if($server_config_array['misc']['use_loadindicator'] != 'y') $use_loadindicator = 'n'; + $json .= $use_loadindicator; + unset($server_config_array); + $json .= '"}'; + } //} diff --git a/interface/web/sites/aps_do_operation.php b/interface/web/sites/aps_do_operation.php index c3362ae8bf..ad165f33bc 100644 --- a/interface/web/sites/aps_do_operation.php +++ b/interface/web/sites/aps_do_operation.php @@ -81,7 +81,8 @@ else if($_GET['action'] == 'delete_instance') WHERE id = ".$app->db->quote($_GET['id'])." AND (instance_status = ".INSTANCE_SUCCESS." OR instance_status = ".INSTANCE_ERROR.");"); if($check['id'] > 0) $gui->deleteInstance($_GET['id']); - echo $app->lng('Installation_remove'); + //echo $app->lng('Installation_remove'); + @header('Location:aps_installedpackages_list.php'); } else if($_GET['action'] == 'reinstall_instance') { @@ -105,6 +106,7 @@ else if($_GET['action'] == 'reinstall_instance') if(!$check) die('Check failed'); // normally this might not happen at all, so just die $gui->reinstallInstance($_GET['id']); - echo $app->lng('Installation_task'); + //echo $app->lng('Installation_task'); + @header('Location:aps_installedpackages_list.php'); } ?> diff --git a/interface/web/sites/aps_installedpackages_list.php b/interface/web/sites/aps_installedpackages_list.php index 26e1898ba7..dbe39ef5df 100644 --- a/interface/web/sites/aps_installedpackages_list.php +++ b/interface/web/sites/aps_installedpackages_list.php @@ -52,7 +52,8 @@ $is_admin = ($_SESSION['s']['user']['typ'] == 'admin') ? true : false; if(!$is_admin) { $cid = $app->db->queryOneRecord('SELECT client_id FROM client WHERE username = "'.$app->db->quote($_SESSION['s']['user']['username']).'";'); - $client_ext = ' AND aps_instances.customer_id = '.$cid['client_id']; + //$client_ext = ' AND aps_instances.customer_id = '.$cid['client_id']; + $client_ext = ' AND '.$app->tform->getAuthSQL('r', 'aps_instances'); } $app->listform_actions->SQLExtWhere = 'aps_instances.package_id = aps_packages.id'.$client_ext; $app->listform_actions->SQLOrderBy = 'ORDER BY package_name'; diff --git a/interface/web/sites/database_edit.php b/interface/web/sites/database_edit.php index 393ec3854c..e43ec3d2cc 100644 --- a/interface/web/sites/database_edit.php +++ b/interface/web/sites/database_edit.php @@ -116,14 +116,10 @@ class page_action extends tform_actions { if ($this->dataRecord['database_name'] != ""){ /* REMOVE the restriction */ - $app->tpl->setVar("database_name", str_replace($dbname_prefix , '', $this->dataRecord['database_name'])); - } - - if($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) { - $app->tpl->setVar("database_name_prefix", $global_config['dbname_prefix']); - } else { - $app->tpl->setVar("database_name_prefix", $dbname_prefix); + $app->tpl->setVar("database_name", $app->tools_sites->removePrefix($this->dataRecord['database_name'], $this->dataRecord['database_name_prefix'], $dbname_prefix)); } + + $app->tpl->setVar("database_name_prefix", $app->tools_sites->getPrefix($this->dataRecord['database_name_prefix'], $dbname_prefix, $global_config['dbname_prefix'])); if($this->id > 0) { //* we are editing a existing record @@ -200,6 +196,9 @@ class page_action extends tform_actions { //* Prevent that the database name and charset is changed $old_record = $app->tform->getDataRecord($this->id); + $dbname_prefix = $app->tools_sites->getPrefix($old_record['database_name_prefix'], $dbname_prefix); + $this->dataRecord['database_name_prefix'] = $dbname_prefix; + if($old_record["database_name"] != $dbname_prefix . $this->dataRecord["database_name"]) { $app->tform->errorMessage .= $app->tform->wordbook["database_name_change_txt"].'
'; } @@ -270,6 +269,7 @@ class page_action extends tform_actions { $app->uses('getconf,tools_sites'); $global_config = $app->getconf->get_global_config('sites'); $dbname_prefix = $app->tools_sites->replacePrefix($global_config['dbname_prefix'], $this->dataRecord); + $this->dataRecord['database_name_prefix'] = $dbname_prefix; if(strlen($dbname_prefix . $this->dataRecord['database_name']) > 64) $app->tform->errorMessage .= str_replace('{db}',$dbname_prefix . $this->dataRecord['database_name'],$app->tform->wordbook["database_name_error_len"]).'
'; diff --git a/interface/web/sites/database_user_edit.php b/interface/web/sites/database_user_edit.php index 86b1382a0e..3444974954 100644 --- a/interface/web/sites/database_user_edit.php +++ b/interface/web/sites/database_user_edit.php @@ -100,14 +100,11 @@ class page_action extends tform_actions { if ($this->dataRecord['database_user'] != ""){ /* REMOVE the restriction */ - $app->tpl->setVar("database_user", str_replace($dbuser_prefix , '', $this->dataRecord['database_user'])); + $app->tpl->setVar("database_user", $app->tools_sites->removePrefix($this->dataRecord['database_user'], $this->dataRecord['database_user_prefix'], $dbuser_prefix)); } - if($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) { - $app->tpl->setVar("database_user_prefix", $global_config['dbuser_prefix']); - } else { - $app->tpl->setVar("database_user_prefix", $dbuser_prefix); - } + + $app->tpl->setVar("database_user_prefix", $app->tools_sites->getPrefix($this->dataRecord['database_user_prefix'], $dbuser_prefix, $global_config['dbuser_prefix'])); parent::onShowEnd(); } @@ -128,6 +125,11 @@ class page_action extends tform_actions { $global_config = $app->getconf->get_global_config('sites'); $dbuser_prefix = $app->tools_sites->replacePrefix($global_config['dbuser_prefix'], $this->dataRecord); + $this->oldDataRecord = $app->db->queryOneRecord("SELECT * FROM web_database_user WHERE database_user_id = '".$this->id."'"); + + $dbuser_prefix = $app->tools_sites->getPrefix($this->oldDataRecord['database_user_prefix'], $dbuser_prefix); + $this->dataRecord['database_user_prefix'] = $dbuser_prefix; + //* Database username shall not be empty if($this->dataRecord['database_user'] == '') $app->tform->errorMessage .= $app->tform->wordbook["database_user_error_empty"].'
'; @@ -146,7 +148,6 @@ class page_action extends tform_actions { } $this->dataRecord['server_id'] = $conf['server_id']; - $this->oldDataRecord = $app->db->queryOneRecord("SELECT * FROM web_database_user WHERE database_user_id = '".$this->id."'"); parent::onBeforeUpdate(); } @@ -162,6 +163,8 @@ class page_action extends tform_actions { $global_config = $app->getconf->get_global_config('sites'); $dbuser_prefix = $app->tools_sites->replacePrefix($global_config['dbuser_prefix'], $this->dataRecord); + $this->dataRecord['database_user_prefix'] = $dbuser_prefix; + if(strlen($dbuser_prefix . $this->dataRecord['database_user']) > 16) $app->tform->errorMessage .= str_replace('{user}',$dbuser_prefix . $this->dataRecord['database_user'],$app->tform->wordbook["database_user_error_len"]).'
'; //* Check database user against blacklist diff --git a/interface/web/sites/form/database.tform.php b/interface/web/sites/form/database.tform.php index c0220609aa..e390f7276c 100644 --- a/interface/web/sites/form/database.tform.php +++ b/interface/web/sites/form/database.tform.php @@ -106,6 +106,14 @@ $form["tabs"]['database'] = array ( 'maxlength' => '255', 'searchable' => 1 ), + 'database_name_prefix' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'default' => '', + 'value' => '', + 'width' => '30', + 'maxlength' => '25' + ), 'database_user_id' => array ( 'datatype' => 'INTEGER', 'formtype' => 'SELECT', diff --git a/interface/web/sites/form/database_user.tform.php b/interface/web/sites/form/database_user.tform.php index 7e84f1c47a..2bac933073 100644 --- a/interface/web/sites/form/database_user.tform.php +++ b/interface/web/sites/form/database_user.tform.php @@ -91,6 +91,14 @@ $form["tabs"]['database_user'] = array ( 'maxlength' => '255', 'searchable' => 1 ), + 'database_user_prefix' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'default' => '', + 'value' => '', + 'width' => '30', + 'maxlength' => '25' + ), 'database_password' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'PASSWORD', diff --git a/interface/web/sites/form/ftp_user.tform.php b/interface/web/sites/form/ftp_user.tform.php index 658d951def..543d863a9d 100644 --- a/interface/web/sites/form/ftp_user.tform.php +++ b/interface/web/sites/form/ftp_user.tform.php @@ -100,6 +100,14 @@ $form["tabs"]['ftp'] = array ( 'maxlength' => '255', 'searchable' => 1 ), + 'username_prefix' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'default' => '', + 'value' => '', + 'width' => '30', + 'maxlength' => '25' + ), 'password' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'PASSWORD', diff --git a/interface/web/sites/form/shell_user.tform.php b/interface/web/sites/form/shell_user.tform.php index 061dd29d91..d698a7ac38 100644 --- a/interface/web/sites/form/shell_user.tform.php +++ b/interface/web/sites/form/shell_user.tform.php @@ -100,6 +100,14 @@ $form["tabs"]['shell'] = array ( 'maxlength' => '255', 'searchable' => 1 ), + 'username_prefix' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'default' => '', + 'value' => '', + 'width' => '30', + 'maxlength' => '25' + ), 'password' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'PASSWORD', diff --git a/interface/web/sites/form/webdav_user.tform.php b/interface/web/sites/form/webdav_user.tform.php index 5d423b652e..29a52dc135 100644 --- a/interface/web/sites/form/webdav_user.tform.php +++ b/interface/web/sites/form/webdav_user.tform.php @@ -93,6 +93,14 @@ $form["tabs"]['webdav'] = array ( 'width' => '30', 'maxlength' => '255' ), + 'username_prefix' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'default' => '', + 'value' => '', + 'width' => '30', + 'maxlength' => '25' + ), 'password' => array ( 'datatype' => 'VARCHAR', 'encryption' => 'CLEARTEXT', diff --git a/interface/web/sites/ftp_user_edit.php b/interface/web/sites/ftp_user_edit.php index cd52d177d2..455d126bba 100644 --- a/interface/web/sites/ftp_user_edit.php +++ b/interface/web/sites/ftp_user_edit.php @@ -79,14 +79,10 @@ class page_action extends tform_actions { if ($this->dataRecord['username'] != ""){ /* REMOVE the restriction */ - $app->tpl->setVar("username", preg_replace('/'.$ftpuser_prefix.'/' , '', $this->dataRecord['username'], 1)); - } - if($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) { - $app->tpl->setVar("username_prefix", $global_config['ftpuser_prefix']); - } - else { - $app->tpl->setVar("username_prefix", $ftpuser_prefix); + $app->tpl->setVar("username", $app->tools_sites->removePrefix($this->dataRecord['username'], $this->dataRecord['username_prefix'], $ftpuser_prefix)); } + + $app->tpl->setVar("username_prefix", $app->tools_sites->getPrefix($this->dataRecord['username_prefix'], $ftpuser_prefix, $global_config['ftpuser_prefix'])); parent::onShowEnd(); } @@ -116,6 +112,8 @@ class page_action extends tform_actions { $app->uses('getconf,tools_sites'); $global_config = $app->getconf->get_global_config('sites'); $ftpuser_prefix = $app->tools_sites->replacePrefix($global_config['ftpuser_prefix'], $this->dataRecord); + + $this->dataRecord['username_prefix'] = $ftpuser_prefix; if ($app->tform->errorMessage == '') { $this->dataRecord['username'] = $ftpuser_prefix . $this->dataRecord['username']; @@ -151,6 +149,10 @@ class page_action extends tform_actions { $global_config = $app->getconf->get_global_config('sites'); $ftpuser_prefix = $app->tools_sites->replacePrefix($global_config['ftpuser_prefix'], $this->dataRecord); + $old_record = $app->tform->getDataRecord($this->id); + $ftpuser_prefix = $app->tools_sites->getPrefix($old_record['username_prefix'], $ftpuser_prefix); + $this->dataRecord['username_prefix'] = $ftpuser_prefix; + /* restrict the names */ if ($app->tform->errorMessage == '') { $this->dataRecord['username'] = $ftpuser_prefix . $this->dataRecord['username']; diff --git a/interface/web/sites/lib/lang/ar_database.lng b/interface/web/sites/lib/lang/ar_database.lng index 9df3e74cab..bf90ffcc28 100644 --- a/interface/web/sites/lib/lang/ar_database.lng +++ b/interface/web/sites/lib/lang/ar_database.lng @@ -41,4 +41,5 @@ $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.'; ?> diff --git a/interface/web/sites/lib/lang/ar_web_domain.lng b/interface/web/sites/lib/lang/ar_web_domain.lng index 462b10633c..c749fb5028 100644 --- a/interface/web/sites/lib/lang/ar_web_domain.lng +++ b/interface/web/sites/lib/lang/ar_web_domain.lng @@ -109,4 +109,6 @@ $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:'; ?> diff --git a/interface/web/sites/lib/lang/ar_web_subdomain.lng b/interface/web/sites/lib/lang/ar_web_subdomain.lng index a64b8824bd..d9c0dbd37c 100644 --- a/interface/web/sites/lib/lang/ar_web_subdomain.lng +++ b/interface/web/sites/lib/lang/ar_web_subdomain.lng @@ -40,4 +40,6 @@ $wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for ex $wb['no_redirect_txt'] = 'No redirect'; $wb['no_flag_txt'] = 'No flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; ?> diff --git a/interface/web/sites/lib/lang/ar_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/ar_web_vhost_subdomain.lng index 4a0279e9fc..b87c788126 100644 --- a/interface/web/sites/lib/lang/ar_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/ar_web_vhost_subdomain.lng @@ -110,4 +110,9 @@ $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; ?> diff --git a/interface/web/sites/lib/lang/bg_database.lng b/interface/web/sites/lib/lang/bg_database.lng index 9fa82b9500..64f09cb71f 100644 --- a/interface/web/sites/lib/lang/bg_database.lng +++ b/interface/web/sites/lib/lang/bg_database.lng @@ -41,4 +41,5 @@ $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.'; ?> diff --git a/interface/web/sites/lib/lang/bg_database_user.lng b/interface/web/sites/lib/lang/bg_database_user.lng index 6c4ee7c696..66a0718349 100644 --- a/interface/web/sites/lib/lang/bg_database_user.lng +++ b/interface/web/sites/lib/lang/bg_database_user.lng @@ -1,23 +1,23 @@ diff --git a/interface/web/sites/lib/lang/bg_database_user_admin_list.lng b/interface/web/sites/lib/lang/bg_database_user_admin_list.lng index 4c17da126b..d7f88c4c36 100644 --- a/interface/web/sites/lib/lang/bg_database_user_admin_list.lng +++ b/interface/web/sites/lib/lang/bg_database_user_admin_list.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$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/bg_database_user_list.lng b/interface/web/sites/lib/lang/bg_database_user_list.lng index 549374b6ac..8c226496a6 100644 --- a/interface/web/sites/lib/lang/bg_database_user_list.lng +++ b/interface/web/sites/lib/lang/bg_database_user_list.lng @@ -1,5 +1,5 @@ \ No newline at end of file +$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/bg_web_domain.lng b/interface/web/sites/lib/lang/bg_web_domain.lng index 3c680d2ab0..2b2fa97056 100644 --- a/interface/web/sites/lib/lang/bg_web_domain.lng +++ b/interface/web/sites/lib/lang/bg_web_domain.lng @@ -109,4 +109,6 @@ $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:'; ?> diff --git a/interface/web/sites/lib/lang/bg_web_subdomain.lng b/interface/web/sites/lib/lang/bg_web_subdomain.lng index 58675bc8da..68a604b075 100644 --- a/interface/web/sites/lib/lang/bg_web_subdomain.lng +++ b/interface/web/sites/lib/lang/bg_web_subdomain.lng @@ -40,4 +40,6 @@ $wb['redirect_error_regex'] = 'Грешен път за редирект. Вал $wb['no_redirect_txt'] = 'Без редирект'; $wb['no_flag_txt'] = 'No flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; ?> diff --git a/interface/web/sites/lib/lang/bg_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/bg_web_vhost_subdomain.lng index d993af80b0..b87c788126 100644 --- a/interface/web/sites/lib/lang/bg_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/bg_web_vhost_subdomain.lng @@ -1,79 +1,78 @@ = 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['nginx_directives_txt'] = 'nginx Directives'; +$wb['seo_redirect_txt'] = 'SEO Redirect'; +$wb['non_www_to_www_txt'] = 'Non-www -> www'; +$wb['www_to_non_www_txt'] = 'www -> non-www'; +$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM'; +$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.'; +$wb['python_txt'] = 'Python'; +$wb['perl_txt'] = 'Perl'; +$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children'; +$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers'; +$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers'; +$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers'; +$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0'; +$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.'; +$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.'; +$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.'; +$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.'; +$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.'; +$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.'; +$wb['fastcgi_php_version_txt'] = 'PHP Version'; +$wb['pm_txt'] = 'PHP-FPM Process Manager'; +$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout'; +$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests'; +$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.'; +$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -?> \ No newline at end of file +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +?> diff --git a/interface/web/sites/lib/lang/bg_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/bg_web_vhost_subdomain_list.lng index 8273dbd066..1c16bcda28 100644 --- a/interface/web/sites/lib/lang/bg_web_vhost_subdomain_list.lng +++ b/interface/web/sites/lib/lang/bg_web_vhost_subdomain_list.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Subdomains'; +$wb['active_txt'] = 'Active'; +$wb['server_id_txt'] = 'Server'; +$wb['parent_domain_id_txt'] = 'Website'; +$wb['domain_txt'] = 'Subdomain'; +$wb['add_new_record_txt'] = 'Add new subdomain'; +?> diff --git a/interface/web/sites/lib/lang/br_aps.lng b/interface/web/sites/lib/lang/br_aps.lng index f6d9ed6eda..8ce5b20eb1 100644 --- a/interface/web/sites/lib/lang/br_aps.lng +++ b/interface/web/sites/lib/lang/br_aps.lng @@ -38,14 +38,14 @@ $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_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'; diff --git a/interface/web/sites/lib/lang/br_database.lng b/interface/web/sites/lib/lang/br_database.lng index 82019b3f30..740472d580 100644 --- a/interface/web/sites/lib/lang/br_database.lng +++ b/interface/web/sites/lib/lang/br_database.lng @@ -41,4 +41,5 @@ $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.'; ?> diff --git a/interface/web/sites/lib/lang/br_database_user.lng b/interface/web/sites/lib/lang/br_database_user.lng index 6c4ee7c696..66a0718349 100644 --- a/interface/web/sites/lib/lang/br_database_user.lng +++ b/interface/web/sites/lib/lang/br_database_user.lng @@ -1,23 +1,23 @@ diff --git a/interface/web/sites/lib/lang/br_database_user_admin_list.lng b/interface/web/sites/lib/lang/br_database_user_admin_list.lng index 4c17da126b..d7f88c4c36 100644 --- a/interface/web/sites/lib/lang/br_database_user_admin_list.lng +++ b/interface/web/sites/lib/lang/br_database_user_admin_list.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$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/br_database_user_list.lng b/interface/web/sites/lib/lang/br_database_user_list.lng index 549374b6ac..8c226496a6 100644 --- a/interface/web/sites/lib/lang/br_database_user_list.lng +++ b/interface/web/sites/lib/lang/br_database_user_list.lng @@ -1,5 +1,5 @@ \ No newline at end of file +$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/br_web_domain.lng b/interface/web/sites/lib/lang/br_web_domain.lng index 8d78cada9a..dc75b80693 100644 --- a/interface/web/sites/lib/lang/br_web_domain.lng +++ b/interface/web/sites/lib/lang/br_web_domain.lng @@ -109,4 +109,6 @@ $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:'; ?> diff --git a/interface/web/sites/lib/lang/br_web_subdomain.lng b/interface/web/sites/lib/lang/br_web_subdomain.lng index b18d2fdf24..6777f6e009 100644 --- a/interface/web/sites/lib/lang/br_web_subdomain.lng +++ b/interface/web/sites/lib/lang/br_web_subdomain.lng @@ -40,4 +40,6 @@ $wb['redirect_error_regex'] = 'Caminho de redirecionamento inválido. Exemplo de $wb['no_redirect_txt'] = 'No redirect'; $wb['no_flag_txt'] = 'No flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; ?> diff --git a/interface/web/sites/lib/lang/br_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/br_web_vhost_subdomain.lng index d993af80b0..b87c788126 100644 --- a/interface/web/sites/lib/lang/br_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/br_web_vhost_subdomain.lng @@ -1,79 +1,78 @@ = 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['nginx_directives_txt'] = 'nginx Directives'; +$wb['seo_redirect_txt'] = 'SEO Redirect'; +$wb['non_www_to_www_txt'] = 'Non-www -> www'; +$wb['www_to_non_www_txt'] = 'www -> non-www'; +$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM'; +$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.'; +$wb['python_txt'] = 'Python'; +$wb['perl_txt'] = 'Perl'; +$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children'; +$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers'; +$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers'; +$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers'; +$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0'; +$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.'; +$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.'; +$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.'; +$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.'; +$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.'; +$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.'; +$wb['fastcgi_php_version_txt'] = 'PHP Version'; +$wb['pm_txt'] = 'PHP-FPM Process Manager'; +$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout'; +$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests'; +$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.'; +$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -?> \ No newline at end of file +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +?> diff --git a/interface/web/sites/lib/lang/br_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/br_web_vhost_subdomain_list.lng index 8273dbd066..1c16bcda28 100644 --- a/interface/web/sites/lib/lang/br_web_vhost_subdomain_list.lng +++ b/interface/web/sites/lib/lang/br_web_vhost_subdomain_list.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Subdomains'; +$wb['active_txt'] = 'Active'; +$wb['server_id_txt'] = 'Server'; +$wb['parent_domain_id_txt'] = 'Website'; +$wb['domain_txt'] = 'Subdomain'; +$wb['add_new_record_txt'] = 'Add new subdomain'; +?> diff --git a/interface/web/sites/lib/lang/cz.lng b/interface/web/sites/lib/lang/cz.lng index 344c229fc4..8d3f7b013c 100644 --- a/interface/web/sites/lib/lang/cz.lng +++ b/interface/web/sites/lib/lang/cz.lng @@ -21,13 +21,13 @@ $wb['Shell'] = 'Shell'; $wb['Webdav'] = 'WebDAV'; $wb['FTP'] = 'FTP'; $wb['Options'] = 'Volby'; -$wb['Domain'] = 'Doména'; $wb['Redirect'] = 'Přesměrování'; $wb['SSL'] = 'SSL'; $wb['Sites'] = 'Stránky'; $wb['Database User'] = 'Uživatelé databáze'; -$wb['APS Installer'] = 'APS Installer'; -$wb['Available packages'] = 'Available packages'; -$wb['Installed packages'] = 'Installed packages'; -$wb['Update Packagelist'] = 'Update Packagelist'; +$wb['APS Installer'] = 'APS instalátor'; +$wb['Available packages'] = 'Dostupné balíčky'; +$wb['Installed packages'] = 'Nainstalované balíčky'; +$wb['Update Packagelist'] = 'Aktualizace seznamu balíčků'; +$wb['Domain'] = 'Domain'; ?> diff --git a/interface/web/sites/lib/lang/cz_aps_instances_list.lng b/interface/web/sites/lib/lang/cz_aps_instances_list.lng index 052d834a71..961ecbac67 100644 --- a/interface/web/sites/lib/lang/cz_aps_instances_list.lng +++ b/interface/web/sites/lib/lang/cz_aps_instances_list.lng @@ -1,13 +1,13 @@ diff --git a/interface/web/sites/lib/lang/cz_aps_packages_list.lng b/interface/web/sites/lib/lang/cz_aps_packages_list.lng index 68c378085f..2c83eac21b 100644 --- a/interface/web/sites/lib/lang/cz_aps_packages_list.lng +++ b/interface/web/sites/lib/lang/cz_aps_packages_list.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/sites/lib/lang/cz_cron_list.lng b/interface/web/sites/lib/lang/cz_cron_list.lng index 896eeb75f1..f50dee2faf 100644 --- a/interface/web/sites/lib/lang/cz_cron_list.lng +++ b/interface/web/sites/lib/lang/cz_cron_list.lng @@ -9,5 +9,5 @@ $wb['run_month_txt'] = 'Měsíce'; $wb['run_wday_txt'] = 'Dny týdne'; $wb['command_txt'] = 'Příkaz'; $wb['add_new_cron_txt'] = 'Přidat novou cron úlohu'; -$wb['parent_domain_id_txt'] = 'Website'; +$wb['parent_domain_id_txt'] = 'Webové stránky'; ?> diff --git a/interface/web/sites/lib/lang/cz_database.lng b/interface/web/sites/lib/lang/cz_database.lng index adde2cf1b9..7c41fbfce6 100644 --- a/interface/web/sites/lib/lang/cz_database.lng +++ b/interface/web/sites/lib/lang/cz_database.lng @@ -41,4 +41,5 @@ $wb['database_ro_user_txt'] = 'Uživatel databáze - jen právo ke čtení'; $wb['optional_txt'] = 'Volitelný'; $wb['select_dbuser_txt'] = 'Vyberte uživatele databáze'; $wb['no_dbuser_txt'] = 'Žádný'; +$wb['database_client_differs_txt'] = 'The client of the parent web and the database do not match.'; ?> diff --git a/interface/web/sites/lib/lang/cz_user_quota_stats_list.lng b/interface/web/sites/lib/lang/cz_user_quota_stats_list.lng index 52adf67fc7..2c9625ad43 100644 --- a/interface/web/sites/lib/lang/cz_user_quota_stats_list.lng +++ b/interface/web/sites/lib/lang/cz_user_quota_stats_list.lng @@ -5,5 +5,5 @@ $wb['system_user_txt'] = 'Linuxový uživatel'; $wb['used_txt'] = 'Využité místo'; $wb['hard_txt'] = 'Tvrdý limit'; $wb['soft_txt'] = 'Měkký limit'; -$wb['files_txt'] = 'Single files'; +$wb['files_txt'] = 'Počet souborů'; ?> diff --git a/interface/web/sites/lib/lang/cz_web_aliasdomain.lng b/interface/web/sites/lib/lang/cz_web_aliasdomain.lng index 0060ecaeab..964151136d 100644 --- a/interface/web/sites/lib/lang/cz_web_aliasdomain.lng +++ b/interface/web/sites/lib/lang/cz_web_aliasdomain.lng @@ -1,3 +1,3 @@ diff --git a/interface/web/sites/lib/lang/cz_web_domain.lng b/interface/web/sites/lib/lang/cz_web_domain.lng index f7a450eb0f..33134ac0ed 100644 --- a/interface/web/sites/lib/lang/cz_web_domain.lng +++ b/interface/web/sites/lib/lang/cz_web_domain.lng @@ -109,4 +109,6 @@ $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:'; ?> diff --git a/interface/web/sites/lib/lang/cz_web_folder_user.lng b/interface/web/sites/lib/lang/cz_web_folder_user.lng index 2adfc2d2ea..d3dc99d105 100644 --- a/interface/web/sites/lib/lang/cz_web_folder_user.lng +++ b/interface/web/sites/lib/lang/cz_web_folder_user.lng @@ -1,10 +1,10 @@ diff --git a/interface/web/sites/lib/lang/cz_web_subdomain.lng b/interface/web/sites/lib/lang/cz_web_subdomain.lng index bb2005ebc0..c4820176e2 100644 --- a/interface/web/sites/lib/lang/cz_web_subdomain.lng +++ b/interface/web/sites/lib/lang/cz_web_subdomain.lng @@ -40,4 +40,6 @@ $wb['redirect_error_regex'] = 'Neplatná cesta přesměrování. Platné přesm $wb['no_redirect_txt'] = 'Žádné přesměrování'; $wb['no_flag_txt'] = 'Žádný příznak'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; ?> diff --git a/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng index 79a44de5d5..a13aea822a 100644 --- a/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng @@ -17,7 +17,7 @@ $wb['ssl_bundle_txt'] = 'SSL Bundle'; $wb['ssl_action_txt'] = 'SSL Action'; $wb['ssl_domain_txt'] = 'SSL Domain'; $wb['server_id_txt'] = 'Server'; -$wb['domain_txt'] = 'Domain'; +$wb['domain_txt'] = 'Doména'; $wb['host_txt'] = 'Hostname'; $wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.'; $wb['type_txt'] = 'Type'; @@ -39,7 +39,7 @@ $wb['subdomain_txt'] = 'Auto-Subdomain'; $wb['ssl_txt'] = 'SSL'; $wb['suexec_txt'] = 'SuEXEC'; $wb['php_txt'] = 'PHP'; -$wb['client_txt'] = 'Client'; +$wb['client_txt'] = 'Klient'; $wb['limit_web_domain_txt'] = 'The max. Počet webových stránek for your account is reached.'; $wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.'; $wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.'; @@ -56,7 +56,7 @@ $wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.'; $wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.'; $wb['error_ssl_country_empty'] = 'SSL Country is empty.'; $wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty'; -$wb['client_group_id_txt'] = 'Client'; +$wb['client_group_id_txt'] = 'Klient'; $wb['stats_password_txt'] = 'Webstatistics password'; $wb['allow_override_txt'] = 'Apache AllowOverride'; $wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota'; @@ -110,4 +110,9 @@ $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; ?> diff --git a/interface/web/sites/lib/lang/cz_webdav_user.lng b/interface/web/sites/lib/lang/cz_webdav_user.lng index 18db84a409..35dae3bb97 100644 --- a/interface/web/sites/lib/lang/cz_webdav_user.lng +++ b/interface/web/sites/lib/lang/cz_webdav_user.lng @@ -3,8 +3,8 @@ $wb['dir_txt'] = 'Directory'; $wb['server_id_txt'] = 'Server'; $wb['parent_domain_id_txt'] = 'Website'; $wb['username_txt'] = 'Username'; -$wb['password_txt'] = 'Password'; -$wb['password_strength_txt'] = 'Password strength'; +$wb['password_txt'] = 'Heslo'; +$wb['password_strength_txt'] = 'Síla hesla'; $wb['active_txt'] = 'Aktivní'; $wb['limit_webdav_user_txt'] = 'The max. number of webdav users for your account is reached.'; $wb['username_error_empty'] = 'Username is empty.'; diff --git a/interface/web/sites/lib/lang/el_database.lng b/interface/web/sites/lib/lang/el_database.lng index fd79f1c86a..4c2d70637e 100644 --- a/interface/web/sites/lib/lang/el_database.lng +++ b/interface/web/sites/lib/lang/el_database.lng @@ -41,4 +41,5 @@ $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.'; ?> diff --git a/interface/web/sites/lib/lang/el_web_domain.lng b/interface/web/sites/lib/lang/el_web_domain.lng index f8ca7e0387..b77cd8a5db 100644 --- a/interface/web/sites/lib/lang/el_web_domain.lng +++ b/interface/web/sites/lib/lang/el_web_domain.lng @@ -109,4 +109,6 @@ $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:'; ?> diff --git a/interface/web/sites/lib/lang/el_web_subdomain.lng b/interface/web/sites/lib/lang/el_web_subdomain.lng index ce9f947b6a..f4fd9b9b6e 100644 --- a/interface/web/sites/lib/lang/el_web_subdomain.lng +++ b/interface/web/sites/lib/lang/el_web_subdomain.lng @@ -40,4 +40,6 @@ $wb['redirect_error_regex'] = 'Η διαδρομή ανακατεύθυνσης $wb['no_redirect_txt'] = 'Χωρίς Ανακατεύθυνση'; $wb['no_flag_txt'] = 'Χωρίς Σημαία'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; ?> diff --git a/interface/web/sites/lib/lang/el_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/el_web_vhost_subdomain.lng index 4a0279e9fc..b87c788126 100644 --- a/interface/web/sites/lib/lang/el_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/el_web_vhost_subdomain.lng @@ -110,4 +110,9 @@ $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; ?> diff --git a/interface/web/sites/lib/lang/en.lng b/interface/web/sites/lib/lang/en.lng index 0d84dfdd39..7160dacfb8 100644 --- a/interface/web/sites/lib/lang/en.lng +++ b/interface/web/sites/lib/lang/en.lng @@ -30,4 +30,5 @@ $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)'; ?> \ No newline at end of file diff --git a/interface/web/sites/lib/lang/es.lng b/interface/web/sites/lib/lang/es.lng index 16c5043b05..054d2aef6a 100644 --- a/interface/web/sites/lib/lang/es.lng +++ b/interface/web/sites/lib/lang/es.lng @@ -1,31 +1,31 @@ diff --git a/interface/web/sites/lib/lang/es_database.lng b/interface/web/sites/lib/lang/es_database.lng index 61af654f5a..ed3019002a 100644 --- a/interface/web/sites/lib/lang/es_database.lng +++ b/interface/web/sites/lib/lang/es_database.lng @@ -22,6 +22,11 @@ $wb['remote_ips_txt'] = 'IPs de acceso remoto (separadas por ,) (dejar en blanco $wb['database_remote_error_ips'] = 'Al menos una de las IP introducidas no es válida.'; $wb['database_name_error_len'] = 'El nombre de la base de datos - {db} - es demasiado largo. La longitud máxima del nombre de la base de datos, incluyendo el prefijo, es de 64 caracteres.'; $wb['database_user_error_len'] = 'El nombre de usuario de la base de datos - {user}- es demasiado largo. La longitud máxima del nombre de usuario de la base de datos, incluyendo el prefijo, es de 16 caracteres.'; +$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['parent_domain_id_txt'] = 'Site'; $wb['database_site_error_empty'] = 'Select the site to which the database belongs.'; $wb['select_site_txt'] = '- Select Site -'; @@ -37,8 +42,4 @@ $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'; ?> diff --git a/interface/web/sites/lib/lang/es_database_user.lng b/interface/web/sites/lib/lang/es_database_user.lng index 6c4ee7c696..66a0718349 100644 --- a/interface/web/sites/lib/lang/es_database_user.lng +++ b/interface/web/sites/lib/lang/es_database_user.lng @@ -1,23 +1,23 @@ diff --git a/interface/web/sites/lib/lang/es_database_user_admin_list.lng b/interface/web/sites/lib/lang/es_database_user_admin_list.lng index 4c17da126b..d7f88c4c36 100644 --- a/interface/web/sites/lib/lang/es_database_user_admin_list.lng +++ b/interface/web/sites/lib/lang/es_database_user_admin_list.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$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/es_database_user_list.lng b/interface/web/sites/lib/lang/es_database_user_list.lng index 549374b6ac..8c226496a6 100644 --- a/interface/web/sites/lib/lang/es_database_user_list.lng +++ b/interface/web/sites/lib/lang/es_database_user_list.lng @@ -1,5 +1,5 @@ \ No newline at end of file +$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/es_ftp_user.lng b/interface/web/sites/lib/lang/es_ftp_user.lng index 94dcc694fe..c8b86b064d 100644 --- a/interface/web/sites/lib/lang/es_ftp_user.lng +++ b/interface/web/sites/lib/lang/es_ftp_user.lng @@ -24,9 +24,9 @@ $wb['directory_error_empty'] = 'Directorio vacío'; $wb['quota_files_unity_txt'] = 'Ficheros'; $wb['directory_error_notinweb'] = 'El directorio no está dentro del directorio web raíz.'; $wb['parent_domain_id_error_empty'] = 'No se ha seleccionado un sitio web.'; -$wb['quota_size_error_regex'] = 'Quota: enter a -1 for unlimited or a number > 0'; -$wb['dir_dot_error'] = 'No .. in path allowed.'; -$wb['dir_slashdot_error'] = 'No ./ in path allowed.'; +$wb['quota_size_error_regex'] = 'Cuota: introduzca un -1 para ilimitados ó un número > 0'; +$wb['dir_dot_error'] = 'No .. ruta permitida.'; +$wb['dir_slashdot_error'] = 'No ./ en ruta permitida.'; $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; diff --git a/interface/web/sites/lib/lang/es_shell_user.lng b/interface/web/sites/lib/lang/es_shell_user.lng index b0cb7248cf..2ca9c55840 100644 --- a/interface/web/sites/lib/lang/es_shell_user.lng +++ b/interface/web/sites/lib/lang/es_shell_user.lng @@ -17,11 +17,11 @@ $wb['uid_error_empty'] = 'GID vacío'; $wb['directory_error_empty'] = 'Directorio vacío'; $wb['limit_shell_user_txt'] = 'Se ha alcanzado el número máximo de usuarios de consola'; $wb['parent_domain_id_error_empty'] = 'No se ha seleccionado un sitio web.'; -$wb['puser_txt'] = 'Web Username'; +$wb['puser_txt'] = 'Nombre del usuario Web'; $wb['pgroup_txt'] = 'Web Group'; -$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)'; -$wb['dir_dot_error'] = 'No .. in path allowed.'; -$wb['dir_slashdot_error'] = 'No ./ in path allowed.'; +$wb['ssh_rsa_txt'] = 'SSH-RSA de clave pública (para los inicios de sesión basados ??en clave)'; +$wb['dir_dot_error'] = 'No .. ruta permitida.'; +$wb['dir_slashdot_error'] = 'No ./ en ruta permitida.'; $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; diff --git a/interface/web/sites/lib/lang/es_shell_user_list.lng b/interface/web/sites/lib/lang/es_shell_user_list.lng index a64cc4e558..4a9d7cb9a7 100644 --- a/interface/web/sites/lib/lang/es_shell_user_list.lng +++ b/interface/web/sites/lib/lang/es_shell_user_list.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/sites/lib/lang/es_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/es_web_aliasdomain_list.lng index 12e7b60833..ba9cf8ec79 100644 --- a/interface/web/sites/lib/lang/es_web_aliasdomain_list.lng +++ b/interface/web/sites/lib/lang/es_web_aliasdomain_list.lng @@ -8,7 +8,7 @@ $wb['add_new_record_txt'] = 'Añadir nuevo alias de dominio'; $wb['domain_error_empty'] = 'El dominio está vacío'; $wb['domain_error_unique'] = 'El domino debe ser único'; $wb['domain_error_regex'] = 'El nombre de dominio no es válido'; -$wb['no_redirect_txt'] = 'No redirect'; +$wb['no_redirect_txt'] = 'No redirigir'; $wb['no_flag_txt'] = 'No flag'; -$wb['none_txt'] = 'None'; +$wb['none_txt'] = 'Ninguno'; ?> diff --git a/interface/web/sites/lib/lang/es_web_domain.lng b/interface/web/sites/lib/lang/es_web_domain.lng index 44e4aa9963..3ba7ab9739 100644 --- a/interface/web/sites/lib/lang/es_web_domain.lng +++ b/interface/web/sites/lib/lang/es_web_domain.lng @@ -1,30 +1,35 @@ www'; +$wb['www_to_non_www_txt'] = 'www -> non-www'; +$wb['php_fpm_use_socket_txt'] = 'Usar Socket para PHP-FPM'; +$wb['error_no_sni_txt'] = 'SNI para SSL no está activado en este servidor. Sólo es posible activar un certificado SSL en cada dirección 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['error_php_fpm_pm_settings_txt'] = 'Los valores de configuración de PHP-FPM pm debe ser como sigue: 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 debe ser un valor entero positivo.'; +$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers debe ser un valor entero positivo.'; +$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers debe ser un valor entero positivo.'; +$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers debe ser un valor entero positivo.'; $wb['ssl_key_txt'] = 'SSL Key'; +$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['perl_txt'] = 'Perl'; +$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.'; +$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.'; $wb['fastcgi_php_version_txt'] = 'PHP Version'; $wb['pm_txt'] = 'PHP-FPM Process Manager'; $wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout'; @@ -104,9 +106,9 @@ $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:'; ?> diff --git a/interface/web/sites/lib/lang/es_web_folder.lng b/interface/web/sites/lib/lang/es_web_folder.lng index 93cd40a081..650f75bc1d 100644 --- a/interface/web/sites/lib/lang/es_web_folder.lng +++ b/interface/web/sites/lib/lang/es_web_folder.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/sites/lib/lang/es_web_folder_list.lng b/interface/web/sites/lib/lang/es_web_folder_list.lng index 76d97029ba..668f62602b 100644 --- a/interface/web/sites/lib/lang/es_web_folder_list.lng +++ b/interface/web/sites/lib/lang/es_web_folder_list.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/sites/lib/lang/es_web_folder_user.lng b/interface/web/sites/lib/lang/es_web_folder_user.lng index bf56653969..645fe3ab3b 100644 --- a/interface/web/sites/lib/lang/es_web_folder_user.lng +++ b/interface/web/sites/lib/lang/es_web_folder_user.lng @@ -1,9 +1,9 @@ diff --git a/interface/web/sites/lib/lang/es_web_subdomain.lng b/interface/web/sites/lib/lang/es_web_subdomain.lng index eaaae93c5d..31ee111816 100644 --- a/interface/web/sites/lib/lang/es_web_subdomain.lng +++ b/interface/web/sites/lib/lang/es_web_subdomain.lng @@ -36,8 +36,10 @@ $wb['domain_error_empty'] = 'El dominio está vacío.'; $wb['domain_error_unique'] = 'El dominio debe ser único.'; $wb['domain_error_regex'] = 'El nombre de dominio no es válido.'; $wb['host_txt'] = 'Alojamiento'; -$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/'; -$wb['no_redirect_txt'] = 'No redirect'; +$wb['redirect_error_regex'] = 'Redirección no válida ruta. Redirecciones válidos son por ejemplo: /test/ or http://www.domain.tld/test/'; +$wb['no_redirect_txt'] = 'No redirigir'; $wb['no_flag_txt'] = 'No flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; ?> diff --git a/interface/web/sites/lib/lang/es_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/es_web_vhost_subdomain.lng index d993af80b0..b87c788126 100644 --- a/interface/web/sites/lib/lang/es_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/es_web_vhost_subdomain.lng @@ -1,79 +1,78 @@ = 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['nginx_directives_txt'] = 'nginx Directives'; +$wb['seo_redirect_txt'] = 'SEO Redirect'; +$wb['non_www_to_www_txt'] = 'Non-www -> www'; +$wb['www_to_non_www_txt'] = 'www -> non-www'; +$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM'; +$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.'; +$wb['python_txt'] = 'Python'; +$wb['perl_txt'] = 'Perl'; +$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children'; +$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers'; +$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers'; +$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers'; +$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0'; +$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.'; +$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.'; +$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.'; +$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.'; +$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.'; +$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.'; +$wb['fastcgi_php_version_txt'] = 'PHP Version'; +$wb['pm_txt'] = 'PHP-FPM Process Manager'; +$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout'; +$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests'; +$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.'; +$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -?> \ No newline at end of file +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +?> diff --git a/interface/web/sites/lib/lang/es_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/es_web_vhost_subdomain_list.lng index 8273dbd066..1c16bcda28 100644 --- a/interface/web/sites/lib/lang/es_web_vhost_subdomain_list.lng +++ b/interface/web/sites/lib/lang/es_web_vhost_subdomain_list.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Subdomains'; +$wb['active_txt'] = 'Active'; +$wb['server_id_txt'] = 'Server'; +$wb['parent_domain_id_txt'] = 'Website'; +$wb['domain_txt'] = 'Subdomain'; +$wb['add_new_record_txt'] = 'Add new subdomain'; +?> diff --git a/interface/web/sites/lib/lang/es_webdav_user.lng b/interface/web/sites/lib/lang/es_webdav_user.lng index 329eb60b7e..8cf788e99a 100644 --- a/interface/web/sites/lib/lang/es_webdav_user.lng +++ b/interface/web/sites/lib/lang/es_webdav_user.lng @@ -1,17 +1,17 @@ diff --git a/interface/web/sites/lib/lang/fi_aps.lng b/interface/web/sites/lib/lang/fi_aps.lng index f6d9ed6eda..8ce5b20eb1 100644 --- a/interface/web/sites/lib/lang/fi_aps.lng +++ b/interface/web/sites/lib/lang/fi_aps.lng @@ -38,14 +38,14 @@ $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_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'; diff --git a/interface/web/sites/lib/lang/fi_database.lng b/interface/web/sites/lib/lang/fi_database.lng index 9826ddb13d..362d4c628a 100755 --- a/interface/web/sites/lib/lang/fi_database.lng +++ b/interface/web/sites/lib/lang/fi_database.lng @@ -41,4 +41,5 @@ $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.'; ?> diff --git a/interface/web/sites/lib/lang/fi_database_user.lng b/interface/web/sites/lib/lang/fi_database_user.lng index 6c4ee7c696..66a0718349 100644 --- a/interface/web/sites/lib/lang/fi_database_user.lng +++ b/interface/web/sites/lib/lang/fi_database_user.lng @@ -1,23 +1,23 @@ diff --git a/interface/web/sites/lib/lang/fi_database_user_admin_list.lng b/interface/web/sites/lib/lang/fi_database_user_admin_list.lng index 4c17da126b..d7f88c4c36 100644 --- a/interface/web/sites/lib/lang/fi_database_user_admin_list.lng +++ b/interface/web/sites/lib/lang/fi_database_user_admin_list.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$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/fi_database_user_list.lng b/interface/web/sites/lib/lang/fi_database_user_list.lng index 549374b6ac..8c226496a6 100644 --- a/interface/web/sites/lib/lang/fi_database_user_list.lng +++ b/interface/web/sites/lib/lang/fi_database_user_list.lng @@ -1,5 +1,5 @@ \ No newline at end of file +$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/fi_web_domain.lng b/interface/web/sites/lib/lang/fi_web_domain.lng index 5fe839dc27..e7129e1a2f 100755 --- a/interface/web/sites/lib/lang/fi_web_domain.lng +++ b/interface/web/sites/lib/lang/fi_web_domain.lng @@ -109,4 +109,6 @@ $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:'; ?> diff --git a/interface/web/sites/lib/lang/fi_web_subdomain.lng b/interface/web/sites/lib/lang/fi_web_subdomain.lng index db2b43457d..cf0d5e68dd 100755 --- a/interface/web/sites/lib/lang/fi_web_subdomain.lng +++ b/interface/web/sites/lib/lang/fi_web_subdomain.lng @@ -40,4 +40,6 @@ $wb['redirect_error_regex'] = 'VIrheellinen edelleenohjausosoite. Kelvollisia ov $wb['no_redirect_txt'] = 'No redirect'; $wb['no_flag_txt'] = 'No flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; ?> diff --git a/interface/web/sites/lib/lang/fi_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/fi_web_vhost_subdomain.lng index d993af80b0..b87c788126 100644 --- a/interface/web/sites/lib/lang/fi_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/fi_web_vhost_subdomain.lng @@ -1,79 +1,78 @@ = 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['nginx_directives_txt'] = 'nginx Directives'; +$wb['seo_redirect_txt'] = 'SEO Redirect'; +$wb['non_www_to_www_txt'] = 'Non-www -> www'; +$wb['www_to_non_www_txt'] = 'www -> non-www'; +$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM'; +$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.'; +$wb['python_txt'] = 'Python'; +$wb['perl_txt'] = 'Perl'; +$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children'; +$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers'; +$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers'; +$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers'; +$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0'; +$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.'; +$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.'; +$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.'; +$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.'; +$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.'; +$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.'; +$wb['fastcgi_php_version_txt'] = 'PHP Version'; +$wb['pm_txt'] = 'PHP-FPM Process Manager'; +$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout'; +$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests'; +$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.'; +$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -?> \ No newline at end of file +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +?> diff --git a/interface/web/sites/lib/lang/fi_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/fi_web_vhost_subdomain_list.lng index 8273dbd066..1c16bcda28 100644 --- a/interface/web/sites/lib/lang/fi_web_vhost_subdomain_list.lng +++ b/interface/web/sites/lib/lang/fi_web_vhost_subdomain_list.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Subdomains'; +$wb['active_txt'] = 'Active'; +$wb['server_id_txt'] = 'Server'; +$wb['parent_domain_id_txt'] = 'Website'; +$wb['domain_txt'] = 'Subdomain'; +$wb['add_new_record_txt'] = 'Add new subdomain'; +?> diff --git a/interface/web/sites/lib/lang/fr.lng b/interface/web/sites/lib/lang/fr.lng index 5cda995415..706c12659d 100644 --- a/interface/web/sites/lib/lang/fr.lng +++ b/interface/web/sites/lib/lang/fr.lng @@ -4,7 +4,6 @@ $wb['Website'] = 'Sites web'; $wb['Subdomain'] = 'Sous-domaine'; $wb['Aliasdomain'] = 'Alias'; $wb['Database'] = 'Base de données'; -$wb['Database Users'] = 'Database Users'; $wb['Web Access'] = 'Web Access'; $wb['FTP-User'] = 'Utilisateur FTP'; $wb['Webdav-User'] = 'Utilisateur WebDav'; @@ -26,4 +25,9 @@ $wb['Domain'] = 'Domaine'; $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'; ?> diff --git a/interface/web/sites/lib/lang/fr_aps.lng b/interface/web/sites/lib/lang/fr_aps.lng index d0ecb771fb..f6d9ed6eda 100644 --- a/interface/web/sites/lib/lang/fr_aps.lng +++ b/interface/web/sites/lib/lang/fr_aps.lng @@ -1,57 +1,57 @@ - \ No newline at end of file + 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 3b9c7e943a..052d834a71 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 @@ - \ No newline at end of file + 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 12cc30d023..68c378085f 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 @@ - \ No newline at end of file + diff --git a/interface/web/sites/lib/lang/fr_database.lng b/interface/web/sites/lib/lang/fr_database.lng index d4b20c52d7..c51423042f 100644 --- a/interface/web/sites/lib/lang/fr_database.lng +++ b/interface/web/sites/lib/lang/fr_database.lng @@ -37,4 +37,9 @@ $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.'; ?> diff --git a/interface/web/sites/lib/lang/fr_database_user.lng b/interface/web/sites/lib/lang/fr_database_user.lng new file mode 100644 index 0000000000..6c4ee7c696 --- /dev/null +++ b/interface/web/sites/lib/lang/fr_database_user.lng @@ -0,0 +1,23 @@ + diff --git a/interface/web/sites/lib/lang/fr_database_user_admin_list.lng b/interface/web/sites/lib/lang/fr_database_user_admin_list.lng new file mode 100644 index 0000000000..4c17da126b --- /dev/null +++ b/interface/web/sites/lib/lang/fr_database_user_admin_list.lng @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/interface/web/sites/lib/lang/fr_database_user_list.lng b/interface/web/sites/lib/lang/fr_database_user_list.lng new file mode 100644 index 0000000000..549374b6ac --- /dev/null +++ b/interface/web/sites/lib/lang/fr_database_user_list.lng @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/interface/web/sites/lib/lang/fr_web_aliasdomain.lng b/interface/web/sites/lib/lang/fr_web_aliasdomain.lng new file mode 100644 index 0000000000..0060ecaeab --- /dev/null +++ b/interface/web/sites/lib/lang/fr_web_aliasdomain.lng @@ -0,0 +1,3 @@ + diff --git a/interface/web/sites/lib/lang/fr_web_backup_list.lng b/interface/web/sites/lib/lang/fr_web_backup_list.lng index 1ac6687622..9a10ca6d07 100644 --- a/interface/web/sites/lib/lang/fr_web_backup_list.lng +++ b/interface/web/sites/lib/lang/fr_web_backup_list.lng @@ -12,5 +12,4 @@ $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'; - -?> \ No newline at end of file +?> diff --git a/interface/web/sites/lib/lang/fr_web_domain.lng b/interface/web/sites/lib/lang/fr_web_domain.lng index 27d68d688d..05b27ce7ae 100644 --- a/interface/web/sites/lib/lang/fr_web_domain.lng +++ b/interface/web/sites/lib/lang/fr_web_domain.lng @@ -104,4 +104,11 @@ $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:'; ?> diff --git a/interface/web/sites/lib/lang/fr_web_sites_stats_list.lng b/interface/web/sites/lib/lang/fr_web_sites_stats_list.lng index a50a1de419..553fa01e51 100644 --- a/interface/web/sites/lib/lang/fr_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/fr_web_sites_stats_list.lng @@ -5,4 +5,5 @@ $wb['this_month_txt'] = 'Le mois en cours'; $wb['last_month_txt'] = 'Le mois précédent'; $wb['this_year_txt'] = 'L\'année en cours'; $wb['last_year_txt'] = 'L\'année précédente'; +$wb['sum_txt'] = 'Sum'; ?> diff --git a/interface/web/sites/lib/lang/fr_web_subdomain.lng b/interface/web/sites/lib/lang/fr_web_subdomain.lng index 059acf48c9..94b7fcb217 100644 --- a/interface/web/sites/lib/lang/fr_web_subdomain.lng +++ b/interface/web/sites/lib/lang/fr_web_subdomain.lng @@ -39,4 +39,7 @@ $wb['traffic_quota_txt'] = 'Quota de trafic'; $wb['redirect_error_regex'] = 'Chemin de redirection invalide. Exemples de redirections valides: /test/ ou http://www.domain.tld/test/'; $wb['no_redirect_txt'] = 'Aucune redirecton'; $wb['no_flag_txt'] = 'Aucun flag'; +$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; ?> diff --git a/interface/web/sites/lib/lang/fr_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/fr_web_vhost_subdomain.lng new file mode 100644 index 0000000000..7ebe9e6b24 --- /dev/null +++ b/interface/web/sites/lib/lang/fr_web_vhost_subdomain.lng @@ -0,0 +1,119 @@ += 0.'; +$wb["pm_ondemand_hint_txt"] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; +$wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +?> \ No newline at end of file diff --git a/interface/web/sites/lib/lang/fr_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/fr_web_vhost_subdomain_list.lng new file mode 100644 index 0000000000..8273dbd066 --- /dev/null +++ b/interface/web/sites/lib/lang/fr_web_vhost_subdomain_list.lng @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/interface/web/sites/lib/lang/hr_database.lng b/interface/web/sites/lib/lang/hr_database.lng index 53d49a8303..3f8a542a19 100644 --- a/interface/web/sites/lib/lang/hr_database.lng +++ b/interface/web/sites/lib/lang/hr_database.lng @@ -41,4 +41,5 @@ $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.'; ?> diff --git a/interface/web/sites/lib/lang/hr_web_domain.lng b/interface/web/sites/lib/lang/hr_web_domain.lng index ee3b386e3c..ca300d63b1 100644 --- a/interface/web/sites/lib/lang/hr_web_domain.lng +++ b/interface/web/sites/lib/lang/hr_web_domain.lng @@ -109,4 +109,6 @@ $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:'; ?> diff --git a/interface/web/sites/lib/lang/hr_web_subdomain.lng b/interface/web/sites/lib/lang/hr_web_subdomain.lng index 8663cc38a1..8b4c31cae3 100644 --- a/interface/web/sites/lib/lang/hr_web_subdomain.lng +++ b/interface/web/sites/lib/lang/hr_web_subdomain.lng @@ -40,4 +40,6 @@ $wb['redirect_error_regex'] = 'Neispravna putanja redirekcije. Ispravne redirek $wb['no_redirect_txt'] = 'Bez redirekcije'; $wb['no_flag_txt'] = 'Bez markiranja'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; ?> diff --git a/interface/web/sites/lib/lang/hr_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/hr_web_vhost_subdomain.lng index 4a0279e9fc..b87c788126 100644 --- a/interface/web/sites/lib/lang/hr_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/hr_web_vhost_subdomain.lng @@ -110,4 +110,9 @@ $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; ?> diff --git a/interface/web/sites/lib/lang/hu_aps.lng b/interface/web/sites/lib/lang/hu_aps.lng index f6d9ed6eda..8ce5b20eb1 100644 --- a/interface/web/sites/lib/lang/hu_aps.lng +++ b/interface/web/sites/lib/lang/hu_aps.lng @@ -38,14 +38,14 @@ $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_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'; diff --git a/interface/web/sites/lib/lang/hu_database.lng b/interface/web/sites/lib/lang/hu_database.lng index 9bb8ce228b..f6e30c8c4c 100644 --- a/interface/web/sites/lib/lang/hu_database.lng +++ b/interface/web/sites/lib/lang/hu_database.lng @@ -41,4 +41,5 @@ $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.'; ?> diff --git a/interface/web/sites/lib/lang/hu_database_user.lng b/interface/web/sites/lib/lang/hu_database_user.lng index 6c4ee7c696..66a0718349 100644 --- a/interface/web/sites/lib/lang/hu_database_user.lng +++ b/interface/web/sites/lib/lang/hu_database_user.lng @@ -1,23 +1,23 @@ diff --git a/interface/web/sites/lib/lang/hu_database_user_admin_list.lng b/interface/web/sites/lib/lang/hu_database_user_admin_list.lng index 4c17da126b..d7f88c4c36 100644 --- a/interface/web/sites/lib/lang/hu_database_user_admin_list.lng +++ b/interface/web/sites/lib/lang/hu_database_user_admin_list.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$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/hu_database_user_list.lng b/interface/web/sites/lib/lang/hu_database_user_list.lng index 549374b6ac..8c226496a6 100644 --- a/interface/web/sites/lib/lang/hu_database_user_list.lng +++ b/interface/web/sites/lib/lang/hu_database_user_list.lng @@ -1,5 +1,5 @@ \ No newline at end of file +$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/hu_web_domain.lng b/interface/web/sites/lib/lang/hu_web_domain.lng index 4dc7d3a6dc..2659f9aba1 100644 --- a/interface/web/sites/lib/lang/hu_web_domain.lng +++ b/interface/web/sites/lib/lang/hu_web_domain.lng @@ -109,4 +109,6 @@ $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:'; ?> diff --git a/interface/web/sites/lib/lang/hu_web_subdomain.lng b/interface/web/sites/lib/lang/hu_web_subdomain.lng index de88b560d2..b390baf0d8 100644 --- a/interface/web/sites/lib/lang/hu_web_subdomain.lng +++ b/interface/web/sites/lib/lang/hu_web_subdomain.lng @@ -40,4 +40,6 @@ $wb['no_redirect_txt'] = 'Nincs átirányítás'; $wb['no_flag_txt'] = 'No flag'; $wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; ?> diff --git a/interface/web/sites/lib/lang/hu_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/hu_web_vhost_subdomain.lng index d993af80b0..b87c788126 100644 --- a/interface/web/sites/lib/lang/hu_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/hu_web_vhost_subdomain.lng @@ -1,79 +1,78 @@ = 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['nginx_directives_txt'] = 'nginx Directives'; +$wb['seo_redirect_txt'] = 'SEO Redirect'; +$wb['non_www_to_www_txt'] = 'Non-www -> www'; +$wb['www_to_non_www_txt'] = 'www -> non-www'; +$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM'; +$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.'; +$wb['python_txt'] = 'Python'; +$wb['perl_txt'] = 'Perl'; +$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children'; +$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers'; +$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers'; +$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers'; +$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0'; +$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.'; +$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.'; +$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.'; +$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.'; +$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.'; +$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.'; +$wb['fastcgi_php_version_txt'] = 'PHP Version'; +$wb['pm_txt'] = 'PHP-FPM Process Manager'; +$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout'; +$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests'; +$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.'; +$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -?> \ No newline at end of file +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +?> diff --git a/interface/web/sites/lib/lang/hu_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/hu_web_vhost_subdomain_list.lng index 8273dbd066..1c16bcda28 100644 --- a/interface/web/sites/lib/lang/hu_web_vhost_subdomain_list.lng +++ b/interface/web/sites/lib/lang/hu_web_vhost_subdomain_list.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Subdomains'; +$wb['active_txt'] = 'Active'; +$wb['server_id_txt'] = 'Server'; +$wb['parent_domain_id_txt'] = 'Website'; +$wb['domain_txt'] = 'Subdomain'; +$wb['add_new_record_txt'] = 'Add new subdomain'; +?> diff --git a/interface/web/sites/lib/lang/id_database.lng b/interface/web/sites/lib/lang/id_database.lng index 012d63dc19..5b08e4af24 100644 --- a/interface/web/sites/lib/lang/id_database.lng +++ b/interface/web/sites/lib/lang/id_database.lng @@ -41,4 +41,5 @@ $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.'; ?> diff --git a/interface/web/sites/lib/lang/id_web_domain.lng b/interface/web/sites/lib/lang/id_web_domain.lng index 35d12e5f16..012583e74e 100644 --- a/interface/web/sites/lib/lang/id_web_domain.lng +++ b/interface/web/sites/lib/lang/id_web_domain.lng @@ -109,4 +109,6 @@ $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:'; ?> diff --git a/interface/web/sites/lib/lang/id_web_subdomain.lng b/interface/web/sites/lib/lang/id_web_subdomain.lng index 4d0241c522..ac0d1e39c5 100644 --- a/interface/web/sites/lib/lang/id_web_subdomain.lng +++ b/interface/web/sites/lib/lang/id_web_subdomain.lng @@ -40,4 +40,6 @@ $wb['redirect_error_regex'] = 'Path pengalihan tidak valid. Contoh pengalihan ya $wb['no_redirect_txt'] = 'No redirect'; $wb['no_flag_txt'] = 'No flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; ?> diff --git a/interface/web/sites/lib/lang/id_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/id_web_vhost_subdomain.lng index 4a0279e9fc..b87c788126 100644 --- a/interface/web/sites/lib/lang/id_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/id_web_vhost_subdomain.lng @@ -110,4 +110,9 @@ $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; ?> diff --git a/interface/web/sites/lib/lang/it_aps.lng b/interface/web/sites/lib/lang/it_aps.lng index f6d9ed6eda..8ce5b20eb1 100644 --- a/interface/web/sites/lib/lang/it_aps.lng +++ b/interface/web/sites/lib/lang/it_aps.lng @@ -38,14 +38,14 @@ $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_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'; diff --git a/interface/web/sites/lib/lang/it_database.lng b/interface/web/sites/lib/lang/it_database.lng index d49c2f1a1b..62117a4416 100644 --- a/interface/web/sites/lib/lang/it_database.lng +++ b/interface/web/sites/lib/lang/it_database.lng @@ -41,4 +41,5 @@ $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.'; ?> diff --git a/interface/web/sites/lib/lang/it_database_user.lng b/interface/web/sites/lib/lang/it_database_user.lng index 6c4ee7c696..66a0718349 100644 --- a/interface/web/sites/lib/lang/it_database_user.lng +++ b/interface/web/sites/lib/lang/it_database_user.lng @@ -1,23 +1,23 @@ diff --git a/interface/web/sites/lib/lang/it_database_user_admin_list.lng b/interface/web/sites/lib/lang/it_database_user_admin_list.lng index 4c17da126b..d7f88c4c36 100644 --- a/interface/web/sites/lib/lang/it_database_user_admin_list.lng +++ b/interface/web/sites/lib/lang/it_database_user_admin_list.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$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/it_database_user_list.lng b/interface/web/sites/lib/lang/it_database_user_list.lng index 549374b6ac..8c226496a6 100644 --- a/interface/web/sites/lib/lang/it_database_user_list.lng +++ b/interface/web/sites/lib/lang/it_database_user_list.lng @@ -1,5 +1,5 @@ \ No newline at end of file +$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/it_web_domain.lng b/interface/web/sites/lib/lang/it_web_domain.lng index 5ea7b4b51e..a34c576a0e 100644 --- a/interface/web/sites/lib/lang/it_web_domain.lng +++ b/interface/web/sites/lib/lang/it_web_domain.lng @@ -109,4 +109,6 @@ $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:'; ?> diff --git a/interface/web/sites/lib/lang/it_web_subdomain.lng b/interface/web/sites/lib/lang/it_web_subdomain.lng index 6b2e96e37c..0d4773969b 100644 --- a/interface/web/sites/lib/lang/it_web_subdomain.lng +++ b/interface/web/sites/lib/lang/it_web_subdomain.lng @@ -40,4 +40,6 @@ $wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for ex $wb['no_redirect_txt'] = 'No redirect'; $wb['no_flag_txt'] = 'No flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; ?> diff --git a/interface/web/sites/lib/lang/it_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/it_web_vhost_subdomain.lng index d993af80b0..b87c788126 100644 --- a/interface/web/sites/lib/lang/it_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/it_web_vhost_subdomain.lng @@ -1,79 +1,78 @@ = 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['nginx_directives_txt'] = 'nginx Directives'; +$wb['seo_redirect_txt'] = 'SEO Redirect'; +$wb['non_www_to_www_txt'] = 'Non-www -> www'; +$wb['www_to_non_www_txt'] = 'www -> non-www'; +$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM'; +$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.'; +$wb['python_txt'] = 'Python'; +$wb['perl_txt'] = 'Perl'; +$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children'; +$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers'; +$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers'; +$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers'; +$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0'; +$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.'; +$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.'; +$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.'; +$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.'; +$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.'; +$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.'; +$wb['fastcgi_php_version_txt'] = 'PHP Version'; +$wb['pm_txt'] = 'PHP-FPM Process Manager'; +$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout'; +$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests'; +$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.'; +$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -?> \ No newline at end of file +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +?> diff --git a/interface/web/sites/lib/lang/it_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/it_web_vhost_subdomain_list.lng index 8273dbd066..1c16bcda28 100644 --- a/interface/web/sites/lib/lang/it_web_vhost_subdomain_list.lng +++ b/interface/web/sites/lib/lang/it_web_vhost_subdomain_list.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Subdomains'; +$wb['active_txt'] = 'Active'; +$wb['server_id_txt'] = 'Server'; +$wb['parent_domain_id_txt'] = 'Website'; +$wb['domain_txt'] = 'Subdomain'; +$wb['add_new_record_txt'] = 'Add new subdomain'; +?> diff --git a/interface/web/sites/lib/lang/ja_aps.lng b/interface/web/sites/lib/lang/ja_aps.lng index f6d9ed6eda..8ce5b20eb1 100644 --- a/interface/web/sites/lib/lang/ja_aps.lng +++ b/interface/web/sites/lib/lang/ja_aps.lng @@ -38,14 +38,14 @@ $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_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'; diff --git a/interface/web/sites/lib/lang/ja_database.lng b/interface/web/sites/lib/lang/ja_database.lng index 9df3e74cab..bf90ffcc28 100644 --- a/interface/web/sites/lib/lang/ja_database.lng +++ b/interface/web/sites/lib/lang/ja_database.lng @@ -41,4 +41,5 @@ $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.'; ?> diff --git a/interface/web/sites/lib/lang/ja_database_user.lng b/interface/web/sites/lib/lang/ja_database_user.lng index 6c4ee7c696..66a0718349 100644 --- a/interface/web/sites/lib/lang/ja_database_user.lng +++ b/interface/web/sites/lib/lang/ja_database_user.lng @@ -1,23 +1,23 @@ diff --git a/interface/web/sites/lib/lang/ja_database_user_admin_list.lng b/interface/web/sites/lib/lang/ja_database_user_admin_list.lng index 4c17da126b..d7f88c4c36 100644 --- a/interface/web/sites/lib/lang/ja_database_user_admin_list.lng +++ b/interface/web/sites/lib/lang/ja_database_user_admin_list.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$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/ja_database_user_list.lng b/interface/web/sites/lib/lang/ja_database_user_list.lng index 549374b6ac..8c226496a6 100644 --- a/interface/web/sites/lib/lang/ja_database_user_list.lng +++ b/interface/web/sites/lib/lang/ja_database_user_list.lng @@ -1,5 +1,5 @@ \ No newline at end of file +$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/ja_web_domain.lng b/interface/web/sites/lib/lang/ja_web_domain.lng index 7fd425a6b7..9a0eb0eb8e 100644 --- a/interface/web/sites/lib/lang/ja_web_domain.lng +++ b/interface/web/sites/lib/lang/ja_web_domain.lng @@ -109,4 +109,6 @@ $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:'; ?> diff --git a/interface/web/sites/lib/lang/ja_web_subdomain.lng b/interface/web/sites/lib/lang/ja_web_subdomain.lng index 49c9e80422..3e76b4722b 100644 --- a/interface/web/sites/lib/lang/ja_web_subdomain.lng +++ b/interface/web/sites/lib/lang/ja_web_subdomain.lng @@ -40,4 +40,6 @@ $wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for ex $wb['no_redirect_txt'] = 'No redirect'; $wb['no_flag_txt'] = 'No flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; ?> diff --git a/interface/web/sites/lib/lang/ja_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/ja_web_vhost_subdomain.lng index d993af80b0..b87c788126 100644 --- a/interface/web/sites/lib/lang/ja_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/ja_web_vhost_subdomain.lng @@ -1,79 +1,78 @@ = 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['nginx_directives_txt'] = 'nginx Directives'; +$wb['seo_redirect_txt'] = 'SEO Redirect'; +$wb['non_www_to_www_txt'] = 'Non-www -> www'; +$wb['www_to_non_www_txt'] = 'www -> non-www'; +$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM'; +$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.'; +$wb['python_txt'] = 'Python'; +$wb['perl_txt'] = 'Perl'; +$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children'; +$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers'; +$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers'; +$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers'; +$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0'; +$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.'; +$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.'; +$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.'; +$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.'; +$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.'; +$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.'; +$wb['fastcgi_php_version_txt'] = 'PHP Version'; +$wb['pm_txt'] = 'PHP-FPM Process Manager'; +$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout'; +$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests'; +$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.'; +$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -?> \ No newline at end of file +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +?> diff --git a/interface/web/sites/lib/lang/ja_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/ja_web_vhost_subdomain_list.lng index 8273dbd066..1c16bcda28 100644 --- a/interface/web/sites/lib/lang/ja_web_vhost_subdomain_list.lng +++ b/interface/web/sites/lib/lang/ja_web_vhost_subdomain_list.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Subdomains'; +$wb['active_txt'] = 'Active'; +$wb['server_id_txt'] = 'Server'; +$wb['parent_domain_id_txt'] = 'Website'; +$wb['domain_txt'] = 'Subdomain'; +$wb['add_new_record_txt'] = 'Add new subdomain'; +?> diff --git a/interface/web/sites/lib/lang/nl_aps.lng b/interface/web/sites/lib/lang/nl_aps.lng index f6d9ed6eda..8ce5b20eb1 100644 --- a/interface/web/sites/lib/lang/nl_aps.lng +++ b/interface/web/sites/lib/lang/nl_aps.lng @@ -38,14 +38,14 @@ $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_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'; diff --git a/interface/web/sites/lib/lang/nl_database.lng b/interface/web/sites/lib/lang/nl_database.lng index 9ddff5995c..479e98f5d7 100644 --- a/interface/web/sites/lib/lang/nl_database.lng +++ b/interface/web/sites/lib/lang/nl_database.lng @@ -41,4 +41,5 @@ $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.'; ?> diff --git a/interface/web/sites/lib/lang/nl_database_user.lng b/interface/web/sites/lib/lang/nl_database_user.lng index 6c4ee7c696..66a0718349 100644 --- a/interface/web/sites/lib/lang/nl_database_user.lng +++ b/interface/web/sites/lib/lang/nl_database_user.lng @@ -1,23 +1,23 @@ diff --git a/interface/web/sites/lib/lang/nl_database_user_admin_list.lng b/interface/web/sites/lib/lang/nl_database_user_admin_list.lng index 4c17da126b..d7f88c4c36 100644 --- a/interface/web/sites/lib/lang/nl_database_user_admin_list.lng +++ b/interface/web/sites/lib/lang/nl_database_user_admin_list.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$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/nl_database_user_list.lng b/interface/web/sites/lib/lang/nl_database_user_list.lng index 549374b6ac..8c226496a6 100644 --- a/interface/web/sites/lib/lang/nl_database_user_list.lng +++ b/interface/web/sites/lib/lang/nl_database_user_list.lng @@ -1,5 +1,5 @@ \ No newline at end of file +$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/nl_web_domain.lng b/interface/web/sites/lib/lang/nl_web_domain.lng index aa1f5ba139..3319f46865 100644 --- a/interface/web/sites/lib/lang/nl_web_domain.lng +++ b/interface/web/sites/lib/lang/nl_web_domain.lng @@ -109,4 +109,6 @@ $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:'; ?> diff --git a/interface/web/sites/lib/lang/nl_web_subdomain.lng b/interface/web/sites/lib/lang/nl_web_subdomain.lng index c08f63ffcc..8684124106 100644 --- a/interface/web/sites/lib/lang/nl_web_subdomain.lng +++ b/interface/web/sites/lib/lang/nl_web_subdomain.lng @@ -40,4 +40,6 @@ $wb['redirect_error_regex'] = 'Ongeldig redirect pad. Geldige redirects zijn bij $wb['no_redirect_txt'] = 'No redirect'; $wb['no_flag_txt'] = 'No flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; ?> diff --git a/interface/web/sites/lib/lang/nl_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/nl_web_vhost_subdomain.lng index d993af80b0..b87c788126 100644 --- a/interface/web/sites/lib/lang/nl_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/nl_web_vhost_subdomain.lng @@ -1,79 +1,78 @@ = 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['nginx_directives_txt'] = 'nginx Directives'; +$wb['seo_redirect_txt'] = 'SEO Redirect'; +$wb['non_www_to_www_txt'] = 'Non-www -> www'; +$wb['www_to_non_www_txt'] = 'www -> non-www'; +$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM'; +$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.'; +$wb['python_txt'] = 'Python'; +$wb['perl_txt'] = 'Perl'; +$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children'; +$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers'; +$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers'; +$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers'; +$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0'; +$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.'; +$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.'; +$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.'; +$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.'; +$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.'; +$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.'; +$wb['fastcgi_php_version_txt'] = 'PHP Version'; +$wb['pm_txt'] = 'PHP-FPM Process Manager'; +$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout'; +$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests'; +$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.'; +$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -?> \ No newline at end of file +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +?> diff --git a/interface/web/sites/lib/lang/nl_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/nl_web_vhost_subdomain_list.lng index 8273dbd066..1c16bcda28 100644 --- a/interface/web/sites/lib/lang/nl_web_vhost_subdomain_list.lng +++ b/interface/web/sites/lib/lang/nl_web_vhost_subdomain_list.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Subdomains'; +$wb['active_txt'] = 'Active'; +$wb['server_id_txt'] = 'Server'; +$wb['parent_domain_id_txt'] = 'Website'; +$wb['domain_txt'] = 'Subdomain'; +$wb['add_new_record_txt'] = 'Add new subdomain'; +?> diff --git a/interface/web/sites/lib/lang/pl_aps.lng b/interface/web/sites/lib/lang/pl_aps.lng index f6d9ed6eda..8ce5b20eb1 100644 --- a/interface/web/sites/lib/lang/pl_aps.lng +++ b/interface/web/sites/lib/lang/pl_aps.lng @@ -38,14 +38,14 @@ $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_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'; diff --git a/interface/web/sites/lib/lang/pl_database.lng b/interface/web/sites/lib/lang/pl_database.lng index 7b86ce76a0..748aff9549 100644 --- a/interface/web/sites/lib/lang/pl_database.lng +++ b/interface/web/sites/lib/lang/pl_database.lng @@ -41,4 +41,5 @@ $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.'; ?> diff --git a/interface/web/sites/lib/lang/pl_database_user.lng b/interface/web/sites/lib/lang/pl_database_user.lng index 6c4ee7c696..66a0718349 100644 --- a/interface/web/sites/lib/lang/pl_database_user.lng +++ b/interface/web/sites/lib/lang/pl_database_user.lng @@ -1,23 +1,23 @@ diff --git a/interface/web/sites/lib/lang/pl_database_user_admin_list.lng b/interface/web/sites/lib/lang/pl_database_user_admin_list.lng index 4c17da126b..d7f88c4c36 100644 --- a/interface/web/sites/lib/lang/pl_database_user_admin_list.lng +++ b/interface/web/sites/lib/lang/pl_database_user_admin_list.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$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/pl_database_user_list.lng b/interface/web/sites/lib/lang/pl_database_user_list.lng index 549374b6ac..8c226496a6 100644 --- a/interface/web/sites/lib/lang/pl_database_user_list.lng +++ b/interface/web/sites/lib/lang/pl_database_user_list.lng @@ -1,5 +1,5 @@ \ No newline at end of file +$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/pl_web_domain.lng b/interface/web/sites/lib/lang/pl_web_domain.lng index f245bf9891..1235f10205 100644 --- a/interface/web/sites/lib/lang/pl_web_domain.lng +++ b/interface/web/sites/lib/lang/pl_web_domain.lng @@ -109,4 +109,6 @@ $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:'; ?> diff --git a/interface/web/sites/lib/lang/pl_web_subdomain.lng b/interface/web/sites/lib/lang/pl_web_subdomain.lng index ccf2c5756c..14efd16fc1 100644 --- a/interface/web/sites/lib/lang/pl_web_subdomain.lng +++ b/interface/web/sites/lib/lang/pl_web_subdomain.lng @@ -40,4 +40,6 @@ $wb['redirect_error_regex'] = 'Nieprawidłowa ścieżka przekierowania. Poprawne $wb['no_redirect_txt'] = 'Bez przekierowania'; $wb['no_flag_txt'] = 'Bez flagi'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; ?> diff --git a/interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng index d993af80b0..b87c788126 100644 --- a/interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng @@ -1,79 +1,78 @@ = 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['nginx_directives_txt'] = 'nginx Directives'; +$wb['seo_redirect_txt'] = 'SEO Redirect'; +$wb['non_www_to_www_txt'] = 'Non-www -> www'; +$wb['www_to_non_www_txt'] = 'www -> non-www'; +$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM'; +$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.'; +$wb['python_txt'] = 'Python'; +$wb['perl_txt'] = 'Perl'; +$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children'; +$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers'; +$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers'; +$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers'; +$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0'; +$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.'; +$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.'; +$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.'; +$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.'; +$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.'; +$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.'; +$wb['fastcgi_php_version_txt'] = 'PHP Version'; +$wb['pm_txt'] = 'PHP-FPM Process Manager'; +$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout'; +$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests'; +$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.'; +$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -?> \ No newline at end of file +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +?> diff --git a/interface/web/sites/lib/lang/pl_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/pl_web_vhost_subdomain_list.lng index 8273dbd066..1c16bcda28 100644 --- a/interface/web/sites/lib/lang/pl_web_vhost_subdomain_list.lng +++ b/interface/web/sites/lib/lang/pl_web_vhost_subdomain_list.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Subdomains'; +$wb['active_txt'] = 'Active'; +$wb['server_id_txt'] = 'Server'; +$wb['parent_domain_id_txt'] = 'Website'; +$wb['domain_txt'] = 'Subdomain'; +$wb['add_new_record_txt'] = 'Add new subdomain'; +?> diff --git a/interface/web/sites/lib/lang/pt_aps.lng b/interface/web/sites/lib/lang/pt_aps.lng index f6d9ed6eda..8ce5b20eb1 100644 --- a/interface/web/sites/lib/lang/pt_aps.lng +++ b/interface/web/sites/lib/lang/pt_aps.lng @@ -38,14 +38,14 @@ $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_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'; diff --git a/interface/web/sites/lib/lang/pt_database.lng b/interface/web/sites/lib/lang/pt_database.lng index d7d0e726c5..053f2f7a2b 100644 --- a/interface/web/sites/lib/lang/pt_database.lng +++ b/interface/web/sites/lib/lang/pt_database.lng @@ -41,4 +41,5 @@ $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.'; ?> diff --git a/interface/web/sites/lib/lang/pt_database_user.lng b/interface/web/sites/lib/lang/pt_database_user.lng index 6c4ee7c696..66a0718349 100644 --- a/interface/web/sites/lib/lang/pt_database_user.lng +++ b/interface/web/sites/lib/lang/pt_database_user.lng @@ -1,23 +1,23 @@ diff --git a/interface/web/sites/lib/lang/pt_database_user_admin_list.lng b/interface/web/sites/lib/lang/pt_database_user_admin_list.lng index 4c17da126b..d7f88c4c36 100644 --- a/interface/web/sites/lib/lang/pt_database_user_admin_list.lng +++ b/interface/web/sites/lib/lang/pt_database_user_admin_list.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$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/pt_database_user_list.lng b/interface/web/sites/lib/lang/pt_database_user_list.lng index 549374b6ac..8c226496a6 100644 --- a/interface/web/sites/lib/lang/pt_database_user_list.lng +++ b/interface/web/sites/lib/lang/pt_database_user_list.lng @@ -1,5 +1,5 @@ \ No newline at end of file +$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/pt_web_domain.lng b/interface/web/sites/lib/lang/pt_web_domain.lng index c3010f90c7..b060656a18 100644 --- a/interface/web/sites/lib/lang/pt_web_domain.lng +++ b/interface/web/sites/lib/lang/pt_web_domain.lng @@ -109,4 +109,6 @@ $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:'; ?> diff --git a/interface/web/sites/lib/lang/pt_web_subdomain.lng b/interface/web/sites/lib/lang/pt_web_subdomain.lng index 219f793977..f83c4ff15f 100644 --- a/interface/web/sites/lib/lang/pt_web_subdomain.lng +++ b/interface/web/sites/lib/lang/pt_web_subdomain.lng @@ -40,4 +40,6 @@ $wb['redirect_error_regex'] = 'Pasta de redireccionamento inválida. Exemplos de $wb['no_redirect_txt'] = 'No redirect'; $wb['no_flag_txt'] = 'No flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; ?> diff --git a/interface/web/sites/lib/lang/pt_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/pt_web_vhost_subdomain.lng index d993af80b0..b87c788126 100644 --- a/interface/web/sites/lib/lang/pt_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/pt_web_vhost_subdomain.lng @@ -1,79 +1,78 @@ = 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['nginx_directives_txt'] = 'nginx Directives'; +$wb['seo_redirect_txt'] = 'SEO Redirect'; +$wb['non_www_to_www_txt'] = 'Non-www -> www'; +$wb['www_to_non_www_txt'] = 'www -> non-www'; +$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM'; +$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.'; +$wb['python_txt'] = 'Python'; +$wb['perl_txt'] = 'Perl'; +$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children'; +$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers'; +$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers'; +$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers'; +$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0'; +$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.'; +$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.'; +$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.'; +$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.'; +$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.'; +$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.'; +$wb['fastcgi_php_version_txt'] = 'PHP Version'; +$wb['pm_txt'] = 'PHP-FPM Process Manager'; +$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout'; +$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests'; +$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.'; +$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -?> \ No newline at end of file +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +?> diff --git a/interface/web/sites/lib/lang/pt_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/pt_web_vhost_subdomain_list.lng index 8273dbd066..1c16bcda28 100644 --- a/interface/web/sites/lib/lang/pt_web_vhost_subdomain_list.lng +++ b/interface/web/sites/lib/lang/pt_web_vhost_subdomain_list.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Subdomains'; +$wb['active_txt'] = 'Active'; +$wb['server_id_txt'] = 'Server'; +$wb['parent_domain_id_txt'] = 'Website'; +$wb['domain_txt'] = 'Subdomain'; +$wb['add_new_record_txt'] = 'Add new subdomain'; +?> diff --git a/interface/web/sites/lib/lang/ro_aps.lng b/interface/web/sites/lib/lang/ro_aps.lng index f6d9ed6eda..8ce5b20eb1 100644 --- a/interface/web/sites/lib/lang/ro_aps.lng +++ b/interface/web/sites/lib/lang/ro_aps.lng @@ -38,14 +38,14 @@ $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_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'; diff --git a/interface/web/sites/lib/lang/ro_database.lng b/interface/web/sites/lib/lang/ro_database.lng index 41bdd37ea8..256c1245d4 100644 --- a/interface/web/sites/lib/lang/ro_database.lng +++ b/interface/web/sites/lib/lang/ro_database.lng @@ -41,4 +41,5 @@ $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.'; ?> diff --git a/interface/web/sites/lib/lang/ro_database_user.lng b/interface/web/sites/lib/lang/ro_database_user.lng index 6c4ee7c696..66a0718349 100644 --- a/interface/web/sites/lib/lang/ro_database_user.lng +++ b/interface/web/sites/lib/lang/ro_database_user.lng @@ -1,23 +1,23 @@ diff --git a/interface/web/sites/lib/lang/ro_database_user_admin_list.lng b/interface/web/sites/lib/lang/ro_database_user_admin_list.lng index 4c17da126b..d7f88c4c36 100644 --- a/interface/web/sites/lib/lang/ro_database_user_admin_list.lng +++ b/interface/web/sites/lib/lang/ro_database_user_admin_list.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$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/ro_database_user_list.lng b/interface/web/sites/lib/lang/ro_database_user_list.lng index 549374b6ac..8c226496a6 100644 --- a/interface/web/sites/lib/lang/ro_database_user_list.lng +++ b/interface/web/sites/lib/lang/ro_database_user_list.lng @@ -1,5 +1,5 @@ \ No newline at end of file +$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/ro_web_domain.lng b/interface/web/sites/lib/lang/ro_web_domain.lng index 3028e27627..791f67b577 100644 --- a/interface/web/sites/lib/lang/ro_web_domain.lng +++ b/interface/web/sites/lib/lang/ro_web_domain.lng @@ -109,4 +109,6 @@ $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:'; ?> diff --git a/interface/web/sites/lib/lang/ro_web_subdomain.lng b/interface/web/sites/lib/lang/ro_web_subdomain.lng index d340c72472..15e95d66b7 100644 --- a/interface/web/sites/lib/lang/ro_web_subdomain.lng +++ b/interface/web/sites/lib/lang/ro_web_subdomain.lng @@ -40,4 +40,6 @@ $wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for ex $wb['no_redirect_txt'] = 'No redirect'; $wb['no_flag_txt'] = 'No flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; ?> diff --git a/interface/web/sites/lib/lang/ro_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/ro_web_vhost_subdomain.lng index d993af80b0..b87c788126 100644 --- a/interface/web/sites/lib/lang/ro_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/ro_web_vhost_subdomain.lng @@ -1,79 +1,78 @@ = 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['nginx_directives_txt'] = 'nginx Directives'; +$wb['seo_redirect_txt'] = 'SEO Redirect'; +$wb['non_www_to_www_txt'] = 'Non-www -> www'; +$wb['www_to_non_www_txt'] = 'www -> non-www'; +$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM'; +$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.'; +$wb['python_txt'] = 'Python'; +$wb['perl_txt'] = 'Perl'; +$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children'; +$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers'; +$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers'; +$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers'; +$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0'; +$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.'; +$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.'; +$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.'; +$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.'; +$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.'; +$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.'; +$wb['fastcgi_php_version_txt'] = 'PHP Version'; +$wb['pm_txt'] = 'PHP-FPM Process Manager'; +$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout'; +$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests'; +$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.'; +$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -?> \ No newline at end of file +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +?> diff --git a/interface/web/sites/lib/lang/ro_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/ro_web_vhost_subdomain_list.lng index 8273dbd066..1c16bcda28 100644 --- a/interface/web/sites/lib/lang/ro_web_vhost_subdomain_list.lng +++ b/interface/web/sites/lib/lang/ro_web_vhost_subdomain_list.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Subdomains'; +$wb['active_txt'] = 'Active'; +$wb['server_id_txt'] = 'Server'; +$wb['parent_domain_id_txt'] = 'Website'; +$wb['domain_txt'] = 'Subdomain'; +$wb['add_new_record_txt'] = 'Add new subdomain'; +?> diff --git a/interface/web/sites/lib/lang/ru_aps.lng b/interface/web/sites/lib/lang/ru_aps.lng index f6d9ed6eda..8ce5b20eb1 100644 --- a/interface/web/sites/lib/lang/ru_aps.lng +++ b/interface/web/sites/lib/lang/ru_aps.lng @@ -38,14 +38,14 @@ $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_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'; diff --git a/interface/web/sites/lib/lang/ru_database.lng b/interface/web/sites/lib/lang/ru_database.lng index 8d7308e681..20bfba4f25 100644 --- a/interface/web/sites/lib/lang/ru_database.lng +++ b/interface/web/sites/lib/lang/ru_database.lng @@ -41,4 +41,5 @@ $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.'; ?> diff --git a/interface/web/sites/lib/lang/ru_database_user.lng b/interface/web/sites/lib/lang/ru_database_user.lng index 6c4ee7c696..66a0718349 100644 --- a/interface/web/sites/lib/lang/ru_database_user.lng +++ b/interface/web/sites/lib/lang/ru_database_user.lng @@ -1,23 +1,23 @@ diff --git a/interface/web/sites/lib/lang/ru_database_user_admin_list.lng b/interface/web/sites/lib/lang/ru_database_user_admin_list.lng index 4c17da126b..d7f88c4c36 100644 --- a/interface/web/sites/lib/lang/ru_database_user_admin_list.lng +++ b/interface/web/sites/lib/lang/ru_database_user_admin_list.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$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/ru_database_user_list.lng b/interface/web/sites/lib/lang/ru_database_user_list.lng index 549374b6ac..8c226496a6 100644 --- a/interface/web/sites/lib/lang/ru_database_user_list.lng +++ b/interface/web/sites/lib/lang/ru_database_user_list.lng @@ -1,5 +1,5 @@ \ No newline at end of file +$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/ru_web_domain.lng b/interface/web/sites/lib/lang/ru_web_domain.lng index 85fe99d2dd..be367c0f62 100644 --- a/interface/web/sites/lib/lang/ru_web_domain.lng +++ b/interface/web/sites/lib/lang/ru_web_domain.lng @@ -109,4 +109,6 @@ $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:'; ?> diff --git a/interface/web/sites/lib/lang/ru_web_subdomain.lng b/interface/web/sites/lib/lang/ru_web_subdomain.lng index ad197f8e55..3c3842d145 100644 --- a/interface/web/sites/lib/lang/ru_web_subdomain.lng +++ b/interface/web/sites/lib/lang/ru_web_subdomain.lng @@ -40,4 +40,6 @@ $wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for ex $wb['no_redirect_txt'] = 'No redirect'; $wb['no_flag_txt'] = 'No flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; ?> diff --git a/interface/web/sites/lib/lang/ru_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/ru_web_vhost_subdomain.lng index d993af80b0..b87c788126 100644 --- a/interface/web/sites/lib/lang/ru_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/ru_web_vhost_subdomain.lng @@ -1,79 +1,78 @@ = 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['nginx_directives_txt'] = 'nginx Directives'; +$wb['seo_redirect_txt'] = 'SEO Redirect'; +$wb['non_www_to_www_txt'] = 'Non-www -> www'; +$wb['www_to_non_www_txt'] = 'www -> non-www'; +$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM'; +$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.'; +$wb['python_txt'] = 'Python'; +$wb['perl_txt'] = 'Perl'; +$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children'; +$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers'; +$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers'; +$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers'; +$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0'; +$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.'; +$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.'; +$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.'; +$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.'; +$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.'; +$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.'; +$wb['fastcgi_php_version_txt'] = 'PHP Version'; +$wb['pm_txt'] = 'PHP-FPM Process Manager'; +$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout'; +$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests'; +$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.'; +$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -?> \ No newline at end of file +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +?> diff --git a/interface/web/sites/lib/lang/ru_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/ru_web_vhost_subdomain_list.lng index 8273dbd066..1c16bcda28 100644 --- a/interface/web/sites/lib/lang/ru_web_vhost_subdomain_list.lng +++ b/interface/web/sites/lib/lang/ru_web_vhost_subdomain_list.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Subdomains'; +$wb['active_txt'] = 'Active'; +$wb['server_id_txt'] = 'Server'; +$wb['parent_domain_id_txt'] = 'Website'; +$wb['domain_txt'] = 'Subdomain'; +$wb['add_new_record_txt'] = 'Add new subdomain'; +?> diff --git a/interface/web/sites/lib/lang/se_aps.lng b/interface/web/sites/lib/lang/se_aps.lng index f6d9ed6eda..8ce5b20eb1 100644 --- a/interface/web/sites/lib/lang/se_aps.lng +++ b/interface/web/sites/lib/lang/se_aps.lng @@ -38,14 +38,14 @@ $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_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'; diff --git a/interface/web/sites/lib/lang/se_database.lng b/interface/web/sites/lib/lang/se_database.lng index ce20ef74bc..d27f883e93 100644 --- a/interface/web/sites/lib/lang/se_database.lng +++ b/interface/web/sites/lib/lang/se_database.lng @@ -41,4 +41,5 @@ $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.'; ?> diff --git a/interface/web/sites/lib/lang/se_database_user.lng b/interface/web/sites/lib/lang/se_database_user.lng index 6c4ee7c696..66a0718349 100644 --- a/interface/web/sites/lib/lang/se_database_user.lng +++ b/interface/web/sites/lib/lang/se_database_user.lng @@ -1,23 +1,23 @@ diff --git a/interface/web/sites/lib/lang/se_database_user_admin_list.lng b/interface/web/sites/lib/lang/se_database_user_admin_list.lng index 4c17da126b..d7f88c4c36 100644 --- a/interface/web/sites/lib/lang/se_database_user_admin_list.lng +++ b/interface/web/sites/lib/lang/se_database_user_admin_list.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$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/se_database_user_list.lng b/interface/web/sites/lib/lang/se_database_user_list.lng index 549374b6ac..8c226496a6 100644 --- a/interface/web/sites/lib/lang/se_database_user_list.lng +++ b/interface/web/sites/lib/lang/se_database_user_list.lng @@ -1,5 +1,5 @@ \ No newline at end of file +$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/se_web_domain.lng b/interface/web/sites/lib/lang/se_web_domain.lng index 9a8a8b1dfb..15df484917 100644 --- a/interface/web/sites/lib/lang/se_web_domain.lng +++ b/interface/web/sites/lib/lang/se_web_domain.lng @@ -109,4 +109,6 @@ $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:'; ?> diff --git a/interface/web/sites/lib/lang/se_web_subdomain.lng b/interface/web/sites/lib/lang/se_web_subdomain.lng index 2b7a2fcbcd..f8501c64c9 100644 --- a/interface/web/sites/lib/lang/se_web_subdomain.lng +++ b/interface/web/sites/lib/lang/se_web_subdomain.lng @@ -40,4 +40,6 @@ $wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for ex $wb['no_redirect_txt'] = 'No redirect'; $wb['no_flag_txt'] = 'No flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; ?> diff --git a/interface/web/sites/lib/lang/se_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/se_web_vhost_subdomain.lng index d993af80b0..b87c788126 100644 --- a/interface/web/sites/lib/lang/se_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/se_web_vhost_subdomain.lng @@ -1,79 +1,78 @@ = 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['nginx_directives_txt'] = 'nginx Directives'; +$wb['seo_redirect_txt'] = 'SEO Redirect'; +$wb['non_www_to_www_txt'] = 'Non-www -> www'; +$wb['www_to_non_www_txt'] = 'www -> non-www'; +$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM'; +$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.'; +$wb['python_txt'] = 'Python'; +$wb['perl_txt'] = 'Perl'; +$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children'; +$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers'; +$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers'; +$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers'; +$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0'; +$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.'; +$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.'; +$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.'; +$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.'; +$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.'; +$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.'; +$wb['fastcgi_php_version_txt'] = 'PHP Version'; +$wb['pm_txt'] = 'PHP-FPM Process Manager'; +$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout'; +$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests'; +$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.'; +$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -?> \ No newline at end of file +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +?> diff --git a/interface/web/sites/lib/lang/se_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/se_web_vhost_subdomain_list.lng index 8273dbd066..1c16bcda28 100644 --- a/interface/web/sites/lib/lang/se_web_vhost_subdomain_list.lng +++ b/interface/web/sites/lib/lang/se_web_vhost_subdomain_list.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Subdomains'; +$wb['active_txt'] = 'Active'; +$wb['server_id_txt'] = 'Server'; +$wb['parent_domain_id_txt'] = 'Website'; +$wb['domain_txt'] = 'Subdomain'; +$wb['add_new_record_txt'] = 'Add new subdomain'; +?> diff --git a/interface/web/sites/lib/lang/sk_aps.lng b/interface/web/sites/lib/lang/sk_aps.lng index f6d9ed6eda..8ce5b20eb1 100644 --- a/interface/web/sites/lib/lang/sk_aps.lng +++ b/interface/web/sites/lib/lang/sk_aps.lng @@ -38,14 +38,14 @@ $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_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'; diff --git a/interface/web/sites/lib/lang/sk_database.lng b/interface/web/sites/lib/lang/sk_database.lng index ffaf83a186..b081dcf0f5 100644 --- a/interface/web/sites/lib/lang/sk_database.lng +++ b/interface/web/sites/lib/lang/sk_database.lng @@ -41,4 +41,5 @@ $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.'; ?> diff --git a/interface/web/sites/lib/lang/sk_database_user.lng b/interface/web/sites/lib/lang/sk_database_user.lng index 6c4ee7c696..66a0718349 100644 --- a/interface/web/sites/lib/lang/sk_database_user.lng +++ b/interface/web/sites/lib/lang/sk_database_user.lng @@ -1,23 +1,23 @@ diff --git a/interface/web/sites/lib/lang/sk_database_user_admin_list.lng b/interface/web/sites/lib/lang/sk_database_user_admin_list.lng index 4c17da126b..d7f88c4c36 100644 --- a/interface/web/sites/lib/lang/sk_database_user_admin_list.lng +++ b/interface/web/sites/lib/lang/sk_database_user_admin_list.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$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/sk_database_user_list.lng b/interface/web/sites/lib/lang/sk_database_user_list.lng index 549374b6ac..8c226496a6 100644 --- a/interface/web/sites/lib/lang/sk_database_user_list.lng +++ b/interface/web/sites/lib/lang/sk_database_user_list.lng @@ -1,5 +1,5 @@ \ No newline at end of file +$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/sk_web_domain.lng b/interface/web/sites/lib/lang/sk_web_domain.lng index 5e3d650d24..6df5937805 100644 --- a/interface/web/sites/lib/lang/sk_web_domain.lng +++ b/interface/web/sites/lib/lang/sk_web_domain.lng @@ -109,4 +109,6 @@ $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:'; ?> diff --git a/interface/web/sites/lib/lang/sk_web_subdomain.lng b/interface/web/sites/lib/lang/sk_web_subdomain.lng index 165beb6755..47cd669341 100644 --- a/interface/web/sites/lib/lang/sk_web_subdomain.lng +++ b/interface/web/sites/lib/lang/sk_web_subdomain.lng @@ -40,4 +40,6 @@ $wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for ex $wb['no_redirect_txt'] = 'No redirect'; $wb['no_flag_txt'] = 'No flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; ?> diff --git a/interface/web/sites/lib/lang/sk_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/sk_web_vhost_subdomain.lng index d993af80b0..b87c788126 100644 --- a/interface/web/sites/lib/lang/sk_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/sk_web_vhost_subdomain.lng @@ -1,79 +1,78 @@ = 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['nginx_directives_txt'] = 'nginx Directives'; +$wb['seo_redirect_txt'] = 'SEO Redirect'; +$wb['non_www_to_www_txt'] = 'Non-www -> www'; +$wb['www_to_non_www_txt'] = 'www -> non-www'; +$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM'; +$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.'; +$wb['python_txt'] = 'Python'; +$wb['perl_txt'] = 'Perl'; +$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children'; +$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers'; +$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers'; +$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers'; +$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0'; +$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.'; +$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.'; +$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.'; +$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.'; +$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.'; +$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.'; +$wb['fastcgi_php_version_txt'] = 'PHP Version'; +$wb['pm_txt'] = 'PHP-FPM Process Manager'; +$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout'; +$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests'; +$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.'; +$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -?> \ No newline at end of file +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +?> diff --git a/interface/web/sites/lib/lang/sk_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/sk_web_vhost_subdomain_list.lng index 8273dbd066..1c16bcda28 100644 --- a/interface/web/sites/lib/lang/sk_web_vhost_subdomain_list.lng +++ b/interface/web/sites/lib/lang/sk_web_vhost_subdomain_list.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['list_head_txt'] = 'Subdomains'; +$wb['active_txt'] = 'Active'; +$wb['server_id_txt'] = 'Server'; +$wb['parent_domain_id_txt'] = 'Website'; +$wb['domain_txt'] = 'Subdomain'; +$wb['add_new_record_txt'] = 'Add new subdomain'; +?> diff --git a/interface/web/sites/lib/lang/tr_database.lng b/interface/web/sites/lib/lang/tr_database.lng index 15b061c351..565e6df7ec 100644 --- a/interface/web/sites/lib/lang/tr_database.lng +++ b/interface/web/sites/lib/lang/tr_database.lng @@ -41,4 +41,5 @@ $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.'; ?> diff --git a/interface/web/sites/lib/lang/tr_web_domain.lng b/interface/web/sites/lib/lang/tr_web_domain.lng index e253e92d41..814f600c8b 100644 --- a/interface/web/sites/lib/lang/tr_web_domain.lng +++ b/interface/web/sites/lib/lang/tr_web_domain.lng @@ -109,4 +109,6 @@ $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:'; ?> diff --git a/interface/web/sites/lib/lang/tr_web_subdomain.lng b/interface/web/sites/lib/lang/tr_web_subdomain.lng index 69842d9025..48eb82bc51 100644 --- a/interface/web/sites/lib/lang/tr_web_subdomain.lng +++ b/interface/web/sites/lib/lang/tr_web_subdomain.lng @@ -40,4 +40,6 @@ $wb['redirect_error_regex'] = 'Geçersiz yönlendirme yolu. Geçerli yönlendirm $wb['no_redirect_txt'] = 'No redirect'; $wb['no_flag_txt'] = 'No flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; ?> diff --git a/interface/web/sites/lib/lang/tr_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/tr_web_vhost_subdomain.lng index 4a0279e9fc..b87c788126 100644 --- a/interface/web/sites/lib/lang/tr_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/tr_web_vhost_subdomain.lng @@ -110,4 +110,9 @@ $wb['generate_password_txt'] = 'Generate Password'; $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; ?> diff --git a/interface/web/sites/list/aps_installedpackages.list.php b/interface/web/sites/list/aps_installedpackages.list.php index 573df2a556..2b2f32e7fa 100644 --- a/interface/web/sites/list/aps_installedpackages.list.php +++ b/interface/web/sites/list/aps_installedpackages.list.php @@ -58,14 +58,16 @@ $liste["item"][] = array('field' => 'version', 'width' => '', 'value' => ''); -$liste["item"][] = array('field' => 'customer_name', - 'datatype' => 'VARCHAR', - 'formtype' => 'TEXT', - 'op' => 'LIKE', - 'prefix' => '%', - 'suffix' => '%', + /* +$liste["item"][] = array('field' => 'customer_id', + 'datatype' => 'INTEGER', + 'formtype' => 'SELECT', + 'op' => '=', + 'prefix' => '', + 'suffix' => '', 'width' => '', 'value' => ''); +*/ $liste["item"][] = array('field' => 'instance_status', 'datatype' => 'VARCHAR', diff --git a/interface/web/sites/shell_user_edit.php b/interface/web/sites/shell_user_edit.php index 8f2a93fd8b..6939d4ad9c 100644 --- a/interface/web/sites/shell_user_edit.php +++ b/interface/web/sites/shell_user_edit.php @@ -79,13 +79,10 @@ class page_action extends tform_actions { if ($this->dataRecord['username'] != ""){ /* REMOVE the restriction */ - $app->tpl->setVar("username", preg_replace('/'.$shelluser_prefix.'/', '', $this->dataRecord['username'], 1)); - } - if($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) { - $app->tpl->setVar("username_prefix", $global_config['shelluser_prefix']); - } else { - $app->tpl->setVar("username_prefix", $shelluser_prefix); + $app->tpl->setVar("username", $app->tools_sites->removePrefix($this->dataRecord['username'], $this->dataRecord['username_prefix'], $shelluser_prefix)); } + + $app->tpl->setVar("username_prefix", $app->tools_sites->getPrefix($this->dataRecord['username_prefix'], $shelluser_prefix, $global_config['shelluser_prefix'])); if($this->id > 0) { //* we are editing a existing record @@ -138,6 +135,7 @@ class page_action extends tform_actions { $global_config = $app->getconf->get_global_config('sites'); $shelluser_prefix = $app->tools_sites->replacePrefix($global_config['shelluser_prefix'], $this->dataRecord); + $this->dataRecord['username_prefix'] = $shelluser_prefix; /* restrict the names */ $this->dataRecord['username'] = $shelluser_prefix . $this->dataRecord['username']; } @@ -184,6 +182,10 @@ class page_action extends tform_actions { $global_config = $app->getconf->get_global_config('sites'); $shelluser_prefix = $app->tools_sites->replacePrefix($global_config['shelluser_prefix'], $this->dataRecord); + $old_record = $app->tform->getDataRecord($this->id); + $shelluser_prefix = $app->tools_sites->getPrefix($old_record['username_prefix'], $shelluser_prefix); + $this->dataRecord['username_prefix'] = $shelluser_prefix; + /* restrict the names */ $this->dataRecord['username'] = $shelluser_prefix . $this->dataRecord['username']; } diff --git a/interface/web/sites/templates/aps_instances_list.htm b/interface/web/sites/templates/aps_instances_list.htm index be985b5831..48da5232e6 100644 --- a/interface/web/sites/templates/aps_instances_list.htm +++ b/interface/web/sites/templates/aps_instances_list.htm @@ -10,7 +10,7 @@ {tmpl_var name='name_txt'} {tmpl_var name='version_txt'} - {tmpl_var name='customer_txt'} + {tmpl_var name='install_location_txt'} {tmpl_var name='status_txt'} @@ -20,7 +20,7 @@ - +   @@ -35,7 +35,7 @@ {tmpl_var name='package_name'} {tmpl_var name='package_version'}-{tmpl_var name='package_release'} - {tmpl_var name='customer_name'} + {tmpl_var name='install_location_short'} {tmpl_var name='instance_status'} @@ -44,7 +44,7 @@ {tmpl_var name='delete_txt'} - {tmpl_var name='reinstall_txt'} + {tmpl_var name='reinstall_txt'} diff --git a/interface/web/sites/templates/ftp_user_advanced.htm b/interface/web/sites/templates/ftp_user_advanced.htm index b945033823..9d69143c9e 100644 --- a/interface/web/sites/templates/ftp_user_advanced.htm +++ b/interface/web/sites/templates/ftp_user_advanced.htm @@ -23,11 +23,11 @@
-

MB

+

-

MB

+

diff --git a/interface/web/sites/templates/web_domain_edit.htm b/interface/web/sites/templates/web_domain_edit.htm index 31c96cc8c6..c415066e33 100644 --- a/interface/web/sites/templates/web_domain_edit.htm +++ b/interface/web/sites/templates/web_domain_edit.htm @@ -166,8 +166,8 @@ reloadFastcgiPHPVersions(); }); } - adjustForm(); - reloadFastcgiPHPVersions(); + adjustForm(true); + reloadFastcgiPHPVersions(true); jQuery('#client_group_id').change(function(){ clientGroupId = $(this).val(); @@ -179,6 +179,8 @@ } else { jQuery('.fastcgi_php_version:visible').hide(); } + //resetFormChanged(); + jQuery('#php').change(function(){ reloadFastcgiPHPVersions(); if(jQuery(this).val() == 'fast-cgi' || jQuery(this).val() == 'php-fpm'){ @@ -188,7 +190,7 @@ } }); - function adjustForm(){ + function adjustForm(noFormChange){ jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) { if(data.servertype == "nginx"){ var selected = jQuery('#php').val(); @@ -205,7 +207,8 @@ jQuery('#php option[value="mod"]').show(); jQuery('#php option[value="suphp"]').show(); } - jQuery('#php').change(); + if(noFormChange) resetFormChanged(); + else jQuery('#php').change(); }); } @@ -214,7 +217,7 @@ loadOptionInto('ipv6_address','sites/ajax_get_ip.php?ip_type=IPv6&server_id='+serverId+'&client_group_id='+clientGroupId); } - function reloadFastcgiPHPVersions() { + function reloadFastcgiPHPVersions(noFormChange) { jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, php_type : jQuery('#php').val(), type : "getphpfastcgi"}, function(data) { var options = ''; var phpfastcgiselected = ''; @@ -227,6 +230,7 @@ options += ''; }); $('#fastcgi_php_version').html(options).change(); + if(noFormChange) resetFormChanged(); }); } diff --git a/interface/web/sites/web_aliasdomain_edit.php b/interface/web/sites/web_aliasdomain_edit.php index d3315eb487..901cb3525f 100644 --- a/interface/web/sites/web_aliasdomain_edit.php +++ b/interface/web/sites/web_aliasdomain_edit.php @@ -45,7 +45,7 @@ require_once('../../lib/app.inc.php'); $app->auth->check_module_permissions('sites'); // Loading classes -$app->uses('tpl,tform,tform_actions'); +$app->uses('tpl,tform,tform_actions,tools_sites'); $app->load('tform_actions'); class page_action extends tform_actions { @@ -81,16 +81,7 @@ class page_action extends tform_actions { /* * The domain-module is in use. */ - $client_group_id = $_SESSION["s"]["user"]["default_group"]; - /* - * The admin can select ALL domains, the user only the domains assigned to him - */ - $sql = "SELECT domain_id, domain FROM domain "; - if ($_SESSION["s"]["user"]["typ"] != 'admin') { - $sql .= "WHERE sys_groupid =" . $client_group_id; - } - $sql .= " ORDER BY domain"; - $domains = $app->db->queryAllRecords($sql); + $domains = $app->tools_sites->getDomainModuleDomains(); $domain_select = ''; if(is_array($domains) && sizeof($domains) > 0) { /* We have domains in the list, so create the drop-down-list */ @@ -137,18 +128,12 @@ class page_action extends tform_actions { $app->uses('ini_parser,getconf'); $settings = $app->getconf->get_global_config('domains'); if ($settings['use_domain_module'] == 'y') { - $client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]); - - $sql = "SELECT domain_id, domain FROM domain WHERE domain_id = " . $app->functions->intval($this->dataRecord['domain']); - if ($_SESSION["s"]["user"]["typ"] != 'admin') { - $sql .= " AND sys_groupid =" . $client_group_id; - } - $domain_check = $app->db->queryOneRecord($sql); + $domain_check = $app->tools_sites->checkDomainModuleDomain($this->dataRecord['domain']); if(!$domain_check) { // invalid domain selected $app->tform->errorMessage .= $app->tform->lng("domain_error_empty")."
"; } else { - $this->dataRecord['domain'] = $domain_check['domain']; + $this->dataRecord['domain'] = $domain_check; } } diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php index 758c05fc34..72be72a3d7 100644 --- a/interface/web/sites/web_domain_edit.php +++ b/interface/web/sites/web_domain_edit.php @@ -45,7 +45,7 @@ require_once('../../lib/app.inc.php'); $app->auth->check_module_permissions('sites'); // Loading classes -$app->uses('tpl,tform,tform_actions'); +$app->uses('tpl,tform,tform_actions,tools_sites'); $app->load('tform_actions'); class page_action extends tform_actions { @@ -393,7 +393,7 @@ class page_action extends tform_actions { $ssl_domain_select = ''; $tmp = $app->db->queryOneRecord("SELECT domain FROM web_domain WHERE domain_id = ".$this->id); - $ssl_domains = array($tmp["domain"],'www.'.$tmp["domain"]); + $ssl_domains = array($tmp["domain"],'www.'.$tmp["domain"],'*.'.$tmp["domain"]); if(is_array($ssl_domains)) { foreach( $ssl_domains as $ssl_domain) { $selected = ($ssl_domain == $this->dataRecord['ssl_domain'])?'SELECTED':''; @@ -425,16 +425,7 @@ class page_action extends tform_actions { /* * The domain-module is in use. */ - $client_group_id = $_SESSION["s"]["user"]["default_group"]; - /* - * The admin can select ALL domains, the user only the domains assigned to him - */ - $sql = "SELECT domain_id, domain FROM domain "; - if ($_SESSION["s"]["user"]["typ"] != 'admin') { - $sql .= "WHERE sys_groupid =" . $client_group_id; - } - $sql .= " ORDER BY domain"; - $domains = $app->db->queryAllRecords($sql); + $domains = $app->tools_sites->getDomainModuleDomains(); $domain_select = ''; if(is_array($domains) && sizeof($domains) > 0) { /* We have domains in the list, so create the drop-down-list */ @@ -474,18 +465,12 @@ class page_action extends tform_actions { $app->uses('ini_parser,getconf'); $settings = $app->getconf->get_global_config('domains'); if ($settings['use_domain_module'] == 'y') { - $client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]); - - $sql = "SELECT domain_id, domain FROM domain WHERE domain_id = " . $app->functions->intval($this->dataRecord['domain']); - if ($_SESSION["s"]["user"]["typ"] != 'admin') { - $sql .= " AND sys_groupid =" . $client_group_id; - } - $domain_check = $app->db->queryOneRecord($sql); + $domain_check = $app->tools_sites->checkDomainModuleDomain($this->dataRecord['domain']); if(!$domain_check) { // invalid domain selected $app->tform->errorMessage .= $app->tform->lng("domain_error_empty")."
"; } else { - $this->dataRecord['domain'] = $domain_check['domain']; + $this->dataRecord['domain'] = $domain_check; } } } @@ -508,7 +493,7 @@ class page_action extends tform_actions { if($client['limit_perl'] != 'y') $this->dataRecord['perl'] = '-'; if($client['limit_ruby'] != 'y') $this->dataRecord['ruby'] = '-'; if($client['limit_python'] != 'y') $this->dataRecord['python'] = '-'; - if($client['force_suexec'] != 'n') $this->dataRecord['suexec'] = '-'; + if($client['force_suexec'] == 'y') $this->dataRecord['suexec'] = 'y'; if($client['limit_hterror'] != 'y') $this->dataRecord['errordocs'] = '-'; if($client['limit_wildcard'] != 'y' && $this->dataRecord['subdomain'] == '*') $this->dataRecord['subdomain'] = '-'; if($client['limit_ssl'] != 'y') $this->dataRecord['ssl'] = '-'; @@ -853,7 +838,13 @@ class page_action extends tform_actions { //* Set php_open_basedir if empty or domain or client has been changed if(empty($web_rec['php_open_basedir']) || - (!empty($this->dataRecord["domain"]) && !empty($this->oldDataRecord["domain"]) && $this->dataRecord["domain"] != $this->oldDataRecord["domain"]) || + (!empty($this->dataRecord["domain"]) && !empty($this->oldDataRecord["domain"]) && $this->dataRecord["domain"] != $this->oldDataRecord["domain"])) { + $php_open_basedir = $web_rec['php_open_basedir']; + $php_open_basedir = str_replace($this->oldDataRecord['domain'],$web_rec['domain'],$php_open_basedir); + $sql = "UPDATE web_domain SET php_open_basedir = '$php_open_basedir' WHERE domain_id = ".$this->id; + $app->db->query($sql); + } + if(empty($web_rec['php_open_basedir']) || (isset($this->dataRecord["client_group_id"]) && $this->dataRecord["client_group_id"] != $this->oldDataRecord["sys_groupid"])) { $document_root = $app->db->quote(str_replace("[client_id]",$client_id,$document_root)); $php_open_basedir = str_replace("[website_path]",$document_root,$web_config["php_open_basedir"]); diff --git a/interface/web/sites/web_subdomain_edit.php b/interface/web/sites/web_subdomain_edit.php index 5fb990b19d..a424680050 100644 --- a/interface/web/sites/web_subdomain_edit.php +++ b/interface/web/sites/web_subdomain_edit.php @@ -45,7 +45,7 @@ require_once('../../lib/app.inc.php'); $app->auth->check_module_permissions('sites'); // Loading classes -$app->uses('tpl,tform,tform_actions'); +$app->uses('tpl,tform,tform_actions,tools_sites'); $app->load('tform_actions'); class page_action extends tform_actions { @@ -77,16 +77,7 @@ class page_action extends tform_actions { /* * The domain-module is in use. */ - $client_group_id = $_SESSION["s"]["user"]["default_group"]; - /* - * The admin can select ALL domains, the user only the domains assigned to him - */ - $sql = "SELECT domain_id, domain FROM domain "; - if ($_SESSION["s"]["user"]["typ"] != 'admin') { - $sql .= "WHERE sys_groupid =" . $client_group_id; - } - $sql .= " ORDER BY domain"; - $domains = $app->db->queryAllRecords($sql); + $domains = $app->tools_sites->getDomainModuleDomains(); $domain_select = ''; $selected_domain = ''; if(is_array($domains) && sizeof($domains) > 0) { @@ -147,11 +138,11 @@ class page_action extends tform_actions { $settings = $app->getconf->get_global_config('domains'); if ($settings['use_domain_module'] == 'y') { // get the record of the domain module domain - $domain = $app->db->queryOneRecord("SELECT * FROM domain WHERE domain_id = ".$app->functions->intval($this->dataRecord["sel_domain"])); + $domain = $app->tools_sites->checkDomainModuleDomain($this->dataRecord['sel_domain']); if(!$domain) { $app->tform->errorMessage .= $app->tform->lng("domain_error_empty")."
"; } else { - $this->dataRecord['domain'] = $this->dataRecord['domain'] . '.' . $domain['domain']; + $this->dataRecord['domain'] = $this->dataRecord['domain'] . '.' . $domain; } } else { $this->dataRecord["domain"] = $this->dataRecord["domain"].'.'.$parent_domain["domain"]; diff --git a/interface/web/sites/web_vhost_subdomain_edit.php b/interface/web/sites/web_vhost_subdomain_edit.php index 6094baa67b..6ea122d8e9 100644 --- a/interface/web/sites/web_vhost_subdomain_edit.php +++ b/interface/web/sites/web_vhost_subdomain_edit.php @@ -45,7 +45,7 @@ require_once('../../lib/app.inc.php'); $app->auth->check_module_permissions('sites'); // Loading classes -$app->uses('tpl,tform,tform_actions'); +$app->uses('tpl,tform,tform_actions,tools_sites'); $app->load('tform_actions'); class page_action extends tform_actions { @@ -277,16 +277,7 @@ class page_action extends tform_actions { /* * The domain-module is in use. */ - $client_group_id = $_SESSION["s"]["user"]["default_group"]; - /* - * The admin can select ALL domains, the user only the domains assigned to him - */ - $sql = "SELECT domain_id, domain FROM domain "; - if ($_SESSION["s"]["user"]["typ"] != 'admin') { - $sql .= "WHERE sys_groupid =" . $client_group_id; - } - $sql .= " ORDER BY domain"; - $domains = $app->db->queryAllRecords($sql); + $domains = $app->tools_sites->getDomainModuleDomains(); $domain_select = ''; $selected_domain = ''; if(is_array($domains) && sizeof($domains) > 0) { @@ -350,18 +341,12 @@ class page_action extends tform_actions { $app->uses('ini_parser,getconf'); $settings = $app->getconf->get_global_config('domains'); if ($settings['use_domain_module'] == 'y') { - $client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]); - - $sql = "SELECT domain_id, domain FROM domain WHERE domain_id = " . $app->functions->intval($this->dataRecord['sel_domain']); - if ($_SESSION["s"]["user"]["typ"] != 'admin') { - $sql .= " AND sys_groupid =" . $client_group_id; - } - $domain_check = $app->db->queryOneRecord($sql); + $domain_check = $app->tools_sites->checkDomainModuleDomain($this->dataRecord['sel_domain']); if(!$domain_check) { // invalid domain selected $app->tform->errorMessage .= $app->tform->lng("domain_error_empty")."
"; } else { - $this->dataRecord['domain'] = $this->dataRecord['domain'] . '.' . $domain_check['domain']; + $this->dataRecord['domain'] = $this->dataRecord['domain'] . '.' . $domain_check; } } else { $this->dataRecord["domain"] = $this->dataRecord["domain"].'.'.$parent_domain["domain"]; diff --git a/interface/web/sites/webdav_user_edit.php b/interface/web/sites/webdav_user_edit.php index 8f11bb0dbe..c6eaaf9941 100644 --- a/interface/web/sites/webdav_user_edit.php +++ b/interface/web/sites/webdav_user_edit.php @@ -78,14 +78,11 @@ class page_action extends tform_actions { if ($this->dataRecord['username'] != "") { /* REMOVE the restriction */ - $app->tpl->setVar("username", str_replace($webdavuser_prefix , '', $this->dataRecord['username'])); + $app->tpl->setVar("username", $app->tools_sites->removePrefix($this->dataRecord['username'], $this->dataRecord['username_prefix'], $webdavuser_prefix)); } - if($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) { - $app->tpl->setVar("username_prefix", $global_config['webdavuser_prefix']); - } else { - $app->tpl->setVar("username_prefix", $webdavuser_prefix); - } - + + $app->tpl->setVar("username_prefix", $app->tools_sites->getPrefix($this->dataRecord['username_prefix'], $webdavuser_prefix, $global_config['webdavuser_prefix'])); + if($this->id > 0) { //* we are editing a existing record $app->tpl->setVar("edit_disabled", 1); @@ -131,6 +128,8 @@ class page_action extends tform_actions { $global_config = $app->getconf->get_global_config('sites'); $webdavuser_prefix = $app->tools_sites->replacePrefix($global_config['webdavuser_prefix'], $this->dataRecord); + $this->dataRecord['username_prefix'] = $webdavuser_prefix; + /* restrict the names */ $this->dataRecord['username'] = $webdavuser_prefix . $this->dataRecord['username']; @@ -167,6 +166,7 @@ class page_action extends tform_actions { $data = $app->db->queryOneRecord("SELECT * FROM webdav_user WHERE webdav_user_id = ".$app->functions->intval($this->id)); $this->dataRecord["username"] = $data['username']; $this->dataRecord["dir"] = $data['dir']; + $this->dataRecord['username_prefix'] = $data['username_prefix']; $passwordOld = $data['password']; /* diff --git a/interface/web/tools/lib/lang/es.lng b/interface/web/tools/lib/lang/es.lng index 442be60a4f..d54c877fd2 100644 --- a/interface/web/tools/lib/lang/es.lng +++ b/interface/web/tools/lib/lang/es.lng @@ -3,11 +3,11 @@ $wb['User Settings'] = 'Configuraciones del usuario'; $wb['Settings'] = 'Configuraciones'; $wb['ISPConfig Tools'] = 'Herramientas ISPConfig'; $wb['Password and Language'] = 'Contraseña e Idioma'; -$wb['ispconfig_tools_note'] = 'Este módulo le permite cambiar la contraseña y el idioma y para iniciar una resincronización de los registros de DNS.'; +$wb['ispconfig_tools_note'] = 'Este módulo le permite cambiar la contraseña y el idioma e iniciar una resincronización de los registros DNS.'; $wb['Resync'] = 'Resync'; -$wb['Sync Tools'] = 'Sync Tools'; -$wb['Import'] = 'Import'; -$wb['ISPConfig 3 mail'] = 'ISPConfig 3 mail'; +$wb['Sync Tools'] = 'Herramientas Sync'; +$wb['Import'] = 'Importar'; +$wb['ISPConfig 3 mail'] = 'Correo de ISPConfig 3'; $wb['PDNS Tupa'] = 'PowerDNS Tupa'; $wb['Interface'] = 'Interface'; ?> diff --git a/interface/web/tools/lib/lang/es_import_ispconfig.lng b/interface/web/tools/lib/lang/es_import_ispconfig.lng index ce47c4da4d..0674068a90 100644 --- a/interface/web/tools/lib/lang/es_import_ispconfig.lng +++ b/interface/web/tools/lib/lang/es_import_ispconfig.lng @@ -1,23 +1,23 @@ diff --git a/interface/web/tools/lib/lang/es_resync.lng b/interface/web/tools/lib/lang/es_resync.lng index ed94767208..5226523993 100644 --- a/interface/web/tools/lib/lang/es_resync.lng +++ b/interface/web/tools/lib/lang/es_resync.lng @@ -1,13 +1,13 @@ diff --git a/interface/web/tools/lib/lang/fr_index.lng b/interface/web/tools/lib/lang/fr_index.lng index 9fa2544eea..a3ef38f219 100644 --- a/interface/web/tools/lib/lang/fr_index.lng +++ b/interface/web/tools/lib/lang/fr_index.lng @@ -1,4 +1,4 @@ \ No newline at end of file +?> diff --git a/interface/web/tools/lib/lang/fr_interface.lng b/interface/web/tools/lib/lang/fr_interface.lng index b15c7334b2..aab4fc89ff 100644 --- a/interface/web/tools/lib/lang/fr_interface.lng +++ b/interface/web/tools/lib/lang/fr_interface.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$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/fr_tpl_default.lng b/interface/web/tools/lib/lang/fr_tpl_default.lng index 81c443e6d5..c06246304d 100644 --- a/interface/web/tools/lib/lang/fr_tpl_default.lng +++ b/interface/web/tools/lib/lang/fr_tpl_default.lng @@ -1,7 +1,7 @@ \ No newline at end of file +$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/menu.d/import.menu.php b/interface/web/tools/lib/menu.d/import.menu.php index bd92d8c2e7..477c075423 100644 --- a/interface/web/tools/lib/menu.d/import.menu.php +++ b/interface/web/tools/lib/menu.d/import.menu.php @@ -15,10 +15,11 @@ $items[] = array( 'title' => 'PDNS Tupa', 'target' => 'content', 'link' => 'tools/dns_import_tupa.php'); +/* not yet complete $items[] = array( 'title' => 'Plesk', 'target' => 'content', 'link' => 'tools/import_plesk.php'); - +*/ $module['nav'][] = array( 'title' => 'Import', 'open' => 1, diff --git a/interface/web/tools/templates/dns_import_tupa.htm b/interface/web/tools/templates/dns_import_tupa.htm index 9bd7ba37fc..ca44696fac 100644 --- a/interface/web/tools/templates/dns_import_tupa.htm +++ b/interface/web/tools/templates/dns_import_tupa.htm @@ -1,4 +1,4 @@ -

Import DNS recods from Tupa PowerDNS controlpanel

+

Import DNS records from Tupa PowerDNS controlpanel

@@ -29,12 +29,6 @@
-
-

Import DNS Records

-
- -
-
@@ -45,6 +39,7 @@ +
diff --git a/interface/web/vm/lib/lang/cz.lng b/interface/web/vm/lib/lang/cz.lng index 4167e14a8a..b666d6fe55 100644 --- a/interface/web/vm/lib/lang/cz.lng +++ b/interface/web/vm/lib/lang/cz.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/vm/lib/lang/cz_openvz_ip.lng b/interface/web/vm/lib/lang/cz_openvz_ip.lng index 6016681df8..84c42ceeb2 100644 --- a/interface/web/vm/lib/lang/cz_openvz_ip.lng +++ b/interface/web/vm/lib/lang/cz_openvz_ip.lng @@ -1,9 +1,9 @@ diff --git a/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng b/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng index 4977e7245b..76cab8cce8 100644 --- a/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng +++ b/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/vm/lib/lang/cz_openvz_template.lng b/interface/web/vm/lib/lang/cz_openvz_template.lng index bd4209d4ad..8b07949a63 100644 --- a/interface/web/vm/lib/lang/cz_openvz_template.lng +++ b/interface/web/vm/lib/lang/cz_openvz_template.lng @@ -21,13 +21,13 @@ $wb['numsiginfo_txt'] = 'Numsiginfo'; $wb['dcachesize_txt'] = 'Dcachesize'; $wb['numiptent_txt'] = 'Numiptent'; $wb['swappages_txt'] = 'Swappages'; -$wb['hostname_txt'] = 'Hostname'; -$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['hostname_txt'] = 'Název hostitele (hostname)'; +$wb['nameserver_txt'] = 'Jmený server(y)'; +$wb['nameserver_desc_txt'] = '(oddělené mezerou)'; +$wb['capability_txt'] = 'Schopnost'; +$wb['template_name_txt'] = 'Název šablony'; +$wb['diskspace_txt'] = 'Velikost disku'; +$wb['ram_txt'] = 'RAM (garantovaná)'; $wb['ram_burst_txt'] = 'RAM (burst)'; $wb['cpu_units_txt'] = 'CPU units'; $wb['cpu_num_txt'] = 'CPU cores'; diff --git a/interface/web/vm/lib/lang/cz_openvz_vm.lng b/interface/web/vm/lib/lang/cz_openvz_vm.lng index 1b54aa9010..36f0b42743 100644 --- a/interface/web/vm/lib/lang/cz_openvz_vm.lng +++ b/interface/web/vm/lib/lang/cz_openvz_vm.lng @@ -1,40 +1,40 @@ diff --git a/interface/web/vm/lib/lang/cz_openvz_vm_list.lng b/interface/web/vm/lib/lang/cz_openvz_vm_list.lng index 6ff57ee18e..d9c7e4d05e 100644 --- a/interface/web/vm/lib/lang/cz_openvz_vm_list.lng +++ b/interface/web/vm/lib/lang/cz_openvz_vm_list.lng @@ -1,10 +1,10 @@ diff --git a/interface/web/vm/lib/lang/es.lng b/interface/web/vm/lib/lang/es.lng index 4167e14a8a..67f895b1fe 100644 --- a/interface/web/vm/lib/lang/es.lng +++ b/interface/web/vm/lib/lang/es.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/vm/lib/lang/es_openvz_action.lng b/interface/web/vm/lib/lang/es_openvz_action.lng index 52f7328582..995c66fdfe 100644 --- a/interface/web/vm/lib/lang/es_openvz_action.lng +++ b/interface/web/vm/lib/lang/es_openvz_action.lng @@ -1,16 +1,16 @@ diff --git a/interface/web/vm/lib/lang/es_openvz_ip.lng b/interface/web/vm/lib/lang/es_openvz_ip.lng index 6016681df8..e2a77bbf96 100644 --- a/interface/web/vm/lib/lang/es_openvz_ip.lng +++ b/interface/web/vm/lib/lang/es_openvz_ip.lng @@ -1,9 +1,9 @@ diff --git a/interface/web/vm/lib/lang/es_openvz_ip_list.lng b/interface/web/vm/lib/lang/es_openvz_ip_list.lng index e6a3a68c2c..fa164e4d71 100644 --- a/interface/web/vm/lib/lang/es_openvz_ip_list.lng +++ b/interface/web/vm/lib/lang/es_openvz_ip_list.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/vm/lib/lang/es_openvz_ostemplate.lng b/interface/web/vm/lib/lang/es_openvz_ostemplate.lng index 256750f19a..7fca4d193b 100644 --- a/interface/web/vm/lib/lang/es_openvz_ostemplate.lng +++ b/interface/web/vm/lib/lang/es_openvz_ostemplate.lng @@ -1,11 +1,11 @@ diff --git a/interface/web/vm/lib/lang/es_openvz_ostemplate_list.lng b/interface/web/vm/lib/lang/es_openvz_ostemplate_list.lng index 6471ec0e27..9afa6c9dce 100644 --- a/interface/web/vm/lib/lang/es_openvz_ostemplate_list.lng +++ b/interface/web/vm/lib/lang/es_openvz_ostemplate_list.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/vm/lib/lang/es_openvz_template.lng b/interface/web/vm/lib/lang/es_openvz_template.lng index d285512dca..0f73d409c3 100644 --- a/interface/web/vm/lib/lang/es_openvz_template.lng +++ b/interface/web/vm/lib/lang/es_openvz_template.lng @@ -21,20 +21,20 @@ $wb['numsiginfo_txt'] = 'Numsiginfo'; $wb['dcachesize_txt'] = 'Dcachesize'; $wb['numiptent_txt'] = 'Numiptent'; $wb['swappages_txt'] = 'Swappages'; -$wb['hostname_txt'] = 'Hostname'; +$wb['hostname_txt'] = 'Nombre de maquina'; $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'] = '(separados por espacios en blanco)'; +$wb['capability_txt'] = 'Capacidad'; +$wb['template_name_txt'] = 'Nombre de plantilla'; +$wb['diskspace_txt'] = 'Espacio en disco'; +$wb['ram_txt'] = 'RAM (garantizado)'; $wb['ram_burst_txt'] = 'RAM (burst)'; $wb['cpu_units_txt'] = 'CPU units'; -$wb['cpu_num_txt'] = 'CPU cores'; +$wb['cpu_num_txt'] = 'CPU number'; $wb['cpu_limit_txt'] = 'CPU limit %'; -$wb['io_priority_txt'] = 'I/O priority'; -$wb['active_txt'] = 'Active'; -$wb['description_txt'] = 'Description'; +$wb['io_priority_txt'] = 'I/O prioridad'; +$wb['active_txt'] = 'Activar'; +$wb['description_txt'] = 'Descripción'; $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.'; @@ -44,7 +44,7 @@ $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['oomguarpages_desc_txt'] = 'The guaranteed amount of memory for the case the memory is '; $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.'; @@ -56,38 +56,38 @@ $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['create_dns_txt'] = 'Crear DNS para el nombre de maquina'; +$wb['template_name_error_empty'] = 'Nombre de la plantilla está vacía.'; +$wb['diskspace_error_empty'] = 'Espacio en disco está vacío.'; +$wb['ram_error_empty'] = 'RAM (guaranteed) esta vacío.'; +$wb['ram_burst_error_empty'] = 'RAM (burst) esta vacío.'; +$wb['cpu_units_error_empty'] = 'CPU units esta vacío.'; +$wb['cpu_num_error_empty'] = 'CPU cores esta vacío.'; +$wb['cpu_limit_error_empty'] = 'CPU limit % esta vacío.'; +$wb['io_priority_error_empty'] = 'I/O prioridad esta vacío.'; +$wb['template_nameserver_error_empty'] = 'Nameserver(s) esta vacío.'; +$wb['numproc_error_empty'] = 'Numproc esta vacío.'; $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['numothersock_error_empty'] = 'Numothersock esta vacío.'; +$wb['vmguarpages_error_empty'] = 'Vmguarpages esta vacío.'; +$wb['kmemsize_error_empty'] = 'Kmemsize esta vacío.'; $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['tcprcvbuf_error_empty'] = 'Tcprcvbuf esta vacío.'; +$wb['othersockbuf_error_empty'] = 'Othersockbuf esta vacío.'; +$wb['dgramrcvbuf_error_empty'] = 'Dgramrcvbuf esta vacío.'; +$wb['oomguarpages_error_empty'] = 'Oomguarpages esta vacío.'; +$wb['privvmpages_error_empty'] = 'Privvmpages esta vacío.'; +$wb['lockedpages_error_empty'] = 'Lockedpages esta vacío.'; +$wb['shmpages_error_empty'] = 'Shmpages esta vacío.'; +$wb['physpages_error_empty'] = 'Physpages esta vacío.'; +$wb['numfile_error_empty'] = 'Numfile esta vacío.'; +$wb['avnumproc_error_empty'] = 'Avnumproc esta vacío.'; +$wb['numflock_error_empty'] = 'Numflock esta vacío.'; +$wb['numpty_error_empty'] = 'Numpty esta vacío.'; +$wb['numsiginfo_error_empty'] = 'Numsiginfo esta vacío.'; +$wb['dcachesize_error_empty'] = 'Dcachesize esta vacío.'; +$wb['numiptent_error_empty'] = 'Numiptent esta vacío.'; +$wb['swappages_error_empty'] = 'Swappages esta vacío.'; +$wb['Template'] = 'Plantilla'; +$wb['Advanced'] = 'Avanzado'; ?> diff --git a/interface/web/vm/lib/lang/es_openvz_template_list.lng b/interface/web/vm/lib/lang/es_openvz_template_list.lng index de4045c36a..464250d1b0 100644 --- a/interface/web/vm/lib/lang/es_openvz_template_list.lng +++ b/interface/web/vm/lib/lang/es_openvz_template_list.lng @@ -1,5 +1,5 @@ diff --git a/interface/web/vm/lib/lang/es_openvz_vm.lng b/interface/web/vm/lib/lang/es_openvz_vm.lng index f2be022dd0..ce5eccb749 100644 --- a/interface/web/vm/lib/lang/es_openvz_vm.lng +++ b/interface/web/vm/lib/lang/es_openvz_vm.lng @@ -1,40 +1,40 @@ diff --git a/interface/web/vm/lib/lang/es_openvz_vm_list.lng b/interface/web/vm/lib/lang/es_openvz_vm_list.lng index 2238e2b8f4..701a28aba3 100644 --- a/interface/web/vm/lib/lang/es_openvz_vm_list.lng +++ b/interface/web/vm/lib/lang/es_openvz_vm_list.lng @@ -1,10 +1,10 @@ diff --git a/remoting_client/API-docs/navigation.html b/remoting_client/API-docs/navigation.html index 0c6254f228..27f9f244ef 100644 --- a/remoting_client/API-docs/navigation.html +++ b/remoting_client/API-docs/navigation.html @@ -205,6 +205,10 @@

sites_database_get

sites_database_get_all_by_user

sites_database_update

+

sites_database_user_add

+

sites_database_user_delete

+

sites_database_user_get

+

sites_database_user_update

sites_ftp_user_add

sites_ftp_user_delete

sites_ftp_user_get

diff --git a/remoting_client/API-docs/sites_database_add.html b/remoting_client/API-docs/sites_database_add.html index eeaf79d949..411f75dc3a 100644 --- a/remoting_client/API-docs/sites_database_add.html +++ b/remoting_client/API-docs/sites_database_add.html @@ -22,11 +22,14 @@

server_id  (int(11))

type  (varchar(16))

database_name  (varchar(64))

-

database_user  (varchar(64))

+

database_user_id  (int(11))

+

database_ro_user_id  (int(11))

database_password  (varchar(64))

database_charset  (varchar(64))

remote_access  (enum('n','y'))

remote_ips  (text)

+

backup_interval  (varchar(255))

+

backup_copies  (int(11))

active  (enum('n','y'))

Output:

Returns the ID of the newly added database.

diff --git a/remoting_client/API-docs/sites_database_user_add.html b/remoting_client/API-docs/sites_database_user_add.html new file mode 100644 index 0000000000..86adf8fe70 --- /dev/null +++ b/remoting_client/API-docs/sites_database_user_add.html @@ -0,0 +1,31 @@ + +ISPCOnfig 3 remote API documentation + + + + + + + + + + +
+

sites_database_user_add($session_id, $client_id, $params);

+
+

Description:

+

Adds a new database user.


+

Input Variables:

+

$session_id, $client_id, $params

+

Parameters (in $params):

+

server_id  (int(11))

+

database_user  (varchar(64))

+

database_password  (varchar(64))

+

Output:

+

Returns the ID of the newly added database.

+ +
+ + diff --git a/remoting_client/API-docs/sites_database_user_delete.html b/remoting_client/API-docs/sites_database_user_delete.html new file mode 100644 index 0000000000..1123f32179 --- /dev/null +++ b/remoting_client/API-docs/sites_database_user_delete.html @@ -0,0 +1,29 @@ + +ISPCOnfig 3 remote API documentation + + + + + + + + + + +
+

sites_database_user_delete($session_id, $primary_id);

+
+

Description:

+

Deletes a database user.


+

Input Variables:

+

$session_id, $primary_id

+

Parameters (in $params):

+

None

+

Output:

+

Returns the number of deleted records.

+ +
+ + diff --git a/remoting_client/API-docs/sites_database_user_get.html b/remoting_client/API-docs/sites_database_user_get.html new file mode 100644 index 0000000000..c93c03b9b0 --- /dev/null +++ b/remoting_client/API-docs/sites_database_user_get.html @@ -0,0 +1,29 @@ + +ISPCOnfig 3 remote API documentation + + + + + + + + + + +
+

sites_database_user_get($session_id, $primary_id);

+
+

Description:

+

Retrieves information about a database.


+

Input Variables:

+

$session_id, $primary_id

+

Parameters (in $params):

+

None

+

Output:

+

Returns all fields and values of the chosen database.

+ +
+ + diff --git a/remoting_client/API-docs/sites_database_user_update.html b/remoting_client/API-docs/sites_database_user_update.html new file mode 100644 index 0000000000..2df9b30143 --- /dev/null +++ b/remoting_client/API-docs/sites_database_user_update.html @@ -0,0 +1,31 @@ + +ISPCOnfig 3 remote API documentation + + + + + + + + + + +
+

sites_database_user_update($session_id, $client_id, $primary_id, $params);

+
+Description: +

Updates a database.


+Input Variables: +

$session_id, $client_id, $primary_id, $params

+Parameters (in $params): +

server_id  (int(11))

+

database_name  (varchar(64))

+

database_password  (varchar(64))

+Output: +

Returns the number of affected rows.

+ +
+ + diff --git a/remoting_client/examples/sites_database_add.php b/remoting_client/examples/sites_database_add.php index 26ed3e6b4a..f3ddc29fef 100644 --- a/remoting_client/examples/sites_database_add.php +++ b/remoting_client/examples/sites_database_add.php @@ -20,11 +20,13 @@ try { 'server_id' => 1, 'type' => 'mysql', 'database_name' => 'db_name2', - 'database_user' => 'db_name2', - 'database_password' => 'db_name2', + 'database_user_id' => '1', + 'database_ro_user_id' => '0', 'database_charset' => 'UTF8', 'remote_access' => 'y', 'remote_ips' => '', + 'backup_interval' => 'none', + 'backup_copies' => 1, 'active' => 'y' ); diff --git a/remoting_client/examples/sites_database_user_add.php b/remoting_client/examples/sites_database_user_add.php new file mode 100644 index 0000000000..8dd2e79729 --- /dev/null +++ b/remoting_client/examples/sites_database_user_add.php @@ -0,0 +1,39 @@ + $soap_location, + 'uri' => $soap_uri, + 'trace' => 1, + 'exceptions' => 1)); + + +try { + if($session_id = $client->login($username,$password)) { + echo 'Logged successfull. Session ID:'.$session_id.'
'; + } + + //* Set the function parameters. + $client_id = 1; + $params = array( + 'server_id' => 1, + 'database_user' => 'db_name2', + 'database_password' => 'db_name2' + ); + + $database_id = $client->sites_database_user_add($session_id, $client_id, $params); + + echo "Database ID: ".$database_user_id."
"; + + if($client->logout($session_id)) { + echo 'Logged out.
'; + } + + +} catch (SoapFault $e) { + echo $client->__getLastResponse(); + die('SOAP Error: '.$e->getMessage()); +} + +?> diff --git a/remoting_client/examples/sites_database_user_delete.php b/remoting_client/examples/sites_database_user_delete.php new file mode 100644 index 0000000000..6c8293218b --- /dev/null +++ b/remoting_client/examples/sites_database_user_delete.php @@ -0,0 +1,36 @@ + $soap_location, + 'uri' => $soap_uri, + 'trace' => 1, + 'exceptions' => 1)); + + +try { + if($session_id = $client->login($username,$password)) { + echo 'Logged successfull. Session ID:'.$session_id.'
'; + } + + //* Parameters + $database_user_id = 1; + + + //* Get the database record + $affected_rows = $client->sites_database_user_delete($session_id, $database_user_id); + + echo "Number of records that have been deleted: ".$affected_rows."
"; + + if($client->logout($session_id)) { + echo 'Logged out.
'; + } + + +} catch (SoapFault $e) { + echo $client->__getLastResponse(); + die('SOAP Error: '.$e->getMessage()); +} + +?> diff --git a/remoting_client/examples/sites_database_user_get.php b/remoting_client/examples/sites_database_user_get.php new file mode 100644 index 0000000000..759ed9f8fc --- /dev/null +++ b/remoting_client/examples/sites_database_user_get.php @@ -0,0 +1,34 @@ + $soap_location, + 'uri' => $soap_uri, + 'trace' => 1, + 'exceptions' => 1)); + + +try { + if($session_id = $client->login($username,$password)) { + echo 'Logged successfull. Session ID:'.$session_id.'
'; + } + + //* Set the function parameters. + $database_user_id = 1; + + $database_record = $client->sites_database_user_get($session_id, $database_user_id); + + print_r($database_record); + + if($client->logout($session_id)) { + echo 'Logged out.
'; + } + + +} catch (SoapFault $e) { + echo $client->__getLastResponse(); + die('SOAP Error: '.$e->getMessage()); +} + +?> diff --git a/remoting_client/examples/sites_database_user_update.php b/remoting_client/examples/sites_database_user_update.php new file mode 100644 index 0000000000..527920dad6 --- /dev/null +++ b/remoting_client/examples/sites_database_user_update.php @@ -0,0 +1,42 @@ + $soap_location, + 'uri' => $soap_uri, + 'trace' => 1, + 'exceptions' => 1)); + + +try { + if($session_id = $client->login($username,$password)) { + echo 'Logged successfull. Session ID:'.$session_id.'
'; + } + + //* Parameters + $database_user_id = 1; + $client_id = 1; + + + //* Get the database record + $database_user_record = $client->sites_database_user_get($session_id, $database_user_id); + + //* Change password of the database user + $database_user_record['database_password'] = 'abcde'; + + $affected_rows = $client->sites_database_user_update($session_id, $client_id, $database_user_id, $database_user_record); + + echo "Number of records that have been changed in the database: ".$affected_rows."
"; + + if($client->logout($session_id)) { + echo 'Logged out.
'; + } + + +} catch (SoapFault $e) { + echo $client->__getLastResponse(); + die('SOAP Error: '.$e->getMessage()); +} + +?> diff --git a/server/conf/nginx_reverse_proxy_plugin.vhost.conf.master b/server/conf/nginx_reverse_proxy_plugin.vhost.conf.master new file mode 100644 index 0000000000..e1073e8051 --- /dev/null +++ b/server/conf/nginx_reverse_proxy_plugin.vhost.conf.master @@ -0,0 +1,125 @@ + +server { + + ###################################################################### + ## Server configuration + ###################################################################### + + # Tell nginx to listen on port (default http(s) port, IPv4) + listen :; + + + # Tell nginx to listen on port (default http(s) port, IPv6) + listen []: ipv6only=on; + + + server_name ; + + ###################################################################### + ## Log configuration + ###################################################################### + + access_log /var/log/ispconfig/httpd//access.log combined; + error_log /var/log/ispconfig/httpd//error.log; + + + ###################################################################### + ## SSL configuration + ###################################################################### + + ssl on; + ssl_certificate /.nginx.crt; + ssl_certificate_key /.nginx.key; + + + ###################################################################### + ## Redirects configuration + ###################################################################### + + + # SEO Redirect + if ($http_host = "") { + rewrite ^ $scheme://$request_uri permanent; + } + + + + + # Redirects + #if ($http_host ~* "$") { + # rewrite ^/(.+)$ $1 ; + #} + + + + ###################################################################### + ## Error configuration + ###################################################################### + + error_page 400 /error/400.html; + error_page 401 /error/401.html; + error_page 403 /error/403.html; + error_page 404 /error/404.html; + error_page 405 /error/405.html; + error_page 500 /error/500.html; + error_page 502 /error/502.html; + error_page 503 /error/503.html; + + ###################################################################### + ## Locations configuration + ###################################################################### + + location / { + + # disable access log (we already have it for nginx) + access_log off; + + # set the document root + root ; + + # cache apache2's answers in the cache + proxy_cache nginx_cache; + + # pass all requests to apache2 + + proxy_pass http://:; + + proxy_pass http://:; + + + } + + location ~ /\. { + + # Don't allow any access + deny all; + + # Don't log access + access_log off; + + } + + ###################################################################### + ## Directives configuration + ###################################################################### + + + + + + ###################################################################### + ## CP configuration + ###################################################################### + + # If domain.tld/ispconfig is requested, redirect to the secure ISPConfig URL + location = /ispconfig { rewrite ^ / permanent; } + + # If domain.tld/phpmyadmin is requested, redirect to the secure phpMyAdmin URL + location = /phpmyadmin { rewrite ^ /phpmyadmin/ permanent; } + + # If domain.tld/webmail is requested, redirect to the secure RoundCube Webmail URL + location = /webmail { rewrite ^ /webmail/ permanent; } + +} + + \ No newline at end of file diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master index d7c03d02e0..e9327eb8bb 100644 --- a/server/conf/vhost.conf.master +++ b/server/conf/vhost.conf.master @@ -234,7 +234,7 @@ - + Order allow,deny Allow from all diff --git a/server/cron_daily.php b/server/cron_daily.php index 0e9fffed6b..6045087aa5 100644 --- a/server/cron_daily.php +++ b/server/cron_daily.php @@ -686,7 +686,7 @@ if ($app->dbmaster == $app->db) { } //* Send email to client - if($web_config['overtraffic_notify_admin'] == 'y') { + if($web_config['overtraffic_notify_client'] == 'y') { $client_group_id = $rec["sys_groupid"]; $client = $app->db->queryOneRecord("SELECT client.email FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); if($client['email'] != '') { @@ -873,10 +873,10 @@ if($backup_dir != '') { $web_id = $rec['parent_domain_id']; $db_backup_dir = $backup_dir.'/web'.$web_id; - if(!is_dir($web_backup_dir)) mkdir($web_backup_dir, 0750); - chmod($web_backup_dir, 0750); - chown($web_backup_dir, 'root'); - chgrp($web_backup_dir, 'root'); + if(!is_dir($db_backup_dir)) mkdir($db_backup_dir, 0750); + chmod($db_backup_dir, 0750); + chown($db_backup_dir, 'root'); + chgrp($db_backup_dir, 'root'); //* Do the mysql database backup with mysqldump $db_id = $rec['database_id']; diff --git a/server/lib/classes/aps_installer.inc.php b/server/lib/classes/aps_installer.inc.php index f5b661c80a..9bb8db41a3 100644 --- a/server/lib/classes/aps_installer.inc.php +++ b/server/lib/classes/aps_installer.inc.php @@ -294,7 +294,8 @@ class ApsInstaller extends ApsBase $db_id = parent::getXPathValue($sxe, '//db:id'); if(empty($db_id)) return; // No database needed - /* + /* WARNING: if this will ever be uncommented please check the updated prefix handling for user and db names!!! + * // Set the database owner to the domain owner // ISPConfig identifies the owner by the sys_groupid (not sys_userid!) // so sys_userid can be set to any value diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index fd94133152..afcafef724 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -254,11 +254,15 @@ class apache2_plugin { $rand_file = escapeshellcmd($rand_file); $key_file = escapeshellcmd($key_file); + if(substr($domain, 0, 2) == '*.' && strpos($key_file, '/ssl/\*.') != false) $key_file = str_replace('/ssl/\*.', '/ssl/*.', $key_file); // wildcard certificate $key_file2 = escapeshellcmd($key_file2); + if(substr($domain, 0, 2) == '*.' && strpos($key_file2, '/ssl/\*.') != false) $key_file2 = str_replace('/ssl/\*.', '/ssl/*.', $key_file2); // wildcard certificate $ssl_days = 3650; $csr_file = escapeshellcmd($csr_file); + if(substr($domain, 0, 2) == '*.' && strpos($csr_file, '/ssl/\*.') != false) $csr_file = str_replace('/ssl/\*.', '/ssl/*.', $csr_file); // wildcard certificate $config_file = escapeshellcmd($ssl_cnf_file); $crt_file = escapeshellcmd($crt_file); + if(substr($domain, 0, 2) == '*.' && strpos($crt_file, '/ssl/\*.') != false) $crt_file = str_replace('/ssl/\*.', '/ssl/*.', $crt_file); // wildcard certificate if(is_file($ssl_cnf_file) && !is_link($ssl_cnf_file)) { @@ -510,8 +514,8 @@ class apache2_plugin { //* Create new base directory, if it does not exist yet if(!is_dir($new_dir)) $app->system->mkdirpath($new_dir); - //exec('mv '.$data['old']['document_root'].' '.$new_dir); - $app->system->rename($data['old']['document_root'],$new_dir); + exec('mv '.escapeshellarg($data['old']['document_root']).' '.escapeshellarg($new_dir)); + //$app->system->rename($data['old']['document_root'],$new_dir); $app->log('Moving site to new document root: mv '.$data['old']['document_root'].' '.$new_dir,LOGLEVEL_DEBUG); // Handle the change in php_open_basedir @@ -528,7 +532,12 @@ class apache2_plugin { exec($command); 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'; + $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 0 0'; + $app->system->replaceLine('/etc/fstab',$fstab_line,$fstab_line,1,1); } @@ -558,19 +567,26 @@ class apache2_plugin { 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); + + //* remove old log mount + $fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$log_folder.' none bind'; + $app->system->removeLine('/etc/fstab',$fstab_line); + + //* Unmount log directory + exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder)); } //* Create the log dir if nescessary and mount it - if(!is_dir('/var/log/ispconfig/httpd/'.$data['new']['domain'])) exec('mkdir -p /var/log/ispconfig/httpd/'.$data['new']['domain']); - if(!is_dir($data['new']['document_root'].'/'.$log_folder) || is_link($data['new']['document_root'].'/'.$log_folder)) { + if(!is_dir($data['new']['document_root'].'/'.$log_folder) || !is_dir('/var/log/ispconfig/httpd/'.$data['new']['domain']) || is_link($data['new']['document_root'].'/'.$log_folder)) { if(is_link($data['new']['document_root'].'/'.$log_folder)) unlink($data['new']['document_root'].'/'.$log_folder); + if(!is_dir('/var/log/ispconfig/httpd/'.$data['new']['domain'])) exec('mkdir -p /var/log/ispconfig/httpd/'.$data['new']['domain']); $app->system->mkdirpath($data['new']['document_root'].'/'.$log_folder); $app->system->chown($data['new']['document_root'].'/'.$log_folder,'root'); $app->system->chgrp($data['new']['document_root'].'/'.$log_folder,'root'); $app->system->chmod($data['new']['document_root'].'/'.$log_folder,0755); exec('mount --bind '.escapeshellarg('/var/log/ispconfig/httpd/'.$data['new']['domain']).' '.escapeshellarg($data['new']['document_root'].'/'.$log_folder)); //* add mountpoint to fstab - $fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind 0 0'; + $fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nobootwait 0 0'; $app->system->replaceLine('/etc/fstab',$fstab_line,$fstab_line,1,1); } @@ -1613,7 +1629,7 @@ class apache2_plugin { exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder)); //* remove mountpoint from fstab - $fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$log_folder.' none bind 0 0'; + $fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$log_folder.' none bind'; $app->system->removeLine('/etc/fstab',$fstab_line); if($data['old']['type'] != 'vhost' && $data['old']['type'] != 'vhostsubdomain' && $data['old']['parent_domain_id'] > 0) { diff --git a/server/plugins-available/aps_plugin.inc.php b/server/plugins-available/aps_plugin.inc.php index ddeca3d438..dbbbfb944a 100644 --- a/server/plugins-available/aps_plugin.inc.php +++ b/server/plugins-available/aps_plugin.inc.php @@ -69,6 +69,10 @@ class aps_plugin { global $app, $conf; + //* dont run the installer on a mirror server to prevent + // that the pplication gets installed twice. + if($conf['mirror_server_id'] > 0) return true; + $app->log("Starting APS install",LOGLEVEL_DEBUG); if(!isset($data['new']['id'])) return false; $instanceid = $data['new']['id']; diff --git a/server/plugins-available/mysql_clientdb_plugin.inc.php b/server/plugins-available/mysql_clientdb_plugin.inc.php index 101b2ccb8c..e4825c8e9f 100644 --- a/server/plugins-available/mysql_clientdb_plugin.inc.php +++ b/server/plugins-available/mysql_clientdb_plugin.inc.php @@ -164,6 +164,7 @@ class mysql_clientdb_plugin { $host_list = ''; if($data['new']['remote_access'] == 'y') { $host_list = $data['new']['remote_ips']; + if($host_list == '') $host_list = '%'; } if($host_list != '') $host_list .= ','; $host_list .= 'localhost'; @@ -208,6 +209,7 @@ class mysql_clientdb_plugin { $host_list = ''; if($data['new']['remote_access'] == 'y') { $host_list = $data['new']['remote_ips']; + if($host_list == '') $host_list = '%'; } if($host_list != '') $host_list .= ','; $host_list .= 'localhost'; diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php index 60a1e557a9..854320e088 100644 --- a/server/plugins-available/nginx_plugin.inc.php +++ b/server/plugins-available/nginx_plugin.inc.php @@ -164,11 +164,15 @@ class nginx_plugin { $rand_file = escapeshellcmd($rand_file); $key_file = escapeshellcmd($key_file); + if(substr($domain, 0, 2) == '*.' && strpos($key_file, '/ssl/\*.') != false) $key_file = str_replace('/ssl/\*.', '/ssl/*.', $key_file); // wildcard certificate $key_file2 = escapeshellcmd($key_file2); + if(substr($domain, 0, 2) == '*.' && strpos($key_file2, '/ssl/\*.') != false) $key_file2 = str_replace('/ssl/\*.', '/ssl/*.', $key_file2); // wildcard certificate $ssl_days = 3650; $csr_file = escapeshellcmd($csr_file); + if(substr($domain, 0, 2) == '*.' && strpos($csr_file, '/ssl/\*.') != false) $csr_file = str_replace('/ssl/\*.', '/ssl/*.', $csr_file); // wildcard certificate $config_file = escapeshellcmd($ssl_cnf_file); $crt_file = escapeshellcmd($crt_file); + if(substr($domain, 0, 2) == '*.' && strpos($crt_file, '/ssl/\*.') != false) $crt_file = str_replace('/ssl/\*.', '/ssl/*.', $crt_file); // wildcard certificate if(is_file($ssl_cnf_file) && !is_link($ssl_cnf_file)) { @@ -435,8 +439,8 @@ class nginx_plugin { //* Create new base directory, if it does not exist yet if(!is_dir($new_dir)) $app->system->mkdirpath($new_dir); - //exec('mv '.$data['old']['document_root'].' '.$new_dir); - $app->system->rename($data['old']['document_root'],$new_dir); + exec('mv '.escapeshellarg($data['old']['document_root']).' '.escapeshellarg($new_dir)); + //$app->system->rename($data['old']['document_root'],$new_dir); $app->log('Moving site to new document root: mv '.$data['old']['document_root'].' '.$new_dir,LOGLEVEL_DEBUG); // Handle the change in php_open_basedir @@ -453,7 +457,12 @@ class nginx_plugin { exec($command); 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'; + $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 0 0'; + $app->system->replaceLine('/etc/fstab',$fstab_line,$fstab_line,1,1); } @@ -483,19 +492,26 @@ class nginx_plugin { 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); + + //* remove old log mount + $fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$log_folder.' none bind'; + $app->system->removeLine('/etc/fstab',$fstab_line); + + //* Unmount log directory + exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder)); } //* Create the log dir if nescessary and mount it - if(!is_dir('/var/log/ispconfig/httpd/'.$data['new']['domain'])) exec('mkdir -p /var/log/ispconfig/httpd/'.$data['new']['domain']); - if(!is_dir($data['new']['document_root'].'/'.$log_folder) || is_link($data['new']['document_root'].'/'.$log_folder)) { + if(!is_dir($data['new']['document_root'].'/'.$log_folder) || !is_dir('/var/log/ispconfig/httpd/'.$data['new']['domain']) || is_link($data['new']['document_root'].'/'.$log_folder)) { if(is_link($data['new']['document_root'].'/'.$log_folder)) unlink($data['new']['document_root'].'/'.$log_folder); + if(!is_dir('/var/log/ispconfig/httpd/'.$data['new']['domain'])) exec('mkdir -p /var/log/ispconfig/httpd/'.$data['new']['domain']); $app->system->mkdirpath($data['new']['document_root'].'/'.$log_folder); $app->system->chown($data['new']['document_root'].'/'.$log_folder,'root'); $app->system->chgrp($data['new']['document_root'].'/'.$log_folder,'root'); $app->system->chmod($data['new']['document_root'].'/'.$log_folder,0755); exec('mount --bind '.escapeshellarg('/var/log/ispconfig/httpd/'.$data['new']['domain']).' '.escapeshellarg($data['new']['document_root'].'/'.$log_folder)); //* add mountpoint to fstab - $fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind 0 0'; + $fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nobootwait 0 0'; $app->system->replaceLine('/etc/fstab',$fstab_line,$fstab_line,1,1); } @@ -1593,7 +1609,7 @@ class nginx_plugin { exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder)); //* remove mountpoint from fstab - $fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$log_folder.' none bind 0 0'; + $fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$log_folder.' none bind'; $app->system->removeLine('/etc/fstab',$fstab_line); if($data['old']['type'] != 'vhost' && $data['old']['type'] != 'vhostsubdomain' && $data['old']['parent_domain_id'] > 0) { -- GitLab