From a0fd5ab7b5412985324e970573ca22a27b3a94d3 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 16 Apr 2013 05:56:06 -0400
Subject: [PATCH] - Merged revisions 3922-3958 from svn stable branch - Added backup size to web backups
---
interface/web/dns/dns_mx_edit.php | 11
interface/web/admin/lib/lang/pl_login_as.lng | 1
interface/web/designer/lib/lang/cz_module_nav_item_edit.lng | 2
interface/web/dns/lib/lang/el_dns_mx.lng | 1
interface/web/mailuser/lib/lang/pl_mail_user_password.lng | 1
interface/web/admin/lib/lang/pl_language_complete.lng | 1
interface/web/help/lib/lang/cz_faq_manage_questions_list.lng | 2
interface/web/admin/lib/lang/cz_language_add.lng | 2
interface/web/admin/lib/lang/es_server_config.lng | 1
interface/web/mail/lib/lang/pl_mail_domain_catchall.lng | 1
interface/web/vm/lib/lang/cz_openvz_ip_list.lng | 2
interface/web/sites/lib/lang/se_web_domain.lng | 1
interface/web/admin/lib/lang/de_server_config.lng | 1
interface/web/admin/lib/lang/nl_server_config.lng | 1
interface/web/help/lib/lang/cz_faq_form.lng | 2
interface/web/mailuser/lib/lang/cz_index.lng | 2
interface/web/monitor/lib/lang/cz_syslog_list.lng | 2
interface/web/mail/lib/lang/pl_mail_get.lng | 1
interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng | 2
interface/web/dashboard/lib/lang/cz_dashlet_modules.lng | 2
interface/web/mail/lib/lang/cz_mail_forward_list.lng | 2
interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng | 2
interface/web/admin/lib/lang/cz_software_repo.lng | 2
interface/web/client/lib/lang/cz_domain_list.lng | 2
interface/web/admin/lib/lang/cz_software_package_install.lng | 2
interface/web/dns/lib/lang/pl_dns_slave.lng | 1
interface/web/admin/lib/lang/pl_server.lng | 1
interface/web/admin/lib/lang/pl_server_ip_list.lng | 1
interface/web/dns/lib/lang/pl_dns_mx.lng | 2
interface/web/sites/lib/lang/de_web_domain.lng | 1
interface/web/vm/lib/lang/pl_openvz_vm.lng | 1
interface/web/designer/lib/lang/cz_form_list.lng | 2
interface/web/dns/lib/lang/nl_dns_mx.lng | 1
interface/web/admin/lib/lang/pl_groups.lng | 1
interface/web/mail/lib/lang/pl_mail_domain.lng | 1
interface/web/mail/lib/lang/pl_spamfilter_policy.lng | 1
interface/web/admin/lib/lang/pl_system_config.lng | 1
interface/web/sites/lib/lang/pl_web_folder.lng | 1
interface/web/admin/lib/lang/cz_software_repo_list.lng | 2
interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng | 1
interface/web/sites/lib/lang/pl_shell_user_list.lng | 1
interface/web/admin/lib/lang/pl_language_list.lng | 1
interface/web/client/lib/lang/cz_client_template.lng | 2
interface/web/sites/lib/lang/pl_cron_list.lng | 1
interface/web/monitor/lib/lang/cz.lng | 2
interface/web/mail/lib/lang/cz_spamfilter_users.lng | 2
interface/web/sites/lib/lang/cz_web_folder_list.lng | 2
interface/web/dns/lib/lang/de_dns_mx.lng | 2
interface/web/designer/lib/lang/cz_module_nav_edit.lng | 2
interface/web/admin/lib/lang/ru_server_config.lng | 1
interface/web/help/lib/lang/cz_help_faq_list.lng | 2
interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng | 2
interface/web/dns/lib/lang/es_dns_mx.lng | 1
interface/web/admin/lib/lang/pl_language_edit.lng | 1
interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng | 1
interface/web/admin/lib/lang/pl_remote_user_list.lng | 1
interface/web/client/lib/lang/cz_clients_list.lng | 2
interface/web/sites/lib/lang/pl_web_domain_admin_list.lng | 1
interface/web/admin/lib/lang/cz_server_php_list.lng | 2
interface/web/js/jquery.tipsy.js | 3
interface/web/tools/lib/lang/cz_interface.lng | 2
interface/web/sites/lib/lang/pl_webdav_user.lng | 1
interface/web/client/lib/lang/cz.lng | 2
interface/web/dns/lib/lang/pl_dns_cname.lng | 1
interface/web/mail/lib/lang/cz_mail_whitelist_list.lng | 2
interface/web/mailuser/lib/lang/pl_mail_user_spamfilter.lng | 1
interface/web/mail/lib/lang/cz_mail_get.lng | 2
interface/web/admin/lib/lang/cz_directive_snippets_list.lng | 2
interface/web/mail/lib/lang/pl_mail_blacklist_list.lng | 1
interface/web/mail/lib/lang/pl_mail_whitelist.lng | 1
interface/web/client/lib/lang/pl_clients_list.lng | 1
interface/web/help/lib/lang/pl.lng | 1
interface/web/admin/lib/lang/pl_server_php.lng | 1
interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng | 2
interface/web/dns/lib/lang/cz_dns_mx.lng | 3
interface/web/sites/lib/lang/pl_database_admin_list.lng | 1
interface/web/mail/lib/lang/pl_mail_user_filter.lng | 1
interface/web/mail/lib/lang/cz_mail_transport.lng | 2
interface/web/admin/lib/lang/cz_software_package_list.lng | 2
interface/web/sites/lib/lang/cz_web_folder_user_list.lng | 2
interface/web/admin/lib/lang/hu_server_config.lng | 1
interface/web/admin/lib/lang/cz_login_as.lng | 2
interface/web/admin/lib/lang/el_server_config.lng | 1
server/plugins-available/apache2_plugin.inc.php | 2
interface/web/sites/lib/lang/cz_web_subdomain_list.lng | 2
interface/web/admin/lib/lang/pl.lng | 1
interface/web/vm/lib/lang/cz_openvz_template.lng | 2
interface/web/sites/lib/lang/pl_aps_instances_list.lng | 1
interface/web/dns/lib/lang/de.lng | 4
interface/web/client/lib/lang/pl_reseller.lng | 1
interface/web/designer/lib/lang/cz_form_show.lng | 2
interface/web/mail/lib/lang/cz_mail_forward.lng | 2
interface/web/sites/lib/lang/cz_shell_user_list.lng | 2
interface/web/mail/lib/lang/cz_spamfilter_config_list.lng | 2
install/sql/incremental/upd_0050.sql | 2
interface/web/mail/lib/lang/pl_mail_content_filter.lng | 1
interface/web/sites/lib/lang/pt_web_domain.lng | 1
interface/web/dashboard/lib/lang/cz_dashlet_limits.lng | 2
interface/web/sites/lib/lang/pl_aps.lng | 1
interface/web/mail/lib/lang/cz_mail_blacklist.lng | 2
server/plugins-available/mailman_plugin.inc.php | 2
interface/web/admin/lib/lang/pl_server_config_list.lng | 1
interface/web/mailuser/lib/lang/cz.lng | 2
interface/web/dns/lib/lang/pl_dns_srv.lng | 1
interface/web/mail/lib/lang/pl_mail_user_stats_list.lng | 1
interface/web/dns/lib/lang/cz_dns_txt.lng | 2
interface/web/admin/lib/lang/cz_server_ip.lng | 2
interface/web/admin/lib/lang/pl_firewall_list.lng | 1
interface/web/designer/lib/lang/pl.lng | 1
interface/web/sites/lib/lang/pl_web_folder_list.lng | 1
interface/web/admin/lib/lang/pl_server_php_list.lng | 1
interface/web/admin/lib/lang/pl_iptables.lng | 1
interface/web/admin/lib/lang/ro_server_config.lng | 1
interface/web/designer/lib/lang/cz_form_edit.lng | 2
server/plugins-available/nginx_plugin.inc.php | 2
install/tpl/apache_ispconfig.conf.master | 2
interface/web/admin/lib/lang/br_server_config.lng | 1
interface/web/admin/lib/lang/hr_server_config.lng | 1
interface/web/designer/lib/lang/pl_module_list.lng | 1
interface/web/dns/lib/lang/se_dns_mx.lng | 1
interface/web/tools/lib/lang/cz.lng | 2
interface/web/admin/lib/lang/cz_directive_snippets.lng | 2
interface/web/help/lib/lang/pl_faq_form.lng | 1
interface/web/client/lib/lang/cz_client_del.lng | 2
interface/web/mail/lib/lang/pl_mail_user_filter_list.lng | 1
interface/web/mailuser/lib/lang/pl_index.lng | 1
interface/web/sites/lib/lang/cz_ftp_user_list.lng | 2
install/sql/incremental/upd_0049.sql | 2
server/plugins-available/shelluser_base_plugin.inc.php | 4
interface/web/sites/lib/lang/cz_web_aliasdomain.lng | 2
interface/web/sites/lib/lang/pl_web_vhost_subdomain_list.lng | 1
interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng | 2
interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng | 2
interface/web/tools/lib/lang/pl_index.lng | 1
interface/web/sites/lib/lang/pl_user_quota_stats_list.lng | 1
interface/web/admin/lib/lang/ja_server_config.lng | 1
interface/web/mail/lib/lang/pl_mail_get_list.lng | 1
interface/web/tools/lib/lang/cz_import_ispconfig.lng | 2
interface/web/mail/lib/lang/cz_mail_user_filter_list.lng | 2
interface/web/tools/lib/lang/cz_resync.lng | 2
interface/web/sites/lib/lang/cz_database_user_admin_list.lng | 2
interface/web/admin/lib/lang/pl_directive_snippets_list.lng | 1
install/sql/incremental/upd_0051.sql | 1
interface/web/admin/lib/lang/pl_server_list.lng | 1
interface/web/admin/lib/lang/se_server_config.lng | 1
interface/web/dns/lib/lang/cz_dns_hinfo.lng | 2
interface/web/mail/lib/lang/pl_mail_content_filter_list.lng | 1
interface/web/mail/lib/lang/pl.lng | 1
interface/web/mail/lib/lang/pl_mail_aliasdomain.lng | 1
interface/web/admin/lib/lang/pl_groups_list.lng | 1
interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng | 2
interface/web/client/lib/lang/cz_client_circle.lng | 2
interface/web/admin/form/system_config.tform.php | 2
interface/web/dns/lib/lang/pl_dns_soa.lng | 1
interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng | 2
interface/web/dns/lib/lang/hu_dns_mx.lng | 1
interface/web/login/lib/lang/pl.lng | 1
interface/web/mail/lib/lang/cz.lng | 2
interface/web/mail/lib/lang/pl_mail_mailinglist_list.lng | 1
interface/web/mail/lib/lang/cz_spamfilter_config.lng | 2
interface/web/mailuser/lib/lang/pl_mail_user_autoresponder.lng | 1
interface/web/dns/lib/lang/pl_dns_alias.lng | 1
interface/web/sites/lib/lang/ja_web_domain.lng | 1
interface/web/sites/lib/lang/cz_database_user.lng | 2
interface/web/dns/lib/lang/de_dns_slave_list.lng | 4
interface/web/admin/lib/lang/pl_remote_user.lng | 1
interface/web/designer/lib/lang/pl_module_nav_item_edit.lng | 1
interface/web/sites/lib/lang/pl_database_user_list.lng | 1
interface/web/sites/templates/web_backup_list.htm | 34 +
interface/web/sites/lib/lang/cz_database.lng | 2
install/dist/lib/opensuse.lib.php | 40 +
interface/web/mail/lib/lang/cz_mail_domain_catchall.lng | 2
interface/web/dns/lib/lang/pl_dns_slave_list.lng | 1
interface/web/dns/lib/lang/ro_dns_mx.lng | 1
interface/web/sites/lib/lang/br_web_domain.lng | 1
interface/web/designer/lib/lang/pl_module_edit.lng | 1
interface/web/mail/lib/lang/pl_mail_whitelist_list.lng | 1
interface/web/sites/lib/lang/hr_web_domain.lng | 1
interface/web/admin/lib/lang/cz_language_export.lng | 2
interface/web/client/lib/lang/pl_client_circle_list.lng | 1
interface/web/admin/lib/lang/cz_server_config.lng | 3
interface/web/dns/lib/lang/pl_dns_wizard.lng | 1
interface/web/vm/lib/lang/pl_openvz_action.lng | 1
interface/web/admin/lib/lang/pl_language_import.lng | 1
install/dist/lib/fedora.lib.php | 43 +
interface/web/dashboard/lib/lang/cz.lng | 2
interface/web/sites/lib/lang/cz_web_backup_list.lng | 2
interface/web/sites/lib/lang/cz_web_folder_user.lng | 2
interface/web/mailuser/lib/lang/cz_mail_user_password.lng | 2
interface/web/dns/lib/lang/id_dns_mx.lng | 1
interface/web/tools/lib/lang/pl_interface.lng | 1
interface/web/dns/lib/lang/cz_dns_rp.lng | 2
interface/web/admin/lib/lang/cz_software_update_list.lng | 2
interface/web/admin/lib/lang/pl_software_repo.lng | 1
interface/web/mail/lib/lang/pl_mail_relay_recipient.lng | 1
interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng | 2
interface/web/dns/lib/lang/pl_dns_ns.lng | 1
interface/web/admin/lib/lang/pl_users.lng | 1
interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng | 2
interface/web/mail/lib/lang/pl_spamfilter_config_list.lng | 1
interface/web/tools/lib/lang/cz_tpl_default.lng | 2
interface/web/sites/lib/lang/cz_cron_list.lng | 2
interface/web/dns/dns_slave_edit.php | 11
interface/web/dns/lib/lang/bg_dns_mx.lng | 1
interface/web/sites/lib/lang/pl_web_domain_list.lng | 1
interface/web/dns/lib/lang/cz_dns_a_list.lng | 2
interface/web/client/lib/lang/de_client.lng | 2
interface/web/admin/lib/lang/pl_server_ip.lng | 1
interface/web/client/lib/lang/pl_client_template_list.lng | 1
interface/web/dashboard/lib/lang/pl_dashlet_modules.lng | 1
interface/web/sites/lib/lang/cz_cron.lng | 2
interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng | 1
interface/web/dns/lib/lang/cz_dns_template_list.lng | 2
interface/web/client/lib/lang/pl_client_template.lng | 1
interface/lib/lang/cz.lng | 2
interface/web/dns/lib/lang/cz_dns_ptr.lng | 2
interface/web/admin/lib/lang/pl_users_list.lng | 1
interface/web/tools/import_ispconfig.php | 13
interface/web/sites/lib/lang/fi_web_domain.lng | 1
interface/web/admin/lib/lang/cz_server_config_list.lng | 2
interface/web/mail/lib/lang/cz_mail_spamfilter.lng | 2
interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng | 2
interface/web/mail/lib/lang/cz_spamfilter_policy.lng | 2
interface/web/mail/lib/lang/pl_mail_mailinglist.lng | 1
interface/web/tools/lib/lang/cz_index.lng | 2
interface/web/sites/lib/lang/cz_webdav_user.lng | 2
interface/web/sites/lib/lang/el_web_domain.lng | 1
interface/web/dns/lib/lang/pt_dns_mx.lng | 1
interface/web/help/lib/lang/cz_help_faq_sections_list.lng | 2
interface/web/vm/lib/lang/pl_openvz_ip.lng | 1
interface/web/vm/lib/lang/pl_openvz_ostemplate_list.lng | 1
interface/web/admin/lib/lang/en_system_config.lng | 1
interface/web/vm/lib/lang/pl_openvz_template_list.lng | 1
interface/web/sites/lib/lang/nl_web_domain.lng | 1
interface/web/vm/lib/lang/cz_openvz_ostemplate.lng | 2
interface/web/admin/lib/lang/cz_package_install.lng | 2
interface/web/sites/lib/lang/pl_web_subdomain.lng | 1
interface/web/dns/lib/lang/cz_dns_soa.lng | 2
interface/web/help/lib/lang/pl_support_message_list.lng | 1
interface/web/help/lib/lang/pl_faq_sections_form.lng | 1
interface/web/dns/lib/lang/pl_dns_txt.lng | 1
interface/web/admin/lib/lang/pl_iptables_list.lng | 1
interface/web/admin/lib/lang/pl_tpl_default_admin.lng | 1
interface/web/sites/lib/lang/cz_aps_instances_list.lng | 2
interface/web/mail/lib/lang/cz_mail_aliasdomain.lng | 2
interface/web/dns/form/dns_slave.tform.php | 4
interface/web/admin/lib/lang/it_server_config.lng | 1
interface/web/client/lib/lang/pl_client.lng | 1
interface/web/dns/lib/lang/pl_dns_aaaa.lng | 1
interface/web/sites/lib/lang/cz_database_list.lng | 2
interface/web/admin/lib/lang/cz_remote_action.lng | 6
interface/web/sites/lib/lang/es_web_domain.lng | 1
interface/web/vm/lib/lang/cz_openvz_ip.lng | 2
interface/web/admin/lib/lang/cz_language_edit.lng | 2
interface/web/sites/lib/lang/pl_database.lng | 1
interface/web/admin/lib/lang/cz_firewall.lng | 2
interface/web/dns/lib/lang/hr_dns_mx.lng | 1
interface/web/admin/lib/lang/cz.lng | 2
interface/web/mail/lib/lang/cz_mail_whitelist.lng | 2
interface/web/dns/lib/lang/fr_dns_mx.lng | 1
interface/web/admin/lib/lang/cz_language_import.lng | 2
interface/web/dashboard/lib/lang/pl.lng | 1
interface/web/help/lib/lang/cz.lng | 2
interface/web/sites/lib/lang/pl_cron.lng | 1
interface/web/mail/lib/lang/pl_mail_alias.lng | 1
interface/web/sites/lib/lang/hu_web_domain.lng | 1
interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng | 2
interface/web/help/lib/lang/pl_help_faq_sections_list.lng | 1
interface/web/admin/lib/lang/pl_software_package_install.lng | 1
interface/web/admin/lib/lang/fi_server_config.lng | 1
interface/web/mail/lib/lang/pl_spamfilter_users_list.lng | 1
interface/web/admin/lib/lang/pl_remote_action.lng | 1
interface/web/dns/lib/lang/cz_dns_slave_list.lng | 2
interface/web/help/lib/lang/pl_help_faq_list.lng | 1
interface/web/dns/lib/lang/sk_dns_mx.lng | 1
interface/web/client/lib/lang/cz_domain.lng | 2
interface/web/designer/lib/lang/cz_module_list.lng | 2
interface/lib/lang/pl.lng | 1
interface/web/sites/lib/lang/pl_web_backup_list.lng | 1
interface/web/dns/lib/lang/cz_dns_template.lng | 2
interface/web/dns/lib/lang/cz.lng | 2
interface/web/help/lib/lang/pl_support_message.lng | 1
interface/web/sites/lib/lang/pl_web_domain.lng | 2
interface/web/mail/lib/lang/cz_mail_mailinglist.lng | 2
interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng | 1
interface/web/sites/lib/lang/cz_web_domain_list.lng | 2
interface/web/dns/lib/lang/cz_dns_cname.lng | 2
interface/web/sites/lib/lang/bg_web_domain.lng | 1
interface/web/designer/lib/lang/cz.lng | 2
interface/web/dns/lib/lang/cz_dns_aaaa.lng | 2
interface/web/admin/lib/lang/cz_server_list.lng | 2
server/lib/classes/system.inc.php | 52 ++
interface/web/admin/lib/lang/cz_language_list.lng | 2
interface/web/dns/lib/lang/cz_dns_soa_list.lng | 2
interface/web/client/lib/lang/pl_domain.lng | 1
interface/web/mail/lib/lang/pl_mail_transport.lng | 1
interface/web/dns/lib/lang/br_dns_mx.lng | 1
interface/web/mail/lib/lang/pl_user_quota_stats_list.lng | 1
interface/web/dns/lib/lang/ar_dns_mx.lng | 1
interface/web/sites/lib/lang/cz_user_quota_stats_list.lng | 2
interface/web/mail/lib/lang/pl_mail_transport_list.lng | 1
interface/web/mail/lib/lang/pl_mail_blacklist.lng | 1
interface/web/vm/lib/lang/cz_openvz_vm.lng | 2
interface/web/dns/lib/lang/cz_dns_import.lng | 2
interface/web/mail/lib/lang/cz_mail_domain_list.lng | 2
interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng | 2
interface/web/dns/lib/lang/pl_dns_hinfo.lng | 1
interface/web/designer/lib/lang/pl_module_show.lng | 1
interface/web/mail/lib/lang/pl_mail_forward_list.lng | 1
interface/web/sites/lib/lang/pl_web_sites_stats_list.lng | 1
interface/web/tools/lib/lang/pl.lng | 1
interface/web/mail/lib/lang/cz_mail_get_list.lng | 2
interface/web/help/lib/lang/cz_support_message.lng | 2
interface/web/admin/lib/lang/cz_firewall_list.lng | 2
interface/web/dns/lib/lang/pl_dns_a_list.lng | 1
interface/web/login/lib/lang/cz.lng | 2
interface/web/sites/lib/lang/pl_ftp_user_list.lng | 1
install/sql/ispconfig3.sql | 21
interface/web/admin/lib/lang/pl_server_config.lng | 2
interface/web/mail/lib/lang/cz_mail_alias_list.lng | 2
interface/web/admin/language_complete.php | 2
interface/web/dns/lib/lang/cz_dns_alias.lng | 2
interface/web/sites/lib/lang/cz_database_admin_list.lng | 2
interface/web/client/lib/lang/cz_client_template_list.lng | 2
interface/web/client/lib/lang/cz_resellers_list.lng | 2
interface/web/designer/lib/lang/pl_form_list.lng | 1
interface/web/mail/lib/lang/cz_mail_content_filter_list.lng | 2
interface/web/mailuser/lib/lang/pl.lng | 1
interface/web/vm/lib/lang/pl_openvz_ip_list.lng | 1
interface/web/admin/lib/lang/de_system_config.lng | 1
interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng | 2
interface/web/mail/lib/lang/cz_mail_blacklist_list.lng | 2
interface/web/tools/lib/lang/pl_import_ispconfig.lng | 1
interface/web/admin/lib/lang/sk_server_config.lng | 1
interface/web/mailuser/lib/lang/pl_mail_user_cc.lng | 1
interface/web/sites/lib/lang/fr_web_domain.lng | 1
interface/web/mail/lib/lang/pl_mail_spamfilter.lng | 1
interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng | 2
interface/web/monitor/lib/lang/pl_datalog_list.lng | 1
interface/web/admin/lib/lang/id_server_config.lng | 1
interface/web/dns/lib/lang/it_dns_mx.lng | 1
interface/web/vm/lib/lang/cz_openvz_template_list.lng | 2
interface/web/sites/lib/lang/id_web_domain.lng | 1
interface/web/admin/lib/lang/cz_tpl_default_admin.lng | 2
interface/web/client/lib/lang/pl.lng | 1
interface/web/dns/lib/lang/cz_dns_a.lng | 2
install/tpl/apache_ispconfig.vhost.master | 1
interface/web/admin/lib/lang/cz_server_php.lng | 2
interface/web/dns/lib/lang/de_dns_slave.lng | 4
interface/web/tools/lib/lang/cz_usersettings.lng | 2
interface/web/dns/lib/lang/pl_dns_template.lng | 1
interface/web/admin/lib/lang/cz_system_config.lng | 2
interface/web/sites/lib/lang/pl_aps_packages_list.lng | 1
interface/web/vm/lib/lang/pl_openvz_ostemplate.lng | 1
interface/web/dns/lib/lang/pl_dns_ptr.lng | 1
interface/web/vm/lib/lang/cz_openvz_vm_list.lng | 2
server/cron_daily.php | 89 +++-
interface/web/admin/lib/lang/fr_server_config.lng | 1
interface/web/admin/lib/lang/cz_language_complete.lng | 2
interface/web/client/lib/lang/pl_client_message.lng | 1
interface/web/sites/lib/lang/ro_web_domain.lng | 1
interface/web/sites/lib/lang/cz.lng | 2
interface/web/sites/lib/lang/cz_web_domain_admin_list.lng | 2
interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng | 2
interface/web/sites/lib/lang/cz_shell_user.lng | 2
interface/web/admin/lib/lang/cz_groups_list.lng | 2
interface/web/admin/lib/lang/cz_server_ip_list.lng | 2
interface/web/help/lib/lang/pl_faq_manage_questions_list.lng | 1
interface/web/sites/lib/lang/cz_webdav_user_list.lng | 2
interface/web/admin/lib/lang/ar_server_config.lng | 1
interface/web/sites/lib/lang/cz_web_subdomain.lng | 2
interface/web/mail/lib/lang/cz_mail_user_list.lng | 2
interface/web/dns/lib/lang/ru_dns_mx.lng | 1
interface/web/mail/lib/lang/cz_mail_user.lng | 2
interface/web/admin/templates/server_ip_list.htm | 6
interface/web/client/lib/lang/pl_resellers_list.lng | 1
interface/web/client/lib/lang/cz_reseller.lng | 2
interface/web/vm/lib/lang/pl_openvz_template.lng | 1
interface/web/mail/lib/lang/cz_spamfilter_users_list.lng | 2
interface/web/sites/lib/lang/it_web_domain.lng | 1
interface/web/vm/lib/lang/pl.lng | 1
interface/web/vm/lib/lang/pl_openvz_vm_list.lng | 1
interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng | 1
interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng | 1
interface/web/mail/lib/lang/cz_mail_user_stats_list.lng | 2
interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng | 1
interface/web/sites/lib/lang/pl_web_subdomain_list.lng | 1
interface/web/client/lib/lang/cz_client_circle_list.lng | 2
interface/web/client/lib/lang/cz_client_message.lng | 2
interface/web/mail/lib/lang/pl_mail_alias_list.lng | 1
interface/web/sites/lib/lang/cz_aps.lng | 2
interface/web/mailuser/lib/lang/pl_mail_user_filter.lng | 1
interface/web/designer/lib/lang/cz_module_show.lng | 2
interface/web/sites/lib/lang/pl_web_folder_user.lng | 1
interface/web/admin/lib/lang/cz_iptables_list.lng | 2
interface/web/sites/lib/lang/pl_database_user.lng | 1
interface/web/sites/lib/lang/cz_web_domain.lng | 3
interface/web/admin/lib/lang/cz_remote_user_list.lng | 2
interface/web/sites/lib/lang/pl.lng | 1
interface/web/tools/lib/lang/pl_tpl_default.lng | 1
interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng | 2
interface/web/sites/lib/lang/en_web_backup_list.lng | 21
interface/web/mail/lib/lang/cz_mail_content_filter.lng | 2
interface/web/mail/lib/lang/pl_mail_user.lng | 1
interface/web/sites/lib/lang/cz_database_user_list.lng | 2
interface/web/vm/lib/lang/cz_openvz_action.lng | 2
interface/web/help/lib/lang/cz_support_message_list.lng | 2
interface/web/dns/lib/lang/pl_dns_rp.lng | 1
interface/web/monitor/lib/lang/pl_syslog_list.lng | 1
interface/web/admin/lib/lang/pl_software_update_list.lng | 1
interface/web/admin/lib/lang/pl_language_add.lng | 1
interface/web/mail/lib/lang/cz_mail_transport_list.lng | 2
interface/web/client/lib/lang/de_reseller.lng | 2
interface/web/admin/lib/lang/cz_users.lng | 2
interface/web/dns/lib/lang/cz_dns_ns.lng | 2
interface/web/dns/lib/lang/pl_dns_template_list.lng | 1
interface/web/sites/lib/lang/ru_web_domain.lng | 1
interface/web/client/lib/lang/pl_client_del.lng | 1
interface/web/dns/lib/lang/pl_dns_import.lng | 1
interface/web/mail/lib/lang/cz_mail_relay_recipient.lng | 2
interface/web/sites/lib/lang/pl_web_aliasdomain.lng | 1
interface/web/admin/lib/lang/pl_package_install.lng | 1
interface/web/mail/lib/lang/pl_spamfilter_users.lng | 1
interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng | 1
interface/web/admin/lib/lang/bg_server_config.lng | 1
interface/web/sites/lib/lang/cz_ftp_user.lng | 2
install/tpl/config.inc.php.master | 2
interface/web/dns/lib/lang/pl_dns_a.lng | 1
interface/web/dns/lib/lang/ja_dns_mx.lng | 1
interface/web/tools/lib/lang/pl_resync.lng | 1
interface/web/mail/lib/lang/cz_mail_domain.lng | 2
interface/web/admin/lib/lang/pl_software_package_list.lng | 1
interface/web/mail/mail_domain_del.php | 4
interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng | 1
interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng | 2
interface/web/sites/lib/lang/pl_shell_user.lng | 1
interface/web/mailuser/lib/lang/cz_mail_user_filter.lng | 2
interface/web/admin/lib/lang/pl_firewall.lng | 1
interface/web/sites/lib/lang/cz_web_sites_stats_list.lng | 2
interface/web/admin/lib/lang/cz_groups.lng | 2
interface/web/monitor/lib/lang/pl.lng | 1
interface/web/client/lib/lang/pl_domain_list.lng | 1
interface/web/admin/lib/lang/cz_users_list.lng | 2
interface/web/client/lib/lang/cz_client.lng | 2
interface/web/admin/lib/lang/pl_directive_snippets.lng | 1
interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng | 1
interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng | 1
interface/web/sites/lib/lang/pl_database_user_admin_list.lng | 1
interface/web/mail/lib/lang/pl_mail_user_list.lng | 1
interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng | 1
interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng | 1
interface/web/admin/lib/lang/cz_iptables.lng | 2
interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng | 2
interface/web/dns/lib/lang/pl_dns_soa_list.lng | 1
interface/web/sites/lib/lang/ar_web_domain.lng | 1
interface/web/client/lib/lang/pl_client_circle.lng | 1
interface/web/sites/lib/lang/cz_web_folder.lng | 2
interface/web/tools/lib/lang/pl_usersettings.lng | 1
interface/web/sites/lib/lang/sk_web_domain.lng | 1
interface/web/dns/lib/lang/pl.lng | 1
interface/web/dns/lib/lang/cz_dns_srv.lng | 2
interface/web/vm/lib/lang/cz.lng | 2
interface/web/mail/lib/lang/cz_mail_alias.lng | 2
interface/web/sites/lib/lang/pl_database_list.lng | 1
interface/web/mailuser/lib/lang/pl_mail_user_filter_list.lng | 1
interface/web/designer/lib/lang/pl_form_show.lng | 1
interface/web/admin/lib/lang/pl_language_export.lng | 1
interface/web/designer/lib/lang/pl_module_nav_edit.lng | 1
interface/web/dns/lib/lang/cz_dns_slave.lng | 2
interface/web/mail/lib/lang/pl_spamfilter_config.lng | 1
interface/web/mail/lib/lang/cz_mail_user_filter.lng | 2
interface/web/sites/lib/lang/pl_ftp_user.lng | 1
interface/web/mail/lib/lang/cz_user_quota_stats_list.lng | 2
interface/web/sites/lib/lang/pl_webdav_user_list.lng | 1
interface/web/designer/lib/lang/pl_form_edit.lng | 1
interface/web/mail/lib/lang/pl_mail_forward.lng | 1
interface/web/mail/lib/lang/pl_mail_domain_list.lng | 1
interface/web/admin/lib/lang/pl_software_repo_list.lng | 1
interface/web/designer/lib/lang/cz_module_edit.lng | 2
interface/web/dns/lib/lang/fi_dns_mx.lng | 1
interface/web/sites/lib/lang/pl_web_folder_user_list.lng | 1
interface/web/dashboard/lib/lang/pl_dashlet_limits.lng | 1
interface/web/monitor/lib/lang/cz_datalog_list.lng | 2
interface/web/admin/lib/lang/cz_server.lng | 2
interface/web/admin/lib/lang/cz_remote_user.lng | 2
interface/web/sites/lib/lang/cz_aps_packages_list.lng | 2
interface/web/mailuser/lib/lang/cz_mail_user_cc.lng | 2
interface/web/admin/lib/lang/pt_server_config.lng | 1
interface/web/dns/lib/lang/cz_dns_wizard.lng | 2
489 files changed, 342 insertions(+), 718 deletions(-)
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 6993782..aa83141 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -59,22 +59,8 @@
}
}
- $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,'mailman');
- 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')
@@ -101,6 +87,25 @@
$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,'mailman');
+ chmod($full_file_name,0750);
+ }
+
+ //* Create aliasaes
+ exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
+
}
function configure_postfix($options = '')
@@ -204,6 +209,16 @@
touch($config_dir.'/nested_header_checks');
touch($config_dir.'/body_checks');
+ //* Create the mailman files
+ 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');
+ if(is_file('/var/lib/mailman/data/aliases')) unlink('/var/lib/mailman/data/aliases');
+ if(!is_link('/var/lib/mailman/data/aliases')) symlink('/etc/mailman/aliases','/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~');
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index 0a16f48..197aa15 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -59,22 +59,8 @@
}
}
- $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,'mailman');
- 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')
@@ -101,6 +87,24 @@
$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,'mailman');
+ chmod($full_file_name,0750);
+ }
+
+ //* Create aliasaes
+ exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
}
function configure_postfix($options = '')
@@ -218,6 +222,14 @@
touch($config_dir.'/nested_header_checks');
touch($config_dir.'/body_checks');
+ //* Create the mailman files
+ 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~');
diff --git a/install/sql/incremental/upd_0049.sql b/install/sql/incremental/upd_0049.sql
index 55eff84..02a2465 100644
--- a/install/sql/incremental/upd_0049.sql
+++ b/install/sql/incremental/upd_0049.sql
@@ -1 +1 @@
-ALTER TABLE `client_template` CHANGE `limit_aps` `limit_aps` INT( 11 ) NOT NULL DEFAULT '-1';
\ No newline at end of file
+ALTER TABLE `client_template` CHANGE `limit_aps` `limit_aps` INT( 11 ) NOT NULL DEFAULT '-1';
diff --git a/install/sql/incremental/upd_0050.sql b/install/sql/incremental/upd_0050.sql
new file mode 100644
index 0000000..d0caf42
--- /dev/null
+++ b/install/sql/incremental/upd_0050.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `dns_slave` DROP INDEX `origin`;
+ALTER TABLE `dns_slave` ADD CONSTRAINT `slave` UNIQUE (`origin`,`server_id`);
\ No newline at end of file
diff --git a/install/sql/incremental/upd_0051.sql b/install/sql/incremental/upd_0051.sql
new file mode 100644
index 0000000..b43b0c1
--- /dev/null
+++ b/install/sql/incremental/upd_0051.sql
@@ -0,0 +1 @@
+ALTER TABLE `web_backup` ADD `filesize` VARCHAR(10) NOT NULL AFTER `filename`;
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 6849418..be8038f 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -418,7 +418,7 @@
`active` enum('N','Y') NOT NULL,
`xfer` varchar(255) NOT NULL,
PRIMARY KEY (`id`),
- UNIQUE KEY `origin` (`origin`),
+ UNIQUE KEY `slave` (`origin`,`server_id`),
KEY `active` (`active`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -1628,12 +1628,13 @@
`server_id` int(10) unsigned NOT NULL,
`parent_domain_id` int(10) unsigned NOT NULL,
`backup_type` enum('web','mysql') NOT NULL DEFAULT 'web',
- `backup_mode` varchar(64) NOT NULL DEFAULT '',
- `tstamp` int(10) unsigned NOT NULL,
- `filename` varchar(255) NOT NULL,
- PRIMARY KEY (`backup_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-
+ `backup_mode` varchar(64) NOT NULL DEFAULT '',
+ `tstamp` int(10) unsigned NOT NULL,
+ `filename` varchar(255) NOT NULL,
+ `filesize` VARCHAR(10) NOT NULL,
+ PRIMARY KEY (`backup_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
-- --------------------------------------------------------
--
@@ -2168,7 +2169,7 @@
--
-- Dumping data for table `sys_config`
--
-
-INSERT INTO sys_config VALUES ('1','db','db_version','3.0.5.1');
-
+
+INSERT INTO sys_config VALUES ('1','db','db_version','3.0.5.2');
+
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 f5b2a91..0745c28 100644
--- a/install/tpl/apache_ispconfig.conf.master
+++ b/install/tpl/apache_ispconfig.conf.master
@@ -51,4 +51,4 @@
Alias /awstats-icon "/usr/share/awstats/icon"
NameVirtualHost *:80
-NameVirtualHost *:443
\ No newline at end of file
+NameVirtualHost *:443
diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master
index 4410b85..15b2956 100644
--- a/install/tpl/apache_ispconfig.vhost.master
+++ b/install/tpl/apache_ispconfig.vhost.master
@@ -26,6 +26,7 @@
Allow from all
</Directory>
IPCCommTimeout 7200
+ MaxRequestLen 15728640
</IfModule>
<IfModule mpm_itk_module>
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index 2af243d..1c96732 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -56,7 +56,7 @@
//** Application
define('ISPC_APP_TITLE', 'ISPConfig');
-define('ISPC_APP_VERSION', '3.0.5.1');
+define('ISPC_APP_VERSION', '3.0.5.2');
define('DEVSYSTEM', 0);
diff --git a/interface/lib/lang/cz.lng b/interface/lib/lang/cz.lng
index 03e7bd8..185b7fb 100644
--- a/interface/lib/lang/cz.lng
+++ b/interface/lib/lang/cz.lng
@@ -132,5 +132,3 @@
$wb['datalog_status_d_web_folder_user'] = 'Odstranění uživatele pro adresáře chráněné heslem';
$wb['login_as_txt'] = 'Přihlaste se jako';
?>
-
-
diff --git a/interface/lib/lang/pl.lng b/interface/lib/lang/pl.lng
index 5d8ec6f..7374ab6 100644
--- a/interface/lib/lang/pl.lng
+++ b/interface/lib/lang/pl.lng
@@ -132,4 +132,3 @@
$wb['datalog_status_d_web_folder_user'] = 'Usuń konto zabezpieczonego folderu';
$wb['login_as_txt'] = 'Zaloguj jako';
?>
-
diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php
index 0d64014..d44b6ad 100644
--- a/interface/web/admin/form/system_config.tform.php
+++ b/interface/web/admin/form/system_config.tform.php
@@ -214,7 +214,7 @@
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}$/',
+ 'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}(\?.+)?$/',
'errmsg'=> 'webmail_url_error_regex'),
),
'default' => '',
diff --git a/interface/web/admin/language_complete.php b/interface/web/admin/language_complete.php
index 5c071a3..75343bd 100644
--- a/interface/web/admin/language_complete.php
+++ b/interface/web/admin/language_complete.php
@@ -138,7 +138,7 @@
$file_content = "<?php\n";
foreach($wb as $key => $val) {
$val = str_replace("'","\\'",$val);
- $val = str_replace('"','\\"',$val);
+ $val = str_replace('"','\"',$val);
$file_content .= '$wb['."'$key'".'] = '."'$val';\n";
}
$file_content .= "?>\n";
diff --git a/interface/web/admin/lib/lang/ar_server_config.lng b/interface/web/admin/lib/lang/ar_server_config.lng
index ef609bb..618b69e 100644
--- a/interface/web/admin/lib/lang/ar_server_config.lng
+++ b/interface/web/admin/lib/lang/ar_server_config.lng
@@ -170,4 +170,5 @@
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng
index 5c2b5f6..18cae75 100644
--- a/interface/web/admin/lib/lang/bg_server_config.lng
+++ b/interface/web/admin/lib/lang/bg_server_config.lng
@@ -170,4 +170,5 @@
$wb['website_autoalias_note_txt'] = 'Placeholders:';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng
index c723799..1f8e3f7 100644
--- a/interface/web/admin/lib/lang/br_server_config.lng
+++ b/interface/web/admin/lib/lang/br_server_config.lng
@@ -170,4 +170,5 @@
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/cz.lng b/interface/web/admin/lib/lang/cz.lng
index 8c80d12..bc1c9bb 100644
--- a/interface/web/admin/lib/lang/cz.lng
+++ b/interface/web/admin/lib/lang/cz.lng
@@ -48,5 +48,3 @@
$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 9a579d2..c6a8909 100644
--- a/interface/web/admin/lib/lang/cz_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/cz_directive_snippets.lng
@@ -7,5 +7,3 @@
$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 cf1bb28..c6f444b 100644
--- a/interface/web/admin/lib/lang/cz_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/cz_directive_snippets_list.lng
@@ -5,5 +5,3 @@
$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 df9386a..c6146ae 100644
--- a/interface/web/admin/lib/lang/cz_firewall.lng
+++ b/interface/web/admin/lib/lang/cz_firewall.lng
@@ -9,5 +9,3 @@
$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 da1af43..aecc4cf 100644
--- a/interface/web/admin/lib/lang/cz_firewall_list.lng
+++ b/interface/web/admin/lib/lang/cz_firewall_list.lng
@@ -6,5 +6,3 @@
$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 0f1a6be..a6281be 100644
--- a/interface/web/admin/lib/lang/cz_groups.lng
+++ b/interface/web/admin/lib/lang/cz_groups.lng
@@ -3,5 +3,3 @@
$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 f285b38..c1d7ef9 100644
--- a/interface/web/admin/lib/lang/cz_groups_list.lng
+++ b/interface/web/admin/lib/lang/cz_groups_list.lng
@@ -5,5 +5,3 @@
$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 6a57b7c..a40fc04 100644
--- a/interface/web/admin/lib/lang/cz_iptables.lng
+++ b/interface/web/admin/lib/lang/cz_iptables.lng
@@ -11,5 +11,3 @@
$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 3dbc906..65cef75 100644
--- a/interface/web/admin/lib/lang/cz_iptables_list.lng
+++ b/interface/web/admin/lib/lang/cz_iptables_list.lng
@@ -13,5 +13,3 @@
$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 d95f12e..285dff2 100644
--- a/interface/web/admin/lib/lang/cz_language_add.lng
+++ b/interface/web/admin/lib/lang/cz_language_add.lng
@@ -6,5 +6,3 @@
$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 eb222b3..f1e6f49 100644
--- a/interface/web/admin/lib/lang/cz_language_complete.lng
+++ b/interface/web/admin/lib/lang/cz_language_complete.lng
@@ -5,5 +5,3 @@
$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 f880e6d..2a71ed0 100644
--- a/interface/web/admin/lib/lang/cz_language_edit.lng
+++ b/interface/web/admin/lib/lang/cz_language_edit.lng
@@ -6,5 +6,3 @@
$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 7ffdccf..7998eea 100644
--- a/interface/web/admin/lib/lang/cz_language_export.lng
+++ b/interface/web/admin/lib/lang/cz_language_export.lng
@@ -4,5 +4,3 @@
$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 17dfa89..838c325 100644
--- a/interface/web/admin/lib/lang/cz_language_import.lng
+++ b/interface/web/admin/lib/lang/cz_language_import.lng
@@ -6,5 +6,3 @@
$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 77810e0..b2a7863 100644
--- a/interface/web/admin/lib/lang/cz_language_list.lng
+++ b/interface/web/admin/lib/lang/cz_language_list.lng
@@ -5,5 +5,3 @@
$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 dd409d3..3f8e849 100644
--- a/interface/web/admin/lib/lang/cz_login_as.lng
+++ b/interface/web/admin/lib/lang/cz_login_as.lng
@@ -9,5 +9,3 @@
$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 f48a2c4..64a190d 100644
--- a/interface/web/admin/lib/lang/cz_package_install.lng
+++ b/interface/web/admin/lib/lang/cz_package_install.lng
@@ -5,5 +5,3 @@
$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 11747ab..68da1c0 100644
--- a/interface/web/admin/lib/lang/cz_remote_action.lng
+++ b/interface/web/admin/lib/lang/cz_remote_action.lng
@@ -2,13 +2,11 @@
$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 a34b3d7..17c4f05 100644
--- a/interface/web/admin/lib/lang/cz_remote_user.lng
+++ b/interface/web/admin/lib/lang/cz_remote_user.lng
@@ -45,5 +45,3 @@
$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 1b40308..66b6494 100644
--- a/interface/web/admin/lib/lang/cz_remote_user_list.lng
+++ b/interface/web/admin/lib/lang/cz_remote_user_list.lng
@@ -5,5 +5,3 @@
$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 9d44fd2..a087656 100644
--- a/interface/web/admin/lib/lang/cz_server.lng
+++ b/interface/web/admin/lib/lang/cz_server.lng
@@ -13,5 +13,3 @@
$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 0e58bf2..c0e4240 100644
--- a/interface/web/admin/lib/lang/cz_server_config.lng
+++ b/interface/web/admin/lib/lang/cz_server_config.lng
@@ -170,6 +170,5 @@
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Při překročení limitu přenesených dat, poslat oznámení adminovi';
$wb['overtraffic_notify_client_txt'] = 'Při překročení limitu přenesených dat, poslat oznámení klientovi';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
-
-
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 8589dbc..2118c35 100644
--- a/interface/web/admin/lib/lang/cz_server_config_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_config_list.lng
@@ -2,5 +2,3 @@
$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 a948939..43a382a 100644
--- a/interface/web/admin/lib/lang/cz_server_ip.lng
+++ b/interface/web/admin/lib/lang/cz_server_ip.lng
@@ -9,5 +9,3 @@
$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 2a47ca7..93b0b77 100644
--- a/interface/web/admin/lib/lang/cz_server_ip_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_ip_list.lng
@@ -8,5 +8,3 @@
$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 e7a2efd..ecddbf2 100644
--- a/interface/web/admin/lib/lang/cz_server_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_list.lng
@@ -11,5 +11,3 @@
$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 59cf3c7..10aba05 100644
--- a/interface/web/admin/lib/lang/cz_server_php.lng
+++ b/interface/web/admin/lib/lang/cz_server_php.lng
@@ -14,5 +14,3 @@
$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 e0b43a4..36b28fe 100644
--- a/interface/web/admin/lib/lang/cz_server_php_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_php_list.lng
@@ -5,5 +5,3 @@
$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 8344025..0d079ef 100644
--- a/interface/web/admin/lib/lang/cz_software_package_install.lng
+++ b/interface/web/admin/lib/lang/cz_software_package_install.lng
@@ -4,5 +4,3 @@
$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 1a59b58..7df837f 100644
--- a/interface/web/admin/lib/lang/cz_software_package_list.lng
+++ b/interface/web/admin/lib/lang/cz_software_package_list.lng
@@ -9,5 +9,3 @@
$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 f48a2c4..64a190d 100644
--- a/interface/web/admin/lib/lang/cz_software_repo.lng
+++ b/interface/web/admin/lib/lang/cz_software_repo.lng
@@ -5,5 +5,3 @@
$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 4ae3c66..5c82d4c 100644
--- a/interface/web/admin/lib/lang/cz_software_repo_list.lng
+++ b/interface/web/admin/lib/lang/cz_software_repo_list.lng
@@ -4,5 +4,3 @@
$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 4e7d161..c48ad8c 100644
--- a/interface/web/admin/lib/lang/cz_software_update_list.lng
+++ b/interface/web/admin/lib/lang/cz_software_update_list.lng
@@ -7,5 +7,3 @@
$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 67253c6..8073830 100644
--- a/interface/web/admin/lib/lang/cz_system_config.lng
+++ b/interface/web/admin/lib/lang/cz_system_config.lng
@@ -50,5 +50,3 @@
$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 edf6696..480d504 100644
--- a/interface/web/admin/lib/lang/cz_tpl_default_admin.lng
+++ b/interface/web/admin/lib/lang/cz_tpl_default_admin.lng
@@ -16,5 +16,3 @@
$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 1f3cb59..16f4812 100644
--- a/interface/web/admin/lib/lang/cz_users.lng
+++ b/interface/web/admin/lib/lang/cz_users.lng
@@ -31,5 +31,3 @@
$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 a4915a4..e5a7d1e 100644
--- a/interface/web/admin/lib/lang/cz_users_list.lng
+++ b/interface/web/admin/lib/lang/cz_users_list.lng
@@ -7,5 +7,3 @@
$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 2c852ed..3611969 100644
--- a/interface/web/admin/lib/lang/de_server_config.lng
+++ b/interface/web/admin/lib/lang/de_server_config.lng
@@ -170,6 +170,7 @@
$wb['web_folder_protection_txt'] = 'Webverzeichnis unveränderlich machen (erweiterte Attribute)';
$wb['overtraffic_notify_admin_txt'] = 'Überschreiten des Transfer Limits an den Administrator senden';
$wb['overtraffic_notify_client_txt'] = 'Überschreiten des Transfer Limits an den Kunden senden';
+$wb['rbl_error_regex'] = 'Bitte geben Sie gültige RBL-Hostnamen an.';
$wb['php_ini_check_minutes_txt'] = 'Prüfe System php.ini Dateien auf Änderungen alle';
$wb['php_ini_check_minutes_info_txt'] = 'Minute(n) (0 deaktiviert diese Funktion)';
$wb['php_ini_check_minutes_error_empty'] = 'Der Wert für die Einstellung der php.ini Prüfung ist ungültig.';
diff --git a/interface/web/admin/lib/lang/de_system_config.lng b/interface/web/admin/lib/lang/de_system_config.lng
index a3cd4a9..c3e4116 100644
--- a/interface/web/admin/lib/lang/de_system_config.lng
+++ b/interface/web/admin/lib/lang/de_system_config.lng
@@ -49,5 +49,6 @@
$wb['mailbox_show_autoresponder_tab_txt'] = 'Zeige Autoresponder Reiter in E-Mail Kontodetails';
$wb['mailbox_show_mail_filter_tab_txt'] = 'Zeige E-Mail Filter Reiter in E-Mail Kontodetails';
$wb['mailbox_show_custom_rules_tab_txt'] = 'Zeige Benutzerregel Reiter in E-Mail Kontodetails';
+$wb['webmail_url_error_regex'] = 'Falsche Webmail URL';
$wb['reseller_can_use_options_txt'] = 'Reseller können den Optionen Reiter bei Webseiten verwenden';
?>
diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng
index 5768d3f..b9913e6 100644
--- a/interface/web/admin/lib/lang/el_server_config.lng
+++ b/interface/web/admin/lib/lang/el_server_config.lng
@@ -170,4 +170,5 @@
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/en_system_config.lng b/interface/web/admin/lib/lang/en_system_config.lng
index ba061de..a6bf4cb 100644
--- a/interface/web/admin/lib/lang/en_system_config.lng
+++ b/interface/web/admin/lib/lang/en_system_config.lng
@@ -52,5 +52,6 @@
$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['webmail_url_error_regex'] = 'Invalid webmail URL';
$wb['reseller_can_use_options_txt'] = 'Reseller can use options tab in web sites config';
?>
diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng
index 4310764..92d9b45 100644
--- a/interface/web/admin/lib/lang/es_server_config.lng
+++ b/interface/web/admin/lib/lang/es_server_config.lng
@@ -170,4 +170,5 @@
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng
index d56ca75..0bddcc7 100755
--- a/interface/web/admin/lib/lang/fi_server_config.lng
+++ b/interface/web/admin/lib/lang/fi_server_config.lng
@@ -170,4 +170,5 @@
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/fr_server_config.lng b/interface/web/admin/lib/lang/fr_server_config.lng
index 595596c..c74d89e 100644
--- a/interface/web/admin/lib/lang/fr_server_config.lng
+++ b/interface/web/admin/lib/lang/fr_server_config.lng
@@ -170,4 +170,5 @@
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/hr_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng
index 5c9e7d0..27168f2 100644
--- a/interface/web/admin/lib/lang/hr_server_config.lng
+++ b/interface/web/admin/lib/lang/hr_server_config.lng
@@ -170,4 +170,5 @@
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/hu_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng
index c3a6806..5349608 100644
--- a/interface/web/admin/lib/lang/hu_server_config.lng
+++ b/interface/web/admin/lib/lang/hu_server_config.lng
@@ -170,4 +170,5 @@
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/id_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng
index 34ea127..39217c3 100644
--- a/interface/web/admin/lib/lang/id_server_config.lng
+++ b/interface/web/admin/lib/lang/id_server_config.lng
@@ -170,4 +170,5 @@
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/it_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng
index 9a32425..6bea4d2 100644
--- a/interface/web/admin/lib/lang/it_server_config.lng
+++ b/interface/web/admin/lib/lang/it_server_config.lng
@@ -170,4 +170,5 @@
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/ja_server_config.lng b/interface/web/admin/lib/lang/ja_server_config.lng
index 2cd8c38..ce88036 100644
--- a/interface/web/admin/lib/lang/ja_server_config.lng
+++ b/interface/web/admin/lib/lang/ja_server_config.lng
@@ -170,4 +170,5 @@
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng
index 4cb3092..c3b3ce0 100644
--- a/interface/web/admin/lib/lang/nl_server_config.lng
+++ b/interface/web/admin/lib/lang/nl_server_config.lng
@@ -170,4 +170,5 @@
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/pl.lng b/interface/web/admin/lib/lang/pl.lng
index 40c3594..e06fba3 100644
--- a/interface/web/admin/lib/lang/pl.lng
+++ b/interface/web/admin/lib/lang/pl.lng
@@ -48,4 +48,3 @@
$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 e4c5572..acd6451 100644
--- a/interface/web/admin/lib/lang/pl_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/pl_directive_snippets.lng
@@ -7,4 +7,3 @@
$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 41c6364..8d73102 100644
--- a/interface/web/admin/lib/lang/pl_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/pl_directive_snippets_list.lng
@@ -5,4 +5,3 @@
$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 8098fcc..5681789 100644
--- a/interface/web/admin/lib/lang/pl_firewall.lng
+++ b/interface/web/admin/lib/lang/pl_firewall.lng
@@ -9,4 +9,3 @@
$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 fe80e43..6a4b838 100644
--- a/interface/web/admin/lib/lang/pl_firewall_list.lng
+++ b/interface/web/admin/lib/lang/pl_firewall_list.lng
@@ -6,4 +6,3 @@
$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 a97ac3f..b3c8b9c 100644
--- a/interface/web/admin/lib/lang/pl_groups.lng
+++ b/interface/web/admin/lib/lang/pl_groups.lng
@@ -3,4 +3,3 @@
$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 9409d32..75756bc 100644
--- a/interface/web/admin/lib/lang/pl_groups_list.lng
+++ b/interface/web/admin/lib/lang/pl_groups_list.lng
@@ -5,4 +5,3 @@
$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 8073e5d..f6be566 100644
--- a/interface/web/admin/lib/lang/pl_iptables.lng
+++ b/interface/web/admin/lib/lang/pl_iptables.lng
@@ -11,4 +11,3 @@
$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 255a829..2f74b18 100644
--- a/interface/web/admin/lib/lang/pl_iptables_list.lng
+++ b/interface/web/admin/lib/lang/pl_iptables_list.lng
@@ -13,4 +13,3 @@
$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 df1a5f3..82e42ef 100644
--- a/interface/web/admin/lib/lang/pl_language_add.lng
+++ b/interface/web/admin/lib/lang/pl_language_add.lng
@@ -6,4 +6,3 @@
$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 6d6d8ec..0096c69 100644
--- a/interface/web/admin/lib/lang/pl_language_complete.lng
+++ b/interface/web/admin/lib/lang/pl_language_complete.lng
@@ -5,4 +5,3 @@
$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 b4ec35d..3a5e706 100644
--- a/interface/web/admin/lib/lang/pl_language_edit.lng
+++ b/interface/web/admin/lib/lang/pl_language_edit.lng
@@ -6,4 +6,3 @@
$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 0b38a48..e58dbf0 100644
--- a/interface/web/admin/lib/lang/pl_language_export.lng
+++ b/interface/web/admin/lib/lang/pl_language_export.lng
@@ -4,4 +4,3 @@
$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 e78238a..077d0c0 100644
--- a/interface/web/admin/lib/lang/pl_language_import.lng
+++ b/interface/web/admin/lib/lang/pl_language_import.lng
@@ -6,4 +6,3 @@
$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 14b7cdb..05fd6e3 100644
--- a/interface/web/admin/lib/lang/pl_language_list.lng
+++ b/interface/web/admin/lib/lang/pl_language_list.lng
@@ -5,4 +5,3 @@
$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 a505494..f00e042 100644
--- a/interface/web/admin/lib/lang/pl_login_as.lng
+++ b/interface/web/admin/lib/lang/pl_login_as.lng
@@ -9,4 +9,3 @@
$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 ce5c73c..3043908 100644
--- a/interface/web/admin/lib/lang/pl_package_install.lng
+++ b/interface/web/admin/lib/lang/pl_package_install.lng
@@ -5,4 +5,3 @@
$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 36b0383..83fbc9e 100644
--- a/interface/web/admin/lib/lang/pl_remote_action.lng
+++ b/interface/web/admin/lib/lang/pl_remote_action.lng
@@ -10,4 +10,3 @@
$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 6c55771..b456de8 100644
--- a/interface/web/admin/lib/lang/pl_remote_user.lng
+++ b/interface/web/admin/lib/lang/pl_remote_user.lng
@@ -45,4 +45,3 @@
$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 976e313..6dd12ae 100644
--- a/interface/web/admin/lib/lang/pl_remote_user_list.lng
+++ b/interface/web/admin/lib/lang/pl_remote_user_list.lng
@@ -5,4 +5,3 @@
$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 2ebbeb2..5e9c411 100644
--- a/interface/web/admin/lib/lang/pl_server.lng
+++ b/interface/web/admin/lib/lang/pl_server.lng
@@ -13,4 +13,3 @@
$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 05836f6..175c9be 100644
--- a/interface/web/admin/lib/lang/pl_server_config.lng
+++ b/interface/web/admin/lib/lang/pl_server_config.lng
@@ -170,5 +170,5 @@
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$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';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
-
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 e700889..f9e8dcf 100644
--- a/interface/web/admin/lib/lang/pl_server_config_list.lng
+++ b/interface/web/admin/lib/lang/pl_server_config_list.lng
@@ -2,4 +2,3 @@
$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 2c107d0..cb16e10 100644
--- a/interface/web/admin/lib/lang/pl_server_ip.lng
+++ b/interface/web/admin/lib/lang/pl_server_ip.lng
@@ -9,4 +9,3 @@
$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 dcf8951..64b004d 100644
--- a/interface/web/admin/lib/lang/pl_server_ip_list.lng
+++ b/interface/web/admin/lib/lang/pl_server_ip_list.lng
@@ -8,4 +8,3 @@
$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 9ca9eb8..81356ac 100644
--- a/interface/web/admin/lib/lang/pl_server_list.lng
+++ b/interface/web/admin/lib/lang/pl_server_list.lng
@@ -11,4 +11,3 @@
$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 54d0ef2..298eca6 100644
--- a/interface/web/admin/lib/lang/pl_server_php.lng
+++ b/interface/web/admin/lib/lang/pl_server_php.lng
@@ -14,4 +14,3 @@
$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 dc697ae..b402fd1 100644
--- a/interface/web/admin/lib/lang/pl_server_php_list.lng
+++ b/interface/web/admin/lib/lang/pl_server_php_list.lng
@@ -5,4 +5,3 @@
$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 ea9290b..fd2f293 100644
--- a/interface/web/admin/lib/lang/pl_software_package_install.lng
+++ b/interface/web/admin/lib/lang/pl_software_package_install.lng
@@ -4,4 +4,3 @@
$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 e1ffd2c..78c412c 100644
--- a/interface/web/admin/lib/lang/pl_software_package_list.lng
+++ b/interface/web/admin/lib/lang/pl_software_package_list.lng
@@ -9,4 +9,3 @@
$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 84d9c9e..d11a1b3 100644
--- a/interface/web/admin/lib/lang/pl_software_repo.lng
+++ b/interface/web/admin/lib/lang/pl_software_repo.lng
@@ -5,4 +5,3 @@
$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 85a54b0..7ca6af9 100644
--- a/interface/web/admin/lib/lang/pl_software_repo_list.lng
+++ b/interface/web/admin/lib/lang/pl_software_repo_list.lng
@@ -4,4 +4,3 @@
$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 31a3dd0..aa49fba 100644
--- a/interface/web/admin/lib/lang/pl_software_update_list.lng
+++ b/interface/web/admin/lib/lang/pl_software_update_list.lng
@@ -7,4 +7,3 @@
$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 42da3d1..dbcd61f 100644
--- a/interface/web/admin/lib/lang/pl_system_config.lng
+++ b/interface/web/admin/lib/lang/pl_system_config.lng
@@ -50,4 +50,3 @@
$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 ed5fe51..eee3af5 100644
--- a/interface/web/admin/lib/lang/pl_tpl_default_admin.lng
+++ b/interface/web/admin/lib/lang/pl_tpl_default_admin.lng
@@ -16,4 +16,3 @@
$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 f645401..586e9ff 100644
--- a/interface/web/admin/lib/lang/pl_users.lng
+++ b/interface/web/admin/lib/lang/pl_users.lng
@@ -31,4 +31,3 @@
$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 16e1804..7def402 100644
--- a/interface/web/admin/lib/lang/pl_users_list.lng
+++ b/interface/web/admin/lib/lang/pl_users_list.lng
@@ -7,4 +7,3 @@
$wb['active_txt'] = 'Aktywny';
$wb['groups_txt'] = 'Grupy';
?>
-
diff --git a/interface/web/admin/lib/lang/pt_server_config.lng b/interface/web/admin/lib/lang/pt_server_config.lng
index 3470e28..25d19f3 100644
--- a/interface/web/admin/lib/lang/pt_server_config.lng
+++ b/interface/web/admin/lib/lang/pt_server_config.lng
@@ -170,4 +170,5 @@
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/ro_server_config.lng b/interface/web/admin/lib/lang/ro_server_config.lng
index 56ce46c..d3247ac 100644
--- a/interface/web/admin/lib/lang/ro_server_config.lng
+++ b/interface/web/admin/lib/lang/ro_server_config.lng
@@ -170,4 +170,5 @@
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng
index fd76bf6..f9cea0c 100644
--- a/interface/web/admin/lib/lang/ru_server_config.lng
+++ b/interface/web/admin/lib/lang/ru_server_config.lng
@@ -170,4 +170,5 @@
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng
index 0d16ced..df557e2 100644
--- a/interface/web/admin/lib/lang/se_server_config.lng
+++ b/interface/web/admin/lib/lang/se_server_config.lng
@@ -170,4 +170,5 @@
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/lib/lang/sk_server_config.lng b/interface/web/admin/lib/lang/sk_server_config.lng
index d2f27c7..0ea3647 100644
--- a/interface/web/admin/lib/lang/sk_server_config.lng
+++ b/interface/web/admin/lib/lang/sk_server_config.lng
@@ -170,4 +170,5 @@
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
?>
diff --git a/interface/web/admin/templates/server_ip_list.htm b/interface/web/admin/templates/server_ip_list.htm
index 713e1e9..d83724c 100644
--- a/interface/web/admin/templates/server_ip_list.htm
+++ b/interface/web/admin/templates/server_ip_list.htm
@@ -18,7 +18,7 @@
<thead>
<tr class="caption">
<th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_client_pid" scope="col"><tmpl_var name="client_id_txt"></th>
+ <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
<th class="tbl_col_ip_type" scope="col"><tmpl_var name="ip_type_txt"></th>
<th class="tbl_col_ip_address" scope="col"><tmpl_var name="ip_address_txt"></th>
<th class="tbl_col_virtualhost" scope="col"><tmpl_var name="virtualhost_txt"></th>
@@ -27,7 +27,7 @@
</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_client_pid"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
+ <td class="tbl_col_client_id"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
<td class="tbl_col_ip_type"><select name="search_ip_type">{tmpl_var name='search_ip_type'}</select></td>
<td class="tbl_col_ip_address"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></td>
<td class="tbl_col_virtualhost"><select name="search_virtualhost">{tmpl_var name='search_virtualhost'}</select></td>
@@ -41,7 +41,7 @@
<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_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_client_pid"><a href="#" onclick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
+ <td class="tbl_col_client_id"><a href="#" onclick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
<td class="tbl_col_ip_type"><a href="#" onclick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ip_type"}</a></td>
<td class="tbl_col_ip_address"><a href="#" onclick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ip_address"}</a></td>
<td class="tbl_col_virtualhost"><a href="#" onclick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="virtualhost"}</a></td>
diff --git a/interface/web/client/lib/lang/cz.lng b/interface/web/client/lib/lang/cz.lng
index 9c1d91c..8efa987 100644
--- a/interface/web/client/lib/lang/cz.lng
+++ b/interface/web/client/lib/lang/cz.lng
@@ -23,5 +23,3 @@
$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 bb885e9..eb1273f 100644
--- a/interface/web/client/lib/lang/cz_client.lng
+++ b/interface/web/client/lib/lang/cz_client.lng
@@ -144,5 +144,3 @@
$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 cb4b143..f26e2d6 100644
--- a/interface/web/client/lib/lang/cz_client_circle.lng
+++ b/interface/web/client/lib/lang/cz_client_circle.lng
@@ -7,5 +7,3 @@
$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 2402551..e827605 100644
--- a/interface/web/client/lib/lang/cz_client_circle_list.lng
+++ b/interface/web/client/lib/lang/cz_client_circle_list.lng
@@ -8,5 +8,3 @@
$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 a759ab6..4515806 100644
--- a/interface/web/client/lib/lang/cz_client_del.lng
+++ b/interface/web/client/lib/lang/cz_client_del.lng
@@ -4,5 +4,3 @@
$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 f1c3870..d980d55 100644
--- a/interface/web/client/lib/lang/cz_client_message.lng
+++ b/interface/web/client/lib/lang/cz_client_message.lng
@@ -16,5 +16,3 @@
$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 94ee886..5c84069 100644
--- a/interface/web/client/lib/lang/cz_client_template.lng
+++ b/interface/web/client/lib/lang/cz_client_template.lng
@@ -88,5 +88,3 @@
$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 7d9e923..c3faae1 100644
--- a/interface/web/client/lib/lang/cz_client_template_list.lng
+++ b/interface/web/client/lib/lang/cz_client_template_list.lng
@@ -3,5 +3,3 @@
$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 ffd1b8e..9657cb7 100644
--- a/interface/web/client/lib/lang/cz_clients_list.lng
+++ b/interface/web/client/lib/lang/cz_clients_list.lng
@@ -9,5 +9,3 @@
$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 26117ae..34ba70c 100644
--- a/interface/web/client/lib/lang/cz_domain.lng
+++ b/interface/web/client/lib/lang/cz_domain.lng
@@ -4,5 +4,3 @@
$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 9b52d04..6cf7376 100644
--- a/interface/web/client/lib/lang/cz_domain_list.lng
+++ b/interface/web/client/lib/lang/cz_domain_list.lng
@@ -4,5 +4,3 @@
$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 53f079e..6e7fec6 100644
--- a/interface/web/client/lib/lang/cz_reseller.lng
+++ b/interface/web/client/lib/lang/cz_reseller.lng
@@ -143,5 +143,3 @@
$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 fb23672..8e72797 100644
--- a/interface/web/client/lib/lang/cz_resellers_list.lng
+++ b/interface/web/client/lib/lang/cz_resellers_list.lng
@@ -9,5 +9,3 @@
$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 8cf5522..46afed5 100644
--- a/interface/web/client/lib/lang/de_client.lng
+++ b/interface/web/client/lib/lang/de_client.lng
@@ -143,4 +143,4 @@
$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 fa38a8e..14cd58a 100644
--- a/interface/web/client/lib/lang/de_reseller.lng
+++ b/interface/web/client/lib/lang/de_reseller.lng
@@ -142,4 +142,4 @@
$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/pl.lng b/interface/web/client/lib/lang/pl.lng
index 7ecf640..2727435 100644
--- a/interface/web/client/lib/lang/pl.lng
+++ b/interface/web/client/lib/lang/pl.lng
@@ -23,4 +23,3 @@
$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 8cda7bd..3607bff 100644
--- a/interface/web/client/lib/lang/pl_client.lng
+++ b/interface/web/client/lib/lang/pl_client.lng
@@ -144,4 +144,3 @@
$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 0612768..f98a144 100644
--- a/interface/web/client/lib/lang/pl_client_circle.lng
+++ b/interface/web/client/lib/lang/pl_client_circle.lng
@@ -7,4 +7,3 @@
$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 b424448..00fd0b3 100644
--- a/interface/web/client/lib/lang/pl_client_circle_list.lng
+++ b/interface/web/client/lib/lang/pl_client_circle_list.lng
@@ -8,4 +8,3 @@
$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 aab69a4..666e12a 100644
--- a/interface/web/client/lib/lang/pl_client_del.lng
+++ b/interface/web/client/lib/lang/pl_client_del.lng
@@ -4,4 +4,3 @@
$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 726f388..d156f31 100644
--- a/interface/web/client/lib/lang/pl_client_message.lng
+++ b/interface/web/client/lib/lang/pl_client_message.lng
@@ -16,4 +16,3 @@
$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 cd017fb..cbcf1a3 100644
--- a/interface/web/client/lib/lang/pl_client_template.lng
+++ b/interface/web/client/lib/lang/pl_client_template.lng
@@ -88,4 +88,3 @@
$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 7620441..06a3976 100644
--- a/interface/web/client/lib/lang/pl_client_template_list.lng
+++ b/interface/web/client/lib/lang/pl_client_template_list.lng
@@ -3,4 +3,3 @@
$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 aa07671..c790271 100644
--- a/interface/web/client/lib/lang/pl_clients_list.lng
+++ b/interface/web/client/lib/lang/pl_clients_list.lng
@@ -9,4 +9,3 @@
$wb['username_txt'] = 'Login';
$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 9854e89..9f3e80f 100644
--- a/interface/web/client/lib/lang/pl_domain.lng
+++ b/interface/web/client/lib/lang/pl_domain.lng
@@ -4,4 +4,3 @@
$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 d31e7df..e2cac3b 100644
--- a/interface/web/client/lib/lang/pl_domain_list.lng
+++ b/interface/web/client/lib/lang/pl_domain_list.lng
@@ -4,4 +4,3 @@
$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 8c2dd69..64bd813 100644
--- a/interface/web/client/lib/lang/pl_reseller.lng
+++ b/interface/web/client/lib/lang/pl_reseller.lng
@@ -143,4 +143,3 @@
$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 6b277bf..176c73e 100644
--- a/interface/web/client/lib/lang/pl_resellers_list.lng
+++ b/interface/web/client/lib/lang/pl_resellers_list.lng
@@ -9,4 +9,3 @@
$wb['customer_no_txt'] = 'Nr klienta';
$wb['username_txt'] = 'Login';
?>
-
diff --git a/interface/web/dashboard/lib/lang/cz.lng b/interface/web/dashboard/lib/lang/cz.lng
index 297b639..9d2a321 100644
--- a/interface/web/dashboard/lib/lang/cz.lng
+++ b/interface/web/dashboard/lib/lang/cz.lng
@@ -2,5 +2,3 @@
$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 9810ba9..bedb98f 100644
--- a/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
@@ -28,5 +28,3 @@
$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 a25ba21..66275f1 100644
--- a/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng
@@ -1,5 +1,3 @@
<?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 9a8b669..5ef320a 100644
--- a/interface/web/dashboard/lib/lang/pl.lng
+++ b/interface/web/dashboard/lib/lang/pl.lng
@@ -2,4 +2,3 @@
$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 b0c28ec..d69a551 100644
--- a/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng
@@ -28,4 +28,3 @@
$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 e329a25..fafcc61 100644
--- a/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng
@@ -1,4 +1,3 @@
<?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 dd815ad..acb6c35 100644
--- a/interface/web/designer/lib/lang/cz.lng
+++ b/interface/web/designer/lib/lang/cz.lng
@@ -1,4 +1,2 @@
<?php
?>
-
-
diff --git a/interface/web/designer/lib/lang/cz_form_edit.lng b/interface/web/designer/lib/lang/cz_form_edit.lng
index 2b04eb9..75bf5a5 100644
--- a/interface/web/designer/lib/lang/cz_form_edit.lng
+++ b/interface/web/designer/lib/lang/cz_form_edit.lng
@@ -22,5 +22,3 @@
$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 46241cf..1e677f2 100644
--- a/interface/web/designer/lib/lang/cz_form_list.lng
+++ b/interface/web/designer/lib/lang/cz_form_list.lng
@@ -5,5 +5,3 @@
$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 45829d5..381414b 100644
--- a/interface/web/designer/lib/lang/cz_form_show.lng
+++ b/interface/web/designer/lib/lang/cz_form_show.lng
@@ -16,5 +16,3 @@
$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 f6da04e..847896d 100644
--- a/interface/web/designer/lib/lang/cz_module_edit.lng
+++ b/interface/web/designer/lib/lang/cz_module_edit.lng
@@ -20,5 +20,3 @@
<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 b37872c..b568f69 100644
--- a/interface/web/designer/lib/lang/cz_module_list.lng
+++ b/interface/web/designer/lib/lang/cz_module_list.lng
@@ -3,5 +3,3 @@
$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 8c21ea4..01f5df6 100644
--- a/interface/web/designer/lib/lang/cz_module_nav_edit.lng
+++ b/interface/web/designer/lib/lang/cz_module_nav_edit.lng
@@ -4,5 +4,3 @@
$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 65f6c76..17e3131 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,5 +6,3 @@
$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 605d11d..95c2d85 100644
--- a/interface/web/designer/lib/lang/cz_module_show.lng
+++ b/interface/web/designer/lib/lang/cz_module_show.lng
@@ -14,5 +14,3 @@
$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 29f4a51..acb6c35 100644
--- a/interface/web/designer/lib/lang/pl.lng
+++ b/interface/web/designer/lib/lang/pl.lng
@@ -1,3 +1,2 @@
<?php
?>
-
diff --git a/interface/web/designer/lib/lang/pl_form_edit.lng b/interface/web/designer/lib/lang/pl_form_edit.lng
index cff6b51..ee4f4c4 100644
--- a/interface/web/designer/lib/lang/pl_form_edit.lng
+++ b/interface/web/designer/lib/lang/pl_form_edit.lng
@@ -22,4 +22,3 @@
$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 a0aacc3..ac85722 100644
--- a/interface/web/designer/lib/lang/pl_form_list.lng
+++ b/interface/web/designer/lib/lang/pl_form_list.lng
@@ -5,4 +5,3 @@
$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 fbb82a4..db62af1 100644
--- a/interface/web/designer/lib/lang/pl_form_show.lng
+++ b/interface/web/designer/lib/lang/pl_form_show.lng
@@ -16,4 +16,3 @@
$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 d05cb9f..b87d04b 100644
--- a/interface/web/designer/lib/lang/pl_module_edit.lng
+++ b/interface/web/designer/lib/lang/pl_module_edit.lng
@@ -20,4 +20,3 @@
<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 2751633..308d1c6 100644
--- a/interface/web/designer/lib/lang/pl_module_list.lng
+++ b/interface/web/designer/lib/lang/pl_module_list.lng
@@ -3,4 +3,3 @@
$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 54095f9..fe8edab 100644
--- a/interface/web/designer/lib/lang/pl_module_nav_edit.lng
+++ b/interface/web/designer/lib/lang/pl_module_nav_edit.lng
@@ -4,4 +4,3 @@
$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 1e2fde4..779b3b4 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,4 +6,3 @@
$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 6daf82e..9b98c49 100644
--- a/interface/web/designer/lib/lang/pl_module_show.lng
+++ b/interface/web/designer/lib/lang/pl_module_show.lng
@@ -14,4 +14,3 @@
$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 73483f7..8ce9b87 100644
--- a/interface/web/dns/dns_mx_edit.php
+++ b/interface/web/dns/dns_mx_edit.php
@@ -119,6 +119,17 @@
parent::onInsert();
}
+ function onUpdate() {
+ 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 id != ".$app->functions->intval($this->dataRecord["id"])." AND ".$app->tform->getAuthSQL('r'));
+
+ if(is_array($duplicate_mx) && !empty($duplicate_mx)) $app->error($app->tform->wordbook["duplicate_mx_record_txt"]);
+
+ parent::onUpdate();
+ }
+
function onAfterInsert() {
global $app, $conf;
diff --git a/interface/web/dns/dns_slave_edit.php b/interface/web/dns/dns_slave_edit.php
index 82d62b4..2a5247a 100644
--- a/interface/web/dns/dns_slave_edit.php
+++ b/interface/web/dns/dns_slave_edit.php
@@ -158,6 +158,17 @@
parent::onSubmit();
}
+ function onInsert() {
+ global $app, $conf;
+
+ // Check if record is existing already
+ $duplicate_slave = $app->db->queryOneRecord("SELECT * FROM dns_slave WHERE origin = '".$this->dataRecord["origin"]."' AND server_id = ".$app->functions->intval($this->dataRecord["server_id"])." AND ".$app->tform->getAuthSQL('r'));
+
+ if(is_array($duplicate_slave) && !empty($duplicate_slave)) $app->error($app->tform->wordbook["origin_error_unique"]);
+
+ parent::onInsert();
+ }
+
function onAfterInsert() {
global $app, $conf;
diff --git a/interface/web/dns/form/dns_slave.tform.php b/interface/web/dns/form/dns_slave.tform.php
index 744aa87..0ff6a5e 100644
--- a/interface/web/dns/form/dns_slave.tform.php
+++ b/interface/web/dns/form/dns_slave.tform.php
@@ -91,9 +91,11 @@
),
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
'errmsg'=> 'origin_error_empty'),
+ /*
1 => array ( 'type' => 'UNIQUE',
'errmsg'=> 'origin_error_unique'),
- 2 => array ( 'type' => 'REGEX',
+ */
+ 1 => array ( 'type' => 'REGEX',
'regex' => '/^[\w\.\-\/]{2,255}\.[a-zA-Z0-9\-]{2,10}[\.]{0,1}$/',
'errmsg'=> 'origin_error_regex'),
),
diff --git a/interface/web/dns/lib/lang/ar_dns_mx.lng b/interface/web/dns/lib/lang/ar_dns_mx.lng
index 648827f..68bf48a 100644
--- a/interface/web/dns/lib/lang/ar_dns_mx.lng
+++ b/interface/web/dns/lib/lang/ar_dns_mx.lng
@@ -13,4 +13,5 @@
$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.';
?>
diff --git a/interface/web/dns/lib/lang/bg_dns_mx.lng b/interface/web/dns/lib/lang/bg_dns_mx.lng
index 5f61437..f5369c7 100644
--- a/interface/web/dns/lib/lang/bg_dns_mx.lng
+++ b/interface/web/dns/lib/lang/bg_dns_mx.lng
@@ -13,4 +13,5 @@
$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.';
?>
diff --git a/interface/web/dns/lib/lang/br_dns_mx.lng b/interface/web/dns/lib/lang/br_dns_mx.lng
index 0dfd536..0f173a7 100644
--- a/interface/web/dns/lib/lang/br_dns_mx.lng
+++ b/interface/web/dns/lib/lang/br_dns_mx.lng
@@ -13,4 +13,5 @@
$wb['name_error_regex'] = 'Hostname tem um formato inválido.';
$wb['data_error_empty'] = 'Hostname do servidor de correio em branco';
$wb['data_error_regex'] = 'Hostname do servidor de correio formato inválido';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
diff --git a/interface/web/dns/lib/lang/cz.lng b/interface/web/dns/lib/lang/cz.lng
index 876a575..f143b0b 100644
--- a/interface/web/dns/lib/lang/cz.lng
+++ b/interface/web/dns/lib/lang/cz.lng
@@ -20,5 +20,3 @@
$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 6d9a24d..8b8c206 100644
--- a/interface/web/dns/lib/lang/cz_dns_a.lng
+++ b/interface/web/dns/lib/lang/cz_dns_a.lng
@@ -14,5 +14,3 @@
$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 9f16d3c..a61265a 100644
--- a/interface/web/dns/lib/lang/cz_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_a_list.lng
@@ -13,5 +13,3 @@
$wb['page_of_txt'] = 'z';
$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 143885f..26c6ae9 100644
--- a/interface/web/dns/lib/lang/cz_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/cz_dns_aaaa.lng
@@ -13,5 +13,3 @@
$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 c25dc7b..572478a 100644
--- a/interface/web/dns/lib/lang/cz_dns_alias.lng
+++ b/interface/web/dns/lib/lang/cz_dns_alias.lng
@@ -13,5 +13,3 @@
$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 29587c8..8494b7c 100644
--- a/interface/web/dns/lib/lang/cz_dns_cname.lng
+++ b/interface/web/dns/lib/lang/cz_dns_cname.lng
@@ -14,5 +14,3 @@
$wb['data_error_regex'] = 'Cílový hostname má chybný formát';
$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 3633fdb..5f67d5e 100644
--- a/interface/web/dns/lib/lang/cz_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/cz_dns_hinfo.lng
@@ -13,5 +13,3 @@
$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 9734b3e..8b25eba 100644
--- a/interface/web/dns/lib/lang/cz_dns_import.lng
+++ b/interface/web/dns/lib/lang/cz_dns_import.lng
@@ -12,5 +12,3 @@
$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 e0e475b..228d9d6 100644
--- a/interface/web/dns/lib/lang/cz_dns_mx.lng
+++ b/interface/web/dns/lib/lang/cz_dns_mx.lng
@@ -13,6 +13,5 @@
$wb['name_error_regex'] = 'Hostname 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';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_ns.lng b/interface/web/dns/lib/lang/cz_dns_ns.lng
index 4b01184..ba38e2a 100644
--- a/interface/web/dns/lib/lang/cz_dns_ns.lng
+++ b/interface/web/dns/lib/lang/cz_dns_ns.lng
@@ -13,5 +13,3 @@
$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 33f1166..9617ea5 100644
--- a/interface/web/dns/lib/lang/cz_dns_ptr.lng
+++ b/interface/web/dns/lib/lang/cz_dns_ptr.lng
@@ -13,5 +13,3 @@
$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 bcebed3..8b1e7e4 100644
--- a/interface/web/dns/lib/lang/cz_dns_rp.lng
+++ b/interface/web/dns/lib/lang/cz_dns_rp.lng
@@ -13,5 +13,3 @@
$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 b8cc5f1..16617f6 100644
--- a/interface/web/dns/lib/lang/cz_dns_slave.lng
+++ b/interface/web/dns/lib/lang/cz_dns_slave.lng
@@ -15,5 +15,3 @@
$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 eead22a..1e0a3d0 100644
--- a/interface/web/dns/lib/lang/cz_dns_slave_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_slave_list.lng
@@ -7,5 +7,3 @@
$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 8bc1eb8..c98cb6d 100644
--- a/interface/web/dns/lib/lang/cz_dns_soa.lng
+++ b/interface/web/dns/lib/lang/cz_dns_soa.lng
@@ -36,5 +36,3 @@
$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 999e5bd..beba8a2 100644
--- a/interface/web/dns/lib/lang/cz_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_soa_list.lng
@@ -8,5 +8,3 @@
$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 60d844a..6b6708f 100644
--- a/interface/web/dns/lib/lang/cz_dns_srv.lng
+++ b/interface/web/dns/lib/lang/cz_dns_srv.lng
@@ -17,5 +17,3 @@
$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 b91b3ae..be4ac0e 100644
--- a/interface/web/dns/lib/lang/cz_dns_template.lng
+++ b/interface/web/dns/lib/lang/cz_dns_template.lng
@@ -4,5 +4,3 @@
$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 a7218a4..bdd6e18 100644
--- a/interface/web/dns/lib/lang/cz_dns_template_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_template_list.lng
@@ -4,5 +4,3 @@
$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 8784c7e..76047b0 100644
--- a/interface/web/dns/lib/lang/cz_dns_txt.lng
+++ b/interface/web/dns/lib/lang/cz_dns_txt.lng
@@ -13,5 +13,3 @@
$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 2c54eaf..1b2e5f7 100644
--- a/interface/web/dns/lib/lang/cz_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/cz_dns_wizard.lng
@@ -36,5 +36,3 @@
$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.lng b/interface/web/dns/lib/lang/de.lng
index de5e1e9..822fcd6 100644
--- a/interface/web/dns/lib/lang/de.lng
+++ b/interface/web/dns/lib/lang/de.lng
@@ -17,6 +17,6 @@
$wb['DNS Wizard'] = 'DNS Assistent';
$wb['Add DNS Zone'] = 'DNS Zone hinzufügen';
$wb['Templates'] = 'Vorlagen';
-$wb['Secondary Zones'] = 'Zweiter DNS Zonen';
-$wb['Import Zone File'] = 'Zonen Datei Import';
+$wb['Secondary Zones'] = 'Slave DNS-Zonen';
+$wb['Import Zone File'] = 'Zonen-Datei-Import';
?>
diff --git a/interface/web/dns/lib/lang/de_dns_mx.lng b/interface/web/dns/lib/lang/de_dns_mx.lng
index f229c2c..4920806 100644
--- a/interface/web/dns/lib/lang/de_dns_mx.lng
+++ b/interface/web/dns/lib/lang/de_dns_mx.lng
@@ -13,5 +13,5 @@
$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.';
+$wb['duplicate_mx_record_txt'] = 'Doppelter MX-Eintrag.';
?>
diff --git a/interface/web/dns/lib/lang/de_dns_slave.lng b/interface/web/dns/lib/lang/de_dns_slave.lng
index a1677b6..1b58088 100644
--- a/interface/web/dns/lib/lang/de_dns_slave.lng
+++ b/interface/web/dns/lib/lang/de_dns_slave.lng
@@ -1,7 +1,7 @@
<?php
$wb['server_id_txt'] = 'Server';
-$wb['origin_txt'] = 'DNS Zone';
-$wb['secondary_zone_txt'] = 'Zweiter DNS Zone';
+$wb['origin_txt'] = 'DNS-Zone';
+$wb['secondary_zone_txt'] = 'Slave DNS-Zone';
$wb['ns_txt'] = 'NS (IP Adresse)';
$wb['active_txt'] = 'Aktiv';
$wb['limit_dns_slave_zone_txt'] = 'Die maximale Anzahl an Zweiter DNS Zonen für Ihr Konto wurde erreicht.';
diff --git a/interface/web/dns/lib/lang/de_dns_slave_list.lng b/interface/web/dns/lib/lang/de_dns_slave_list.lng
index f06b451..dc60207 100644
--- a/interface/web/dns/lib/lang/de_dns_slave_list.lng
+++ b/interface/web/dns/lib/lang/de_dns_slave_list.lng
@@ -1,9 +1,9 @@
<?php
-$wb['list_head_txt'] = 'Zweiter DNS Zonen';
+$wb['list_head_txt'] = 'Slave DNS-Zonen';
$wb['active_txt'] = 'Aktiv';
$wb['server_id_txt'] = 'Server';
$wb['origin_txt'] = 'Zone';
$wb['ns_txt'] = 'NS';
-$wb['add_new_record_txt'] = 'Neue Zweiter DNS Zone hinzufügen';
+$wb['add_new_record_txt'] = 'Neue Slave DNS-Zone hinzufügen';
$wb['eg_domain_tld'] = 'Format: domain.tld.';
?>
diff --git a/interface/web/dns/lib/lang/el_dns_mx.lng b/interface/web/dns/lib/lang/el_dns_mx.lng
index 890cfc9..37c967b 100644
--- a/interface/web/dns/lib/lang/el_dns_mx.lng
+++ b/interface/web/dns/lib/lang/el_dns_mx.lng
@@ -13,4 +13,5 @@
$wb['name_error_regex'] = 'Το hostname δεν έχει σωστή μορφοποίηση.';
$wb['data_error_empty'] = 'Το hostname Mailserver δεν έχει οριστεί';
$wb['data_error_regex'] = 'Mailserver hostname με μη έγκυρη μορφοποίηση';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
diff --git a/interface/web/dns/lib/lang/es_dns_mx.lng b/interface/web/dns/lib/lang/es_dns_mx.lng
index e7c377d..f51a325 100644
--- a/interface/web/dns/lib/lang/es_dns_mx.lng
+++ b/interface/web/dns/lib/lang/es_dns_mx.lng
@@ -13,4 +13,5 @@
$wb['name_error_regex'] = 'El formato del nombre de la máquina es incorrecto.';
$wb['data_error_empty'] = 'El nombre del servidor de correo está vacío.';
$wb['data_error_regex'] = 'El nombre del servidor de correo no es válido.';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
diff --git a/interface/web/dns/lib/lang/fi_dns_mx.lng b/interface/web/dns/lib/lang/fi_dns_mx.lng
index e4b4a60..1464071 100755
--- a/interface/web/dns/lib/lang/fi_dns_mx.lng
+++ b/interface/web/dns/lib/lang/fi_dns_mx.lng
@@ -13,4 +13,5 @@
$wb['name_error_regex'] = 'Verkkotunnus on väärän muotoinen.';
$wb['data_error_empty'] = 'Tekstikenttä on tyhjä';
$wb['data_error_regex'] = 'Tekstikenttä on vääränlainen';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
diff --git a/interface/web/dns/lib/lang/fr_dns_mx.lng b/interface/web/dns/lib/lang/fr_dns_mx.lng
index b625c12..4db3567 100644
--- a/interface/web/dns/lib/lang/fr_dns_mx.lng
+++ b/interface/web/dns/lib/lang/fr_dns_mx.lng
@@ -13,4 +13,5 @@
$wb['name_error_regex'] = 'Le format du nom d\'hôte est invalide.';
$wb['data_error_empty'] = 'Le nom d\'hôte du serveur mail est vide';
$wb['data_error_regex'] = 'Le format du nom d\'hôte du serveur mail est invalide';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
diff --git a/interface/web/dns/lib/lang/hr_dns_mx.lng b/interface/web/dns/lib/lang/hr_dns_mx.lng
index 8375fe8..9667adb 100644
--- a/interface/web/dns/lib/lang/hr_dns_mx.lng
+++ b/interface/web/dns/lib/lang/hr_dns_mx.lng
@@ -13,4 +13,5 @@
$wb['name_error_regex'] = 'Naziv hosta je u pogrešnom formatu.';
$wb['data_error_empty'] = 'Naziv mail hosta polje je prazno';
$wb['data_error_regex'] = 'Neispravan format naziva mail host zapisa';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
diff --git a/interface/web/dns/lib/lang/hu_dns_mx.lng b/interface/web/dns/lib/lang/hu_dns_mx.lng
index 67232f3..4de9b34 100644
--- a/interface/web/dns/lib/lang/hu_dns_mx.lng
+++ b/interface/web/dns/lib/lang/hu_dns_mx.lng
@@ -13,4 +13,5 @@
$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.';
?>
diff --git a/interface/web/dns/lib/lang/id_dns_mx.lng b/interface/web/dns/lib/lang/id_dns_mx.lng
index e483d77..e085e27 100644
--- a/interface/web/dns/lib/lang/id_dns_mx.lng
+++ b/interface/web/dns/lib/lang/id_dns_mx.lng
@@ -13,4 +13,5 @@
$wb['name_error_regex'] = 'Format Nama Host salah.';
$wb['data_error_empty'] = 'Nama Host Server Mail kosong';
$wb['data_error_regex'] = 'Format Nama Host Server Mail tidak valid';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
diff --git a/interface/web/dns/lib/lang/it_dns_mx.lng b/interface/web/dns/lib/lang/it_dns_mx.lng
index 648827f..68bf48a 100644
--- a/interface/web/dns/lib/lang/it_dns_mx.lng
+++ b/interface/web/dns/lib/lang/it_dns_mx.lng
@@ -13,4 +13,5 @@
$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.';
?>
diff --git a/interface/web/dns/lib/lang/ja_dns_mx.lng b/interface/web/dns/lib/lang/ja_dns_mx.lng
index 648827f..68bf48a 100644
--- a/interface/web/dns/lib/lang/ja_dns_mx.lng
+++ b/interface/web/dns/lib/lang/ja_dns_mx.lng
@@ -13,4 +13,5 @@
$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.';
?>
diff --git a/interface/web/dns/lib/lang/nl_dns_mx.lng b/interface/web/dns/lib/lang/nl_dns_mx.lng
index a148232..86be085 100644
--- a/interface/web/dns/lib/lang/nl_dns_mx.lng
+++ b/interface/web/dns/lib/lang/nl_dns_mx.lng
@@ -13,4 +13,5 @@
$wb['name_error_regex'] = 'De hostnaam heeft een onjuist formaat.';
$wb['data_error_empty'] = 'Mailserver hostnaam is niet ingvuld';
$wb['data_error_regex'] = 'Mailserver hostnaam formaat ongeldig';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
diff --git a/interface/web/dns/lib/lang/pl.lng b/interface/web/dns/lib/lang/pl.lng
index 6fca592..46f691e 100644
--- a/interface/web/dns/lib/lang/pl.lng
+++ b/interface/web/dns/lib/lang/pl.lng
@@ -20,4 +20,3 @@
$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 3aa2d68..f9b0997 100644
--- a/interface/web/dns/lib/lang/pl_dns_a.lng
+++ b/interface/web/dns/lib/lang/pl_dns_a.lng
@@ -14,4 +14,3 @@
$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 2fe8fbd..63a4df4 100644
--- a/interface/web/dns/lib/lang/pl_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/pl_dns_a_list.lng
@@ -13,4 +13,3 @@
$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 8c90e3f..f8e44e5 100644
--- a/interface/web/dns/lib/lang/pl_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/pl_dns_aaaa.lng
@@ -13,4 +13,3 @@
$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 44c377e..a950805 100644
--- a/interface/web/dns/lib/lang/pl_dns_alias.lng
+++ b/interface/web/dns/lib/lang/pl_dns_alias.lng
@@ -13,4 +13,3 @@
$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 5fbe693..c007ea6 100644
--- a/interface/web/dns/lib/lang/pl_dns_cname.lng
+++ b/interface/web/dns/lib/lang/pl_dns_cname.lng
@@ -14,4 +14,3 @@
$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 18f3b9f..d408e14 100644
--- a/interface/web/dns/lib/lang/pl_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/pl_dns_hinfo.lng
@@ -13,4 +13,3 @@
$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 b694185..62cfb4f 100644
--- a/interface/web/dns/lib/lang/pl_dns_import.lng
+++ b/interface/web/dns/lib/lang/pl_dns_import.lng
@@ -12,4 +12,3 @@
$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 d244013..8c612a5 100644
--- a/interface/web/dns/lib/lang/pl_dns_mx.lng
+++ b/interface/web/dns/lib/lang/pl_dns_mx.lng
@@ -13,5 +13,5 @@
$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.';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
-
diff --git a/interface/web/dns/lib/lang/pl_dns_ns.lng b/interface/web/dns/lib/lang/pl_dns_ns.lng
index d82dc48..18d7efd 100644
--- a/interface/web/dns/lib/lang/pl_dns_ns.lng
+++ b/interface/web/dns/lib/lang/pl_dns_ns.lng
@@ -13,4 +13,3 @@
$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 eeb03d6..eae3981 100644
--- a/interface/web/dns/lib/lang/pl_dns_ptr.lng
+++ b/interface/web/dns/lib/lang/pl_dns_ptr.lng
@@ -13,4 +13,3 @@
$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 587c735..43cbc51 100644
--- a/interface/web/dns/lib/lang/pl_dns_rp.lng
+++ b/interface/web/dns/lib/lang/pl_dns_rp.lng
@@ -13,4 +13,3 @@
$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 115dfc6..42dea7c 100644
--- a/interface/web/dns/lib/lang/pl_dns_slave.lng
+++ b/interface/web/dns/lib/lang/pl_dns_slave.lng
@@ -15,4 +15,3 @@
$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 010d78f..bbdb368 100644
--- a/interface/web/dns/lib/lang/pl_dns_slave_list.lng
+++ b/interface/web/dns/lib/lang/pl_dns_slave_list.lng
@@ -7,4 +7,3 @@
$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 c30b17b..b5471db 100644
--- a/interface/web/dns/lib/lang/pl_dns_soa.lng
+++ b/interface/web/dns/lib/lang/pl_dns_soa.lng
@@ -36,4 +36,3 @@
$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 0b17c90..d440e05 100644
--- a/interface/web/dns/lib/lang/pl_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/pl_dns_soa_list.lng
@@ -8,4 +8,3 @@
$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 228df53..eec182b 100644
--- a/interface/web/dns/lib/lang/pl_dns_srv.lng
+++ b/interface/web/dns/lib/lang/pl_dns_srv.lng
@@ -17,4 +17,3 @@
$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 fc7a0d6..f3e7563 100644
--- a/interface/web/dns/lib/lang/pl_dns_template.lng
+++ b/interface/web/dns/lib/lang/pl_dns_template.lng
@@ -4,4 +4,3 @@
$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 a74e0c5..7deac3b 100644
--- a/interface/web/dns/lib/lang/pl_dns_template_list.lng
+++ b/interface/web/dns/lib/lang/pl_dns_template_list.lng
@@ -4,4 +4,3 @@
$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 324bf06..f84620e 100644
--- a/interface/web/dns/lib/lang/pl_dns_txt.lng
+++ b/interface/web/dns/lib/lang/pl_dns_txt.lng
@@ -13,4 +13,3 @@
$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 8bf1cfa..52ab37d 100644
--- a/interface/web/dns/lib/lang/pl_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/pl_dns_wizard.lng
@@ -36,4 +36,3 @@
$wb['globalsearch_searchfield_watermark_txt'] = 'Szukaj';
$wb['globalsearch_suggestions_text_txt'] = 'Sugestie';
?>
-
diff --git a/interface/web/dns/lib/lang/pt_dns_mx.lng b/interface/web/dns/lib/lang/pt_dns_mx.lng
index 723f9d0..bd00da3 100644
--- a/interface/web/dns/lib/lang/pt_dns_mx.lng
+++ b/interface/web/dns/lib/lang/pt_dns_mx.lng
@@ -13,4 +13,5 @@
$wb['name_error_regex'] = 'Hostname tem um formato inválido.';
$wb['data_error_empty'] = 'Hostname do servidor de correio em branco';
$wb['data_error_regex'] = 'Hostname do servidor de correio formato inválido';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
diff --git a/interface/web/dns/lib/lang/ro_dns_mx.lng b/interface/web/dns/lib/lang/ro_dns_mx.lng
index 3c5b548..b04e8f1 100644
--- a/interface/web/dns/lib/lang/ro_dns_mx.lng
+++ b/interface/web/dns/lib/lang/ro_dns_mx.lng
@@ -13,4 +13,5 @@
$wb['name_error_regex'] = 'Hostname format gresit.';
$wb['data_error_empty'] = 'Mailserver hostname necompletat.';
$wb['data_error_regex'] = 'Mailserver hostname format invalid';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
diff --git a/interface/web/dns/lib/lang/ru_dns_mx.lng b/interface/web/dns/lib/lang/ru_dns_mx.lng
index d4ec0ad..f82e6d2 100644
--- a/interface/web/dns/lib/lang/ru_dns_mx.lng
+++ b/interface/web/dns/lib/lang/ru_dns_mx.lng
@@ -13,4 +13,5 @@
$wb['name_error_regex'] = 'Имя узла имеет неправильный формат.';
$wb['data_error_empty'] = 'Mailserver имя узла пустое';
$wb['data_error_regex'] = 'Mailserver имя узла в неправильном формате';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
diff --git a/interface/web/dns/lib/lang/se_dns_mx.lng b/interface/web/dns/lib/lang/se_dns_mx.lng
index 648827f..68bf48a 100644
--- a/interface/web/dns/lib/lang/se_dns_mx.lng
+++ b/interface/web/dns/lib/lang/se_dns_mx.lng
@@ -13,4 +13,5 @@
$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.';
?>
diff --git a/interface/web/dns/lib/lang/sk_dns_mx.lng b/interface/web/dns/lib/lang/sk_dns_mx.lng
index 3647ee9..488a8aa 100644
--- a/interface/web/dns/lib/lang/sk_dns_mx.lng
+++ b/interface/web/dns/lib/lang/sk_dns_mx.lng
@@ -13,4 +13,5 @@
$wb['name_error_regex'] = 'Hostname má zlý formát.';
$wb['data_error_empty'] = 'Hostname mailserveru je prázdny';
$wb['data_error_regex'] = 'Hostname mailserveru má neplatný formát';
+$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
?>
diff --git a/interface/web/help/lib/lang/cz.lng b/interface/web/help/lib/lang/cz.lng
index 721aaf3..18f8f21 100644
--- a/interface/web/help/lib/lang/cz.lng
+++ b/interface/web/help/lib/lang/cz.lng
@@ -12,5 +12,3 @@
$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 dc951a4..73feee6 100644
--- a/interface/web/help/lib/lang/cz_faq_form.lng
+++ b/interface/web/help/lib/lang/cz_faq_form.lng
@@ -4,5 +4,3 @@
$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 ab5d07c..a948844 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,5 +7,3 @@
$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 15eb20a..b6c7b46 100644
--- a/interface/web/help/lib/lang/cz_help_faq_list.lng
+++ b/interface/web/help/lib/lang/cz_help_faq_list.lng
@@ -1,5 +1,3 @@
<?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 60906e5..967b0ab 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,5 +6,3 @@
$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 63bce28..6c27284 100644
--- a/interface/web/help/lib/lang/cz_support_message.lng
+++ b/interface/web/help/lib/lang/cz_support_message.lng
@@ -6,5 +6,3 @@
$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 3a2c9a9..8629a2f 100644
--- a/interface/web/help/lib/lang/cz_support_message_list.lng
+++ b/interface/web/help/lib/lang/cz_support_message_list.lng
@@ -4,5 +4,3 @@
$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 3120f36..5f4ec6d 100644
--- a/interface/web/help/lib/lang/pl.lng
+++ b/interface/web/help/lib/lang/pl.lng
@@ -12,4 +12,3 @@
$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 6495e63..a39383e 100644
--- a/interface/web/help/lib/lang/pl_faq_form.lng
+++ b/interface/web/help/lib/lang/pl_faq_form.lng
@@ -4,4 +4,3 @@
$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 c50ff01..4c07503 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,4 +7,3 @@
$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 21615bd..d4bb7ef 100644
--- a/interface/web/help/lib/lang/pl_faq_sections_form.lng
+++ b/interface/web/help/lib/lang/pl_faq_sections_form.lng
@@ -1,4 +1,3 @@
<?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 10a98c5..072e3ed 100644
--- a/interface/web/help/lib/lang/pl_help_faq_list.lng
+++ b/interface/web/help/lib/lang/pl_help_faq_list.lng
@@ -1,4 +1,3 @@
<?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 53a56a9..e21792d 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,4 +6,3 @@
$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 63f2feb..7482e35 100644
--- a/interface/web/help/lib/lang/pl_support_message.lng
+++ b/interface/web/help/lib/lang/pl_support_message.lng
@@ -6,4 +6,3 @@
$wb['tstamp_txt'] = 'Kalendarz';
$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 13c678e..bc32856 100644
--- a/interface/web/help/lib/lang/pl_support_message_list.lng
+++ b/interface/web/help/lib/lang/pl_support_message_list.lng
@@ -4,4 +4,3 @@
$wb['subject_txt'] = 'Temat';
$wb['add_new_record_txt'] = 'Wyślij wiadomość';
?>
-
diff --git a/interface/web/js/jquery.tipsy.js b/interface/web/js/jquery.tipsy.js
index 735d72e..1484a01 100644
--- a/interface/web/js/jquery.tipsy.js
+++ b/interface/web/js/jquery.tipsy.js
@@ -352,9 +352,6 @@
return;
}
- // work around a bug (likely same cause as #5265)
- $( this ).blur();
-
// pass empty string as value to search for, displaying all results
input.autocomplete( "search", "" );
input.focus();
diff --git a/interface/web/login/lib/lang/cz.lng b/interface/web/login/lib/lang/cz.lng
index a65862a..cf65934 100644
--- a/interface/web/login/lib/lang/cz.lng
+++ b/interface/web/login/lib/lang/cz.lng
@@ -22,5 +22,3 @@
$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 109af55..29bd8b2 100644
--- a/interface/web/login/lib/lang/pl.lng
+++ b/interface/web/login/lib/lang/pl.lng
@@ -22,4 +22,3 @@
$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/lib/lang/cz.lng b/interface/web/mail/lib/lang/cz.lng
index 6b5f3fc..6a5afe0 100644
--- a/interface/web/mail/lib/lang/cz.lng
+++ b/interface/web/mail/lib/lang/cz.lng
@@ -46,5 +46,3 @@
$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 414e102..605e06b 100644
--- a/interface/web/mail/lib/lang/cz_mail_alias.lng
+++ b/interface/web/mail/lib/lang/cz_mail_alias.lng
@@ -12,5 +12,3 @@
$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 0d8f779..de8cc2e 100644
--- a/interface/web/mail/lib/lang/cz_mail_alias_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_alias_list.lng
@@ -6,5 +6,3 @@
$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 e0cde68..74611c2 100644
--- a/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng
+++ b/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng
@@ -9,5 +9,3 @@
$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 cfc0154..fd850d6 100644
--- a/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng
@@ -5,5 +5,3 @@
$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 4719142..e1e6dab 100644
--- a/interface/web/mail/lib/lang/cz_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/cz_mail_blacklist.lng
@@ -7,5 +7,3 @@
$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 fbf6e2d..0ef1d34 100644
--- a/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng
@@ -8,5 +8,3 @@
$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 1405881..459ca22 100644
--- a/interface/web/mail/lib/lang/cz_mail_content_filter.lng
+++ b/interface/web/mail/lib/lang/cz_mail_content_filter.lng
@@ -7,5 +7,3 @@
$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 6e7ebf5..da9709e 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,5 +6,3 @@
$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 be20bce..026a2f1 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain.lng
@@ -11,5 +11,3 @@
$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 da42190..b579d2d 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,5 +6,3 @@
$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 75efd56..488d0d5 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng
@@ -9,5 +9,3 @@
$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 aa0b76d..3b24645 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,5 +7,3 @@
$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 05bb747..2abb05c 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain_list.lng
@@ -5,5 +5,3 @@
$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 ba79e1a..a59bd9b 100644
--- a/interface/web/mail/lib/lang/cz_mail_forward.lng
+++ b/interface/web/mail/lib/lang/cz_mail_forward.lng
@@ -7,5 +7,3 @@
$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 bdbff70..e5381fe 100644
--- a/interface/web/mail/lib/lang/cz_mail_forward_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_forward_list.lng
@@ -6,5 +6,3 @@
$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 6fc9101..51b9f34 100644
--- a/interface/web/mail/lib/lang/cz_mail_get.lng
+++ b/interface/web/mail/lib/lang/cz_mail_get.lng
@@ -16,5 +16,3 @@
$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 824205f..9ca8b86 100644
--- a/interface/web/mail/lib/lang/cz_mail_get_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_get_list.lng
@@ -7,5 +7,3 @@
$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 406df72..2d22785 100644
--- a/interface/web/mail/lib/lang/cz_mail_mailinglist.lng
+++ b/interface/web/mail/lib/lang/cz_mail_mailinglist.lng
@@ -20,5 +20,3 @@
$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 b3e2cf8..db31273 100644
--- a/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng
@@ -3,5 +3,3 @@
$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 b64c311..0c07059 100644
--- a/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng
+++ b/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng
@@ -7,5 +7,3 @@
$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 bf34af6..1af9599 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,5 +7,3 @@
$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 f19706d..4b6cc2b 100644
--- a/interface/web/mail/lib/lang/cz_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/cz_mail_spamfilter.lng
@@ -15,5 +15,3 @@
$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 f6170c6..7560b57 100644
--- a/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng
@@ -6,5 +6,3 @@
$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 710e577..dfe1855 100644
--- a/interface/web/mail/lib/lang/cz_mail_transport.lng
+++ b/interface/web/mail/lib/lang/cz_mail_transport.lng
@@ -9,5 +9,3 @@
$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 9fb61fd..e833293 100644
--- a/interface/web/mail/lib/lang/cz_mail_transport_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_transport_list.lng
@@ -7,5 +7,3 @@
$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 d8805f0..2c441f2 100644
--- a/interface/web/mail/lib/lang/cz_mail_user.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user.lng
@@ -48,5 +48,3 @@
$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 0973856..6cd8ed7 100644
--- a/interface/web/mail/lib/lang/cz_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user_filter.lng
@@ -18,5 +18,3 @@
$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 d9f6748..60229ce 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,5 +5,3 @@
$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 08d28fb..e6dfd00 100644
--- a/interface/web/mail/lib/lang/cz_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user_list.lng
@@ -6,5 +6,3 @@
$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 92600a1..50cbc31 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,5 +6,3 @@
$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 cd5d032..db55c18 100644
--- a/interface/web/mail/lib/lang/cz_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/cz_mail_whitelist.lng
@@ -7,5 +7,3 @@
$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 042cd71..7fae368 100644
--- a/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng
@@ -8,5 +8,3 @@
$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 98e7649..5e0c6b7 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng
@@ -7,5 +7,3 @@
$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 76ab17e..83a732d 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng
@@ -7,5 +7,3 @@
$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 d0ebcc4..0f878cc 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_config.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_config.lng
@@ -18,5 +18,3 @@
$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 8b5b1e7..fe2ee8d 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng
@@ -3,5 +3,3 @@
$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 1a77830..54d0155 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_policy.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_policy.lng
@@ -36,5 +36,3 @@
$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 37f41d3..9a0c361 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng
@@ -7,5 +7,3 @@
$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 d795af1..914304c 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_users.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_users.lng
@@ -6,5 +6,3 @@
$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 26c4df1..36bf340 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng
@@ -8,5 +8,3 @@
$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 98e7649..5e0c6b7 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng
@@ -7,5 +7,3 @@
$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 3b74159..ad13897 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng
@@ -7,5 +7,3 @@
$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 0c30e75..c8b73a9 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,5 +5,3 @@
$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 afa99d7..93861b7 100644
--- a/interface/web/mail/lib/lang/pl.lng
+++ b/interface/web/mail/lib/lang/pl.lng
@@ -46,4 +46,3 @@
$wb['Relay Recipients'] = 'Odbiorcy przekierowania';
$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 bf8e41e..ee50d0f 100644
--- a/interface/web/mail/lib/lang/pl_mail_alias.lng
+++ b/interface/web/mail/lib/lang/pl_mail_alias.lng
@@ -12,4 +12,3 @@
$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 f5567ce..b6ce95d 100644
--- a/interface/web/mail/lib/lang/pl_mail_alias_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_alias_list.lng
@@ -6,4 +6,3 @@
$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 ebbc0d0..7735a4e 100644
--- a/interface/web/mail/lib/lang/pl_mail_aliasdomain.lng
+++ b/interface/web/mail/lib/lang/pl_mail_aliasdomain.lng
@@ -9,4 +9,3 @@
$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 bdccec7..ba2e3b9 100644
--- a/interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng
@@ -5,4 +5,3 @@
$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 448658d..528f2f7 100644
--- a/interface/web/mail/lib/lang/pl_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/pl_mail_blacklist.lng
@@ -7,4 +7,3 @@
$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 8351885..ebef666 100644
--- a/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng
@@ -8,4 +8,3 @@
$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 6ca25bc..54efa4f 100644
--- a/interface/web/mail/lib/lang/pl_mail_content_filter.lng
+++ b/interface/web/mail/lib/lang/pl_mail_content_filter.lng
@@ -7,4 +7,3 @@
$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 fe5a78f..9fc964c 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,4 +6,3 @@
$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 0e76cd0..6f9c68c 100644
--- a/interface/web/mail/lib/lang/pl_mail_domain.lng
+++ b/interface/web/mail/lib/lang/pl_mail_domain.lng
@@ -11,4 +11,3 @@
$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 de3a665..e214d92 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,4 +6,3 @@
$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 c9667c5..3630b95 100644
--- a/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng
@@ -9,4 +9,3 @@
$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 304bc3d..1f0aad1 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,4 +7,3 @@
$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 e14f2f0..ec51e2c 100644
--- a/interface/web/mail/lib/lang/pl_mail_domain_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_domain_list.lng
@@ -5,4 +5,3 @@
$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 cc84d34..d975d5e 100644
--- a/interface/web/mail/lib/lang/pl_mail_forward.lng
+++ b/interface/web/mail/lib/lang/pl_mail_forward.lng
@@ -7,4 +7,3 @@
$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 3f27975..1044bd5 100644
--- a/interface/web/mail/lib/lang/pl_mail_forward_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_forward_list.lng
@@ -6,4 +6,3 @@
$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 ca27711..fdac040 100644
--- a/interface/web/mail/lib/lang/pl_mail_get.lng
+++ b/interface/web/mail/lib/lang/pl_mail_get.lng
@@ -16,4 +16,3 @@
$wb['source_read_all_txt'] = 'Pobierz wszystkie maile (razem z przeczytanymi)';
$wb['error_delete_read_all_combination'] = 'Nieprawidłowa kombinacja opcji. Nie możesz użyć jednocześnie opcji Delete emails after retrieval = no razem z Retrieve all emails = yes';
?>
-
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 cf5844f..cd473d9 100644
--- a/interface/web/mail/lib/lang/pl_mail_get_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_get_list.lng
@@ -7,4 +7,3 @@
$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 774da18..f285b1e 100644
--- a/interface/web/mail/lib/lang/pl_mail_mailinglist.lng
+++ b/interface/web/mail/lib/lang/pl_mail_mailinglist.lng
@@ -20,4 +20,3 @@
$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 96cd960..649db47 100644
--- a/interface/web/mail/lib/lang/pl_mail_mailinglist_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_mailinglist_list.lng
@@ -3,4 +3,3 @@
$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 ab7926f..594aba1 100644
--- a/interface/web/mail/lib/lang/pl_mail_relay_recipient.lng
+++ b/interface/web/mail/lib/lang/pl_mail_relay_recipient.lng
@@ -7,4 +7,3 @@
$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 84d08ba..310e27c 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,4 +7,3 @@
$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 2849430..3879f24 100644
--- a/interface/web/mail/lib/lang/pl_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/pl_mail_spamfilter.lng
@@ -15,4 +15,3 @@
$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 a6959a2..d6097bb 100644
--- a/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng
@@ -6,4 +6,3 @@
$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 364eba9..514fc26 100644
--- a/interface/web/mail/lib/lang/pl_mail_transport.lng
+++ b/interface/web/mail/lib/lang/pl_mail_transport.lng
@@ -9,4 +9,3 @@
$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 837972c..fa5c584 100644
--- a/interface/web/mail/lib/lang/pl_mail_transport_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_transport_list.lng
@@ -7,4 +7,3 @@
$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 4ccab2e..5fc7a38 100644
--- a/interface/web/mail/lib/lang/pl_mail_user.lng
+++ b/interface/web/mail/lib/lang/pl_mail_user.lng
@@ -48,4 +48,3 @@
$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 1e1a7fd..99ac6a9 100644
--- a/interface/web/mail/lib/lang/pl_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/pl_mail_user_filter.lng
@@ -18,4 +18,3 @@
$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 4d45c5d..ce235b8 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,4 +5,3 @@
$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 8e47f96..7c13db3 100644
--- a/interface/web/mail/lib/lang/pl_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_user_list.lng
@@ -6,4 +6,3 @@
$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 9e87680..b978068 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,4 +6,3 @@
$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 4aa2f05..203c5ba 100644
--- a/interface/web/mail/lib/lang/pl_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/pl_mail_whitelist.lng
@@ -7,4 +7,3 @@
$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 a7239ca..10e6dfc 100644
--- a/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng
@@ -8,4 +8,3 @@
$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 6c4c8d7..6da8ddc 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng
@@ -7,4 +7,3 @@
$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 65a9d37..c237a7a 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng
@@ -7,4 +7,3 @@
$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 43fab4d..c750d95 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_config.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_config.lng
@@ -18,4 +18,3 @@
$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 d31d785..45b3f31 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng
@@ -3,4 +3,3 @@
$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 b7bc37d..8a825b5 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_policy.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_policy.lng
@@ -36,4 +36,3 @@
$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 906006e..43d9d41 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng
@@ -7,4 +7,3 @@
$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 8529e45..656c29e 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_users.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_users.lng
@@ -6,4 +6,3 @@
$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 0951df5..dde2a62 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng
@@ -8,4 +8,3 @@
$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 a6f2e43..be83601 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng
@@ -7,4 +7,3 @@
$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 425a6fe..6517cf4 100644
--- a/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng
@@ -7,4 +7,3 @@
$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 2cffcf1..2b33b10 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
@@ -5,4 +5,3 @@
$wb['email_txt'] = 'Adres e-mail';
$wb['used_txt'] = 'Użycie dysku';
?>
-
diff --git a/interface/web/mail/mail_domain_del.php b/interface/web/mail/mail_domain_del.php
index 0f00dd9..806996a 100644
--- a/interface/web/mail/mail_domain_del.php
+++ b/interface/web/mail/mail_domain_del.php
@@ -59,8 +59,8 @@
// Before we delete the email domain,
// we will delete all depending records.
- // Delete all forwardings where the osurce or destination belongs to this domain
- $records = $app->db->queryAllRecords("SELECT forwarding_id as id FROM mail_forwarding WHERE source like '%@".$app->db->quote($domain)."' OR (destination like '%@".$app->db->quote($domain)."' AND type != 'forward'");
+ // Delete all forwardings where the source or destination belongs to this domain
+ $records = $app->db->queryAllRecords("SELECT forwarding_id as id FROM mail_forwarding WHERE source like '%@".$app->db->quote($domain)."' OR (destination like '%@".$app->db->quote($domain)."' AND type != 'forward')");
foreach($records as $rec) {
$app->db->datalogDelete('mail_forwarding','forwarding_id',$rec['id']);
}
diff --git a/interface/web/mailuser/lib/lang/cz.lng b/interface/web/mailuser/lib/lang/cz.lng
index 12f1bd7..8b4b58b 100644
--- a/interface/web/mailuser/lib/lang/cz.lng
+++ b/interface/web/mailuser/lib/lang/cz.lng
@@ -7,5 +7,3 @@
$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 9b820cd..45af56e 100644
--- a/interface/web/mailuser/lib/lang/cz_index.lng
+++ b/interface/web/mailuser/lib/lang/cz_index.lng
@@ -10,5 +10,3 @@
$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 f8d331b..ef3aeb4 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng
@@ -11,5 +11,3 @@
$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 fc8a0f9..36f11a9 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng
@@ -5,5 +5,3 @@
$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 65300b6..3df9d38 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng
@@ -18,5 +18,3 @@
$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 4b64af9..3c2593d 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,5 +6,3 @@
$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 4481539..36555a2 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_password.lng
@@ -8,5 +8,3 @@
$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 c634556..2a53036 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng
@@ -5,5 +5,3 @@
$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 5d7166a..4002670 100644
--- a/interface/web/mailuser/lib/lang/pl.lng
+++ b/interface/web/mailuser/lib/lang/pl.lng
@@ -7,4 +7,3 @@
$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 3682760..0774a65 100644
--- a/interface/web/mailuser/lib/lang/pl_index.lng
+++ b/interface/web/mailuser/lib/lang/pl_index.lng
@@ -10,4 +10,3 @@
$wb['mb_txt'] = 'MB';
$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 c6f3ed6..7a28409 100644
--- a/interface/web/mailuser/lib/lang/pl_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/pl_mail_user_autoresponder.lng
@@ -11,4 +11,3 @@
$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 a3b4817..70becda 100644
--- a/interface/web/mailuser/lib/lang/pl_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/pl_mail_user_cc.lng
@@ -5,4 +5,3 @@
$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 9ac57b5..2e74ffd 100644
--- a/interface/web/mailuser/lib/lang/pl_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/pl_mail_user_filter.lng
@@ -18,4 +18,3 @@
$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 8bea987..882d601 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
@@ -6,4 +6,3 @@
$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 08fd740..48dfd26 100644
--- a/interface/web/mailuser/lib/lang/pl_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/pl_mail_user_password.lng
@@ -8,4 +8,3 @@
$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 ed18053..b371f3e 100644
--- a/interface/web/mailuser/lib/lang/pl_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/pl_mail_user_spamfilter.lng
@@ -5,4 +5,3 @@
$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 763b7f5..36647b7 100644
--- a/interface/web/monitor/lib/lang/cz.lng
+++ b/interface/web/monitor/lib/lang/cz.lng
@@ -147,5 +147,3 @@
$wb['Show IPTables'] = 'Zobrazit IPTables pravidla';
$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 70adcad..c9e9a86 100644
--- a/interface/web/monitor/lib/lang/cz_datalog_list.lng
+++ b/interface/web/monitor/lib/lang/cz_datalog_list.lng
@@ -6,5 +6,3 @@
$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 85cd4b3..9906625 100644
--- a/interface/web/monitor/lib/lang/cz_syslog_list.lng
+++ b/interface/web/monitor/lib/lang/cz_syslog_list.lng
@@ -5,5 +5,3 @@
$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 533d8f6..f1ce821 100644
--- a/interface/web/monitor/lib/lang/pl.lng
+++ b/interface/web/monitor/lib/lang/pl.lng
@@ -147,4 +147,3 @@
$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 0b969b1..398ca51 100644
--- a/interface/web/monitor/lib/lang/pl_datalog_list.lng
+++ b/interface/web/monitor/lib/lang/pl_datalog_list.lng
@@ -6,4 +6,3 @@
$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 f5e0645..e37799c 100644
--- a/interface/web/monitor/lib/lang/pl_syslog_list.lng
+++ b/interface/web/monitor/lib/lang/pl_syslog_list.lng
@@ -5,4 +5,3 @@
$wb['loglevel_txt'] = 'Poziom logowania';
$wb['message_txt'] = 'Wiadomość';
?>
-
diff --git a/interface/web/sites/lib/lang/ar_web_domain.lng b/interface/web/sites/lib/lang/ar_web_domain.lng
index c749fb5..f10cc42 100644
--- a/interface/web/sites/lib/lang/ar_web_domain.lng
+++ b/interface/web/sites/lib/lang/ar_web_domain.lng
@@ -111,4 +111,5 @@
$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.';
?>
diff --git a/interface/web/sites/lib/lang/bg_web_domain.lng b/interface/web/sites/lib/lang/bg_web_domain.lng
index 2b2fa97..c2816ad 100644
--- a/interface/web/sites/lib/lang/bg_web_domain.lng
+++ b/interface/web/sites/lib/lang/bg_web_domain.lng
@@ -111,4 +111,5 @@
$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.';
?>
diff --git a/interface/web/sites/lib/lang/br_web_domain.lng b/interface/web/sites/lib/lang/br_web_domain.lng
index dc75b80..623bc0b 100644
--- a/interface/web/sites/lib/lang/br_web_domain.lng
+++ b/interface/web/sites/lib/lang/br_web_domain.lng
@@ -111,4 +111,5 @@
$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.';
?>
diff --git a/interface/web/sites/lib/lang/cz.lng b/interface/web/sites/lib/lang/cz.lng
index d96c4d5..71ccd16 100644
--- a/interface/web/sites/lib/lang/cz.lng
+++ b/interface/web/sites/lib/lang/cz.lng
@@ -33,5 +33,3 @@
$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 97bc670..176d76d 100644
--- a/interface/web/sites/lib/lang/cz_aps.lng
+++ b/interface/web/sites/lib/lang/cz_aps.lng
@@ -56,5 +56,3 @@
$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 3d5d3d8..7b7b6dd 100644
--- a/interface/web/sites/lib/lang/cz_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/cz_aps_instances_list.lng
@@ -11,5 +11,3 @@
$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 b74dfc8..52ef6eb 100644
--- a/interface/web/sites/lib/lang/cz_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/cz_aps_packages_list.lng
@@ -6,5 +6,3 @@
$wb['status_txt'] = 'Odemčený';
$wb['filter_txt'] = 'Hledat';
?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_cron.lng b/interface/web/sites/lib/lang/cz_cron.lng
index 5ea9bb5..d4e6c17 100644
--- a/interface/web/sites/lib/lang/cz_cron.lng
+++ b/interface/web/sites/lib/lang/cz_cron.lng
@@ -19,5 +19,3 @@
$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 0ca6dc3..f50dee2 100644
--- a/interface/web/sites/lib/lang/cz_cron_list.lng
+++ b/interface/web/sites/lib/lang/cz_cron_list.lng
@@ -11,5 +11,3 @@
$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 cb7e4eb..c316f0a 100644
--- a/interface/web/sites/lib/lang/cz_database.lng
+++ b/interface/web/sites/lib/lang/cz_database.lng
@@ -44,5 +44,3 @@
$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 4eb24c9..a006940 100644
--- a/interface/web/sites/lib/lang/cz_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/cz_database_admin_list.lng
@@ -8,5 +8,3 @@
$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 269dc21..9bb80dd 100644
--- a/interface/web/sites/lib/lang/cz_database_list.lng
+++ b/interface/web/sites/lib/lang/cz_database_list.lng
@@ -7,5 +7,3 @@
$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 4621087..8a64cb5 100644
--- a/interface/web/sites/lib/lang/cz_database_user.lng
+++ b/interface/web/sites/lib/lang/cz_database_user.lng
@@ -21,5 +21,3 @@
$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 db76d10..8703e71 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,5 +4,3 @@
$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 68cd34d..42cf36d 100644
--- a/interface/web/sites/lib/lang/cz_database_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_database_user_list.lng
@@ -3,5 +3,3 @@
$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 2b9dd54..876ad51 100644
--- a/interface/web/sites/lib/lang/cz_ftp_user.lng
+++ b/interface/web/sites/lib/lang/cz_ftp_user.lng
@@ -32,5 +32,3 @@
$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 6f6f502..41649df 100644
--- a/interface/web/sites/lib/lang/cz_ftp_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_ftp_user_list.lng
@@ -6,5 +6,3 @@
$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 234b7a5..97b8a0d 100644
--- a/interface/web/sites/lib/lang/cz_shell_user.lng
+++ b/interface/web/sites/lib/lang/cz_shell_user.lng
@@ -27,5 +27,3 @@
$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 6d4a8fe..1d6bc19 100644
--- a/interface/web/sites/lib/lang/cz_shell_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_shell_user_list.lng
@@ -6,5 +6,3 @@
$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 dabb73b..4531944 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,5 +7,3 @@
$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 10b7eee..3a5d150 100644
--- a/interface/web/sites/lib/lang/cz_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/cz_web_aliasdomain.lng
@@ -113,5 +113,3 @@
$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 6cf247f..22a4ffe 100644
--- a/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng
@@ -12,5 +12,3 @@
$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 88e110f..3c9cfc8 100644
--- a/interface/web/sites/lib/lang/cz_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_backup_list.lng
@@ -13,5 +13,3 @@
$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 4f5df29..f3e31d3 100644
--- a/interface/web/sites/lib/lang/cz_web_domain.lng
+++ b/interface/web/sites/lib/lang/cz_web_domain.lng
@@ -111,6 +111,5 @@
$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.';
?>
-
-
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 c79a51b..e52a794 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,5 +7,3 @@
$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 af0947c..cbf025e 100644
--- a/interface/web/sites/lib/lang/cz_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_domain_list.lng
@@ -6,5 +6,3 @@
$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 108f7c9..f9f623d 100644
--- a/interface/web/sites/lib/lang/cz_web_folder.lng
+++ b/interface/web/sites/lib/lang/cz_web_folder.lng
@@ -5,5 +5,3 @@
$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 2aaaf4c..b75c0e8 100644
--- a/interface/web/sites/lib/lang/cz_web_folder_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_folder_list.lng
@@ -5,5 +5,3 @@
$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 a1c6ccf..48f4260 100644
--- a/interface/web/sites/lib/lang/cz_web_folder_user.lng
+++ b/interface/web/sites/lib/lang/cz_web_folder_user.lng
@@ -10,5 +10,3 @@
$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 0b3f964..99fe620 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,5 +4,3 @@
$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 ffab544..ed93596 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,5 +7,3 @@
$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 4547f91..de1445f 100644
--- a/interface/web/sites/lib/lang/cz_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/cz_web_subdomain.lng
@@ -44,5 +44,3 @@
$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 1eab4a8..8a0bafe 100644
--- a/interface/web/sites/lib/lang/cz_web_subdomain_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_subdomain_list.lng
@@ -6,5 +6,3 @@
$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 3ed649f..c76dffd 100644
--- a/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
+++ b/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
@@ -116,5 +116,3 @@
$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 bf8a171..a54e19a 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,5 +6,3 @@
$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 523b79f..3e89a1e 100644
--- a/interface/web/sites/lib/lang/cz_webdav_user.lng
+++ b/interface/web/sites/lib/lang/cz_webdav_user.lng
@@ -19,5 +19,3 @@
$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 c74be89..0c1148b 100644
--- a/interface/web/sites/lib/lang/cz_webdav_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_webdav_user_list.lng
@@ -6,5 +6,3 @@
$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_web_domain.lng b/interface/web/sites/lib/lang/de_web_domain.lng
index 3c64f65..dab184f 100644
--- a/interface/web/sites/lib/lang/de_web_domain.lng
+++ b/interface/web/sites/lib/lang/de_web_domain.lng
@@ -111,4 +111,5 @@
$wb['available_nginx_directive_snippets_txt'] = 'Verfügbare nginx Direktiven Schnipsel:';
$wb['proxy_directives_txt'] = 'Proxy Direktiven';
$wb['available_proxy_directive_snippets_txt'] = 'Verfügbare Proxy Direktiven Schnipsel:';
+$wb['no_server_error'] = 'No server selected.';
?>
diff --git a/interface/web/sites/lib/lang/el_web_domain.lng b/interface/web/sites/lib/lang/el_web_domain.lng
index b77cd8a..e13af50 100644
--- a/interface/web/sites/lib/lang/el_web_domain.lng
+++ b/interface/web/sites/lib/lang/el_web_domain.lng
@@ -111,4 +111,5 @@
$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.';
?>
diff --git a/interface/web/sites/lib/lang/en_web_backup_list.lng b/interface/web/sites/lib/lang/en_web_backup_list.lng
index 74bcbd9..2b65944 100644
--- a/interface/web/sites/lib/lang/en_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/en_web_backup_list.lng
@@ -1,16 +1,17 @@
<?php
$wb['list_head_txt'] = 'Existing backups';
-$wb['date_txt'] = 'Date';
-$wb['backup_type_txt'] = 'Type';
-$wb['filename_txt'] = 'Backup file';
-$wb['restore_backup_txt'] = 'Restore';
-$wb['download_backup_txt'] = 'Download';
-$wb['download_info_txt'] = 'The backup file will be available for download in the backup folder of the website in a few minutes.';
+$wb['date_txt'] = 'Date';
+$wb['backup_type_txt'] = 'Type';
+$wb['filename_txt'] = 'Backup file';
+$wb['filesize_txt'] = 'Filesize';
+$wb['restore_backup_txt'] = 'Restore';
+$wb['download_backup_txt'] = 'Download';
+$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';
-
-?>
\ No newline at end of file
+$wb['backup_type_mysql'] = 'MySQL Database';
+$wb['backup_type_web'] = 'Website files';
+
+?>
diff --git a/interface/web/sites/lib/lang/es_web_domain.lng b/interface/web/sites/lib/lang/es_web_domain.lng
index 3ba7ab9..db0a0b6 100644
--- a/interface/web/sites/lib/lang/es_web_domain.lng
+++ b/interface/web/sites/lib/lang/es_web_domain.lng
@@ -111,4 +111,5 @@
$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.';
?>
diff --git a/interface/web/sites/lib/lang/fi_web_domain.lng b/interface/web/sites/lib/lang/fi_web_domain.lng
index e7129e1..7c31eeb 100755
--- a/interface/web/sites/lib/lang/fi_web_domain.lng
+++ b/interface/web/sites/lib/lang/fi_web_domain.lng
@@ -111,4 +111,5 @@
$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.';
?>
diff --git a/interface/web/sites/lib/lang/fr_web_domain.lng b/interface/web/sites/lib/lang/fr_web_domain.lng
index 05b27ce..d002990 100644
--- a/interface/web/sites/lib/lang/fr_web_domain.lng
+++ b/interface/web/sites/lib/lang/fr_web_domain.lng
@@ -111,4 +111,5 @@
$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.';
?>
diff --git a/interface/web/sites/lib/lang/hr_web_domain.lng b/interface/web/sites/lib/lang/hr_web_domain.lng
index ca300d6..37bed82 100644
--- a/interface/web/sites/lib/lang/hr_web_domain.lng
+++ b/interface/web/sites/lib/lang/hr_web_domain.lng
@@ -111,4 +111,5 @@
$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.';
?>
diff --git a/interface/web/sites/lib/lang/hu_web_domain.lng b/interface/web/sites/lib/lang/hu_web_domain.lng
index 2659f9a..2bf0127 100644
--- a/interface/web/sites/lib/lang/hu_web_domain.lng
+++ b/interface/web/sites/lib/lang/hu_web_domain.lng
@@ -111,4 +111,5 @@
$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.';
?>
diff --git a/interface/web/sites/lib/lang/id_web_domain.lng b/interface/web/sites/lib/lang/id_web_domain.lng
index 012583e..6c46439 100644
--- a/interface/web/sites/lib/lang/id_web_domain.lng
+++ b/interface/web/sites/lib/lang/id_web_domain.lng
@@ -111,4 +111,5 @@
$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.';
?>
diff --git a/interface/web/sites/lib/lang/it_web_domain.lng b/interface/web/sites/lib/lang/it_web_domain.lng
index a34c576..084b4ac 100644
--- a/interface/web/sites/lib/lang/it_web_domain.lng
+++ b/interface/web/sites/lib/lang/it_web_domain.lng
@@ -111,4 +111,5 @@
$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.';
?>
diff --git a/interface/web/sites/lib/lang/ja_web_domain.lng b/interface/web/sites/lib/lang/ja_web_domain.lng
index 9a0eb0e..43162ef 100644
--- a/interface/web/sites/lib/lang/ja_web_domain.lng
+++ b/interface/web/sites/lib/lang/ja_web_domain.lng
@@ -111,4 +111,5 @@
$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.';
?>
diff --git a/interface/web/sites/lib/lang/nl_web_domain.lng b/interface/web/sites/lib/lang/nl_web_domain.lng
index 3319f46..785471d 100644
--- a/interface/web/sites/lib/lang/nl_web_domain.lng
+++ b/interface/web/sites/lib/lang/nl_web_domain.lng
@@ -111,4 +111,5 @@
$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.';
?>
diff --git a/interface/web/sites/lib/lang/pl.lng b/interface/web/sites/lib/lang/pl.lng
index 6d26fb6..22bbad3 100644
--- a/interface/web/sites/lib/lang/pl.lng
+++ b/interface/web/sites/lib/lang/pl.lng
@@ -33,4 +33,3 @@
$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 aa791fc..1a2ffad 100644
--- a/interface/web/sites/lib/lang/pl_aps.lng
+++ b/interface/web/sites/lib/lang/pl_aps.lng
@@ -56,4 +56,3 @@
$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 f4b8499..186dc7d 100644
--- a/interface/web/sites/lib/lang/pl_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/pl_aps_instances_list.lng
@@ -11,4 +11,3 @@
$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 2e2140d..684f4d7 100644
--- a/interface/web/sites/lib/lang/pl_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/pl_aps_packages_list.lng
@@ -6,4 +6,3 @@
$wb['status_txt'] = 'Odblokowany';
$wb['filter_txt'] = 'Szukaj';
?>
-
diff --git a/interface/web/sites/lib/lang/pl_cron.lng b/interface/web/sites/lib/lang/pl_cron.lng
index a5d3b8b..a097d08 100644
--- a/interface/web/sites/lib/lang/pl_cron.lng
+++ b/interface/web/sites/lib/lang/pl_cron.lng
@@ -19,4 +19,3 @@
$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 67e2e6f..467cae6 100644
--- a/interface/web/sites/lib/lang/pl_cron_list.lng
+++ b/interface/web/sites/lib/lang/pl_cron_list.lng
@@ -11,4 +11,3 @@
$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 92af857..05bd91b 100644
--- a/interface/web/sites/lib/lang/pl_database.lng
+++ b/interface/web/sites/lib/lang/pl_database.lng
@@ -44,4 +44,3 @@
$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 653657e..5785a77 100644
--- a/interface/web/sites/lib/lang/pl_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/pl_database_admin_list.lng
@@ -8,4 +8,3 @@
$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 0b419fe..2162a15 100644
--- a/interface/web/sites/lib/lang/pl_database_list.lng
+++ b/interface/web/sites/lib/lang/pl_database_list.lng
@@ -7,4 +7,3 @@
$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 5bf0031..66a0718 100644
--- a/interface/web/sites/lib/lang/pl_database_user.lng
+++ b/interface/web/sites/lib/lang/pl_database_user.lng
@@ -21,4 +21,3 @@
$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 a44cc7c..d7f88c4 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,4 +4,3 @@
$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 522780d..8c22649 100644
--- a/interface/web/sites/lib/lang/pl_database_user_list.lng
+++ b/interface/web/sites/lib/lang/pl_database_user_list.lng
@@ -3,4 +3,3 @@
$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 5a97a4b..5c91401 100644
--- a/interface/web/sites/lib/lang/pl_ftp_user.lng
+++ b/interface/web/sites/lib/lang/pl_ftp_user.lng
@@ -32,4 +32,3 @@
$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 9577209..fecbba3 100644
--- a/interface/web/sites/lib/lang/pl_ftp_user_list.lng
+++ b/interface/web/sites/lib/lang/pl_ftp_user_list.lng
@@ -6,4 +6,3 @@
$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 2852ccc..5259aeb 100644
--- a/interface/web/sites/lib/lang/pl_shell_user.lng
+++ b/interface/web/sites/lib/lang/pl_shell_user.lng
@@ -27,4 +27,3 @@
$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 0f17980..10f9e43 100644
--- a/interface/web/sites/lib/lang/pl_shell_user_list.lng
+++ b/interface/web/sites/lib/lang/pl_shell_user_list.lng
@@ -6,4 +6,3 @@
$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 f92c360..d8e963d 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
@@ -7,4 +7,3 @@
$wb['soft_txt'] = 'Limit miękki';
$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 62d88d9..19cd691 100644
--- a/interface/web/sites/lib/lang/pl_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/pl_web_aliasdomain.lng
@@ -113,4 +113,3 @@
$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 a577415..5bdd8e8 100644
--- a/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng
@@ -12,4 +12,3 @@
$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 e7d9aed..401ee65 100644
--- a/interface/web/sites/lib/lang/pl_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_backup_list.lng
@@ -13,4 +13,3 @@
$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 5c02a06..4cac25f 100644
--- a/interface/web/sites/lib/lang/pl_web_domain.lng
+++ b/interface/web/sites/lib/lang/pl_web_domain.lng
@@ -111,5 +111,5 @@
$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:';
+$wb['no_server_error'] = 'No server selected.';
?>
-
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 1aab019..56634eb 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,4 +7,3 @@
$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 8a74d05..62b7455 100644
--- a/interface/web/sites/lib/lang/pl_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_domain_list.lng
@@ -6,4 +6,3 @@
$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 053a2c0..6eec2fd 100644
--- a/interface/web/sites/lib/lang/pl_web_folder.lng
+++ b/interface/web/sites/lib/lang/pl_web_folder.lng
@@ -5,4 +5,3 @@
$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 cd16721..87a7690 100644
--- a/interface/web/sites/lib/lang/pl_web_folder_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_folder_list.lng
@@ -5,4 +5,3 @@
$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 48893ba..1975ae5 100644
--- a/interface/web/sites/lib/lang/pl_web_folder_user.lng
+++ b/interface/web/sites/lib/lang/pl_web_folder_user.lng
@@ -10,4 +10,3 @@
$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 462d3b9..81769bd 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,4 +4,3 @@
$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 1431940..29985f0 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
@@ -7,4 +7,3 @@
$wb['last_year_txt'] = 'Ostatni rok';
$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 4bfc75b..def9efb 100644
--- a/interface/web/sites/lib/lang/pl_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/pl_web_subdomain.lng
@@ -44,4 +44,3 @@
$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 d20a14c..9ccb0a3 100644
--- a/interface/web/sites/lib/lang/pl_web_subdomain_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_subdomain_list.lng
@@ -6,4 +6,3 @@
$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 fa77cde..8420a9d 100644
--- a/interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng
+++ b/interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng
@@ -116,4 +116,3 @@
$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 58084a6..1c16bcd 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,4 +6,3 @@
$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 669c1b3..8d80f94 100644
--- a/interface/web/sites/lib/lang/pl_webdav_user.lng
+++ b/interface/web/sites/lib/lang/pl_webdav_user.lng
@@ -19,4 +19,3 @@
$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 f679685..5e7e4b6 100644
--- a/interface/web/sites/lib/lang/pl_webdav_user_list.lng
+++ b/interface/web/sites/lib/lang/pl_webdav_user_list.lng
@@ -6,4 +6,3 @@
$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_web_domain.lng b/interface/web/sites/lib/lang/pt_web_domain.lng
index b060656..e3acc8a 100644
--- a/interface/web/sites/lib/lang/pt_web_domain.lng
+++ b/interface/web/sites/lib/lang/pt_web_domain.lng
@@ -111,4 +111,5 @@
$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.';
?>
diff --git a/interface/web/sites/lib/lang/ro_web_domain.lng b/interface/web/sites/lib/lang/ro_web_domain.lng
index 791f67b..d100895 100644
--- a/interface/web/sites/lib/lang/ro_web_domain.lng
+++ b/interface/web/sites/lib/lang/ro_web_domain.lng
@@ -111,4 +111,5 @@
$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.';
?>
diff --git a/interface/web/sites/lib/lang/ru_web_domain.lng b/interface/web/sites/lib/lang/ru_web_domain.lng
index be367c0..46f377f 100644
--- a/interface/web/sites/lib/lang/ru_web_domain.lng
+++ b/interface/web/sites/lib/lang/ru_web_domain.lng
@@ -111,4 +111,5 @@
$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.';
?>
diff --git a/interface/web/sites/lib/lang/se_web_domain.lng b/interface/web/sites/lib/lang/se_web_domain.lng
index 15df484..a44eee8 100644
--- a/interface/web/sites/lib/lang/se_web_domain.lng
+++ b/interface/web/sites/lib/lang/se_web_domain.lng
@@ -111,4 +111,5 @@
$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.';
?>
diff --git a/interface/web/sites/lib/lang/sk_web_domain.lng b/interface/web/sites/lib/lang/sk_web_domain.lng
index 6df5937..b127ec2 100644
--- a/interface/web/sites/lib/lang/sk_web_domain.lng
+++ b/interface/web/sites/lib/lang/sk_web_domain.lng
@@ -111,4 +111,5 @@
$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.';
?>
diff --git a/interface/web/sites/templates/web_backup_list.htm b/interface/web/sites/templates/web_backup_list.htm
index 3248812..5594473 100644
--- a/interface/web/sites/templates/web_backup_list.htm
+++ b/interface/web/sites/templates/web_backup_list.htm
@@ -13,21 +13,23 @@
<table class="list">
<thead>
<tr class="caption">
- <th class="tbl_col_date" scope="col"><tmpl_var name="date_txt"></th>
- <th class="tbl_col_date" scope="col"><tmpl_var name="backup_type_txt"></th>
- <th class="tbl_col_filename" scope="col"><tmpl_var name="filename_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
- </tr>
- </thead>
+ <th class="tbl_col_date" scope="col"><tmpl_var name="date_txt"></th>
+ <th class="tbl_col_date" scope="col"><tmpl_var name="backup_type_txt"></th>
+ <th class="tbl_col_filename" scope="col"><tmpl_var name="filename_txt"></th>
+ <th class="tbl_col_filename" scope="col"><tmpl_var name="filesize_txt"></th>
+ <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+ </tr>
+ </thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_date">{tmpl_var name="date"}</td>
- <td class="tbl_col_date">{tmpl_var name="backup_type"}</td>
- <td class="tbl_col_filename">{tmpl_var name="filename"}</td>
- <td class="tbl_col_buttons">
- <div class="buttons">
- <button class="button iconstxt icoRestore" type="button" onclick="confirm_action('sites/web_domain_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=restore&backup_id={tmpl_var name='backup_id'}','{tmpl_var name='restore_confirm_txt'}');"><span>{tmpl_var name="restore_backup_txt"}</span></button>
+ <td class="tbl_col_date">{tmpl_var name="date"}</td>
+ <td class="tbl_col_date">{tmpl_var name="backup_type"}</td>
+ <td class="tbl_col_filename">{tmpl_var name="filename"}</td>
+ <td class="tbl_col_filesize">{tmpl_var name="filesize"}</td>
+ <td class="tbl_col_buttons">
+ <div class="buttons">
+ <button class="button iconstxt icoRestore" type="button" onclick="confirm_action('sites/web_domain_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=restore&backup_id={tmpl_var name='backup_id'}','{tmpl_var name='restore_confirm_txt'}');"><span>{tmpl_var name="restore_backup_txt"}</span></button>
<button class="button iconstxt icoDownload" type="button" onclick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=download&backup_id={tmpl_var name='backup_id'}');"><span>{tmpl_var name="download_backup_txt"}</span></button>
</div>
</td>
@@ -40,7 +42,7 @@
</tmpl_unless>
</tbody>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+ </fieldset>
+ </div>
+
+</div>
diff --git a/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng
index 59a146c..cff29d5 100644
--- a/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng
+++ b/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng
@@ -6,5 +6,3 @@
$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 79d0317..df85c97 100644
--- a/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng
+++ b/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng
@@ -6,4 +6,3 @@
$wb['password_strength_4_txt'] = 'Silne';
$wb['password_strength_5_txt'] = 'Bardzo mocne';
?>
-
diff --git a/interface/web/tools/import_ispconfig.php b/interface/web/tools/import_ispconfig.php
index a063664..432bb31 100644
--- a/interface/web/tools/import_ispconfig.php
+++ b/interface/web/tools/import_ispconfig.php
@@ -149,6 +149,12 @@
if($sys_groupid == 0) $error .= 'Inavlid groupid<br />';
if($sys_userid == 0) $error .= 'Inavlid Userid<br />';
+ //* Get the mail server ID
+ $tmp = $app->db->queryOneRecord("SELECT server_id FROM server WHERE mail_server = 1 LIMIT 0,1");
+ $server_id = intval($tmp['server_id']);
+ unset($tmp);
+ if($server_id == 0) $server_id = 1;
+
//* get the mail domain record
$mail_domain_rec = $client->mail_domain_get($remote_session_id, array('domain' => $mail_domain));
if(is_array($mail_domain_rec)) {
@@ -160,6 +166,7 @@
//* Change the record owner and remove the index field
$mail_domain_rec['sys_userid'] = $sys_userid;
$mail_domain_rec['sys_groupid'] = $sys_groupid;
+ $mail_domain_rec['server_id'] = $server_id;
unset($mail_domain_rec['domain_id']);
//* Insert domain if no error occurred
@@ -181,6 +188,7 @@
//* Prepare record
$mail_user['sys_userid'] = $sys_userid;
$mail_user['sys_groupid'] = $sys_groupid;
+ $mail_user['server_id'] = $server_id;
$remote_mailuser_id = $mail_user['mailuser_id'];
unset($mail_user['mailuser_id']);
if(!isset($_POST['import_user_filter'])) $mail_user['custom_mailfilter'] = '';
@@ -199,6 +207,7 @@
$mail_user_filter['sys_userid'] = $sys_userid;
$mail_user_filter['sys_groupid'] = $sys_groupid;
$mail_user_filter['mailuser_id'] = $local_mailuser_id;
+ $mail_user_filter['server_id'] = $server_id;
unset($mail_user_filter['filter_id']);
//* Insert record in DB
@@ -224,6 +233,7 @@
if($tmp['number'] == 0) {
$mail_alias['sys_userid'] = $sys_userid;
$mail_alias['sys_groupid'] = $sys_groupid;
+ $mail_alias['server_id'] = $server_id;
unset($mail_alias['forwarding_id']);
$app->db->datalogInsert('mail_forwarding', $mail_alias, 'forwarding_id');
$msg .= "Imported email alias ".$mail_alias['source']."<br />";
@@ -244,6 +254,7 @@
if($tmp['number'] == 0) {
$mail_alias['sys_userid'] = $sys_userid;
$mail_alias['sys_groupid'] = $sys_groupid;
+ $mail_alias['server_id'] = $server_id;
unset($mail_alias['forwarding_id']);
$app->db->datalogInsert('mail_forwarding', $mail_alias, 'forwarding_id');
$msg .= "Imported email aliasdomain ".$mail_alias['source']."<br />";
@@ -264,6 +275,7 @@
if($tmp['number'] == 0) {
$mail_forward['sys_userid'] = $sys_userid;
$mail_forward['sys_groupid'] = $sys_groupid;
+ $mail_forward['server_id'] = $server_id;
unset($mail_forward['forwarding_id']);
$app->db->datalogInsert('mail_forwarding', $mail_forward, 'forwarding_id');
$msg .= "Imported email forward ".$mail_forward['source']."<br />";
@@ -284,6 +296,7 @@
if($tmp['number'] == 0) {
$mail_spamfilter['sys_userid'] = $sys_userid;
$mail_spamfilter['sys_groupid'] = $sys_groupid;
+ $mail_spamfilter['server_id'] = $server_id;
unset($mail_spamfilter['id']);
$app->db->datalogInsert('spamfilter_users', $mail_spamfilter, 'id');
$msg .= "Imported spamfilter user ".$mail_spamfilter['email']."<br />";
diff --git a/interface/web/tools/lib/lang/cz.lng b/interface/web/tools/lib/lang/cz.lng
index 480434e..66bcaf4 100644
--- a/interface/web/tools/lib/lang/cz.lng
+++ b/interface/web/tools/lib/lang/cz.lng
@@ -11,5 +11,3 @@
$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 ba24f58..8ebf717 100644
--- a/interface/web/tools/lib/lang/cz_import_ispconfig.lng
+++ b/interface/web/tools/lib/lang/cz_import_ispconfig.lng
@@ -21,5 +21,3 @@
$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 b1f32ec..5ebf1ec 100644
--- a/interface/web/tools/lib/lang/cz_index.lng
+++ b/interface/web/tools/lib/lang/cz_index.lng
@@ -2,5 +2,3 @@
$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 1125032..507b7c3 100644
--- a/interface/web/tools/lib/lang/cz_interface.lng
+++ b/interface/web/tools/lib/lang/cz_interface.lng
@@ -5,5 +5,3 @@
$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 3b53ca0..96d622e 100644
--- a/interface/web/tools/lib/lang/cz_resync.lng
+++ b/interface/web/tools/lib/lang/cz_resync.lng
@@ -11,5 +11,3 @@
$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 53e9bd8..0f037f1 100644
--- a/interface/web/tools/lib/lang/cz_tpl_default.lng
+++ b/interface/web/tools/lib/lang/cz_tpl_default.lng
@@ -5,5 +5,3 @@
$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 7490e52..dec46b7 100644
--- a/interface/web/tools/lib/lang/cz_usersettings.lng
+++ b/interface/web/tools/lib/lang/cz_usersettings.lng
@@ -10,5 +10,3 @@
$wb['password_mismatch_txt'] = 'Hesla se neshodují.';
$wb['password_match_txt'] = 'Hesla se shodují.';
?>
-
-
diff --git a/interface/web/tools/lib/lang/pl.lng b/interface/web/tools/lib/lang/pl.lng
index a807a75..10bf647 100644
--- a/interface/web/tools/lib/lang/pl.lng
+++ b/interface/web/tools/lib/lang/pl.lng
@@ -11,4 +11,3 @@
$wb['PDNS Tupa'] = 'PowerDNS Tupa';
$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 bae9417..cba0761 100644
--- a/interface/web/tools/lib/lang/pl_import_ispconfig.lng
+++ b/interface/web/tools/lib/lang/pl_import_ispconfig.lng
@@ -21,4 +21,3 @@
$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 0ff1c84..d69a272 100644
--- a/interface/web/tools/lib/lang/pl_index.lng
+++ b/interface/web/tools/lib/lang/pl_index.lng
@@ -2,4 +2,3 @@
$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 7775fe8..0256fab 100644
--- a/interface/web/tools/lib/lang/pl_interface.lng
+++ b/interface/web/tools/lib/lang/pl_interface.lng
@@ -5,4 +5,3 @@
$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 e69bec4..18b5936 100644
--- a/interface/web/tools/lib/lang/pl_resync.lng
+++ b/interface/web/tools/lib/lang/pl_resync.lng
@@ -11,4 +11,3 @@
$wb['btn_start_txt'] = 'Start';
$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 84c90f6..c7cd9c4 100644
--- a/interface/web/tools/lib/lang/pl_tpl_default.lng
+++ b/interface/web/tools/lib/lang/pl_tpl_default.lng
@@ -5,4 +5,3 @@
$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 2dbba98..addd42b 100644
--- a/interface/web/tools/lib/lang/pl_usersettings.lng
+++ b/interface/web/tools/lib/lang/pl_usersettings.lng
@@ -10,4 +10,3 @@
$wb['password_mismatch_txt'] = 'Hasła się nie zgadzają';
$wb['password_match_txt'] = 'Hasła się zgadzają';
?>
-
diff --git a/interface/web/vm/lib/lang/cz.lng b/interface/web/vm/lib/lang/cz.lng
index 2122438..4167e14 100644
--- a/interface/web/vm/lib/lang/cz.lng
+++ b/interface/web/vm/lib/lang/cz.lng
@@ -5,5 +5,3 @@
$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 2930fff..3e2e3e0 100644
--- a/interface/web/vm/lib/lang/cz_openvz_action.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_action.lng
@@ -14,5 +14,3 @@
$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 6afda02..6016681 100644
--- a/interface/web/vm/lib/lang/cz_openvz_ip.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_ip.lng
@@ -7,5 +7,3 @@
$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 e392e9c..e6a3a68 100644
--- a/interface/web/vm/lib/lang/cz_openvz_ip_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_ip_list.lng
@@ -5,5 +5,3 @@
$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 12f2217..72838a2 100644
--- a/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng
@@ -9,5 +9,3 @@
$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 264d944..7705a4d 100644
--- a/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng
@@ -6,5 +6,3 @@
$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 6f1f394..12c80bd 100644
--- a/interface/web/vm/lib/lang/cz_openvz_template.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_template.lng
@@ -91,5 +91,3 @@
$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 fc31985..89c11ef 100644
--- a/interface/web/vm/lib/lang/cz_openvz_template_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_template_list.lng
@@ -3,5 +3,3 @@
$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 aeed119..adfa56f 100644
--- a/interface/web/vm/lib/lang/cz_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_vm.lng
@@ -38,5 +38,3 @@
$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 5097648..1371c4b 100644
--- a/interface/web/vm/lib/lang/cz_openvz_vm_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_vm_list.lng
@@ -8,5 +8,3 @@
$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 5c1ab58..4167e14 100644
--- a/interface/web/vm/lib/lang/pl.lng
+++ b/interface/web/vm/lib/lang/pl.lng
@@ -5,4 +5,3 @@
$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 71e7263..52f7328 100644
--- a/interface/web/vm/lib/lang/pl_openvz_action.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_action.lng
@@ -14,4 +14,3 @@
$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 67f6885..6016681 100644
--- a/interface/web/vm/lib/lang/pl_openvz_ip.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_ip.lng
@@ -7,4 +7,3 @@
$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 3658443..f675aa5 100644
--- a/interface/web/vm/lib/lang/pl_openvz_ip_list.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_ip_list.lng
@@ -5,4 +5,3 @@
$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 bfeb299..256750f 100644
--- a/interface/web/vm/lib/lang/pl_openvz_ostemplate.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_ostemplate.lng
@@ -9,4 +9,3 @@
$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 df01680..6471ec0 100644
--- a/interface/web/vm/lib/lang/pl_openvz_ostemplate_list.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_ostemplate_list.lng
@@ -6,4 +6,3 @@
$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 0887164..d285512 100644
--- a/interface/web/vm/lib/lang/pl_openvz_template.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_template.lng
@@ -91,4 +91,3 @@
$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 6e4d911..de4045c 100644
--- a/interface/web/vm/lib/lang/pl_openvz_template_list.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_template_list.lng
@@ -3,4 +3,3 @@
$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 4698fe6..f2be022 100644
--- a/interface/web/vm/lib/lang/pl_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_vm.lng
@@ -38,4 +38,3 @@
$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 a534a65..2238e2b 100644
--- a/interface/web/vm/lib/lang/pl_openvz_vm_list.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_vm_list.lng
@@ -8,4 +8,3 @@
$wb['ip_address_txt'] = 'IP address';
$wb['veid_txt'] = 'VEID';
?>
-
diff --git a/server/cron_daily.php b/server/cron_daily.php
index a89468e..70735c1 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -272,15 +272,24 @@
}
-$sql = "SELECT domain_id, domain, document_root, web_folder, type FROM web_domain WHERE (type = 'vhost' or type = 'vhostsubdomain') and stats_type = 'webalizer' AND server_id = ".$conf['server_id'];
+$sql = "SELECT domain_id, domain, document_root, web_folder, type, parent_domain_id FROM web_domain WHERE (type = 'vhost' or type = 'vhostsubdomain') and stats_type = 'webalizer' AND server_id = ".$conf['server_id'];
$records = $app->db->queryAllRecords($sql);
foreach($records as $rec) {
//$yesterday = date('Ymd',time() - 86400);
$yesterday = date('Ymd',strtotime("-1 day", time()));
- $logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday.'-access.log');
+
+ $log_folder = 'log';
+ if($rec['type'] == 'vhostsubdomain') {
+ $tmp = $app->db->queryOneRecord('SELECT `domain` FROM web_domain WHERE domain_id = '.intval($rec['parent_domain_id']));
+ $subdomain_host = preg_replace('/^(.*)\.' . preg_quote($tmp['domain'], '/') . '$/', '$1', $rec['domain']);
+ if($subdomain_host == '') $subdomain_host = 'web'.$rec['domain_id'];
+ $log_folder .= '/' . $subdomain_host;
+ unset($tmp);
+ }
+ $logfile = escapeshellcmd($rec['document_root'].'/' . $log_folder . '/'.$yesterday.'-access.log');
if(!@is_file($logfile)) {
- $logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday.'-access.log.gz');
+ $logfile = escapeshellcmd($rec['document_root'].'/' . $log_folder . '/'.$yesterday.'-access.log.gz');
if(!@is_file($logfile)) {
continue;
}
@@ -313,7 +322,7 @@
// Create awstats statistics
#######################################################################################################
-$sql = "SELECT domain_id, domain, document_root, web_folder, type, system_user, system_group FROM web_domain WHERE (type = 'vhost' or type = 'vhostsubdomain') and stats_type = 'awstats' AND server_id = ".$conf['server_id'];
+$sql = "SELECT domain_id, domain, document_root, web_folder, type, system_user, system_group, parent_domain_id FROM web_domain WHERE (type = 'vhost' or type = 'vhostsubdomain') and stats_type = 'awstats' AND server_id = ".$conf['server_id'];
$records = $app->db->queryAllRecords($sql);
$web_config = $app->getconf->get_server_config($conf['server_id'], 'web');
@@ -321,9 +330,18 @@
foreach($records as $rec) {
//$yesterday = date('Ymd',time() - 86400);
$yesterday = date('Ymd',strtotime("-1 day", time()));
- $logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday.'-access.log');
+
+ $log_folder = 'log';
+ if($rec['type'] == 'vhostsubdomain') {
+ $tmp = $app->db->queryOneRecord('SELECT `domain` FROM web_domain WHERE domain_id = '.intval($rec['parent_domain_id']));
+ $subdomain_host = preg_replace('/^(.*)\.' . preg_quote($tmp['domain'], '/') . '$/', '$1', $rec['domain']);
+ if($subdomain_host == '') $subdomain_host = 'web'.$rec['domain_id'];
+ $log_folder .= '/' . $subdomain_host;
+ unset($tmp);
+ }
+ $logfile = escapeshellcmd($rec['document_root'].'/' . $log_folder . '/'.$yesterday.'-access.log');
if(!@is_file($logfile)) {
- $logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday.'-access.log.gz');
+ $logfile = escapeshellcmd($rec['document_root'].'/' . $log_folder . '/'.$yesterday.'-access.log.gz');
if(!@is_file($logfile)) {
continue;
}
@@ -428,13 +446,23 @@
// Manage and compress web logfiles and create traffic statistics
#######################################################################################################
-$sql = "SELECT domain_id, domain, document_root FROM web_domain WHERE (type = 'vhost' or type = 'vhostsubdomain') AND server_id = ".$conf['server_id'];
+$sql = "SELECT domain_id, domain, type, document_root, web_folder, parent_domain_id FROM web_domain WHERE (type = 'vhost' or type = 'vhostsubdomain') AND server_id = ".$conf['server_id'];
$records = $app->db->queryAllRecords($sql);
foreach($records as $rec) {
//* create traffic statistics based on yesterdays access log file
$yesterday = date('Ymd',time() - 86400);
- $logfile = $rec['document_root'].'/log/'.$yesterday.'-access.log';
+
+ $log_folder = 'log';
+ if($rec['type'] == 'vhostsubdomain') {
+ $tmp = $app->db->queryOneRecord('SELECT `domain` FROM web_domain WHERE domain_id = '.intval($rec['parent_domain_id']));
+ $subdomain_host = preg_replace('/^(.*)\.' . preg_quote($tmp['domain'], '/') . '$/', '$1', $rec['domain']);
+ if($subdomain_host == '') $subdomain_host = 'web'.$rec['domain_id'];
+ $log_folder .= '/' . $subdomain_host;
+ unset($tmp);
+ }
+
+ $logfile = $rec['document_root'].'/' . $log_folder . '/'.$yesterday.'-access.log';
$total_bytes = 0;
$handle = @fopen($logfile, "r");
@@ -462,7 +490,7 @@
}
$yesterday2 = date('Ymd',time() - 86400*2);
- $logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday2.'-access.log');
+ $logfile = escapeshellcmd($rec['document_root'].'/' . $log_folder . '/'.$yesterday2.'-access.log');
//* Compress logfile
if(@is_file($logfile)) {
@@ -472,7 +500,7 @@
}
// rotate and compress the error.log when it exceeds a size of 10 MB
- $logfile = escapeshellcmd($rec['document_root'].'/log/error.log');
+ $logfile = escapeshellcmd($rec['document_root'].'/' . $log_folder . '/error.log');
if(is_file($logfile) && filesize($logfile) > 10000000) {
exec("gzip -c $logfile > $logfile.1.gz");
exec("cat /dev/null > $logfile");
@@ -480,7 +508,7 @@
// delete logfiles after 30 days
$month_ago = date('Ymd',time() - 86400 * 30);
- $logfile = escapeshellcmd($rec['document_root'].'/log/'.$month_ago.'-access.log.gz');
+ $logfile = escapeshellcmd($rec['document_root'].'/' . $log_folder . '/'.$month_ago.'-access.log.gz');
if(@is_file($logfile)) {
unlink($logfile);
}
@@ -488,10 +516,10 @@
//* Delete older Log files, in case that we missed them before due to serverdowntimes.
$datepart = date('Ym',time() - 86400 * 31 * 2);
- $logfile = escapeshellcmd($rec['document_root']).'/log/'.$datepart.'*-access.log.gz';
+ $logfile = escapeshellcmd($rec['document_root']).'/' . $log_folder . '/'.$datepart.'*-access.log.gz';
exec('rm -f '.$logfile);
- $logfile = escapeshellcmd($rec['document_root']).'/log/'.$datepart.'*-access.log';
+ $logfile = escapeshellcmd($rec['document_root']).'/' . $log_folder . '/'.$datepart.'*-access.log';
exec('rm -f '.$logfile);
}
@@ -738,12 +766,17 @@
}
-#######################################################################################################
-// Create website backups
-#######################################################################################################
-
-$server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
-$backup_dir = $server_config['backup_dir'];
+#######################################################################################################
+// Create website backups
+#######################################################################################################
+function formatBytes($size, $precision = 2) {
+ $base=log($size)/log(1024);
+ $suffixes=array('','k','M','G','T');
+ return round(pow(1024,$base-floor($base)),$precision).$suffixes[floor($base)];
+}
+
+$server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
+$backup_dir = $server_config['backup_dir'];
$backup_mode = $server_config['backup_mode'];
if($backup_mode == '') $backup_mode = 'userzip';
@@ -800,13 +833,17 @@
chgrp($web_backup_dir.'/'.$web_backup_file, 'root');
chmod($web_backup_dir.'/'.$web_backup_file, 0750);
- //* Insert web backup record in database
- //$insert_data = "(server_id,parent_domain_id,backup_type,backup_mode,tstamp,filename) VALUES (".$conf['server_id'].",".$web_id.",'web','".$backup_mode."',".time().",'".$app->db->quote($web_backup_file)."')";
- //$app->dbmaster->datalogInsert('web_backup', $insert_data, 'backup_id');
- $sql = "INSERT INTO web_backup (server_id,parent_domain_id,backup_type,backup_mode,tstamp,filename) VALUES (".$conf['server_id'].",".$web_id.",'web','".$backup_mode."',".time().",'".$app->db->quote($web_backup_file)."')";
- $app->db->query($sql);
- if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
-
+ //* Insert web backup record in database
+ //$insert_data = "(server_id,parent_domain_id,backup_type,backup_mode,tstamp,filename) VALUES (".$conf['server_id'].",".$web_id.",'web','".$backup_mode."',".time().",'".$app->db->quote($web_backup_file)."')";
+ //$app->dbmaster->datalogInsert('web_backup', $insert_data, 'backup_id');
+
+
+
+
+ $sql = "INSERT INTO web_backup (server_id,parent_domain_id,backup_type,backup_mode,tstamp,filename,filesize) VALUES (".$conf['server_id'].",".$web_id.",'web','".$backup_mode."',".time().",'".$app->db->quote($web_backup_file)."','".formatBytes(filesize($web_backup_dir.'/'.$web_backup_file))."')";
+ $app->db->query($sql);
+ if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
+
//* Remove old backups
$backup_copies = intval($rec['backup_copies']);
diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php
index 1de54e2..c958e8b 100644
--- a/server/lib/classes/system.inc.php
+++ b/server/lib/classes/system.inc.php
@@ -575,6 +575,58 @@
}
/**
+ * Get the group id from an group
+ *
+ */
+ function getgid($group){
+ global $app;
+ if($this->is_group($group)){
+ $group_datei = $this->server_conf['group_datei'];
+ $groups = $app->file->no_comments($group_datei);
+ $lines = explode("\n", $groups);
+ if(is_array($lines)){
+ foreach($lines as $line){
+ if(trim($line) != ""){
+ list($f1, $f2, $f3, $f4) = explode(':', $line);
+ if($f1 == $group) return $f3;
+ }
+ }
+ }
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * Return info about a group by name
+ *
+ */
+ function posix_getgrnam($group) {
+ if(!function_exists('posix_getgrnam')){
+ $group_datei = $this->server_conf['group_datei'];
+ $cmd = 'grep -m 1 "^'.$group.':" '.$group_datei;
+ exec($cmd, $output, $return_var);
+ if($return_var != 0 || !$output[0]) return false;
+ list($f1, $f2, $f3, $f4) = explode(':', $output[0]);
+ $f2 = trim($f2);
+ $f3 = trim($f3);
+ $f4 = trim($f4);
+ if($f4 != ''){
+ $members = explode(',', $f4);
+ } else {
+ $members = array();
+ }
+ $group_details = array( 'name' => $group,
+ 'passwd' => $f2,
+ 'members' => $members,
+ 'gid' => $f3);
+ return $group_details;
+ } else {
+ return posix_getgrnam($group);
+ }
+ }
+
+ /**
* Get all information from a user
*
*/
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 8df1dcf..58e941d 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -923,7 +923,7 @@
//* Create custom php.ini
if(trim($data['new']['custom_php_ini']) != '') {
$has_custom_php_ini = true;
- if(!is_dir($custom_php_ini_dir)) $app->system->mkdir($custom_php_ini_dir);
+ if(!is_dir($custom_php_ini_dir)) $app->system->mkdirpath($custom_php_ini_dir);
$php_ini_content = '';
if($data['new']['php'] == 'mod') {
$master_php_ini_path = $web_config['php_ini_path_apache'];
diff --git a/server/plugins-available/mailman_plugin.inc.php b/server/plugins-available/mailman_plugin.inc.php
index 7e6eaf2..c302806 100644
--- a/server/plugins-available/mailman_plugin.inc.php
+++ b/server/plugins-available/mailman_plugin.inc.php
@@ -74,7 +74,7 @@
$this->update_config();
exec("nohup /usr/lib/mailman/bin/newlist -u ".escapeshellcmd($data["new"]["domain"])." -e ".escapeshellcmd($data["new"]["domain"])." ".escapeshellcmd($data["new"]["listname"])." ".escapeshellcmd($data["new"]["email"])." ".escapeshellcmd($data["new"]["password"])." >/dev/null 2>&1 &");
-
+ if(is_file('/var/lib/mailman/data/virtual-mailman')) exec('postmap /var/lib/mailman/data/virtual-mailman');
exec('nohup '.$conf['init_scripts'] . '/' . 'mailman reload >/dev/null 2>&1 &');
$app->db->query("UPDATE mail_mailinglist SET password = '' WHERE mailinglist_id = ".$app->db->quote($data["new"]['mailinglist_id']));
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index 7a1e562..2c347f4 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -831,7 +831,7 @@
if(!is_dir($web_config['website_basedir'].'/conf')) mkdir($web_config['website_basedir'].'/conf');
if(trim($data['new']['custom_php_ini']) != '') {
$has_custom_php_ini = true;
- if(!is_dir($custom_php_ini_dir)) $app->system->mkdir($custom_php_ini_dir);
+ if(!is_dir($custom_php_ini_dir)) $app->system->mkdirpath($custom_php_ini_dir);
$php_ini_content = '';
if($data['new']['php'] == 'mod') {
$master_php_ini_path = $web_config['php_ini_path_apache'];
diff --git a/server/plugins-available/shelluser_base_plugin.inc.php b/server/plugins-available/shelluser_base_plugin.inc.php
index c3133a6..2924d49 100755
--- a/server/plugins-available/shelluser_base_plugin.inc.php
+++ b/server/plugins-available/shelluser_base_plugin.inc.php
@@ -162,8 +162,8 @@
exec($command);
$app->log("Executed command: $command ",LOGLEVEL_DEBUG);
*/
- $groupinfo = posix_getgrnam($data['new']['pgroup']);
- $app->system->usermod($data['old']['username'],0, $groupinfo[gid], $data['new']['dir'], $data['new']['shell'], $data['new']['password'], $data['new']['username']);
+ //$groupinfo = $app->system->posix_getgrnam($data['new']['pgroup']);
+ $app->system->usermod($data['old']['username'],0, $app->system->getgid($data['new']['pgroup']), $data['new']['dir'], $data['new']['shell'], $data['new']['password'], $data['new']['username']);
$app->log("Updated shelluser: ".$data['old']['username'],LOGLEVEL_DEBUG);
// call the ssh-rsa update function
--
Gitblit v1.9.1