From 526b997c9891a796b152cdbab8e329b356b1f596 Mon Sep 17 00:00:00 2001 From: tbrehm Date: Fri, 22 Feb 2013 13:59:02 +0000 Subject: [PATCH] Merged revisions 3803-3844 from stable branch. --- install/dist/conf/centos52.conf.php | 1 + install/dist/conf/centos53.conf.php | 1 + install/dist/conf/debian40.conf.php | 1 + install/dist/conf/debian60.conf.php | 1 + install/dist/conf/fedora9.conf.php | 1 + install/dist/conf/gentoo.conf.php | 1 + install/dist/conf/opensuse110.conf.php | 1 + install/dist/conf/opensuse112.conf.php | 1 + install/dist/lib/centos52.lib.php | 73 ++++++++ install/dist/lib/centos53.lib.php | 73 ++++++++ install/dist/lib/fedora.lib.php | 85 ++++++++++ install/dist/lib/gentoo.lib.php | 16 +- install/dist/lib/opensuse.lib.php | 96 ++++++++++- install/lib/installer_base.lib.php | 17 +- install/lib/update.lib.php | 1 + install/sql/incremental/upd_0048.sql | 1 + install/sql/ispconfig3.sql | 2 +- install/tpl/apache_apps_fcgi_starter.master | 4 +- .../tpl/apache_ispconfig_fcgi_starter.master | 4 +- interface/lib/classes/aps_crawler.inc.php | 67 ++++++-- .../lib/classes/aps_guicontroller.inc.php | 10 +- interface/lib/classes/ispcmail.inc.php | 3 +- interface/lib/classes/simplepie.inc.php | 14 +- interface/lib/lang/ar.lng | 1 + interface/lib/lang/bg.lng | 1 + interface/lib/lang/br.lng | 1 + interface/lib/lang/cz.lng | 2 +- interface/lib/lang/de.lng | 85 +++++----- interface/lib/lang/el.lng | 1 + interface/lib/lang/es.lng | 1 + interface/lib/lang/fi.lng | 1 + interface/lib/lang/fr.lng | 1 + interface/lib/lang/hr.lng | 1 + interface/lib/lang/hu.lng | 1 + interface/lib/lang/id.lng | 1 + interface/lib/lang/it.lng | 1 + interface/lib/lang/ja.lng | 1 + interface/lib/lang/nl.lng | 1 + interface/lib/lang/pl.lng | 1 + interface/lib/lang/pt.lng | 1 + interface/lib/lang/ro.lng | 1 + interface/lib/lang/ru.lng | 1 + interface/lib/lang/se.lng | 1 + interface/lib/lang/sk.lng | 1 + interface/lib/lang/tr.lng | 1 + interface/web/admin/lib/lang/ar_login_as.lng | 21 ++- .../web/admin/lib/lang/ar_system_config.lng | 3 + interface/web/admin/lib/lang/bg_login_as.lng | 21 ++- .../web/admin/lib/lang/bg_system_config.lng | 3 + interface/web/admin/lib/lang/br_login_as.lng | 21 ++- .../web/admin/lib/lang/br_system_config.lng | 3 + interface/web/admin/lib/lang/cz.lng | 1 - .../admin/lib/lang/cz_directive_snippets.lng | 1 - .../lib/lang/cz_directive_snippets_list.lng | 1 - interface/web/admin/lib/lang/cz_firewall.lng | 1 - .../web/admin/lib/lang/cz_firewall_list.lng | 1 - interface/web/admin/lib/lang/cz_groups.lng | 1 - .../web/admin/lib/lang/cz_groups_list.lng | 1 - interface/web/admin/lib/lang/cz_iptables.lng | 1 - .../web/admin/lib/lang/cz_iptables_list.lng | 1 - .../web/admin/lib/lang/cz_language_add.lng | 1 - .../admin/lib/lang/cz_language_complete.lng | 1 - .../web/admin/lib/lang/cz_language_edit.lng | 1 - .../web/admin/lib/lang/cz_language_export.lng | 1 - .../web/admin/lib/lang/cz_language_import.lng | 1 - .../web/admin/lib/lang/cz_language_list.lng | 1 - interface/web/admin/lib/lang/cz_login_as.lng | 21 ++- .../web/admin/lib/lang/cz_package_install.lng | 1 - .../web/admin/lib/lang/cz_remote_action.lng | 1 - .../web/admin/lib/lang/cz_remote_user.lng | 1 - .../admin/lib/lang/cz_remote_user_list.lng | 1 - interface/web/admin/lib/lang/cz_server.lng | 1 - .../web/admin/lib/lang/cz_server_config.lng | 9 - .../admin/lib/lang/cz_server_config_list.lng | 1 - interface/web/admin/lib/lang/cz_server_ip.lng | 1 - .../web/admin/lib/lang/cz_server_ip_list.lng | 1 - .../web/admin/lib/lang/cz_server_list.lng | 1 - .../web/admin/lib/lang/cz_server_php.lng | 1 - .../web/admin/lib/lang/cz_server_php_list.lng | 1 - .../lib/lang/cz_software_package_install.lng | 1 - .../lib/lang/cz_software_package_list.lng | 1 - .../web/admin/lib/lang/cz_software_repo.lng | 1 - .../admin/lib/lang/cz_software_repo_list.lng | 1 - .../lib/lang/cz_software_update_list.lng | 1 - .../web/admin/lib/lang/cz_system_config.lng | 1 - .../admin/lib/lang/cz_tpl_default_admin.lng | 1 - interface/web/admin/lib/lang/cz_users.lng | 1 - .../web/admin/lib/lang/cz_users_list.lng | 1 - interface/web/admin/lib/lang/de.lng | 6 +- .../lib/lang/de_directive_snippets_list.lng | 4 +- .../web/admin/lib/lang/de_firewall_list.lng | 2 +- interface/web/admin/lib/lang/de_login_as.lng | 18 +- .../web/admin/lib/lang/de_remote_action.lng | 2 +- .../admin/lib/lang/de_remote_user_list.lng | 4 +- interface/web/admin/lib/lang/de_server.lng | 8 +- .../web/admin/lib/lang/de_server_config.lng | 22 +-- .../web/admin/lib/lang/de_server_list.lng | 18 +- .../web/admin/lib/lang/de_system_config.lng | 19 ++- interface/web/admin/lib/lang/el_login_as.lng | 21 ++- .../web/admin/lib/lang/el_system_config.lng | 3 + .../web/admin/lib/lang/en_system_config.lng | 3 + interface/web/admin/lib/lang/es_login_as.lng | 21 ++- .../web/admin/lib/lang/es_system_config.lng | 3 + interface/web/admin/lib/lang/fi_login_as.lng | 21 ++- .../web/admin/lib/lang/fi_system_config.lng | 3 + interface/web/admin/lib/lang/fr_login_as.lng | 21 ++- .../web/admin/lib/lang/fr_system_config.lng | 3 + interface/web/admin/lib/lang/hr_login_as.lng | 21 ++- .../web/admin/lib/lang/hr_system_config.lng | 3 + interface/web/admin/lib/lang/hu_login_as.lng | 21 ++- .../web/admin/lib/lang/hu_system_config.lng | 3 + interface/web/admin/lib/lang/id_login_as.lng | 21 ++- .../web/admin/lib/lang/id_system_config.lng | 3 + interface/web/admin/lib/lang/it_login_as.lng | 21 ++- .../web/admin/lib/lang/it_system_config.lng | 3 + interface/web/admin/lib/lang/ja_login_as.lng | 21 ++- .../web/admin/lib/lang/ja_system_config.lng | 3 + interface/web/admin/lib/lang/nl_login_as.lng | 21 ++- .../web/admin/lib/lang/nl_system_config.lng | 3 + interface/web/admin/lib/lang/pl_login_as.lng | 21 ++- .../web/admin/lib/lang/pl_system_config.lng | 3 + interface/web/admin/lib/lang/pt_login_as.lng | 21 ++- .../web/admin/lib/lang/pt_system_config.lng | 3 + interface/web/admin/lib/lang/ro_login_as.lng | 21 ++- .../web/admin/lib/lang/ro_system_config.lng | 3 + interface/web/admin/lib/lang/ru_login_as.lng | 21 ++- .../web/admin/lib/lang/ru_system_config.lng | 3 + interface/web/admin/lib/lang/se_login_as.lng | 21 ++- .../web/admin/lib/lang/se_system_config.lng | 3 + interface/web/admin/lib/lang/sk_login_as.lng | 21 ++- .../web/admin/lib/lang/sk_system_config.lng | 3 + interface/web/admin/lib/lang/tr_login_as.lng | 21 ++- .../web/admin/lib/lang/tr_system_config.lng | 3 + interface/web/admin/templates/users_list.htm | 6 +- interface/web/client/form/client.tform.php | 14 ++ .../web/client/form/client_template.tform.php | 14 ++ interface/web/client/form/reseller.tform.php | 14 ++ interface/web/client/lib/lang/cz.lng | 1 - interface/web/client/lib/lang/cz_client.lng | 1 - .../web/client/lib/lang/cz_client_circle.lng | 1 - .../client/lib/lang/cz_client_circle_list.lng | 1 - .../web/client/lib/lang/cz_client_del.lng | 1 - .../web/client/lib/lang/cz_client_message.lng | 1 - .../client/lib/lang/cz_client_template.lng | 1 - .../lib/lang/cz_client_template_list.lng | 1 - .../web/client/lib/lang/cz_clients_list.lng | 1 - interface/web/client/lib/lang/cz_domain.lng | 1 - .../web/client/lib/lang/cz_domain_list.lng | 1 - interface/web/client/lib/lang/cz_reseller.lng | 1 - .../web/client/lib/lang/cz_resellers_list.lng | 1 - interface/web/client/lib/lang/de.lng | 4 +- interface/web/client/lib/lang/de_client.lng | 29 ++-- .../web/client/lib/lang/de_client_circle.lng | 2 +- .../client/lib/lang/de_client_circle_list.lng | 6 +- .../client/lib/lang/de_client_template.lng | 19 ++- interface/web/client/lib/lang/de_reseller.lng | 33 ++-- interface/web/client/lib/lang/en_client.lng | 3 + .../client/lib/lang/en_client_template.lng | 3 + interface/web/client/lib/lang/en_reseller.lng | 3 + .../client/templates/client_edit_limits.htm | 7 + .../templates/client_template_edit_limits.htm | 7 + .../client/templates/reseller_edit_limits.htm | 7 + .../web/client/templates/resellers_list.htm | 4 +- interface/web/dashboard/lib/lang/cz.lng | 1 - .../dashboard/lib/lang/cz_dashlet_limits.lng | 1 - .../dashboard/lib/lang/cz_dashlet_modules.lng | 1 - .../dashboard/lib/lang/de_dashlet_limits.lng | 6 +- interface/web/designer/lib/lang/cz.lng | 1 - .../web/designer/lib/lang/cz_form_edit.lng | 1 - .../web/designer/lib/lang/cz_form_list.lng | 1 - .../web/designer/lib/lang/cz_form_show.lng | 1 - .../web/designer/lib/lang/cz_module_edit.lng | 1 - .../web/designer/lib/lang/cz_module_list.lng | 1 - .../designer/lib/lang/cz_module_nav_edit.lng | 1 - .../lib/lang/cz_module_nav_item_edit.lng | 1 - .../web/designer/lib/lang/cz_module_show.lng | 1 - interface/web/dns/lib/lang/cz.lng | 1 - interface/web/dns/lib/lang/cz_dns_a.lng | 1 - interface/web/dns/lib/lang/cz_dns_a_list.lng | 1 - interface/web/dns/lib/lang/cz_dns_aaaa.lng | 1 - interface/web/dns/lib/lang/cz_dns_alias.lng | 1 - interface/web/dns/lib/lang/cz_dns_cname.lng | 1 - interface/web/dns/lib/lang/cz_dns_hinfo.lng | 1 - interface/web/dns/lib/lang/cz_dns_import.lng | 1 - interface/web/dns/lib/lang/cz_dns_mx.lng | 1 - interface/web/dns/lib/lang/cz_dns_ns.lng | 1 - interface/web/dns/lib/lang/cz_dns_ptr.lng | 1 - interface/web/dns/lib/lang/cz_dns_rp.lng | 1 - interface/web/dns/lib/lang/cz_dns_slave.lng | 1 - .../web/dns/lib/lang/cz_dns_slave_list.lng | 1 - interface/web/dns/lib/lang/cz_dns_soa.lng | 2 +- .../web/dns/lib/lang/cz_dns_soa_list.lng | 1 - interface/web/dns/lib/lang/cz_dns_srv.lng | 1 - .../web/dns/lib/lang/cz_dns_template.lng | 1 - .../web/dns/lib/lang/cz_dns_template_list.lng | 1 - interface/web/dns/lib/lang/cz_dns_txt.lng | 1 - interface/web/dns/lib/lang/cz_dns_wizard.lng | 1 - interface/web/dns/lib/lang/de.lng | 4 +- interface/web/dns/lib/lang/de_dns_a.lng | 2 +- interface/web/dns/lib/lang/de_dns_import.lng | 8 +- interface/web/dns/lib/lang/de_dns_slave.lng | 6 +- .../web/dns/lib/lang/de_dns_slave_list.lng | 4 +- interface/web/dns/lib/lang/de_dns_soa.lng | 10 +- interface/web/dns/lib/lang/de_dns_wizard.lng | 26 +-- interface/web/dummy_login.html | 0 interface/web/help/lib/lang/cz.lng | 1 - interface/web/help/lib/lang/cz_faq_form.lng | 1 - .../lib/lang/cz_faq_manage_questions_list.lng | 1 - .../web/help/lib/lang/cz_help_faq_list.lng | 1 - .../lib/lang/cz_help_faq_sections_list.lng | 1 - .../web/help/lib/lang/cz_support_message.lng | 1 - .../help/lib/lang/cz_support_message_list.lng | 1 - interface/web/js/scrigo.js.php | 7 +- interface/web/login/lib/lang/cz.lng | 1 - interface/web/login/lib/lang/de.lng | 2 +- .../web/mail/lib/lang/ar_mail_mailinglist.lng | 1 + .../web/mail/lib/lang/bg_mail_mailinglist.lng | 1 + .../web/mail/lib/lang/br_mail_mailinglist.lng | 1 + interface/web/mail/lib/lang/cz.lng | 1 - interface/web/mail/lib/lang/cz_mail_alias.lng | 1 - .../web/mail/lib/lang/cz_mail_alias_list.lng | 1 - .../web/mail/lib/lang/cz_mail_aliasdomain.lng | 1 - .../lib/lang/cz_mail_aliasdomain_list.lng | 1 - .../web/mail/lib/lang/cz_mail_blacklist.lng | 1 - .../mail/lib/lang/cz_mail_blacklist_list.lng | 1 - .../mail/lib/lang/cz_mail_content_filter.lng | 1 - .../lib/lang/cz_mail_content_filter_list.lng | 1 - .../web/mail/lib/lang/cz_mail_domain.lng | 1 - .../lib/lang/cz_mail_domain_admin_list.lng | 1 - .../mail/lib/lang/cz_mail_domain_catchall.lng | 1 - .../lib/lang/cz_mail_domain_catchall_list.lng | 1 - .../web/mail/lib/lang/cz_mail_domain_list.lng | 1 - .../web/mail/lib/lang/cz_mail_forward.lng | 1 - .../mail/lib/lang/cz_mail_forward_list.lng | 1 - interface/web/mail/lib/lang/cz_mail_get.lng | 1 - .../web/mail/lib/lang/cz_mail_get_list.lng | 1 - .../web/mail/lib/lang/cz_mail_mailinglist.lng | 2 +- .../lib/lang/cz_mail_mailinglist_list.lng | 1 - .../mail/lib/lang/cz_mail_relay_recipient.lng | 1 - .../lib/lang/cz_mail_relay_recipient_list.lng | 1 - .../web/mail/lib/lang/cz_mail_spamfilter.lng | 1 - .../mail/lib/lang/cz_mail_spamfilter_list.lng | 1 - .../web/mail/lib/lang/cz_mail_transport.lng | 1 - .../mail/lib/lang/cz_mail_transport_list.lng | 1 - interface/web/mail/lib/lang/cz_mail_user.lng | 1 - .../web/mail/lib/lang/cz_mail_user_filter.lng | 1 - .../lib/lang/cz_mail_user_filter_list.lng | 1 - .../web/mail/lib/lang/cz_mail_user_list.lng | 1 - .../mail/lib/lang/cz_mail_user_stats_list.lng | 1 - .../web/mail/lib/lang/cz_mail_whitelist.lng | 1 - .../mail/lib/lang/cz_mail_whitelist_list.lng | 1 - .../mail/lib/lang/cz_spamfilter_blacklist.lng | 1 - .../lib/lang/cz_spamfilter_blacklist_list.lng | 1 - .../mail/lib/lang/cz_spamfilter_config.lng | 1 - .../lib/lang/cz_spamfilter_config_list.lng | 1 - .../mail/lib/lang/cz_spamfilter_policy.lng | 1 - .../lib/lang/cz_spamfilter_policy_list.lng | 1 - .../web/mail/lib/lang/cz_spamfilter_users.lng | 1 - .../lib/lang/cz_spamfilter_users_list.lng | 1 - .../mail/lib/lang/cz_spamfilter_whitelist.lng | 1 - .../lib/lang/cz_spamfilter_whitelist_list.lng | 1 - .../lib/lang/cz_user_quota_stats_list.lng | 1 - interface/web/mail/lib/lang/de.lng | 2 +- interface/web/mail/lib/lang/de_mail_alias.lng | 2 +- .../web/mail/lib/lang/de_mail_mailinglist.lng | 1 + .../web/mail/lib/lang/el_mail_mailinglist.lng | 1 + .../web/mail/lib/lang/es_mail_mailinglist.lng | 1 + .../web/mail/lib/lang/fi_mail_mailinglist.lng | 1 + .../web/mail/lib/lang/fr_mail_mailinglist.lng | 1 + .../web/mail/lib/lang/hr_mail_mailinglist.lng | 1 + .../web/mail/lib/lang/hu_mail_mailinglist.lng | 1 + .../web/mail/lib/lang/id_mail_mailinglist.lng | 1 + .../web/mail/lib/lang/it_mail_mailinglist.lng | 1 + .../web/mail/lib/lang/ja_mail_mailinglist.lng | 1 + .../web/mail/lib/lang/nl_mail_mailinglist.lng | 1 + .../web/mail/lib/lang/pl_mail_mailinglist.lng | 1 + .../web/mail/lib/lang/pt_mail_mailinglist.lng | 1 + .../web/mail/lib/lang/ro_mail_mailinglist.lng | 1 + .../web/mail/lib/lang/ru_mail_mailinglist.lng | 1 + .../web/mail/lib/lang/se_mail_mailinglist.lng | 1 + .../web/mail/lib/lang/sk_mail_mailinglist.lng | 1 + .../web/mail/lib/lang/tr_mail_mailinglist.lng | 1 + interface/web/mailuser/lib/lang/cz.lng | 1 - interface/web/mailuser/lib/lang/cz_index.lng | 1 - .../lib/lang/cz_mail_user_autoresponder.lng | 1 - .../web/mailuser/lib/lang/cz_mail_user_cc.lng | 1 - .../mailuser/lib/lang/cz_mail_user_filter.lng | 1 - .../lib/lang/cz_mail_user_filter_list.lng | 1 - .../lib/lang/cz_mail_user_password.lng | 1 - .../lib/lang/cz_mail_user_spamfilter.lng | 1 - interface/web/mailuser/lib/lang/de.lng | 2 +- interface/web/mailuser/lib/lang/de_index.lng | 2 +- .../lib/lang/de_mail_user_filter_list.lng | 4 +- .../lib/lang/de_mail_user_password.lng | 2 +- interface/web/monitor/lib/lang/cz.lng | 1 - .../web/monitor/lib/lang/cz_datalog_list.lng | 1 - .../web/monitor/lib/lang/cz_syslog_list.lng | 1 - interface/web/monitor/lib/lang/de.lng | 2 +- .../web/sites/aps_cron_apscrawler_if.php | 4 +- interface/web/sites/aps_install_package.php | 17 +- .../web/sites/aps_update_packagelist.php | 57 +++++++ interface/web/sites/database_user_edit.php | 4 + .../web/sites/form/web_aliasdomain.tform.php | 2 +- interface/web/sites/lib/lang/ar.lng | 2 +- .../lib/lang/ar_aps_update_packagelist.lng | 7 + .../web/sites/lib/lang/ar_web_aliasdomain.lng | 112 +++++++++++++ .../web/sites/lib/lang/ar_web_subdomain.lng | 2 +- interface/web/sites/lib/lang/bg.lng | 2 +- .../lib/lang/bg_aps_update_packagelist.lng | 7 + .../web/sites/lib/lang/bg_web_aliasdomain.lng | 112 +++++++++++++ .../web/sites/lib/lang/bg_web_subdomain.lng | 2 +- interface/web/sites/lib/lang/br.lng | 2 +- .../lib/lang/br_aps_update_packagelist.lng | 7 + .../web/sites/lib/lang/br_web_aliasdomain.lng | 112 +++++++++++++ .../web/sites/lib/lang/br_web_subdomain.lng | 2 +- interface/web/sites/lib/lang/cz.lng | 1 - interface/web/sites/lib/lang/cz_aps.lng | 1 - .../sites/lib/lang/cz_aps_instances_list.lng | 1 - .../sites/lib/lang/cz_aps_packages_list.lng | 1 - .../lib/lang/cz_aps_update_packagelist.lng | 7 + interface/web/sites/lib/lang/cz_cron.lng | 1 - interface/web/sites/lib/lang/cz_cron_list.lng | 1 - interface/web/sites/lib/lang/cz_database.lng | 2 +- .../sites/lib/lang/cz_database_admin_list.lng | 1 - .../web/sites/lib/lang/cz_database_list.lng | 1 - .../web/sites/lib/lang/cz_database_user.lng | 1 - .../lib/lang/cz_database_user_admin_list.lng | 1 - .../sites/lib/lang/cz_database_user_list.lng | 1 - interface/web/sites/lib/lang/cz_ftp_user.lng | 1 - .../web/sites/lib/lang/cz_ftp_user_list.lng | 1 - .../web/sites/lib/lang/cz_shell_user.lng | 1 - .../web/sites/lib/lang/cz_shell_user_list.lng | 1 - .../lib/lang/cz_user_quota_stats_list.lng | 1 - .../web/sites/lib/lang/cz_web_aliasdomain.lng | 113 ++++++++++++- .../lib/lang/cz_web_aliasdomain_list.lng | 1 - .../web/sites/lib/lang/cz_web_backup_list.lng | 1 - .../web/sites/lib/lang/cz_web_domain.lng | 1 - .../lib/lang/cz_web_domain_admin_list.lng | 1 - .../web/sites/lib/lang/cz_web_domain_list.lng | 1 - .../web/sites/lib/lang/cz_web_folder.lng | 1 - .../web/sites/lib/lang/cz_web_folder_list.lng | 1 - .../web/sites/lib/lang/cz_web_folder_user.lng | 1 - .../lib/lang/cz_web_folder_user_list.lng | 1 - .../lib/lang/cz_web_sites_stats_list.lng | 1 - .../web/sites/lib/lang/cz_web_subdomain.lng | 1 - .../sites/lib/lang/cz_web_subdomain_list.lng | 1 - .../sites/lib/lang/cz_web_vhost_subdomain.lng | 1 - .../lib/lang/cz_web_vhost_subdomain_list.lng | 1 - .../web/sites/lib/lang/cz_webdav_user.lng | 1 - .../sites/lib/lang/cz_webdav_user_list.lng | 1 - interface/web/sites/lib/lang/de_aps.lng | 1 + .../lib/lang/de_aps_update_packagelist.lng | 7 + interface/web/sites/lib/lang/de_database.lng | 20 +-- .../web/sites/lib/lang/de_web_aliasdomain.lng | 112 +++++++++++++ interface/web/sites/lib/lang/el.lng | 2 +- .../lib/lang/el_aps_update_packagelist.lng | 7 + .../web/sites/lib/lang/el_web_aliasdomain.lng | 112 +++++++++++++ .../web/sites/lib/lang/el_web_subdomain.lng | 2 +- interface/web/sites/lib/lang/en_aps.lng | 1 + .../lib/lang/en_aps_update_packagelist.lng | 7 + .../web/sites/lib/lang/en_web_aliasdomain.lng | 112 +++++++++++++ interface/web/sites/lib/lang/es.lng | 2 +- .../lib/lang/es_aps_update_packagelist.lng | 7 + .../web/sites/lib/lang/es_web_aliasdomain.lng | 112 +++++++++++++ .../web/sites/lib/lang/es_web_subdomain.lng | 2 +- interface/web/sites/lib/lang/fi.lng | 2 +- .../lib/lang/fi_aps_update_packagelist.lng | 7 + .../web/sites/lib/lang/fi_web_aliasdomain.lng | 112 +++++++++++++ .../web/sites/lib/lang/fi_web_subdomain.lng | 2 +- interface/web/sites/lib/lang/fr.lng | 2 +- .../lib/lang/fr_aps_update_packagelist.lng | 7 + .../web/sites/lib/lang/fr_web_aliasdomain.lng | 112 +++++++++++++ .../web/sites/lib/lang/fr_web_subdomain.lng | 2 +- interface/web/sites/lib/lang/hr.lng | 2 +- .../lib/lang/hr_aps_update_packagelist.lng | 7 + .../web/sites/lib/lang/hr_web_aliasdomain.lng | 112 +++++++++++++ .../web/sites/lib/lang/hr_web_subdomain.lng | 2 +- interface/web/sites/lib/lang/hu.lng | 2 +- .../lib/lang/hu_aps_update_packagelist.lng | 7 + .../web/sites/lib/lang/hu_web_aliasdomain.lng | 112 +++++++++++++ .../web/sites/lib/lang/hu_web_subdomain.lng | 2 +- interface/web/sites/lib/lang/id.lng | 2 +- .../lib/lang/id_aps_update_packagelist.lng | 7 + .../web/sites/lib/lang/id_web_aliasdomain.lng | 112 +++++++++++++ .../web/sites/lib/lang/id_web_subdomain.lng | 2 +- interface/web/sites/lib/lang/it.lng | 2 +- .../lib/lang/it_aps_update_packagelist.lng | 7 + .../web/sites/lib/lang/it_web_aliasdomain.lng | 112 +++++++++++++ .../web/sites/lib/lang/it_web_subdomain.lng | 2 +- interface/web/sites/lib/lang/ja.lng | 2 +- .../lib/lang/ja_aps_update_packagelist.lng | 7 + .../web/sites/lib/lang/ja_web_aliasdomain.lng | 112 +++++++++++++ .../web/sites/lib/lang/ja_web_subdomain.lng | 2 +- interface/web/sites/lib/lang/nl.lng | 2 +- .../lib/lang/nl_aps_update_packagelist.lng | 7 + .../web/sites/lib/lang/nl_web_aliasdomain.lng | 112 +++++++++++++ .../web/sites/lib/lang/nl_web_subdomain.lng | 2 +- interface/web/sites/lib/lang/pl.lng | 2 +- .../lib/lang/pl_aps_update_packagelist.lng | 7 + .../web/sites/lib/lang/pl_web_aliasdomain.lng | 112 +++++++++++++ .../web/sites/lib/lang/pl_web_subdomain.lng | 2 +- interface/web/sites/lib/lang/pt.lng | 2 +- .../lib/lang/pt_aps_update_packagelist.lng | 7 + .../web/sites/lib/lang/pt_web_aliasdomain.lng | 112 +++++++++++++ .../web/sites/lib/lang/pt_web_subdomain.lng | 2 +- interface/web/sites/lib/lang/ro.lng | 2 +- .../lib/lang/ro_aps_update_packagelist.lng | 7 + .../web/sites/lib/lang/ro_web_aliasdomain.lng | 112 +++++++++++++ .../web/sites/lib/lang/ro_web_subdomain.lng | 2 +- interface/web/sites/lib/lang/ru.lng | 2 +- .../lib/lang/ru_aps_update_packagelist.lng | 7 + .../web/sites/lib/lang/ru_web_aliasdomain.lng | 112 +++++++++++++ .../web/sites/lib/lang/ru_web_subdomain.lng | 2 +- interface/web/sites/lib/lang/se.lng | 2 +- .../lib/lang/se_aps_update_packagelist.lng | 7 + .../web/sites/lib/lang/se_web_aliasdomain.lng | 112 +++++++++++++ .../web/sites/lib/lang/se_web_subdomain.lng | 2 +- interface/web/sites/lib/lang/sk.lng | 2 +- .../lib/lang/sk_aps_update_packagelist.lng | 7 + .../web/sites/lib/lang/sk_web_aliasdomain.lng | 112 +++++++++++++ .../web/sites/lib/lang/sk_web_subdomain.lng | 2 +- interface/web/sites/lib/lang/tr.lng | 2 +- .../lib/lang/tr_aps_update_packagelist.lng | 7 + .../web/sites/lib/lang/tr_web_aliasdomain.lng | 112 +++++++++++++ .../web/sites/lib/lang/tr_web_subdomain.lng | 2 +- interface/web/sites/lib/module.conf.php | 6 +- .../templates/aps_update_packagelist.htm | 20 +++ interface/web/sites/web_domain_del.php | 32 ++-- interface/web/sites/web_domain_edit.php | 14 +- .../lib/lang/cz_strengthmeter.lng | 1 - interface/web/themes/default/css/styles.css | 4 +- .../web/themes/default/templates/main.tpl.htm | 31 ++++ interface/web/tools/lib/lang/cz.lng | 1 - .../tools/lib/lang/cz_import_ispconfig.lng | 1 - interface/web/tools/lib/lang/cz_index.lng | 1 - interface/web/tools/lib/lang/cz_interface.lng | 1 - interface/web/tools/lib/lang/cz_resync.lng | 1 - .../web/tools/lib/lang/cz_tpl_default.lng | 1 - .../web/tools/lib/lang/cz_usersettings.lng | 1 - interface/web/tools/lib/lang/de.lng | 8 +- .../tools/lib/lang/de_import_ispconfig.lng | 26 +-- interface/web/tools/lib/lang/de_index.lng | 2 +- interface/web/tools/lib/lang/de_interface.lng | 2 +- interface/web/tools/lib/lang/de_resync.lng | 18 +- interface/web/vm/lib/lang/cz.lng | 1 - .../web/vm/lib/lang/cz_openvz_action.lng | 1 - interface/web/vm/lib/lang/cz_openvz_ip.lng | 1 - .../web/vm/lib/lang/cz_openvz_ip_list.lng | 1 - .../web/vm/lib/lang/cz_openvz_ostemplate.lng | 1 - .../vm/lib/lang/cz_openvz_ostemplate_list.lng | 1 - .../web/vm/lib/lang/cz_openvz_template.lng | 1 - .../vm/lib/lang/cz_openvz_template_list.lng | 1 - interface/web/vm/lib/lang/cz_openvz_vm.lng | 1 - .../web/vm/lib/lang/cz_openvz_vm_list.lng | 1 - server/lib/classes/aps_installer.inc.php | 26 ++- server/lib/classes/file.inc.php | 17 ++ server/lib/classes/monitor_tools.inc.php | 10 +- server/lib/classes/system.inc.php | 6 + .../plugins-available/apache2_plugin.inc.php | 129 ++++++++++----- .../cron_jailkit_plugin.inc.php | 10 +- .../plugins-available/firewall_plugin.inc.php | 8 +- server/plugins-available/nginx_plugin.inc.php | 156 +++++++++++++----- .../shelluser_base_plugin.inc.php | 5 +- .../shelluser_jailkit_plugin.inc.php | 10 +- server/scripts/create_jailkit_user.sh | 4 +- 465 files changed, 4278 insertions(+), 872 deletions(-) create mode 100644 install/sql/incremental/upd_0048.sql create mode 100644 interface/web/dummy_login.html create mode 100644 interface/web/sites/aps_update_packagelist.php create mode 100644 interface/web/sites/lib/lang/ar_aps_update_packagelist.lng create mode 100644 interface/web/sites/lib/lang/bg_aps_update_packagelist.lng create mode 100644 interface/web/sites/lib/lang/br_aps_update_packagelist.lng create mode 100644 interface/web/sites/lib/lang/cz_aps_update_packagelist.lng create mode 100644 interface/web/sites/lib/lang/de_aps_update_packagelist.lng create mode 100644 interface/web/sites/lib/lang/el_aps_update_packagelist.lng create mode 100644 interface/web/sites/lib/lang/en_aps_update_packagelist.lng create mode 100644 interface/web/sites/lib/lang/es_aps_update_packagelist.lng create mode 100644 interface/web/sites/lib/lang/fi_aps_update_packagelist.lng create mode 100644 interface/web/sites/lib/lang/fr_aps_update_packagelist.lng create mode 100644 interface/web/sites/lib/lang/hr_aps_update_packagelist.lng create mode 100644 interface/web/sites/lib/lang/hu_aps_update_packagelist.lng create mode 100644 interface/web/sites/lib/lang/id_aps_update_packagelist.lng create mode 100644 interface/web/sites/lib/lang/it_aps_update_packagelist.lng create mode 100644 interface/web/sites/lib/lang/ja_aps_update_packagelist.lng create mode 100644 interface/web/sites/lib/lang/nl_aps_update_packagelist.lng create mode 100644 interface/web/sites/lib/lang/pl_aps_update_packagelist.lng create mode 100644 interface/web/sites/lib/lang/pt_aps_update_packagelist.lng create mode 100644 interface/web/sites/lib/lang/ro_aps_update_packagelist.lng create mode 100644 interface/web/sites/lib/lang/ru_aps_update_packagelist.lng create mode 100644 interface/web/sites/lib/lang/se_aps_update_packagelist.lng create mode 100644 interface/web/sites/lib/lang/sk_aps_update_packagelist.lng create mode 100644 interface/web/sites/lib/lang/tr_aps_update_packagelist.lng create mode 100644 interface/web/sites/templates/aps_update_packagelist.htm diff --git a/install/dist/conf/centos52.conf.php b/install/dist/conf/centos52.conf.php index 8a092a9f7e..1221a74e6c 100644 --- a/install/dist/conf/centos52.conf.php +++ b/install/dist/conf/centos52.conf.php @@ -99,6 +99,7 @@ $conf['web']['apps_vhost_group'] = 'ispapps'; //* Fastcgi $conf['fastcgi']['fastcgi_phpini_path'] = '/etc/'; $conf['fastcgi']['fastcgi_starter_path'] = '/var/www/php-fcgi-scripts/[system_user]/'; +$conf['fastcgi']['fastcgi_bin'] = '/usr/bin/php-cgi'; //* Postfix $conf['postfix']['installed'] = false; // will be detected automatically during installation diff --git a/install/dist/conf/centos53.conf.php b/install/dist/conf/centos53.conf.php index 8a092a9f7e..1221a74e6c 100644 --- a/install/dist/conf/centos53.conf.php +++ b/install/dist/conf/centos53.conf.php @@ -99,6 +99,7 @@ $conf['web']['apps_vhost_group'] = 'ispapps'; //* Fastcgi $conf['fastcgi']['fastcgi_phpini_path'] = '/etc/'; $conf['fastcgi']['fastcgi_starter_path'] = '/var/www/php-fcgi-scripts/[system_user]/'; +$conf['fastcgi']['fastcgi_bin'] = '/usr/bin/php-cgi'; //* Postfix $conf['postfix']['installed'] = false; // will be detected automatically during installation diff --git a/install/dist/conf/debian40.conf.php b/install/dist/conf/debian40.conf.php index ba7296bc19..7bdd238498 100644 --- a/install/dist/conf/debian40.conf.php +++ b/install/dist/conf/debian40.conf.php @@ -101,6 +101,7 @@ $conf['web']['apps_vhost_group'] = 'ispapps'; //* Fastcgi $conf['fastcgi']['fastcgi_phpini_path'] = '/etc/php5/cgi/'; $conf['fastcgi']['fastcgi_starter_path'] = '/var/www/php-fcgi-scripts/[system_user]/'; +$conf['fastcgi']['fastcgi_bin'] = '/usr/bin/php-cgi'; //* Postfix $conf['postfix']['installed'] = false; // will be detected automatically during installation diff --git a/install/dist/conf/debian60.conf.php b/install/dist/conf/debian60.conf.php index f866d8a3f7..8eb3a2ca3a 100644 --- a/install/dist/conf/debian60.conf.php +++ b/install/dist/conf/debian60.conf.php @@ -101,6 +101,7 @@ $conf['web']['apps_vhost_group'] = 'ispapps'; //* Fastcgi $conf['fastcgi']['fastcgi_phpini_path'] = '/etc/php5/cgi/'; $conf['fastcgi']['fastcgi_starter_path'] = '/var/www/php-fcgi-scripts/[system_user]/'; +$conf['fastcgi']['fastcgi_bin'] = '/usr/bin/php-cgi'; //* Postfix $conf['postfix']['installed'] = false; // will be detected automatically during installation diff --git a/install/dist/conf/fedora9.conf.php b/install/dist/conf/fedora9.conf.php index 6b4c24a7df..c988d3f3cd 100644 --- a/install/dist/conf/fedora9.conf.php +++ b/install/dist/conf/fedora9.conf.php @@ -99,6 +99,7 @@ $conf['web']['apps_vhost_group'] = 'ispapps'; //* Fastcgi $conf['fastcgi']['fastcgi_phpini_path'] = '/etc/'; $conf['fastcgi']['fastcgi_starter_path'] = '/var/www/php-fcgi-scripts/[system_user]/'; +$conf['fastcgi']['fastcgi_bin'] = '/usr/bin/php-cgi'; //* Postfix $conf['postfix']['installed'] = false; // will be detected automatically during installation diff --git a/install/dist/conf/gentoo.conf.php b/install/dist/conf/gentoo.conf.php index b89a158df7..2a0471a520 100644 --- a/install/dist/conf/gentoo.conf.php +++ b/install/dist/conf/gentoo.conf.php @@ -112,6 +112,7 @@ $conf['awstats']['buildstaticpages_pl'] = '/usr/bin/awstats_buildstaticpages.pl' //* Fastcgi $conf['fastcgi']['fastcgi_phpini_path'] = '/etc/php/cgi-php5'; $conf['fastcgi']['fastcgi_starter_path'] = '/var/www/php-fcgi-scripts/[system_user]/'; +$conf['fastcgi']['fastcgi_bin'] = '/usr/bin/php-cgi'; //* Postfix $conf['postfix']['installed'] = false; // will be detected automatically during installation diff --git a/install/dist/conf/opensuse110.conf.php b/install/dist/conf/opensuse110.conf.php index e57d9be467..fd8ef65439 100644 --- a/install/dist/conf/opensuse110.conf.php +++ b/install/dist/conf/opensuse110.conf.php @@ -99,6 +99,7 @@ $conf['web']['apps_vhost_group'] = 'ispapps'; //* Fastcgi $conf['fastcgi']['fastcgi_phpini_path'] = '/etc/php5/fastcgi/'; $conf['fastcgi']['fastcgi_starter_path'] = '/srv/www/php-fcgi-scripts/[system_user]/'; +$conf['fastcgi']['fastcgi_bin'] = '/usr/bin/php-cgi'; //* Postfix $conf['postfix']['installed'] = false; // will be detected automatically during installation diff --git a/install/dist/conf/opensuse112.conf.php b/install/dist/conf/opensuse112.conf.php index 8e4a1fac40..96a37d6a57 100644 --- a/install/dist/conf/opensuse112.conf.php +++ b/install/dist/conf/opensuse112.conf.php @@ -99,6 +99,7 @@ $conf['web']['apps_vhost_group'] = 'ispapps'; //* Fastcgi $conf['fastcgi']['fastcgi_phpini_path'] = '/etc/php5/fastcgi/'; $conf['fastcgi']['fastcgi_starter_path'] = '/srv/www/php-fcgi-scripts/[system_user]/'; +$conf['fastcgi']['fastcgi_bin'] = '/usr/bin/php-cgi'; //* Postfix $conf['postfix']['installed'] = false; // will be detected automatically during installation diff --git a/install/dist/lib/centos52.lib.php b/install/dist/lib/centos52.lib.php index f00414a62c..8accc9a1ec 100644 --- a/install/dist/lib/centos52.lib.php +++ b/install/dist/lib/centos52.lib.php @@ -30,6 +30,79 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. class installer extends installer_dist { + public function configure_mailman($status = 'insert') { + global $conf; + + $config_dir = $conf['mailman']['config_dir'].'/'; + $full_file_name = $config_dir.'mm_cfg.py'; + //* Backup exiting file + if(is_file($full_file_name)) { + copy($full_file_name, $config_dir.'mm_cfg.py~'); + } + + // load files + $content = rf('tpl/mm_cfg.py.master'); + $old_file = rf($full_file_name); + + $old_options = array(); + $lines = explode("\n", $old_file); + foreach ($lines as $line) + { + if (trim($line) != '' && substr($line, 0, 1) != '#') + { + @list($key, $value) = @explode("=", $line); + if (!empty($value)) + { + $key = rtrim($key); + $old_options[$key] = trim($value); + } + } + } + + $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') + { + // create virtual_domains list + $domainAll = $this->db->queryAllRecords("SELECT domain FROM mail_mailinglist GROUP BY domain"); + + if(is_array($domainAll)) { + foreach($domainAll as $domain) + { + if ($domainAll[0]['domain'] == $domain['domain']) + $virtual_domains .= "'".$domain['domain']."'"; + else + $virtual_domains .= ", '".$domain['domain']."'"; + } + } + } + else + $virtual_domains = "' '"; + + $content = str_replace('{hostname}', $conf['hostname'], $content); + if(!isset($old_options['DEFAULT_SERVER_LANGUAGE'])) $old_options['DEFAULT_SERVER_LANGUAGE'] = ''; + $content = str_replace('{default_language}', $old_options['DEFAULT_SERVER_LANGUAGE'], $content); + $content = str_replace('{virtual_domains}', $virtual_domains, $content); + + wf($full_file_name, $content); + } + public function configure_amavis() { global $conf; diff --git a/install/dist/lib/centos53.lib.php b/install/dist/lib/centos53.lib.php index 7b3337d966..d1960a1c58 100644 --- a/install/dist/lib/centos53.lib.php +++ b/install/dist/lib/centos53.lib.php @@ -30,6 +30,79 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. class installer extends installer_dist { + public function configure_mailman($status = 'insert') { + global $conf; + + $config_dir = $conf['mailman']['config_dir'].'/'; + $full_file_name = $config_dir.'mm_cfg.py'; + //* Backup exiting file + if(is_file($full_file_name)) { + copy($full_file_name, $config_dir.'mm_cfg.py~'); + } + + // load files + $content = rf('tpl/mm_cfg.py.master'); + $old_file = rf($full_file_name); + + $old_options = array(); + $lines = explode("\n", $old_file); + foreach ($lines as $line) + { + if (trim($line) != '' && substr($line, 0, 1) != '#') + { + @list($key, $value) = @explode("=", $line); + if (!empty($value)) + { + $key = rtrim($key); + $old_options[$key] = trim($value); + } + } + } + + $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') + { + // create virtual_domains list + $domainAll = $this->db->queryAllRecords("SELECT domain FROM mail_mailinglist GROUP BY domain"); + + if(is_array($domainAll)) { + foreach($domainAll as $domain) + { + if ($domainAll[0]['domain'] == $domain['domain']) + $virtual_domains .= "'".$domain['domain']."'"; + else + $virtual_domains .= ", '".$domain['domain']."'"; + } + } + } + else + $virtual_domains = "' '"; + + $content = str_replace('{hostname}', $conf['hostname'], $content); + if(!isset($old_options['DEFAULT_SERVER_LANGUAGE'])) $old_options['DEFAULT_SERVER_LANGUAGE'] = ''; + $content = str_replace('{default_language}', $old_options['DEFAULT_SERVER_LANGUAGE'], $content); + $content = str_replace('{virtual_domains}', $virtual_domains, $content); + + wf($full_file_name, $content); + } + public function configure_amavis() { global $conf; diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php index ea7f378189..05e86f61c3 100644 --- a/install/dist/lib/fedora.lib.php +++ b/install/dist/lib/fedora.lib.php @@ -29,6 +29,79 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ class installer_dist extends installer_base { + + public function configure_mailman($status = 'insert') { + global $conf; + + $config_dir = $conf['mailman']['config_dir'].'/'; + $full_file_name = $config_dir.'mm_cfg.py'; + //* Backup exiting file + if(is_file($full_file_name)) { + copy($full_file_name, $config_dir.'mm_cfg.py~'); + } + + // load files + $content = rf('tpl/mm_cfg.py.master'); + $old_file = rf($full_file_name); + + $old_options = array(); + $lines = explode("\n", $old_file); + foreach ($lines as $line) + { + if (trim($line) != '' && substr($line, 0, 1) != '#') + { + @list($key, $value) = @explode("=", $line); + if (!empty($value)) + { + $key = rtrim($key); + $old_options[$key] = trim($value); + } + } + } + + $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') + { + // create virtual_domains list + $domainAll = $this->db->queryAllRecords("SELECT domain FROM mail_mailinglist GROUP BY domain"); + + if(is_array($domainAll)) { + foreach($domainAll as $domain) + { + if ($domainAll[0]['domain'] == $domain['domain']) + $virtual_domains .= "'".$domain['domain']."'"; + else + $virtual_domains .= ", '".$domain['domain']."'"; + } + } + } + else + $virtual_domains = "' '"; + + $content = str_replace('{hostname}', $conf['hostname'], $content); + if(!isset($old_options['DEFAULT_SERVER_LANGUAGE'])) $old_options['DEFAULT_SERVER_LANGUAGE'] = ''; + $content = str_replace('{default_language}', $old_options['DEFAULT_SERVER_LANGUAGE'], $content); + $content = str_replace('{virtual_domains}', $virtual_domains, $content); + + wf($full_file_name, $content); + } function configure_postfix($options = '') { @@ -957,6 +1030,7 @@ class installer_dist extends installer_base { exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/000-ispconfig.vhost"); } + /* exec('mkdir -p /var/www/php-fcgi-scripts/ispconfig'); exec('cp tpl/apache_ispconfig_fcgi_starter.master /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'); exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'); @@ -964,6 +1038,17 @@ class installer_dist extends installer_base { exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig'); replaceLine('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter','PHPRC=','PHPRC=/etc/',0,0); + */ + if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) { + $content = rf('tpl/apache_ispconfig_fcgi_starter.master'); + $content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content); + $content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content); + exec('mkdir -p /var/www/php-fcgi-scripts/ispconfig'); + wf('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter', $content); + exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'); + exec('ln -s /usr/local/ispconfig/interface/web /var/www/ispconfig'); + exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig'); + } } } diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php index 5ff3af1a41..4600093bac 100644 --- a/install/dist/lib/gentoo.lib.php +++ b/install/dist/lib/gentoo.lib.php @@ -612,8 +612,12 @@ class installer extends installer_base if ( !is_file($conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter') ) { + $content = rf('tpl/apache_apps_fcgi_starter.master'); + $content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content); + $content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content); mkdir($conf['web']['website_basedir'].'/php-fcgi-scripts/apps', 0755, true); - copy('tpl/apache_apps_fcgi_starter.master',$conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter'); + //copy('tpl/apache_apps_fcgi_starter.master',$conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter'); + wf($conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter', $content); exec('chmod +x '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter'); exec('chown -R ispapps:ispapps '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps'); @@ -938,13 +942,15 @@ class installer extends installer_base $vhost_path = $conf['apache']['vhost_conf_dir'].'/ispconfig.vhost'; $this->write_config_file($vhost_path, $content); - if (!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) - { + if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) { + $content = rf('tpl/apache_ispconfig_fcgi_starter.master'); + $content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content); + $content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content); mkdir('/var/www/php-fcgi-scripts/ispconfig', 0755, true); - copy('tpl/apache_ispconfig_fcgi_starter.master', '/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'); + wf('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter', $content); exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'); chmod('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter', 0755); - symlink($install_dir.'/interface/web', '/var/www/ispconfig'); + symlink($install_dir.'/interface/web','/var/www/ispconfig'); exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig'); } } diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php index 75b2f66d3e..78ddf5e920 100644 --- a/install/dist/lib/opensuse.lib.php +++ b/install/dist/lib/opensuse.lib.php @@ -29,6 +29,79 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ class installer_dist extends installer_base { + + public function configure_mailman($status = 'insert') { + global $conf; + + $config_dir = $conf['mailman']['config_dir'].'/'; + $full_file_name = $config_dir.'mm_cfg.py'; + //* Backup exiting file + if(is_file($full_file_name)) { + copy($full_file_name, $config_dir.'mm_cfg.py~'); + } + + // load files + $content = rf('tpl/mm_cfg.py.master'); + $old_file = rf($full_file_name); + + $old_options = array(); + $lines = explode("\n", $old_file); + foreach ($lines as $line) + { + if (trim($line) != '' && substr($line, 0, 1) != '#') + { + @list($key, $value) = @explode("=", $line); + if (!empty($value)) + { + $key = rtrim($key); + $old_options[$key] = trim($value); + } + } + } + + $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') + { + // create virtual_domains list + $domainAll = $this->db->queryAllRecords("SELECT domain FROM mail_mailinglist GROUP BY domain"); + + if(is_array($domainAll)) { + foreach($domainAll as $domain) + { + if ($domainAll[0]['domain'] == $domain['domain']) + $virtual_domains .= "'".$domain['domain']."'"; + else + $virtual_domains .= ", '".$domain['domain']."'"; + } + } + } + else + $virtual_domains = "' '"; + + $content = str_replace('{hostname}', $conf['hostname'], $content); + if(!isset($old_options['DEFAULT_SERVER_LANGUAGE'])) $old_options['DEFAULT_SERVER_LANGUAGE'] = ''; + $content = str_replace('{default_language}', $old_options['DEFAULT_SERVER_LANGUAGE'], $content); + $content = str_replace('{virtual_domains}', $virtual_domains, $content); + + wf($full_file_name, $content); + } function configure_postfix($options = '') { @@ -607,6 +680,24 @@ class installer_dist extends installer_base { $command = 'groupadd sshusers'; if(!is_group('sshusers')) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); + // create PHP-FPM pool dir + exec('mkdir -p '.$conf['nginx']['php_fpm_pool_dir']); + + $content = rf('/etc/php5/fpm/php-fpm.conf'); + if(stripos($content, 'include=/etc/php5/fpm/pool.d/*.conf') === false){ + af('/etc/php5/fpm/php-fpm.conf',"\ninclude=/etc/php5/fpm/pool.d/*.conf"); + } + unset($content); + if(!@is_file($conf['nginx']['php_fpm_ini_path'])){ + if(@is_file('/etc/php5/cli/php.ini')){ + exec('cp -f /etc/php5/cli/php.ini '.$conf['nginx']['php_fpm_ini_path']); + } elseif(@is_file('/etc/php5/fastcgi/php.ini')){ + exec('cp -f /etc/php5/fastcgi/php.ini '.$conf['nginx']['php_fpm_ini_path']); + } elseif(@is_file('/etc/php5/apache2/php.ini')){ + exec('cp -f /etc/php5/apache2/php.ini '.$conf['nginx']['php_fpm_ini_path']); + } + } + } public function configure_nginx(){ @@ -988,8 +1079,11 @@ class installer_dist extends installer_base { wf("$vhost_conf_dir/ispconfig.vhost", $content); if(!is_file('/srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) { + $content = rf('tpl/apache_ispconfig_fcgi_starter.master'); + $content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content); + $content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content); exec('mkdir -p /srv/www/php-fcgi-scripts/ispconfig'); - exec('cp tpl/apache_ispconfig_fcgi_starter.master /srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'); + wf('/srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter', $content); exec('chmod +x /srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'); exec('ln -s /usr/local/ispconfig/interface/web /srv/www/ispconfig'); exec('chown -R ispconfig:ispconfig /srv/www/php-fcgi-scripts/ispconfig'); diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 97853a097e..d4ab51b487 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -215,6 +215,7 @@ class installer_base { $tpl_ini_array['jailkit']['jailkit_chroot_app_programs'] = $conf['jailkit']['jailkit_chroot_app_programs']; $tpl_ini_array['fastcgi']['fastcgi_phpini_path'] = $conf['fastcgi']['fastcgi_phpini_path']; $tpl_ini_array['fastcgi']['fastcgi_starter_path'] = $conf['fastcgi']['fastcgi_starter_path']; + $tpl_ini_array['fastcgi']['fastcgi_bin'] = $conf['fastcgi']['fastcgi_bin']; $tpl_ini_array['server']['hostname'] = $conf['hostname']; $tpl_ini_array['server']['ip_address'] = @gethostbyname($conf['hostname']); $tpl_ini_array['web']['website_basedir'] = $conf['web']['website_basedir']; @@ -582,7 +583,7 @@ class installer_base { 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'); + exec('/usr/lib/mailman/bin/genaliases 2>/dev/null'); $virtual_domains = ''; if($status == 'update') @@ -1521,12 +1522,16 @@ class installer_base { } if(!is_file($conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter')) { + $content = rf('tpl/apache_apps_fcgi_starter.master'); + $content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content); + $content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content); mkdir($conf['web']['website_basedir'].'/php-fcgi-scripts/apps', 0755, true); - copy('tpl/apache_apps_fcgi_starter.master',$conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter'); + //copy('tpl/apache_apps_fcgi_starter.master',$conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter'); + wf($conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter', $content); exec('chmod +x '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter'); exec('chown -R ispapps:ispapps '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps'); - } + } } if($conf['nginx']['installed'] == true){ $apps_vhost_user = escapeshellcmd($conf['web']['apps_vhost_user']); @@ -1917,12 +1922,14 @@ class installer_base { } } if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) { + $content = rf('tpl/apache_ispconfig_fcgi_starter.master'); + $content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content); + $content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content); mkdir('/var/www/php-fcgi-scripts/ispconfig', 0755, true); - copy('tpl/apache_ispconfig_fcgi_starter.master','/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'); + wf('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter', $content); exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'); symlink($install_dir.'/interface/web','/var/www/ispconfig'); exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig'); - } } diff --git a/install/lib/update.lib.php b/install/lib/update.lib.php index 9feffa335b..5beca81020 100644 --- a/install/lib/update.lib.php +++ b/install/lib/update.lib.php @@ -247,6 +247,7 @@ function updateDbAndIni() { $tpl_ini_array['jailkit']['jailkit_chroot_app_programs'] = $conf['jailkit']['jailkit_chroot_app_programs']; $tpl_ini_array['fastcgi']['fastcgi_phpini_path'] = $conf['fastcgi']['fastcgi_phpini_path']; $tpl_ini_array['fastcgi']['fastcgi_starter_path'] = $conf['fastcgi']['fastcgi_starter_path']; + $tpl_ini_array['fastcgi']['fastcgi_bin'] = $conf['fastcgi']['fastcgi_bin']; $tpl_ini_array['server']['hostname'] = $conf['hostname']; $tpl_ini_array['server']['ip_address'] = @gethostbyname($conf['hostname']); $tpl_ini_array['web']['website_basedir'] = $conf['web']['website_basedir']; diff --git a/install/sql/incremental/upd_0048.sql b/install/sql/incremental/upd_0048.sql new file mode 100644 index 0000000000..a3cbba6721 --- /dev/null +++ b/install/sql/incremental/upd_0048.sql @@ -0,0 +1 @@ +ALTER TABLE `client` CHANGE `limit_aps` `limit_aps` INT( 11 ) NOT NULL DEFAULT '-1'; \ No newline at end of file diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index 921c768df3..828fcf3d46 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -201,7 +201,7 @@ CREATE TABLE `client` ( `limit_shell_user` int(11) NOT NULL DEFAULT '0', `ssh_chroot` varchar(255) NOT NULL DEFAULT 'no,jailkit,ssh-chroot', `limit_webdav_user` int(11) NOT NULL DEFAULT '0', - `limit_aps` int(11) NOT NULL DEFAULT '0', + `limit_aps` int(11) NOT NULL DEFAULT '-1', `default_dnsserver` int(11) unsigned NOT NULL DEFAULT '1', `limit_dns_zone` int(11) NOT NULL DEFAULT '-1', `limit_dns_slave_zone` int(11) NOT NULL DEFAULT '-1', diff --git a/install/tpl/apache_apps_fcgi_starter.master b/install/tpl/apache_apps_fcgi_starter.master index a638732da9..8a26441e68 100644 --- a/install/tpl/apache_apps_fcgi_starter.master +++ b/install/tpl/apache_apps_fcgi_starter.master @@ -1,6 +1,6 @@ #!/bin/sh -PHPRC=/etc/php5/cgi/ +PHPRC={fastcgi_phpini_path} export PHPRC export PHP_FCGI_MAX_REQUESTS=5000 export PHP_FCGI_CHILDREN=1 -exec /usr/lib/cgi-bin/php -d magic_quotes_gpc=off \ No newline at end of file +exec {fastcgi_bin} -d magic_quotes_gpc=off \ No newline at end of file diff --git a/install/tpl/apache_ispconfig_fcgi_starter.master b/install/tpl/apache_ispconfig_fcgi_starter.master index c534243af7..cc6ec2d09c 100644 --- a/install/tpl/apache_ispconfig_fcgi_starter.master +++ b/install/tpl/apache_ispconfig_fcgi_starter.master @@ -1,6 +1,6 @@ #!/bin/sh -PHPRC=/etc/php5/cgi/ +PHPRC={fastcgi_phpini_path} export PHPRC export PHP_FCGI_MAX_REQUESTS=5000 export PHP_FCGI_CHILDREN=1 -exec /usr/bin/php-cgi -d magic_quotes_gpc=off -d session.save_path=/usr/local/ispconfig/server/temp \ No newline at end of file +exec {fastcgi_bin} -d magic_quotes_gpc=off -d session.save_path=/usr/local/ispconfig/server/temp \ No newline at end of file diff --git a/interface/lib/classes/aps_crawler.inc.php b/interface/lib/classes/aps_crawler.inc.php index ca3402ed24..00b1d76327 100644 --- a/interface/lib/classes/aps_crawler.inc.php +++ b/interface/lib/classes/aps_crawler.inc.php @@ -35,7 +35,7 @@ require_once('aps_base.inc.php'); class ApsCrawler extends ApsBase { - public $app_download_url_list = array(); + //public $app_download_url_list = array(); /** * Constructor @@ -98,7 +98,7 @@ class ApsCrawler extends ApsBase foreach($files as $file) { if($file != '.' && $file != '..') - if(filetype($dir.'/'.$file) == 'dir') rrmdir($dir.'/'.$file); + if(filetype($dir.'/'.$file) == 'dir') $this->removeDirectory($dir.'/'.$file); else @unlink($dir.'/'.$file); } reset($files); @@ -216,7 +216,7 @@ class ApsCrawler extends ApsBase public function startCrawler() { global $app; - + try { // Make sure the requirements are given so that this script can execute @@ -297,13 +297,8 @@ class ApsCrawler extends ApsBase $local_intf_folder = $this->interface_pkg_dir.'/'.$app_name.'-'.$new_ver.'.app.zip/'; // Proceed if a newer or at least equal version has been found with server mode or - // interface mode is activated and there's no valid APP-META.xml existing yet - if((!$this->interface_mode && version_compare($new_ver, $ex_ver) >= 0) - || ($this->interface_mode - && (!file_exists($local_intf_folder.'APP-META.xml') || filesize($local_intf_folder.'APP-META.xml') == 0) - ) - ) - { + // interface mode is activated and there are no valid APP-META.xml and PKG_URL existing yet + if((!$this->interface_mode && version_compare($new_ver, $ex_ver) >= 0) || ($this->interface_mode && (!file_exists($local_intf_folder.'APP-META.xml') || filesize($local_intf_folder.'APP-META.xml') == 0 || !file_exists($local_intf_folder.'PKG_URL') || filesize($local_intf_folder.'PKG_URL') == 0))){ // Check if we already have an old version of this app if(!empty($ex_ver) && version_compare($new_ver, $ex_ver) == 1) $apps_updated++; @@ -311,8 +306,7 @@ class ApsCrawler extends ApsBase $app_filesize = parent::getXPathValue($sxe, "entry[position()=1]/link[@a:type='aps']/@length"); $app_metafile = parent::getXPathValue($sxe, "entry[position()=1]/link[@a:type='meta']/@href"); - $this->app_download_url_list[$app_name.'-'.$new_ver.'.app.zip'] = $app_dl; - + //$this->app_download_url_list[$app_name.'-'.$new_ver.'.app.zip'] = $app_dl; // Skip ASP.net packages because they can't be used at all $asp_handler = parent::getXPathValue($sxe, '//aspnet:handler'); $asp_permissions = parent::getXPathValue($sxe, '//aspnet:permissions'); @@ -342,6 +336,9 @@ class ApsCrawler extends ApsBase // Create the local folder if not yet existing if(!file_exists($local_intf_folder)) @mkdir($local_intf_folder, 0777, true); + + // Save the package URL in an extra file because it's not part of the APP-META.xml file + @file_put_contents($local_intf_folder.'PKG_URL', $app_dl); // Download the meta file $local_metafile = $local_intf_folder.'APP-META.xml'; @@ -480,7 +477,7 @@ class ApsCrawler extends ApsBase try { - // This method must be used in server mode + // This method must be used in interface mode if(!$this->interface_mode) return false; $pkg_list = array(); @@ -531,6 +528,8 @@ class ApsCrawler extends ApsBase $pkg_category = parent::getXPathValue($sxe, '//category'); $pkg_version = parent::getXPathValue($sxe, 'version'); $pkg_release = parent::getXPathValue($sxe, 'release'); + //$pkg_url = $this->app_download_url_list[$pkg]; + $pkg_url = @file_get_contents($this->interface_pkg_dir.'/'.$pkg.'/PKG_URL'); /* $app->db->query("INSERT INTO `aps_packages` @@ -539,13 +538,17 @@ class ApsCrawler extends ApsBase '".$app->db->quote($pkg_category)."', '".$app->db->quote($pkg_version)."', ".$app->db->quote($pkg_release).", ".PACKAGE_ENABLED.");"); */ - - $insert_data = "(`path`, `name`, `category`, `version`, `release`, `package_url`, `package_status`) VALUES + // Insert only if data is complete + if($pkg != '' && $pkg_name != '' && $pkg_category != '' && $pkg_version != '' && $pkg_release != '' && $pkg_url){ + $insert_data = "(`path`, `name`, `category`, `version`, `release`, `package_url`, `package_status`) VALUES ('".$app->db->quote($pkg)."', '".$app->db->quote($pkg_name)."', '".$app->db->quote($pkg_category)."', '".$app->db->quote($pkg_version)."', - ".$app->db->quote($pkg_release).", '".$app->db->quote($this->app_download_url_list[$pkg])."', ".PACKAGE_ENABLED.");"; + ".$app->db->quote($pkg_release).", '".$app->db->quote($pkg_url)."', ".PACKAGE_ENABLED.");"; - $app->db->datalogInsert('aps_packages', $insert_data, 'id'); + $app->db->datalogInsert('aps_packages', $insert_data, 'id'); + } else { + if(file_exists($this->interface_pkg_dir.'/'.$pkg)) $this->removeDirectory($this->interface_pkg_dir.'/'.$pkg); + } } } catch(Exception $e) @@ -555,5 +558,35 @@ class ApsCrawler extends ApsBase return false; } } + + /** + * Add missing package URLs to database + */ + public function fixURLs() + { + global $app; + + try + { + // This method must be used in interface mode + if(!$this->interface_mode) return false; + + $incomplete_pkgs = $app->db->queryAllRecords("SELECT * FROM aps_packages WHERE package_url = ''"); + if(is_array($incomplete_pkgs) && !empty($incomplete_pkgs)){ + foreach($incomplete_pkgs as $incomplete_pkg){ + $pkg_url = @file_get_contents($this->interface_pkg_dir.'/'.$incomplete_pkg['path'].'/PKG_URL'); + if($pkg_url != ''){ + $app->db->datalogUpdate('aps_packages', "package_url = '".$pkg_url."'", 'id', $incomplete_pkg['id']); + } + } + } + } + catch(Exception $e) + { + $app->log($this->log_prefix.$e->getMessage(), LOGLEVEL_ERROR); + $app->error($e->getMessage()); + return false; + } + } } ?> \ No newline at end of file diff --git a/interface/lib/classes/aps_guicontroller.inc.php b/interface/lib/classes/aps_guicontroller.inc.php index 0f1fd10069..4d0cf4b804 100644 --- a/interface/lib/classes/aps_guicontroller.inc.php +++ b/interface/lib/classes/aps_guicontroller.inc.php @@ -220,13 +220,19 @@ class ApsGUIController extends ApsBase $app->uses("getconf"); $web_config = $app->getconf->get_server_config($app->functions->intval($websrv["server_id"]),'web'); - //* Set mysql mode to php-fcgi and enable suexec in website on apache servers + //* Set PHP mode to php-fcgi and enable suexec in website on apache servers / set PHP mode to PHP-FPM on nginx servers if($web_config['server_type'] == 'apache') { - if($websrv['php'] != 'fast-cgi' || $websrv['suexec'] != 'y') { + if(($websrv['php'] != 'fast-cgi' || $websrv['suexec'] != 'y') && $websrv['php'] != 'php-fpm') { $app->db->datalogUpdate('web_domain', "php = 'fast-cgi', suexec = 'y'", 'domain_id', $websrv['domain_id']); } + } else { + // nginx + if($websrv['php'] != 'php-fpm' && $websrv['php'] != 'fast-cgi') { + $app->db->datalogUpdate('web_domain', "php = 'php-fpm'", 'domain_id', $websrv['domain_id']); + } } + //* Create the MySQL database for the application $pkg = $app->db->queryOneRecord('SELECT * FROM aps_packages WHERE id = '.$app->db->quote($packageid).';'); $metafile = $this->interface_pkg_dir.'/'.$pkg['path'].'/APP-META.xml'; diff --git a/interface/lib/classes/ispcmail.inc.php b/interface/lib/classes/ispcmail.inc.php index 388a638c6f..e30a711c1f 100644 --- a/interface/lib/classes/ispcmail.inc.php +++ b/interface/lib/classes/ispcmail.inc.php @@ -652,7 +652,8 @@ class ispcmail { else $rec_string .= $recip; } $to = $this->_encodeHeader($rec_string, $this->mail_charset); - $result = mail($to, $subject, $this->body, implode($this->_crlf, $headers)); + //$result = mail($to, $subject, $this->body, implode($this->_crlf, $headers)); + $result = mail($to, $enc_subject, $this->body, implode($this->_crlf, $headers)); } // Reset the subject in case mail is resent diff --git a/interface/lib/classes/simplepie.inc.php b/interface/lib/classes/simplepie.inc.php index b0da004cf3..d6d2045ec0 100644 --- a/interface/lib/classes/simplepie.inc.php +++ b/interface/lib/classes/simplepie.inc.php @@ -9304,7 +9304,7 @@ class SimplePie_Misc die('Cached file for ' . $identifier_url . ' cannot be found.'); } - function fix_protocol($url, $http = 1) + public static function fix_protocol($url, $http = 1) { $url = SimplePie_Misc::normalize_url($url); $parsed = SimplePie_Misc::parse_url($url); @@ -9336,7 +9336,7 @@ class SimplePie_Misc } } - function parse_url($url) + public static function parse_url($url) { $iri = new SimplePie_IRI($url); return array( @@ -9359,7 +9359,7 @@ class SimplePie_Misc return $iri->get_iri(); } - function normalize_url($url) + public static function normalize_url($url) { $iri = new SimplePie_IRI($url); return $iri->get_iri(); @@ -9428,7 +9428,7 @@ class SimplePie_Misc return strtr($string, $convert_table); } - function change_encoding($data, $input, $output) + public static function change_encoding($data, $input, $output) { $input = SimplePie_Misc::encoding($input); $output = SimplePie_Misc::encoding($output); @@ -9469,7 +9469,7 @@ class SimplePie_Misc } } - function encoding($charset) + public static function encoding($charset) { // Normalization from UTS #22 switch (strtolower(preg_replace('/(?:[^a-zA-Z0-9]+|([^0-9])0+)/', '\1', $charset))) @@ -10785,7 +10785,7 @@ class SimplePie_Misc } } - function get_curl_version() + public static function get_curl_version() { if (is_array($curl = curl_version())) { @@ -11245,7 +11245,7 @@ class SimplePie_Misc * @param string $data XML data * @return array Possible encodings */ - function xml_encoding($data) + public static function xml_encoding($data) { // UTF-32 Big Endian BOM if (substr($data, 0, 4) === "\x00\x00\xFE\xFF") diff --git a/interface/lib/lang/ar.lng b/interface/lib/lang/ar.lng index 4de5e8b075..a49f6fb854 100644 --- a/interface/lib/lang/ar.lng +++ b/interface/lib/lang/ar.lng @@ -130,4 +130,5 @@ $wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user'; $wb['datalog_status_i_spamfilter_users'] = 'Create spam filter settings'; $wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings'; $wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings'; +$wb['login_as_txt'] = 'Log in as'; ?> diff --git a/interface/lib/lang/bg.lng b/interface/lib/lang/bg.lng index 70cee5ec18..8b15a9a506 100644 --- a/interface/lib/lang/bg.lng +++ b/interface/lib/lang/bg.lng @@ -130,4 +130,5 @@ $wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user'; $wb['datalog_status_i_spamfilter_users'] = 'Create spam filter settings'; $wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings'; $wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings'; +$wb['login_as_txt'] = 'Log in as'; ?> diff --git a/interface/lib/lang/br.lng b/interface/lib/lang/br.lng index 45d98ac696..ae65e871db 100644 --- a/interface/lib/lang/br.lng +++ b/interface/lib/lang/br.lng @@ -130,4 +130,5 @@ $wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user'; $wb['datalog_status_i_spamfilter_users'] = 'Create spam filter settings'; $wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings'; $wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings'; +$wb['login_as_txt'] = 'Log in as'; ?> diff --git a/interface/lib/lang/cz.lng b/interface/lib/lang/cz.lng index 43b46498cb..349b0ea5cf 100644 --- a/interface/lib/lang/cz.lng +++ b/interface/lib/lang/cz.lng @@ -130,5 +130,5 @@ $wb['datalog_status_d_web_folder'] = 'Odstranění chráněného adresáře hesl $wb['datalog_status_i_web_folder_user'] = 'Vytvoření uživatele pro adresáře chráněné heslem'; $wb['datalog_status_u_web_folder_user'] = 'Aktualizace nastavení uživatele pro adresáře chráněné heslem'; $wb['datalog_status_d_web_folder_user'] = 'Odstranění uživatele pro adresáře chráněné heslem'; +$wb['login_as_txt'] = 'Log in as'; ?> - diff --git a/interface/lib/lang/de.lng b/interface/lib/lang/de.lng index f3d043b0ce..56b1c1be85 100644 --- a/interface/lib/lang/de.lng +++ b/interface/lib/lang/de.lng @@ -39,9 +39,9 @@ $wb['top_menu_help'] = 'Support'; $wb['top_menu_billing'] = 'Fakturierung'; $wb['top_menu_mailuser'] = 'E-Mail Benutzer'; $wb['top_menu_domain'] = 'Domains'; -$wb['top_menu_dashboard'] = 'Home'; +$wb['top_menu_dashboard'] = 'Übersicht'; $wb['latest_news_txt'] = 'Neuigkeiten'; -$wb['top_menu_vm'] = 'VServer'; +$wb['top_menu_vm'] = 'vServer'; $wb['daynamesmin_su'] = 'So'; $wb['daynamesmin_mo'] = 'Mo'; $wb['daynamesmin_tu'] = 'Di'; @@ -80,54 +80,55 @@ $wb['globalsearch_searchfield_watermark_txt'] = 'Suche'; $wb['globalsearch_suggestions_text_txt'] = 'Vorschläge'; $wb['global_tabchange_warning_txt'] = 'Die Eingaben in diesem Tab werden gespeichert, wenn Sie OK klicken, bei Abbrechen werden die Änderungen verworfen.'; $wb['global_tabchange_discard_txt'] = 'Achtung, Sie haben ungespeicherte Änderungen in diesem Tab. Wenn Sie fortfahren werden die Änderungen verworfen.'; -$wb['datalog_changes_txt'] = 'Folgende Änderungen wurden noch nicht auf alle Server übernommen:'; -$wb['datalog_changes_end_txt'] = 'Die Übernahme der Änderungen kann bis zu 1 Minute in Anspruch nehmen.'; +$wb['datalog_changes_txt'] = 'Folgende Änderungen wurden noch nicht auf alle Server übernommen:'; +$wb['datalog_changes_end_txt'] = 'Die Übernahme der Änderungen kann bis zu 1 Minute in Anspruch nehmen.'; $wb['datalog_status_i_web_database'] = 'Neue Datenbank anlegen'; -$wb['datalog_status_u_web_database'] = 'Datenbank ändern'; -$wb['datalog_status_d_web_database'] = 'Datenbank löschen'; -$wb['datalog_status_i_web_database_user'] = 'Datenbank-Benutzer für Datenbank anlegen'; -$wb['datalog_status_u_web_database_user'] = 'Datenbank-Benutzer ändern'; -$wb['datalog_status_d_web_database_user'] = 'Datenbank-Benutzer löschen'; +$wb['datalog_status_u_web_database'] = 'Datenbank ändern'; +$wb['datalog_status_d_web_database'] = 'Datenbank löschen'; +$wb['datalog_status_i_web_database_user'] = 'Datenbank Benutzer für Datenbank anlegen'; +$wb['datalog_status_u_web_database_user'] = 'Datenbank Benutzer ändern'; +$wb['datalog_status_d_web_database_user'] = 'Datenbank Benutzer löschen'; $wb['datalog_status_i_web_domain'] = 'Neue Webseite anlegen'; -$wb['datalog_status_u_web_domain'] = 'Webseiten-Einstellungen ändern'; -$wb['datalog_status_d_web_domain'] = 'Webseite löschen'; -$wb['datalog_status_i_ftp_user'] = 'FTP-Benutzer anlegen'; -$wb['datalog_status_u_ftp_user'] = 'FTP-Benutzer ändern'; -$wb['datalog_status_d_ftp_user'] = 'FTP-Benutzer löschen'; +$wb['datalog_status_u_web_domain'] = 'Webseiten Einstellungen ändern'; +$wb['datalog_status_d_web_domain'] = 'Webseite löschen'; +$wb['datalog_status_i_ftp_user'] = 'FTP Benutzer anlegen'; +$wb['datalog_status_u_ftp_user'] = 'FTP Benutzer ändern'; +$wb['datalog_status_d_ftp_user'] = 'FTP Benutzer löschen'; $wb['datalog_status_i_mail_domain'] = 'Neue E-Mail Domain anlegen'; -$wb['datalog_status_u_mail_domain'] = 'E-Mail Domain ändern'; -$wb['datalog_status_d_mail_domain'] = 'E-Mail Domain löschen'; +$wb['datalog_status_u_mail_domain'] = 'E-Mail Domain ändern'; +$wb['datalog_status_d_mail_domain'] = 'E-Mail Domain löschen'; $wb['datalog_status_i_mail_user'] = 'Neues E-Mail Konto anlegen'; -$wb['datalog_status_u_mail_user'] = 'E-Mail Konto ändern'; -$wb['datalog_status_d_mail_user'] = 'E-Mail Konto löschen'; -$wb['datalog_status_i_spamfilter_users'] = 'Spamfilter-Einstellungen anlegen'; -$wb['datalog_status_u_spamfilter_users'] = 'Spamfilter-Einstellungen ändern'; -$wb['datalog_status_d_spamfilter_users'] = 'Spamfilter-Einstellungen löschen'; +$wb['datalog_status_u_mail_user'] = 'E-Mail Konto ändern'; +$wb['datalog_status_d_mail_user'] = 'E-Mail Konto löschen'; +$wb['datalog_status_i_spamfilter_users'] = 'Spamfilter Einstellungen anlegen'; +$wb['datalog_status_u_spamfilter_users'] = 'Spamfilter Einstellungen ändern'; +$wb['datalog_status_d_spamfilter_users'] = 'Spamfilter Einstellungen löschen'; $wb['datalog_status_i_mail_forwarding'] = 'Neue E-Mail Adresse anlegen'; -$wb['datalog_status_u_mail_forwarding'] = 'E-Mail Adresse ändern'; -$wb['datalog_status_d_mail_forwarding'] = 'E-Mail Adresse löschen'; -$wb['datalog_status_i_dns_rr'] = 'DNS Record anlegen'; -$wb['datalog_status_u_dns_rr'] = 'DNS Record ändern'; -$wb['datalog_status_d_dns_rr'] = 'DNS Record löschen'; +$wb['datalog_status_u_mail_forwarding'] = 'E-Mail Adresse ändern'; +$wb['datalog_status_d_mail_forwarding'] = 'E-Mail Adresse löschen'; +$wb['datalog_status_i_dns_rr'] = 'DNS Eintrag anlegen'; +$wb['datalog_status_u_dns_rr'] = 'DNS Eintrag ändern'; +$wb['datalog_status_d_dns_rr'] = 'DNS Eintrag löschen'; $wb['datalog_status_i_dns_soa'] = 'DNS Zone anlegen'; -$wb['datalog_status_u_dns_soa'] = 'DNS Zone ändern'; -$wb['datalog_status_d_dns_soa'] = 'DNS Zone löschen'; +$wb['datalog_status_u_dns_soa'] = 'DNS Zone ändern'; +$wb['datalog_status_d_dns_soa'] = 'DNS Zone löschen'; $wb['datalog_status_i_cron'] = 'Cronjob anlegen'; -$wb['datalog_status_u_cron'] = 'Cronjob ändern'; -$wb['datalog_status_d_cron'] = 'Cronjob löschen'; -$wb['datalog_status_i_mail_get'] = 'Mailabruf anlegen'; -$wb['datalog_status_u_mail_get'] = 'Mailabruf ändern'; -$wb['datalog_status_d_mail_get'] = 'Mailabruf löschen'; +$wb['datalog_status_u_cron'] = 'Cronjob ändern'; +$wb['datalog_status_d_cron'] = 'Cronjob löschen'; +$wb['datalog_status_i_mail_get'] = 'E-Mailabruf anlegen'; +$wb['datalog_status_u_mail_get'] = 'E-Mailabruf ändern'; +$wb['datalog_status_d_mail_get'] = 'E-Mailabruf löschen'; $wb['datalog_status_i_mail_mailinglist'] = 'Mailingliste anlegen'; -$wb['datalog_status_u_mail_mailinglist'] = 'Mailingliste ändern'; -$wb['datalog_status_d_mail_mailinglist'] = 'Mailingliste löschen'; -$wb['datalog_status_i_shell_user'] = 'Shell User anlegen'; -$wb['datalog_status_u_shell_user'] = 'Shell User ändern'; -$wb['datalog_status_d_shell_user'] = 'Shell User löschen'; +$wb['datalog_status_u_mail_mailinglist'] = 'Mailingliste ändern'; +$wb['datalog_status_d_mail_mailinglist'] = 'Mailingliste löschen'; +$wb['datalog_status_i_shell_user'] = 'Shell Benutzer anlegen'; +$wb['datalog_status_u_shell_user'] = 'Shell Benutzer ändern'; +$wb['datalog_status_d_shell_user'] = 'Shell Benutzer löschen'; $wb['datalog_status_i_web_folder'] = 'Verzeichnisschutz anlegen'; -$wb['datalog_status_u_web_folder'] = 'Verzeichnisschutz ändern'; -$wb['datalog_status_d_web_folder'] = 'Verzeichnisschutz löschen'; +$wb['datalog_status_u_web_folder'] = 'Verzeichnisschutz ändern'; +$wb['datalog_status_d_web_folder'] = 'Verzeichnisschutz löschen'; $wb['datalog_status_i_web_folder_user'] = 'Verzeichnisschutz Benutzer anlegen'; -$wb['datalog_status_u_web_folder_user'] = 'Verzeichnisschutz Benutzer ändern'; -$wb['datalog_status_d_web_folder_user'] = 'Verzeichnisschutz Benutzer löschen'; +$wb['datalog_status_u_web_folder_user'] = 'Verzeichnisschutz Benutzer ändern'; +$wb['datalog_status_d_web_folder_user'] = 'Verzeichnisschutz Benutzer löschen'; +$wb['login_as_txt'] = 'Anmelden als'; ?> diff --git a/interface/lib/lang/el.lng b/interface/lib/lang/el.lng index 5e111fdf77..a85327db6f 100644 --- a/interface/lib/lang/el.lng +++ b/interface/lib/lang/el.lng @@ -130,4 +130,5 @@ $wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user'; $wb['datalog_status_i_spamfilter_users'] = 'Create spam filter settings'; $wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings'; $wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings'; +$wb['login_as_txt'] = 'Log in as'; ?> diff --git a/interface/lib/lang/es.lng b/interface/lib/lang/es.lng index 4d1f95a672..619ae97f1f 100644 --- a/interface/lib/lang/es.lng +++ b/interface/lib/lang/es.lng @@ -130,4 +130,5 @@ $wb['datalog_status_d_web_folder'] = 'Delete folder protection'; $wb['datalog_status_i_web_folder_user'] = 'Create folder protection user'; $wb['datalog_status_u_web_folder_user'] = 'Update folder protection user'; $wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user'; +$wb['login_as_txt'] = 'Log in as'; ?> diff --git a/interface/lib/lang/fi.lng b/interface/lib/lang/fi.lng index 07879d43f5..9b89ed1a6c 100755 --- a/interface/lib/lang/fi.lng +++ b/interface/lib/lang/fi.lng @@ -130,4 +130,5 @@ $wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user'; $wb['datalog_status_i_spamfilter_users'] = 'Create spam filter settings'; $wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings'; $wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings'; +$wb['login_as_txt'] = 'Log in as'; ?> diff --git a/interface/lib/lang/fr.lng b/interface/lib/lang/fr.lng index 06106427bd..c611a6a09e 100644 --- a/interface/lib/lang/fr.lng +++ b/interface/lib/lang/fr.lng @@ -130,4 +130,5 @@ $wb['datalog_status_d_web_folder'] = 'Delete folder protection'; $wb['datalog_status_i_web_folder_user'] = 'Create folder protection user'; $wb['datalog_status_u_web_folder_user'] = 'Update folder protection user'; $wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user'; +$wb['login_as_txt'] = 'Log in as'; ?> diff --git a/interface/lib/lang/hr.lng b/interface/lib/lang/hr.lng index 266e9082ac..8ba16f1b62 100644 --- a/interface/lib/lang/hr.lng +++ b/interface/lib/lang/hr.lng @@ -130,4 +130,5 @@ $wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user'; $wb['datalog_status_i_spamfilter_users'] = 'Create spam filter settings'; $wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings'; $wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings'; +$wb['login_as_txt'] = 'Log in as'; ?> diff --git a/interface/lib/lang/hu.lng b/interface/lib/lang/hu.lng index 37048ae649..7ed92c5b7c 100644 --- a/interface/lib/lang/hu.lng +++ b/interface/lib/lang/hu.lng @@ -130,4 +130,5 @@ $wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user'; $wb['datalog_status_i_spamfilter_users'] = 'Create spam filter settings'; $wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings'; $wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings'; +$wb['login_as_txt'] = 'Log in as'; ?> diff --git a/interface/lib/lang/id.lng b/interface/lib/lang/id.lng index 2f9deaf15f..6313b8fa47 100644 --- a/interface/lib/lang/id.lng +++ b/interface/lib/lang/id.lng @@ -130,4 +130,5 @@ $wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user'; $wb['datalog_status_i_spamfilter_users'] = 'Create spam filter settings'; $wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings'; $wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings'; +$wb['login_as_txt'] = 'Log in as'; ?> diff --git a/interface/lib/lang/it.lng b/interface/lib/lang/it.lng index 57eccb8175..4f05227b63 100644 --- a/interface/lib/lang/it.lng +++ b/interface/lib/lang/it.lng @@ -130,4 +130,5 @@ $wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user'; $wb['datalog_status_i_spamfilter_users'] = 'Create spam filter settings'; $wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings'; $wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings'; +$wb['login_as_txt'] = 'Log in as'; ?> diff --git a/interface/lib/lang/ja.lng b/interface/lib/lang/ja.lng index 2404093942..e8493692dc 100644 --- a/interface/lib/lang/ja.lng +++ b/interface/lib/lang/ja.lng @@ -130,4 +130,5 @@ $wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user'; $wb['datalog_status_i_spamfilter_users'] = 'Create spam filter settings'; $wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings'; $wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings'; +$wb['login_as_txt'] = 'Log in as'; ?> diff --git a/interface/lib/lang/nl.lng b/interface/lib/lang/nl.lng index 2fca64be8e..d0d8d9e054 100644 --- a/interface/lib/lang/nl.lng +++ b/interface/lib/lang/nl.lng @@ -130,4 +130,5 @@ $wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user'; $wb['datalog_status_i_spamfilter_users'] = 'Create spam filter settings'; $wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings'; $wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings'; +$wb['login_as_txt'] = 'Log in as'; ?> diff --git a/interface/lib/lang/pl.lng b/interface/lib/lang/pl.lng index ccc2139432..465dcc78aa 100644 --- a/interface/lib/lang/pl.lng +++ b/interface/lib/lang/pl.lng @@ -130,4 +130,5 @@ $wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user'; $wb['datalog_status_i_spamfilter_users'] = 'Create spam filter settings'; $wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings'; $wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings'; +$wb['login_as_txt'] = 'Log in as'; ?> diff --git a/interface/lib/lang/pt.lng b/interface/lib/lang/pt.lng index 10b3df0d23..cb16283c22 100644 --- a/interface/lib/lang/pt.lng +++ b/interface/lib/lang/pt.lng @@ -130,4 +130,5 @@ $wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user'; $wb['datalog_status_i_spamfilter_users'] = 'Create spam filter settings'; $wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings'; $wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings'; +$wb['login_as_txt'] = 'Log in as'; ?> diff --git a/interface/lib/lang/ro.lng b/interface/lib/lang/ro.lng index a222b37c9a..c30a9b75b9 100644 --- a/interface/lib/lang/ro.lng +++ b/interface/lib/lang/ro.lng @@ -130,4 +130,5 @@ $wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user'; $wb['datalog_status_i_spamfilter_users'] = 'Create spam filter settings'; $wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings'; $wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings'; +$wb['login_as_txt'] = 'Log in as'; ?> diff --git a/interface/lib/lang/ru.lng b/interface/lib/lang/ru.lng index 45c361ce74..039622403a 100644 --- a/interface/lib/lang/ru.lng +++ b/interface/lib/lang/ru.lng @@ -130,4 +130,5 @@ $wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user'; $wb['datalog_status_i_spamfilter_users'] = 'Create spam filter settings'; $wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings'; $wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings'; +$wb['login_as_txt'] = 'Log in as'; ?> diff --git a/interface/lib/lang/se.lng b/interface/lib/lang/se.lng index dfccc7914f..712e415a37 100644 --- a/interface/lib/lang/se.lng +++ b/interface/lib/lang/se.lng @@ -130,4 +130,5 @@ $wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user'; $wb['datalog_status_i_spamfilter_users'] = 'Create spam filter settings'; $wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings'; $wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings'; +$wb['login_as_txt'] = 'Log in as'; ?> diff --git a/interface/lib/lang/sk.lng b/interface/lib/lang/sk.lng index f71bb4450a..15923d2464 100644 --- a/interface/lib/lang/sk.lng +++ b/interface/lib/lang/sk.lng @@ -130,4 +130,5 @@ $wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user'; $wb['datalog_status_i_spamfilter_users'] = 'Create spam filter settings'; $wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings'; $wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings'; +$wb['login_as_txt'] = 'Log in as'; ?> diff --git a/interface/lib/lang/tr.lng b/interface/lib/lang/tr.lng index a6a4acfba5..55041acb56 100644 --- a/interface/lib/lang/tr.lng +++ b/interface/lib/lang/tr.lng @@ -130,4 +130,5 @@ $wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user'; $wb['datalog_status_i_spamfilter_users'] = 'Create spam filter settings'; $wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings'; $wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings'; +$wb['login_as_txt'] = 'Log in as'; ?> diff --git a/interface/web/admin/lib/lang/ar_login_as.lng b/interface/web/admin/lib/lang/ar_login_as.lng index 88d4850c12..f905b45115 100644 --- a/interface/web/admin/lib/lang/ar_login_as.lng +++ b/interface/web/admin/lib/lang/ar_login_as.lng @@ -1,12 +1,11 @@ \ No newline at end of file +$wb['login_1_txt'] = 'Do you want to login as user'; +$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.'; +$wb['btn_yes_txt'] = 'Yes, login as Client'; +$wb['btn_back_txt'] = 'No, back to list'; +$wb['udp_port_help_txt'] = 'Separated by comma'; +$wb['active_txt'] = 'Active'; +$wb['firewall_error_unique'] = 'There is already a firewall record for this server.'; +$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".'; +$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".'; +?> diff --git a/interface/web/admin/lib/lang/ar_system_config.lng b/interface/web/admin/lib/lang/ar_system_config.lng index 66352ef12b..1cc07ec02b 100644 --- a/interface/web/admin/lib/lang/ar_system_config.lng +++ b/interface/web/admin/lib/lang/ar_system_config.lng @@ -46,4 +46,7 @@ $wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; $wb['use_loadindicator_txt'] = 'Use Load Indicator'; $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; +$wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details'; +$wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details'; +$wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details'; ?> diff --git a/interface/web/admin/lib/lang/bg_login_as.lng b/interface/web/admin/lib/lang/bg_login_as.lng index 88d4850c12..f905b45115 100644 --- a/interface/web/admin/lib/lang/bg_login_as.lng +++ b/interface/web/admin/lib/lang/bg_login_as.lng @@ -1,12 +1,11 @@ \ No newline at end of file +$wb['login_1_txt'] = 'Do you want to login as user'; +$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.'; +$wb['btn_yes_txt'] = 'Yes, login as Client'; +$wb['btn_back_txt'] = 'No, back to list'; +$wb['udp_port_help_txt'] = 'Separated by comma'; +$wb['active_txt'] = 'Active'; +$wb['firewall_error_unique'] = 'There is already a firewall record for this server.'; +$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".'; +$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".'; +?> diff --git a/interface/web/admin/lib/lang/bg_system_config.lng b/interface/web/admin/lib/lang/bg_system_config.lng index 4f6622ff45..b7b364bf02 100644 --- a/interface/web/admin/lib/lang/bg_system_config.lng +++ b/interface/web/admin/lib/lang/bg_system_config.lng @@ -46,4 +46,7 @@ $wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; $wb['use_loadindicator_txt'] = 'Use Load Indicator'; $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; +$wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details'; +$wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details'; +$wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details'; ?> diff --git a/interface/web/admin/lib/lang/br_login_as.lng b/interface/web/admin/lib/lang/br_login_as.lng index 88d4850c12..f905b45115 100644 --- a/interface/web/admin/lib/lang/br_login_as.lng +++ b/interface/web/admin/lib/lang/br_login_as.lng @@ -1,12 +1,11 @@ \ No newline at end of file +$wb['login_1_txt'] = 'Do you want to login as user'; +$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.'; +$wb['btn_yes_txt'] = 'Yes, login as Client'; +$wb['btn_back_txt'] = 'No, back to list'; +$wb['udp_port_help_txt'] = 'Separated by comma'; +$wb['active_txt'] = 'Active'; +$wb['firewall_error_unique'] = 'There is already a firewall record for this server.'; +$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".'; +$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".'; +?> diff --git a/interface/web/admin/lib/lang/br_system_config.lng b/interface/web/admin/lib/lang/br_system_config.lng index d6ef3d50ee..76d2c06ac8 100644 --- a/interface/web/admin/lib/lang/br_system_config.lng +++ b/interface/web/admin/lib/lang/br_system_config.lng @@ -46,4 +46,7 @@ $wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; $wb['use_loadindicator_txt'] = 'Use Load Indicator'; $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; +$wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details'; +$wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details'; +$wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details'; ?> diff --git a/interface/web/admin/lib/lang/cz.lng b/interface/web/admin/lib/lang/cz.lng index 23a64d8ba2..bc1c9bb83f 100644 --- a/interface/web/admin/lib/lang/cz.lng +++ b/interface/web/admin/lib/lang/cz.lng @@ -48,4 +48,3 @@ $wb['Do OS-Update'] = 'Aktualizovat operační systém'; $wb['Do ISPConfig-Update'] = 'Aktualizovat ISPConfig'; $wb['Directive Snippets'] = 'Directive Snippets'; ?> - diff --git a/interface/web/admin/lib/lang/cz_directive_snippets.lng b/interface/web/admin/lib/lang/cz_directive_snippets.lng index 085aec4d40..c6a89099c6 100644 --- a/interface/web/admin/lib/lang/cz_directive_snippets.lng +++ b/interface/web/admin/lib/lang/cz_directive_snippets.lng @@ -7,4 +7,3 @@ $wb['active_txt'] = 'Aktivní'; $wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.'; $wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.'; ?> - diff --git a/interface/web/admin/lib/lang/cz_directive_snippets_list.lng b/interface/web/admin/lib/lang/cz_directive_snippets_list.lng index c8cedfe36d..c6f444b660 100644 --- a/interface/web/admin/lib/lang/cz_directive_snippets_list.lng +++ b/interface/web/admin/lib/lang/cz_directive_snippets_list.lng @@ -5,4 +5,3 @@ $wb['name_txt'] = 'Name of Snippet'; $wb['type_txt'] = 'Verze'; $wb['add_new_record_txt'] = 'Add Directive Snippet'; ?> - diff --git a/interface/web/admin/lib/lang/cz_firewall.lng b/interface/web/admin/lib/lang/cz_firewall.lng index abe744f065..c6146ae93d 100644 --- a/interface/web/admin/lib/lang/cz_firewall.lng +++ b/interface/web/admin/lib/lang/cz_firewall.lng @@ -9,4 +9,3 @@ $wb['firewall_error_unique'] = 'Pro tento server již existuje záznam firewallu $wb['tcp_ports_error_regex'] = 'Znak není povole v definici TCP portu. Povolené symboly jsou čísla, : a ,.'; $wb['udp_ports_error_regex'] = 'Znak není povole v definici UDP portu. Povolené symboly jsou čísla, : a ,.'; ?> - diff --git a/interface/web/admin/lib/lang/cz_firewall_list.lng b/interface/web/admin/lib/lang/cz_firewall_list.lng index 76ee5c0f76..aecc4cf06a 100644 --- a/interface/web/admin/lib/lang/cz_firewall_list.lng +++ b/interface/web/admin/lib/lang/cz_firewall_list.lng @@ -6,4 +6,3 @@ $wb['tcp_port_txt'] = 'Otevřené TCP porty'; $wb['udp_port_txt'] = 'Otevřené UDP porty'; $wb['add_new_record_txt'] = 'Přidat záznam'; ?> - diff --git a/interface/web/admin/lib/lang/cz_groups.lng b/interface/web/admin/lib/lang/cz_groups.lng index b7bb634f5e..a6281be247 100644 --- a/interface/web/admin/lib/lang/cz_groups.lng +++ b/interface/web/admin/lib/lang/cz_groups.lng @@ -3,4 +3,3 @@ $wb['description_txt'] = 'Popis'; $wb['name_txt'] = 'Skupina'; $wb['name_err'] = 'Skupina musí mít min. 1, max. 30 znaků.'; ?> - diff --git a/interface/web/admin/lib/lang/cz_groups_list.lng b/interface/web/admin/lib/lang/cz_groups_list.lng index 9bc2c9eb72..c1d7ef9a8b 100644 --- a/interface/web/admin/lib/lang/cz_groups_list.lng +++ b/interface/web/admin/lib/lang/cz_groups_list.lng @@ -5,4 +5,3 @@ $wb['name_txt'] = 'Skupina'; $wb['add_new_record_txt'] = 'Přidat skupinu'; $wb['warning_txt'] = 'VAROVÁNÍ: Zde neupravujte uživatelská nastavení. Užijte klientská a distributorská nastavení v klientském modulu. Úprava uživatelý nebo skupin zde může způsobit ztrátu dat!'; ?> - diff --git a/interface/web/admin/lib/lang/cz_iptables.lng b/interface/web/admin/lib/lang/cz_iptables.lng index b7d736e15d..a40fc0490f 100644 --- a/interface/web/admin/lib/lang/cz_iptables.lng +++ b/interface/web/admin/lib/lang/cz_iptables.lng @@ -11,4 +11,3 @@ $wb['source_ip_txt'] = 'Zdrojové adresy'; $wb['active_txt'] = 'Aktivní'; $wb['iptables_error_unique'] = 'Stejný záznam pro firewall je již na tomto serveru použit.'; ?> - diff --git a/interface/web/admin/lib/lang/cz_iptables_list.lng b/interface/web/admin/lib/lang/cz_iptables_list.lng index 02177f6d99..65cef7507e 100644 --- a/interface/web/admin/lib/lang/cz_iptables_list.lng +++ b/interface/web/admin/lib/lang/cz_iptables_list.lng @@ -13,4 +13,3 @@ $wb['source_ip_txt'] = 'Zdrojové adresy'; $wb['active_txt'] = 'Aktivní'; $wb['iptables_error_unique'] = 'Stejný záznam pro firewall je již na tomto serveru použit.'; ?> - diff --git a/interface/web/admin/lib/lang/cz_language_add.lng b/interface/web/admin/lib/lang/cz_language_add.lng index 3af00bf303..285dff2761 100644 --- a/interface/web/admin/lib/lang/cz_language_add.lng +++ b/interface/web/admin/lib/lang/cz_language_add.lng @@ -6,4 +6,3 @@ $wb['language_new_hint_txt'] = '2 znakové ISO 639-1 jazykové kódy (Viz: http: $wb['btn_save_txt'] = 'Vytvořit novou jazykovou sadu souborů'; $wb['btn_cancel_txt'] = 'Zpět'; ?> - diff --git a/interface/web/admin/lib/lang/cz_language_complete.lng b/interface/web/admin/lib/lang/cz_language_complete.lng index 5f1b2f75b1..f1e6f4924e 100644 --- a/interface/web/admin/lib/lang/cz_language_complete.lng +++ b/interface/web/admin/lib/lang/cz_language_complete.lng @@ -5,4 +5,3 @@ $wb['language_select_txt'] = 'Vybrat jazyk k doplnění'; $wb['btn_save_txt'] = 'Sloučit / doplnit jazykový soubor'; $wb['btn_cancel_txt'] = 'Zpět'; ?> - diff --git a/interface/web/admin/lib/lang/cz_language_edit.lng b/interface/web/admin/lib/lang/cz_language_edit.lng index 086e166bba..2a71ed0a77 100644 --- a/interface/web/admin/lib/lang/cz_language_edit.lng +++ b/interface/web/admin/lib/lang/cz_language_edit.lng @@ -6,4 +6,3 @@ $wb['lang_file_txt'] = 'Jazykový soubor'; $wb['btn_save_txt'] = 'Uložit'; $wb['btn_cancel_txt'] = 'Zpět'; ?> - diff --git a/interface/web/admin/lib/lang/cz_language_export.lng b/interface/web/admin/lib/lang/cz_language_export.lng index 54f138a2ea..7998eea017 100644 --- a/interface/web/admin/lib/lang/cz_language_export.lng +++ b/interface/web/admin/lib/lang/cz_language_export.lng @@ -4,4 +4,3 @@ $wb['language_select_txt'] = 'Vybrat jazykovou sadu'; $wb['btn_save_txt'] = 'Uložit vybranou jazykovou sadu do souboru'; $wb['btn_cancel_txt'] = 'Zpět'; ?> - diff --git a/interface/web/admin/lib/lang/cz_language_import.lng b/interface/web/admin/lib/lang/cz_language_import.lng index 11e42f8041..838c325f7f 100644 --- a/interface/web/admin/lib/lang/cz_language_import.lng +++ b/interface/web/admin/lib/lang/cz_language_import.lng @@ -6,4 +6,3 @@ $wb['language_overwrite_txt'] = 'Přepsat soubor, pokud existuje.'; $wb['btn_cancel_txt'] = 'Zpět'; $wb['ignore_version_txt'] = 'Přeskočit kontrolu verze ISPConfigu.'; ?> - diff --git a/interface/web/admin/lib/lang/cz_language_list.lng b/interface/web/admin/lib/lang/cz_language_list.lng index 49614e0529..b2a7863715 100644 --- a/interface/web/admin/lib/lang/cz_language_list.lng +++ b/interface/web/admin/lib/lang/cz_language_list.lng @@ -5,4 +5,3 @@ $wb['module_txt'] = 'Modul'; $wb['lang_file_txt'] = 'Jazykový soubor'; $wb['lang_file_date_txt'] = 'Poslední úprava'; ?> - diff --git a/interface/web/admin/lib/lang/cz_login_as.lng b/interface/web/admin/lib/lang/cz_login_as.lng index 88d4850c12..f905b45115 100644 --- a/interface/web/admin/lib/lang/cz_login_as.lng +++ b/interface/web/admin/lib/lang/cz_login_as.lng @@ -1,12 +1,11 @@ \ No newline at end of file +$wb['login_1_txt'] = 'Do you want to login as user'; +$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.'; +$wb['btn_yes_txt'] = 'Yes, login as Client'; +$wb['btn_back_txt'] = 'No, back to list'; +$wb['udp_port_help_txt'] = 'Separated by comma'; +$wb['active_txt'] = 'Active'; +$wb['firewall_error_unique'] = 'There is already a firewall record for this server.'; +$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".'; +$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".'; +?> diff --git a/interface/web/admin/lib/lang/cz_package_install.lng b/interface/web/admin/lib/lang/cz_package_install.lng index aec170b2fb..3375bd51c0 100644 --- a/interface/web/admin/lib/lang/cz_package_install.lng +++ b/interface/web/admin/lib/lang/cz_package_install.lng @@ -5,4 +5,3 @@ $wb['repo_username_txt'] = 'User (optional)'; $wb['repo_password_txt'] = 'Password (optional)'; $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 536ccfb357..e1908e2d04 100644 --- a/interface/web/admin/lib/lang/cz_remote_action.lng +++ b/interface/web/admin/lib/lang/cz_remote_action.lng @@ -10,4 +10,3 @@ $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

ispconfig_update.sh

spustí se ISPConfig aktualizace.

Klikněte zde pro podrobnější informace o provedení aktualizace'; ?> - diff --git a/interface/web/admin/lib/lang/cz_remote_user.lng b/interface/web/admin/lib/lang/cz_remote_user.lng index d35c800c5c..f764fc73e8 100644 --- a/interface/web/admin/lib/lang/cz_remote_user.lng +++ b/interface/web/admin/lib/lang/cz_remote_user.lng @@ -45,4 +45,3 @@ $wb['repeat_password_txt'] = 'Opakujte heslo'; $wb['password_mismatch_txt'] = 'Hesla se neshodují.'; $wb['password_match_txt'] = 'Hesla se shodují.'; ?> - diff --git a/interface/web/admin/lib/lang/cz_remote_user_list.lng b/interface/web/admin/lib/lang/cz_remote_user_list.lng index c466a2a8b5..66b64946e4 100644 --- a/interface/web/admin/lib/lang/cz_remote_user_list.lng +++ b/interface/web/admin/lib/lang/cz_remote_user_list.lng @@ -5,4 +5,3 @@ $wb['add_new_record_txt'] = 'Přidat uživatele'; $wb['parent_remote_userid_txt'] = 'ID'; $wb['username_txt'] = 'Uživatel'; ?> - diff --git a/interface/web/admin/lib/lang/cz_server.lng b/interface/web/admin/lib/lang/cz_server.lng index ced7e5fb33..a087656a1c 100644 --- a/interface/web/admin/lib/lang/cz_server.lng +++ b/interface/web/admin/lib/lang/cz_server.lng @@ -13,4 +13,3 @@ $wb['- None -'] = '- Žádný -'; $wb['proxy_server_txt'] = 'Proxy-Server'; $wb['firewall_server_txt'] = 'Firewall-Server'; ?> - diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng index d0d7f488ca..c1d2b4278f 100644 --- a/interface/web/admin/lib/lang/cz_server_config.lng +++ b/interface/web/admin/lib/lang/cz_server_config.lng @@ -170,13 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Aktivovat IP wildcard (*)'; $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['v6_prefix_txt'] = 'IPv6 Prefix'; -$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror'; -$wb['v6_prefix_wrong'] = 'Invalid v6 Netmask format.'; -$wb['php_ini_check_minutes_txt'] = 'Check system php.ini files for changes each'; -$wb['php_ini_check_minutes_info_txt'] = 'minutes (0 disables checking)'; -$wb['php_ini_check_minutes_error_empty'] = 'Invalid value for php.ini checking.'; -$wb['sendmail_path_txt'] = 'Sendmail Path'; -$wb['sendmail_path_error_empty'] = 'Sendmail Path is empty.'; ?> - 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 9a56c34e2a..2118c35357 100644 --- a/interface/web/admin/lib/lang/cz_server_config_list.lng +++ b/interface/web/admin/lib/lang/cz_server_config_list.lng @@ -2,4 +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 111286c418..fa719665bb 100644 --- a/interface/web/admin/lib/lang/cz_server_ip.lng +++ b/interface/web/admin/lib/lang/cz_server_ip.lng @@ -9,4 +9,3 @@ $wb['ip_type_txt'] = 'Verze'; $wb['virtualhost_port_txt'] = 'HTTP Ports'; $wb['error_port_syntax'] = 'Invalid chars in port field, please enter only comma separated numbers. Example: 80,443'; ?> - 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 3aaa3abb09..93b0b77c9b 100644 --- a/interface/web/admin/lib/lang/cz_server_ip_list.lng +++ b/interface/web/admin/lib/lang/cz_server_ip_list.lng @@ -8,4 +8,3 @@ $wb['virtualhost_txt'] = 'HTTP Vhost'; $wb['virtualhost_port_txt'] = 'HTTP Ports'; $wb['ip_type_txt'] = 'Verze'; ?> - diff --git a/interface/web/admin/lib/lang/cz_server_list.lng b/interface/web/admin/lib/lang/cz_server_list.lng index 437f376284..ecddbf28e8 100644 --- a/interface/web/admin/lib/lang/cz_server_list.lng +++ b/interface/web/admin/lib/lang/cz_server_list.lng @@ -11,4 +11,3 @@ $wb['add_new_record_txt'] = 'Přidat server'; $wb['proxy_server_txt'] = 'Proxy'; $wb['firewall_server_txt'] = 'Firewall'; ?> - diff --git a/interface/web/admin/lib/lang/cz_server_php.lng b/interface/web/admin/lib/lang/cz_server_php.lng index fc8f7ad4af..10aba05dd7 100644 --- a/interface/web/admin/lib/lang/cz_server_php.lng +++ b/interface/web/admin/lib/lang/cz_server_php.lng @@ -14,4 +14,3 @@ $wb['php_fpm_init_script_txt'] = 'Cesta k PHP-FPM init script'; $wb['php_fpm_ini_dir_txt'] = 'Cesta k php.ini adresáři'; $wb['php_fpm_pool_dir_txt'] = 'Cesta k PHP-FPM pool adresáři'; ?> - diff --git a/interface/web/admin/lib/lang/cz_server_php_list.lng b/interface/web/admin/lib/lang/cz_server_php_list.lng index 25b95f9c4d..36b28fe411 100644 --- a/interface/web/admin/lib/lang/cz_server_php_list.lng +++ b/interface/web/admin/lib/lang/cz_server_php_list.lng @@ -5,4 +5,3 @@ $wb['add_new_record_txt'] = 'Přidat novou verzi PHP'; $wb['client_id_txt'] = 'Klient'; $wb['name_txt'] = 'Verze PHP'; ?> - diff --git a/interface/web/admin/lib/lang/cz_software_package_install.lng b/interface/web/admin/lib/lang/cz_software_package_install.lng index d80ffa0476..af524509f0 100644 --- a/interface/web/admin/lib/lang/cz_software_package_install.lng +++ b/interface/web/admin/lib/lang/cz_software_package_install.lng @@ -4,4 +4,3 @@ $wb['install_key_txt'] = 'Enter install key'; $wb['btn_save_txt'] = 'Start Installation'; $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 2f1feced37..ac98941ae8 100644 --- a/interface/web/admin/lib/lang/cz_software_package_list.lng +++ b/interface/web/admin/lib/lang/cz_software_package_list.lng @@ -8,4 +8,3 @@ $wb['toolsarea_head_txt'] = 'Balíčky'; $wb['repoupdate_txt'] = 'Aktualizace seznamu balíků'; $wb['package_id_txt'] = 'místní App-ID'; ?> - diff --git a/interface/web/admin/lib/lang/cz_software_repo.lng b/interface/web/admin/lib/lang/cz_software_repo.lng index 843bab6687..64a190d9a1 100644 --- a/interface/web/admin/lib/lang/cz_software_repo.lng +++ b/interface/web/admin/lib/lang/cz_software_repo.lng @@ -5,4 +5,3 @@ $wb['repo_username_txt'] = 'Uživatel (volitelné)'; $wb['repo_password_txt'] = 'Heslo (volitelné)'; $wb['active_txt'] = 'Aktivní'; ?> - diff --git a/interface/web/admin/lib/lang/cz_software_repo_list.lng b/interface/web/admin/lib/lang/cz_software_repo_list.lng index d45b792fbc..5c82d4c41f 100644 --- a/interface/web/admin/lib/lang/cz_software_repo_list.lng +++ b/interface/web/admin/lib/lang/cz_software_repo_list.lng @@ -4,4 +4,3 @@ $wb['active_txt'] = 'Aktivní'; $wb['repo_name_txt'] = 'Repozitář'; $wb['repo_url_txt'] = 'URL'; ?> - diff --git a/interface/web/admin/lib/lang/cz_software_update_list.lng b/interface/web/admin/lib/lang/cz_software_update_list.lng index f95d8c3159..32671d3823 100644 --- a/interface/web/admin/lib/lang/cz_software_update_list.lng +++ b/interface/web/admin/lib/lang/cz_software_update_list.lng @@ -6,4 +6,3 @@ $wb['update_title_txt'] = 'Aktualizovat'; $wb['version_txt'] = 'Verze'; $wb['action_txt'] = 'Akce'; ?> - diff --git a/interface/web/admin/lib/lang/cz_system_config.lng b/interface/web/admin/lib/lang/cz_system_config.lng index 0b6479e599..8a75c351c9 100644 --- a/interface/web/admin/lib/lang/cz_system_config.lng +++ b/interface/web/admin/lib/lang/cz_system_config.lng @@ -50,4 +50,3 @@ $wb['mailbox_show_autoresponder_tab_txt'] = 'Show Autoresponder tab in Mailbox d $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 efecb6d979..480d504421 100644 --- a/interface/web/admin/lib/lang/cz_tpl_default_admin.lng +++ b/interface/web/admin/lib/lang/cz_tpl_default_admin.lng @@ -16,4 +16,3 @@ $wb['php_fpm_init_script_txt'] = 'Cesta k PHP-FPM init script'; $wb['php_fpm_ini_dir_txt'] = 'Cesta k php.ini adresáři'; $wb['php_fpm_pool_dir_txt'] = 'Cesta k PHP-FPM pool adresáři'; ?> - diff --git a/interface/web/admin/lib/lang/cz_users.lng b/interface/web/admin/lib/lang/cz_users.lng index 0324f16a8d..16f4812d68 100644 --- a/interface/web/admin/lib/lang/cz_users.lng +++ b/interface/web/admin/lib/lang/cz_users.lng @@ -31,4 +31,3 @@ $wb['password_mismatch_txt'] = 'Hesla se neshodují.'; $wb['password_match_txt'] = 'Hesla se shodují.'; $wb['username_error_collision'] = 'Uživatelské jméno nesmí být web nebo web a číslo.\\"'; ?> - diff --git a/interface/web/admin/lib/lang/cz_users_list.lng b/interface/web/admin/lib/lang/cz_users_list.lng index 37b0e7e29b..e5a7d1e4de 100644 --- a/interface/web/admin/lib/lang/cz_users_list.lng +++ b/interface/web/admin/lib/lang/cz_users_list.lng @@ -7,4 +7,3 @@ $wb['add_new_record_txt'] = 'Přidat uživatele'; $wb['warning_txt'] = 'VAROVÁNÍ: Zde neupravujte uživatelská nastavení. Užijte klientská a distributorská nastavení v klientském modulu. Úprava uživatelů nebo skupin zde může způsobit ztrátu dat!'; $wb['groups_txt'] = 'Skupiny'; ?> - diff --git a/interface/web/admin/lib/lang/de.lng b/interface/web/admin/lib/lang/de.lng index 0c34257b29..cca00fefd0 100644 --- a/interface/web/admin/lib/lang/de.lng +++ b/interface/web/admin/lib/lang/de.lng @@ -13,8 +13,8 @@ $wb['Edit server'] = 'Server bearbeiten'; $wb['Sync. Now'] = 'Jetzt synchronisieren'; $wb['DB Sync.'] = 'Datenbank Synchronisation'; $wb['User Management'] = 'Benutzerverwaltung'; -$wb['CP Users'] = 'CP Benutzer'; -$wb['Remote Users'] = 'Remote Benutzer'; +$wb['CP Users'] = 'ISPConfig Benutzer'; +$wb['Remote Users'] = 'Entfernte Benutzer'; $wb['System'] = 'System'; $wb['Server Services'] = 'Server Dienste'; $wb['Services'] = 'Dienste'; @@ -30,7 +30,7 @@ $wb['Server IP addresses'] = 'Server IP Adressen'; $wb['Additional PHP Versions'] = 'Zusätzliche PHP Versionen'; $wb['Directive Snippets'] = 'Direktiven Schnipsel'; $wb['Firewall'] = 'Firewall'; -$wb['Interface'] = 'Benutzeroberfläche'; +$wb['Interface'] = 'Systemkonfiguration'; $wb['Interface Config'] = 'Einstellungen'; $wb['Domains'] = 'Domains'; $wb['Misc'] = 'Diverses'; diff --git a/interface/web/admin/lib/lang/de_directive_snippets_list.lng b/interface/web/admin/lib/lang/de_directive_snippets_list.lng index c5f1b1001f..a19d5e8da4 100644 --- a/interface/web/admin/lib/lang/de_directive_snippets_list.lng +++ b/interface/web/admin/lib/lang/de_directive_snippets_list.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/admin/lib/lang/de_firewall_list.lng b/interface/web/admin/lib/lang/de_firewall_list.lng index 0cf79f0af0..aefad619ba 100644 --- a/interface/web/admin/lib/lang/de_firewall_list.lng +++ b/interface/web/admin/lib/lang/de_firewall_list.lng @@ -3,6 +3,6 @@ $wb['list_head_txt'] = 'Firewall'; $wb['active_txt'] = 'Aktiv'; $wb['server_id_txt'] = 'Server'; $wb['tcp_port_txt'] = 'Offene TCP Ports'; -$wb['udp_port_txt'] = 'Offene UD Ports'; +$wb['udp_port_txt'] = 'Offene UDP Ports'; $wb['add_new_record_txt'] = 'Firewalleintrag hinzufügen'; ?> diff --git a/interface/web/admin/lib/lang/de_login_as.lng b/interface/web/admin/lib/lang/de_login_as.lng index f905b45115..1edec36c32 100644 --- a/interface/web/admin/lib/lang/de_login_as.lng +++ b/interface/web/admin/lib/lang/de_login_as.lng @@ -1,11 +1,11 @@ diff --git a/interface/web/admin/lib/lang/de_remote_action.lng b/interface/web/admin/lib/lang/de_remote_action.lng index c1dacca34d..786f03e0ad 100644 --- a/interface/web/admin/lib/lang/de_remote_action.lng +++ b/interface/web/admin/lib/lang/de_remote_action.lng @@ -8,5 +8,5 @@ $wb['do_ispcupdate_desc'] = 'Diese Aktion wird ein Update des ISPConfig 3 System $wb['action_scheduled'] = 'Die Aktion wurde zur Ausführung vorgemerkt'; $wb['select_all_server'] = 'Alle Server'; $wb['ispconfig_update_title'] = 'ISPConfig 3 Update Anweisungen'; -$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; +$wb['ispconfig_update_text'] = 'Melden Sie sich auf Ihrem Server als root an und führen Sie folgendes Kommando auf der Shell aus

ispconfig_update.sh

um das ISPConfig Update zu starten.

Klicken Sie hier um eine detailierte Beschreibung zu erhalten'; ?> diff --git a/interface/web/admin/lib/lang/de_remote_user_list.lng b/interface/web/admin/lib/lang/de_remote_user_list.lng index 8fb1641b6d..4a3c6fe1d5 100644 --- a/interface/web/admin/lib/lang/de_remote_user_list.lng +++ b/interface/web/admin/lib/lang/de_remote_user_list.lng @@ -1,6 +1,6 @@ diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng index b08dc3b8bf..6eb46d16da 100644 --- a/interface/web/admin/lib/lang/de_server_config.lng +++ b/interface/web/admin/lib/lang/de_server_config.lng @@ -26,8 +26,8 @@ $wb['mailuser_group_txt'] = 'Mailbenutzer Gruppe'; $wb['relayhost_txt'] = 'Relayhost'; $wb['relayhost_user_txt'] = 'Relayhost Benutzer'; $wb['relayhost_password_txt'] = 'Relayhost Passwort'; -$wb['mailbox_size_limit_txt'] = 'Mailboxgrößen Limit'; -$wb['message_size_limit_txt'] = 'Nachrichtengrößen Limit'; +$wb['mailbox_size_limit_txt'] = 'E-Mailkonto Beschränkung'; +$wb['message_size_limit_txt'] = 'E-Mailgrößen Beschränkung'; $wb['ip_address_txt'] = 'IP Adresse'; $wb['netmask_txt'] = 'Netzmaske'; $wb['gateway_txt'] = 'Gateway'; @@ -62,7 +62,7 @@ $wb['bind_group_error_empty'] = 'BIND Gruppe ist leer.'; $wb['bind_zonefiles_dir_error_empty'] = 'BIND Zonefiles Verzeichnis ist leer.'; $wb['named_conf_path_error_empty'] = 'BIND named.conf Pfad ist leer.'; $wb['named_conf_local_path_error_empty'] = 'BIND named.conf.local Pfad ist leer.'; -$wb['mail_filter_syntax_txt'] = 'Mailfilter Syntax'; +$wb['mail_filter_syntax_txt'] = 'E-Mailfilter Syntax'; $wb['pop3_imap_daemon_txt'] = 'POP3/IMAP Dämon'; $wb['php_open_basedir_txt'] = 'PHP open_basedir'; $wb['php_open_basedir_error_empty'] = 'PHP open_basedir ist leer.'; @@ -80,7 +80,7 @@ $wb['check_apache_config_txt'] = 'Teste Apache Konfiguration beim Neustart'; $wb['CA_path_txt'] = 'CA Pfad'; $wb['CA_pass_txt'] = 'CA Passwort'; $wb['ufw_enable_txt'] = 'Aktivieren'; -$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules'; +$wb['ufw_manage_builtins_txt'] = 'Verwalte Builtin Rules'; $wb['ufw_ipv6_txt'] = 'Aktiviere IPv6'; $wb['ufw_default_input_policy_txt'] = 'Default Input Policy'; $wb['ufw_default_output_policy_txt'] = 'Default Output Policy'; @@ -90,7 +90,7 @@ $wb['ufw_log_level_txt'] = 'Loglevel'; $wb['network_config_warning_txt'] = 'Die Netzwerk Konfiguration Option ist nur auf Debian- und Ubuntu Servern verfügbar. Aktivieren Sie diese Option nicht, falls Ihr Netzwerk Interface nicht eth0 heißt.'; $wb['server_type_txt'] = 'Server Typ'; $wb['nginx_vhost_conf_dir_txt'] = 'Nginx vHost Konfigurations Verzeichnis'; -$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir'; +$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx vHost config enabled dir'; $wb['nginx_user_txt'] = 'Nginx Benutzer'; $wb['nginx_group_txt'] = 'Nginx Gruppe'; $wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket'; @@ -129,8 +129,8 @@ $wb['jailkit_chroot_home_error_empty'] = 'Jailkit Chroot home ist leer.'; $wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit Chroot Anwendungsbereiche ist leer.'; $wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit Chrooted Anwendungen ist leer.'; $wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit Cron Chrooted Anwendungen ist leer.'; -$wb['vlogger_config_dir_error_empty'] = 'Config Verzeichnis ist leer.'; -$wb['cron_init_script_error_empty'] = 'Cron init Script Name ist leer.'; +$wb['vlogger_config_dir_error_empty'] = 'Konfigurationsverzeichnis ist leer.'; +$wb['cron_init_script_error_empty'] = 'Cron Startscript Name ist leer.'; $wb['crontab_dir_error_empty'] = 'Pfad für individuelle Crontabs ist leer.'; $wb['cron_wget_error_empty'] = 'Pfad zum wget Programm ist leer.'; $wb['php_fpm_init_script_txt'] = 'PHP-FPM Init Script'; @@ -148,24 +148,24 @@ $wb['try_rescue_txt'] = 'Aktiviere Service Monitoring und Neustart bei Unerreich $wb['do_not_try_rescue_httpd_txt'] = 'Deaktiviere HTTPD Monitoring'; $wb['do_not_try_rescue_mysql_txt'] = 'Deaktiviere MySQL Monitoring'; $wb['do_not_try_rescue_mail_txt'] = 'Deaktiviere E-Mail Monitoring'; -$wb['rescue_description_txt'] = 'Information: Falls Sie MySQL stoppen möchten, wählen Sie die '; +$wb['rescue_description_txt'] = 'Information: Falls Sie MySQL stoppen möchten, wählen Sie die Funktion \'Deaktiviere MySQL Monitoring\' und warten Sie 2 bis 3 Minuten. Wenn Sie nicht 2 bis 3 Miunten warten wird ISPConfig versuchen MySQL wieder zu starten.'; $wb['enable_sni_txt'] = 'Aktiviere SNI'; $wb['set_folder_permissions_on_update_txt'] = 'Verzeichnisberechtigungen beim Update setzen'; $wb['add_web_users_to_sshusers_group_txt'] = 'Webbenutzer zur -sshusers- hinzufügen'; $wb['connect_userid_to_webid_txt'] = 'Linux Userid mit webid verknüpfen'; $wb['connect_userid_to_webid_start_txt'] = 'Start ID für userid/webid Verknüpfung'; $wb['realtime_blackhole_list_txt'] = 'Realtime Blackhole Liste'; -$wb['realtime_blackhole_list_note_txt'] = '(RBL\'s mit Kommas trennen)'; +$wb['realtime_blackhole_list_note_txt'] = '(Mehrere Realtime Blackhole Listen mit Kommas trennen)'; $wb['ssl_settings_txt'] = 'SSL Einstellungen'; $wb['permissions_txt'] = 'Berechtigungen'; $wb['php_settings_txt'] = 'PHP Einstellungen'; $wb['apps_vhost_settings_txt'] = 'Apps vHost Einstellungen'; $wb['awstats_settings_txt'] = 'AWStats Einstellungen'; $wb['backup_mode_txt'] = 'Backupmodus'; -$wb['backup_mode_userzip'] = 'Backup Dateien gehören dem Web Benutzer (ZIP-Datei)'; +$wb['backup_mode_userzip'] = 'Backup Dateien gehören dem Web Benutzer (.zip Datei)'; $wb['backup_mode_rootgz'] = 'Backup aller Dateien des Webverzeichnisses als Root Benutzer'; $wb['firewall_txt'] = 'Firewall'; -$wb['mailbox_quota_stats_txt'] = 'Mailboxbeschränkung Statistiken'; +$wb['mailbox_quota_stats_txt'] = 'E-Mailkonto Beschränkung Statistiken'; $wb['enable_ip_wildcard_txt'] = 'IP Adressen Wildcard (*) aktivieren'; $wb['web_folder_protection_txt'] = 'Webverzeichnis unveränderlich machen (erweiterte Attribute)'; $wb['overtraffic_notify_admin_txt'] = 'Überschreiten des Transfer Limits an den Administrator senden'; diff --git a/interface/web/admin/lib/lang/de_server_list.lng b/interface/web/admin/lib/lang/de_server_list.lng index a770a850c6..e38a5db413 100644 --- a/interface/web/admin/lib/lang/de_server_list.lng +++ b/interface/web/admin/lib/lang/de_server_list.lng @@ -1,13 +1,13 @@ diff --git a/interface/web/admin/lib/lang/de_system_config.lng b/interface/web/admin/lib/lang/de_system_config.lng index 53b540ad40..8b936081fc 100644 --- a/interface/web/admin/lib/lang/de_system_config.lng +++ b/interface/web/admin/lib/lang/de_system_config.lng @@ -1,10 +1,10 @@ web.'; +$wb['client_username_web_check_disabled_txt'] = 'Deaktiviere die Kunden Benutzernamen Überprüfung für den Begriff web.'; +$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'; ?> diff --git a/interface/web/admin/lib/lang/el_login_as.lng b/interface/web/admin/lib/lang/el_login_as.lng index 88d4850c12..f905b45115 100644 --- a/interface/web/admin/lib/lang/el_login_as.lng +++ b/interface/web/admin/lib/lang/el_login_as.lng @@ -1,12 +1,11 @@ \ No newline at end of file +$wb['login_1_txt'] = 'Do you want to login as user'; +$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.'; +$wb['btn_yes_txt'] = 'Yes, login as Client'; +$wb['btn_back_txt'] = 'No, back to list'; +$wb['udp_port_help_txt'] = 'Separated by comma'; +$wb['active_txt'] = 'Active'; +$wb['firewall_error_unique'] = 'There is already a firewall record for this server.'; +$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".'; +$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".'; +?> diff --git a/interface/web/admin/lib/lang/el_system_config.lng b/interface/web/admin/lib/lang/el_system_config.lng index 18dd8c5383..d85a0830c9 100644 --- a/interface/web/admin/lib/lang/el_system_config.lng +++ b/interface/web/admin/lib/lang/el_system_config.lng @@ -46,4 +46,7 @@ $wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; $wb['use_loadindicator_txt'] = 'Use Load Indicator'; $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; +$wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details'; +$wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details'; +$wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details'; ?> diff --git a/interface/web/admin/lib/lang/en_system_config.lng b/interface/web/admin/lib/lang/en_system_config.lng index 5c706bb3ba..9424b19cb1 100644 --- a/interface/web/admin/lib/lang/en_system_config.lng +++ b/interface/web/admin/lib/lang/en_system_config.lng @@ -49,4 +49,7 @@ $wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; $wb['use_loadindicator_txt'] = 'Use Load Indicator'; $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; +$wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details'; +$wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details'; +$wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details'; ?> diff --git a/interface/web/admin/lib/lang/es_login_as.lng b/interface/web/admin/lib/lang/es_login_as.lng index 88d4850c12..f905b45115 100644 --- a/interface/web/admin/lib/lang/es_login_as.lng +++ b/interface/web/admin/lib/lang/es_login_as.lng @@ -1,12 +1,11 @@ \ No newline at end of file +$wb['login_1_txt'] = 'Do you want to login as user'; +$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.'; +$wb['btn_yes_txt'] = 'Yes, login as Client'; +$wb['btn_back_txt'] = 'No, back to list'; +$wb['udp_port_help_txt'] = 'Separated by comma'; +$wb['active_txt'] = 'Active'; +$wb['firewall_error_unique'] = 'There is already a firewall record for this server.'; +$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".'; +$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".'; +?> diff --git a/interface/web/admin/lib/lang/es_system_config.lng b/interface/web/admin/lib/lang/es_system_config.lng index dfa5d650f7..f4ed53ca48 100644 --- a/interface/web/admin/lib/lang/es_system_config.lng +++ b/interface/web/admin/lib/lang/es_system_config.lng @@ -46,4 +46,7 @@ $wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; $wb['use_loadindicator_txt'] = 'Use Load Indicator'; $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; +$wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details'; +$wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details'; +$wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details'; ?> diff --git a/interface/web/admin/lib/lang/fi_login_as.lng b/interface/web/admin/lib/lang/fi_login_as.lng index 88d4850c12..f905b45115 100644 --- a/interface/web/admin/lib/lang/fi_login_as.lng +++ b/interface/web/admin/lib/lang/fi_login_as.lng @@ -1,12 +1,11 @@ \ No newline at end of file +$wb['login_1_txt'] = 'Do you want to login as user'; +$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.'; +$wb['btn_yes_txt'] = 'Yes, login as Client'; +$wb['btn_back_txt'] = 'No, back to list'; +$wb['udp_port_help_txt'] = 'Separated by comma'; +$wb['active_txt'] = 'Active'; +$wb['firewall_error_unique'] = 'There is already a firewall record for this server.'; +$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".'; +$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".'; +?> diff --git a/interface/web/admin/lib/lang/fi_system_config.lng b/interface/web/admin/lib/lang/fi_system_config.lng index bff1a97608..1ed39352bc 100755 --- a/interface/web/admin/lib/lang/fi_system_config.lng +++ b/interface/web/admin/lib/lang/fi_system_config.lng @@ -46,4 +46,7 @@ $wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; $wb['use_loadindicator_txt'] = 'Use Load Indicator'; $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; +$wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details'; +$wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details'; +$wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details'; ?> diff --git a/interface/web/admin/lib/lang/fr_login_as.lng b/interface/web/admin/lib/lang/fr_login_as.lng index 88d4850c12..f905b45115 100644 --- a/interface/web/admin/lib/lang/fr_login_as.lng +++ b/interface/web/admin/lib/lang/fr_login_as.lng @@ -1,12 +1,11 @@ \ No newline at end of file +$wb['login_1_txt'] = 'Do you want to login as user'; +$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.'; +$wb['btn_yes_txt'] = 'Yes, login as Client'; +$wb['btn_back_txt'] = 'No, back to list'; +$wb['udp_port_help_txt'] = 'Separated by comma'; +$wb['active_txt'] = 'Active'; +$wb['firewall_error_unique'] = 'There is already a firewall record for this server.'; +$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".'; +$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".'; +?> diff --git a/interface/web/admin/lib/lang/fr_system_config.lng b/interface/web/admin/lib/lang/fr_system_config.lng index 10c7d3f044..7a404d629c 100644 --- a/interface/web/admin/lib/lang/fr_system_config.lng +++ b/interface/web/admin/lib/lang/fr_system_config.lng @@ -46,4 +46,7 @@ $wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; $wb['use_loadindicator_txt'] = 'Use Load Indicator'; $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; +$wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details'; +$wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details'; +$wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details'; ?> diff --git a/interface/web/admin/lib/lang/hr_login_as.lng b/interface/web/admin/lib/lang/hr_login_as.lng index 88d4850c12..f905b45115 100644 --- a/interface/web/admin/lib/lang/hr_login_as.lng +++ b/interface/web/admin/lib/lang/hr_login_as.lng @@ -1,12 +1,11 @@ \ No newline at end of file +$wb['login_1_txt'] = 'Do you want to login as user'; +$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.'; +$wb['btn_yes_txt'] = 'Yes, login as Client'; +$wb['btn_back_txt'] = 'No, back to list'; +$wb['udp_port_help_txt'] = 'Separated by comma'; +$wb['active_txt'] = 'Active'; +$wb['firewall_error_unique'] = 'There is already a firewall record for this server.'; +$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".'; +$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".'; +?> diff --git a/interface/web/admin/lib/lang/hr_system_config.lng b/interface/web/admin/lib/lang/hr_system_config.lng index d552e190fb..210a18b00f 100644 --- a/interface/web/admin/lib/lang/hr_system_config.lng +++ b/interface/web/admin/lib/lang/hr_system_config.lng @@ -46,4 +46,7 @@ $wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; $wb['use_loadindicator_txt'] = 'Use Load Indicator'; $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; +$wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details'; +$wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details'; +$wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details'; ?> diff --git a/interface/web/admin/lib/lang/hu_login_as.lng b/interface/web/admin/lib/lang/hu_login_as.lng index 88d4850c12..f905b45115 100644 --- a/interface/web/admin/lib/lang/hu_login_as.lng +++ b/interface/web/admin/lib/lang/hu_login_as.lng @@ -1,12 +1,11 @@ \ No newline at end of file +$wb['login_1_txt'] = 'Do you want to login as user'; +$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.'; +$wb['btn_yes_txt'] = 'Yes, login as Client'; +$wb['btn_back_txt'] = 'No, back to list'; +$wb['udp_port_help_txt'] = 'Separated by comma'; +$wb['active_txt'] = 'Active'; +$wb['firewall_error_unique'] = 'There is already a firewall record for this server.'; +$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".'; +$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".'; +?> diff --git a/interface/web/admin/lib/lang/hu_system_config.lng b/interface/web/admin/lib/lang/hu_system_config.lng index e2e189bfeb..f18d12f4cd 100644 --- a/interface/web/admin/lib/lang/hu_system_config.lng +++ b/interface/web/admin/lib/lang/hu_system_config.lng @@ -46,4 +46,7 @@ $wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; $wb['use_loadindicator_txt'] = 'Use Load Indicator'; $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; +$wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details'; +$wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details'; +$wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details'; ?> diff --git a/interface/web/admin/lib/lang/id_login_as.lng b/interface/web/admin/lib/lang/id_login_as.lng index 88d4850c12..f905b45115 100644 --- a/interface/web/admin/lib/lang/id_login_as.lng +++ b/interface/web/admin/lib/lang/id_login_as.lng @@ -1,12 +1,11 @@ \ No newline at end of file +$wb['login_1_txt'] = 'Do you want to login as user'; +$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.'; +$wb['btn_yes_txt'] = 'Yes, login as Client'; +$wb['btn_back_txt'] = 'No, back to list'; +$wb['udp_port_help_txt'] = 'Separated by comma'; +$wb['active_txt'] = 'Active'; +$wb['firewall_error_unique'] = 'There is already a firewall record for this server.'; +$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".'; +$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".'; +?> diff --git a/interface/web/admin/lib/lang/id_system_config.lng b/interface/web/admin/lib/lang/id_system_config.lng index 66eb60503b..c68bc676c1 100644 --- a/interface/web/admin/lib/lang/id_system_config.lng +++ b/interface/web/admin/lib/lang/id_system_config.lng @@ -46,4 +46,7 @@ $wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; $wb['use_loadindicator_txt'] = 'Use Load Indicator'; $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; +$wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details'; +$wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details'; +$wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details'; ?> diff --git a/interface/web/admin/lib/lang/it_login_as.lng b/interface/web/admin/lib/lang/it_login_as.lng index 88d4850c12..f905b45115 100644 --- a/interface/web/admin/lib/lang/it_login_as.lng +++ b/interface/web/admin/lib/lang/it_login_as.lng @@ -1,12 +1,11 @@ \ No newline at end of file +$wb['login_1_txt'] = 'Do you want to login as user'; +$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.'; +$wb['btn_yes_txt'] = 'Yes, login as Client'; +$wb['btn_back_txt'] = 'No, back to list'; +$wb['udp_port_help_txt'] = 'Separated by comma'; +$wb['active_txt'] = 'Active'; +$wb['firewall_error_unique'] = 'There is already a firewall record for this server.'; +$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".'; +$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".'; +?> diff --git a/interface/web/admin/lib/lang/it_system_config.lng b/interface/web/admin/lib/lang/it_system_config.lng index 33b3aa38eb..60512a412e 100644 --- a/interface/web/admin/lib/lang/it_system_config.lng +++ b/interface/web/admin/lib/lang/it_system_config.lng @@ -46,4 +46,7 @@ $wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; $wb['use_loadindicator_txt'] = 'Use Load Indicator'; $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; +$wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details'; +$wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details'; +$wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details'; ?> diff --git a/interface/web/admin/lib/lang/ja_login_as.lng b/interface/web/admin/lib/lang/ja_login_as.lng index 88d4850c12..c660ff1a4b 100644 --- a/interface/web/admin/lib/lang/ja_login_as.lng +++ b/interface/web/admin/lib/lang/ja_login_as.lng @@ -1,12 +1,11 @@ \ No newline at end of file +$wb['login_1_txt'] = 'Do you want to login as user'; +$wb['login_2_txt'] = 'If you do so, you can \\"go back\\" by clicking at logout.'; +$wb['btn_yes_txt'] = 'Yes, login as Client'; +$wb['btn_back_txt'] = 'No, back to list'; +$wb['udp_port_help_txt'] = 'Separated by comma'; +$wb['active_txt'] = 'Active'; +$wb['firewall_error_unique'] = 'There is already a firewall record for this server.'; +$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \\":\\" and \\",\\".'; +$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \\":\\" and \\",\\".'; +?> diff --git a/interface/web/admin/lib/lang/ja_system_config.lng b/interface/web/admin/lib/lang/ja_system_config.lng index 15b4d3c5be..f58ce702a9 100644 --- a/interface/web/admin/lib/lang/ja_system_config.lng +++ b/interface/web/admin/lib/lang/ja_system_config.lng @@ -46,4 +46,7 @@ $wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; $wb['use_loadindicator_txt'] = 'Use Load Indicator'; $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; +$wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details'; +$wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details'; +$wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details'; ?> diff --git a/interface/web/admin/lib/lang/nl_login_as.lng b/interface/web/admin/lib/lang/nl_login_as.lng index 88d4850c12..f905b45115 100644 --- a/interface/web/admin/lib/lang/nl_login_as.lng +++ b/interface/web/admin/lib/lang/nl_login_as.lng @@ -1,12 +1,11 @@ \ No newline at end of file +$wb['login_1_txt'] = 'Do you want to login as user'; +$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.'; +$wb['btn_yes_txt'] = 'Yes, login as Client'; +$wb['btn_back_txt'] = 'No, back to list'; +$wb['udp_port_help_txt'] = 'Separated by comma'; +$wb['active_txt'] = 'Active'; +$wb['firewall_error_unique'] = 'There is already a firewall record for this server.'; +$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".'; +$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".'; +?> diff --git a/interface/web/admin/lib/lang/nl_system_config.lng b/interface/web/admin/lib/lang/nl_system_config.lng index 0955743f59..65ed315cdd 100644 --- a/interface/web/admin/lib/lang/nl_system_config.lng +++ b/interface/web/admin/lib/lang/nl_system_config.lng @@ -49,4 +49,7 @@ $wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; $wb['use_loadindicator_txt'] = 'Use Load Indicator'; $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; +$wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details'; +$wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details'; +$wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details'; ?> diff --git a/interface/web/admin/lib/lang/pl_login_as.lng b/interface/web/admin/lib/lang/pl_login_as.lng index 88d4850c12..f905b45115 100644 --- a/interface/web/admin/lib/lang/pl_login_as.lng +++ b/interface/web/admin/lib/lang/pl_login_as.lng @@ -1,12 +1,11 @@ \ No newline at end of file +$wb['login_1_txt'] = 'Do you want to login as user'; +$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.'; +$wb['btn_yes_txt'] = 'Yes, login as Client'; +$wb['btn_back_txt'] = 'No, back to list'; +$wb['udp_port_help_txt'] = 'Separated by comma'; +$wb['active_txt'] = 'Active'; +$wb['firewall_error_unique'] = 'There is already a firewall record for this server.'; +$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".'; +$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".'; +?> diff --git a/interface/web/admin/lib/lang/pl_system_config.lng b/interface/web/admin/lib/lang/pl_system_config.lng index 904c983888..50e5a40b62 100644 --- a/interface/web/admin/lib/lang/pl_system_config.lng +++ b/interface/web/admin/lib/lang/pl_system_config.lng @@ -46,4 +46,7 @@ $wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; $wb['use_loadindicator_txt'] = 'Use Load Indicator'; $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; +$wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details'; +$wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details'; +$wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details'; ?> diff --git a/interface/web/admin/lib/lang/pt_login_as.lng b/interface/web/admin/lib/lang/pt_login_as.lng index 88d4850c12..f905b45115 100644 --- a/interface/web/admin/lib/lang/pt_login_as.lng +++ b/interface/web/admin/lib/lang/pt_login_as.lng @@ -1,12 +1,11 @@ \ No newline at end of file +$wb['login_1_txt'] = 'Do you want to login as user'; +$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.'; +$wb['btn_yes_txt'] = 'Yes, login as Client'; +$wb['btn_back_txt'] = 'No, back to list'; +$wb['udp_port_help_txt'] = 'Separated by comma'; +$wb['active_txt'] = 'Active'; +$wb['firewall_error_unique'] = 'There is already a firewall record for this server.'; +$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".'; +$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".'; +?> diff --git a/interface/web/admin/lib/lang/pt_system_config.lng b/interface/web/admin/lib/lang/pt_system_config.lng index 2b32bab6ac..93389bbe90 100644 --- a/interface/web/admin/lib/lang/pt_system_config.lng +++ b/interface/web/admin/lib/lang/pt_system_config.lng @@ -46,4 +46,7 @@ $wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; $wb['use_loadindicator_txt'] = 'Use Load Indicator'; $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; +$wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details'; +$wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details'; +$wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details'; ?> diff --git a/interface/web/admin/lib/lang/ro_login_as.lng b/interface/web/admin/lib/lang/ro_login_as.lng index 88d4850c12..f905b45115 100644 --- a/interface/web/admin/lib/lang/ro_login_as.lng +++ b/interface/web/admin/lib/lang/ro_login_as.lng @@ -1,12 +1,11 @@ \ No newline at end of file +$wb['login_1_txt'] = 'Do you want to login as user'; +$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.'; +$wb['btn_yes_txt'] = 'Yes, login as Client'; +$wb['btn_back_txt'] = 'No, back to list'; +$wb['udp_port_help_txt'] = 'Separated by comma'; +$wb['active_txt'] = 'Active'; +$wb['firewall_error_unique'] = 'There is already a firewall record for this server.'; +$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".'; +$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".'; +?> diff --git a/interface/web/admin/lib/lang/ro_system_config.lng b/interface/web/admin/lib/lang/ro_system_config.lng index 86887aed3f..d8486c8b08 100644 --- a/interface/web/admin/lib/lang/ro_system_config.lng +++ b/interface/web/admin/lib/lang/ro_system_config.lng @@ -46,4 +46,7 @@ $wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; $wb['use_loadindicator_txt'] = 'Use Load Indicator'; $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; +$wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details'; +$wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details'; +$wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details'; ?> diff --git a/interface/web/admin/lib/lang/ru_login_as.lng b/interface/web/admin/lib/lang/ru_login_as.lng index 88d4850c12..f905b45115 100644 --- a/interface/web/admin/lib/lang/ru_login_as.lng +++ b/interface/web/admin/lib/lang/ru_login_as.lng @@ -1,12 +1,11 @@ \ No newline at end of file +$wb['login_1_txt'] = 'Do you want to login as user'; +$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.'; +$wb['btn_yes_txt'] = 'Yes, login as Client'; +$wb['btn_back_txt'] = 'No, back to list'; +$wb['udp_port_help_txt'] = 'Separated by comma'; +$wb['active_txt'] = 'Active'; +$wb['firewall_error_unique'] = 'There is already a firewall record for this server.'; +$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".'; +$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".'; +?> diff --git a/interface/web/admin/lib/lang/ru_system_config.lng b/interface/web/admin/lib/lang/ru_system_config.lng index c17a0086e4..8d47e5fd2f 100644 --- a/interface/web/admin/lib/lang/ru_system_config.lng +++ b/interface/web/admin/lib/lang/ru_system_config.lng @@ -46,4 +46,7 @@ $wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; $wb['use_loadindicator_txt'] = 'Use Load Indicator'; $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; +$wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details'; +$wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details'; +$wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details'; ?> diff --git a/interface/web/admin/lib/lang/se_login_as.lng b/interface/web/admin/lib/lang/se_login_as.lng index 88d4850c12..f905b45115 100644 --- a/interface/web/admin/lib/lang/se_login_as.lng +++ b/interface/web/admin/lib/lang/se_login_as.lng @@ -1,12 +1,11 @@ \ No newline at end of file +$wb['login_1_txt'] = 'Do you want to login as user'; +$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.'; +$wb['btn_yes_txt'] = 'Yes, login as Client'; +$wb['btn_back_txt'] = 'No, back to list'; +$wb['udp_port_help_txt'] = 'Separated by comma'; +$wb['active_txt'] = 'Active'; +$wb['firewall_error_unique'] = 'There is already a firewall record for this server.'; +$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".'; +$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".'; +?> diff --git a/interface/web/admin/lib/lang/se_system_config.lng b/interface/web/admin/lib/lang/se_system_config.lng index 86887aed3f..d8486c8b08 100644 --- a/interface/web/admin/lib/lang/se_system_config.lng +++ b/interface/web/admin/lib/lang/se_system_config.lng @@ -46,4 +46,7 @@ $wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; $wb['use_loadindicator_txt'] = 'Use Load Indicator'; $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; +$wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details'; +$wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details'; +$wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details'; ?> diff --git a/interface/web/admin/lib/lang/sk_login_as.lng b/interface/web/admin/lib/lang/sk_login_as.lng index 88d4850c12..f905b45115 100644 --- a/interface/web/admin/lib/lang/sk_login_as.lng +++ b/interface/web/admin/lib/lang/sk_login_as.lng @@ -1,12 +1,11 @@ \ No newline at end of file +$wb['login_1_txt'] = 'Do you want to login as user'; +$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.'; +$wb['btn_yes_txt'] = 'Yes, login as Client'; +$wb['btn_back_txt'] = 'No, back to list'; +$wb['udp_port_help_txt'] = 'Separated by comma'; +$wb['active_txt'] = 'Active'; +$wb['firewall_error_unique'] = 'There is already a firewall record for this server.'; +$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".'; +$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".'; +?> diff --git a/interface/web/admin/lib/lang/sk_system_config.lng b/interface/web/admin/lib/lang/sk_system_config.lng index f8c7b3cf12..bf2c0777f4 100644 --- a/interface/web/admin/lib/lang/sk_system_config.lng +++ b/interface/web/admin/lib/lang/sk_system_config.lng @@ -46,4 +46,7 @@ $wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; $wb['use_loadindicator_txt'] = 'Use Load Indicator'; $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; +$wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details'; +$wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details'; +$wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details'; ?> diff --git a/interface/web/admin/lib/lang/tr_login_as.lng b/interface/web/admin/lib/lang/tr_login_as.lng index 88d4850c12..f905b45115 100644 --- a/interface/web/admin/lib/lang/tr_login_as.lng +++ b/interface/web/admin/lib/lang/tr_login_as.lng @@ -1,12 +1,11 @@ \ No newline at end of file +$wb['login_1_txt'] = 'Do you want to login as user'; +$wb['login_2_txt'] = 'If you do so, you can \"go back\" by clicking at logout.'; +$wb['btn_yes_txt'] = 'Yes, login as Client'; +$wb['btn_back_txt'] = 'No, back to list'; +$wb['udp_port_help_txt'] = 'Separated by comma'; +$wb['active_txt'] = 'Active'; +$wb['firewall_error_unique'] = 'There is already a firewall record for this server.'; +$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".'; +$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".'; +?> diff --git a/interface/web/admin/lib/lang/tr_system_config.lng b/interface/web/admin/lib/lang/tr_system_config.lng index 0184815994..70e4853c73 100644 --- a/interface/web/admin/lib/lang/tr_system_config.lng +++ b/interface/web/admin/lib/lang/tr_system_config.lng @@ -46,4 +46,7 @@ $wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; $wb['use_loadindicator_txt'] = 'Use Load Indicator'; $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; +$wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details'; +$wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details'; +$wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details'; ?> diff --git a/interface/web/admin/templates/users_list.htm b/interface/web/admin/templates/users_list.htm index 8c41ac8fa2..dece7f8f3d 100644 --- a/interface/web/admin/templates/users_list.htm +++ b/interface/web/admin/templates/users_list.htm @@ -19,14 +19,14 @@ - + - + @@ -38,7 +38,7 @@ - + diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php index 25623f42f7..7d7bf45314 100644 --- a/interface/web/client/form/client.tform.php +++ b/interface/web/client/form/client.tform.php @@ -1039,6 +1039,20 @@ $form["tabs"]['limits'] = array ( ), 'value' => array(0 => ' ') ), + 'limit_aps' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'ISINT', + 'errmsg'=> 'limit_aps_error_notint'), + ), + 'default' => '-1', + 'value' => '', + 'separator' => '', + 'width' => '10', + 'maxlength' => '10', + 'rows' => '', + 'cols' => '' + ), ################################## # END Datatable fields ################################## diff --git a/interface/web/client/form/client_template.tform.php b/interface/web/client/form/client_template.tform.php index bd98e23037..917266eef4 100644 --- a/interface/web/client/form/client_template.tform.php +++ b/interface/web/client/form/client_template.tform.php @@ -616,6 +616,20 @@ $form["tabs"]['limits'] = array ( ), 'value' => array(0 => ' ') ), + 'limit_aps' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'ISINT', + 'errmsg'=> 'limit_aps_error_notint'), + ), + 'default' => '-1', + 'value' => '', + 'separator' => '', + 'width' => '10', + 'maxlength' => '10', + 'rows' => '', + 'cols' => '' + ), ################################## # END Datatable fields ################################## diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php index b6bbe1c53d..df240e5c55 100644 --- a/interface/web/client/form/reseller.tform.php +++ b/interface/web/client/form/reseller.tform.php @@ -1037,6 +1037,20 @@ $form["tabs"]['limits'] = array ( ), 'value' => array(0 => ' ') ), + 'limit_aps' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'ISINT', + 'errmsg'=> 'limit_aps_error_notint'), + ), + 'default' => '-1', + 'value' => '', + 'separator' => '', + 'width' => '10', + 'maxlength' => '10', + 'rows' => '', + 'cols' => '' + ), ################################## # END Datatable fields ################################## diff --git a/interface/web/client/lib/lang/cz.lng b/interface/web/client/lib/lang/cz.lng index fa1c78df75..8efa987cfa 100644 --- a/interface/web/client/lib/lang/cz.lng +++ b/interface/web/client/lib/lang/cz.lng @@ -23,4 +23,3 @@ $wb['error_domain_in webuse'] = 'Tato doména nelze odstranit, protože je v pou $wb['error_client_can_not_add_domain'] = 'Nemůžete přidat novou doménu'; $wb['error_client_group_id_empty'] = 'Musíte vybrat zákazníka
'; ?> - diff --git a/interface/web/client/lib/lang/cz_client.lng b/interface/web/client/lib/lang/cz_client.lng index 66bb8d12e3..23570f0305 100644 --- a/interface/web/client/lib/lang/cz_client.lng +++ b/interface/web/client/lib/lang/cz_client.lng @@ -141,4 +141,3 @@ $wb['paypal_email_error_isemail'] = 'Zadejte prosím platnou PayPal e-mail addre $wb['paypal_email_txt'] = 'PayPal e-mail'; $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.'; ?> - diff --git a/interface/web/client/lib/lang/cz_client_circle.lng b/interface/web/client/lib/lang/cz_client_circle.lng index c47f934f6f..f26e2d6d4b 100644 --- a/interface/web/client/lib/lang/cz_client_circle.lng +++ b/interface/web/client/lib/lang/cz_client_circle.lng @@ -7,4 +7,3 @@ $wb['client_ids_txt'] = 'Klienti/Distributoři'; $wb['description_txt'] = 'Popis'; $wb['active_txt'] = 'Aktivní'; ?> - diff --git a/interface/web/client/lib/lang/cz_client_circle_list.lng b/interface/web/client/lib/lang/cz_client_circle_list.lng index 5895f82def..e827605400 100644 --- a/interface/web/client/lib/lang/cz_client_circle_list.lng +++ b/interface/web/client/lib/lang/cz_client_circle_list.lng @@ -8,4 +8,3 @@ $wb['filter_txt'] = 'Filtr'; $wb['delete_txt'] = 'Smazat'; $wb['active_txt'] = 'Aktivní'; ?> - diff --git a/interface/web/client/lib/lang/cz_client_del.lng b/interface/web/client/lib/lang/cz_client_del.lng index f564b37a15..4515806be5 100644 --- a/interface/web/client/lib/lang/cz_client_del.lng +++ b/interface/web/client/lib/lang/cz_client_del.lng @@ -4,4 +4,3 @@ $wb['delete_explanation'] = 'Tato akce smaže následující počet záznamů p $wb['btn_save_txt'] = 'Smazat klienta'; $wb['btn_cancel_txt'] = 'Zrušit bez smazání klienta'; ?> - diff --git a/interface/web/client/lib/lang/cz_client_message.lng b/interface/web/client/lib/lang/cz_client_message.lng index 401908daed..d980d55012 100644 --- a/interface/web/client/lib/lang/cz_client_message.lng +++ b/interface/web/client/lib/lang/cz_client_message.lng @@ -16,4 +16,3 @@ $wb['all_clients_resellers_txt'] = 'Všichni klienti a distributoři (prodejci)' $wb['all_clients_txt'] = 'Všichni klienti'; $wb['variables_txt'] = 'Výběr (možnosti):'; ?> - diff --git a/interface/web/client/lib/lang/cz_client_template.lng b/interface/web/client/lib/lang/cz_client_template.lng index 8c3aac87e1..9b8e1a8b37 100644 --- a/interface/web/client/lib/lang/cz_client_template.lng +++ b/interface/web/client/lib/lang/cz_client_template.lng @@ -85,4 +85,3 @@ $wb['cron_job_limits_txt'] = 'Cron pracovní limity'; $wb['dns_limits_txt'] = 'DNS limity'; $wb['virtualization_limits_txt'] = 'Virtualizace limity'; ?> - 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 bd2b066c39..c3faae17c7 100644 --- a/interface/web/client/lib/lang/cz_client_template_list.lng +++ b/interface/web/client/lib/lang/cz_client_template_list.lng @@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'Klientské šablony'; $wb['template_type_txt'] = 'Typ'; $wb['template_name_txt'] = 'Název šablony'; ?> - diff --git a/interface/web/client/lib/lang/cz_clients_list.lng b/interface/web/client/lib/lang/cz_clients_list.lng index bceac34bc8..9657cb71e8 100644 --- a/interface/web/client/lib/lang/cz_clients_list.lng +++ b/interface/web/client/lib/lang/cz_clients_list.lng @@ -9,4 +9,3 @@ $wb['add_new_record_txt'] = 'Přidat klienta'; $wb['username_txt'] = 'Uživatelské jméno'; $wb['customer_no_txt'] = 'Zákaznické číslo'; ?> - diff --git a/interface/web/client/lib/lang/cz_domain.lng b/interface/web/client/lib/lang/cz_domain.lng index 09e1d8e22d..34ba70c11e 100644 --- a/interface/web/client/lib/lang/cz_domain.lng +++ b/interface/web/client/lib/lang/cz_domain.lng @@ -4,4 +4,3 @@ $wb['domain_error_unique'] = 'The domain already exists'; $wb['domain_error_regex'] = 'This domain-name is not allowed'; $wb['Domain'] = 'Doména'; ?> - diff --git a/interface/web/client/lib/lang/cz_domain_list.lng b/interface/web/client/lib/lang/cz_domain_list.lng index 88df8383cd..6cf7376bd4 100644 --- a/interface/web/client/lib/lang/cz_domain_list.lng +++ b/interface/web/client/lib/lang/cz_domain_list.lng @@ -4,4 +4,3 @@ $wb['add_new_record_txt'] = 'Přidat novou doménu'; $wb['domain_txt'] = 'Doména'; $wb['user_txt'] = 'Klient'; ?> - diff --git a/interface/web/client/lib/lang/cz_reseller.lng b/interface/web/client/lib/lang/cz_reseller.lng index c860b6694e..a9ebdf5f18 100644 --- a/interface/web/client/lib/lang/cz_reseller.lng +++ b/interface/web/client/lib/lang/cz_reseller.lng @@ -140,4 +140,3 @@ $wb['bank_name_txt'] = 'Název banky'; $wb['bank_account_iban_txt'] = 'IBAN'; $wb['bank_account_swift_txt'] = 'BIC / Swift'; ?> - diff --git a/interface/web/client/lib/lang/cz_resellers_list.lng b/interface/web/client/lib/lang/cz_resellers_list.lng index 859c97f1c2..8e72797b4d 100644 --- a/interface/web/client/lib/lang/cz_resellers_list.lng +++ b/interface/web/client/lib/lang/cz_resellers_list.lng @@ -9,4 +9,3 @@ $wb['add_new_record_txt'] = 'Přidat distributora'; $wb['customer_no_txt'] = 'Zákaznické číslo'; $wb['username_txt'] = 'Uživatelské jméno'; ?> - diff --git a/interface/web/client/lib/lang/de.lng b/interface/web/client/lib/lang/de.lng index 607a70b32e..ba66401d9e 100644 --- a/interface/web/client/lib/lang/de.lng +++ b/interface/web/client/lib/lang/de.lng @@ -5,7 +5,7 @@ $wb['Limits'] = 'Limits'; $wb['Add Client'] = 'Kunde hinzufügen'; $wb['Edit Client'] = 'Kunde bearbeiten'; $wb['Clients'] = 'Kunden'; -$wb['Edit Client-Templates'] = 'Kundenvorlagen bearbeiten'; +$wb['Edit Client-Templates'] = 'Kundenvorlagen'; $wb['Add Reseller'] = 'Reseller hinzufügen'; $wb['Edit Reseller'] = 'Reseller bearbeiten'; $wb['Resellers'] = 'Reseller'; @@ -18,7 +18,7 @@ $wb['Edit Client Circle'] = 'Kundenkreis bearbeiten'; $wb['Domains'] = 'Domains'; $wb['domain_txt'] = 'Domain'; $wb['client_txt'] = 'Kunde'; -$wb['error_domain_in mailuse'] = 'Diese Domain kann nicht gelöscht werden, weil sie als Maildomain verwendet wird'; +$wb['error_domain_in mailuse'] = 'Diese Domain kann nicht gelöscht werden, weil sie als E-Mail Domain verwendet wird'; $wb['error_domain_in webuse'] = 'Diese Domain kann nicht gelöscht werden, weil sie als Webdomain verwendet wird'; $wb['error_client_can_not_add_domain'] = 'Sie können keine neue Domain anlegen'; $wb['error_client_group_id_empty'] = 'Sie müssen ein Benutzerdefiniertes auswählen
'; diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng index 586c8b80a9..40d907a39a 100644 --- a/interface/web/client/lib/lang/de_client.lng +++ b/interface/web/client/lib/lang/de_client.lng @@ -1,13 +1,13 @@ diff --git a/interface/web/client/lib/lang/de_client_circle.lng b/interface/web/client/lib/lang/de_client_circle.lng index 27c5d1561a..b6aee4638d 100644 --- a/interface/web/client/lib/lang/de_client_circle.lng +++ b/interface/web/client/lib/lang/de_client_circle.lng @@ -2,7 +2,7 @@ $wb['Client Circle'] = 'Kundenkreis'; $wb['Circle'] = 'Kreis'; $wb['circle_txt'] = 'Kreis'; -$wb['circle_name_txt'] = 'Kreisname'; +$wb['circle_name_txt'] = 'Kundenkreisname'; $wb['client_ids_txt'] = 'Kunden/Reseller'; $wb['description_txt'] = 'Beschreibung'; $wb['active_txt'] = 'Aktiv'; diff --git a/interface/web/client/lib/lang/de_client_circle_list.lng b/interface/web/client/lib/lang/de_client_circle_list.lng index 709b509110..f69b755ddc 100644 --- a/interface/web/client/lib/lang/de_client_circle_list.lng +++ b/interface/web/client/lib/lang/de_client_circle_list.lng @@ -1,9 +1,9 @@ diff --git a/interface/web/client/lib/lang/de_reseller.lng b/interface/web/client/lib/lang/de_reseller.lng index 8ee282224f..14cd58a0c4 100644 --- a/interface/web/client/lib/lang/de_reseller.lng +++ b/interface/web/client/lib/lang/de_reseller.lng @@ -1,13 +1,13 @@ 0 sein'; $wb['limit_web_quota_txt'] = 'Speicherplatzbeschränkung'; $wb['limit_traffic_quota_txt'] = 'Transfervolumenbeschränkung'; $wb['limit_trafficquota_error_notint'] = 'Transfervolumenbeschränkung muss eine Zahl sein.'; -$wb['limit_dns_slave_zone_txt'] = 'Max. Anzahl an Secondary DNS Zonen'; -$wb['limit_dns_slave_zone_error_notint'] = 'Das Secondary DNS Zonen Limit muss eine Zahl sein.'; +$wb['limit_dns_slave_zone_txt'] = 'Max. Anzahl an Zweiter DNS Zonen'; +$wb['limit_dns_slave_zone_error_notint'] = 'Das Zweiter DNS Zonen Limit muss eine Zahl sein.'; $wb['limit_dns_record_error_notint'] = 'Das DNS Eintrag Limit muss eine Zahl sein.'; $wb['customer_no_txt'] = 'Kundennummer'; $wb['vat_id_txt'] = 'USt-ID'; @@ -110,13 +110,13 @@ $wb['required_fields_txt'] = '* Benötigte Felder'; $wb['limit_webdav_user_txt'] = 'Max. Anzahl an WebDAV Benutzern'; $wb['limit_webdav_user_error_notint'] = 'Das WebDAV Benutzer Limit muss eine Zahl sein.'; $wb['limit_mailmailinglist_txt'] = 'Max. Anzahl an Mailinglisten'; -$wb['limit_mailaliasdomain_txt'] = 'Max. Anzahl an E-Mail Domainaliases'; +$wb['limit_mailaliasdomain_txt'] = 'Max. Anzahl an E-Mail Domain Aliasse'; $wb['limit_mailmailinglist_error_notint'] = 'Das Mailinglisten Limit muss eine Zahl sein.'; $wb['limit_openvz_vm_txt'] = 'Max. Anzahl an virtuellen Servern'; -$wb['limit_openvz_vm_template_id_txt'] = 'Template für virtuelle Server erzwingen'; +$wb['limit_openvz_vm_template_id_txt'] = 'Vorlage für virtuelle Server erzwingen'; $wb['limit_openvz_vm_error_notint'] = 'Das Limit virtueller Server muss eine Zahl sein.'; $wb['web_php_options_notempty'] = 'Keine PHP Option ausgewählt. Wähle mindestens eine PHP Option.'; -$wb['ssh_chroot_notempty'] = 'Keine SSH Chroot-Option ausgewählt. Wähle mindestens eine SSH Option.'; +$wb['ssh_chroot_notempty'] = 'Keine SSH Chroot Option ausgewählt. Wähle mindestens eine SSH Option.'; $wb['username_error_collision'] = 'Der Benutzername sollte nicht mit dem Wort -web- oder -web- gefolgt von einer Nummer anfangen.'; $wb['web_limits_txt'] = 'Web Limits'; $wb['email_limits_txt'] = 'E-Mail Limits'; @@ -130,8 +130,8 @@ $wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; $wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; $wb['customer_no_error_unique'] = 'Die Kundennummer muß einzigartig sein (oder leer).'; $wb['email_error_isemail'] = 'Please enter a valid email address.'; -$wb['paypal_email_error_isemail'] = 'Bitte geben Sie eine gültige PayPal-E-Mail-Adresse an.'; -$wb['paypal_email_txt'] = 'PayPal-E-Mail'; +$wb['paypal_email_error_isemail'] = 'Bitte geben Sie eine gültige PayPal E-Mail Adresse an.'; +$wb['paypal_email_txt'] = 'PayPal E-Mail'; $wb['company_id_txt'] = 'Firmen/Entrepreneur ID'; $wb['bank_account_number_txt'] = 'Kontonummer'; $wb['bank_account_owner_txt'] = 'Kontoinhaber'; @@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'BLZ'; $wb['bank_name_txt'] = 'Bank'; $wb['bank_account_iban_txt'] = 'IBAN'; $wb['bank_account_swift_txt'] = 'BIC'; +$wb['aps_limits_txt'] = 'APS Installationsassistent Limits'; +$wb['limit_aps_txt'] = 'Max. Anzahl an APS-Instanzen'; +$wb['limit_aps_error_notint'] = 'Das APS Instanzen Limit muss eine Zahl sein.'; ?> diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng index 62ad8415e2..61a719b790 100644 --- a/interface/web/client/lib/lang/en_client.lng +++ b/interface/web/client/lib/lang/en_client.lng @@ -143,4 +143,7 @@ $wb["customer_no_error_unique"] = 'The customer no. must be unique (or empty).'; $wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.'; $wb['paypal_email_txt'] = 'PayPal Email'; $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than "custom" is selected.'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/en_client_template.lng b/interface/web/client/lib/lang/en_client_template.lng index 434f94e862..e7c06a8b6f 100644 --- a/interface/web/client/lib/lang/en_client_template.lng +++ b/interface/web/client/lib/lang/en_client_template.lng @@ -85,4 +85,7 @@ $wb["database_limits_txt"] = 'Database Limits'; $wb["cron_job_limits_txt"] = 'Cron Job Limits'; $wb["dns_limits_txt"] = 'DNS Limits'; $wb["virtualization_limits_txt"] = 'Virtualization Limits'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> \ No newline at end of file diff --git a/interface/web/client/lib/lang/en_reseller.lng b/interface/web/client/lib/lang/en_reseller.lng index 3d78e3c236..711c414ba8 100644 --- a/interface/web/client/lib/lang/en_reseller.lng +++ b/interface/web/client/lib/lang/en_reseller.lng @@ -141,4 +141,7 @@ $wb["bank_code_txt"] = 'Bank code'; $wb["bank_name_txt"] = 'Bank name'; $wb["bank_account_iban_txt"] = 'IBAN'; $wb["bank_account_swift_txt"] = 'BIC / Swift'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm index c05d6bb344..c17d778ba3 100644 --- a/interface/web/client/templates/client_edit_limits.htm +++ b/interface/web/client/templates/client_edit_limits.htm @@ -277,6 +277,13 @@ {tmpl_var name='limit_openvz_vm_template_id'} + +
{tmpl_var name='aps_limits_txt'}
+
+
+ + +
diff --git a/interface/web/client/templates/client_template_edit_limits.htm b/interface/web/client/templates/client_template_edit_limits.htm index e7b28f17dd..18abc9b397 100644 --- a/interface/web/client/templates/client_template_edit_limits.htm +++ b/interface/web/client/templates/client_template_edit_limits.htm @@ -216,6 +216,13 @@ {tmpl_var name='limit_openvz_vm_template_id'} + +
{tmpl_var name='aps_limits_txt'}
+
+
+ + +
diff --git a/interface/web/client/templates/reseller_edit_limits.htm b/interface/web/client/templates/reseller_edit_limits.htm index 4c4b06f962..468a680181 100644 --- a/interface/web/client/templates/reseller_edit_limits.htm +++ b/interface/web/client/templates/reseller_edit_limits.htm @@ -265,6 +265,13 @@ {tmpl_var name='limit_openvz_vm_template_id'} + +
{tmpl_var name='aps_limits_txt'}
+
+
+ + +
diff --git a/interface/web/client/templates/resellers_list.htm b/interface/web/client/templates/resellers_list.htm index 6bf1150ab1..66cb06af64 100644 --- a/interface/web/client/templates/resellers_list.htm +++ b/interface/web/client/templates/resellers_list.htm @@ -46,8 +46,8 @@ - - + +
{tmpl_var name='search_limit'}
{tmpl_var name="client_id"}{tmpl_var name="client_id"} {tmpl_var name="active"}
{tmpl_var name="typ"}
{tmpl_var name="username"}
 {tmpl_var name="groups"} {tmpl_var name="client_id"} {tmpl_var name="company_name"} {tmpl_var name="contact_name"}{tmpl_var name="customer_no"}{tmpl_var name="username"}{tmpl_var name="customer_no"}{tmpl_var name="username"} {tmpl_var name="city"}
{tmpl_var name="country"}		 diff --git a/interface/web/dashboard/lib/lang/cz.lng b/interface/web/dashboard/lib/lang/cz.lng index 15063c03fa..9d2a3211cb 100644 --- a/interface/web/dashboard/lib/lang/cz.lng +++ b/interface/web/dashboard/lib/lang/cz.lng @@ -2,4 +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 ac3266ec1d..bedb98f865 100644 --- a/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng @@ -28,4 +28,3 @@ $wb['limit_client_txt'] = 'Počet klientů'; $wb['limit_database_txt'] = 'Počet databází'; $wb['limit_mailmailinglist_txt'] = 'Počet e-mailových konferencí'; ?> - diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng b/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng index be21791ff0..66275f1d05 100644 --- a/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng +++ b/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng @@ -1,4 +1,3 @@ - diff --git a/interface/web/dashboard/lib/lang/de_dashlet_limits.lng b/interface/web/dashboard/lib/lang/de_dashlet_limits.lng index 964531eccf..e50ff27594 100644 --- a/interface/web/dashboard/lib/lang/de_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/de_dashlet_limits.lng @@ -4,13 +4,13 @@ $wb['of_txt'] = 'von'; $wb['unlimited_txt'] = 'unlimitiert'; $wb['limit_maildomain_txt'] = 'Anzahl der E-Mail Domains'; $wb['limit_mailbox_txt'] = 'Anzahl der E-Mail Konten'; -$wb['limit_mailalias_txt'] = 'Anzahl der E-Mail Aliases'; -$wb['limit_mailaliasdomain_txt'] = 'Anzahl der Domain Aliases'; +$wb['limit_mailalias_txt'] = 'Anzahl der E-Mail Aliase'; +$wb['limit_mailaliasdomain_txt'] = 'Anzahl der Domain Aliase'; $wb['limit_mailforward_txt'] = 'Anzahl der E-Mail Weiterleitungen'; $wb['limit_mailcatchall_txt'] = 'Anzahl der E-Mail Catchall Konten'; $wb['limit_mailrouting_txt'] = 'Anzahl der E-Mail Routen'; $wb['limit_mailfilter_txt'] = 'Anzahl der E-Mail Filter'; -$wb['limit_fetchmail_txt'] = 'Anzahl der Fetchmail Konten'; +$wb['limit_fetchmail_txt'] = 'Anzahl der E-Mail Sammelkonten'; $wb['limit_spamfilter_wblist_txt'] = 'Anzahl der Spamfilter (White-/Blacklist)'; $wb['limit_spamfilter_user_txt'] = 'Anzahl der Spamfilter Benutzer'; $wb['limit_spamfilter_policy_txt'] = 'Anzahl der Spamfilter Richtlinien'; diff --git a/interface/web/designer/lib/lang/cz.lng b/interface/web/designer/lib/lang/cz.lng index 29f4a51efe..acb6c3546c 100644 --- a/interface/web/designer/lib/lang/cz.lng +++ b/interface/web/designer/lib/lang/cz.lng @@ -1,3 +1,2 @@ - diff --git a/interface/web/designer/lib/lang/cz_form_edit.lng b/interface/web/designer/lib/lang/cz_form_edit.lng index 00eeb204d0..75bf5a5606 100644 --- a/interface/web/designer/lib/lang/cz_form_edit.lng +++ b/interface/web/designer/lib/lang/cz_form_edit.lng @@ -22,4 +22,3 @@ $wb['auth_preset_perm_user_txt'] = 'Opr. Uživatel'; $wb['auth_preset_perm_group_txt'] = 'Opr. Skupina'; $wb['auth_preset_perm_other_txt'] = 'Opr. Ostatní'; ?> - diff --git a/interface/web/designer/lib/lang/cz_form_list.lng b/interface/web/designer/lib/lang/cz_form_list.lng index edaa422253..1e677f2410 100644 --- a/interface/web/designer/lib/lang/cz_form_list.lng +++ b/interface/web/designer/lib/lang/cz_form_list.lng @@ -5,4 +5,3 @@ $wb['module_txt'] = 'Modul'; $wb['title_txt'] = 'Titulek'; $wb['description_txt'] = 'Popis'; ?> - diff --git a/interface/web/designer/lib/lang/cz_form_show.lng b/interface/web/designer/lib/lang/cz_form_show.lng index 7d63b02d3a..381414bdf0 100644 --- a/interface/web/designer/lib/lang/cz_form_show.lng +++ b/interface/web/designer/lib/lang/cz_form_show.lng @@ -16,4 +16,3 @@ $wb['module_del_txt'] = 'Delete the module and all subdirectories?'; $wb['menu_del_txt'] = 'Delete menu with all menuitems?'; $wb['item_del_txt'] = 'Delete menuitem?'; ?> - diff --git a/interface/web/designer/lib/lang/cz_module_edit.lng b/interface/web/designer/lib/lang/cz_module_edit.lng index e5f988ed7c..847896d302 100644 --- a/interface/web/designer/lib/lang/cz_module_edit.lng +++ b/interface/web/designer/lib/lang/cz_module_edit.lng @@ -20,4 +20,3 @@ $wb['description_txt'] = ' Rada: 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 6617c8c300..b568f69d63 100644 --- a/interface/web/designer/lib/lang/cz_module_list.lng +++ b/interface/web/designer/lib/lang/cz_module_list.lng @@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'Backend modul'; $wb['module_txt'] = 'Modul'; $wb['title_txt'] = 'Titulek'; ?> - diff --git a/interface/web/designer/lib/lang/cz_module_nav_edit.lng b/interface/web/designer/lib/lang/cz_module_nav_edit.lng index 58d5773231..01f5df68fb 100644 --- a/interface/web/designer/lib/lang/cz_module_nav_edit.lng +++ b/interface/web/designer/lib/lang/cz_module_nav_edit.lng @@ -4,4 +4,3 @@ $wb['header_txt'] = 'Navi vlastnosti'; $wb['save_txt'] = 'Uložit'; $wb['cancel_txt'] = 'Zrušit'; ?> - diff --git a/interface/web/designer/lib/lang/cz_module_nav_item_edit.lng b/interface/web/designer/lib/lang/cz_module_nav_item_edit.lng index 39aaae8c41..17e31319d7 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,4 +6,3 @@ $wb['header_txt'] = 'Navi properties'; $wb['save_txt'] = 'Uložit'; $wb['cancel_txt'] = 'Zrušit'; ?> - diff --git a/interface/web/designer/lib/lang/cz_module_show.lng b/interface/web/designer/lib/lang/cz_module_show.lng index e032f9dade..95c2d85723 100644 --- a/interface/web/designer/lib/lang/cz_module_show.lng +++ b/interface/web/designer/lib/lang/cz_module_show.lng @@ -14,4 +14,3 @@ $wb['module_del_txt'] = 'Wollen Sie das Modul und alle im Modul angelegten Datei $wb['menu_del_txt'] = 'Wollen Sie das Menü mit allen Untereinträgen löschen?'; $wb['item_del_txt'] = 'Wollen Sie den Menüeintrag löschen?'; ?> - diff --git a/interface/web/dns/lib/lang/cz.lng b/interface/web/dns/lib/lang/cz.lng index 126fb7ab99..f143b0b922 100644 --- a/interface/web/dns/lib/lang/cz.lng +++ b/interface/web/dns/lib/lang/cz.lng @@ -20,4 +20,3 @@ $wb['Templates'] = 'Šablony DNS'; $wb['Secondary Zones'] = 'Sekundární DNS zóny'; $wb['Import Zone File'] = 'Importovat vybraný DNS zonový soubor'; ?> - diff --git a/interface/web/dns/lib/lang/cz_dns_a.lng b/interface/web/dns/lib/lang/cz_dns_a.lng index 4631836201..8b8c206b63 100644 --- a/interface/web/dns/lib/lang/cz_dns_a.lng +++ b/interface/web/dns/lib/lang/cz_dns_a.lng @@ -14,4 +14,3 @@ $wb['data_error_empty'] = 'IP adresa je prázdná'; $wb['data_error_regex'] = 'IP adresa má chybný formát'; $wb['data_error_duplicate'] = 'Duplikace A záznamu'; ?> - diff --git a/interface/web/dns/lib/lang/cz_dns_a_list.lng b/interface/web/dns/lib/lang/cz_dns_a_list.lng index 5770094c08..249808688f 100644 --- a/interface/web/dns/lib/lang/cz_dns_a_list.lng +++ b/interface/web/dns/lib/lang/cz_dns_a_list.lng @@ -13,4 +13,3 @@ $wb['page_txt'] = 'Stránka'; $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 1936207d70..26c6ae9064 100644 --- a/interface/web/dns/lib/lang/cz_dns_aaaa.lng +++ b/interface/web/dns/lib/lang/cz_dns_aaaa.lng @@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.'; $wb['data_error_empty'] = 'IP adresa je prázdná'; $wb['data_error_regex'] = 'IP adresa má chybný formát'; ?> - diff --git a/interface/web/dns/lib/lang/cz_dns_alias.lng b/interface/web/dns/lib/lang/cz_dns_alias.lng index a32def2ae1..572478a98b 100644 --- a/interface/web/dns/lib/lang/cz_dns_alias.lng +++ b/interface/web/dns/lib/lang/cz_dns_alias.lng @@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.'; $wb['data_error_empty'] = 'Cílový Hostname je prázdný'; $wb['data_error_regex'] = 'Cílový Hostname má chybný formát'; ?> - diff --git a/interface/web/dns/lib/lang/cz_dns_cname.lng b/interface/web/dns/lib/lang/cz_dns_cname.lng index f4e5f220ad..0c5ebe21e1 100644 --- a/interface/web/dns/lib/lang/cz_dns_cname.lng +++ b/interface/web/dns/lib/lang/cz_dns_cname.lng @@ -14,4 +14,3 @@ $wb['data_error_empty'] = 'Cílový hostname je prázdný'; $wb['data_error_regex'] = 'Cílový hostname má chybný formát'; $wb['data_error_duplicate'] = 'Duplicate A-Record or CNAME-Record'; ?> - diff --git a/interface/web/dns/lib/lang/cz_dns_hinfo.lng b/interface/web/dns/lib/lang/cz_dns_hinfo.lng index 636600ba22..5f67d5e826 100644 --- a/interface/web/dns/lib/lang/cz_dns_hinfo.lng +++ b/interface/web/dns/lib/lang/cz_dns_hinfo.lng @@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.'; $wb['data_error_empty'] = 'Informace o hostovi je prázdná'; $wb['data_error_regex'] = 'Informace o hostovi má chybný formát'; ?> - diff --git a/interface/web/dns/lib/lang/cz_dns_import.lng b/interface/web/dns/lib/lang/cz_dns_import.lng index 29f5803e76..4020f8a976 100644 --- a/interface/web/dns/lib/lang/cz_dns_import.lng +++ b/interface/web/dns/lib/lang/cz_dns_import.lng @@ -12,4 +12,3 @@ $wb['title'] = 'Importovat soubory zón'; $wb['no_file_uploaded_error'] = 'Nelze odeslat DNS zonový soubor'; $wb['zone_file_import_txt'] = 'Importovat vybraný DNS zonový soubor'; ?> - diff --git a/interface/web/dns/lib/lang/cz_dns_mx.lng b/interface/web/dns/lib/lang/cz_dns_mx.lng index 534bba59a0..9bb5ce280e 100644 --- a/interface/web/dns/lib/lang/cz_dns_mx.lng +++ b/interface/web/dns/lib/lang/cz_dns_mx.lng @@ -14,4 +14,3 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.'; $wb['data_error_empty'] = 'Hostname mailserveru je prázdný'; $wb['data_error_regex'] = 'Hostname mailserveru má chybný formát'; ?> - diff --git a/interface/web/dns/lib/lang/cz_dns_ns.lng b/interface/web/dns/lib/lang/cz_dns_ns.lng index 73f897b683..ba38e2a65e 100644 --- a/interface/web/dns/lib/lang/cz_dns_ns.lng +++ b/interface/web/dns/lib/lang/cz_dns_ns.lng @@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Zóna má chybný formát.'; $wb['data_error_empty'] = 'Jmenný server je prázdný'; $wb['data_error_regex'] = 'Jmenný server má chybný formát'; ?> - diff --git a/interface/web/dns/lib/lang/cz_dns_ptr.lng b/interface/web/dns/lib/lang/cz_dns_ptr.lng index 6124f30d30..9617ea5852 100644 --- a/interface/web/dns/lib/lang/cz_dns_ptr.lng +++ b/interface/web/dns/lib/lang/cz_dns_ptr.lng @@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Název má chybný formát.'; $wb['data_error_empty'] = 'Kanonický hostname je prázdný'; $wb['data_error_regex'] = 'Kanonického hostname má chybný formát'; ?> - diff --git a/interface/web/dns/lib/lang/cz_dns_rp.lng b/interface/web/dns/lib/lang/cz_dns_rp.lng index 10218a7738..8b1e7e442e 100644 --- a/interface/web/dns/lib/lang/cz_dns_rp.lng +++ b/interface/web/dns/lib/lang/cz_dns_rp.lng @@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.'; $wb['data_error_empty'] = 'Odpovědná osoba je prázdná'; $wb['data_error_regex'] = 'Odpovědná osoba má chybný formát'; ?> - diff --git a/interface/web/dns/lib/lang/cz_dns_slave.lng b/interface/web/dns/lib/lang/cz_dns_slave.lng index 2870562a8c..16617f6c59 100644 --- a/interface/web/dns/lib/lang/cz_dns_slave.lng +++ b/interface/web/dns/lib/lang/cz_dns_slave.lng @@ -15,4 +15,3 @@ $wb['eg_domain_tld'] = 'např. domena.cz'; $wb['ipv4_form_txt'] = 'IPV4 formát, např. 1.2.3.4'; $wb['secondary_zone_txt'] = 'Sekundární DNS zóna'; ?> - diff --git a/interface/web/dns/lib/lang/cz_dns_slave_list.lng b/interface/web/dns/lib/lang/cz_dns_slave_list.lng index 3f801f97b9..1e0a3d0106 100644 --- a/interface/web/dns/lib/lang/cz_dns_slave_list.lng +++ b/interface/web/dns/lib/lang/cz_dns_slave_list.lng @@ -7,4 +7,3 @@ $wb['ns_txt'] = 'NS'; $wb['add_new_record_txt'] = 'Přidat sekundární DNS zónu'; $wb['eg_domain_tld'] = 'např. domena.cz'; ?> - diff --git a/interface/web/dns/lib/lang/cz_dns_soa.lng b/interface/web/dns/lib/lang/cz_dns_soa.lng index 029cf36e15..f770f8257c 100644 --- a/interface/web/dns/lib/lang/cz_dns_soa.lng +++ b/interface/web/dns/lib/lang/cz_dns_soa.lng @@ -34,5 +34,5 @@ $wb['retry_range_error'] = 'Min. Retry time is 60 seconds.'; $wb['expire_range_error'] = 'Min. Expire time is 60 seconds.'; $wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.'; $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.'; +$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.'; ?> - diff --git a/interface/web/dns/lib/lang/cz_dns_soa_list.lng b/interface/web/dns/lib/lang/cz_dns_soa_list.lng index 05834d4933..beba8a22b2 100644 --- a/interface/web/dns/lib/lang/cz_dns_soa_list.lng +++ b/interface/web/dns/lib/lang/cz_dns_soa_list.lng @@ -8,4 +8,3 @@ $wb['mbox_txt'] = 'E-mail'; $wb['add_new_record_txt'] = 'Přidat DNS zónu (SOA záznam)'; $wb['add_new_record_wizard_txt'] = 'Přidat DNS zónu (dle šablony)'; ?> - diff --git a/interface/web/dns/lib/lang/cz_dns_srv.lng b/interface/web/dns/lib/lang/cz_dns_srv.lng index 88b1fc1cbf..6b6708fc01 100644 --- a/interface/web/dns/lib/lang/cz_dns_srv.lng +++ b/interface/web/dns/lib/lang/cz_dns_srv.lng @@ -17,4 +17,3 @@ $wb['data_error_regex'] = 'Záznam serveru má chybný formát'; $wb['srv_error_regex'] = 'Neplatný formát záznamu serveru. Záznam serveru musí­ obsahovat 3 textové řetězce oddělené mezerami.'; $wb['aux_txt'] = 'Priority'; ?> - diff --git a/interface/web/dns/lib/lang/cz_dns_template.lng b/interface/web/dns/lib/lang/cz_dns_template.lng index 82e207a83f..be4ac0e949 100644 --- a/interface/web/dns/lib/lang/cz_dns_template.lng +++ b/interface/web/dns/lib/lang/cz_dns_template.lng @@ -4,4 +4,3 @@ $wb['fields_txt'] = 'Pole'; $wb['template_txt'] = 'Šablona'; $wb['visible_txt'] = 'Viditelný'; ?> - diff --git a/interface/web/dns/lib/lang/cz_dns_template_list.lng b/interface/web/dns/lib/lang/cz_dns_template_list.lng index 10c3fcfabd..bdd6e18204 100644 --- a/interface/web/dns/lib/lang/cz_dns_template_list.lng +++ b/interface/web/dns/lib/lang/cz_dns_template_list.lng @@ -4,4 +4,3 @@ $wb['visible_txt'] = 'Viditelný'; $wb['name_txt'] = 'Název'; $wb['add_new_record_txt'] = 'Přidat záznam'; ?> - diff --git a/interface/web/dns/lib/lang/cz_dns_txt.lng b/interface/web/dns/lib/lang/cz_dns_txt.lng index 0c07487276..76047b0ceb 100644 --- a/interface/web/dns/lib/lang/cz_dns_txt.lng +++ b/interface/web/dns/lib/lang/cz_dns_txt.lng @@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.'; $wb['data_error_empty'] = 'Text je prázdný'; $wb['data_error_regex'] = 'Text má chybný formát'; ?> - diff --git a/interface/web/dns/lib/lang/cz_dns_wizard.lng b/interface/web/dns/lib/lang/cz_dns_wizard.lng index 6eb7b416c4..8d68e6167d 100644 --- a/interface/web/dns/lib/lang/cz_dns_wizard.lng +++ b/interface/web/dns/lib/lang/cz_dns_wizard.lng @@ -36,4 +36,3 @@ $wb['globalsearch_suggestions_text_txt'] = 'Návrhy'; $wb['list_head_txt'] = 'Průvodce vytvořením DNS zóny'; $wb['list_desc_txt'] = 'Vytvoření DNS zóny pomocí průvodce'; ?> - diff --git a/interface/web/dns/lib/lang/de.lng b/interface/web/dns/lib/lang/de.lng index 7d5f345e86..de5e1e9bf4 100644 --- a/interface/web/dns/lib/lang/de.lng +++ b/interface/web/dns/lib/lang/de.lng @@ -17,6 +17,6 @@ $wb['DNS TXT'] = 'DNS TXT'; $wb['DNS Wizard'] = 'DNS Assistent'; $wb['Add DNS Zone'] = 'DNS Zone hinzufügen'; $wb['Templates'] = 'Vorlagen'; -$wb['Secondary Zones'] = 'Secondary DNS Zonen'; -$wb['Import Zone File'] = 'Zone File Import'; +$wb['Secondary Zones'] = 'Zweiter DNS Zonen'; +$wb['Import Zone File'] = 'Zonen Datei Import'; ?> diff --git a/interface/web/dns/lib/lang/de_dns_a.lng b/interface/web/dns/lib/lang/de_dns_a.lng index 2e21543e8c..409864981a 100644 --- a/interface/web/dns/lib/lang/de_dns_a.lng +++ b/interface/web/dns/lib/lang/de_dns_a.lng @@ -11,6 +11,6 @@ $wb['no_zone_perm'] = 'Sie haben nicht die Berechtigung, einen Eintrag zu dieser $wb['name_error_empty'] = 'Der Hostname ist leer.'; $wb['name_error_regex'] = 'Der Hostname hat das falsche Format.'; $wb['data_error_empty'] = 'IPv4 Adresse ist leer'; -$wb['data_error_regex'] = 'IPv4 Adressen-Format ist ungültig'; +$wb['data_error_regex'] = 'IPv4 Adressen Format ist ungültig'; $wb['data_error_duplicate'] = 'Doppelter A oder CNAME Eintrag'; ?> diff --git a/interface/web/dns/lib/lang/de_dns_import.lng b/interface/web/dns/lib/lang/de_dns_import.lng index 63670962ab..183809de66 100644 --- a/interface/web/dns/lib/lang/de_dns_import.lng +++ b/interface/web/dns/lib/lang/de_dns_import.lng @@ -1,14 +1,14 @@ diff --git a/interface/web/dns/lib/lang/de_dns_slave.lng b/interface/web/dns/lib/lang/de_dns_slave.lng index 007e4f4f6e..a1677b6b7f 100644 --- a/interface/web/dns/lib/lang/de_dns_slave.lng +++ b/interface/web/dns/lib/lang/de_dns_slave.lng @@ -1,10 +1,10 @@ diff --git a/interface/web/dns/lib/lang/de_dns_soa.lng b/interface/web/dns/lib/lang/de_dns_soa.lng index 8145e78bc2..8ff7141440 100644 --- a/interface/web/dns/lib/lang/de_dns_soa.lng +++ b/interface/web/dns/lib/lang/de_dns_soa.lng @@ -9,13 +9,13 @@ $wb['retry_txt'] = 'Retry'; $wb['expire_txt'] = 'Expire'; $wb['minimum_txt'] = 'Minimum'; $wb['ttl_txt'] = 'TTL'; -$wb['xfer_txt'] = 'Zonentransfer zu diesen IPs erlauben (mit Komma getrennte Liste)'; +$wb['xfer_txt'] = 'Zonentransfer zu diesen IP Adressen erlauben (mit Komma getrennte Liste)'; $wb['active_txt'] = 'Aktiv'; -$wb['limit_dns_zone_txt'] = 'Die maximale Anzahl an DNS-Einträgen für ihr Konto wurde erreicht.'; +$wb['limit_dns_zone_txt'] = 'Die maximale Anzahl an DNS Einträgen für Ihr Konto wurde erreicht.'; $wb['client_txt'] = 'Kunde'; -$wb['no_zone_perm'] = 'Sie haben nicht die Berechtigung, einen Eintrag zu dieser DNS-Zone hinzuzufügen.'; +$wb['no_zone_perm'] = 'Sie haben nicht die Berechtigung, einen Eintrag zu dieser DNS Zone hinzuzufügen.'; $wb['server_id_error_empty'] = 'Kein Server ausgewählt'; -$wb['origin_error_empty'] = 'Zone leer.'; +$wb['origin_error_empty'] = 'Zone ist leer.'; $wb['origin_error_unique'] = 'Es existiert bereits ein Eintrag für diese Zone.'; $wb['origin_error_regex'] = 'Zone hat ein ungültiges Format.'; $wb['ns_error_regex'] = 'NS hat ein ungültiges Format.'; @@ -34,5 +34,5 @@ $wb['retry_range_error'] = 'Min. Refresh ist 60 Sekunden.'; $wb['expire_range_error'] = 'Min. Expire ist 60 Sekunden.'; $wb['minimum_range_error'] = 'Min. Minimum ist 60 Sekunden.'; $wb['ttl_range_error'] = 'Min. TTL ist 60 Sekunden.'; -$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.'; +$wb['xfer_error_regex'] = 'Bitte Beachten: Verwenden Sie eine IP Adresse.'; ?> diff --git a/interface/web/dns/lib/lang/de_dns_wizard.lng b/interface/web/dns/lib/lang/de_dns_wizard.lng index a9a284f65f..bb90167b2c 100644 --- a/interface/web/dns/lib/lang/de_dns_wizard.lng +++ b/interface/web/dns/lib/lang/de_dns_wizard.lng @@ -12,23 +12,23 @@ $wb['email_txt'] = 'E-Mail Adresse'; $wb['ns1_txt'] = 'NS 1'; $wb['ns2_txt'] = 'NS 2'; $wb['ip_txt'] = 'IP Adresse'; -$wb['error_origin_empty'] = 'Origin leer.'; -$wb['error_ns_empty'] = 'NS leer.'; -$wb['error_mbox_empty'] = 'E-Mail Adresse leer.'; -$wb['error_refresh_empty'] = 'Refresh leer.'; -$wb['error_retry_empty'] = 'Retry leer.'; -$wb['error_expire_empty'] = 'Expire leer.'; +$wb['error_origin_empty'] = 'Quelle ist leer.'; +$wb['error_ns_empty'] = 'NS ist leer.'; +$wb['error_mbox_empty'] = 'E-Mail Adresse ist leer.'; +$wb['error_refresh_empty'] = 'Refresh ist leer.'; +$wb['error_retry_empty'] = 'Retry ist leer.'; +$wb['error_expire_empty'] = 'Expire ist leer.'; $wb['error_minimum_empty'] = 'Minimum leer.'; -$wb['error_ttl_empty'] = 'TTL leer.'; -$wb['error_domain_empty'] = 'Domain leer'; -$wb['error_ip_empty'] = 'IP Adresse leer.'; -$wb['error_ns1_empty'] = 'NS1 leer.'; -$wb['error_ns2_empty'] = 'NS2 leer.'; -$wb['error_email_empty'] = 'E-Mail Adresse leer.'; +$wb['error_ttl_empty'] = 'TTL ist leer.'; +$wb['error_domain_empty'] = 'Domain ist leer'; +$wb['error_ip_empty'] = 'IP Adresse ist leer.'; +$wb['error_ns1_empty'] = 'NS1 ist leer.'; +$wb['error_ns2_empty'] = 'NS2 ist leer.'; +$wb['error_email_empty'] = 'E-Mail Adresse ist leer.'; $wb['error_domain_regex'] = 'Domain beinhaltet ungültige Zeichen.'; $wb['error_ns1_regex'] = 'NS1 beinhaltet ungültige Zeichen.'; $wb['error_ns2_regex'] = 'NS2 beinhaltet ungültige Zeichen.'; -$wb['error_email_regex'] = 'E-Mail Adresse beinhaltet keine gültige Adresse.'; +$wb['error_email_regex'] = 'E-Mail Adresse ist ungültig.'; $wb['globalsearch_resultslimit_of_txt'] = 'von'; $wb['globalsearch_resultslimit_results_txt'] = 'Treffern'; $wb['globalsearch_noresults_text_txt'] = 'Keine Treffer.'; diff --git a/interface/web/dummy_login.html b/interface/web/dummy_login.html new file mode 100644 index 0000000000..e69de29bb2 diff --git a/interface/web/help/lib/lang/cz.lng b/interface/web/help/lib/lang/cz.lng index 95efe025d2..18f8f210b7 100644 --- a/interface/web/help/lib/lang/cz.lng +++ b/interface/web/help/lib/lang/cz.lng @@ -12,4 +12,3 @@ $wb['Manage Sections'] = 'Spravovat sekce'; $wb['Manage Questions'] = 'Spravovat dotazy'; $wb['Add a Question & Answer Pair'] = 'Přidat otázku a odpověď'; ?> - diff --git a/interface/web/help/lib/lang/cz_faq_form.lng b/interface/web/help/lib/lang/cz_faq_form.lng index c71ddfa9ac..73feee6955 100644 --- a/interface/web/help/lib/lang/cz_faq_form.lng +++ b/interface/web/help/lib/lang/cz_faq_form.lng @@ -4,4 +4,3 @@ $wb['faq_question_txt'] = 'Otázka'; $wb['faq_answer_txt'] = 'Odpověď'; $wb['faq_section_txt'] = 'Sekce'; ?> - diff --git a/interface/web/help/lib/lang/cz_faq_manage_questions_list.lng b/interface/web/help/lib/lang/cz_faq_manage_questions_list.lng index 7a4a2fd3ad..a9488445ca 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,4 +7,3 @@ $wb['faq_sections_txt'] = 'Sekce'; $wb['faq_faq_questions_txt'] = 'Často kladené dotazy'; $wb['faq_new_question_txt'] = 'Přidat nový dotaz'; ?> - diff --git a/interface/web/help/lib/lang/cz_help_faq_list.lng b/interface/web/help/lib/lang/cz_help_faq_list.lng index db89761959..b6c7b460b9 100644 --- a/interface/web/help/lib/lang/cz_help_faq_list.lng +++ b/interface/web/help/lib/lang/cz_help_faq_list.lng @@ -1,4 +1,3 @@ - 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 596a9ef69b..967b0abfcd 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,4 +6,3 @@ $wb['faq_sections_txt'] = 'Sekce'; $wb['faq_faq_sections_txt'] = 'Sekce FAQ'; $wb['faq_new_section_txt'] = 'Přidat novou sekci'; ?> - diff --git a/interface/web/help/lib/lang/cz_support_message.lng b/interface/web/help/lib/lang/cz_support_message.lng index 6bb28fe375..6c27284432 100644 --- a/interface/web/help/lib/lang/cz_support_message.lng +++ b/interface/web/help/lib/lang/cz_support_message.lng @@ -6,4 +6,3 @@ $wb['message_txt'] = 'Zpráva'; $wb['tstamp_txt'] = 'Časové razítko'; $wb['reply_txt'] = 'Odpovědět'; ?> - diff --git a/interface/web/help/lib/lang/cz_support_message_list.lng b/interface/web/help/lib/lang/cz_support_message_list.lng index 2d4c14c13a..8629a2f8a1 100644 --- a/interface/web/help/lib/lang/cz_support_message_list.lng +++ b/interface/web/help/lib/lang/cz_support_message_list.lng @@ -4,4 +4,3 @@ $wb['sender_id_txt'] = 'Odesílatel'; $wb['subject_txt'] = 'Předmět'; $wb['add_new_record_txt'] = 'Vytvořit zprávu pro podporu'; ?> - diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php index 600066b803..b1b2ef4984 100644 --- a/interface/web/js/scrigo.js.php +++ b/interface/web/js/scrigo.js.php @@ -149,7 +149,12 @@ function submitLoginForm(formname) { if(passwordObj.value == ''){ passwordObj.focus(); return; - } + } + + $('#dummy_username').val(userNameObj.value); + $('#dummy_passwort').val(passwordObj.value); + $('#dummy_login_form').submit(); + var submitFormObj = jQuery.ajax({ type: "POST", url: "content.php", data: jQuery('#'+formname).serialize(), diff --git a/interface/web/login/lib/lang/cz.lng b/interface/web/login/lib/lang/cz.lng index 06de3c6097..a89f5f32ef 100644 --- a/interface/web/login/lib/lang/cz.lng +++ b/interface/web/login/lib/lang/cz.lng @@ -22,4 +22,3 @@ $wb['pw_button_txt'] = 'Znovu odeslat heslo'; $wb['email_txt'] = 'E-mail'; $wb['theme_not_compatible'] = 'Zvolené téma není kompatibilní s aktuální verzí ISPConfig. Zkontrolujte prosím, zda není nová verze tématu.
Výchozí motiv byl aktivován automaticky.'; ?> - diff --git a/interface/web/login/lib/lang/de.lng b/interface/web/login/lib/lang/de.lng index 31d18efb6b..a6c66fe1d6 100644 --- a/interface/web/login/lib/lang/de.lng +++ b/interface/web/login/lib/lang/de.lng @@ -7,7 +7,7 @@ $wb['pass_reset_txt'] = 'Ein neues Passwort wird generiert und an die E-Mail Adr $wb['pw_reset'] = 'Das Passwort wurde zurückgesetzt und wird per E-Mail an Sie geschickt.'; $wb['pw_error'] = 'Benutzername oder E-Mail Adresse stimmen nicht überein.'; $wb['pw_error_noinput'] = 'Bitte geben Sie Ihre E-Mail Adresse und Ihren Benutzernamen ein.'; -$wb['pw_reset_mail_msg'] = 'Das Passwort wurde zurückgesetzt. Das neue Passwort lautet :'; +$wb['pw_reset_mail_msg'] = 'Das Passwort wurde zurückgesetzt. Das neue Passwort lautet: '; $wb['pw_reset_mail_title'] = 'Ihr Passwort wurde zurückgesetzt.'; $wb['user_regex_error'] = 'Benutzername beinhaltet nicht erlaubte Zeichen oder ist länger als 64 Zeichen.'; $wb['pw_error_length'] = 'Die Passwortlänge ist > 64 Zeichen.'; diff --git a/interface/web/mail/lib/lang/ar_mail_mailinglist.lng b/interface/web/mail/lib/lang/ar_mail_mailinglist.lng index 867dde8138..b4570ef863 100644 --- a/interface/web/mail/lib/lang/ar_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/ar_mail_mailinglist.lng @@ -18,4 +18,5 @@ $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; $wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.'; $wb['email_error_isemail'] = 'Email address is invalid.'; +$wb['mailinglist_txt'] = 'Mailing list'; ?> diff --git a/interface/web/mail/lib/lang/bg_mail_mailinglist.lng b/interface/web/mail/lib/lang/bg_mail_mailinglist.lng index d8ac6bf9d6..94513d95d2 100644 --- a/interface/web/mail/lib/lang/bg_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/bg_mail_mailinglist.lng @@ -18,4 +18,5 @@ $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; $wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.'; $wb['email_error_isemail'] = 'Email address is invalid.'; +$wb['mailinglist_txt'] = 'Mailing list'; ?> diff --git a/interface/web/mail/lib/lang/br_mail_mailinglist.lng b/interface/web/mail/lib/lang/br_mail_mailinglist.lng index 867dde8138..b4570ef863 100644 --- a/interface/web/mail/lib/lang/br_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/br_mail_mailinglist.lng @@ -18,4 +18,5 @@ $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; $wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.'; $wb['email_error_isemail'] = 'Email address is invalid.'; +$wb['mailinglist_txt'] = 'Mailing list'; ?> diff --git a/interface/web/mail/lib/lang/cz.lng b/interface/web/mail/lib/lang/cz.lng index a1dab14d91..6a5afe0685 100644 --- a/interface/web/mail/lib/lang/cz.lng +++ b/interface/web/mail/lib/lang/cz.lng @@ -46,4 +46,3 @@ $wb['Relay Recipients'] = 'Relay adresáti'; $wb['Statistics'] = 'Statistiky'; $wb['Mailbox quota'] = 'Mailbox kvóta'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_alias.lng b/interface/web/mail/lib/lang/cz_mail_alias.lng index 119b849739..605e06b3c8 100644 --- a/interface/web/mail/lib/lang/cz_mail_alias.lng +++ b/interface/web/mail/lib/lang/cz_mail_alias.lng @@ -12,4 +12,3 @@ $wb['domain_txt'] = 'Doména'; $wb['duplicate_email_alias_txt'] = 'Tento e-mail alias již existuje.'; $wb['source_txt'] = 'Alias'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_alias_list.lng b/interface/web/mail/lib/lang/cz_mail_alias_list.lng index db4fb4f8c7..de8cc2ef2a 100644 --- a/interface/web/mail/lib/lang/cz_mail_alias_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_alias_list.lng @@ -6,4 +6,3 @@ $wb['destination_txt'] = 'Cíl'; $wb['email_txt'] = 'E-mail'; $wb['add_new_record_txt'] = 'Přidat nový e-mailový alias'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng b/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng index 7c74fb6edf..74611c2de0 100644 --- a/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng +++ b/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng @@ -9,4 +9,3 @@ $wb['source_error_empty'] = 'Zdrojová doména je prázdná.'; $wb['source_error_unique'] = 'Duplikování zdrojové domény.'; $wb['source_error_regex'] = 'Chybná zdrojová doména.'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng index 155a87a7ba..fd850d6f5f 100644 --- a/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng @@ -5,4 +5,3 @@ $wb['source_txt'] = 'Zdroj'; $wb['destination_txt'] = 'Cíl'; $wb['add_new_record_txt'] = 'Přidat doménový alias'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_blacklist.lng b/interface/web/mail/lib/lang/cz_mail_blacklist.lng index 93978c72f6..e1e6dab48f 100644 --- a/interface/web/mail/lib/lang/cz_mail_blacklist.lng +++ b/interface/web/mail/lib/lang/cz_mail_blacklist.lng @@ -7,4 +7,3 @@ $wb['source_error_notempty'] = 'Adresa je prázdná.'; $wb['type_txt'] = 'Typ'; $wb['limit_mailfilter_txt'] = 'Dosažen maximální počet email filtrů pro Váš účet.'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng b/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng index 2e0c37b63b..0ef1d3417c 100644 --- a/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng @@ -8,4 +8,3 @@ $wb['recipient_txt'] = 'Příjemce (adresát)'; $wb['add_new_record_txt'] = 'Přidat záznam na černou listinu'; $wb['access_txt'] = 'Přístup'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_content_filter.lng b/interface/web/mail/lib/lang/cz_mail_content_filter.lng index 240de670e3..459ca228a2 100644 --- a/interface/web/mail/lib/lang/cz_mail_content_filter.lng +++ b/interface/web/mail/lib/lang/cz_mail_content_filter.lng @@ -7,4 +7,3 @@ $wb['action_txt'] = 'Akce'; $wb['active_txt'] = 'Aktivní'; $wb['pattern_error_empty'] = 'Vzor je prázdný.'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_content_filter_list.lng b/interface/web/mail/lib/lang/cz_mail_content_filter_list.lng index 68acaf780c..da9709e7f9 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,4 +6,3 @@ $wb['pattern_txt'] = 'Vzor'; $wb['action_txt'] = 'Akce'; $wb['add_new_record_txt'] = 'Přidat obsahový filtr'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_domain.lng b/interface/web/mail/lib/lang/cz_mail_domain.lng index d497e0502a..026a2f1d27 100644 --- a/interface/web/mail/lib/lang/cz_mail_domain.lng +++ b/interface/web/mail/lib/lang/cz_mail_domain.lng @@ -11,4 +11,3 @@ $wb['limit_maildomain_txt'] = 'Dosažen maximální počet email domén pro Vá $wb['policy_txt'] = 'Spamový filtr'; $wb['no_policy'] = '- nepovoleno -'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng index 8277ec4848..b579d2de08 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,4 +6,3 @@ $wb['add_new_record_txt'] = 'Přidat doménu'; $wb['active_txt'] = 'Aktivní'; $wb['sys_groupid_txt'] = 'Klient'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng b/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng index 635091c425..488d0d5176 100644 --- a/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng +++ b/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng @@ -9,4 +9,3 @@ $wb['limit_mailcatchall_txt'] = 'Dosažen maximální počet košů účtů pro $wb['source_txt'] = 'Zdroj'; $wb['destination_error_isemail'] = 'Cílová e-mailová adresa není platná.'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng index 7fd14a7adf..3b24645ec8 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,4 +7,3 @@ $wb['server_id_txt'] = 'Server'; $wb['domain_txt'] = 'E-malová doména'; $wb['add_new_record_txt'] = 'Přidat e-mailový koš'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_domain_list.lng b/interface/web/mail/lib/lang/cz_mail_domain_list.lng index 141e9e87d3..2abb05cf74 100644 --- a/interface/web/mail/lib/lang/cz_mail_domain_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_domain_list.lng @@ -5,4 +5,3 @@ $wb['domain_txt'] = 'Doména'; $wb['add_new_record_txt'] = 'Přidat doménu'; $wb['active_txt'] = 'Aktivní'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_forward.lng b/interface/web/mail/lib/lang/cz_mail_forward.lng index 849ff1bca2..a59bd9b52b 100644 --- a/interface/web/mail/lib/lang/cz_mail_forward.lng +++ b/interface/web/mail/lib/lang/cz_mail_forward.lng @@ -7,4 +7,3 @@ $wb['duplicate_mailbox_txt'] = 'Mailbox s touto adresou již existuje'; $wb['domain_txt'] = 'Doména'; $wb['source_txt'] = 'Zdrojový e-mail'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_forward_list.lng b/interface/web/mail/lib/lang/cz_mail_forward_list.lng index 6cf1f88ca4..e5381fe5f8 100644 --- a/interface/web/mail/lib/lang/cz_mail_forward_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_forward_list.lng @@ -6,4 +6,3 @@ $wb['destination_txt'] = 'Cíl'; $wb['email_txt'] = 'E-mail'; $wb['add_new_record_txt'] = 'Přidat nové přesměrování'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_get.lng b/interface/web/mail/lib/lang/cz_mail_get.lng index b73ddfddb6..51b9f3403e 100644 --- a/interface/web/mail/lib/lang/cz_mail_get.lng +++ b/interface/web/mail/lib/lang/cz_mail_get.lng @@ -16,4 +16,3 @@ $wb['source_server_error_regex'] = 'POP3/IMAP server není validní doménový n $wb['source_read_all_txt'] = 'Načíst všechny e-maily (včetně již přečtené pošty)'; $wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_get_list.lng b/interface/web/mail/lib/lang/cz_mail_get_list.lng index 55df9d27d7..9ca8b86dcb 100644 --- a/interface/web/mail/lib/lang/cz_mail_get_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_get_list.lng @@ -7,4 +7,3 @@ $wb['source_username_txt'] = 'Uživatelské jméno'; $wb['destination_txt'] = 'Cíl'; $wb['add_new_record_txt'] = 'Přidat účet'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_mailinglist.lng b/interface/web/mail/lib/lang/cz_mail_mailinglist.lng index 0123bc7955..2d2278526e 100644 --- a/interface/web/mail/lib/lang/cz_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/cz_mail_mailinglist.lng @@ -18,5 +18,5 @@ $wb['password_mismatch_txt'] = 'Hesla se neshodují.'; $wb['password_match_txt'] = 'Hesla se shodují.'; $wb['listname_error_unique'] = 'Na serveru je již shodný \\"název seznamu\\". Prosím, vyberte si jiný \\"název seznamu\\".'; $wb['email_error_isemail'] = 'E-mailová adresa je neplatná.'; +$wb['mailinglist_txt'] = 'Mailing list'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng b/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng index abd9737338..db31273f59 100644 --- a/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng @@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'E-mailové konference'; $wb['domain_txt'] = 'Doména'; $wb['listname_txt'] = 'Název seznamu'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng b/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng index 597f6405c5..0c07059c34 100644 --- a/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng +++ b/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng @@ -7,4 +7,3 @@ $wb['source_error_notempty'] = 'Adresa je prázdná.'; $wb['type_txt'] = 'Typ'; $wb['limit_mailfilter_txt'] = 'Dosažen maximální počet email filtrů pro Váš účet.'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng index 19f46821f3..1af959966c 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,4 +7,3 @@ $wb['recipient_txt'] = 'Příjemce (adresát)'; $wb['add_new_record_txt'] = 'Přidat relay adresáta'; $wb['access_txt'] = 'Přístup'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_spamfilter.lng b/interface/web/mail/lib/lang/cz_mail_spamfilter.lng index b538ad044a..4b6cc2b5d8 100644 --- a/interface/web/mail/lib/lang/cz_mail_spamfilter.lng +++ b/interface/web/mail/lib/lang/cz_mail_spamfilter.lng @@ -15,4 +15,3 @@ $wb['email_error_unique'] = 'Pro tuto email adresu již existuje filtrovací zá $wb['spam_redirect_maildir_purge_txt'] = 'Vyčistit poté mailový adresář'; $wb['days_txt'] = 'Dny.'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng index fa5924f2bd..7560b570da 100644 --- a/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng @@ -6,4 +6,3 @@ $wb['server_name_txt'] = 'server_name'; $wb['email_txt'] = 'E-mail'; $wb['add_new_record_txt'] = 'Přidat nový záznam spamfiltru'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_transport.lng b/interface/web/mail/lib/lang/cz_mail_transport.lng index a00d33f880..dfe1855084 100644 --- a/interface/web/mail/lib/lang/cz_mail_transport.lng +++ b/interface/web/mail/lib/lang/cz_mail_transport.lng @@ -9,4 +9,3 @@ $wb['active_txt'] = 'Aktivní'; $wb['limit_mailrouting_txt'] = 'Dosažen maximální počet email směrování pro Váš účet.'; $wb['transport_txt'] = 'Transport'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_transport_list.lng b/interface/web/mail/lib/lang/cz_mail_transport_list.lng index 584e329adb..e833293a2f 100644 --- a/interface/web/mail/lib/lang/cz_mail_transport_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_transport_list.lng @@ -7,4 +7,3 @@ $wb['transport_txt'] = 'Transport'; $wb['sort_order_txt'] = 'Třídit podle'; $wb['add_new_record_txt'] = 'Přidat transport'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_user.lng b/interface/web/mail/lib/lang/cz_mail_user.lng index a390b5fa97..2c441f2aba 100644 --- a/interface/web/mail/lib/lang/cz_mail_user.lng +++ b/interface/web/mail/lib/lang/cz_mail_user.lng @@ -48,4 +48,3 @@ $wb['repeat_password_txt'] = 'Opakujte heslo'; $wb['password_mismatch_txt'] = 'Hesla se neshodují.'; $wb['password_match_txt'] = 'Hesla se shodují.'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_user_filter.lng b/interface/web/mail/lib/lang/cz_mail_user_filter.lng index 0fdd4ba147..6cd8ed7e89 100644 --- a/interface/web/mail/lib/lang/cz_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/cz_mail_user_filter.lng @@ -18,4 +18,3 @@ $wb['ends_with_txt'] = 'Končí na'; $wb['move_to_txt'] = 'Přesunout do'; $wb['delete_txt'] = 'Smazat'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_user_filter_list.lng b/interface/web/mail/lib/lang/cz_mail_user_filter_list.lng index f5de2b289b..60229ce3b5 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,4 +5,3 @@ $wb['page_txt'] = 'Stránka'; $wb['page_of_txt'] = 'z'; $wb['delete_confirmation'] = 'Opravdu smazat mailový filtr?'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_user_list.lng b/interface/web/mail/lib/lang/cz_mail_user_list.lng index b4adbdb5d1..e6dfd006ed 100644 --- a/interface/web/mail/lib/lang/cz_mail_user_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_user_list.lng @@ -6,4 +6,3 @@ $wb['add_new_record_txt'] = 'Přidat e-mailovou schránku'; $wb['name_txt'] = 'Skutečný název'; $wb['login_txt'] = 'Přihlášení'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_user_stats_list.lng b/interface/web/mail/lib/lang/cz_mail_user_stats_list.lng index 9c7602dc38..50cbc31d5c 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,4 +6,3 @@ $wb['last_month_txt'] = 'Minulý měsíc'; $wb['this_year_txt'] = 'Tento rok'; $wb['last_year_txt'] = 'Minulý rok'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_whitelist.lng b/interface/web/mail/lib/lang/cz_mail_whitelist.lng index 31dfd7574d..db55c18a0b 100644 --- a/interface/web/mail/lib/lang/cz_mail_whitelist.lng +++ b/interface/web/mail/lib/lang/cz_mail_whitelist.lng @@ -7,4 +7,3 @@ $wb['source_error_notempty'] = 'Adresa je prázdná.'; $wb['type_txt'] = 'Typ'; $wb['limit_mailfilter_txt'] = 'Dosažen maximální počet email filtrů pro Váš účet.'; ?> - diff --git a/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng b/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng index bab30222ff..7fae368999 100644 --- a/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng @@ -8,4 +8,3 @@ $wb['recipient_txt'] = 'Příjemce (adresát)'; $wb['add_new_record_txt'] = 'Přidat záznam na bílou listinu'; $wb['access_txt'] = 'Přístup'; ?> - diff --git a/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng index 2b929082c7..5e0c6b7799 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng @@ -7,4 +7,3 @@ $wb['priority_txt'] = 'Priorita'; $wb['active_txt'] = 'Aktivní'; $wb['limit_spamfilter_wblist_txt'] = 'Dosažen maximální počet záznamů pro bílou / černou listinu pro Váš účet.'; ?> - diff --git a/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng index f0f021432a..83a732d6f3 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng @@ -7,4 +7,3 @@ $wb['rid_txt'] = 'Uživatel'; $wb['email_txt'] = 'Emaily na černé listině'; $wb['add_new_record_txt'] = 'Přidat záznam na černou listinu'; ?> - diff --git a/interface/web/mail/lib/lang/cz_spamfilter_config.lng b/interface/web/mail/lib/lang/cz_spamfilter_config.lng index 7eae43eb2b..0f878cc7d8 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_config.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_config.lng @@ -18,4 +18,3 @@ $wb['relayhost_password_txt'] = 'Relayhost heslo'; $wb['mailbox_size_limit_txt'] = 'Limit velikosti e-mailové schránky'; $wb['message_size_limit_txt'] = 'Limit velikosti zprávy'; ?> - diff --git a/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng index 348fe9b0e5..fe2ee8d51c 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng @@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'Konfigurace serveru'; $wb['server_name_txt'] = 'Server'; $wb['server_id_txt'] = 'server_id'; ?> - diff --git a/interface/web/mail/lib/lang/cz_spamfilter_policy.lng b/interface/web/mail/lib/lang/cz_spamfilter_policy.lng index 826050fc5e..54d0155d74 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_policy.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_policy.lng @@ -36,4 +36,3 @@ $wb['spam_admin_txt'] = 'SPAM admin'; $wb['message_size_limit_txt'] = 'Limit velikosti zprávy'; $wb['banned_rulenames_txt'] = 'Název pravidel zabanované'; ?> - diff --git a/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng index 0ff38e1091..9a0c361997 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng @@ -7,4 +7,3 @@ $wb['banned_files_lover_txt'] = 'Zabanované soubory'; $wb['bad_header_lover_txt'] = 'Špatné hlavičky'; $wb['add_new_record_txt'] = 'Přidat záznam politiky'; ?> - diff --git a/interface/web/mail/lib/lang/cz_spamfilter_users.lng b/interface/web/mail/lib/lang/cz_spamfilter_users.lng index 1514aa1c87..914304c58b 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_users.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_users.lng @@ -6,4 +6,3 @@ $wb['email_txt'] = 'Email (vzor)'; $wb['fullname_txt'] = 'Název'; $wb['local_txt'] = 'Lokální'; ?> - diff --git a/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng index f4dd015aa6..36bf3409e3 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng @@ -8,4 +8,3 @@ $wb['fullname_txt'] = 'Jméno'; $wb['email_txt'] = 'E-mail'; $wb['add_new_record_txt'] = 'Přidat spamfiltr uživatele'; ?> - diff --git a/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng index 2b929082c7..5e0c6b7799 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng @@ -7,4 +7,3 @@ $wb['priority_txt'] = 'Priorita'; $wb['active_txt'] = 'Aktivní'; $wb['limit_spamfilter_wblist_txt'] = 'Dosažen maximální počet záznamů pro bílou / černou listinu pro Váš účet.'; ?> - diff --git a/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng index 65ac33365c..ad13897004 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng @@ -7,4 +7,3 @@ $wb['rid_txt'] = 'Uživatel'; $wb['email_txt'] = 'Emaily na bílé listině'; $wb['add_new_record_txt'] = 'Přidat záznam na bílou listinu'; ?> - diff --git a/interface/web/mail/lib/lang/cz_user_quota_stats_list.lng b/interface/web/mail/lib/lang/cz_user_quota_stats_list.lng index 6bd35cafff..c8b73a9e8e 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,4 +5,3 @@ $wb['name_txt'] = 'Jméno'; $wb['email_txt'] = 'E-mailová adresa'; $wb['used_txt'] = 'Využité místo'; ?> - diff --git a/interface/web/mail/lib/lang/de.lng b/interface/web/mail/lib/lang/de.lng index 92ef42ce91..91418972dd 100644 --- a/interface/web/mail/lib/lang/de.lng +++ b/interface/web/mail/lib/lang/de.lng @@ -44,5 +44,5 @@ $wb['Content Filter'] = 'Inhaltsfilter'; $wb['Global Filters'] = 'Globale Filter'; $wb['Domain Alias'] = 'E-Mail Domain Alias'; $wb['Relay Recipients'] = 'Relay Empfänger'; -$wb['Mailbox quota'] = 'Mailbox Speichernutzung'; +$wb['Mailbox quota'] = 'E-Mail Konto Speichernutzung'; ?> diff --git a/interface/web/mail/lib/lang/de_mail_alias.lng b/interface/web/mail/lib/lang/de_mail_alias.lng index 83a1fdf46f..c11499effa 100644 --- a/interface/web/mail/lib/lang/de_mail_alias.lng +++ b/interface/web/mail/lib/lang/de_mail_alias.lng @@ -7,7 +7,7 @@ $wb['email_error_unique'] = 'Doppelte E-Mail Adresse.'; $wb['no_domain_perm'] = 'Sie haben keine Berechtigung für diese Domain.'; $wb['destination_error_isemail'] = 'Zieladresse ist ungültig.'; $wb['limit_mailalias_txt'] = 'Die maximale Anzahl an E-Mail Aliasen für Ihr Konto wurde erreicht.'; -$wb['duplicate_mailbox_txt'] = 'Es existiert bereits eineE-Mail Konto mit dieser E-Mail Adresse.'; +$wb['duplicate_mailbox_txt'] = 'Es existiert bereits eine E-Mail Konto mit dieser E-Mail Adresse.'; $wb['domain_txt'] = 'Domain'; $wb['duplicate_email_alias_txt'] = 'Dieser E-Mail Alias existiert bereits.'; $wb['source_txt'] = 'Alias'; diff --git a/interface/web/mail/lib/lang/de_mail_mailinglist.lng b/interface/web/mail/lib/lang/de_mail_mailinglist.lng index acb13b13fa..1d143b690c 100644 --- a/interface/web/mail/lib/lang/de_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/de_mail_mailinglist.lng @@ -18,4 +18,5 @@ $wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; $wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; $wb['listname_error_unique'] = 'Es beseht bereits eine Mailingliste mit diesem Namen auf dem Serverr. Bitte verwenden Sie einen anderen Mailinglistennamen.'; $wb['email_error_isemail'] = 'Die E-Mail Adresse ist falsch.'; +$wb['mailinglist_txt'] = 'Mailingliste'; ?> diff --git a/interface/web/mail/lib/lang/el_mail_mailinglist.lng b/interface/web/mail/lib/lang/el_mail_mailinglist.lng index 4a749fe70a..1942ea5a5b 100644 --- a/interface/web/mail/lib/lang/el_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/el_mail_mailinglist.lng @@ -18,4 +18,5 @@ $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; $wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.'; $wb['email_error_isemail'] = 'Email address is invalid.'; +$wb['mailinglist_txt'] = 'Mailing list'; ?> diff --git a/interface/web/mail/lib/lang/es_mail_mailinglist.lng b/interface/web/mail/lib/lang/es_mail_mailinglist.lng index 7d4ea9fa9c..6f1f333b5a 100644 --- a/interface/web/mail/lib/lang/es_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/es_mail_mailinglist.lng @@ -18,4 +18,5 @@ $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; $wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.'; $wb['email_error_isemail'] = 'Email address is invalid.'; +$wb['mailinglist_txt'] = 'Mailing list'; ?> diff --git a/interface/web/mail/lib/lang/fi_mail_mailinglist.lng b/interface/web/mail/lib/lang/fi_mail_mailinglist.lng index 867dde8138..b4570ef863 100644 --- a/interface/web/mail/lib/lang/fi_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/fi_mail_mailinglist.lng @@ -18,4 +18,5 @@ $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; $wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.'; $wb['email_error_isemail'] = 'Email address is invalid.'; +$wb['mailinglist_txt'] = 'Mailing list'; ?> diff --git a/interface/web/mail/lib/lang/fr_mail_mailinglist.lng b/interface/web/mail/lib/lang/fr_mail_mailinglist.lng index 07834b1d96..c9ae61945f 100644 --- a/interface/web/mail/lib/lang/fr_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/fr_mail_mailinglist.lng @@ -18,4 +18,5 @@ $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; $wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.'; $wb['email_error_isemail'] = 'Email address is invalid.'; +$wb['mailinglist_txt'] = 'Mailing list'; ?> diff --git a/interface/web/mail/lib/lang/hr_mail_mailinglist.lng b/interface/web/mail/lib/lang/hr_mail_mailinglist.lng index 09c5507f52..361af68e39 100644 --- a/interface/web/mail/lib/lang/hr_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/hr_mail_mailinglist.lng @@ -18,4 +18,5 @@ $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; $wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.'; $wb['email_error_isemail'] = 'Email address is invalid.'; +$wb['mailinglist_txt'] = 'Mailing list'; ?> diff --git a/interface/web/mail/lib/lang/hu_mail_mailinglist.lng b/interface/web/mail/lib/lang/hu_mail_mailinglist.lng index 867dde8138..b4570ef863 100644 --- a/interface/web/mail/lib/lang/hu_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/hu_mail_mailinglist.lng @@ -18,4 +18,5 @@ $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; $wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.'; $wb['email_error_isemail'] = 'Email address is invalid.'; +$wb['mailinglist_txt'] = 'Mailing list'; ?> diff --git a/interface/web/mail/lib/lang/id_mail_mailinglist.lng b/interface/web/mail/lib/lang/id_mail_mailinglist.lng index 867dde8138..b4570ef863 100644 --- a/interface/web/mail/lib/lang/id_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/id_mail_mailinglist.lng @@ -18,4 +18,5 @@ $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; $wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.'; $wb['email_error_isemail'] = 'Email address is invalid.'; +$wb['mailinglist_txt'] = 'Mailing list'; ?> diff --git a/interface/web/mail/lib/lang/it_mail_mailinglist.lng b/interface/web/mail/lib/lang/it_mail_mailinglist.lng index 867dde8138..b4570ef863 100644 --- a/interface/web/mail/lib/lang/it_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/it_mail_mailinglist.lng @@ -18,4 +18,5 @@ $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; $wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.'; $wb['email_error_isemail'] = 'Email address is invalid.'; +$wb['mailinglist_txt'] = 'Mailing list'; ?> diff --git a/interface/web/mail/lib/lang/ja_mail_mailinglist.lng b/interface/web/mail/lib/lang/ja_mail_mailinglist.lng index 867dde8138..b4570ef863 100644 --- a/interface/web/mail/lib/lang/ja_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/ja_mail_mailinglist.lng @@ -18,4 +18,5 @@ $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; $wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.'; $wb['email_error_isemail'] = 'Email address is invalid.'; +$wb['mailinglist_txt'] = 'Mailing list'; ?> diff --git a/interface/web/mail/lib/lang/nl_mail_mailinglist.lng b/interface/web/mail/lib/lang/nl_mail_mailinglist.lng index 867dde8138..b4570ef863 100644 --- a/interface/web/mail/lib/lang/nl_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/nl_mail_mailinglist.lng @@ -18,4 +18,5 @@ $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; $wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.'; $wb['email_error_isemail'] = 'Email address is invalid.'; +$wb['mailinglist_txt'] = 'Mailing list'; ?> diff --git a/interface/web/mail/lib/lang/pl_mail_mailinglist.lng b/interface/web/mail/lib/lang/pl_mail_mailinglist.lng index 074f72344b..cd622ad007 100644 --- a/interface/web/mail/lib/lang/pl_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/pl_mail_mailinglist.lng @@ -18,4 +18,5 @@ $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; $wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.'; $wb['email_error_isemail'] = 'Email address is invalid.'; +$wb['mailinglist_txt'] = 'Mailing list'; ?> diff --git a/interface/web/mail/lib/lang/pt_mail_mailinglist.lng b/interface/web/mail/lib/lang/pt_mail_mailinglist.lng index 867dde8138..b4570ef863 100644 --- a/interface/web/mail/lib/lang/pt_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/pt_mail_mailinglist.lng @@ -18,4 +18,5 @@ $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; $wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.'; $wb['email_error_isemail'] = 'Email address is invalid.'; +$wb['mailinglist_txt'] = 'Mailing list'; ?> diff --git a/interface/web/mail/lib/lang/ro_mail_mailinglist.lng b/interface/web/mail/lib/lang/ro_mail_mailinglist.lng index 867dde8138..b4570ef863 100644 --- a/interface/web/mail/lib/lang/ro_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/ro_mail_mailinglist.lng @@ -18,4 +18,5 @@ $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; $wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.'; $wb['email_error_isemail'] = 'Email address is invalid.'; +$wb['mailinglist_txt'] = 'Mailing list'; ?> diff --git a/interface/web/mail/lib/lang/ru_mail_mailinglist.lng b/interface/web/mail/lib/lang/ru_mail_mailinglist.lng index 867dde8138..b4570ef863 100644 --- a/interface/web/mail/lib/lang/ru_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/ru_mail_mailinglist.lng @@ -18,4 +18,5 @@ $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; $wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.'; $wb['email_error_isemail'] = 'Email address is invalid.'; +$wb['mailinglist_txt'] = 'Mailing list'; ?> diff --git a/interface/web/mail/lib/lang/se_mail_mailinglist.lng b/interface/web/mail/lib/lang/se_mail_mailinglist.lng index 867dde8138..b4570ef863 100644 --- a/interface/web/mail/lib/lang/se_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/se_mail_mailinglist.lng @@ -18,4 +18,5 @@ $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; $wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.'; $wb['email_error_isemail'] = 'Email address is invalid.'; +$wb['mailinglist_txt'] = 'Mailing list'; ?> diff --git a/interface/web/mail/lib/lang/sk_mail_mailinglist.lng b/interface/web/mail/lib/lang/sk_mail_mailinglist.lng index 867dde8138..b4570ef863 100644 --- a/interface/web/mail/lib/lang/sk_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/sk_mail_mailinglist.lng @@ -18,4 +18,5 @@ $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; $wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.'; $wb['email_error_isemail'] = 'Email address is invalid.'; +$wb['mailinglist_txt'] = 'Mailing list'; ?> diff --git a/interface/web/mail/lib/lang/tr_mail_mailinglist.lng b/interface/web/mail/lib/lang/tr_mail_mailinglist.lng index 867dde8138..b4570ef863 100644 --- a/interface/web/mail/lib/lang/tr_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/tr_mail_mailinglist.lng @@ -18,4 +18,5 @@ $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; $wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.'; $wb['email_error_isemail'] = 'Email address is invalid.'; +$wb['mailinglist_txt'] = 'Mailing list'; ?> diff --git a/interface/web/mailuser/lib/lang/cz.lng b/interface/web/mailuser/lib/lang/cz.lng index 4c947bd5f8..8b4b58bc42 100644 --- a/interface/web/mailuser/lib/lang/cz.lng +++ b/interface/web/mailuser/lib/lang/cz.lng @@ -7,4 +7,3 @@ $wb['Send copy'] = 'Poslat kopii na e-mail'; $wb['Spamfilter'] = 'Spamový filtr'; $wb['Email Filters'] = 'E-mailové filtry'; ?> - diff --git a/interface/web/mailuser/lib/lang/cz_index.lng b/interface/web/mailuser/lib/lang/cz_index.lng index cb39d65ad6..45af56ee8d 100644 --- a/interface/web/mailuser/lib/lang/cz_index.lng +++ b/interface/web/mailuser/lib/lang/cz_index.lng @@ -10,4 +10,3 @@ $wb['unlimited_txt'] = 'Neomezený'; $wb['mb_txt'] = 'MB'; $wb['none_txt'] = 'Nenastaveno'; ?> - diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng index 5ed9a1f46e..ef3aeb42da 100644 --- a/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng +++ b/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng @@ -11,4 +11,3 @@ $wb['autoresponder_active'] = 'Povolit automatický odpovídač'; $wb['now_txt'] = 'Nyní'; $wb['autoresponder_subject_txt'] = 'Předmět e-mailu'; ?> - diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng b/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng index ef00aa2365..36f11a9baa 100644 --- a/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng +++ b/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng @@ -5,4 +5,3 @@ $wb['email_txt'] = 'E-mail'; $wb['cc_error_isemail'] = 'Vyplněná e-mailová adresa neplatná'; $wb['email_is_cc_error'] = 'Vyplněná e-mailová adresa a poslat kopii na e-mail adresu, nemůžou být stejné.'; ?> - diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng b/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng index 60bd6642a2..3df9d38c72 100644 --- a/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng @@ -18,4 +18,3 @@ $wb['ends_with_txt'] = 'Končí na'; $wb['move_to_txt'] = 'Přesunout do'; $wb['delete_txt'] = 'Smazat'; ?> - diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng index c7198afa8e..3c2593d6d4 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,4 +6,3 @@ $wb['page_txt'] = 'Stránka'; $wb['page_of_txt'] = 'z'; $wb['delete_confirmation'] = 'Opravdu chcete odstranit e-mail filter?'; ?> - diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_password.lng b/interface/web/mailuser/lib/lang/cz_mail_user_password.lng index c28524026d..36555a2030 100644 --- a/interface/web/mailuser/lib/lang/cz_mail_user_password.lng +++ b/interface/web/mailuser/lib/lang/cz_mail_user_password.lng @@ -8,4 +8,3 @@ $wb['repeat_password_txt'] = 'Opakujte heslo'; $wb['password_mismatch_txt'] = 'Hesla se neshodují.'; $wb['password_match_txt'] = 'Hesla se shodují.'; ?> - diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng index 00720f859d..2a53036be6 100644 --- a/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng @@ -5,4 +5,3 @@ $wb['email_txt'] = 'E-mail'; $wb['no_policy'] = '- nepovoleno -'; $wb['policy_txt'] = 'Politika'; ?> - diff --git a/interface/web/mailuser/lib/lang/de.lng b/interface/web/mailuser/lib/lang/de.lng index 326c7495f0..b373d456a0 100644 --- a/interface/web/mailuser/lib/lang/de.lng +++ b/interface/web/mailuser/lib/lang/de.lng @@ -5,5 +5,5 @@ $wb['Password'] = 'Passwort'; $wb['Autoresponder'] = 'Autoresponder'; $wb['Send copy'] = 'Kopie senden an'; $wb['Spamfilter'] = 'Spamfilter'; -$wb['Email Filters'] = 'E-Mail Filter'; +$wb['Email Filters'] = 'E-Mailfilter'; ?> diff --git a/interface/web/mailuser/lib/lang/de_index.lng b/interface/web/mailuser/lib/lang/de_index.lng index 19ebf9db13..522ddbc8db 100644 --- a/interface/web/mailuser/lib/lang/de_index.lng +++ b/interface/web/mailuser/lib/lang/de_index.lng @@ -5,7 +5,7 @@ $wb['email_txt'] = 'E-Mail Adresse'; $wb['login_txt'] = 'Login'; $wb['server_address_txt'] = 'E-Mailserver Adresse'; $wb['cc_txt'] = 'Kopie senden an (CC)'; -$wb['quota_txt'] = 'E-Mail Kontogröße'; +$wb['quota_txt'] = 'E-Mailkonto Beschränkung'; $wb['unlimited_txt'] = 'Unlimitiert'; $wb['mb_txt'] = 'MB'; $wb['none_txt'] = 'Niemanden'; diff --git a/interface/web/mailuser/lib/lang/de_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/de_mail_user_filter_list.lng index d0be3c5601..9abd40d7e3 100644 --- a/interface/web/mailuser/lib/lang/de_mail_user_filter_list.lng +++ b/interface/web/mailuser/lib/lang/de_mail_user_filter_list.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/mailuser/lib/lang/de_mail_user_password.lng b/interface/web/mailuser/lib/lang/de_mail_user_password.lng index d9fdfe552b..5e5fe5e933 100644 --- a/interface/web/mailuser/lib/lang/de_mail_user_password.lng +++ b/interface/web/mailuser/lib/lang/de_mail_user_password.lng @@ -1,5 +1,5 @@ - diff --git a/interface/web/monitor/lib/lang/cz_datalog_list.lng b/interface/web/monitor/lib/lang/cz_datalog_list.lng index 29d8cbb448..c9e9a86555 100644 --- a/interface/web/monitor/lib/lang/cz_datalog_list.lng +++ b/interface/web/monitor/lib/lang/cz_datalog_list.lng @@ -6,4 +6,3 @@ $wb['dbtable_txt'] = 'DB tabulka'; $wb['action_txt'] = 'Akce'; $wb['status_txt'] = 'Stav'; ?> - diff --git a/interface/web/monitor/lib/lang/cz_syslog_list.lng b/interface/web/monitor/lib/lang/cz_syslog_list.lng index 864232ed0d..990662552b 100644 --- a/interface/web/monitor/lib/lang/cz_syslog_list.lng +++ b/interface/web/monitor/lib/lang/cz_syslog_list.lng @@ -5,4 +5,3 @@ $wb['server_id_txt'] = 'Server'; $wb['loglevel_txt'] = 'Logovací úroveň'; $wb['message_txt'] = 'Zpráva'; ?> - diff --git a/interface/web/monitor/lib/lang/de.lng b/interface/web/monitor/lib/lang/de.lng index 6a3083e13c..ff0b6459ec 100644 --- a/interface/web/monitor/lib/lang/de.lng +++ b/interface/web/monitor/lib/lang/de.lng @@ -56,7 +56,7 @@ $wb['monitor_diskusage_usage_txt'] = 'Verwendung in %'; $wb['monitor_diskusage_mounted_txt'] = 'gemountet unter'; $wb['monitor_logs_mail_txt'] = 'E-Mail Protokoll'; $wb['monitor_logs_mailwarn_txt'] = 'E-Mail Warnung Protokoll'; -$wb['monitor_logs_mailerr_txt'] = 'Mail Fehler Protokoll'; +$wb['monitor_logs_mailerr_txt'] = 'E-Mail Fehler Protokoll'; $wb['monitor_logs_messages_txt'] = 'Systemmeldungen Protokoll'; $wb['monitor_logs_ispccron_txt'] = 'Cron Protokoll'; $wb['monitor_logs_freshclam_txt'] = 'Freshclam Protokoll'; diff --git a/interface/web/sites/aps_cron_apscrawler_if.php b/interface/web/sites/aps_cron_apscrawler_if.php index b34b836e3f..d1e15cc963 100644 --- a/interface/web/sites/aps_cron_apscrawler_if.php +++ b/interface/web/sites/aps_cron_apscrawler_if.php @@ -28,7 +28,8 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ require_once('../../lib/config.inc.php'); -require_once('../../lib/app.inc.php'); +require_once('../../lib/app.inc.php'); + //require_once('classes/class.crawler.php'); $app->load('aps_crawler'); @@ -44,6 +45,7 @@ $app->log($log_prefix.'Used mem at begin: '.$aps->convertSize(memory_get_usage(t $time_start = microtime(true); $aps->startCrawler(); $aps->parseFolderToDB(); +$aps->fixURLs(); $time = microtime(true) - $time_start; $app->log($log_prefix.'Used mem at end: '.$aps->convertSize(memory_get_usage(true))); diff --git a/interface/web/sites/aps_install_package.php b/interface/web/sites/aps_install_package.php index be6012108e..b7bed71be3 100644 --- a/interface/web/sites/aps_install_package.php +++ b/interface/web/sites/aps_install_package.php @@ -37,7 +37,7 @@ $app->load('aps_guicontroller'); $app->auth->check_module_permissions('sites'); // Load needed classes -$app->uses('tpl'); +$app->uses('tpl,tform'); $app->tpl->newTemplate("form.tpl.htm"); $app->tpl->setInclude('content_tpl', 'templates/aps_install_package.htm'); @@ -47,6 +47,19 @@ require_once($lngfile); $app->tpl->setVar($wb); $app->load_language_file('web/sites/'.$lngfile); +// we will check only users, not admins +if($_SESSION["s"]["user"]["typ"] == 'user') { + $app->tform->formDef['db_table_idx'] = 'client_id'; + $app->tform->formDef['db_table'] = 'client'; + if(!$app->tform->checkClientLimit('limit_aps')) { + $app->error($app->lng("limit_aps_txt")); + } + if(!$app->tform->checkResellerLimit('limit_aps')) { + $app->error('Reseller: '.$wb["limit_aps_txt"]); + } +} + + $adminflag = ($_SESSION['s']['user']['typ'] == 'admin') ? true : false; $gui = new ApsGUIController($app); $pkg_id = (isset($_GET['id'])) ? $app->db->quote($_GET['id']) : ''; @@ -74,7 +87,7 @@ $domains = array(); $domain_for_user = ''; if(!$adminflag) $domain_for_user = "AND (sys_userid = '".$app->db->quote($_SESSION['s']['user']['userid'])."' OR sys_groupid = '".$app->db->quote($_SESSION['s']['user']['userid'])."' )"; -$domains_assoc = $app->db->queryAllRecords("SELECT domain FROM web_domain WHERE document_root != '' ".$domain_for_user." ORDER BY domain;"); +$domains_assoc = $app->db->queryAllRecords("SELECT domain FROM web_domain WHERE document_root != '' AND (type = 'vhost' OR type = 'vhostsubdomain') AND active = 'y' ".$domain_for_user." ORDER BY domain;"); if(!empty($domains_assoc)) foreach($domains_assoc as $domain) $domains[] = $domain['domain']; // If data has been submitted, validate it diff --git a/interface/web/sites/aps_update_packagelist.php b/interface/web/sites/aps_update_packagelist.php new file mode 100644 index 0000000000..10de873e64 --- /dev/null +++ b/interface/web/sites/aps_update_packagelist.php @@ -0,0 +1,57 @@ +auth->check_module_permissions('sites'); + +$app->uses('tpl'); + +$app->tpl->newTemplate('form.tpl.htm'); +$app->tpl->setInclude('content_tpl', 'templates/aps_update_packagelist.htm'); +$msg = ''; +$error = ''; + +//* load language file +$lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_aps_update_packagelist.lng'; +include($lng_file); +$app->tpl->setVar($wb); + + + +$app->tpl->setVar('msg',$msg); +$app->tpl->setVar('error',$error); + +$app->tpl_defaults(); +$app->tpl->pparse(); + + +?> \ No newline at end of file diff --git a/interface/web/sites/database_user_edit.php b/interface/web/sites/database_user_edit.php index 3444974954..50975a77f8 100644 --- a/interface/web/sites/database_user_edit.php +++ b/interface/web/sites/database_user_edit.php @@ -208,11 +208,15 @@ class page_action extends tform_actions { $client_group_id = $app->functions->intval($this->dataRecord["client_group_id"]); $app->db->query("UPDATE web_database_user SET sys_groupid = $client_group_id, sys_perm_group = 'riud' WHERE database_user_id = ".$this->id); } + + $password = $app->db->queryOneRecord("SELECT database_password FROM web_database_user WHERE database_user_id = ".$this->id); $records = $app->db->queryAllRecords("SELECT DISTINCT server_id FROM web_database WHERE database_user_id = '".$app->functions->intval($this->id)."' UNION SELECT DISTINCT server_id FROM web_database WHERE database_ro_user_id = '".$app->functions->intval($this->id)."'"); foreach($records as $rec) { $new_rec = $this->dataRecord; $new_rec['server_id'] = $rec['server_id']; + // Make sure to store the password in encrypted form in sys_datalog + $new_rec['database_password'] = $password['database_password']; $app->db->datalogSave('web_database_user', 'UPDATE', 'database_user_id', $this->id, $this->oldDataRecord, $new_rec); } unset($new_rec); diff --git a/interface/web/sites/form/web_aliasdomain.tform.php b/interface/web/sites/form/web_aliasdomain.tform.php index b7255c0cf8..e815034bda 100644 --- a/interface/web/sites/form/web_aliasdomain.tform.php +++ b/interface/web/sites/form/web_aliasdomain.tform.php @@ -40,7 +40,7 @@ $form["title"] = "Web Aliasdomain"; $form["description"] = ""; -$form["name"] = "web_domain"; +$form["name"] = "web_aliasdomain"; $form["action"] = "web_aliasdomain_edit.php"; $form["db_table"] = "web_domain"; $form["db_table_idx"] = "domain_id"; diff --git a/interface/web/sites/lib/lang/ar.lng b/interface/web/sites/lib/lang/ar.lng index bfd833292d..6ca61afae0 100644 --- a/interface/web/sites/lib/lang/ar.lng +++ b/interface/web/sites/lib/lang/ar.lng @@ -31,5 +31,5 @@ $wb['Available packages'] = 'Available packages'; $wb['Installed packages'] = 'Installed packages'; $wb['Update Packagelist'] = 'Update Packagelist'; $wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/ar_aps_update_packagelist.lng b/interface/web/sites/lib/lang/ar_aps_update_packagelist.lng new file mode 100644 index 0000000000..1a40a3394f --- /dev/null +++ b/interface/web/sites/lib/lang/ar_aps_update_packagelist.lng @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng b/interface/web/sites/lib/lang/ar_web_aliasdomain.lng index 0060ecaeab..4149c71149 100644 --- a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng +++ b/interface/web/sites/lib/lang/ar_web_aliasdomain.lng @@ -1,3 +1,115 @@ = 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; +$wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +$wb['Domain'] = 'Aliasdomain'; ?> diff --git a/interface/web/sites/lib/lang/ar_web_subdomain.lng b/interface/web/sites/lib/lang/ar_web_subdomain.lng index 61f5daf53c..fc21378f22 100644 --- a/interface/web/sites/lib/lang/ar_web_subdomain.lng +++ b/interface/web/sites/lib/lang/ar_web_subdomain.lng @@ -42,5 +42,5 @@ $wb['no_flag_txt'] = 'No flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; $wb['proxy_directives_txt'] = 'Proxy Directives'; $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/bg.lng b/interface/web/sites/lib/lang/bg.lng index 842b70ae02..0d28df2994 100644 --- a/interface/web/sites/lib/lang/bg.lng +++ b/interface/web/sites/lib/lang/bg.lng @@ -31,5 +31,5 @@ $wb['Available packages'] = 'Available packages'; $wb['Installed packages'] = 'Installed packages'; $wb['Update Packagelist'] = 'Update Packagelist'; $wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/bg_aps_update_packagelist.lng b/interface/web/sites/lib/lang/bg_aps_update_packagelist.lng new file mode 100644 index 0000000000..1a40a3394f --- /dev/null +++ b/interface/web/sites/lib/lang/bg_aps_update_packagelist.lng @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/interface/web/sites/lib/lang/bg_web_aliasdomain.lng b/interface/web/sites/lib/lang/bg_web_aliasdomain.lng index 0060ecaeab..4149c71149 100644 --- a/interface/web/sites/lib/lang/bg_web_aliasdomain.lng +++ b/interface/web/sites/lib/lang/bg_web_aliasdomain.lng @@ -1,3 +1,115 @@ = 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; +$wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +$wb['Domain'] = 'Aliasdomain'; ?> diff --git a/interface/web/sites/lib/lang/bg_web_subdomain.lng b/interface/web/sites/lib/lang/bg_web_subdomain.lng index 55489d93da..3beb3d2a5c 100644 --- a/interface/web/sites/lib/lang/bg_web_subdomain.lng +++ b/interface/web/sites/lib/lang/bg_web_subdomain.lng @@ -42,5 +42,5 @@ $wb['no_flag_txt'] = 'No flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; $wb['proxy_directives_txt'] = 'Proxy Directives'; $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/br.lng b/interface/web/sites/lib/lang/br.lng index bd710eb53a..6b7f0ef80f 100644 --- a/interface/web/sites/lib/lang/br.lng +++ b/interface/web/sites/lib/lang/br.lng @@ -31,5 +31,5 @@ $wb['Available packages'] = 'Available packages'; $wb['Installed packages'] = 'Installed packages'; $wb['Update Packagelist'] = 'Update Packagelist'; $wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/br_aps_update_packagelist.lng b/interface/web/sites/lib/lang/br_aps_update_packagelist.lng new file mode 100644 index 0000000000..1a40a3394f --- /dev/null +++ b/interface/web/sites/lib/lang/br_aps_update_packagelist.lng @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/interface/web/sites/lib/lang/br_web_aliasdomain.lng b/interface/web/sites/lib/lang/br_web_aliasdomain.lng index 0060ecaeab..4149c71149 100644 --- a/interface/web/sites/lib/lang/br_web_aliasdomain.lng +++ b/interface/web/sites/lib/lang/br_web_aliasdomain.lng @@ -1,3 +1,115 @@ = 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; +$wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +$wb['Domain'] = 'Aliasdomain'; ?> diff --git a/interface/web/sites/lib/lang/br_web_subdomain.lng b/interface/web/sites/lib/lang/br_web_subdomain.lng index 08608bf545..340735adfb 100644 --- a/interface/web/sites/lib/lang/br_web_subdomain.lng +++ b/interface/web/sites/lib/lang/br_web_subdomain.lng @@ -42,5 +42,5 @@ $wb['no_flag_txt'] = 'No flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; $wb['proxy_directives_txt'] = 'Proxy Directives'; $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/cz.lng b/interface/web/sites/lib/lang/cz.lng index 3a37df3f91..71ccd165f6 100644 --- a/interface/web/sites/lib/lang/cz.lng +++ b/interface/web/sites/lib/lang/cz.lng @@ -33,4 +33,3 @@ $wb['Update Packagelist'] = 'Aktualizace seznamu balíčků'; $wb['Subdomain (Vhost)'] = 'Subdoména (Vhost)'; $wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> - diff --git a/interface/web/sites/lib/lang/cz_aps.lng b/interface/web/sites/lib/lang/cz_aps.lng index 79f36f5cd6..be2d99eac4 100644 --- a/interface/web/sites/lib/lang/cz_aps.lng +++ b/interface/web/sites/lib/lang/cz_aps.lng @@ -55,4 +55,3 @@ $wb['packagelist_update_finished_txt'] = 'APS aktualizace seznamu balíčků dok $wb['btn_install_txt'] = 'Instalovat'; $wb['btn_cancel_txt'] = 'Zrušit'; ?> - 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 16e863ee9c..7b7b6dd6f0 100644 --- a/interface/web/sites/lib/lang/cz_aps_instances_list.lng +++ b/interface/web/sites/lib/lang/cz_aps_instances_list.lng @@ -11,4 +11,3 @@ $wb['filter_txt'] = 'Hledat'; $wb['delete_txt'] = 'Smazat'; $wb['reinstall_txt'] = 'Přeinstalovat'; ?> - diff --git a/interface/web/sites/lib/lang/cz_aps_packages_list.lng b/interface/web/sites/lib/lang/cz_aps_packages_list.lng index cf0d2b69d9..52ef6ebcd9 100644 --- a/interface/web/sites/lib/lang/cz_aps_packages_list.lng +++ b/interface/web/sites/lib/lang/cz_aps_packages_list.lng @@ -6,4 +6,3 @@ $wb['category_txt'] = 'Kategorie'; $wb['status_txt'] = 'Odemčený'; $wb['filter_txt'] = 'Hledat'; ?> - diff --git a/interface/web/sites/lib/lang/cz_aps_update_packagelist.lng b/interface/web/sites/lib/lang/cz_aps_update_packagelist.lng new file mode 100644 index 0000000000..1a40a3394f --- /dev/null +++ b/interface/web/sites/lib/lang/cz_aps_update_packagelist.lng @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/interface/web/sites/lib/lang/cz_cron.lng b/interface/web/sites/lib/lang/cz_cron.lng index 00017a5aef..d4e6c1767c 100644 --- a/interface/web/sites/lib/lang/cz_cron.lng +++ b/interface/web/sites/lib/lang/cz_cron.lng @@ -19,4 +19,3 @@ $wb['run_wday_error_format'] = 'Chybný formát pro dny týdne.'; $wb['command_error_format'] = 'Chybná formát příkazu. V případě URL je povoleno volání pouze http/https.'; $wb['unknown_fieldtype_error'] = 'Bylp použito pole neznámého typu.'; ?> - diff --git a/interface/web/sites/lib/lang/cz_cron_list.lng b/interface/web/sites/lib/lang/cz_cron_list.lng index dfabfa46ac..f50dee2faf 100644 --- a/interface/web/sites/lib/lang/cz_cron_list.lng +++ b/interface/web/sites/lib/lang/cz_cron_list.lng @@ -11,4 +11,3 @@ $wb['command_txt'] = 'Příkaz'; $wb['add_new_cron_txt'] = 'Přidat novou cron úlohu'; $wb['parent_domain_id_txt'] = 'Webové stránky'; ?> - diff --git a/interface/web/sites/lib/lang/cz_database.lng b/interface/web/sites/lib/lang/cz_database.lng index 39fe4838e7..c316f0ac97 100644 --- a/interface/web/sites/lib/lang/cz_database.lng +++ b/interface/web/sites/lib/lang/cz_database.lng @@ -42,5 +42,5 @@ $wb['optional_txt'] = 'Volitelný'; $wb['select_dbuser_txt'] = 'Vyberte uživatele databáze'; $wb['no_dbuser_txt'] = 'Žádný'; $wb['database_client_differs_txt'] = 'Klient mateřského webu a databáze se neshodují.'; +$wb['database_user_missing_txt'] = 'Please select a database user for this database.'; ?> - diff --git a/interface/web/sites/lib/lang/cz_database_admin_list.lng b/interface/web/sites/lib/lang/cz_database_admin_list.lng index fbf078975a..a0069404d8 100644 --- a/interface/web/sites/lib/lang/cz_database_admin_list.lng +++ b/interface/web/sites/lib/lang/cz_database_admin_list.lng @@ -8,4 +8,3 @@ $wb['database_name_txt'] = 'Jméno databáze'; $wb['add_new_record_txt'] = 'Přidat nové databáze'; $wb['sys_groupid_txt'] = 'Klient'; ?> - diff --git a/interface/web/sites/lib/lang/cz_database_list.lng b/interface/web/sites/lib/lang/cz_database_list.lng index 9cebca4506..9bb80dd945 100644 --- a/interface/web/sites/lib/lang/cz_database_list.lng +++ b/interface/web/sites/lib/lang/cz_database_list.lng @@ -7,4 +7,3 @@ $wb['database_user_txt'] = 'Uživatel databáze'; $wb['database_name_txt'] = 'Název databáze'; $wb['add_new_record_txt'] = 'Přidat databázi'; ?> - diff --git a/interface/web/sites/lib/lang/cz_database_user.lng b/interface/web/sites/lib/lang/cz_database_user.lng index 98f8d1527c..8a64cb5225 100644 --- a/interface/web/sites/lib/lang/cz_database_user.lng +++ b/interface/web/sites/lib/lang/cz_database_user.lng @@ -21,4 +21,3 @@ $wb['globalsearch_noresults_limit_txt'] = '0 výsledků'; $wb['globalsearch_searchfield_watermark_txt'] = 'Hledat'; $wb['globalsearch_suggestions_text_txt'] = 'Návrhy'; ?> - diff --git a/interface/web/sites/lib/lang/cz_database_user_admin_list.lng b/interface/web/sites/lib/lang/cz_database_user_admin_list.lng index 127be4f973..8703e713e1 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,4 +4,3 @@ $wb['database_user_txt'] = 'Uživatel databáze'; $wb['add_new_record_txt'] = 'Vytvořit nového uživatele databáze'; $wb['sys_groupid_txt'] = 'Klient'; ?> - diff --git a/interface/web/sites/lib/lang/cz_database_user_list.lng b/interface/web/sites/lib/lang/cz_database_user_list.lng index 5fc1fc39b5..42cf36d703 100644 --- a/interface/web/sites/lib/lang/cz_database_user_list.lng +++ b/interface/web/sites/lib/lang/cz_database_user_list.lng @@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'Uživatelé databáze'; $wb['database_user_txt'] = 'Uživatelé databáze'; $wb['add_new_record_txt'] = 'Přidat nového uživatele databáze'; ?> - diff --git a/interface/web/sites/lib/lang/cz_ftp_user.lng b/interface/web/sites/lib/lang/cz_ftp_user.lng index 494ecda153..876ad5108c 100644 --- a/interface/web/sites/lib/lang/cz_ftp_user.lng +++ b/interface/web/sites/lib/lang/cz_ftp_user.lng @@ -32,4 +32,3 @@ $wb['repeat_password_txt'] = 'Opakujte heslo'; $wb['password_mismatch_txt'] = 'Hesla se neshodují.'; $wb['password_match_txt'] = 'Hesla se shodují.'; ?> - diff --git a/interface/web/sites/lib/lang/cz_ftp_user_list.lng b/interface/web/sites/lib/lang/cz_ftp_user_list.lng index 965e1c7256..41649df7f9 100644 --- a/interface/web/sites/lib/lang/cz_ftp_user_list.lng +++ b/interface/web/sites/lib/lang/cz_ftp_user_list.lng @@ -6,4 +6,3 @@ $wb['parent_domain_id_txt'] = 'Webová stránka'; $wb['username_txt'] = 'Uživatelské jméno'; $wb['add_new_record_txt'] = 'Přidat FTP uživatele'; ?> - diff --git a/interface/web/sites/lib/lang/cz_shell_user.lng b/interface/web/sites/lib/lang/cz_shell_user.lng index 9ed78d8cfb..97b8a0d088 100644 --- a/interface/web/sites/lib/lang/cz_shell_user.lng +++ b/interface/web/sites/lib/lang/cz_shell_user.lng @@ -27,4 +27,3 @@ $wb['repeat_password_txt'] = 'Opakujte heslo'; $wb['password_mismatch_txt'] = 'Hesla se neshodují.'; $wb['password_match_txt'] = 'Hesla se shodují.'; ?> - diff --git a/interface/web/sites/lib/lang/cz_shell_user_list.lng b/interface/web/sites/lib/lang/cz_shell_user_list.lng index cdc729c9fe..1d6bc198d7 100644 --- a/interface/web/sites/lib/lang/cz_shell_user_list.lng +++ b/interface/web/sites/lib/lang/cz_shell_user_list.lng @@ -6,4 +6,3 @@ $wb['parent_domain_id_txt'] = 'Stránka'; $wb['username_txt'] = 'Uživatelské jméno'; $wb['add_new_record_txt'] = 'Přidat shell uživatele'; ?> - diff --git a/interface/web/sites/lib/lang/cz_user_quota_stats_list.lng b/interface/web/sites/lib/lang/cz_user_quota_stats_list.lng index 7c60624d3d..4531944549 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,4 +7,3 @@ $wb['hard_txt'] = 'Tvrdý limit'; $wb['soft_txt'] = 'Měkký limit'; $wb['files_txt'] = 'Jednotlivé soubory'; ?> - diff --git a/interface/web/sites/lib/lang/cz_web_aliasdomain.lng b/interface/web/sites/lib/lang/cz_web_aliasdomain.lng index b2ce8abd00..4149c71149 100644 --- a/interface/web/sites/lib/lang/cz_web_aliasdomain.lng +++ b/interface/web/sites/lib/lang/cz_web_aliasdomain.lng @@ -1,4 +1,115 @@ = 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; +$wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +$wb['Domain'] = 'Aliasdomain'; ?> - diff --git a/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng index a3ae2a954d..22a4ffe32f 100644 --- a/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng +++ b/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng @@ -12,4 +12,3 @@ $wb['no_redirect_txt'] = 'Žádné přesměrování'; $wb['no_flag_txt'] = 'Žádný příznak'; $wb['none_txt'] = 'Žádná'; ?> - diff --git a/interface/web/sites/lib/lang/cz_web_backup_list.lng b/interface/web/sites/lib/lang/cz_web_backup_list.lng index ae06162d72..3c9cfc8ef5 100644 --- a/interface/web/sites/lib/lang/cz_web_backup_list.lng +++ b/interface/web/sites/lib/lang/cz_web_backup_list.lng @@ -13,4 +13,3 @@ $wb['restore_pending_txt'] = 'There is already a pending backup restore job.'; $wb['backup_type_mysql'] = 'MySQL Database'; $wb['backup_type_web'] = 'Website files'; ?> - diff --git a/interface/web/sites/lib/lang/cz_web_domain.lng b/interface/web/sites/lib/lang/cz_web_domain.lng index 8ded370b15..604bdb6129 100644 --- a/interface/web/sites/lib/lang/cz_web_domain.lng +++ b/interface/web/sites/lib/lang/cz_web_domain.lng @@ -112,4 +112,3 @@ $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snipp $wb['proxy_directives_txt'] = 'Proxy Directives'; $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; ?> - diff --git a/interface/web/sites/lib/lang/cz_web_domain_admin_list.lng b/interface/web/sites/lib/lang/cz_web_domain_admin_list.lng index 4a20c10f55..e52a794428 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,4 +7,3 @@ $wb['server_id_txt'] = 'Server'; $wb['domain_txt'] = 'Doména'; $wb['add_new_record_txt'] = 'Přidat webovou stránku'; ?> - diff --git a/interface/web/sites/lib/lang/cz_web_domain_list.lng b/interface/web/sites/lib/lang/cz_web_domain_list.lng index 78296799a1..cbf025e79b 100644 --- a/interface/web/sites/lib/lang/cz_web_domain_list.lng +++ b/interface/web/sites/lib/lang/cz_web_domain_list.lng @@ -6,4 +6,3 @@ $wb['server_id_txt'] = 'Server'; $wb['domain_txt'] = 'Doména'; $wb['add_new_record_txt'] = 'Přidat webovou stránku'; ?> - diff --git a/interface/web/sites/lib/lang/cz_web_folder.lng b/interface/web/sites/lib/lang/cz_web_folder.lng index 0d1090f5a5..f9f623dc2b 100644 --- a/interface/web/sites/lib/lang/cz_web_folder.lng +++ b/interface/web/sites/lib/lang/cz_web_folder.lng @@ -5,4 +5,3 @@ $wb['path_txt'] = 'Cesta'; $wb['active_txt'] = 'Aktivní'; $wb['path_error_regex'] = 'Neplatná cesta ke složce.'; ?> - diff --git a/interface/web/sites/lib/lang/cz_web_folder_list.lng b/interface/web/sites/lib/lang/cz_web_folder_list.lng index 74b4d323c1..b75c0e80da 100644 --- a/interface/web/sites/lib/lang/cz_web_folder_list.lng +++ b/interface/web/sites/lib/lang/cz_web_folder_list.lng @@ -5,4 +5,3 @@ $wb['server_id_txt'] = 'Server'; $wb['parent_domain_id_txt'] = 'Webové stránky'; $wb['path_txt'] = 'Cesta'; ?> - diff --git a/interface/web/sites/lib/lang/cz_web_folder_user.lng b/interface/web/sites/lib/lang/cz_web_folder_user.lng index 61d32c8e52..48f426089a 100644 --- a/interface/web/sites/lib/lang/cz_web_folder_user.lng +++ b/interface/web/sites/lib/lang/cz_web_folder_user.lng @@ -10,4 +10,3 @@ $wb['repeat_password_txt'] = 'Opakujte heslo'; $wb['password_mismatch_txt'] = 'Hesla se neshodují.'; $wb['password_match_txt'] = 'Hesla se shodují.'; ?> - diff --git a/interface/web/sites/lib/lang/cz_web_folder_user_list.lng b/interface/web/sites/lib/lang/cz_web_folder_user_list.lng index c4621250b1..99fe62051c 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,4 +4,3 @@ $wb['active_txt'] = 'Aktivní'; $wb['web_folder_id_txt'] = 'Složka'; $wb['username_txt'] = 'Uživatelské jméno'; ?> - diff --git a/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng b/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng index a70ccfb9b7..ed93596824 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,4 +7,3 @@ $wb['this_year_txt'] = 'Tento rok'; $wb['last_year_txt'] = 'Minulý rok'; $wb['sum_txt'] = 'Součet'; ?> - diff --git a/interface/web/sites/lib/lang/cz_web_subdomain.lng b/interface/web/sites/lib/lang/cz_web_subdomain.lng index b40c927524..de1445f5de 100644 --- a/interface/web/sites/lib/lang/cz_web_subdomain.lng +++ b/interface/web/sites/lib/lang/cz_web_subdomain.lng @@ -44,4 +44,3 @@ $wb['proxy_directives_txt'] = 'Proxy Directives'; $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; $wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> - diff --git a/interface/web/sites/lib/lang/cz_web_subdomain_list.lng b/interface/web/sites/lib/lang/cz_web_subdomain_list.lng index d1ad2834fe..8a0bafe0f9 100644 --- a/interface/web/sites/lib/lang/cz_web_subdomain_list.lng +++ b/interface/web/sites/lib/lang/cz_web_subdomain_list.lng @@ -6,4 +6,3 @@ $wb['parent_domain_id_txt'] = 'Webová stránka'; $wb['domain_txt'] = 'Subdoména'; $wb['add_new_record_txt'] = 'Přidat subdoménu'; ?> - diff --git a/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng index 4a2dc3e852..63d61fb724 100644 --- a/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng @@ -116,4 +116,3 @@ $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snipp $wb['proxy_directives_txt'] = 'Proxy Directives'; $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; ?> - diff --git a/interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng index e15402b067..a54e19a5ad 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,4 +6,3 @@ $wb['parent_domain_id_txt'] = 'Webové stránky'; $wb['domain_txt'] = 'Subdoména'; $wb['add_new_record_txt'] = 'Přidat novou poddoménu'; ?> - diff --git a/interface/web/sites/lib/lang/cz_webdav_user.lng b/interface/web/sites/lib/lang/cz_webdav_user.lng index c21555e78e..3e89a1e625 100644 --- a/interface/web/sites/lib/lang/cz_webdav_user.lng +++ b/interface/web/sites/lib/lang/cz_webdav_user.lng @@ -19,4 +19,3 @@ $wb['repeat_password_txt'] = 'Opakujte heslo'; $wb['password_mismatch_txt'] = 'Hesla se neshodují.'; $wb['password_match_txt'] = 'Hesla se shodují.'; ?> - diff --git a/interface/web/sites/lib/lang/cz_webdav_user_list.lng b/interface/web/sites/lib/lang/cz_webdav_user_list.lng index af8bfea749..0c1148b53e 100644 --- a/interface/web/sites/lib/lang/cz_webdav_user_list.lng +++ b/interface/web/sites/lib/lang/cz_webdav_user_list.lng @@ -6,4 +6,3 @@ $wb['parent_domain_id_txt'] = 'Webové stránky'; $wb['username_txt'] = 'Uživatelské jméno'; $wb['add_new_record_txt'] = 'Přidat nového WebDAV uživatele'; ?> - diff --git a/interface/web/sites/lib/lang/de_aps.lng b/interface/web/sites/lib/lang/de_aps.lng index 76bd17f734..ff8df35d5b 100644 --- a/interface/web/sites/lib/lang/de_aps.lng +++ b/interface/web/sites/lib/lang/de_aps.lng @@ -54,4 +54,5 @@ $wb['installation_error_txt'] = 'Installationsfehler'; $wb['installation_success_txt'] = 'Installiert'; $wb['installation_remove_txt'] = 'Deinstallation vorgemerkt'; $wb['packagelist_update_finished_txt'] = 'APS Paketlistenupdate beendet.'; +$wb["limit_aps_txt"] = 'Die maximale Anzahl an APS-Instanzen für Ihr Konto wurde erreicht.'; ?> diff --git a/interface/web/sites/lib/lang/de_aps_update_packagelist.lng b/interface/web/sites/lib/lang/de_aps_update_packagelist.lng new file mode 100644 index 0000000000..e0326cbb3c --- /dev/null +++ b/interface/web/sites/lib/lang/de_aps_update_packagelist.lng @@ -0,0 +1,7 @@ + diff --git a/interface/web/sites/lib/lang/de_database.lng b/interface/web/sites/lib/lang/de_database.lng index bb20e59566..716fd7a20e 100644 --- a/interface/web/sites/lib/lang/de_database.lng +++ b/interface/web/sites/lib/lang/de_database.lng @@ -2,23 +2,23 @@ $wb['server_id_txt'] = 'Server'; $wb['type_txt'] = 'Typ'; $wb['database_name_txt'] = 'Datenbankname'; -$wb['database_user_txt'] = 'Datenbank Benutzer'; -$wb['database_ro_user_txt'] = 'Nur Lesen Datenbank Benutzer'; +$wb['database_user_txt'] = 'Datenbankbenutzer'; +$wb['database_ro_user_txt'] = 'Nur Lesen Datenbankbenutzer'; $wb['optional_txt'] = 'optional'; $wb['database_password_txt'] = 'Datenbank Passwort'; $wb['database_charset_txt'] = 'Datenbank Zeichensatz'; -$wb['select_dbuser_txt'] = 'Datenbank Benutzer auswählen'; +$wb['select_dbuser_txt'] = 'Datenbankbenutzer auswählen'; $wb['no_dbuser_txt'] = 'Keiner'; -$wb['remote_access_txt'] = 'Remote zugriff'; -$wb['remote_ips_txt'] = 'Remote zugriff IP Adressen (mit Komma trennen, keine Eingabe für alle)'; +$wb['remote_access_txt'] = 'Entfernter Zugriff'; +$wb['remote_ips_txt'] = 'Entfernter Zugriff IP Adressen (Mehrere mit Komma trennen, keine Eingabe für alle)'; $wb['database_remote_error_ips'] = 'Mindestens eine der eingegebenen IP Adressen ist ungültig.'; $wb['client_txt'] = 'Kunde'; $wb['active_txt'] = 'Aktiv'; -$wb['database_client_differs_txt'] = 'Der Kunde dieser Datenbank passt nicht zum Kunden des Datenbankusers.'; -$wb['database_name_error_empty'] = 'Datenbankname ist leer.'; +$wb['database_client_differs_txt'] = 'Der Kunde dieser Datenbank passt nicht zum Kunden des Datenbankbenutzers.'; +$wb['database_name_error_empty'] = 'Datenbank Name ist leer.'; $wb['database_name_error_unique'] = 'Es existiert bereits eine Datenbank mit diesem Namen am Server. Um einen eindeutigen Namen zu erhalten können sie z.B. den Domainnamen vor dem Datenbanknamen verwenden.'; $wb['database_name_error_regex'] = 'Ungültiger Datenbankname. Der Datenbankname darf die Zeichen: a-z, A-Z, 0-9 und den Unterstrich beinhalten. Länge: 2 - 64 Zeichen.'; -$wb['database_user_error_empty'] = 'Datenbank Benutzer ist leer.'; +$wb['database_user_error_empty'] = 'Datenbankbenutzer ist leer.'; $wb['database_user_error_unique'] = 'Es existiert bereits ein Benutzer mit diesem Namen am Server. Um einen eindeutigen Namen zu erhalten können sie z.B. den Domainnamen vor dem Benutzernamen verwenden.'; $wb['database_user_error_regex'] = 'Ungültiger Benutzername. Der Benutzername darf die Zeichen: a-z, A-Z, 0-9 und den Unterstrich beinhalten. Länge: 2 - 64 Zeichen.'; $wb['limit_database_txt'] = 'Die maximale Anzahl an Datenbanken wurde erreicht.'; @@ -26,8 +26,8 @@ $wb['database_name_change_txt'] = 'Der Datenbankname kann nicht geändert werden $wb['database_user_missing_txt'] = 'Bitte wählen Sie einen Datenbanknutzer für die Datenbank aus.'; $wb['database_charset_change_txt'] = 'Der Zeichensatz der Datenbank kann nicht geändert werden.'; $wb['password_strength_txt'] = 'Passwortkomplexität'; -$wb['database_name_error_len'] = 'Datenbank Name - {db} - zu lang. Die max. Datenbank Namen Länge inkl. Präfix ist 64 Zeichen.'; -$wb['database_user_error_len'] = 'Datenbank Benutzername - {user} - zu lang. Die max. Datenbank Benutzernamen Länge inkl. Präfix ist 16 Zeichen.'; +$wb['database_name_error_len'] = 'Datenbankname - {db} - zu lang. Die max. Datenbanknamen Länge inkl. Präfix ist 64 Zeichen.'; +$wb['database_user_error_len'] = 'Datenbankbenutzername - {user} - zu lang. Die max. Datenbankbenutzernamen Länge inkl. Präfix ist 16 Zeichen.'; $wb['generate_password_txt'] = 'Passwort erzeugen'; $wb['repeat_password_txt'] = 'Passwort wiederholen'; $wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; diff --git a/interface/web/sites/lib/lang/de_web_aliasdomain.lng b/interface/web/sites/lib/lang/de_web_aliasdomain.lng index 0060ecaeab..ccb3bdfa24 100644 --- a/interface/web/sites/lib/lang/de_web_aliasdomain.lng +++ b/interface/web/sites/lib/lang/de_web_aliasdomain.lng @@ -1,3 +1,115 @@ www'; +$wb['www_to_non_www_txt'] = 'www -> non-www'; +$wb['php_fpm_use_socket_txt'] = 'Verwende Socket für PHP-FPM'; +$wb['error_no_sni_txt'] = 'SNI ist für SSL ist auf diesem Server nicht aktiviert. Sie können nur ein SSL Zertifikate pro IP Adresse aktivieren.'; +$wb['python_txt'] = 'Python'; +$wb['perl_txt'] = 'Perl'; +$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children'; +$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers'; +$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers'; +$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers'; +$wb['error_php_fpm_pm_settings_txt'] = 'Werte von PHP-FPM pm Einstellungen müßen folgendermaßen aussehen: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0'; +$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children muss ein positiver integer Wert sein.'; +$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers muss ein positiver integer Wert sein.'; +$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers muss ein positiver integer Wert sein.'; +$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers muss ein positiver integer Wert sein.'; +$wb['hd_quota_error_regex'] = 'Festplatten Beschränkung ist ungültig.'; +$wb['traffic_quota_error_regex'] = 'Transfer Beschränkung ist ungültig.'; +$wb['fastcgi_php_version_txt'] = 'PHP Version'; +$wb['pm_txt'] = 'PHP-FPM Prozess Manager'; +$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout'; +$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests'; +$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout muss eine positiver integer Wert sein.'; +$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests muss ein integer Wert >= 0 sein.'; +$wb['pm_ondemand_hint_txt'] = 'Bitte beachte Sie, daß Sie mindesten PHP Version >= 5.3.9 verwenden um den Ondemand Prozess Manager zu verwenden. Wenn Sie Ondemand für eine ältere PHP Version aktivieren wird PHP nicht mehr funktionieren!'; +$wb['generate_password_txt'] = 'Passwort generieren'; +$wb['repeat_password_txt'] = 'Passwort wiederholen'; +$wb['password_mismatch_txt'] = 'Die Passwörter stimmer nicht überein.'; +$wb['password_match_txt'] = 'Die Passwörter stimmer überein.'; +$wb['available_php_directive_snippets_txt'] = 'Verfügbare PHP Direktiven Schnipsel:'; +$wb['available_apache_directive_snippets_txt'] = 'Verfügbare Apache Direktiven Schnipsel:'; +$wb['available_nginx_directive_snippets_txt'] = 'Verfügbare nginx Direktiven Schnipsel:'; +$wb['proxy_directives_txt'] = 'Proxy Direktiven'; +$wb['available_proxy_directive_snippets_txt'] = 'Verfügbare Proxy Direktiven Schnipsel:'; +$wb['Domain'] = 'Alias Domain'; ?> diff --git a/interface/web/sites/lib/lang/el.lng b/interface/web/sites/lib/lang/el.lng index 19bfc27349..2d726140fd 100644 --- a/interface/web/sites/lib/lang/el.lng +++ b/interface/web/sites/lib/lang/el.lng @@ -31,5 +31,5 @@ $wb['Available packages'] = 'Available packages'; $wb['Installed packages'] = 'Installed packages'; $wb['Update Packagelist'] = 'Update Packagelist'; $wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/el_aps_update_packagelist.lng b/interface/web/sites/lib/lang/el_aps_update_packagelist.lng new file mode 100644 index 0000000000..1a40a3394f --- /dev/null +++ b/interface/web/sites/lib/lang/el_aps_update_packagelist.lng @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/interface/web/sites/lib/lang/el_web_aliasdomain.lng b/interface/web/sites/lib/lang/el_web_aliasdomain.lng index 0060ecaeab..4149c71149 100644 --- a/interface/web/sites/lib/lang/el_web_aliasdomain.lng +++ b/interface/web/sites/lib/lang/el_web_aliasdomain.lng @@ -1,3 +1,115 @@ = 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; +$wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +$wb['Domain'] = 'Aliasdomain'; ?> diff --git a/interface/web/sites/lib/lang/el_web_subdomain.lng b/interface/web/sites/lib/lang/el_web_subdomain.lng index 73a79c24ba..8f5148b99d 100644 --- a/interface/web/sites/lib/lang/el_web_subdomain.lng +++ b/interface/web/sites/lib/lang/el_web_subdomain.lng @@ -42,5 +42,5 @@ $wb['no_flag_txt'] = 'Χωρίς Σημαία'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; $wb['proxy_directives_txt'] = 'Proxy Directives'; $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/en_aps.lng b/interface/web/sites/lib/lang/en_aps.lng index 2ab54024b2..e240d57873 100644 --- a/interface/web/sites/lib/lang/en_aps.lng +++ b/interface/web/sites/lib/lang/en_aps.lng @@ -54,4 +54,5 @@ $wb['installation_error_txt'] = 'Install error'; $wb['installation_success_txt'] = 'Installed'; $wb['installation_remove_txt'] = 'Removal planned'; $wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.'; +$wb["limit_aps_txt"] = 'The max. number of APS instances for your account is reached.'; ?> \ No newline at end of file diff --git a/interface/web/sites/lib/lang/en_aps_update_packagelist.lng b/interface/web/sites/lib/lang/en_aps_update_packagelist.lng new file mode 100644 index 0000000000..1a40a3394f --- /dev/null +++ b/interface/web/sites/lib/lang/en_aps_update_packagelist.lng @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/interface/web/sites/lib/lang/en_web_aliasdomain.lng b/interface/web/sites/lib/lang/en_web_aliasdomain.lng index 0060ecaeab..eeae6770c6 100644 --- a/interface/web/sites/lib/lang/en_web_aliasdomain.lng +++ b/interface/web/sites/lib/lang/en_web_aliasdomain.lng @@ -1,3 +1,115 @@ = 0.'; +$wb["pm_ondemand_hint_txt"] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; +$wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +$wb['Domain'] = 'Aliasdomain'; ?> diff --git a/interface/web/sites/lib/lang/es.lng b/interface/web/sites/lib/lang/es.lng index 241d4e1b39..6b2574aafc 100644 --- a/interface/web/sites/lib/lang/es.lng +++ b/interface/web/sites/lib/lang/es.lng @@ -31,5 +31,5 @@ $wb['Available packages'] = 'Available packages'; $wb['Installed packages'] = 'Installed packages'; $wb['Update Packagelist'] = 'Update Packagelist'; $wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/es_aps_update_packagelist.lng b/interface/web/sites/lib/lang/es_aps_update_packagelist.lng new file mode 100644 index 0000000000..1a40a3394f --- /dev/null +++ b/interface/web/sites/lib/lang/es_aps_update_packagelist.lng @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/interface/web/sites/lib/lang/es_web_aliasdomain.lng b/interface/web/sites/lib/lang/es_web_aliasdomain.lng index 0060ecaeab..4149c71149 100644 --- a/interface/web/sites/lib/lang/es_web_aliasdomain.lng +++ b/interface/web/sites/lib/lang/es_web_aliasdomain.lng @@ -1,3 +1,115 @@ = 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; +$wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +$wb['Domain'] = 'Aliasdomain'; ?> diff --git a/interface/web/sites/lib/lang/es_web_subdomain.lng b/interface/web/sites/lib/lang/es_web_subdomain.lng index 1dc29fadc1..1fa75e51b5 100644 --- a/interface/web/sites/lib/lang/es_web_subdomain.lng +++ b/interface/web/sites/lib/lang/es_web_subdomain.lng @@ -42,5 +42,5 @@ $wb['no_flag_txt'] = 'No flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; $wb['proxy_directives_txt'] = 'Proxy Directives'; $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/fi.lng b/interface/web/sites/lib/lang/fi.lng index 5adab57775..ebf94bc190 100755 --- a/interface/web/sites/lib/lang/fi.lng +++ b/interface/web/sites/lib/lang/fi.lng @@ -31,5 +31,5 @@ $wb['Available packages'] = 'Available packages'; $wb['Installed packages'] = 'Installed packages'; $wb['Update Packagelist'] = 'Update Packagelist'; $wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/fi_aps_update_packagelist.lng b/interface/web/sites/lib/lang/fi_aps_update_packagelist.lng new file mode 100644 index 0000000000..1a40a3394f --- /dev/null +++ b/interface/web/sites/lib/lang/fi_aps_update_packagelist.lng @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/interface/web/sites/lib/lang/fi_web_aliasdomain.lng b/interface/web/sites/lib/lang/fi_web_aliasdomain.lng index 0060ecaeab..4149c71149 100644 --- a/interface/web/sites/lib/lang/fi_web_aliasdomain.lng +++ b/interface/web/sites/lib/lang/fi_web_aliasdomain.lng @@ -1,3 +1,115 @@ = 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; +$wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +$wb['Domain'] = 'Aliasdomain'; ?> diff --git a/interface/web/sites/lib/lang/fi_web_subdomain.lng b/interface/web/sites/lib/lang/fi_web_subdomain.lng index cde47f9993..b2003f0cfe 100755 --- a/interface/web/sites/lib/lang/fi_web_subdomain.lng +++ b/interface/web/sites/lib/lang/fi_web_subdomain.lng @@ -42,5 +42,5 @@ $wb['no_flag_txt'] = 'No flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; $wb['proxy_directives_txt'] = 'Proxy Directives'; $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/fr.lng b/interface/web/sites/lib/lang/fr.lng index 8bf868f8bb..a7f4576fe1 100644 --- a/interface/web/sites/lib/lang/fr.lng +++ b/interface/web/sites/lib/lang/fr.lng @@ -31,5 +31,5 @@ $wb['Available packages'] = 'Available packages'; $wb['Installed packages'] = 'Installed packages'; $wb['Update Packagelist'] = 'Update Packagelist'; $wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/fr_aps_update_packagelist.lng b/interface/web/sites/lib/lang/fr_aps_update_packagelist.lng new file mode 100644 index 0000000000..1a40a3394f --- /dev/null +++ b/interface/web/sites/lib/lang/fr_aps_update_packagelist.lng @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/interface/web/sites/lib/lang/fr_web_aliasdomain.lng b/interface/web/sites/lib/lang/fr_web_aliasdomain.lng index 0060ecaeab..4149c71149 100644 --- a/interface/web/sites/lib/lang/fr_web_aliasdomain.lng +++ b/interface/web/sites/lib/lang/fr_web_aliasdomain.lng @@ -1,3 +1,115 @@ = 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; +$wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +$wb['Domain'] = 'Aliasdomain'; ?> diff --git a/interface/web/sites/lib/lang/fr_web_subdomain.lng b/interface/web/sites/lib/lang/fr_web_subdomain.lng index 1daf862549..e28106f581 100644 --- a/interface/web/sites/lib/lang/fr_web_subdomain.lng +++ b/interface/web/sites/lib/lang/fr_web_subdomain.lng @@ -42,5 +42,5 @@ $wb['no_flag_txt'] = 'Aucun flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; $wb['proxy_directives_txt'] = 'Proxy Directives'; $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/hr.lng b/interface/web/sites/lib/lang/hr.lng index e267eb3bf9..8a18c47639 100644 --- a/interface/web/sites/lib/lang/hr.lng +++ b/interface/web/sites/lib/lang/hr.lng @@ -31,5 +31,5 @@ $wb['Available packages'] = 'Available packages'; $wb['Installed packages'] = 'Installed packages'; $wb['Update Packagelist'] = 'Update Packagelist'; $wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/hr_aps_update_packagelist.lng b/interface/web/sites/lib/lang/hr_aps_update_packagelist.lng new file mode 100644 index 0000000000..1a40a3394f --- /dev/null +++ b/interface/web/sites/lib/lang/hr_aps_update_packagelist.lng @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/interface/web/sites/lib/lang/hr_web_aliasdomain.lng b/interface/web/sites/lib/lang/hr_web_aliasdomain.lng index 0060ecaeab..4149c71149 100644 --- a/interface/web/sites/lib/lang/hr_web_aliasdomain.lng +++ b/interface/web/sites/lib/lang/hr_web_aliasdomain.lng @@ -1,3 +1,115 @@ = 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; +$wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +$wb['Domain'] = 'Aliasdomain'; ?> diff --git a/interface/web/sites/lib/lang/hr_web_subdomain.lng b/interface/web/sites/lib/lang/hr_web_subdomain.lng index 652fce6458..5ea6fff25b 100644 --- a/interface/web/sites/lib/lang/hr_web_subdomain.lng +++ b/interface/web/sites/lib/lang/hr_web_subdomain.lng @@ -42,5 +42,5 @@ $wb['no_flag_txt'] = 'Bez markiranja'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; $wb['proxy_directives_txt'] = 'Proxy Directives'; $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/hu.lng b/interface/web/sites/lib/lang/hu.lng index 1a3e31d3f9..2c156a4775 100644 --- a/interface/web/sites/lib/lang/hu.lng +++ b/interface/web/sites/lib/lang/hu.lng @@ -31,5 +31,5 @@ $wb['Available packages'] = 'Available packages'; $wb['Installed packages'] = 'Installed packages'; $wb['Update Packagelist'] = 'Update Packagelist'; $wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/hu_aps_update_packagelist.lng b/interface/web/sites/lib/lang/hu_aps_update_packagelist.lng new file mode 100644 index 0000000000..1a40a3394f --- /dev/null +++ b/interface/web/sites/lib/lang/hu_aps_update_packagelist.lng @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/interface/web/sites/lib/lang/hu_web_aliasdomain.lng b/interface/web/sites/lib/lang/hu_web_aliasdomain.lng index 0060ecaeab..4149c71149 100644 --- a/interface/web/sites/lib/lang/hu_web_aliasdomain.lng +++ b/interface/web/sites/lib/lang/hu_web_aliasdomain.lng @@ -1,3 +1,115 @@ = 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; +$wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +$wb['Domain'] = 'Aliasdomain'; ?> diff --git a/interface/web/sites/lib/lang/hu_web_subdomain.lng b/interface/web/sites/lib/lang/hu_web_subdomain.lng index 7e933b9b44..b629c3fe5d 100644 --- a/interface/web/sites/lib/lang/hu_web_subdomain.lng +++ b/interface/web/sites/lib/lang/hu_web_subdomain.lng @@ -42,5 +42,5 @@ $wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for ex $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; $wb['proxy_directives_txt'] = 'Proxy Directives'; $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/id.lng b/interface/web/sites/lib/lang/id.lng index 4fdae1813f..c8510df6cb 100644 --- a/interface/web/sites/lib/lang/id.lng +++ b/interface/web/sites/lib/lang/id.lng @@ -31,5 +31,5 @@ $wb['Available packages'] = 'Available packages'; $wb['Installed packages'] = 'Installed packages'; $wb['Update Packagelist'] = 'Update Packagelist'; $wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/id_aps_update_packagelist.lng b/interface/web/sites/lib/lang/id_aps_update_packagelist.lng new file mode 100644 index 0000000000..1a40a3394f --- /dev/null +++ b/interface/web/sites/lib/lang/id_aps_update_packagelist.lng @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/interface/web/sites/lib/lang/id_web_aliasdomain.lng b/interface/web/sites/lib/lang/id_web_aliasdomain.lng index 0060ecaeab..4149c71149 100644 --- a/interface/web/sites/lib/lang/id_web_aliasdomain.lng +++ b/interface/web/sites/lib/lang/id_web_aliasdomain.lng @@ -1,3 +1,115 @@ = 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; +$wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +$wb['Domain'] = 'Aliasdomain'; ?> diff --git a/interface/web/sites/lib/lang/id_web_subdomain.lng b/interface/web/sites/lib/lang/id_web_subdomain.lng index 4662cc9077..79672f6feb 100644 --- a/interface/web/sites/lib/lang/id_web_subdomain.lng +++ b/interface/web/sites/lib/lang/id_web_subdomain.lng @@ -42,5 +42,5 @@ $wb['no_flag_txt'] = 'No flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; $wb['proxy_directives_txt'] = 'Proxy Directives'; $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/it.lng b/interface/web/sites/lib/lang/it.lng index f4b6c1af2f..62f50b7328 100644 --- a/interface/web/sites/lib/lang/it.lng +++ b/interface/web/sites/lib/lang/it.lng @@ -31,5 +31,5 @@ $wb['Available packages'] = 'Available packages'; $wb['Installed packages'] = 'Installed packages'; $wb['Update Packagelist'] = 'Update Packagelist'; $wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/it_aps_update_packagelist.lng b/interface/web/sites/lib/lang/it_aps_update_packagelist.lng new file mode 100644 index 0000000000..1a40a3394f --- /dev/null +++ b/interface/web/sites/lib/lang/it_aps_update_packagelist.lng @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/interface/web/sites/lib/lang/it_web_aliasdomain.lng b/interface/web/sites/lib/lang/it_web_aliasdomain.lng index 0060ecaeab..4149c71149 100644 --- a/interface/web/sites/lib/lang/it_web_aliasdomain.lng +++ b/interface/web/sites/lib/lang/it_web_aliasdomain.lng @@ -1,3 +1,115 @@ = 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; +$wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +$wb['Domain'] = 'Aliasdomain'; ?> diff --git a/interface/web/sites/lib/lang/it_web_subdomain.lng b/interface/web/sites/lib/lang/it_web_subdomain.lng index 34e7e5fe05..9069194ba5 100644 --- a/interface/web/sites/lib/lang/it_web_subdomain.lng +++ b/interface/web/sites/lib/lang/it_web_subdomain.lng @@ -42,5 +42,5 @@ $wb['no_flag_txt'] = 'No flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; $wb['proxy_directives_txt'] = 'Proxy Directives'; $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/ja.lng b/interface/web/sites/lib/lang/ja.lng index 470ec2baec..920064bc5e 100644 --- a/interface/web/sites/lib/lang/ja.lng +++ b/interface/web/sites/lib/lang/ja.lng @@ -31,5 +31,5 @@ $wb['Available packages'] = 'Available packages'; $wb['Installed packages'] = 'Installed packages'; $wb['Update Packagelist'] = 'Update Packagelist'; $wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/ja_aps_update_packagelist.lng b/interface/web/sites/lib/lang/ja_aps_update_packagelist.lng new file mode 100644 index 0000000000..ce9fcf68fb --- /dev/null +++ b/interface/web/sites/lib/lang/ja_aps_update_packagelist.lng @@ -0,0 +1,7 @@ + diff --git a/interface/web/sites/lib/lang/ja_web_aliasdomain.lng b/interface/web/sites/lib/lang/ja_web_aliasdomain.lng index 0060ecaeab..4149c71149 100644 --- a/interface/web/sites/lib/lang/ja_web_aliasdomain.lng +++ b/interface/web/sites/lib/lang/ja_web_aliasdomain.lng @@ -1,3 +1,115 @@ = 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; +$wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +$wb['Domain'] = 'Aliasdomain'; ?> diff --git a/interface/web/sites/lib/lang/ja_web_subdomain.lng b/interface/web/sites/lib/lang/ja_web_subdomain.lng index cb467f2248..7c0d55c94d 100644 --- a/interface/web/sites/lib/lang/ja_web_subdomain.lng +++ b/interface/web/sites/lib/lang/ja_web_subdomain.lng @@ -42,5 +42,5 @@ $wb['no_flag_txt'] = 'No flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; $wb['proxy_directives_txt'] = 'Proxy Directives'; $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/nl.lng b/interface/web/sites/lib/lang/nl.lng index d47212a162..4772673ddf 100644 --- a/interface/web/sites/lib/lang/nl.lng +++ b/interface/web/sites/lib/lang/nl.lng @@ -31,5 +31,5 @@ $wb['Available packages'] = 'Available packages'; $wb['Installed packages'] = 'Installed packages'; $wb['Update Packagelist'] = 'Update Packagelist'; $wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/nl_aps_update_packagelist.lng b/interface/web/sites/lib/lang/nl_aps_update_packagelist.lng new file mode 100644 index 0000000000..1a40a3394f --- /dev/null +++ b/interface/web/sites/lib/lang/nl_aps_update_packagelist.lng @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/interface/web/sites/lib/lang/nl_web_aliasdomain.lng b/interface/web/sites/lib/lang/nl_web_aliasdomain.lng index 0060ecaeab..4149c71149 100644 --- a/interface/web/sites/lib/lang/nl_web_aliasdomain.lng +++ b/interface/web/sites/lib/lang/nl_web_aliasdomain.lng @@ -1,3 +1,115 @@ = 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; +$wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +$wb['Domain'] = 'Aliasdomain'; ?> diff --git a/interface/web/sites/lib/lang/nl_web_subdomain.lng b/interface/web/sites/lib/lang/nl_web_subdomain.lng index 915f0d04cd..2fea49110c 100644 --- a/interface/web/sites/lib/lang/nl_web_subdomain.lng +++ b/interface/web/sites/lib/lang/nl_web_subdomain.lng @@ -42,5 +42,5 @@ $wb['no_flag_txt'] = 'No flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; $wb['proxy_directives_txt'] = 'Proxy Directives'; $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/pl.lng b/interface/web/sites/lib/lang/pl.lng index 18aac48d85..62628fcb37 100644 --- a/interface/web/sites/lib/lang/pl.lng +++ b/interface/web/sites/lib/lang/pl.lng @@ -31,5 +31,5 @@ $wb['Available packages'] = 'Available packages'; $wb['Installed packages'] = 'Installed packages'; $wb['Update Packagelist'] = 'Update Packagelist'; $wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/pl_aps_update_packagelist.lng b/interface/web/sites/lib/lang/pl_aps_update_packagelist.lng new file mode 100644 index 0000000000..1a40a3394f --- /dev/null +++ b/interface/web/sites/lib/lang/pl_aps_update_packagelist.lng @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/interface/web/sites/lib/lang/pl_web_aliasdomain.lng b/interface/web/sites/lib/lang/pl_web_aliasdomain.lng index 0060ecaeab..4149c71149 100644 --- a/interface/web/sites/lib/lang/pl_web_aliasdomain.lng +++ b/interface/web/sites/lib/lang/pl_web_aliasdomain.lng @@ -1,3 +1,115 @@ = 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; +$wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +$wb['Domain'] = 'Aliasdomain'; ?> diff --git a/interface/web/sites/lib/lang/pl_web_subdomain.lng b/interface/web/sites/lib/lang/pl_web_subdomain.lng index 4cc3865ea7..5a53df347d 100644 --- a/interface/web/sites/lib/lang/pl_web_subdomain.lng +++ b/interface/web/sites/lib/lang/pl_web_subdomain.lng @@ -42,5 +42,5 @@ $wb['no_flag_txt'] = 'Bez flagi'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; $wb['proxy_directives_txt'] = 'Proxy Directives'; $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/pt.lng b/interface/web/sites/lib/lang/pt.lng index 6cd9798fa1..c1fca015b8 100644 --- a/interface/web/sites/lib/lang/pt.lng +++ b/interface/web/sites/lib/lang/pt.lng @@ -31,5 +31,5 @@ $wb['Available packages'] = 'Available packages'; $wb['Installed packages'] = 'Installed packages'; $wb['Update Packagelist'] = 'Update Packagelist'; $wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/pt_aps_update_packagelist.lng b/interface/web/sites/lib/lang/pt_aps_update_packagelist.lng new file mode 100644 index 0000000000..1a40a3394f --- /dev/null +++ b/interface/web/sites/lib/lang/pt_aps_update_packagelist.lng @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/interface/web/sites/lib/lang/pt_web_aliasdomain.lng b/interface/web/sites/lib/lang/pt_web_aliasdomain.lng index 0060ecaeab..4149c71149 100644 --- a/interface/web/sites/lib/lang/pt_web_aliasdomain.lng +++ b/interface/web/sites/lib/lang/pt_web_aliasdomain.lng @@ -1,3 +1,115 @@ = 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; +$wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +$wb['Domain'] = 'Aliasdomain'; ?> diff --git a/interface/web/sites/lib/lang/pt_web_subdomain.lng b/interface/web/sites/lib/lang/pt_web_subdomain.lng index 9ee3ae3d1c..570badca98 100644 --- a/interface/web/sites/lib/lang/pt_web_subdomain.lng +++ b/interface/web/sites/lib/lang/pt_web_subdomain.lng @@ -42,5 +42,5 @@ $wb['no_flag_txt'] = 'No flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; $wb['proxy_directives_txt'] = 'Proxy Directives'; $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/ro.lng b/interface/web/sites/lib/lang/ro.lng index 418585ea55..f674e91b80 100644 --- a/interface/web/sites/lib/lang/ro.lng +++ b/interface/web/sites/lib/lang/ro.lng @@ -31,5 +31,5 @@ $wb['Available packages'] = 'Available packages'; $wb['Installed packages'] = 'Installed packages'; $wb['Update Packagelist'] = 'Update Packagelist'; $wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/ro_aps_update_packagelist.lng b/interface/web/sites/lib/lang/ro_aps_update_packagelist.lng new file mode 100644 index 0000000000..1a40a3394f --- /dev/null +++ b/interface/web/sites/lib/lang/ro_aps_update_packagelist.lng @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/interface/web/sites/lib/lang/ro_web_aliasdomain.lng b/interface/web/sites/lib/lang/ro_web_aliasdomain.lng index 0060ecaeab..4149c71149 100644 --- a/interface/web/sites/lib/lang/ro_web_aliasdomain.lng +++ b/interface/web/sites/lib/lang/ro_web_aliasdomain.lng @@ -1,3 +1,115 @@ = 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; +$wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +$wb['Domain'] = 'Aliasdomain'; ?> diff --git a/interface/web/sites/lib/lang/ro_web_subdomain.lng b/interface/web/sites/lib/lang/ro_web_subdomain.lng index 6d4d94b75a..614f88631b 100644 --- a/interface/web/sites/lib/lang/ro_web_subdomain.lng +++ b/interface/web/sites/lib/lang/ro_web_subdomain.lng @@ -42,5 +42,5 @@ $wb['no_flag_txt'] = 'No flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; $wb['proxy_directives_txt'] = 'Proxy Directives'; $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/ru.lng b/interface/web/sites/lib/lang/ru.lng index cc0eb3d906..a5764f14e5 100644 --- a/interface/web/sites/lib/lang/ru.lng +++ b/interface/web/sites/lib/lang/ru.lng @@ -31,5 +31,5 @@ $wb['Available packages'] = 'Available packages'; $wb['Installed packages'] = 'Installed packages'; $wb['Update Packagelist'] = 'Update Packagelist'; $wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/ru_aps_update_packagelist.lng b/interface/web/sites/lib/lang/ru_aps_update_packagelist.lng new file mode 100644 index 0000000000..1a40a3394f --- /dev/null +++ b/interface/web/sites/lib/lang/ru_aps_update_packagelist.lng @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/interface/web/sites/lib/lang/ru_web_aliasdomain.lng b/interface/web/sites/lib/lang/ru_web_aliasdomain.lng index 0060ecaeab..4149c71149 100644 --- a/interface/web/sites/lib/lang/ru_web_aliasdomain.lng +++ b/interface/web/sites/lib/lang/ru_web_aliasdomain.lng @@ -1,3 +1,115 @@ = 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; +$wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +$wb['Domain'] = 'Aliasdomain'; ?> diff --git a/interface/web/sites/lib/lang/ru_web_subdomain.lng b/interface/web/sites/lib/lang/ru_web_subdomain.lng index c0b4bf5713..8972c6e590 100644 --- a/interface/web/sites/lib/lang/ru_web_subdomain.lng +++ b/interface/web/sites/lib/lang/ru_web_subdomain.lng @@ -42,5 +42,5 @@ $wb['no_flag_txt'] = 'No flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; $wb['proxy_directives_txt'] = 'Proxy Directives'; $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/se.lng b/interface/web/sites/lib/lang/se.lng index bfd833292d..6ca61afae0 100644 --- a/interface/web/sites/lib/lang/se.lng +++ b/interface/web/sites/lib/lang/se.lng @@ -31,5 +31,5 @@ $wb['Available packages'] = 'Available packages'; $wb['Installed packages'] = 'Installed packages'; $wb['Update Packagelist'] = 'Update Packagelist'; $wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/se_aps_update_packagelist.lng b/interface/web/sites/lib/lang/se_aps_update_packagelist.lng new file mode 100644 index 0000000000..1a40a3394f --- /dev/null +++ b/interface/web/sites/lib/lang/se_aps_update_packagelist.lng @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/interface/web/sites/lib/lang/se_web_aliasdomain.lng b/interface/web/sites/lib/lang/se_web_aliasdomain.lng index 0060ecaeab..4149c71149 100644 --- a/interface/web/sites/lib/lang/se_web_aliasdomain.lng +++ b/interface/web/sites/lib/lang/se_web_aliasdomain.lng @@ -1,3 +1,115 @@ = 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; +$wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +$wb['Domain'] = 'Aliasdomain'; ?> diff --git a/interface/web/sites/lib/lang/se_web_subdomain.lng b/interface/web/sites/lib/lang/se_web_subdomain.lng index 49799b3ca1..d86c1665c3 100644 --- a/interface/web/sites/lib/lang/se_web_subdomain.lng +++ b/interface/web/sites/lib/lang/se_web_subdomain.lng @@ -42,5 +42,5 @@ $wb['no_flag_txt'] = 'No flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; $wb['proxy_directives_txt'] = 'Proxy Directives'; $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/sk.lng b/interface/web/sites/lib/lang/sk.lng index 401ad2c65d..fabf52fda0 100644 --- a/interface/web/sites/lib/lang/sk.lng +++ b/interface/web/sites/lib/lang/sk.lng @@ -31,5 +31,5 @@ $wb['Available packages'] = 'Available packages'; $wb['Installed packages'] = 'Installed packages'; $wb['Update Packagelist'] = 'Update Packagelist'; $wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/sk_aps_update_packagelist.lng b/interface/web/sites/lib/lang/sk_aps_update_packagelist.lng new file mode 100644 index 0000000000..1a40a3394f --- /dev/null +++ b/interface/web/sites/lib/lang/sk_aps_update_packagelist.lng @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/interface/web/sites/lib/lang/sk_web_aliasdomain.lng b/interface/web/sites/lib/lang/sk_web_aliasdomain.lng index 0060ecaeab..4149c71149 100644 --- a/interface/web/sites/lib/lang/sk_web_aliasdomain.lng +++ b/interface/web/sites/lib/lang/sk_web_aliasdomain.lng @@ -1,3 +1,115 @@ = 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; +$wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +$wb['Domain'] = 'Aliasdomain'; ?> diff --git a/interface/web/sites/lib/lang/sk_web_subdomain.lng b/interface/web/sites/lib/lang/sk_web_subdomain.lng index 8d601cb26e..aa0a1b60aa 100644 --- a/interface/web/sites/lib/lang/sk_web_subdomain.lng +++ b/interface/web/sites/lib/lang/sk_web_subdomain.lng @@ -42,5 +42,5 @@ $wb['no_flag_txt'] = 'No flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; $wb['proxy_directives_txt'] = 'Proxy Directives'; $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/tr.lng b/interface/web/sites/lib/lang/tr.lng index 3eaab09ee0..43d17dcde6 100644 --- a/interface/web/sites/lib/lang/tr.lng +++ b/interface/web/sites/lib/lang/tr.lng @@ -31,5 +31,5 @@ $wb['Available packages'] = 'Available packages'; $wb['Installed packages'] = 'Installed packages'; $wb['Update Packagelist'] = 'Update Packagelist'; $wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/lang/tr_aps_update_packagelist.lng b/interface/web/sites/lib/lang/tr_aps_update_packagelist.lng new file mode 100644 index 0000000000..1a40a3394f --- /dev/null +++ b/interface/web/sites/lib/lang/tr_aps_update_packagelist.lng @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/interface/web/sites/lib/lang/tr_web_aliasdomain.lng b/interface/web/sites/lib/lang/tr_web_aliasdomain.lng index 0060ecaeab..4149c71149 100644 --- a/interface/web/sites/lib/lang/tr_web_aliasdomain.lng +++ b/interface/web/sites/lib/lang/tr_web_aliasdomain.lng @@ -1,3 +1,115 @@ = 0.'; +$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; +$wb['generate_password_txt'] = 'Generate Password'; +$wb['repeat_password_txt'] = 'Repeat Password'; +$wb['password_mismatch_txt'] = 'The passwords do not match.'; +$wb['password_match_txt'] = 'The passwords do match.'; +$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['proxy_directives_txt'] = 'Proxy Directives'; +$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +$wb['Domain'] = 'Aliasdomain'; ?> diff --git a/interface/web/sites/lib/lang/tr_web_subdomain.lng b/interface/web/sites/lib/lang/tr_web_subdomain.lng index e1870f33d5..c0191cfd00 100644 --- a/interface/web/sites/lib/lang/tr_web_subdomain.lng +++ b/interface/web/sites/lib/lang/tr_web_subdomain.lng @@ -42,5 +42,5 @@ $wb['no_flag_txt'] = 'No flag'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; $wb['proxy_directives_txt'] = 'Proxy Directives'; $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; -$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> diff --git a/interface/web/sites/lib/module.conf.php b/interface/web/sites/lib/module.conf.php index 982cb90752..1f7067ee47 100644 --- a/interface/web/sites/lib/module.conf.php +++ b/interface/web/sites/lib/module.conf.php @@ -132,6 +132,8 @@ $module["nav"][] = array( 'title' => 'Command Line', } // APS menu +if($app->auth->get_client_limit($userid,'aps') != 0) +{ $items = array(); $items[] = array( 'title' => 'Available packages', @@ -150,14 +152,14 @@ if($_SESSION['s']['user']['typ'] == 'admin') { $items[] = array( 'title' => 'Update Packagelist', 'target' => 'content', - 'link' => 'sites/aps_cron_apscrawler_if.php', + 'link' => 'sites/aps_update_packagelist.php', 'html_id' => 'aps_packagedetails_show'); } $module['nav'][] = array( 'title' => 'APS Installer', 'open' => 1, 'items' => $items); - +} // Statistics menu $items = array(); diff --git a/interface/web/sites/templates/aps_update_packagelist.htm b/interface/web/sites/templates/aps_update_packagelist.htm new file mode 100644 index 0000000000..bd8edfd428 --- /dev/null +++ b/interface/web/sites/templates/aps_update_packagelist.htm @@ -0,0 +1,20 @@ +

+

+ +
+ +
+
{tmpl_var name="legend_txt"} + +
+ + +
+
+ + + + +
+ +
diff --git a/interface/web/sites/web_domain_del.php b/interface/web/sites/web_domain_del.php index 3f3a49aa1e..cefb0ec413 100644 --- a/interface/web/sites/web_domain_del.php +++ b/interface/web/sites/web_domain_del.php @@ -55,48 +55,56 @@ class page_action extends tform_actions { if($app->tform->checkPerm($this->id,'d') == false) $app->error($app->lng('error_no_delete_permission')); - //* Delete all records that belog to this zone. + //* Delete all records that belong to this web. $records = $app->db->queryAllRecords("SELECT domain_id FROM web_domain WHERE parent_domain_id = '".$app->functions->intval($this->id)."' AND type != 'vhost'"); foreach($records as $rec) { $app->db->datalogDelete('web_domain','domain_id',$rec['domain_id']); } - //* Delete all records that belog to this zone. + //* Delete all records that belong to this web. $records = $app->db->queryAllRecords("SELECT ftp_user_id FROM ftp_user WHERE parent_domain_id = '".$app->functions->intval($this->id)."'"); foreach($records as $rec) { $app->db->datalogDelete('ftp_user','ftp_user_id',$rec['ftp_user_id']); } - //* Delete all records that belog to this web. + //* Delete all records that belong to this web. $records = $app->db->queryAllRecords("SELECT shell_user_id FROM shell_user WHERE parent_domain_id = '".$app->functions->intval($this->id)."'"); foreach($records as $rec) { $app->db->datalogDelete('shell_user','shell_user_id',$rec['shell_user_id']); } - //* Delete all records that belog to this web. - $records = $app->db->queryAllRecords("SELECT id FROM cron WHERE parent_domain_id = '".$app->functions->intval($this->id)."'"); - foreach($records as $rec) { - $app->db->datalogDelete('cron','id',$rec['id']); - } - - //* Delete all records that belog to this web. + //* Delete all records that belong to this web. $records = $app->db->queryAllRecords("SELECT id FROM cron WHERE parent_domain_id = '".$app->functions->intval($this->id)."'"); foreach($records as $rec) { $app->db->datalogDelete('cron','id',$rec['id']); } - //* Delete all records that belog to this web + //* Delete all records that belong to this web $records = $app->db->queryAllRecords("SELECT webdav_user_id FROM webdav_user WHERE parent_domain_id = '".$app->functions->intval($this->id)."'"); foreach($records as $rec) { $app->db->datalogDelete('webdav_user','webdav_user_id',$rec['webdav_user_id']); } - //* Delete all records that belog to this web + //* Delete all records that belong to this web $records = $app->db->queryAllRecords("SELECT backup_id FROM web_backup WHERE parent_domain_id = '".$app->functions->intval($this->id)."'"); foreach($records as $rec) { $app->db->datalogDelete('web_backup','backup_id',$rec['backup_id']); } + //* Delete all records that belog to this web. + $web_domain = $app->db->queryOneRecord("SELECT domain FROM web_domain WHERE domain_id = ".$app->functions->intval($this->id)); + if($web_domain['domain'] != ''){ + $aps_instances = $app->db->queryAllRecords("SELECT instance_id FROM aps_instances_settings WHERE name = 'main_domain' AND value = '".$web_domain['domain']."'"); + if(is_array($aps_instances) && !empty($aps_instances)){ + foreach($aps_instances as $aps_instance){ + if($aps_instance['instance_id'] > 0){ + $app->db->datalogDelete('aps_instances_settings','instance_id',$aps_instance['instance_id']); + $app->db->datalogDelete('aps_instances','id',$aps_instance['instance_id']); + } + } + } + } + //* Delete all web folders $records = $app->db->queryAllRecords("SELECT web_folder_id FROM web_folder WHERE parent_domain_id = '".$app->functions->intval($this->id)."'"); foreach($records as $rec) { diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php index c714fa312a..b21b1c89b0 100644 --- a/interface/web/sites/web_domain_edit.php +++ b/interface/web/sites/web_domain_edit.php @@ -832,7 +832,7 @@ class page_action extends tform_actions { } - //* If the domain name has been changed, we will have to change all subdomains + //* If the domain name has been changed, we will have to change all subdomains + APS instances if(!empty($this->dataRecord["domain"]) && !empty($this->oldDataRecord["domain"]) && $this->dataRecord["domain"] != $this->oldDataRecord["domain"]) { $records = $app->db->queryAllRecords("SELECT domain_id,domain FROM web_domain WHERE (type = 'subdomain' OR type = 'vhostsubdomain') AND domain LIKE '%.".$app->db->quote($this->oldDataRecord["domain"])."'"); foreach($records as $rec) { @@ -842,6 +842,18 @@ class page_action extends tform_actions { unset($records); unset($rec); unset($subdomain); + + // Update APS instances + $records = $app->db->queryAllRecords("SELECT id, instance_id FROM aps_instances_settings WHERE name = 'main_domain' AND value = '".$this->oldDataRecord["domain"]."'"); + if(is_array($records) && !empty($records)){ + foreach($records as $rec){ + $app->db->datalogUpdate('aps_instances_settings', "value = '".$this->dataRecord["domain"]."'", 'id', $rec['id']); + // Reinstall of package needed? + //$app->db->datalogUpdate('aps_instances', "instance_status = '1'", 'id', $rec['instance_id']); + } + } + unset($records); + unset($rec); } //* Set allow_override if empty diff --git a/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng index 136f5e2273..cff29d541a 100644 --- a/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng +++ b/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng @@ -6,4 +6,3 @@ $wb['password_strength_3_txt'] = 'Dobré'; $wb['password_strength_4_txt'] = 'Silné'; $wb['password_strength_5_txt'] = 'Velmi silné'; ?> - diff --git a/interface/web/themes/default/css/styles.css b/interface/web/themes/default/css/styles.css index be6317a471..ff56da40cb 100644 --- a/interface/web/themes/default/css/styles.css +++ b/interface/web/themes/default/css/styles.css @@ -449,7 +449,7 @@ table.list .tbl_row_even { background: #fcfcfc; } table.list .tbl_row_uneven { background: #f0f8ff; } table.list tr:hover { background: #fffacd; } table.list td { word-wrap:break-word;white-space:pre-wrap; } -table.list td.tbl_col_buttons { word-wrap:normal;white-space:normal; } +table.list td.tbl_col_buttons { word-wrap:normal;white-space:normal;overflow:visible; } /* Password Strength */ #passBar { @@ -782,7 +782,7 @@ button.icons16 { .icons16.icoFilter { background-position: -1px -161px; } .icons16.icoDbAdmin { background-position: -1px -221px; } .icons16.icoAction { background-position: -1px -241px; } -.icons16.icoLink { background-position: -1px -442px; float: right; } +.icons16.icoLink { background-position: -1px -422px; float: right; } div.group-icon { float: left; diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm index f80193a052..4ccb70aa2f 100644 --- a/interface/web/themes/default/templates/main.tpl.htm +++ b/interface/web/themes/default/templates/main.tpl.htm @@ -47,6 +47,28 @@ tabChangeWarning = ''; tabChangeDiscardTxt = ''; + + // Store password in browser; works in Firefox, but not Chrome + $('#username').live("blur", function(){ + if($('#dummy_username').val() == '' || $('#dummy_username').val() != $(this).val()){ + $('#dummy_login').show(); + $('#dummy_username').attr('value', $(this).val()).trigger('focus').trigger('blur'); + $('#dummy_login').hide(); + } + if($('#dummy_username').val() == $(this).val() && $(this).val() != ''){ + $('#passwort').val($('#dummy_passwort').val()); + } else { + $('#passwort').val(''); + } + $('#passwort').focus(); + }); + + $('#username').live("keyup", function(){ + $('#dummy_username').val(''); + $('#dummy_passwort').val(''); + $('#passwort').val(''); + }); + }); @@ -147,5 +169,14 @@ Powered by " target="_blank"> + + diff --git a/interface/web/tools/lib/lang/cz.lng b/interface/web/tools/lib/lang/cz.lng index 2379ffb8e5..66bcaf49ae 100644 --- a/interface/web/tools/lib/lang/cz.lng +++ b/interface/web/tools/lib/lang/cz.lng @@ -11,4 +11,3 @@ $wb['ISPConfig 3 mail'] = 'ISPConfig 3 vzdalený e-mail server'; $wb['PDNS Tupa'] = 'PowerDNS Tupa'; $wb['Interface'] = 'Rozhraní'; ?> - diff --git a/interface/web/tools/lib/lang/cz_import_ispconfig.lng b/interface/web/tools/lib/lang/cz_import_ispconfig.lng index 97d213ad82..8ebf71795c 100644 --- a/interface/web/tools/lib/lang/cz_import_ispconfig.lng +++ b/interface/web/tools/lib/lang/cz_import_ispconfig.lng @@ -21,4 +21,3 @@ $wb['import_forward_txt'] = 'Import forward'; $wb['import_user_filter_txt'] = 'Importovat uživatelský filter'; $wb['import_spamfilter_txt'] = 'Importovat spamový filter'; ?> - diff --git a/interface/web/tools/lib/lang/cz_index.lng b/interface/web/tools/lib/lang/cz_index.lng index c3db96e19d..5ebf1ec341 100644 --- a/interface/web/tools/lib/lang/cz_index.lng +++ b/interface/web/tools/lib/lang/cz_index.lng @@ -2,4 +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 1ac22ec6ca..507b7c3cbe 100644 --- a/interface/web/tools/lib/lang/cz_interface.lng +++ b/interface/web/tools/lib/lang/cz_interface.lng @@ -5,4 +5,3 @@ $wb['language_txt'] = 'Jazyk'; $wb['startmodule_txt'] = 'Výchozí modul po přihlášení'; $wb['app_theme_txt'] = 'Výchozí grafické téma'; ?> - diff --git a/interface/web/tools/lib/lang/cz_resync.lng b/interface/web/tools/lib/lang/cz_resync.lng index ff1e3a586a..96d622e28a 100644 --- a/interface/web/tools/lib/lang/cz_resync.lng +++ b/interface/web/tools/lib/lang/cz_resync.lng @@ -11,4 +11,3 @@ $wb['resync_dns_txt'] = 'Resynchronizovat DNS záznamy'; $wb['btn_start_txt'] = 'Zahájit'; $wb['btn_cancel_txt'] = 'Zrušit'; ?> - diff --git a/interface/web/tools/lib/lang/cz_tpl_default.lng b/interface/web/tools/lib/lang/cz_tpl_default.lng index fb77e7cb0a..0f037f1590 100644 --- a/interface/web/tools/lib/lang/cz_tpl_default.lng +++ b/interface/web/tools/lib/lang/cz_tpl_default.lng @@ -5,4 +5,3 @@ $wb['no_settings_txt'] = 'Nejsou žádné nastavení pro výchozí motiv.'; $wb['btn_start_txt'] = 'Uložit'; $wb['btn_cancel_txt'] = 'Zpět'; ?> - diff --git a/interface/web/tools/lib/lang/cz_usersettings.lng b/interface/web/tools/lib/lang/cz_usersettings.lng index eb3599b851..dec46b7a06 100644 --- a/interface/web/tools/lib/lang/cz_usersettings.lng +++ b/interface/web/tools/lib/lang/cz_usersettings.lng @@ -10,4 +10,3 @@ $wb['repeat_password_txt'] = 'Opakujte heslo'; $wb['password_mismatch_txt'] = 'Hesla se neshodují.'; $wb['password_match_txt'] = 'Hesla se shodují.'; ?> - diff --git a/interface/web/tools/lib/lang/de.lng b/interface/web/tools/lib/lang/de.lng index 4f0aea4218..5a1c501cb5 100644 --- a/interface/web/tools/lib/lang/de.lng +++ b/interface/web/tools/lib/lang/de.lng @@ -1,13 +1,13 @@ diff --git a/interface/web/tools/lib/lang/de_import_ispconfig.lng b/interface/web/tools/lib/lang/de_import_ispconfig.lng index f9e171de34..d8ae6cf1a7 100644 --- a/interface/web/tools/lib/lang/de_import_ispconfig.lng +++ b/interface/web/tools/lib/lang/de_import_ispconfig.lng @@ -1,20 +1,20 @@ diff --git a/interface/web/tools/lib/lang/de_interface.lng b/interface/web/tools/lib/lang/de_interface.lng index 58dce22f2a..2af008f763 100644 --- a/interface/web/tools/lib/lang/de_interface.lng +++ b/interface/web/tools/lib/lang/de_interface.lng @@ -1,5 +1,5 @@ diff --git a/interface/web/vm/lib/lang/cz.lng b/interface/web/vm/lib/lang/cz.lng index 5c1ab58229..4167e14a8a 100644 --- a/interface/web/vm/lib/lang/cz.lng +++ b/interface/web/vm/lib/lang/cz.lng @@ -5,4 +5,3 @@ $wb['VM Templates'] = 'VM Templates'; $wb['IP addresses'] = 'IP addresses'; $wb['OpenVZ'] = 'OpenVZ'; ?> - diff --git a/interface/web/vm/lib/lang/cz_openvz_action.lng b/interface/web/vm/lib/lang/cz_openvz_action.lng index 84682fc15a..3e2e3e0b84 100644 --- a/interface/web/vm/lib/lang/cz_openvz_action.lng +++ b/interface/web/vm/lib/lang/cz_openvz_action.lng @@ -14,4 +14,3 @@ $wb['ostemplate_name_error'] = 'The OSTemplate name conatains unallowed characte $wb['ostemplate_name_unique_error'] = 'There is already a OSTemplate with that name.'; $wb['ostemplate_exec_txt'] = 'The command to create a OSTemplate has been sent to the host server. It will take several minutes until the OSTemplate has been created.'; ?> - diff --git a/interface/web/vm/lib/lang/cz_openvz_ip.lng b/interface/web/vm/lib/lang/cz_openvz_ip.lng index 67f688576a..6016681df8 100644 --- a/interface/web/vm/lib/lang/cz_openvz_ip.lng +++ b/interface/web/vm/lib/lang/cz_openvz_ip.lng @@ -7,4 +7,3 @@ $wb['ip_error_wrong'] = 'Please fill in a valid IPv4 address.'; $wb['ip_error_unique'] = 'This IP address does already exist.'; $wb['IP address'] = 'IP address'; ?> - diff --git a/interface/web/vm/lib/lang/cz_openvz_ip_list.lng b/interface/web/vm/lib/lang/cz_openvz_ip_list.lng index 37c1d62e7c..e6a3a68c2c 100644 --- a/interface/web/vm/lib/lang/cz_openvz_ip_list.lng +++ b/interface/web/vm/lib/lang/cz_openvz_ip_list.lng @@ -5,4 +5,3 @@ $wb['ip_address_txt'] = 'IP address'; $wb['reserved_txt'] = 'Reserved'; $wb['vm_id_txt'] = 'VM'; ?> - diff --git a/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng b/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng index 97741100e4..72838a20de 100644 --- a/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng +++ b/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng @@ -9,4 +9,3 @@ $wb['template_name_error_empty'] = 'Template name is empty.'; $wb['template_file_error_empty'] = 'Template filename is empty.'; $wb['Template'] = 'Šablona'; ?> - diff --git a/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng b/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng index 930b33f5bb..7705a4d18f 100644 --- a/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng +++ b/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng @@ -6,4 +6,3 @@ $wb['server_id_txt'] = 'Server'; $wb['allservers_txt'] = 'Exists on all servers'; $wb['ostemplate_id_txt'] = 'ID'; ?> - diff --git a/interface/web/vm/lib/lang/cz_openvz_template.lng b/interface/web/vm/lib/lang/cz_openvz_template.lng index cf926f6b33..12c80bd6c1 100644 --- a/interface/web/vm/lib/lang/cz_openvz_template.lng +++ b/interface/web/vm/lib/lang/cz_openvz_template.lng @@ -91,4 +91,3 @@ $wb['swappages_error_empty'] = 'Swappages is empty.'; $wb['Template'] = 'Šablona'; $wb['Advanced'] = 'Pokročilý'; ?> - diff --git a/interface/web/vm/lib/lang/cz_openvz_template_list.lng b/interface/web/vm/lib/lang/cz_openvz_template_list.lng index 353e760ea6..89c11ef5d1 100644 --- a/interface/web/vm/lib/lang/cz_openvz_template_list.lng +++ b/interface/web/vm/lib/lang/cz_openvz_template_list.lng @@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'OpenVZ Virtual Machine Template'; $wb['active_txt'] = 'Aktivní'; $wb['template_name_txt'] = 'Název šablony'; ?> - diff --git a/interface/web/vm/lib/lang/cz_openvz_vm.lng b/interface/web/vm/lib/lang/cz_openvz_vm.lng index b9043e4a95..adfa56f0d5 100644 --- a/interface/web/vm/lib/lang/cz_openvz_vm.lng +++ b/interface/web/vm/lib/lang/cz_openvz_vm.lng @@ -38,4 +38,3 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.'; $wb['Virtual server'] = 'Virtual server'; $wb['Advanced'] = 'Pokročilý'; ?> - diff --git a/interface/web/vm/lib/lang/cz_openvz_vm_list.lng b/interface/web/vm/lib/lang/cz_openvz_vm_list.lng index 9fa15b92ee..1371c4b70e 100644 --- a/interface/web/vm/lib/lang/cz_openvz_vm_list.lng +++ b/interface/web/vm/lib/lang/cz_openvz_vm_list.lng @@ -8,4 +8,3 @@ $wb['hostname_txt'] = 'Hostname'; $wb['ip_address_txt'] = 'IP address'; $wb['veid_txt'] = 'VEID'; ?> - diff --git a/server/lib/classes/aps_installer.inc.php b/server/lib/classes/aps_installer.inc.php index 9bb8db41a3..5951698806 100644 --- a/server/lib/classes/aps_installer.inc.php +++ b/server/lib/classes/aps_installer.inc.php @@ -397,8 +397,28 @@ class ApsInstaller extends ApsBase // Now delete an existing folder (affects install and removal in the same way) @chdir($this->local_installpath); - if(file_exists($this->local_installpath)) exec("rm -Rf ".escapeshellarg($this->local_installpath).'*'); - else mkdir($this->local_installpath, 0777, true); + if(file_exists($this->local_installpath)){ + // make sure we don't delete error and stats folders + if($this->local_installpath == $this->document_root.'/'){ + if(is_dir($this->document_root)){ + $files = array_diff(scandir($this->document_root), array('.','..','error','stats')); + foreach($files as $file){ + if(is_dir($this->document_root.'/'.$file)){ + $app->file->removeDirectory($this->document_root.'/'.$file); + } else { + @unlink($this->document_root.'/'.$file); + } + } + } else { + @unlink($this->document_root); + mkdir($this->document_root, 0777, true); + } + } else { + exec("rm -Rf ".escapeshellarg($this->local_installpath).'*'); + } + } else { + mkdir($this->local_installpath, 0777, true); + } if($this->handle_type == 'install') { @@ -614,7 +634,7 @@ class ApsInstaller extends ApsBase if(!isset($task['instance_id'])) $task['instance_id'] = $instanceid; // Download aps package - if(!file_exists($this->packages_dir.'/'.$task['path'])) { + if(!file_exists($this->packages_dir.'/'.$task['path']) || filesize($this->packages_dir.'/'.$task['path']) == 0) { $ch = curl_init(); $fh = fopen($this->packages_dir.'/'.$task['path'], 'wb'); curl_setopt($ch, CURLOPT_FILE, $fh); diff --git a/server/lib/classes/file.inc.php b/server/lib/classes/file.inc.php index 47b537529f..c1f031b791 100644 --- a/server/lib/classes/file.inc.php +++ b/server/lib/classes/file.inc.php @@ -268,6 +268,23 @@ class file{ } return $passed; } + + function removeDirectory($dir){ + //TODO: implement something to delete files/directories recursively that are owned by a certain user or group + if(is_dir($dir)){ + $files = array_diff(scandir($dir), array('.','..')); + if(is_array($files) && !empty($files)){ + foreach($files as $file){ + if(is_dir($dir.'/'.$file)){ + $this->removeDirectory($dir.'/'.$file); + } else { + @unlink($dir.'/'.$file); + } + } + } + @rmdir($dir); + } + } } ?> diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php index bfe0df288d..92b3ecb733 100644 --- a/server/lib/classes/monitor_tools.inc.php +++ b/server/lib/classes/monitor_tools.inc.php @@ -302,7 +302,7 @@ class monitor_tools { $state = 'ok'; //* Fetch the data for all users - $dfData = shell_exec('repquota -au'); + $dfData = shell_exec('repquota -au 2>/dev/null'); //* Split into array $df = explode("\n", $dfData); @@ -330,7 +330,7 @@ class monitor_tools { } //** Fetch the data for all users - $dfData = shell_exec('repquota -ag'); + $dfData = shell_exec('repquota -ag 2>/dev/null'); //* split into array $df = explode("\n", $dfData); @@ -485,7 +485,7 @@ class monitor_tools { $state = 'ok'; /** Fetch the data of ALL devices into a array (needed for monitoring!) */ - $dfData = shell_exec('df -hT'); + $dfData = shell_exec('df -hT 2>/dev/null'); // split into array $df = explode("\n", $dfData); @@ -1309,7 +1309,7 @@ class monitor_tools { system('which iptables', $retval); // Debian, Ubuntu, Fedora if ($retval === 0) { /* Get the data of the log */ - $data['output'] = '

iptables -S (ipv4)

'.shell_exec('iptables -S'); + $data['output'] = '

iptables -S (ipv4)

'.shell_exec('iptables -S 2>/dev/null'); /* * At this moment, there is no state (maybe later) @@ -1325,7 +1325,7 @@ class monitor_tools { system('which ip6tables', $retval); // Debian, Ubuntu, Fedora if ($retval === 0) { /* Get the data of the log */ - $data['output'] .= '

ip6tables -S (ipv6)

'.shell_exec('ip6tables -S'); + $data['output'] .= '

ip6tables -S (ipv6)

'.shell_exec('ip6tables -S 2>/dev/null'); /* * At this moment, there is no state (maybe later) diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php index c10e6ff220..07bcc64f05 100644 --- a/server/lib/classes/system.inc.php +++ b/server/lib/classes/system.inc.php @@ -1537,6 +1537,12 @@ class system{ return intval($string); } } + + function is_mounted($mountpoint){ + $cmd = 'df 2>/dev/null | grep " '.$mountpoint.'$"'; + exec($cmd, $output, $return_var); + return $return_var == 0 ? true : false; + } } ?> diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index 1892db178d..62392d38fe 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -429,7 +429,7 @@ class apache2_plugin { } if($data['new']['document_root'] == '') { - $app->log('document_root not set',LOGLEVEL_WARN); + if($data['new']['type'] == 'vhost' || $data['new']['type'] == 'vhostsubdomain') $app->log('document_root not set',LOGLEVEL_WARN); return 0; } if($data['new']['system_user'] == 'root' or $data['new']['system_group'] == 'root') { @@ -551,10 +551,10 @@ class apache2_plugin { exec('chown --recursive --from='.escapeshellcmd($data['old']['system_user']).':'.escapeshellcmd($data['old']['system_group']).' '.escapeshellcmd($data['new']['system_user']).':'.escapeshellcmd($data['new']['system_group']).' '.$new_dir); //* Change the home directory and group of the website user - $command = 'usermod'; + $command = 'killall -u '.escapeshellcmd($data['new']['system_user']).' && usermod'; $command .= ' --home '.escapeshellcmd($data['new']['document_root']); $command .= ' --gid '.escapeshellcmd($data['new']['system_group']); - $command .= ' '.escapeshellcmd($data['new']['system_user']); + $command .= ' '.escapeshellcmd($data['new']['system_user']).' 2>/dev/null'; exec($command); } @@ -790,7 +790,7 @@ class apache2_plugin { if($web_config['add_web_users_to_sshusers_group'] == 'y') { $command = 'usermod'; $command .= ' --groups sshusers'; - $command .= ' '.escapeshellcmd($data['new']['system_user']); + $command .= ' '.escapeshellcmd($data['new']['system_user']).' 2>/dev/null'; $this->_exec($command); } @@ -1179,10 +1179,6 @@ class apache2_plugin { } else { $tpl->setVar('rewrite_enabled',0); } - - if(count($alias_seo_redirects) > 0) { - $tpl->setLoop('alias_seo_redirects',$alias_seo_redirects); - } //$tpl->setLoop('redirects',$rewrite_rules); @@ -1395,12 +1391,12 @@ class apache2_plugin { //* create empty vhost array $vhosts = array(); - //* Add vhost for ipv4 IP - if(count($rewrite_rules) > 0){ - $vhosts[] = array('ip_address' => $data['new']['ip_address'], 'ssl_enabled' => 0, 'port' => 80, 'redirects' => $rewrite_rules); - } else { - $vhosts[] = array('ip_address' => $data['new']['ip_address'], 'ssl_enabled' => 0, 'port' => 80); - } + //* Add vhost for ipv4 IP + $tmp_vhost_arr = array('ip_address' => $data['new']['ip_address'], 'ssl_enabled' => 0, 'port' => 80); + if(count($rewrite_rules) > 0) $tmp_vhost_arr = $tmp_vhost_arr + array('redirects' => $rewrite_rules); + if(count($alias_seo_redirects) > 0) $tmp_vhost_arr = $tmp_vhost_arr + array('alias_seo_redirects' => $alias_seo_redirects); + $vhosts[] = $tmp_vhost_arr; + unset($tmp_vhost_arr); //* Add vhost for ipv4 IP with SSL $ssl_dir = $data['new']['document_root'].'/ssl'; @@ -1409,11 +1405,11 @@ class apache2_plugin { $crt_file = $ssl_dir.'/'.$domain.'.crt'; if($data['new']['ssl_domain'] != '' && $data['new']['ssl'] == 'y' && @is_file($crt_file) && @is_file($key_file) && (@filesize($crt_file)>0) && (@filesize($key_file)>0)) { - if(count($rewrite_rules) > 0){ - $vhosts[] = array('ip_address' => $data['new']['ip_address'], 'ssl_enabled' => 1, 'port' => '443', 'redirects' => $rewrite_rules); - } else { - $vhosts[] = array('ip_address' => $data['new']['ip_address'], 'ssl_enabled' => 1, 'port' => '443'); - } + $tmp_vhost_arr = array('ip_address' => $data['new']['ip_address'], 'ssl_enabled' => 1, 'port' => '443'); + if(count($rewrite_rules) > 0) $tmp_vhost_arr = $tmp_vhost_arr + array('redirects' => $rewrite_rules); + if(count($alias_seo_redirects) > 0) $tmp_vhost_arr = $tmp_vhost_arr + array('alias_seo_redirects' => $alias_seo_redirects); + $vhosts[] = $tmp_vhost_arr; + unset($tmp_vhost_arr); $app->log('Enable SSL for: '.$domain,LOGLEVEL_DEBUG); } @@ -1430,20 +1426,20 @@ class apache2_plugin { $data['new']['ipv6_address'] = implode(':',$explode_v6); } } - if(count($rewrite_rules) > 0){ - $vhosts[] = array('ip_address' => '['.$data['new']['ipv6_address'].']', 'ssl_enabled' => 0, 'port' => 80, 'redirects' => $rewrite_rules); - } else { - $vhosts[] = array('ip_address' => '['.$data['new']['ipv6_address'].']', 'ssl_enabled' => 0, 'port' => 80); - } + + $tmp_vhost_arr = array('ip_address' => '['.$data['new']['ipv6_address'].']', 'ssl_enabled' => 0, 'port' => 80); + if(count($rewrite_rules) > 0) $tmp_vhost_arr = $tmp_vhost_arr + array('redirects' => $rewrite_rules); + if(count($alias_seo_redirects) > 0) $tmp_vhost_arr = $tmp_vhost_arr + array('alias_seo_redirects' => $alias_seo_redirects); + $vhosts[] = $tmp_vhost_arr; + unset($tmp_vhost_arr); //* Add vhost for ipv6 IP with SSL if($data['new']['ssl_domain'] != '' && $data['new']['ssl'] == 'y' && @is_file($crt_file) && @is_file($key_file) && (@filesize($crt_file)>0) && (@filesize($key_file)>0)) { - - if(count($rewrite_rules) > 0){ - $vhosts[] = array('ip_address' => '['.$data['new']['ipv6_address'].']', 'ssl_enabled' => 1, 'port' => '443', 'redirects' => $rewrite_rules); - } else { - $vhosts[] = array('ip_address' => '['.$data['new']['ipv6_address'].']', 'ssl_enabled' => 1, 'port' => '443'); - } + $tmp_vhost_arr = array('ip_address' => '['.$data['new']['ipv6_address'].']', 'ssl_enabled' => 1, 'port' => '443'); + if(count($rewrite_rules) > 0) $tmp_vhost_arr = $tmp_vhost_arr + array('redirects' => $rewrite_rules); + if(count($alias_seo_redirects) > 0) $tmp_vhost_arr = $tmp_vhost_arr + array('alias_seo_redirects' => $alias_seo_redirects); + $vhosts[] = $tmp_vhost_arr; + unset($tmp_vhost_arr); $app->log('Enable SSL for IPv6: '.$domain,LOGLEVEL_DEBUG); } } @@ -1646,7 +1642,7 @@ class apache2_plugin { $app->uses('system'); $web_config = $app->getconf->get_server_config($conf['server_id'], 'web'); - $app->system->web_folder_protection($data['old']['document_root'],false); + if($data['old']['type'] == 'vhost' || $data['old']['type'] == 'vhostsubdomain') $app->system->web_folder_protection($data['old']['document_root'],false); //* Check if this is a chrooted setup if($web_config['website_basedir'] != '' && @is_file($web_config['website_basedir'].'/etc/passwd')) { @@ -1660,18 +1656,71 @@ class apache2_plugin { $web_folder = ''; if($data['old']['type'] == 'vhostsubdomain') { $tmp = $app->db->queryOneRecord('SELECT `domain`,`document_root` FROM web_domain WHERE domain_id = '.intval($data['old']['parent_domain_id'])); - $subdomain_host = preg_replace('/^(.*)\.' . preg_quote($tmp['domain'], '/') . '$/', '$1', $data['old']['domain']); - if($subdomain_host == '') $subdomain_host = 'web'.$data['old']['domain_id']; - $web_folder = $data['old']['web_folder']; - $log_folder .= '/' . $subdomain_host; + if($tmp['domain'] != ''){ + $subdomain_host = preg_replace('/^(.*)\.' . preg_quote($tmp['domain'], '/') . '$/', '$1', $data['old']['domain']); + } else { + // get log folder from /etc/fstab + /* + $bind_mounts = $app->system->file_get_contents('/etc/fstab'); + $bind_mount_lines = explode("\n", $bind_mounts); + if(is_array($bind_mount_lines) && !empty($bind_mount_lines)){ + foreach($bind_mount_lines as $bind_mount_line){ + $bind_mount_line = preg_replace('/\s+/', ' ', $bind_mount_line); + $bind_mount_parts = explode(' ', $bind_mount_line); + if(is_array($bind_mount_parts) && !empty($bind_mount_parts)){ + if($bind_mount_parts[0] == '/var/log/ispconfig/httpd/'.$data['old']['domain'] && $bind_mount_parts[2] == 'none' && strpos($bind_mount_parts[3], 'bind') !== false){ + $subdomain_host = str_replace($data['old']['document_root'].'/log/', '', $bind_mount_parts[1]); + } + } + } + } + */ + // we are deleting the parent domain, so we can delete everything in the log directory + $subdomain_hosts = array(); + $files = array_diff(scandir($data['old']['document_root'].'/'.$log_folder), array('.','..')); + if(is_array($files) && !empty($files)){ + foreach($files as $file){ + if(is_dir($data['old']['document_root'].'/'.$log_folder.'/'.$file)){ + $subdomain_hosts[] = $file; + } + } + } + } + if(is_array($subdomain_hosts) && !empty($subdomain_hosts)){ + $log_folders = array(); + foreach($subdomain_hosts as $subdomain_host){ + $log_folders[] = $log_folder.'/'.$subdomain_host; + } + } else { + if($subdomain_host == '') $subdomain_host = 'web'.$data['old']['domain_id']; + $log_folder .= '/' . $subdomain_host; + } + $web_folder = $data['old']['web_folder']; unset($tmp); + unset($subdomain_hosts); } - exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder)); + if($data['old']['type'] == 'vhost' || $data['old']['type'] == 'vhostsubdomain'){ + if(is_array($log_folders) && !empty($log_folders)){ + foreach($log_folders as $log_folder){ + if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder)); + } + } else { + if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder)); + } + } //* remove mountpoint from fstab - $fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$log_folder.' none bind'; - $app->system->removeLine('/etc/fstab',$fstab_line); + if(is_array($log_folders) && !empty($log_folders)){ + foreach($log_folders as $log_folder){ + $fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$log_folder.' none bind'; + $app->system->removeLine('/etc/fstab',$fstab_line); + } + } else { + $fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$log_folder.' none bind'; + $app->system->removeLine('/etc/fstab',$fstab_line); + } + unset($log_folders); if($data['old']['type'] != 'vhost' && $data['old']['type'] != 'vhostsubdomain' && $data['old']['parent_domain_id'] > 0) { //* This is a alias domain or subdomain, so we have to update the website instead @@ -1837,8 +1886,8 @@ class apache2_plugin { if($data['old']['type'] == 'vhost') { //delete the web user - $command = 'userdel'; - $command .= ' '.$data['old']['system_user']; + $command = 'killall -u '.escapeshellcmd($data['old']['system_user']).' && userdel'; + $command .= ' '.escapeshellcmd($data['old']['system_user']); exec($command); if($apache_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' '.$command); diff --git a/server/plugins-available/cron_jailkit_plugin.inc.php b/server/plugins-available/cron_jailkit_plugin.inc.php index 8df854a31d..963d71efe9 100644 --- a/server/plugins-available/cron_jailkit_plugin.inc.php +++ b/server/plugins-available/cron_jailkit_plugin.inc.php @@ -124,7 +124,7 @@ class cron_jailkit_plugin { $this->_add_jailkit_user(); - $command .= 'usermod -U '.escapeshellcmd($parent_domain["system_user"]); + $command .= 'usermod -U '.escapeshellcmd($parent_domain["system_user"]).' 2>/dev/null'; exec($command); $this->_update_website_security_level(); @@ -223,7 +223,7 @@ class cron_jailkit_plugin { $command = '/usr/local/ispconfig/server/scripts/create_jailkit_chroot.sh'; $command .= ' '.escapeshellcmd($this->parent_domain['document_root']); $command .= ' \''.$this->jailkit_config['jailkit_chroot_app_sections'].'\''; - exec($command); + exec($command.' 2>/dev/null'); $this->app->log("Added jailkit chroot with command: ".$command,LOGLEVEL_DEBUG); @@ -268,14 +268,14 @@ class cron_jailkit_plugin { $command = '/usr/local/ispconfig/server/scripts/create_jailkit_programs.sh'; $command .= ' '.escapeshellcmd($this->parent_domain['document_root']); $command .= ' \''.$this->jailkit_config['jailkit_chroot_app_programs'].'\''; - exec($command); + exec($command.' 2>/dev/null'); $this->app->log("Added programs to jailkit chroot with command: ".$command,LOGLEVEL_DEBUG); $command = '/usr/local/ispconfig/server/scripts/create_jailkit_programs.sh'; $command .= ' '.escapeshellcmd($this->parent_domain['document_root']); $command .= ' \''.$this->jailkit_config['jailkit_chroot_cron_programs'].'\''; - exec($command); + exec($command.' 2>/dev/null'); $this->app->log("Added cron programs to jailkit chroot with command: ".$command,LOGLEVEL_DEBUG); } @@ -299,7 +299,7 @@ class cron_jailkit_plugin { $command .= ' '.escapeshellcmd($this->parent_domain['document_root']); $command .= ' '.$jailkit_chroot_userhome; $command .= ' '.escapeshellcmd("/bin/bash"); - exec($command); + exec($command.' 2>/dev/null'); $this->app->log("Added jailkit user to chroot with command: ".$command,LOGLEVEL_DEBUG); diff --git a/server/plugins-available/firewall_plugin.inc.php b/server/plugins-available/firewall_plugin.inc.php index 08f735cfeb..7197ccc6a9 100644 --- a/server/plugins-available/firewall_plugin.inc.php +++ b/server/plugins-available/firewall_plugin.inc.php @@ -202,7 +202,7 @@ class firewall_plugin { $app->log('Reloading the firewall',LOGLEVEL_DEBUG); } else { //* Ensure that bastille firewall is stopped - exec($conf['init_scripts'] . '/' . 'bastille-firewall stop'); + exec($conf['init_scripts'] . '/' . 'bastille-firewall stop 2>/dev/null'); if(@is_file('/etc/debian_version')) exec('update-rc.d -f bastille-firewall remove'); //* Start ufw firewall @@ -255,11 +255,11 @@ class firewall_plugin { if($app->system->is_installed('ufw')) { exec('ufw disable'); } - exec($conf['init_scripts'] . '/' . 'bastille-firewall restart'); + exec($conf['init_scripts'] . '/' . 'bastille-firewall restart 2>/dev/null'); if(@is_file('/etc/debian_version')) exec('update-rc.d bastille-firewall defaults'); $app->log('Restarting the firewall',LOGLEVEL_DEBUG); } else { - exec($conf['init_scripts'] . '/' . 'bastille-firewall stop'); + exec($conf['init_scripts'] . '/' . 'bastille-firewall stop 2>/dev/null'); if(@is_file('/etc/debian_version')) exec('update-rc.d -f bastille-firewall remove'); $app->log('Stopping the firewall',LOGLEVEL_DEBUG); } @@ -270,7 +270,7 @@ class firewall_plugin { private function bastille_delete($event_name,$data) { global $app, $conf; - exec($conf['init_scripts'] . '/' . 'bastille-firewall stop'); + exec($conf['init_scripts'] . '/' . 'bastille-firewall stop 2>/dev/null'); if(@is_file('/etc/debian_version')) exec('update-rc.d -f bastille-firewall remove'); $app->log('Stopping the firewall',LOGLEVEL_DEBUG); diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php index 7fa3570e36..1a593aa53f 100644 --- a/server/plugins-available/nginx_plugin.inc.php +++ b/server/plugins-available/nginx_plugin.inc.php @@ -347,7 +347,7 @@ class nginx_plugin { } if($data['new']['document_root'] == '') { - $app->log('document_root not set',LOGLEVEL_WARN); + if($data['new']['type'] == 'vhost' || $data['new']['type'] == 'vhostsubdomain') $app->log('document_root not set',LOGLEVEL_WARN); return 0; } if($data['new']['system_user'] == 'root' or $data['new']['system_group'] == 'root') { @@ -435,41 +435,43 @@ class nginx_plugin { } } - //* Move the site data - $tmp_docroot = explode('/',$data['new']['document_root']); - unset($tmp_docroot[count($tmp_docroot)-1]); - $new_dir = implode('/',$tmp_docroot); + if($data["new"]["type"] != "vhostsubdomain") { + //* Move the site data + $tmp_docroot = explode('/',$data['new']['document_root']); + unset($tmp_docroot[count($tmp_docroot)-1]); + $new_dir = implode('/',$tmp_docroot); - $tmp_docroot = explode('/',$data['old']['document_root']); - unset($tmp_docroot[count($tmp_docroot)-1]); - $old_dir = implode('/',$tmp_docroot); + $tmp_docroot = explode('/',$data['old']['document_root']); + unset($tmp_docroot[count($tmp_docroot)-1]); + $old_dir = implode('/',$tmp_docroot); - //* Check if there is already some data in the new docroot and rename it as we need a clean path to move the existing site to the new path - if(@is_dir($data['new']['document_root'])) { - $app->system->web_folder_protection($data['new']['document_root'],false); - $app->system->rename($data['new']['document_root'],$data['new']['document_root'].'_bak_'.date('Y_m_d_H_i_s')); - $app->log('Renaming existing directory in new docroot location. mv '.$data['new']['document_root'].' '.$data['new']['document_root'].'_bak_'.date('Y_m_d_H_i_s'),LOGLEVEL_DEBUG); - } + //* Check if there is already some data in the new docroot and rename it as we need a clean path to move the existing site to the new path + if(@is_dir($data['new']['document_root'])) { + $app->system->web_folder_protection($data['new']['document_root'],false); + $app->system->rename($data['new']['document_root'],$data['new']['document_root'].'_bak_'.date('Y_m_d_H_i_s')); + $app->log('Renaming existing directory in new docroot location. mv '.$data['new']['document_root'].' '.$data['new']['document_root'].'_bak_'.date('Y_m_d_H_i_s'),LOGLEVEL_DEBUG); + } - //* Create new base directory, if it does not exist yet - if(!is_dir($new_dir)) $app->system->mkdirpath($new_dir); - $app->system->web_folder_protection($data['old']['document_root'],false); - exec('mv '.escapeshellarg($data['old']['document_root']).' '.escapeshellarg($new_dir)); - //$app->system->rename($data['old']['document_root'],$new_dir); - $app->log('Moving site to new document root: mv '.$data['old']['document_root'].' '.$new_dir,LOGLEVEL_DEBUG); - - // Handle the change in php_open_basedir - $data['new']['php_open_basedir'] = str_replace($data['old']['document_root'],$data['new']['document_root'],$data['old']['php_open_basedir']); - - //* Change the owner of the website files to the new website owner - exec('chown --recursive --from='.escapeshellcmd($data['old']['system_user']).':'.escapeshellcmd($data['old']['system_group']).' '.escapeshellcmd($data['new']['system_user']).':'.escapeshellcmd($data['new']['system_group']).' '.$new_dir); - - //* Change the home directory and group of the website user - $command = 'usermod'; - $command .= ' --home '.escapeshellcmd($data['new']['document_root']); - $command .= ' --gid '.escapeshellcmd($data['new']['system_group']); - $command .= ' '.escapeshellcmd($data['new']['system_user']); - exec($command); + //* Create new base directory, if it does not exist yet + if(!is_dir($new_dir)) $app->system->mkdirpath($new_dir); + $app->system->web_folder_protection($data['old']['document_root'],false); + exec('mv '.escapeshellarg($data['old']['document_root']).' '.escapeshellarg($new_dir)); + //$app->system->rename($data['old']['document_root'],$new_dir); + $app->log('Moving site to new document root: mv '.$data['old']['document_root'].' '.$new_dir,LOGLEVEL_DEBUG); + + // Handle the change in php_open_basedir + $data['new']['php_open_basedir'] = str_replace($data['old']['document_root'],$data['new']['document_root'],$data['old']['php_open_basedir']); + + //* Change the owner of the website files to the new website owner + exec('chown --recursive --from='.escapeshellcmd($data['old']['system_user']).':'.escapeshellcmd($data['old']['system_group']).' '.escapeshellcmd($data['new']['system_user']).':'.escapeshellcmd($data['new']['system_group']).' '.$new_dir); + + //* Change the home directory and group of the website user + $command = 'killall -u '.escapeshellcmd($data['new']['system_user']).' && usermod'; + $command .= ' --home '.escapeshellcmd($data['new']['document_root']); + $command .= ' --gid '.escapeshellcmd($data['new']['system_group']); + $command .= ' '.escapeshellcmd($data['new']['system_user']).' 2>/dev/null'; + exec($command); + } if($nginx_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' '.$command); @@ -703,7 +705,7 @@ class nginx_plugin { if($web_config['add_web_users_to_sshusers_group'] == 'y') { $command = 'usermod'; $command .= ' --groups sshusers'; - $command .= ' '.escapeshellcmd($data['new']['system_user']); + $command .= ' '.escapeshellcmd($data['new']['system_user']).' 2>/dev/null'; $this->_exec($command); } @@ -1621,7 +1623,7 @@ class nginx_plugin { $app->uses('system'); $web_config = $app->getconf->get_server_config($conf['server_id'], 'web'); - $app->system->web_folder_protection($data['old']['document_root'],false); + if($data['old']['type'] == 'vhost' || $data['old']['type'] == 'vhostsubdomain') $app->system->web_folder_protection($data['old']['document_root'],false); //* Check if this is a chrooted setup if($web_config['website_basedir'] != '' && @is_file($web_config['website_basedir'].'/etc/passwd')) { @@ -1635,18 +1637,71 @@ class nginx_plugin { $web_folder = ''; if($data['old']['type'] == 'vhostsubdomain') { $tmp = $app->db->queryOneRecord('SELECT `domain`,`document_root` FROM web_domain WHERE domain_id = '.intval($data['old']['parent_domain_id'])); - $subdomain_host = preg_replace('/^(.*)\.' . preg_quote($tmp['domain'], '/') . '$/', '$1', $data['old']['domain']); - if($subdomain_host == '') $subdomain_host = 'web'.$data['old']['domain_id']; - $web_folder = $data['old']['web_folder']; - $log_folder .= '/' . $subdomain_host; + if($tmp['domain'] != ''){ + $subdomain_host = preg_replace('/^(.*)\.' . preg_quote($tmp['domain'], '/') . '$/', '$1', $data['old']['domain']); + } else { + // get log folder from /etc/fstab + /* + $bind_mounts = $app->system->file_get_contents('/etc/fstab'); + $bind_mount_lines = explode("\n", $bind_mounts); + if(is_array($bind_mount_lines) && !empty($bind_mount_lines)){ + foreach($bind_mount_lines as $bind_mount_line){ + $bind_mount_line = preg_replace('/\s+/', ' ', $bind_mount_line); + $bind_mount_parts = explode(' ', $bind_mount_line); + if(is_array($bind_mount_parts) && !empty($bind_mount_parts)){ + if($bind_mount_parts[0] == '/var/log/ispconfig/httpd/'.$data['old']['domain'] && $bind_mount_parts[2] == 'none' && strpos($bind_mount_parts[3], 'bind') !== false){ + $subdomain_host = str_replace($data['old']['document_root'].'/log/', '', $bind_mount_parts[1]); + } + } + } + } + */ + // we are deleting the parent domain, so we can delete everything in the log directory + $subdomain_hosts = array(); + $files = array_diff(scandir($data['old']['document_root'].'/'.$log_folder), array('.','..')); + if(is_array($files) && !empty($files)){ + foreach($files as $file){ + if(is_dir($data['old']['document_root'].'/'.$log_folder.'/'.$file)){ + $subdomain_hosts[] = $file; + } + } + } + } + if(is_array($subdomain_hosts) && !empty($subdomain_hosts)){ + $log_folders = array(); + foreach($subdomain_hosts as $subdomain_host){ + $log_folders[] = $log_folder.'/'.$subdomain_host; + } + } else { + if($subdomain_host == '') $subdomain_host = 'web'.$data['old']['domain_id']; + $log_folder .= '/' . $subdomain_host; + } + $web_folder = $data['old']['web_folder']; unset($tmp); + unset($subdomain_hosts); } - exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder)); + if($data['old']['type'] == 'vhost' || $data['old']['type'] == 'vhostsubdomain'){ + if(is_array($log_folders) && !empty($log_folders)){ + foreach($log_folders as $log_folder){ + if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder)); + } + } else { + if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder)); + } + } //* remove mountpoint from fstab - $fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$log_folder.' none bind'; - $app->system->removeLine('/etc/fstab',$fstab_line); + if(is_array($log_folders) && !empty($log_folders)){ + foreach($log_folders as $log_folder){ + $fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$log_folder.' none bind'; + $app->system->removeLine('/etc/fstab',$fstab_line); + } + } else { + $fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$log_folder.' none bind'; + $app->system->removeLine('/etc/fstab',$fstab_line); + } + unset($log_folders); if($data['old']['type'] != 'vhost' && $data['old']['type'] != 'vhostsubdomain' && $data['old']['parent_domain_id'] > 0) { //* This is a alias domain or subdomain, so we have to update the website instead @@ -1815,8 +1870,8 @@ class nginx_plugin { if($data['old']['type'] == 'vhost') { //delete the web user - $command = 'userdel'; - $command .= ' '.$data['old']['system_user']; + $command = 'killall -u '.escapeshellcmd($data['old']['system_user']).' && userdel'; + $command .= ' '.escapeshellcmd($data['old']['system_user']); exec($command); if($nginx_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' '.$command); @@ -2326,6 +2381,15 @@ class nginx_plugin { } } + private function nginx_replace($matches){ + $location = 'location'.($matches[1] != '' ? ' '.$matches[1] : '').' '.$matches[2].' '.$matches[3]; + if($matches[4] == '##merge##' || $matches[7] == '##merge##') $location .= ' ##merge##'; + $location .= "\n"; + $location .= $matches[5]."\n"; + $location .= $matches[6]; + return $location; + } + private function nginx_merge_locations($vhost_conf){ $lines = explode("\n", $vhost_conf); @@ -2335,6 +2399,7 @@ class nginx_plugin { $linecount = sizeof($lines); for($h=0;$h<$linecount;$h++){ $lines[$h] = rtrim($lines[$h]); + /* if(substr(ltrim($lines[$h]), 0, 8) == 'location' && strpos($lines[$h], '{') !== false && strpos($lines[$h], ';') !== false){ $lines[$h] = str_replace("{", "{\n", $lines[$h]); $lines[$h] = str_replace(";", ";\n", $lines[$h]); @@ -2350,6 +2415,9 @@ class nginx_plugin { $lines[$h] = substr($lines[$h],0,strpos($lines[$h], '{')).' ##merge##'.substr($lines[$h],strpos($lines[$h], '{')+1); } } + */ + $pattern = '/^[^\S\n]*location[^\S\n]+(?:(.+)[^\S\n]+)?(.+)[^\S\n]*(\{)[^\S\n]*(##merge##)?[^\S\n]*(.+)[^\S\n]*(\})[^\S\n]*(##merge##)?[^\S\n]*$/'; + $lines[$h] = preg_replace_callback($pattern, array($this, 'nginx_replace') ,$lines[$h]); } } $vhost_conf = implode("\n", $lines); diff --git a/server/plugins-available/shelluser_base_plugin.inc.php b/server/plugins-available/shelluser_base_plugin.inc.php index 48e2cde629..c3133a6fde 100755 --- a/server/plugins-available/shelluser_base_plugin.inc.php +++ b/server/plugins-available/shelluser_base_plugin.inc.php @@ -114,7 +114,7 @@ class shelluser_base_plugin { //* Disable shell user temporarily if we use jailkit if($data['new']['chroot'] == 'jailkit') { - $command = 'usermod -s /bin/false -L '.escapeshellcmd($data['new']['username']); + $command = 'usermod -s /bin/false -L '.escapeshellcmd($data['new']['username']).' 2>/dev/null'; exec($command); $app->log("Disabling shelluser temporarily: ".$command,LOGLEVEL_DEBUG); } @@ -204,8 +204,7 @@ class shelluser_base_plugin { // We delete only non jailkit users, jailkit users will be deleted by the jailkit plugin. if ($data['old']['chroot'] != "jailkit") { $command = 'userdel -f'; - $command .= ' '.escapeshellcmd($data['old']['username']); - + $command .= ' '.escapeshellcmd($data['old']['username']).' &> /dev/null'; exec($command); $app->log("Deleted shelluser: ".$data['old']['username'],LOGLEVEL_DEBUG); } diff --git a/server/plugins-available/shelluser_jailkit_plugin.inc.php b/server/plugins-available/shelluser_jailkit_plugin.inc.php index c465b719d3..268df9c082 100755 --- a/server/plugins-available/shelluser_jailkit_plugin.inc.php +++ b/server/plugins-available/shelluser_jailkit_plugin.inc.php @@ -104,7 +104,7 @@ class shelluser_jailkit_plugin { $app->system->usermod($data['new']['username'], 0, 0, '', '/usr/sbin/jk_chrootsh', '', ''); //* Unlock user - $command = 'usermod -U '.escapeshellcmd($data['new']['username']); + $command = 'usermod -U '.escapeshellcmd($data['new']['username']).' 2>/dev/null'; exec($command); $this->_update_website_security_level(); @@ -188,7 +188,7 @@ class shelluser_jailkit_plugin { if(@is_dir($data['old']['dir'].$jailkit_chroot_userhome)) { $command = 'userdel -f'; - $command .= ' '.escapeshellcmd($data['old']['username']); + $command .= ' '.escapeshellcmd($data['old']['username']).' &> /dev/null'; exec($command); $app->log("Jailkit Plugin -> delete chroot home:".$data['old']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG); } @@ -212,7 +212,7 @@ class shelluser_jailkit_plugin { $command = '/usr/local/ispconfig/server/scripts/create_jailkit_chroot.sh'; $command .= ' '.escapeshellcmd($this->data['new']['dir']); $command .= ' \''.$this->jailkit_config['jailkit_chroot_app_sections'].'\''; - exec($command); + exec($command.' 2>/dev/null'); $this->app->log("Added jailkit chroot with command: ".$command,LOGLEVEL_DEBUG); @@ -258,7 +258,7 @@ class shelluser_jailkit_plugin { $command = '/usr/local/ispconfig/server/scripts/create_jailkit_programs.sh'; $command .= ' '.escapeshellcmd($this->data['new']['dir']); $command .= ' \''.$this->jailkit_config['jailkit_chroot_app_programs'].'\''; - exec($command); + exec($command.' 2>/dev/null'); $this->app->log("Added programs to jailkit chroot with command: ".$command,LOGLEVEL_DEBUG); } @@ -290,7 +290,7 @@ class shelluser_jailkit_plugin { $command .= ' '.escapeshellcmd($this->data['new']['shell']); $command .= ' '.$this->data['new']['puser']; $command .= ' '.$jailkit_chroot_puserhome; - exec($command); + exec($command.' 2>/dev/null'); //* Change the homedir of the shell user and parent user //* We have to do this manually as the usermod command fails diff --git a/server/scripts/create_jailkit_user.sh b/server/scripts/create_jailkit_user.sh index efe06031c4..da01f9af92 100755 --- a/server/scripts/create_jailkit_user.sh +++ b/server/scripts/create_jailkit_user.sh @@ -25,9 +25,9 @@ CHROOT_P_USER_HOMEDIR=$6 jk_jailuser -n -s $CHROOT_SHELL -j $CHROOT_HOMEDIR $CHROOT_USERNAME ### Reconfigure the chroot home directory for the user ### -usermod --home=$CHROOT_HOMEDIR/.$CHROOT_USERHOMEDIR $CHROOT_USERNAME +usermod --home=$CHROOT_HOMEDIR/.$CHROOT_USERHOMEDIR $CHROOT_USERNAME 2>/dev/null ### We have to reconfigure the chroot home directory for the parent user ### if [ "$CHROOT_P_USER" != "" ]; then - usermod --home=$CHROOT_HOMEDIR/.$CHROOT_P_USER_HOMEDIR $CHROOT_P_USER + usermod --home=$CHROOT_HOMEDIR/.$CHROOT_P_USER_HOMEDIR $CHROOT_P_USER 2>/dev/null fi \ No newline at end of file -- GitLab