From cc65688b3da3e16729a1f73dd50fd975bd1ff741 Mon Sep 17 00:00:00 2001
From: hellkat <hellkat@ispconfig3>
Date: Tue, 26 Mar 2013 04:43:51 +0000
Subject: [PATCH] Merged revisions 3845-3876 and 3879-3918 from stable
branch.
---
install/dist/lib/fedora.lib.php | 16 +-
install/dist/lib/gentoo.lib.php | 10 +-
install/dist/lib/opensuse.lib.php | 8 +-
install/lib/installer_base.lib.php | 54 ++---
install/sql/incremental/upd_0035.sql | 2 +-
install/sql/ispconfig3.sql | 4 +-
install/tpl/apache_ispconfig.conf.master | 2 +
install/tpl/apache_ispconfig.vhost.master | 25 +--
install/tpl/config.inc.php.master | 4 +-
install/tpl/nginx_apps.vhost.master | 2 +-
install/tpl/nginx_ispconfig.vhost.master | 2 +-
install/update.php | 2 +-
.../lib/classes/aps_guicontroller.inc.php | 7 +-
interface/lib/classes/db_mysql.inc.php | 38 ++--
.../lib/classes/listform_actions.inc.php | 13 +-
interface/lib/classes/remoting_lib.inc.php | 76 ++++---
interface/lib/classes/tools_monitor.inc.php | 2 +-
interface/lib/classes/validate_domain.inc.php | 4 +-
interface/lib/lang/cz.lng | 24 ++-
interface/lib/lang/pl.lng | 129 ++++++------
.../web/admin/form/server_config.tform.php | 6 +-
interface/web/admin/lib/lang/ar_login_as.lng | 6 +-
.../lib/lang/ar_software_package_list.lng | 1 +
.../lib/lang/ar_software_update_list.lng | 1 +
interface/web/admin/lib/lang/bg_login_as.lng | 6 +-
.../lib/lang/bg_software_package_list.lng | 1 +
.../lib/lang/bg_software_update_list.lng | 1 +
interface/web/admin/lib/lang/br_login_as.lng | 6 +-
.../lib/lang/br_software_package_list.lng | 1 +
.../lib/lang/br_software_update_list.lng | 1 +
interface/web/admin/lib/lang/cz.lng | 2 +
.../admin/lib/lang/cz_directive_snippets.lng | 2 +
.../lib/lang/cz_directive_snippets_list.lng | 2 +
interface/web/admin/lib/lang/cz_firewall.lng | 2 +
.../web/admin/lib/lang/cz_firewall_list.lng | 2 +
interface/web/admin/lib/lang/cz_groups.lng | 2 +
.../web/admin/lib/lang/cz_groups_list.lng | 2 +
interface/web/admin/lib/lang/cz_iptables.lng | 2 +
.../web/admin/lib/lang/cz_iptables_list.lng | 2 +
.../web/admin/lib/lang/cz_language_add.lng | 2 +
.../admin/lib/lang/cz_language_complete.lng | 2 +
.../web/admin/lib/lang/cz_language_edit.lng | 2 +
.../web/admin/lib/lang/cz_language_export.lng | 2 +
.../web/admin/lib/lang/cz_language_import.lng | 2 +
.../web/admin/lib/lang/cz_language_list.lng | 2 +
interface/web/admin/lib/lang/cz_login_as.lng | 18 +-
.../web/admin/lib/lang/cz_package_install.lng | 8 +-
.../web/admin/lib/lang/cz_remote_action.lng | 6 +-
.../web/admin/lib/lang/cz_remote_user.lng | 30 +--
.../admin/lib/lang/cz_remote_user_list.lng | 2 +
interface/web/admin/lib/lang/cz_server.lng | 2 +
.../web/admin/lib/lang/cz_server_config.lng | 18 +-
.../admin/lib/lang/cz_server_config_list.lng | 2 +
interface/web/admin/lib/lang/cz_server_ip.lng | 8 +-
.../web/admin/lib/lang/cz_server_ip_list.lng | 2 +
.../web/admin/lib/lang/cz_server_list.lng | 2 +
.../web/admin/lib/lang/cz_server_php.lng | 2 +
.../web/admin/lib/lang/cz_server_php_list.lng | 2 +
.../lib/lang/cz_software_package_install.lng | 6 +-
.../lib/lang/cz_software_package_list.lng | 3 +
.../web/admin/lib/lang/cz_software_repo.lng | 2 +
.../admin/lib/lang/cz_software_repo_list.lng | 2 +
.../lib/lang/cz_software_update_list.lng | 3 +
.../web/admin/lib/lang/cz_system_config.lng | 22 +-
.../admin/lib/lang/cz_tpl_default_admin.lng | 2 +
interface/web/admin/lib/lang/cz_users.lng | 2 +
.../web/admin/lib/lang/cz_users_list.lng | 2 +
.../web/admin/lib/lang/de_server_config.lng | 1 +
.../lib/lang/de_software_package_list.lng | 1 +
.../lib/lang/de_software_update_list.lng | 1 +
interface/web/admin/lib/lang/el_login_as.lng | 6 +-
.../lib/lang/el_software_package_list.lng | 1 +
.../lib/lang/el_software_update_list.lng | 1 +
.../web/admin/lib/lang/en_server_config.lng | 1 +
.../lib/lang/en_software_package_list.lng | 1 +
.../lib/lang/en_software_update_list.lng | 1 +
interface/web/admin/lib/lang/es_login_as.lng | 6 +-
.../lib/lang/es_software_package_list.lng | 1 +
.../lib/lang/es_software_update_list.lng | 1 +
interface/web/admin/lib/lang/fi_login_as.lng | 6 +-
.../lib/lang/fi_software_package_list.lng | 1 +
.../lib/lang/fi_software_update_list.lng | 1 +
interface/web/admin/lib/lang/fr_login_as.lng | 6 +-
.../lib/lang/fr_software_package_list.lng | 1 +
.../lib/lang/fr_software_update_list.lng | 1 +
interface/web/admin/lib/lang/hr_login_as.lng | 6 +-
.../lib/lang/hr_software_package_list.lng | 1 +
.../lib/lang/hr_software_update_list.lng | 1 +
interface/web/admin/lib/lang/hu_login_as.lng | 6 +-
.../lib/lang/hu_software_package_list.lng | 1 +
.../lib/lang/hu_software_update_list.lng | 1 +
interface/web/admin/lib/lang/id_login_as.lng | 6 +-
.../lib/lang/id_software_package_list.lng | 1 +
.../lib/lang/id_software_update_list.lng | 1 +
interface/web/admin/lib/lang/it_login_as.lng | 6 +-
.../lib/lang/it_software_package_list.lng | 1 +
.../lib/lang/it_software_update_list.lng | 1 +
.../lib/lang/ja_software_package_list.lng | 1 +
.../lib/lang/ja_software_update_list.lng | 1 +
interface/web/admin/lib/lang/nl_login_as.lng | 6 +-
.../lib/lang/nl_software_package_list.lng | 1 +
.../lib/lang/nl_software_update_list.lng | 1 +
interface/web/admin/lib/lang/pl.lng | 61 +++---
.../admin/lib/lang/pl_directive_snippets.lng | 15 +-
.../lib/lang/pl_directive_snippets_list.lng | 11 +-
interface/web/admin/lib/lang/pl_firewall.lng | 1 +
.../web/admin/lib/lang/pl_firewall_list.lng | 1 +
interface/web/admin/lib/lang/pl_groups.lng | 1 +
.../web/admin/lib/lang/pl_groups_list.lng | 1 +
interface/web/admin/lib/lang/pl_iptables.lng | 1 +
.../web/admin/lib/lang/pl_iptables_list.lng | 1 +
.../web/admin/lib/lang/pl_language_add.lng | 1 +
.../admin/lib/lang/pl_language_complete.lng | 1 +
.../web/admin/lib/lang/pl_language_edit.lng | 1 +
.../web/admin/lib/lang/pl_language_export.lng | 1 +
.../web/admin/lib/lang/pl_language_import.lng | 1 +
.../web/admin/lib/lang/pl_language_list.lng | 1 +
interface/web/admin/lib/lang/pl_login_as.lng | 19 +-
.../web/admin/lib/lang/pl_package_install.lng | 1 +
.../web/admin/lib/lang/pl_remote_action.lng | 1 +
.../web/admin/lib/lang/pl_remote_user.lng | 9 +-
.../admin/lib/lang/pl_remote_user_list.lng | 1 +
interface/web/admin/lib/lang/pl_server.lng | 1 +
.../web/admin/lib/lang/pl_server_config.lng | 27 +--
.../admin/lib/lang/pl_server_config_list.lng | 1 +
interface/web/admin/lib/lang/pl_server_ip.lng | 1 +
.../web/admin/lib/lang/pl_server_ip_list.lng | 1 +
.../web/admin/lib/lang/pl_server_list.lng | 1 +
.../web/admin/lib/lang/pl_server_php.lng | 29 +--
.../web/admin/lib/lang/pl_server_php_list.lng | 1 +
.../lib/lang/pl_software_package_install.lng | 1 +
.../lib/lang/pl_software_package_list.lng | 2 +
.../web/admin/lib/lang/pl_software_repo.lng | 1 +
.../admin/lib/lang/pl_software_repo_list.lng | 1 +
.../lib/lang/pl_software_update_list.lng | 2 +
.../web/admin/lib/lang/pl_system_config.lng | 49 ++---
.../admin/lib/lang/pl_tpl_default_admin.lng | 1 +
interface/web/admin/lib/lang/pl_users.lng | 11 +-
.../web/admin/lib/lang/pl_users_list.lng | 7 +-
interface/web/admin/lib/lang/pt_login_as.lng | 6 +-
.../lib/lang/pt_software_package_list.lng | 1 +
.../lib/lang/pt_software_update_list.lng | 1 +
interface/web/admin/lib/lang/ro_login_as.lng | 6 +-
.../lib/lang/ro_software_package_list.lng | 1 +
.../lib/lang/ro_software_update_list.lng | 1 +
interface/web/admin/lib/lang/ru_login_as.lng | 6 +-
.../lib/lang/ru_software_package_list.lng | 1 +
.../lib/lang/ru_software_update_list.lng | 1 +
interface/web/admin/lib/lang/se_login_as.lng | 6 +-
.../lib/lang/se_software_package_list.lng | 1 +
.../lib/lang/se_software_update_list.lng | 1 +
interface/web/admin/lib/lang/sk_login_as.lng | 6 +-
.../lib/lang/sk_software_package_list.lng | 1 +
.../lib/lang/sk_software_update_list.lng | 1 +
interface/web/admin/lib/lang/tr_login_as.lng | 6 +-
.../lib/lang/tr_software_package_list.lng | 1 +
.../lib/lang/tr_software_update_list.lng | 1 +
interface/web/admin/software_package_list.php | 7 +-
.../templates/server_config_server_edit.htm | 4 +-
.../web/admin/templates/server_php_list.htm | 12 +-
.../admin/templates/software_package_list.htm | 10 +-
.../admin/templates/software_update_list.htm | 2 +-
.../templates/system_config_sites_edit.htm | 6 +-
interface/web/client/lib/lang/ar_client.lng | 3 +
.../client/lib/lang/ar_client_template.lng | 3 +
interface/web/client/lib/lang/ar_reseller.lng | 3 +
interface/web/client/lib/lang/bg_client.lng | 3 +
.../client/lib/lang/bg_client_template.lng | 3 +
interface/web/client/lib/lang/bg_reseller.lng | 3 +
interface/web/client/lib/lang/br_client.lng | 3 +
.../client/lib/lang/br_client_template.lng | 3 +
interface/web/client/lib/lang/br_reseller.lng | 3 +
interface/web/client/lib/lang/cz.lng | 2 +
interface/web/client/lib/lang/cz_client.lng | 5 +
.../web/client/lib/lang/cz_client_circle.lng | 2 +
.../client/lib/lang/cz_client_circle_list.lng | 2 +
.../web/client/lib/lang/cz_client_del.lng | 2 +
.../web/client/lib/lang/cz_client_message.lng | 2 +
.../client/lib/lang/cz_client_template.lng | 5 +
.../lib/lang/cz_client_template_list.lng | 2 +
.../web/client/lib/lang/cz_clients_list.lng | 2 +
interface/web/client/lib/lang/cz_domain.lng | 2 +
.../web/client/lib/lang/cz_domain_list.lng | 2 +
interface/web/client/lib/lang/cz_reseller.lng | 5 +
.../web/client/lib/lang/cz_resellers_list.lng | 2 +
interface/web/client/lib/lang/de_client.lng | 4 +-
interface/web/client/lib/lang/de_reseller.lng | 2 +-
interface/web/client/lib/lang/el_client.lng | 3 +
.../client/lib/lang/el_client_template.lng | 3 +
interface/web/client/lib/lang/el_reseller.lng | 3 +
interface/web/client/lib/lang/es_client.lng | 3 +
.../client/lib/lang/es_client_template.lng | 3 +
interface/web/client/lib/lang/es_reseller.lng | 3 +
interface/web/client/lib/lang/fi_client.lng | 3 +
.../client/lib/lang/fi_client_template.lng | 3 +
interface/web/client/lib/lang/fi_reseller.lng | 3 +
interface/web/client/lib/lang/fr_client.lng | 3 +
.../client/lib/lang/fr_client_template.lng | 3 +
interface/web/client/lib/lang/fr_reseller.lng | 3 +
interface/web/client/lib/lang/hr_client.lng | 3 +
.../client/lib/lang/hr_client_template.lng | 3 +
interface/web/client/lib/lang/hr_reseller.lng | 3 +
interface/web/client/lib/lang/hu_client.lng | 3 +
.../client/lib/lang/hu_client_template.lng | 3 +
interface/web/client/lib/lang/hu_reseller.lng | 3 +
interface/web/client/lib/lang/id_client.lng | 3 +
.../client/lib/lang/id_client_template.lng | 3 +
interface/web/client/lib/lang/id_reseller.lng | 3 +
interface/web/client/lib/lang/it_client.lng | 3 +
.../client/lib/lang/it_client_template.lng | 3 +
interface/web/client/lib/lang/it_reseller.lng | 3 +
interface/web/client/lib/lang/ja_client.lng | 3 +
.../client/lib/lang/ja_client_template.lng | 3 +
interface/web/client/lib/lang/ja_reseller.lng | 3 +
interface/web/client/lib/lang/nl_client.lng | 3 +
.../client/lib/lang/nl_client_template.lng | 3 +
interface/web/client/lib/lang/nl_reseller.lng | 3 +
interface/web/client/lib/lang/pl.lng | 25 +--
interface/web/client/lib/lang/pl_client.lng | 98 ++++-----
.../web/client/lib/lang/pl_client_circle.lng | 1 +
.../client/lib/lang/pl_client_circle_list.lng | 1 +
.../web/client/lib/lang/pl_client_del.lng | 1 +
.../web/client/lib/lang/pl_client_message.lng | 33 +--
.../client/lib/lang/pl_client_template.lng | 50 +++--
.../lib/lang/pl_client_template_list.lng | 1 +
.../web/client/lib/lang/pl_clients_list.lng | 3 +-
interface/web/client/lib/lang/pl_domain.lng | 1 +
.../web/client/lib/lang/pl_domain_list.lng | 1 +
interface/web/client/lib/lang/pl_reseller.lng | 74 ++++---
.../web/client/lib/lang/pl_resellers_list.lng | 5 +-
interface/web/client/lib/lang/pt_client.lng | 3 +
.../client/lib/lang/pt_client_template.lng | 3 +
interface/web/client/lib/lang/pt_reseller.lng | 3 +
interface/web/client/lib/lang/ro_client.lng | 3 +
.../client/lib/lang/ro_client_template.lng | 3 +
interface/web/client/lib/lang/ro_reseller.lng | 3 +
interface/web/client/lib/lang/ru_client.lng | 3 +
.../client/lib/lang/ru_client_template.lng | 3 +
interface/web/client/lib/lang/ru_reseller.lng | 3 +
interface/web/client/lib/lang/se_client.lng | 3 +
.../client/lib/lang/se_client_template.lng | 3 +
interface/web/client/lib/lang/se_reseller.lng | 3 +
interface/web/client/lib/lang/sk_client.lng | 3 +
.../client/lib/lang/sk_client_template.lng | 3 +
interface/web/client/lib/lang/sk_reseller.lng | 3 +
interface/web/client/lib/lang/tr_client.lng | 3 +
.../client/lib/lang/tr_client_template.lng | 3 +
interface/web/client/lib/lang/tr_reseller.lng | 3 +
.../client/templates/client_edit_limits.htm | 4 +-
interface/web/dashboard/lib/lang/cz.lng | 2 +
.../dashboard/lib/lang/cz_dashlet_limits.lng | 2 +
.../dashboard/lib/lang/cz_dashlet_modules.lng | 2 +
interface/web/dashboard/lib/lang/pl.lng | 1 +
.../dashboard/lib/lang/pl_dashlet_limits.lng | 1 +
.../dashboard/lib/lang/pl_dashlet_modules.lng | 1 +
interface/web/designer/lib/lang/cz.lng | 2 +
.../web/designer/lib/lang/cz_form_edit.lng | 2 +
.../web/designer/lib/lang/cz_form_list.lng | 2 +
.../web/designer/lib/lang/cz_form_show.lng | 2 +
.../web/designer/lib/lang/cz_module_edit.lng | 2 +
.../web/designer/lib/lang/cz_module_list.lng | 2 +
.../designer/lib/lang/cz_module_nav_edit.lng | 2 +
.../lib/lang/cz_module_nav_item_edit.lng | 2 +
.../web/designer/lib/lang/cz_module_show.lng | 2 +
interface/web/designer/lib/lang/pl.lng | 1 +
.../web/designer/lib/lang/pl_form_edit.lng | 1 +
.../web/designer/lib/lang/pl_form_list.lng | 1 +
.../web/designer/lib/lang/pl_form_show.lng | 1 +
.../web/designer/lib/lang/pl_module_edit.lng | 1 +
.../web/designer/lib/lang/pl_module_list.lng | 1 +
.../designer/lib/lang/pl_module_nav_edit.lng | 1 +
.../lib/lang/pl_module_nav_item_edit.lng | 1 +
.../web/designer/lib/lang/pl_module_show.lng | 1 +
interface/web/dns/dns_mx_edit.php | 11 +
interface/web/dns/form/dns_a.tform.php | 2 +-
interface/web/dns/lib/lang/cz.lng | 2 +
interface/web/dns/lib/lang/cz_dns_a.lng | 2 +
interface/web/dns/lib/lang/cz_dns_a_list.lng | 4 +-
interface/web/dns/lib/lang/cz_dns_aaaa.lng | 2 +
interface/web/dns/lib/lang/cz_dns_alias.lng | 2 +
interface/web/dns/lib/lang/cz_dns_cname.lng | 4 +-
interface/web/dns/lib/lang/cz_dns_hinfo.lng | 2 +
interface/web/dns/lib/lang/cz_dns_import.lng | 4 +-
interface/web/dns/lib/lang/cz_dns_mx.lng | 8 +-
interface/web/dns/lib/lang/cz_dns_ns.lng | 2 +
interface/web/dns/lib/lang/cz_dns_ptr.lng | 2 +
interface/web/dns/lib/lang/cz_dns_rp.lng | 2 +
interface/web/dns/lib/lang/cz_dns_slave.lng | 2 +
.../web/dns/lib/lang/cz_dns_slave_list.lng | 2 +
interface/web/dns/lib/lang/cz_dns_soa.lng | 14 +-
.../web/dns/lib/lang/cz_dns_soa_list.lng | 2 +
interface/web/dns/lib/lang/cz_dns_srv.lng | 2 +
.../web/dns/lib/lang/cz_dns_template.lng | 2 +
.../web/dns/lib/lang/cz_dns_template_list.lng | 2 +
interface/web/dns/lib/lang/cz_dns_txt.lng | 2 +
interface/web/dns/lib/lang/cz_dns_wizard.lng | 4 +-
interface/web/dns/lib/lang/de_dns_mx.lng | 1 +
interface/web/dns/lib/lang/en_dns_mx.lng | 1 +
interface/web/dns/lib/lang/en_dns_soa.lng | 2 +-
interface/web/dns/lib/lang/pl.lng | 5 +-
interface/web/dns/lib/lang/pl_dns_a.lng | 1 +
interface/web/dns/lib/lang/pl_dns_a_list.lng | 3 +-
interface/web/dns/lib/lang/pl_dns_aaaa.lng | 1 +
interface/web/dns/lib/lang/pl_dns_alias.lng | 1 +
interface/web/dns/lib/lang/pl_dns_cname.lng | 1 +
interface/web/dns/lib/lang/pl_dns_hinfo.lng | 1 +
interface/web/dns/lib/lang/pl_dns_import.lng | 23 +-
interface/web/dns/lib/lang/pl_dns_mx.lng | 1 +
interface/web/dns/lib/lang/pl_dns_ns.lng | 1 +
interface/web/dns/lib/lang/pl_dns_ptr.lng | 1 +
interface/web/dns/lib/lang/pl_dns_rp.lng | 1 +
interface/web/dns/lib/lang/pl_dns_slave.lng | 7 +-
.../web/dns/lib/lang/pl_dns_slave_list.lng | 1 +
interface/web/dns/lib/lang/pl_dns_soa.lng | 17 +-
.../web/dns/lib/lang/pl_dns_soa_list.lng | 1 +
interface/web/dns/lib/lang/pl_dns_srv.lng | 7 +-
.../web/dns/lib/lang/pl_dns_template.lng | 1 +
.../web/dns/lib/lang/pl_dns_template_list.lng | 1 +
interface/web/dns/lib/lang/pl_dns_txt.lng | 1 +
interface/web/dns/lib/lang/pl_dns_wizard.lng | 19 +-
interface/web/help/faq_list.php | 4 +-
interface/web/help/lib/lang/cz.lng | 2 +
interface/web/help/lib/lang/cz_faq_form.lng | 2 +
.../lib/lang/cz_faq_manage_questions_list.lng | 2 +
.../web/help/lib/lang/cz_help_faq_list.lng | 2 +
.../lib/lang/cz_help_faq_sections_list.lng | 2 +
.../web/help/lib/lang/cz_support_message.lng | 2 +
.../help/lib/lang/cz_support_message_list.lng | 2 +
interface/web/help/lib/lang/pl.lng | 3 +-
interface/web/help/lib/lang/pl_faq_form.lng | 1 +
.../lib/lang/pl_faq_manage_questions_list.lng | 1 +
.../help/lib/lang/pl_faq_sections_form.lng | 1 +
.../web/help/lib/lang/pl_help_faq_list.lng | 1 +
.../lib/lang/pl_help_faq_sections_list.lng | 1 +
.../web/help/lib/lang/pl_support_message.lng | 3 +-
.../help/lib/lang/pl_support_message_list.lng | 1 +
interface/web/login/index.php | 2 +-
interface/web/login/lib/lang/cz.lng | 8 +-
interface/web/login/lib/lang/pl.lng | 25 +--
.../web/mail/form/mail_user_filter.tform.php | 2 +-
interface/web/mail/lib/lang/cz.lng | 2 +
interface/web/mail/lib/lang/cz_mail_alias.lng | 2 +
.../web/mail/lib/lang/cz_mail_alias_list.lng | 2 +
.../web/mail/lib/lang/cz_mail_aliasdomain.lng | 2 +
.../lib/lang/cz_mail_aliasdomain_list.lng | 2 +
.../web/mail/lib/lang/cz_mail_blacklist.lng | 2 +
.../mail/lib/lang/cz_mail_blacklist_list.lng | 2 +
.../mail/lib/lang/cz_mail_content_filter.lng | 2 +
.../lib/lang/cz_mail_content_filter_list.lng | 2 +
.../web/mail/lib/lang/cz_mail_domain.lng | 2 +
.../lib/lang/cz_mail_domain_admin_list.lng | 2 +
.../mail/lib/lang/cz_mail_domain_catchall.lng | 2 +
.../lib/lang/cz_mail_domain_catchall_list.lng | 2 +
.../web/mail/lib/lang/cz_mail_domain_list.lng | 2 +
.../web/mail/lib/lang/cz_mail_forward.lng | 2 +
.../mail/lib/lang/cz_mail_forward_list.lng | 2 +
interface/web/mail/lib/lang/cz_mail_get.lng | 2 +
.../web/mail/lib/lang/cz_mail_get_list.lng | 2 +
.../web/mail/lib/lang/cz_mail_mailinglist.lng | 2 +
.../lib/lang/cz_mail_mailinglist_list.lng | 2 +
.../mail/lib/lang/cz_mail_relay_recipient.lng | 2 +
.../lib/lang/cz_mail_relay_recipient_list.lng | 2 +
.../web/mail/lib/lang/cz_mail_spamfilter.lng | 2 +
.../mail/lib/lang/cz_mail_spamfilter_list.lng | 2 +
.../web/mail/lib/lang/cz_mail_transport.lng | 2 +
.../mail/lib/lang/cz_mail_transport_list.lng | 2 +
interface/web/mail/lib/lang/cz_mail_user.lng | 2 +
.../web/mail/lib/lang/cz_mail_user_filter.lng | 2 +
.../lib/lang/cz_mail_user_filter_list.lng | 2 +
.../web/mail/lib/lang/cz_mail_user_list.lng | 2 +
.../mail/lib/lang/cz_mail_user_stats_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_blacklist.lng | 2 +
.../lib/lang/cz_spamfilter_blacklist_list.lng | 2 +
.../mail/lib/lang/cz_spamfilter_config.lng | 2 +
.../lib/lang/cz_spamfilter_config_list.lng | 2 +
.../mail/lib/lang/cz_spamfilter_policy.lng | 2 +
.../lib/lang/cz_spamfilter_policy_list.lng | 2 +
.../web/mail/lib/lang/cz_spamfilter_users.lng | 2 +
.../lib/lang/cz_spamfilter_users_list.lng | 2 +
.../mail/lib/lang/cz_spamfilter_whitelist.lng | 2 +
.../lib/lang/cz_spamfilter_whitelist_list.lng | 2 +
.../lib/lang/cz_user_quota_stats_list.lng | 2 +
interface/web/mail/lib/lang/pl.lng | 3 +-
interface/web/mail/lib/lang/pl_mail_alias.lng | 3 +-
.../web/mail/lib/lang/pl_mail_alias_list.lng | 1 +
.../web/mail/lib/lang/pl_mail_aliasdomain.lng | 1 +
.../lib/lang/pl_mail_aliasdomain_list.lng | 1 +
.../web/mail/lib/lang/pl_mail_blacklist.lng | 1 +
.../mail/lib/lang/pl_mail_blacklist_list.lng | 1 +
.../mail/lib/lang/pl_mail_content_filter.lng | 1 +
.../lib/lang/pl_mail_content_filter_list.lng | 1 +
.../web/mail/lib/lang/pl_mail_domain.lng | 1 +
.../lib/lang/pl_mail_domain_admin_list.lng | 1 +
.../mail/lib/lang/pl_mail_domain_catchall.lng | 5 +-
.../lib/lang/pl_mail_domain_catchall_list.lng | 1 +
.../web/mail/lib/lang/pl_mail_domain_list.lng | 1 +
.../web/mail/lib/lang/pl_mail_forward.lng | 7 +-
.../mail/lib/lang/pl_mail_forward_list.lng | 1 +
interface/web/mail/lib/lang/pl_mail_get.lng | 3 +-
.../web/mail/lib/lang/pl_mail_get_list.lng | 1 +
.../web/mail/lib/lang/pl_mail_mailinglist.lng | 15 +-
.../lib/lang/pl_mail_mailinglist_list.lng | 1 +
.../mail/lib/lang/pl_mail_relay_recipient.lng | 1 +
.../lib/lang/pl_mail_relay_recipient_list.lng | 1 +
.../web/mail/lib/lang/pl_mail_spamfilter.lng | 1 +
.../mail/lib/lang/pl_mail_spamfilter_list.lng | 1 +
.../web/mail/lib/lang/pl_mail_transport.lng | 1 +
.../mail/lib/lang/pl_mail_transport_list.lng | 1 +
interface/web/mail/lib/lang/pl_mail_user.lng | 15 +-
.../web/mail/lib/lang/pl_mail_user_filter.lng | 1 +
.../lib/lang/pl_mail_user_filter_list.lng | 1 +
.../web/mail/lib/lang/pl_mail_user_list.lng | 1 +
.../mail/lib/lang/pl_mail_user_stats_list.lng | 1 +
.../web/mail/lib/lang/pl_mail_whitelist.lng | 1 +
.../mail/lib/lang/pl_mail_whitelist_list.lng | 1 +
.../mail/lib/lang/pl_spamfilter_blacklist.lng | 1 +
.../lib/lang/pl_spamfilter_blacklist_list.lng | 1 +
.../mail/lib/lang/pl_spamfilter_config.lng | 1 +
.../lib/lang/pl_spamfilter_config_list.lng | 1 +
.../mail/lib/lang/pl_spamfilter_policy.lng | 1 +
.../lib/lang/pl_spamfilter_policy_list.lng | 1 +
.../web/mail/lib/lang/pl_spamfilter_users.lng | 1 +
.../lib/lang/pl_spamfilter_users_list.lng | 1 +
.../mail/lib/lang/pl_spamfilter_whitelist.lng | 1 +
.../lib/lang/pl_spamfilter_whitelist_list.lng | 1 +
.../lib/lang/pl_user_quota_stats_list.lng | 3 +-
.../mail/templates/mail_user_filter_edit.htm | 8 +-
.../mail/templates/mail_user_filter_list.htm | 3 +-
interface/web/mail/user_quota_stats.php | 2 +-
interface/web/mailuser/lib/lang/cz.lng | 2 +
interface/web/mailuser/lib/lang/cz_index.lng | 2 +
.../lib/lang/cz_mail_user_autoresponder.lng | 2 +
.../web/mailuser/lib/lang/cz_mail_user_cc.lng | 2 +
.../mailuser/lib/lang/cz_mail_user_filter.lng | 2 +
.../lib/lang/cz_mail_user_filter_list.lng | 2 +
.../lib/lang/cz_mail_user_password.lng | 2 +
.../lib/lang/cz_mail_user_spamfilter.lng | 2 +
interface/web/mailuser/lib/lang/pl.lng | 13 +-
interface/web/mailuser/lib/lang/pl_index.lng | 17 +-
.../lib/lang/pl_mail_user_autoresponder.lng | 21 +-
.../web/mailuser/lib/lang/pl_mail_user_cc.lng | 11 +-
.../mailuser/lib/lang/pl_mail_user_filter.lng | 1 +
.../lib/lang/pl_mail_user_filter_list.lng | 13 +-
.../lib/lang/pl_mail_user_password.lng | 17 +-
.../lib/lang/pl_mail_user_spamfilter.lng | 11 +-
interface/web/monitor/lib/lang/cz.lng | 24 ++-
.../web/monitor/lib/lang/cz_datalog_list.lng | 2 +
.../web/monitor/lib/lang/cz_syslog_list.lng | 2 +
interface/web/monitor/lib/lang/pl.lng | 5 +-
.../web/monitor/lib/lang/pl_datalog_list.lng | 1 +
.../web/monitor/lib/lang/pl_syslog_list.lng | 1 +
interface/web/sites/ajax_get_json.php | 14 +-
.../web/sites/aps_installedpackages_list.php | 6 +-
interface/web/sites/database_edit.php | 26 +++
interface/web/sites/form/web_domain.tform.php | 3 +
.../sites/form/web_vhost_subdomain.tform.php | 8 +-
interface/web/sites/lib/lang/ar_aps.lng | 1 +
.../lib/lang/ar_aps_update_packagelist.lng | 2 +-
interface/web/sites/lib/lang/bg_aps.lng | 1 +
.../lib/lang/bg_aps_update_packagelist.lng | 2 +-
interface/web/sites/lib/lang/br_aps.lng | 1 +
.../lib/lang/br_aps_update_packagelist.lng | 2 +-
interface/web/sites/lib/lang/cz.lng | 2 +
interface/web/sites/lib/lang/cz_aps.lng | 3 +
.../sites/lib/lang/cz_aps_instances_list.lng | 2 +
.../sites/lib/lang/cz_aps_packages_list.lng | 2 +
.../lib/lang/cz_aps_update_packagelist.lng | 4 +-
interface/web/sites/lib/lang/cz_cron.lng | 2 +
interface/web/sites/lib/lang/cz_cron_list.lng | 2 +
interface/web/sites/lib/lang/cz_database.lng | 2 +
.../sites/lib/lang/cz_database_admin_list.lng | 2 +
.../web/sites/lib/lang/cz_database_list.lng | 2 +
.../web/sites/lib/lang/cz_database_user.lng | 2 +
.../lib/lang/cz_database_user_admin_list.lng | 2 +
.../sites/lib/lang/cz_database_user_list.lng | 2 +
interface/web/sites/lib/lang/cz_ftp_user.lng | 2 +
.../web/sites/lib/lang/cz_ftp_user_list.lng | 2 +
.../web/sites/lib/lang/cz_shell_user.lng | 2 +
.../web/sites/lib/lang/cz_shell_user_list.lng | 2 +
.../lib/lang/cz_user_quota_stats_list.lng | 2 +
.../web/sites/lib/lang/cz_web_aliasdomain.lng | 14 +-
.../lib/lang/cz_web_aliasdomain_list.lng | 2 +
.../web/sites/lib/lang/cz_web_backup_list.lng | 2 +
.../web/sites/lib/lang/cz_web_domain.lng | 2 +
.../lib/lang/cz_web_domain_admin_list.lng | 2 +
.../web/sites/lib/lang/cz_web_domain_list.lng | 2 +
.../web/sites/lib/lang/cz_web_folder.lng | 2 +
.../web/sites/lib/lang/cz_web_folder_list.lng | 2 +
.../web/sites/lib/lang/cz_web_folder_user.lng | 2 +
.../lib/lang/cz_web_folder_user_list.lng | 2 +
.../lib/lang/cz_web_sites_stats_list.lng | 2 +
.../web/sites/lib/lang/cz_web_subdomain.lng | 2 +
.../sites/lib/lang/cz_web_subdomain_list.lng | 2 +
.../sites/lib/lang/cz_web_vhost_subdomain.lng | 8 +-
.../lib/lang/cz_web_vhost_subdomain_list.lng | 2 +
.../web/sites/lib/lang/cz_webdav_user.lng | 2 +
.../sites/lib/lang/cz_webdav_user_list.lng | 2 +
interface/web/sites/lib/lang/de_aps.lng | 2 +-
interface/web/sites/lib/lang/el_aps.lng | 1 +
.../lib/lang/el_aps_update_packagelist.lng | 2 +-
.../web/sites/lib/lang/en_web_domain.lng | 1 +
interface/web/sites/lib/lang/es_aps.lng | 1 +
.../lib/lang/es_aps_update_packagelist.lng | 2 +-
interface/web/sites/lib/lang/fi_aps.lng | 1 +
.../lib/lang/fi_aps_update_packagelist.lng | 2 +-
interface/web/sites/lib/lang/fr_aps.lng | 1 +
.../lib/lang/fr_aps_update_packagelist.lng | 2 +-
interface/web/sites/lib/lang/hr_aps.lng | 1 +
.../lib/lang/hr_aps_update_packagelist.lng | 2 +-
interface/web/sites/lib/lang/hu_aps.lng | 1 +
.../lib/lang/hu_aps_update_packagelist.lng | 2 +-
interface/web/sites/lib/lang/id_aps.lng | 1 +
.../lib/lang/id_aps_update_packagelist.lng | 2 +-
interface/web/sites/lib/lang/it_aps.lng | 1 +
.../lib/lang/it_aps_update_packagelist.lng | 2 +-
interface/web/sites/lib/lang/ja_aps.lng | 1 +
interface/web/sites/lib/lang/nl_aps.lng | 1 +
.../lib/lang/nl_aps_update_packagelist.lng | 2 +-
interface/web/sites/lib/lang/pl.lng | 55 ++---
interface/web/sites/lib/lang/pl_aps.lng | 112 +++++-----
.../sites/lib/lang/pl_aps_instances_list.lng | 21 +-
.../sites/lib/lang/pl_aps_packages_list.lng | 13 +-
.../lib/lang/pl_aps_update_packagelist.lng | 10 +-
interface/web/sites/lib/lang/pl_cron.lng | 1 +
interface/web/sites/lib/lang/pl_cron_list.lng | 1 +
interface/web/sites/lib/lang/pl_database.lng | 43 ++--
.../sites/lib/lang/pl_database_admin_list.lng | 1 +
.../web/sites/lib/lang/pl_database_list.lng | 1 +
.../web/sites/lib/lang/pl_database_user.lng | 1 +
.../lib/lang/pl_database_user_admin_list.lng | 1 +
.../sites/lib/lang/pl_database_user_list.lng | 1 +
interface/web/sites/lib/lang/pl_ftp_user.lng | 13 +-
.../web/sites/lib/lang/pl_ftp_user_list.lng | 1 +
.../web/sites/lib/lang/pl_shell_user.lng | 13 +-
.../web/sites/lib/lang/pl_shell_user_list.lng | 1 +
.../lib/lang/pl_user_quota_stats_list.lng | 3 +-
.../web/sites/lib/lang/pl_web_aliasdomain.lng | 193 ++++++++---------
.../lib/lang/pl_web_aliasdomain_list.lng | 1 +
.../web/sites/lib/lang/pl_web_backup_list.lng | 27 +--
.../web/sites/lib/lang/pl_web_domain.lng | 73 +++----
.../lib/lang/pl_web_domain_admin_list.lng | 1 +
.../web/sites/lib/lang/pl_web_domain_list.lng | 1 +
.../web/sites/lib/lang/pl_web_folder.lng | 1 +
.../web/sites/lib/lang/pl_web_folder_list.lng | 1 +
.../web/sites/lib/lang/pl_web_folder_user.lng | 11 +-
.../lib/lang/pl_web_folder_user_list.lng | 1 +
.../lib/lang/pl_web_sites_stats_list.lng | 3 +-
.../web/sites/lib/lang/pl_web_subdomain.lng | 9 +-
.../sites/lib/lang/pl_web_subdomain_list.lng | 1 +
.../sites/lib/lang/pl_web_vhost_subdomain.lng | 199 +++++++++---------
.../lib/lang/pl_web_vhost_subdomain_list.lng | 1 +
.../web/sites/lib/lang/pl_webdav_user.lng | 13 +-
.../sites/lib/lang/pl_webdav_user_list.lng | 1 +
interface/web/sites/lib/lang/pt_aps.lng | 1 +
.../lib/lang/pt_aps_update_packagelist.lng | 2 +-
interface/web/sites/lib/lang/ro_aps.lng | 1 +
.../lib/lang/ro_aps_update_packagelist.lng | 2 +-
interface/web/sites/lib/lang/ru_aps.lng | 1 +
.../lib/lang/ru_aps_update_packagelist.lng | 2 +-
interface/web/sites/lib/lang/se_aps.lng | 1 +
.../lib/lang/se_aps_update_packagelist.lng | 2 +-
interface/web/sites/lib/lang/sk_aps.lng | 1 +
.../lib/lang/sk_aps_update_packagelist.lng | 2 +-
interface/web/sites/lib/lang/tr_aps.lng | 1 +
.../lib/lang/tr_aps_update_packagelist.lng | 2 +-
.../sites/templates/aps_install_package.htm | 4 +-
.../templates/web_vhost_subdomain_edit.htm | 4 -
interface/web/sites/web_domain_edit.php | 26 +--
.../web/sites/web_vhost_subdomain_edit.php | 42 +---
.../lib/lang/cz_strengthmeter.lng | 2 +
.../lib/lang/pl_strengthmeter.lng | 1 +
interface/web/themes/default/css/styles.css | 2 +
.../tools/form/interface_settings.tform.php | 4 +-
interface/web/tools/import_vpopmail.php | 2 +-
interface/web/tools/lib/lang/cz.lng | 2 +
.../tools/lib/lang/cz_import_ispconfig.lng | 2 +
interface/web/tools/lib/lang/cz_index.lng | 2 +
interface/web/tools/lib/lang/cz_interface.lng | 2 +
interface/web/tools/lib/lang/cz_resync.lng | 2 +
.../web/tools/lib/lang/cz_tpl_default.lng | 2 +
.../web/tools/lib/lang/cz_usersettings.lng | 2 +
.../web/tools/lib/lang/en_import_vpopmail.lng | 2 +-
interface/web/tools/lib/lang/pl.lng | 9 +-
.../tools/lib/lang/pl_import_ispconfig.lng | 43 ++--
interface/web/tools/lib/lang/pl_index.lng | 5 +-
interface/web/tools/lib/lang/pl_interface.lng | 11 +-
interface/web/tools/lib/lang/pl_resync.lng | 21 +-
.../web/tools/lib/lang/pl_tpl_default.lng | 11 +-
.../web/tools/lib/lang/pl_usersettings.lng | 9 +-
interface/web/tools/lib/module.conf.php | 2 +-
.../web/tools/templates/import_vpopmail.htm | 2 +-
interface/web/vm/lib/lang/cz.lng | 2 +
.../web/vm/lib/lang/cz_openvz_action.lng | 2 +
interface/web/vm/lib/lang/cz_openvz_ip.lng | 2 +
.../web/vm/lib/lang/cz_openvz_ip_list.lng | 2 +
.../web/vm/lib/lang/cz_openvz_ostemplate.lng | 2 +
.../vm/lib/lang/cz_openvz_ostemplate_list.lng | 2 +
.../web/vm/lib/lang/cz_openvz_template.lng | 2 +
.../vm/lib/lang/cz_openvz_template_list.lng | 2 +
interface/web/vm/lib/lang/cz_openvz_vm.lng | 2 +
.../web/vm/lib/lang/cz_openvz_vm_list.lng | 2 +
interface/web/vm/lib/lang/pl.lng | 1 +
.../web/vm/lib/lang/pl_openvz_action.lng | 1 +
interface/web/vm/lib/lang/pl_openvz_ip.lng | 1 +
.../web/vm/lib/lang/pl_openvz_ip_list.lng | 9 +-
.../web/vm/lib/lang/pl_openvz_ostemplate.lng | 1 +
.../vm/lib/lang/pl_openvz_ostemplate_list.lng | 1 +
.../web/vm/lib/lang/pl_openvz_template.lng | 1 +
.../vm/lib/lang/pl_openvz_template_list.lng | 1 +
interface/web/vm/lib/lang/pl_openvz_vm.lng | 1 +
.../web/vm/lib/lang/pl_openvz_vm_list.lng | 1 +
interface/web/vm/list/openvz_vm.list.php | 2 +-
interface/web/vm/openvz_vm_list.php | 2 +-
server/conf/apache_ispconfig.conf.master | 2 +
server/conf/nginx_apps.vhost.master | 2 +-
server/conf/vhost.conf.master | 12 +-
server/lib/classes/aps_installer.inc.php | 12 +-
server/lib/classes/db_mysql.inc.php | 15 +-
server/lib/classes/plugins.inc.php | 2 +-
server/lib/classes/system.inc.php | 3 +-
.../plugins-available/apache2_plugin.inc.php | 76 ++++---
.../apps_vhost_plugin.inc.php | 20 +-
.../plugins-available/backup_plugin.inc.php | 6 +-
.../plugins-available/bind_dlz_plugin.inc.php | 52 ++---
server/plugins-available/bind_plugin.inc.php | 4 +-
.../ftpuser_base_plugin.inc.php | 8 +-
.../maildeliver_plugin.inc.php | 13 +-
.../mysql_clientdb_plugin.inc.php | 171 +++++++++++++--
server/plugins-available/nginx_plugin.inc.php | 16 +-
.../postfix_server_plugin.inc.php | 16 +-
.../webserver_plugin.inc.php | 2 +-
server/server.php | 4 +-
634 files changed, 2539 insertions(+), 1395 deletions(-)
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 05e86f61c3..6993782181 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -1024,7 +1024,7 @@ class installer_dist extends installer_base {
//copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
//* and create the symlink
- if($this->is_update == false) {
+ //if($this->is_update == false) {
if(@is_link("$vhost_conf_enabled_dir/ispconfig.vhost")) unlink("$vhost_conf_enabled_dir/ispconfig.vhost");
if(!@is_link("$vhost_conf_enabled_dir/000-ispconfig.vhost")) {
exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/000-ispconfig.vhost");
@@ -1039,17 +1039,17 @@ class installer_dist extends installer_base {
replaceLine('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter','PHPRC=','PHPRC=/etc/',0,0);
*/
- if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
+ //if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
$content = rf('tpl/apache_ispconfig_fcgi_starter.master');
$content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content);
$content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content);
- exec('mkdir -p /var/www/php-fcgi-scripts/ispconfig');
+ if(!is_dir('/var/www/php-fcgi-scripts/ispconfig')) exec('mkdir -p /var/www/php-fcgi-scripts/ispconfig');
wf('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter', $content);
exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
- exec('ln -s /usr/local/ispconfig/interface/web /var/www/ispconfig');
+ if(!is_link('/var/www/ispconfig')) exec('ln -s /usr/local/ispconfig/interface/web /var/www/ispconfig');
exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig');
- }
- }
+ //}
+ //}
}
if($conf['nginx']['installed'] == true && $this->install_ispconfig_interface == true){
@@ -1228,7 +1228,7 @@ class installer_dist extends installer_base {
$existing_cron_jobs = file('crontab.txt');
$cron_jobs = array(
- '*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /var/log/ispconfig/cron.log'
+ '*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /dev/null'
);
// remove existing ispconfig cronjobs, in case the syntax has changed
@@ -1247,7 +1247,7 @@ class installer_dist extends installer_base {
}
exec('touch /var/log/ispconfig/cron.log');
- exec('chmod 666 /var/log/ispconfig/cron.log');
+ exec('chmod 660 /var/log/ispconfig/cron.log');
}
}
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
index 4600093bac..bc6b4993dc 100644
--- a/install/dist/lib/gentoo.lib.php
+++ b/install/dist/lib/gentoo.lib.php
@@ -610,8 +610,8 @@ class installer extends installer_base
$this->write_config_file("$vhost_conf_dir/apps.vhost", $content);
- if ( !is_file($conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter') )
- {
+ //if ( !is_file($conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter') )
+ //{
$content = rf('tpl/apache_apps_fcgi_starter.master');
$content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content);
$content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content);
@@ -621,7 +621,7 @@ class installer extends installer_base
exec('chmod +x '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter');
exec('chown -R ispapps:ispapps '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps');
- }
+ //}
}
if($conf['nginx']['installed'] == true){
$apps_vhost_user = escapeshellcmd($conf['web']['apps_vhost_user']);
@@ -946,11 +946,11 @@ class installer extends installer_base
$content = rf('tpl/apache_ispconfig_fcgi_starter.master');
$content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content);
$content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content);
- mkdir('/var/www/php-fcgi-scripts/ispconfig', 0755, true);
+ @mkdir('/var/www/php-fcgi-scripts/ispconfig', 0755, true);
wf('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter', $content);
exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
chmod('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter', 0755);
- symlink($install_dir.'/interface/web','/var/www/ispconfig');
+ @symlink($install_dir.'/interface/web','/var/www/ispconfig');
exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig');
}
}
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index 78ddf5e920..0a16f483aa 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -1078,7 +1078,7 @@ class installer_dist extends installer_base {
wf("$vhost_conf_dir/ispconfig.vhost", $content);
- if(!is_file('/srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
+ //if(!is_file('/srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
$content = rf('tpl/apache_ispconfig_fcgi_starter.master');
$content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content);
$content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content);
@@ -1088,7 +1088,7 @@ class installer_dist extends installer_base {
exec('ln -s /usr/local/ispconfig/interface/web /srv/www/ispconfig');
exec('chown -R ispconfig:ispconfig /srv/www/php-fcgi-scripts/ispconfig');
- }
+ //}
//copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
//* and create the symlink
@@ -1280,7 +1280,7 @@ class installer_dist extends installer_base {
$existing_cron_jobs = file('crontab.txt');
$cron_jobs = array(
- '*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /var/log/ispconfig/cron.log'
+ '*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /dev/null'
);
// remove existing ispconfig cronjobs, in case the syntax has changed
@@ -1299,7 +1299,7 @@ class installer_dist extends installer_base {
}
exec('touch /var/log/ispconfig/cron.log');
- exec('chmod 666 /var/log/ispconfig/cron.log');
+ exec('chmod 660 /var/log/ispconfig/cron.log');
}
}
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index d4ab51b487..c7b4ae77ca 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -567,23 +567,6 @@ class installer_base {
}
}
}
-
- $config_dir = $conf['mailman']['config_dir'].'/';
- $full_file_name = $config_dir.'virtual_to_transport.sh';
-
- //* Backup exiting virtual_to_transport.sh script
- if(is_file($full_file_name)) {
- copy($full_file_name, $config_dir.'virtual_to_transport.sh~');
- }
-
- copy('tpl/mailman-virtual_to_transport.sh',$full_file_name);
- chgrp($full_file_name,'list');
- chmod($full_file_name,0750);
-
- if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman');
- exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');
-
- exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
$virtual_domains = '';
if($status == 'update')
@@ -608,8 +591,27 @@ class installer_base {
if(!isset($old_options['DEFAULT_SERVER_LANGUAGE'])) $old_options['DEFAULT_SERVER_LANGUAGE'] = '';
$content = str_replace('{default_language}', $old_options['DEFAULT_SERVER_LANGUAGE'], $content);
$content = str_replace('{virtual_domains}', $virtual_domains, $content);
-
+
wf($full_file_name, $content);
+
+ //* Write virtual_to_transport.sh script
+ $config_dir = $conf['mailman']['config_dir'].'/';
+ $full_file_name = $config_dir.'virtual_to_transport.sh';
+
+ //* Backup exiting virtual_to_transport.sh script
+ if(is_file($full_file_name)) {
+ copy($full_file_name, $config_dir.'virtual_to_transport.sh~');
+ }
+
+ if(is_dir('/etc/mailman')) {
+ copy('tpl/mailman-virtual_to_transport.sh',$full_file_name);
+ chgrp($full_file_name,'list');
+ chmod($full_file_name,0750);
+ }
+
+ //* Create aliasaes
+ exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
+
}
public function configure_postfix($options = '') {
@@ -732,11 +734,13 @@ class installer_base {
touch($config_dir.'/body_checks');
//* Create the mailman files
- exec('mkdir -p /var/lib/mailman/data');
+ if(!is_dir('/var/lib/mailman/data')) exec('mkdir -p /var/lib/mailman/data');
if(!is_file('/var/lib/mailman/data/aliases')) touch('/var/lib/mailman/data/aliases');
exec('postalias /var/lib/mailman/data/aliases');
if(!is_file('/var/lib/mailman/data/virtual-mailman')) touch('/var/lib/mailman/data/virtual-mailman');
exec('postmap /var/lib/mailman/data/virtual-mailman');
+ if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman');
+ exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');
//* Make a backup copy of the main.cf file
copy($config_dir.'/main.cf', $config_dir.'/main.cf~');
@@ -1921,16 +1925,16 @@ class installer_base {
symlink($vhost_conf_dir.'/ispconfig.vhost',$vhost_conf_enabled_dir.'/000-ispconfig.vhost');
}
}
- if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
+ //if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
$content = rf('tpl/apache_ispconfig_fcgi_starter.master');
$content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content);
$content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content);
- mkdir('/var/www/php-fcgi-scripts/ispconfig', 0755, true);
+ @mkdir('/var/www/php-fcgi-scripts/ispconfig', 0755, true);
wf('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter', $content);
exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
- symlink($install_dir.'/interface/web','/var/www/ispconfig');
+ @symlink($install_dir.'/interface/web','/var/www/ispconfig');
exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig');
- }
+ //}
}
if($conf['nginx']['installed'] == true && $this->install_ispconfig_interface == true){
@@ -2116,7 +2120,7 @@ class installer_base {
$existing_cron_jobs = file('crontab.txt');
$cron_jobs = array(
- '*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> '.$conf['ispconfig_log_dir'].'/cron.log'
+ '*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /dev/null'
);
// remove existing ispconfig cronjobs, in case the syntax has changed
@@ -2135,7 +2139,7 @@ class installer_base {
}
touch($conf['ispconfig_log_dir'].'/cron.log');
- chmod($conf['ispconfig_log_dir'].'/cron.log', 0666);
+ chmod($conf['ispconfig_log_dir'].'/cron.log', 0660);
}
diff --git a/install/sql/incremental/upd_0035.sql b/install/sql/incremental/upd_0035.sql
index b2f85163bc..5f8031c514 100644
--- a/install/sql/incremental/upd_0035.sql
+++ b/install/sql/incremental/upd_0035.sql
@@ -20,6 +20,6 @@ INSERT INTO `sys_theme` (`var_id`, `tpl_name`, `username`, `logo_url`) VALUES (N
-- --------------------------------------------------------
ALTER TABLE `web_domain` ADD `ssl_key` MEDIUMTEXT NOT NULL AFTER `ssl_bundle`;
-ALTER TABLE `mail_user` ADD `disabledoveadm` enum('n','y') NOT NULL default 'n' AFTER `disablelda`
+ALTER TABLE `mail_user` ADD `disabledoveadm` enum('n','y') NOT NULL default 'n' AFTER `disablelda`;
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 828fcf3d46..6849418823 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -296,7 +296,7 @@ CREATE TABLE `client_template` (
`limit_shell_user` int(11) NOT NULL default '0',
`ssh_chroot` varchar(255) NOT NULL DEFAULT 'no',
`limit_webdav_user` int(11) NOT NULL default '0',
- `limit_aps` int(11) NOT NULL DEFAULT '0',
+ `limit_aps` int(11) NOT NULL DEFAULT '-1',
`limit_dns_zone` int(11) NOT NULL default '-1',
`limit_dns_slave_zone` int(11) NOT NULL default '-1',
`limit_dns_record` int(11) NOT NULL default '-1',
@@ -2169,6 +2169,6 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`,
-- Dumping data for table `sys_config`
--
-INSERT INTO sys_config VALUES ('1','db','db_version','3.0.5');
+INSERT INTO sys_config VALUES ('1','db','db_version','3.0.5.1');
SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file
diff --git a/install/tpl/apache_ispconfig.conf.master b/install/tpl/apache_ispconfig.conf.master
index aaa9e0dd94..f5b2a91d8e 100644
--- a/install/tpl/apache_ispconfig.conf.master
+++ b/install/tpl/apache_ispconfig.conf.master
@@ -50,3 +50,5 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
Alias /awstats-icon "/usr/share/awstats/icon"
+NameVirtualHost *:80
+NameVirtualHost *:443
\ No newline at end of file
diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master
index 0385427a6d..4410b8533d 100644
--- a/install/tpl/apache_ispconfig.vhost.master
+++ b/install/tpl/apache_ispconfig.vhost.master
@@ -28,18 +28,19 @@ NameVirtualHost *:{vhost_port}
IPCCommTimeout 7200
</IfModule>
-# <IfModule mod_php5.c>
-# DocumentRoot /usr/local/ispconfig/interface/web/
-# AddType application/x-httpd-php .php
-# <Directory /usr/local/ispconfig/interface/web>
-# # php_admin_value open_basedir "/usr/local/ispconfig/interface:/usr/share:/tmp"
-# Options FollowSymLinks
-# AllowOverride None
-# Order allow,deny
-# Allow from all
-# php_value magic_quotes_gpc 0
-# </Directory>
-# </IfModule>
+ <IfModule mpm_itk_module>
+ DocumentRoot /usr/local/ispconfig/interface/web/
+ AssignUserId ispconfig ispconfig
+ AddType application/x-httpd-php .php
+ <Directory /usr/local/ispconfig/interface/web>
+ # php_admin_value open_basedir "/usr/local/ispconfig/interface:/usr/share:/tmp"
+ Options FollowSymLinks
+ AllowOverride None
+ Order allow,deny
+ Allow from all
+ php_value magic_quotes_gpc 0
+ </Directory>
+ </IfModule>
# ErrorLog /var/log/apache2/error.log
# CustomLog /var/log/apache2/access.log combined
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index de512a4a0c..2af243d92d 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -1,6 +1,6 @@
<?php
/*
-Copyright (c) 2007 - 2012, Till Brehm, projektfarm Gmbh
+Copyright (c) 2007 - 2013, Till Brehm, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -56,7 +56,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision);
//** Application
define('ISPC_APP_TITLE', 'ISPConfig');
-define('ISPC_APP_VERSION', '3.0.5');
+define('ISPC_APP_VERSION', '3.0.5.1');
define('DEVSYSTEM', 0);
diff --git a/install/tpl/nginx_apps.vhost.master b/install/tpl/nginx_apps.vhost.master
index fc3f0870ec..9f8ae8806d 100644
--- a/install/tpl/nginx_apps.vhost.master
+++ b/install/tpl/nginx_apps.vhost.master
@@ -46,7 +46,7 @@ server {
fastcgi_pass unix:{fpm_socket};
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
- fastcgi_param PATH_INFO $fastcgi_script_name;
+ #fastcgi_param PATH_INFO $fastcgi_script_name;
fastcgi_buffer_size 128k;
fastcgi_buffers 256 4k;
fastcgi_busy_buffers_size 256k;
diff --git a/install/tpl/nginx_ispconfig.vhost.master b/install/tpl/nginx_ispconfig.vhost.master
index 74372f6a02..931bc61626 100644
--- a/install/tpl/nginx_ispconfig.vhost.master
+++ b/install/tpl/nginx_ispconfig.vhost.master
@@ -28,7 +28,7 @@ server {
fastcgi_pass unix:{fpm_socket};
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
- fastcgi_param PATH_INFO $fastcgi_script_name;
+ #fastcgi_param PATH_INFO $fastcgi_script_name;
fastcgi_buffer_size 128k;
fastcgi_buffers 256 4k;
fastcgi_busy_buffers_size 256k;
diff --git a/install/update.php b/install/update.php
index cc2d17516d..b7753dc7e7 100644
--- a/install/update.php
+++ b/install/update.php
@@ -129,7 +129,7 @@ $do_backup = $inst->simple_query('Shall the script create a ISPConfig backup in
if($do_backup == 'yes') {
//* Create the backup directory
- $backup_path = '/var/backup/ispconfig_'.date('Y-m-d_H-i');
+ $backup_path = '/var/backup/ispconfig_'.@date('Y-m-d_H-i');
$conf['backup_path'] = $backup_path;
exec("mkdir -p $backup_path");
exec("chown root:root $backup_path");
diff --git a/interface/lib/classes/aps_guicontroller.inc.php b/interface/lib/classes/aps_guicontroller.inc.php
index 2185717a95..d8e641d9ab 100644
--- a/interface/lib/classes/aps_guicontroller.inc.php
+++ b/interface/lib/classes/aps_guicontroller.inc.php
@@ -728,6 +728,9 @@ class ApsGUIController extends ApsBase
// Using parse_url() to filter malformed URLs
$path = dirname(parse_url($_SERVER['PHP_SELF'], PHP_URL_PATH)).'/'.
basename($this->interface_pkg_dir).'/'.$pkg['path'].'/'.basename((string)$icon);
+ // nginx: if $_SERVER['PHP_SELF'] is doubled, remove /sites/aps_packagedetails_show.php from beginning of path
+ $path = preg_replace('@^/sites/aps_packagedetails_show.php(.*)@', '$1', $path);
+
$pkg['Icon'] = $path;
}
else $pkg['Icon'] = '';
@@ -741,6 +744,8 @@ class ApsGUIController extends ApsBase
// Using parse_url() to filter malformed URLs
$path = dirname(parse_url($_SERVER['PHP_SELF'], PHP_URL_PATH)).'/'.
basename($this->interface_pkg_dir).'/'.$pkg['path'].'/'.basename((string)$screen['path']);
+ // nginx: if $_SERVER['PHP_SELF'] is doubled, remove /sites/aps_packagedetails_show.php from beginning of path
+ $path = preg_replace('@^/sites/aps_packagedetails_show.php(.*)@', '$1', $path);
$pkg['Screenshots'][] = array('ScreenPath' => $path,
'ScreenDescription' => htmlspecialchars(trim((string)$screen->description)));
@@ -838,4 +843,4 @@ class ApsGUIController extends ApsBase
return $pkg;
}
}
-?>
\ No newline at end of file
+?>
diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php
index 01eae1bd5c..46729988e6 100644
--- a/interface/lib/classes/db_mysql.inc.php
+++ b/interface/lib/classes/db_mysql.inc.php
@@ -44,7 +44,7 @@ class db extends mysqli
private $errorNumber = 0; // last error number
public $errorMessage = ''; // last error message
private $errorLocation = '';// last error location
- public $show_error_messages = true; // false in server, true in interface
+ public $show_error_messages = false; // false in server, true in interface
private $isConnected = false; // needed to know if we have a valid mysqli object from the constructor
// constructor
@@ -60,7 +60,8 @@ class db extends mysqli
$this->dbClientFlags = $conf[$prefix.'db_client_flags'];
parent::__construct($conf[$prefix.'db_host'], $conf[$prefix.'db_user'],$conf[$prefix.'db_password'],$conf[$prefix.'db_database']);
$try = 0;
- while(!is_null($this->connect_error) && $try < 5) {
+ //while(!is_null($this->connect_error) && $try < 5) {
+ while(mysqli_connect_error() && $try < 5) {
if($try > 0) sleep(1);
$try++;
@@ -69,7 +70,9 @@ class db extends mysqli
parent::__construct($conf[$prefix.'db_host'], $conf[$prefix.'db_user'],$conf[$prefix.'db_password'],$conf[$prefix.'db_database']);
}
- if(is_null($this->connect_error)) $this->isConnected = true;
+ //if(is_null($this->connect_error)) $this->isConnected = true;
+ //else return false;
+ if(!mysqli_connect_error()) $this->isConnected = true;
else return false;
$this->setCharacterEncoding();
@@ -81,8 +84,9 @@ class db extends mysqli
// error handler
public function updateError($location) {
- global $app;
+ global $app, $conf;
+ /*
if(!is_null($this->connect_error)) {
$this->errorNumber = $this->connect_errno;
$this->errorMessage = $this->connect_error;
@@ -90,15 +94,24 @@ class db extends mysqli
$this->errorNumber = $this->errno;
$this->errorMessage = $this->error;
}
+ */
+ if(mysqli_connect_error()) {
+ $this->errorNumber = mysqli_connect_errno();
+ $this->errorMessage = mysqli_connect_error();
+ } else {
+ $this->errorNumber = mysqli_errno($this);
+ $this->errorMessage = mysqli_error($this);
+ }
+
$this->errorLocation = $location;
if($this->errorNumber) {
$error_msg = $this->errorLocation .' '. $this->errorMessage;
- // This right here will allow us to use the samefile for server & interface
- if($this->show_error_messages) {
- echo $error_msg;
+ // This right here will allow us to use the same file for server & interface
+ if($this->show_error_messages && $conf['demo_mode'] === false) {
+ echo $error_msg;
} else if(is_object($app) && method_exists($app, 'log')) {
- $app->log($error_msg, LOGLEVEL_WARN);
+ $app->log($error_msg, LOGLEVEL_WARN);
}
}
}
@@ -110,7 +123,8 @@ class db extends mysqli
}
public function query($queryString) {
- if($this->isConnected == false) return false;
+ global $conf;
+ if($this->isConnected == false) return false;
$try = 0;
do {
$try++;
@@ -131,7 +145,7 @@ class db extends mysqli
} while($ok == false);
$this->queryId = parent::query($queryString);
$this->updateError('DB::query('.$queryString.') -> mysqli_query');
- if($this->errorNumber) debug_print_backtrace();
+ if($this->errorNumber && $conf['demo_mode'] === false) debug_print_backtrace();
if(!$this->queryId) {
return false;
}
@@ -176,11 +190,11 @@ class db extends mysqli
// returns number of rows returned by the last select query
public function numRows() {
- return $this->queryId->num_rows;
+ return intval($this->queryId->num_rows);
}
public function affectedRows() {
- return $this->queryId->affected_rows;
+ return intval($this->queryId->affected_rows);
}
// returns mySQL insert id
diff --git a/interface/lib/classes/listform_actions.inc.php b/interface/lib/classes/listform_actions.inc.php
index ed689ebda7..aef3371dd1 100644
--- a/interface/lib/classes/listform_actions.inc.php
+++ b/interface/lib/classes/listform_actions.inc.php
@@ -149,7 +149,7 @@ class listform_actions {
if($this->SQLExtWhere != '') {
$sql_where .= ' '.$this->SQLExtWhere.' and';
}
-
+
$sql_where = $app->listform->getSearchSQL($sql_where);
$app->tpl->setVar($app->listform->searchValues);
@@ -171,8 +171,15 @@ class listform_actions {
$order_by_sql = str_replace('client_id','c.contact_name',$order_by_sql);
} elseif($order == 'parent_domain_id'){
$join .= ' LEFT JOIN web_domain as wd ON '.$app->listform->listDef['table'].'.parent_domain_id = wd.domain_id ';
- $order_by_sql = str_replace('parent_domain_id','wd.domain',$order_by_sql);
- $sql_where = str_replace('type',$app->listform->listDef['table'].'.type',$sql_where);
+ //$order_by_sql = str_replace(' domain', ' '.$app->listform->listDef['table'].'.domain',$order_by_sql);
+ //$order_by_sql = str_replace('parent_domain_id','wd.domain',$order_by_sql);
+ $order_by_sql = preg_replace('@( |,|^)(domain)( |,|$)@', '$1'.$app->listform->listDef['table'].'.$2$3', $order_by_sql);
+ $order_by_sql = preg_replace('@( |,|^)(parent_domain_id)( |,|$)@', '$1wd.domain$3', $order_by_sql);
+
+ //$sql_where = str_replace('type',$app->listform->listDef['table'].'.type',$sql_where);
+ //$sql_where = str_replace(' domain',' '.$app->listform->listDef['table'].'.domain',$sql_where);
+ $sql_where = preg_replace('@( |,|^)(type)( |,|$)@', '$1'.$app->listform->listDef['table'].'.$2$3', $sql_where);
+ $sql_where = preg_replace('@( |,|^)(domain)( |,|$)@', '$1'.$app->listform->listDef['table'].'.$2$3', $sql_where);
} elseif($order == 'sys_groupid'){
$join .= ' LEFT JOIN sys_group as sg ON '.$app->listform->listDef['table'].'.sys_groupid = sg.groupid ';
$order_by_sql = str_replace('sys_groupid','sg.name',$order_by_sql);
diff --git a/interface/lib/classes/remoting_lib.inc.php b/interface/lib/classes/remoting_lib.inc.php
index c636518f6e..bcfd619242 100644
--- a/interface/lib/classes/remoting_lib.inc.php
+++ b/interface/lib/classes/remoting_lib.inc.php
@@ -467,7 +467,9 @@ class remoting_lib {
}
break;
case 'UNIQUE':
- if($this->action == 'NEW') {
+ if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n';
+ if($validator['allowempty'] == 'n' || ($validator['allowempty'] == 'y' && $field_value != '')){
+ if($this->action == 'NEW') {
$num_rec = $app->db->queryOneRecord("SELECT count(*) as number FROM ".$escape.$this->formDef['db_table'].$escape. " WHERE $field_name = '".$app->db->quote($field_value)."'");
if($num_rec["number"] > 0) {
$errmsg = $validator['errmsg'];
@@ -477,7 +479,7 @@ class remoting_lib {
$this->errorMessage .= $errmsg."<br />\r\n";
}
}
- } else {
+ } else {
$num_rec = $app->db->queryOneRecord("SELECT count(*) as number FROM ".$escape.$this->formDef['db_table'].$escape. " WHERE $field_name = '".$app->db->quote($field_value)."' AND ".$this->formDef['db_table_idx']." != ".$this->primary_id);
if($num_rec["number"] > 0) {
$errmsg = $validator['errmsg'];
@@ -487,7 +489,8 @@ class remoting_lib {
$this->errorMessage .= $errmsg."<br />\r\n";
}
}
- }
+ }
+ }
break;
case 'NOTEMPTY':
if(empty($field_value)) {
@@ -571,31 +574,44 @@ class remoting_lib {
}
break;
case 'ISIP':
- //* Check if its a IPv4 or IPv6 address
- if(function_exists('filter_var')) {
- if(!filter_var($field_value,FILTER_VALIDATE_IP)) {
- $errmsg = $validator['errmsg'];
- if(isset($this->wordbook[$errmsg])) {
- $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
- } else {
- $this->errorMessage .= $errmsg."<br />\r\n";
- }
- }
+ if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n';
+ if($validator['allowempty'] == 'y' && $field_value == '') {
+ //* Do nothing
} else {
- //* Check content with regex, if we use php < 5.2
- $ip_ok = 0;
- if(preg_match("/^(\:\:([a-f0-9]{1,4}\:){0,6}?[a-f0-9]{0,4}|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){0,6}?\:\:|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){1,6}?\:\:([a-f0-9]{1,4}\:){1,6}?[a-f0-9]{1,4})(\/\d{1,3})?$/i", $field_value)){
- $ip_ok = 1;
- }
- if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){
- $ip_ok = 1;
+ //* Check if its a IPv4 or IPv6 address
+ if(isset($validator['separator']) && $validator['separator'] != '') {
+ //* When the field may contain several IP addresses, split them by the char defined as separator
+ $field_value_array = explode($validator['separator'],$field_value);
+ } else {
+ $field_value_array[] = $field_value;
}
- if($ip_ok == 0) {
- $errmsg = $validator['errmsg'];
- if(isset($this->wordbook[$errmsg])) {
- $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
+ foreach($field_value_array as $field_value) {
+ if(function_exists('filter_var')) {
+ if(!filter_var($field_value,FILTER_VALIDATE_IP)) {
+ $errmsg = $validator['errmsg'];
+ if(isset($this->wordbook[$errmsg])) {
+ $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
+ } else {
+ $this->errorMessage .= $errmsg."<br />\r\n";
+ }
+ }
} else {
- $this->errorMessage .= $errmsg."<br />\r\n";
+ //* Check content with regex, if we use php < 5.2
+ $ip_ok = 0;
+ if(preg_match("/^(\:\:([a-f0-9]{1,4}\:){0,6}?[a-f0-9]{0,4}|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){0,6}?\:\:|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){1,6}?\:\:([a-f0-9]{1,4}\:){1,6}?[a-f0-9]{1,4})(\/\d{1,3})?$/i", $field_value)){
+ $ip_ok = 1;
+ }
+ if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){
+ $ip_ok = 1;
+ }
+ if($ip_ok == 0) {
+ $errmsg = $validator['errmsg'];
+ if(isset($this->wordbook[$errmsg])) {
+ $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
+ } else {
+ $this->errorMessage .= $errmsg."<br />\r\n";
+ }
+ }
}
}
}
@@ -802,18 +818,24 @@ class remoting_lib {
$sql = "SELECT * FROM ".$escape.$this->formDef['db_table'].$escape." WHERE ".$this->formDef['db_table_idx']." = ".$primary_id;
return $app->db->queryOneRecord($sql);
} elseif (@is_array($primary_id)) {
- $sql_where = '';
+ $sql_offset = 0;
+ $sql_limit = 0;
+ $sql_where = '';
foreach($primary_id as $key => $val) {
$key = $app->db->quote($key);
$val = $app->db->quote($val);
- if(stristr($val,'%')) {
+ if($key == '#OFFSET#') $sql_offset = $app->functions->intval($val);
+ elseif($key == '#LIMIT#') $sql_limit = $app->functions->intval($val);
+ elseif(stristr($val,'%')) {
$sql_where .= "$key like '$val' AND ";
} else {
$sql_where .= "$key = '$val' AND ";
}
}
$sql_where = substr($sql_where,0,-5);
+ if($sql_where == '') $sql_where = '1';
$sql = "SELECT * FROM ".$escape.$this->formDef['db_table'].$escape." WHERE ".$sql_where;
+ if($sql_offset >= 0 && $sql_limit > 0) $sql .= ' LIMIT ' . $sql_offset . ',' . $sql_limit;
return $app->db->queryAllRecords($sql);
} else {
$this->errorMessage = 'The ID must be either an integer or an array.';
diff --git a/interface/lib/classes/tools_monitor.inc.php b/interface/lib/classes/tools_monitor.inc.php
index b0b46643ee..121ab931f4 100644
--- a/interface/lib/classes/tools_monitor.inc.php
+++ b/interface/lib/classes/tools_monitor.inc.php
@@ -465,7 +465,7 @@ class tools_monitor {
$html .= '<p>Problem, there are no rules listed for the server</p>';
}
else {
- $html = nl2br($data['output']);
+ $html .= nl2br($data['output']);
}
$html .= '</div></div>';
} else {
diff --git a/interface/lib/classes/validate_domain.inc.php b/interface/lib/classes/validate_domain.inc.php
index 42c9c57a0e..ca137f6c3c 100644
--- a/interface/lib/classes/validate_domain.inc.php
+++ b/interface/lib/classes/validate_domain.inc.php
@@ -137,7 +137,7 @@ class validate_domain {
//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) : ""));
+ $checks = $app->db->queryAllRecords("SELECT * FROM `web_domain` WHERE (`domain` = '" . $app->db->quote($domain_name) . "'".$additional_sql1.") AND `server_id` = ".intval($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){
@@ -207,7 +207,7 @@ class validate_domain {
//$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) : ""));
+ $checks = $app->db->queryAllRecords("SELECT * FROM `web_domain` WHERE (CONCAT(`subdomain`, '.', `domain`) = '" . $app->db->quote($domain_name) . "'".$additional_sql2.") AND `server_id` = ".intval($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;
diff --git a/interface/lib/lang/cz.lng b/interface/lib/lang/cz.lng
index 349b0ea5cf..03e7bd8269 100644
--- a/interface/lib/lang/cz.lng
+++ b/interface/lib/lang/cz.lng
@@ -11,11 +11,11 @@ $wb['number_format_thousands_sep'] = '';
$wb['error_301'] = 'Modul nenà povolen pro souÄasného uživatele.';
$wb['error_302'] = 'Neplatný modul.';
$wb['error_1001'] = 'Uživatelské jméno a heslo nemohou být prázdné !';
-$wb['error_1002'] = 'Uživatelské jméno a/nebo heslo nejsou správné !';
-$wb['error_1003'] = 'Uživatelské jméno je neaktivnÃ!';
-$wb['delete_confirmation'] = 'SkuteÄnÄ› chcete smazat tento záznam?';
-$wb['error_no_view_permission'] = 'Záznam neexistuje nebo nemáte oprávněnà jej zobrazit!';
-$wb['error_no_delete_permission'] = 'Nemáte oprávněnà smazat tento záznam!';
+$wb['error_1002'] = 'Uživatelské jméno nebo heslo nejsou správné !';
+$wb['error_1003'] = 'Uživatelské jméno je neaktivnà !';
+$wb['delete_confirmation'] = 'SkuteÄnÄ› chcete smazat tento záznam ?';
+$wb['error_no_view_permission'] = 'Záznam neexistuje nebo nemáte oprávněnà jej zobrazit !';
+$wb['error_no_delete_permission'] = 'Nemáte oprávněnà smazat tento záznam !';
$wb['page_txt'] = 'Stránka';
$wb['page_of_txt'] = 'z';
$wb['page_and_txt'] = 'a';
@@ -59,8 +59,8 @@ $wb['monthnamesshort_feb'] = 'Úno';
$wb['monthnamesshort_mar'] = 'Bře';
$wb['monthnamesshort_apr'] = 'Dub';
$wb['monthnamesshort_may'] = 'KvÄ›';
-$wb['monthnamesshort_jun'] = 'Jun';
-$wb['monthnamesshort_jul'] = 'Jul';
+$wb['monthnamesshort_jun'] = 'ÄŒer';
+$wb['monthnamesshort_jul'] = 'ÄŒvc';
$wb['monthnamesshort_aug'] = 'Srp';
$wb['monthnamesshort_sep'] = 'Zář';
$wb['monthnamesshort_oct'] = 'ŘÃj';
@@ -100,9 +100,9 @@ $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_spamfilter_users'] = 'Vytvořenà nastavenà spamového filtru';
+$wb['datalog_status_u_spamfilter_users'] = 'Aktualizace nastavenà spamového filtru';
+$wb['datalog_status_d_spamfilter_users'] = 'Odstraněnà nastavenà spamového filtru';
$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';
@@ -130,5 +130,7 @@ $wb['datalog_status_d_web_folder'] = 'Odstraněnà chráněného adresáře hesl
$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';
-$wb['login_as_txt'] = 'Log in as';
+$wb['login_as_txt'] = 'Přihlaste se jako';
?>
+
+
diff --git a/interface/lib/lang/pl.lng b/interface/lib/lang/pl.lng
index 465dcc78aa..5d8ec6f790 100644
--- a/interface/lib/lang/pl.lng
+++ b/interface/lib/lang/pl.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'] = 'Moduł nie jest dostępny dla aktualnego uzytkownika.';
@@ -68,67 +67,69 @@ $wb['monthnamesshort_nov'] = 'Lis';
$wb['monthnamesshort_dec'] = 'Gru';
$wb['datepicker_nextText'] = 'Nast';
$wb['datepicker_prevText'] = 'Poprz';
-$wb['logout_txt'] = 'Logout';
+$wb['logout_txt'] = 'WYLOGUJ';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
-$wb['submit_confirmation'] = 'Do you really want to perform this action?';
-$wb['top_menu_mailuser'] = 'Mailuser';
-$wb['globalsearch_resultslimit_of_txt'] = 'of';
-$wb['globalsearch_resultslimit_results_txt'] = 'results';
-$wb['globalsearch_noresults_text_txt'] = 'No results.';
-$wb['globalsearch_noresults_limit_txt'] = '0 results';
-$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
-$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
-$wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
-$wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.';
-$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
-$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
-$wb['datalog_status_i_web_database'] = 'Create new database';
-$wb['datalog_status_u_web_database'] = 'Update database';
-$wb['datalog_status_d_web_database'] = 'Delete database';
-$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
-$wb['datalog_status_u_web_database_user'] = 'Update database user';
-$wb['datalog_status_d_web_database_user'] = 'Delete database user';
-$wb['datalog_status_i_web_domain'] = 'Create new website';
-$wb['datalog_status_u_web_domain'] = 'Update website settings';
-$wb['datalog_status_d_web_domain'] = 'Delete website';
-$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
-$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
-$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
-$wb['datalog_status_i_mail_domain'] = 'Create email domain';
-$wb['datalog_status_u_mail_domain'] = 'Update email domain';
-$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
-$wb['datalog_status_i_mail_user'] = 'Create email user';
-$wb['datalog_status_u_mail_user'] = 'Update email user';
-$wb['datalog_status_d_mail_user'] = 'Delete email user';
-$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
-$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
-$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
-$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
-$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
-$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
-$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
-$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
-$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
-$wb['datalog_status_i_cron'] = 'Create cron job';
-$wb['datalog_status_u_cron'] = 'Update cron job';
-$wb['datalog_status_d_cron'] = 'Delete cron job';
-$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
-$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
-$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
-$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
-$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
-$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
-$wb['datalog_status_i_shell_user'] = 'Create shell user';
-$wb['datalog_status_u_shell_user'] = 'Update shell user';
-$wb['datalog_status_d_shell_user'] = 'Delete shell user';
-$wb['datalog_status_i_web_folder'] = 'Create folder protection';
-$wb['datalog_status_u_web_folder'] = 'Update folder protection';
-$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
-$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
-$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
-$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
-$wb['datalog_status_i_spamfilter_users'] = 'Create spam filter settings';
-$wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings';
-$wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings';
-$wb['login_as_txt'] = 'Log in as';
+$wb['submit_confirmation'] = 'Czy na pewno chcesz wykonać tę akcję?';
+$wb['number_format_decimals_client'] = '2';
+$wb['top_menu_mailuser'] = 'Użytkownik email';
+$wb['globalsearch_resultslimit_of_txt'] = 'z';
+$wb['globalsearch_resultslimit_results_txt'] = 'wyników';
+$wb['globalsearch_noresults_text_txt'] = 'Brak wyników';
+$wb['globalsearch_noresults_limit_txt'] = '0 wyników';
+$wb['globalsearch_searchfield_watermark_txt'] = 'Szukaj';
+$wb['globalsearch_suggestions_text_txt'] = 'Sugestie';
+$wb['global_tabchange_warning_txt'] = 'Zmienione dane w tej zakładce będą zapisane jeżeli wciśniesz OK.';
+$wb['global_tabchange_discard_txt'] = 'Posiadasz niezapisane zmiany w tej zakładce. Zmiany zostaną porzucone jeżeli przejdziesz dalej.';
+$wb['datalog_changes_txt'] = 'Poniższe zmiany nie zostały jeszcze wprowadzone na wszystkich serwerach:';
+$wb['datalog_changes_end_txt'] = 'Zapisanie zmian może zająć do minuty. Proszę o cierpliwość.';
+$wb['datalog_status_i_web_database'] = 'Utwórz nową bazę danych';
+$wb['datalog_status_u_web_database'] = 'Edytuj bazÄ™';
+$wb['datalog_status_d_web_database'] = 'Usuń bazę';
+$wb['datalog_status_i_web_database_user'] = 'Utwórz użytkownika bazy';
+$wb['datalog_status_u_web_database_user'] = 'Edytuj użytkownika bazy';
+$wb['datalog_status_d_web_database_user'] = 'Usuń użytkownika bazy';
+$wb['datalog_status_i_web_domain'] = 'Utwórz nową stronę';
+$wb['datalog_status_u_web_domain'] = 'Edytuj ustawienia strony';
+$wb['datalog_status_d_web_domain'] = 'Usuń stronę';
+$wb['datalog_status_i_ftp_user'] = 'Utwórz użytkownika FTP';
+$wb['datalog_status_u_ftp_user'] = 'Edytuj użytkownika FTP';
+$wb['datalog_status_d_ftp_user'] = 'Usuń użytkownika FTP';
+$wb['datalog_status_i_mail_domain'] = 'Utwórz domenę e-mail';
+$wb['datalog_status_u_mail_domain'] = 'Edytuj domenÄ™ e-mail';
+$wb['datalog_status_d_mail_domain'] = 'Usuń domenę e-mail';
+$wb['datalog_status_i_mail_user'] = 'Utwórz konto e-mail';
+$wb['datalog_status_u_mail_user'] = 'Edytuj konto e-mail';
+$wb['datalog_status_d_mail_user'] = 'Usuń konto e-mail';
+$wb['datalog_status_i_spamfilter_users'] = 'Utwórz ustawienia filtra antyspamowego';
+$wb['datalog_status_u_spamfilter_users'] = 'Edytu ustawienia filtra antyspamowego';
+$wb['datalog_status_d_spamfilter_users'] = 'Usuń ustawienia filtra antyspamowego';
+$wb['datalog_status_i_mail_forwarding'] = 'Utwórz adres e-mail';
+$wb['datalog_status_u_mail_forwarding'] = 'Edytu adres e-mail';
+$wb['datalog_status_d_mail_forwarding'] = 'Usuń adres e-mail';
+$wb['datalog_status_i_dns_rr'] = 'Utwórz wpis DNS';
+$wb['datalog_status_u_dns_rr'] = 'Edytuj wpis DNS';
+$wb['datalog_status_d_dns_rr'] = 'Usuń wpis DNS';
+$wb['datalog_status_i_dns_soa'] = 'Utwórz strefę DNS';
+$wb['datalog_status_u_dns_soa'] = 'Edytuj strefÄ™ DNS';
+$wb['datalog_status_d_dns_soa'] = 'Usuń strefę DNS';
+$wb['datalog_status_i_cron'] = 'Utwórz zadanie Cron';
+$wb['datalog_status_u_cron'] = 'Edytuj zadanie Cron';
+$wb['datalog_status_d_cron'] = 'Usuń zadanie Cron';
+$wb['datalog_status_i_mail_get'] = 'Utwórz konto mail fetcher';
+$wb['datalog_status_u_mail_get'] = 'Edytuj konto mail fetcher';
+$wb['datalog_status_d_mail_get'] = 'Usuń konto mail fetcher';
+$wb['datalog_status_i_mail_mailinglist'] = 'Utwórz listę mailingową';
+$wb['datalog_status_u_mail_mailinglist'] = 'Edytuj listÄ™ mailingowÄ…';
+$wb['datalog_status_d_mail_mailinglist'] = 'Usuń listę mailingową';
+$wb['datalog_status_i_shell_user'] = 'Utwórz konto shell';
+$wb['datalog_status_u_shell_user'] = 'Edytuj konto shell';
+$wb['datalog_status_d_shell_user'] = 'Usuń konto shell';
+$wb['datalog_status_i_web_folder'] = 'Utwórz zabezpieczenie folderu';
+$wb['datalog_status_u_web_folder'] = 'Edytuj zabezpieczenie folderu';
+$wb['datalog_status_d_web_folder'] = 'Usuń zabezpieczenie folderu';
+$wb['datalog_status_i_web_folder_user'] = 'Utwórz konto dla zabezpieczonego folderu';
+$wb['datalog_status_u_web_folder_user'] = 'Edytuj konto zabezpieczonego folderu';
+$wb['datalog_status_d_web_folder_user'] = 'Usuń konto zabezpieczonego folderu';
+$wb['login_as_txt'] = 'Zaloguj jako';
?>
+
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index 7f7e2b30d6..0f0c38b2e7 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -317,6 +317,10 @@ $form["tabs"]['mail'] = array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'default' => '',
+ 'validators' => array ( 0 => array ( 'type' => 'REGEX',
+ 'regex' => '/^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])(,\s*(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9]))*$/',
+ 'errmsg'=> 'rbl_error_regex'),
+ ),
'value' => '',
'width' => '40',
'maxlength' => '255'
@@ -431,8 +435,6 @@ $form["tabs"]['web'] = array(
'default' => 'n',
'value' => array(0 => 'n',1 => 'y')
),
-
-
*/
'vhost_conf_dir' => array(
'datatype' => 'VARCHAR',
diff --git a/interface/web/admin/lib/lang/ar_login_as.lng b/interface/web/admin/lib/lang/ar_login_as.lng
index f905b45115..c660ff1a4b 100644
--- a/interface/web/admin/lib/lang/ar_login_as.lng
+++ b/interface/web/admin/lib/lang/ar_login_as.lng
@@ -1,11 +1,11 @@
<?php
$wb['login_1_txt'] = 'Do you want to login as user';
-$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.';
+$wb['login_2_txt'] = 'If you do so, you can \\"go back\\" by clicking at logout.';
$wb['btn_yes_txt'] = 'Yes, login as Client';
$wb['btn_back_txt'] = 'No, back to list';
$wb['udp_port_help_txt'] = 'Separated by comma';
$wb['active_txt'] = 'Active';
$wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
-$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".';
-$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".';
+$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
+$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
?>
diff --git a/interface/web/admin/lib/lang/ar_software_package_list.lng b/interface/web/admin/lib/lang/ar_software_package_list.lng
index f7a60d721f..87b27fd50b 100644
--- a/interface/web/admin/lib/lang/ar_software_package_list.lng
+++ b/interface/web/admin/lib/lang/ar_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Action';
$wb['toolsarea_head_txt'] = 'Packages';
$wb['repoupdate_txt'] = 'Update package list';
$wb['package_id_txt'] = 'local App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/ar_software_update_list.lng b/interface/web/admin/lib/lang/ar_software_update_list.lng
index ec4af23a4b..fe7639125c 100644
--- a/interface/web/admin/lib/lang/ar_software_update_list.lng
+++ b/interface/web/admin/lib/lang/ar_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['installed_txt'] = 'Action';
$wb['update_title_txt'] = 'Update';
$wb['version_txt'] = 'Version';
$wb['action_txt'] = 'Action';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/bg_login_as.lng b/interface/web/admin/lib/lang/bg_login_as.lng
index f905b45115..c660ff1a4b 100644
--- a/interface/web/admin/lib/lang/bg_login_as.lng
+++ b/interface/web/admin/lib/lang/bg_login_as.lng
@@ -1,11 +1,11 @@
<?php
$wb['login_1_txt'] = 'Do you want to login as user';
-$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.';
+$wb['login_2_txt'] = 'If you do so, you can \\"go back\\" by clicking at logout.';
$wb['btn_yes_txt'] = 'Yes, login as Client';
$wb['btn_back_txt'] = 'No, back to list';
$wb['udp_port_help_txt'] = 'Separated by comma';
$wb['active_txt'] = 'Active';
$wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
-$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".';
-$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".';
+$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
+$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
?>
diff --git a/interface/web/admin/lib/lang/bg_software_package_list.lng b/interface/web/admin/lib/lang/bg_software_package_list.lng
index 2e1895e655..6ff7b4a9aa 100644
--- a/interface/web/admin/lib/lang/bg_software_package_list.lng
+++ b/interface/web/admin/lib/lang/bg_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'ДейÑтвие';
$wb['toolsarea_head_txt'] = 'Пакети';
$wb['repoupdate_txt'] = 'ОбновÑване на пакетите ';
$wb['package_id_txt'] = 'local App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/bg_software_update_list.lng b/interface/web/admin/lib/lang/bg_software_update_list.lng
index a75b3a81b6..c7fa6e07f5 100644
--- a/interface/web/admin/lib/lang/bg_software_update_list.lng
+++ b/interface/web/admin/lib/lang/bg_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['update_title_txt'] = 'Ъпдейт';
$wb['version_txt'] = 'ВерÑиÑ';
$wb['action_txt'] = 'ДейÑтвие';
$wb['server_select_txt'] = 'Избери Ñървър';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/br_login_as.lng b/interface/web/admin/lib/lang/br_login_as.lng
index f905b45115..c660ff1a4b 100644
--- a/interface/web/admin/lib/lang/br_login_as.lng
+++ b/interface/web/admin/lib/lang/br_login_as.lng
@@ -1,11 +1,11 @@
<?php
$wb['login_1_txt'] = 'Do you want to login as user';
-$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.';
+$wb['login_2_txt'] = 'If you do so, you can \\"go back\\" by clicking at logout.';
$wb['btn_yes_txt'] = 'Yes, login as Client';
$wb['btn_back_txt'] = 'No, back to list';
$wb['udp_port_help_txt'] = 'Separated by comma';
$wb['active_txt'] = 'Active';
$wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
-$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".';
-$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".';
+$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
+$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
?>
diff --git a/interface/web/admin/lib/lang/br_software_package_list.lng b/interface/web/admin/lib/lang/br_software_package_list.lng
index 35510d7ea3..2adf5b8d43 100644
--- a/interface/web/admin/lib/lang/br_software_package_list.lng
+++ b/interface/web/admin/lib/lang/br_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Acão';
$wb['toolsarea_head_txt'] = 'Packages';
$wb['repoupdate_txt'] = 'Update package list';
$wb['package_id_txt'] = 'local App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/br_software_update_list.lng b/interface/web/admin/lib/lang/br_software_update_list.lng
index e6af8ec634..3bb6d6ee83 100644
--- a/interface/web/admin/lib/lang/br_software_update_list.lng
+++ b/interface/web/admin/lib/lang/br_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['installed_txt'] = 'Ações';
$wb['update_title_txt'] = 'Atualizar';
$wb['version_txt'] = 'Versão';
$wb['action_txt'] = 'Ação';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/cz.lng b/interface/web/admin/lib/lang/cz.lng
index bc1c9bb83f..8c80d1292d 100644
--- a/interface/web/admin/lib/lang/cz.lng
+++ b/interface/web/admin/lib/lang/cz.lng
@@ -48,3 +48,5 @@ $wb['Do OS-Update'] = 'Aktualizovat operaÄnà systém';
$wb['Do ISPConfig-Update'] = 'Aktualizovat ISPConfig';
$wb['Directive Snippets'] = 'Directive Snippets';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_directive_snippets.lng b/interface/web/admin/lib/lang/cz_directive_snippets.lng
index c6a89099c6..9a579d25e3 100644
--- a/interface/web/admin/lib/lang/cz_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/cz_directive_snippets.lng
@@ -7,3 +7,5 @@ $wb['active_txt'] = 'AktivnÃ';
$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/cz_directive_snippets_list.lng b/interface/web/admin/lib/lang/cz_directive_snippets_list.lng
index c6f444b660..cf1bb28c77 100644
--- a/interface/web/admin/lib/lang/cz_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/cz_directive_snippets_list.lng
@@ -5,3 +5,5 @@ $wb['name_txt'] = 'Name of Snippet';
$wb['type_txt'] = 'Verze';
$wb['add_new_record_txt'] = 'Add Directive Snippet';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_firewall.lng b/interface/web/admin/lib/lang/cz_firewall.lng
index c6146ae93d..df9386ae66 100644
--- a/interface/web/admin/lib/lang/cz_firewall.lng
+++ b/interface/web/admin/lib/lang/cz_firewall.lng
@@ -9,3 +9,5 @@ $wb['firewall_error_unique'] = 'Pro tento server již existuje záznam firewallu
$wb['tcp_ports_error_regex'] = 'Znak nenà povole v definici TCP portu. Povolené symboly jsou ÄÃsla, : a ,.';
$wb['udp_ports_error_regex'] = 'Znak nenà povole v definici UDP portu. Povolené symboly jsou ÄÃsla, : a ,.';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_firewall_list.lng b/interface/web/admin/lib/lang/cz_firewall_list.lng
index aecc4cf06a..da1af438de 100644
--- a/interface/web/admin/lib/lang/cz_firewall_list.lng
+++ b/interface/web/admin/lib/lang/cz_firewall_list.lng
@@ -6,3 +6,5 @@ $wb['tcp_port_txt'] = 'Otevřené TCP porty';
$wb['udp_port_txt'] = 'Otevřené UDP porty';
$wb['add_new_record_txt'] = 'Přidat záznam';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_groups.lng b/interface/web/admin/lib/lang/cz_groups.lng
index a6281be247..0f1a6be926 100644
--- a/interface/web/admin/lib/lang/cz_groups.lng
+++ b/interface/web/admin/lib/lang/cz_groups.lng
@@ -3,3 +3,5 @@ $wb['description_txt'] = 'Popis';
$wb['name_txt'] = 'Skupina';
$wb['name_err'] = 'Skupina musà mÃt min. 1, max. 30 znaků.';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_groups_list.lng b/interface/web/admin/lib/lang/cz_groups_list.lng
index c1d7ef9a8b..f285b382b9 100644
--- a/interface/web/admin/lib/lang/cz_groups_list.lng
+++ b/interface/web/admin/lib/lang/cz_groups_list.lng
@@ -5,3 +5,5 @@ $wb['name_txt'] = 'Skupina';
$wb['add_new_record_txt'] = 'Přidat skupinu';
$wb['warning_txt'] = '<b>VAROVÃNÃ:</b> 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!';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_iptables.lng b/interface/web/admin/lib/lang/cz_iptables.lng
index a40fc0490f..6a57b7ce8e 100644
--- a/interface/web/admin/lib/lang/cz_iptables.lng
+++ b/interface/web/admin/lib/lang/cz_iptables.lng
@@ -11,3 +11,5 @@ $wb['source_ip_txt'] = 'Zdrojové adresy';
$wb['active_txt'] = 'AktivnÃ';
$wb['iptables_error_unique'] = 'Stejný záznam pro firewall je již na tomto serveru použit.';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_iptables_list.lng b/interface/web/admin/lib/lang/cz_iptables_list.lng
index 65cef7507e..3dbc9061a5 100644
--- a/interface/web/admin/lib/lang/cz_iptables_list.lng
+++ b/interface/web/admin/lib/lang/cz_iptables_list.lng
@@ -13,3 +13,5 @@ $wb['source_ip_txt'] = 'Zdrojové adresy';
$wb['active_txt'] = 'AktivnÃ';
$wb['iptables_error_unique'] = 'Stejný záznam pro firewall je již na tomto serveru použit.';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_language_add.lng b/interface/web/admin/lib/lang/cz_language_add.lng
index 285dff2761..d95f12eb35 100644
--- a/interface/web/admin/lib/lang/cz_language_add.lng
+++ b/interface/web/admin/lib/lang/cz_language_add.lng
@@ -6,3 +6,5 @@ $wb['language_new_hint_txt'] = '2 znakové ISO 639-1 jazykové kódy (Viz: http:
$wb['btn_save_txt'] = 'Vytvořit novou jazykovou sadu souborů';
$wb['btn_cancel_txt'] = 'Zpět';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_language_complete.lng b/interface/web/admin/lib/lang/cz_language_complete.lng
index f1e6f4924e..eb222b3bd0 100644
--- a/interface/web/admin/lib/lang/cz_language_complete.lng
+++ b/interface/web/admin/lib/lang/cz_language_complete.lng
@@ -5,3 +5,5 @@ $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_language_edit.lng b/interface/web/admin/lib/lang/cz_language_edit.lng
index 2a71ed0a77..f880e6dbe7 100644
--- a/interface/web/admin/lib/lang/cz_language_edit.lng
+++ b/interface/web/admin/lib/lang/cz_language_edit.lng
@@ -6,3 +6,5 @@ $wb['lang_file_txt'] = 'Jazykový soubor';
$wb['btn_save_txt'] = 'Uložit';
$wb['btn_cancel_txt'] = 'Zpět';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_language_export.lng b/interface/web/admin/lib/lang/cz_language_export.lng
index 7998eea017..7ffdccf522 100644
--- a/interface/web/admin/lib/lang/cz_language_export.lng
+++ b/interface/web/admin/lib/lang/cz_language_export.lng
@@ -4,3 +4,5 @@ $wb['language_select_txt'] = 'Vybrat jazykovou sadu';
$wb['btn_save_txt'] = 'Uložit vybranou jazykovou sadu do souboru';
$wb['btn_cancel_txt'] = 'Zpět';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_language_import.lng b/interface/web/admin/lib/lang/cz_language_import.lng
index 838c325f7f..17dfa89aaf 100644
--- a/interface/web/admin/lib/lang/cz_language_import.lng
+++ b/interface/web/admin/lib/lang/cz_language_import.lng
@@ -6,3 +6,5 @@ $wb['language_overwrite_txt'] = 'Přepsat soubor, pokud existuje.';
$wb['btn_cancel_txt'] = 'Zpět';
$wb['ignore_version_txt'] = 'PÅ™eskoÄit kontrolu verze ISPConfigu.';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_language_list.lng b/interface/web/admin/lib/lang/cz_language_list.lng
index b2a7863715..77810e0a75 100644
--- a/interface/web/admin/lib/lang/cz_language_list.lng
+++ b/interface/web/admin/lib/lang/cz_language_list.lng
@@ -5,3 +5,5 @@ $wb['module_txt'] = 'Modul';
$wb['lang_file_txt'] = 'Jazykový soubor';
$wb['lang_file_date_txt'] = 'Poslednà úprava';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_login_as.lng b/interface/web/admin/lib/lang/cz_login_as.lng
index f905b45115..dd409d358d 100644
--- a/interface/web/admin/lib/lang/cz_login_as.lng
+++ b/interface/web/admin/lib/lang/cz_login_as.lng
@@ -1,11 +1,13 @@
<?php
-$wb['login_1_txt'] = 'Do you want to login as user';
-$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.';
-$wb['btn_yes_txt'] = 'Yes, login as Client';
-$wb['btn_back_txt'] = 'No, back to list';
-$wb['udp_port_help_txt'] = 'Separated by comma';
-$wb['active_txt'] = 'Active';
+$wb['login_1_txt'] = 'Chcete se přihlásit jako klient';
+$wb['login_2_txt'] = 'Pokud se pÅ™ihlásÃte jako klient, zpÄ›t do sekce Administrátora se vratÃte kliknutÃm na odhlášenà klienta.';
+$wb['btn_yes_txt'] = 'Ano, přihlásit se jako klient';
+$wb['btn_back_txt'] = 'Ne, zpět na seznam klientů';
+$wb['udp_port_help_txt'] = 'OddÄ›leny Äárkou';
+$wb['active_txt'] = 'AktivnÃ';
$wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
-$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".';
-$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".';
+$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
+$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_package_install.lng b/interface/web/admin/lib/lang/cz_package_install.lng
index 3375bd51c0..f48a2c4a36 100644
--- a/interface/web/admin/lib/lang/cz_package_install.lng
+++ b/interface/web/admin/lib/lang/cz_package_install.lng
@@ -1,7 +1,9 @@
<?php
-$wb['repo_name_txt'] = 'Repository';
+$wb['repo_name_txt'] = 'Repozitář';
$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'User (optional)';
-$wb['repo_password_txt'] = 'Password (optional)';
+$wb['repo_username_txt'] = 'Uživatel (volitelné)';
+$wb['repo_password_txt'] = 'Heslo (volitelné)';
$wb['active_txt'] = 'AktivnÃ';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_remote_action.lng b/interface/web/admin/lib/lang/cz_remote_action.lng
index e1908e2d04..11747ab9ce 100644
--- a/interface/web/admin/lib/lang/cz_remote_action.lng
+++ b/interface/web/admin/lib/lang/cz_remote_action.lng
@@ -2,11 +2,13 @@
$wb['select_server_txt'] = 'Zvolit server';
$wb['btn_do_txt'] = 'Provést akci';
$wb['do_osupdate_caption'] = 'Aktualizace operaÄnÃho systému na vzdáleném serveru.';
-$wb['do_osupdate_desc'] = 'Tato akce provede \\"aptitude -y\\" aktualizaci na vybraném serveru.<br><br><strong>POUŽITà TÉTO AKCE NA VLASTNà NEBEZPEČà !</strong>';
+$wb['do_osupdate_desc'] = 'Tato akce provede "aptitude -y" aktualizaci na vybraném serveru.<br><br><strong>POUŽITà TÉTO AKCE NA VLASTNà NEBEZPEČà !</strong>';
$wb['do_ispcupdate_caption'] = 'Provedenà ISPConfig 3 - aktualizace na vzdáleném serveru';
-$wb['do_ispcupdate_desc'] = 'Tato akce provede \\"ISPConfig 3\\" aktualizaci na vašem vybraném serveru.<br><br><strong>POUŽITà TÉTO AKCE NA VLASTNà NEBEZPEČà !</strong>';
+$wb['do_ispcupdate_desc'] = 'Tato akce provede "ISPConfig 3" aktualizaci na vašem vybraném serveru.<br><br><strong>POUŽITà TÉTO AKCE NA VLASTNà NEBEZPEČà !</strong>';
$wb['action_scheduled'] = 'Akce je naplánována na provedenÃ';
$wb['select_all_server'] = 'VÅ¡echny servery';
$wb['ispconfig_update_title'] = 'ISPConfig pokyny k aktualizaci';
$wb['ispconfig_update_text'] = 'PÅ™ihlaste se jako uživatel root na terminal (shell) serveru a proveÄte pÅ™Ãkaz<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />spustà se ISPConfig aktualizace.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>KliknÄ›te zde pro podrobnÄ›jÅ¡Ã informace o provedenà aktualizace</a>';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_remote_user.lng b/interface/web/admin/lib/lang/cz_remote_user.lng
index f764fc73e8..a34b3d74de 100644
--- a/interface/web/admin/lib/lang/cz_remote_user.lng
+++ b/interface/web/admin/lib/lang/cz_remote_user.lng
@@ -6,19 +6,19 @@ $wb['username_error_unique'] = 'Uživatelské jméno musà být unikátnÃ';
$wb['username_error_empty'] = 'Uživatelské jméno nemůže být prázdné';
$wb['password_error_empty'] = 'Heslo nemůže být prázdné';
$wb['password_strength_txt'] = 'BezpeÄnost hesla:';
-$wb['Mail domain functions'] = 'Funkce mailové domény';
-$wb['Mail user functions'] = 'Funkce mailového uživatele';
-$wb['Mail alias functions'] = 'Funkce mailového aliasu';
-$wb['Mail forward functions'] = 'Funkce mailového pÅ™edávánÃ';
-$wb['Mail catchall functions'] = 'Funkce mailového koše';
-$wb['Mail transport functions'] = 'Funkce mailového transportu';
-$wb['Mail whitelist functions'] = 'Funkce mailové bÃlé listiny';
-$wb['Mail blacklist functions'] = 'Funkce mailové Äerné listiny';
-$wb['Mail spamfilter user functions'] = 'Funkce mailového spamfiltr uživatele';
-$wb['Mail spamfilter policy functions'] = 'Funkce mailové spamfiltr politiky';
-$wb['Mail fetchmail functions'] = 'Funkce mailové externà zÃskávánà emailů';
-$wb['Mail user filter functions'] = 'Funkce mailového filtru uživatelů';
-$wb['Mail filter functions'] = 'Funkce mailového filtru';
+$wb['Mail domain functions'] = 'Funkce e-mailové domény';
+$wb['Mail user functions'] = 'Funkce e-mailového uživatele';
+$wb['Mail alias functions'] = 'Funkce e-mailového aliasu';
+$wb['Mail forward functions'] = 'Funkce e-mailového pÅ™edávánÃ';
+$wb['Mail catchall functions'] = 'Funkce e-mailového koše';
+$wb['Mail transport functions'] = 'Funkce e-mailového transportu';
+$wb['Mail whitelist functions'] = 'Funkce e-mailové bÃlé listiny';
+$wb['Mail blacklist functions'] = 'Funkce e-mailové Äerné listiny';
+$wb['Mail spamfilter user functions'] = 'Funkce e-mailového spamfiltr uživatele';
+$wb['Mail spamfilter policy functions'] = 'Funkce e-mailové spamfiltr politiky';
+$wb['Mail fetchmail functions'] = 'Funkce e-mailové externà zÃskávánà e-mailů';
+$wb['Mail user filter functions'] = 'Funkce e-mailového filtru uživatelů';
+$wb['Mail filter functions'] = 'Funkce e-mailového filtru';
$wb['Client functions'] = 'Klientské funkce';
$wb['Sites cron functions'] = 'Funkce cronů';
$wb['Sites database functions'] = 'Funkce databázÃ';
@@ -39,9 +39,11 @@ $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';
$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Ã.';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_remote_user_list.lng b/interface/web/admin/lib/lang/cz_remote_user_list.lng
index 66b64946e4..1b40308735 100644
--- a/interface/web/admin/lib/lang/cz_remote_user_list.lng
+++ b/interface/web/admin/lib/lang/cz_remote_user_list.lng
@@ -5,3 +5,5 @@ $wb['add_new_record_txt'] = 'Přidat uživatele';
$wb['parent_remote_userid_txt'] = 'ID';
$wb['username_txt'] = 'Uživatel';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_server.lng b/interface/web/admin/lib/lang/cz_server.lng
index a087656a1c..9d44fd27c8 100644
--- a/interface/web/admin/lib/lang/cz_server.lng
+++ b/interface/web/admin/lib/lang/cz_server.lng
@@ -13,3 +13,5 @@ $wb['- None -'] = '- Žádný -';
$wb['proxy_server_txt'] = 'Proxy-Server';
$wb['firewall_server_txt'] = 'Firewall-Server';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng
index c1d2b4278f..0e58bf2bac 100644
--- a/interface/web/admin/lib/lang/cz_server_config.lng
+++ b/interface/web/admin/lib/lang/cz_server_config.lng
@@ -132,16 +132,16 @@ $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_init_script_txt'] = 'PHP-FPM název init skriptu';
+$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM název init skriptu je prázdny';
+$wb['php_fpm_ini_path_txt'] = 'PHP-FPM cesta k php.ini';
+$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM cesta k php.ini je prázdná';
+$wb['php_fpm_pool_dir_txt'] = 'PHP-FPM adresář pro pool';
+$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM adresář pro pool je prázdny.';
$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['php_fpm_socket_dir_txt'] = 'PHP-FPM adresář pro socket';
+$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM adresář pro socket je prázdny.';
$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 monitorovánÃ';
$wb['do_not_try_rescue_mail_txt'] = 'Zakázat E-mail monitorovánÃ';
@@ -171,3 +171,5 @@ $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attribu
$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';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_server_config_list.lng b/interface/web/admin/lib/lang/cz_server_config_list.lng
index 2118c35357..8589dbc9d1 100644
--- a/interface/web/admin/lib/lang/cz_server_config_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_config_list.lng
@@ -2,3 +2,5 @@
$wb['list_head_txt'] = 'Konfigurace serveru';
$wb['server_name_txt'] = 'Server';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_server_ip.lng b/interface/web/admin/lib/lang/cz_server_ip.lng
index fa719665bb..a948939fe2 100644
--- a/interface/web/admin/lib/lang/cz_server_ip.lng
+++ b/interface/web/admin/lib/lang/cz_server_ip.lng
@@ -2,10 +2,12 @@
$wb['server_id_txt'] = 'Server';
$wb['ip_address_txt'] = 'IP adresa';
$wb['virtualhost_txt'] = 'HTTP NameVirtualHost';
-$wb['ip_error_wrong'] = 'IP adresa je neplatná';
+$wb['ip_error_wrong'] = 'IP adresa je neplatná nebo prázdná';
$wb['ip_error_unique'] = 'IP adresa musà být unikátnÃ';
$wb['client_id_txt'] = 'Klient';
$wb['ip_type_txt'] = 'Verze';
-$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['virtualhost_port_txt'] = 'HTTP Porty';
+$wb['error_port_syntax'] = 'Neplatné znaky ve volbÄ› HTTP Portů. ProsÃm, zadejte pouze ÄÃselné hodnoty oddÄ›lené Äárkami. PÅ™Ãklad: 80,443';
?>
+
+
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 93b0b77c9b..2a47ca7591 100644
--- a/interface/web/admin/lib/lang/cz_server_ip_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_ip_list.lng
@@ -8,3 +8,5 @@ $wb['virtualhost_txt'] = 'HTTP Vhost';
$wb['virtualhost_port_txt'] = 'HTTP Ports';
$wb['ip_type_txt'] = 'Verze';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_server_list.lng b/interface/web/admin/lib/lang/cz_server_list.lng
index ecddbf28e8..e7a2efd805 100644
--- a/interface/web/admin/lib/lang/cz_server_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_list.lng
@@ -11,3 +11,5 @@ $wb['add_new_record_txt'] = 'Přidat server';
$wb['proxy_server_txt'] = 'Proxy';
$wb['firewall_server_txt'] = 'Firewall';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_server_php.lng b/interface/web/admin/lib/lang/cz_server_php.lng
index 10aba05dd7..59cf3c7365 100644
--- a/interface/web/admin/lib/lang/cz_server_php.lng
+++ b/interface/web/admin/lib/lang/cz_server_php.lng
@@ -14,3 +14,5 @@ $wb['php_fpm_init_script_txt'] = 'Cesta k PHP-FPM init script';
$wb['php_fpm_ini_dir_txt'] = 'Cesta k php.ini adresáři';
$wb['php_fpm_pool_dir_txt'] = 'Cesta k PHP-FPM pool adresáři';
?>
+
+
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 36b28fe411..e0b43a4a99 100644
--- a/interface/web/admin/lib/lang/cz_server_php_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_php_list.lng
@@ -5,3 +5,5 @@ $wb['add_new_record_txt'] = 'Přidat novou verzi PHP';
$wb['client_id_txt'] = 'Klient';
$wb['name_txt'] = 'Verze PHP';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_software_package_install.lng b/interface/web/admin/lib/lang/cz_software_package_install.lng
index af524509f0..83440257f2 100644
--- a/interface/web/admin/lib/lang/cz_software_package_install.lng
+++ b/interface/web/admin/lib/lang/cz_software_package_install.lng
@@ -1,6 +1,8 @@
<?php
-$wb['head_txt'] = 'Install software package';
+$wb['head_txt'] = 'Instalace software';
$wb['install_key_txt'] = 'Enter install key';
-$wb['btn_save_txt'] = 'Start Installation';
+$wb['btn_save_txt'] = 'Spustit instalaci';
$wb['btn_cancel_txt'] = 'Zrušit';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_software_package_list.lng b/interface/web/admin/lib/lang/cz_software_package_list.lng
index ac98941ae8..1a59b58e10 100644
--- a/interface/web/admin/lib/lang/cz_software_package_list.lng
+++ b/interface/web/admin/lib/lang/cz_software_package_list.lng
@@ -7,4 +7,7 @@ $wb['action_txt'] = 'Akce';
$wb['toolsarea_head_txt'] = 'BalÃÄky';
$wb['repoupdate_txt'] = 'Aktualizace seznamu balÃků';
$wb['package_id_txt'] = 'mÃstnà App-ID';
+$wb['no_packages_txt'] = 'Žádné balÃÄky nejsou k dispozici';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_software_repo.lng b/interface/web/admin/lib/lang/cz_software_repo.lng
index 64a190d9a1..f48a2c4a36 100644
--- a/interface/web/admin/lib/lang/cz_software_repo.lng
+++ b/interface/web/admin/lib/lang/cz_software_repo.lng
@@ -5,3 +5,5 @@ $wb['repo_username_txt'] = 'Uživatel (volitelné)';
$wb['repo_password_txt'] = 'Heslo (volitelné)';
$wb['active_txt'] = 'AktivnÃ';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_software_repo_list.lng b/interface/web/admin/lib/lang/cz_software_repo_list.lng
index 5c82d4c41f..4ae3c662d8 100644
--- a/interface/web/admin/lib/lang/cz_software_repo_list.lng
+++ b/interface/web/admin/lib/lang/cz_software_repo_list.lng
@@ -4,3 +4,5 @@ $wb['active_txt'] = 'AktivnÃ';
$wb['repo_name_txt'] = 'Repozitář';
$wb['repo_url_txt'] = 'URL';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_software_update_list.lng b/interface/web/admin/lib/lang/cz_software_update_list.lng
index 32671d3823..4e7d161bbe 100644
--- a/interface/web/admin/lib/lang/cz_software_update_list.lng
+++ b/interface/web/admin/lib/lang/cz_software_update_list.lng
@@ -5,4 +5,7 @@ $wb['installed_txt'] = 'Akce';
$wb['update_title_txt'] = 'Aktualizovat';
$wb['version_txt'] = 'Verze';
$wb['action_txt'] = 'Akce';
+$wb['no_updates_txt'] = 'Žádné aktualizace nejsou k dispozici';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_system_config.lng b/interface/web/admin/lib/lang/cz_system_config.lng
index 8a75c351c9..67253c63d8 100644
--- a/interface/web/admin/lib/lang/cz_system_config.lng
+++ b/interface/web/admin/lib/lang/cz_system_config.lng
@@ -13,9 +13,9 @@ $wb['dblist_phpmyadmin_link_txt'] = 'Odkaz na aplikaci PHPMyAdmin v DB seznamu';
$wb['mailboxlist_webmail_link_txt'] = 'Odkaz na aplikaci Webmail v Mailbox seznamu';
$wb['webmail_url_txt'] = 'Webmail URL';
$wb['phpmyadmin_url_txt'] = 'PHPMyAdmin URL';
-$wb['dashboard_atom_url_admin_txt'] = 'Dashboard atom feed URL (admin)';
-$wb['dashboard_atom_url_reseller_txt'] = 'Dashboard atom feed URL (reseller)';
-$wb['dashboard_atom_url_client_txt'] = 'Dashboard atom feed URL (client)';
+$wb['dashboard_atom_url_admin_txt'] = 'ŘÃdÃcà panel novinky naÄÃtat z URL pro: (admina)';
+$wb['dashboard_atom_url_reseller_txt'] = 'ŘÃdÃcà panel novinky naÄÃtat z URL pro: (prodejce)';
+$wb['dashboard_atom_url_client_txt'] = 'ŘÃdÃcà panel novinky naÄÃtat z URL pro: (klienty)';
$wb['webdavuser_prefix_txt'] = 'Prefix webdav uživatele';
$wb['webdavuser_prefix_error_regex'] = 'Char not allowed in webdav user prefix.';
$wb['use_domain_module_txt'] = 'Použijte modul-domény pro přidánà nových domén';
@@ -29,24 +29,26 @@ $wb['mailmailinglist_link_txt'] = 'Odkaz na aplikaci mailing seznam e-mailových
$wb['mailmailinglist_url_txt'] = 'Mailing seznam URL';
$wb['monitor_key_txt'] = 'Monitor keyword';
$wb['maintenance_mode_txt'] = 'Režim údržby';
-$wb['smtp_enabled_txt'] = 'PoužÃt (zvolit) SMTP server pro zasÃlánà systemových mailů';
+$wb['smtp_enabled_txt'] = 'PoužÃt (zvolit) SMTP server pro zasÃlánà systémových mailů';
$wb['smtp_host_txt'] = 'SMTP host';
$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['smtp_missing_admin_mail_txt'] = 'Zadejte prosÃm jméno Administrátora a e-mailovou adresu Administrátora, pokud chcete použÃvat zvolený SMTP server pro zasÃlánà systémových mailů.';
$wb['tab_change_discard_txt'] = 'Discard changes on tab change';
$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['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'] = '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['phpmyadmin_url_error_regex'] = 'phpmyadmin neplatné URL';
+$wb['use_combobox_txt'] = 'Použità jQuery UI Combobox';
+$wb['use_loadindicator_txt'] = 'Použità indikátoru zatÞenÃ';
+$wb['f5_to_reload_js_txt'] = 'Pokud vypnete tuto volbu, zÅ™ejmÄ› budete muset použÃvat klávesu F5, aby internetový prohlÞeÄ znovu naÄetl JavaScript knihovny nebo budete muset ruÄnÄ› vyprázdňovat mezipaměť (cache) vaÅ¡eho internetového prohlÞeÄe.';
$wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.';
$wb['mailbox_show_autoresponder_tab_txt'] = 'Show Autoresponder tab in Mailbox detail';
$wb['mailbox_show_mail_filter_tab_txt'] = 'Show Mail Filter tab in Mailbox detail';
$wb['mailbox_show_custom_rules_tab_txt'] = 'Show Custom Rules tab in Mailbox detail';
?>
+
+
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 480d504421..edf66963d4 100644
--- a/interface/web/admin/lib/lang/cz_tpl_default_admin.lng
+++ b/interface/web/admin/lib/lang/cz_tpl_default_admin.lng
@@ -16,3 +16,5 @@ $wb['php_fpm_init_script_txt'] = 'Cesta k PHP-FPM init script';
$wb['php_fpm_ini_dir_txt'] = 'Cesta k php.ini adresáři';
$wb['php_fpm_pool_dir_txt'] = 'Cesta k PHP-FPM pool adresáři';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_users.lng b/interface/web/admin/lib/lang/cz_users.lng
index 16f4812d68..1f3cb59e87 100644
--- a/interface/web/admin/lib/lang/cz_users.lng
+++ b/interface/web/admin/lib/lang/cz_users.lng
@@ -31,3 +31,5 @@ $wb['password_mismatch_txt'] = 'Hesla se neshodujÃ.';
$wb['password_match_txt'] = 'Hesla se shodujÃ.';
$wb['username_error_collision'] = 'Uživatelské jméno nesmà být web nebo web a ÄÃslo.\\"';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_users_list.lng b/interface/web/admin/lib/lang/cz_users_list.lng
index e5a7d1e4de..a4915a4ca0 100644
--- a/interface/web/admin/lib/lang/cz_users_list.lng
+++ b/interface/web/admin/lib/lang/cz_users_list.lng
@@ -7,3 +7,5 @@ $wb['add_new_record_txt'] = 'Přidat uživatele';
$wb['warning_txt'] = '<b>VAROVÃNÃ:</b> 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 6eb46d16da..2c852ede07 100644
--- a/interface/web/admin/lib/lang/de_server_config.lng
+++ b/interface/web/admin/lib/lang/de_server_config.lng
@@ -173,6 +173,7 @@ $wb['overtraffic_notify_client_txt'] = 'Ãœberschreiten des Transfer Limits an de
$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.';
+$wb["rbl_error_regex"] = 'Bitte geben Sie gültige RBL-Hostnamen an.';
$wb["sendmail_path_txt"] = 'Pfad zu Sendmail';
$wb["sendmail_path_error_empty"] = 'Sendmail Pfad ist leer.';
?>
diff --git a/interface/web/admin/lib/lang/de_software_package_list.lng b/interface/web/admin/lib/lang/de_software_package_list.lng
index 8cf3e39d89..0d74780fa9 100644
--- a/interface/web/admin/lib/lang/de_software_package_list.lng
+++ b/interface/web/admin/lib/lang/de_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Aktion';
$wb['toolsarea_head_txt'] = 'Pakete';
$wb['repoupdate_txt'] = 'Softwarepakete Liste updaten';
$wb['package_id_txt'] = 'Lokale App ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/de_software_update_list.lng b/interface/web/admin/lib/lang/de_software_update_list.lng
index 6f01c1f081..29ba194a53 100644
--- a/interface/web/admin/lib/lang/de_software_update_list.lng
+++ b/interface/web/admin/lib/lang/de_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['installed_txt'] = 'Aktion';
$wb['update_title_txt'] = 'Update';
$wb['version_txt'] = 'Version';
$wb['action_txt'] = 'Aktion';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/el_login_as.lng b/interface/web/admin/lib/lang/el_login_as.lng
index f905b45115..c660ff1a4b 100644
--- a/interface/web/admin/lib/lang/el_login_as.lng
+++ b/interface/web/admin/lib/lang/el_login_as.lng
@@ -1,11 +1,11 @@
<?php
$wb['login_1_txt'] = 'Do you want to login as user';
-$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.';
+$wb['login_2_txt'] = 'If you do so, you can \\"go back\\" by clicking at logout.';
$wb['btn_yes_txt'] = 'Yes, login as Client';
$wb['btn_back_txt'] = 'No, back to list';
$wb['udp_port_help_txt'] = 'Separated by comma';
$wb['active_txt'] = 'Active';
$wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
-$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".';
-$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".';
+$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
+$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
?>
diff --git a/interface/web/admin/lib/lang/el_software_package_list.lng b/interface/web/admin/lib/lang/el_software_package_list.lng
index 798f6d0b16..1528928da3 100644
--- a/interface/web/admin/lib/lang/el_software_package_list.lng
+++ b/interface/web/admin/lib/lang/el_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'ΕνÎÏγεια';
$wb['toolsarea_head_txt'] = 'ΠακÎτα';
$wb['repoupdate_txt'] = 'ΕνημÎÏωση λίστας πακκÎτων';
$wb['package_id_txt'] = 'τοπικό App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/el_software_update_list.lng b/interface/web/admin/lib/lang/el_software_update_list.lng
index 7bdc66102c..42100d0c89 100644
--- a/interface/web/admin/lib/lang/el_software_update_list.lng
+++ b/interface/web/admin/lib/lang/el_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['installed_txt'] = 'ΕνÎÏγεια';
$wb['update_title_txt'] = 'ΕνημÎÏωση';
$wb['version_txt'] = 'Έκδοση';
$wb['action_txt'] = 'ΕνÎÏγεια';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng
index 8033db8818..b39dd0e538 100644
--- a/interface/web/admin/lib/lang/en_server_config.lng
+++ b/interface/web/admin/lib/lang/en_server_config.lng
@@ -176,6 +176,7 @@ $wb["v6_prefix_wrong"] = 'Invalid v6 Netmask format.';
$wb["php_ini_check_minutes_txt"] = 'Check system php.ini files for changes each';
$wb["php_ini_check_minutes_info_txt"] = 'minutes (0 disables checking)';
$wb['php_ini_check_minutes_error_empty'] = 'Invalid value for php.ini checking.';
+$wb["rbl_error_regex"] = 'Please specify valid RBL hostnames.';
$wb["sendmail_path_txt"] = 'Sendmail Path';
$wb["sendmail_path_error_empty"] = 'Sendmail Path is empty.';
?>
diff --git a/interface/web/admin/lib/lang/en_software_package_list.lng b/interface/web/admin/lib/lang/en_software_package_list.lng
index 29ad555875..8ba66d7fdc 100644
--- a/interface/web/admin/lib/lang/en_software_package_list.lng
+++ b/interface/web/admin/lib/lang/en_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Action';
$wb['toolsarea_head_txt'] = 'Packages';
$wb['repoupdate_txt'] = 'Update package list';
$wb['package_id_txt'] = 'local App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/en_software_update_list.lng b/interface/web/admin/lib/lang/en_software_update_list.lng
index ec4af23a4b..fe7639125c 100644
--- a/interface/web/admin/lib/lang/en_software_update_list.lng
+++ b/interface/web/admin/lib/lang/en_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['installed_txt'] = 'Action';
$wb['update_title_txt'] = 'Update';
$wb['version_txt'] = 'Version';
$wb['action_txt'] = 'Action';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/es_login_as.lng b/interface/web/admin/lib/lang/es_login_as.lng
index f905b45115..c660ff1a4b 100644
--- a/interface/web/admin/lib/lang/es_login_as.lng
+++ b/interface/web/admin/lib/lang/es_login_as.lng
@@ -1,11 +1,11 @@
<?php
$wb['login_1_txt'] = 'Do you want to login as user';
-$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.';
+$wb['login_2_txt'] = 'If you do so, you can \\"go back\\" by clicking at logout.';
$wb['btn_yes_txt'] = 'Yes, login as Client';
$wb['btn_back_txt'] = 'No, back to list';
$wb['udp_port_help_txt'] = 'Separated by comma';
$wb['active_txt'] = 'Active';
$wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
-$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".';
-$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".';
+$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
+$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
?>
diff --git a/interface/web/admin/lib/lang/es_software_package_list.lng b/interface/web/admin/lib/lang/es_software_package_list.lng
index b77a5d5a76..103260991e 100644
--- a/interface/web/admin/lib/lang/es_software_package_list.lng
+++ b/interface/web/admin/lib/lang/es_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Acción';
$wb['toolsarea_head_txt'] = 'Packages';
$wb['repoupdate_txt'] = 'Update package list';
$wb['package_id_txt'] = 'local App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/es_software_update_list.lng b/interface/web/admin/lib/lang/es_software_update_list.lng
index adbe6d8c99..deb2a3c352 100644
--- a/interface/web/admin/lib/lang/es_software_update_list.lng
+++ b/interface/web/admin/lib/lang/es_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['update_title_txt'] = 'Actualizar';
$wb['version_txt'] = 'Versión';
$wb['action_txt'] = 'Acción';
$wb['server_select_txt'] = 'Seleccionar servidor';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/fi_login_as.lng b/interface/web/admin/lib/lang/fi_login_as.lng
index f905b45115..c660ff1a4b 100644
--- a/interface/web/admin/lib/lang/fi_login_as.lng
+++ b/interface/web/admin/lib/lang/fi_login_as.lng
@@ -1,11 +1,11 @@
<?php
$wb['login_1_txt'] = 'Do you want to login as user';
-$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.';
+$wb['login_2_txt'] = 'If you do so, you can \\"go back\\" by clicking at logout.';
$wb['btn_yes_txt'] = 'Yes, login as Client';
$wb['btn_back_txt'] = 'No, back to list';
$wb['udp_port_help_txt'] = 'Separated by comma';
$wb['active_txt'] = 'Active';
$wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
-$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".';
-$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".';
+$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
+$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
?>
diff --git a/interface/web/admin/lib/lang/fi_software_package_list.lng b/interface/web/admin/lib/lang/fi_software_package_list.lng
index 9714b4d7d9..85e31f904b 100755
--- a/interface/web/admin/lib/lang/fi_software_package_list.lng
+++ b/interface/web/admin/lib/lang/fi_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Toiminto';
$wb['toolsarea_head_txt'] = 'Packages';
$wb['repoupdate_txt'] = 'Update package list';
$wb['package_id_txt'] = 'local App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/fi_software_update_list.lng b/interface/web/admin/lib/lang/fi_software_update_list.lng
index 9d9a2d2f74..7871958353 100755
--- a/interface/web/admin/lib/lang/fi_software_update_list.lng
+++ b/interface/web/admin/lib/lang/fi_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['update_title_txt'] = 'Päivitä';
$wb['version_txt'] = 'Versio';
$wb['action_txt'] = 'Toiminto';
$wb['server_select_txt'] = 'Valitse palvelin';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/fr_login_as.lng b/interface/web/admin/lib/lang/fr_login_as.lng
index f905b45115..c660ff1a4b 100644
--- a/interface/web/admin/lib/lang/fr_login_as.lng
+++ b/interface/web/admin/lib/lang/fr_login_as.lng
@@ -1,11 +1,11 @@
<?php
$wb['login_1_txt'] = 'Do you want to login as user';
-$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.';
+$wb['login_2_txt'] = 'If you do so, you can \\"go back\\" by clicking at logout.';
$wb['btn_yes_txt'] = 'Yes, login as Client';
$wb['btn_back_txt'] = 'No, back to list';
$wb['udp_port_help_txt'] = 'Separated by comma';
$wb['active_txt'] = 'Active';
$wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
-$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".';
-$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".';
+$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
+$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
?>
diff --git a/interface/web/admin/lib/lang/fr_software_package_list.lng b/interface/web/admin/lib/lang/fr_software_package_list.lng
index cb8f3f3634..d6e1d14d48 100644
--- a/interface/web/admin/lib/lang/fr_software_package_list.lng
+++ b/interface/web/admin/lib/lang/fr_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Action';
$wb['toolsarea_head_txt'] = 'Packages';
$wb['repoupdate_txt'] = 'Mettre à jour la liste des paquets';
$wb['package_id_txt'] = 'App-ID locale';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/fr_software_update_list.lng b/interface/web/admin/lib/lang/fr_software_update_list.lng
index 3c66539aa5..8fb67a0310 100644
--- a/interface/web/admin/lib/lang/fr_software_update_list.lng
+++ b/interface/web/admin/lib/lang/fr_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['update_title_txt'] = 'Mise à jour';
$wb['version_txt'] = 'Version';
$wb['action_txt'] = 'Action';
$wb['server_select_txt'] = 'Sélectionnez le serveur';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/hr_login_as.lng b/interface/web/admin/lib/lang/hr_login_as.lng
index f905b45115..c660ff1a4b 100644
--- a/interface/web/admin/lib/lang/hr_login_as.lng
+++ b/interface/web/admin/lib/lang/hr_login_as.lng
@@ -1,11 +1,11 @@
<?php
$wb['login_1_txt'] = 'Do you want to login as user';
-$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.';
+$wb['login_2_txt'] = 'If you do so, you can \\"go back\\" by clicking at logout.';
$wb['btn_yes_txt'] = 'Yes, login as Client';
$wb['btn_back_txt'] = 'No, back to list';
$wb['udp_port_help_txt'] = 'Separated by comma';
$wb['active_txt'] = 'Active';
$wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
-$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".';
-$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".';
+$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
+$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
?>
diff --git a/interface/web/admin/lib/lang/hr_software_package_list.lng b/interface/web/admin/lib/lang/hr_software_package_list.lng
index 0240c2d235..66ee959b91 100644
--- a/interface/web/admin/lib/lang/hr_software_package_list.lng
+++ b/interface/web/admin/lib/lang/hr_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Akcija';
$wb['toolsarea_head_txt'] = 'Paketi';
$wb['repoupdate_txt'] = 'Obnovi listu paketa';
$wb['package_id_txt'] = 'lokalni App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/hr_software_update_list.lng b/interface/web/admin/lib/lang/hr_software_update_list.lng
index 59f910b698..ed28fafbab 100644
--- a/interface/web/admin/lib/lang/hr_software_update_list.lng
+++ b/interface/web/admin/lib/lang/hr_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['installed_txt'] = 'Akcija';
$wb['update_title_txt'] = 'Nadogradi';
$wb['version_txt'] = 'Verzija';
$wb['action_txt'] = 'Akcija';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/hu_login_as.lng b/interface/web/admin/lib/lang/hu_login_as.lng
index f905b45115..c660ff1a4b 100644
--- a/interface/web/admin/lib/lang/hu_login_as.lng
+++ b/interface/web/admin/lib/lang/hu_login_as.lng
@@ -1,11 +1,11 @@
<?php
$wb['login_1_txt'] = 'Do you want to login as user';
-$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.';
+$wb['login_2_txt'] = 'If you do so, you can \\"go back\\" by clicking at logout.';
$wb['btn_yes_txt'] = 'Yes, login as Client';
$wb['btn_back_txt'] = 'No, back to list';
$wb['udp_port_help_txt'] = 'Separated by comma';
$wb['active_txt'] = 'Active';
$wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
-$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".';
-$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".';
+$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
+$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
?>
diff --git a/interface/web/admin/lib/lang/hu_software_package_list.lng b/interface/web/admin/lib/lang/hu_software_package_list.lng
index b5e4fefb87..d4749f0de2 100644
--- a/interface/web/admin/lib/lang/hu_software_package_list.lng
+++ b/interface/web/admin/lib/lang/hu_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Művelet';
$wb['toolsarea_head_txt'] = 'Csomagok';
$wb['repoupdate_txt'] = 'Csomaglista frissÃtése';
$wb['package_id_txt'] = 'local App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/hu_software_update_list.lng b/interface/web/admin/lib/lang/hu_software_update_list.lng
index 56f95b6a3d..c2edc83217 100644
--- a/interface/web/admin/lib/lang/hu_software_update_list.lng
+++ b/interface/web/admin/lib/lang/hu_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['update_title_txt'] = 'FrissÃtés';
$wb['version_txt'] = 'Verzió';
$wb['action_txt'] = 'Művelet';
$wb['server_select_txt'] = 'Válasszon szervert';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/id_login_as.lng b/interface/web/admin/lib/lang/id_login_as.lng
index f905b45115..c660ff1a4b 100644
--- a/interface/web/admin/lib/lang/id_login_as.lng
+++ b/interface/web/admin/lib/lang/id_login_as.lng
@@ -1,11 +1,11 @@
<?php
$wb['login_1_txt'] = 'Do you want to login as user';
-$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.';
+$wb['login_2_txt'] = 'If you do so, you can \\"go back\\" by clicking at logout.';
$wb['btn_yes_txt'] = 'Yes, login as Client';
$wb['btn_back_txt'] = 'No, back to list';
$wb['udp_port_help_txt'] = 'Separated by comma';
$wb['active_txt'] = 'Active';
$wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
-$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".';
-$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".';
+$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
+$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
?>
diff --git a/interface/web/admin/lib/lang/id_software_package_list.lng b/interface/web/admin/lib/lang/id_software_package_list.lng
index c6e3e4f4a4..a7e4987ed6 100644
--- a/interface/web/admin/lib/lang/id_software_package_list.lng
+++ b/interface/web/admin/lib/lang/id_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Aktif';
$wb['toolsarea_head_txt'] = 'Paket';
$wb['repoupdate_txt'] = 'Mutakhirkan daftar paket';
$wb['package_id_txt'] = 'App-ID lokal';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/id_software_update_list.lng b/interface/web/admin/lib/lang/id_software_update_list.lng
index a1d8eb7c78..f789a0e72c 100644
--- a/interface/web/admin/lib/lang/id_software_update_list.lng
+++ b/interface/web/admin/lib/lang/id_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['installed_txt'] = 'Tindakan';
$wb['update_title_txt'] = 'Mutakhirkan';
$wb['version_txt'] = 'Versi';
$wb['action_txt'] = 'Tindakan';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/it_login_as.lng b/interface/web/admin/lib/lang/it_login_as.lng
index f905b45115..c660ff1a4b 100644
--- a/interface/web/admin/lib/lang/it_login_as.lng
+++ b/interface/web/admin/lib/lang/it_login_as.lng
@@ -1,11 +1,11 @@
<?php
$wb['login_1_txt'] = 'Do you want to login as user';
-$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.';
+$wb['login_2_txt'] = 'If you do so, you can \\"go back\\" by clicking at logout.';
$wb['btn_yes_txt'] = 'Yes, login as Client';
$wb['btn_back_txt'] = 'No, back to list';
$wb['udp_port_help_txt'] = 'Separated by comma';
$wb['active_txt'] = 'Active';
$wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
-$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".';
-$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".';
+$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
+$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
?>
diff --git a/interface/web/admin/lib/lang/it_software_package_list.lng b/interface/web/admin/lib/lang/it_software_package_list.lng
index f7a60d721f..87b27fd50b 100644
--- a/interface/web/admin/lib/lang/it_software_package_list.lng
+++ b/interface/web/admin/lib/lang/it_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Action';
$wb['toolsarea_head_txt'] = 'Packages';
$wb['repoupdate_txt'] = 'Update package list';
$wb['package_id_txt'] = 'local App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/it_software_update_list.lng b/interface/web/admin/lib/lang/it_software_update_list.lng
index 0a1819661c..16ca62d8b1 100644
--- a/interface/web/admin/lib/lang/it_software_update_list.lng
+++ b/interface/web/admin/lib/lang/it_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['update_title_txt'] = 'Aggiornamento';
$wb['version_txt'] = 'Versione';
$wb['action_txt'] = 'Azione';
$wb['server_select_txt'] = 'Selezionare server';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/ja_software_package_list.lng b/interface/web/admin/lib/lang/ja_software_package_list.lng
index a1f5b65183..fb587767c8 100644
--- a/interface/web/admin/lib/lang/ja_software_package_list.lng
+++ b/interface/web/admin/lib/lang/ja_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'æ“作';
$wb['toolsarea_head_txt'] = 'Packages';
$wb['repoupdate_txt'] = 'Update package list';
$wb['package_id_txt'] = 'local App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/ja_software_update_list.lng b/interface/web/admin/lib/lang/ja_software_update_list.lng
index b37528035d..f0ecf5711b 100644
--- a/interface/web/admin/lib/lang/ja_software_update_list.lng
+++ b/interface/web/admin/lib/lang/ja_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['installed_txt'] = 'æ“作';
$wb['update_title_txt'] = 'æ›´æ–°';
$wb['version_txt'] = 'ãƒãƒ¼ã‚¸ãƒ§ãƒ³';
$wb['action_txt'] = 'æ“作';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/nl_login_as.lng b/interface/web/admin/lib/lang/nl_login_as.lng
index f905b45115..c660ff1a4b 100644
--- a/interface/web/admin/lib/lang/nl_login_as.lng
+++ b/interface/web/admin/lib/lang/nl_login_as.lng
@@ -1,11 +1,11 @@
<?php
$wb['login_1_txt'] = 'Do you want to login as user';
-$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.';
+$wb['login_2_txt'] = 'If you do so, you can \\"go back\\" by clicking at logout.';
$wb['btn_yes_txt'] = 'Yes, login as Client';
$wb['btn_back_txt'] = 'No, back to list';
$wb['udp_port_help_txt'] = 'Separated by comma';
$wb['active_txt'] = 'Active';
$wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
-$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".';
-$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".';
+$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
+$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
?>
diff --git a/interface/web/admin/lib/lang/nl_software_package_list.lng b/interface/web/admin/lib/lang/nl_software_package_list.lng
index f55b7f8a8f..ee5516a15e 100644
--- a/interface/web/admin/lib/lang/nl_software_package_list.lng
+++ b/interface/web/admin/lib/lang/nl_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Actie';
$wb['toolsarea_head_txt'] = 'Pakketten';
$wb['repoupdate_txt'] = 'Update pakketlijst';
$wb['package_id_txt'] = 'locaal App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/nl_software_update_list.lng b/interface/web/admin/lib/lang/nl_software_update_list.lng
index eb7cf1ca5a..0d05c85594 100644
--- a/interface/web/admin/lib/lang/nl_software_update_list.lng
+++ b/interface/web/admin/lib/lang/nl_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['installed_txt'] = 'Actie';
$wb['update_title_txt'] = 'Update';
$wb['version_txt'] = 'Versie';
$wb['action_txt'] = 'Actie';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/pl.lng b/interface/web/admin/lib/lang/pl.lng
index d813d580e0..40c35945aa 100644
--- a/interface/web/admin/lib/lang/pl.lng
+++ b/interface/web/admin/lib/lang/pl.lng
@@ -1,50 +1,51 @@
<?php
-$wb['1001'] = 'Nazwa użytkownika lub hasło jest puste.';
-$wb['1002'] = 'Nazwa użytkownika lub hasło jest błędne.';
+$wb['Firewall'] = 'Firewall';
$wb['Groups'] = 'Grupy';
$wb['groups_description'] = 'Formularz do edycji grup użytkowników w systemie.';
-$wb['Servers'] = 'Serwery';
+$wb['Server'] = 'Serwer';
+$wb['Services'] = 'Usługi';
$wb['Config'] = 'Konfiguracja';
+$wb['Server Config'] = 'Konfiguracja serwera';
+$wb['Mail'] = 'Mail';
+$wb['Getmail'] = 'Getmail';
+$wb['Web'] = 'Web';
+$wb['FastCGI'] = 'FastCGI';
+$wb['Jailkit'] = 'Jailkit';
+$wb['System'] = 'System';
$wb['Add user'] = 'Dodaj użytkownika';
$wb['Edit user'] = 'Edytuj użytkownika';
+$wb['CP Users'] = 'Użytkownicy';
$wb['Add group'] = 'Dodaj grupÄ™';
$wb['Edit group'] = 'Edytuj grupÄ™';
$wb['Edit server'] = 'Edytuj serwer';
+$wb['Servers'] = 'Serwery';
$wb['Sync. Now'] = 'Synchronizuj teraz.';
$wb['DB Sync.'] = 'Synchronizacja bazy danych.';
-$wb['User Management'] = 'User Management';
-$wb['CP Users'] = 'Użytkownicy';
-$wb['Remote Users'] = 'Użytkownicy zdalni';
-$wb['System'] = 'System';
-$wb['Server Services'] = 'Usługi serwera';
-$wb['Services'] = 'Usługi';
-$wb['Server Config'] = 'Konfiguracja serwera';
-$wb['Server'] = 'Serwer';
-$wb['Mail'] = 'Mail';
-$wb['Getmail'] = 'Getmail';
-$wb['Web'] = 'Web';
-$wb['FastCGI'] = 'FastCGI';
-$wb['Jailkit'] = 'Jailkit';
-$wb['Rescue'] = 'Rescue';
-$wb['Server IP addresses'] = 'Server IP addresses';
-$wb['Additional PHP Versions'] = 'Additional PHP Versions';
-$wb['Firewall'] = 'Firewall';
-$wb['Interface'] = 'Interface';
-$wb['Interface Config'] = 'Main Config';
-$wb['Domains'] = 'Domains';
-$wb['Misc'] = 'Misc';
+$wb['Languages'] = 'Języki';
+$wb['New Language'] = 'Nowy język';
+$wb['Export'] = 'Eksport';
+$wb['Import'] = 'Import';
+$wb['Language Editor'] = 'Edytor języków';
$wb['Software'] = 'Oprogramowanie';
$wb['Repositories'] = 'Repozytoria';
+$wb['Server Services'] = 'Usługi serwera';
+$wb['Interface Config'] = 'Konfiguracja interfejsu';
$wb['Packages'] = 'Pakiety';
$wb['Updates'] = 'Aktualizacje';
-$wb['Language Editor'] = 'Edytor języków';
-$wb['Languages'] = 'Języki';
-$wb['New Language'] = 'Nowy język';
$wb['Merge'] = 'Połącz';
-$wb['Export'] = 'Eksport';
-$wb['Import'] = 'Import';
+$wb['Remote Users'] = 'Użytkownicy zdalni';
$wb['Remote Actions'] = 'Akcje zdalne';
$wb['Do OS-Update'] = 'Wykonaj aktualizacjÄ™ systemu';
$wb['Do ISPConfig-Update'] = 'Wykonaj aktualizacjÄ™ ISPConfig';
-$wb['Directive Snippets'] = 'Directive Snippets';
+$wb['1001'] = 'Nazwa użytkownika lub hasło jest puste.';
+$wb['1002'] = 'Nazwa użytkownika lub hasło jest błędne.';
+$wb['User Management'] = 'Zarządzanie użytkownikami';
+$wb['Rescue'] = 'Rescue';
+$wb['Server IP addresses'] = 'Adresy IP serwera';
+$wb['Additional PHP Versions'] = 'Dodatkowe wersje PHP';
+$wb['Directive Snippets'] = 'Zestawy dyrektyw';
+$wb['Interface'] = 'Interfejs';
+$wb['Domains'] = 'Domeny';
+$wb['Misc'] = 'Różne';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_directive_snippets.lng b/interface/web/admin/lib/lang/pl_directive_snippets.lng
index d836ab0da0..e4c5572293 100644
--- a/interface/web/admin/lib/lang/pl_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/pl_directive_snippets.lng
@@ -1,9 +1,10 @@
<?php
-$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.';
+$wb['Directive Snippets'] = 'Zestawy dyrektyw';
+$wb['name_txt'] = 'Nazwa';
+$wb['type_txt'] = 'Rodzaj';
+$wb['snippet_txt'] = 'Zestaw';
+$wb['active_txt'] = 'Aktywne';
+$wb['directive_snippets_name_empty'] = 'Wybierz nazwÄ™ dla zestawu dyrektyw';
+$wb['directive_snippets_name_error_unique'] = 'Istnieje już zestaw dyrektyw o podanej nazwie';
?>
+
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 4124ea3464..41c6364f97 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,8 @@
<?php
-$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';
+$wb['list_head_txt'] = 'Zestawy dyrektyw';
+$wb['active_txt'] = 'Aktywne';
+$wb['name_txt'] = 'Nazwa zestawu';
+$wb['type_txt'] = 'Rodzaj';
+$wb['add_new_record_txt'] = 'Dodaj nowy zestaw dyrektyw';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_firewall.lng b/interface/web/admin/lib/lang/pl_firewall.lng
index 5681789506..8098fcc61b 100644
--- a/interface/web/admin/lib/lang/pl_firewall.lng
+++ b/interface/web/admin/lib/lang/pl_firewall.lng
@@ -9,3 +9,4 @@ $wb['firewall_error_unique'] = 'Istnieje już wpis firewalla dla tego serwera.';
$wb['tcp_ports_error_regex'] = 'Znak nie jest dozwolony w formacie portu TCP. Dozwolone znaki to liczby, : oraz ,.';
$wb['udp_ports_error_regex'] = 'Znak nie jest dozwolony w formacie portu UDP. Dozwolone znaki to liczby, : oraz ,.';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_firewall_list.lng b/interface/web/admin/lib/lang/pl_firewall_list.lng
index 6a4b8388f7..fe80e430ca 100644
--- a/interface/web/admin/lib/lang/pl_firewall_list.lng
+++ b/interface/web/admin/lib/lang/pl_firewall_list.lng
@@ -6,3 +6,4 @@ $wb['tcp_port_txt'] = 'Otwarte porty TCP';
$wb['udp_port_txt'] = 'Otwarte porty UDP';
$wb['add_new_record_txt'] = 'Dodaj wpis Firewalla';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_groups.lng b/interface/web/admin/lib/lang/pl_groups.lng
index b3c8b9ca77..a97ac3f301 100644
--- a/interface/web/admin/lib/lang/pl_groups.lng
+++ b/interface/web/admin/lib/lang/pl_groups.lng
@@ -3,3 +3,4 @@ $wb['description_txt'] = 'Opis';
$wb['name_txt'] = 'Grupa';
$wb['name_err'] = 'Nazwa grupy musi mieć od 1 do 30 znaków.';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_groups_list.lng b/interface/web/admin/lib/lang/pl_groups_list.lng
index 75756bca7b..9409d32c9c 100644
--- a/interface/web/admin/lib/lang/pl_groups_list.lng
+++ b/interface/web/admin/lib/lang/pl_groups_list.lng
@@ -5,3 +5,4 @@ $wb['name_txt'] = 'Grupa';
$wb['add_new_record_txt'] = 'Dodaj nowÄ… grupÄ™';
$wb['warning_txt'] = '<b>OSTRZEŻENIE:</b> Nie modyfikuj żadnych ustawień użytkownika w tym miejscu. Użyj ustawień Klienta lub Resellera w module Klient. Modyfikacja ustawień użytkownika lub grupy tutaj grozi utratą danych!';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_iptables.lng b/interface/web/admin/lib/lang/pl_iptables.lng
index f6be566c4f..8073e5d008 100644
--- a/interface/web/admin/lib/lang/pl_iptables.lng
+++ b/interface/web/admin/lib/lang/pl_iptables.lng
@@ -11,3 +11,4 @@ $wb['source_ip_txt'] = 'Adres źródłowy';
$wb['active_txt'] = 'Aktywny';
$wb['iptables_error_unique'] = 'Istnieje już wpis firewalla dla tego serwera.';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_iptables_list.lng b/interface/web/admin/lib/lang/pl_iptables_list.lng
index 2f74b180c6..255a82925c 100644
--- a/interface/web/admin/lib/lang/pl_iptables_list.lng
+++ b/interface/web/admin/lib/lang/pl_iptables_list.lng
@@ -13,3 +13,4 @@ $wb['source_ip_txt'] = 'Adres źródłowy';
$wb['active_txt'] = 'Aktywny';
$wb['iptables_error_unique'] = 'Istnieje już wpis firewalla dla tego serwera.';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_language_add.lng b/interface/web/admin/lib/lang/pl_language_add.lng
index 82e42ef720..df1a5f31fc 100644
--- a/interface/web/admin/lib/lang/pl_language_add.lng
+++ b/interface/web/admin/lib/lang/pl_language_add.lng
@@ -6,3 +6,4 @@ $wb['language_new_hint_txt'] = '2 znakowe kodowanie języka ISO 639-1 (Zobacz ht
$wb['btn_save_txt'] = 'Utwórz nowy zbiór plików z językami';
$wb['btn_cancel_txt'] = 'Wróć';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_language_complete.lng b/interface/web/admin/lib/lang/pl_language_complete.lng
index 0096c69efa..6d6d8ec36d 100644
--- a/interface/web/admin/lib/lang/pl_language_complete.lng
+++ b/interface/web/admin/lib/lang/pl_language_complete.lng
@@ -5,3 +5,4 @@ $wb['language_select_txt'] = 'Wybierz język';
$wb['btn_save_txt'] = 'Połącz pliki teraz';
$wb['btn_cancel_txt'] = 'Wróć';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_language_edit.lng b/interface/web/admin/lib/lang/pl_language_edit.lng
index 3a5e706939..b4ec35d9b4 100644
--- a/interface/web/admin/lib/lang/pl_language_edit.lng
+++ b/interface/web/admin/lib/lang/pl_language_edit.lng
@@ -6,3 +6,4 @@ $wb['lang_file_txt'] = 'Plik języka';
$wb['btn_save_txt'] = 'Zapisz';
$wb['btn_cancel_txt'] = 'Wróć';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_language_export.lng b/interface/web/admin/lib/lang/pl_language_export.lng
index e58dbf072a..0b38a48701 100644
--- a/interface/web/admin/lib/lang/pl_language_export.lng
+++ b/interface/web/admin/lib/lang/pl_language_export.lng
@@ -4,3 +4,4 @@ $wb['language_select_txt'] = 'Wybierz język';
$wb['btn_save_txt'] = 'Eksportuj pliki wybranego języka';
$wb['btn_cancel_txt'] = 'Wróć';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_language_import.lng b/interface/web/admin/lib/lang/pl_language_import.lng
index 077d0c00ea..e78238adaa 100644
--- a/interface/web/admin/lib/lang/pl_language_import.lng
+++ b/interface/web/admin/lib/lang/pl_language_import.lng
@@ -6,3 +6,4 @@ $wb['language_overwrite_txt'] = 'Nadpisz plik jeśli istnieje.';
$wb['btn_cancel_txt'] = 'Wróć';
$wb['ignore_version_txt'] = 'Pomiń sprawdzanie wersji ISPConfig';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_language_list.lng b/interface/web/admin/lib/lang/pl_language_list.lng
index 05fd6e39ac..14b7cdb507 100644
--- a/interface/web/admin/lib/lang/pl_language_list.lng
+++ b/interface/web/admin/lib/lang/pl_language_list.lng
@@ -5,3 +5,4 @@ $wb['module_txt'] = 'Moduł';
$wb['lang_file_txt'] = 'Plik języka';
$wb['lang_file_date_txt'] = 'Ostatnia modyfikacja';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_login_as.lng b/interface/web/admin/lib/lang/pl_login_as.lng
index f905b45115..a505494494 100644
--- a/interface/web/admin/lib/lang/pl_login_as.lng
+++ b/interface/web/admin/lib/lang/pl_login_as.lng
@@ -1,11 +1,12 @@
<?php
-$wb['login_1_txt'] = 'Do you want to login as user';
-$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.';
-$wb['btn_yes_txt'] = 'Yes, login as Client';
-$wb['btn_back_txt'] = 'No, back to list';
-$wb['udp_port_help_txt'] = 'Separated by comma';
-$wb['active_txt'] = 'Active';
-$wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
-$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".';
-$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".';
+$wb['login_1_txt'] = 'Czy chcesz zalogować się jako użytkownik';
+$wb['login_2_txt'] = 'Po zalogowaniu będziesz mógł wrócić tutaj wylogowując się.';
+$wb['btn_yes_txt'] = 'Tak, zaloguj jako Klienta';
+$wb['btn_back_txt'] = 'Nie, wracam do listy';
+$wb['udp_port_help_txt'] = 'Rozdzielone przecinkami';
+$wb['active_txt'] = 'Aktywny';
+$wb['firewall_error_unique'] = 'Istnieje już wpis firewalla dla tego serwera.';
+$wb['tcp_ports_error_regex'] = 'Niedozwolony znam w definicji portu TCP. Dozwolone sÄ… liczby, dwukropek i przecinek (: i ,)';
+$wb['udp_ports_error_regex'] = 'Niedozwolony znam w definicji portu UDP. Dozwolone sÄ… liczby, dwukropek i przecinek (: i ,)';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_package_install.lng b/interface/web/admin/lib/lang/pl_package_install.lng
index 30439086ab..ce5c73c814 100644
--- a/interface/web/admin/lib/lang/pl_package_install.lng
+++ b/interface/web/admin/lib/lang/pl_package_install.lng
@@ -5,3 +5,4 @@ $wb['repo_username_txt'] = 'Użytkownik (opcjonalnie)';
$wb['repo_password_txt'] = 'Hasło (opcjonalnie)';
$wb['active_txt'] = 'Aktywne';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_remote_action.lng b/interface/web/admin/lib/lang/pl_remote_action.lng
index 83fbc9e282..36b0383c4e 100644
--- a/interface/web/admin/lib/lang/pl_remote_action.lng
+++ b/interface/web/admin/lib/lang/pl_remote_action.lng
@@ -10,3 +10,4 @@ $wb['select_all_server'] = 'Wszystkie serwery';
$wb['ispconfig_update_title'] = 'ISPConfig update instructions';
$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructions</a>';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_remote_user.lng b/interface/web/admin/lib/lang/pl_remote_user.lng
index 7691fecbe7..6c55771f6c 100644
--- a/interface/web/admin/lib/lang/pl_remote_user.lng
+++ b/interface/web/admin/lib/lang/pl_remote_user.lng
@@ -40,8 +40,9 @@ $wb['DNS rp functions'] = 'Funkcje rekordu RP DNS';
$wb['DNS srv functions'] = 'Funkcje rekordu SRV DNS';
$wb['DNS txt functions'] = 'Funkcje rekordu TXT DNS';
$wb['Mail mailing list functions'] = 'Funkcje listy mailingowej';
-$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['generate_password_txt'] = 'Generuj hasło';
+$wb['repeat_password_txt'] = 'Powtórz hasło';
+$wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
+$wb['password_match_txt'] = 'Hasła pasują';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_remote_user_list.lng b/interface/web/admin/lib/lang/pl_remote_user_list.lng
index 6dd12ae97c..976e3130ad 100644
--- a/interface/web/admin/lib/lang/pl_remote_user_list.lng
+++ b/interface/web/admin/lib/lang/pl_remote_user_list.lng
@@ -5,3 +5,4 @@ $wb['add_new_record_txt'] = 'Dodaj nowego użytkownika';
$wb['parent_remote_userid_txt'] = 'ID';
$wb['username_txt'] = 'Nazwa użytkownika';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_server.lng b/interface/web/admin/lib/lang/pl_server.lng
index 5e9c411720..2ebbeb2198 100644
--- a/interface/web/admin/lib/lang/pl_server.lng
+++ b/interface/web/admin/lib/lang/pl_server.lng
@@ -13,3 +13,4 @@ $wb['- None -'] = '- Żaden -';
$wb['proxy_server_txt'] = 'Proxy-Server';
$wb['firewall_server_txt'] = 'Firewall-Server';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng
index ac1d280e28..05836f62f6 100644
--- a/interface/web/admin/lib/lang/pl_server_config.lng
+++ b/interface/web/admin/lib/lang/pl_server_config.lng
@@ -5,7 +5,7 @@ $wb['jailkit_chroot_app_programs_txt'] = 'Ścieżki aplikacji roota Jailkit';
$wb['jailkit_chroot_cron_programs_txt'] = 'Aplikacje cron roota Jailkit';
$wb['website_path_txt'] = 'Adres strony WWW';
$wb['website_symlinks_txt'] = 'Symulowany link strony WWW';
-$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
+$wb['website_symlinks_rel_txt'] = 'Twórz linki relatywne';
$wb['website_basedir_txt'] = 'Ścieżka bazowa strony WWW';
$wb['vhost_conf_dir_txt'] = 'Ścieżka do konfiguracyji wirtualnego serwera';
$wb['vhost_conf_enabled_dir_txt'] = 'Ścieżka do aktywnej konfiguracyji Vhost';
@@ -42,7 +42,7 @@ $wb['hostname_error_empty'] = 'Nazwa jest pusta.';
$wb['nameservers_error_empty'] = 'Nazwa serwera jest pusta.';
$wb['config_dir_txt'] = 'Katalog konfiguracji';
$wb['init_script_txt'] = 'Nazwa skryptu inicjujÄ…cego Crona';
-$wb['crontab_dir_txt'] = 'Ścieżka do indywidualnych crontabs';
+$wb['crontab_dir_txt'] = 'Ścieżka do indywidualnych zadań Cron';
$wb['wget_txt'] = 'Ścieżka do wget';
$wb['web_user_txt'] = 'Użytkownik Apache';
$wb['web_group_txt'] = 'Grupa Apache';
@@ -154,20 +154,21 @@ $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['backup_mode_txt'] = 'Tryb tworzenia kopii';
+$wb['backup_mode_userzip'] = 'Pliki kopii z prawami użytkownika jako zip';
+$wb['backup_mode_rootgz'] = 'Twórz kopie wszystkich plików w katalogu web jako root';
$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['realtime_blackhole_list_note_txt'] = '(oddziel RBL-e przecinkami)';
+$wb['ssl_settings_txt'] = 'Ustawienia SSL';
+$wb['permissions_txt'] = 'Uprawnienia';
+$wb['php_settings_txt'] = 'Ustawienia PHP';
$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings';
-$wb['awstats_settings_txt'] = 'AWStats Settings';
+$wb['awstats_settings_txt'] = 'Ustawienia AWStats';
$wb['firewall_txt'] = 'Firewall';
-$wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics';
+$wb['mailbox_quota_stats_txt'] = 'Statystyki użycia skrzynek email';
$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['overtraffic_notify_admin_txt'] = 'Prześlij informacje o przekroczeniu transferu do admina';
+$wb['overtraffic_notify_client_txt'] = 'Prześlij informacje o przekroczeniu transferu do klienta';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_server_config_list.lng b/interface/web/admin/lib/lang/pl_server_config_list.lng
index f9e8dcf1b5..e700889bf8 100644
--- a/interface/web/admin/lib/lang/pl_server_config_list.lng
+++ b/interface/web/admin/lib/lang/pl_server_config_list.lng
@@ -2,3 +2,4 @@
$wb['list_head_txt'] = 'Konfiguracja serwera';
$wb['server_name_txt'] = 'Serwer';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_server_ip.lng b/interface/web/admin/lib/lang/pl_server_ip.lng
index cb16e104d5..2c107d05a9 100644
--- a/interface/web/admin/lib/lang/pl_server_ip.lng
+++ b/interface/web/admin/lib/lang/pl_server_ip.lng
@@ -9,3 +9,4 @@ $wb['ip_type_txt'] = 'Typ';
$wb['virtualhost_port_txt'] = 'Porty HTTP';
$wb['error_port_syntax'] = 'Nieprawidłowe wartości w polu portów, proszę wpisać tylko liczby oddzielone przecinkiem. Przykładowo: 80,443';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_server_ip_list.lng b/interface/web/admin/lib/lang/pl_server_ip_list.lng
index 64b004dc78..dcf8951ac9 100644
--- a/interface/web/admin/lib/lang/pl_server_ip_list.lng
+++ b/interface/web/admin/lib/lang/pl_server_ip_list.lng
@@ -8,3 +8,4 @@ $wb['virtualhost_txt'] = 'HTTP Vhost';
$wb['virtualhost_port_txt'] = 'Porty HTTP';
$wb['ip_type_txt'] = 'Typ';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_server_list.lng b/interface/web/admin/lib/lang/pl_server_list.lng
index 81356acf77..9ca9eb8715 100644
--- a/interface/web/admin/lib/lang/pl_server_list.lng
+++ b/interface/web/admin/lib/lang/pl_server_list.lng
@@ -11,3 +11,4 @@ $wb['add_new_record_txt'] = 'Dodaj nowy serwer';
$wb['proxy_server_txt'] = 'Proxy';
$wb['firewall_server_txt'] = 'Firewall';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_server_php.lng b/interface/web/admin/lib/lang/pl_server_php.lng
index addbfa4935..54d0ef2775 100644
--- a/interface/web/admin/lib/lang/pl_server_php.lng
+++ b/interface/web/admin/lib/lang/pl_server_php.lng
@@ -1,16 +1,17 @@
<?php
-$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['Additional PHP Versions'] = 'Additional PHP Versions';
-$wb['Form to edit additional PHP versions'] = 'Form to edit additional PHP versions';
-$wb['server_php_name_error_empty'] = 'The Name field must not be empty.';
-$wb['php_fastcgi_binary_txt'] = 'Path to the PHP FastCGI binary';
-$wb['php_fastcgi_ini_dir_txt'] = 'Path to the php.ini directory';
-$wb['php_fpm_init_script_txt'] = 'Path to the PHP-FPM init script';
-$wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory';
-$wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory';
+$wb['server_id_txt'] = 'Serwer';
+$wb['client_id_txt'] = 'Klient';
+$wb['name_txt'] = 'Nazwa PHP';
+$wb['Name'] = 'Nazwa';
+$wb['FastCGI Settings'] = 'Ustawienia FastCGI';
+$wb['PHP-FPM Settings'] = 'Ustawienia PHP-FPM';
+$wb['Additional PHP Versions'] = 'Dodatkowe wersje PHP';
+$wb['Form to edit additional PHP versions'] = 'Formularz do edycji dodatkowych wersji PHP';
+$wb['server_php_name_error_empty'] = 'Pole Nazwa nie może być puste';
+$wb['php_fastcgi_binary_txt'] = 'Ścieżka do binarki PHP FastCGI';
+$wb['php_fastcgi_ini_dir_txt'] = 'Ścieżka do katalogu php.ini';
+$wb['php_fpm_init_script_txt'] = 'Ścieżka do skryptu inicjującego PHP-FPM';
+$wb['php_fpm_ini_dir_txt'] = 'Ścieżka do katalogu php.ini';
+$wb['php_fpm_pool_dir_txt'] = 'Ścieżka do katalogu pool PHP-FPM';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_server_php_list.lng b/interface/web/admin/lib/lang/pl_server_php_list.lng
index b402fd1ed1..dc697ae1ff 100644
--- a/interface/web/admin/lib/lang/pl_server_php_list.lng
+++ b/interface/web/admin/lib/lang/pl_server_php_list.lng
@@ -5,3 +5,4 @@ $wb['add_new_record_txt'] = 'Add new PHP version';
$wb['client_id_txt'] = 'Client';
$wb['name_txt'] = 'PHP Name';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_software_package_install.lng b/interface/web/admin/lib/lang/pl_software_package_install.lng
index fd2f2930dd..ea9290bd39 100644
--- a/interface/web/admin/lib/lang/pl_software_package_install.lng
+++ b/interface/web/admin/lib/lang/pl_software_package_install.lng
@@ -4,3 +4,4 @@ $wb['install_key_txt'] = 'Podaj klucz instalacyjny';
$wb['btn_save_txt'] = 'Start instalacji';
$wb['btn_cancel_txt'] = 'Przerwij';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_software_package_list.lng b/interface/web/admin/lib/lang/pl_software_package_list.lng
index e50d34f34d..e1ffd2c3df 100644
--- a/interface/web/admin/lib/lang/pl_software_package_list.lng
+++ b/interface/web/admin/lib/lang/pl_software_package_list.lng
@@ -7,4 +7,6 @@ $wb['action_txt'] = 'Akcja';
$wb['toolsarea_head_txt'] = 'Pakiety';
$wb['repoupdate_txt'] = 'Aktualizuj listę pakietów';
$wb['package_id_txt'] = 'lokalny App-ID';
+$wb['no_packages_txt'] = 'Brak dostępnych pakietów';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_software_repo.lng b/interface/web/admin/lib/lang/pl_software_repo.lng
index d11a1b3b33..84d9c9e61b 100644
--- a/interface/web/admin/lib/lang/pl_software_repo.lng
+++ b/interface/web/admin/lib/lang/pl_software_repo.lng
@@ -5,3 +5,4 @@ $wb['repo_username_txt'] = 'Użytkownik (Opcjonalnie)';
$wb['repo_password_txt'] = 'Hasło (Opcjonalnie)';
$wb['active_txt'] = 'Aktywny';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_software_repo_list.lng b/interface/web/admin/lib/lang/pl_software_repo_list.lng
index 7ca6af9f9f..85a54b06b4 100644
--- a/interface/web/admin/lib/lang/pl_software_repo_list.lng
+++ b/interface/web/admin/lib/lang/pl_software_repo_list.lng
@@ -4,3 +4,4 @@ $wb['active_txt'] = 'Aktywny';
$wb['repo_name_txt'] = 'Repozytoria';
$wb['repo_url_txt'] = 'URL';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_software_update_list.lng b/interface/web/admin/lib/lang/pl_software_update_list.lng
index e38bdf8a31..31a3dd0131 100644
--- a/interface/web/admin/lib/lang/pl_software_update_list.lng
+++ b/interface/web/admin/lib/lang/pl_software_update_list.lng
@@ -5,4 +5,6 @@ $wb['installed_txt'] = 'Akcja';
$wb['update_title_txt'] = 'Aktualizacja';
$wb['version_txt'] = 'Wersja';
$wb['action_txt'] = 'Akcja';
+$wb['no_updates_txt'] = 'Nie ma dostępnych aktualizacji';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_system_config.lng b/interface/web/admin/lib/lang/pl_system_config.lng
index 50e5a40b62..42da3d1357 100644
--- a/interface/web/admin/lib/lang/pl_system_config.lng
+++ b/interface/web/admin/lib/lang/pl_system_config.lng
@@ -1,5 +1,4 @@
<?php
-$wb['system_config_desc_txt'] = '';
$wb['warning'] = 'Edytuj te wartości ostrożnie! Nie usuwaj prefiksów w systemie w więcej niż jednym kliencie.';
$wb['dbname_prefix_txt'] = 'Prefiks nazwy bazy danych';
$wb['dbuser_prefix_txt'] = 'Prefiks użytkownika bazy danych';
@@ -25,28 +24,30 @@ $wb['webftp_url_txt'] = 'Link do WebFTP';
$wb['enable_custom_login_txt'] = 'Zezwalaj na dowolnÄ… nazwÄ™ loginu';
$wb['mailmailinglist_link_txt'] = 'Link do listy mailingowej na liście list mailingowych';
$wb['mailmailinglist_url_txt'] = 'URL listy mailingowej';
-$wb['admin_mail_txt'] = 'E-Mail administratorów';
+$wb['admin_mail_txt'] = 'E-Mail administratora';
$wb['monitor_key_txt'] = 'Klucz monitora';
-$wb['admin_name_txt'] = 'Nazwy administratorów';
-$wb['maintenance_mode_txt'] = 'Maintenance Mode';
-$wb['smtp_enabled_txt'] = 'Use SMTP to send system mails';
-$wb['smtp_host_txt'] = 'SMTP host';
-$wb['smtp_port_txt'] = 'SMTP 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\'.';
-$wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details';
-$wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details';
-$wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details';
+$wb['admin_name_txt'] = 'Nazwa administratora';
+$wb['system_config_desc_txt'] = '';
+$wb['smtp_missing_admin_mail_txt'] = 'Podaj nazwę administratora oraz adres email jeżeli chcesz użyć wysyłanie maili przez SMTP.';
+$wb['tab_change_discard_txt'] = 'Porzuć zmiany przy zmianie zakładki';
+$wb['tab_change_warning_txt'] = 'Ostrzegaj przy zmianie zakładki';
+$wb['tab_change_warning_note_txt'] = 'Pokaż ostrzeżenie przy zmianie zakładki jeżeli zostały zmienione dane przez użytkownika.';
+$wb['vhost_subdomains_txt'] = 'Twórz subdomeny jako strony web';
+$wb['vhost_subdomains_note_txt'] = 'Nie możesz wyłączyć tego tak długo jak istnieją w systemie vhosty subdomen.';
+$wb['maintenance_mode_txt'] = 'Tryb serwisowy';
+$wb['smtp_enabled_txt'] = 'Używaj SMTP do wysyłania powiadomień systemowych';
+$wb['smtp_host_txt'] = 'Host SMTP';
+$wb['smtp_port_txt'] = 'Port SMTP';
+$wb['smtp_user_txt'] = 'Użytkownik SMTP';
+$wb['smtp_pass_txt'] = 'Hasło SMTP';
+$wb['smtp_crypt_txt'] = 'Użyj połączenia szyfrowanego SSL/TLS dla SMTP';
+$wb['phpmyadmin_url_error_regex'] = 'Nieprawidłowy link do phpmyadmin';
+$wb['use_combobox_txt'] = 'Użyj jQuery UI Combobox';
+$wb['use_loadindicator_txt'] = 'Użyj wskaźnika ładowania';
+$wb['f5_to_reload_js_txt'] = 'Jeżeli zmienisz to, możesz potrzebować wcisnąć F5 lub wyczyścić cache aby przeglądarka przeładowała biblioteki JavaScript.';
+$wb['client_username_web_check_disabled_txt'] = 'Wyłącz sprawdzanie nazwy klienta w poszukiwaniu słowa -web-.';
+$wb['mailbox_show_autoresponder_tab_txt'] = 'Pokaż zakładkę autorespondera w szczegółach konta email.';
+$wb['mailbox_show_mail_filter_tab_txt'] = 'Pokaż zakładkę filtra email w szczegółach konta email.';
+$wb['mailbox_show_custom_rules_tab_txt'] = 'Pokaż zakładkę własnych filtrów email w szczegółach konta email.';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_tpl_default_admin.lng b/interface/web/admin/lib/lang/pl_tpl_default_admin.lng
index eee3af5fe4..ed5fe51542 100644
--- a/interface/web/admin/lib/lang/pl_tpl_default_admin.lng
+++ b/interface/web/admin/lib/lang/pl_tpl_default_admin.lng
@@ -16,3 +16,4 @@ $wb['php_fpm_init_script_txt'] = 'Path to the PHP-FPM init script';
$wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory';
$wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_users.lng b/interface/web/admin/lib/lang/pl_users.lng
index 7fcc601446..f645401a26 100644
--- a/interface/web/admin/lib/lang/pl_users.lng
+++ b/interface/web/admin/lib/lang/pl_users.lng
@@ -25,9 +25,10 @@ $wb['fax_txt'] = 'Fax';
$wb['groups_txt'] = 'Grupy';
$wb['default_group_txt'] = 'Domyślna grupa';
$wb['startmodule_err'] = 'Modułu startowego nie ma wśród modułów.';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"';
+$wb['generate_password_txt'] = 'Generuj hasło';
+$wb['repeat_password_txt'] = 'Powtórz hasło';
+$wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
+$wb['password_match_txt'] = 'Hasła pasują';
+$wb['username_error_collision'] = 'Nazwa użytkownika nie może być web lub web z numerem.';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_users_list.lng b/interface/web/admin/lib/lang/pl_users_list.lng
index b5bf954af1..16e1804a06 100644
--- a/interface/web/admin/lib/lang/pl_users_list.lng
+++ b/interface/web/admin/lib/lang/pl_users_list.lng
@@ -1,9 +1,10 @@
<?php
$wb['list_head_txt'] = 'Użytkownicy';
$wb['username_txt'] = 'Nazwa użytkownika';
-$wb['client_id_txt'] = 'Client ID';
-$wb['active_txt'] = 'Active';
$wb['add_new_record_txt'] = 'Dodaj nowego użytkownika';
$wb['warning_txt'] = '<b>OSTRZEŻENIE:</b> Nie edytuj żadnych ustawień tutaj. Użyj do tego celu ustawień Klienta i Resellera w module Klienta. Zmiana użytkowników i grup w tym miejscu może spowodować utratę danych!';
-$wb['groups_txt'] = 'Groups';
+$wb['client_id_txt'] = 'User ID';
+$wb['active_txt'] = 'Aktywny';
+$wb['groups_txt'] = 'Grupy';
?>
+
diff --git a/interface/web/admin/lib/lang/pt_login_as.lng b/interface/web/admin/lib/lang/pt_login_as.lng
index f905b45115..c660ff1a4b 100644
--- a/interface/web/admin/lib/lang/pt_login_as.lng
+++ b/interface/web/admin/lib/lang/pt_login_as.lng
@@ -1,11 +1,11 @@
<?php
$wb['login_1_txt'] = 'Do you want to login as user';
-$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.';
+$wb['login_2_txt'] = 'If you do so, you can \\"go back\\" by clicking at logout.';
$wb['btn_yes_txt'] = 'Yes, login as Client';
$wb['btn_back_txt'] = 'No, back to list';
$wb['udp_port_help_txt'] = 'Separated by comma';
$wb['active_txt'] = 'Active';
$wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
-$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".';
-$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".';
+$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
+$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
?>
diff --git a/interface/web/admin/lib/lang/pt_software_package_list.lng b/interface/web/admin/lib/lang/pt_software_package_list.lng
index b544e9eee1..80b0c2e2c0 100644
--- a/interface/web/admin/lib/lang/pt_software_package_list.lng
+++ b/interface/web/admin/lib/lang/pt_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Acção';
$wb['toolsarea_head_txt'] = 'Packages';
$wb['repoupdate_txt'] = 'Update package list';
$wb['package_id_txt'] = 'local App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/pt_software_update_list.lng b/interface/web/admin/lib/lang/pt_software_update_list.lng
index b29f082252..12fd9e2fa9 100644
--- a/interface/web/admin/lib/lang/pt_software_update_list.lng
+++ b/interface/web/admin/lib/lang/pt_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['installed_txt'] = 'Acções';
$wb['update_title_txt'] = 'Actualizar';
$wb['version_txt'] = 'Versão';
$wb['action_txt'] = 'Acção';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/ro_login_as.lng b/interface/web/admin/lib/lang/ro_login_as.lng
index f905b45115..c660ff1a4b 100644
--- a/interface/web/admin/lib/lang/ro_login_as.lng
+++ b/interface/web/admin/lib/lang/ro_login_as.lng
@@ -1,11 +1,11 @@
<?php
$wb['login_1_txt'] = 'Do you want to login as user';
-$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.';
+$wb['login_2_txt'] = 'If you do so, you can \\"go back\\" by clicking at logout.';
$wb['btn_yes_txt'] = 'Yes, login as Client';
$wb['btn_back_txt'] = 'No, back to list';
$wb['udp_port_help_txt'] = 'Separated by comma';
$wb['active_txt'] = 'Active';
$wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
-$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".';
-$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".';
+$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
+$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
?>
diff --git a/interface/web/admin/lib/lang/ro_software_package_list.lng b/interface/web/admin/lib/lang/ro_software_package_list.lng
index 151cf8a3e5..1eca7d4232 100644
--- a/interface/web/admin/lib/lang/ro_software_package_list.lng
+++ b/interface/web/admin/lib/lang/ro_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Actiune';
$wb['toolsarea_head_txt'] = 'Packages';
$wb['repoupdate_txt'] = 'Update package list';
$wb['package_id_txt'] = 'local App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/ro_software_update_list.lng b/interface/web/admin/lib/lang/ro_software_update_list.lng
index fc96ffa182..1e85d6de5f 100644
--- a/interface/web/admin/lib/lang/ro_software_update_list.lng
+++ b/interface/web/admin/lib/lang/ro_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['installed_txt'] = 'Actiune';
$wb['update_title_txt'] = 'Update';
$wb['version_txt'] = 'Versiune';
$wb['action_txt'] = 'Actiune';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/ru_login_as.lng b/interface/web/admin/lib/lang/ru_login_as.lng
index f905b45115..c660ff1a4b 100644
--- a/interface/web/admin/lib/lang/ru_login_as.lng
+++ b/interface/web/admin/lib/lang/ru_login_as.lng
@@ -1,11 +1,11 @@
<?php
$wb['login_1_txt'] = 'Do you want to login as user';
-$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.';
+$wb['login_2_txt'] = 'If you do so, you can \\"go back\\" by clicking at logout.';
$wb['btn_yes_txt'] = 'Yes, login as Client';
$wb['btn_back_txt'] = 'No, back to list';
$wb['udp_port_help_txt'] = 'Separated by comma';
$wb['active_txt'] = 'Active';
$wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
-$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".';
-$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".';
+$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
+$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
?>
diff --git a/interface/web/admin/lib/lang/ru_software_package_list.lng b/interface/web/admin/lib/lang/ru_software_package_list.lng
index 2a453ee187..41ebca92de 100644
--- a/interface/web/admin/lib/lang/ru_software_package_list.lng
+++ b/interface/web/admin/lib/lang/ru_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'ДейÑтвие';
$wb['toolsarea_head_txt'] = 'Packages';
$wb['repoupdate_txt'] = 'Update package list';
$wb['package_id_txt'] = 'local App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/ru_software_update_list.lng b/interface/web/admin/lib/lang/ru_software_update_list.lng
index b0af5ed918..556149d6f6 100644
--- a/interface/web/admin/lib/lang/ru_software_update_list.lng
+++ b/interface/web/admin/lib/lang/ru_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['update_title_txt'] = 'Обновить';
$wb['version_txt'] = 'ВерÑиÑ';
$wb['action_txt'] = 'ДейÑтвие';
$wb['server_select_txt'] = 'Выберите Ñервер';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/se_login_as.lng b/interface/web/admin/lib/lang/se_login_as.lng
index f905b45115..c660ff1a4b 100644
--- a/interface/web/admin/lib/lang/se_login_as.lng
+++ b/interface/web/admin/lib/lang/se_login_as.lng
@@ -1,11 +1,11 @@
<?php
$wb['login_1_txt'] = 'Do you want to login as user';
-$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.';
+$wb['login_2_txt'] = 'If you do so, you can \\"go back\\" by clicking at logout.';
$wb['btn_yes_txt'] = 'Yes, login as Client';
$wb['btn_back_txt'] = 'No, back to list';
$wb['udp_port_help_txt'] = 'Separated by comma';
$wb['active_txt'] = 'Active';
$wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
-$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".';
-$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".';
+$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
+$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
?>
diff --git a/interface/web/admin/lib/lang/se_software_package_list.lng b/interface/web/admin/lib/lang/se_software_package_list.lng
index f7a60d721f..87b27fd50b 100644
--- a/interface/web/admin/lib/lang/se_software_package_list.lng
+++ b/interface/web/admin/lib/lang/se_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Action';
$wb['toolsarea_head_txt'] = 'Packages';
$wb['repoupdate_txt'] = 'Update package list';
$wb['package_id_txt'] = 'local App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/se_software_update_list.lng b/interface/web/admin/lib/lang/se_software_update_list.lng
index ebf4e6fbc5..ce766efd73 100644
--- a/interface/web/admin/lib/lang/se_software_update_list.lng
+++ b/interface/web/admin/lib/lang/se_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['update_title_txt'] = 'Update';
$wb['version_txt'] = 'Version';
$wb['action_txt'] = 'Action';
$wb['server_select_txt'] = 'Select server';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/sk_login_as.lng b/interface/web/admin/lib/lang/sk_login_as.lng
index f905b45115..c660ff1a4b 100644
--- a/interface/web/admin/lib/lang/sk_login_as.lng
+++ b/interface/web/admin/lib/lang/sk_login_as.lng
@@ -1,11 +1,11 @@
<?php
$wb['login_1_txt'] = 'Do you want to login as user';
-$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.';
+$wb['login_2_txt'] = 'If you do so, you can \\"go back\\" by clicking at logout.';
$wb['btn_yes_txt'] = 'Yes, login as Client';
$wb['btn_back_txt'] = 'No, back to list';
$wb['udp_port_help_txt'] = 'Separated by comma';
$wb['active_txt'] = 'Active';
$wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
-$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".';
-$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".';
+$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
+$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
?>
diff --git a/interface/web/admin/lib/lang/sk_software_package_list.lng b/interface/web/admin/lib/lang/sk_software_package_list.lng
index 6e200b78fc..d6cf51120b 100644
--- a/interface/web/admin/lib/lang/sk_software_package_list.lng
+++ b/interface/web/admin/lib/lang/sk_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Akcia';
$wb['toolsarea_head_txt'] = 'Packages';
$wb['repoupdate_txt'] = 'Update package list';
$wb['package_id_txt'] = 'local App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/sk_software_update_list.lng b/interface/web/admin/lib/lang/sk_software_update_list.lng
index a671b46704..9a04707c3e 100644
--- a/interface/web/admin/lib/lang/sk_software_update_list.lng
+++ b/interface/web/admin/lib/lang/sk_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['installed_txt'] = 'Akcia';
$wb['update_title_txt'] = 'Aktualizácia ';
$wb['version_txt'] = 'Verzia';
$wb['action_txt'] = 'Akcia';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/tr_login_as.lng b/interface/web/admin/lib/lang/tr_login_as.lng
index f905b45115..c660ff1a4b 100644
--- a/interface/web/admin/lib/lang/tr_login_as.lng
+++ b/interface/web/admin/lib/lang/tr_login_as.lng
@@ -1,11 +1,11 @@
<?php
$wb['login_1_txt'] = 'Do you want to login as user';
-$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.';
+$wb['login_2_txt'] = 'If you do so, you can \\"go back\\" by clicking at logout.';
$wb['btn_yes_txt'] = 'Yes, login as Client';
$wb['btn_back_txt'] = 'No, back to list';
$wb['udp_port_help_txt'] = 'Separated by comma';
$wb['active_txt'] = 'Active';
$wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
-$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".';
-$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".';
+$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
+$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
?>
diff --git a/interface/web/admin/lib/lang/tr_software_package_list.lng b/interface/web/admin/lib/lang/tr_software_package_list.lng
index 5caf6ef936..eb18128805 100644
--- a/interface/web/admin/lib/lang/tr_software_package_list.lng
+++ b/interface/web/admin/lib/lang/tr_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Eylem';
$wb['toolsarea_head_txt'] = 'Packages';
$wb['repoupdate_txt'] = 'Update package list';
$wb['package_id_txt'] = 'local App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/tr_software_update_list.lng b/interface/web/admin/lib/lang/tr_software_update_list.lng
index 3f77e54864..88fea87b7a 100644
--- a/interface/web/admin/lib/lang/tr_software_update_list.lng
+++ b/interface/web/admin/lib/lang/tr_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['installed_txt'] = 'Eylem';
$wb['update_title_txt'] = 'Güncelleme';
$wb['version_txt'] = 'Versiyon';
$wb['action_txt'] = 'Eylem';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/software_package_list.php b/interface/web/admin/software_package_list.php
index 2a24759554..0b7fd54aaf 100644
--- a/interface/web/admin/software_package_list.php
+++ b/interface/web/admin/software_package_list.php
@@ -146,7 +146,7 @@ $app->tpl->setInclude('content_tpl','templates/software_package_list.htm');
$servers = $app->db->queryAllRecords('SELECT server_id, server_name FROM server ORDER BY server_name');
$packages = $app->db->queryAllRecords('SELECT * FROM software_package');
-if(is_array($packages)) {
+if(is_array($packages) && count($packages) > 0) {
foreach($packages as $key => $p) {
$installed_txt = '';
foreach($servers as $s) {
@@ -169,9 +169,12 @@ if(is_array($packages)) {
}
}
}
- $packages[$key]['software_update_inst_id'] = $inst['software_update_inst_id'];
+ $packages[$key]['software_update_inst_id'] = intval($inst['software_update_inst_id']);
$packages[$key]['installed'] = $installed_txt;
}
+ $app->tpl->setVar('has_packages',1);
+} else {
+ $app->tpl->setVar('has_packages',0);
}
diff --git a/interface/web/admin/templates/server_config_server_edit.htm b/interface/web/admin/templates/server_config_server_edit.htm
index 19873ff054..aed24471ee 100644
--- a/interface/web/admin/templates/server_config_server_edit.htm
+++ b/interface/web/admin/templates/server_config_server_edit.htm
@@ -19,10 +19,10 @@
<label for="netmask">{tmpl_var name='netmask_txt'}</label>
<input name="netmask" id="netmask" value="{tmpl_var name='netmask'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
</div>
- <div class="ctrlHolder">
+ <div class="ctrlHolder">
<label for="v6_prefix">{tmpl_var name='v6_prefix_txt'}</label>
<input name="v6_prefix" id="v6_prefix" value="{tmpl_var name='v6_prefix'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
- </div>
+ </div>
<div class="ctrlHolder">
<label for="gateway">{tmpl_var name='gateway_txt'}</label>
<input name="gateway" id="gateway" value="{tmpl_var name='gateway'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
diff --git a/interface/web/admin/templates/server_php_list.htm b/interface/web/admin/templates/server_php_list.htm
index 42f8ab1027..f6b989c9af 100644
--- a/interface/web/admin/templates/server_php_list.htm
+++ b/interface/web/admin/templates/server_php_list.htm
@@ -18,14 +18,14 @@
<thead>
<tr class="caption">
<th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_clientname" scope="col"><tmpl_var name="client_id_txt"></th>
- <th class="tbl_col_phpname" scope="col"><tmpl_var name="name_txt"></th>
+ <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
+ <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
<th class="tbl_col_buttons" scope="col">{tmpl_var name='search_limit'}</th>
</tr>
<tr class="filter">
<td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_clientname"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
- <td class="tbl_col_phpname"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+ <td class="tbl_col_client_id"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
+ <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
<td class="tbl_col_buttons">
<button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/server_php_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
</td>
@@ -35,8 +35,8 @@
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
<td class="tbl_col_server_id"><a href="#" onclick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_clientname"><a href="#" onclick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
- <td class="tbl_col_phpname"><a href="#" onclick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
+ <td class="tbl_col_client_id"><a href="#" onclick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
+ <td class="tbl_col_name"><a href="#" onclick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
<td class="tbl_col_buttons">
<a class="button icons16 icoDelete" href="javascript: del_record('admin/server_php_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
</td>
diff --git a/interface/web/admin/templates/software_package_list.htm b/interface/web/admin/templates/software_package_list.htm
index b455f7a4da..576ffbc642 100644
--- a/interface/web/admin/templates/software_package_list.htm
+++ b/interface/web/admin/templates/software_package_list.htm
@@ -26,20 +26,22 @@
</tr>
</thead>
<tbody>
- <tmpl_loop name="records">
- <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+ <tmpl_loop name="records">
+ <tmpl_if name="has_packages">
+ <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
<td class="tbl_col_installed">{tmpl_var name="installed"}</td>
<td class="tbl_col_package_title">{tmpl_var name="package_title"}</td>
<td class="tbl_col_package_description">{tmpl_var name="package_description"}</td>
<td class="tbl_col_package_description">ispapp{tmpl_var name="package_id"}</td>
<td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" href="javascript: del_record('admin/software_package_del.php?software_update_inst_id={tmpl_var name="software_update_inst_id"}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+ <a class="button icons16 icoDelete" href="javascript: del_record('admin/software_package_del.php?software_update_inst_id={tmpl_var name='software_update_inst_id'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
</td>
</tr>
+ </tmpl_if>
</tmpl_loop>
<tmpl_unless name="records">
<tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td colspan="5">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
+ <td colspan="5">{tmpl_var name='no_packages_txt'}</td>
</tr>
</tmpl_unless>
</tbody>
diff --git a/interface/web/admin/templates/software_update_list.htm b/interface/web/admin/templates/software_update_list.htm
index d85009665f..1b49e9e6dd 100644
--- a/interface/web/admin/templates/software_update_list.htm
+++ b/interface/web/admin/templates/software_update_list.htm
@@ -38,7 +38,7 @@
</tmpl_loop>
<tmpl_unless name="records">
<tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td colspan="3">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
+ <td colspan="3">{tmpl_var name='no_updates_txt'}</td>
</tr>
</tmpl_unless>
</tbody>
diff --git a/interface/web/admin/templates/system_config_sites_edit.htm b/interface/web/admin/templates/system_config_sites_edit.htm
index b687a51ec2..e60e3facbe 100644
--- a/interface/web/admin/templates/system_config_sites_edit.htm
+++ b/interface/web/admin/templates/system_config_sites_edit.htm
@@ -45,13 +45,13 @@
{tmpl_var name='vhost_subdomains'} {tmpl_var name='vhost_subdomains_note_txt'}
</div>
</div>
- <div class="ctrlHolder">
+ <div class="ctrlHolder">
<p class="label">{tmpl_var name='client_username_web_check_disabled_txt'}</p>
<div class="multiField">
{tmpl_var name='client_username_web_check_disabled'}
</div>
</div>
- <div class="ctrlHolder">
+ <div class="ctrlHolder">
<p class="label">{tmpl_var name='reseller_can_use_options_txt'}</p>
<div class="multiField">
{tmpl_var name='reseller_can_use_options'}
@@ -67,4 +67,4 @@
</div>
</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/interface/web/client/lib/lang/ar_client.lng b/interface/web/client/lib/lang/ar_client.lng
index 9732186e82..42aeea1587 100644
--- a/interface/web/client/lib/lang/ar_client.lng
+++ b/interface/web/client/lib/lang/ar_client.lng
@@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/ar_client_template.lng b/interface/web/client/lib/lang/ar_client_template.lng
index b763383e00..2a637f7e36 100644
--- a/interface/web/client/lib/lang/ar_client_template.lng
+++ b/interface/web/client/lib/lang/ar_client_template.lng
@@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits';
$wb['cron_job_limits_txt'] = 'Cron Job Limits';
$wb['dns_limits_txt'] = 'DNS Limits';
$wb['virtualization_limits_txt'] = 'Virtualization Limits';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/ar_reseller.lng b/interface/web/client/lib/lang/ar_reseller.lng
index 6d8f0e4d34..91025a9ea8 100644
--- a/interface/web/client/lib/lang/ar_reseller.lng
+++ b/interface/web/client/lib/lang/ar_reseller.lng
@@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code';
$wb['bank_name_txt'] = 'Bank name';
$wb['bank_account_iban_txt'] = 'IBAN';
$wb['bank_account_swift_txt'] = 'BIC / Swift';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/bg_client.lng b/interface/web/client/lib/lang/bg_client.lng
index 8e16a792bc..7d8a12a94c 100644
--- a/interface/web/client/lib/lang/bg_client.lng
+++ b/interface/web/client/lib/lang/bg_client.lng
@@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/bg_client_template.lng b/interface/web/client/lib/lang/bg_client_template.lng
index 9795df590c..f6ddea9d7d 100644
--- a/interface/web/client/lib/lang/bg_client_template.lng
+++ b/interface/web/client/lib/lang/bg_client_template.lng
@@ -84,4 +84,7 @@ $wb['force_suexec_txt'] = 'SuEXEC forced';
$wb['limit_hterror_txt'] = 'Custom error docs available';
$wb['limit_wildcard_txt'] = 'Wildcard subdomain available';
$wb['limit_ssl_txt'] = 'SSL available';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/bg_reseller.lng b/interface/web/client/lib/lang/bg_reseller.lng
index 3c8a6da648..6f57b527f3 100644
--- a/interface/web/client/lib/lang/bg_reseller.lng
+++ b/interface/web/client/lib/lang/bg_reseller.lng
@@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code';
$wb['bank_name_txt'] = 'Bank name';
$wb['bank_account_iban_txt'] = 'IBAN';
$wb['bank_account_swift_txt'] = 'BIC / Swift';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/br_client.lng b/interface/web/client/lib/lang/br_client.lng
index f50fa77fff..01b45f2dc9 100644
--- a/interface/web/client/lib/lang/br_client.lng
+++ b/interface/web/client/lib/lang/br_client.lng
@@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/br_client_template.lng b/interface/web/client/lib/lang/br_client_template.lng
index fd71c73625..47a3cd34ea 100644
--- a/interface/web/client/lib/lang/br_client_template.lng
+++ b/interface/web/client/lib/lang/br_client_template.lng
@@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits';
$wb['cron_job_limits_txt'] = 'Cron Job Limits';
$wb['dns_limits_txt'] = 'DNS Limits';
$wb['virtualization_limits_txt'] = 'Virtualization Limits';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/br_reseller.lng b/interface/web/client/lib/lang/br_reseller.lng
index fc055df06b..c565aec989 100644
--- a/interface/web/client/lib/lang/br_reseller.lng
+++ b/interface/web/client/lib/lang/br_reseller.lng
@@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code';
$wb['bank_name_txt'] = 'Bank name';
$wb['bank_account_iban_txt'] = 'IBAN';
$wb['bank_account_swift_txt'] = 'BIC / Swift';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/cz.lng b/interface/web/client/lib/lang/cz.lng
index 8efa987cfa..9c1d91cc20 100644
--- a/interface/web/client/lib/lang/cz.lng
+++ b/interface/web/client/lib/lang/cz.lng
@@ -23,3 +23,5 @@ $wb['error_domain_in webuse'] = 'Tato doména nelze odstranit, protože je v pou
$wb['error_client_can_not_add_domain'] = 'Nemůžete přidat novou doménu';
$wb['error_client_group_id_empty'] = 'MusÃte vybrat zákaznÃka<br>';
?>
+
+
diff --git a/interface/web/client/lib/lang/cz_client.lng b/interface/web/client/lib/lang/cz_client.lng
index 23570f0305..bb885e966d 100644
--- a/interface/web/client/lib/lang/cz_client.lng
+++ b/interface/web/client/lib/lang/cz_client.lng
@@ -140,4 +140,9 @@ $wb['customer_no_error_unique'] = 'Zákaznické ÄÃslo musà být jedineÄné (
$wb['paypal_email_error_isemail'] = 'Zadejte prosÃm platnou PayPal e-mail addresu.';
$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.';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
+
+
diff --git a/interface/web/client/lib/lang/cz_client_circle.lng b/interface/web/client/lib/lang/cz_client_circle.lng
index f26e2d6d4b..cb4b143b11 100644
--- a/interface/web/client/lib/lang/cz_client_circle.lng
+++ b/interface/web/client/lib/lang/cz_client_circle.lng
@@ -7,3 +7,5 @@ $wb['client_ids_txt'] = 'Klienti/Distributoři';
$wb['description_txt'] = 'Popis';
$wb['active_txt'] = 'AktivnÃ';
?>
+
+
diff --git a/interface/web/client/lib/lang/cz_client_circle_list.lng b/interface/web/client/lib/lang/cz_client_circle_list.lng
index e827605400..24025510de 100644
--- a/interface/web/client/lib/lang/cz_client_circle_list.lng
+++ b/interface/web/client/lib/lang/cz_client_circle_list.lng
@@ -8,3 +8,5 @@ $wb['filter_txt'] = 'Filtr';
$wb['delete_txt'] = 'Smazat';
$wb['active_txt'] = 'AktivnÃ';
?>
+
+
diff --git a/interface/web/client/lib/lang/cz_client_del.lng b/interface/web/client/lib/lang/cz_client_del.lng
index 4515806be5..a759ab6a94 100644
--- a/interface/web/client/lib/lang/cz_client_del.lng
+++ b/interface/web/client/lib/lang/cz_client_del.lng
@@ -4,3 +4,5 @@ $wb['delete_explanation'] = 'Tato akce smaže následujÃcà poÄet záznamů p
$wb['btn_save_txt'] = 'Smazat klienta';
$wb['btn_cancel_txt'] = 'Zrušit bez smazánà klienta';
?>
+
+
diff --git a/interface/web/client/lib/lang/cz_client_message.lng b/interface/web/client/lib/lang/cz_client_message.lng
index d980d55012..f1c3870bca 100644
--- a/interface/web/client/lib/lang/cz_client_message.lng
+++ b/interface/web/client/lib/lang/cz_client_message.lng
@@ -16,3 +16,5 @@ $wb['all_clients_resellers_txt'] = 'Všichni klienti a distributoři (prodejci)'
$wb['all_clients_txt'] = 'VÅ¡ichni klienti';
$wb['variables_txt'] = 'Výběr (možnosti):';
?>
+
+
diff --git a/interface/web/client/lib/lang/cz_client_template.lng b/interface/web/client/lib/lang/cz_client_template.lng
index 9b8e1a8b37..94ee886d72 100644
--- a/interface/web/client/lib/lang/cz_client_template.lng
+++ b/interface/web/client/lib/lang/cz_client_template.lng
@@ -84,4 +84,9 @@ $wb['database_limits_txt'] = 'Databázové limity';
$wb['cron_job_limits_txt'] = 'Cron pracovnà limity';
$wb['dns_limits_txt'] = 'DNS limity';
$wb['virtualization_limits_txt'] = 'Virtualizace limity';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
+
+
diff --git a/interface/web/client/lib/lang/cz_client_template_list.lng b/interface/web/client/lib/lang/cz_client_template_list.lng
index c3faae17c7..7d9e9238d4 100644
--- a/interface/web/client/lib/lang/cz_client_template_list.lng
+++ b/interface/web/client/lib/lang/cz_client_template_list.lng
@@ -3,3 +3,5 @@ $wb['list_head_txt'] = 'Klientské šablony';
$wb['template_type_txt'] = 'Typ';
$wb['template_name_txt'] = 'Název šablony';
?>
+
+
diff --git a/interface/web/client/lib/lang/cz_clients_list.lng b/interface/web/client/lib/lang/cz_clients_list.lng
index 9657cb71e8..ffd1b8e82a 100644
--- a/interface/web/client/lib/lang/cz_clients_list.lng
+++ b/interface/web/client/lib/lang/cz_clients_list.lng
@@ -9,3 +9,5 @@ $wb['add_new_record_txt'] = 'Přidat klienta';
$wb['username_txt'] = 'Uživatelské jméno';
$wb['customer_no_txt'] = 'Zákaznické ÄÃslo';
?>
+
+
diff --git a/interface/web/client/lib/lang/cz_domain.lng b/interface/web/client/lib/lang/cz_domain.lng
index 34ba70c11e..26117aef5f 100644
--- a/interface/web/client/lib/lang/cz_domain.lng
+++ b/interface/web/client/lib/lang/cz_domain.lng
@@ -4,3 +4,5 @@ $wb['domain_error_unique'] = 'The domain already exists';
$wb['domain_error_regex'] = 'This domain-name is not allowed';
$wb['Domain'] = 'Doména';
?>
+
+
diff --git a/interface/web/client/lib/lang/cz_domain_list.lng b/interface/web/client/lib/lang/cz_domain_list.lng
index 6cf7376bd4..9b52d04ddd 100644
--- a/interface/web/client/lib/lang/cz_domain_list.lng
+++ b/interface/web/client/lib/lang/cz_domain_list.lng
@@ -4,3 +4,5 @@ $wb['add_new_record_txt'] = 'Přidat novou doménu';
$wb['domain_txt'] = 'Doména';
$wb['user_txt'] = 'Klient';
?>
+
+
diff --git a/interface/web/client/lib/lang/cz_reseller.lng b/interface/web/client/lib/lang/cz_reseller.lng
index a9ebdf5f18..53f079edb0 100644
--- a/interface/web/client/lib/lang/cz_reseller.lng
+++ b/interface/web/client/lib/lang/cz_reseller.lng
@@ -139,4 +139,9 @@ $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['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
+
+
diff --git a/interface/web/client/lib/lang/cz_resellers_list.lng b/interface/web/client/lib/lang/cz_resellers_list.lng
index 8e72797b4d..fb23672a88 100644
--- a/interface/web/client/lib/lang/cz_resellers_list.lng
+++ b/interface/web/client/lib/lang/cz_resellers_list.lng
@@ -9,3 +9,5 @@ $wb['add_new_record_txt'] = 'Přidat distributora';
$wb['customer_no_txt'] = 'Zákaznické ÄÃslo';
$wb['username_txt'] = 'Uživatelské jméno';
?>
+
+
diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng
index 40d907a39a..8cf55223e7 100644
--- a/interface/web/client/lib/lang/de_client.lng
+++ b/interface/web/client/lib/lang/de_client.lng
@@ -139,8 +139,8 @@ $wb['customer_no_error_unique'] = 'Die Kundennummer muß einzigartig sein (oder
$wb['email_error_isemail'] = 'Bitte geben Sie eine gültige E-Mail 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 \'Custon\' ausgewählt ist!';
+$wb['err_msg_master_tpl_set'] = 'Die hier eingestellten Werte werden ignoriert, wenn als Mastervorlage nicht -Custom- ausgewählt ist!';
$wb['aps_limits_txt'] = 'APS Installationsassistent Limits';
$wb['limit_aps_txt'] = 'Max. Anzahl an APS-Instanzen';
$wb['limit_aps_error_notint'] = 'Das APS Instanzen Limit muss eine Zahl sein.';
-?>
+?>
\ No newline at end of file
diff --git a/interface/web/client/lib/lang/de_reseller.lng b/interface/web/client/lib/lang/de_reseller.lng
index 14cd58a0c4..fa38a8e4ab 100644
--- a/interface/web/client/lib/lang/de_reseller.lng
+++ b/interface/web/client/lib/lang/de_reseller.lng
@@ -142,4 +142,4 @@ $wb['bank_account_swift_txt'] = 'BIC';
$wb['aps_limits_txt'] = 'APS Installationsassistent Limits';
$wb['limit_aps_txt'] = 'Max. Anzahl an APS-Instanzen';
$wb['limit_aps_error_notint'] = 'Das APS Instanzen Limit muss eine Zahl sein.';
-?>
+?>
\ No newline at end of file
diff --git a/interface/web/client/lib/lang/el_client.lng b/interface/web/client/lib/lang/el_client.lng
index 27d5531f48..6fdb9cfe9d 100644
--- a/interface/web/client/lib/lang/el_client.lng
+++ b/interface/web/client/lib/lang/el_client.lng
@@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/el_client_template.lng b/interface/web/client/lib/lang/el_client_template.lng
index 721d93943b..8829657ebc 100644
--- a/interface/web/client/lib/lang/el_client_template.lng
+++ b/interface/web/client/lib/lang/el_client_template.lng
@@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits';
$wb['cron_job_limits_txt'] = 'Cron Job Limits';
$wb['dns_limits_txt'] = 'DNS Limits';
$wb['virtualization_limits_txt'] = 'Virtualization Limits';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/el_reseller.lng b/interface/web/client/lib/lang/el_reseller.lng
index 246299979e..2438cdad83 100644
--- a/interface/web/client/lib/lang/el_reseller.lng
+++ b/interface/web/client/lib/lang/el_reseller.lng
@@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code';
$wb['bank_name_txt'] = 'Bank name';
$wb['bank_account_iban_txt'] = 'IBAN';
$wb['bank_account_swift_txt'] = 'BIC / Swift';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/es_client.lng b/interface/web/client/lib/lang/es_client.lng
index 1bb597150c..751d8634f0 100644
--- a/interface/web/client/lib/lang/es_client.lng
+++ b/interface/web/client/lib/lang/es_client.lng
@@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/es_client_template.lng b/interface/web/client/lib/lang/es_client_template.lng
index 36fb5dacf0..8dc5c023e2 100644
--- a/interface/web/client/lib/lang/es_client_template.lng
+++ b/interface/web/client/lib/lang/es_client_template.lng
@@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits';
$wb['cron_job_limits_txt'] = 'Cron Job Limits';
$wb['dns_limits_txt'] = 'DNS Limits';
$wb['virtualization_limits_txt'] = 'Virtualization Limits';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/es_reseller.lng b/interface/web/client/lib/lang/es_reseller.lng
index a82a73386e..6b809baf08 100644
--- a/interface/web/client/lib/lang/es_reseller.lng
+++ b/interface/web/client/lib/lang/es_reseller.lng
@@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code';
$wb['bank_name_txt'] = 'Bank name';
$wb['bank_account_iban_txt'] = 'IBAN';
$wb['bank_account_swift_txt'] = 'BIC / Swift';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/fi_client.lng b/interface/web/client/lib/lang/fi_client.lng
index b83d912d28..c0b38cfa1c 100755
--- a/interface/web/client/lib/lang/fi_client.lng
+++ b/interface/web/client/lib/lang/fi_client.lng
@@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/fi_client_template.lng b/interface/web/client/lib/lang/fi_client_template.lng
index 5d02fee14d..6e0ad30b2b 100755
--- a/interface/web/client/lib/lang/fi_client_template.lng
+++ b/interface/web/client/lib/lang/fi_client_template.lng
@@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits';
$wb['cron_job_limits_txt'] = 'Cron Job Limits';
$wb['dns_limits_txt'] = 'DNS Limits';
$wb['virtualization_limits_txt'] = 'Virtualization Limits';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/fi_reseller.lng b/interface/web/client/lib/lang/fi_reseller.lng
index 35c2a67954..25023da75f 100644
--- a/interface/web/client/lib/lang/fi_reseller.lng
+++ b/interface/web/client/lib/lang/fi_reseller.lng
@@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code';
$wb['bank_name_txt'] = 'Bank name';
$wb['bank_account_iban_txt'] = 'IBAN';
$wb['bank_account_swift_txt'] = 'BIC / Swift';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/fr_client.lng b/interface/web/client/lib/lang/fr_client.lng
index cb8ef3861a..13e15eff13 100644
--- a/interface/web/client/lib/lang/fr_client.lng
+++ b/interface/web/client/lib/lang/fr_client.lng
@@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/fr_client_template.lng b/interface/web/client/lib/lang/fr_client_template.lng
index e6b7d65545..75d2d93f24 100644
--- a/interface/web/client/lib/lang/fr_client_template.lng
+++ b/interface/web/client/lib/lang/fr_client_template.lng
@@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits';
$wb['cron_job_limits_txt'] = 'Cron Job Limits';
$wb['dns_limits_txt'] = 'DNS Limits';
$wb['virtualization_limits_txt'] = 'Virtualization Limits';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/fr_reseller.lng b/interface/web/client/lib/lang/fr_reseller.lng
index 5c9699befa..7162656baf 100644
--- a/interface/web/client/lib/lang/fr_reseller.lng
+++ b/interface/web/client/lib/lang/fr_reseller.lng
@@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code';
$wb['bank_name_txt'] = 'Bank name';
$wb['bank_account_iban_txt'] = 'IBAN';
$wb['bank_account_swift_txt'] = 'BIC / Swift';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/hr_client.lng b/interface/web/client/lib/lang/hr_client.lng
index 105715d81c..38126136e9 100644
--- a/interface/web/client/lib/lang/hr_client.lng
+++ b/interface/web/client/lib/lang/hr_client.lng
@@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/hr_client_template.lng b/interface/web/client/lib/lang/hr_client_template.lng
index ce54aa47c2..34dde990ad 100644
--- a/interface/web/client/lib/lang/hr_client_template.lng
+++ b/interface/web/client/lib/lang/hr_client_template.lng
@@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits';
$wb['cron_job_limits_txt'] = 'Cron Job Limits';
$wb['dns_limits_txt'] = 'DNS Limits';
$wb['virtualization_limits_txt'] = 'Virtualization Limits';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/hr_reseller.lng b/interface/web/client/lib/lang/hr_reseller.lng
index d63005fcc2..5674d6ac29 100644
--- a/interface/web/client/lib/lang/hr_reseller.lng
+++ b/interface/web/client/lib/lang/hr_reseller.lng
@@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code';
$wb['bank_name_txt'] = 'Bank name';
$wb['bank_account_iban_txt'] = 'IBAN';
$wb['bank_account_swift_txt'] = 'BIC / Swift';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/hu_client.lng b/interface/web/client/lib/lang/hu_client.lng
index f9834008cd..b393ee76d7 100644
--- a/interface/web/client/lib/lang/hu_client.lng
+++ b/interface/web/client/lib/lang/hu_client.lng
@@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/hu_client_template.lng b/interface/web/client/lib/lang/hu_client_template.lng
index 6286ccbd08..716f0ab369 100644
--- a/interface/web/client/lib/lang/hu_client_template.lng
+++ b/interface/web/client/lib/lang/hu_client_template.lng
@@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits';
$wb['cron_job_limits_txt'] = 'Cron Job Limits';
$wb['dns_limits_txt'] = 'DNS Limits';
$wb['virtualization_limits_txt'] = 'Virtualization Limits';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/hu_reseller.lng b/interface/web/client/lib/lang/hu_reseller.lng
index 47a08eb0bb..9c45093653 100644
--- a/interface/web/client/lib/lang/hu_reseller.lng
+++ b/interface/web/client/lib/lang/hu_reseller.lng
@@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code';
$wb['bank_name_txt'] = 'Bank name';
$wb['bank_account_iban_txt'] = 'IBAN';
$wb['bank_account_swift_txt'] = 'BIC / Swift';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/id_client.lng b/interface/web/client/lib/lang/id_client.lng
index 2b87ab26bc..549493f794 100644
--- a/interface/web/client/lib/lang/id_client.lng
+++ b/interface/web/client/lib/lang/id_client.lng
@@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/id_client_template.lng b/interface/web/client/lib/lang/id_client_template.lng
index 6d0996e4d3..2e6ccd5813 100644
--- a/interface/web/client/lib/lang/id_client_template.lng
+++ b/interface/web/client/lib/lang/id_client_template.lng
@@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits';
$wb['cron_job_limits_txt'] = 'Cron Job Limits';
$wb['dns_limits_txt'] = 'DNS Limits';
$wb['virtualization_limits_txt'] = 'Virtualization Limits';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/id_reseller.lng b/interface/web/client/lib/lang/id_reseller.lng
index b49f85aff3..f558d51477 100644
--- a/interface/web/client/lib/lang/id_reseller.lng
+++ b/interface/web/client/lib/lang/id_reseller.lng
@@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code';
$wb['bank_name_txt'] = 'Bank name';
$wb['bank_account_iban_txt'] = 'IBAN';
$wb['bank_account_swift_txt'] = 'BIC / Swift';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/it_client.lng b/interface/web/client/lib/lang/it_client.lng
index aa7dee3bfc..a2e6f3ec51 100644
--- a/interface/web/client/lib/lang/it_client.lng
+++ b/interface/web/client/lib/lang/it_client.lng
@@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/it_client_template.lng b/interface/web/client/lib/lang/it_client_template.lng
index d5a3445c6f..f15615bed1 100644
--- a/interface/web/client/lib/lang/it_client_template.lng
+++ b/interface/web/client/lib/lang/it_client_template.lng
@@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits';
$wb['cron_job_limits_txt'] = 'Cron Job Limits';
$wb['dns_limits_txt'] = 'DNS Limits';
$wb['virtualization_limits_txt'] = 'Virtualization Limits';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/it_reseller.lng b/interface/web/client/lib/lang/it_reseller.lng
index 6d8f0e4d34..91025a9ea8 100644
--- a/interface/web/client/lib/lang/it_reseller.lng
+++ b/interface/web/client/lib/lang/it_reseller.lng
@@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code';
$wb['bank_name_txt'] = 'Bank name';
$wb['bank_account_iban_txt'] = 'IBAN';
$wb['bank_account_swift_txt'] = 'BIC / Swift';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/ja_client.lng b/interface/web/client/lib/lang/ja_client.lng
index ab212ee35c..e11629fba8 100644
--- a/interface/web/client/lib/lang/ja_client.lng
+++ b/interface/web/client/lib/lang/ja_client.lng
@@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/ja_client_template.lng b/interface/web/client/lib/lang/ja_client_template.lng
index f149534efb..823472a6b7 100644
--- a/interface/web/client/lib/lang/ja_client_template.lng
+++ b/interface/web/client/lib/lang/ja_client_template.lng
@@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits';
$wb['cron_job_limits_txt'] = 'Cron Job Limits';
$wb['dns_limits_txt'] = 'DNS Limits';
$wb['virtualization_limits_txt'] = 'Virtualization Limits';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/ja_reseller.lng b/interface/web/client/lib/lang/ja_reseller.lng
index 0d750b29c0..812dbf418b 100644
--- a/interface/web/client/lib/lang/ja_reseller.lng
+++ b/interface/web/client/lib/lang/ja_reseller.lng
@@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code';
$wb['bank_name_txt'] = 'Bank name';
$wb['bank_account_iban_txt'] = 'IBAN';
$wb['bank_account_swift_txt'] = 'BIC / Swift';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/nl_client.lng b/interface/web/client/lib/lang/nl_client.lng
index f0ffa3f398..a86a887370 100644
--- a/interface/web/client/lib/lang/nl_client.lng
+++ b/interface/web/client/lib/lang/nl_client.lng
@@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/nl_client_template.lng b/interface/web/client/lib/lang/nl_client_template.lng
index 434220808b..edd743381d 100644
--- a/interface/web/client/lib/lang/nl_client_template.lng
+++ b/interface/web/client/lib/lang/nl_client_template.lng
@@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits';
$wb['cron_job_limits_txt'] = 'Cron Job Limits';
$wb['dns_limits_txt'] = 'DNS Limits';
$wb['virtualization_limits_txt'] = 'Virtualization Limits';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/nl_reseller.lng b/interface/web/client/lib/lang/nl_reseller.lng
index 96c8e62be3..bf3eedcf53 100644
--- a/interface/web/client/lib/lang/nl_reseller.lng
+++ b/interface/web/client/lib/lang/nl_reseller.lng
@@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code';
$wb['bank_name_txt'] = 'Bank name';
$wb['bank_account_iban_txt'] = 'IBAN';
$wb['bank_account_swift_txt'] = 'BIC / Swift';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/pl.lng b/interface/web/client/lib/lang/pl.lng
index cb488467be..7ecf6400ff 100644
--- a/interface/web/client/lib/lang/pl.lng
+++ b/interface/web/client/lib/lang/pl.lng
@@ -10,16 +10,17 @@ $wb['Add Reseller'] = 'Dodaj Resellera';
$wb['Edit Reseller'] = 'Edytuj Resellera';
$wb['Resellers'] = 'Resellerzy';
$wb['error_has_clients'] = 'Reseller posiada klientów. Usuń ich zanim usuniesz resellera.';
-$wb['add_additional_template_txt'] = 'Add additional template';
-$wb['delete_additional_template_txt'] = 'Delete additional template';
-$wb['Messaging'] = 'Messaging';
-$wb['Send email'] = 'Send Email';
-$wb['Edit Client Circle'] = 'Edit Client Circle';
-$wb['Domains'] = 'Domains';
-$wb['domain_txt'] = 'Domain';
-$wb['client_txt'] = 'Client';
-$wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is in use as mail-domain';
-$wb['error_domain_in webuse'] = 'This domain cannot be deleted, because it is in use as web-domain';
-$wb['error_client_can_not_add_domain'] = 'You cannot add a new domain';
-$wb['error_client_group_id_empty'] = 'You have to select a customer<br>';
+$wb['add_additional_template_txt'] = 'Dodaj dodatkowy szablon';
+$wb['delete_additional_template_txt'] = 'Usuń dodatkowy szablon';
+$wb['Messaging'] = 'Wiadomości dla klientów';
+$wb['Send email'] = 'Wyślij email';
+$wb['Edit Client Circle'] = 'Edytuj grupy klientów';
+$wb['Domains'] = 'Domeny';
+$wb['domain_txt'] = 'Domena';
+$wb['client_txt'] = 'Klient';
+$wb['error_domain_in mailuse'] = 'Ta domena nie może zostać usunięta ponieważ jest używana jako domena dla poczty email.';
+$wb['error_domain_in webuse'] = 'Ta domena nie może zostać usunięta ponieważ jest używana jako domena dla strony www.';
+$wb['error_client_can_not_add_domain'] = 'Nie możesz dodać nowej domeny';
+$wb['error_client_group_id_empty'] = 'Musisz wybrać klienta<br>';
?>
+
diff --git a/interface/web/client/lib/lang/pl_client.lng b/interface/web/client/lib/lang/pl_client.lng
index 2d7aade174..8cda7bd5d4 100644
--- a/interface/web/client/lib/lang/pl_client.lng
+++ b/interface/web/client/lib/lang/pl_client.lng
@@ -29,20 +29,20 @@ $wb['mobile_txt'] = 'Komórka';
$wb['fax_txt'] = 'Fax';
$wb['email_txt'] = 'E-mail';
$wb['internet_txt'] = 'Strona www';
-$wb['icq_txt'] = 'ICQ';
+$wb['icq_txt'] = 'GG';
$wb['notes_txt'] = 'Notatki';
$wb['company_txt'] = 'Firma';
$wb['title_txt'] = 'Tytuł';
$wb['firstname_txt'] = 'ImiÄ™';
$wb['surname_txt'] = 'Nazwisko';
-$wb['limit_domain_txt'] = 'limit_domen';
-$wb['limit_subdomain_txt'] = 'limit_subdomen';
-$wb['limit_webquota_txt'] = 'limit_pojemnosci_www';
+$wb['limit_domain_txt'] = 'Limit domen';
+$wb['limit_subdomain_txt'] = 'Limit subdomen';
+$wb['limit_webquota_txt'] = 'Limit pojemności www';
$wb['limit_database_txt'] = 'Maksymalna ilość bazy danych';
$wb['limit_cron_txt'] = 'Maksymalna ilość zadań cron';
-$wb['limit_cron_type_txt'] = 'Maksymalny typ zadań cron (chroot i full implikuje url)';
-$wb['limit_cron_frequency_txt'] = 'Minimalny odstęp czasowy między uruchomieniem';
-$wb['ip_address_txt'] = 'adres_ip';
+$wb['limit_cron_type_txt'] = 'Dostępne typy zadań cron (chroot i full implikuje url)';
+$wb['limit_cron_frequency_txt'] = 'Odstęp czasowy między uruchomieniem';
+$wb['ip_address_txt'] = 'Adres IP';
$wb['limit_client_error_notint'] = 'Limit subklientów musi być liczbą.';
$wb['firstname_error_empty'] = 'ImiÄ™ jest puste.';
$wb['contact_error_empty'] = 'Nazwa kontaktu jest pusta.';
@@ -98,46 +98,50 @@ $wb['limit_webdav_user_error_notint'] = 'Limit użytkowników webdav musi być l
$wb['customer_no_txt'] = 'Klient nr';
$wb['vat_id_txt'] = 'NIP';
$wb['required_fields_txt'] = '* Wymagane pola';
-$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
-$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
-$wb['company_id_txt'] = 'Company/Entrepreneur ID';
-$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
-$wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template';
-$wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.';
-$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.';
-$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.';
-$wb['username_error_collision'] = 'The username may not start with the word -web- or -web- followed by a number.';
-$wb['add_additional_template_txt'] = 'Add additional template';
-$wb['delete_additional_template_txt'] = 'Delete additional template';
-$wb['limit_cgi_txt'] = 'CGI available';
-$wb['limit_ssi_txt'] = 'SSI available';
-$wb['limit_perl_txt'] = 'Perl available';
-$wb['limit_ruby_txt'] = 'Ruby available';
-$wb['limit_python_txt'] = 'Python available';
-$wb['force_suexec_txt'] = 'SuEXEC forced';
-$wb['limit_hterror_txt'] = 'Custom error docs available';
-$wb['limit_wildcard_txt'] = 'Wildcard subdomain available';
-$wb['limit_ssl_txt'] = 'SSL available';
-$wb['bank_account_number_txt'] = 'Bank account no.';
-$wb['bank_code_txt'] = 'Bank code';
-$wb['bank_name_txt'] = 'Bank name';
+$wb['limit_mailmailinglist_txt'] = 'Maks. liczba list mailingowych';
+$wb['limit_mailmailinglist_error_notint'] = 'Limit list mailingowych musi być liczbą';
+$wb['company_id_txt'] = 'Regon';
+$wb['limit_openvz_vm_txt'] = 'Maks. liczba serwerów wirtualnych';
+$wb['limit_openvz_vm_template_id_txt'] = 'Wymuś szablon wirtualnych serwerów';
+$wb['limit_openvz_vm_error_notint'] = 'Limit wirtualnych serwerów musi być liczbą';
+$wb['web_php_options_notempty'] = 'Nie wybrano żadnej opcji PHP. Wybierz przynajmniej jedną.';
+$wb['ssh_chroot_notempty'] = 'Nie wybrano żadnej opcji SSH. Wybierz przynajmniej jedną.';
+$wb['username_error_collision'] = 'Nawza użytkownika nie może się zaczynać od słowa -web- lub -web- poprzedzonego numerem.';
+$wb['active_template_additional_txt'] = 'Aktywne dodatki';
+$wb['add_additional_template_txt'] = 'Dodaj dodatkowy szablon';
+$wb['delete_additional_template_txt'] = 'Usuń dodatkowy szablon';
+$wb['limit_cgi_txt'] = 'CGI dostępne';
+$wb['limit_ssi_txt'] = 'SSI dostępne';
+$wb['limit_perl_txt'] = 'Perl dostępny';
+$wb['limit_ruby_txt'] = 'Ruby dostępne';
+$wb['limit_python_txt'] = 'Python dostępny';
+$wb['force_suexec_txt'] = 'Wymuszone SuEXEC';
+$wb['limit_hterror_txt'] = 'Strony błędów użytkownika dostępne';
+$wb['limit_wildcard_txt'] = 'Dostępne domeny wildcard';
+$wb['limit_ssl_txt'] = 'SSL dostępne';
+$wb['bank_account_number_txt'] = 'Numer konta';
+$wb['bank_account_owner_txt'] = 'Właściciel konta';
+$wb['bank_code_txt'] = 'Kod Banku';
+$wb['bank_name_txt'] = 'Nazwa Banku';
$wb['bank_account_iban_txt'] = 'IBAN';
$wb['bank_account_swift_txt'] = 'BIC / Swift';
-$wb['web_limits_txt'] = 'Web Limits';
-$wb['email_limits_txt'] = 'Email Limits';
-$wb['database_limits_txt'] = 'Database Limits';
-$wb['cron_job_limits_txt'] = 'Cron Job Limits';
-$wb['dns_limits_txt'] = 'DNS Limits';
-$wb['virtualization_limits_txt'] = 'Virtualization Limits';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['active_template_additional_txt'] = 'Active Addons';
-$wb['bank_account_owner_txt'] = 'Bank account owner';
-$wb['email_error_isemail'] = 'Please enter a valid email address.';
-$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
-$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
-$wb['paypal_email_txt'] = 'PayPal Email';
-$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb['web_limits_txt'] = 'Limity WWW';
+$wb['email_limits_txt'] = 'Limity E-mail';
+$wb['database_limits_txt'] = 'Limity Baz Danych';
+$wb['cron_job_limits_txt'] = 'Limity Zadań Cron';
+$wb['dns_limits_txt'] = 'Limity DNS';
+$wb['virtualization_limits_txt'] = 'Limity Wirtualizacji';
+$wb['generate_password_txt'] = 'Generuj hasło';
+$wb['repeat_password_txt'] = 'Powtórz hasło';
+$wb['password_mismatch_txt'] = 'Hasła nie pasują';
+$wb['password_match_txt'] = 'Hasła pasują';
+$wb['email_error_isemail'] = 'Proszę wpisać prawidłowy adres e-mail';
+$wb['customer_no_error_unique'] = 'Numer klienta musi być unikalny (lub pusty)';
+$wb['paypal_email_error_isemail'] = 'Proszę wpisać prawidłowe konto e-mail PayPal';
+$wb['paypal_email_txt'] = 'Konto PayPal';
+$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than ';
+$wb['aps_limits_txt'] = 'Limity Instalatora APS';
+$wb['limit_aps_txt'] = 'Maks. liczba instalacji APS';
+$wb['limit_aps_error_notint'] = 'Limit instalacji APS musi być liczbą';
?>
+
diff --git a/interface/web/client/lib/lang/pl_client_circle.lng b/interface/web/client/lib/lang/pl_client_circle.lng
index f98a1447fc..061276809c 100644
--- a/interface/web/client/lib/lang/pl_client_circle.lng
+++ b/interface/web/client/lib/lang/pl_client_circle.lng
@@ -7,3 +7,4 @@ $wb['client_ids_txt'] = 'Clients/Resellers';
$wb['description_txt'] = 'Description';
$wb['active_txt'] = 'Active';
?>
+
diff --git a/interface/web/client/lib/lang/pl_client_circle_list.lng b/interface/web/client/lib/lang/pl_client_circle_list.lng
index 00fd0b3998..b4244484c6 100644
--- a/interface/web/client/lib/lang/pl_client_circle_list.lng
+++ b/interface/web/client/lib/lang/pl_client_circle_list.lng
@@ -8,3 +8,4 @@ $wb['filter_txt'] = 'Filter';
$wb['delete_txt'] = 'Delete';
$wb['active_txt'] = 'Active';
?>
+
diff --git a/interface/web/client/lib/lang/pl_client_del.lng b/interface/web/client/lib/lang/pl_client_del.lng
index 666e12a24c..aab69a43b3 100644
--- a/interface/web/client/lib/lang/pl_client_del.lng
+++ b/interface/web/client/lib/lang/pl_client_del.lng
@@ -4,3 +4,4 @@ $wb['delete_explanation'] = 'Ta akcja usunie następującą liczbę rekordów po
$wb['btn_save_txt'] = 'Usuń klienta';
$wb['btn_cancel_txt'] = 'Anuluj bez usuwania klienta';
?>
+
diff --git a/interface/web/client/lib/lang/pl_client_message.lng b/interface/web/client/lib/lang/pl_client_message.lng
index 12f491ec1d..726f388cc6 100644
--- a/interface/web/client/lib/lang/pl_client_message.lng
+++ b/interface/web/client/lib/lang/pl_client_message.lng
@@ -1,18 +1,19 @@
<?php
-$wb['btn_send_txt'] = 'Send email';
-$wb['btn_cancel_txt'] = 'Cancel';
-$wb['sender_txt'] = 'Sender email address';
-$wb['subject_txt'] = 'Subject';
-$wb['message_txt'] = 'Message';
-$wb['form_legend_client_txt'] = 'Send email message to all clients.';
-$wb['form_legend_admin_txt'] = 'Send email message to all clients and resellers.';
-$wb['sender_invalid_error'] = 'Sender email invalid.';
-$wb['subject_invalid_error'] = 'Subject is empty.';
-$wb['message_invalid_error'] = 'Message is empty.';
-$wb['email_sent_to_txt'] = 'Email sent to:';
-$wb['page_head_txt'] = 'Send customer information';
-$wb['recipient_txt'] = 'Recipient';
-$wb['all_clients_resellers_txt'] = 'All clients and resellers';
-$wb['all_clients_txt'] = 'All clients';
-$wb['variables_txt'] = 'Variables:';
+$wb['btn_send_txt'] = 'Wyślij wiadomość';
+$wb['btn_cancel_txt'] = 'Anuluj';
+$wb['sender_txt'] = 'Adres nadawcy';
+$wb['subject_txt'] = 'Temat';
+$wb['message_txt'] = 'Wiadomość';
+$wb['form_legend_client_txt'] = 'Wyślij wiadomość do wszystkich klientów';
+$wb['form_legend_admin_txt'] = 'Wyślij wiadomość do wszystkich klientów i sprzedawców';
+$wb['sender_invalid_error'] = 'Adres nadawcy jest nieprawidłowy.';
+$wb['subject_invalid_error'] = 'Temat jest pusty!';
+$wb['message_invalid_error'] = 'Wiadomość jest pusta.';
+$wb['email_sent_to_txt'] = 'Email wysłany do:';
+$wb['page_head_txt'] = 'Wyślij informację dla klienta';
+$wb['recipient_txt'] = 'Odbiorca';
+$wb['all_clients_resellers_txt'] = 'Wszyscy klienci i resellerzy';
+$wb['all_clients_txt'] = 'Wszyscy klienci';
+$wb['variables_txt'] = 'Zmienne:';
?>
+
diff --git a/interface/web/client/lib/lang/pl_client_template.lng b/interface/web/client/lib/lang/pl_client_template.lng
index a6f46a716f..cd017fb828 100644
--- a/interface/web/client/lib/lang/pl_client_template.lng
+++ b/interface/web/client/lib/lang/pl_client_template.lng
@@ -54,34 +54,38 @@ $wb['limit_cron_error_frequency'] = 'Limit częstości zadań corn musi być lic
$wb['error_template_name_empty'] = 'Proszę wpisać nazwę szablonu';
$wb['limit_mailaliasdomain_txt'] = 'Maksymalna ilość aliasów domeny e-mail';
$wb['limit_mailaliasdomain_error_notint'] = 'Limit aliasów domeny e-mail musi być liczbą.';
-$wb['limit_web_quota_txt'] = 'Limit przestrzeni';
+$wb['limit_web_quota_txt'] = 'Limit przestrzeni web';
$wb['limit_traffic_quota_txt'] = 'Limit transferu';
$wb['limit_trafficquota_error_notint'] = 'Limit przestrzeni musi być liczbą.';
$wb['template_del_aborted_txt'] = 'Usuwanie przerwane. Istnieje klient używający ciągle tego szablonu.';
-$wb['limit_webdav_user_txt'] = 'Maksymalna ilość użytkowników webdav';
-$wb['limit_webdav_user_error_notint'] = 'Limit użytkowników webdav musi być liczbą.';
-$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
-$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
-$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
-$wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template';
-$wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.';
+$wb['limit_webdav_user_txt'] = 'Maksymalna ilość kont webdav';
+$wb['limit_webdav_user_error_notint'] = 'Limit kont webdav musi być liczbą.';
+$wb['limit_mailmailinglist_txt'] = 'Maks. liczba list mailingowych';
+$wb['limit_mailmailinglist_error_notint'] = 'Limit list mailingowych musi być liczbą';
+$wb['limit_openvz_vm_txt'] = 'Maks. liczba wirtualnych serwerów';
+$wb['limit_openvz_vm_template_id_txt'] = 'Wymuś szablon dla wirtualnych serwerów';
+$wb['limit_openvz_vm_error_notint'] = 'Limit wirtualnych serwerów musi być liczbą';
$wb['ssh_chroot_txt'] = 'Opcje SSH-Chroot';
$wb['web_php_options_txt'] = 'Opcje PHP';
$wb['template_type_txt'] = 'Rodzaj szablonu';
$wb['template_name_txt'] = 'Nazwa szablonu';
-$wb['limit_cgi_txt'] = 'CGI available';
-$wb['limit_ssi_txt'] = 'SSI available';
-$wb['limit_perl_txt'] = 'Perl available';
-$wb['limit_ruby_txt'] = 'Ruby available';
-$wb['limit_python_txt'] = 'Python available';
-$wb['force_suexec_txt'] = 'SuEXEC forced';
-$wb['limit_hterror_txt'] = 'Custom error docs available';
-$wb['limit_wildcard_txt'] = 'Wildcard subdomain available';
-$wb['limit_ssl_txt'] = 'SSL available';
-$wb['web_limits_txt'] = 'Web Limits';
-$wb['email_limits_txt'] = 'Email Limits';
-$wb['database_limits_txt'] = 'Database Limits';
-$wb['cron_job_limits_txt'] = 'Cron Job Limits';
-$wb['dns_limits_txt'] = 'DNS Limits';
-$wb['virtualization_limits_txt'] = 'Virtualization Limits';
+$wb['limit_cgi_txt'] = 'CGI dostępne';
+$wb['limit_ssi_txt'] = 'SSI dostępne';
+$wb['limit_perl_txt'] = 'Perl dostępny';
+$wb['limit_ruby_txt'] = 'Ruby dostępne';
+$wb['limit_python_txt'] = 'Python dostępny';
+$wb['force_suexec_txt'] = 'Wymuszone SuEXEC';
+$wb['limit_hterror_txt'] = 'Dostępne własne strony błędów';
+$wb['limit_wildcard_txt'] = 'Dostępne subdomeny wildcard';
+$wb['limit_ssl_txt'] = 'SSL dostępne';
+$wb['web_limits_txt'] = 'Limity WWW';
+$wb['email_limits_txt'] = 'Limity E-mail';
+$wb['database_limits_txt'] = 'Limity Baz danych';
+$wb['cron_job_limits_txt'] = 'Limit zadań Cron';
+$wb['dns_limits_txt'] = 'Limit DNS';
+$wb['virtualization_limits_txt'] = 'Limit Wirtualizacji';
+$wb['aps_limits_txt'] = 'Limit Instalatora APS';
+$wb['limit_aps_txt'] = 'Maks. liczba instancji APS';
+$wb['limit_aps_error_notint'] = 'Limit instancji APS musi być liczbą';
?>
+
diff --git a/interface/web/client/lib/lang/pl_client_template_list.lng b/interface/web/client/lib/lang/pl_client_template_list.lng
index 06a39761f9..76204419e6 100644
--- a/interface/web/client/lib/lang/pl_client_template_list.lng
+++ b/interface/web/client/lib/lang/pl_client_template_list.lng
@@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Szablon klienta';
$wb['template_type_txt'] = 'Typ';
$wb['template_name_txt'] = 'Nazwa szablonu';
?>
+
diff --git a/interface/web/client/lib/lang/pl_clients_list.lng b/interface/web/client/lib/lang/pl_clients_list.lng
index 026aecdfa4..aa07671641 100644
--- a/interface/web/client/lib/lang/pl_clients_list.lng
+++ b/interface/web/client/lib/lang/pl_clients_list.lng
@@ -7,5 +7,6 @@ $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.';
+$wb['customer_no_txt'] = 'Nr klienta';
?>
+
diff --git a/interface/web/client/lib/lang/pl_domain.lng b/interface/web/client/lib/lang/pl_domain.lng
index 9f3e80ff64..9854e8904f 100644
--- a/interface/web/client/lib/lang/pl_domain.lng
+++ b/interface/web/client/lib/lang/pl_domain.lng
@@ -4,3 +4,4 @@ $wb['domain_error_unique'] = 'Domena o podanej nazwie już istnieje';
$wb['domain_error_regex'] = 'Nazwa domeny jest niedopuszczalna';
$wb['Domain'] = 'Domena';
?>
+
diff --git a/interface/web/client/lib/lang/pl_domain_list.lng b/interface/web/client/lib/lang/pl_domain_list.lng
index e2cac3b934..d31e7dfdcc 100644
--- a/interface/web/client/lib/lang/pl_domain_list.lng
+++ b/interface/web/client/lib/lang/pl_domain_list.lng
@@ -4,3 +4,4 @@ $wb['add_new_record_txt'] = 'Dodaj nowÄ… domenÄ™';
$wb['domain_txt'] = 'Domena';
$wb['user_txt'] = 'Client';
?>
+
diff --git a/interface/web/client/lib/lang/pl_reseller.lng b/interface/web/client/lib/lang/pl_reseller.lng
index 3145e59fc1..8c2dd696f8 100644
--- a/interface/web/client/lib/lang/pl_reseller.lng
+++ b/interface/web/client/lib/lang/pl_reseller.lng
@@ -42,7 +42,7 @@ $wb['limit_database_txt'] = 'Maksymalna ilość bazy danych';
$wb['limit_cron_txt'] = 'Maksymalna ilość zadań crone';
$wb['limit_cron_type_txt'] = 'Maksymalna ilość typów zadań corne (zadania admina oraz sugerowane url)';
$wb['limit_cron_frequency_txt'] = 'Minimalne odstępy między zadaniami';
-$wb['ip_address_txt'] = 'adres_ip';
+$wb['ip_address_txt'] = 'Adres IP';
$wb['limit_client_error_notint'] = 'Ilość klientów musi być liczbą.';
$wb['firstname_error_empty'] = 'ImiÄ™ jest puste.';
$wb['contact_error_empty'] = 'Nazwa kontaktu jest pusta.';
@@ -102,41 +102,45 @@ $wb['limit_mailmailinglist_txt'] = 'Maks. ilość list mailingowych';
$wb['limit_mailaliasdomain_txt'] = 'Maks. ilość aliasów domen e-mail';
$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
$wb['limit_openvz_vm_txt'] = 'Maks. ilość wirtualnych serwerów';
-$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['limit_openvz_vm_template_id_txt'] = 'Wymuś użycie szablonu wirtualnego serwera';
+$wb['limit_openvz_vm_error_notint'] = 'Limit wirtualnych serwerów musi być liczbą';
+$wb['web_php_options_notempty'] = 'Nie wybrano żadnej opcji PHP. Wybierz przynajmniej jedną.';
+$wb['ssh_chroot_notempty'] = 'Nie wybrano żadnej opcji SSH. Wybierz przynajmniej jedną.';
$wb['username_error_collision'] = 'The username may not start with the word -web- or -web- followed by a number.';
-$wb['add_additional_template_txt'] = 'Add additional template';
-$wb['delete_additional_template_txt'] = 'Delete additional template';
-$wb['limit_cgi_txt'] = 'CGI available';
-$wb['limit_ssi_txt'] = 'SSI available';
-$wb['limit_perl_txt'] = 'Perl available';
-$wb['limit_ruby_txt'] = 'Ruby available';
-$wb['limit_python_txt'] = 'Python available';
-$wb['force_suexec_txt'] = 'SuEXEC forced';
-$wb['limit_hterror_txt'] = 'Custom error docs available';
-$wb['limit_wildcard_txt'] = 'Wildcard subdomain available';
-$wb['limit_ssl_txt'] = 'SSL available';
-$wb['web_limits_txt'] = 'Web Limits';
-$wb['email_limits_txt'] = 'Email Limits';
-$wb['database_limits_txt'] = 'Database Limits';
-$wb['cron_job_limits_txt'] = 'Cron Job Limits';
-$wb['dns_limits_txt'] = 'DNS Limits';
-$wb['virtualization_limits_txt'] = 'Virtualization Limits';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['email_error_isemail'] = 'Please enter a valid email address.';
-$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
-$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
-$wb['paypal_email_txt'] = 'PayPal Email';
-$wb['company_id_txt'] = 'Company/Entrepreneur ID';
-$wb['bank_account_number_txt'] = 'Bank account no.';
-$wb['bank_account_owner_txt'] = 'Bank account owner';
-$wb['bank_code_txt'] = 'Bank code';
-$wb['bank_name_txt'] = 'Bank name';
+$wb['add_additional_template_txt'] = 'Dodaj dodatkowy szablon';
+$wb['delete_additional_template_txt'] = 'Usuń dodatkowy szablon';
+$wb['limit_cgi_txt'] = 'CGI dostępne';
+$wb['limit_ssi_txt'] = 'SSI dostępne';
+$wb['limit_perl_txt'] = 'Perl dostępne';
+$wb['limit_ruby_txt'] = 'Ruby dostępne';
+$wb['limit_python_txt'] = 'Python dostępne';
+$wb['force_suexec_txt'] = 'WymuÅ› SuEXEC';
+$wb['limit_hterror_txt'] = 'Własne strony błędów włączone';
+$wb['limit_wildcard_txt'] = 'Dostępne subdomeny wildcard';
+$wb['limit_ssl_txt'] = 'SSL dostępne';
+$wb['web_limits_txt'] = 'Limity WWW';
+$wb['email_limits_txt'] = 'Limity E-mail';
+$wb['database_limits_txt'] = 'Limity bazy danych';
+$wb['cron_job_limits_txt'] = 'Limity zadań Cron';
+$wb['dns_limits_txt'] = 'Limity DNS';
+$wb['virtualization_limits_txt'] = 'Limity Wirtualizacji';
+$wb['generate_password_txt'] = 'Wygeneruj hasło';
+$wb['repeat_password_txt'] = 'Powtórz hasło';
+$wb['password_mismatch_txt'] = 'Hasła nie pasują';
+$wb['password_match_txt'] = 'Hasła pasują do siebie';
+$wb['email_error_isemail'] = 'Podaj poprawny adres email';
+$wb['customer_no_error_unique'] = 'Numer klienta musi być unikalny (lub pusty)';
+$wb['paypal_email_error_isemail'] = 'Podaj poprawny email PayPal';
+$wb['paypal_email_txt'] = 'Konto PayPal';
+$wb['company_id_txt'] = 'Regon';
+$wb['bank_account_number_txt'] = 'Numer konta';
+$wb['bank_account_owner_txt'] = 'Właściciel konta';
+$wb['bank_code_txt'] = 'Kod Banku';
+$wb['bank_name_txt'] = 'Nazwa Banku';
$wb['bank_account_iban_txt'] = 'IBAN';
$wb['bank_account_swift_txt'] = 'BIC / Swift';
+$wb['aps_limits_txt'] = 'Limit instalacji APS';
+$wb['limit_aps_txt'] = 'Maks. liczba instancji APS';
+$wb['limit_aps_error_notint'] = 'Limit instancji APS musi być liczbą';
?>
+
diff --git a/interface/web/client/lib/lang/pl_resellers_list.lng b/interface/web/client/lib/lang/pl_resellers_list.lng
index d26c35f9a9..6b277bfdd3 100644
--- a/interface/web/client/lib/lang/pl_resellers_list.lng
+++ b/interface/web/client/lib/lang/pl_resellers_list.lng
@@ -6,6 +6,7 @@ $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';
+$wb['customer_no_txt'] = 'Nr klienta';
+$wb['username_txt'] = 'Login';
?>
+
diff --git a/interface/web/client/lib/lang/pt_client.lng b/interface/web/client/lib/lang/pt_client.lng
index 340a243003..5798a00512 100644
--- a/interface/web/client/lib/lang/pt_client.lng
+++ b/interface/web/client/lib/lang/pt_client.lng
@@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/pt_client_template.lng b/interface/web/client/lib/lang/pt_client_template.lng
index 8230899a8a..aa90ddc8b8 100644
--- a/interface/web/client/lib/lang/pt_client_template.lng
+++ b/interface/web/client/lib/lang/pt_client_template.lng
@@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits';
$wb['cron_job_limits_txt'] = 'Cron Job Limits';
$wb['dns_limits_txt'] = 'DNS Limits';
$wb['virtualization_limits_txt'] = 'Virtualization Limits';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/pt_reseller.lng b/interface/web/client/lib/lang/pt_reseller.lng
index 87bd1434d1..7e466004de 100644
--- a/interface/web/client/lib/lang/pt_reseller.lng
+++ b/interface/web/client/lib/lang/pt_reseller.lng
@@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code';
$wb['bank_name_txt'] = 'Bank name';
$wb['bank_account_iban_txt'] = 'IBAN';
$wb['bank_account_swift_txt'] = 'BIC / Swift';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/ro_client.lng b/interface/web/client/lib/lang/ro_client.lng
index bbce82597e..5651460a13 100644
--- a/interface/web/client/lib/lang/ro_client.lng
+++ b/interface/web/client/lib/lang/ro_client.lng
@@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/ro_client_template.lng b/interface/web/client/lib/lang/ro_client_template.lng
index 429e61358c..22285a9598 100644
--- a/interface/web/client/lib/lang/ro_client_template.lng
+++ b/interface/web/client/lib/lang/ro_client_template.lng
@@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits';
$wb['cron_job_limits_txt'] = 'Cron Job Limits';
$wb['dns_limits_txt'] = 'DNS Limits';
$wb['virtualization_limits_txt'] = 'Virtualization Limits';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/ro_reseller.lng b/interface/web/client/lib/lang/ro_reseller.lng
index 6d8f0e4d34..91025a9ea8 100644
--- a/interface/web/client/lib/lang/ro_reseller.lng
+++ b/interface/web/client/lib/lang/ro_reseller.lng
@@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code';
$wb['bank_name_txt'] = 'Bank name';
$wb['bank_account_iban_txt'] = 'IBAN';
$wb['bank_account_swift_txt'] = 'BIC / Swift';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/ru_client.lng b/interface/web/client/lib/lang/ru_client.lng
index 5893a19285..b927418b81 100644
--- a/interface/web/client/lib/lang/ru_client.lng
+++ b/interface/web/client/lib/lang/ru_client.lng
@@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/ru_client_template.lng b/interface/web/client/lib/lang/ru_client_template.lng
index 5949f884a4..3738739111 100644
--- a/interface/web/client/lib/lang/ru_client_template.lng
+++ b/interface/web/client/lib/lang/ru_client_template.lng
@@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits';
$wb['cron_job_limits_txt'] = 'Cron Job Limits';
$wb['dns_limits_txt'] = 'DNS Limits';
$wb['virtualization_limits_txt'] = 'Virtualization Limits';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/ru_reseller.lng b/interface/web/client/lib/lang/ru_reseller.lng
index f4fdada447..3c24b30de4 100644
--- a/interface/web/client/lib/lang/ru_reseller.lng
+++ b/interface/web/client/lib/lang/ru_reseller.lng
@@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code';
$wb['bank_name_txt'] = 'Bank name';
$wb['bank_account_iban_txt'] = 'IBAN';
$wb['bank_account_swift_txt'] = 'BIC / Swift';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/se_client.lng b/interface/web/client/lib/lang/se_client.lng
index 910caea924..cbc9917b1f 100644
--- a/interface/web/client/lib/lang/se_client.lng
+++ b/interface/web/client/lib/lang/se_client.lng
@@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/se_client_template.lng b/interface/web/client/lib/lang/se_client_template.lng
index e8c222732e..3e9915bec5 100644
--- a/interface/web/client/lib/lang/se_client_template.lng
+++ b/interface/web/client/lib/lang/se_client_template.lng
@@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits';
$wb['cron_job_limits_txt'] = 'Cron Job Limits';
$wb['dns_limits_txt'] = 'DNS Limits';
$wb['virtualization_limits_txt'] = 'Virtualization Limits';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/se_reseller.lng b/interface/web/client/lib/lang/se_reseller.lng
index 6d8f0e4d34..91025a9ea8 100644
--- a/interface/web/client/lib/lang/se_reseller.lng
+++ b/interface/web/client/lib/lang/se_reseller.lng
@@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code';
$wb['bank_name_txt'] = 'Bank name';
$wb['bank_account_iban_txt'] = 'IBAN';
$wb['bank_account_swift_txt'] = 'BIC / Swift';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/sk_client.lng b/interface/web/client/lib/lang/sk_client.lng
index 91afc026b7..7dea61a9b5 100644
--- a/interface/web/client/lib/lang/sk_client.lng
+++ b/interface/web/client/lib/lang/sk_client.lng
@@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/sk_client_template.lng b/interface/web/client/lib/lang/sk_client_template.lng
index b7765a726a..463bb7019b 100644
--- a/interface/web/client/lib/lang/sk_client_template.lng
+++ b/interface/web/client/lib/lang/sk_client_template.lng
@@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits';
$wb['cron_job_limits_txt'] = 'Cron Job Limits';
$wb['dns_limits_txt'] = 'DNS Limits';
$wb['virtualization_limits_txt'] = 'Virtualization Limits';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/sk_reseller.lng b/interface/web/client/lib/lang/sk_reseller.lng
index 1ee0c4a666..792c131391 100644
--- a/interface/web/client/lib/lang/sk_reseller.lng
+++ b/interface/web/client/lib/lang/sk_reseller.lng
@@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code';
$wb['bank_name_txt'] = 'Bank name';
$wb['bank_account_iban_txt'] = 'IBAN';
$wb['bank_account_swift_txt'] = 'BIC / Swift';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/tr_client.lng b/interface/web/client/lib/lang/tr_client.lng
index 866a5f43a1..13bb60e21a 100644
--- a/interface/web/client/lib/lang/tr_client.lng
+++ b/interface/web/client/lib/lang/tr_client.lng
@@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
$wb['paypal_email_txt'] = 'PayPal Email';
$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/tr_client_template.lng b/interface/web/client/lib/lang/tr_client_template.lng
index 0efac7979a..5a62ed87fd 100644
--- a/interface/web/client/lib/lang/tr_client_template.lng
+++ b/interface/web/client/lib/lang/tr_client_template.lng
@@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits';
$wb['cron_job_limits_txt'] = 'Cron Job Limits';
$wb['dns_limits_txt'] = 'DNS Limits';
$wb['virtualization_limits_txt'] = 'Virtualization Limits';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/lib/lang/tr_reseller.lng b/interface/web/client/lib/lang/tr_reseller.lng
index b6677703fc..ce687c509b 100644
--- a/interface/web/client/lib/lang/tr_reseller.lng
+++ b/interface/web/client/lib/lang/tr_reseller.lng
@@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code';
$wb['bank_name_txt'] = 'Bank name';
$wb['bank_account_iban_txt'] = 'IBAN';
$wb['bank_account_swift_txt'] = 'BIC / Swift';
+$wb['aps_limits_txt'] = 'APS Installer Limits';
+$wb['limit_aps_txt'] = 'Max. number of APS instances';
+$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
?>
diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm
index c17d778ba3..3ad6c9d50b 100644
--- a/interface/web/client/templates/client_edit_limits.htm
+++ b/interface/web/client/templates/client_edit_limits.htm
@@ -296,6 +296,7 @@
</div>
</div>
+<tmpl_if name="is_admin">
<script type="text/javascript">
<!--
function custom_template_selected() {
@@ -318,4 +319,5 @@ jQuery('div.panel_client')
});
//-->
-</script>
\ No newline at end of file
+</script>
+</tmpl_if>
\ No newline at end of file
diff --git a/interface/web/dashboard/lib/lang/cz.lng b/interface/web/dashboard/lib/lang/cz.lng
index 9d2a3211cb..297b6397fa 100644
--- a/interface/web/dashboard/lib/lang/cz.lng
+++ b/interface/web/dashboard/lib/lang/cz.lng
@@ -2,3 +2,5 @@
$wb['welcome_user_txt'] = 'VÃtejte %s';
$wb['available_modules_txt'] = 'Dostupné moduly';
?>
+
+
diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng b/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
index bedb98f865..9810ba9808 100644
--- a/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
@@ -28,3 +28,5 @@ $wb['limit_client_txt'] = 'PoÄet klientů';
$wb['limit_database_txt'] = 'PoÄet databázÃ';
$wb['limit_mailmailinglist_txt'] = 'PoÄet e-mailových konferencÃ';
?>
+
+
diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng b/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng
index 66275f1d05..a25ba21fc3 100644
--- a/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng
@@ -1,3 +1,5 @@
<?php
$wb['available_modules_txt'] = 'Dostupné moduly';
?>
+
+
diff --git a/interface/web/dashboard/lib/lang/pl.lng b/interface/web/dashboard/lib/lang/pl.lng
index 5ef320a86e..9a8b6694f1 100644
--- a/interface/web/dashboard/lib/lang/pl.lng
+++ b/interface/web/dashboard/lib/lang/pl.lng
@@ -2,3 +2,4 @@
$wb['welcome_user_txt'] = 'Witaj %s';
$wb['available_modules_txt'] = 'Dostępne moduły';
?>
+
diff --git a/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng b/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng
index d69a551bd0..b0c28ec7e2 100644
--- a/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng
@@ -28,3 +28,4 @@ $wb['limit_client_txt'] = 'Liczba klientów';
$wb['limit_database_txt'] = 'Liczba baz danych';
$wb['limit_mailmailinglist_txt'] = 'Liczba list mailingowych';
?>
+
diff --git a/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng b/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng
index fafcc61480..e329a2517d 100644
--- a/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng
@@ -1,3 +1,4 @@
<?php
$wb['available_modules_txt'] = 'Dostępne moduły';
?>
+
diff --git a/interface/web/designer/lib/lang/cz.lng b/interface/web/designer/lib/lang/cz.lng
index acb6c3546c..dd815ad751 100644
--- a/interface/web/designer/lib/lang/cz.lng
+++ b/interface/web/designer/lib/lang/cz.lng
@@ -1,2 +1,4 @@
<?php
?>
+
+
diff --git a/interface/web/designer/lib/lang/cz_form_edit.lng b/interface/web/designer/lib/lang/cz_form_edit.lng
index 75bf5a5606..2b04eb968d 100644
--- a/interface/web/designer/lib/lang/cz_form_edit.lng
+++ b/interface/web/designer/lib/lang/cz_form_edit.lng
@@ -22,3 +22,5 @@ $wb['auth_preset_perm_user_txt'] = 'Opr. Uživatel';
$wb['auth_preset_perm_group_txt'] = 'Opr. Skupina';
$wb['auth_preset_perm_other_txt'] = 'Opr. OstatnÃ';
?>
+
+
diff --git a/interface/web/designer/lib/lang/cz_form_list.lng b/interface/web/designer/lib/lang/cz_form_list.lng
index 1e677f2410..46241cfd5e 100644
--- a/interface/web/designer/lib/lang/cz_form_list.lng
+++ b/interface/web/designer/lib/lang/cz_form_list.lng
@@ -5,3 +5,5 @@ $wb['module_txt'] = 'Modul';
$wb['title_txt'] = 'Titulek';
$wb['description_txt'] = 'Popis';
?>
+
+
diff --git a/interface/web/designer/lib/lang/cz_form_show.lng b/interface/web/designer/lib/lang/cz_form_show.lng
index 381414bdf0..45829d54de 100644
--- a/interface/web/designer/lib/lang/cz_form_show.lng
+++ b/interface/web/designer/lib/lang/cz_form_show.lng
@@ -16,3 +16,5 @@ $wb['module_del_txt'] = 'Delete the module and all subdirectories?';
$wb['menu_del_txt'] = 'Delete menu with all menuitems?';
$wb['item_del_txt'] = 'Delete menuitem?';
?>
+
+
diff --git a/interface/web/designer/lib/lang/cz_module_edit.lng b/interface/web/designer/lib/lang/cz_module_edit.lng
index 847896d302..f6da04e2e7 100644
--- a/interface/web/designer/lib/lang/cz_module_edit.lng
+++ b/interface/web/designer/lib/lang/cz_module_edit.lng
@@ -20,3 +20,5 @@ $wb['description_txt'] = '
<b>Rada:</b> Všechny cesty jsou relativně k adresáři web web.
';
?>
+
+
diff --git a/interface/web/designer/lib/lang/cz_module_list.lng b/interface/web/designer/lib/lang/cz_module_list.lng
index b568f69d63..b37872cedc 100644
--- a/interface/web/designer/lib/lang/cz_module_list.lng
+++ b/interface/web/designer/lib/lang/cz_module_list.lng
@@ -3,3 +3,5 @@ $wb['list_head_txt'] = 'Backend modul';
$wb['module_txt'] = 'Modul';
$wb['title_txt'] = 'Titulek';
?>
+
+
diff --git a/interface/web/designer/lib/lang/cz_module_nav_edit.lng b/interface/web/designer/lib/lang/cz_module_nav_edit.lng
index 01f5df68fb..8c21ea4a7d 100644
--- a/interface/web/designer/lib/lang/cz_module_nav_edit.lng
+++ b/interface/web/designer/lib/lang/cz_module_nav_edit.lng
@@ -4,3 +4,5 @@ $wb['header_txt'] = 'Navi vlastnosti';
$wb['save_txt'] = 'Uložit';
$wb['cancel_txt'] = 'Zrušit';
?>
+
+
diff --git a/interface/web/designer/lib/lang/cz_module_nav_item_edit.lng b/interface/web/designer/lib/lang/cz_module_nav_item_edit.lng
index 17e31319d7..65f6c765a6 100644
--- a/interface/web/designer/lib/lang/cz_module_nav_item_edit.lng
+++ b/interface/web/designer/lib/lang/cz_module_nav_item_edit.lng
@@ -6,3 +6,5 @@ $wb['header_txt'] = 'Navi properties';
$wb['save_txt'] = 'Uložit';
$wb['cancel_txt'] = 'Zrušit';
?>
+
+
diff --git a/interface/web/designer/lib/lang/cz_module_show.lng b/interface/web/designer/lib/lang/cz_module_show.lng
index 95c2d85723..605d11de08 100644
--- a/interface/web/designer/lib/lang/cz_module_show.lng
+++ b/interface/web/designer/lib/lang/cz_module_show.lng
@@ -14,3 +14,5 @@ $wb['module_del_txt'] = 'Wollen Sie das Modul und alle im Modul angelegten Datei
$wb['menu_del_txt'] = 'Wollen Sie das Menü mit allen Untereinträgen löschen?';
$wb['item_del_txt'] = 'Wollen Sie den Menüeintrag löschen?';
?>
+
+
diff --git a/interface/web/designer/lib/lang/pl.lng b/interface/web/designer/lib/lang/pl.lng
index acb6c3546c..29f4a51efe 100644
--- a/interface/web/designer/lib/lang/pl.lng
+++ b/interface/web/designer/lib/lang/pl.lng
@@ -1,2 +1,3 @@
<?php
?>
+
diff --git a/interface/web/designer/lib/lang/pl_form_edit.lng b/interface/web/designer/lib/lang/pl_form_edit.lng
index ee4f4c4100..cff6b51b22 100644
--- a/interface/web/designer/lib/lang/pl_form_edit.lng
+++ b/interface/web/designer/lib/lang/pl_form_edit.lng
@@ -22,3 +22,4 @@ $wb['auth_preset_perm_user_txt'] = 'Stały użytkownik';
$wb['auth_preset_perm_group_txt'] = 'Stała grupa';
$wb['auth_preset_perm_other_txt'] = 'Stała inna';
?>
+
diff --git a/interface/web/designer/lib/lang/pl_form_list.lng b/interface/web/designer/lib/lang/pl_form_list.lng
index ac8572277c..a0aacc35bd 100644
--- a/interface/web/designer/lib/lang/pl_form_list.lng
+++ b/interface/web/designer/lib/lang/pl_form_list.lng
@@ -5,3 +5,4 @@ $wb['module_txt'] = 'Moduł';
$wb['title_txt'] = 'Tytuł';
$wb['description_txt'] = 'Opis';
?>
+
diff --git a/interface/web/designer/lib/lang/pl_form_show.lng b/interface/web/designer/lib/lang/pl_form_show.lng
index db62af16b9..fbb82a426b 100644
--- a/interface/web/designer/lib/lang/pl_form_show.lng
+++ b/interface/web/designer/lib/lang/pl_form_show.lng
@@ -16,3 +16,4 @@ $wb['module_del_txt'] = 'Usunąć moduł i wszystkie podkatalogi?';
$wb['menu_del_txt'] = 'Usunąć menu i wszystkie jego elementy?';
$wb['item_del_txt'] = 'UsunÄ…c element menu?';
?>
+
diff --git a/interface/web/designer/lib/lang/pl_module_edit.lng b/interface/web/designer/lib/lang/pl_module_edit.lng
index b87d04b182..d05cb9fadf 100644
--- a/interface/web/designer/lib/lang/pl_module_edit.lng
+++ b/interface/web/designer/lib/lang/pl_module_edit.lng
@@ -20,3 +20,4 @@ $wb['description_txt'] = '
<b>Podpowiedź:</b> Wszystkie ścieżki są względne według strony www..
';
?>
+
diff --git a/interface/web/designer/lib/lang/pl_module_list.lng b/interface/web/designer/lib/lang/pl_module_list.lng
index 308d1c688b..2751633fa2 100644
--- a/interface/web/designer/lib/lang/pl_module_list.lng
+++ b/interface/web/designer/lib/lang/pl_module_list.lng
@@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Nazwa modułu';
$wb['module_txt'] = 'Moduł';
$wb['title_txt'] = 'Tytuł';
?>
+
diff --git a/interface/web/designer/lib/lang/pl_module_nav_edit.lng b/interface/web/designer/lib/lang/pl_module_nav_edit.lng
index fe8edabf66..54095f906d 100644
--- a/interface/web/designer/lib/lang/pl_module_nav_edit.lng
+++ b/interface/web/designer/lib/lang/pl_module_nav_edit.lng
@@ -4,3 +4,4 @@ $wb['header_txt'] = 'Parametry nawigacyjne';
$wb['save_txt'] = 'Zapisz';
$wb['cancel_txt'] = 'Usuń';
?>
+
diff --git a/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng b/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng
index 779b3b4b3b..1e2fde46f0 100644
--- a/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng
+++ b/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng
@@ -6,3 +6,4 @@ $wb['header_txt'] = 'Parametry nawigacyjne';
$wb['save_txt'] = 'Zapisz';
$wb['cancel_txt'] = 'Usuń';
?>
+
diff --git a/interface/web/designer/lib/lang/pl_module_show.lng b/interface/web/designer/lib/lang/pl_module_show.lng
index 9b98c49482..6daf82e396 100644
--- a/interface/web/designer/lib/lang/pl_module_show.lng
+++ b/interface/web/designer/lib/lang/pl_module_show.lng
@@ -14,3 +14,4 @@ $wb['module_del_txt'] = 'Czy na pewno chcesz usunąć moduł wraz z wszystkimi p
$wb['menu_del_txt'] = 'Czy na pewno chcesz usunąć menu z wszystkimi wpisami?';
$wb['item_del_txt'] = 'Czy na pewno chcesz usunąć wpis w menu?';
?>
+
diff --git a/interface/web/dns/dns_mx_edit.php b/interface/web/dns/dns_mx_edit.php
index d78ae720ed..73483f7ca3 100644
--- a/interface/web/dns/dns_mx_edit.php
+++ b/interface/web/dns/dns_mx_edit.php
@@ -108,6 +108,17 @@ class page_action extends tform_actions {
parent::onSubmit();
}
+ function onInsert() {
+ global $app, $conf;
+
+ // Check if record is existing already
+ $duplicate_mx = $app->db->queryOneRecord("SELECT * FROM dns_rr WHERE zone = ".$app->functions->intval($this->dataRecord["zone"])." AND name = '".$this->dataRecord["name"]."' AND type = '".$this->dataRecord["type"]."' AND data = '".$this->dataRecord["data"]."' AND ".$app->tform->getAuthSQL('r'));
+
+ if(is_array($duplicate_mx) && !empty($duplicate_mx)) $app->error($app->tform->wordbook["duplicate_mx_record_txt"]);
+
+ parent::onInsert();
+ }
+
function onAfterInsert() {
global $app, $conf;
diff --git a/interface/web/dns/form/dns_a.tform.php b/interface/web/dns/form/dns_a.tform.php
index bbd0d0107a..d6e93ffb5b 100644
--- a/interface/web/dns/form/dns_a.tform.php
+++ b/interface/web/dns/form/dns_a.tform.php
@@ -86,7 +86,7 @@ $form["tabs"]['dns'] = array (
'type' => 'TOLOWER')
),
'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^[\w\.\-\*]{0,64}$/',
+ 'regex' => '/^[\a-zA-Z0-9\.\-\*]{0,64}$/',
'errmsg'=> 'name_error_regex'),
),
'default' => '',
diff --git a/interface/web/dns/lib/lang/cz.lng b/interface/web/dns/lib/lang/cz.lng
index f143b0b922..876a5751e2 100644
--- a/interface/web/dns/lib/lang/cz.lng
+++ b/interface/web/dns/lib/lang/cz.lng
@@ -20,3 +20,5 @@ $wb['Templates'] = 'Å ablony DNS';
$wb['Secondary Zones'] = 'Sekundárnà DNS zóny';
$wb['Import Zone File'] = 'Importovat vybraný DNS zonový soubor';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_a.lng b/interface/web/dns/lib/lang/cz_dns_a.lng
index 8b8c206b63..6d9a24d64c 100644
--- a/interface/web/dns/lib/lang/cz_dns_a.lng
+++ b/interface/web/dns/lib/lang/cz_dns_a.lng
@@ -14,3 +14,5 @@ $wb['data_error_empty'] = 'IP adresa je prázdná';
$wb['data_error_regex'] = 'IP adresa má chybný formát';
$wb['data_error_duplicate'] = 'Duplikace A záznamu';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_a_list.lng b/interface/web/dns/lib/lang/cz_dns_a_list.lng
index 249808688f..9f16d3c36c 100644
--- a/interface/web/dns/lib/lang/cz_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_a_list.lng
@@ -11,5 +11,7 @@ $wb['type_txt'] = 'Typ';
$wb['add_new_record_txt'] = 'Přidat DNS A záznam';
$wb['page_txt'] = 'Stránka';
$wb['page_of_txt'] = 'z';
-$wb['delete_confirmation'] = 'SkuteÄnÄ› chcete smazat tento záznam?';
+$wb['delete_confirmation'] = 'SkuteÄnÄ› chcete smazat tento záznam ?';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_aaaa.lng b/interface/web/dns/lib/lang/cz_dns_aaaa.lng
index 26c6ae9064..143885f969 100644
--- a/interface/web/dns/lib/lang/cz_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/cz_dns_aaaa.lng
@@ -13,3 +13,5 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.';
$wb['data_error_empty'] = 'IP adresa je prázdná';
$wb['data_error_regex'] = 'IP adresa má chybný formát';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_alias.lng b/interface/web/dns/lib/lang/cz_dns_alias.lng
index 572478a98b..c25dc7b3eb 100644
--- a/interface/web/dns/lib/lang/cz_dns_alias.lng
+++ b/interface/web/dns/lib/lang/cz_dns_alias.lng
@@ -13,3 +13,5 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.';
$wb['data_error_empty'] = 'CÃlový Hostname je prázdný';
$wb['data_error_regex'] = 'CÃlový Hostname má chybný formát';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_cname.lng b/interface/web/dns/lib/lang/cz_dns_cname.lng
index 0c5ebe21e1..29587c8b15 100644
--- a/interface/web/dns/lib/lang/cz_dns_cname.lng
+++ b/interface/web/dns/lib/lang/cz_dns_cname.lng
@@ -12,5 +12,7 @@ $wb['name_error_empty'] = 'Hostname je prázdný.';
$wb['name_error_regex'] = 'Hostname má chybný formát.';
$wb['data_error_empty'] = 'CÃlový hostname je prázdný';
$wb['data_error_regex'] = 'CÃlový hostname má chybný formát';
-$wb['data_error_duplicate'] = 'Duplicate A-Record or CNAME-Record';
+$wb['data_error_duplicate'] = 'Duplikace A záznamu nebo CNAME-záznamu';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_hinfo.lng b/interface/web/dns/lib/lang/cz_dns_hinfo.lng
index 5f67d5e826..3633fdb80b 100644
--- a/interface/web/dns/lib/lang/cz_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/cz_dns_hinfo.lng
@@ -13,3 +13,5 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.';
$wb['data_error_empty'] = 'Informace o hostovi je prázdná';
$wb['data_error_regex'] = 'Informace o hostovi má chybný formát';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_import.lng b/interface/web/dns/lib/lang/cz_dns_import.lng
index 4020f8a976..9734b3e947 100644
--- a/interface/web/dns/lib/lang/cz_dns_import.lng
+++ b/interface/web/dns/lib/lang/cz_dns_import.lng
@@ -4,7 +4,7 @@ $wb['client_txt'] = 'Klient';
$wb['btn_save_txt'] = 'Importovat vybraný DNS zonový soubor';
$wb['btn_cancel_txt'] = 'Zrušit';
$wb['domain_txt'] = 'Doména';
-$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
+$wb['zone_file_successfully_imported_txt'] = 'Zónový soubor byl úspěšně importován !';
$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
$wb['zonefile_to_import_txt'] = 'Vybrat soubor s DNS zónou ';
$wb['domain_field_desc_txt'] = 'Může být ponechána nevyplněná, pokud je název domény názvem souboru nebo je v obsahu souboru s DNS zónou.';
@@ -12,3 +12,5 @@ $wb['title'] = 'Importovat soubory zón';
$wb['no_file_uploaded_error'] = 'Nelze odeslat DNS zonový soubor';
$wb['zone_file_import_txt'] = 'Importovat vybraný DNS zonový soubor';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_mx.lng b/interface/web/dns/lib/lang/cz_dns_mx.lng
index 9bb5ce280e..e0e475bf14 100644
--- a/interface/web/dns/lib/lang/cz_dns_mx.lng
+++ b/interface/web/dns/lib/lang/cz_dns_mx.lng
@@ -3,7 +3,7 @@ $wb['server_id_txt'] = 'Server';
$wb['zone_txt'] = 'Zóna';
$wb['name_txt'] = 'Hostname';
$wb['type_txt'] = 'Typ';
-$wb['data_txt'] = 'Hostname mailserveru';
+$wb['data_txt'] = 'Hostname e-mailového serveru';
$wb['aux_txt'] = 'Priorita';
$wb['ttl_txt'] = 'TTL';
$wb['active_txt'] = 'AktivnÃ';
@@ -11,6 +11,8 @@ $wb['limit_dns_record_txt'] = 'Dosažen maximálnà poÄet DNS záznamů pro Vá
$wb['no_zone_perm'] = 'Nemáte oprávněnà přidat záznam do této zóny.';
$wb['name_error_empty'] = 'Hostname je prázdný.';
$wb['name_error_regex'] = 'Hostname má chybný formát.';
-$wb['data_error_empty'] = 'Hostname mailserveru je prázdný';
-$wb['data_error_regex'] = 'Hostname mailserveru má chybný formát';
+$wb['data_error_empty'] = 'Hostname e-mailového serveru je prázdný';
+$wb['data_error_regex'] = 'Hostname e-mailového serveru má chybný formát';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_ns.lng b/interface/web/dns/lib/lang/cz_dns_ns.lng
index ba38e2a65e..4b011849f8 100644
--- a/interface/web/dns/lib/lang/cz_dns_ns.lng
+++ b/interface/web/dns/lib/lang/cz_dns_ns.lng
@@ -13,3 +13,5 @@ $wb['name_error_regex'] = 'Zóna má chybný formát.';
$wb['data_error_empty'] = 'Jmenný server je prázdný';
$wb['data_error_regex'] = 'Jmenný server má chybný formát';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_ptr.lng b/interface/web/dns/lib/lang/cz_dns_ptr.lng
index 9617ea5852..33f116631e 100644
--- a/interface/web/dns/lib/lang/cz_dns_ptr.lng
+++ b/interface/web/dns/lib/lang/cz_dns_ptr.lng
@@ -13,3 +13,5 @@ $wb['name_error_regex'] = 'Název má chybný formát.';
$wb['data_error_empty'] = 'Kanonický hostname je prázdný';
$wb['data_error_regex'] = 'Kanonického hostname má chybný formát';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_rp.lng b/interface/web/dns/lib/lang/cz_dns_rp.lng
index 8b1e7e442e..bcebed3ef3 100644
--- a/interface/web/dns/lib/lang/cz_dns_rp.lng
+++ b/interface/web/dns/lib/lang/cz_dns_rp.lng
@@ -13,3 +13,5 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.';
$wb['data_error_empty'] = 'Odpovědná osoba je prázdná';
$wb['data_error_regex'] = 'Odpovědná osoba má chybný formát';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_slave.lng b/interface/web/dns/lib/lang/cz_dns_slave.lng
index 16617f6c59..b8cc5f139f 100644
--- a/interface/web/dns/lib/lang/cz_dns_slave.lng
+++ b/interface/web/dns/lib/lang/cz_dns_slave.lng
@@ -15,3 +15,5 @@ $wb['eg_domain_tld'] = 'napÅ™. domena.cz';
$wb['ipv4_form_txt'] = 'IPV4 formát, např. 1.2.3.4';
$wb['secondary_zone_txt'] = 'Sekundárnà DNS zóna';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_slave_list.lng b/interface/web/dns/lib/lang/cz_dns_slave_list.lng
index 1e0a3d0106..eead22a8b7 100644
--- a/interface/web/dns/lib/lang/cz_dns_slave_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_slave_list.lng
@@ -7,3 +7,5 @@ $wb['ns_txt'] = 'NS';
$wb['add_new_record_txt'] = 'Přidat sekundárnà DNS zónu';
$wb['eg_domain_tld'] = 'napÅ™. domena.cz';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_soa.lng b/interface/web/dns/lib/lang/cz_dns_soa.lng
index f770f8257c..8bc1eb8c53 100644
--- a/interface/web/dns/lib/lang/cz_dns_soa.lng
+++ b/interface/web/dns/lib/lang/cz_dns_soa.lng
@@ -29,10 +29,12 @@ $wb['eg_domain_tld'] = 'napÅ™. domena.cz';
$wb['eg_ns1_domain_tld'] = 'napÅ™. ns1.domena.cz';
$wb['eg_webmaster_domain_tld'] = 'napÅ™. webmaster@domena.cz';
$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'Doménu nenà možné mÄ›nit. ProsÃm, kontaktujte svého správce, pokud chcete zmÄ›nit název domény.';
-$wb['refresh_range_error'] = 'Min. Refresh time is 60 seconds.';
-$wb['retry_range_error'] = 'Min. Retry time is 60 seconds.';
-$wb['expire_range_error'] = 'Min. Expire time is 60 seconds.';
-$wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.';
-$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
-$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
+$wb['refresh_range_error'] = 'Min. Äas obnovenà je 60 sekund.';
+$wb['retry_range_error'] = 'Min. Äas nového opakovánà je 60 sekund.';
+$wb['expire_range_error'] = 'Min. expiraÄnà doba je 60 sekund.';
+$wb['minimum_range_error'] = 'Minimálnà doba je 60 sekund.';
+$wb['ttl_range_error'] = 'Min. TTL Äas je 60 sekund.';
+$wb['xfer_error_regex'] = 'Také oznámÃ: ProsÃm, použijte IP adresu.';
?>
+
+
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 beba8a22b2..999e5bd68d 100644
--- a/interface/web/dns/lib/lang/cz_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_soa_list.lng
@@ -8,3 +8,5 @@ $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 6b6708fc01..60d844ac9b 100644
--- a/interface/web/dns/lib/lang/cz_dns_srv.lng
+++ b/interface/web/dns/lib/lang/cz_dns_srv.lng
@@ -17,3 +17,5 @@ $wb['data_error_regex'] = 'Záznam serveru má chybný formát';
$wb['srv_error_regex'] = 'Neplatný formát záznamu serveru. Záznam serveru musàobsahovat 3 textové Å™etÄ›zce oddÄ›lené mezerami.';
$wb['aux_txt'] = 'Priority';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_template.lng b/interface/web/dns/lib/lang/cz_dns_template.lng
index be4ac0e949..b91b3ae257 100644
--- a/interface/web/dns/lib/lang/cz_dns_template.lng
+++ b/interface/web/dns/lib/lang/cz_dns_template.lng
@@ -4,3 +4,5 @@ $wb['fields_txt'] = 'Pole';
$wb['template_txt'] = 'Å ablona';
$wb['visible_txt'] = 'Viditelný';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_template_list.lng b/interface/web/dns/lib/lang/cz_dns_template_list.lng
index bdd6e18204..a7218a4976 100644
--- a/interface/web/dns/lib/lang/cz_dns_template_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_template_list.lng
@@ -4,3 +4,5 @@ $wb['visible_txt'] = 'Viditelný';
$wb['name_txt'] = 'Název';
$wb['add_new_record_txt'] = 'Přidat záznam';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_txt.lng b/interface/web/dns/lib/lang/cz_dns_txt.lng
index 76047b0ceb..8784c7e2b4 100644
--- a/interface/web/dns/lib/lang/cz_dns_txt.lng
+++ b/interface/web/dns/lib/lang/cz_dns_txt.lng
@@ -13,3 +13,5 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.';
$wb['data_error_empty'] = 'Text je prázdný';
$wb['data_error_regex'] = 'Text má chybný formát';
?>
+
+
diff --git a/interface/web/dns/lib/lang/cz_dns_wizard.lng b/interface/web/dns/lib/lang/cz_dns_wizard.lng
index 8d68e6167d..2c54eaf228 100644
--- a/interface/web/dns/lib/lang/cz_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/cz_dns_wizard.lng
@@ -9,7 +9,7 @@ $wb['email_txt'] = 'E-mail';
$wb['ns1_txt'] = 'NS 1';
$wb['ns2_txt'] = 'NS 2';
$wb['ip_txt'] = 'IP adresa';
-$wb['error_origin_empty'] = 'Origin je prázdný.';
+$wb['error_origin_empty'] = 'Zdroj je prázdný.';
$wb['error_ns_empty'] = 'NS je prázdný.';
$wb['error_mbox_empty'] = 'Mbox je prázdný.';
$wb['error_refresh_empty'] = 'Refresh je prázdný.';
@@ -36,3 +36,5 @@ $wb['globalsearch_suggestions_text_txt'] = 'Návrhy';
$wb['list_head_txt'] = 'Průvodce vytvoÅ™enÃm DNS zóny';
$wb['list_desc_txt'] = 'Vytvořenà DNS zóny pomocà průvodce';
?>
+
+
diff --git a/interface/web/dns/lib/lang/de_dns_mx.lng b/interface/web/dns/lib/lang/de_dns_mx.lng
index 2968a1322b..f229c2cc6e 100644
--- a/interface/web/dns/lib/lang/de_dns_mx.lng
+++ b/interface/web/dns/lib/lang/de_dns_mx.lng
@@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'Der Hostname ist leer.';
$wb['name_error_regex'] = 'Der Hostname hat das falsche Format.';
$wb['data_error_empty'] = 'Mailserver Hostname ist leer';
$wb['data_error_regex'] = 'Mailserver Hostname Format ist ungültig';
+$wb["duplicate_mx_record_txt"] = 'Doppelter MX-Eintrag.';
?>
diff --git a/interface/web/dns/lib/lang/en_dns_mx.lng b/interface/web/dns/lib/lang/en_dns_mx.lng
index d0bee5eba3..d61f592ec2 100644
--- a/interface/web/dns/lib/lang/en_dns_mx.lng
+++ b/interface/web/dns/lib/lang/en_dns_mx.lng
@@ -13,4 +13,5 @@ $wb["name_error_empty"] = 'The hostname is empty.';
$wb["name_error_regex"] = 'The hostname has the wrong format.';
$wb["data_error_empty"] = 'Mailserver hostname empty';
$wb["data_error_regex"] = 'Mailserver hostname format invalid';
+$wb["duplicate_mx_record_txt"] = 'Duplicate MX record.';
?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/en_dns_soa.lng b/interface/web/dns/lib/lang/en_dns_soa.lng
index 271572d2a7..65e3f92b09 100644
--- a/interface/web/dns/lib/lang/en_dns_soa.lng
+++ b/interface/web/dns/lib/lang/en_dns_soa.lng
@@ -23,7 +23,7 @@ $wb["mbox_error_empty"] = 'Email is empty.';
$wb["mbox_error_regex"] = 'Email format invalid.';
$wb["also_notify_txt"] = 'Also Notify';
$wb['also_notify_error_regex'] = 'Also notify: Please use an IP address.';
-$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
+$wb['xfer_error_regex'] = 'Xfer: Please use an IP address.';
$wb["update_acl_txt"] = 'Update ACL';
$wb['seconds_txt'] = 'Seconds';
$wb['eg_domain_tld'] = 'e.g. domain.tld';
diff --git a/interface/web/dns/lib/lang/pl.lng b/interface/web/dns/lib/lang/pl.lng
index 29a4a9b4b9..6fca5921ab 100644
--- a/interface/web/dns/lib/lang/pl.lng
+++ b/interface/web/dns/lib/lang/pl.lng
@@ -17,6 +17,7 @@ $wb['DNS TXT'] = 'DNS TXT';
$wb['DNS Wizard'] = 'Kreator DNS';
$wb['Add DNS Zone'] = 'Dodaj strefÄ™ DNS';
$wb['Templates'] = 'Szablony';
-$wb['Secondary Zones'] = 'Secondary Zones';
-$wb['Import Zone File'] = 'Import Zone File';
+$wb['Secondary Zones'] = 'Strefy Zapasowe';
+$wb['Import Zone File'] = 'Import pliku Strefy';
?>
+
diff --git a/interface/web/dns/lib/lang/pl_dns_a.lng b/interface/web/dns/lib/lang/pl_dns_a.lng
index f9b0997731..3aa2d6855e 100644
--- a/interface/web/dns/lib/lang/pl_dns_a.lng
+++ b/interface/web/dns/lib/lang/pl_dns_a.lng
@@ -14,3 +14,4 @@ $wb['data_error_empty'] = 'Adres IP jest pusty.';
$wb['data_error_regex'] = 'Adres IP ma niepoprawny format.';
$wb['data_error_duplicate'] = 'Duplikat wpisu A.';
?>
+
diff --git a/interface/web/dns/lib/lang/pl_dns_a_list.lng b/interface/web/dns/lib/lang/pl_dns_a_list.lng
index 89fac7f967..2fe8fbd6c7 100644
--- a/interface/web/dns/lib/lang/pl_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/pl_dns_a_list.lng
@@ -6,10 +6,11 @@ $wb['zone_txt'] = 'Strefa';
$wb['name_txt'] = 'Nazwa';
$wb['data_txt'] = 'Data';
$wb['aux_txt'] = 'Priorytet';
-$wb['ttl_txt'] = 'TTL';
$wb['type_txt'] = 'Typ';
$wb['add_new_record_txt'] = 'Dodaj nowy rekord A DNS';
$wb['page_txt'] = 'Strona';
$wb['page_of_txt'] = 'z';
$wb['delete_confirmation'] = 'Czy jesteś pewny, że chcesz usunąć ten wpis?';
+$wb['ttl_txt'] = 'TTL';
?>
+
diff --git a/interface/web/dns/lib/lang/pl_dns_aaaa.lng b/interface/web/dns/lib/lang/pl_dns_aaaa.lng
index f8e44e58f3..8c90e3fe5f 100644
--- a/interface/web/dns/lib/lang/pl_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/pl_dns_aaaa.lng
@@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Nazwa serwera ma niepoprawny format.';
$wb['data_error_empty'] = 'Adres IP jest pusty.';
$wb['data_error_regex'] = 'Adres IP ma niepoprawny format.';
?>
+
diff --git a/interface/web/dns/lib/lang/pl_dns_alias.lng b/interface/web/dns/lib/lang/pl_dns_alias.lng
index a950805e3b..44c377e38f 100644
--- a/interface/web/dns/lib/lang/pl_dns_alias.lng
+++ b/interface/web/dns/lib/lang/pl_dns_alias.lng
@@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Nazwa serwera ma zły format.';
$wb['data_error_empty'] = 'Docelowa nazwa serwera jest pusta.';
$wb['data_error_regex'] = 'Docelowa nazwa serwera ma niepoprawny format.';
?>
+
diff --git a/interface/web/dns/lib/lang/pl_dns_cname.lng b/interface/web/dns/lib/lang/pl_dns_cname.lng
index c007ea6f4c..5fbe693566 100644
--- a/interface/web/dns/lib/lang/pl_dns_cname.lng
+++ b/interface/web/dns/lib/lang/pl_dns_cname.lng
@@ -14,3 +14,4 @@ $wb['data_error_empty'] = 'Docelowa nazwa serwera jest pusta.';
$wb['data_error_regex'] = 'Docelowa nazwa serwera ma niepoprawny format.';
$wb['data_error_duplicate'] = 'Zdublowany rekord A lub CNAME.';
?>
+
diff --git a/interface/web/dns/lib/lang/pl_dns_hinfo.lng b/interface/web/dns/lib/lang/pl_dns_hinfo.lng
index d408e14328..18f3b9f4f6 100644
--- a/interface/web/dns/lib/lang/pl_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/pl_dns_hinfo.lng
@@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Nazwa serwera ma niepoprawny format.';
$wb['data_error_empty'] = 'Informacje o serwerze sÄ… puste.';
$wb['data_error_regex'] = 'Informacje o serwerze majÄ… niepoprawny format.';
?>
+
diff --git a/interface/web/dns/lib/lang/pl_dns_import.lng b/interface/web/dns/lib/lang/pl_dns_import.lng
index 2d1fe083ea..b6941851c0 100644
--- a/interface/web/dns/lib/lang/pl_dns_import.lng
+++ b/interface/web/dns/lib/lang/pl_dns_import.lng
@@ -1,14 +1,15 @@
<?php
$wb['server_id_txt'] = 'Server';
-$wb['client_txt'] = 'Client';
-$wb['btn_save_txt'] = 'Import Zonefile';
-$wb['btn_cancel_txt'] = 'Cancel';
-$wb['domain_txt'] = 'Domain';
-$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
-$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
-$wb['zonefile_to_import_txt'] = 'Zone File';
-$wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
-$wb['title'] = 'Import Zone Files';
-$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
-$wb['zone_file_import_txt'] = 'Zone File Import';
+$wb['client_txt'] = 'Klient';
+$wb['btn_save_txt'] = 'Import pliku strefy';
+$wb['btn_cancel_txt'] = 'Anuluj';
+$wb['domain_txt'] = 'Domena';
+$wb['zone_file_successfully_imported_txt'] = 'Strefa została poprawnie zaimportowana';
+$wb['error_no_valid_zone_file_txt'] = 'Struktura pliku strefy jest nieprawidłowa';
+$wb['zonefile_to_import_txt'] = 'Plik strefy';
+$wb['domain_field_desc_txt'] = 'Może być puste jeżeli nazwa domeny jest w nazwie pliku lub w treści pliku';
+$wb['title'] = 'Importuj pliki strefy';
+$wb['no_file_uploaded_error'] = 'Nie załadowany żaden plik';
+$wb['zone_file_import_txt'] = 'Import pliku strefy';
?>
+
diff --git a/interface/web/dns/lib/lang/pl_dns_mx.lng b/interface/web/dns/lib/lang/pl_dns_mx.lng
index 4a3936a1b4..d244013dec 100644
--- a/interface/web/dns/lib/lang/pl_dns_mx.lng
+++ b/interface/web/dns/lib/lang/pl_dns_mx.lng
@@ -14,3 +14,4 @@ $wb['name_error_regex'] = 'Nazwa serwera ma zły format.';
$wb['data_error_empty'] = 'Nazwa serwera poczty e-mail jest pusta.';
$wb['data_error_regex'] = 'Nazwa serwera poczty e-mail ma niepoprawny format.';
?>
+
diff --git a/interface/web/dns/lib/lang/pl_dns_ns.lng b/interface/web/dns/lib/lang/pl_dns_ns.lng
index 18d7efd6cd..d82dc4887f 100644
--- a/interface/web/dns/lib/lang/pl_dns_ns.lng
+++ b/interface/web/dns/lib/lang/pl_dns_ns.lng
@@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Strefa ma zły format.';
$wb['data_error_empty'] = 'Nazwa serwera jest pusta.';
$wb['data_error_regex'] = 'Nazwa serwera ma zły format.';
?>
+
diff --git a/interface/web/dns/lib/lang/pl_dns_ptr.lng b/interface/web/dns/lib/lang/pl_dns_ptr.lng
index eae39817a0..eeb03d6524 100644
--- a/interface/web/dns/lib/lang/pl_dns_ptr.lng
+++ b/interface/web/dns/lib/lang/pl_dns_ptr.lng
@@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Nazwa ma zły format.';
$wb['data_error_empty'] = 'Standardowa nazwa serwera jest pusta';
$wb['data_error_regex'] = 'Standardowa nazwa serwera ma zły format';
?>
+
diff --git a/interface/web/dns/lib/lang/pl_dns_rp.lng b/interface/web/dns/lib/lang/pl_dns_rp.lng
index 43cbc51225..587c7353a7 100644
--- a/interface/web/dns/lib/lang/pl_dns_rp.lng
+++ b/interface/web/dns/lib/lang/pl_dns_rp.lng
@@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Nazwa serwera ma zły format.';
$wb['data_error_empty'] = 'Musisz podać osobę odpowiedzialna.';
$wb['data_error_regex'] = 'Nazwa osoby odpowiedzialnej ma niepoprawny format.';
?>
+
diff --git a/interface/web/dns/lib/lang/pl_dns_slave.lng b/interface/web/dns/lib/lang/pl_dns_slave.lng
index b0c0265af2..115dfc6215 100644
--- a/interface/web/dns/lib/lang/pl_dns_slave.lng
+++ b/interface/web/dns/lib/lang/pl_dns_slave.lng
@@ -11,7 +11,8 @@ $wb['origin_error_empty'] = 'Strefa jest pusta';
$wb['origin_error_unique'] = 'Jest już rekord w tej strefie.';
$wb['origin_error_regex'] = 'Strefa ma niepoprawny format.';
$wb['ns_error_regex'] = 'NS ma niepoprawny format.';
-$wb['eg_domain_tld'] = 'e.g. domain.tld.';
-$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
-$wb['secondary_zone_txt'] = 'Secondary DNS Zone';
+$wb['eg_domain_tld'] = 'np. domena.pl.';
+$wb['ipv4_form_txt'] = 'notacja IPv4 - np. 127.0.0.1';
+$wb['secondary_zone_txt'] = 'Zapasowa Strefa DNS';
?>
+
diff --git a/interface/web/dns/lib/lang/pl_dns_slave_list.lng b/interface/web/dns/lib/lang/pl_dns_slave_list.lng
index bbdb368f1d..010d78f36e 100644
--- a/interface/web/dns/lib/lang/pl_dns_slave_list.lng
+++ b/interface/web/dns/lib/lang/pl_dns_slave_list.lng
@@ -7,3 +7,4 @@ $wb['ns_txt'] = 'NS';
$wb['add_new_record_txt'] = 'Dodaj nowÄ… zapasowÄ… strefÄ™ DNS';
$wb['eg_domain_tld'] = 'np. domena.pl.';
?>
+
diff --git a/interface/web/dns/lib/lang/pl_dns_soa.lng b/interface/web/dns/lib/lang/pl_dns_soa.lng
index ea63910f6b..c30b17be58 100644
--- a/interface/web/dns/lib/lang/pl_dns_soa.lng
+++ b/interface/web/dns/lib/lang/pl_dns_soa.lng
@@ -27,12 +27,13 @@ $wb['update_acl_txt'] = 'Zaktualizuj ACL';
$wb['seconds_txt'] = 'Sekund';
$wb['eg_domain_tld'] = 'np. domena.pl';
$wb['eg_ns1_domain_tld'] = 'np. ns1.domena.pl';
-$wb['eg_webmaster_domain_tld'] = 'np. webmaster@domena.pl';
-$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.';
-$wb['refresh_range_error'] = 'Min. Refresh time is 60 seconds.';
-$wb['retry_range_error'] = 'Min. Retry time is 60 seconds.';
-$wb['expire_range_error'] = 'Min. Expire time is 60 seconds.';
-$wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.';
-$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
-$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
+$wb['eg_webmaster_domain_tld'] = 'np. webmaster.domena.pl';
+$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'Domena nie może być zmieniona. Prześlij prośbę o zmianę do Administratora.';
+$wb['xfer_error_regex'] = 'Także powiadom: Proszę użyć adresu IP';
+$wb['refresh_range_error'] = 'Min. czas odświeżania wynosi 60 sekund';
+$wb['retry_range_error'] = 'Min. czas powtórzenia wynosi 60 sekund';
+$wb['expire_range_error'] = 'Min. czas przedawnienia wynosi 60 sekund';
+$wb['minimum_range_error'] = 'Min. czas minimalny wynosi 60 sekund';
+$wb['ttl_range_error'] = 'Min. czas TTL wynosi 60 sekund';
?>
+
diff --git a/interface/web/dns/lib/lang/pl_dns_soa_list.lng b/interface/web/dns/lib/lang/pl_dns_soa_list.lng
index d440e05469..0b17c903f1 100644
--- a/interface/web/dns/lib/lang/pl_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/pl_dns_soa_list.lng
@@ -8,3 +8,4 @@ $wb['mbox_txt'] = 'E-mail';
$wb['add_new_record_txt'] = 'Dodaj nowÄ… strefÄ™ DNS (SOA)';
$wb['add_new_record_wizard_txt'] = 'Dodaj nowÄ… strefÄ™ DNS za pomocÄ… Kreatora';
?>
+
diff --git a/interface/web/dns/lib/lang/pl_dns_srv.lng b/interface/web/dns/lib/lang/pl_dns_srv.lng
index 9d6127d329..228df530f3 100644
--- a/interface/web/dns/lib/lang/pl_dns_srv.lng
+++ b/interface/web/dns/lib/lang/pl_dns_srv.lng
@@ -3,9 +3,6 @@ $wb['server_id_txt'] = 'Serwer';
$wb['zone_txt'] = 'Strefa';
$wb['name_txt'] = 'Nazwa serwera';
$wb['type_txt'] = 'typ';
-$wb['target_txt'] = 'Target';
-$wb['weight_txt'] = 'Weight';
-$wb['port_txt'] = 'Port';
$wb['ttl_txt'] = 'TTL';
$wb['active_txt'] = 'Aktywny';
$wb['limit_dns_record_txt'] = 'Maksymalna ilość wpisów DNS dla Twojego konta została przekroczona.';
@@ -16,4 +13,8 @@ $wb['data_error_empty'] = 'Wpis serwera jest pusty';
$wb['data_error_regex'] = 'Wpis serwera ma niepoprawny format';
$wb['srv_error_regex'] = 'Niepoprawny format rekordu serwera. Rekord serwera musi zawierać 3 łańcuchy znakowe oddzielone spacjami.';
$wb['aux_txt'] = 'Priorytet';
+$wb['target_txt'] = 'Cel';
+$wb['weight_txt'] = 'Waga';
+$wb['port_txt'] = 'Port';
?>
+
diff --git a/interface/web/dns/lib/lang/pl_dns_template.lng b/interface/web/dns/lib/lang/pl_dns_template.lng
index f3e7563577..fc7a0d6f92 100644
--- a/interface/web/dns/lib/lang/pl_dns_template.lng
+++ b/interface/web/dns/lib/lang/pl_dns_template.lng
@@ -4,3 +4,4 @@ $wb['fields_txt'] = 'Pola';
$wb['template_txt'] = 'Szablon';
$wb['visible_txt'] = 'Widoczność';
?>
+
diff --git a/interface/web/dns/lib/lang/pl_dns_template_list.lng b/interface/web/dns/lib/lang/pl_dns_template_list.lng
index 7deac3b2fa..a74e0c52f4 100644
--- a/interface/web/dns/lib/lang/pl_dns_template_list.lng
+++ b/interface/web/dns/lib/lang/pl_dns_template_list.lng
@@ -4,3 +4,4 @@ $wb['visible_txt'] = 'Widoczność';
$wb['name_txt'] = 'Nazwa';
$wb['add_new_record_txt'] = 'Dodaj nowy wpis';
?>
+
diff --git a/interface/web/dns/lib/lang/pl_dns_txt.lng b/interface/web/dns/lib/lang/pl_dns_txt.lng
index f84620ed3a..324bf06aa1 100644
--- a/interface/web/dns/lib/lang/pl_dns_txt.lng
+++ b/interface/web/dns/lib/lang/pl_dns_txt.lng
@@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Nazwa serwera ma zły format.';
$wb['data_error_empty'] = 'Tekst jest pusty.';
$wb['data_error_regex'] = 'Tekst ma zły format.';
?>
+
diff --git a/interface/web/dns/lib/lang/pl_dns_wizard.lng b/interface/web/dns/lib/lang/pl_dns_wizard.lng
index 1323c43afa..8bf1cfa254 100644
--- a/interface/web/dns/lib/lang/pl_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/pl_dns_wizard.lng
@@ -26,13 +26,14 @@ $wb['error_domain_regex'] = 'Domena zawiera niepoprawne znaki.';
$wb['error_ns1_regex'] = 'NS1 zawiera niepoprawne znaki.';
$wb['error_ns2_regex'] = 'NS2 zawiera niepoprawne znaki.';
$wb['error_email_regex'] = 'Pole E-mail nie zawiera poprawnego adresu e-mail.';
-$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['list_head_txt'] = 'Kreator Stref DNS';
+$wb['list_desc_txt'] = 'Utwórz strefę DNS za pomocą Kreatora';
+$wb['dns_zone_txt'] = 'Strefa DNS';
+$wb['globalsearch_resultslimit_of_txt'] = 'z';
+$wb['globalsearch_resultslimit_results_txt'] = 'wyników';
+$wb['globalsearch_noresults_text_txt'] = 'Brak wyników';
+$wb['globalsearch_noresults_limit_txt'] = '0 wyników';
+$wb['globalsearch_searchfield_watermark_txt'] = 'Szukaj';
+$wb['globalsearch_suggestions_text_txt'] = 'Sugestie';
?>
+
diff --git a/interface/web/help/faq_list.php b/interface/web/help/faq_list.php
index 96d281a602..df69273884 100644
--- a/interface/web/help/faq_list.php
+++ b/interface/web/help/faq_list.php
@@ -29,9 +29,9 @@ if(!$hf_section)
$app->listform_actions->SQLExtWhere = "hf_section = $hf_section";
-$res = $app->db->queryOneRecord("SELECT hfs_name FROM help_faq_sections WHERE hfs_id=$hf_section");
+if($hf_section) $res = $app->db->queryOneRecord("SELECT hfs_name FROM help_faq_sections WHERE hfs_id=$hf_section");
// Start the form rendering and action ahndling
echo "<h2>FAQ: ".$res['hfs_name']."</h2>";
-$app->listform_actions->onLoad();
+if($hf_section) $app->listform_actions->onLoad();
?>
diff --git a/interface/web/help/lib/lang/cz.lng b/interface/web/help/lib/lang/cz.lng
index 18f8f210b7..721aaf388e 100644
--- a/interface/web/help/lib/lang/cz.lng
+++ b/interface/web/help/lib/lang/cz.lng
@@ -12,3 +12,5 @@ $wb['Manage Sections'] = 'Spravovat sekce';
$wb['Manage Questions'] = 'Spravovat dotazy';
$wb['Add a Question & Answer Pair'] = 'PÅ™idat otázku a odpovÄ›Ä';
?>
+
+
diff --git a/interface/web/help/lib/lang/cz_faq_form.lng b/interface/web/help/lib/lang/cz_faq_form.lng
index 73feee6955..dc951a40ab 100644
--- a/interface/web/help/lib/lang/cz_faq_form.lng
+++ b/interface/web/help/lib/lang/cz_faq_form.lng
@@ -4,3 +4,5 @@ $wb['faq_question_txt'] = 'Otázka';
$wb['faq_answer_txt'] = 'OdpovÄ›Ä';
$wb['faq_section_txt'] = 'Sekce';
?>
+
+
diff --git a/interface/web/help/lib/lang/cz_faq_manage_questions_list.lng b/interface/web/help/lib/lang/cz_faq_manage_questions_list.lng
index a9488445ca..ab5d07c4e1 100644
--- a/interface/web/help/lib/lang/cz_faq_manage_questions_list.lng
+++ b/interface/web/help/lib/lang/cz_faq_manage_questions_list.lng
@@ -7,3 +7,5 @@ $wb['faq_sections_txt'] = 'Sekce';
$wb['faq_faq_questions_txt'] = 'Často kladené dotazy';
$wb['faq_new_question_txt'] = 'Přidat nový dotaz';
?>
+
+
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..15eb20ad58 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,5 @@
<?php
$wb['edit_txt'] = 'Edit';
?>
+
+
diff --git a/interface/web/help/lib/lang/cz_help_faq_sections_list.lng b/interface/web/help/lib/lang/cz_help_faq_sections_list.lng
index 967b0abfcd..60906e5d3e 100644
--- a/interface/web/help/lib/lang/cz_help_faq_sections_list.lng
+++ b/interface/web/help/lib/lang/cz_help_faq_sections_list.lng
@@ -6,3 +6,5 @@ $wb['faq_sections_txt'] = 'Sekce';
$wb['faq_faq_sections_txt'] = 'Sekce FAQ';
$wb['faq_new_section_txt'] = 'Přidat novou sekci';
?>
+
+
diff --git a/interface/web/help/lib/lang/cz_support_message.lng b/interface/web/help/lib/lang/cz_support_message.lng
index 6c27284432..63bce28898 100644
--- a/interface/web/help/lib/lang/cz_support_message.lng
+++ b/interface/web/help/lib/lang/cz_support_message.lng
@@ -6,3 +6,5 @@ $wb['message_txt'] = 'Zpráva';
$wb['tstamp_txt'] = 'ÄŒasové razÃtko';
$wb['reply_txt'] = 'Odpovědět';
?>
+
+
diff --git a/interface/web/help/lib/lang/cz_support_message_list.lng b/interface/web/help/lib/lang/cz_support_message_list.lng
index 8629a2f8a1..3a2c9a90d9 100644
--- a/interface/web/help/lib/lang/cz_support_message_list.lng
+++ b/interface/web/help/lib/lang/cz_support_message_list.lng
@@ -4,3 +4,5 @@ $wb['sender_id_txt'] = 'OdesÃlatel';
$wb['subject_txt'] = 'Předmět';
$wb['add_new_record_txt'] = 'Vytvořit zprávu pro podporu';
?>
+
+
diff --git a/interface/web/help/lib/lang/pl.lng b/interface/web/help/lib/lang/pl.lng
index 6d9412c7a8..3120f36cb8 100644
--- a/interface/web/help/lib/lang/pl.lng
+++ b/interface/web/help/lib/lang/pl.lng
@@ -4,7 +4,7 @@ $wb['Message'] = 'Wiadomość';
$wb['Send message'] = 'Wyślij wiadomość';
$wb['View messages'] = 'Pokaż wiadomość';
$wb['Support'] = 'Pomoc';
-$wb['About ISPConfig'] = 'O ISPConfig';
+$wb['About ISPConfig'] = 'Informacje o ISPConfig';
$wb['Version'] = 'Wersja';
$wb['Frequently Asked Questions'] = 'Pomoc Techniczna';
$wb['FAQ Sections'] = 'Sekcje FAQ';
@@ -12,3 +12,4 @@ $wb['Manage Sections'] = 'ZarzÄ…dzaj sekcjami';
$wb['Add a Question & Answer Pair'] = 'Dodaj nowe pytanie i odpowiedź';
$wb['Manage Questions'] = 'ZarzÄ…dzaj pytaniami';
?>
+
diff --git a/interface/web/help/lib/lang/pl_faq_form.lng b/interface/web/help/lib/lang/pl_faq_form.lng
index a39383e99e..6495e6352d 100644
--- a/interface/web/help/lib/lang/pl_faq_form.lng
+++ b/interface/web/help/lib/lang/pl_faq_form.lng
@@ -4,3 +4,4 @@ $wb['faq_question_txt'] = 'Pytanie';
$wb['faq_answer_txt'] = 'Odpowiedź';
$wb['faq_section_txt'] = 'Sekcja';
?>
+
diff --git a/interface/web/help/lib/lang/pl_faq_manage_questions_list.lng b/interface/web/help/lib/lang/pl_faq_manage_questions_list.lng
index 4c07503eee..c50ff019ac 100644
--- a/interface/web/help/lib/lang/pl_faq_manage_questions_list.lng
+++ b/interface/web/help/lib/lang/pl_faq_manage_questions_list.lng
@@ -7,3 +7,4 @@ $wb['faq_sections_txt'] = 'Sekcja';
$wb['faq_faq_questions_txt'] = 'Pomoc Techniczna';
$wb['faq_new_question_txt'] = 'Dodaj nowe pytanie i odpowiedź';
?>
+
diff --git a/interface/web/help/lib/lang/pl_faq_sections_form.lng b/interface/web/help/lib/lang/pl_faq_sections_form.lng
index d4bb7ef944..21615bd07c 100644
--- a/interface/web/help/lib/lang/pl_faq_sections_form.lng
+++ b/interface/web/help/lib/lang/pl_faq_sections_form.lng
@@ -1,3 +1,4 @@
<?php
$wb['faq_section_name_txt'] = 'Nazwa sekcji';
?>
+
diff --git a/interface/web/help/lib/lang/pl_help_faq_list.lng b/interface/web/help/lib/lang/pl_help_faq_list.lng
index 072e3edbd2..10a98c50cf 100644
--- a/interface/web/help/lib/lang/pl_help_faq_list.lng
+++ b/interface/web/help/lib/lang/pl_help_faq_list.lng
@@ -1,3 +1,4 @@
<?php
$wb['edit_txt'] = 'Edycja';
?>
+
diff --git a/interface/web/help/lib/lang/pl_help_faq_sections_list.lng b/interface/web/help/lib/lang/pl_help_faq_sections_list.lng
index e21792dfd7..53a56a9289 100644
--- a/interface/web/help/lib/lang/pl_help_faq_sections_list.lng
+++ b/interface/web/help/lib/lang/pl_help_faq_sections_list.lng
@@ -6,3 +6,4 @@ $wb['faq_sections_txt'] = 'Sekcje';
$wb['faq_faq_sections_txt'] = 'Sekcje FAQ';
$wb['faq_new_section_txt'] = 'Dodaj nowÄ… sekcjÄ™';
?>
+
diff --git a/interface/web/help/lib/lang/pl_support_message.lng b/interface/web/help/lib/lang/pl_support_message.lng
index 5758dadec2..63f2feb2ae 100644
--- a/interface/web/help/lib/lang/pl_support_message.lng
+++ b/interface/web/help/lib/lang/pl_support_message.lng
@@ -4,5 +4,6 @@ $wb['sender_id_txt'] = 'ID nadawcy';
$wb['subject_txt'] = 'Temat';
$wb['message_txt'] = 'Wiadomość';
$wb['tstamp_txt'] = 'Kalendarz';
-$wb['reply_txt'] = 'Reply';
+$wb['reply_txt'] = 'Odpowiedź';
?>
+
diff --git a/interface/web/help/lib/lang/pl_support_message_list.lng b/interface/web/help/lib/lang/pl_support_message_list.lng
index bc3285694b..13c678e3b9 100644
--- a/interface/web/help/lib/lang/pl_support_message_list.lng
+++ b/interface/web/help/lib/lang/pl_support_message_list.lng
@@ -4,3 +4,4 @@ $wb['sender_id_txt'] = 'Nadawca';
$wb['subject_txt'] = 'Temat';
$wb['add_new_record_txt'] = 'Wyślij wiadomość';
?>
+
diff --git a/interface/web/login/index.php b/interface/web/login/index.php
index a158422f89..2c596f8b81 100644
--- a/interface/web/login/index.php
+++ b/interface/web/login/index.php
@@ -213,7 +213,7 @@ class login_index {
// check if the user theme is valid
if($_SESSION['s']['user']['theme'] != 'default') {
$tmp_path = ISPC_THEMES_PATH."/".$_SESSION['s']['user']['theme'];
- if(!@is_dir($tmp_path) || !@file_exists($tmp_path."/ISPC_VERSION") || trim(file_get_contents($tmp_path."/ISPC_VERSION")) != ISPC_APP_VERSION) {
+ if(!@is_dir($tmp_path) || !@file_exists($tmp_path."/ispconfig_version") || trim(file_get_contents($tmp_path."/ispconfig_version")) != ISPC_APP_VERSION) {
// fall back to default theme if this one is not compatible with current ispc version
$_SESSION['s']['user']['theme'] = 'default';
$_SESSION['s']['theme'] = 'default';
diff --git a/interface/web/login/lib/lang/cz.lng b/interface/web/login/lib/lang/cz.lng
index a89f5f32ef..a65862acc0 100644
--- a/interface/web/login/lib/lang/cz.lng
+++ b/interface/web/login/lib/lang/cz.lng
@@ -1,11 +1,11 @@
<?php
$wb['error_user_password_empty'] = 'Uživatelské jméno nebo heslo je prázdné.';
$wb['error_user_password_incorrect'] = 'Uživatelské jméno nebo heslo je špatně.';
-$wb['error_user_blocked'] = 'Uživatel blokován.';
-$wb['error_user_too_many_logins'] = 'PÅ™ÃliÅ¡ mnoho nesprávných pÅ™ihlášenÃ, zkuste to za 15 minut znova';
+$wb['error_user_blocked'] = 'Uživatel je blokován.';
+$wb['error_user_too_many_logins'] = 'PÅ™ÃliÅ¡ mnoho nesprávných pÅ™ihlášenÃ, zkuste to za 15 minut znovu';
$wb['pass_reset_txt'] = 'Bude Vám vygenerováno a zasláno nové heslo na e-mail, pokud VaÅ¡e adresa zadaná nÞe odpovÃdá adrese ve VaÅ¡em klientském nastavenÃ.';
$wb['pw_reset'] = 'Heslo bylo resetováno a zasláno na Váš e-mail.';
-$wb['pw_error'] = 'Uživatelské jméno nebo e-mail neodpovÃdá.';
+$wb['pw_error'] = 'Uživatelské jméno nebo e-mail nesouhlasÃ.';
$wb['pw_error_noinput'] = 'ProsÃm zadejte uživatelské jméno a e-mail.';
$wb['pw_reset_mail_msg'] = 'Vaše heslo do ISPConfigu bylo resetováno. Nové heslo je: ';
$wb['pw_reset_mail_title'] = 'Heslo do ISPConfigu bylo resetováno.';
@@ -22,3 +22,5 @@ $wb['pw_button_txt'] = 'Znovu odeslat heslo';
$wb['email_txt'] = 'E-mail';
$wb['theme_not_compatible'] = 'Zvolené téma nenà kompatibilnà s aktuálnà verzà ISPConfig. Zkontrolujte prosÃm, zda nenà nová verze tématu.<br />Výchozà motiv byl aktivován automaticky.';
?>
+
+
diff --git a/interface/web/login/lib/lang/pl.lng b/interface/web/login/lib/lang/pl.lng
index 2a7e58f6d6..109af558f2 100644
--- a/interface/web/login/lib/lang/pl.lng
+++ b/interface/web/login/lib/lang/pl.lng
@@ -1,24 +1,25 @@
<?php
-$wb['error_user_password_empty'] = 'Pusta nazwa użytkownika lub hasło.';
-$wb['error_user_password_incorrect'] = 'Niepoprawna nazwa użytownika lub hasło.';
-$wb['error_user_blocked'] = 'Konto użytkownika zostało zablokowane.';
-$wb['error_user_too_many_logins'] = 'Zbyt dużo niepoprawnych logowań. Prosimy spróbować ponownie za 15 minut.';
$wb['pass_reset_txt'] = 'Nowe hasło zostanie wygenerowane i wysłane na Twój adres e-mail, jeśli podany adres e-mail będzie pasował do tego w ustawieniach Twojego profilu.';
$wb['pw_reset'] = 'Nowe hasło zostało wygenerowane i wysłane na Twój adres e-mail.';
$wb['pw_error'] = 'Nazwa użytkownika lub e-mail nie pasują do siebie.';
$wb['pw_error_noinput'] = 'Podaj nazwę użytkownika i adres e-mail.';
-$wb['pw_reset_mail_msg'] = 'Hasło do Twojego panelu w ISPConfig 3 zostało z resetowane. Twoje nowe hasło to: ';
-$wb['pw_reset_mail_title'] = 'Hasło do paneli w ISPConfig 3 zostało z resetowane.';
+$wb['pw_reset_mail_msg'] = 'Hasło do Twojego panelu w ISPConfig 3 zostało zresetowane. Twoje nowe hasło to: ';
+$wb['pw_reset_mail_title'] = 'Hasło do panelu w ISPConfig 3 zostało zresetowane.';
$wb['user_regex_error'] = 'Nazwa użytkownika zawiera niedozwolone znaki lub jest dłuższa niż 64 znaki.';
$wb['pw_error_length'] = 'Długość hasła jest > 64 znaki.';
+$wb['error_user_password_empty'] = 'Pusta nazwa użytkownika lub hasło.';
+$wb['error_user_password_incorrect'] = 'Niepoprawna nazwa użytownika lub hasło.';
+$wb['error_user_blocked'] = 'Konto użytkownika zostało zablokowane.';
+$wb['error_user_too_many_logins'] = 'Zbyt dużo niepoprawnych logowań. Prosimy spróbować ponownie za 15 minut.';
$wb['username_txt'] = 'Nazwa użytkownika';
$wb['password_txt'] = 'Hasło';
$wb['login_button_txt'] = 'Zaloguj';
-$wb['pw_lost_txt'] = 'Password lost';
-$wb['error_maintenance_mode'] = 'This ISPConfig installation is currently under maintenance. We should be back shortly. Thank you for your patience.';
$wb['login_txt'] = 'Login';
-$wb['pw_reset_txt'] = 'Password reset';
-$wb['pw_button_txt'] = 'Resend password';
-$wb['email_txt'] = 'Email';
-$wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.<br />The default theme as been activated automatically.';
+$wb['pw_lost_txt'] = 'Zapomniałem hasła';
+$wb['pw_reset_txt'] = 'Reset hasła';
+$wb['pw_button_txt'] = 'Prześlij hasło ponownie';
+$wb['email_txt'] = 'E-mail';
+$wb['error_maintenance_mode'] = 'Ta instalacja ISPConfig jest aktualnie w trakcje modernizacji. Wracamy niebawem - proszę o cierpliwość.';
+$wb['theme_not_compatible'] = 'Wybrany temat nie jest kompatybilny z aktualną wersją ISPConfig. Proszę wybrać nową wersję tematu.<br />Został aktywowany automatycznie domyślny temat.';
?>
+
diff --git a/interface/web/mail/form/mail_user_filter.tform.php b/interface/web/mail/form/mail_user_filter.tform.php
index 2ea37233ce..8962e79ee6 100644
--- a/interface/web/mail/form/mail_user_filter.tform.php
+++ b/interface/web/mail/form/mail_user_filter.tform.php
@@ -112,7 +112,7 @@ $form["tabs"]['filter'] = array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^[a-zA-Z0-9\.\-\_\ ]{0,100}$/',
+ 'regex' => '/^[\p{Latin}0-9\.\-\_\ ]{0,100}$/u',
'errmsg'=> 'target_error_regex'),
),
'default' => '',
diff --git a/interface/web/mail/lib/lang/cz.lng b/interface/web/mail/lib/lang/cz.lng
index 6a5afe0685..6b5f3fc131 100644
--- a/interface/web/mail/lib/lang/cz.lng
+++ b/interface/web/mail/lib/lang/cz.lng
@@ -46,3 +46,5 @@ $wb['Relay Recipients'] = 'Relay adresáti';
$wb['Statistics'] = 'Statistiky';
$wb['Mailbox quota'] = 'Mailbox kvóta';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_alias.lng b/interface/web/mail/lib/lang/cz_mail_alias.lng
index 605e06b3c8..414e1023c8 100644
--- a/interface/web/mail/lib/lang/cz_mail_alias.lng
+++ b/interface/web/mail/lib/lang/cz_mail_alias.lng
@@ -12,3 +12,5 @@ $wb['domain_txt'] = 'Doména';
$wb['duplicate_email_alias_txt'] = 'Tento e-mail alias již existuje.';
$wb['source_txt'] = 'Alias';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_alias_list.lng b/interface/web/mail/lib/lang/cz_mail_alias_list.lng
index de8cc2ef2a..0d8f779c33 100644
--- a/interface/web/mail/lib/lang/cz_mail_alias_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_alias_list.lng
@@ -6,3 +6,5 @@ $wb['destination_txt'] = 'CÃl';
$wb['email_txt'] = 'E-mail';
$wb['add_new_record_txt'] = 'Přidat nový e-mailový alias';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng b/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng
index 74611c2de0..e0cde68350 100644
--- a/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng
+++ b/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng
@@ -9,3 +9,5 @@ $wb['source_error_empty'] = 'Zdrojová doména je prázdná.';
$wb['source_error_unique'] = 'Duplikovánà zdrojové domény.';
$wb['source_error_regex'] = 'Chybná zdrojová doména.';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng
index fd850d6f5f..cfc0154d84 100644
--- a/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng
@@ -5,3 +5,5 @@ $wb['source_txt'] = 'Zdroj';
$wb['destination_txt'] = 'CÃl';
$wb['add_new_record_txt'] = 'Přidat doménový alias';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_blacklist.lng b/interface/web/mail/lib/lang/cz_mail_blacklist.lng
index e1e6dab48f..4719142aff 100644
--- a/interface/web/mail/lib/lang/cz_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/cz_mail_blacklist.lng
@@ -7,3 +7,5 @@ $wb['source_error_notempty'] = 'Adresa je prázdná.';
$wb['type_txt'] = 'Typ';
$wb['limit_mailfilter_txt'] = 'Dosažen maximálnà poÄet email filtrů pro Váš úÄet.';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng b/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng
index 0ef1d3417c..fbf6e2d230 100644
--- a/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng
@@ -8,3 +8,5 @@ $wb['recipient_txt'] = 'PÅ™Ãjemce (adresát)';
$wb['add_new_record_txt'] = 'PÅ™idat záznam na Äernou listinu';
$wb['access_txt'] = 'PÅ™Ãstup';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_content_filter.lng b/interface/web/mail/lib/lang/cz_mail_content_filter.lng
index 459ca228a2..1405881fbb 100644
--- a/interface/web/mail/lib/lang/cz_mail_content_filter.lng
+++ b/interface/web/mail/lib/lang/cz_mail_content_filter.lng
@@ -7,3 +7,5 @@ $wb['action_txt'] = 'Akce';
$wb['active_txt'] = 'AktivnÃ';
$wb['pattern_error_empty'] = 'Vzor je prázdný.';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_content_filter_list.lng b/interface/web/mail/lib/lang/cz_mail_content_filter_list.lng
index da9709e7f9..6e7ebf5186 100644
--- a/interface/web/mail/lib/lang/cz_mail_content_filter_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_content_filter_list.lng
@@ -6,3 +6,5 @@ $wb['pattern_txt'] = 'Vzor';
$wb['action_txt'] = 'Akce';
$wb['add_new_record_txt'] = 'Přidat obsahový filtr';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_domain.lng b/interface/web/mail/lib/lang/cz_mail_domain.lng
index 026a2f1d27..be20bce450 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain.lng
@@ -11,3 +11,5 @@ $wb['limit_maildomain_txt'] = 'Dosažen maximálnà poÄet email domén pro Vá
$wb['policy_txt'] = 'Spamový filtr';
$wb['no_policy'] = '- nepovoleno -';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng
index b579d2de08..da42190fac 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng
@@ -6,3 +6,5 @@ $wb['add_new_record_txt'] = 'Přidat doménu';
$wb['active_txt'] = 'AktivnÃ';
$wb['sys_groupid_txt'] = 'Klient';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng b/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng
index 488d0d5176..75efd56218 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng
@@ -9,3 +9,5 @@ $wb['limit_mailcatchall_txt'] = 'Dosažen maximálnà poÄet košů úÄtů pro
$wb['source_txt'] = 'Zdroj';
$wb['destination_error_isemail'] = 'CÃlová e-mailová adresa nenà platná.';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng
index 3b24645ec8..aa0b76df8c 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng
@@ -7,3 +7,5 @@ $wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'E-malová doména';
$wb['add_new_record_txt'] = 'Přidat e-mailový koš';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_domain_list.lng b/interface/web/mail/lib/lang/cz_mail_domain_list.lng
index 2abb05cf74..05bb747530 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain_list.lng
@@ -5,3 +5,5 @@ $wb['domain_txt'] = 'Doména';
$wb['add_new_record_txt'] = 'Přidat doménu';
$wb['active_txt'] = 'AktivnÃ';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_forward.lng b/interface/web/mail/lib/lang/cz_mail_forward.lng
index a59bd9b52b..ba79e1a2ff 100644
--- a/interface/web/mail/lib/lang/cz_mail_forward.lng
+++ b/interface/web/mail/lib/lang/cz_mail_forward.lng
@@ -7,3 +7,5 @@ $wb['duplicate_mailbox_txt'] = 'Mailbox s touto adresou již existuje';
$wb['domain_txt'] = 'Doména';
$wb['source_txt'] = 'Zdrojový e-mail';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_forward_list.lng b/interface/web/mail/lib/lang/cz_mail_forward_list.lng
index e5381fe5f8..bdbff701e1 100644
--- a/interface/web/mail/lib/lang/cz_mail_forward_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_forward_list.lng
@@ -6,3 +6,5 @@ $wb['destination_txt'] = 'CÃl';
$wb['email_txt'] = 'E-mail';
$wb['add_new_record_txt'] = 'PÅ™idat nové pÅ™esmÄ›rovánÃ';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_get.lng b/interface/web/mail/lib/lang/cz_mail_get.lng
index 51b9f3403e..6fc9101699 100644
--- a/interface/web/mail/lib/lang/cz_mail_get.lng
+++ b/interface/web/mail/lib/lang/cz_mail_get.lng
@@ -16,3 +16,5 @@ $wb['source_server_error_regex'] = 'POP3/IMAP server nenà validnà doménový n
$wb['source_read_all_txt'] = 'NaÄÃst vÅ¡echny e-maily (vÄetnÄ› již pÅ™eÄtené poÅ¡ty)';
$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_get_list.lng b/interface/web/mail/lib/lang/cz_mail_get_list.lng
index 9ca8b86dcb..824205f00a 100644
--- a/interface/web/mail/lib/lang/cz_mail_get_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_get_list.lng
@@ -7,3 +7,5 @@ $wb['source_username_txt'] = 'Uživatelské jméno';
$wb['destination_txt'] = 'CÃl';
$wb['add_new_record_txt'] = 'PÅ™idat úÄet';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_mailinglist.lng b/interface/web/mail/lib/lang/cz_mail_mailinglist.lng
index 2d2278526e..406df72ad9 100644
--- a/interface/web/mail/lib/lang/cz_mail_mailinglist.lng
+++ b/interface/web/mail/lib/lang/cz_mail_mailinglist.lng
@@ -20,3 +20,5 @@ $wb['listname_error_unique'] = 'Na serveru je již shodný \\"název seznamu\\".
$wb['email_error_isemail'] = 'E-mailová adresa je neplatná.';
$wb['mailinglist_txt'] = 'Mailing list';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng b/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng
index db31273f59..b3e2cf85ac 100644
--- a/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng
@@ -3,3 +3,5 @@ $wb['list_head_txt'] = 'E-mailové konference';
$wb['domain_txt'] = 'Doména';
$wb['listname_txt'] = 'Název seznamu';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng b/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng
index 0c07059c34..b64c3113bc 100644
--- a/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng
+++ b/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng
@@ -7,3 +7,5 @@ $wb['source_error_notempty'] = 'Adresa je prázdná.';
$wb['type_txt'] = 'Typ';
$wb['limit_mailfilter_txt'] = 'Dosažen maximálnà poÄet email filtrů pro Váš úÄet.';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng
index 1af959966c..bf34af6ec3 100644
--- a/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng
@@ -7,3 +7,5 @@ $wb['recipient_txt'] = 'PÅ™Ãjemce (adresát)';
$wb['add_new_record_txt'] = 'Přidat relay adresáta';
$wb['access_txt'] = 'PÅ™Ãstup';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_spamfilter.lng b/interface/web/mail/lib/lang/cz_mail_spamfilter.lng
index 4b6cc2b5d8..f19706dc3a 100644
--- a/interface/web/mail/lib/lang/cz_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/cz_mail_spamfilter.lng
@@ -15,3 +15,5 @@ $wb['email_error_unique'] = 'Pro tuto email adresu již existuje filtrovacà zá
$wb['spam_redirect_maildir_purge_txt'] = 'VyÄistit poté mailový adresář';
$wb['days_txt'] = 'Dny.';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng
index 7560b570da..f6170c6355 100644
--- a/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng
@@ -6,3 +6,5 @@ $wb['server_name_txt'] = 'server_name';
$wb['email_txt'] = 'E-mail';
$wb['add_new_record_txt'] = 'Přidat nový záznam spamfiltru';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_transport.lng b/interface/web/mail/lib/lang/cz_mail_transport.lng
index dfe1855084..710e577eca 100644
--- a/interface/web/mail/lib/lang/cz_mail_transport.lng
+++ b/interface/web/mail/lib/lang/cz_mail_transport.lng
@@ -9,3 +9,5 @@ $wb['active_txt'] = 'AktivnÃ';
$wb['limit_mailrouting_txt'] = 'Dosažen maximálnà poÄet email smÄ›rovánà pro Váš úÄet.';
$wb['transport_txt'] = 'Transport';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_transport_list.lng b/interface/web/mail/lib/lang/cz_mail_transport_list.lng
index e833293a2f..9fb61fd886 100644
--- a/interface/web/mail/lib/lang/cz_mail_transport_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_transport_list.lng
@@ -7,3 +7,5 @@ $wb['transport_txt'] = 'Transport';
$wb['sort_order_txt'] = 'TÅ™Ãdit podle';
$wb['add_new_record_txt'] = 'Přidat transport';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_user.lng b/interface/web/mail/lib/lang/cz_mail_user.lng
index 2c441f2aba..d8805f0fab 100644
--- a/interface/web/mail/lib/lang/cz_mail_user.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user.lng
@@ -48,3 +48,5 @@ $wb['repeat_password_txt'] = 'Opakujte heslo';
$wb['password_mismatch_txt'] = 'Hesla se neshodujÃ.';
$wb['password_match_txt'] = 'Hesla se shodujÃ.';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_user_filter.lng b/interface/web/mail/lib/lang/cz_mail_user_filter.lng
index 6cd8ed7e89..0973856843 100644
--- a/interface/web/mail/lib/lang/cz_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user_filter.lng
@@ -18,3 +18,5 @@ $wb['ends_with_txt'] = 'KonÄÃ na';
$wb['move_to_txt'] = 'Přesunout do';
$wb['delete_txt'] = 'Smazat';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_user_filter_list.lng b/interface/web/mail/lib/lang/cz_mail_user_filter_list.lng
index 60229ce3b5..d9f6748c19 100644
--- a/interface/web/mail/lib/lang/cz_mail_user_filter_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user_filter_list.lng
@@ -5,3 +5,5 @@ $wb['page_txt'] = 'Stránka';
$wb['page_of_txt'] = 'z';
$wb['delete_confirmation'] = 'Opravdu smazat mailový filtr?';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_user_list.lng b/interface/web/mail/lib/lang/cz_mail_user_list.lng
index e6dfd006ed..08d28fbc02 100644
--- a/interface/web/mail/lib/lang/cz_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user_list.lng
@@ -6,3 +6,5 @@ $wb['add_new_record_txt'] = 'Přidat e-mailovou schránku';
$wb['name_txt'] = 'SkuteÄný název';
$wb['login_txt'] = 'PÅ™ihlášenÃ';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_user_stats_list.lng b/interface/web/mail/lib/lang/cz_mail_user_stats_list.lng
index 50cbc31d5c..92600a17d9 100644
--- a/interface/web/mail/lib/lang/cz_mail_user_stats_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user_stats_list.lng
@@ -6,3 +6,5 @@ $wb['last_month_txt'] = 'Minulý mÄ›sÃc';
$wb['this_year_txt'] = 'Tento rok';
$wb['last_year_txt'] = 'Minulý rok';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_whitelist.lng b/interface/web/mail/lib/lang/cz_mail_whitelist.lng
index db55c18a0b..cd5d032953 100644
--- a/interface/web/mail/lib/lang/cz_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/cz_mail_whitelist.lng
@@ -7,3 +7,5 @@ $wb['source_error_notempty'] = 'Adresa je prázdná.';
$wb['type_txt'] = 'Typ';
$wb['limit_mailfilter_txt'] = 'Dosažen maximálnà poÄet email filtrů pro Váš úÄet.';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng b/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng
index 7fae368999..042cd71c57 100644
--- a/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng
@@ -8,3 +8,5 @@ $wb['recipient_txt'] = 'PÅ™Ãjemce (adresát)';
$wb['add_new_record_txt'] = 'PÅ™idat záznam na bÃlou listinu';
$wb['access_txt'] = 'PÅ™Ãstup';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng
index 5e0c6b7799..98e7649ba5 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng
@@ -7,3 +7,5 @@ $wb['priority_txt'] = 'Priorita';
$wb['active_txt'] = 'AktivnÃ';
$wb['limit_spamfilter_wblist_txt'] = 'Dosažen maximálnà poÄet záznamů pro bÃlou / Äernou listinu pro Váš úÄet.';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng
index 83a732d6f3..76ab17ec17 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng
@@ -7,3 +7,5 @@ $wb['rid_txt'] = 'Uživatel';
$wb['email_txt'] = 'Emaily na Äerné listinÄ›';
$wb['add_new_record_txt'] = 'PÅ™idat záznam na Äernou listinu';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_config.lng b/interface/web/mail/lib/lang/cz_spamfilter_config.lng
index 0f878cc7d8..d0ebcc4bf6 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_config.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_config.lng
@@ -18,3 +18,5 @@ $wb['relayhost_password_txt'] = 'Relayhost heslo';
$wb['mailbox_size_limit_txt'] = 'Limit velikosti e-mailové schránky';
$wb['message_size_limit_txt'] = 'Limit velikosti zprávy';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng
index fe2ee8d51c..8b5b1e758d 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng
@@ -3,3 +3,5 @@ $wb['list_head_txt'] = 'Konfigurace serveru';
$wb['server_name_txt'] = 'Server';
$wb['server_id_txt'] = 'server_id';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_policy.lng b/interface/web/mail/lib/lang/cz_spamfilter_policy.lng
index 54d0155d74..1a778301eb 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_policy.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_policy.lng
@@ -36,3 +36,5 @@ $wb['spam_admin_txt'] = 'SPAM admin';
$wb['message_size_limit_txt'] = 'Limit velikosti zprávy';
$wb['banned_rulenames_txt'] = 'Název pravidel zabanované';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng
index 9a0c361997..37f41d3ace 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng
@@ -7,3 +7,5 @@ $wb['banned_files_lover_txt'] = 'Zabanované soubory';
$wb['bad_header_lover_txt'] = 'Å patné hlaviÄky';
$wb['add_new_record_txt'] = 'Přidat záznam politiky';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_users.lng b/interface/web/mail/lib/lang/cz_spamfilter_users.lng
index 914304c58b..d795af11df 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_users.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_users.lng
@@ -6,3 +6,5 @@ $wb['email_txt'] = 'Email (vzor)';
$wb['fullname_txt'] = 'Název';
$wb['local_txt'] = 'LokálnÃ';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng
index 36bf3409e3..26c4df143f 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng
@@ -8,3 +8,5 @@ $wb['fullname_txt'] = 'Jméno';
$wb['email_txt'] = 'E-mail';
$wb['add_new_record_txt'] = 'Přidat spamfiltr uživatele';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng
index 5e0c6b7799..98e7649ba5 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng
@@ -7,3 +7,5 @@ $wb['priority_txt'] = 'Priorita';
$wb['active_txt'] = 'AktivnÃ';
$wb['limit_spamfilter_wblist_txt'] = 'Dosažen maximálnà poÄet záznamů pro bÃlou / Äernou listinu pro Váš úÄet.';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng
index ad13897004..3b74159b99 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng
@@ -7,3 +7,5 @@ $wb['rid_txt'] = 'Uživatel';
$wb['email_txt'] = 'Emaily na bÃlé listinÄ›';
$wb['add_new_record_txt'] = 'PÅ™idat záznam na bÃlou listinu';
?>
+
+
diff --git a/interface/web/mail/lib/lang/cz_user_quota_stats_list.lng b/interface/web/mail/lib/lang/cz_user_quota_stats_list.lng
index c8b73a9e8e..0c30e7574e 100755
--- a/interface/web/mail/lib/lang/cz_user_quota_stats_list.lng
+++ b/interface/web/mail/lib/lang/cz_user_quota_stats_list.lng
@@ -5,3 +5,5 @@ $wb['name_txt'] = 'Jméno';
$wb['email_txt'] = 'E-mailová adresa';
$wb['used_txt'] = 'Využité mÃsto';
?>
+
+
diff --git a/interface/web/mail/lib/lang/pl.lng b/interface/web/mail/lib/lang/pl.lng
index 82bcf014e9..afa99d7d4e 100644
--- a/interface/web/mail/lib/lang/pl.lng
+++ b/interface/web/mail/lib/lang/pl.lng
@@ -44,5 +44,6 @@ $wb['Content Filter'] = 'Zawartość filtru';
$wb['Global Filters'] = 'Globalne filtry';
$wb['Domain Alias'] = 'Alias domeny';
$wb['Relay Recipients'] = 'Odbiorcy przekierowania';
-$wb['Mailbox quota'] = 'Mailbox quota';
+$wb['Mailbox quota'] = 'Użycie skrzynek email';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_alias.lng b/interface/web/mail/lib/lang/pl_mail_alias.lng
index e3de56dc08..bf8e41e28f 100644
--- a/interface/web/mail/lib/lang/pl_mail_alias.lng
+++ b/interface/web/mail/lib/lang/pl_mail_alias.lng
@@ -9,6 +9,7 @@ $wb['destination_error_isemail'] = 'Element docelowy adresów e-mail jest niepop
$wb['limit_mailalias_txt'] = 'Maksymalna ilość aliasów e-mail dla Twojego konta została przekroczona.';
$wb['duplicate_mailbox_txt'] = 'Istnieje już skrzynka pocztowa z e-mailem o takiej nazwie.';
$wb['domain_txt'] = 'Domena';
-$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
+$wb['duplicate_email_alias_txt'] = 'Istnieje już taki alias email.';
$wb['source_txt'] = 'Alias';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_alias_list.lng b/interface/web/mail/lib/lang/pl_mail_alias_list.lng
index b6ce95d0c7..f5567ce92a 100644
--- a/interface/web/mail/lib/lang/pl_mail_alias_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_alias_list.lng
@@ -6,3 +6,4 @@ $wb['destination_txt'] = 'Element docelowy';
$wb['email_txt'] = 'E-mail';
$wb['add_new_record_txt'] = 'Dodaj nowy alias e-mail';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_aliasdomain.lng b/interface/web/mail/lib/lang/pl_mail_aliasdomain.lng
index 7735a4e87d..ebbc0d0203 100644
--- a/interface/web/mail/lib/lang/pl_mail_aliasdomain.lng
+++ b/interface/web/mail/lib/lang/pl_mail_aliasdomain.lng
@@ -9,3 +9,4 @@ $wb['source_error_empty'] = 'Domena źródłowa jest pusta.';
$wb['source_error_unique'] = 'Duplikat źródłowej domeny.';
$wb['source_error_regex'] = 'Nieprawidłowa nazwa domeny źródłowej.';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng
index ba2e3b9575..bdccec7d67 100644
--- a/interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng
@@ -5,3 +5,4 @@ $wb['source_txt'] = 'Źródło';
$wb['destination_txt'] = 'Cel';
$wb['add_new_record_txt'] = 'Dodaj nowy alias domeny';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_blacklist.lng b/interface/web/mail/lib/lang/pl_mail_blacklist.lng
index 528f2f741a..448658d832 100644
--- a/interface/web/mail/lib/lang/pl_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/pl_mail_blacklist.lng
@@ -7,3 +7,4 @@ $wb['source_error_notempty'] = 'Adres jest pusty.';
$wb['type_txt'] = 'Typ';
$wb['limit_mailfilter_txt'] = 'Maksymalna ilość filtrów dla Twojego konta została przekroczona.';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng b/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng
index ebef66657b..8351885ca0 100644
--- a/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng
@@ -8,3 +8,4 @@ $wb['recipient_txt'] = 'Odbiorca';
$wb['add_new_record_txt'] = 'Dodaj nowy wpis czarnej listy';
$wb['access_txt'] = 'dostęp';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_content_filter.lng b/interface/web/mail/lib/lang/pl_mail_content_filter.lng
index 54efa4fed0..6ca25bccd1 100644
--- a/interface/web/mail/lib/lang/pl_mail_content_filter.lng
+++ b/interface/web/mail/lib/lang/pl_mail_content_filter.lng
@@ -7,3 +7,4 @@ $wb['action_txt'] = 'Akcja';
$wb['active_txt'] = 'Aktywny';
$wb['pattern_error_empty'] = 'Wzór jest pusty.';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_content_filter_list.lng b/interface/web/mail/lib/lang/pl_mail_content_filter_list.lng
index 9fc964cf57..fe5a78fd65 100644
--- a/interface/web/mail/lib/lang/pl_mail_content_filter_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_content_filter_list.lng
@@ -6,3 +6,4 @@ $wb['pattern_txt'] = 'Wzór';
$wb['action_txt'] = 'Akcja';
$wb['add_new_record_txt'] = 'Dodaj nowy zbiór filtrów';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_domain.lng b/interface/web/mail/lib/lang/pl_mail_domain.lng
index 6f9c68cdc6..0e76cd0f01 100644
--- a/interface/web/mail/lib/lang/pl_mail_domain.lng
+++ b/interface/web/mail/lib/lang/pl_mail_domain.lng
@@ -11,3 +11,4 @@ $wb['limit_maildomain_txt'] = 'Maksymalna ilość domen e-mail dla Twojego konta
$wb['policy_txt'] = 'Filtr spamu';
$wb['no_policy'] = '-nie używane-';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng
index e214d92a92..de3a6654f4 100644
--- a/interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng
@@ -6,3 +6,4 @@ $wb['add_new_record_txt'] = 'Dodaj nowÄ… domenÄ™';
$wb['active_txt'] = 'Aktywne';
$wb['sys_groupid_txt'] = 'Klient';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng b/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng
index 72f6f9b897..c9667c519a 100644
--- a/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng
@@ -6,6 +6,7 @@ $wb['domain_error_unique'] = 'Jest już wpis Catchall dla tej domeny.';
$wb['no_domain_perm'] = 'Nie masz dostępu do tej domeny.';
$wb['domain_error_regex'] = 'Nieprawidłowa nazwa domeny. Domena zawiera niedozolone znaki.';
$wb['limit_mailcatchall_txt'] = 'Maksymalna ilość kont e-mail catchall dla Twojej domeny została przekroczona.';
-$wb['source_txt'] = 'Source';
-$wb['destination_error_isemail'] = 'Destination is no valid email address.';
+$wb['source_txt'] = 'Źródło';
+$wb['destination_error_isemail'] = 'Cel nie jest poprawnym adresem email.';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng
index 1f0aad197d..304bc3d9a4 100644
--- a/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng
@@ -7,3 +7,4 @@ $wb['server_id_txt'] = 'Serwer';
$wb['domain_txt'] = 'Domena';
$wb['add_new_record_txt'] = 'Dodaj nowy Catchall';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_domain_list.lng b/interface/web/mail/lib/lang/pl_mail_domain_list.lng
index ec51e2cdb5..e14f2f0889 100644
--- a/interface/web/mail/lib/lang/pl_mail_domain_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_domain_list.lng
@@ -5,3 +5,4 @@ $wb['domain_txt'] = 'Domena';
$wb['add_new_record_txt'] = 'Dodaj nowÄ… domenÄ™';
$wb['active_txt'] = 'Aktywny';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_forward.lng b/interface/web/mail/lib/lang/pl_mail_forward.lng
index 05ebbd7c35..cc84d34b8b 100644
--- a/interface/web/mail/lib/lang/pl_mail_forward.lng
+++ b/interface/web/mail/lib/lang/pl_mail_forward.lng
@@ -1,9 +1,10 @@
<?php
$wb['email_txt'] = 'E-mail';
-$wb['destination_txt'] = 'Element docelowy E-mail';
+$wb['destination_txt'] = 'E-mail docelowy';
$wb['active_txt'] = 'Aktywny';
$wb['limit_mailforward_txt'] = 'Maksymalna ilość przekierowań e-mail dla Twojego konta została przekroczona.';
$wb['duplicate_mailbox_txt'] = 'Istnieje już skrzynka pocztowa o podanym adresie e-mail';
-$wb['domain_txt'] = 'Domain';
-$wb['source_txt'] = 'Source Email';
+$wb['domain_txt'] = 'Domena';
+$wb['source_txt'] = 'E-mail źródłowy';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_forward_list.lng b/interface/web/mail/lib/lang/pl_mail_forward_list.lng
index 1044bd5121..3f27975cf7 100644
--- a/interface/web/mail/lib/lang/pl_mail_forward_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_forward_list.lng
@@ -6,3 +6,4 @@ $wb['destination_txt'] = 'Element docelowy';
$wb['email_txt'] = 'E-mail';
$wb['add_new_record_txt'] = 'Dodaj nowe przekierowanie E-mail';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_get.lng b/interface/web/mail/lib/lang/pl_mail_get.lng
index 4d7c7f9a3d..ca27711e98 100644
--- a/interface/web/mail/lib/lang/pl_mail_get.lng
+++ b/interface/web/mail/lib/lang/pl_mail_get.lng
@@ -14,5 +14,6 @@ $wb['source_password_error_isempty'] = 'Hasło jest puste.';
$wb['destination_error_isemail'] = 'Nie wybrano elementu docelowego.';
$wb['source_server_error_regex'] = 'Serwer Pop3/Imap nie jest poprawnÄ… nazwÄ… domenowÄ….';
$wb['source_read_all_txt'] = 'Pobierz wszystkie maile (razem z przeczytanymi)';
-$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['error_delete_read_all_combination'] = 'Nieprawidłowa kombinacja opcji. Nie możesz użyć jednocześnie opcji Delete emails after retrieval = no razem z Retrieve all emails = yes';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_get_list.lng b/interface/web/mail/lib/lang/pl_mail_get_list.lng
index cd473d9ded..cf5844f0d6 100644
--- a/interface/web/mail/lib/lang/pl_mail_get_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_get_list.lng
@@ -7,3 +7,4 @@ $wb['source_username_txt'] = 'Nazwa użytkownika';
$wb['destination_txt'] = 'Element docelowy';
$wb['add_new_record_txt'] = 'Dodaj nowe konto';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_mailinglist.lng b/interface/web/mail/lib/lang/pl_mail_mailinglist.lng
index cd622ad007..774da1802e 100644
--- a/interface/web/mail/lib/lang/pl_mail_mailinglist.lng
+++ b/interface/web/mail/lib/lang/pl_mail_mailinglist.lng
@@ -12,11 +12,12 @@ $wb['listname_txt'] = 'Nazwa listy';
$wb['client_txt'] = 'Klient';
$wb['email_txt'] = 'Email';
$wb['password_txt'] = 'Hasło';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.';
-$wb['email_error_isemail'] = 'Email address is invalid.';
-$wb['mailinglist_txt'] = 'Mailing list';
+$wb['mailinglist_txt'] = 'Lista Mailingowa';
+$wb['generate_password_txt'] = 'Generuj hasło';
+$wb['repeat_password_txt'] = 'Powtórz hasło';
+$wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
+$wb['password_match_txt'] = 'Hasła pasują';
+$wb['listname_error_unique'] = 'Isnieje już lista mailingowa o tej nazwie, wybierz inną nazwę listy.';
+$wb['email_error_isemail'] = 'Adres e-mail jest nieprawidłowy';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_mailinglist_list.lng b/interface/web/mail/lib/lang/pl_mail_mailinglist_list.lng
index 649db47bd0..96cd9604d7 100644
--- a/interface/web/mail/lib/lang/pl_mail_mailinglist_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_mailinglist_list.lng
@@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Lista mailingowa';
$wb['domain_txt'] = 'Domena';
$wb['listname_txt'] = 'Nazwa listy';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_relay_recipient.lng b/interface/web/mail/lib/lang/pl_mail_relay_recipient.lng
index 594aba1f2a..ab7926f899 100644
--- a/interface/web/mail/lib/lang/pl_mail_relay_recipient.lng
+++ b/interface/web/mail/lib/lang/pl_mail_relay_recipient.lng
@@ -7,3 +7,4 @@ $wb['source_error_notempty'] = 'Adres jest pusty.';
$wb['type_txt'] = 'Typ';
$wb['limit_mailfilter_txt'] = 'Maksymalna ilość filtrów e-mail dla Twojego konta została przekroczona.';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng
index 310e27ca30..84d08ba619 100644
--- a/interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng
@@ -7,3 +7,4 @@ $wb['recipient_txt'] = 'Odbiorca';
$wb['add_new_record_txt'] = 'Dodaj nowego odbiorcÄ™ przekierowania';
$wb['access_txt'] = 'dostęp';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_spamfilter.lng b/interface/web/mail/lib/lang/pl_mail_spamfilter.lng
index 3879f24247..2849430c6d 100644
--- a/interface/web/mail/lib/lang/pl_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/pl_mail_spamfilter.lng
@@ -15,3 +15,4 @@ $wb['email_error_unique'] = 'Istnieje już wpis z filtrem spamu dla tego adresu
$wb['spam_redirect_maildir_purge_txt'] = 'Wyczyść później Maildir';
$wb['days_txt'] = 'Dni.';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng
index d6097bb336..a6959a26e2 100644
--- a/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng
@@ -6,3 +6,4 @@ $wb['server_name_txt'] = 'nazwa_serwera';
$wb['email_txt'] = 'E-mail';
$wb['add_new_record_txt'] = 'Dodaj nowy wpis z filtrem spamu';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_transport.lng b/interface/web/mail/lib/lang/pl_mail_transport.lng
index 514fc263a5..364eba9445 100644
--- a/interface/web/mail/lib/lang/pl_mail_transport.lng
+++ b/interface/web/mail/lib/lang/pl_mail_transport.lng
@@ -9,3 +9,4 @@ $wb['active_txt'] = 'Aktywny';
$wb['limit_mailrouting_txt'] = 'Maksymalna ilość ścieżek dla Twojego konta została przekroczona.';
$wb['transport_txt'] = 'Transport';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_transport_list.lng b/interface/web/mail/lib/lang/pl_mail_transport_list.lng
index fa5c584318..837972c4f2 100644
--- a/interface/web/mail/lib/lang/pl_mail_transport_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_transport_list.lng
@@ -7,3 +7,4 @@ $wb['transport_txt'] = 'PrzenieÅ›';
$wb['sort_order_txt'] = 'Sortuj według';
$wb['add_new_record_txt'] = 'Dodaj nowe przeniesienie';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_user.lng b/interface/web/mail/lib/lang/pl_mail_user.lng
index d762af643a..4ccab2e93e 100644
--- a/interface/web/mail/lib/lang/pl_mail_user.lng
+++ b/interface/web/mail/lib/lang/pl_mail_user.lng
@@ -18,7 +18,7 @@ $wb['maildir_txt'] = 'Maildir';
$wb['postfix_txt'] = 'Zezwól na odbiór poczty';
$wb['access_txt'] = 'Możliwy dostęp';
$wb['policy_txt'] = 'Filtr spamu';
-$wb['no_policy'] = '- nie dostępny -';
+$wb['no_policy'] = '- brak polityki -';
$wb['limit_mailbox_txt'] = 'Maksymalna ilość skrzynek pocztowych dla Twojego konta została przekroczona.';
$wb['limit_mailquota_txt'] = 'Maksymalna pojemność skrzynki pocztowej została przekroczona. Maksymalne dostępne miejsce w MB to: ';
$wb['disableimap_txt'] = 'Wyłącz IMAP';
@@ -41,10 +41,11 @@ $wb['login_error_unique'] = 'Login jest już w użyciu.';
$wb['login_error_regex'] = 'Poprawne znaki to A-Z, a-z, 0-9, ., _ oraz -.';
$wb['login_txt'] = 'Login (opcjonalnie)';
$wb['error_login_email_txt'] = 'Ten login nie jest poprawny. Proszę wpisać inny lub użyć adresu e-mail jako loginu.';
-$wb['autoresponder_subject_txt'] = 'Email Subject';
-$wb['autoresponder_subject'] = 'Out of office reply';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
+$wb['autoresponder_subject_txt'] = 'Temat wiadomości';
+$wb['autoresponder_subject'] = 'Odpowiedź - poza biurem - ';
+$wb['generate_password_txt'] = 'Generuj hasło';
+$wb['repeat_password_txt'] = 'Powtórz hasło';
+$wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
+$wb['password_match_txt'] = 'Hasła pasują';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_user_filter.lng b/interface/web/mail/lib/lang/pl_mail_user_filter.lng
index 99ac6a9e78..1e1a7fd895 100644
--- a/interface/web/mail/lib/lang/pl_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/pl_mail_user_filter.lng
@@ -18,3 +18,4 @@ $wb['ends_with_txt'] = 'Kończy się na';
$wb['move_to_txt'] = 'PrzenieÅ› do';
$wb['delete_txt'] = 'Usuń';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_user_filter_list.lng b/interface/web/mail/lib/lang/pl_mail_user_filter_list.lng
index ce235b892f..4d45c5d23b 100644
--- a/interface/web/mail/lib/lang/pl_mail_user_filter_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_user_filter_list.lng
@@ -5,3 +5,4 @@ $wb['page_txt'] = 'Strona';
$wb['page_of_txt'] = 'z';
$wb['delete_confirmation'] = 'Czy na pewno chcesz skasować filtr?';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_user_list.lng b/interface/web/mail/lib/lang/pl_mail_user_list.lng
index 7c13db38d1..8e47f96dcb 100644
--- a/interface/web/mail/lib/lang/pl_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_user_list.lng
@@ -6,3 +6,4 @@ $wb['add_new_record_txt'] = 'Dodaj nowÄ… skrzynkÄ™ pocztowÄ…';
$wb['name_txt'] = 'Nazwa rzeczywista';
$wb['login_txt'] = 'Login';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng b/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng
index b9780687d7..9e876805ba 100644
--- a/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng
@@ -6,3 +6,4 @@ $wb['last_month_txt'] = 'Ostatni miesiÄ…c';
$wb['this_year_txt'] = 'Ten rok';
$wb['last_year_txt'] = 'Ostatni rok';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_whitelist.lng b/interface/web/mail/lib/lang/pl_mail_whitelist.lng
index 203c5bae73..4aa2f05609 100644
--- a/interface/web/mail/lib/lang/pl_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/pl_mail_whitelist.lng
@@ -7,3 +7,4 @@ $wb['source_error_notempty'] = 'Adres jest pusty.';
$wb['type_txt'] = 'Typ';
$wb['limit_mailfilter_txt'] = 'Maksymalna ilość filtrów e-mail dla Twojego konta zosała przekroczona.';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng b/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng
index 10e6dfcf0b..a7239ca95c 100644
--- a/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng
@@ -8,3 +8,4 @@ $wb['recipient_txt'] = 'odbiorca';
$wb['add_new_record_txt'] = 'Dodaj nowy wpis białej listy';
$wb['access_txt'] = 'dostęp';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng
index 6da8ddc9d9..6c4c8d78fd 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng
@@ -7,3 +7,4 @@ $wb['priority_txt'] = 'Priorytet';
$wb['active_txt'] = 'Aktywny';
$wb['limit_spamfilter_wblist_txt'] = 'Maksymalna ilość wpisów do białej i czarnej listy dla Twojego konta została przekroczona.';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng
index c237a7a778..65a9d37fda 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng
@@ -7,3 +7,4 @@ $wb['rid_txt'] = 'Użytkownik';
$wb['email_txt'] = 'E-mail dodany do czarnej listy';
$wb['add_new_record_txt'] = 'Dodaj wpis czarnej listy';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_spamfilter_config.lng b/interface/web/mail/lib/lang/pl_spamfilter_config.lng
index c750d95937..43fab4d4f3 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_config.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_config.lng
@@ -18,3 +18,4 @@ $wb['relayhost_password_txt'] = 'Hasło Relayhost';
$wb['mailbox_size_limit_txt'] = 'Limit wielkości skrzynki pocztowej';
$wb['message_size_limit_txt'] = 'Limit wielkości wiadomości';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng
index 45b3f315cd..d31d7857eb 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng
@@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Konfiguracja serwer';
$wb['server_name_txt'] = 'Serwer';
$wb['server_id_txt'] = 'id_serwera';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_spamfilter_policy.lng b/interface/web/mail/lib/lang/pl_spamfilter_policy.lng
index 8a825b5594..b7bc37de8b 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_policy.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_policy.lng
@@ -36,3 +36,4 @@ $wb['spam_admin_txt'] = 'Admin obsługi spamu';
$wb['message_size_limit_txt'] = 'Limit wielkości wiadomości';
$wb['banned_rulenames_txt'] = 'Zabronione nazwy zasad';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng
index 43d9d414d6..906006e75f 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng
@@ -7,3 +7,4 @@ $wb['banned_files_lover_txt'] = 'Przyjmuj zablokowane pliki';
$wb['bad_header_lover_txt'] = 'Przyjmuj złe nagłowki';
$wb['add_new_record_txt'] = 'Dodaj wpis plityki';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_spamfilter_users.lng b/interface/web/mail/lib/lang/pl_spamfilter_users.lng
index 656c29ea1a..8529e455c4 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_users.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_users.lng
@@ -6,3 +6,4 @@ $wb['email_txt'] = 'E-mail (wzór)';
$wb['fullname_txt'] = 'Nazwa';
$wb['local_txt'] = 'Lokalne';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng
index dde2a62c6a..0951df528f 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng
@@ -8,3 +8,4 @@ $wb['fullname_txt'] = 'Nazwa';
$wb['email_txt'] = 'E-mail';
$wb['add_new_record_txt'] = 'Dodaj filtr spamu użytkownika';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng
index be836015db..a6f2e4306d 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng
@@ -7,3 +7,4 @@ $wb['priority_txt'] = 'Priorytet';
$wb['active_txt'] = 'Aktywny';
$wb['limit_spamfilter_wblist_txt'] = 'Maksymalna liczba wpisów białej lub czarnej listy została przekroczona.';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng
index 6517cf41a1..425a6fe35a 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng
@@ -7,3 +7,4 @@ $wb['rid_txt'] = 'Użytkownik';
$wb['email_txt'] = 'Adres e-mail dodany do białej listy';
$wb['add_new_record_txt'] = 'Dodaj wpis do białej listy';
?>
+
diff --git a/interface/web/mail/lib/lang/pl_user_quota_stats_list.lng b/interface/web/mail/lib/lang/pl_user_quota_stats_list.lng
index 91dc11aae3..2cffcf1d16 100755
--- a/interface/web/mail/lib/lang/pl_user_quota_stats_list.lng
+++ b/interface/web/mail/lib/lang/pl_user_quota_stats_list.lng
@@ -1,7 +1,8 @@
<?php
$wb['list_head_txt'] = 'Użycie skrzynki pocztowej';
-$wb['quota_txt'] = 'Quota';
+$wb['quota_txt'] = 'Limit';
$wb['name_txt'] = 'Nazwa';
$wb['email_txt'] = 'Adres e-mail';
$wb['used_txt'] = 'Użycie dysku';
?>
+
diff --git a/interface/web/mail/templates/mail_user_filter_edit.htm b/interface/web/mail/templates/mail_user_filter_edit.htm
index 16ea6fa3cc..f7fb4c70a2 100644
--- a/interface/web/mail/templates/mail_user_filter_edit.htm
+++ b/interface/web/mail/templates/mail_user_filter_edit.htm
@@ -12,13 +12,13 @@
<div class="ctrlHolder">
<label for="source" class="wf_preField">{tmpl_var name='source_txt'}</label>
<select id="source" name="source" class="textInput formLengthHalf">{tmpl_var name='source'}</select>
- <select id="op" name="op" class="textInput formLengthHalf">{tmpl_var name='op'}</select>
- <input type="text" id="searchterm" name="searchterm" value="{tmpl_var name='searchterm'}" size="30" maxlength="255" class="textInput">
+ <select id="op" name="op" class="textInput formLengthHalf">{tmpl_var name='op'}</select><br><br>
+ <div><label></label><input type="text" id="searchterm" name="searchterm" value="{tmpl_var name='searchterm'}" size="30" maxlength="255" class="textInput"></div>
</div>
<div class="ctrlHolder">
<label for="action" class="wf_preField">{tmpl_var name='action_txt'}</label>
- <select id="action" name="action" class="textInput formLengthHalf">{tmpl_var name='action'}</select>
- <input type="text" id="target" name="target" value="{tmpl_var name='target'}" size="30" maxlength="255" class="textInput formLengthHalf">
+ <select id="action" name="action" class="textInput formLengthHalf">{tmpl_var name='action'}</select><br><br>
+ <div><label></label><input type="text" id="target" name="target" value="{tmpl_var name='target'}" size="30" maxlength="255" class="textInput formLengthHalf"></div>
</div>
<div class="ctrlHolder">
<label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
diff --git a/interface/web/mail/templates/mail_user_filter_list.htm b/interface/web/mail/templates/mail_user_filter_list.htm
index 74f1771d0d..2d7a6deb7c 100644
--- a/interface/web/mail/templates/mail_user_filter_list.htm
+++ b/interface/web/mail/templates/mail_user_filter_list.htm
@@ -1,4 +1,3 @@
-
<div class="pnl_toolsarea">
<tmpl_if name='datalog_changes_count' op='>' value='0'>
<div>
@@ -16,7 +15,7 @@
</div><br />
</div>
</tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+ <fieldset style="margin-top:20px;margin-bottom:20px;"><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/mail_user_filter_edit.php?mailuser_id={tmpl_var name='parent_id'}');">
<span>{tmpl_var name="add_new_record_txt"}</span>
diff --git a/interface/web/mail/user_quota_stats.php b/interface/web/mail/user_quota_stats.php
index 9a0ee141a8..5766ff7781 100644
--- a/interface/web/mail/user_quota_stats.php
+++ b/interface/web/mail/user_quota_stats.php
@@ -27,7 +27,7 @@ if(is_array($tmp_rec)) {
$tmp_array = unserialize($app->db->unquote($tmp_mon['data']));
if(is_array($tmp_array)) {
foreach($tmp_array as $username => $data) {
- $monitor_data[$username]['used'] += $data['used'];
+ if(!$monitor_data[$username]['used']) $monitor_data[$username]['used'] = $data['used'];
}
}
}
diff --git a/interface/web/mailuser/lib/lang/cz.lng b/interface/web/mailuser/lib/lang/cz.lng
index 8b4b58bc42..12f1bd72cc 100644
--- a/interface/web/mailuser/lib/lang/cz.lng
+++ b/interface/web/mailuser/lib/lang/cz.lng
@@ -7,3 +7,5 @@ $wb['Send copy'] = 'Poslat kopii na e-mail';
$wb['Spamfilter'] = 'Spamový filtr';
$wb['Email Filters'] = 'E-mailové filtry';
?>
+
+
diff --git a/interface/web/mailuser/lib/lang/cz_index.lng b/interface/web/mailuser/lib/lang/cz_index.lng
index 45af56ee8d..9b820cdee6 100644
--- a/interface/web/mailuser/lib/lang/cz_index.lng
+++ b/interface/web/mailuser/lib/lang/cz_index.lng
@@ -10,3 +10,5 @@ $wb['unlimited_txt'] = 'Neomezený';
$wb['mb_txt'] = 'MB';
$wb['none_txt'] = 'Nenastaveno';
?>
+
+
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng
index ef3aeb42da..f8d331b557 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng
@@ -11,3 +11,5 @@ $wb['autoresponder_active'] = 'Povolit automatický odpovÃdaÄ';
$wb['now_txt'] = 'NynÃ';
$wb['autoresponder_subject_txt'] = 'Předmět e-mailu';
?>
+
+
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng b/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng
index 36f11a9baa..fc8a0f9df6 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng
@@ -5,3 +5,5 @@ $wb['email_txt'] = 'E-mail';
$wb['cc_error_isemail'] = 'Vyplněná e-mailová adresa neplatná';
$wb['email_is_cc_error'] = 'Vyplněná e-mailová adresa a poslat kopii na e-mail adresu, nemůžou být stejné.';
?>
+
+
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng b/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng
index 3df9d38c72..65300b6d95 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng
@@ -18,3 +18,5 @@ $wb['ends_with_txt'] = 'KonÄÃ na';
$wb['move_to_txt'] = 'Přesunout do';
$wb['delete_txt'] = 'Smazat';
?>
+
+
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng
index 3c2593d6d4..4b64af9205 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng
@@ -6,3 +6,5 @@ $wb['page_txt'] = 'Stránka';
$wb['page_of_txt'] = 'z';
$wb['delete_confirmation'] = 'Opravdu chcete odstranit e-mail filter?';
?>
+
+
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_password.lng b/interface/web/mailuser/lib/lang/cz_mail_user_password.lng
index 36555a2030..44815399dd 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_password.lng
@@ -8,3 +8,5 @@ $wb['repeat_password_txt'] = 'Opakujte heslo';
$wb['password_mismatch_txt'] = 'Hesla se neshodujÃ.';
$wb['password_match_txt'] = 'Hesla se shodujÃ.';
?>
+
+
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng
index 2a53036be6..c6345567b0 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng
@@ -5,3 +5,5 @@ $wb['email_txt'] = 'E-mail';
$wb['no_policy'] = '- nepovoleno -';
$wb['policy_txt'] = 'Politika';
?>
+
+
diff --git a/interface/web/mailuser/lib/lang/pl.lng b/interface/web/mailuser/lib/lang/pl.lng
index 114dec9b91..5d7166ada3 100644
--- a/interface/web/mailuser/lib/lang/pl.lng
+++ b/interface/web/mailuser/lib/lang/pl.lng
@@ -1,9 +1,10 @@
<?php
-$wb['Email Account'] = 'Email Account';
-$wb['Overview'] = 'Overview';
-$wb['Password'] = 'Password';
+$wb['Email Account'] = 'Konto email';
+$wb['Overview'] = 'PrzeglÄ…d';
+$wb['Password'] = 'Hasło';
$wb['Autoresponder'] = 'Autoresponder';
-$wb['Send copy'] = 'Send copy';
-$wb['Spamfilter'] = 'Spamfilter';
-$wb['Email Filters'] = 'Email Filters';
+$wb['Send copy'] = 'Wyślij kopię';
+$wb['Spamfilter'] = 'Filtr spamu';
+$wb['Email Filters'] = 'Fitry e-mail';
?>
+
diff --git a/interface/web/mailuser/lib/lang/pl_index.lng b/interface/web/mailuser/lib/lang/pl_index.lng
index 29fe9ea4f3..368276036a 100644
--- a/interface/web/mailuser/lib/lang/pl_index.lng
+++ b/interface/web/mailuser/lib/lang/pl_index.lng
@@ -1,12 +1,13 @@
<?php
-$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['page_head_txt'] = 'Ustawienia skrzynki';
+$wb['page_desc_txt'] = 'Możesz tutaj edytować ustawienia swojego konta e-mail.';
+$wb['email_txt'] = 'Adres e-mail';
$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['server_address_txt'] = 'Adres serwera poczty';
+$wb['cc_txt'] = 'Wyślij kopię do (CC)';
+$wb['quota_txt'] = 'Wielkość skrzynki';
+$wb['unlimited_txt'] = 'Bez limitu';
$wb['mb_txt'] = 'MB';
-$wb['none_txt'] = 'None';
+$wb['none_txt'] = 'Brak';
?>
+
diff --git a/interface/web/mailuser/lib/lang/pl_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/pl_mail_user_autoresponder.lng
index 79f386a7dc..c6f3ed67dd 100644
--- a/interface/web/mailuser/lib/lang/pl_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/pl_mail_user_autoresponder.lng
@@ -1,13 +1,14 @@
<?php
$wb['mailbox_autoresponder_txt'] = 'Autoresponder';
-$wb['autoresponder_subject'] = 'Out of office reply';
-$wb['autoresponder_text_txt'] = 'Text';
-$wb['autoresponder_txt'] = 'Active';
-$wb['autoresponder_start_date_txt'] = 'Start on';
-$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
-$wb['autoresponder_end_date_txt'] = 'End by';
-$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
-$wb['autoresponder_active'] = 'Enable the autoresponder';
-$wb['now_txt'] = 'Now';
-$wb['autoresponder_subject_txt'] = 'Betreff';
+$wb['autoresponder_subject'] = 'Poza biurem';
+$wb['autoresponder_text_txt'] = 'Tekst';
+$wb['autoresponder_txt'] = 'Aktywny';
+$wb['autoresponder_start_date_txt'] = 'Start';
+$wb['autoresponder_start_date_isfuture'] = 'Data startu nie może być z przeszłości';
+$wb['autoresponder_end_date_txt'] = 'Koniec';
+$wb['autoresponder_end_date_isgreater'] = 'Data końcowa musi być ustawiona i być późniejsza niż startu.';
+$wb['autoresponder_active'] = 'WÅ‚Ä…cz autoresponder';
+$wb['now_txt'] = 'Teraz';
+$wb['autoresponder_subject_txt'] = 'Temat';
?>
+
diff --git a/interface/web/mailuser/lib/lang/pl_mail_user_cc.lng b/interface/web/mailuser/lib/lang/pl_mail_user_cc.lng
index dc2165a4fc..a3b48179b9 100644
--- a/interface/web/mailuser/lib/lang/pl_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/pl_mail_user_cc.lng
@@ -1,7 +1,8 @@
<?php
-$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.';
+$wb['mailbox_cc_txt'] = 'Wyślij kopię na inny adres e-mail';
+$wb['cc_txt'] = 'Wyślij kopię do';
+$wb['email_txt'] = 'E-mail';
+$wb['cc_error_isemail'] = 'Adres e-mail jest niepoprawny w polu -Wyślij kopię do-';
+$wb['email_is_cc_error'] = 'Adres e-mail i adres do wysyłki kopii nie mogą być takie same.';
?>
+
diff --git a/interface/web/mailuser/lib/lang/pl_mail_user_filter.lng b/interface/web/mailuser/lib/lang/pl_mail_user_filter.lng
index 2e74ffd4f7..9ac57b53cb 100644
--- a/interface/web/mailuser/lib/lang/pl_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/pl_mail_user_filter.lng
@@ -18,3 +18,4 @@ $wb['ends_with_txt'] = 'Ends with';
$wb['move_to_txt'] = 'Move to';
$wb['delete_txt'] = 'Delete';
?>
+
diff --git a/interface/web/mailuser/lib/lang/pl_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/pl_mail_user_filter_list.lng
index fb6b9dfa5d..8bea987f51 100644
--- a/interface/web/mailuser/lib/lang/pl_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/pl_mail_user_filter_list.lng
@@ -1,8 +1,9 @@
<?php
-$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?';
+$wb['list_head_txt'] = 'Filtry poczty';
+$wb['rulename_txt'] = 'Nazwa';
+$wb['add_new_record_txt'] = 'Dodaj nowy filtr';
+$wb['page_txt'] = 'Strona';
+$wb['page_of_txt'] = 'z';
+$wb['delete_confirmation'] = 'Na pewno chcesz skasować ten filtr poczty?';
?>
+
diff --git a/interface/web/mailuser/lib/lang/pl_mail_user_password.lng b/interface/web/mailuser/lib/lang/pl_mail_user_password.lng
index cdf9674e70..08fd7405dc 100644
--- a/interface/web/mailuser/lib/lang/pl_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/pl_mail_user_password.lng
@@ -1,10 +1,11 @@
<?php
-$wb['mailbox_password_txt'] = 'Mailbox password';
-$wb['password_txt'] = 'Password';
-$wb['password_strength_txt'] = 'Password strength';
-$wb['email_txt'] = 'Email';
-$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['mailbox_password_txt'] = 'Hasło konta e-mail';
+$wb['password_txt'] = 'Hasło';
+$wb['password_strength_txt'] = 'Siła hasła';
+$wb['email_txt'] = 'E-mail';
+$wb['generate_password_txt'] = 'Generuj hasło';
+$wb['repeat_password_txt'] = 'Powtórz hasło';
+$wb['password_mismatch_txt'] = 'Błąd, hasła nie pasują';
+$wb['password_match_txt'] = 'OK, hasła są jednakowe';
?>
+
diff --git a/interface/web/mailuser/lib/lang/pl_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/pl_mail_user_spamfilter.lng
index be4bad9050..ed18053d80 100644
--- a/interface/web/mailuser/lib/lang/pl_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/pl_mail_user_spamfilter.lng
@@ -1,7 +1,8 @@
<?php
-$wb['mailbox_spamfilter_txt'] = 'Spamfilter';
-$wb['spamfilter_txt'] = 'Spamfilter';
-$wb['email_txt'] = 'Email';
-$wb['no_policy'] = '- not enabled -';
-$wb['policy_txt'] = 'Policy';
+$wb['mailbox_spamfilter_txt'] = 'Ustawienia filtra spamu';
+$wb['spamfilter_txt'] = 'Filtr spamu';
+$wb['email_txt'] = 'E-mail';
+$wb['no_policy'] = '- nie włączony -';
+$wb['policy_txt'] = 'Polityka';
?>
+
diff --git a/interface/web/monitor/lib/lang/cz.lng b/interface/web/monitor/lib/lang/cz.lng
index 1904d97094..763b7f5cfd 100644
--- a/interface/web/monitor/lib/lang/cz.lng
+++ b/interface/web/monitor/lib/lang/cz.lng
@@ -1,5 +1,5 @@
<?php
-$wb['Server online since'] = 'Server online od';
+$wb['Server online since'] = 'Server je online';
$wb['Users online'] = 'Uživatelé online';
$wb['System load 1 minute'] = 'Zátěž systému - 1 minuta';
$wb['System load 5 minutes'] = 'Zátěž systému - 5 minut';
@@ -26,7 +26,7 @@ $wb['minutes'] = 'minut';
$wb['Show Overview'] = 'Zobrazit přehled';
$wb['System State (All Servers)'] = 'Stav systému (servery)';
$wb['Hardware-Information'] = 'Informace o hardwaru';
-$wb['Show CPU info'] = 'Zobrazit CPU informace';
+$wb['Show CPU info'] = 'Zobrazit informace o CPU';
$wb['Server State'] = 'Stav serveru';
$wb['Show Update State'] = 'Zobrazit stav aktualizacÃ';
$wb['Show RAID state'] = 'Zobrazit stav RAID polÃ';
@@ -72,11 +72,11 @@ $wb['monitor_serverstate_critical_txt'] = 'kritický';
$wb['monitor_serverstate_error_txt'] = 'chyba';
$wb['monitor_serverstate_moreinfo_txt'] = 'VÃce informacÃ...';
$wb['monitor_serverstate_more_txt'] = 'VÃce...';
-$wb['monitor_serverstate_fclamok_txt'] = 'Virová ochrana vpořádku';
+$wb['monitor_serverstate_fclamok_txt'] = 'Antirová ochrana je v pořádku';
$wb['monitor_serverstate_fclamoutdated_txt'] = 'Virová ochrana ZASTARALÃ!';
$wb['monitor_serverstate_fclamunknown_txt'] = 'Freshclam: ???!';
-$wb['monitor_serverstate_hdok_txt'] = 'MÃsto na disku vpořádku';
-$wb['monitor_serverstate_hdgoingfull_txt'] = 'Distk se zaÄÃna zaplňovat';
+$wb['monitor_serverstate_hdok_txt'] = 'MÃsto na disku je v pořádku';
+$wb['monitor_serverstate_hdgoingfull_txt'] = 'Disk se zaÄÃná zaplňovat';
$wb['monitor_serverstate_hdnearlyfull_txt'] = 'Disk je téměř plný';
$wb['monitor_serverstate_hdveryfull_txt'] = 'Disk bude každou chvÃli zaplnÄ›n';
$wb['monitor_serverstate_hdfull_txt'] = 'Žádné mÃsto na disku';
@@ -87,13 +87,13 @@ $wb['monitor_serverstate_listwarning_txt'] = 'varovánÃ';
$wb['monitor_serverstate_listcritical_txt'] = 'kritický';
$wb['monitor_serverstate_listerror_txt'] = 'chyba';
$wb['monitor_serverstate_listunknown_txt'] = 'neznámý';
-$wb['monitor_serverstate_loadok_txt'] = 'ZatÞená serveru je vpořádku';
+$wb['monitor_serverstate_loadok_txt'] = 'ZatÞenà serveru je vpořádku';
$wb['monitor_serverstate_loadheavy_txt'] = 'Server těžce zatÞenÃm';
$wb['monitor_serverstate_loadhigh_txt'] = 'Server vysoce zatÞen';
$wb['monitor_serverstate_loaghigher_txt'] = 'Server pod vyÅ¡Å¡Ãm zatÞenÃm';
$wb['monitor_serverstate_loadhighest_txt'] = 'Server pod nejvyÅ¡Å¡Ãm zatÞenÃm';
-$wb['monitor_serverstate_loadunknown_txt'] = 'ZatÞená serveru: ???';
-$wb['monitor_serverstate_mailqok_txt'] = 'ZatÞená mailové fronty je vpořádku';
+$wb['monitor_serverstate_loadunknown_txt'] = 'ZatÞenà serveru: ???';
+$wb['monitor_serverstate_mailqok_txt'] = 'ZatÞenà e-mailové fronty je vpořádku';
$wb['monitor_serverstate_mailqheavy_txt'] = 'E-mailová fronta těžce zatÞena';
$wb['monitor_serverstate_mailqhigh_txt'] = 'E-mailová fronta vysoce zatÞena';
$wb['monitor_serverstate_mailqhigher_txt'] = 'E-mailová fronta je pod vyÅ¡Å¡Ãm zatÞenÃm';
@@ -127,7 +127,7 @@ $wb['monitor_settings_datafromdate_txt'] = 'Data z: ';
$wb['monitor_settings_datetimeformat_txt'] = 'Y-d-m H:i';
$wb['monitor_settings_refreshsq_txt'] = 'ObnovovánÃ:';
$wb['monitor_settings_server_txt'] = 'Server';
-$wb['monitor_title_cpuinfo_txt'] = 'CPU informace';
+$wb['monitor_title_cpuinfo_txt'] = 'Informace o CPU';
$wb['monitor_title_updatestate_txt'] = 'Stav aktualizace';
$wb['monitor_title_mailq_txt'] = 'E-mailová fronta';
$wb['monitor_title_raidstate_txt'] = 'Stav pole RAID';
@@ -141,9 +141,11 @@ $wb['monitor_serverstate_beancounterwarning_txt'] = 'NÄ›které ÄÃtaÄe (limity
$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_beancounter_nosupport_txt'] = 'Tento server nemá nainstalován VE OpenVZ a proto nemá beancounter informace';
$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 BeanCounter';
?>
+
+
diff --git a/interface/web/monitor/lib/lang/cz_datalog_list.lng b/interface/web/monitor/lib/lang/cz_datalog_list.lng
index c9e9a86555..70adcad1ab 100644
--- a/interface/web/monitor/lib/lang/cz_datalog_list.lng
+++ b/interface/web/monitor/lib/lang/cz_datalog_list.lng
@@ -6,3 +6,5 @@ $wb['dbtable_txt'] = 'DB tabulka';
$wb['action_txt'] = 'Akce';
$wb['status_txt'] = 'Stav';
?>
+
+
diff --git a/interface/web/monitor/lib/lang/cz_syslog_list.lng b/interface/web/monitor/lib/lang/cz_syslog_list.lng
index 990662552b..85cd4b3b01 100644
--- a/interface/web/monitor/lib/lang/cz_syslog_list.lng
+++ b/interface/web/monitor/lib/lang/cz_syslog_list.lng
@@ -5,3 +5,5 @@ $wb['server_id_txt'] = 'Server';
$wb['loglevel_txt'] = 'Logovacà úroveň';
$wb['message_txt'] = 'Zpráva';
?>
+
+
diff --git a/interface/web/monitor/lib/lang/pl.lng b/interface/web/monitor/lib/lang/pl.lng
index 88497b423e..533d8f6fef 100644
--- a/interface/web/monitor/lib/lang/pl.lng
+++ b/interface/web/monitor/lib/lang/pl.lng
@@ -100,7 +100,7 @@ $wb['monitor_serverstate_mailqhigher_txt'] = 'Mailq jest za bardzo obciążony';
$wb['monitor_serverstate_mailqhighest_txt'] = 'Mailq jest krytycznie przeciążony';
$wb['monitor_serverstate_mailqunknown_txt'] = 'Mailq: ???';
$wb['monitor_serverstate_raidok_txt'] = 'RAID działa poprawnie';
-$wb['monitor_serverstate_raidresync_txt'] = 'RAID nie jest z synchronizowany';
+$wb['monitor_serverstate_raidresync_txt'] = 'RAID nie jest zsynchronizowany';
$wb['monitor_serverstate_raidfault_txt'] = 'RAID ma jeden niesprawny dysk. Wymień go najszybciej jak to możliwe!';
$wb['monitor_serverstate_raiderror_txt'] = 'RAID nie włączy się już więcej';
$wb['monitor_serverstate_raidunknown_txt'] = 'Stan RAID: ???';
@@ -144,6 +144,7 @@ $wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter';
$wb['monitor_beancounter_nosupport_txt'] = 'Ten serwer nie jest serwerem OpenVz VE i nie posiada informacji o beancounterach';
$wb['monitor_title_iptables_txt'] = 'Reguły IPTables';
$wb['Show fail2ban-Log'] = 'Pokaż log fail2ban';
-$wb['Show IPTables'] = 'Pokaż IPTables';
+$wb['Show IPTables'] = 'Pokaż reguły IPTables';
$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter';
?>
+
diff --git a/interface/web/monitor/lib/lang/pl_datalog_list.lng b/interface/web/monitor/lib/lang/pl_datalog_list.lng
index 398ca51edd..0b969b1332 100644
--- a/interface/web/monitor/lib/lang/pl_datalog_list.lng
+++ b/interface/web/monitor/lib/lang/pl_datalog_list.lng
@@ -6,3 +6,4 @@ $wb['dbtable_txt'] = 'Tabele DB';
$wb['action_txt'] = 'Akcja';
$wb['status_txt'] = 'Status';
?>
+
diff --git a/interface/web/monitor/lib/lang/pl_syslog_list.lng b/interface/web/monitor/lib/lang/pl_syslog_list.lng
index e37799c474..f5e0645fe0 100644
--- a/interface/web/monitor/lib/lang/pl_syslog_list.lng
+++ b/interface/web/monitor/lib/lang/pl_syslog_list.lng
@@ -5,3 +5,4 @@ $wb['server_id_txt'] = 'Serwer';
$wb['loglevel_txt'] = 'Poziom logowania';
$wb['message_txt'] = 'Wiadomość';
?>
+
diff --git a/interface/web/sites/ajax_get_json.php b/interface/web/sites/ajax_get_json.php
index f7bbc71cd5..ba9a32eb8f 100644
--- a/interface/web/sites/ajax_get_json.php
+++ b/interface/web/sites/ajax_get_json.php
@@ -130,23 +130,21 @@ $type = $_GET["type"];
}
if($type == 'getdatabaseusers') {
- $json = '{';
-
+ $json = '{}';
+
$sql = "SELECT sys_groupid FROM web_domain WHERE domain_id = $web_id";
$group = $app->db->queryOneRecord($sql);
if($group) {
$sql = "SELECT database_user_id, database_user FROM web_database_user WHERE sys_groupid = '" . $group['sys_groupid'] . "'";
$records = $app->db->queryAllRecords($sql);
+ $tmp_array = array();
foreach($records as $record) {
- $json .= '"'.$record['database_user_id'].'": "'.$record['database_user'].'",';
+ $tmp_array[$record['database_user_id']] = $record['database_user'];
}
- unset($records);
- unset($group);
+ $json = $app->functions->json_encode($tmp_array);
+ unset($records, $group, $tmp_array);
}
-
- if(substr($json,-1) == ',') $json = substr($json,0,-1);
- $json .= '}';
}
if($type == 'get_use_combobox'){
diff --git a/interface/web/sites/aps_installedpackages_list.php b/interface/web/sites/aps_installedpackages_list.php
index c3933c55ee..e3c318f93e 100644
--- a/interface/web/sites/aps_installedpackages_list.php
+++ b/interface/web/sites/aps_installedpackages_list.php
@@ -90,7 +90,7 @@ $query = "SELECT aps_instances.id AS id, aps_instances.package_id AS package_id,
aps_instances.instance_status AS instance_status, aps_packages.name AS package_name,
aps_packages.version AS package_version, aps_packages.release AS package_release,
aps_packages.package_status AS package_status,
- CONCAT ((SELECT value FROM aps_instances_settings WHERE name='main_domain' AND instance_id = aps_instances.id),
+ CONCAT((SELECT value FROM aps_instances_settings WHERE name='main_domain' AND instance_id = aps_instances.id),
'/', (SELECT value FROM aps_instances_settings WHERE name='main_location' AND instance_id = aps_instances.id))
AS install_location
FROM aps_instances, aps_packages, client
@@ -101,7 +101,7 @@ $query = "SELECT aps_instances.id AS id, aps_instances.package_id AS package_id,
aps_instances.instance_status AS instance_status, aps_packages.name AS package_name,
aps_packages.version AS package_version, aps_packages.release AS package_release,
aps_packages.package_status AS package_status,
- CONCAT ((SELECT value FROM aps_instances_settings WHERE name='main_domain' AND instance_id = aps_instances.id),
+ CONCAT((SELECT value FROM aps_instances_settings WHERE name='main_domain' AND instance_id = aps_instances.id),
'/', (SELECT value FROM aps_instances_settings WHERE name='main_location' AND instance_id = aps_instances.id))
AS install_location
FROM aps_instances, aps_packages, sys_group
@@ -139,4 +139,4 @@ if(is_array($records))
$app->tpl->setLoop('records', $records_new);
$app->listform_actions->onShow();
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/database_edit.php b/interface/web/sites/database_edit.php
index a11d38a9e2..c259ff055d 100644
--- a/interface/web/sites/database_edit.php
+++ b/interface/web/sites/database_edit.php
@@ -248,11 +248,24 @@ class page_action extends tform_actions {
// we need remote access rights for this server, so get it's ip address
$server_config = $app->getconf->get_server_config($tmp['server_id'], 'server');
if($server_config['ip_address']!='') {
+ /*
if($this->dataRecord['remote_access'] != 'y') $this->dataRecord['remote_ips'] = '';
$this->dataRecord['remote_access'] = 'y';
if(preg_match('/(^|,)' . preg_quote($server_config['ip_address'], '/') . '(,|$)/', $this->dataRecord['remote_ips']) == false) {
$this->dataRecord['remote_ips'] .= ($this->dataRecord['remote_ips'] != '' ? ',' : '') . $server_config['ip_address'];
}
+ */
+
+ if($this->dataRecord['remote_access'] != 'y'){
+ $this->dataRecord['remote_ips'] = $server_config['ip_address'];
+ $this->dataRecord['remote_access'] = 'y';
+ } else {
+ if($this->dataRecord['remote_ips'] != ''){
+ if(preg_match('/(^|,)' . preg_quote($server_config['ip_address'], '/') . '(,|$)/', $this->dataRecord['remote_ips']) == false) {
+ $this->dataRecord['remote_ips'] .= ',' . $server_config['ip_address'];
+ }
+ }
+ }
}
}
@@ -299,11 +312,24 @@ class page_action extends tform_actions {
// we need remote access rights for this server, so get it's ip address
$server_config = $app->getconf->get_server_config($tmp['server_id'], 'server');
if($server_config['ip_address']!='') {
+ /*
if($this->dataRecord['remote_access'] != 'y') $this->dataRecord['remote_ips'] = '';
$this->dataRecord['remote_access'] = 'y';
if(preg_match('/(^|,)' . preg_quote($server_config['ip_address'], '/') . '(,|$)/', $this->dataRecord['remote_ips']) == false) {
$this->dataRecord['remote_ips'] .= ($this->dataRecord['remote_ips'] != '' ? ',' : '') . $server_config['ip_address'];
}
+ */
+
+ if($this->dataRecord['remote_access'] != 'y'){
+ $this->dataRecord['remote_ips'] = $server_config['ip_address'];
+ $this->dataRecord['remote_access'] = 'y';
+ } else {
+ if($this->dataRecord['remote_ips'] != ''){
+ if(preg_match('/(^|,)' . preg_quote($server_config['ip_address'], '/') . '(,|$)/', $this->dataRecord['remote_ips']) == false) {
+ $this->dataRecord['remote_ips'] .= ',' . $server_config['ip_address'];
+ }
+ }
+ }
}
}
diff --git a/interface/web/sites/form/web_domain.tform.php b/interface/web/sites/form/web_domain.tform.php
index a55fe4d877..8f991b7fbf 100644
--- a/interface/web/sites/form/web_domain.tform.php
+++ b/interface/web/sites/form/web_domain.tform.php
@@ -88,6 +88,9 @@ $form["tabs"]['domain'] = array (
'datatype' => 'INTEGER',
'formtype' => 'SELECT',
'default' => '',
+ 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
+ 'errmsg'=> 'no_server_error'),
+ ),
'datasource' => array ( 'type' => 'SQL',
'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND web_server = 1 AND {AUTHSQL} ORDER BY server_name',
'keyfield'=> 'server_id',
diff --git a/interface/web/sites/form/web_vhost_subdomain.tform.php b/interface/web/sites/form/web_vhost_subdomain.tform.php
index cb1f6cc0d2..3aa304982a 100644
--- a/interface/web/sites/form/web_vhost_subdomain.tform.php
+++ b/interface/web/sites/form/web_vhost_subdomain.tform.php
@@ -170,13 +170,7 @@ $form["tabs"]['domain'] = array (
'hd_quota' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
- 'errmsg'=> 'hd_quota_error_empty'),
- 1 => array ( 'type' => 'REGEX',
- 'regex' => '/^(\-1|[0-9]{1,10})$/',
- 'errmsg'=> 'hd_quota_error_regex'),
- ),
- 'default' => '-1',
+ 'default' => '0',
'value' => '',
'width' => '7',
'maxlength' => '7'
diff --git a/interface/web/sites/lib/lang/ar_aps.lng b/interface/web/sites/lib/lang/ar_aps.lng
index 8ce5b20eb1..29fb7b6a40 100644
--- a/interface/web/sites/lib/lang/ar_aps.lng
+++ b/interface/web/sites/lib/lang/ar_aps.lng
@@ -54,4 +54,5 @@ $wb['installation_remove_txt'] = 'Removal planned';
$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
$wb['btn_install_txt'] = 'Install';
$wb['btn_cancel_txt'] = 'Cancel';
+$wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
?>
diff --git a/interface/web/sites/lib/lang/ar_aps_update_packagelist.lng b/interface/web/sites/lib/lang/ar_aps_update_packagelist.lng
index 20a7360b64..ce9fcf68fb 100644
--- a/interface/web/sites/lib/lang/ar_aps_update_packagelist.lng
+++ b/interface/web/sites/lib/lang/ar_aps_update_packagelist.lng
@@ -4,4 +4,4 @@ $wb['list_desc_txt'] = '';
$wb['btn_start_txt'] = 'Update Packagelist';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['legend_txt'] = 'Here you can update the list of available packages. Please note that this can take up to five minutes. You can leave this page if you like; the process will continue in the background.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/bg_aps.lng b/interface/web/sites/lib/lang/bg_aps.lng
index 8ce5b20eb1..29fb7b6a40 100644
--- a/interface/web/sites/lib/lang/bg_aps.lng
+++ b/interface/web/sites/lib/lang/bg_aps.lng
@@ -54,4 +54,5 @@ $wb['installation_remove_txt'] = 'Removal planned';
$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
$wb['btn_install_txt'] = 'Install';
$wb['btn_cancel_txt'] = 'Cancel';
+$wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
?>
diff --git a/interface/web/sites/lib/lang/bg_aps_update_packagelist.lng b/interface/web/sites/lib/lang/bg_aps_update_packagelist.lng
index 20a7360b64..ce9fcf68fb 100644
--- a/interface/web/sites/lib/lang/bg_aps_update_packagelist.lng
+++ b/interface/web/sites/lib/lang/bg_aps_update_packagelist.lng
@@ -4,4 +4,4 @@ $wb['list_desc_txt'] = '';
$wb['btn_start_txt'] = 'Update Packagelist';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['legend_txt'] = 'Here you can update the list of available packages. Please note that this can take up to five minutes. You can leave this page if you like; the process will continue in the background.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/br_aps.lng b/interface/web/sites/lib/lang/br_aps.lng
index 8ce5b20eb1..29fb7b6a40 100644
--- a/interface/web/sites/lib/lang/br_aps.lng
+++ b/interface/web/sites/lib/lang/br_aps.lng
@@ -54,4 +54,5 @@ $wb['installation_remove_txt'] = 'Removal planned';
$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
$wb['btn_install_txt'] = 'Install';
$wb['btn_cancel_txt'] = 'Cancel';
+$wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
?>
diff --git a/interface/web/sites/lib/lang/br_aps_update_packagelist.lng b/interface/web/sites/lib/lang/br_aps_update_packagelist.lng
index 20a7360b64..ce9fcf68fb 100644
--- a/interface/web/sites/lib/lang/br_aps_update_packagelist.lng
+++ b/interface/web/sites/lib/lang/br_aps_update_packagelist.lng
@@ -4,4 +4,4 @@ $wb['list_desc_txt'] = '';
$wb['btn_start_txt'] = 'Update Packagelist';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['legend_txt'] = 'Here you can update the list of available packages. Please note that this can take up to five minutes. You can leave this page if you like; the process will continue in the background.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/cz.lng b/interface/web/sites/lib/lang/cz.lng
index 71ccd165f6..d96c4d546a 100644
--- a/interface/web/sites/lib/lang/cz.lng
+++ b/interface/web/sites/lib/lang/cz.lng
@@ -33,3 +33,5 @@ $wb['Update Packagelist'] = 'Aktualizace seznamu balÃÄků';
$wb['Subdomain (Vhost)'] = 'Subdoména (Vhost)';
$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_aps.lng b/interface/web/sites/lib/lang/cz_aps.lng
index be2d99eac4..97bc670013 100644
--- a/interface/web/sites/lib/lang/cz_aps.lng
+++ b/interface/web/sites/lib/lang/cz_aps.lng
@@ -54,4 +54,7 @@ $wb['installation_remove_txt'] = 'Odstraněnà plánu';
$wb['packagelist_update_finished_txt'] = 'APS aktualizace seznamu balÃÄků dokonÄena.';
$wb['btn_install_txt'] = 'Instalovat';
$wb['btn_cancel_txt'] = 'Zrušit';
+$wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
?>
+
+
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 7b7b6dd6f0..3d5d3d8650 100644
--- a/interface/web/sites/lib/lang/cz_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/cz_aps_instances_list.lng
@@ -11,3 +11,5 @@ $wb['filter_txt'] = 'Hledat';
$wb['delete_txt'] = 'Smazat';
$wb['reinstall_txt'] = 'Přeinstalovat';
?>
+
+
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 52ef6ebcd9..b74dfc8882 100644
--- a/interface/web/sites/lib/lang/cz_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/cz_aps_packages_list.lng
@@ -6,3 +6,5 @@ $wb['category_txt'] = 'Kategorie';
$wb['status_txt'] = 'OdemÄený';
$wb['filter_txt'] = 'Hledat';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_aps_update_packagelist.lng b/interface/web/sites/lib/lang/cz_aps_update_packagelist.lng
index 20a7360b64..91a6ed46a4 100644
--- a/interface/web/sites/lib/lang/cz_aps_update_packagelist.lng
+++ b/interface/web/sites/lib/lang/cz_aps_update_packagelist.lng
@@ -2,6 +2,6 @@
$wb['head_txt'] = 'Update Packagelist';
$wb['list_desc_txt'] = '';
$wb['btn_start_txt'] = 'Update Packagelist';
-$wb['btn_cancel_txt'] = 'Cancel';
+$wb['btn_cancel_txt'] = 'Zrušit';
$wb['legend_txt'] = 'Here you can update the list of available packages. Please note that this can take up to five minutes. You can leave this page if you like; the process will continue in the background.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/cz_cron.lng b/interface/web/sites/lib/lang/cz_cron.lng
index d4e6c1767c..5ea9bb5b7b 100644
--- a/interface/web/sites/lib/lang/cz_cron.lng
+++ b/interface/web/sites/lib/lang/cz_cron.lng
@@ -19,3 +19,5 @@ $wb['run_wday_error_format'] = 'Chybný formát pro dny týdne.';
$wb['command_error_format'] = 'Chybná formát pÅ™Ãkazu. V pÅ™ÃpadÄ› URL je povoleno volánà pouze http/https.';
$wb['unknown_fieldtype_error'] = 'Bylp použito pole neznámého typu.';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_cron_list.lng b/interface/web/sites/lib/lang/cz_cron_list.lng
index f50dee2faf..0ca6dc3b87 100644
--- a/interface/web/sites/lib/lang/cz_cron_list.lng
+++ b/interface/web/sites/lib/lang/cz_cron_list.lng
@@ -11,3 +11,5 @@ $wb['command_txt'] = 'PÅ™Ãkaz';
$wb['add_new_cron_txt'] = 'Přidat novou cron úlohu';
$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 c316f0ac97..cb7e4ebbe4 100644
--- a/interface/web/sites/lib/lang/cz_database.lng
+++ b/interface/web/sites/lib/lang/cz_database.lng
@@ -44,3 +44,5 @@ $wb['no_dbuser_txt'] = 'Žádný';
$wb['database_client_differs_txt'] = 'Klient mateÅ™ského webu a databáze se neshodujÃ.';
$wb['database_user_missing_txt'] = 'Please select a database user for this database.';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_database_admin_list.lng b/interface/web/sites/lib/lang/cz_database_admin_list.lng
index a0069404d8..4eb24c99ca 100644
--- a/interface/web/sites/lib/lang/cz_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/cz_database_admin_list.lng
@@ -8,3 +8,5 @@ $wb['database_name_txt'] = 'Jméno databáze';
$wb['add_new_record_txt'] = 'Přidat nové databáze';
$wb['sys_groupid_txt'] = 'Klient';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_database_list.lng b/interface/web/sites/lib/lang/cz_database_list.lng
index 9bb80dd945..269dc2114d 100644
--- a/interface/web/sites/lib/lang/cz_database_list.lng
+++ b/interface/web/sites/lib/lang/cz_database_list.lng
@@ -7,3 +7,5 @@ $wb['database_user_txt'] = 'Uživatel databáze';
$wb['database_name_txt'] = 'Název databáze';
$wb['add_new_record_txt'] = 'Přidat databázi';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_database_user.lng b/interface/web/sites/lib/lang/cz_database_user.lng
index 8a64cb5225..4621087b5b 100644
--- a/interface/web/sites/lib/lang/cz_database_user.lng
+++ b/interface/web/sites/lib/lang/cz_database_user.lng
@@ -21,3 +21,5 @@ $wb['globalsearch_noresults_limit_txt'] = '0 výsledků';
$wb['globalsearch_searchfield_watermark_txt'] = 'Hledat';
$wb['globalsearch_suggestions_text_txt'] = 'Návrhy';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_database_user_admin_list.lng b/interface/web/sites/lib/lang/cz_database_user_admin_list.lng
index 8703e713e1..db76d1099e 100644
--- a/interface/web/sites/lib/lang/cz_database_user_admin_list.lng
+++ b/interface/web/sites/lib/lang/cz_database_user_admin_list.lng
@@ -4,3 +4,5 @@ $wb['database_user_txt'] = 'Uživatel databáze';
$wb['add_new_record_txt'] = 'Vytvořit nového uživatele databáze';
$wb['sys_groupid_txt'] = 'Klient';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_database_user_list.lng b/interface/web/sites/lib/lang/cz_database_user_list.lng
index 42cf36d703..68cd34d2e4 100644
--- a/interface/web/sites/lib/lang/cz_database_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_database_user_list.lng
@@ -3,3 +3,5 @@ $wb['list_head_txt'] = 'Uživatelé databáze';
$wb['database_user_txt'] = 'Uživatelé databáze';
$wb['add_new_record_txt'] = 'Přidat nového uživatele databáze';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_ftp_user.lng b/interface/web/sites/lib/lang/cz_ftp_user.lng
index 876ad5108c..2b9dd54505 100644
--- a/interface/web/sites/lib/lang/cz_ftp_user.lng
+++ b/interface/web/sites/lib/lang/cz_ftp_user.lng
@@ -32,3 +32,5 @@ $wb['repeat_password_txt'] = 'Opakujte heslo';
$wb['password_mismatch_txt'] = 'Hesla se neshodujÃ.';
$wb['password_match_txt'] = 'Hesla se shodujÃ.';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_ftp_user_list.lng b/interface/web/sites/lib/lang/cz_ftp_user_list.lng
index 41649df7f9..6f6f5021ee 100644
--- a/interface/web/sites/lib/lang/cz_ftp_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_ftp_user_list.lng
@@ -6,3 +6,5 @@ $wb['parent_domain_id_txt'] = 'Webová stránka';
$wb['username_txt'] = 'Uživatelské jméno';
$wb['add_new_record_txt'] = 'Přidat FTP uživatele';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_shell_user.lng b/interface/web/sites/lib/lang/cz_shell_user.lng
index 97b8a0d088..234b7a5921 100644
--- a/interface/web/sites/lib/lang/cz_shell_user.lng
+++ b/interface/web/sites/lib/lang/cz_shell_user.lng
@@ -27,3 +27,5 @@ $wb['repeat_password_txt'] = 'Opakujte heslo';
$wb['password_mismatch_txt'] = 'Hesla se neshodujÃ.';
$wb['password_match_txt'] = 'Hesla se shodujÃ.';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_shell_user_list.lng b/interface/web/sites/lib/lang/cz_shell_user_list.lng
index 1d6bc198d7..6d4a8fe52a 100644
--- a/interface/web/sites/lib/lang/cz_shell_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_shell_user_list.lng
@@ -6,3 +6,5 @@ $wb['parent_domain_id_txt'] = 'Stránka';
$wb['username_txt'] = 'Uživatelské jméno';
$wb['add_new_record_txt'] = 'Přidat shell uživatele';
?>
+
+
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 4531944549..dabb73b888 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
@@ -7,3 +7,5 @@ $wb['hard_txt'] = 'Tvrdý limit';
$wb['soft_txt'] = 'Měkký limit';
$wb['files_txt'] = 'Jednotlivé soubory';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_aliasdomain.lng b/interface/web/sites/lib/lang/cz_web_aliasdomain.lng
index 4149c71149..10b7eee7c5 100644
--- a/interface/web/sites/lib/lang/cz_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/cz_web_aliasdomain.lng
@@ -17,9 +17,9 @@ $wb['server_id_txt'] = 'Server';
$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
$wb['type_txt'] = 'Type';
$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
+$wb['redirect_type_txt'] = 'Typ pÅ™esmÄ›rovánÃ';
+$wb['redirect_path_txt'] = 'Cesta pÅ™esmÄ›rovánÃ';
+$wb['active_txt'] = 'AktivnÃ';
$wb['document_root_txt'] = 'Documentroot';
$wb['system_user_txt'] = 'Linux User';
$wb['system_group_txt'] = 'Linux Group';
@@ -40,9 +40,9 @@ $wb['limit_web_domain_txt'] = 'The max. number of web domains for your account i
$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
+$wb['domain_error_empty'] = 'Doména je prázdná.';
$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_regex'] = 'Neplatné doménové jméno.';
$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
@@ -77,7 +77,7 @@ $wb['save_certificate_txt'] = 'Save certificate';
$wb['create_certificate_txt'] = 'Create certificate';
$wb['delete_certificate_txt'] = 'Delete certificate';
$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['seo_redirect_txt'] = 'SEO pÅ™esmÄ›rovánÃ';
$wb['non_www_to_www_txt'] = 'Non-www -> www';
$wb['www_to_non_www_txt'] = 'www -> non-www';
$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
@@ -113,3 +113,5 @@ $wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
$wb['Domain'] = 'Aliasdomain';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng
index 22a4ffe32f..6cf247f995 100644
--- a/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng
@@ -12,3 +12,5 @@ $wb['no_redirect_txt'] = 'Žádné pÅ™esmÄ›rovánÃ';
$wb['no_flag_txt'] = 'Žádný pÅ™Ãznak';
$wb['none_txt'] = 'Žádná';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_backup_list.lng b/interface/web/sites/lib/lang/cz_web_backup_list.lng
index 3c9cfc8ef5..88e110f75f 100644
--- a/interface/web/sites/lib/lang/cz_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_backup_list.lng
@@ -13,3 +13,5 @@ $wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
$wb['backup_type_mysql'] = 'MySQL Database';
$wb['backup_type_web'] = 'Website files';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_domain.lng b/interface/web/sites/lib/lang/cz_web_domain.lng
index 604bdb6129..4f5df2935b 100644
--- a/interface/web/sites/lib/lang/cz_web_domain.lng
+++ b/interface/web/sites/lib/lang/cz_web_domain.lng
@@ -112,3 +112,5 @@ $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snipp
$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_domain_admin_list.lng b/interface/web/sites/lib/lang/cz_web_domain_admin_list.lng
index e52a794428..c79a51beb9 100644
--- a/interface/web/sites/lib/lang/cz_web_domain_admin_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_domain_admin_list.lng
@@ -7,3 +7,5 @@ $wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Doména';
$wb['add_new_record_txt'] = 'Přidat webovou stránku';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_domain_list.lng b/interface/web/sites/lib/lang/cz_web_domain_list.lng
index cbf025e79b..af0947c9fc 100644
--- a/interface/web/sites/lib/lang/cz_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_domain_list.lng
@@ -6,3 +6,5 @@ $wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Doména';
$wb['add_new_record_txt'] = 'Přidat webovou stránku';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_folder.lng b/interface/web/sites/lib/lang/cz_web_folder.lng
index f9f623dc2b..108f7c9527 100644
--- a/interface/web/sites/lib/lang/cz_web_folder.lng
+++ b/interface/web/sites/lib/lang/cz_web_folder.lng
@@ -5,3 +5,5 @@ $wb['path_txt'] = 'Cesta';
$wb['active_txt'] = 'AktivnÃ';
$wb['path_error_regex'] = 'Neplatná cesta ke složce.';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_folder_list.lng b/interface/web/sites/lib/lang/cz_web_folder_list.lng
index b75c0e80da..2aaaf4c98c 100644
--- a/interface/web/sites/lib/lang/cz_web_folder_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_folder_list.lng
@@ -5,3 +5,5 @@ $wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Webové stránky';
$wb['path_txt'] = 'Cesta';
?>
+
+
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 48f426089a..a1c6ccf411 100644
--- a/interface/web/sites/lib/lang/cz_web_folder_user.lng
+++ b/interface/web/sites/lib/lang/cz_web_folder_user.lng
@@ -10,3 +10,5 @@ $wb['repeat_password_txt'] = 'Opakujte heslo';
$wb['password_mismatch_txt'] = 'Hesla se neshodujÃ.';
$wb['password_match_txt'] = 'Hesla se shodujÃ.';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_folder_user_list.lng b/interface/web/sites/lib/lang/cz_web_folder_user_list.lng
index 99fe62051c..0b3f9648d4 100644
--- a/interface/web/sites/lib/lang/cz_web_folder_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_folder_user_list.lng
@@ -4,3 +4,5 @@ $wb['active_txt'] = 'AktivnÃ';
$wb['web_folder_id_txt'] = 'Složka';
$wb['username_txt'] = 'Uživatelské jméno';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng b/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng
index ed93596824..ffab544669 100644
--- a/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng
@@ -7,3 +7,5 @@ $wb['this_year_txt'] = 'Tento rok';
$wb['last_year_txt'] = 'Minulý rok';
$wb['sum_txt'] = 'SouÄet';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_subdomain.lng b/interface/web/sites/lib/lang/cz_web_subdomain.lng
index de1445f5de..4547f9188d 100644
--- a/interface/web/sites/lib/lang/cz_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/cz_web_subdomain.lng
@@ -44,3 +44,5 @@ $wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_subdomain_list.lng b/interface/web/sites/lib/lang/cz_web_subdomain_list.lng
index 8a0bafe0f9..1eab4a8aa4 100644
--- a/interface/web/sites/lib/lang/cz_web_subdomain_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_subdomain_list.lng
@@ -6,3 +6,5 @@ $wb['parent_domain_id_txt'] = 'Webová stránka';
$wb['domain_txt'] = 'Subdoména';
$wb['add_new_record_txt'] = 'Přidat subdoménu';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
index 63d61fb724..3ed649f760 100644
--- a/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
+++ b/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
@@ -21,8 +21,8 @@ $wb['domain_txt'] = 'Doména';
$wb['host_txt'] = 'Hostname';
$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
$wb['type_txt'] = 'Verze';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
+$wb['redirect_type_txt'] = 'Typ pÅ™esmÄ›rovánÃ';
+$wb['redirect_path_txt'] = 'Cesta pÅ™esmÄ›rovánÃ';
$wb['active_txt'] = 'AktivnÃ';
$wb['document_root_txt'] = 'Documentroot';
$wb['system_user_txt'] = 'Linux User';
@@ -46,7 +46,7 @@ $wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your acc
$wb['apache_directives_txt'] = 'Apache Directives';
$wb['domain_error_empty'] = 'Doména je prázdná.';
$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_regex'] = 'Neplatné doménové jméno.';
$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
@@ -116,3 +116,5 @@ $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snipp
$wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
index a54e19a5ad..bf8a1710bc 100644
--- a/interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
@@ -6,3 +6,5 @@ $wb['parent_domain_id_txt'] = 'Webové stránky';
$wb['domain_txt'] = 'Subdoména';
$wb['add_new_record_txt'] = 'Přidat novou poddoménu';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_webdav_user.lng b/interface/web/sites/lib/lang/cz_webdav_user.lng
index 3e89a1e625..523b79f80c 100644
--- a/interface/web/sites/lib/lang/cz_webdav_user.lng
+++ b/interface/web/sites/lib/lang/cz_webdav_user.lng
@@ -19,3 +19,5 @@ $wb['repeat_password_txt'] = 'Opakujte heslo';
$wb['password_mismatch_txt'] = 'Hesla se neshodujÃ.';
$wb['password_match_txt'] = 'Hesla se shodujÃ.';
?>
+
+
diff --git a/interface/web/sites/lib/lang/cz_webdav_user_list.lng b/interface/web/sites/lib/lang/cz_webdav_user_list.lng
index 0c1148b53e..c74be89691 100644
--- a/interface/web/sites/lib/lang/cz_webdav_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_webdav_user_list.lng
@@ -6,3 +6,5 @@ $wb['parent_domain_id_txt'] = 'Webové stránky';
$wb['username_txt'] = 'Uživatelské jméno';
$wb['add_new_record_txt'] = 'Přidat nového WebDAV uživatele';
?>
+
+
diff --git a/interface/web/sites/lib/lang/de_aps.lng b/interface/web/sites/lib/lang/de_aps.lng
index ff8df35d5b..aab6f4edf7 100644
--- a/interface/web/sites/lib/lang/de_aps.lng
+++ b/interface/web/sites/lib/lang/de_aps.lng
@@ -54,5 +54,5 @@ $wb['installation_error_txt'] = 'Installationsfehler';
$wb['installation_success_txt'] = 'Installiert';
$wb['installation_remove_txt'] = 'Deinstallation vorgemerkt';
$wb['packagelist_update_finished_txt'] = 'APS Paketlistenupdate beendet.';
-$wb["limit_aps_txt"] = 'Die maximale Anzahl an APS-Instanzen für Ihr Konto wurde erreicht.';
+$wb['limit_aps_txt'] = 'Die maximale Anzahl an APS-Instanzen für Ihr Konto wurde erreicht.';
?>
diff --git a/interface/web/sites/lib/lang/el_aps.lng b/interface/web/sites/lib/lang/el_aps.lng
index 8ce5b20eb1..29fb7b6a40 100644
--- a/interface/web/sites/lib/lang/el_aps.lng
+++ b/interface/web/sites/lib/lang/el_aps.lng
@@ -54,4 +54,5 @@ $wb['installation_remove_txt'] = 'Removal planned';
$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
$wb['btn_install_txt'] = 'Install';
$wb['btn_cancel_txt'] = 'Cancel';
+$wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
?>
diff --git a/interface/web/sites/lib/lang/el_aps_update_packagelist.lng b/interface/web/sites/lib/lang/el_aps_update_packagelist.lng
index 20a7360b64..ce9fcf68fb 100644
--- a/interface/web/sites/lib/lang/el_aps_update_packagelist.lng
+++ b/interface/web/sites/lib/lang/el_aps_update_packagelist.lng
@@ -4,4 +4,4 @@ $wb['list_desc_txt'] = '';
$wb['btn_start_txt'] = 'Update Packagelist';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['legend_txt'] = 'Here you can update the list of available packages. Please note that this can take up to five minutes. You can leave this page if you like; the process will continue in the background.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/en_web_domain.lng b/interface/web/sites/lib/lang/en_web_domain.lng
index ff96f1fb45..d7b3dcf427 100644
--- a/interface/web/sites/lib/lang/en_web_domain.lng
+++ b/interface/web/sites/lib/lang/en_web_domain.lng
@@ -111,4 +111,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
$wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['no_server_error'] = 'No server selected.';
?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/es_aps.lng b/interface/web/sites/lib/lang/es_aps.lng
index 8ce5b20eb1..29fb7b6a40 100644
--- a/interface/web/sites/lib/lang/es_aps.lng
+++ b/interface/web/sites/lib/lang/es_aps.lng
@@ -54,4 +54,5 @@ $wb['installation_remove_txt'] = 'Removal planned';
$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
$wb['btn_install_txt'] = 'Install';
$wb['btn_cancel_txt'] = 'Cancel';
+$wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
?>
diff --git a/interface/web/sites/lib/lang/es_aps_update_packagelist.lng b/interface/web/sites/lib/lang/es_aps_update_packagelist.lng
index 20a7360b64..ce9fcf68fb 100644
--- a/interface/web/sites/lib/lang/es_aps_update_packagelist.lng
+++ b/interface/web/sites/lib/lang/es_aps_update_packagelist.lng
@@ -4,4 +4,4 @@ $wb['list_desc_txt'] = '';
$wb['btn_start_txt'] = 'Update Packagelist';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['legend_txt'] = 'Here you can update the list of available packages. Please note that this can take up to five minutes. You can leave this page if you like; the process will continue in the background.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/fi_aps.lng b/interface/web/sites/lib/lang/fi_aps.lng
index 8ce5b20eb1..29fb7b6a40 100644
--- a/interface/web/sites/lib/lang/fi_aps.lng
+++ b/interface/web/sites/lib/lang/fi_aps.lng
@@ -54,4 +54,5 @@ $wb['installation_remove_txt'] = 'Removal planned';
$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
$wb['btn_install_txt'] = 'Install';
$wb['btn_cancel_txt'] = 'Cancel';
+$wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
?>
diff --git a/interface/web/sites/lib/lang/fi_aps_update_packagelist.lng b/interface/web/sites/lib/lang/fi_aps_update_packagelist.lng
index 20a7360b64..ce9fcf68fb 100644
--- a/interface/web/sites/lib/lang/fi_aps_update_packagelist.lng
+++ b/interface/web/sites/lib/lang/fi_aps_update_packagelist.lng
@@ -4,4 +4,4 @@ $wb['list_desc_txt'] = '';
$wb['btn_start_txt'] = 'Update Packagelist';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['legend_txt'] = 'Here you can update the list of available packages. Please note that this can take up to five minutes. You can leave this page if you like; the process will continue in the background.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/fr_aps.lng b/interface/web/sites/lib/lang/fr_aps.lng
index 8ce5b20eb1..29fb7b6a40 100644
--- a/interface/web/sites/lib/lang/fr_aps.lng
+++ b/interface/web/sites/lib/lang/fr_aps.lng
@@ -54,4 +54,5 @@ $wb['installation_remove_txt'] = 'Removal planned';
$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
$wb['btn_install_txt'] = 'Install';
$wb['btn_cancel_txt'] = 'Cancel';
+$wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
?>
diff --git a/interface/web/sites/lib/lang/fr_aps_update_packagelist.lng b/interface/web/sites/lib/lang/fr_aps_update_packagelist.lng
index 20a7360b64..ce9fcf68fb 100644
--- a/interface/web/sites/lib/lang/fr_aps_update_packagelist.lng
+++ b/interface/web/sites/lib/lang/fr_aps_update_packagelist.lng
@@ -4,4 +4,4 @@ $wb['list_desc_txt'] = '';
$wb['btn_start_txt'] = 'Update Packagelist';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['legend_txt'] = 'Here you can update the list of available packages. Please note that this can take up to five minutes. You can leave this page if you like; the process will continue in the background.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/hr_aps.lng b/interface/web/sites/lib/lang/hr_aps.lng
index 8ce5b20eb1..29fb7b6a40 100644
--- a/interface/web/sites/lib/lang/hr_aps.lng
+++ b/interface/web/sites/lib/lang/hr_aps.lng
@@ -54,4 +54,5 @@ $wb['installation_remove_txt'] = 'Removal planned';
$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
$wb['btn_install_txt'] = 'Install';
$wb['btn_cancel_txt'] = 'Cancel';
+$wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
?>
diff --git a/interface/web/sites/lib/lang/hr_aps_update_packagelist.lng b/interface/web/sites/lib/lang/hr_aps_update_packagelist.lng
index 20a7360b64..ce9fcf68fb 100644
--- a/interface/web/sites/lib/lang/hr_aps_update_packagelist.lng
+++ b/interface/web/sites/lib/lang/hr_aps_update_packagelist.lng
@@ -4,4 +4,4 @@ $wb['list_desc_txt'] = '';
$wb['btn_start_txt'] = 'Update Packagelist';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['legend_txt'] = 'Here you can update the list of available packages. Please note that this can take up to five minutes. You can leave this page if you like; the process will continue in the background.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/hu_aps.lng b/interface/web/sites/lib/lang/hu_aps.lng
index 8ce5b20eb1..29fb7b6a40 100644
--- a/interface/web/sites/lib/lang/hu_aps.lng
+++ b/interface/web/sites/lib/lang/hu_aps.lng
@@ -54,4 +54,5 @@ $wb['installation_remove_txt'] = 'Removal planned';
$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
$wb['btn_install_txt'] = 'Install';
$wb['btn_cancel_txt'] = 'Cancel';
+$wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
?>
diff --git a/interface/web/sites/lib/lang/hu_aps_update_packagelist.lng b/interface/web/sites/lib/lang/hu_aps_update_packagelist.lng
index 20a7360b64..ce9fcf68fb 100644
--- a/interface/web/sites/lib/lang/hu_aps_update_packagelist.lng
+++ b/interface/web/sites/lib/lang/hu_aps_update_packagelist.lng
@@ -4,4 +4,4 @@ $wb['list_desc_txt'] = '';
$wb['btn_start_txt'] = 'Update Packagelist';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['legend_txt'] = 'Here you can update the list of available packages. Please note that this can take up to five minutes. You can leave this page if you like; the process will continue in the background.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/id_aps.lng b/interface/web/sites/lib/lang/id_aps.lng
index 8ce5b20eb1..29fb7b6a40 100644
--- a/interface/web/sites/lib/lang/id_aps.lng
+++ b/interface/web/sites/lib/lang/id_aps.lng
@@ -54,4 +54,5 @@ $wb['installation_remove_txt'] = 'Removal planned';
$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
$wb['btn_install_txt'] = 'Install';
$wb['btn_cancel_txt'] = 'Cancel';
+$wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
?>
diff --git a/interface/web/sites/lib/lang/id_aps_update_packagelist.lng b/interface/web/sites/lib/lang/id_aps_update_packagelist.lng
index 20a7360b64..ce9fcf68fb 100644
--- a/interface/web/sites/lib/lang/id_aps_update_packagelist.lng
+++ b/interface/web/sites/lib/lang/id_aps_update_packagelist.lng
@@ -4,4 +4,4 @@ $wb['list_desc_txt'] = '';
$wb['btn_start_txt'] = 'Update Packagelist';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['legend_txt'] = 'Here you can update the list of available packages. Please note that this can take up to five minutes. You can leave this page if you like; the process will continue in the background.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/it_aps.lng b/interface/web/sites/lib/lang/it_aps.lng
index 8ce5b20eb1..29fb7b6a40 100644
--- a/interface/web/sites/lib/lang/it_aps.lng
+++ b/interface/web/sites/lib/lang/it_aps.lng
@@ -54,4 +54,5 @@ $wb['installation_remove_txt'] = 'Removal planned';
$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
$wb['btn_install_txt'] = 'Install';
$wb['btn_cancel_txt'] = 'Cancel';
+$wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
?>
diff --git a/interface/web/sites/lib/lang/it_aps_update_packagelist.lng b/interface/web/sites/lib/lang/it_aps_update_packagelist.lng
index 20a7360b64..ce9fcf68fb 100644
--- a/interface/web/sites/lib/lang/it_aps_update_packagelist.lng
+++ b/interface/web/sites/lib/lang/it_aps_update_packagelist.lng
@@ -4,4 +4,4 @@ $wb['list_desc_txt'] = '';
$wb['btn_start_txt'] = 'Update Packagelist';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['legend_txt'] = 'Here you can update the list of available packages. Please note that this can take up to five minutes. You can leave this page if you like; the process will continue in the background.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/ja_aps.lng b/interface/web/sites/lib/lang/ja_aps.lng
index 8ce5b20eb1..29fb7b6a40 100644
--- a/interface/web/sites/lib/lang/ja_aps.lng
+++ b/interface/web/sites/lib/lang/ja_aps.lng
@@ -54,4 +54,5 @@ $wb['installation_remove_txt'] = 'Removal planned';
$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
$wb['btn_install_txt'] = 'Install';
$wb['btn_cancel_txt'] = 'Cancel';
+$wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
?>
diff --git a/interface/web/sites/lib/lang/nl_aps.lng b/interface/web/sites/lib/lang/nl_aps.lng
index 8ce5b20eb1..29fb7b6a40 100644
--- a/interface/web/sites/lib/lang/nl_aps.lng
+++ b/interface/web/sites/lib/lang/nl_aps.lng
@@ -54,4 +54,5 @@ $wb['installation_remove_txt'] = 'Removal planned';
$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
$wb['btn_install_txt'] = 'Install';
$wb['btn_cancel_txt'] = 'Cancel';
+$wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
?>
diff --git a/interface/web/sites/lib/lang/nl_aps_update_packagelist.lng b/interface/web/sites/lib/lang/nl_aps_update_packagelist.lng
index 20a7360b64..ce9fcf68fb 100644
--- a/interface/web/sites/lib/lang/nl_aps_update_packagelist.lng
+++ b/interface/web/sites/lib/lang/nl_aps_update_packagelist.lng
@@ -4,4 +4,4 @@ $wb['list_desc_txt'] = '';
$wb['btn_start_txt'] = 'Update Packagelist';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['legend_txt'] = 'Here you can update the list of available packages. Please note that this can take up to five minutes. You can leave this page if you like; the process will continue in the background.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/pl.lng b/interface/web/sites/lib/lang/pl.lng
index 62628fcb37..6d26fb6757 100644
--- a/interface/web/sites/lib/lang/pl.lng
+++ b/interface/web/sites/lib/lang/pl.lng
@@ -1,35 +1,36 @@
<?php
-$wb['Websites'] = 'Strona www';
-$wb['Website'] = 'Strona www';
-$wb['Subdomain'] = 'Subdomain for website';
-$wb['Aliasdomain'] = 'Aliasdomain for website';
$wb['Database'] = 'Baza danych';
-$wb['Web Access'] = 'Web Access';
+$wb['Options'] = 'Opcje';
+$wb['Domain'] = 'Strona www';
+$wb['Redirect'] = 'Przekierowanie';
+$wb['SSL'] = 'SSL';
+$wb['Subdomain'] = 'Subdomena';
+$wb['Sites'] = 'Strony';
+$wb['Aliasdomain'] = 'Alias domeny';
$wb['FTP-User'] = 'Użytkownik FTP';
-$wb['Webdav-User'] = 'Użytkownik Webdav';
-$wb['Folder'] = 'Protected Folders';
-$wb['Folder users'] = 'Protected Folder Users';
-$wb['Command Line'] = 'Command Line';
+$wb['FTP'] = 'FTP';
$wb['Shell-User'] = 'Użytkownik Shell';
+$wb['Shell'] = 'Shell';
+$wb['Websites'] = 'Strony www';
+$wb['Stats'] = 'Statystyki';
+$wb['Website'] = 'Strona www';
+$wb['Cron'] = 'Cron';
$wb['Cron Jobs'] = 'Zadania Cron';
$wb['Statistics'] = 'Statystyki';
$wb['Web traffic'] = 'Ruch na stronie';
-$wb['Website quota (Harddisk)'] = 'Uzycie dysku strony (Harddisk)';
-$wb['Cron'] = 'Cron';
-$wb['Stats'] = 'Statystyki';
-$wb['Shell'] = 'Shell';
-$wb['Webdav'] = 'WebDAV';
-$wb['FTP'] = 'FTP';
-$wb['Options'] = 'Opcje';
-$wb['Domain'] = 'Strona www';
-$wb['Redirect'] = 'Przekierowanie';
-$wb['SSL'] = 'SSL';
-$wb['Sites'] = 'Sites';
-$wb['Database User'] = 'Database Users';
-$wb['APS Installer'] = 'APS Installer';
-$wb['Available packages'] = 'Available packages';
-$wb['Installed packages'] = 'Installed packages';
-$wb['Update Packagelist'] = 'Update Packagelist';
-$wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
+$wb['Webdav-User'] = 'Użytkownik Webdav';
+$wb['Webdav'] = 'Webdav';
+$wb['Website quota (Harddisk)'] = 'Użycie miejsca dla strony';
+$wb['Database User'] = 'Użytkownicy bazy danych';
+$wb['Web Access'] = 'Dostęp WWW';
+$wb['Folder'] = 'Foldery chronione';
+$wb['Folder users'] = 'Użytkownicy chronionych folderów';
+$wb['Command Line'] = 'Linia poleceń';
+$wb['APS Installer'] = 'Instalator APS';
+$wb['Available packages'] = 'Dostępne pakiety';
+$wb['Installed packages'] = 'Zainstalowane pakiety';
+$wb['Update Packagelist'] = 'Uaktualnij listę pakietów';
+$wb['Subdomain (Vhost)'] = 'Subdomena (Vhost)';
+$wb['error_proxy_requires_url'] = 'Rodzaj przekierowania ';
?>
+
diff --git a/interface/web/sites/lib/lang/pl_aps.lng b/interface/web/sites/lib/lang/pl_aps.lng
index 8ce5b20eb1..aa791fc432 100644
--- a/interface/web/sites/lib/lang/pl_aps.lng
+++ b/interface/web/sites/lib/lang/pl_aps.lng
@@ -1,57 +1,59 @@
<?php
-$wb['overview_txt'] = 'Overview';
-$wb['administration_txt'] = 'Administration';
-$wb['available_packages_txt'] = 'Available packages';
-$wb['installed_packages_txt'] = 'Installed packages';
-$wb['yes_txt'] = 'Yes';
-$wb['no_txt'] = 'No';
-$wb['invalid_id_txt'] = 'No valid ID has been provided.';
-$wb['details_txt'] = 'Details';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['homepage_txt'] = 'Homepage';
-$wb['supported_languages_txt'] = 'Supported languages';
-$wb['description_txt'] = 'Description';
-$wb['config_script_txt'] = 'Configuration script';
-$wb['installed_size_txt'] = 'Size after installation';
-$wb['license_txt'] = 'License';
-$wb['screenshots_txt'] = 'Screenshots';
-$wb['changelog_txt'] = 'Changelog';
-$wb['server_requirements_txt'] = 'Server requirements';
-$wb['php_extensions_txt'] = 'PHP extensions';
-$wb['php_settings_txt'] = 'PHP settings';
-$wb['supported_php_versions_txt'] = 'Supported PHP versions';
-$wb['database_txt'] = 'Database';
-$wb['settings_txt'] = 'Settings';
-$wb['install_package_txt'] = 'Install this package';
-$wb['installation_txt'] = 'Installation';
-$wb['install_location_txt'] = 'Install location';
-$wb['acceptance_txt'] = 'Acceptance';
-$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
-$wb['install_language_txt'] = 'Interface language';
-$wb['new_database_password_txt'] = 'New database password';
-$wb['basic_settings_txt'] = 'Basic settings';
-$wb['package_settings_txt'] = 'Package settings';
-$wb['error_main_domain'] = 'The domain of the installation path is invalid.';
-$wb['error_no_main_location'] = 'You have provided no valid installation path.';
-$wb['error_inv_main_location'] = 'The given install location folder is invalid.';
-$wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
-$wb['error_no_database_pw'] = 'You have provided no valid database password.';
-$wb['error_short_database_pw'] = 'Please choose a longer database password.';
-$wb['error_no_value_for'] = 'The field \\"%s\\" must not be empty.';
-$wb['error_short_value_for'] = 'The field \\"%s\\" requires a longer input value.';
-$wb['error_long_value_for'] = 'The field \\"%s\\" requires a shorter input value.';
-$wb['error_inv_value_for'] = 'You have entered an invalid value for the field \\"%s\\".';
-$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field \\"%s\\".';
-$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field \\"%s\\".';
-$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field \\"%s\\".';
-$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field \\"%s\\".';
-$wb['error_used_location'] = 'The installation path already contains a package installation.';
-$wb['installation_task_txt'] = 'Install planned';
-$wb['installation_error_txt'] = 'Install error';
-$wb['installation_success_txt'] = 'Installed';
-$wb['installation_remove_txt'] = 'Removal planned';
-$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
-$wb['btn_install_txt'] = 'Install';
-$wb['btn_cancel_txt'] = 'Cancel';
+$wb['overview_txt'] = 'PrzeglÄ…d';
+$wb['administration_txt'] = 'Administracja';
+$wb['available_packages_txt'] = 'Dostępne pakiety';
+$wb['installed_packages_txt'] = 'Zainstalowane pakiety';
+$wb['yes_txt'] = 'Tak';
+$wb['no_txt'] = 'Nie';
+$wb['invalid_id_txt'] = 'Zostało podane nieprawidłowe ID';
+$wb['details_txt'] = 'Szczegóły';
+$wb['version_txt'] = 'Wersja';
+$wb['category_txt'] = 'Kategoria';
+$wb['homepage_txt'] = 'Strona domowa';
+$wb['supported_languages_txt'] = 'Wspierane języki';
+$wb['description_txt'] = 'Opis';
+$wb['config_script_txt'] = 'Skrypt konfiguracji';
+$wb['installed_size_txt'] = 'Rozmiar po instalacji';
+$wb['license_txt'] = 'Licencja';
+$wb['screenshots_txt'] = 'Zrzuty ekranu';
+$wb['changelog_txt'] = 'Zmiany';
+$wb['server_requirements_txt'] = 'Wymagania serwera';
+$wb['php_extensions_txt'] = 'Rozszerzenia PHP';
+$wb['php_settings_txt'] = 'Ustawienia PHP';
+$wb['supported_php_versions_txt'] = 'Wspierane wersje PHP';
+$wb['database_txt'] = 'Baza danych';
+$wb['settings_txt'] = 'Ustawienia';
+$wb['install_package_txt'] = 'Instaluj ten pakiet';
+$wb['installation_txt'] = 'Instalacja';
+$wb['install_location_txt'] = 'Lokalizacja instalacji';
+$wb['acceptance_txt'] = 'Akceptacja';
+$wb['acceptance_text_txt'] = 'Tak, przeczytałem i zgadzam się z licencją.';
+$wb['install_language_txt'] = 'Język interfejsu';
+$wb['new_database_password_txt'] = 'Hasło nowej bazy danych';
+$wb['basic_settings_txt'] = 'Podstawowe ustawienia';
+$wb['package_settings_txt'] = 'Ustawienia pakietu';
+$wb['error_main_domain'] = 'Domena ścieżki instalacji jest nieprawidłowa.';
+$wb['error_no_main_location'] = 'Podałeś nieprawidłową ścieżkę instalacji.';
+$wb['error_inv_main_location'] = 'Instalacja w podanym folderze jest niemożliwa.';
+$wb['error_license_agreement'] = 'Aby kontynuować musisz zaakceptować umowę licencyjną.';
+$wb['error_no_database_pw'] = 'Nie podałeś prawidłowego hasła do bazy danych.';
+$wb['error_short_database_pw'] = 'Wybierz dłuższe hasło do bazy.';
+$wb['error_no_value_for'] = 'Pole \\"%s\\" nie może być puste';
+$wb['error_short_value_for'] = 'Pole \\"%s\\" wymaga dłuższej wartości';
+$wb['error_long_value_for'] = 'Pole \\"%s\\" wymaga krótszej wartości';
+$wb['error_inv_value_for'] = 'Wprowadziłeś nieprawidłową wartość w polu \\"%s\\"';
+$wb['error_inv_email_for'] = 'Wprowadziłeś nieprawidłowy adres email w polu \\"%s\\"';
+$wb['error_inv_domain_for'] = 'Wprowadziłeś nieprawidłową domenę w polu \\"%s\\"';
+$wb['error_inv_integer_for'] = 'Wprowadziłeś nieprawidłową liczbę w polu \\"%s\\"';
+$wb['error_inv_float_for'] = 'Wprowadziłeś nieprawidłową liczbę w polu \\"%s\\"';
+$wb['error_used_location'] = 'Ścieżka instalacji zawiera już zainstalowany pakiet.';
+$wb['installation_task_txt'] = 'Instalacja planowana';
+$wb['installation_error_txt'] = 'BÅ‚Ä…d instalacji';
+$wb['installation_success_txt'] = 'Zainstalowane';
+$wb['installation_remove_txt'] = 'Usunięcie zaplanowane';
+$wb['packagelist_update_finished_txt'] = 'Aktualizacja listy pakietów APS zakończona';
+$wb['btn_install_txt'] = 'Instaluj';
+$wb['btn_cancel_txt'] = 'Anuluj';
+$wb['limit_aps_txt'] = 'Maksymalna liczba instancji APS dla Twojego konta została wyczerpana.';
?>
+
diff --git a/interface/web/sites/lib/lang/pl_aps_instances_list.lng b/interface/web/sites/lib/lang/pl_aps_instances_list.lng
index 052d834a71..f4b849921b 100644
--- a/interface/web/sites/lib/lang/pl_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/pl_aps_instances_list.lng
@@ -1,13 +1,14 @@
<?php
-$wb['list_head_txt'] = 'Installed packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['customer_txt'] = 'Client';
+$wb['list_head_txt'] = 'Zainstalowane aplikacje';
+$wb['name_txt'] = 'Nazwa';
+$wb['version_txt'] = 'Wersja';
+$wb['customer_txt'] = 'Klient';
$wb['status_txt'] = 'Status';
-$wb['install_location_txt'] = 'Install location';
-$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
-$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
-$wb['filter_txt'] = 'Search';
-$wb['delete_txt'] = 'Delete';
-$wb['reinstall_txt'] = 'Reinstall';
+$wb['install_location_txt'] = 'Lokalizacja instalacji';
+$wb['pkg_delete_confirmation'] = 'Na pewno chcesz usunąć tę instalację?';
+$wb['pkg_reinstall_confirmation'] = 'Na pewno chcesz przeinstalować ten pakiet z tymi samymi ustawieniami?';
+$wb['filter_txt'] = 'Szukaj';
+$wb['delete_txt'] = 'Usuń';
+$wb['reinstall_txt'] = 'Przeinstaluj';
?>
+
diff --git a/interface/web/sites/lib/lang/pl_aps_packages_list.lng b/interface/web/sites/lib/lang/pl_aps_packages_list.lng
index 68c378085f..2e2140d95d 100644
--- a/interface/web/sites/lib/lang/pl_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/pl_aps_packages_list.lng
@@ -1,8 +1,9 @@
<?php
-$wb['list_head_txt'] = 'Available packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['status_txt'] = 'Unlocked';
-$wb['filter_txt'] = 'Search';
+$wb['list_head_txt'] = 'Dostępne pakiety';
+$wb['name_txt'] = 'Nazwa';
+$wb['version_txt'] = 'Wersja';
+$wb['category_txt'] = 'Kategoria';
+$wb['status_txt'] = 'Odblokowany';
+$wb['filter_txt'] = 'Szukaj';
?>
+
diff --git a/interface/web/sites/lib/lang/pl_aps_update_packagelist.lng b/interface/web/sites/lib/lang/pl_aps_update_packagelist.lng
index 20a7360b64..b1facb1e82 100644
--- a/interface/web/sites/lib/lang/pl_aps_update_packagelist.lng
+++ b/interface/web/sites/lib/lang/pl_aps_update_packagelist.lng
@@ -1,7 +1,7 @@
<?php
-$wb['head_txt'] = 'Update Packagelist';
+$wb['head_txt'] = 'Aktualizacja listy pakietów';
$wb['list_desc_txt'] = '';
-$wb['btn_start_txt'] = 'Update Packagelist';
-$wb['btn_cancel_txt'] = 'Cancel';
-$wb['legend_txt'] = 'Here you can update the list of available packages. Please note that this can take up to five minutes. You can leave this page if you like; the process will continue in the background.';
-?>
\ No newline at end of file
+$wb['btn_start_txt'] = 'Uaktualnij listÄ™';
+$wb['btn_cancel_txt'] = 'Anuluj';
+$wb['legend_txt'] = 'Tutaj możesz uaktualnić listę dostępnych pakietów. Może to zająć nawet do pięciu minut. Możesz opuścić tę stronę jeżeli chcesz - proces aktualizacji wykona się w tle.';
+?>
diff --git a/interface/web/sites/lib/lang/pl_cron.lng b/interface/web/sites/lib/lang/pl_cron.lng
index a097d0813e..a5d3b8b891 100644
--- a/interface/web/sites/lib/lang/pl_cron.lng
+++ b/interface/web/sites/lib/lang/pl_cron.lng
@@ -19,3 +19,4 @@ $wb['run_wday_error_format'] = 'Niepoprawny format dni w tygodniu.';
$wb['command_error_format'] = 'Niepoprawny format polecenia. W zbiorze url może być tylko adres http/https który ma pozwolenie.';
$wb['unknown_fieldtype_error'] = 'Został użyty niepoprawny format pola.';
?>
+
diff --git a/interface/web/sites/lib/lang/pl_cron_list.lng b/interface/web/sites/lib/lang/pl_cron_list.lng
index 467cae6ed1..67e2e6fba8 100644
--- a/interface/web/sites/lib/lang/pl_cron_list.lng
+++ b/interface/web/sites/lib/lang/pl_cron_list.lng
@@ -11,3 +11,4 @@ $wb['command_txt'] = 'Komenda';
$wb['add_new_cron_txt'] = 'Dodaj nowe zadanie Cron';
$wb['parent_domain_id_txt'] = 'Witryna';
?>
+
diff --git a/interface/web/sites/lib/lang/pl_database.lng b/interface/web/sites/lib/lang/pl_database.lng
index 823e854525..92af857087 100644
--- a/interface/web/sites/lib/lang/pl_database.lng
+++ b/interface/web/sites/lib/lang/pl_database.lng
@@ -22,25 +22,26 @@ $wb['database_name_change_txt'] = 'Nie można zmienić nazwy bazy danych.';
$wb['database_charset_change_txt'] = 'Nie można zmienić kodowania bazy danych.';
$wb['database_name_error_len'] = 'Nazwa bazy danych - {db} - za długa. Maksymalna długość wynosi 64 znaki łącznie z prefiksem.';
$wb['database_user_error_len'] = 'Nazwa użytkownika bazy - {user}- za długa. Maksymalna długość wynosi 16 znaków łącznie z prefiksem.';
-$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 -';
-$wb['btn_save_txt'] = 'Save';
-$wb['btn_cancel_txt'] = 'Cancel';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['globalsearch_resultslimit_of_txt'] = 'of';
-$wb['globalsearch_resultslimit_results_txt'] = 'results';
-$wb['globalsearch_noresults_text_txt'] = 'No results.';
-$wb['globalsearch_noresults_limit_txt'] = '0 results';
-$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
-$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
-$wb['database_ro_user_txt'] = 'Read-only database user';
-$wb['optional_txt'] = 'optional';
-$wb['select_dbuser_txt'] = 'Select database user';
-$wb['no_dbuser_txt'] = 'None';
-$wb['database_client_differs_txt'] = 'The client of the parent web and the database do not match.';
-$wb['database_user_missing_txt'] = 'Please select a database user for this database.';
+$wb['database_ro_user_txt'] = 'Użytkownik tylko do odczytu';
+$wb['optional_txt'] = 'opcjonalnie';
+$wb['select_dbuser_txt'] = 'Wybierz nazwę użytkownika bazy';
+$wb['no_dbuser_txt'] = 'Brak';
+$wb['database_client_differs_txt'] = 'Właściciele strony i bazy danych są inni!';
+$wb['database_user_missing_txt'] = 'Wybierz użytkownika bazy dla tej bazy';
+$wb['parent_domain_id_txt'] = 'Strona';
+$wb['database_site_error_empty'] = 'Wybierz witrynę, do której należy baza danych.';
+$wb['select_site_txt'] = '- Wybierz stronÄ™ -';
+$wb['btn_save_txt'] = 'Zapisz';
+$wb['btn_cancel_txt'] = 'Anuluj';
+$wb['generate_password_txt'] = 'Generuj hasło';
+$wb['repeat_password_txt'] = 'Powtórz hasło';
+$wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
+$wb['password_match_txt'] = 'Hasła pasują';
+$wb['globalsearch_resultslimit_of_txt'] = 'z';
+$wb['globalsearch_resultslimit_results_txt'] = 'wyników';
+$wb['globalsearch_noresults_text_txt'] = 'Brak wyników';
+$wb['globalsearch_noresults_limit_txt'] = '0 wyników';
+$wb['globalsearch_searchfield_watermark_txt'] = 'Szukaj';
+$wb['globalsearch_suggestions_text_txt'] = 'Sugestie';
?>
+
diff --git a/interface/web/sites/lib/lang/pl_database_admin_list.lng b/interface/web/sites/lib/lang/pl_database_admin_list.lng
index 5785a779fd..653657ee10 100644
--- a/interface/web/sites/lib/lang/pl_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/pl_database_admin_list.lng
@@ -8,3 +8,4 @@ $wb['database_name_txt'] = 'Nazwa bazy danych';
$wb['add_new_record_txt'] = 'Dodaj nowÄ… bazÄ™ danych';
$wb['sys_groupid_txt'] = 'Klient';
?>
+
diff --git a/interface/web/sites/lib/lang/pl_database_list.lng b/interface/web/sites/lib/lang/pl_database_list.lng
index 2162a15a21..0b419fef48 100644
--- a/interface/web/sites/lib/lang/pl_database_list.lng
+++ b/interface/web/sites/lib/lang/pl_database_list.lng
@@ -7,3 +7,4 @@ $wb['database_name_txt'] = 'Nazwa bazy danych';
$wb['add_new_record_txt'] = 'Dodaj nowÄ… bazÄ™ danych';
$wb['database_user_txt'] = 'Użytkownik bazy danych';
?>
+
diff --git a/interface/web/sites/lib/lang/pl_database_user.lng b/interface/web/sites/lib/lang/pl_database_user.lng
index 66a0718349..5bf00310f6 100644
--- a/interface/web/sites/lib/lang/pl_database_user.lng
+++ b/interface/web/sites/lib/lang/pl_database_user.lng
@@ -21,3 +21,4 @@ $wb['globalsearch_noresults_limit_txt'] = '0 results';
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
?>
+
diff --git a/interface/web/sites/lib/lang/pl_database_user_admin_list.lng b/interface/web/sites/lib/lang/pl_database_user_admin_list.lng
index d7f88c4c36..a44cc7cfa0 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
@@ -4,3 +4,4 @@ $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 8c226496a6..522780d246 100644
--- a/interface/web/sites/lib/lang/pl_database_user_list.lng
+++ b/interface/web/sites/lib/lang/pl_database_user_list.lng
@@ -3,3 +3,4 @@ $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_ftp_user.lng b/interface/web/sites/lib/lang/pl_ftp_user.lng
index fffb54d8fe..5a97a4bba8 100644
--- a/interface/web/sites/lib/lang/pl_ftp_user.lng
+++ b/interface/web/sites/lib/lang/pl_ftp_user.lng
@@ -25,10 +25,11 @@ $wb['directory_error_empty'] = 'Element docelowy jest pusty.';
$wb['directory_error_notinweb'] = 'Katalog nie jest wewnÄ…trz katalogu root www.';
$wb['parent_domain_id_error_empty'] = 'Nie wybrano żadnej strony www.';
$wb['quota_size_error_regex'] = 'Quota: wpisz -1 dla wartości bez limitu lub liczbę > 0';
-$wb['dir_dot_error'] = 'No .. in path allowed.';
-$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
+$wb['dir_dot_error'] = 'Znaki .. nie są dozwolone w ścieżce';
+$wb['dir_slashdot_error'] = 'Znaki ./ nie są dozwolone w ścieżce';
+$wb['generate_password_txt'] = 'Generuj hasło';
+$wb['repeat_password_txt'] = 'Powtórz hasło';
+$wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
+$wb['password_match_txt'] = 'Hasła pasują';
?>
+
diff --git a/interface/web/sites/lib/lang/pl_ftp_user_list.lng b/interface/web/sites/lib/lang/pl_ftp_user_list.lng
index fecbba355a..9577209363 100644
--- a/interface/web/sites/lib/lang/pl_ftp_user_list.lng
+++ b/interface/web/sites/lib/lang/pl_ftp_user_list.lng
@@ -6,3 +6,4 @@ $wb['parent_domain_id_txt'] = 'Strona www';
$wb['username_txt'] = 'Nazwa użytkownika';
$wb['add_new_record_txt'] = 'Dodaj nowego użytkownika FTP';
?>
+
diff --git a/interface/web/sites/lib/lang/pl_shell_user.lng b/interface/web/sites/lib/lang/pl_shell_user.lng
index b216b41baf..2852ccc823 100644
--- a/interface/web/sites/lib/lang/pl_shell_user.lng
+++ b/interface/web/sites/lib/lang/pl_shell_user.lng
@@ -20,10 +20,11 @@ $wb['parent_domain_id_error_empty'] = 'Nie wybrano żadnej strony www.';
$wb['puser_txt'] = 'Nazwa użytkownika strony www';
$wb['pgroup_txt'] = 'Nazwa grupy strony www';
$wb['ssh_rsa_txt'] = 'Klucz publiczny SSH-RSA (dla logowania po kluczu)';
-$wb['dir_dot_error'] = 'No .. in path allowed.';
-$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
+$wb['dir_dot_error'] = 'Znaki .. w ścieżce nie są dozwolone';
+$wb['dir_slashdot_error'] = 'Znaki ./ w ścieżce nie są dozwolone';
+$wb['generate_password_txt'] = 'Generuj hasło';
+$wb['repeat_password_txt'] = 'Powtórz hasło';
+$wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
+$wb['password_match_txt'] = 'Hasła pasują';
?>
+
diff --git a/interface/web/sites/lib/lang/pl_shell_user_list.lng b/interface/web/sites/lib/lang/pl_shell_user_list.lng
index 10f9e433ac..0f179803dd 100644
--- a/interface/web/sites/lib/lang/pl_shell_user_list.lng
+++ b/interface/web/sites/lib/lang/pl_shell_user_list.lng
@@ -6,3 +6,4 @@ $wb['parent_domain_id_txt'] = 'Strona';
$wb['username_txt'] = 'Nazwa użytkownika';
$wb['add_new_record_txt'] = 'Dodaj nowego użytkownika Shell';
?>
+
diff --git a/interface/web/sites/lib/lang/pl_user_quota_stats_list.lng b/interface/web/sites/lib/lang/pl_user_quota_stats_list.lng
index 75e2c991e7..f92c3603a2 100644
--- a/interface/web/sites/lib/lang/pl_user_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/pl_user_quota_stats_list.lng
@@ -5,5 +5,6 @@ $wb['system_user_txt'] = 'Użytkownik Linux';
$wb['used_txt'] = 'Wykorzystana przestrzeń';
$wb['hard_txt'] = 'Limit twardy';
$wb['soft_txt'] = 'Limit miękki';
-$wb['files_txt'] = 'Single files';
+$wb['files_txt'] = 'Pojedyncze pliki';
?>
+
diff --git a/interface/web/sites/lib/lang/pl_web_aliasdomain.lng b/interface/web/sites/lib/lang/pl_web_aliasdomain.lng
index 4149c71149..62d88d949e 100644
--- a/interface/web/sites/lib/lang/pl_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/pl_web_aliasdomain.lng
@@ -1,115 +1,116 @@
<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['domain_txt'] = 'Alias domeny';
+$wb['backup_interval_txt'] = 'Częstotliwość tworzenia kopii zapasowych';
+$wb['backup_copies_txt'] = 'Liczba kopii';
+$wb['ssl_state_txt'] = 'Województwo';
+$wb['ssl_locality_txt'] = 'Lokalizacja';
+$wb['ssl_organisation_txt'] = 'Organizacja';
+$wb['ssl_organisation_unit_txt'] = 'Jednostka organizacji';
+$wb['ssl_country_txt'] = 'Kraj';
+$wb['ssl_key_txt'] = 'Klucz SSL';
+$wb['ssl_request_txt'] = 'Żądanie SSL';
+$wb['ssl_cert_txt'] = 'Certyfikat SSL';
+$wb['ssl_bundle_txt'] = 'Paczka SSL (bundle)';
+$wb['ssl_action_txt'] = 'Akcja SSL';
+$wb['ssl_domain_txt'] = 'Domena SSL';
+$wb['server_id_txt'] = 'Serwer';
+$wb['web_folder_error_regex'] = 'Wpisano nieprawidłowy folder. Proszę nie wpisywać znaku slash: /';
+$wb['type_txt'] = 'Rodzaj';
+$wb['parent_domain_id_txt'] = 'Strona macierzysta';
+$wb['redirect_type_txt'] = 'Rodzaj przekierowania';
+$wb['redirect_path_txt'] = 'Ścieżka przekierowania';
+$wb['active_txt'] = 'Aktywny';
+$wb['document_root_txt'] = 'Document root';
+$wb['system_user_txt'] = 'Użytkownik systemowy';
+$wb['system_group_txt'] = 'Grupa systemowa';
+$wb['ip_address_txt'] = 'Adres IPv4';
+$wb['ipv6_address_txt'] = 'Adres IPv6';
+$wb['vhost_type_txt'] = 'Rodzaj VHosta';
+$wb['hd_quota_txt'] = 'Limit dysku';
+$wb['traffic_quota_txt'] = 'Limit transferu';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['errordocs_txt'] = 'Własne strony błędów';
+$wb['subdomain_txt'] = 'Automatyczna subdomena';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['client_txt'] = 'Klient';
+$wb['limit_web_domain_txt'] = 'Maks. liczba domen web dla Twojego konta została już osiągnięta.';
+$wb['limit_web_aliasdomain_txt'] = 'Maks. liczba aliasów domen dla Twojego konta została już osiągnięta.';
+$wb['limit_web_subdomain_txt'] = 'Maks. liczba subdomen dla Twojego konta została już osiągnięta.';
+$wb['apache_directives_txt'] = 'Dyrektywy Apache';
+$wb['domain_error_empty'] = 'Pole domena jest puste';
+$wb['domain_error_unique'] = 'Istnieje już strona z tą nazwą domeny/poddomeny.';
+$wb['domain_error_regex'] = 'Nazwa domeny jest pusta';
+$wb['domain_error_autosub'] = 'Istnieje już subdomena z tymi ustawieniami.';
+$wb['hd_quota_error_empty'] = 'Limit dysku jest pusty lub wynosi 0.';
+$wb['traffic_quota_error_empty'] = 'Limit transferu jest pusty.';
+$wb['error_ssl_state_empty'] = 'Pole województwa dla SSL jest puste.';
+$wb['error_ssl_locality_empty'] = 'Pole lokalizacji dla SSL jest puste.';
+$wb['error_ssl_organisation_empty'] = 'Pole organizacji dla SSL jest puste.';
+$wb['error_ssl_organisation_unit_empty'] = 'Pole jednostkie dla SSL jest puste.';
+$wb['error_ssl_country_empty'] = 'Pole kraju dla SSL jest puste.';
+$wb['error_ssl_cert_empty'] = 'Pole certyfikatu SSL jest puste.';
+$wb['client_group_id_txt'] = 'Klient';
+$wb['stats_password_txt'] = 'Hasło do statystyk';
$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['limit_web_quota_free_txt'] = 'Maks. dostępny limit dysku';
+$wb['ssl_state_error_regex'] = 'Nieprawidłowe województwo SSL. Dozwolone znaki to: a-z, 0-9 i .,-_';
+$wb['ssl_locality_error_regex'] = 'Nieprawidłowa lokalizacja SSL. Dozwolone znaki to: a-z, 0-9 i .,-_';
+$wb['ssl_organisation_error_regex'] = 'Nieprawidłowa organizacja SSL. Dozwolone znaki to: a-z, 0-9 i .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Nieprawidłowa jednostka SSL. Dozwolone znaki to: a-z, 0-9 i .,-_';
+$wb['ssl_country_error_regex'] = 'Nieprawidłowy kraj SSL. Dozwolone znaki to: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Maks. dostępny limit transferu';
+$wb['redirect_error_regex'] = 'Nieprawidłowa ścieżka przekierowania. Przykładowe prawidłowe przekierowania: /test/ lub http://www.domena.pl/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['traffic_quota_exceeded_txt'] = 'Limit transferu został przekroczony';
$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['stats_user_txt'] = 'Login do statystyk';
+$wb['stats_type_txt'] = 'Rodzaj statystyk';
+$wb['custom_php_ini_txt'] = 'WÅ‚asne ustawienia php.ini';
+$wb['none_txt'] = 'Brak';
+$wb['disabled_txt'] = 'Wyłączone';
+$wb['no_redirect_txt'] = 'Bez przekierowania';
+$wb['no_flag_txt'] = 'Bez flagi';
+$wb['save_certificate_txt'] = 'Zapisz certyfikat';
+$wb['create_certificate_txt'] = 'Utwórz certyfikat';
+$wb['delete_certificate_txt'] = 'Usuń certyfikat';
+$wb['nginx_directives_txt'] = 'Dyrektywy nginx';
+$wb['seo_redirect_txt'] = 'Przekierowanie SEO';
+$wb['non_www_to_www_txt'] = 'bez www -> www';
+$wb['www_to_non_www_txt'] = 'www -> bez www';
+$wb['php_fpm_use_socket_txt'] = 'Uzyj gniazda dla PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI dla SSL nie jest aktywowane dla tego serwera. Możesz włączyć tylko jeden certyfikat SSL dla jednego adresu IP.';
$wb['python_txt'] = 'Python';
$wb['perl_txt'] = 'Perl';
$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = '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['error_php_fpm_pm_settings_txt'] = 'Wartości ustawień PHP-FPM pm muszą być następujące: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children musi być dodatnią wartością całkowitą.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers musi być dodatnią wartością całkowitą.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers musi być dodatnią wartością całkowitą.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers musi być dodatnią wartością całkowitą.';
+$wb['hd_quota_error_regex'] = 'Limit dysku jest nieprawidłowy';
+$wb['traffic_quota_error_regex'] = 'Limit transferu jest nieprawidłowy';
+$wb['fastcgi_php_version_txt'] = 'Wersja PHP';
$wb['pm_txt'] = 'PHP-FPM Process Manager';
$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout musi być dodatnią wartością całkowitą.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an inPHP-FPM pm.process_idle_timeout musi być dodatnią wartością całkowitą >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Wersja PHP musi być >= 5.3.9 aby użyć ondemand process manager. W przypadku użycia starszej wersji PHP może nie działać w ogóle.';
+$wb['generate_password_txt'] = 'Generuj hasło';
+$wb['repeat_password_txt'] = 'Powtórz hasło';
+$wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
+$wb['password_match_txt'] = 'Hasła są jednakowe';
+$wb['available_php_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw PHP:';
+$wb['available_apache_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw Apache:';
+$wb['available_nginx_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw nginx:';
+$wb['proxy_directives_txt'] = 'Dyrektywny Proxy';
+$wb['available_proxy_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw Proxy:';
+$wb['Domain'] = 'Alias domeny';
?>
+
diff --git a/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng
index 5bdd8e8316..a57741558f 100644
--- a/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng
@@ -12,3 +12,4 @@ $wb['no_redirect_txt'] = 'Bez przekierowania';
$wb['no_flag_txt'] = 'Bez flagi';
$wb['none_txt'] = 'Brak';
?>
+
diff --git a/interface/web/sites/lib/lang/pl_web_backup_list.lng b/interface/web/sites/lib/lang/pl_web_backup_list.lng
index 9a10ca6d07..e7d9aed9ab 100644
--- a/interface/web/sites/lib/lang/pl_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_backup_list.lng
@@ -1,15 +1,16 @@
<?php
-$wb['list_head_txt'] = 'Existing backups';
-$wb['date_txt'] = 'Date';
-$wb['backup_type_txt'] = 'Type';
-$wb['filename_txt'] = 'Backup file';
-$wb['restore_backup_txt'] = 'Restore backup';
-$wb['download_backup_txt'] = 'Download backup';
-$wb['download_info_txt'] = 'The backup file will be available for download in the backup folder of the website in a few minutes.';
-$wb['restore_info_txt'] = 'Restore of the backup has been started. This action takes several minutes to be completed.';
-$wb['restore_confirm_txt'] = 'Restoring will overwrite existing files in your website. Do you really want to restore this backup?';
-$wb['download_pending_txt'] = 'There is already a pending backup download job.';
-$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
-$wb['backup_type_mysql'] = 'MySQL Database';
-$wb['backup_type_web'] = 'Website files';
+$wb['list_head_txt'] = 'Dostępne kopie zapasowe';
+$wb['date_txt'] = 'Data';
+$wb['backup_type_txt'] = 'Rodzaj';
+$wb['filename_txt'] = 'Plik kopii';
+$wb['restore_backup_txt'] = 'Przywróć kopię';
+$wb['download_backup_txt'] = 'Pobierz kopiÄ™';
+$wb['download_info_txt'] = 'Plik kopii będzie dostępny do pobrania w folderze backup strony w przeciągu kilku minut.';
+$wb['restore_info_txt'] = 'Rozpoczęło się odtwarzanie z kopii plików strony. Proces ten może zająć kilka minut.';
+$wb['restore_confirm_txt'] = 'Przywrócenie danych z kopii zapasowej zastąpi wszystkie obecnie istniejące pliki. Czy na pewno chcesz to zrobić?';
+$wb['download_pending_txt'] = 'Trwa już jedno zadanie pobrania kopii.';
+$wb['restore_pending_txt'] = 'Trwa już jedno zadanie przywrócenia danych z kopii.';
+$wb['backup_type_mysql'] = 'Baza MySQL';
+$wb['backup_type_web'] = 'Pliki strony';
?>
+
diff --git a/interface/web/sites/lib/lang/pl_web_domain.lng b/interface/web/sites/lib/lang/pl_web_domain.lng
index 1235f10205..5c02a06abb 100644
--- a/interface/web/sites/lib/lang/pl_web_domain.lng
+++ b/interface/web/sites/lib/lang/pl_web_domain.lng
@@ -1,5 +1,5 @@
<?php
-$wb['ssl_state_txt'] = 'Stan/województwo';
+$wb['ssl_state_txt'] = 'Województwo';
$wb['ssl_locality_txt'] = 'Lokalizacja';
$wb['ssl_organisation_txt'] = 'Organizacja';
$wb['ssl_organisation_unit_txt'] = 'Jednosta organizacji';
@@ -11,15 +11,15 @@ $wb['ssl_action_txt'] = 'Akcja SSL';
$wb['server_id_txt'] = 'Serwer';
$wb['domain_txt'] = 'Domena';
$wb['type_txt'] = 'Typ';
-$wb['parent_domain_id_txt'] = 'Aktualna strona www';
-$wb['redirect_type_txt'] = 'Typ przekierowania';
+$wb['parent_domain_id_txt'] = 'Macierzysta strona www';
+$wb['redirect_type_txt'] = 'Rodzaj przekierowania';
$wb['redirect_path_txt'] = 'Ścieżka przekierowania';
$wb['active_txt'] = 'Aktywny';
-$wb['document_root_txt'] = 'Główny katalog';
-$wb['system_user_txt'] = 'Użytkownik Linuksa';
-$wb['system_group_txt'] = 'Grupa Linux';
+$wb['document_root_txt'] = 'Katalog strony';
+$wb['system_user_txt'] = 'Użytkownik systemowy';
+$wb['system_group_txt'] = 'Grupa systemowa';
$wb['ip_address_txt'] = 'Adres IP';
-$wb['vhost_type_txt'] = 'Typ wirtualnego serwera';
+$wb['vhost_type_txt'] = 'Rodzaj VHosta';
$wb['hd_quota_txt'] = 'Limit dysku twardego';
$wb['traffic_quota_txt'] = 'Limit ruchu na serwerze';
$wb['cgi_txt'] = 'CGI';
@@ -55,16 +55,16 @@ $wb['ssl_organisation_error_regex'] = 'Nieprawidłowa organizacja SSL. Dozwolone
$wb['ssl_organistaion_unit_error_regex'] = 'Nieprawidłowa jednostka organizacji SSL. Dozwolone znaki to: a-z, 0-9 oraz .,-_';
$wb['ssl_country_error_regex'] = 'Nieprawidłowy kraj SSL. Dozwolone znaki to: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Maksymalny dostępny limit transferu';
-$wb['redirect_error_regex'] = 'Nieprawidłowa ścieżka przekierowania. Poprawne przekierowania to np.: /test/ or http://www.domain.tld/test/';
+$wb['redirect_error_regex'] = 'Nieprawidłowa ścieżka przekierowania. Poprawne przekierowania to np.: /test/ lub http://www.domain.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Limit transferu przekroczony.';
$wb['backup_interval_txt'] = 'Odstęp między kopiami zapasowymi';
$wb['backup_copies_txt'] = 'Liczba kopii zapasowych';
$wb['ruby_txt'] = 'Ruby';
$wb['stats_user_txt'] = 'Nazwa użytkownika statystyk';
-$wb['stats_type_txt'] = 'Oprogramowanie statystyk';
+$wb['stats_type_txt'] = 'Rodzaj statystyk';
$wb['custom_php_ini_txt'] = 'WÅ‚asne ustawienia php.ini';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['error_ssl_cert_empty'] = 'Pole certyfikatu SSL jest puste';
$wb['none_txt'] = 'Brak';
$wb['disabled_txt'] = 'Wyłączone';
$wb['no_redirect_txt'] = 'Bez przekierowania';
@@ -75,40 +75,41 @@ $wb['delete_certificate_txt'] = 'Usuń certyfikat';
$wb['ipv6_address_txt'] = 'Adres IPv6';
$wb['nginx_directives_txt'] = 'Dyrektywy nginx';
$wb['seo_redirect_txt'] = 'Przekierowanie SEO';
-$wb['non_www_to_www_txt'] = 'bez www -> www';
-$wb['www_to_non_www_txt'] = 'www -> bez www';
-$wb['php_fpm_use_socket_txt'] = 'Użyj socketu dla PHP-FPM';
+$wb['non_www_to_www_txt'] = 'bez www -> www';
+$wb['www_to_non_www_txt'] = 'www -> bez www';
+$wb['php_fpm_use_socket_txt'] = 'Użyj gniazda dla PHP-FPM';
$wb['error_no_sni_txt'] = 'SNI dla SSL nie jest aktywowane na tym serwerze. Możesz utworzyć tylko jeden certyfikat SSL dla jednego adresu IP.';
$wb['python_txt'] = 'Python';
$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['ssl_key_txt'] = 'SSL Key';
+$wb['error_php_fpm_pm_settings_txt'] = 'Wartości ustawień PHP-FPM pm muszą być następujące: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children musi być całkowitą liczną dodatnią.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers musi być całkowitą liczną dodatnią.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers musi być całkowitą liczną dodatnią.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers musi być całkowitą liczną dodatnią.';
+$wb['hd_quota_error_regex'] = 'Limit dysku jest nieprawidłowy.';
+$wb['traffic_quota_error_regex'] = 'Limit transferu jest nieprawidłowy.';
+$wb['ssl_key_txt'] = 'Klucz SSL';
+$wb['web_folder_error_regex'] = 'Wprowadzono nieprawidłowy katalog. Proszę nie wpisywać znaku slash [ / ]';
+$wb['domain_error_autosub'] = 'Istnieje już subdomena z tymi ustawieniami.';
$wb['perl_txt'] = 'Perl';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['fastcgi_php_version_txt'] = 'Wersja PHP';
$wb['pm_txt'] = 'PHP-FPM Process Manager';
$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout musi być całkowitą wartością dodatnią';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests musi być całkowitą wartością >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Musisz mieć PHP w wersji >= 5.3.9 aby użyć ondemand process manager. Jeżeli wybierzesz ondemand dla starszej wersji, PHP nie zadziała w ogóle!';
+$wb['generate_password_txt'] = 'Generuj hasło';
+$wb['repeat_password_txt'] = 'Powtórz hasło';
+$wb['password_mismatch_txt'] = 'Hasła nie pasują';
+$wb['password_match_txt'] = 'Hasła pasują';
+$wb['available_php_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw PHP:';
+$wb['available_apache_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw Apache:';
+$wb['available_nginx_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw nginx:';
+$wb['proxy_directives_txt'] = 'Dyrektywy Proxy';
+$wb['available_proxy_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw Proxy:';
?>
+
diff --git a/interface/web/sites/lib/lang/pl_web_domain_admin_list.lng b/interface/web/sites/lib/lang/pl_web_domain_admin_list.lng
index 56634eb623..1aab019c08 100644
--- a/interface/web/sites/lib/lang/pl_web_domain_admin_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_domain_admin_list.lng
@@ -7,3 +7,4 @@ $wb['server_id_txt'] = 'Serwer';
$wb['domain_txt'] = 'Domena';
$wb['add_new_record_txt'] = 'Dodaj nowÄ… stronÄ™';
?>
+
diff --git a/interface/web/sites/lib/lang/pl_web_domain_list.lng b/interface/web/sites/lib/lang/pl_web_domain_list.lng
index 62b7455ff3..8a74d05dd8 100644
--- a/interface/web/sites/lib/lang/pl_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_domain_list.lng
@@ -6,3 +6,4 @@ $wb['server_id_txt'] = 'Serwer';
$wb['domain_txt'] = 'Domena';
$wb['add_new_record_txt'] = 'Dodaj nowÄ… stronÄ™';
?>
+
diff --git a/interface/web/sites/lib/lang/pl_web_folder.lng b/interface/web/sites/lib/lang/pl_web_folder.lng
index 6eec2fd5f0..053a2c012b 100644
--- a/interface/web/sites/lib/lang/pl_web_folder.lng
+++ b/interface/web/sites/lib/lang/pl_web_folder.lng
@@ -5,3 +5,4 @@ $wb['path_txt'] = 'Ścieżka';
$wb['active_txt'] = 'Aktywny';
$wb['path_error_regex'] = 'Nieprawidłowa ścieżka katalogu.';
?>
+
diff --git a/interface/web/sites/lib/lang/pl_web_folder_list.lng b/interface/web/sites/lib/lang/pl_web_folder_list.lng
index 87a769008f..cd16721678 100644
--- a/interface/web/sites/lib/lang/pl_web_folder_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_folder_list.lng
@@ -5,3 +5,4 @@ $wb['server_id_txt'] = 'Serwer';
$wb['parent_domain_id_txt'] = 'Witryna';
$wb['path_txt'] = 'Ścieżka';
?>
+
diff --git a/interface/web/sites/lib/lang/pl_web_folder_user.lng b/interface/web/sites/lib/lang/pl_web_folder_user.lng
index 9c3ad7723d..48893ba7df 100644
--- a/interface/web/sites/lib/lang/pl_web_folder_user.lng
+++ b/interface/web/sites/lib/lang/pl_web_folder_user.lng
@@ -4,9 +4,10 @@ $wb['username_txt'] = 'Login';
$wb['password_txt'] = 'Hasło';
$wb['active_txt'] = 'Aktywny';
$wb['folder_error_empty'] = 'Nie wybrano katalogu.';
-$wb['password_strength_txt'] = 'Password strength';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
+$wb['password_strength_txt'] = 'Siła hasła';
+$wb['generate_password_txt'] = 'Generuj hasło';
+$wb['repeat_password_txt'] = 'Powtórz hasło';
+$wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
+$wb['password_match_txt'] = 'Hasła pasują';
?>
+
diff --git a/interface/web/sites/lib/lang/pl_web_folder_user_list.lng b/interface/web/sites/lib/lang/pl_web_folder_user_list.lng
index 81769bd9d0..462d3b9def 100644
--- a/interface/web/sites/lib/lang/pl_web_folder_user_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_folder_user_list.lng
@@ -4,3 +4,4 @@ $wb['active_txt'] = 'Aktywny';
$wb['web_folder_id_txt'] = 'Katalog';
$wb['username_txt'] = 'Login';
?>
+
diff --git a/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng b/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng
index 6769ac0f7c..14319404ae 100644
--- a/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng
@@ -5,5 +5,6 @@ $wb['this_month_txt'] = 'Ten miesiÄ…c';
$wb['last_month_txt'] = 'Ostatni miesiÄ…c';
$wb['this_year_txt'] = 'Ten rok';
$wb['last_year_txt'] = 'Ostatni rok';
-$wb['sum_txt'] = 'Sum';
+$wb['sum_txt'] = 'Razem';
?>
+
diff --git a/interface/web/sites/lib/lang/pl_web_subdomain.lng b/interface/web/sites/lib/lang/pl_web_subdomain.lng
index 5a53df347d..4bfc75b5d3 100644
--- a/interface/web/sites/lib/lang/pl_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/pl_web_subdomain.lng
@@ -39,8 +39,9 @@ $wb['host_txt'] = 'Serwer';
$wb['redirect_error_regex'] = 'Nieprawidłowa ścieżka przekierowania. Poprawne przekierowanie to np.: /test/ lub http://www.domain.tld/test/';
$wb['no_redirect_txt'] = 'Bez przekierowania';
$wb['no_flag_txt'] = 'Bez flagi';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
+$wb['domain_error_wildcard'] = 'Subdomeny typu wildcard nie sÄ… dozwolone';
+$wb['proxy_directives_txt'] = 'Dyrektywy Proxy';
+$wb['available_proxy_directive_snippets_txt'] = 'Dostępne konfiguracje dodatkowe Proxy';
+$wb['error_proxy_requires_url'] = 'Rodzaj przekierowania ';
?>
+
diff --git a/interface/web/sites/lib/lang/pl_web_subdomain_list.lng b/interface/web/sites/lib/lang/pl_web_subdomain_list.lng
index 9ccb0a3c77..d20a14cb70 100644
--- a/interface/web/sites/lib/lang/pl_web_subdomain_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_subdomain_list.lng
@@ -6,3 +6,4 @@ $wb['parent_domain_id_txt'] = 'Strona www';
$wb['domain_txt'] = 'Subdomena';
$wb['add_new_record_txt'] = 'Dodaj nowÄ… subdomene';
?>
+
diff --git a/interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng
index b87c788126..fa77cdef54 100644
--- a/interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng
+++ b/interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng
@@ -1,118 +1,119 @@
<?php
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['parent_domain_id_txt'] = 'Strona macierzysta';
+$wb['web_folder_txt'] = 'Folder strony';
+$wb['web_folder_invalid_txt'] = 'Folder strony jest nieprawidłowy, proszę wybrać inny.';
+$wb['web_folder_unique_txt'] = 'Folder strony jest już w użyciu, proszę wybrać inny.';
+$wb['backup_interval_txt'] = 'Częstotliwość kopii';
+$wb['backup_copies_txt'] = 'Liczba kopii zapasowych';
+$wb['ssl_state_txt'] = 'Województwo';
+$wb['ssl_locality_txt'] = 'Lokalizacja';
+$wb['ssl_organisation_txt'] = 'Ogranizacja';
+$wb['ssl_organisation_unit_txt'] = 'Jednostka organizacji';
+$wb['ssl_country_txt'] = 'Kraj';
+$wb['ssl_key_txt'] = 'Klucz SSL';
+$wb['ssl_request_txt'] = 'Żądanie SSL';
+$wb['ssl_cert_txt'] = 'Certyfikat SSL';
+$wb['ssl_bundle_txt'] = 'Pakiet SSL (Bundle)';
+$wb['ssl_action_txt'] = 'Czynność SSL';
+$wb['ssl_domain_txt'] = 'Domena SSL';
+$wb['server_id_txt'] = 'Serwer';
+$wb['domain_txt'] = 'Domena';
+$wb['host_txt'] = 'Nazwa hosta';
+$wb['web_folder_error_regex'] = 'Wpisano nieprawidłowy folder. Proszę nie dopisywać znaku slash: / ';
+$wb['type_txt'] = 'Rodzaj';
+$wb['redirect_type_txt'] = 'Rodzaj przekierowania';
+$wb['redirect_path_txt'] = 'Ścieżka przekierowania';
+$wb['active_txt'] = 'Aktywny';
+$wb['document_root_txt'] = 'Document root';
+$wb['system_user_txt'] = 'Użytkownik systemowy';
+$wb['system_group_txt'] = 'Grupa systemowa';
+$wb['ip_address_txt'] = 'Adres IPv4';
+$wb['ipv6_address_txt'] = 'Adres IPv6';
+$wb['vhost_type_txt'] = 'Typ VHosta';
+$wb['hd_quota_txt'] = 'Limit dysku';
+$wb['traffic_quota_txt'] = 'Limit transferu';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['errordocs_txt'] = 'Własne strony błędów';
+$wb['subdomain_txt'] = 'Automatyczna subdomena';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['client_txt'] = 'Klient';
+$wb['limit_web_domain_txt'] = 'Maks. liczba domen dla Twojego konta została osiągnięta.';
+$wb['limit_web_aliasdomain_txt'] = 'Maks. liczba aliasów domen dla Twojego konta została osiągnięta.';
+$wb['limit_web_subdomain_txt'] = 'Maks. liczba poddomen dla Twojego konta została osiągnięta.';
+$wb['apache_directives_txt'] = 'Dyrektywy Apache';
+$wb['domain_error_empty'] = 'Pole domeny jest puste';
+$wb['domain_error_unique'] = 'Istnieje już strona z taką domeną lub subdomeną.';
+$wb['domain_error_regex'] = 'Nazwa domeny jest nieprawidłowa.';
+$wb['domain_error_wildcard'] = 'Subdomeny typu wildcard nie sÄ… dozwolone.';
+$wb['hd_quota_error_empty'] = 'Pole limitu dysku jest puste lub wynosi 0.';
+$wb['traffic_quota_error_empty'] = 'Pole limitu transferu jest puste.';
+$wb['error_ssl_state_empty'] = 'Pole województwa dla SSL jest puste.';
+$wb['error_ssl_locality_empty'] = 'Pole lokalizacji dla SSL jest puste.';
+$wb['error_ssl_organisation_empty'] = 'Pole organizacji dla SSL jest puste.';
+$wb['error_ssl_organisation_unit_empty'] = 'Pole jednostki dla SSL jest puste.';
+$wb['error_ssl_country_empty'] = 'Pole kraju dla SSL jest puste.';
+$wb['error_ssl_cert_empty'] = 'Pole certyfikatu SSL jest puste.';
+$wb['client_group_id_txt'] = 'Klient';
+$wb['stats_password_txt'] = 'Hasło do statystyk';
$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['limit_web_quota_free_txt'] = 'Maks. dostępny limit dysku';
+$wb['ssl_state_error_regex'] = 'Nieprawidłowe województwo SSL. Dozwolone znaki: a-z, 0-9 i .,-_';
+$wb['ssl_locality_error_regex'] = 'Nieprawidłowa lokalizacja SSL. Dozwolone znaki: a-z, 0-9 i .,-_';
+$wb['ssl_organisation_error_regex'] = 'Nieprawidłowa organizacja SSL. Dozwolone znaki: a-z, 0-9 i .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Nieprawidłowa jednostka SSL. Dozwolone znaki: a-z, 0-9 i .,-_';
+$wb['ssl_country_error_regex'] = 'Nieprawidłowy kraj SSL. Dozwolone znaki: a-z, 0-9 i .,-_';
+$wb['limit_traffic_quota_free_txt'] = 'Maks. dostępny limit transferu';
+$wb['redirect_error_regex'] = 'Nieprawidłowa ścieżka przekierowania. Przykładowe prawidłowe przekierowania: /test/ lub http://www.domena.pl/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['traffic_quota_exceeded_txt'] = 'Limit transferu został przekroczony';
$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['stats_user_txt'] = 'Login do statystyk';
+$wb['stats_type_txt'] = 'Rodzaj statystyk';
+$wb['custom_php_ini_txt'] = 'WÅ‚asne ustawienia php.ini';
+$wb['none_txt'] = 'Brak';
+$wb['disabled_txt'] = 'Wyłączone';
+$wb['no_redirect_txt'] = 'Bez przekierowania';
+$wb['no_flag_txt'] = 'Bez flagi';
+$wb['save_certificate_txt'] = 'Zapisz certyfikat';
+$wb['create_certificate_txt'] = 'Utwórz certyfikat';
+$wb['delete_certificate_txt'] = 'Usuń certyfikat';
+$wb['nginx_directives_txt'] = 'Dyrektywy nginx';
+$wb['seo_redirect_txt'] = 'Przekierowanie SEO';
+$wb['non_www_to_www_txt'] = 'bez-www -> www';
+$wb['www_to_non_www_txt'] = 'www -> bez-www';
+$wb['php_fpm_use_socket_txt'] = 'Użyj gniazda dla PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI dla SSL nie jest aktywowane dla tego serwera. Możesz włączyć tylko jeden certyfikat SSL dla jednego adresu IP.';
$wb['python_txt'] = 'Python';
$wb['perl_txt'] = 'Perl';
$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = '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['error_php_fpm_pm_settings_txt'] = 'Wartości ustawień PHP-FPM pm muszą być następujące: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children musi być dodatnią wartością całkowitą.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers musi być dodatnią wartością całkowitą.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers musi być dodatnią wartością całkowitą.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers musi być dodatnią wartością całkowitą.';
+$wb['hd_quota_error_regex'] = 'Limit dyski jest nieprawidłowy';
+$wb['traffic_quota_error_regex'] = 'Limit transferu jest nieprawidłowy';
+$wb['fastcgi_php_version_txt'] = 'Wersja PHP';
$wb['pm_txt'] = 'PHP-FPM Process Manager';
$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout musi być dodatnią wartością całkowitą.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests musi być wartością całkowitą >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Pamiętaj że musisz mieć wersję PHP >= 5.3.9 aby używać ondemand process manager. W przypadku starszej wersji PHP nie będzie działać w ogóle!';
+$wb['generate_password_txt'] = 'Generuj hasło';
+$wb['repeat_password_txt'] = 'Powtórz hasło';
+$wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
+$wb['password_match_txt'] = 'Hasła pasują do siebie';
+$wb['available_php_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw PHP:';
+$wb['available_apache_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw Apache:';
+$wb['available_nginx_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw nginx:';
+$wb['proxy_directives_txt'] = 'Dyrektywy Proxy';
+$wb['available_proxy_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw Proxy:';
?>
+
diff --git a/interface/web/sites/lib/lang/pl_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/pl_web_vhost_subdomain_list.lng
index 1c16bcda28..58084a63ff 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
@@ -6,3 +6,4 @@ $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_webdav_user.lng b/interface/web/sites/lib/lang/pl_webdav_user.lng
index 00d73646da..669c1b3088 100644
--- a/interface/web/sites/lib/lang/pl_webdav_user.lng
+++ b/interface/web/sites/lib/lang/pl_webdav_user.lng
@@ -12,10 +12,11 @@ $wb['username_error_unique'] = 'Nazwa użytkownika musi być unikalna.';
$wb['username_error_regex'] = 'Nazwa użytkownika zawiera niedozwolone znaki.';
$wb['directory_error_empty'] = 'Pusty katalog.';
$wb['parent_domain_id_error_empty'] = 'Nie wybrano strony www.';
-$wb['dir_dot_error'] = 'No .. in path allowed.';
-$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
+$wb['dir_dot_error'] = 'Znaki .. w ścieżce nie są dozwolone';
+$wb['dir_slashdot_error'] = 'Znaki ./ w ścieżce nie są dozwolone';
+$wb['generate_password_txt'] = 'Generuj hasło';
+$wb['repeat_password_txt'] = 'Powtórz hasło';
+$wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
+$wb['password_match_txt'] = 'Hasła pasują do siebie';
?>
+
diff --git a/interface/web/sites/lib/lang/pl_webdav_user_list.lng b/interface/web/sites/lib/lang/pl_webdav_user_list.lng
index 5e7e4b6a58..f679685e8d 100644
--- a/interface/web/sites/lib/lang/pl_webdav_user_list.lng
+++ b/interface/web/sites/lib/lang/pl_webdav_user_list.lng
@@ -6,3 +6,4 @@ $wb['parent_domain_id_txt'] = 'Strona';
$wb['username_txt'] = 'Nazwa użytkownika';
$wb['add_new_record_txt'] = 'Dodaj nowego użytkownika Webdav';
?>
+
diff --git a/interface/web/sites/lib/lang/pt_aps.lng b/interface/web/sites/lib/lang/pt_aps.lng
index 8ce5b20eb1..29fb7b6a40 100644
--- a/interface/web/sites/lib/lang/pt_aps.lng
+++ b/interface/web/sites/lib/lang/pt_aps.lng
@@ -54,4 +54,5 @@ $wb['installation_remove_txt'] = 'Removal planned';
$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
$wb['btn_install_txt'] = 'Install';
$wb['btn_cancel_txt'] = 'Cancel';
+$wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
?>
diff --git a/interface/web/sites/lib/lang/pt_aps_update_packagelist.lng b/interface/web/sites/lib/lang/pt_aps_update_packagelist.lng
index 20a7360b64..ce9fcf68fb 100644
--- a/interface/web/sites/lib/lang/pt_aps_update_packagelist.lng
+++ b/interface/web/sites/lib/lang/pt_aps_update_packagelist.lng
@@ -4,4 +4,4 @@ $wb['list_desc_txt'] = '';
$wb['btn_start_txt'] = 'Update Packagelist';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['legend_txt'] = 'Here you can update the list of available packages. Please note that this can take up to five minutes. You can leave this page if you like; the process will continue in the background.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/ro_aps.lng b/interface/web/sites/lib/lang/ro_aps.lng
index 8ce5b20eb1..29fb7b6a40 100644
--- a/interface/web/sites/lib/lang/ro_aps.lng
+++ b/interface/web/sites/lib/lang/ro_aps.lng
@@ -54,4 +54,5 @@ $wb['installation_remove_txt'] = 'Removal planned';
$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
$wb['btn_install_txt'] = 'Install';
$wb['btn_cancel_txt'] = 'Cancel';
+$wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
?>
diff --git a/interface/web/sites/lib/lang/ro_aps_update_packagelist.lng b/interface/web/sites/lib/lang/ro_aps_update_packagelist.lng
index 20a7360b64..ce9fcf68fb 100644
--- a/interface/web/sites/lib/lang/ro_aps_update_packagelist.lng
+++ b/interface/web/sites/lib/lang/ro_aps_update_packagelist.lng
@@ -4,4 +4,4 @@ $wb['list_desc_txt'] = '';
$wb['btn_start_txt'] = 'Update Packagelist';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['legend_txt'] = 'Here you can update the list of available packages. Please note that this can take up to five minutes. You can leave this page if you like; the process will continue in the background.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/ru_aps.lng b/interface/web/sites/lib/lang/ru_aps.lng
index 8ce5b20eb1..29fb7b6a40 100644
--- a/interface/web/sites/lib/lang/ru_aps.lng
+++ b/interface/web/sites/lib/lang/ru_aps.lng
@@ -54,4 +54,5 @@ $wb['installation_remove_txt'] = 'Removal planned';
$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
$wb['btn_install_txt'] = 'Install';
$wb['btn_cancel_txt'] = 'Cancel';
+$wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
?>
diff --git a/interface/web/sites/lib/lang/ru_aps_update_packagelist.lng b/interface/web/sites/lib/lang/ru_aps_update_packagelist.lng
index 20a7360b64..ce9fcf68fb 100644
--- a/interface/web/sites/lib/lang/ru_aps_update_packagelist.lng
+++ b/interface/web/sites/lib/lang/ru_aps_update_packagelist.lng
@@ -4,4 +4,4 @@ $wb['list_desc_txt'] = '';
$wb['btn_start_txt'] = 'Update Packagelist';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['legend_txt'] = 'Here you can update the list of available packages. Please note that this can take up to five minutes. You can leave this page if you like; the process will continue in the background.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/se_aps.lng b/interface/web/sites/lib/lang/se_aps.lng
index 8ce5b20eb1..29fb7b6a40 100644
--- a/interface/web/sites/lib/lang/se_aps.lng
+++ b/interface/web/sites/lib/lang/se_aps.lng
@@ -54,4 +54,5 @@ $wb['installation_remove_txt'] = 'Removal planned';
$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
$wb['btn_install_txt'] = 'Install';
$wb['btn_cancel_txt'] = 'Cancel';
+$wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
?>
diff --git a/interface/web/sites/lib/lang/se_aps_update_packagelist.lng b/interface/web/sites/lib/lang/se_aps_update_packagelist.lng
index 20a7360b64..ce9fcf68fb 100644
--- a/interface/web/sites/lib/lang/se_aps_update_packagelist.lng
+++ b/interface/web/sites/lib/lang/se_aps_update_packagelist.lng
@@ -4,4 +4,4 @@ $wb['list_desc_txt'] = '';
$wb['btn_start_txt'] = 'Update Packagelist';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['legend_txt'] = 'Here you can update the list of available packages. Please note that this can take up to five minutes. You can leave this page if you like; the process will continue in the background.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/sk_aps.lng b/interface/web/sites/lib/lang/sk_aps.lng
index 8ce5b20eb1..29fb7b6a40 100644
--- a/interface/web/sites/lib/lang/sk_aps.lng
+++ b/interface/web/sites/lib/lang/sk_aps.lng
@@ -54,4 +54,5 @@ $wb['installation_remove_txt'] = 'Removal planned';
$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
$wb['btn_install_txt'] = 'Install';
$wb['btn_cancel_txt'] = 'Cancel';
+$wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
?>
diff --git a/interface/web/sites/lib/lang/sk_aps_update_packagelist.lng b/interface/web/sites/lib/lang/sk_aps_update_packagelist.lng
index 20a7360b64..ce9fcf68fb 100644
--- a/interface/web/sites/lib/lang/sk_aps_update_packagelist.lng
+++ b/interface/web/sites/lib/lang/sk_aps_update_packagelist.lng
@@ -4,4 +4,4 @@ $wb['list_desc_txt'] = '';
$wb['btn_start_txt'] = 'Update Packagelist';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['legend_txt'] = 'Here you can update the list of available packages. Please note that this can take up to five minutes. You can leave this page if you like; the process will continue in the background.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/tr_aps.lng b/interface/web/sites/lib/lang/tr_aps.lng
index 8ce5b20eb1..29fb7b6a40 100644
--- a/interface/web/sites/lib/lang/tr_aps.lng
+++ b/interface/web/sites/lib/lang/tr_aps.lng
@@ -54,4 +54,5 @@ $wb['installation_remove_txt'] = 'Removal planned';
$wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
$wb['btn_install_txt'] = 'Install';
$wb['btn_cancel_txt'] = 'Cancel';
+$wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
?>
diff --git a/interface/web/sites/lib/lang/tr_aps_update_packagelist.lng b/interface/web/sites/lib/lang/tr_aps_update_packagelist.lng
index 20a7360b64..ce9fcf68fb 100644
--- a/interface/web/sites/lib/lang/tr_aps_update_packagelist.lng
+++ b/interface/web/sites/lib/lang/tr_aps_update_packagelist.lng
@@ -4,4 +4,4 @@ $wb['list_desc_txt'] = '';
$wb['btn_start_txt'] = 'Update Packagelist';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['legend_txt'] = 'Here you can update the list of available packages. Please note that this can take up to five minutes. You can leave this page if you like; the process will continue in the background.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/templates/aps_install_package.htm b/interface/web/sites/templates/aps_install_package.htm
index 44e40f2db9..c911ced39e 100644
--- a/interface/web/sites/templates/aps_install_package.htm
+++ b/interface/web/sites/templates/aps_install_package.htm
@@ -49,8 +49,8 @@
<input type="hidden" name="install" value="0" />
<div class="buttonHolder buttons">
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_install_txt'}" name="btn_install" onclick="document.pageForm.install.value=1; submitForm('pageForm','sites/aps_install_package.php?id={tmpl_var name='pkg_id'}');"><span>{tmpl_var name='btn_install_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('aps/availablepackages_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/aps_availablepackages_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/interface/web/sites/templates/web_vhost_subdomain_edit.htm b/interface/web/sites/templates/web_vhost_subdomain_edit.htm
index 30745dd15d..8070e0092b 100644
--- a/interface/web/sites/templates/web_vhost_subdomain_edit.htm
+++ b/interface/web/sites/templates/web_vhost_subdomain_edit.htm
@@ -33,10 +33,6 @@
<label for="web_folder">{tmpl_var name='web_folder_txt'}</label>
<input name="web_folder" id="web_folder" value="{tmpl_var name='web_folder'}" size="30" maxlength="100" type="text" class="textInput formLengthHalf"<tmpl_if name='fixed_folder' op='==' value='y'> readonly="readonly"</tmpl_if> />
</div>
- <div class="ctrlHolder">
- <label for="hd_quota">{tmpl_var name='hd_quota_txt'}</label>
- <input name="hd_quota" id="hd_quota" value="{tmpl_var name='hd_quota'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /> MB
- </div>
<div class="ctrlHolder">
<label for="traffic_quota">{tmpl_var name='traffic_quota_txt'}</label>
<input name="traffic_quota" id="traffic_quota" value="{tmpl_var name='traffic_quota'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /> MB <tmpl_var name='traffic_quota_exceeded_txt'>
diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php
index 2d7e9a9e2d..11946aa0fd 100644
--- a/interface/web/sites/web_domain_edit.php
+++ b/interface/web/sites/web_domain_edit.php
@@ -103,7 +103,7 @@ class page_action extends tform_actions {
$web_config = $app->getconf->get_server_config($client['default_webserver'], 'web');
// Set the webserver to the default server of the client
- $tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = $client[default_webserver]");
+ $tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = ".intval($client['default_webserver']));
$app->tpl->setVar("server_id","<option value='$client[default_webserver]'>$tmp[server_name]</option>");
unset($tmp);
@@ -123,7 +123,7 @@ class page_action extends tform_actions {
unset($ips);
//* Fill the IPv6 select field with the IP addresses that are allowed for this client
- $sql = "SELECT ip_address FROM server_ip WHERE server_id = ".$client['default_webserver']." AND ip_type = 'IPv6' AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")";
+ $sql = "SELECT ip_address FROM server_ip WHERE server_id = ".intval($client['default_webserver'])." AND ip_type = 'IPv6' AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")";
$ips = $app->db->queryAllRecords($sql);
$ip_select = "<option value=''></option>";
//$ip_select = "";
@@ -142,10 +142,10 @@ class page_action extends tform_actions {
if(!empty($web_config['server_type'])) $server_type = $web_config['server_type'];
if($server_type == 'nginx' && $this->dataRecord['php'] == 'fast-cgi') $this->dataRecord['php'] = 'php-fpm';
if($this->dataRecord['php'] == 'php-fpm'){
- $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ".($this->id > 0 ? $this->dataRecord['server_id'] : $client['default_webserver'])." AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")");
+ $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ".($this->id > 0 ? $this->dataRecord['server_id'] : intval($client['default_webserver']))." AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")");
}
if($this->dataRecord['php'] == 'fast-cgi'){
- $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ".($this->id > 0 ? $this->dataRecord['server_id'] : $client['default_webserver'])." AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")");
+ $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ".($this->id > 0 ? $this->dataRecord['server_id'] : intval($client['default_webserver']))." AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")");
}
$php_select = "<option value=''>Default</option>";
if(is_array($php_records) && !empty($php_records)) {
@@ -177,7 +177,7 @@ class page_action extends tform_actions {
$web_config = $app->getconf->get_server_config($client['default_webserver'], 'web');
// Set the webserver to the default server of the client
- $tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = $client[default_webserver]");
+ $tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = ".intval($client['default_webserver']));
$app->tpl->setVar("server_id","<option value='$client[default_webserver]'>$tmp[server_name]</option>");
unset($tmp);
@@ -196,7 +196,7 @@ class page_action extends tform_actions {
$app->tpl->setVar("client_group_id",$client_select);
//* Fill the IPv4 select field with the IP addresses that are allowed for this client
- $sql = "SELECT ip_address FROM server_ip WHERE server_id = ".$client['default_webserver']." AND ip_type = 'IPv4' AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")";
+ $sql = "SELECT ip_address FROM server_ip WHERE server_id = ".intval($client['default_webserver'])." AND ip_type = 'IPv4' AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")";
$ips = $app->db->queryAllRecords($sql);
$ip_select = ($web_config['enable_ip_wildcard'] == 'y')?"<option value='*'>*</option>":"";
//$ip_select = "";
@@ -211,7 +211,7 @@ class page_action extends tform_actions {
unset($ips);
//* Fill the IPv6 select field with the IP addresses that are allowed for this client
- $sql = "SELECT ip_address FROM server_ip WHERE server_id = ".$client['default_webserver']." AND ip_type = 'IPv6' AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")";
+ $sql = "SELECT ip_address FROM server_ip WHERE server_id = ".intval($client['default_webserver'])." AND ip_type = 'IPv6' AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")";
$ips = $app->db->queryAllRecords($sql);
$ip_select = "<option value=''></option>";
//$ip_select = "";
@@ -230,10 +230,10 @@ class page_action extends tform_actions {
if(!empty($web_config['server_type'])) $server_type = $web_config['server_type'];
if($server_type == 'nginx' && $this->dataRecord['php'] == 'fast-cgi') $this->dataRecord['php'] = 'php-fpm';
if($this->dataRecord['php'] == 'php-fpm'){
- $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ".($this->id > 0 ? $this->dataRecord['server_id'] : $client['default_webserver'])." AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")");
+ $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ".($this->id > 0 ? $this->dataRecord['server_id'] : intval($client['default_webserver']))." AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")");
}
if($this->dataRecord['php'] == 'fast-cgi') {
- $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ".($this->id > 0 ? $this->dataRecord['server_id'] : $client['default_webserver'])." AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")");
+ $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ".($this->id > 0 ? $this->dataRecord['server_id'] : intval($client['default_webserver']))." AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")");
}
$php_select = "<option value=''>Default</option>";
if(is_array($php_records) && !empty($php_records)) {
@@ -311,11 +311,11 @@ class page_action extends tform_actions {
$this->dataRecord["server_id"] = $tmp["server_id"];
unset($tmp);
}
- $server_id = @$this->dataRecord["server_id"];
+ $server_id = intval(@$this->dataRecord["server_id"]);
} else {
// Get the first server ID
$tmp = $app->db->queryOneRecord("SELECT server_id FROM server WHERE web_server = 1 ORDER BY server_name LIMIT 0,1");
- $server_id = $tmp['server_id'];
+ $server_id = intval($tmp['server_id']);
}
//* get global web config
@@ -552,7 +552,7 @@ class page_action extends tform_actions {
//* Check the website quota of the client
if(isset($_POST["hd_quota"]) && $client["limit_web_quota"] >= 0) {
- $tmp = $app->db->queryOneRecord("SELECT sum(hd_quota) as webquota FROM web_domain WHERE domain_id != ".$app->functions->intval($this->id)." AND ".$app->tform->getAuthSQL('u'));
+ $tmp = $app->db->queryOneRecord("SELECT sum(hd_quota) as webquota FROM web_domain WHERE domain_id != ".$app->functions->intval($this->id)." AND type = 'vhost' AND ".$app->tform->getAuthSQL('u'));
$webquota = $tmp["webquota"];
$new_web_quota = $app->functions->intval($this->dataRecord["hd_quota"]);
if(($webquota + $new_web_quota > $client["limit_web_quota"]) || ($new_web_quota < 0 && $client["limit_web_quota"] >= 0)) {
@@ -588,7 +588,7 @@ class page_action extends tform_actions {
//* Check the website quota of the client
if(isset($_POST["hd_quota"]) && $reseller["limit_web_quota"] >= 0) {
- $tmp = $app->db->queryOneRecord("SELECT sum(hd_quota) as webquota FROM web_domain WHERE domain_id != ".$app->functions->intval($this->id)." AND ".$app->tform->getAuthSQL('u'));
+ $tmp = $app->db->queryOneRecord("SELECT sum(hd_quota) as webquota FROM web_domain WHERE domain_id != ".$app->functions->intval($this->id)." AND type = 'vhost' AND ".$app->tform->getAuthSQL('u'));
$webquota = $tmp["webquota"];
$new_web_quota = $app->functions->intval($this->dataRecord["hd_quota"]);
if(($webquota + $new_web_quota > $reseller["limit_web_quota"]) || ($new_web_quota < 0 && $reseller["limit_web_quota"] >= 0)) {
diff --git a/interface/web/sites/web_vhost_subdomain_edit.php b/interface/web/sites/web_vhost_subdomain_edit.php
index 58e2474a54..c9bdd27876 100644
--- a/interface/web/sites/web_vhost_subdomain_edit.php
+++ b/interface/web/sites/web_vhost_subdomain_edit.php
@@ -211,7 +211,7 @@ class page_action extends tform_actions {
if($proxy_directive_snippets_txt == '') $proxy_directive_snippets_txt = '------';
$app->tpl->setVar("proxy_directive_snippets_txt",$proxy_directive_snippets_txt);
}
-
+
//* Admin: If the logged in user is admin
} else {
@@ -410,6 +410,10 @@ class page_action extends tform_actions {
if(in_array($check_folder, $forbidden_folders)) {
$app->tform->errorMessage .= $app->tform->lng("web_folder_invalid_txt")."<br>";
}
+
+ // vhostsubdomains do not have a quota of their own
+ $this->dataRecord["hd_quota"] = 0;
+
// check for duplicate folder usage
/*
$check = $app->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_domain` WHERE `type` = 'vhostsubdomain' AND `parent_domain_id` = '" . $app->functions->intval($this->dataRecord['parent_domain_id']) . "' AND `web_folder` = '" . $app->db->quote($this->dataRecord['web_folder']) . "' AND `domain_id` != '" . $app->functions->intval($this->id) . "'");
@@ -431,26 +435,10 @@ 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'] != 'n') $this->dataRecord['suexec'] = 'y';
if($client['limit_hterror'] != 'y') $this->dataRecord['errordocs'] = '-';
if($client['limit_wildcard'] != 'y' && $this->dataRecord['subdomain'] == '*') $this->dataRecord['subdomain'] = '-';
if($client['limit_ssl'] != 'y') $this->dataRecord['ssl'] = '-';
-
- //* Check the website quota of the client
- if(isset($_POST["hd_quota"]) && $client["limit_web_quota"] >= 0) {
- $tmp = $app->db->queryOneRecord("SELECT sum(hd_quota) as webquota FROM web_domain WHERE domain_id != ".$app->functions->intval($this->id)." AND ".$app->tform->getAuthSQL('u'));
- $webquota = $tmp["webquota"];
- $new_web_quota = $app->functions->intval($this->dataRecord["hd_quota"]);
- if(($webquota + $new_web_quota > $client["limit_web_quota"]) || ($new_web_quota < 0 && $client["limit_web_quota"] >= 0)) {
- $max_free_quota = floor($client["limit_web_quota"] - $webquota);
- if($max_free_quota < 0) $max_free_quota = 0;
- $app->tform->errorMessage .= $app->tform->lng("limit_web_quota_free_txt").": ".$max_free_quota." MB<br>";
- // Set the quota field to the max free space
- $this->dataRecord["hd_quota"] = $max_free_quota;
- }
- unset($tmp);
- unset($tmp_quota);
- }
//* Check the traffic quota of the client
if(isset($_POST["traffic_quota"]) && $client["limit_traffic_quota"] > 0) {
@@ -472,22 +460,6 @@ class page_action extends tform_actions {
// Get the limits of the reseller
$reseller = $app->db->queryOneRecord("SELECT limit_traffic_quota, limit_web_subdomain, default_webserver, limit_web_quota FROM client WHERE client_id = ".$client['parent_client_id']);
- //* Check the website quota of the client
- if(isset($_POST["hd_quota"]) && $reseller["limit_web_quota"] >= 0) {
- $tmp = $app->db->queryOneRecord("SELECT sum(hd_quota) as webquota FROM web_domain WHERE domain_id != ".$app->functions->intval($this->id)." AND ".$app->tform->getAuthSQL('u'));
- $webquota = $tmp["webquota"];
- $new_web_quota = $app->functions->intval($this->dataRecord["hd_quota"]);
- if(($webquota + $new_web_quota > $reseller["limit_web_quota"]) || ($new_web_quota < 0 && $reseller["limit_web_quota"] >= 0)) {
- $max_free_quota = floor($reseller["limit_web_quota"] - $webquota);
- if($max_free_quota < 0) $max_free_quota = 0;
- $app->tform->errorMessage .= $app->tform->lng("limit_web_quota_free_txt").": ".$max_free_quota." MB<br>";
- // Set the quota field to the max free space
- $this->dataRecord["hd_quota"] = $max_free_quota;
- }
- unset($tmp);
- unset($tmp_quota);
- }
-
//* Check the traffic quota of the client
if(isset($_POST["traffic_quota"]) && $reseller["limit_traffic_quota"] > 0) {
$tmp = $app->db->queryOneRecord("SELECT sum(traffic_quota) as trafficquota FROM web_domain WHERE domain_id != ".$app->functions->intval($this->id)." AND ".$app->tform->getAuthSQL('u'));
@@ -627,4 +599,4 @@ class page_action extends tform_actions {
$page = new page_action;
$page->onLoad();
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng
index cff29d541a..59a146cbfd 100644
--- a/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng
+++ b/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng
@@ -6,3 +6,5 @@ $wb['password_strength_3_txt'] = 'Dobré';
$wb['password_strength_4_txt'] = 'Silné';
$wb['password_strength_5_txt'] = 'Velmi silné';
?>
+
+
diff --git a/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng
index df85c97124..79d031777b 100644
--- a/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng
+++ b/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng
@@ -6,3 +6,4 @@ $wb['password_strength_3_txt'] = 'Dobre';
$wb['password_strength_4_txt'] = 'Silne';
$wb['password_strength_5_txt'] = 'Bardzo mocne';
?>
+
diff --git a/interface/web/themes/default/css/styles.css b/interface/web/themes/default/css/styles.css
index ff56da40cb..1820dbcdff 100644
--- a/interface/web/themes/default/css/styles.css
+++ b/interface/web/themes/default/css/styles.css
@@ -384,6 +384,8 @@ table.list .tbl_col_limit {
}
.pnl_listarea th[class^="tbl_col"] { cursor:pointer; }
.pnl_listarea th[class^="tbl_col"]:hover { background-position:0 -15px!important; }
+.pnl_listarea th.tbl_col_nosort { cursor:default; }
+.pnl_listarea th.tbl_col_nosort:hover { background-position:0 0!important; }
.pageForm_description { font-size: 12px; }
diff --git a/interface/web/tools/form/interface_settings.tform.php b/interface/web/tools/form/interface_settings.tform.php
index 52db8aae76..c93da46a52 100644
--- a/interface/web/tools/form/interface_settings.tform.php
+++ b/interface/web/tools/form/interface_settings.tform.php
@@ -96,7 +96,9 @@ if($_SESSION["s"]["user"]["typ"] == 'admin') {
}
}
} else {
- $modules = $conf['interface_modules_enabled'];
+ $tmp = $app->db->queryOneRecord("SELECT * FROM sys_user where username = '".$_SESSION["s"]["user"]['username']."'");
+ $modules = $tmp['modules'];
+ //$modules = $conf['interface_modules_enabled'];
if($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
$modules .= ',client';
}
diff --git a/interface/web/tools/import_vpopmail.php b/interface/web/tools/import_vpopmail.php
index 6d223fa82e..cb99794185 100644
--- a/interface/web/tools/import_vpopmail.php
+++ b/interface/web/tools/import_vpopmail.php
@@ -264,4 +264,4 @@ function start_import() {
}
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/tools/lib/lang/cz.lng b/interface/web/tools/lib/lang/cz.lng
index 66bcaf49ae..480434e148 100644
--- a/interface/web/tools/lib/lang/cz.lng
+++ b/interface/web/tools/lib/lang/cz.lng
@@ -11,3 +11,5 @@ $wb['ISPConfig 3 mail'] = 'ISPConfig 3 vzdalený e-mail server';
$wb['PDNS Tupa'] = 'PowerDNS Tupa';
$wb['Interface'] = 'RozhranÃ';
?>
+
+
diff --git a/interface/web/tools/lib/lang/cz_import_ispconfig.lng b/interface/web/tools/lib/lang/cz_import_ispconfig.lng
index 8ebf71795c..ba24f58f75 100644
--- a/interface/web/tools/lib/lang/cz_import_ispconfig.lng
+++ b/interface/web/tools/lib/lang/cz_import_ispconfig.lng
@@ -21,3 +21,5 @@ $wb['import_forward_txt'] = 'Import forward';
$wb['import_user_filter_txt'] = 'Importovat uživatelský filter';
$wb['import_spamfilter_txt'] = 'Importovat spamový filter';
?>
+
+
diff --git a/interface/web/tools/lib/lang/cz_index.lng b/interface/web/tools/lib/lang/cz_index.lng
index 5ebf1ec341..b1f32ec119 100644
--- a/interface/web/tools/lib/lang/cz_index.lng
+++ b/interface/web/tools/lib/lang/cz_index.lng
@@ -2,3 +2,5 @@
$wb['page_head_txt'] = 'ISPConfig nástroje';
$wb['page_desc_txt'] = 'ZmÄ›na uživatelského nastavenÃ';
?>
+
+
diff --git a/interface/web/tools/lib/lang/cz_interface.lng b/interface/web/tools/lib/lang/cz_interface.lng
index 507b7c3cbe..1125032b1f 100644
--- a/interface/web/tools/lib/lang/cz_interface.lng
+++ b/interface/web/tools/lib/lang/cz_interface.lng
@@ -5,3 +5,5 @@ $wb['language_txt'] = 'Jazyk';
$wb['startmodule_txt'] = 'Výchozà modul po pÅ™ihlášenÃ';
$wb['app_theme_txt'] = 'Výchozà grafické téma';
?>
+
+
diff --git a/interface/web/tools/lib/lang/cz_resync.lng b/interface/web/tools/lib/lang/cz_resync.lng
index 96d622e28a..3b53ca06a5 100644
--- a/interface/web/tools/lib/lang/cz_resync.lng
+++ b/interface/web/tools/lib/lang/cz_resync.lng
@@ -11,3 +11,5 @@ $wb['resync_dns_txt'] = 'Resynchronizovat DNS záznamy';
$wb['btn_start_txt'] = 'Zahájit';
$wb['btn_cancel_txt'] = 'Zrušit';
?>
+
+
diff --git a/interface/web/tools/lib/lang/cz_tpl_default.lng b/interface/web/tools/lib/lang/cz_tpl_default.lng
index 0f037f1590..53e9bd8442 100644
--- a/interface/web/tools/lib/lang/cz_tpl_default.lng
+++ b/interface/web/tools/lib/lang/cz_tpl_default.lng
@@ -5,3 +5,5 @@ $wb['no_settings_txt'] = 'Nejsou žádné nastavenà pro výchozà motiv.';
$wb['btn_start_txt'] = 'Uložit';
$wb['btn_cancel_txt'] = 'Zpět';
?>
+
+
diff --git a/interface/web/tools/lib/lang/cz_usersettings.lng b/interface/web/tools/lib/lang/cz_usersettings.lng
index dec46b7a06..7490e52f98 100644
--- a/interface/web/tools/lib/lang/cz_usersettings.lng
+++ b/interface/web/tools/lib/lang/cz_usersettings.lng
@@ -10,3 +10,5 @@ $wb['repeat_password_txt'] = 'Opakujte heslo';
$wb['password_mismatch_txt'] = 'Hesla se neshodujÃ.';
$wb['password_match_txt'] = 'Hesla se shodujÃ.';
?>
+
+
diff --git a/interface/web/tools/lib/lang/en_import_vpopmail.lng b/interface/web/tools/lib/lang/en_import_vpopmail.lng
index d212867479..1e4dd281f7 100644
--- a/interface/web/tools/lib/lang/en_import_vpopmail.lng
+++ b/interface/web/tools/lib/lang/en_import_vpopmail.lng
@@ -5,4 +5,4 @@ $wb['btn_start_txt'] = 'Start Import';
$wb['btn_connect_txt'] = 'Connect to remote server';
$wb['btn_cancel_txt'] = 'Cancel';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/tools/lib/lang/pl.lng b/interface/web/tools/lib/lang/pl.lng
index 8a5468df37..a807a75c3d 100644
--- a/interface/web/tools/lib/lang/pl.lng
+++ b/interface/web/tools/lib/lang/pl.lng
@@ -4,10 +4,11 @@ $wb['Settings'] = 'Ustawienia';
$wb['ISPConfig Tools'] = 'Narzędzia ISPConfig';
$wb['Password and Language'] = 'Hasło i język';
$wb['ispconfig_tools_note'] = 'Ten moduł pozwala na zmianę hasła i języka oraz na ponowną synchronizację rekordów DNS.';
-$wb['Resync'] = 'Resync';
-$wb['Sync Tools'] = 'Sync Tools';
+$wb['Resync'] = 'Resynchronizuj';
+$wb['Sync Tools'] = 'Narzędzia do synchronizacji';
$wb['Import'] = 'Import';
-$wb['ISPConfig 3 mail'] = 'ISPConfig 3 mail';
+$wb['ISPConfig 3 mail'] = 'Poczta ISPConfig 3';
$wb['PDNS Tupa'] = 'PowerDNS Tupa';
-$wb['Interface'] = 'Interface';
+$wb['Interface'] = 'Interfejs';
?>
+
diff --git a/interface/web/tools/lib/lang/pl_import_ispconfig.lng b/interface/web/tools/lib/lang/pl_import_ispconfig.lng
index ce47c4da4d..bae9417da1 100644
--- a/interface/web/tools/lib/lang/pl_import_ispconfig.lng
+++ b/interface/web/tools/lib/lang/pl_import_ispconfig.lng
@@ -1,23 +1,24 @@
<?php
-$wb['head_txt'] = 'Import email configuration from ISPConfig 3';
-$wb['legend_txt'] = 'Remote server connection details';
-$wb['legend2_txt'] = 'Import email domain';
-$wb['resync_sites_txt'] = 'Resync Websites';
-$wb['resync_ftp_txt'] = 'Resync FTP users';
-$wb['resync_shell_txt'] = 'Resync shell users';
-$wb['resync_cron_txt'] = 'Resync cronjobs';
-$wb['resync_db_txt'] = 'Resync clientdb config';
-$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
-$wb['resync_dns_txt'] = 'Resync DNS records';
-$wb['btn_start_txt'] = 'Start Import';
-$wb['btn_connect_txt'] = 'Connect to remote server';
-$wb['btn_cancel_txt'] = 'Cancel';
-$wb['client_group_id_txt'] = 'Local client';
-$wb['mail_domain_txt'] = 'Remote email domain';
-$wb['import_mailbox_txt'] = 'Import mailbox';
-$wb['import_aliasdomain_txt'] = 'Import alias domain';
-$wb['import_alias_txt'] = 'Import email alias';
-$wb['import_forward_txt'] = 'Import forward';
-$wb['import_user_filter_txt'] = 'Import user filter';
-$wb['import_spamfilter_txt'] = 'Import spamfilter';
+$wb['head_txt'] = 'Import konfiguracji poczty z serwera ISPConfig 3';
+$wb['legend_txt'] = 'Szczegóły połączenia ze zdalnym serwerem';
+$wb['legend2_txt'] = 'Domena importowanej poczty';
+$wb['resync_sites_txt'] = 'Resynchronizuj strony www';
+$wb['resync_ftp_txt'] = 'Resynchronizuj konta FTP';
+$wb['resync_shell_txt'] = 'Resynchronizuj konta shell';
+$wb['resync_cron_txt'] = 'Resynchronizuj zadania cron';
+$wb['resync_db_txt'] = 'Resynchronizuj użytkowników bazy';
+$wb['resync_mailbox_txt'] = 'Resynchronizuj skrzynki pocztowe';
+$wb['resync_dns_txt'] = 'Resynchronizuj rekordy DNS';
+$wb['btn_start_txt'] = 'Uruchom import';
+$wb['btn_connect_txt'] = 'Połączenie do zdalnego serwera';
+$wb['btn_cancel_txt'] = 'Anuluj';
+$wb['client_group_id_txt'] = 'Klient lokalny';
+$wb['mail_domain_txt'] = 'Zdalna domena poczty';
+$wb['import_mailbox_txt'] = 'Import skrzynek pocztowych';
+$wb['import_aliasdomain_txt'] = 'Import aliasów domen';
+$wb['import_alias_txt'] = 'Import aliasów email';
+$wb['import_forward_txt'] = 'Import przekierowań';
+$wb['import_user_filter_txt'] = 'Import filtrów użytkownika';
+$wb['import_spamfilter_txt'] = 'Import filtrów spamu';
?>
+
diff --git a/interface/web/tools/lib/lang/pl_index.lng b/interface/web/tools/lib/lang/pl_index.lng
index a3ef38f219..0ff1c84dc4 100644
--- a/interface/web/tools/lib/lang/pl_index.lng
+++ b/interface/web/tools/lib/lang/pl_index.lng
@@ -1,4 +1,5 @@
<?php
-$wb['page_head_txt'] = 'ISPConfig Tools';
-$wb['page_desc_txt'] = 'Change user settings';
+$wb['page_head_txt'] = 'Narzędzia ISPConfig';
+$wb['page_desc_txt'] = 'Zmiana ustawień użytkownika';
?>
+
diff --git a/interface/web/tools/lib/lang/pl_interface.lng b/interface/web/tools/lib/lang/pl_interface.lng
index aab4fc89ff..7775fe861f 100644
--- a/interface/web/tools/lib/lang/pl_interface.lng
+++ b/interface/web/tools/lib/lang/pl_interface.lng
@@ -1,7 +1,8 @@
<?php
-$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';
+$wb['interface_head_txt'] = 'Ustawienia interfejsu';
+$wb['interface_desc_txt'] = 'Zmień temat interfejsu';
+$wb['language_txt'] = 'Język';
+$wb['startmodule_txt'] = 'Moduł startowy';
+$wb['app_theme_txt'] = 'Temat';
?>
+
diff --git a/interface/web/tools/lib/lang/pl_resync.lng b/interface/web/tools/lib/lang/pl_resync.lng
index ed94767208..e69bec4e93 100644
--- a/interface/web/tools/lib/lang/pl_resync.lng
+++ b/interface/web/tools/lib/lang/pl_resync.lng
@@ -1,13 +1,14 @@
<?php
-$wb['head_txt'] = 'Resync Tool';
-$wb['legend_txt'] = 'Resync';
-$wb['resync_sites_txt'] = 'Resync Websites';
-$wb['resync_ftp_txt'] = 'Resync FTP users';
-$wb['resync_shell_txt'] = 'Resync shell users';
-$wb['resync_cron_txt'] = 'Resync cronjobs';
-$wb['resync_db_txt'] = 'Resync clientdb config';
-$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
-$wb['resync_dns_txt'] = 'Resync DNS records';
+$wb['head_txt'] = 'Resynchronizacja ustawień';
+$wb['legend_txt'] = 'Resynchronizacja';
+$wb['resync_sites_txt'] = 'Resynchronizacja stron www';
+$wb['resync_ftp_txt'] = 'Resynchronizacja kont FTP';
+$wb['resync_shell_txt'] = 'Resynchronizacja kont shell';
+$wb['resync_cron_txt'] = 'Resynchronizacja zadań cron';
+$wb['resync_db_txt'] = 'Resynchronizacja użytkowników bazy';
+$wb['resync_mailbox_txt'] = 'Resynchronizacja skrzynek e-mail';
+$wb['resync_dns_txt'] = 'Resynchronizacja rekordów DNS';
$wb['btn_start_txt'] = 'Start';
-$wb['btn_cancel_txt'] = 'Cancel';
+$wb['btn_cancel_txt'] = 'Anuluj';
?>
+
diff --git a/interface/web/tools/lib/lang/pl_tpl_default.lng b/interface/web/tools/lib/lang/pl_tpl_default.lng
index c06246304d..84c90f6761 100644
--- a/interface/web/tools/lib/lang/pl_tpl_default.lng
+++ b/interface/web/tools/lib/lang/pl_tpl_default.lng
@@ -1,7 +1,8 @@
<?php
-$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';
+$wb['list_head_txt'] = 'Ustawienia domyślnego szablonu';
+$wb['list_desc_txt'] = 'Zmień opcje specyficzne dla szablonu';
+$wb['no_settings_txt'] = 'Nie ma ustawień dla domyślnego szablonu';
+$wb['btn_start_txt'] = 'Zapisz';
+$wb['btn_cancel_txt'] = 'Wróć';
?>
+
diff --git a/interface/web/tools/lib/lang/pl_usersettings.lng b/interface/web/tools/lib/lang/pl_usersettings.lng
index 31b062a5de..2dbba9816b 100644
--- a/interface/web/tools/lib/lang/pl_usersettings.lng
+++ b/interface/web/tools/lib/lang/pl_usersettings.lng
@@ -5,8 +5,9 @@ $wb['language_txt'] = 'Język';
$wb['password_mismatch'] = 'Hasła nie pasują do siebie.';
$wb['Form to edit the user password and language.'] = 'Formularz do edycji języka i hasła użytkownika.';
$wb['Settings'] = 'Ustawienia';
-$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['generate_password_txt'] = 'Wygeneruj hasło';
+$wb['repeat_password_txt'] = 'Powtórz hasło';
+$wb['password_mismatch_txt'] = 'Hasła się nie zgadzają';
+$wb['password_match_txt'] = 'Hasła się zgadzają';
?>
+
diff --git a/interface/web/tools/lib/module.conf.php b/interface/web/tools/lib/module.conf.php
index c6b6aaeb87..274e6aa3e1 100644
--- a/interface/web/tools/lib/module.conf.php
+++ b/interface/web/tools/lib/module.conf.php
@@ -32,7 +32,7 @@ $items[] = array( 'title' => 'Interface',
'link' => 'tools/interface_settings.php',
'html_id' => 'interface_settings');
-include_once(ISPC_WEB_PATH.'/tools/lib/interface.d/tpl_' . $_SESSION['s']['user']['app_theme'] . '.menu.php');
+if(file_exists(ISPC_WEB_PATH.'/tools/lib/interface.d/tpl_' . $_SESSION['s']['user']['app_theme'] . '.menu.php')) include_once(ISPC_WEB_PATH.'/tools/lib/interface.d/tpl_' . $_SESSION['s']['user']['app_theme'] . '.menu.php');
$module['nav'][] = array( 'title' => 'Interface',
'open' => 1,
diff --git a/interface/web/tools/templates/import_vpopmail.htm b/interface/web/tools/templates/import_vpopmail.htm
index 8a786617c2..ade9476943 100644
--- a/interface/web/tools/templates/import_vpopmail.htm
+++ b/interface/web/tools/templates/import_vpopmail.htm
@@ -50,4 +50,4 @@
<button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/import_vpopmail.php');"><span>{tmpl_var name="btn_start_txt"}</span></button>
<button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
</div>
- </div>
\ No newline at end of file
+ </div>
diff --git a/interface/web/vm/lib/lang/cz.lng b/interface/web/vm/lib/lang/cz.lng
index 4167e14a8a..21224389a8 100644
--- a/interface/web/vm/lib/lang/cz.lng
+++ b/interface/web/vm/lib/lang/cz.lng
@@ -5,3 +5,5 @@ $wb['VM Templates'] = 'VM Templates';
$wb['IP addresses'] = 'IP addresses';
$wb['OpenVZ'] = 'OpenVZ';
?>
+
+
diff --git a/interface/web/vm/lib/lang/cz_openvz_action.lng b/interface/web/vm/lib/lang/cz_openvz_action.lng
index 3e2e3e0b84..2930fff65c 100644
--- a/interface/web/vm/lib/lang/cz_openvz_action.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_action.lng
@@ -14,3 +14,5 @@ $wb['ostemplate_name_error'] = 'The OSTemplate name conatains unallowed characte
$wb['ostemplate_name_unique_error'] = 'There is already a OSTemplate with that name.';
$wb['ostemplate_exec_txt'] = 'The command to create a OSTemplate has been sent to the host server. It will take several minutes until the OSTemplate has been created.';
?>
+
+
diff --git a/interface/web/vm/lib/lang/cz_openvz_ip.lng b/interface/web/vm/lib/lang/cz_openvz_ip.lng
index 6016681df8..6afda02718 100644
--- a/interface/web/vm/lib/lang/cz_openvz_ip.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_ip.lng
@@ -7,3 +7,5 @@ $wb['ip_error_wrong'] = 'Please fill in a valid IPv4 address.';
$wb['ip_error_unique'] = 'This IP address does already exist.';
$wb['IP address'] = 'IP address';
?>
+
+
diff --git a/interface/web/vm/lib/lang/cz_openvz_ip_list.lng b/interface/web/vm/lib/lang/cz_openvz_ip_list.lng
index e6a3a68c2c..e392e9c970 100644
--- a/interface/web/vm/lib/lang/cz_openvz_ip_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_ip_list.lng
@@ -5,3 +5,5 @@ $wb['ip_address_txt'] = 'IP address';
$wb['reserved_txt'] = 'Reserved';
$wb['vm_id_txt'] = 'VM';
?>
+
+
diff --git a/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng b/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng
index 72838a20de..12f22178d0 100644
--- a/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng
@@ -9,3 +9,5 @@ $wb['template_name_error_empty'] = 'Template name is empty.';
$wb['template_file_error_empty'] = 'Template filename is empty.';
$wb['Template'] = 'Å ablona';
?>
+
+
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 7705a4d18f..264d944d2c 100644
--- a/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng
@@ -6,3 +6,5 @@ $wb['server_id_txt'] = 'Server';
$wb['allservers_txt'] = 'Exists on all servers';
$wb['ostemplate_id_txt'] = 'ID';
?>
+
+
diff --git a/interface/web/vm/lib/lang/cz_openvz_template.lng b/interface/web/vm/lib/lang/cz_openvz_template.lng
index 12c80bd6c1..6f1f394d87 100644
--- a/interface/web/vm/lib/lang/cz_openvz_template.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_template.lng
@@ -91,3 +91,5 @@ $wb['swappages_error_empty'] = 'Swappages is empty.';
$wb['Template'] = 'Å ablona';
$wb['Advanced'] = 'PokroÄilý';
?>
+
+
diff --git a/interface/web/vm/lib/lang/cz_openvz_template_list.lng b/interface/web/vm/lib/lang/cz_openvz_template_list.lng
index 89c11ef5d1..fc3198560b 100644
--- a/interface/web/vm/lib/lang/cz_openvz_template_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_template_list.lng
@@ -3,3 +3,5 @@ $wb['list_head_txt'] = 'OpenVZ Virtual Machine Template';
$wb['active_txt'] = 'AktivnÃ';
$wb['template_name_txt'] = 'Název šablony';
?>
+
+
diff --git a/interface/web/vm/lib/lang/cz_openvz_vm.lng b/interface/web/vm/lib/lang/cz_openvz_vm.lng
index adfa56f0d5..aeed11933e 100644
--- a/interface/web/vm/lib/lang/cz_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_vm.lng
@@ -38,3 +38,5 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
$wb['Virtual server'] = 'Virtual server';
$wb['Advanced'] = 'PokroÄilý';
?>
+
+
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 1371c4b70e..509764831f 100644
--- a/interface/web/vm/lib/lang/cz_openvz_vm_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_vm_list.lng
@@ -8,3 +8,5 @@ $wb['hostname_txt'] = 'Hostname';
$wb['ip_address_txt'] = 'IP address';
$wb['veid_txt'] = 'VEID';
?>
+
+
diff --git a/interface/web/vm/lib/lang/pl.lng b/interface/web/vm/lib/lang/pl.lng
index 4167e14a8a..5c1ab58229 100644
--- a/interface/web/vm/lib/lang/pl.lng
+++ b/interface/web/vm/lib/lang/pl.lng
@@ -5,3 +5,4 @@ $wb['VM Templates'] = 'VM Templates';
$wb['IP addresses'] = 'IP addresses';
$wb['OpenVZ'] = 'OpenVZ';
?>
+
diff --git a/interface/web/vm/lib/lang/pl_openvz_action.lng b/interface/web/vm/lib/lang/pl_openvz_action.lng
index 52f7328582..71e7263f9d 100644
--- a/interface/web/vm/lib/lang/pl_openvz_action.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_action.lng
@@ -14,3 +14,4 @@ $wb['ostemplate_name_error'] = 'The OSTemplate name conatains unallowed characte
$wb['ostemplate_name_unique_error'] = 'There is already a OSTemplate with that name.';
$wb['ostemplate_exec_txt'] = 'The command to create a OSTemplate has been sent to the host server. It will take several minutes until the OSTemplate has been created.';
?>
+
diff --git a/interface/web/vm/lib/lang/pl_openvz_ip.lng b/interface/web/vm/lib/lang/pl_openvz_ip.lng
index 6016681df8..67f688576a 100644
--- a/interface/web/vm/lib/lang/pl_openvz_ip.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_ip.lng
@@ -7,3 +7,4 @@ $wb['ip_error_wrong'] = 'Please fill in a valid IPv4 address.';
$wb['ip_error_unique'] = 'This IP address does already exist.';
$wb['IP address'] = 'IP address';
?>
+
diff --git a/interface/web/vm/lib/lang/pl_openvz_ip_list.lng b/interface/web/vm/lib/lang/pl_openvz_ip_list.lng
index e6a3a68c2c..365844325e 100644
--- a/interface/web/vm/lib/lang/pl_openvz_ip_list.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_ip_list.lng
@@ -1,7 +1,8 @@
<?php
-$wb['list_head_txt'] = 'OpenVZ IP addresses';
-$wb['server_id_txt'] = 'Server';
-$wb['ip_address_txt'] = 'IP address';
-$wb['reserved_txt'] = 'Reserved';
+$wb['list_head_txt'] = 'Adresy IP OpenVZ';
+$wb['server_id_txt'] = 'Serwer';
+$wb['ip_address_txt'] = 'Adresy IP';
+$wb['reserved_txt'] = 'Zarezerwowany';
$wb['vm_id_txt'] = 'VM';
?>
+
diff --git a/interface/web/vm/lib/lang/pl_openvz_ostemplate.lng b/interface/web/vm/lib/lang/pl_openvz_ostemplate.lng
index 256750f19a..bfeb299088 100644
--- a/interface/web/vm/lib/lang/pl_openvz_ostemplate.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_ostemplate.lng
@@ -9,3 +9,4 @@ $wb['template_name_error_empty'] = 'Template name is empty.';
$wb['template_file_error_empty'] = 'Template filename is empty.';
$wb['Template'] = 'Template';
?>
+
diff --git a/interface/web/vm/lib/lang/pl_openvz_ostemplate_list.lng b/interface/web/vm/lib/lang/pl_openvz_ostemplate_list.lng
index 6471ec0e27..df01680e16 100644
--- a/interface/web/vm/lib/lang/pl_openvz_ostemplate_list.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_ostemplate_list.lng
@@ -6,3 +6,4 @@ $wb['server_id_txt'] = 'Server';
$wb['allservers_txt'] = 'Exists on all servers';
$wb['ostemplate_id_txt'] = 'ID';
?>
+
diff --git a/interface/web/vm/lib/lang/pl_openvz_template.lng b/interface/web/vm/lib/lang/pl_openvz_template.lng
index d285512dca..0887164d39 100644
--- a/interface/web/vm/lib/lang/pl_openvz_template.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_template.lng
@@ -91,3 +91,4 @@ $wb['swappages_error_empty'] = 'Swappages is empty.';
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
?>
+
diff --git a/interface/web/vm/lib/lang/pl_openvz_template_list.lng b/interface/web/vm/lib/lang/pl_openvz_template_list.lng
index de4045c36a..6e4d911c6b 100644
--- a/interface/web/vm/lib/lang/pl_openvz_template_list.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_template_list.lng
@@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'OpenVZ Virtual Machine Template';
$wb['active_txt'] = 'Active';
$wb['template_name_txt'] = 'Template name';
?>
+
diff --git a/interface/web/vm/lib/lang/pl_openvz_vm.lng b/interface/web/vm/lib/lang/pl_openvz_vm.lng
index f2be022dd0..4698fe681b 100644
--- a/interface/web/vm/lib/lang/pl_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_vm.lng
@@ -38,3 +38,4 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
$wb['Virtual server'] = 'Virtual server';
$wb['Advanced'] = 'Advanced';
?>
+
diff --git a/interface/web/vm/lib/lang/pl_openvz_vm_list.lng b/interface/web/vm/lib/lang/pl_openvz_vm_list.lng
index 2238e2b8f4..a534a65f20 100644
--- a/interface/web/vm/lib/lang/pl_openvz_vm_list.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_vm_list.lng
@@ -8,3 +8,4 @@ $wb['hostname_txt'] = 'Hostname';
$wb['ip_address_txt'] = 'IP address';
$wb['veid_txt'] = 'VEID';
?>
+
diff --git a/interface/web/vm/list/openvz_vm.list.php b/interface/web/vm/list/openvz_vm.list.php
index 016165b0f7..81a7c8e1e5 100644
--- a/interface/web/vm/list/openvz_vm.list.php
+++ b/interface/web/vm/list/openvz_vm.list.php
@@ -59,7 +59,7 @@ $liste["item"][] = array( 'field' => "active",
$liste["item"][] = array( 'field' => "veid",
'datatype' => "VARCHAR",
'formtype' => "TEXT",
- 'op' => "==",
+ 'op' => "=",
'prefix' => "",
'suffix' => "",
'width' => "",
diff --git a/interface/web/vm/openvz_vm_list.php b/interface/web/vm/openvz_vm_list.php
index 874feabbfa..02d1651144 100644
--- a/interface/web/vm/openvz_vm_list.php
+++ b/interface/web/vm/openvz_vm_list.php
@@ -47,7 +47,7 @@ $app->auth->check_module_permissions('vm');
$app->uses('listform_actions');
// $app->listform_actions->SQLOrderBy = 'ORDER BY company_name, contact_name, client_id';
-// $app->listform_actions->SQLExtWhere = "limit_client = 0";
+//$app->listform_actions->SQLExtWhere = "";
$app->listform_actions->onLoad();
diff --git a/server/conf/apache_ispconfig.conf.master b/server/conf/apache_ispconfig.conf.master
index bf02a7bc46..5fb0f2c118 100644
--- a/server/conf/apache_ispconfig.conf.master
+++ b/server/conf/apache_ispconfig.conf.master
@@ -67,6 +67,8 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
Alias /awstats-icon "/usr/share/awstats/icon"
+NameVirtualHost *:80
+NameVirtualHost *:443
<tmpl_loop name="ip_adresses">
NameVirtualHost {tmpl_var name="ip_address"}:{tmpl_var name="port"}
</tmpl_loop>
diff --git a/server/conf/nginx_apps.vhost.master b/server/conf/nginx_apps.vhost.master
index fc3f0870ec..9f8ae8806d 100644
--- a/server/conf/nginx_apps.vhost.master
+++ b/server/conf/nginx_apps.vhost.master
@@ -46,7 +46,7 @@ server {
fastcgi_pass unix:{fpm_socket};
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
- fastcgi_param PATH_INFO $fastcgi_script_name;
+ #fastcgi_param PATH_INFO $fastcgi_script_name;
fastcgi_buffer_size 128k;
fastcgi_buffers 256 4k;
fastcgi_busy_buffers_size 256k;
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index e9327eb8bb..cf33b6feb1 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -13,7 +13,11 @@
<tmpl_if name='php' op='==' value='cgi'>
DocumentRoot <tmpl_var name='web_document_root'>
</tmpl_else>
+ <tmpl_if name='php' op='==' value='php-fpm'>
+ DocumentRoot <tmpl_var name='web_document_root'>
+ </tmpl_else>
DocumentRoot <tmpl_var name='web_document_root_www'>
+ </tmpl_if>
</tmpl_if>
</tmpl_if>
@@ -242,10 +246,10 @@
Action php5-fcgi /php5-fcgi
Alias /php5-fcgi {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'}
<tmpl_if name='use_tcp'>
- FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -host 127.0.0.1:<tmpl_var name='fpm_port'> -pass-header Authorization
+ FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -host 127.0.0.1:<tmpl_var name='fpm_port'> -pass-header Authorization
</tmpl_if>
<tmpl_if name='use_socket'>
- FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -socket <tmpl_var name='fpm_socket'> -pass-header Authorization
+ FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -socket <tmpl_var name='fpm_socket'> -pass-header Authorization
</tmpl_if>
</IfModule>
</tmpl_if>
@@ -254,11 +258,11 @@
RewriteEngine on
<tmpl_if name='seo_redirect_enabled'>
RewriteCond %{HTTP_HOST} <tmpl_var name='seo_redirect_operator'>^<tmpl_var name='seo_redirect_origin_domain'>$ [NC]
- RewriteRule ^(.*)$ http://<tmpl_var name='seo_redirect_target_domain'>$1 [R=301,L]
+ RewriteRule ^(.*)$ http<tmpl_if name='ssl_enabled'>s</tmpl_if>://<tmpl_var name='seo_redirect_target_domain'>$1 [R=301,L]
</tmpl_if>
<tmpl_loop name="alias_seo_redirects">
RewriteCond %{HTTP_HOST} <tmpl_var name='alias_seo_redirect_operator'>^<tmpl_var name='alias_seo_redirect_origin_domain'>$ [NC]
- RewriteRule ^(.*)$ http://<tmpl_var name='alias_seo_redirect_target_domain'>$1 [R=301,L]
+ RewriteRule ^(.*)$ http<tmpl_if name='ssl_enabled'>s</tmpl_if>://<tmpl_var name='alias_seo_redirect_target_domain'>$1 [R=301,L]
</tmpl_loop>
<tmpl_loop name="redirects">
RewriteCond %{HTTP_HOST} <tmpl_var name='rewrite_domain'>$ [NC]
diff --git a/server/lib/classes/aps_installer.inc.php b/server/lib/classes/aps_installer.inc.php
index 5a5c326363..39f71ce51a 100644
--- a/server/lib/classes/aps_installer.inc.php
+++ b/server/lib/classes/aps_installer.inc.php
@@ -445,6 +445,11 @@ class ApsInstaller extends ApsBase
$this->file_owner_user = $owner_res['system_user'];
$this->file_owner_group = $owner_res['system_group'];
exec('chown -R '.$this->file_owner_user.':'.$this->file_owner_group.' '.escapeshellarg($this->local_installpath));
+
+ //* Chown stats directory back
+ if(is_dir($this->local_installpath.'stats')) {
+ exec('chown -R root:root '.escapeshellarg($this->local_installpath.'stats'));
+ }
}
}
catch(Exception $e)
@@ -579,6 +584,11 @@ class ApsInstaller extends ApsBase
// The install succeeded, chown newly created files too
exec('chown -R '.$this->file_owner_user.':'.$this->file_owner_group.' '.escapeshellarg($this->local_installpath));
+ //* Chown stats directory back
+ if(is_dir($this->local_installpath.'stats')) {
+ exec('chown -R root:root '.escapeshellarg($this->local_installpath.'stats'));
+ }
+
$app->dbmaster->query('UPDATE aps_instances SET instance_status = "'.INSTANCE_SUCCESS.'"
WHERE id = "'.$app->db->quote($task['instance_id']).'";');
}
@@ -707,4 +717,4 @@ class ApsInstaller extends ApsBase
unset($sxe);
}
}
-?>
\ No newline at end of file
+?>
diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
index 09d6640e11..2974da09c9 100644
--- a/server/lib/classes/db_mysql.inc.php
+++ b/server/lib/classes/db_mysql.inc.php
@@ -61,7 +61,8 @@ class db extends mysqli
parent::__construct($this->dbHost, $this->dbUser, $this->dbPass,$this->dbName);
$try = 0;
- while(!is_null($this->connect_error) && $try < 10) {
+ //while(!is_null($this->connect_error) && $try < 10) {
+ while(mysqli_connect_error() && $try < 10) {
if($try > 8) sleep(5);
elseif($try > 0) sleep(1);
@@ -71,7 +72,8 @@ class db extends mysqli
parent::__construct($this->dbHost, $this->dbUser, $this->dbPass,$this->dbName);
}
- if(is_null($this->connect_error)) $this->isConnected = true;
+ //if(is_null($this->connect_error)) $this->isConnected = true;
+ if(!mysqli_connect_error()) $this->isConnected = true;
$this->setCharacterEncoding();
}
@@ -89,6 +91,7 @@ class db extends mysqli
public function updateError($location) {
global $app;
+ /*
if(!is_null($this->connect_error)) {
$this->errorNumber = $this->connect_errno;
$this->errorMessage = $this->connect_error;
@@ -96,6 +99,14 @@ class db extends mysqli
$this->errorNumber = $this->errno;
$this->errorMessage = $this->error;
}
+ */
+ if(mysqli_connect_error()) {
+ $this->errorNumber = mysqli_connect_errno();
+ $this->errorMessage = mysqli_connect_error();
+ } else {
+ $this->errorNumber = mysqli_errno($this);
+ $this->errorMessage = mysqli_error($this);
+ }
$this->errorLocation = $location;
if($this->errorNumber) {
diff --git a/server/lib/classes/plugins.inc.php b/server/lib/classes/plugins.inc.php
index afef438ba6..d13317edba 100644
--- a/server/lib/classes/plugins.inc.php
+++ b/server/lib/classes/plugins.inc.php
@@ -43,7 +43,7 @@ class plugins {
global $app,$conf;
$subPath = 'plugins-enabled';
- if ($type == 'core') $subPath = 'plugins-core';
+ //if ($type == 'core') $subPath = 'plugins-core';
$plugins_dir = $conf['rootpath'].$conf['fs_div'].$subPath.$conf['fs_div'];
$tmp_plugins = array();
diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php
index 07bcc64f05..1de54e29ff 100644
--- a/server/lib/classes/system.inc.php
+++ b/server/lib/classes/system.inc.php
@@ -1539,7 +1539,8 @@ class system{
}
function is_mounted($mountpoint){
- $cmd = 'df 2>/dev/null | grep " '.$mountpoint.'$"';
+ //$cmd = 'df 2>/dev/null | grep " '.$mountpoint.'$"';
+ $cmd = 'mount 2>/dev/null | grep " on '.$mountpoint.' type "';
exec($cmd, $output, $return_var);
return $return_var == 0 ? true : false;
}
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 99ba79b395..8df1dcf97e 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -551,7 +551,7 @@ class apache2_plugin {
exec('chown --recursive --from='.escapeshellcmd($data['old']['system_user']).':'.escapeshellcmd($data['old']['system_group']).' '.escapeshellcmd($data['new']['system_user']).':'.escapeshellcmd($data['new']['system_group']).' '.$new_dir);
//* Change the home directory and group of the website user
- $command = 'killall -u '.escapeshellcmd($data['new']['system_user']).' && usermod';
+ $command = 'killall -u '.escapeshellcmd($data['new']['system_user']).' ; usermod';
$command .= ' --home '.escapeshellcmd($data['new']['document_root']);
$command .= ' --gid '.escapeshellcmd($data['new']['system_group']);
$command .= ' '.escapeshellcmd($data['new']['system_user']).' 2>/dev/null';
@@ -740,8 +740,8 @@ class apache2_plugin {
exec('chown -R '.$data['new']['system_user'].':'.$data['new']['system_group'].' '.$error_page_path);
} // end copy error docs
- // Set the quota for the user
- if($username != '' && $app->system->is_user($username)) {
+ // Set the quota for the user, but only for vhosts, not vhostsubdomains
+ if($username != '' && $app->system->is_user($username) && $data['new']['type'] == 'vhost') {
if($data['new']['hd_quota'] > 0) {
$blocks_soft = $data['new']['hd_quota'] * 1024;
$blocks_hard = $blocks_soft + 1024;
@@ -911,6 +911,15 @@ class apache2_plugin {
if(!stristr($data['new']['custom_php_ini'],'open_basedir') && $data['new']['php'] == 'suphp') {
$data['new']['custom_php_ini'] .= "\nopen_basedir = '".$data['new']['php_open_basedir']."'\n";
}
+
+ $fastcgi_config = $app->getconf->get_server_config($conf['server_id'], 'fastcgi');
+
+ if(trim($data['new']['fastcgi_php_version']) != ''){
+ list($custom_fastcgi_php_name, $custom_fastcgi_php_executable, $custom_fastcgi_php_ini_dir) = explode(':', trim($data['new']['fastcgi_php_version']));
+ if(is_file($custom_fastcgi_php_ini_dir)) $custom_fastcgi_php_ini_dir = dirname($custom_fastcgi_php_ini_dir);
+ if(substr($custom_fastcgi_php_ini_dir,-1) == '/') $custom_fastcgi_php_ini_dir = substr($custom_fastcgi_php_ini_dir,0,-1);
+ }
+
//* Create custom php.ini
if(trim($data['new']['custom_php_ini']) != '') {
$has_custom_php_ini = true;
@@ -919,8 +928,14 @@ class apache2_plugin {
if($data['new']['php'] == 'mod') {
$master_php_ini_path = $web_config['php_ini_path_apache'];
} else {
- if($data["new"]['php'] == 'fast-cgi' && file_exists($fastcgi_config["fastcgi_phpini_path"])) {
- $master_php_ini_path = $fastcgi_config["fastcgi_phpini_path"];
+ if($data["new"]['php'] == 'fast-cgi') {
+ if(trim($data['new']['fastcgi_php_version']) != '' && file_exists($custom_fastcgi_php_ini_dir)){
+ $master_php_ini_path = $custom_fastcgi_php_ini_dir;
+ } elseif(file_exists($fastcgi_config["fastcgi_phpini_path"])){
+ $master_php_ini_path = $fastcgi_config["fastcgi_phpini_path"];
+ } else {
+ $master_php_ini_path = $web_config['php_ini_path_cgi'];
+ }
} else {
$master_php_ini_path = $web_config['php_ini_path_cgi'];
}
@@ -1190,7 +1205,6 @@ class apache2_plugin {
*/
if ($data['new']['php'] == 'fast-cgi') {
- $fastcgi_config = $app->getconf->get_server_config($conf['server_id'], 'fastcgi');
$fastcgi_starter_path = str_replace('[system_user]',$data['new']['system_user'],$fastcgi_config['fastcgi_starter_path']);
$fastcgi_starter_path = str_replace('[client_id]',$client_id,$fastcgi_starter_path);
@@ -1213,8 +1227,6 @@ class apache2_plugin {
// Support for multiple PHP versions (FastCGI)
if(trim($data['new']['fastcgi_php_version']) != ''){
$default_fastcgi_php = false;
- list($custom_fastcgi_php_name, $custom_fastcgi_php_executable, $custom_fastcgi_php_ini_dir) = explode(':', trim($data['new']['fastcgi_php_version']));
- if(is_file($custom_fastcgi_php_ini_dir)) $custom_fastcgi_php_ini_dir = dirname($custom_fastcgi_php_ini_dir);
if(substr($custom_fastcgi_php_ini_dir,-1) != '/') $custom_fastcgi_php_ini_dir .= '/';
} else {
$default_fastcgi_php = true;
@@ -1261,7 +1273,6 @@ class apache2_plugin {
} else {
//remove the php fastgi starter script if available
if ($data['old']['php'] == 'fast-cgi') {
- $fastcgi_config = $app->getconf->get_server_config($conf['server_id'], 'fastcgi');
$fastcgi_starter_path = str_replace('[system_user]',$data['old']['system_user'],$fastcgi_config['fastcgi_starter_path']);
$fastcgi_starter_path = str_replace('[client_id]',$client_id,$fastcgi_starter_path);
if($data['old']['type'] == 'vhost') {
@@ -1407,9 +1418,15 @@ class apache2_plugin {
if($data['new']['ssl_domain'] != '' && $data['new']['ssl'] == 'y' && @is_file($crt_file) && @is_file($key_file) && (@filesize($crt_file)>0) && (@filesize($key_file)>0)) {
$tmp_vhost_arr = array('ip_address' => $data['new']['ip_address'], 'ssl_enabled' => 1, 'port' => '443');
if(count($rewrite_rules) > 0) $tmp_vhost_arr = $tmp_vhost_arr + array('redirects' => $rewrite_rules);
- if(count($alias_seo_redirects) > 0) $tmp_vhost_arr = $tmp_vhost_arr + array('alias_seo_redirects' => $alias_seo_redirects);
+ $ipv4_ssl_alias_seo_redirects = $alias_seo_redirects;
+ if(is_array($ipv4_ssl_alias_seo_redirects) && !empty($ipv4_ssl_alias_seo_redirects)){
+ for($i=0;$i<count($ipv4_ssl_alias_seo_redirects);$i++){
+ $ipv4_ssl_alias_seo_redirects[$i]['ssl_enabled'] = 1;
+ }
+ }
+ if(count($ipv4_ssl_alias_seo_redirects) > 0) $tmp_vhost_arr = $tmp_vhost_arr + array('alias_seo_redirects' => $ipv4_ssl_alias_seo_redirects);
$vhosts[] = $tmp_vhost_arr;
- unset($tmp_vhost_arr);
+ unset($tmp_vhost_arr, $ipv4_ssl_alias_seo_redirects);
$app->log('Enable SSL for: '.$domain,LOGLEVEL_DEBUG);
}
@@ -1437,9 +1454,15 @@ class apache2_plugin {
if($data['new']['ssl_domain'] != '' && $data['new']['ssl'] == 'y' && @is_file($crt_file) && @is_file($key_file) && (@filesize($crt_file)>0) && (@filesize($key_file)>0)) {
$tmp_vhost_arr = array('ip_address' => '['.$data['new']['ipv6_address'].']', 'ssl_enabled' => 1, 'port' => '443');
if(count($rewrite_rules) > 0) $tmp_vhost_arr = $tmp_vhost_arr + array('redirects' => $rewrite_rules);
- if(count($alias_seo_redirects) > 0) $tmp_vhost_arr = $tmp_vhost_arr + array('alias_seo_redirects' => $alias_seo_redirects);
+ $ipv6_ssl_alias_seo_redirects = $alias_seo_redirects;
+ if(is_array($ipv6_ssl_alias_seo_redirects) && !empty($ipv6_ssl_alias_seo_redirects)){
+ for($i=0;$i<count($ipv6_ssl_alias_seo_redirects);$i++){
+ $ipv6_ssl_alias_seo_redirects[$i]['ssl_enabled'] = 1;
+ }
+ }
+ if(count($ipv6_ssl_alias_seo_redirects) > 0) $tmp_vhost_arr = $tmp_vhost_arr + array('alias_seo_redirects' => $ipv6_ssl_alias_seo_redirects);
$vhosts[] = $tmp_vhost_arr;
- unset($tmp_vhost_arr);
+ unset($tmp_vhost_arr, $ipv6_ssl_alias_seo_redirects);
$app->log('Enable SSL for IPv6: '.$domain,LOGLEVEL_DEBUG);
}
}
@@ -1510,13 +1533,13 @@ class apache2_plugin {
}
//* Create .htaccess and .htpasswd file for website statistics
- if(!is_file($data['new']['document_root'].'/' . $web_folder . '/stats/.htaccess') or $data['old']['document_root'] != $data['new']['document_root']) {
- if(!is_dir($data['new']['document_root'].'/' . $web_folder . '/stats')) $app->system->mkdir($data['new']['document_root'].'/' . $web_folder . '/stats');
- $ht_file = "AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$data['new']['document_root']."/web/stats/.htpasswd_stats\nrequire valid-user";
- $app->system->file_put_contents($data['new']['document_root'].'/' . $web_folder . '/stats/.htaccess',$ht_file);
- $app->system->chmod($data['new']['document_root'].'/' . $web_folder . '/stats/.htaccess',0755);
- unset($ht_file);
- }
+ //if(!is_file($data['new']['document_root'].'/' . $web_folder . '/stats/.htaccess') or $data['old']['document_root'] != $data['new']['document_root']) {
+ if(!is_dir($data['new']['document_root'].'/' . $web_folder . '/stats')) $app->system->mkdir($data['new']['document_root'].'/' . $web_folder . '/stats');
+ $ht_file = "AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$data['new']['document_root']."/web/stats/.htpasswd_stats\nrequire valid-user";
+ $app->system->file_put_contents($data['new']['document_root'].'/' . $web_folder . '/stats/.htaccess',$ht_file);
+ $app->system->chmod($data['new']['document_root'].'/' . $web_folder . '/stats/.htaccess',0755);
+ unset($ht_file);
+ //}
if(!is_file($data['new']['document_root'].'/web/stats/.htpasswd_stats') || $data['new']['stats_password'] != $data['old']['stats_password']) {
if(trim($data['new']['stats_password']) != '') {
@@ -1641,6 +1664,7 @@ class apache2_plugin {
$app->uses('getconf');
$app->uses('system');
$web_config = $app->getconf->get_server_config($conf['server_id'], 'web');
+ $fastcgi_config = $app->getconf->get_server_config($conf['server_id'], 'fastcgi');
if($data['old']['type'] == 'vhost' || $data['old']['type'] == 'vhostsubdomain') $app->system->web_folder_protection($data['old']['document_root'],false);
@@ -1703,10 +1727,12 @@ class apache2_plugin {
if($data['old']['type'] == 'vhost' || $data['old']['type'] == 'vhostsubdomain'){
if(is_array($log_folders) && !empty($log_folders)){
foreach($log_folders as $log_folder){
- if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder));
+ //if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder));
+ exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
}
} else {
- if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder));
+ //if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder));
+ exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
}
}
@@ -1820,13 +1846,13 @@ class apache2_plugin {
//remove the php fastgi starter script if available
if ($data['old']['php'] == 'fast-cgi') {
- $fastcgi_starter_path = str_replace('[system_user]',$data['old']['system_user'],$web_config['fastcgi_starter_path']);
+ $fastcgi_starter_path = str_replace('[system_user]',$data['old']['system_user'],$fastcgi_config['fastcgi_starter_path']);
if($data['old']['type'] == 'vhost') {
if (is_dir($fastcgi_starter_path)) {
exec('rm -rf '.$fastcgi_starter_path);
}
} else {
- $fcgi_starter_script = $fastcgi_starter_path.$web_config['fastcgi_starter_script'].'_web'.$data['old']['domain_id'];
+ $fcgi_starter_script = $fastcgi_starter_path.$fastcgi_config['fastcgi_starter_script'].'_web'.$data['old']['domain_id'];
if (file_exists($fcgi_starter_script)) {
exec('rm -f '.$fcgi_starter_script);
}
@@ -1886,7 +1912,7 @@ class apache2_plugin {
if($data['old']['type'] == 'vhost') {
//delete the web user
- $command = 'killall -u '.escapeshellcmd($data['old']['system_user']).' && userdel';
+ $command = 'killall -u '.escapeshellcmd($data['old']['system_user']).' ; userdel';
$command .= ' '.escapeshellcmd($data['old']['system_user']);
exec($command);
if($apache_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' '.$command);
diff --git a/server/plugins-available/apps_vhost_plugin.inc.php b/server/plugins-available/apps_vhost_plugin.inc.php
index f954e45e6e..3cec452c17 100644
--- a/server/plugins-available/apps_vhost_plugin.inc.php
+++ b/server/plugins-available/apps_vhost_plugin.inc.php
@@ -81,7 +81,12 @@ class apps_vhost_plugin {
if($web_config['server_type'] == 'apache'){
// Dont just copy over the virtualhost template but add some custom settings
- $content = file_get_contents($conf["rootpath"]."/conf/apache_apps.vhost.master");
+ if(file_exists($conf["rootpath"]."/conf-custom/apache_apps.vhost.master")) {
+ $content = file_get_contents($conf["rootpath"]."/conf-custom/apache_apps.vhost.master");
+ } else {
+ $content = file_get_contents($conf["rootpath"]."/conf/apache_apps.vhost.master");
+ }
+
$vhost_conf_dir = $web_config['vhost_conf_dir'];
$vhost_conf_enabled_dir = $web_config['vhost_conf_enabled_dir'];
@@ -110,7 +115,11 @@ class apps_vhost_plugin {
if($web_config['server_type'] == 'nginx'){
// Dont just copy over the virtualhost template but add some custom settings
- $content = file_get_contents($conf["rootpath"]."/conf/nginx_apps.vhost.master");
+ if(file_exists($conf["rootpath"]."/conf-custom/nginx_apps.vhost.master")) {
+ $content = file_get_contents($conf["rootpath"]."/conf-custom/nginx_apps.vhost.master");
+ } else {
+ $content = file_get_contents($conf["rootpath"]."/conf/nginx_apps.vhost.master");
+ }
$vhost_conf_dir = $web_config['nginx_vhost_conf_dir'];
$vhost_conf_enabled_dir = $web_config['nginx_vhost_conf_enabled_dir'];
@@ -153,7 +162,12 @@ class apps_vhost_plugin {
// PHP-FPM
// Dont just copy over the php-fpm pool template but add some custom settings
- $fpm_content = file_get_contents($conf["rootpath"]."/conf/apps_php_fpm_pool.conf.master");
+ if(file_exists($conf["rootpath"]."/conf-custom/apps_php_fpm_pool.conf.master")) {
+ $fpm_content = file_get_contents($conf["rootpath"]."/conf-custom/apps_php_fpm_pool.conf.master");
+ } else {
+ $fpm_content = file_get_contents($conf["rootpath"]."/conf/apps_php_fpm_pool.conf.master");
+ }
+
$fpm_content = str_replace('{fpm_pool}', 'apps', $fpm_content);
//$fpm_content = str_replace('{fpm_port}', $web_config['php_fpm_start_port']+1, $fpm_content);
$fpm_content = str_replace('{fpm_socket}', $fpm_socket, $fpm_content);
diff --git a/server/plugins-available/backup_plugin.inc.php b/server/plugins-available/backup_plugin.inc.php
index 3727f82730..78be959e6d 100644
--- a/server/plugins-available/backup_plugin.inc.php
+++ b/server/plugins-available/backup_plugin.inc.php
@@ -87,8 +87,10 @@ class backup_plugin {
include('lib/mysql_clientdb.conf');
if(file_exists($backup_dir.'/'.$backup['filename'])) {
- $parts = explode('_',$backup['filename']);
- $db_name = $parts[1];
+ //$parts = explode('_',$backup['filename']);
+ //$db_name = $parts[1];
+ preg_match('@^db_(.+)_\d{4}-\d{2}-\d{2}_\d{2}-\d{2}\.sql\.gz$@', $backup['filename'], $matches);
+ $db_name = $matches[1];
$command = "gunzip --stdout ".escapeshellarg($backup_dir.'/'.$backup['filename'])." | mysql -h '".escapeshellcmd($clientdb_host)."' -u '".escapeshellcmd($clientdb_user)."' -p'".escapeshellcmd($clientdb_password)."' '".$db_name."'";
exec($command);
}
diff --git a/server/plugins-available/bind_dlz_plugin.inc.php b/server/plugins-available/bind_dlz_plugin.inc.php
index b0ca8704e6..28aff946c9 100644
--- a/server/plugins-available/bind_dlz_plugin.inc.php
+++ b/server/plugins-available/bind_dlz_plugin.inc.php
@@ -125,13 +125,13 @@ class bind_dlz_plugin {
$ttl = $data["new"]["ttl"];
- $_db = clone $app->db;
- $_db->dbName = 'named';
+ //$_db = clone $app->db;
+ //$_db->dbName = 'named';
- $_db->query("INSERT INTO records (zone, ttl, type, primary_ns, resp_contact, serial, refresh, retry, expire, minimum, ispconfig_id) VALUES ".
+ $app->db->query("INSERT INTO named.records (zone, ttl, type, primary_ns, resp_contact, serial, refresh, retry, expire, minimum, ispconfig_id) VALUES ".
"('$origin', $ttl, 'SOA', '{$data["new"]["ns"]}', '{$data["new"]["mbox"]}', '{$serial["serial"]}', '{$serial["refresh"]}'," .
"'{$serial["retry"]}', '{$serial["expire"]}', '{$serial["minimum"]}', $ispconfig_id)");
- unset($_db);
+ //unset($_db);
}
function soa_update($event_name,$data)
@@ -153,13 +153,13 @@ class bind_dlz_plugin {
$ttl = $data["new"]["ttl"];
- $_db = clone $app->db;
- $_db->dbName = 'named';
+ //$_db = clone $app->db;
+ //$_db->dbName = 'named';
- $_db->query("UPDATE records SET zone = '$origin', ttl = $ttl, primary_ns = '{$data["new"]["ns"]}', resp_contact = '{$data["new"]["mbox"]}', ".
+ $app->db->query("UPDATE named.records SET zone = '$origin', ttl = $ttl, primary_ns = '{$data["new"]["ns"]}', resp_contact = '{$data["new"]["mbox"]}', ".
"serial = '{$serial["serial"]}', refresh = '{$serial["refresh"]}', retry = '{$serial["retry"]}', expire = '{$serial["expire"]}', ".
"minimum = '{$serial["minimum"]}' WHERE ispconfig_id = ".$data["new"]["id"]." AND type = 'SOA'");
- unset($_db);
+ //unset($_db);
}
else
{
@@ -185,11 +185,11 @@ class bind_dlz_plugin {
{
global $app, $conf;
- $_db = clone $app->db;
- $_db->dbName = 'named';
+ //$_db = clone $app->db;
+ //$_db->dbName = 'named';
- $_db->query("DELETE FROM records WHERE ispconfig_id = {$data["old"]["id"]}");
- unset($_db);
+ $app->db->query("DELETE FROM named.records WHERE ispconfig_id = {$data["old"]["id"]}");
+ //unset($_db);
}
function rr_insert($event_name,$data)
@@ -246,18 +246,18 @@ class bind_dlz_plugin {
$ttl = $data["new"]["ttl"];
- $_db = clone $app->db;
- $_db->dbName = 'named';
+ //$_db = clone $app->db;
+ //$_db->dbName = 'named';
if ($type == 'MX') {
- $_db->query("INSERT INTO records (zone, ttl, type, host, mx_priority, data, ispconfig_id)".
+ $app->db->query("INSERT INTO named.records (zone, ttl, type, host, mx_priority, data, ispconfig_id)".
" VALUES ('$origin', $ttl, '$type', '$name', {$data["new"]["aux"]}, '$content', $ispconfig_id)");
} else {
- $_db->query("INSERT INTO records (zone, ttl, type, host, data, ispconfig_id)".
+ $app->db->query("INSERT INTO named.records (zone, ttl, type, host, data, ispconfig_id)".
" VALUES ('$origin', $ttl, '$type', '$name', '$content', $ispconfig_id)");
}
- unset($_db);
+ //unset($_db);
}
function rr_update($event_name,$data)
@@ -321,18 +321,18 @@ class bind_dlz_plugin {
$ttl = $data["new"]["ttl"];
$prio = (int)$data["new"]["aux"];
- $_db = clone $app->db;
- $_db->dbName = 'named';
+ //$_db = clone $app->db;
+ //$_db->dbName = 'named';
if ($type == 'MX') {
- $_db->query("UPDATE records SET zone = '$origin', ttl = $ttl, type = '$type', host = '$name', mx_priority = $prio, ".
+ $app->db->query("UPDATE named.records SET zone = '$origin', ttl = $ttl, type = '$type', host = '$name', mx_priority = $prio, ".
"data = '$content' WHERE ispconfig_id = $ispconfig_id AND type != 'SOA'");
} else {
- $_db->query("UPDATE records SET zone = '$origin', ttl = $ttl, type = '$type', host = '$name', ".
+ $app->db->query("UPDATE named.records SET zone = '$origin', ttl = $ttl, type = '$type', host = '$name', ".
"data = '$content' WHERE ispconfig_id = $ispconfig_id AND type != 'SOA'");
}
- unset($_db);
+ //unset($_db);
} else {
$this->rr_insert($event_name,$data);
}
@@ -342,11 +342,11 @@ class bind_dlz_plugin {
function rr_delete($event_name,$data) {
global $app, $conf;
- $_db = clone $app->db;
- $_db->dbName = 'named';
+ //$_db = clone $app->db;
+ //$_db->dbName = 'named';
- $_db->query("DELETE FROM named.records WHERE ispconfig_id = {$data["old"]["id"]} AND type != 'SOA'");
- unset($_db);
+ $app->db->query("DELETE FROM named.records WHERE ispconfig_id = {$data["old"]["id"]} AND type != 'SOA'");
+ //unset($_db);
}
} // end class
?>
diff --git a/server/plugins-available/bind_plugin.inc.php b/server/plugins-available/bind_plugin.inc.php
index 49ca191ed5..e4f6e6c86f 100644
--- a/server/plugins-available/bind_plugin.inc.php
+++ b/server/plugins-available/bind_plugin.inc.php
@@ -141,10 +141,10 @@ class bind_plugin {
if($data['old']['origin'] != $data['new']['origin']) {
//TODO : change this when distribution information has been integrated into server record
if (file_exists('/etc/gentoo-release')) {
- $filename = $dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_", substr($zone['origin'],0,-1));
+ $filename = $dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_", substr($data['old']['origin'],0,-1));
}
else {
- $filename = $dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_", substr($zone['origin'],0,-1));
+ $filename = $dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_", substr($data['old']['origin'],0,-1));
}
if(is_file($filename)) unlink($filename);
diff --git a/server/plugins-available/ftpuser_base_plugin.inc.php b/server/plugins-available/ftpuser_base_plugin.inc.php
index 8cd2aa2dc1..1b4a016a8c 100644
--- a/server/plugins-available/ftpuser_base_plugin.inc.php
+++ b/server/plugins-available/ftpuser_base_plugin.inc.php
@@ -75,15 +75,15 @@ class ftpuser_base_plugin {
$web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".intval($data['new']['parent_domain_id']));
//* Check if the resulting path is inside the docroot
- if(substr(realpath($data['new']['dir']),0,strlen($web['document_root'])) != $web['document_root']) {
+ if(substr($data['new']['dir'],0,strlen($web['document_root'])) != $web['document_root']) {
$app->log('User dir is outside of docroot.',LOGLEVEL_WARN);
return false;
}
exec('mkdir -p '.escapeshellcmd($data['new']['dir']));
exec('chown '.escapeshellcmd($web["system_user"]).':'.escapeshellcmd($web['system_group']).' '.$data['new']['dir']);
-
- $app->log("Added ftpuser_dir: ".$data['new']['dir'],LOGLEVEL_DEBUG);
+
+ $app->log("Added ftpuser_dir: ".$data['new']['dir'],LOGLEVEL_DEBUG);
}
}
@@ -97,7 +97,7 @@ class ftpuser_base_plugin {
$web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".intval($data['new']['parent_domain_id']));
//* Check if the resulting path is inside the docroot
- if(substr(realpath($data['new']['dir']),0,strlen($web['document_root'])) != $web['document_root']) {
+ if(substr($data['new']['dir'],0,strlen($web['document_root'])) != $web['document_root']) {
$app->log('User dir is outside of docroot.',LOGLEVEL_WARN);
return false;
}
diff --git a/server/plugins-available/maildeliver_plugin.inc.php b/server/plugins-available/maildeliver_plugin.inc.php
index 5dbc65ebd3..6d55dd32bf 100644
--- a/server/plugins-available/maildeliver_plugin.inc.php
+++ b/server/plugins-available/maildeliver_plugin.inc.php
@@ -167,19 +167,30 @@ class maildeliver_plugin {
}
}
+ $app->log("Found " . count($addresses) . " addresses.",LOGLEVEL_DEBUG);
+
+ $alias_addresses = array();
+
$email_parts = explode('@',$data["new"]["email"]);
$sql = "SELECT * FROM mail_forwarding WHERE type = 'aliasdomain' AND destination = '@".$app->db->quote($email_parts[1])."'";
$records = $app->db->queryAllRecords($sql);
if(is_array($records) && count($records) > 0) {
+ $app->log("Found " . count($records) . " records (aliasdomains).",LOGLEVEL_DEBUG);
foreach($records as $rec) {
$aliasdomain = substr($rec['source'],1);
foreach($addresses as $email) {
$email_parts = explode('@',$email);
- $addresses[] = $email_parts[0].'@'.$aliasdomain;
+ $alias_addresses[] = $email_parts[0].'@'.$aliasdomain;
}
}
}
+ $app->log("Found " . count($addresses) . " addresses at all.",LOGLEVEL_DEBUG);
+
+ $addresses = array_unique(array_merge($addresses, $alias_addresses));
+
+ $app->log("Found " . count($addresses) . " unique addresses at all.",LOGLEVEL_DEBUG);
+
$address_str = '';
if(is_array($addresses) && count($addresses) > 0) {
$address_str .= ':addresses [';
diff --git a/server/plugins-available/mysql_clientdb_plugin.inc.php b/server/plugins-available/mysql_clientdb_plugin.inc.php
index ce6bb5ab19..7fa2b7b232 100644
--- a/server/plugins-available/mysql_clientdb_plugin.inc.php
+++ b/server/plugins-available/mysql_clientdb_plugin.inc.php
@@ -122,6 +122,47 @@ class mysql_clientdb_plugin {
return $success;
}
+
+ function drop_or_revoke_user($database_id, $user_id, $host_list){
+ global $app;
+
+ // set to all hosts if none given
+ if(trim($host_list) == '') $host_list = '%';
+
+ $db_user_databases = $app->db->queryAllRecords("SELECT * FROM web_database WHERE (database_user_id = ".$user_id." OR database_ro_user_id = ".$user_id.") AND active = 'y' AND database_id != ".$database_id);
+ $db_user_host_list = array();
+ if(is_array($db_user_databases) && !empty($db_user_databases)){
+ foreach($db_user_databases as $db_user_database){
+ if($db_user_database['remote_access'] == 'y'){
+ if($db_user_database['remote_ips'] == ''){
+ $db_user_host_list[] = '%';
+ } else {
+ $tmp_remote_ips = explode(',', $db_user_database['remote_ips']);
+ if(is_array($tmp_remote_ips) && !empty($tmp_remote_ips)){
+ foreach($tmp_remote_ips as $tmp_remote_ip){
+ $tmp_remote_ip = trim($tmp_remote_ip);
+ if($tmp_remote_ip != '') $db_user_host_list[] = $tmp_remote_ip;
+ }
+ }
+ unset($tmp_remote_ips);
+ }
+ }
+ $db_user_host_list[] = 'localhost';
+ }
+ }
+ $host_list_arr = explode(',', $host_list);
+ //print_r($host_list_arr);
+ $drop_hosts = array_diff($host_list_arr, $db_user_host_list);
+ //print_r($drop_hosts);
+ $revoke_hosts = array_diff($host_list_arr, $drop_hosts);
+ //print_r($revoke_hosts);
+
+ $drop_host_list = implode(',', $drop_hosts);
+ $revoke_host_list = implode(',', $revoke_hosts);
+ //echo $drop_host_list."\n";
+ //echo $revoke_host_list."\n";
+ return array('revoke_hosts' => $revoke_host_list, 'drop_hosts' => $drop_host_list);
+ }
function db_insert($event_name,$data) {
global $app, $conf;
@@ -188,6 +229,9 @@ class mysql_clientdb_plugin {
function db_update($event_name,$data) {
global $app, $conf;
+ // skip processing if database was and is inactive
+ if($data['new']['active'] == 'n' && $data['old']['active'] == 'n') return;
+
if($data['new']['type'] == 'mysql') {
if(!include(ISPC_LIB_PATH.'/mysql_clientdb.conf')) {
$app->log('Unable to open'.ISPC_LIB_PATH.'/mysql_clientdb.conf',LOGLEVEL_ERROR);
@@ -213,6 +257,15 @@ class mysql_clientdb_plugin {
}
if($host_list != '') $host_list .= ',';
$host_list .= 'localhost';
+
+ // REVOKES and DROPS have to be done on old host list, not new host list
+ $old_host_list = '';
+ if($data['old']['remote_access'] == 'y') {
+ $old_host_list = $data['old']['remote_ips'];
+ if($old_host_list == '') $old_host_list = '%';
+ }
+ if($old_host_list != '') $old_host_list .= ',';
+ $old_host_list .= 'localhost';
// Create the database user if database was disabled before
if($data['new']['active'] == 'y' && $data['old']['active'] == 'n') {
@@ -226,13 +279,36 @@ class mysql_clientdb_plugin {
}
} else if($data['new']['active'] == 'n' && $data['old']['active'] == 'y') { // revoke database user, if inactive
if($db_user) {
- if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING);
- else $this->process_host_list('REVOKE', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $host_list, $link);
+ if($db_user['database_user'] == 'root'){
+ $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING);
+ } else {
+ // Find out users to drop and users to revoke
+ $drop_or_revoke_user = $this->drop_or_revoke_user($data['new']['database_id'], $data['new']['database_user_id'], $old_host_list);
+ if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link);
+ if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link);
+
+
+ //$this->process_host_list('DROP', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $old_host_list, $link);
+ //$this->process_host_list('REVOKE', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $old_host_list, $link);
+ }
}
if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) {
- if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING);
- else $this->process_host_list('REVOKE', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $host_list, $link);
+ if($db_ro_user['database_user'] == 'root'){
+ $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING);
+ } else {
+ // Find out users to drop and users to revoke
+ $drop_or_revoke_user = $this->drop_or_revoke_user($data['new']['database_id'], $data['new']['database_ro_user_id'], $old_host_list);
+ if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link);
+ if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link);
+
+ //$this->process_host_list('DROP', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $old_host_list, $link);
+ //$this->process_host_list('REVOKE', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $old_host_list, $link);
+ }
}
+ // Database is not active, so stop processing here
+ $link->query('FLUSH PRIVILEGES;');
+ $link->close();
+ return;
}
//* selected Users have changed
@@ -240,8 +316,17 @@ class mysql_clientdb_plugin {
if($data['old']['database_user_id'] && $data['old']['database_user_id'] != $data['new']['database_ro_user_id']) {
$old_db_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = '" . intval($data['old']['database_user_id']) . "'");
if($old_db_user) {
- if($old_db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING);
- else $this->process_host_list('REVOKE', $data['new']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $host_list, $link);
+ if($old_db_user['database_user'] == 'root'){
+ $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING);
+ } else {
+ // Find out users to drop and users to revoke
+ $drop_or_revoke_user = $this->drop_or_revoke_user($data['new']['database_id'], $data['old']['database_user_id'], $old_host_list);
+ if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['new']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link);
+ if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['new']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link);
+
+ //$this->process_host_list('DROP', $data['new']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $old_host_list, $link);
+ //$this->process_host_list('REVOKE', $data['new']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $old_host_list, $link);
+ }
}
}
if($db_user) {
@@ -253,8 +338,17 @@ class mysql_clientdb_plugin {
if($data['old']['database_ro_user_id'] && $data['old']['database_ro_user_id'] != $data['new']['database_user_id']) {
$old_db_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = '" . intval($data['old']['database_ro_user_id']) . "'");
if($old_db_user) {
- if($old_db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING);
- else $this->process_host_list('REVOKE', $data['new']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $host_list, $link);
+ if($old_db_user['database_user'] == 'root'){
+ $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING);
+ } else {
+ // Find out users to drop and users to revoke
+ $drop_or_revoke_user = $this->drop_or_revoke_user($data['new']['database_id'], $data['old']['database_user_id'], $old_host_list);
+ if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['new']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link);
+ if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['new']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link);
+
+ //$this->process_host_list('DROP', $data['new']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $old_host_list, $link);
+ //$this->process_host_list('REVOKE', $data['new']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $old_host_list, $link);
+ }
}
}
if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) {
@@ -272,8 +366,11 @@ class mysql_clientdb_plugin {
//* set new priveliges
if($data['new']['remote_access'] == 'y') {
if($db_user) {
- if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING);
- else $this->process_host_list('GRANT', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['new']['remote_ips'], $link);
+ if($db_user['database_user'] == 'root'){
+ $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING);
+ } else {
+ $this->process_host_list('GRANT', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['new']['remote_ips'], $link);
+ }
}
if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) {
if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING);
@@ -281,32 +378,64 @@ class mysql_clientdb_plugin {
}
} else {
if($db_user) {
- if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING);
- else $this->process_host_list('REVOKE', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['new']['remote_ips'], $link);
+ if($db_user['database_user'] == 'root'){
+ $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING);
+ } else {
+ // Find out users to drop and users to revoke
+ $drop_or_revoke_user = $this->drop_or_revoke_user($data['new']['database_id'], $data['new']['database_user_id'], $data['old']['remote_ips']);
+ if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link);
+ if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link);
+
+ //$this->process_host_list('DROP', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['old']['remote_ips'], $link);
+ //$this->process_host_list('REVOKE', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['old']['remote_ips'], $link);
+ }
}
if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) {
- if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING);
- else $this->process_host_list('REVOKE', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $data['new']['remote_ips'], $link);
+ if($db_ro_user['database_user'] == 'root'){
+ $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING);
+ } else {
+ // Find out users to drop and users to revoke
+ $drop_or_revoke_user = $this->drop_or_revoke_user($data['new']['database_id'], $data['new']['database_ro_user_id'], $data['old']['remote_ips']);
+ if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link);
+ if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link);
+
+ //$this->process_host_list('DROP', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $data['old']['remote_ips'], $link);
+ //$this->process_host_list('REVOKE', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $data['old']['remote_ips'], $link);
+ }
}
}
$app->log('Changing MySQL remote access privileges for database: '.$data['new']['database_name'],LOGLEVEL_DEBUG);
} elseif($data['new']['remote_access'] == 'y' && $data['new']['remote_ips'] != $data['old']['remote_ips']) {
//* Change remote access list
if($db_user) {
- if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING);
- else {
- $this->process_host_list('REVOKE', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['old']['remote_ips'], $link);
+ if($db_user['database_user'] == 'root'){
+ $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING);
+ } else {
+ // Find out users to drop and users to revoke
+ $drop_or_revoke_user = $this->drop_or_revoke_user($data['new']['database_id'], $data['new']['database_user_id'], $data['old']['remote_ips']);
+ if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link);
+ if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link);
+
+ //$this->process_host_list('DROP', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['old']['remote_ips'], $link);
+ //$this->process_host_list('REVOKE', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['old']['remote_ips'], $link);
$this->process_host_list('GRANT', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['new']['remote_ips'], $link);
}
}
if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) {
- if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING);
- else {
- $this->process_host_list('REVOKE', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $data['old']['remote_ips'], $link);
+ if($db_ro_user['database_user'] == 'root'){
+ $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING);
+ } else {
+ // Find out users to drop and users to revoke
+ $drop_or_revoke_user = $this->drop_or_revoke_user($data['new']['database_id'], $data['new']['database_user_id'], $data['old']['remote_ips']);
+ if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link);
+ if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link);
+
+ //$this->process_host_list('DROP', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $data['old']['remote_ips'], $link);
+ //$this->process_host_list('REVOKE', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $data['old']['remote_ips'], $link);
$this->process_host_list('GRANT', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $data['new']['remote_ips'], $link, '', true);
}
}
- }
+ }
$link->query('FLUSH PRIVILEGES;');
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index 1a593aa53f..7a1e562ad5 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -466,7 +466,7 @@ class nginx_plugin {
exec('chown --recursive --from='.escapeshellcmd($data['old']['system_user']).':'.escapeshellcmd($data['old']['system_group']).' '.escapeshellcmd($data['new']['system_user']).':'.escapeshellcmd($data['new']['system_group']).' '.$new_dir);
//* Change the home directory and group of the website user
- $command = 'killall -u '.escapeshellcmd($data['new']['system_user']).' && usermod';
+ $command = 'killall -u '.escapeshellcmd($data['new']['system_user']).' ; usermod';
$command .= ' --home '.escapeshellcmd($data['new']['document_root']);
$command .= ' --gid '.escapeshellcmd($data['new']['system_group']);
$command .= ' '.escapeshellcmd($data['new']['system_user']).' 2>/dev/null';
@@ -655,8 +655,8 @@ class nginx_plugin {
exec('chown -R '.$data['new']['system_user'].':'.$data['new']['system_group'].' '.$error_page_path);
} // end copy error docs
- // Set the quota for the user
- if($username != '' && $app->system->is_user($username)) {
+ // Set the quota for the user, but only for vhosts, not vhostsubdomains
+ if($username != '' && $app->system->is_user($username) && $data['new']['type'] == 'vhost') {
if($data['new']['hd_quota'] > 0) {
$blocks_soft = $data['new']['hd_quota'] * 1024;
$blocks_hard = $blocks_soft + 1024;
@@ -1684,10 +1684,12 @@ class nginx_plugin {
if($data['old']['type'] == 'vhost' || $data['old']['type'] == 'vhostsubdomain'){
if(is_array($log_folders) && !empty($log_folders)){
foreach($log_folders as $log_folder){
- if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder));
+ //if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder));
+ exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
}
} else {
- if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder));
+ //if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder));
+ exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
}
}
@@ -1867,10 +1869,10 @@ class nginx_plugin {
$vhost_logfile_dir = escapeshellcmd('/var/log/ispconfig/httpd/'.$data['old']['domain']);
if($data['old']['domain'] != '' && !stristr($vhost_logfile_dir,'..')) exec('rm -rf '.$vhost_logfile_dir);
$app->log('Removing website logfile directory: '.$vhost_logfile_dir,LOGLEVEL_DEBUG);
-
+
if($data['old']['type'] == 'vhost') {
//delete the web user
- $command = 'killall -u '.escapeshellcmd($data['old']['system_user']).' && userdel';
+ $command = 'killall -u '.escapeshellcmd($data['old']['system_user']).' ; userdel';
$command .= ' '.escapeshellcmd($data['old']['system_user']);
exec($command);
if($nginx_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' '.$command);
diff --git a/server/plugins-available/postfix_server_plugin.inc.php b/server/plugins-available/postfix_server_plugin.inc.php
index 98dd675164..8d00e31804 100644
--- a/server/plugins-available/postfix_server_plugin.inc.php
+++ b/server/plugins-available/postfix_server_plugin.inc.php
@@ -80,6 +80,7 @@ class postfix_server_plugin {
// get the config
$app->uses("getconf");
+ $old_ini_data = $app->ini_parser->parse_ini_string($data['old']['config']);
$mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
copy('/etc/postfix/main.cf','/etc/postfix/main.cf~');
@@ -107,18 +108,23 @@ class postfix_server_plugin {
exec("postconf -e 'relayhost ='");
}
- if($mail_config['realtime_blackhole_list'] != '') {
- $rbl_hosts = explode(",",str_replace(" ", "", $mail_config['realtime_blackhole_list']));
+ if($mail_config['realtime_blackhole_list'] != $old_ini_data['mail']['realtime_blackhole_list']) {
+ $rbl_hosts = trim(preg_replace('/\s+/', '', $mail_config['realtime_blackhole_list']));
+ if($rbl_hosts != ''){
+ $rbl_hosts = explode(",", $rbl_hosts);
+ }
$options = explode(", ", exec("postconf -h smtpd_recipient_restrictions"));
foreach ($options as $key => $value) {
if (!preg_match('/reject_rbl_client/', $value)) {
$new_options[] = $value;
}
}
- foreach ($rbl_hosts as $key => $value) {
- $new_options[] = "reject_rbl_client ".$value;
+ if(is_array($rbl_hosts) && !empty($rbl_hosts)){
+ foreach ($rbl_hosts as $key => $value) {
+ $value = trim($value);
+ if($value != '') $new_options[] = "reject_rbl_client ".$value;
+ }
}
-
exec("postconf -e 'smtpd_recipient_restrictions = ".implode(", ", $new_options)."'");
}
diff --git a/server/plugins-available/webserver_plugin.inc.php b/server/plugins-available/webserver_plugin.inc.php
index 5678444559..0fcdf13c16 100644
--- a/server/plugins-available/webserver_plugin.inc.php
+++ b/server/plugins-available/webserver_plugin.inc.php
@@ -163,4 +163,4 @@ class webserver_plugin {
}
}
-?>
\ No newline at end of file
+?>
diff --git a/server/server.php b/server/server.php
index e669c6ecc5..1cdcb85a47 100644
--- a/server/server.php
+++ b/server/server.php
@@ -196,8 +196,8 @@ if ($needStartCore) {
$app->uses('modules,plugins,file,services');
// Load the modules that are im the mods-core folder
$app->modules->loadModules('core');
- // Load the plugins that are in the plugins-core folder
- $app->plugins->loadPlugins('core');
+ // Load the plugins that are in the f folder
+ //$app->plugins->loadPlugins('core');
}
--
GitLab