From 9f56bd96367f7f3cfa295f23b9129a7dfa1f21af Mon Sep 17 00:00:00 2001 From: tbrehm Date: Wed, 24 Nov 2010 13:16:10 +0000 Subject: [PATCH] Merged revisions 2095-2129 which contain bugfixes from stable branch. --- docs/INSTALL_CENTOS_5.2.txt | 12 ++ docs/INSTALL_CENTOS_5.4_dovecot_bind.txt | 12 ++ install/dist/lib/centos53.lib.php | 1 + install/dist/lib/fedora.lib.php | 3 + install/lib/installer_base.lib.php | 6 +- install/sql/ispconfig3.sql | 9 +- install/tpl/apache_ispconfig.conf.master | 2 +- install/tpl/config.inc.php.master | 2 +- install/update.php | 2 +- interface/lib/classes/tform.inc.php | 3 +- interface/lib/lang/id.lng | 39 +++++ interface/lib/lang/nl.lng | 1 + interface/web/admin/lib/lang/id.lng | 44 ++++++ interface/web/admin/lib/lang/id_firewall.lng | 12 ++ .../web/admin/lib/lang/id_firewall_list.lng | 9 ++ interface/web/admin/lib/lang/id_groups.lng | 6 + .../web/admin/lib/lang/id_groups_list.lng | 8 + .../web/admin/lib/lang/id_language_add.lng | 9 ++ .../admin/lib/lang/id_language_complete.lng | 8 + .../web/admin/lib/lang/id_language_edit.lng | 9 ++ .../web/admin/lib/lang/id_language_export.lng | 7 + .../web/admin/lib/lang/id_language_import.lng | 9 ++ .../web/admin/lib/lang/id_language_list.lng | 8 + .../web/admin/lib/lang/id_package_install.lng | 8 + .../web/admin/lib/lang/id_remote_action.lng | 11 ++ .../web/admin/lib/lang/id_remote_user.lng | 43 ++++++ .../admin/lib/lang/id_remote_user_list.lng | 8 + interface/web/admin/lib/lang/id_server.lng | 14 ++ .../web/admin/lib/lang/id_server_config.lng | 78 ++++++++++ .../admin/lib/lang/id_server_config_list.lng | 5 + interface/web/admin/lib/lang/id_server_ip.lng | 8 + .../web/admin/lib/lang/id_server_ip_list.lng | 7 + .../web/admin/lib/lang/id_server_list.lng | 12 ++ .../lib/lang/id_software_package_install.lng | 7 + .../lib/lang/id_software_package_list.lng | 11 ++ .../web/admin/lib/lang/id_software_repo.lng | 8 + .../admin/lib/lang/id_software_repo_list.lng | 7 + .../lib/lang/id_software_update_list.lng | 9 ++ .../web/admin/lib/lang/id_system_config.lng | 23 +++ interface/web/admin/lib/lang/id_users.lng | 29 ++++ .../web/admin/lib/lang/id_users_list.lng | 10 ++ interface/web/admin/lib/lang/nl.lng | 1 + interface/web/admin/lib/lang/nl_firewall.lng | 1 + .../web/admin/lib/lang/nl_firewall_list.lng | 1 + interface/web/admin/lib/lang/nl_groups.lng | 1 + .../web/admin/lib/lang/nl_groups_list.lng | 1 + .../web/admin/lib/lang/nl_language_add.lng | 1 + .../admin/lib/lang/nl_language_complete.lng | 1 + .../web/admin/lib/lang/nl_language_edit.lng | 1 + .../web/admin/lib/lang/nl_language_export.lng | 1 + .../web/admin/lib/lang/nl_language_import.lng | 1 + .../web/admin/lib/lang/nl_language_list.lng | 1 + .../web/admin/lib/lang/nl_package_install.lng | 1 + .../web/admin/lib/lang/nl_remote_action.lng | 1 + .../web/admin/lib/lang/nl_remote_user.lng | 1 + .../admin/lib/lang/nl_remote_user_list.lng | 1 + interface/web/admin/lib/lang/nl_server.lng | 1 + .../web/admin/lib/lang/nl_server_config.lng | 1 + .../admin/lib/lang/nl_server_config_list.lng | 1 + interface/web/admin/lib/lang/nl_server_ip.lng | 1 + .../web/admin/lib/lang/nl_server_ip_list.lng | 1 + .../web/admin/lib/lang/nl_server_list.lng | 1 + .../lib/lang/nl_software_package_install.lng | 1 + .../lib/lang/nl_software_package_list.lng | 1 + .../web/admin/lib/lang/nl_software_repo.lng | 1 + .../admin/lib/lang/nl_software_repo_list.lng | 1 + .../lib/lang/nl_software_update_list.lng | 1 + .../web/admin/lib/lang/nl_system_config.lng | 3 +- interface/web/admin/lib/lang/nl_users.lng | 1 + .../web/admin/lib/lang/nl_users_list.lng | 1 + interface/web/client/lib/lang/id.lng | 14 ++ interface/web/client/lib/lang/id_client.lng | 102 ++++++++++++ .../web/client/lib/lang/id_client_del.lng | 7 + .../client/lib/lang/id_client_template.lng | 64 ++++++++ .../lib/lang/id_client_template_list.lng | 6 + .../web/client/lib/lang/id_clients_list.lng | 10 ++ interface/web/client/lib/lang/id_reseller.lng | 100 ++++++++++++ .../web/client/lib/lang/id_resellers_list.lng | 10 ++ interface/web/client/lib/lang/nl.lng | 1 + interface/web/client/lib/lang/nl_client.lng | 5 +- .../web/client/lib/lang/nl_client_del.lng | 1 + .../client/lib/lang/nl_client_template.lng | 1 + .../lib/lang/nl_client_template_list.lng | 1 + .../web/client/lib/lang/nl_clients_list.lng | 1 + interface/web/client/lib/lang/nl_reseller.lng | 21 +-- .../web/client/lib/lang/nl_resellers_list.lng | 1 + interface/web/dashboard/lib/lang/id.lng | 5 + .../dashboard/lib/lang/id_dashlet_limits.lng | 30 ++++ .../dashboard/lib/lang/id_dashlet_modules.lng | 4 + interface/web/dashboard/lib/lang/nl.lng | 1 + .../dashboard/lib/lang/nl_dashlet_limits.lng | 1 + .../dashboard/lib/lang/nl_dashlet_modules.lng | 1 + interface/web/designer/lib/lang/id.lng | 3 + .../web/designer/lib/lang/id_form_edit.lng | 25 +++ .../web/designer/lib/lang/id_form_list.lng | 8 + .../web/designer/lib/lang/id_form_show.lng | 19 +++ .../web/designer/lib/lang/id_module_edit.lng | 23 +++ .../web/designer/lib/lang/id_module_list.lng | 6 + .../designer/lib/lang/id_module_nav_edit.lng | 7 + .../lib/lang/id_module_nav_item_edit.lng | 9 ++ .../web/designer/lib/lang/id_module_show.lng | 17 ++ interface/web/designer/lib/lang/nl.lng | 1 + .../web/designer/lib/lang/nl_form_edit.lng | 1 + .../web/designer/lib/lang/nl_form_list.lng | 1 + .../web/designer/lib/lang/nl_form_show.lng | 1 + .../web/designer/lib/lang/nl_module_edit.lng | 1 + .../web/designer/lib/lang/nl_module_list.lng | 1 + .../designer/lib/lang/nl_module_nav_edit.lng | 1 + .../lib/lang/nl_module_nav_item_edit.lng | 1 + .../web/designer/lib/lang/nl_module_show.lng | 1 + interface/web/dns/dns_rr_del.php | 20 ++- interface/web/dns/lib/lang/id.lng | 21 +++ interface/web/dns/lib/lang/id_dns_a.lng | 17 ++ interface/web/dns/lib/lang/id_dns_a_list.lng | 15 ++ interface/web/dns/lib/lang/id_dns_aaaa.lng | 16 ++ interface/web/dns/lib/lang/id_dns_alias.lng | 16 ++ interface/web/dns/lib/lang/id_dns_cname.lng | 17 ++ interface/web/dns/lib/lang/id_dns_hinfo.lng | 16 ++ interface/web/dns/lib/lang/id_dns_mx.lng | 17 ++ interface/web/dns/lib/lang/id_dns_ns.lng | 16 ++ interface/web/dns/lib/lang/id_dns_ptr.lng | 16 ++ interface/web/dns/lib/lang/id_dns_rp.lng | 16 ++ interface/web/dns/lib/lang/id_dns_slave.lng | 15 ++ .../web/dns/lib/lang/id_dns_slave_list.lng | 9 ++ interface/web/dns/lib/lang/id_dns_soa.lng | 27 ++++ .../web/dns/lib/lang/id_dns_soa_list.lng | 11 ++ interface/web/dns/lib/lang/id_dns_srv.lng | 18 +++ .../web/dns/lib/lang/id_dns_template.lng | 7 + .../web/dns/lib/lang/id_dns_template_list.lng | 7 + interface/web/dns/lib/lang/id_dns_txt.lng | 16 ++ interface/web/dns/lib/lang/id_dns_wizard.lng | 30 ++++ interface/web/dns/lib/lang/nl.lng | 1 + interface/web/dns/lib/lang/nl_dns_a.lng | 5 +- interface/web/dns/lib/lang/nl_dns_a_list.lng | 1 + interface/web/dns/lib/lang/nl_dns_aaaa.lng | 7 +- interface/web/dns/lib/lang/nl_dns_alias.lng | 1 + interface/web/dns/lib/lang/nl_dns_cname.lng | 3 +- interface/web/dns/lib/lang/nl_dns_hinfo.lng | 5 +- interface/web/dns/lib/lang/nl_dns_mx.lng | 5 +- interface/web/dns/lib/lang/nl_dns_ns.lng | 5 +- interface/web/dns/lib/lang/nl_dns_ptr.lng | 1 + interface/web/dns/lib/lang/nl_dns_rp.lng | 1 + interface/web/dns/lib/lang/nl_dns_slave.lng | 1 + .../web/dns/lib/lang/nl_dns_slave_list.lng | 1 + interface/web/dns/lib/lang/nl_dns_soa.lng | 1 + .../web/dns/lib/lang/nl_dns_soa_list.lng | 1 + interface/web/dns/lib/lang/nl_dns_srv.lng | 1 + .../web/dns/lib/lang/nl_dns_template.lng | 1 + .../web/dns/lib/lang/nl_dns_template_list.lng | 1 + interface/web/dns/lib/lang/nl_dns_txt.lng | 1 + interface/web/dns/lib/lang/nl_dns_wizard.lng | 1 + interface/web/dns/templates/dns_wizard.htm | 2 +- interface/web/domain/lib/lang/id.lng | 10 ++ interface/web/domain/lib/lang/id_domain.lng | 7 + .../web/domain/lib/lang/id_domain_list.lng | 6 + interface/web/domain/lib/lang/nl.lng | 1 + interface/web/domain/lib/lang/nl_domain.lng | 1 + .../web/domain/lib/lang/nl_domain_list.lng | 1 + interface/web/help/lib/lang/id.lng | 10 ++ .../web/help/lib/lang/id_support_message.lng | 8 + .../help/lib/lang/id_support_message_list.lng | 7 + interface/web/help/lib/lang/nl.lng | 1 + .../web/help/lib/lang/nl_support_message.lng | 1 + .../help/lib/lang/nl_support_message_list.lng | 1 + interface/web/login/lib/lang/id.lng | 18 +++ interface/web/login/lib/lang/nl.lng | 1 + .../web/mail/lib/lang/en_mail_user_filter.lng | 1 + interface/web/mail/lib/lang/id.lng | 48 ++++++ interface/web/mail/lib/lang/id_mail_alias.lng | 12 ++ .../web/mail/lib/lang/id_mail_aliasdomain.lng | 12 ++ .../lib/lang/id_mail_aliasdomain_list.lng | 8 + .../web/mail/lib/lang/id_mail_blacklist.lng | 10 ++ .../mail/lib/lang/id_mail_blacklist_list.lng | 11 ++ .../mail/lib/lang/id_mail_content_filter.lng | 10 ++ .../lib/lang/id_mail_content_filter_list.lng | 9 ++ .../web/mail/lib/lang/id_mail_domain.lng | 14 ++ .../lib/lang/id_mail_domain_admin_list.lng | 9 ++ .../mail/lib/lang/id_mail_domain_catchall.lng | 10 ++ .../lib/lang/id_mail_domain_catchall_list.lng | 10 ++ .../web/mail/lib/lang/id_mail_domain_list.lng | 8 + .../web/mail/lib/lang/id_mail_forward.lng | 8 + .../mail/lib/lang/id_mail_forward_list.lng | 9 ++ interface/web/mail/lib/lang/id_mail_get.lng | 17 ++ .../web/mail/lib/lang/id_mail_get_list.lng | 10 ++ .../mail/lib/lang/id_mail_relay_recipient.lng | 10 ++ .../lib/lang/id_mail_relay_recipient_list.lng | 10 ++ .../web/mail/lib/lang/id_mail_spamfilter.lng | 18 +++ .../mail/lib/lang/id_mail_spamfilter_list.lng | 9 ++ .../web/mail/lib/lang/id_mail_transport.lng | 11 ++ .../mail/lib/lang/id_mail_transport_list.lng | 10 ++ interface/web/mail/lib/lang/id_mail_user.lng | 43 ++++++ .../web/mail/lib/lang/id_mail_user_filter.lng | 11 ++ .../lib/lang/id_mail_user_filter_list.lng | 8 + .../web/mail/lib/lang/id_mail_user_list.lng | 8 + .../mail/lib/lang/id_mail_user_stats_list.lng | 9 ++ .../web/mail/lib/lang/id_mail_whitelist.lng | 10 ++ .../mail/lib/lang/id_mail_whitelist_list.lng | 11 ++ .../mail/lib/lang/id_spamfilter_blacklist.lng | 10 ++ .../lib/lang/id_spamfilter_blacklist_list.lng | 10 ++ .../mail/lib/lang/id_spamfilter_config.lng | 21 +++ .../lib/lang/id_spamfilter_config_list.lng | 6 + .../mail/lib/lang/id_spamfilter_policy.lng | 39 +++++ .../lib/lang/id_spamfilter_policy_list.lng | 10 ++ .../web/mail/lib/lang/id_spamfilter_users.lng | 9 ++ .../lib/lang/id_spamfilter_users_list.lng | 11 ++ .../mail/lib/lang/id_spamfilter_whitelist.lng | 10 ++ .../lib/lang/id_spamfilter_whitelist_list.lng | 10 ++ interface/web/mail/lib/lang/nl.lng | 1 + interface/web/mail/lib/lang/nl_mail_alias.lng | 1 + .../web/mail/lib/lang/nl_mail_alias_list.lng | 1 + .../web/mail/lib/lang/nl_mail_aliasdomain.lng | 1 + .../lib/lang/nl_mail_aliasdomain_list.lng | 1 + .../web/mail/lib/lang/nl_mail_blacklist.lng | 1 + .../mail/lib/lang/nl_mail_blacklist_list.lng | 1 + .../mail/lib/lang/nl_mail_content_filter.lng | 1 + .../lib/lang/nl_mail_content_filter_list.lng | 1 + .../web/mail/lib/lang/nl_mail_domain.lng | 1 + .../lib/lang/nl_mail_domain_admin_list.lng | 1 + .../mail/lib/lang/nl_mail_domain_catchall.lng | 1 + .../lib/lang/nl_mail_domain_catchall_list.lng | 1 + .../web/mail/lib/lang/nl_mail_domain_list.lng | 1 + .../web/mail/lib/lang/nl_mail_forward.lng | 1 + .../mail/lib/lang/nl_mail_forward_list.lng | 1 + interface/web/mail/lib/lang/nl_mail_get.lng | 1 + .../web/mail/lib/lang/nl_mail_get_list.lng | 1 + .../mail/lib/lang/nl_mail_relay_recipient.lng | 1 + .../lib/lang/nl_mail_relay_recipient_list.lng | 1 + .../web/mail/lib/lang/nl_mail_spamfilter.lng | 1 + .../mail/lib/lang/nl_mail_spamfilter_list.lng | 1 + .../web/mail/lib/lang/nl_mail_transport.lng | 1 + .../mail/lib/lang/nl_mail_transport_list.lng | 1 + interface/web/mail/lib/lang/nl_mail_user.lng | 1 + .../web/mail/lib/lang/nl_mail_user_filter.lng | 1 + .../lib/lang/nl_mail_user_filter_list.lng | 1 + .../web/mail/lib/lang/nl_mail_user_list.lng | 1 + .../mail/lib/lang/nl_mail_user_stats_list.lng | 1 + .../web/mail/lib/lang/nl_mail_whitelist.lng | 1 + .../mail/lib/lang/nl_mail_whitelist_list.lng | 1 + .../mail/lib/lang/nl_spamfilter_blacklist.lng | 1 + .../lib/lang/nl_spamfilter_blacklist_list.lng | 1 + .../mail/lib/lang/nl_spamfilter_config.lng | 1 + .../lib/lang/nl_spamfilter_config_list.lng | 1 + .../mail/lib/lang/nl_spamfilter_policy.lng | 1 + .../lib/lang/nl_spamfilter_policy_list.lng | 1 + .../web/mail/lib/lang/nl_spamfilter_users.lng | 1 + .../lib/lang/nl_spamfilter_users_list.lng | 1 + .../mail/lib/lang/nl_spamfilter_whitelist.lng | 1 + .../lib/lang/nl_spamfilter_whitelist_list.lng | 1 + interface/web/mail/mail_user_filter_edit.php | 32 ++++ interface/web/monitor/lib/lang/id.lng | 146 ++++++++++++++++++ .../web/monitor/lib/lang/id_datalog_list.lng | 9 ++ .../web/monitor/lib/lang/id_syslog_list.lng | 8 + interface/web/monitor/lib/lang/nl.lng | 3 +- .../web/monitor/lib/lang/nl_syslog_list.lng | 1 + interface/web/sites/form/web_domain.tform.php | 2 +- .../web/sites/lib/lang/en_web_domain.lng | 1 + interface/web/sites/lib/lang/id.lng | 25 +++ interface/web/sites/lib/lang/id_cron.lng | 22 +++ interface/web/sites/lib/lang/id_cron_list.lng | 13 ++ interface/web/sites/lib/lang/id_database.lng | 26 ++++ .../sites/lib/lang/id_database_admin_list.lng | 11 ++ .../web/sites/lib/lang/id_database_list.lng | 10 ++ interface/web/sites/lib/lang/id_ftp_user.lng | 28 ++++ .../web/sites/lib/lang/id_ftp_user_list.lng | 9 ++ .../web/sites/lib/lang/id_shell_user.lng | 23 +++ .../web/sites/lib/lang/id_shell_user_list.lng | 9 ++ .../lib/lang/id_user_quota_stats_list.lng | 9 ++ .../lib/lang/id_web_aliasdomain_list.lng | 12 ++ .../web/sites/lib/lang/id_web_domain.lng | 68 ++++++++ .../lib/lang/id_web_domain_admin_list.lng | 10 ++ .../web/sites/lib/lang/id_web_domain_list.lng | 9 ++ .../lib/lang/id_web_sites_stats_list.lng | 9 ++ .../web/sites/lib/lang/id_web_subdomain.lng | 41 +++++ .../sites/lib/lang/id_web_subdomain_list.lng | 9 ++ .../web/sites/lib/lang/id_webdav_user.lng | 16 ++ .../sites/lib/lang/id_webdav_user_list.lng | 9 ++ interface/web/sites/lib/lang/nl.lng | 1 + interface/web/sites/lib/lang/nl_cron.lng | 1 + interface/web/sites/lib/lang/nl_cron_list.lng | 1 + interface/web/sites/lib/lang/nl_database.lng | 1 + .../sites/lib/lang/nl_database_admin_list.lng | 1 + .../web/sites/lib/lang/nl_database_list.lng | 1 + interface/web/sites/lib/lang/nl_ftp_user.lng | 1 + .../web/sites/lib/lang/nl_ftp_user_list.lng | 1 + .../web/sites/lib/lang/nl_shell_user.lng | 1 + .../web/sites/lib/lang/nl_shell_user_list.lng | 1 + .../lib/lang/nl_user_quota_stats_list.lng | 1 + .../lib/lang/nl_web_aliasdomain_list.lng | 1 + .../web/sites/lib/lang/nl_web_domain.lng | 1 + .../lib/lang/nl_web_domain_admin_list.lng | 1 + .../web/sites/lib/lang/nl_web_domain_list.lng | 1 + .../lib/lang/nl_web_sites_stats_list.lng | 1 + .../web/sites/lib/lang/nl_web_subdomain.lng | 1 + .../sites/lib/lang/nl_web_subdomain_list.lng | 1 + .../web/sites/lib/lang/nl_webdav_user.lng | 1 + .../sites/lib/lang/nl_webdav_user_list.lng | 1 + .../sites/templates/user_quota_stats_list.htm | 12 +- interface/web/sites/tools.inc.php | 4 +- interface/web/sites/user_quota_stats.php | 48 +++++- interface/web/sites/web_domain_edit.php | 4 + .../lib/lang/id_strengthmeter.lng | 9 ++ .../lib/lang/nl_strengthmeter.lng | 1 + .../web/themes/default/css/screen/basemod.css | 8 +- .../web/themes/default/templates/main.tpl.htm | 8 + .../default_64_navimg/templates/main.tpl.htm | 8 + .../default_no_navimg/templates/main.tpl.htm | 8 + interface/web/tools/lib/lang/id.lng | 7 + .../web/tools/lib/lang/id_usersettings.lng | 9 ++ interface/web/tools/lib/lang/nl.lng | 1 + .../web/tools/lib/lang/nl_usersettings.lng | 1 + server/conf/apache_ispconfig.conf.master | 1 + server/conf/vhost.conf.master | 70 ++++++++- server/cron_daily.php | 2 +- server/lib/classes/system.inc.php | 12 +- .../monitor_core_module.inc.php | 32 +++- .../plugins-available/apache2_plugin.inc.php | 34 ++-- 316 files changed, 2869 insertions(+), 86 deletions(-) create mode 100644 interface/lib/lang/id.lng create mode 100644 interface/web/admin/lib/lang/id.lng create mode 100644 interface/web/admin/lib/lang/id_firewall.lng create mode 100644 interface/web/admin/lib/lang/id_firewall_list.lng create mode 100644 interface/web/admin/lib/lang/id_groups.lng create mode 100644 interface/web/admin/lib/lang/id_groups_list.lng create mode 100644 interface/web/admin/lib/lang/id_language_add.lng create mode 100644 interface/web/admin/lib/lang/id_language_complete.lng create mode 100644 interface/web/admin/lib/lang/id_language_edit.lng create mode 100644 interface/web/admin/lib/lang/id_language_export.lng create mode 100644 interface/web/admin/lib/lang/id_language_import.lng create mode 100644 interface/web/admin/lib/lang/id_language_list.lng create mode 100644 interface/web/admin/lib/lang/id_package_install.lng create mode 100644 interface/web/admin/lib/lang/id_remote_action.lng create mode 100644 interface/web/admin/lib/lang/id_remote_user.lng create mode 100644 interface/web/admin/lib/lang/id_remote_user_list.lng create mode 100644 interface/web/admin/lib/lang/id_server.lng create mode 100644 interface/web/admin/lib/lang/id_server_config.lng create mode 100644 interface/web/admin/lib/lang/id_server_config_list.lng create mode 100644 interface/web/admin/lib/lang/id_server_ip.lng create mode 100644 interface/web/admin/lib/lang/id_server_ip_list.lng create mode 100644 interface/web/admin/lib/lang/id_server_list.lng create mode 100644 interface/web/admin/lib/lang/id_software_package_install.lng create mode 100644 interface/web/admin/lib/lang/id_software_package_list.lng create mode 100644 interface/web/admin/lib/lang/id_software_repo.lng create mode 100644 interface/web/admin/lib/lang/id_software_repo_list.lng create mode 100644 interface/web/admin/lib/lang/id_software_update_list.lng create mode 100644 interface/web/admin/lib/lang/id_system_config.lng create mode 100644 interface/web/admin/lib/lang/id_users.lng create mode 100644 interface/web/admin/lib/lang/id_users_list.lng create mode 100644 interface/web/client/lib/lang/id.lng create mode 100644 interface/web/client/lib/lang/id_client.lng create mode 100644 interface/web/client/lib/lang/id_client_del.lng create mode 100644 interface/web/client/lib/lang/id_client_template.lng create mode 100644 interface/web/client/lib/lang/id_client_template_list.lng create mode 100644 interface/web/client/lib/lang/id_clients_list.lng create mode 100644 interface/web/client/lib/lang/id_reseller.lng create mode 100644 interface/web/client/lib/lang/id_resellers_list.lng create mode 100644 interface/web/dashboard/lib/lang/id.lng create mode 100644 interface/web/dashboard/lib/lang/id_dashlet_limits.lng create mode 100644 interface/web/dashboard/lib/lang/id_dashlet_modules.lng create mode 100644 interface/web/designer/lib/lang/id.lng create mode 100644 interface/web/designer/lib/lang/id_form_edit.lng create mode 100644 interface/web/designer/lib/lang/id_form_list.lng create mode 100644 interface/web/designer/lib/lang/id_form_show.lng create mode 100644 interface/web/designer/lib/lang/id_module_edit.lng create mode 100644 interface/web/designer/lib/lang/id_module_list.lng create mode 100644 interface/web/designer/lib/lang/id_module_nav_edit.lng create mode 100644 interface/web/designer/lib/lang/id_module_nav_item_edit.lng create mode 100644 interface/web/designer/lib/lang/id_module_show.lng create mode 100644 interface/web/dns/lib/lang/id.lng create mode 100644 interface/web/dns/lib/lang/id_dns_a.lng create mode 100644 interface/web/dns/lib/lang/id_dns_a_list.lng create mode 100644 interface/web/dns/lib/lang/id_dns_aaaa.lng create mode 100644 interface/web/dns/lib/lang/id_dns_alias.lng create mode 100644 interface/web/dns/lib/lang/id_dns_cname.lng create mode 100644 interface/web/dns/lib/lang/id_dns_hinfo.lng create mode 100644 interface/web/dns/lib/lang/id_dns_mx.lng create mode 100644 interface/web/dns/lib/lang/id_dns_ns.lng create mode 100644 interface/web/dns/lib/lang/id_dns_ptr.lng create mode 100644 interface/web/dns/lib/lang/id_dns_rp.lng create mode 100644 interface/web/dns/lib/lang/id_dns_slave.lng create mode 100644 interface/web/dns/lib/lang/id_dns_slave_list.lng create mode 100644 interface/web/dns/lib/lang/id_dns_soa.lng create mode 100644 interface/web/dns/lib/lang/id_dns_soa_list.lng create mode 100644 interface/web/dns/lib/lang/id_dns_srv.lng create mode 100644 interface/web/dns/lib/lang/id_dns_template.lng create mode 100644 interface/web/dns/lib/lang/id_dns_template_list.lng create mode 100644 interface/web/dns/lib/lang/id_dns_txt.lng create mode 100644 interface/web/dns/lib/lang/id_dns_wizard.lng create mode 100644 interface/web/domain/lib/lang/id.lng create mode 100644 interface/web/domain/lib/lang/id_domain.lng create mode 100644 interface/web/domain/lib/lang/id_domain_list.lng create mode 100644 interface/web/help/lib/lang/id.lng create mode 100644 interface/web/help/lib/lang/id_support_message.lng create mode 100644 interface/web/help/lib/lang/id_support_message_list.lng create mode 100644 interface/web/login/lib/lang/id.lng create mode 100644 interface/web/mail/lib/lang/id.lng create mode 100644 interface/web/mail/lib/lang/id_mail_alias.lng create mode 100644 interface/web/mail/lib/lang/id_mail_aliasdomain.lng create mode 100644 interface/web/mail/lib/lang/id_mail_aliasdomain_list.lng create mode 100644 interface/web/mail/lib/lang/id_mail_blacklist.lng create mode 100644 interface/web/mail/lib/lang/id_mail_blacklist_list.lng create mode 100644 interface/web/mail/lib/lang/id_mail_content_filter.lng create mode 100644 interface/web/mail/lib/lang/id_mail_content_filter_list.lng create mode 100644 interface/web/mail/lib/lang/id_mail_domain.lng create mode 100644 interface/web/mail/lib/lang/id_mail_domain_admin_list.lng create mode 100644 interface/web/mail/lib/lang/id_mail_domain_catchall.lng create mode 100644 interface/web/mail/lib/lang/id_mail_domain_catchall_list.lng create mode 100644 interface/web/mail/lib/lang/id_mail_domain_list.lng create mode 100644 interface/web/mail/lib/lang/id_mail_forward.lng create mode 100644 interface/web/mail/lib/lang/id_mail_forward_list.lng create mode 100644 interface/web/mail/lib/lang/id_mail_get.lng create mode 100644 interface/web/mail/lib/lang/id_mail_get_list.lng create mode 100644 interface/web/mail/lib/lang/id_mail_relay_recipient.lng create mode 100644 interface/web/mail/lib/lang/id_mail_relay_recipient_list.lng create mode 100644 interface/web/mail/lib/lang/id_mail_spamfilter.lng create mode 100644 interface/web/mail/lib/lang/id_mail_spamfilter_list.lng create mode 100644 interface/web/mail/lib/lang/id_mail_transport.lng create mode 100644 interface/web/mail/lib/lang/id_mail_transport_list.lng create mode 100644 interface/web/mail/lib/lang/id_mail_user.lng create mode 100644 interface/web/mail/lib/lang/id_mail_user_filter.lng create mode 100644 interface/web/mail/lib/lang/id_mail_user_filter_list.lng create mode 100644 interface/web/mail/lib/lang/id_mail_user_list.lng create mode 100644 interface/web/mail/lib/lang/id_mail_user_stats_list.lng create mode 100644 interface/web/mail/lib/lang/id_mail_whitelist.lng create mode 100644 interface/web/mail/lib/lang/id_mail_whitelist_list.lng create mode 100644 interface/web/mail/lib/lang/id_spamfilter_blacklist.lng create mode 100644 interface/web/mail/lib/lang/id_spamfilter_blacklist_list.lng create mode 100644 interface/web/mail/lib/lang/id_spamfilter_config.lng create mode 100644 interface/web/mail/lib/lang/id_spamfilter_config_list.lng create mode 100644 interface/web/mail/lib/lang/id_spamfilter_policy.lng create mode 100644 interface/web/mail/lib/lang/id_spamfilter_policy_list.lng create mode 100644 interface/web/mail/lib/lang/id_spamfilter_users.lng create mode 100644 interface/web/mail/lib/lang/id_spamfilter_users_list.lng create mode 100644 interface/web/mail/lib/lang/id_spamfilter_whitelist.lng create mode 100644 interface/web/mail/lib/lang/id_spamfilter_whitelist_list.lng create mode 100644 interface/web/monitor/lib/lang/id.lng create mode 100644 interface/web/monitor/lib/lang/id_datalog_list.lng create mode 100644 interface/web/monitor/lib/lang/id_syslog_list.lng create mode 100644 interface/web/sites/lib/lang/id.lng create mode 100644 interface/web/sites/lib/lang/id_cron.lng create mode 100644 interface/web/sites/lib/lang/id_cron_list.lng create mode 100644 interface/web/sites/lib/lang/id_database.lng create mode 100644 interface/web/sites/lib/lang/id_database_admin_list.lng create mode 100644 interface/web/sites/lib/lang/id_database_list.lng create mode 100644 interface/web/sites/lib/lang/id_ftp_user.lng create mode 100644 interface/web/sites/lib/lang/id_ftp_user_list.lng create mode 100644 interface/web/sites/lib/lang/id_shell_user.lng create mode 100644 interface/web/sites/lib/lang/id_shell_user_list.lng create mode 100644 interface/web/sites/lib/lang/id_user_quota_stats_list.lng create mode 100644 interface/web/sites/lib/lang/id_web_aliasdomain_list.lng create mode 100644 interface/web/sites/lib/lang/id_web_domain.lng create mode 100644 interface/web/sites/lib/lang/id_web_domain_admin_list.lng create mode 100644 interface/web/sites/lib/lang/id_web_domain_list.lng create mode 100644 interface/web/sites/lib/lang/id_web_sites_stats_list.lng create mode 100644 interface/web/sites/lib/lang/id_web_subdomain.lng create mode 100644 interface/web/sites/lib/lang/id_web_subdomain_list.lng create mode 100644 interface/web/sites/lib/lang/id_webdav_user.lng create mode 100644 interface/web/sites/lib/lang/id_webdav_user_list.lng create mode 100644 interface/web/strengthmeter/lib/lang/id_strengthmeter.lng create mode 100644 interface/web/tools/lib/lang/id.lng create mode 100644 interface/web/tools/lib/lang/id_usersettings.lng diff --git a/docs/INSTALL_CENTOS_5.2.txt b/docs/INSTALL_CENTOS_5.2.txt index 845fae36a6..7cc464b0c7 100644 --- a/docs/INSTALL_CENTOS_5.2.txt +++ b/docs/INSTALL_CENTOS_5.2.txt @@ -162,6 +162,18 @@ tar xvfz vlogger-1.3.tar.gz mv vlogger-1.3/vlogger /usr/sbin/ rm -rf vlogger* +Edit the file /etc/sudoers + +vi /etc/sudoers + +and change the line: + +Defaults requiretty + +to: + +# Defaults requiretty + 7) Install ISPConfig 3 Disable the firewall: diff --git a/docs/INSTALL_CENTOS_5.4_dovecot_bind.txt b/docs/INSTALL_CENTOS_5.4_dovecot_bind.txt index 4fbce1262d..f3b498266e 100644 --- a/docs/INSTALL_CENTOS_5.4_dovecot_bind.txt +++ b/docs/INSTALL_CENTOS_5.4_dovecot_bind.txt @@ -191,6 +191,18 @@ make make install rm -rf jailkit-2.11* +Edit the file /etc/sudoers + +vi /etc/sudoers + +and change the line: + +Defaults requiretty + +to: + +# Defaults requiretty + 7) Install ISPConfig 3 diff --git a/install/dist/lib/centos53.lib.php b/install/dist/lib/centos53.lib.php index d69bc02006..7b3337d966 100644 --- a/install/dist/lib/centos53.lib.php +++ b/install/dist/lib/centos53.lib.php @@ -37,6 +37,7 @@ class installer extends installer_dist { $configfile = 'fedora_amavisd_conf'; if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["amavis"]["config_dir"].'/amavisd.conf~'); if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf~')) exec('chmod 400 '.$conf["amavis"]["config_dir"].'/amavisd.conf~'); + if(!is_dir($conf["amavis"]["config_dir"])) mkdir($conf["amavis"]["config_dir"]); $content = rf("tpl/".$configfile.".master"); $content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content); $content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content); diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php index 20f832b551..eec9af6cc7 100644 --- a/install/dist/lib/fedora.lib.php +++ b/install/dist/lib/fedora.lib.php @@ -903,6 +903,9 @@ class installer_dist extends installer_base { exec('chown getmail /usr/local/bin/run-getmail.sh'); exec('chmod 744 /usr/local/bin/run-getmail.sh'); + // Edit the file Edit the file /etc/sudoers and comment out the requiregetty line, otherwise the backup function will fail + replaceLine('/etc/sudoers','Defaults requiretty','#Defaults requiretty',0,0); + } diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index f9c4ba38b3..9edc4a19c9 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -1010,7 +1010,7 @@ class installer_base { // copy('tpl/apache_ispconfig.conf.master',$vhost_conf_dir.'/ispconfig.conf'); $content = rf('tpl/apache_ispconfig.conf.master'); - $records = $this->db->queryAllRecords("SELECT * FROM server_ip WHERE server_id = ".$conf["server_id"]." AND virtualhost = 'y'"); + $records = $this->db->queryAllRecords('SELECT * FROM '.$conf['mysql']['master_database'].'.server_ip WHERE server_id = '.$conf['server_id']." AND virtualhost = 'y'"); if(is_array($records) && count($records) > 0) { foreach($records as $rec) { $content .= 'NameVirtualHost '.$rec['ip_address'].":80\n"; @@ -1036,6 +1036,10 @@ class installer_base { replaceLine('/etc/webalizer/webalizer.conf','#Incremental','Incremental yes',0,0); replaceLine('/etc/webalizer/webalizer.conf','#HistoryName','HistoryName webalizer.hist',0,0); } + + // Check the awsatst script + if(!is_dir('/usr/share/awstats/tools')) exec('mkdir -p /usr/share/awstats/tools'); + if(!file_exists('/usr/share/awstats/tools/awstats_buildstaticpages.pl') && file_exists('/usr/share/doc/awstats/examples/awstats_buildstaticpages.pl')) symlink('/usr/share/doc/awstats/examples/awstats_buildstaticpages.pl','/usr/share/awstats/tools/awstats_buildstaticpages.pl'); //* add a sshusers group $command = 'groupadd sshusers'; diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index 8dbd915f22..b3baa267a7 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -1102,7 +1102,6 @@ CREATE TABLE `web_domain` ( `parent_domain_id` int(11) unsigned NOT NULL default '0', `vhost_type` varchar(32) default NULL, `document_root` varchar(255) default NULL, - `document_root_www` varchar(255) default NULL, `system_user` varchar(255) default NULL, `system_group` varchar(255) default NULL, `hd_quota` bigint(20) NOT NULL default '0', @@ -1131,9 +1130,9 @@ CREATE TABLE `web_domain` ( `stats_password` varchar(255) default NULL, `stats_type` varchar(255) default 'webalizer', `allow_override` varchar(255) NOT NULL default 'All', - `apache_directives` text, - `php_open_basedir` text, - `custom_php_ini` text, + `apache_directives` mediumtext, + `php_open_basedir` mediumtext, + `custom_php_ini` mediumtext, `backup_interval` VARCHAR( 255 ) NOT NULL DEFAULT 'none', `backup_copies` INT NOT NULL DEFAULT '1', `active` enum('n','y') NOT NULL default 'y', @@ -1354,7 +1353,7 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`, -- Dumping data for table `sys_config` -- -INSERT INTO sys_config VALUES ('1','db','db_version','3.0.3'); +INSERT INTO sys_config VALUES ('1','db','db_version','3.0.3.1'); -- -------------------------------------------------------- diff --git a/install/tpl/apache_ispconfig.conf.master b/install/tpl/apache_ispconfig.conf.master index e8f311e32b..eefb0ca481 100644 --- a/install/tpl/apache_ispconfig.conf.master +++ b/install/tpl/apache_ispconfig.conf.master @@ -41,6 +41,6 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m Order allow,deny Allow from all -Alias /awstats-icon "/usr/share/awstats/icon" +Alias /awstats-icon "/usr/share/awstats/icon" diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master index 205b2bf73e..495c942397 100644 --- a/install/tpl/config.inc.php.master +++ b/install/tpl/config.inc.php.master @@ -56,7 +56,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision); //** Application define('ISPC_APP_TITLE', 'ISPConfig'); -define('ISPC_APP_VERSION', '3.0.3'); +define('ISPC_APP_VERSION', '3.0.3.1'); //** Database diff --git a/install/update.php b/install/update.php index ced040b0b5..fb4df831dc 100644 --- a/install/update.php +++ b/install/update.php @@ -308,7 +308,7 @@ $ispconfig_port_number = get_ispconfig_port_number(); $conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', $ispconfig_port_number); // $ispconfig_ssl_default = (is_ispconfig_ssl_enabled() == true)?'y':'n'; -if(strtolower($inst->simple_query('Create new ISPConfig SSL certificate',array('y','n'),'n')) == 'y') { +if(strtolower($inst->simple_query('Create new ISPConfig SSL certificate',array('yes','no'),'no')) == 'yes') { $inst->make_ispconfig_ssl_cert(); } diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php index b9a417c58c..4f9b8a9854 100644 --- a/interface/lib/classes/tform.inc.php +++ b/interface/lib/classes/tform.inc.php @@ -362,7 +362,8 @@ class tform { // If Datasource is set, get the data from there if(isset($field['datasource']) && is_array($field['datasource'])) { if(is_array($field["value"])) { - $field["value"] = array_merge($field["value"],$this->getDatasourceData($field, $record)); + //$field["value"] = array_merge($field["value"],$this->getDatasourceData($field, $record)); + $field["value"] = $field["value"]+$this->getDatasourceData($field, $record); } else { $field["value"] = $this->getDatasourceData($field, $record); } diff --git a/interface/lib/lang/id.lng b/interface/lib/lang/id.lng new file mode 100644 index 0000000000..6ff8b84e91 --- /dev/null +++ b/interface/lib/lang/id.lng @@ -0,0 +1,39 @@ + + diff --git a/interface/lib/lang/nl.lng b/interface/lib/lang/nl.lng index 66077a4e27..3c6433c71a 100644 --- a/interface/lib/lang/nl.lng +++ b/interface/lib/lang/nl.lng @@ -39,3 +39,4 @@ $wb['latest_news_txt'] = 'Laatste nieuws'; + diff --git a/interface/web/admin/lib/lang/id.lng b/interface/web/admin/lib/lang/id.lng new file mode 100644 index 0000000000..51a90b05f5 --- /dev/null +++ b/interface/web/admin/lib/lang/id.lng @@ -0,0 +1,44 @@ + + diff --git a/interface/web/admin/lib/lang/id_firewall.lng b/interface/web/admin/lib/lang/id_firewall.lng new file mode 100644 index 0000000000..b4b152c0c9 --- /dev/null +++ b/interface/web/admin/lib/lang/id_firewall.lng @@ -0,0 +1,12 @@ + + diff --git a/interface/web/admin/lib/lang/id_firewall_list.lng b/interface/web/admin/lib/lang/id_firewall_list.lng new file mode 100644 index 0000000000..ea9780d22d --- /dev/null +++ b/interface/web/admin/lib/lang/id_firewall_list.lng @@ -0,0 +1,9 @@ + + diff --git a/interface/web/admin/lib/lang/id_groups.lng b/interface/web/admin/lib/lang/id_groups.lng new file mode 100644 index 0000000000..75e2799601 --- /dev/null +++ b/interface/web/admin/lib/lang/id_groups.lng @@ -0,0 +1,6 @@ + + diff --git a/interface/web/admin/lib/lang/id_groups_list.lng b/interface/web/admin/lib/lang/id_groups_list.lng new file mode 100644 index 0000000000..3d50177f7b --- /dev/null +++ b/interface/web/admin/lib/lang/id_groups_list.lng @@ -0,0 +1,8 @@ +PERINGATAN: Jangan menyunting atau memodifikasi pengaturan pengguna apapun di sini. Gunakan Pengaturan Klien dan Reseller di modul Klien. Memodifikasi atau mengubah Pengguna atau Grup di sini dapat mengakibatkan kehilangan data!'; +?> + diff --git a/interface/web/admin/lib/lang/id_language_add.lng b/interface/web/admin/lib/lang/id_language_add.lng new file mode 100644 index 0000000000..41aae086c4 --- /dev/null +++ b/interface/web/admin/lib/lang/id_language_add.lng @@ -0,0 +1,9 @@ + + diff --git a/interface/web/admin/lib/lang/id_language_complete.lng b/interface/web/admin/lib/lang/id_language_complete.lng new file mode 100644 index 0000000000..8fbb6edc46 --- /dev/null +++ b/interface/web/admin/lib/lang/id_language_complete.lng @@ -0,0 +1,8 @@ +Ini akan menambahkan string yang tidak ada dari berkas master bahasa Inggris ke bahasa yang dipilih.'; +$wb['language_select_txt'] = 'Pilih bahasa'; +$wb['btn_save_txt'] = 'Gabungkan Berkas Sekarang'; +$wb['btn_cancel_txt'] = 'Kembali'; +?> + diff --git a/interface/web/admin/lib/lang/id_language_edit.lng b/interface/web/admin/lib/lang/id_language_edit.lng new file mode 100644 index 0000000000..b223182941 --- /dev/null +++ b/interface/web/admin/lib/lang/id_language_edit.lng @@ -0,0 +1,9 @@ + + diff --git a/interface/web/admin/lib/lang/id_language_export.lng b/interface/web/admin/lib/lang/id_language_export.lng new file mode 100644 index 0000000000..5eeb5178cf --- /dev/null +++ b/interface/web/admin/lib/lang/id_language_export.lng @@ -0,0 +1,7 @@ + + diff --git a/interface/web/admin/lib/lang/id_language_import.lng b/interface/web/admin/lib/lang/id_language_import.lng new file mode 100644 index 0000000000..d1a06cc980 --- /dev/null +++ b/interface/web/admin/lib/lang/id_language_import.lng @@ -0,0 +1,9 @@ + + diff --git a/interface/web/admin/lib/lang/id_language_list.lng b/interface/web/admin/lib/lang/id_language_list.lng new file mode 100644 index 0000000000..dfff714b58 --- /dev/null +++ b/interface/web/admin/lib/lang/id_language_list.lng @@ -0,0 +1,8 @@ + + diff --git a/interface/web/admin/lib/lang/id_package_install.lng b/interface/web/admin/lib/lang/id_package_install.lng new file mode 100644 index 0000000000..7ad45a13ed --- /dev/null +++ b/interface/web/admin/lib/lang/id_package_install.lng @@ -0,0 +1,8 @@ + + diff --git a/interface/web/admin/lib/lang/id_remote_action.lng b/interface/web/admin/lib/lang/id_remote_action.lng new file mode 100644 index 0000000000..50992b6ca9 --- /dev/null +++ b/interface/web/admin/lib/lang/id_remote_action.lng @@ -0,0 +1,11 @@ +
PENGGUNAANNYA MENJADI TANGGUNG JAWAB ANDA SENDIRI!'; +$wb['do_ispcupdate_caption'] = 'Lakukan pemutakhiran ISPConfig 3 - di server remote'; +$wb['do_ispcupdate_desc'] = 'Tindakan ini melakukan pemutakhiran ISPConfig3 di server yang Anda pilih.

PENGGUNAANNYA MENJADI TANGGUNG JAWAB ANDA SENDIRI!'; +$wb['action_scheduled'] = 'Tindakan dijadwalkan untuk dijalankan'; +$wb['select_all_server'] = 'Semua server'; +?> + diff --git a/interface/web/admin/lib/lang/id_remote_user.lng b/interface/web/admin/lib/lang/id_remote_user.lng new file mode 100644 index 0000000000..5129261a40 --- /dev/null +++ b/interface/web/admin/lib/lang/id_remote_user.lng @@ -0,0 +1,43 @@ + + diff --git a/interface/web/admin/lib/lang/id_remote_user_list.lng b/interface/web/admin/lib/lang/id_remote_user_list.lng new file mode 100644 index 0000000000..82dd763cd2 --- /dev/null +++ b/interface/web/admin/lib/lang/id_remote_user_list.lng @@ -0,0 +1,8 @@ + + diff --git a/interface/web/admin/lib/lang/id_server.lng b/interface/web/admin/lib/lang/id_server.lng new file mode 100644 index 0000000000..75f639d98a --- /dev/null +++ b/interface/web/admin/lib/lang/id_server.lng @@ -0,0 +1,14 @@ + + diff --git a/interface/web/admin/lib/lang/id_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng new file mode 100644 index 0000000000..8433fc029f --- /dev/null +++ b/interface/web/admin/lib/lang/id_server_config.lng @@ -0,0 +1,78 @@ + + diff --git a/interface/web/admin/lib/lang/id_server_config_list.lng b/interface/web/admin/lib/lang/id_server_config_list.lng new file mode 100644 index 0000000000..15d64cdf95 --- /dev/null +++ b/interface/web/admin/lib/lang/id_server_config_list.lng @@ -0,0 +1,5 @@ + + diff --git a/interface/web/admin/lib/lang/id_server_ip.lng b/interface/web/admin/lib/lang/id_server_ip.lng new file mode 100644 index 0000000000..6044504f47 --- /dev/null +++ b/interface/web/admin/lib/lang/id_server_ip.lng @@ -0,0 +1,8 @@ + + diff --git a/interface/web/admin/lib/lang/id_server_ip_list.lng b/interface/web/admin/lib/lang/id_server_ip_list.lng new file mode 100644 index 0000000000..ee4d8a0a98 --- /dev/null +++ b/interface/web/admin/lib/lang/id_server_ip_list.lng @@ -0,0 +1,7 @@ + + diff --git a/interface/web/admin/lib/lang/id_server_list.lng b/interface/web/admin/lib/lang/id_server_list.lng new file mode 100644 index 0000000000..60211442e4 --- /dev/null +++ b/interface/web/admin/lib/lang/id_server_list.lng @@ -0,0 +1,12 @@ + + diff --git a/interface/web/admin/lib/lang/id_software_package_install.lng b/interface/web/admin/lib/lang/id_software_package_install.lng new file mode 100644 index 0000000000..949845b41c --- /dev/null +++ b/interface/web/admin/lib/lang/id_software_package_install.lng @@ -0,0 +1,7 @@ + + diff --git a/interface/web/admin/lib/lang/id_software_package_list.lng b/interface/web/admin/lib/lang/id_software_package_list.lng new file mode 100644 index 0000000000..583492fd2d --- /dev/null +++ b/interface/web/admin/lib/lang/id_software_package_list.lng @@ -0,0 +1,11 @@ + + diff --git a/interface/web/admin/lib/lang/id_software_repo.lng b/interface/web/admin/lib/lang/id_software_repo.lng new file mode 100644 index 0000000000..8ebd053b12 --- /dev/null +++ b/interface/web/admin/lib/lang/id_software_repo.lng @@ -0,0 +1,8 @@ + + diff --git a/interface/web/admin/lib/lang/id_software_repo_list.lng b/interface/web/admin/lib/lang/id_software_repo_list.lng new file mode 100644 index 0000000000..e40c3544be --- /dev/null +++ b/interface/web/admin/lib/lang/id_software_repo_list.lng @@ -0,0 +1,7 @@ + + diff --git a/interface/web/admin/lib/lang/id_software_update_list.lng b/interface/web/admin/lib/lang/id_software_update_list.lng new file mode 100644 index 0000000000..3dd17ff3a7 --- /dev/null +++ b/interface/web/admin/lib/lang/id_software_update_list.lng @@ -0,0 +1,9 @@ + + diff --git a/interface/web/admin/lib/lang/id_system_config.lng b/interface/web/admin/lib/lang/id_system_config.lng new file mode 100644 index 0000000000..2a43931f32 --- /dev/null +++ b/interface/web/admin/lib/lang/id_system_config.lng @@ -0,0 +1,23 @@ + + diff --git a/interface/web/admin/lib/lang/id_users.lng b/interface/web/admin/lib/lang/id_users.lng new file mode 100644 index 0000000000..bdaf72c0c7 --- /dev/null +++ b/interface/web/admin/lib/lang/id_users.lng @@ -0,0 +1,29 @@ + + diff --git a/interface/web/admin/lib/lang/id_users_list.lng b/interface/web/admin/lib/lang/id_users_list.lng new file mode 100644 index 0000000000..53dc95deb3 --- /dev/null +++ b/interface/web/admin/lib/lang/id_users_list.lng @@ -0,0 +1,10 @@ +PERINGATAN: Jangan menyunting atau memodifikasi pengaturan pengguna apapun di sini. Gunakan Pengaturan Klien dan Reseller di modul Klien. Memodifikasi atau mengubah Pengguna atau Grup di sini dapat mengakibatkan kehilangan data!'; +?> + diff --git a/interface/web/admin/lib/lang/nl.lng b/interface/web/admin/lib/lang/nl.lng index 91791bbcb7..a6448b87c9 100644 --- a/interface/web/admin/lib/lang/nl.lng +++ b/interface/web/admin/lib/lang/nl.lng @@ -45,3 +45,4 @@ $wb['Do ISPConfig-Update'] = 'Voer een ISPConfig-update uit'; ?> + diff --git a/interface/web/admin/lib/lang/nl_firewall.lng b/interface/web/admin/lib/lang/nl_firewall.lng index 1f27d03d24..91544768d2 100644 --- a/interface/web/admin/lib/lang/nl_firewall.lng +++ b/interface/web/admin/lib/lang/nl_firewall.lng @@ -12,3 +12,4 @@ $wb["udp_ports_error_regex"] = 'Karakter niet toegestaan in udp port definitie. ?> + diff --git a/interface/web/admin/lib/lang/nl_firewall_list.lng b/interface/web/admin/lib/lang/nl_firewall_list.lng index 2461506067..d69fca90d6 100644 --- a/interface/web/admin/lib/lang/nl_firewall_list.lng +++ b/interface/web/admin/lib/lang/nl_firewall_list.lng @@ -8,3 +8,4 @@ $wb["add_new_record_txt"] = 'Toevoegen Firewall record'; ?> + diff --git a/interface/web/admin/lib/lang/nl_groups.lng b/interface/web/admin/lib/lang/nl_groups.lng index 0f624ca131..bc3685ac9f 100644 --- a/interface/web/admin/lib/lang/nl_groups.lng +++ b/interface/web/admin/lib/lang/nl_groups.lng @@ -5,3 +5,4 @@ $wb["name_err"] = 'Groep moet min. 1, max. 30 karakters zijn.'; ?> + diff --git a/interface/web/admin/lib/lang/nl_groups_list.lng b/interface/web/admin/lib/lang/nl_groups_list.lng index 71e230d98e..933293cc1a 100644 --- a/interface/web/admin/lib/lang/nl_groups_list.lng +++ b/interface/web/admin/lib/lang/nl_groups_list.lng @@ -7,3 +7,4 @@ $wb["warning_txt"] = 'WAARSCHUWING: Wijzig hier geen enkele gebruikersins ?> + diff --git a/interface/web/admin/lib/lang/nl_language_add.lng b/interface/web/admin/lib/lang/nl_language_add.lng index 5cefedbb9d..379b433342 100644 --- a/interface/web/admin/lib/lang/nl_language_add.lng +++ b/interface/web/admin/lib/lang/nl_language_add.lng @@ -8,3 +8,4 @@ $wb['btn_cancel_txt'] = 'Terug'; ?> + diff --git a/interface/web/admin/lib/lang/nl_language_complete.lng b/interface/web/admin/lib/lang/nl_language_complete.lng index 7fef5c3f78..3ba1f0260e 100644 --- a/interface/web/admin/lib/lang/nl_language_complete.lng +++ b/interface/web/admin/lib/lang/nl_language_complete.lng @@ -7,3 +7,4 @@ $wb['btn_cancel_txt'] = 'Terug'; ?> + diff --git a/interface/web/admin/lib/lang/nl_language_edit.lng b/interface/web/admin/lib/lang/nl_language_edit.lng index 7e9e4ed842..c200400071 100644 --- a/interface/web/admin/lib/lang/nl_language_edit.lng +++ b/interface/web/admin/lib/lang/nl_language_edit.lng @@ -9,3 +9,4 @@ $wb['btn_cancel_txt'] = 'Terug'; + diff --git a/interface/web/admin/lib/lang/nl_language_export.lng b/interface/web/admin/lib/lang/nl_language_export.lng index dca1869b0e..7f3cdf6999 100644 --- a/interface/web/admin/lib/lang/nl_language_export.lng +++ b/interface/web/admin/lib/lang/nl_language_export.lng @@ -6,3 +6,4 @@ $wb['btn_cancel_txt'] = 'Terug'; ?> + diff --git a/interface/web/admin/lib/lang/nl_language_import.lng b/interface/web/admin/lib/lang/nl_language_import.lng index 07514c5a10..851f277829 100644 --- a/interface/web/admin/lib/lang/nl_language_import.lng +++ b/interface/web/admin/lib/lang/nl_language_import.lng @@ -8,3 +8,4 @@ $wb['ignore_version_txt'] = 'Sla ISPConfig versie controle over'; ?> + diff --git a/interface/web/admin/lib/lang/nl_language_list.lng b/interface/web/admin/lib/lang/nl_language_list.lng index ede83dc2b6..35e35c1618 100644 --- a/interface/web/admin/lib/lang/nl_language_list.lng +++ b/interface/web/admin/lib/lang/nl_language_list.lng @@ -8,3 +8,4 @@ $wb["lang_file_date_txt"] = 'Laatste wijziging'; + diff --git a/interface/web/admin/lib/lang/nl_package_install.lng b/interface/web/admin/lib/lang/nl_package_install.lng index 988918ec91..92bb9c6876 100644 --- a/interface/web/admin/lib/lang/nl_package_install.lng +++ b/interface/web/admin/lib/lang/nl_package_install.lng @@ -7,3 +7,4 @@ $wb["active_txt"] = 'Actief'; ?> + diff --git a/interface/web/admin/lib/lang/nl_remote_action.lng b/interface/web/admin/lib/lang/nl_remote_action.lng index cfdd91a738..0514ea5afd 100644 --- a/interface/web/admin/lib/lang/nl_remote_action.lng +++ b/interface/web/admin/lib/lang/nl_remote_action.lng @@ -11,3 +11,4 @@ $wb['select_all_server'] = "Alle servers"; + diff --git a/interface/web/admin/lib/lang/nl_remote_user.lng b/interface/web/admin/lib/lang/nl_remote_user.lng index 12165a392d..b268165931 100644 --- a/interface/web/admin/lib/lang/nl_remote_user.lng +++ b/interface/web/admin/lib/lang/nl_remote_user.lng @@ -43,3 +43,4 @@ $wb['DNS txt functions'] = 'DNS txt functies'; + diff --git a/interface/web/admin/lib/lang/nl_remote_user_list.lng b/interface/web/admin/lib/lang/nl_remote_user_list.lng index 5d9f8fef39..b7bd11949b 100644 --- a/interface/web/admin/lib/lang/nl_remote_user_list.lng +++ b/interface/web/admin/lib/lang/nl_remote_user_list.lng @@ -9,3 +9,4 @@ $wb['username_txt'] = "Gebruikersnaam"; + diff --git a/interface/web/admin/lib/lang/nl_server.lng b/interface/web/admin/lib/lang/nl_server.lng index 097983781b..e5ebc217a3 100644 --- a/interface/web/admin/lib/lang/nl_server.lng +++ b/interface/web/admin/lib/lang/nl_server.lng @@ -13,3 +13,4 @@ $wb["- None -"] = '- Geen enkele -'; ?> + diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng index 159ae26b35..02d84ce2ee 100644 --- a/interface/web/admin/lib/lang/nl_server_config.lng +++ b/interface/web/admin/lib/lang/nl_server_config.lng @@ -77,3 +77,4 @@ $wb["check_apache_config_txt"] = 'Test Apache configuratie tijdens restart'; ?> + diff --git a/interface/web/admin/lib/lang/nl_server_config_list.lng b/interface/web/admin/lib/lang/nl_server_config_list.lng index 656be0706c..953e1195e6 100644 --- a/interface/web/admin/lib/lang/nl_server_config_list.lng +++ b/interface/web/admin/lib/lang/nl_server_config_list.lng @@ -4,3 +4,4 @@ $wb["server_name_txt"] = 'Server'; ?> + diff --git a/interface/web/admin/lib/lang/nl_server_ip.lng b/interface/web/admin/lib/lang/nl_server_ip.lng index f63c399fbf..467a2e4fda 100644 --- a/interface/web/admin/lib/lang/nl_server_ip.lng +++ b/interface/web/admin/lib/lang/nl_server_ip.lng @@ -7,3 +7,4 @@ $wb["ip_error_unique"] = 'Het IP addres moet uniek zijn'; ?> + diff --git a/interface/web/admin/lib/lang/nl_server_ip_list.lng b/interface/web/admin/lib/lang/nl_server_ip_list.lng index 02e043ab48..b304ac095c 100644 --- a/interface/web/admin/lib/lang/nl_server_ip_list.lng +++ b/interface/web/admin/lib/lang/nl_server_ip_list.lng @@ -6,3 +6,4 @@ $wb["add_new_record_txt"] = 'Toevoegen nieuw IP Adres'; ?> + diff --git a/interface/web/admin/lib/lang/nl_server_list.lng b/interface/web/admin/lib/lang/nl_server_list.lng index a28e332f6e..4f1e6462c0 100644 --- a/interface/web/admin/lib/lang/nl_server_list.lng +++ b/interface/web/admin/lib/lang/nl_server_list.lng @@ -11,3 +11,4 @@ $wb["add_new_record_txt"] = 'Toevoegen nieuwe server'; ?> + diff --git a/interface/web/admin/lib/lang/nl_software_package_install.lng b/interface/web/admin/lib/lang/nl_software_package_install.lng index bffab594e5..7ed554e416 100644 --- a/interface/web/admin/lib/lang/nl_software_package_install.lng +++ b/interface/web/admin/lib/lang/nl_software_package_install.lng @@ -6,3 +6,4 @@ $wb["btn_cancel_txt"] = 'Annuleren'; ?> + diff --git a/interface/web/admin/lib/lang/nl_software_package_list.lng b/interface/web/admin/lib/lang/nl_software_package_list.lng index dd375c3db8..1a81ae28a6 100644 --- a/interface/web/admin/lib/lang/nl_software_package_list.lng +++ b/interface/web/admin/lib/lang/nl_software_package_list.lng @@ -11,3 +11,4 @@ $wb['package_id_txt'] = 'locaal App-ID'; + diff --git a/interface/web/admin/lib/lang/nl_software_repo.lng b/interface/web/admin/lib/lang/nl_software_repo.lng index 2448e2a38b..4943e1ce4a 100644 --- a/interface/web/admin/lib/lang/nl_software_repo.lng +++ b/interface/web/admin/lib/lang/nl_software_repo.lng @@ -7,3 +7,4 @@ $wb["active_txt"] = 'Actief'; ?> + diff --git a/interface/web/admin/lib/lang/nl_software_repo_list.lng b/interface/web/admin/lib/lang/nl_software_repo_list.lng index bf318f5078..43e549c4ac 100644 --- a/interface/web/admin/lib/lang/nl_software_repo_list.lng +++ b/interface/web/admin/lib/lang/nl_software_repo_list.lng @@ -6,3 +6,4 @@ $wb["repo_url_txt"] = 'URL'; ?> + diff --git a/interface/web/admin/lib/lang/nl_software_update_list.lng b/interface/web/admin/lib/lang/nl_software_update_list.lng index 9472a7eeb8..0e0deddea1 100644 --- a/interface/web/admin/lib/lang/nl_software_update_list.lng +++ b/interface/web/admin/lib/lang/nl_software_update_list.lng @@ -9,3 +9,4 @@ $wb['action_txt'] = 'Actie'; + diff --git a/interface/web/admin/lib/lang/nl_system_config.lng b/interface/web/admin/lib/lang/nl_system_config.lng index 8105a427b6..6976865635 100644 --- a/interface/web/admin/lib/lang/nl_system_config.lng +++ b/interface/web/admin/lib/lang/nl_system_config.lng @@ -7,7 +7,7 @@ $wb["shelluser_prefix_txt"] = 'Shell gebruiker voorvoegsel'; $wb["webdavuser_prefix_txt"] = 'Webdav gebruiker voorvoegsel'; $wb["ftpuser_prefix_txt"] = 'FTP gebruiker voorvoegsel'; $wb["dbname_prefix_error_regex"] = 'Char niet toegestaan in database naam voorvoegsel.'; -$wb["dbuser_prefix_error_regex"] = 'Charniet toegestaan in database gebruiker voorvoegsel.'; +$wb["dbuser_prefix_error_regex"] = 'Char niet toegestaan in database gebruiker voorvoegsel.'; $wb["ftpuser_prefix_error_regex"] = 'Char niet toegestaan in ftp gebruiker voorvoegsel.'; $wb["shelluser_prefix_error_regex"] = 'Char niet toegestaan in shell gebruiker voorvoegsel.'; $wb["webdavuser_prefix_error_regex"] = 'Char niet toegestaan in webdav gebruiker voorvoegsel.'; @@ -23,3 +23,4 @@ $wb["webftp_url_txt"] = 'WebFTP URL'; + diff --git a/interface/web/admin/lib/lang/nl_users.lng b/interface/web/admin/lib/lang/nl_users.lng index 91a77a14e6..8bca00e0e4 100644 --- a/interface/web/admin/lib/lang/nl_users.lng +++ b/interface/web/admin/lib/lang/nl_users.lng @@ -29,3 +29,4 @@ $wb["startmodule_err"] = 'Start module maakt geen deel uit van de geselecteerde + diff --git a/interface/web/admin/lib/lang/nl_users_list.lng b/interface/web/admin/lib/lang/nl_users_list.lng index 6733111725..e114114fc8 100644 --- a/interface/web/admin/lib/lang/nl_users_list.lng +++ b/interface/web/admin/lib/lang/nl_users_list.lng @@ -9,3 +9,4 @@ $wb["warning_txt"] = 'WAARSCHUWING: Wijzig hier geen enkele gebruikersins ?> + diff --git a/interface/web/client/lib/lang/id.lng b/interface/web/client/lib/lang/id.lng new file mode 100644 index 0000000000..c8e2cf837b --- /dev/null +++ b/interface/web/client/lib/lang/id.lng @@ -0,0 +1,14 @@ + + diff --git a/interface/web/client/lib/lang/id_client.lng b/interface/web/client/lib/lang/id_client.lng new file mode 100644 index 0000000000..edd71996c2 --- /dev/null +++ b/interface/web/client/lib/lang/id_client.lng @@ -0,0 +1,102 @@ + + diff --git a/interface/web/client/lib/lang/id_client_del.lng b/interface/web/client/lib/lang/id_client_del.lng new file mode 100644 index 0000000000..8e7c73faf8 --- /dev/null +++ b/interface/web/client/lib/lang/id_client_del.lng @@ -0,0 +1,7 @@ + + diff --git a/interface/web/client/lib/lang/id_client_template.lng b/interface/web/client/lib/lang/id_client_template.lng new file mode 100644 index 0000000000..f6bc2d1332 --- /dev/null +++ b/interface/web/client/lib/lang/id_client_template.lng @@ -0,0 +1,64 @@ + + diff --git a/interface/web/client/lib/lang/id_client_template_list.lng b/interface/web/client/lib/lang/id_client_template_list.lng new file mode 100644 index 0000000000..47a3d09178 --- /dev/null +++ b/interface/web/client/lib/lang/id_client_template_list.lng @@ -0,0 +1,6 @@ + + diff --git a/interface/web/client/lib/lang/id_clients_list.lng b/interface/web/client/lib/lang/id_clients_list.lng new file mode 100644 index 0000000000..f91c82791b --- /dev/null +++ b/interface/web/client/lib/lang/id_clients_list.lng @@ -0,0 +1,10 @@ + + diff --git a/interface/web/client/lib/lang/id_reseller.lng b/interface/web/client/lib/lang/id_reseller.lng new file mode 100644 index 0000000000..1ed53593a9 --- /dev/null +++ b/interface/web/client/lib/lang/id_reseller.lng @@ -0,0 +1,100 @@ + 0'; +$wb['limit_web_quota_txt'] = 'Kuota Web'; +$wb['limit_traffic_quota_txt'] = 'Kuota Trafik'; +$wb['limit_trafficquota_error_notint'] = 'Kuota Trafik harus berupa angka.'; +$wb['limit_dns_slave_zone_txt'] = 'Jumlah maks zona DNS Sekunder'; +$wb['limit_dns_slave_zone_error_notint'] = 'Batasan zona slave dns harus berupa angka.'; +$wb['limit_dns_record_error_notint'] = 'Batasan record dns harus berupa angka.'; +$wb['customer_no_txt'] = 'No. Pelanggan'; +$wb['vat_id_txt'] = 'VAT ID'; +$wb['required_fields_txt'] = '* Kolom yang dibutuhkan'; +?> + diff --git a/interface/web/client/lib/lang/id_resellers_list.lng b/interface/web/client/lib/lang/id_resellers_list.lng new file mode 100644 index 0000000000..c5a6abc419 --- /dev/null +++ b/interface/web/client/lib/lang/id_resellers_list.lng @@ -0,0 +1,10 @@ + + diff --git a/interface/web/client/lib/lang/nl.lng b/interface/web/client/lib/lang/nl.lng index 1c76b41347..f4475819b9 100644 --- a/interface/web/client/lib/lang/nl.lng +++ b/interface/web/client/lib/lang/nl.lng @@ -14,3 +14,4 @@ $wb["error_has_clients"] = 'Deze reseller heeft klanten. Verwijder eerst de klan ?> + diff --git a/interface/web/client/lib/lang/nl_client.lng b/interface/web/client/lib/lang/nl_client.lng index d9a50600ef..2d36969f79 100644 --- a/interface/web/client/lib/lang/nl_client.lng +++ b/interface/web/client/lib/lang/nl_client.lng @@ -65,7 +65,7 @@ $wb["limit_maildomain_error_notint"] = 'De e-mail domein limiet moet een numerie $wb["limit_mailbox_error_notint"] = 'De mailbox limiet moet een numerieke waarde zijn.'; $wb["limit_mailalias_error_notint"] = 'De e-mail alias limiet moet een numerieke waarde zijn.'; $wb["limit_mailaliasdomain_error_notint"] = 'De e-mail domein alias limiet moet een numerieke waarde zijn.'; -$wb["limit_mailforward_error_notint"] = 'The e-mail forward limiet moet een numerieke waarde zijn.'; +$wb["limit_mailforward_error_notint"] = 'De e-mail forward limiet moet een numerieke waarde zijn.'; $wb["limit_mailcatchall_error_notint"] = 'De e-mail catchall limiet moet een numerieke waarde zijn.'; $wb["limit_mailrouting_error_notint"] = 'De em-ail routing limiet moet een numerieke waarde zijn.'; $wb["limit_mailfilter_error_notint"] = 'De e-mail filter limiet moet een numerieke waarde zijn.'; @@ -86,7 +86,7 @@ $wb["limit_dns_zone_error_notint"] = 'De DNS record limiet moet een numerieke wa $wb["limit_client_error_notint"] = 'De sub klant limiet moet een numerieke waarde zijn.'; $wb["default_dbserver_txt"] = 'Standaard Database server'; $wb["limit_database_txt"] = 'Max. aantal databases'; -$wb["limit_database_error_notint"] = 'The database limiet moet een numerieke waarde zijn.'; +$wb["limit_database_error_notint"] = 'De database limiet moet een numerieke waarde zijn.'; $wb["limit_cron_error_notint"] = 'De cron limiet moet een numerieke waarde zijn.'; $wb["limit_cron_error_frequency"] = 'De cron frequency limiet moet een numerieke waarde zijn.'; $wb["username_error_regex"] = 'De gebruikersnaam bevat ongeldige karakters.'; @@ -105,3 +105,4 @@ $wb["required_fields_txt"] = '* Verplichte velden'; + diff --git a/interface/web/client/lib/lang/nl_client_del.lng b/interface/web/client/lib/lang/nl_client_del.lng index 9193664551..56797bfd02 100644 --- a/interface/web/client/lib/lang/nl_client_del.lng +++ b/interface/web/client/lib/lang/nl_client_del.lng @@ -7,3 +7,4 @@ $wb["btn_cancel_txt"] = 'Annuleren zonder de klant te verwijderen'; + diff --git a/interface/web/client/lib/lang/nl_client_template.lng b/interface/web/client/lib/lang/nl_client_template.lng index bc753c93fe..63a495fe6b 100644 --- a/interface/web/client/lib/lang/nl_client_template.lng +++ b/interface/web/client/lib/lang/nl_client_template.lng @@ -65,3 +65,4 @@ $wb["template_del_aborted_txt"] = 'Verwijderen afgebroken. Er is een klant die d ?> + diff --git a/interface/web/client/lib/lang/nl_client_template_list.lng b/interface/web/client/lib/lang/nl_client_template_list.lng index 44d9d26770..c4ee7c14d9 100644 --- a/interface/web/client/lib/lang/nl_client_template_list.lng +++ b/interface/web/client/lib/lang/nl_client_template_list.lng @@ -6,3 +6,4 @@ $wb["template_name_txt"] = 'Template naam'; + diff --git a/interface/web/client/lib/lang/nl_clients_list.lng b/interface/web/client/lib/lang/nl_clients_list.lng index d0ffbd5705..7a9ae860bb 100644 --- a/interface/web/client/lib/lang/nl_clients_list.lng +++ b/interface/web/client/lib/lang/nl_clients_list.lng @@ -9,3 +9,4 @@ $wb["add_new_record_txt"] = 'Toevoegen nieuwe klant'; ?> + diff --git a/interface/web/client/lib/lang/nl_reseller.lng b/interface/web/client/lib/lang/nl_reseller.lng index 74084150cc..d24d0cea32 100644 --- a/interface/web/client/lib/lang/nl_reseller.lng +++ b/interface/web/client/lib/lang/nl_reseller.lng @@ -16,7 +16,7 @@ $wb["company_name_txt"] = 'Bedrijfsnaam'; $wb["contact_name_txt"] = 'Contactpersoon'; $wb["username_txt"] = 'Gebruikersnaam'; $wb["password_txt"] = 'Wachtwoord'; -$wb["password_strength_txt"] = 'Password sterkte'; +$wb["password_strength_txt"] = 'Wachtwoord sterkte'; $wb["language_txt"] = 'Taal'; $wb["usertheme_txt"] = 'Thema'; $wb["street_txt"] = 'Adres'; @@ -65,7 +65,7 @@ $wb["limit_mailalias_error_notint"] = 'De e-mail alias limiet moet een numerieke $wb["limit_mailforward_error_notint"] = 'De e-mail forward limiet moet een numerieke waarde zijn.'; $wb["limit_mailcatchall_error_notint"] = 'De e-mail catchall limiet moet een numerieke waarde zijn.'; $wb["limit_mailrouting_error_notint"] = 'De e-mail routing limiet moet een numerieke waarde zijn.'; -$wb["limit_mailfilter_error_notint"] = 'The e-mail filter limiet moet een numerieke waarde zijn.'; +$wb["limit_mailfilter_error_notint"] = 'De e-mail filter limiet moet een numerieke waarde zijn.'; $wb["limit_mailfetchmail_error_notint"] = 'De fetchmail limiet moet een numerieke waarde zijn.'; $wb["limit_mailquota_error_notint"] = 'De email quota limiet moet een numerieke waarde zijn.'; $wb["limit_spamfilter_wblist_error_notint"] = 'De spamfilter white / blacklist limit moet een numerieke waarde zijn.'; @@ -73,17 +73,17 @@ $wb["limit_spamfilter_user_error_notint"] = 'De spamfilter gebruiker limiet moet $wb["limit_spamfilter_policy_error_notint"] = 'De spamfilter policy limiet moet een numerieke waarde zijn.'; $wb["limit_web_domain_error_notint"] = 'De website limiet moet een numerieke waarde zijn.'; $wb["limit_web_aliasdomain_error_notint"] = 'De website alias domein limiet moet een numerieke waarde zijn.'; -$wb["limit_web_subdomain_error_notint"] = 'The website subdomein limiet moet een numerieke waarde zijn.'; -$wb["limit_ftp_user_error_notint"] = 'The ftp gebruiker limiet moet een numerieke waarde zijn.'; -$wb["limit_shell_user_error_notint"] = 'The shell gebruiker limiet moet een numerieke waarde zijn.'; -$wb["limit_dns_zone_error_notint"] = 'The DNS zone limiet moet een numerieke waarde zijn.'; -$wb["limit_dns_slave_zone_error_notint"] = 'The DNS slave zone limiet moet een numerieke waarde zijn.'; -$wb["limit_dns_record_error_notint"] = 'The DNS record limiet moet een numerieke waarde zijn.'; -$wb["limit_client_error_notint"] = 'The sub client limiet moet een numerieke waarde zijn.'; +$wb["limit_web_subdomain_error_notint"] = 'De website subdomein limiet moet een numerieke waarde zijn.'; +$wb["limit_ftp_user_error_notint"] = 'De ftp gebruiker limiet moet een numerieke waarde zijn.'; +$wb["limit_shell_user_error_notint"] = 'De shell gebruiker limiet moet een numerieke waarde zijn.'; +$wb["limit_dns_zone_error_notint"] = 'De DNS zone limiet moet een numerieke waarde zijn.'; +$wb["limit_dns_slave_zone_error_notint"] = 'De DNS slave zone limiet moet een numerieke waarde zijn.'; +$wb["limit_dns_record_error_notint"] = 'De DNS record limiet moet een numerieke waarde zijn.'; +$wb["limit_client_error_notint"] = 'De sub client limiet moet een numerieke waarde zijn.'; $wb["default_dbserver_txt"] = 'Standaard Database Server'; $wb["limit_database_txt"] = 'Max. aantal Databases'; $wb["limit_database_error_notint"] = 'De database limiet moet een numerieke waarde zijn.'; -$wb["limit_cron_error_notint"] = 'The cron limiet moet een numerieke waarde zijn.'; +$wb["limit_cron_error_notint"] = 'De cron limiet moet een numerieke waarde zijn.'; $wb["limit_cron_error_frequency"] = 'De cron frequency limiet moet een numerieke waarde zijn.'; $wb["username_error_regex"] = 'De gebruikersnaam bevat ongeldige karakters.'; $wb["template_master_txt"] = 'Master template'; @@ -102,3 +102,4 @@ $wb["required_fields_txt"] = '* Verplichte velden'; + diff --git a/interface/web/client/lib/lang/nl_resellers_list.lng b/interface/web/client/lib/lang/nl_resellers_list.lng index a2c9e34201..3cc7ee4c80 100644 --- a/interface/web/client/lib/lang/nl_resellers_list.lng +++ b/interface/web/client/lib/lang/nl_resellers_list.lng @@ -9,3 +9,4 @@ $wb["add_new_record_txt"] = 'Toevoegen nieuwe reseller'; ?> + diff --git a/interface/web/dashboard/lib/lang/id.lng b/interface/web/dashboard/lib/lang/id.lng new file mode 100644 index 0000000000..b05f9567ab --- /dev/null +++ b/interface/web/dashboard/lib/lang/id.lng @@ -0,0 +1,5 @@ + + diff --git a/interface/web/dashboard/lib/lang/id_dashlet_limits.lng b/interface/web/dashboard/lib/lang/id_dashlet_limits.lng new file mode 100644 index 0000000000..7757571890 --- /dev/null +++ b/interface/web/dashboard/lib/lang/id_dashlet_limits.lng @@ -0,0 +1,30 @@ + + diff --git a/interface/web/dashboard/lib/lang/id_dashlet_modules.lng b/interface/web/dashboard/lib/lang/id_dashlet_modules.lng new file mode 100644 index 0000000000..2f1e23dd87 --- /dev/null +++ b/interface/web/dashboard/lib/lang/id_dashlet_modules.lng @@ -0,0 +1,4 @@ + + diff --git a/interface/web/dashboard/lib/lang/nl.lng b/interface/web/dashboard/lib/lang/nl.lng index 72fd5b5656..db713834c1 100644 --- a/interface/web/dashboard/lib/lang/nl.lng +++ b/interface/web/dashboard/lib/lang/nl.lng @@ -5,3 +5,4 @@ $wb['available_modules_txt'] = "Beschikbare modules"; + diff --git a/interface/web/dashboard/lib/lang/nl_dashlet_limits.lng b/interface/web/dashboard/lib/lang/nl_dashlet_limits.lng index 3ef33ca64f..12a10df94c 100644 --- a/interface/web/dashboard/lib/lang/nl_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/nl_dashlet_limits.lng @@ -30,3 +30,4 @@ $wb["limit_database_txt"] = 'Aantal databases'; + diff --git a/interface/web/dashboard/lib/lang/nl_dashlet_modules.lng b/interface/web/dashboard/lib/lang/nl_dashlet_modules.lng index dc5ce84e7b..827d2aa080 100644 --- a/interface/web/dashboard/lib/lang/nl_dashlet_modules.lng +++ b/interface/web/dashboard/lib/lang/nl_dashlet_modules.lng @@ -4,3 +4,4 @@ $wb['available_modules_txt'] = "Beschikbare modules"; + diff --git a/interface/web/designer/lib/lang/id.lng b/interface/web/designer/lib/lang/id.lng new file mode 100644 index 0000000000..75c42c807a --- /dev/null +++ b/interface/web/designer/lib/lang/id.lng @@ -0,0 +1,3 @@ + + diff --git a/interface/web/designer/lib/lang/id_form_edit.lng b/interface/web/designer/lib/lang/id_form_edit.lng new file mode 100644 index 0000000000..b5ba503bcc --- /dev/null +++ b/interface/web/designer/lib/lang/id_form_edit.lng @@ -0,0 +1,25 @@ + + diff --git a/interface/web/designer/lib/lang/id_form_list.lng b/interface/web/designer/lib/lang/id_form_list.lng new file mode 100644 index 0000000000..fef6a34058 --- /dev/null +++ b/interface/web/designer/lib/lang/id_form_list.lng @@ -0,0 +1,8 @@ + + diff --git a/interface/web/designer/lib/lang/id_form_show.lng b/interface/web/designer/lib/lang/id_form_show.lng new file mode 100644 index 0000000000..87c6f0417b --- /dev/null +++ b/interface/web/designer/lib/lang/id_form_show.lng @@ -0,0 +1,19 @@ + + diff --git a/interface/web/designer/lib/lang/id_module_edit.lng b/interface/web/designer/lib/lang/id_module_edit.lng new file mode 100644 index 0000000000..8c6af9ab55 --- /dev/null +++ b/interface/web/designer/lib/lang/id_module_edit.lng @@ -0,0 +1,23 @@ +Keterangan +

+Nama Modul: Nama direktori modul. Hanya angka, karakter dan garis bawah yang diizinkan.
+Judul Modul: Akan terlihat di navigasi utama (bagian atas).
+Berkas Template: Berkas Template modul. Yang tersedia saat ini: module.tpl.htm dan module_tree.tpl.htm. Defaultnya adalah module.tpl.htm.
+Frame Navigasi: Jika memilih module_tree.tpl.htm sebagai berkas template, masukkan path ke berkas skrip untuk frame sebelah kiri.
+Halaman Default: Halaman ini akan muncul ketika modul dibuka.
+Lebar Tab: Lebar tab di navigasi utama. Kolom ini defaultnya kosong. Anda dapat memasukkan nilai pixel absolut (mis. 20) atau relatif (mis. 20%).
+Petunjuk: Semua path adalah relatif terhadap direktori web. +'; +?> + diff --git a/interface/web/designer/lib/lang/id_module_list.lng b/interface/web/designer/lib/lang/id_module_list.lng new file mode 100644 index 0000000000..098486ffd1 --- /dev/null +++ b/interface/web/designer/lib/lang/id_module_list.lng @@ -0,0 +1,6 @@ + + diff --git a/interface/web/designer/lib/lang/id_module_nav_edit.lng b/interface/web/designer/lib/lang/id_module_nav_edit.lng new file mode 100644 index 0000000000..8b9376ab4f --- /dev/null +++ b/interface/web/designer/lib/lang/id_module_nav_edit.lng @@ -0,0 +1,7 @@ + + diff --git a/interface/web/designer/lib/lang/id_module_nav_item_edit.lng b/interface/web/designer/lib/lang/id_module_nav_item_edit.lng new file mode 100644 index 0000000000..3e2567246f --- /dev/null +++ b/interface/web/designer/lib/lang/id_module_nav_item_edit.lng @@ -0,0 +1,9 @@ + + diff --git a/interface/web/designer/lib/lang/id_module_show.lng b/interface/web/designer/lib/lang/id_module_show.lng new file mode 100644 index 0000000000..31a445c05d --- /dev/null +++ b/interface/web/designer/lib/lang/id_module_show.lng @@ -0,0 +1,17 @@ + + diff --git a/interface/web/designer/lib/lang/nl.lng b/interface/web/designer/lib/lang/nl.lng index 5493b5d2d8..4922f83737 100644 --- a/interface/web/designer/lib/lang/nl.lng +++ b/interface/web/designer/lib/lang/nl.lng @@ -3,3 +3,4 @@ ?> + diff --git a/interface/web/designer/lib/lang/nl_form_edit.lng b/interface/web/designer/lib/lang/nl_form_edit.lng index 140a3a7844..ad01242168 100644 --- a/interface/web/designer/lib/lang/nl_form_edit.lng +++ b/interface/web/designer/lib/lang/nl_form_edit.lng @@ -26,3 +26,4 @@ $wb["auth_preset_perm_other_txt"] = 'Perm. overige'; ?> + diff --git a/interface/web/designer/lib/lang/nl_form_list.lng b/interface/web/designer/lib/lang/nl_form_list.lng index 5e4ef81d19..ced4a6d910 100644 --- a/interface/web/designer/lib/lang/nl_form_list.lng +++ b/interface/web/designer/lib/lang/nl_form_list.lng @@ -7,3 +7,4 @@ $wb["description_txt"] = 'Omschrijving'; ?> + diff --git a/interface/web/designer/lib/lang/nl_form_show.lng b/interface/web/designer/lib/lang/nl_form_show.lng index 7414f5fef3..e6934c1261 100644 --- a/interface/web/designer/lib/lang/nl_form_show.lng +++ b/interface/web/designer/lib/lang/nl_form_show.lng @@ -18,3 +18,4 @@ $wb["item_del_txt"] = "Verwijder menutitem?"; ?> + diff --git a/interface/web/designer/lib/lang/nl_module_edit.lng b/interface/web/designer/lib/lang/nl_module_edit.lng index f56a82a61f..f257acacc6 100644 --- a/interface/web/designer/lib/lang/nl_module_edit.lng +++ b/interface/web/designer/lib/lang/nl_module_edit.lng @@ -23,3 +23,4 @@ $wb["description_txt"] = ' ?> + diff --git a/interface/web/designer/lib/lang/nl_module_list.lng b/interface/web/designer/lib/lang/nl_module_list.lng index c2b9989ab9..06077da6d7 100644 --- a/interface/web/designer/lib/lang/nl_module_list.lng +++ b/interface/web/designer/lib/lang/nl_module_list.lng @@ -5,3 +5,4 @@ $wb["title_txt"] = 'Titel'; ?> + diff --git a/interface/web/designer/lib/lang/nl_module_nav_edit.lng b/interface/web/designer/lib/lang/nl_module_nav_edit.lng index 6187b34caf..1140801bb3 100644 --- a/interface/web/designer/lib/lang/nl_module_nav_edit.lng +++ b/interface/web/designer/lib/lang/nl_module_nav_edit.lng @@ -6,3 +6,4 @@ $wb["cancel_txt"] = 'Annuleren'; ?> + diff --git a/interface/web/designer/lib/lang/nl_module_nav_item_edit.lng b/interface/web/designer/lib/lang/nl_module_nav_item_edit.lng index 122273850a..b510d8da9c 100644 --- a/interface/web/designer/lib/lang/nl_module_nav_item_edit.lng +++ b/interface/web/designer/lib/lang/nl_module_nav_item_edit.lng @@ -8,3 +8,4 @@ $wb["cancel_txt"] = 'Annuleer'; ?> + diff --git a/interface/web/designer/lib/lang/nl_module_show.lng b/interface/web/designer/lib/lang/nl_module_show.lng index ceed1c15d3..457c6ac665 100644 --- a/interface/web/designer/lib/lang/nl_module_show.lng +++ b/interface/web/designer/lib/lang/nl_module_show.lng @@ -17,3 +17,4 @@ $wb["item_del_txt"] = "Wilt u het menu item verwijderen?"; ?> + diff --git a/interface/web/dns/dns_rr_del.php b/interface/web/dns/dns_rr_del.php index 7a0b92d145..26d369ec6c 100644 --- a/interface/web/dns/dns_rr_del.php +++ b/interface/web/dns/dns_rr_del.php @@ -45,7 +45,23 @@ require_once('../../lib/app.inc.php'); //* Check permissions for module $app->auth->check_module_permissions('dns'); -$app->uses("tform_actions"); -$app->tform_actions->onDelete(); +$app->uses('tpl,tform,tform_actions,validate_dns'); +$app->load('tform_actions'); + +class page_action extends tform_actions { + + function onAfterDelete() { + global $app; $conf; + + //* Update the serial number of the SOA record + $soa = $app->db->queryOneRecord("SELECT serial FROM dns_soa WHERE id = '".intval($this->dataRecord["zone"])."' AND ".$app->tform->getAuthSQL('r')); + $soa_id = intval($this->dataRecord["zone"]); + $serial = $app->validate_dns->increase_serial($soa["serial"]); + $app->db->datalogUpdate('dns_soa', "serial = $serial", 'id', $soa_id); + } +} + +$page = new page_action; +$page->onDelete(); ?> \ No newline at end of file diff --git a/interface/web/dns/lib/lang/id.lng b/interface/web/dns/lib/lang/id.lng new file mode 100644 index 0000000000..06b951374d --- /dev/null +++ b/interface/web/dns/lib/lang/id.lng @@ -0,0 +1,21 @@ + + diff --git a/interface/web/dns/lib/lang/id_dns_a.lng b/interface/web/dns/lib/lang/id_dns_a.lng new file mode 100644 index 0000000000..ee08a9f7f2 --- /dev/null +++ b/interface/web/dns/lib/lang/id_dns_a.lng @@ -0,0 +1,17 @@ + + diff --git a/interface/web/dns/lib/lang/id_dns_a_list.lng b/interface/web/dns/lib/lang/id_dns_a_list.lng new file mode 100644 index 0000000000..29a1068f06 --- /dev/null +++ b/interface/web/dns/lib/lang/id_dns_a_list.lng @@ -0,0 +1,15 @@ + + diff --git a/interface/web/dns/lib/lang/id_dns_aaaa.lng b/interface/web/dns/lib/lang/id_dns_aaaa.lng new file mode 100644 index 0000000000..7911411e70 --- /dev/null +++ b/interface/web/dns/lib/lang/id_dns_aaaa.lng @@ -0,0 +1,16 @@ + + diff --git a/interface/web/dns/lib/lang/id_dns_alias.lng b/interface/web/dns/lib/lang/id_dns_alias.lng new file mode 100644 index 0000000000..47d21a5817 --- /dev/null +++ b/interface/web/dns/lib/lang/id_dns_alias.lng @@ -0,0 +1,16 @@ + + diff --git a/interface/web/dns/lib/lang/id_dns_cname.lng b/interface/web/dns/lib/lang/id_dns_cname.lng new file mode 100644 index 0000000000..6ae14c80d3 --- /dev/null +++ b/interface/web/dns/lib/lang/id_dns_cname.lng @@ -0,0 +1,17 @@ + + diff --git a/interface/web/dns/lib/lang/id_dns_hinfo.lng b/interface/web/dns/lib/lang/id_dns_hinfo.lng new file mode 100644 index 0000000000..a4ff8387ed --- /dev/null +++ b/interface/web/dns/lib/lang/id_dns_hinfo.lng @@ -0,0 +1,16 @@ + + diff --git a/interface/web/dns/lib/lang/id_dns_mx.lng b/interface/web/dns/lib/lang/id_dns_mx.lng new file mode 100644 index 0000000000..d9297a2334 --- /dev/null +++ b/interface/web/dns/lib/lang/id_dns_mx.lng @@ -0,0 +1,17 @@ + + diff --git a/interface/web/dns/lib/lang/id_dns_ns.lng b/interface/web/dns/lib/lang/id_dns_ns.lng new file mode 100644 index 0000000000..08cbbd070b --- /dev/null +++ b/interface/web/dns/lib/lang/id_dns_ns.lng @@ -0,0 +1,16 @@ + + diff --git a/interface/web/dns/lib/lang/id_dns_ptr.lng b/interface/web/dns/lib/lang/id_dns_ptr.lng new file mode 100644 index 0000000000..4a245209d8 --- /dev/null +++ b/interface/web/dns/lib/lang/id_dns_ptr.lng @@ -0,0 +1,16 @@ + + diff --git a/interface/web/dns/lib/lang/id_dns_rp.lng b/interface/web/dns/lib/lang/id_dns_rp.lng new file mode 100644 index 0000000000..8f647a4680 --- /dev/null +++ b/interface/web/dns/lib/lang/id_dns_rp.lng @@ -0,0 +1,16 @@ + + diff --git a/interface/web/dns/lib/lang/id_dns_slave.lng b/interface/web/dns/lib/lang/id_dns_slave.lng new file mode 100644 index 0000000000..474b74823d --- /dev/null +++ b/interface/web/dns/lib/lang/id_dns_slave.lng @@ -0,0 +1,15 @@ +IP ini (daftar dipisahkan dengan koma)'; +$wb['server_id_error_empty'] = 'Tidak ada server yang dipilih'; +$wb['origin_error_empty'] = 'Zona kosong.'; +$wb['origin_error_unique'] = 'Sudah ada record untuk zona ini.'; +$wb['origin_error_regex'] = 'Zona memiliki format yang tidak valid.'; +$wb['ns_error_regex'] = 'NS memiliki format yang tidak valid.'; +?> + diff --git a/interface/web/dns/lib/lang/id_dns_slave_list.lng b/interface/web/dns/lib/lang/id_dns_slave_list.lng new file mode 100644 index 0000000000..8889a4b5ec --- /dev/null +++ b/interface/web/dns/lib/lang/id_dns_slave_list.lng @@ -0,0 +1,9 @@ + + diff --git a/interface/web/dns/lib/lang/id_dns_soa.lng b/interface/web/dns/lib/lang/id_dns_soa.lng new file mode 100644 index 0000000000..dfc91fe881 --- /dev/null +++ b/interface/web/dns/lib/lang/id_dns_soa.lng @@ -0,0 +1,27 @@ +IP ini (daftar dipisahkan dengan koma)'; +$wb['active_txt'] = 'Aktif'; +$wb['limit_dns_zone_txt'] = 'Jumlah maksimum record DNS untuk akun Anda telah tercapai.'; +$wb['client_txt'] = 'Klien'; +$wb['no_zone_perm'] = 'Anda tidak memiliki hak untuk menambah record ke zona DNS ini.'; +$wb['server_id_error_empty'] = 'Tak ada server yang dipilih'; +$wb['origin_error_empty'] = 'Zone kosong.'; +$wb['origin_error_unique'] = 'Sudah ada record untuk zona ini.'; +$wb['origin_error_regex'] = 'Format Zona salah.'; +$wb['ns_error_regex'] = 'Format NS salah.'; +$wb['mbox_error_empty'] = 'Email kosong.'; +$wb['mbox_error_regex'] = 'Format Email tidak valid.'; +$wb['also_notify_txt'] = 'Notifikasi Juga'; +$wb['update_acl_txt'] = 'Mutakhirkan ACL'; +?> + diff --git a/interface/web/dns/lib/lang/id_dns_soa_list.lng b/interface/web/dns/lib/lang/id_dns_soa_list.lng new file mode 100644 index 0000000000..b405987122 --- /dev/null +++ b/interface/web/dns/lib/lang/id_dns_soa_list.lng @@ -0,0 +1,11 @@ + + diff --git a/interface/web/dns/lib/lang/id_dns_srv.lng b/interface/web/dns/lib/lang/id_dns_srv.lng new file mode 100644 index 0000000000..1d30171db2 --- /dev/null +++ b/interface/web/dns/lib/lang/id_dns_srv.lng @@ -0,0 +1,18 @@ + + diff --git a/interface/web/dns/lib/lang/id_dns_template.lng b/interface/web/dns/lib/lang/id_dns_template.lng new file mode 100644 index 0000000000..0e70266905 --- /dev/null +++ b/interface/web/dns/lib/lang/id_dns_template.lng @@ -0,0 +1,7 @@ + + diff --git a/interface/web/dns/lib/lang/id_dns_template_list.lng b/interface/web/dns/lib/lang/id_dns_template_list.lng new file mode 100644 index 0000000000..15beb69f7b --- /dev/null +++ b/interface/web/dns/lib/lang/id_dns_template_list.lng @@ -0,0 +1,7 @@ + + diff --git a/interface/web/dns/lib/lang/id_dns_txt.lng b/interface/web/dns/lib/lang/id_dns_txt.lng new file mode 100644 index 0000000000..d2e49a22d0 --- /dev/null +++ b/interface/web/dns/lib/lang/id_dns_txt.lng @@ -0,0 +1,16 @@ + + diff --git a/interface/web/dns/lib/lang/id_dns_wizard.lng b/interface/web/dns/lib/lang/id_dns_wizard.lng new file mode 100644 index 0000000000..c68520c361 --- /dev/null +++ b/interface/web/dns/lib/lang/id_dns_wizard.lng @@ -0,0 +1,30 @@ + + diff --git a/interface/web/dns/lib/lang/nl.lng b/interface/web/dns/lib/lang/nl.lng index 6d0c7e4f01..91637f564f 100644 --- a/interface/web/dns/lib/lang/nl.lng +++ b/interface/web/dns/lib/lang/nl.lng @@ -22,3 +22,4 @@ $wb['Templates'] = 'Templates'; ?> + diff --git a/interface/web/dns/lib/lang/nl_dns_a.lng b/interface/web/dns/lib/lang/nl_dns_a.lng index ac304f8987..6ee27eea96 100644 --- a/interface/web/dns/lib/lang/nl_dns_a.lng +++ b/interface/web/dns/lib/lang/nl_dns_a.lng @@ -8,11 +8,12 @@ $wb["ttl_txt"] = 'TTL'; $wb["active_txt"] = 'Actief'; $wb["limit_dns_record_txt"] = 'Het max. aan DNS records voor uw account is bereikt.'; $wb["no_zone_perm"] = 'U heeft geen toestemming om een record toe te voegen aan deze DNS zone.'; -$wb["name_error_empty"] = 'The hostnaam is niet ingvuld.'; -$wb["name_error_regex"] = 'The hostnaam heeft een onjuist formaat.'; +$wb["name_error_empty"] = 'De hostnaam is niet ingvuld.'; +$wb["name_error_regex"] = 'De hostnaam heeft een onjuist formaat.'; $wb["data_error_empty"] = 'IP-adres is niet ingvuld'; $wb["data_error_regex"] = 'IP-adres formaat ongeldig'; $wb["data_error_duplicate"] = 'Duplicaat A-Record of CNAME-record'; ?> + diff --git a/interface/web/dns/lib/lang/nl_dns_a_list.lng b/interface/web/dns/lib/lang/nl_dns_a_list.lng index b167f11390..5cda650443 100644 --- a/interface/web/dns/lib/lang/nl_dns_a_list.lng +++ b/interface/web/dns/lib/lang/nl_dns_a_list.lng @@ -14,3 +14,4 @@ $wb['delete_confirmation'] = 'Wilt u dit record echt verwijderen?'; ?> + diff --git a/interface/web/dns/lib/lang/nl_dns_aaaa.lng b/interface/web/dns/lib/lang/nl_dns_aaaa.lng index 9c7c966826..7db19335b5 100644 --- a/interface/web/dns/lib/lang/nl_dns_aaaa.lng +++ b/interface/web/dns/lib/lang/nl_dns_aaaa.lng @@ -8,10 +8,11 @@ $wb["ttl_txt"] = 'TTL'; $wb["active_txt"] = 'Actief'; $wb["limit_dns_record_txt"] = 'Het max. number of DNS records voor uw account is bereikt.'; $wb["no_zone_perm"] = 'U heeft geen toestemming om een record toe te voegen aan deze DNS zone.'; -$wb["name_error_empty"] = 'The hostnaam is niet ingvuld.'; -$wb["name_error_regex"] = 'The hostnaam heeft een onjuist formaat.'; -$wb["data_error_empty"] = 'IP-adres empty'; +$wb["name_error_empty"] = 'De hostnaam is niet ingvuld'; +$wb["name_error_regex"] = 'De hostnaam heeft een onjuist formaat.'; +$wb["data_error_empty"] = 'IP-adres is niet ingevuld'; $wb["data_error_regex"] = 'IP-adres formaat ongeldig'; ?> + diff --git a/interface/web/dns/lib/lang/nl_dns_alias.lng b/interface/web/dns/lib/lang/nl_dns_alias.lng index 585856fbfd..0192faae54 100644 --- a/interface/web/dns/lib/lang/nl_dns_alias.lng +++ b/interface/web/dns/lib/lang/nl_dns_alias.lng @@ -15,3 +15,4 @@ $wb["data_error_regex"] = 'Doel hostnaam formaat ongeldig'; ?> + diff --git a/interface/web/dns/lib/lang/nl_dns_cname.lng b/interface/web/dns/lib/lang/nl_dns_cname.lng index 93e1d4812a..59eb6c7762 100644 --- a/interface/web/dns/lib/lang/nl_dns_cname.lng +++ b/interface/web/dns/lib/lang/nl_dns_cname.lng @@ -9,10 +9,11 @@ $wb["active_txt"] = 'Actief'; $wb["limit_dns_record_txt"] = 'Het max. aan DNS records voor uw account is bereikt.'; $wb["no_zone_perm"] = 'U heeft geen toestemming om een record toe te voegen aan deze DNS zone.'; $wb["name_error_empty"] = 'De hostnaam is niet ingvuld.'; -$wb["name_error_regex"] = 'De hostname has the wrong format.'; +$wb["name_error_regex"] = 'De hostname heeft een onjuist formaat.'; $wb["data_error_empty"] = 'Doel hostnaam is niet ingvuld'; $wb["data_error_regex"] = 'Doel hostnaam formaat ongeldig'; $wb["data_error_duplicate"] = 'Duplicaat A-record of CNAME-record'; ?> + diff --git a/interface/web/dns/lib/lang/nl_dns_hinfo.lng b/interface/web/dns/lib/lang/nl_dns_hinfo.lng index bc2007ffca..c153071e98 100644 --- a/interface/web/dns/lib/lang/nl_dns_hinfo.lng +++ b/interface/web/dns/lib/lang/nl_dns_hinfo.lng @@ -8,10 +8,11 @@ $wb["ttl_txt"] = 'TTL'; $wb["active_txt"] = 'Actief'; $wb["limit_dns_record_txt"] = 'Het max. aan DNS records voor uw account is bereikt.'; $wb["no_zone_perm"] = 'U heeft geen toestemming om een record toe te voegen aan deze DNS zone.'; -$wb["name_error_empty"] = 'The hostnaam is niet ingvuld.'; -$wb["name_error_regex"] = 'The hostnaam heeft een onjuist formaat.'; +$wb["name_error_empty"] = 'De hostnaam is niet ingvuld.'; +$wb["name_error_regex"] = 'De hostnaam heeft een onjuist formaat.'; $wb["data_error_empty"] = 'Host informatie is niet ingvuld'; $wb["data_error_regex"] = 'Host Informatie formaat ongeldig'; ?> + diff --git a/interface/web/dns/lib/lang/nl_dns_mx.lng b/interface/web/dns/lib/lang/nl_dns_mx.lng index 1f91060d0d..a62e9dd4db 100644 --- a/interface/web/dns/lib/lang/nl_dns_mx.lng +++ b/interface/web/dns/lib/lang/nl_dns_mx.lng @@ -9,10 +9,11 @@ $wb["ttl_txt"] = 'TTL'; $wb["active_txt"] = 'Actief'; $wb["limit_dns_record_txt"] = 'Het max. aan DNS records voor uw account is bereikt.'; $wb["no_zone_perm"] = 'U heeft geen toestemming om een record toe te voegen aan deze DNS zone.'; -$wb["name_error_empty"] = 'The hostnaam is niet ingvuld.'; -$wb["name_error_regex"] = 'The hostnaam heeft een onjuist formaat.'; +$wb["name_error_empty"] = 'De hostnaam is niet ingvuld.'; +$wb["name_error_regex"] = 'De hostnaam heeft een onjuist formaat.'; $wb["data_error_empty"] = 'Mailserver hostnaam is niet ingvuld'; $wb["data_error_regex"] = 'Mailserver hostnaam formaat ongeldig'; ?> + diff --git a/interface/web/dns/lib/lang/nl_dns_ns.lng b/interface/web/dns/lib/lang/nl_dns_ns.lng index 26b51efcd3..4df66a8d1d 100644 --- a/interface/web/dns/lib/lang/nl_dns_ns.lng +++ b/interface/web/dns/lib/lang/nl_dns_ns.lng @@ -9,9 +9,10 @@ $wb["active_txt"] = 'Actief'; $wb["limit_dns_record_txt"] = 'Het max. aan DNS records voor uw account is bereikt.'; $wb["no_zone_perm"] = 'U heeft geen toestemming om een record toe te voegen aan deze DNS zone.'; $wb["name_error_empty"] = 'De zone is niet ingvuld.'; -$wb["name_error_regex"] = 'De zone has the wrong format.'; +$wb["name_error_regex"] = 'De zone heeft een onjuist formaat.'; $wb["data_error_empty"] = 'Nameserver is niet ingvuld'; -$wb["data_error_regex"] = 'Nameserver formaat ongeldig'; +$wb["data_error_regex"] = 'Nameserver heeft een onjuist formaat'; ?> + diff --git a/interface/web/dns/lib/lang/nl_dns_ptr.lng b/interface/web/dns/lib/lang/nl_dns_ptr.lng index 392f160f45..a7b6be492a 100644 --- a/interface/web/dns/lib/lang/nl_dns_ptr.lng +++ b/interface/web/dns/lib/lang/nl_dns_ptr.lng @@ -15,3 +15,4 @@ $wb["data_error_regex"] = 'Canonical hostnaam format ongeldig'; ?> + diff --git a/interface/web/dns/lib/lang/nl_dns_rp.lng b/interface/web/dns/lib/lang/nl_dns_rp.lng index b1f3673dda..c63a4d816a 100644 --- a/interface/web/dns/lib/lang/nl_dns_rp.lng +++ b/interface/web/dns/lib/lang/nl_dns_rp.lng @@ -15,3 +15,4 @@ $wb["data_error_regex"] = 'Verantwoordelijke persoon veld formaat ongeldig'; ?> + diff --git a/interface/web/dns/lib/lang/nl_dns_slave.lng b/interface/web/dns/lib/lang/nl_dns_slave.lng index 64ca1a2dd7..a2afdca6d7 100644 --- a/interface/web/dns/lib/lang/nl_dns_slave.lng +++ b/interface/web/dns/lib/lang/nl_dns_slave.lng @@ -15,3 +15,4 @@ $wb["ns_error_regex"] = 'NS heeft een ongeldig formaat.'; + diff --git a/interface/web/dns/lib/lang/nl_dns_slave_list.lng b/interface/web/dns/lib/lang/nl_dns_slave_list.lng index e15aa9e81d..da88836ef3 100644 --- a/interface/web/dns/lib/lang/nl_dns_slave_list.lng +++ b/interface/web/dns/lib/lang/nl_dns_slave_list.lng @@ -8,3 +8,4 @@ $wb["add_new_record_txt"] = 'Toevoegen nieuwe secondary DNS Zone'; ?> + diff --git a/interface/web/dns/lib/lang/nl_dns_soa.lng b/interface/web/dns/lib/lang/nl_dns_soa.lng index f9fb92974a..3551d360cc 100644 --- a/interface/web/dns/lib/lang/nl_dns_soa.lng +++ b/interface/web/dns/lib/lang/nl_dns_soa.lng @@ -26,3 +26,4 @@ $wb["update_acl_txt"] = 'Update ACL'; ?> + diff --git a/interface/web/dns/lib/lang/nl_dns_soa_list.lng b/interface/web/dns/lib/lang/nl_dns_soa_list.lng index 56b3061a16..6679278b48 100644 --- a/interface/web/dns/lib/lang/nl_dns_soa_list.lng +++ b/interface/web/dns/lib/lang/nl_dns_soa_list.lng @@ -10,3 +10,4 @@ $wb["add_new_record_txt"] = 'Toevoegen nieuwe DNS Zone (handmatig)'; ?> + diff --git a/interface/web/dns/lib/lang/nl_dns_srv.lng b/interface/web/dns/lib/lang/nl_dns_srv.lng index 68e3b3bc89..c4d26e56e8 100644 --- a/interface/web/dns/lib/lang/nl_dns_srv.lng +++ b/interface/web/dns/lib/lang/nl_dns_srv.lng @@ -17,3 +17,4 @@ $wb["srv_error_regex"] = 'Ongeldig server record formaat. Het server record moet ?> + diff --git a/interface/web/dns/lib/lang/nl_dns_template.lng b/interface/web/dns/lib/lang/nl_dns_template.lng index fdaad7f689..71f2662831 100644 --- a/interface/web/dns/lib/lang/nl_dns_template.lng +++ b/interface/web/dns/lib/lang/nl_dns_template.lng @@ -6,3 +6,4 @@ $wb["visible_txt"] = 'Zichtbaar'; ?> + diff --git a/interface/web/dns/lib/lang/nl_dns_template_list.lng b/interface/web/dns/lib/lang/nl_dns_template_list.lng index ea7ba2bc8b..3273b0ddd5 100644 --- a/interface/web/dns/lib/lang/nl_dns_template_list.lng +++ b/interface/web/dns/lib/lang/nl_dns_template_list.lng @@ -6,3 +6,4 @@ $wb["add_new_record_txt"] = 'Toevoegen nieuw record'; ?> + diff --git a/interface/web/dns/lib/lang/nl_dns_txt.lng b/interface/web/dns/lib/lang/nl_dns_txt.lng index 550985b8bf..641b379f11 100644 --- a/interface/web/dns/lib/lang/nl_dns_txt.lng +++ b/interface/web/dns/lib/lang/nl_dns_txt.lng @@ -15,3 +15,4 @@ $wb["data_error_regex"] = 'Tekst formaat ongeldig'; ?> + diff --git a/interface/web/dns/lib/lang/nl_dns_wizard.lng b/interface/web/dns/lib/lang/nl_dns_wizard.lng index a406bddffd..2037955176 100644 --- a/interface/web/dns/lib/lang/nl_dns_wizard.lng +++ b/interface/web/dns/lib/lang/nl_dns_wizard.lng @@ -30,3 +30,4 @@ $wb['error_email_regex'] = 'E-mail bevat geen geldig e-mailadres.'; ?> + diff --git a/interface/web/dns/templates/dns_wizard.htm b/interface/web/dns/templates/dns_wizard.htm index 971e521d12..b353094dea 100644 --- a/interface/web/dns/templates/dns_wizard.htm +++ b/interface/web/dns/templates/dns_wizard.htm @@ -73,7 +73,7 @@
- +
diff --git a/interface/web/domain/lib/lang/id.lng b/interface/web/domain/lib/lang/id.lng new file mode 100644 index 0000000000..f6a6b2f376 --- /dev/null +++ b/interface/web/domain/lib/lang/id.lng @@ -0,0 +1,10 @@ +'; +?> + diff --git a/interface/web/domain/lib/lang/id_domain.lng b/interface/web/domain/lib/lang/id_domain.lng new file mode 100644 index 0000000000..0ace463833 --- /dev/null +++ b/interface/web/domain/lib/lang/id_domain.lng @@ -0,0 +1,7 @@ + + diff --git a/interface/web/domain/lib/lang/id_domain_list.lng b/interface/web/domain/lib/lang/id_domain_list.lng new file mode 100644 index 0000000000..fc60135d1d --- /dev/null +++ b/interface/web/domain/lib/lang/id_domain_list.lng @@ -0,0 +1,6 @@ + + diff --git a/interface/web/domain/lib/lang/nl.lng b/interface/web/domain/lib/lang/nl.lng index ecd41d7740..6e19eb1265 100644 --- a/interface/web/domain/lib/lang/nl.lng +++ b/interface/web/domain/lib/lang/nl.lng @@ -11,3 +11,4 @@ $wb['error_client_group_id_empty'] = 'U dient een klant selecteren
'; + diff --git a/interface/web/domain/lib/lang/nl_domain.lng b/interface/web/domain/lib/lang/nl_domain.lng index 5c9585ac91..c1cf945e75 100644 --- a/interface/web/domain/lib/lang/nl_domain.lng +++ b/interface/web/domain/lib/lang/nl_domain.lng @@ -7,3 +7,4 @@ $wb['Domain'] = 'Domein'; + diff --git a/interface/web/domain/lib/lang/nl_domain_list.lng b/interface/web/domain/lib/lang/nl_domain_list.lng index 650aa63c74..ff7d3f2a59 100644 --- a/interface/web/domain/lib/lang/nl_domain_list.lng +++ b/interface/web/domain/lib/lang/nl_domain_list.lng @@ -5,3 +5,4 @@ $wb['domain_txt'] = 'Domein'; ?> + diff --git a/interface/web/help/lib/lang/id.lng b/interface/web/help/lib/lang/id.lng new file mode 100644 index 0000000000..3b71869216 --- /dev/null +++ b/interface/web/help/lib/lang/id.lng @@ -0,0 +1,10 @@ + + diff --git a/interface/web/help/lib/lang/id_support_message.lng b/interface/web/help/lib/lang/id_support_message.lng new file mode 100644 index 0000000000..557869cacf --- /dev/null +++ b/interface/web/help/lib/lang/id_support_message.lng @@ -0,0 +1,8 @@ + + diff --git a/interface/web/help/lib/lang/id_support_message_list.lng b/interface/web/help/lib/lang/id_support_message_list.lng new file mode 100644 index 0000000000..e41bc9f74e --- /dev/null +++ b/interface/web/help/lib/lang/id_support_message_list.lng @@ -0,0 +1,7 @@ + + diff --git a/interface/web/help/lib/lang/nl.lng b/interface/web/help/lib/lang/nl.lng index 6b3991df6b..39ca0f4f92 100644 --- a/interface/web/help/lib/lang/nl.lng +++ b/interface/web/help/lib/lang/nl.lng @@ -11,3 +11,4 @@ $wb['Version'] = 'Versie'; + diff --git a/interface/web/help/lib/lang/nl_support_message.lng b/interface/web/help/lib/lang/nl_support_message.lng index 59a0cc5137..f00786c1cb 100644 --- a/interface/web/help/lib/lang/nl_support_message.lng +++ b/interface/web/help/lib/lang/nl_support_message.lng @@ -8,3 +8,4 @@ $wb['tstamp_txt'] = 'Tijdstip'; + diff --git a/interface/web/help/lib/lang/nl_support_message_list.lng b/interface/web/help/lib/lang/nl_support_message_list.lng index 3d1b6b7dd8..182f34b755 100644 --- a/interface/web/help/lib/lang/nl_support_message_list.lng +++ b/interface/web/help/lib/lang/nl_support_message_list.lng @@ -6,3 +6,4 @@ $wb["add_new_record_txt"] = 'Maak een nieuw support bericht'; ?> + diff --git a/interface/web/login/lib/lang/id.lng b/interface/web/login/lib/lang/id.lng new file mode 100644 index 0000000000..6f7eb128df --- /dev/null +++ b/interface/web/login/lib/lang/id.lng @@ -0,0 +1,18 @@ + 64 karakter.'; +$wb['username_txt'] = 'Nama Pengguna'; +$wb['password_txt'] = 'Kata Sandi'; +$wb['login_button_txt'] = 'Masuk'; +?> + diff --git a/interface/web/login/lib/lang/nl.lng b/interface/web/login/lib/lang/nl.lng index 3e676a2325..35005d82c1 100644 --- a/interface/web/login/lib/lang/nl.lng +++ b/interface/web/login/lib/lang/nl.lng @@ -22,3 +22,4 @@ $wb['login_button_txt'] = "Login"; ?> + diff --git a/interface/web/mail/lib/lang/en_mail_user_filter.lng b/interface/web/mail/lib/lang/en_mail_user_filter.lng index 20ffa3dfc6..296a47ec57 100644 --- a/interface/web/mail/lib/lang/en_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/en_mail_user_filter.lng @@ -7,6 +7,7 @@ $wb["rulename_error_empty"] = 'Name is empty.'; $wb["searchterm_is_empty"] = 'Search term is empty.'; $wb["source_txt"] = 'Source'; $wb["target_error_regex"] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}'; +$wb["limit_mailfilter_txt"] = 'The max. number of mailfilters is reached.'; $wb['subject_txt'] = 'Subject'; $wb['from_txt'] = 'From'; $wb['to_txt'] = 'To'; diff --git a/interface/web/mail/lib/lang/id.lng b/interface/web/mail/lib/lang/id.lng new file mode 100644 index 0000000000..8348e1b5b9 --- /dev/null +++ b/interface/web/mail/lib/lang/id.lng @@ -0,0 +1,48 @@ + + diff --git a/interface/web/mail/lib/lang/id_mail_alias.lng b/interface/web/mail/lib/lang/id_mail_alias.lng new file mode 100644 index 0000000000..1dc9ea91e3 --- /dev/null +++ b/interface/web/mail/lib/lang/id_mail_alias.lng @@ -0,0 +1,12 @@ + + diff --git a/interface/web/mail/lib/lang/id_mail_aliasdomain.lng b/interface/web/mail/lib/lang/id_mail_aliasdomain.lng new file mode 100644 index 0000000000..b70848d5bb --- /dev/null +++ b/interface/web/mail/lib/lang/id_mail_aliasdomain.lng @@ -0,0 +1,12 @@ + + diff --git a/interface/web/mail/lib/lang/id_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/id_mail_aliasdomain_list.lng new file mode 100644 index 0000000000..43afd4de5c --- /dev/null +++ b/interface/web/mail/lib/lang/id_mail_aliasdomain_list.lng @@ -0,0 +1,8 @@ + + diff --git a/interface/web/mail/lib/lang/id_mail_blacklist.lng b/interface/web/mail/lib/lang/id_mail_blacklist.lng new file mode 100644 index 0000000000..09c0563af9 --- /dev/null +++ b/interface/web/mail/lib/lang/id_mail_blacklist.lng @@ -0,0 +1,10 @@ + + diff --git a/interface/web/mail/lib/lang/id_mail_blacklist_list.lng b/interface/web/mail/lib/lang/id_mail_blacklist_list.lng new file mode 100644 index 0000000000..0cf0fa0794 --- /dev/null +++ b/interface/web/mail/lib/lang/id_mail_blacklist_list.lng @@ -0,0 +1,11 @@ + + diff --git a/interface/web/mail/lib/lang/id_mail_content_filter.lng b/interface/web/mail/lib/lang/id_mail_content_filter.lng new file mode 100644 index 0000000000..5ebfdaf217 --- /dev/null +++ b/interface/web/mail/lib/lang/id_mail_content_filter.lng @@ -0,0 +1,10 @@ + + diff --git a/interface/web/mail/lib/lang/id_mail_content_filter_list.lng b/interface/web/mail/lib/lang/id_mail_content_filter_list.lng new file mode 100644 index 0000000000..a530539780 --- /dev/null +++ b/interface/web/mail/lib/lang/id_mail_content_filter_list.lng @@ -0,0 +1,9 @@ + + diff --git a/interface/web/mail/lib/lang/id_mail_domain.lng b/interface/web/mail/lib/lang/id_mail_domain.lng new file mode 100644 index 0000000000..da76710dc2 --- /dev/null +++ b/interface/web/mail/lib/lang/id_mail_domain.lng @@ -0,0 +1,14 @@ + + diff --git a/interface/web/mail/lib/lang/id_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/id_mail_domain_admin_list.lng new file mode 100644 index 0000000000..04777bc481 --- /dev/null +++ b/interface/web/mail/lib/lang/id_mail_domain_admin_list.lng @@ -0,0 +1,9 @@ + + diff --git a/interface/web/mail/lib/lang/id_mail_domain_catchall.lng b/interface/web/mail/lib/lang/id_mail_domain_catchall.lng new file mode 100644 index 0000000000..b25ff37266 --- /dev/null +++ b/interface/web/mail/lib/lang/id_mail_domain_catchall.lng @@ -0,0 +1,10 @@ + + diff --git a/interface/web/mail/lib/lang/id_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/id_mail_domain_catchall_list.lng new file mode 100644 index 0000000000..cebfc0ba42 --- /dev/null +++ b/interface/web/mail/lib/lang/id_mail_domain_catchall_list.lng @@ -0,0 +1,10 @@ + + diff --git a/interface/web/mail/lib/lang/id_mail_domain_list.lng b/interface/web/mail/lib/lang/id_mail_domain_list.lng new file mode 100644 index 0000000000..771f6b47a8 --- /dev/null +++ b/interface/web/mail/lib/lang/id_mail_domain_list.lng @@ -0,0 +1,8 @@ + + diff --git a/interface/web/mail/lib/lang/id_mail_forward.lng b/interface/web/mail/lib/lang/id_mail_forward.lng new file mode 100644 index 0000000000..7265fbc0da --- /dev/null +++ b/interface/web/mail/lib/lang/id_mail_forward.lng @@ -0,0 +1,8 @@ + + diff --git a/interface/web/mail/lib/lang/id_mail_forward_list.lng b/interface/web/mail/lib/lang/id_mail_forward_list.lng new file mode 100644 index 0000000000..660016af91 --- /dev/null +++ b/interface/web/mail/lib/lang/id_mail_forward_list.lng @@ -0,0 +1,9 @@ + + diff --git a/interface/web/mail/lib/lang/id_mail_get.lng b/interface/web/mail/lib/lang/id_mail_get.lng new file mode 100644 index 0000000000..79959256c2 --- /dev/null +++ b/interface/web/mail/lib/lang/id_mail_get.lng @@ -0,0 +1,17 @@ + + diff --git a/interface/web/mail/lib/lang/id_mail_get_list.lng b/interface/web/mail/lib/lang/id_mail_get_list.lng new file mode 100644 index 0000000000..7293cb6e0d --- /dev/null +++ b/interface/web/mail/lib/lang/id_mail_get_list.lng @@ -0,0 +1,10 @@ + + diff --git a/interface/web/mail/lib/lang/id_mail_relay_recipient.lng b/interface/web/mail/lib/lang/id_mail_relay_recipient.lng new file mode 100644 index 0000000000..13a5f0dfc7 --- /dev/null +++ b/interface/web/mail/lib/lang/id_mail_relay_recipient.lng @@ -0,0 +1,10 @@ + + diff --git a/interface/web/mail/lib/lang/id_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/id_mail_relay_recipient_list.lng new file mode 100644 index 0000000000..ac1268f7c4 --- /dev/null +++ b/interface/web/mail/lib/lang/id_mail_relay_recipient_list.lng @@ -0,0 +1,10 @@ + + diff --git a/interface/web/mail/lib/lang/id_mail_spamfilter.lng b/interface/web/mail/lib/lang/id_mail_spamfilter.lng new file mode 100644 index 0000000000..bac829dd1c --- /dev/null +++ b/interface/web/mail/lib/lang/id_mail_spamfilter.lng @@ -0,0 +1,18 @@ + + diff --git a/interface/web/mail/lib/lang/id_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/id_mail_spamfilter_list.lng new file mode 100644 index 0000000000..2cca38db2e --- /dev/null +++ b/interface/web/mail/lib/lang/id_mail_spamfilter_list.lng @@ -0,0 +1,9 @@ + + diff --git a/interface/web/mail/lib/lang/id_mail_transport.lng b/interface/web/mail/lib/lang/id_mail_transport.lng new file mode 100644 index 0000000000..64ffec82ac --- /dev/null +++ b/interface/web/mail/lib/lang/id_mail_transport.lng @@ -0,0 +1,11 @@ + + diff --git a/interface/web/mail/lib/lang/id_mail_transport_list.lng b/interface/web/mail/lib/lang/id_mail_transport_list.lng new file mode 100644 index 0000000000..e7518a4f2e --- /dev/null +++ b/interface/web/mail/lib/lang/id_mail_transport_list.lng @@ -0,0 +1,10 @@ + + diff --git a/interface/web/mail/lib/lang/id_mail_user.lng b/interface/web/mail/lib/lang/id_mail_user.lng new file mode 100644 index 0000000000..163bdabbc0 --- /dev/null +++ b/interface/web/mail/lib/lang/id_mail_user.lng @@ -0,0 +1,43 @@ + 1'; +$wb['move_junk_txt'] = 'Pindahkan Email Spam ke direktori Junk'; +$wb['name_txt'] = 'Nama Lengkap'; +$wb['name_optional_txt'] = '(Opsional)'; +$wb['autoresponder_active'] = 'Aktifkan Penjawab Otomatis'; +$wb['cc_txt'] = 'Kirim salinan ke'; +$wb['cc_error_isemail'] = 'Kolom Kirim salinan ke tidak berisi alamat email yang valid'; +?> + diff --git a/interface/web/mail/lib/lang/id_mail_user_filter.lng b/interface/web/mail/lib/lang/id_mail_user_filter.lng new file mode 100644 index 0000000000..4af7bd615a --- /dev/null +++ b/interface/web/mail/lib/lang/id_mail_user_filter.lng @@ -0,0 +1,11 @@ + + diff --git a/interface/web/mail/lib/lang/id_mail_user_filter_list.lng b/interface/web/mail/lib/lang/id_mail_user_filter_list.lng new file mode 100644 index 0000000000..ff993beb5f --- /dev/null +++ b/interface/web/mail/lib/lang/id_mail_user_filter_list.lng @@ -0,0 +1,8 @@ + + diff --git a/interface/web/mail/lib/lang/id_mail_user_list.lng b/interface/web/mail/lib/lang/id_mail_user_list.lng new file mode 100644 index 0000000000..4cda128d29 --- /dev/null +++ b/interface/web/mail/lib/lang/id_mail_user_list.lng @@ -0,0 +1,8 @@ + + diff --git a/interface/web/mail/lib/lang/id_mail_user_stats_list.lng b/interface/web/mail/lib/lang/id_mail_user_stats_list.lng new file mode 100644 index 0000000000..0bbedcd76b --- /dev/null +++ b/interface/web/mail/lib/lang/id_mail_user_stats_list.lng @@ -0,0 +1,9 @@ + + diff --git a/interface/web/mail/lib/lang/id_mail_whitelist.lng b/interface/web/mail/lib/lang/id_mail_whitelist.lng new file mode 100644 index 0000000000..0c523e8228 --- /dev/null +++ b/interface/web/mail/lib/lang/id_mail_whitelist.lng @@ -0,0 +1,10 @@ + + diff --git a/interface/web/mail/lib/lang/id_mail_whitelist_list.lng b/interface/web/mail/lib/lang/id_mail_whitelist_list.lng new file mode 100644 index 0000000000..3f476ad3e1 --- /dev/null +++ b/interface/web/mail/lib/lang/id_mail_whitelist_list.lng @@ -0,0 +1,11 @@ + + diff --git a/interface/web/mail/lib/lang/id_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/id_spamfilter_blacklist.lng new file mode 100644 index 0000000000..5d0d38dc93 --- /dev/null +++ b/interface/web/mail/lib/lang/id_spamfilter_blacklist.lng @@ -0,0 +1,10 @@ + + diff --git a/interface/web/mail/lib/lang/id_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/id_spamfilter_blacklist_list.lng new file mode 100644 index 0000000000..d2128f9430 --- /dev/null +++ b/interface/web/mail/lib/lang/id_spamfilter_blacklist_list.lng @@ -0,0 +1,10 @@ + + diff --git a/interface/web/mail/lib/lang/id_spamfilter_config.lng b/interface/web/mail/lib/lang/id_spamfilter_config.lng new file mode 100644 index 0000000000..6d6886ea44 --- /dev/null +++ b/interface/web/mail/lib/lang/id_spamfilter_config.lng @@ -0,0 +1,21 @@ + + diff --git a/interface/web/mail/lib/lang/id_spamfilter_config_list.lng b/interface/web/mail/lib/lang/id_spamfilter_config_list.lng new file mode 100644 index 0000000000..043713865b --- /dev/null +++ b/interface/web/mail/lib/lang/id_spamfilter_config_list.lng @@ -0,0 +1,6 @@ + + diff --git a/interface/web/mail/lib/lang/id_spamfilter_policy.lng b/interface/web/mail/lib/lang/id_spamfilter_policy.lng new file mode 100644 index 0000000000..f97a028e0b --- /dev/null +++ b/interface/web/mail/lib/lang/id_spamfilter_policy.lng @@ -0,0 +1,39 @@ + + diff --git a/interface/web/mail/lib/lang/id_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/id_spamfilter_policy_list.lng new file mode 100644 index 0000000000..b11f9369ca --- /dev/null +++ b/interface/web/mail/lib/lang/id_spamfilter_policy_list.lng @@ -0,0 +1,10 @@ + + diff --git a/interface/web/mail/lib/lang/id_spamfilter_users.lng b/interface/web/mail/lib/lang/id_spamfilter_users.lng new file mode 100644 index 0000000000..873b009883 --- /dev/null +++ b/interface/web/mail/lib/lang/id_spamfilter_users.lng @@ -0,0 +1,9 @@ + + diff --git a/interface/web/mail/lib/lang/id_spamfilter_users_list.lng b/interface/web/mail/lib/lang/id_spamfilter_users_list.lng new file mode 100644 index 0000000000..3836afd222 --- /dev/null +++ b/interface/web/mail/lib/lang/id_spamfilter_users_list.lng @@ -0,0 +1,11 @@ + + diff --git a/interface/web/mail/lib/lang/id_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/id_spamfilter_whitelist.lng new file mode 100644 index 0000000000..5d0d38dc93 --- /dev/null +++ b/interface/web/mail/lib/lang/id_spamfilter_whitelist.lng @@ -0,0 +1,10 @@ + + diff --git a/interface/web/mail/lib/lang/id_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/id_spamfilter_whitelist_list.lng new file mode 100644 index 0000000000..d0fe5b26df --- /dev/null +++ b/interface/web/mail/lib/lang/id_spamfilter_whitelist_list.lng @@ -0,0 +1,10 @@ + + diff --git a/interface/web/mail/lib/lang/nl.lng b/interface/web/mail/lib/lang/nl.lng index 3513a241ca..7422e66bd7 100644 --- a/interface/web/mail/lib/lang/nl.lng +++ b/interface/web/mail/lib/lang/nl.lng @@ -51,3 +51,4 @@ $wb["Relay Recipients"] = 'Relay ontvangers'; ?> + diff --git a/interface/web/mail/lib/lang/nl_mail_alias.lng b/interface/web/mail/lib/lang/nl_mail_alias.lng index a56cdb1890..c16ed10888 100644 --- a/interface/web/mail/lib/lang/nl_mail_alias.lng +++ b/interface/web/mail/lib/lang/nl_mail_alias.lng @@ -11,3 +11,4 @@ $wb["duplicate_mailbox_txt"] = 'Er is al een mailbox met dit e-mail adres'; ?> + diff --git a/interface/web/mail/lib/lang/nl_mail_alias_list.lng b/interface/web/mail/lib/lang/nl_mail_alias_list.lng index 844e7f1505..7fe4c1cb2c 100644 --- a/interface/web/mail/lib/lang/nl_mail_alias_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_alias_list.lng @@ -8,3 +8,4 @@ $wb["add_new_record_txt"] = 'Toevoegen nieuwe e-mail alias'; ?> + diff --git a/interface/web/mail/lib/lang/nl_mail_aliasdomain.lng b/interface/web/mail/lib/lang/nl_mail_aliasdomain.lng index 727a1367a3..a381aa8418 100644 --- a/interface/web/mail/lib/lang/nl_mail_aliasdomain.lng +++ b/interface/web/mail/lib/lang/nl_mail_aliasdomain.lng @@ -11,3 +11,4 @@ $wb["source_error_regex"] = 'Ongeldige bron domein naam.'; ?> + diff --git a/interface/web/mail/lib/lang/nl_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/nl_mail_aliasdomain_list.lng index e2538961de..d98a02df9e 100644 --- a/interface/web/mail/lib/lang/nl_mail_aliasdomain_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_aliasdomain_list.lng @@ -8,3 +8,4 @@ $wb["add_new_record_txt"] = 'Toevoegen nieuwe domein alias'; ?> + diff --git a/interface/web/mail/lib/lang/nl_mail_blacklist.lng b/interface/web/mail/lib/lang/nl_mail_blacklist.lng index 16dcb77c1c..4cde77e0f6 100644 --- a/interface/web/mail/lib/lang/nl_mail_blacklist.lng +++ b/interface/web/mail/lib/lang/nl_mail_blacklist.lng @@ -9,3 +9,4 @@ $wb["limit_mailfilter_txt"] = 'Het max. aantal e-mail filters voor uw account is ?> + diff --git a/interface/web/mail/lib/lang/nl_mail_blacklist_list.lng b/interface/web/mail/lib/lang/nl_mail_blacklist_list.lng index 11e48b6ed8..e2b63d8af5 100644 --- a/interface/web/mail/lib/lang/nl_mail_blacklist_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_blacklist_list.lng @@ -10,3 +10,4 @@ $wb["access_txt"] = 'toegang'; ?> + diff --git a/interface/web/mail/lib/lang/nl_mail_content_filter.lng b/interface/web/mail/lib/lang/nl_mail_content_filter.lng index 067e483448..fd79464555 100644 --- a/interface/web/mail/lib/lang/nl_mail_content_filter.lng +++ b/interface/web/mail/lib/lang/nl_mail_content_filter.lng @@ -9,3 +9,4 @@ $wb["pattern_error_empty"] = 'Patroon is niet ingvuld.'; ?> + diff --git a/interface/web/mail/lib/lang/nl_mail_content_filter_list.lng b/interface/web/mail/lib/lang/nl_mail_content_filter_list.lng index fd9489cc31..0ebf55d397 100644 --- a/interface/web/mail/lib/lang/nl_mail_content_filter_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_content_filter_list.lng @@ -8,3 +8,4 @@ $wb["add_new_record_txt"] = 'Toevoegen nieuw content filter'; ?> + diff --git a/interface/web/mail/lib/lang/nl_mail_domain.lng b/interface/web/mail/lib/lang/nl_mail_domain.lng index cdc1f8ff90..3b74683027 100644 --- a/interface/web/mail/lib/lang/nl_mail_domain.lng +++ b/interface/web/mail/lib/lang/nl_mail_domain.lng @@ -13,3 +13,4 @@ $wb["no_policy"] = '- niet ingeschakeld -'; ?> + diff --git a/interface/web/mail/lib/lang/nl_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/nl_mail_domain_admin_list.lng index 57d1b748f9..e134a5a928 100644 --- a/interface/web/mail/lib/lang/nl_mail_domain_admin_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_domain_admin_list.lng @@ -8,3 +8,4 @@ $wb["sys_groupid_txt"] = 'Klant'; ?> + diff --git a/interface/web/mail/lib/lang/nl_mail_domain_catchall.lng b/interface/web/mail/lib/lang/nl_mail_domain_catchall.lng index f4d79a9123..21b3183619 100644 --- a/interface/web/mail/lib/lang/nl_mail_domain_catchall.lng +++ b/interface/web/mail/lib/lang/nl_mail_domain_catchall.lng @@ -9,3 +9,4 @@ $wb["limit_mailcatchall_txt"] = 'Het max. aantal e-mail catchall accounts voor u ?> + diff --git a/interface/web/mail/lib/lang/nl_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/nl_mail_domain_catchall_list.lng index 445135cf23..9bcdfc4275 100644 --- a/interface/web/mail/lib/lang/nl_mail_domain_catchall_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_domain_catchall_list.lng @@ -9,3 +9,4 @@ $wb["add_new_record_txt"] = 'Toevoegen nieuwe catchall'; ?> + diff --git a/interface/web/mail/lib/lang/nl_mail_domain_list.lng b/interface/web/mail/lib/lang/nl_mail_domain_list.lng index 0a6711e590..1e445cb006 100644 --- a/interface/web/mail/lib/lang/nl_mail_domain_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_domain_list.lng @@ -7,3 +7,4 @@ $wb["active_txt"] = 'Actief'; ?> + diff --git a/interface/web/mail/lib/lang/nl_mail_forward.lng b/interface/web/mail/lib/lang/nl_mail_forward.lng index 58348d8630..61cfd7dcbe 100644 --- a/interface/web/mail/lib/lang/nl_mail_forward.lng +++ b/interface/web/mail/lib/lang/nl_mail_forward.lng @@ -7,3 +7,4 @@ $wb["duplicate_mailbox_txt"] = 'Er is al een mailbox met dit e-mailadres'; ?> + diff --git a/interface/web/mail/lib/lang/nl_mail_forward_list.lng b/interface/web/mail/lib/lang/nl_mail_forward_list.lng index fc24d8dacc..e2ad77eaf1 100644 --- a/interface/web/mail/lib/lang/nl_mail_forward_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_forward_list.lng @@ -8,3 +8,4 @@ $wb["add_new_record_txt"] = 'Toevoegen nieuwe E-mail forwarder'; ?> + diff --git a/interface/web/mail/lib/lang/nl_mail_get.lng b/interface/web/mail/lib/lang/nl_mail_get.lng index c3abb4e033..19112e82d5 100644 --- a/interface/web/mail/lib/lang/nl_mail_get.lng +++ b/interface/web/mail/lib/lang/nl_mail_get.lng @@ -16,3 +16,4 @@ $wb["source_server_error_regex"] = 'Pop3/Imap server is geen geldige domeinnaam. ?> + diff --git a/interface/web/mail/lib/lang/nl_mail_get_list.lng b/interface/web/mail/lib/lang/nl_mail_get_list.lng index 70df6ab769..95f063e8b7 100644 --- a/interface/web/mail/lib/lang/nl_mail_get_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_get_list.lng @@ -9,3 +9,4 @@ $wb["add_new_record_txt"] = 'Toevoegen nieuwe account'; ?> + diff --git a/interface/web/mail/lib/lang/nl_mail_relay_recipient.lng b/interface/web/mail/lib/lang/nl_mail_relay_recipient.lng index ca392fd64d..06d600e02c 100644 --- a/interface/web/mail/lib/lang/nl_mail_relay_recipient.lng +++ b/interface/web/mail/lib/lang/nl_mail_relay_recipient.lng @@ -9,3 +9,4 @@ $wb["limit_mailfilter_txt"] = 'Het max. aantal e-mail filters voor uw account is ?> + diff --git a/interface/web/mail/lib/lang/nl_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/nl_mail_relay_recipient_list.lng index 3d0f032ee0..0657b29ff4 100644 --- a/interface/web/mail/lib/lang/nl_mail_relay_recipient_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_relay_recipient_list.lng @@ -9,3 +9,4 @@ $wb["access_txt"] = 'toegang'; ?> + diff --git a/interface/web/mail/lib/lang/nl_mail_spamfilter.lng b/interface/web/mail/lib/lang/nl_mail_spamfilter.lng index cb47e7e097..b2414b85c9 100644 --- a/interface/web/mail/lib/lang/nl_mail_spamfilter.lng +++ b/interface/web/mail/lib/lang/nl_mail_spamfilter.lng @@ -17,3 +17,4 @@ $wb["days_txt"] = 'dagen.'; ?> + diff --git a/interface/web/mail/lib/lang/nl_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/nl_mail_spamfilter_list.lng index acd0db21fd..50e2bd024e 100644 --- a/interface/web/mail/lib/lang/nl_mail_spamfilter_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_spamfilter_list.lng @@ -8,3 +8,4 @@ $wb["add_new_record_txt"] = 'Toevoegen nieuw spamfilter record'; ?> + diff --git a/interface/web/mail/lib/lang/nl_mail_transport.lng b/interface/web/mail/lib/lang/nl_mail_transport.lng index 36dfaedb9b..aa16993c3d 100644 --- a/interface/web/mail/lib/lang/nl_mail_transport.lng +++ b/interface/web/mail/lib/lang/nl_mail_transport.lng @@ -10,3 +10,4 @@ $wb["limit_mailrouting_txt"] = 'Het max. aantal routes voor uw account is bereik ?> + diff --git a/interface/web/mail/lib/lang/nl_mail_transport_list.lng b/interface/web/mail/lib/lang/nl_mail_transport_list.lng index 201bf63148..60a2d86efe 100644 --- a/interface/web/mail/lib/lang/nl_mail_transport_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_transport_list.lng @@ -9,3 +9,4 @@ $wb["add_new_record_txt"] = 'Toevoegen nieuw transport'; ?> + diff --git a/interface/web/mail/lib/lang/nl_mail_user.lng b/interface/web/mail/lib/lang/nl_mail_user.lng index 6f4ae7b899..545bf1d024 100644 --- a/interface/web/mail/lib/lang/nl_mail_user.lng +++ b/interface/web/mail/lib/lang/nl_mail_user.lng @@ -43,3 +43,4 @@ $wb['cc_error_isemail'] = 'Het "Stuur kopie naar" veld bevat geen geldig e-mail + diff --git a/interface/web/mail/lib/lang/nl_mail_user_filter.lng b/interface/web/mail/lib/lang/nl_mail_user_filter.lng index 7dea60deac..25538441d3 100644 --- a/interface/web/mail/lib/lang/nl_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/nl_mail_user_filter.lng @@ -11,3 +11,4 @@ $wb["target_error_regex"] = 'Het doel mag alleen de volgende karakters bevatten: + diff --git a/interface/web/mail/lib/lang/nl_mail_user_filter_list.lng b/interface/web/mail/lib/lang/nl_mail_user_filter_list.lng index 8c09b729e0..7c7bbec2f6 100644 --- a/interface/web/mail/lib/lang/nl_mail_user_filter_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_user_filter_list.lng @@ -7,3 +7,4 @@ $wb["delete_confirmation"] = 'Weet u zeker dat u het mailfilter wilt verwijderen ?> + diff --git a/interface/web/mail/lib/lang/nl_mail_user_list.lng b/interface/web/mail/lib/lang/nl_mail_user_list.lng index 16d9e94ac6..9971b61a21 100644 --- a/interface/web/mail/lib/lang/nl_mail_user_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_user_list.lng @@ -7,3 +7,4 @@ $wb["name_txt"] = 'Echte naam'; ?> + diff --git a/interface/web/mail/lib/lang/nl_mail_user_stats_list.lng b/interface/web/mail/lib/lang/nl_mail_user_stats_list.lng index ca2773a5c4..82ea2ac13b 100644 --- a/interface/web/mail/lib/lang/nl_mail_user_stats_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_user_stats_list.lng @@ -8,3 +8,4 @@ $wb["last_year_txt"] = 'Vorig jaar'; ?> + diff --git a/interface/web/mail/lib/lang/nl_mail_whitelist.lng b/interface/web/mail/lib/lang/nl_mail_whitelist.lng index 8afc3226d6..343bfb20e1 100644 --- a/interface/web/mail/lib/lang/nl_mail_whitelist.lng +++ b/interface/web/mail/lib/lang/nl_mail_whitelist.lng @@ -9,3 +9,4 @@ $wb["limit_mailfilter_txt"] = 'Het max. aantal e-mail filters voor uw account is ?> + diff --git a/interface/web/mail/lib/lang/nl_mail_whitelist_list.lng b/interface/web/mail/lib/lang/nl_mail_whitelist_list.lng index d7987e3d45..99ef8d0982 100644 --- a/interface/web/mail/lib/lang/nl_mail_whitelist_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_whitelist_list.lng @@ -10,3 +10,4 @@ $wb["access_txt"] = 'Toegang'; ?> + diff --git a/interface/web/mail/lib/lang/nl_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/nl_spamfilter_blacklist.lng index 1fa0d2788f..bf24d3f3c6 100644 --- a/interface/web/mail/lib/lang/nl_spamfilter_blacklist.lng +++ b/interface/web/mail/lib/lang/nl_spamfilter_blacklist.lng @@ -9,3 +9,4 @@ $wb["limit_spamfilter_wblist_txt"] = 'Het max. aantal white- of blacklist record ?> + diff --git a/interface/web/mail/lib/lang/nl_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/nl_spamfilter_blacklist_list.lng index 9a2698d3bb..f7e127f9d6 100644 --- a/interface/web/mail/lib/lang/nl_spamfilter_blacklist_list.lng +++ b/interface/web/mail/lib/lang/nl_spamfilter_blacklist_list.lng @@ -9,3 +9,4 @@ $wb["add_new_record_txt"] = 'Toevoegen blacklist record'; ?> + diff --git a/interface/web/mail/lib/lang/nl_spamfilter_config.lng b/interface/web/mail/lib/lang/nl_spamfilter_config.lng index 7ab6bc16ca..c1328b15c0 100644 --- a/interface/web/mail/lib/lang/nl_spamfilter_config.lng +++ b/interface/web/mail/lib/lang/nl_spamfilter_config.lng @@ -20,3 +20,4 @@ $wb["message_size_limit_txt"] = 'Bericht grootte Limiet'; ?> + diff --git a/interface/web/mail/lib/lang/nl_spamfilter_config_list.lng b/interface/web/mail/lib/lang/nl_spamfilter_config_list.lng index 18e8e4d638..558223f9b1 100644 --- a/interface/web/mail/lib/lang/nl_spamfilter_config_list.lng +++ b/interface/web/mail/lib/lang/nl_spamfilter_config_list.lng @@ -5,3 +5,4 @@ $wb["server_id_txt"] = 'server_id'; ?> + diff --git a/interface/web/mail/lib/lang/nl_spamfilter_policy.lng b/interface/web/mail/lib/lang/nl_spamfilter_policy.lng index ece037e6ef..379bac1c7a 100644 --- a/interface/web/mail/lib/lang/nl_spamfilter_policy.lng +++ b/interface/web/mail/lib/lang/nl_spamfilter_policy.lng @@ -39,3 +39,4 @@ $wb["banned_rulenames_txt"] = 'Verbannen rulenames'; + diff --git a/interface/web/mail/lib/lang/nl_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/nl_spamfilter_policy_list.lng index e3bce031d7..3ddee1f376 100644 --- a/interface/web/mail/lib/lang/nl_spamfilter_policy_list.lng +++ b/interface/web/mail/lib/lang/nl_spamfilter_policy_list.lng @@ -9,3 +9,4 @@ $wb["add_new_record_txt"] = 'Toevoegen policy record'; ?> + diff --git a/interface/web/mail/lib/lang/nl_spamfilter_users.lng b/interface/web/mail/lib/lang/nl_spamfilter_users.lng index 686781b886..d6d42ff818 100644 --- a/interface/web/mail/lib/lang/nl_spamfilter_users.lng +++ b/interface/web/mail/lib/lang/nl_spamfilter_users.lng @@ -8,3 +8,4 @@ $wb["local_txt"] = 'Locaal'; ?> + diff --git a/interface/web/mail/lib/lang/nl_spamfilter_users_list.lng b/interface/web/mail/lib/lang/nl_spamfilter_users_list.lng index 3ecbf61776..f477640c38 100644 --- a/interface/web/mail/lib/lang/nl_spamfilter_users_list.lng +++ b/interface/web/mail/lib/lang/nl_spamfilter_users_list.lng @@ -10,3 +10,4 @@ $wb["add_new_record_txt"] = 'Toevoegen spamfilter gebruiker'; ?> + diff --git a/interface/web/mail/lib/lang/nl_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/nl_spamfilter_whitelist.lng index 321db82f7b..de5d5ed5a4 100644 --- a/interface/web/mail/lib/lang/nl_spamfilter_whitelist.lng +++ b/interface/web/mail/lib/lang/nl_spamfilter_whitelist.lng @@ -9,3 +9,4 @@ $wb["limit_spamfilter_wblist_txt"] = 'Het max. aantal White- of Blacklist record ?> + diff --git a/interface/web/mail/lib/lang/nl_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/nl_spamfilter_whitelist_list.lng index e414c7f0df..0476777578 100644 --- a/interface/web/mail/lib/lang/nl_spamfilter_whitelist_list.lng +++ b/interface/web/mail/lib/lang/nl_spamfilter_whitelist_list.lng @@ -9,3 +9,4 @@ $wb["add_new_record_txt"] = 'Toevoegen whitelist record'; ?> + diff --git a/interface/web/mail/mail_user_filter_edit.php b/interface/web/mail/mail_user_filter_edit.php index abad48a921..c1873ac899 100644 --- a/interface/web/mail/mail_user_filter_edit.php +++ b/interface/web/mail/mail_user_filter_edit.php @@ -50,6 +50,22 @@ $app->load('tform_actions'); class page_action extends tform_actions { + function onShowNew() { + global $app, $conf; + + // we will check only users, not admins + if($_SESSION["s"]["user"]["typ"] == 'user') { + if(!$app->tform->checkClientLimit('limit_mailfilter',"")) { + $app->error($app->tform->lng("limit_mailfilter_txt")); + } + if(!$app->tform->checkResellerLimit('limit_mailfilter',"")) { + $app->error('Reseller: '.$app->tform->lng("limit_mailfilter_txt")); + } + } + + parent::onShowNew(); + } + function onSubmit() { global $app, $conf; @@ -65,6 +81,22 @@ class page_action extends tform_actions { // Remove leading dots if(substr($this->dataRecord['target'],0,1) == '.') $this->dataRecord['target'] = substr($this->dataRecord['target'],1); + // Check the client limits, if user is not the admin + if($_SESSION["s"]["user"]["typ"] != 'admin') { // if user is not admin + // Get the limits of the client + $client_group_id = $_SESSION["s"]["user"]["default_group"]; + $client = $app->db->queryOneRecord("SELECT limit_mailfilter FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + + // Check if the user may add another filter + if($this->id == 0 && $client["limit_mailfilter"] >= 0) { + $tmp = $app->db->queryOneRecord("SELECT count(filter_id) as number FROM mail_user_filter WHERE sys_groupid = $client_group_id"); + if($tmp["number"] >= $client["limit_mailfilter"]) { + $app->tform->errorMessage .= $app->tform->lng("limit_mailfilter_txt")."
"; + } + unset($tmp); + } + } // end if user is not admin + parent::onSubmit(); } diff --git a/interface/web/monitor/lib/lang/id.lng b/interface/web/monitor/lib/lang/id.lng new file mode 100644 index 0000000000..cbb451e74d --- /dev/null +++ b/interface/web/monitor/lib/lang/id.lng @@ -0,0 +1,146 @@ +Kami tidak menemukan salah satunya di server Anda.

Ini berarti kami belum bisa mendukung RAID Anda.'; +$wb['monitor_serverstate_beancounterok_txt'] = 'Beancounter ok'; +$wb['monitor_serverstate_beancounterinfo_txt'] = 'Ada sedikit kegagalan di beancounter'; +$wb['monitor_serverstate_beancounterwarning_txt'] = 'Ada beberapa kegagalan di beancounter'; +$wb['monitor_serverstate_beancountercritical_txt'] = 'Ada banyak kegagalan di beancounter'; +$wb['monitor_serverstate_beancountererror_txt'] = 'Ada terlalu banyak kegagalan di beancounter'; +$wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; +$wb['monitor_beancounter_nosupport_txt'] = 'Server ini bukan OpenVz VE dan tidak memiliki informasi beancounter'; +?> + diff --git a/interface/web/monitor/lib/lang/id_datalog_list.lng b/interface/web/monitor/lib/lang/id_datalog_list.lng new file mode 100644 index 0000000000..5b9fe42889 --- /dev/null +++ b/interface/web/monitor/lib/lang/id_datalog_list.lng @@ -0,0 +1,9 @@ + + diff --git a/interface/web/monitor/lib/lang/id_syslog_list.lng b/interface/web/monitor/lib/lang/id_syslog_list.lng new file mode 100644 index 0000000000..c777de2241 --- /dev/null +++ b/interface/web/monitor/lib/lang/id_syslog_list.lng @@ -0,0 +1,8 @@ + + diff --git a/interface/web/monitor/lib/lang/nl.lng b/interface/web/monitor/lib/lang/nl.lng index 87938f750a..d9524d238e 100644 --- a/interface/web/monitor/lib/lang/nl.lng +++ b/interface/web/monitor/lib/lang/nl.lng @@ -135,7 +135,7 @@ $wb['monitor_title_rkhunterlog_txt'] = 'RKHunter-Log'; $wb['monitor_updates_nosupport_txt'] = 'Uw distributie ondersteunt deze controle-software niet'; $wb['monitor_title_fail2ban_txt'] = 'Fail2Ban Log'; $wb['monitor_nosupportedraid1_txt'] = 'Op dit moment, worden ondersteund mdadm or mpt-status om RAID te monitoren.
Dit type kan niet op uw server worden gevonden.

Dit betekend dat uw RAID nog niet wordt ondersteund.'; -$wb['monitor_serverstate_beancounterok_txt'] = 'The beancounter is ok'; +$wb['monitor_serverstate_beancounterok_txt'] = 'De beancounter is ok'; $wb['monitor_serverstate_beancounterinfo_txt'] = 'In de beancounter bevindt zich een foutmelding'; $wb['monitor_serverstate_beancounterwarning_txt'] = 'In de beancounter bevinden zich foutmeldingen'; $wb['monitor_serverstate_beancountercritical_txt'] = 'In de beancounter bevinden zich veel foutmeldingen'; @@ -146,3 +146,4 @@ $wb['monitor_beancounter_nosupport_txt'] = 'Deze server is geen OpenVz VE en hee + diff --git a/interface/web/monitor/lib/lang/nl_syslog_list.lng b/interface/web/monitor/lib/lang/nl_syslog_list.lng index 5b271ed4a4..41f773addd 100644 --- a/interface/web/monitor/lib/lang/nl_syslog_list.lng +++ b/interface/web/monitor/lib/lang/nl_syslog_list.lng @@ -7,3 +7,4 @@ $wb["message_txt"] = 'Bericht'; ?> + diff --git a/interface/web/sites/form/web_domain.tform.php b/interface/web/sites/form/web_domain.tform.php index 928df1c1e9..1b05f67551 100644 --- a/interface/web/sites/form/web_domain.tform.php +++ b/interface/web/sites/form/web_domain.tform.php @@ -177,7 +177,7 @@ $form["tabs"]['domain'] = array ( 'subdomain' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'SELECT', - 'default' => 'y', + 'default' => 'www', 'value' => array('none' => 'none_txt', 'www' => 'www.', '*' => '*.') ), 'ssl' => array ( diff --git a/interface/web/sites/lib/lang/en_web_domain.lng b/interface/web/sites/lib/lang/en_web_domain.lng index 8270026151..11e319d230 100644 --- a/interface/web/sites/lib/lang/en_web_domain.lng +++ b/interface/web/sites/lib/lang/en_web_domain.lng @@ -47,6 +47,7 @@ $wb["error_ssl_locality_empty"] = 'SSL Locality is empty.'; $wb["error_ssl_organisation_empty"] = 'SSL Organisation is empty.'; $wb["error_ssl_organisation_unit_empty"] = 'SSL Organisation Unit is empty.'; $wb["error_ssl_country_empty"] = 'SSL Country is empty.'; +$wb["error_ssl_cert_empty"] = 'SSL Certificate field is empty'; $wb["client_group_id_txt"] = 'Client'; $wb["stats_password_txt"] = 'Webstatistics password'; $wb["allow_override_txt"] = 'Apache AllowOverride'; diff --git a/interface/web/sites/lib/lang/id.lng b/interface/web/sites/lib/lang/id.lng new file mode 100644 index 0000000000..03cf77bb41 --- /dev/null +++ b/interface/web/sites/lib/lang/id.lng @@ -0,0 +1,25 @@ + + diff --git a/interface/web/sites/lib/lang/id_cron.lng b/interface/web/sites/lib/lang/id_cron.lng new file mode 100644 index 0000000000..c80b8beb06 --- /dev/null +++ b/interface/web/sites/lib/lang/id_cron.lng @@ -0,0 +1,22 @@ + + diff --git a/interface/web/sites/lib/lang/id_cron_list.lng b/interface/web/sites/lib/lang/id_cron_list.lng new file mode 100644 index 0000000000..2a0b792e58 --- /dev/null +++ b/interface/web/sites/lib/lang/id_cron_list.lng @@ -0,0 +1,13 @@ + + diff --git a/interface/web/sites/lib/lang/id_database.lng b/interface/web/sites/lib/lang/id_database.lng new file mode 100644 index 0000000000..97f48c687f --- /dev/null +++ b/interface/web/sites/lib/lang/id_database.lng @@ -0,0 +1,26 @@ +semua IP)'; +$wb['database_remote_error_ips'] = 'Setidaknya salah satu alamat ip yang dimasukkan tidak valid.'; +$wb['client_txt'] = 'Klien'; +$wb['active_txt'] = 'Aktif'; +$wb['database_name_error_empty'] = 'Nama Database kosong.'; +$wb['database_name_error_unique'] = 'Sudah ada database dengan nama ini di server. Untuk mendapatkan nama yang unik, mis. tambahkan nama domain Anda di depan nama database.'; +$wb['database_name_error_regex'] = 'Nama database tidak valid. Nama database diperbolehkan mengandung karakter-karakter ini: a-z, A-Z, 0-9 dan garis bawah. Panjang: 2 - 64 karakter.'; +$wb['database_user_error_empty'] = 'Pengguna Database kosong.'; +$wb['database_user_error_unique'] = 'Sudah ada pengguna database dengan nama ini di server. Untuk mendapatkan nama yang unik, mis. tambahkan nama domain Anda di depan nama pengguna.'; +$wb['database_user_error_regex'] = 'Nama pengguna database tidak valid. Nama pengguna diperbolehkan mengandung karakter-karakter ini: a-z, A-Z, 0-9 dan garis bawah. Panjang: 2 - 64 karekter.'; +$wb['limit_database_txt'] = 'Jumlah maks databases telah tercapai.'; +$wb['database_name_change_txt'] = 'Nama database tidak dapat diubah'; +$wb['database_charset_change_txt'] = 'Database charset tidak dapat diubah'; +$wb['database_name_error_len'] = 'Nama database - {db} - terlalu panjang. Panjang nama database maks termasuk prefiks adalah 64 karakter.'; +$wb['database_user_error_len'] = 'Nama pengguna database - {user}- terlalu panjang. Panjang nama pengguna database maks termasuk prefiks adalah 16 karakter.'; +?> + diff --git a/interface/web/sites/lib/lang/id_database_admin_list.lng b/interface/web/sites/lib/lang/id_database_admin_list.lng new file mode 100644 index 0000000000..00f0e235d3 --- /dev/null +++ b/interface/web/sites/lib/lang/id_database_admin_list.lng @@ -0,0 +1,11 @@ + + diff --git a/interface/web/sites/lib/lang/id_database_list.lng b/interface/web/sites/lib/lang/id_database_list.lng new file mode 100644 index 0000000000..8867b42648 --- /dev/null +++ b/interface/web/sites/lib/lang/id_database_list.lng @@ -0,0 +1,10 @@ + + diff --git a/interface/web/sites/lib/lang/id_ftp_user.lng b/interface/web/sites/lib/lang/id_ftp_user.lng new file mode 100644 index 0000000000..8a37bba922 --- /dev/null +++ b/interface/web/sites/lib/lang/id_ftp_user.lng @@ -0,0 +1,28 @@ + + diff --git a/interface/web/sites/lib/lang/id_ftp_user_list.lng b/interface/web/sites/lib/lang/id_ftp_user_list.lng new file mode 100644 index 0000000000..dce03d8cb7 --- /dev/null +++ b/interface/web/sites/lib/lang/id_ftp_user_list.lng @@ -0,0 +1,9 @@ + + diff --git a/interface/web/sites/lib/lang/id_shell_user.lng b/interface/web/sites/lib/lang/id_shell_user.lng new file mode 100644 index 0000000000..639c46e89a --- /dev/null +++ b/interface/web/sites/lib/lang/id_shell_user.lng @@ -0,0 +1,23 @@ + + diff --git a/interface/web/sites/lib/lang/id_shell_user_list.lng b/interface/web/sites/lib/lang/id_shell_user_list.lng new file mode 100644 index 0000000000..18ffd43ef4 --- /dev/null +++ b/interface/web/sites/lib/lang/id_shell_user_list.lng @@ -0,0 +1,9 @@ + + diff --git a/interface/web/sites/lib/lang/id_user_quota_stats_list.lng b/interface/web/sites/lib/lang/id_user_quota_stats_list.lng new file mode 100644 index 0000000000..fd67944082 --- /dev/null +++ b/interface/web/sites/lib/lang/id_user_quota_stats_list.lng @@ -0,0 +1,9 @@ + + diff --git a/interface/web/sites/lib/lang/id_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/id_web_aliasdomain_list.lng new file mode 100644 index 0000000000..49bdfaaa4d --- /dev/null +++ b/interface/web/sites/lib/lang/id_web_aliasdomain_list.lng @@ -0,0 +1,12 @@ + + diff --git a/interface/web/sites/lib/lang/id_web_domain.lng b/interface/web/sites/lib/lang/id_web_domain.lng new file mode 100644 index 0000000000..4ee79e5e4f --- /dev/null +++ b/interface/web/sites/lib/lang/id_web_domain.lng @@ -0,0 +1,68 @@ + + diff --git a/interface/web/sites/lib/lang/id_web_domain_admin_list.lng b/interface/web/sites/lib/lang/id_web_domain_admin_list.lng new file mode 100644 index 0000000000..36e919d7b4 --- /dev/null +++ b/interface/web/sites/lib/lang/id_web_domain_admin_list.lng @@ -0,0 +1,10 @@ + + diff --git a/interface/web/sites/lib/lang/id_web_domain_list.lng b/interface/web/sites/lib/lang/id_web_domain_list.lng new file mode 100644 index 0000000000..e901e9d455 --- /dev/null +++ b/interface/web/sites/lib/lang/id_web_domain_list.lng @@ -0,0 +1,9 @@ + + diff --git a/interface/web/sites/lib/lang/id_web_sites_stats_list.lng b/interface/web/sites/lib/lang/id_web_sites_stats_list.lng new file mode 100644 index 0000000000..d1301ed962 --- /dev/null +++ b/interface/web/sites/lib/lang/id_web_sites_stats_list.lng @@ -0,0 +1,9 @@ + + diff --git a/interface/web/sites/lib/lang/id_web_subdomain.lng b/interface/web/sites/lib/lang/id_web_subdomain.lng new file mode 100644 index 0000000000..7b49a1ea2a --- /dev/null +++ b/interface/web/sites/lib/lang/id_web_subdomain.lng @@ -0,0 +1,41 @@ + + diff --git a/interface/web/sites/lib/lang/id_web_subdomain_list.lng b/interface/web/sites/lib/lang/id_web_subdomain_list.lng new file mode 100644 index 0000000000..ccafa2dc92 --- /dev/null +++ b/interface/web/sites/lib/lang/id_web_subdomain_list.lng @@ -0,0 +1,9 @@ + + diff --git a/interface/web/sites/lib/lang/id_webdav_user.lng b/interface/web/sites/lib/lang/id_webdav_user.lng new file mode 100644 index 0000000000..548724cffe --- /dev/null +++ b/interface/web/sites/lib/lang/id_webdav_user.lng @@ -0,0 +1,16 @@ + + diff --git a/interface/web/sites/lib/lang/id_webdav_user_list.lng b/interface/web/sites/lib/lang/id_webdav_user_list.lng new file mode 100644 index 0000000000..571e57292d --- /dev/null +++ b/interface/web/sites/lib/lang/id_webdav_user_list.lng @@ -0,0 +1,9 @@ + + diff --git a/interface/web/sites/lib/lang/nl.lng b/interface/web/sites/lib/lang/nl.lng index 6581195984..fe05b43fe6 100644 --- a/interface/web/sites/lib/lang/nl.lng +++ b/interface/web/sites/lib/lang/nl.lng @@ -24,3 +24,4 @@ $wb["Web traffic"] = 'Web Traffic'; ?> + diff --git a/interface/web/sites/lib/lang/nl_cron.lng b/interface/web/sites/lib/lang/nl_cron.lng index d77aed4e2c..bd2008ed5e 100644 --- a/interface/web/sites/lib/lang/nl_cron.lng +++ b/interface/web/sites/lib/lang/nl_cron.lng @@ -21,3 +21,4 @@ $wb['unknown_fieldtype_error'] = 'Een onbekend veld type is gebruikt.'; ?> + diff --git a/interface/web/sites/lib/lang/nl_cron_list.lng b/interface/web/sites/lib/lang/nl_cron_list.lng index e1eaa30731..e3d493cfb6 100644 --- a/interface/web/sites/lib/lang/nl_cron_list.lng +++ b/interface/web/sites/lib/lang/nl_cron_list.lng @@ -12,3 +12,4 @@ $wb["add_new_cron_txt"] = 'Toevoegen nieuwe Cron job'; ?> + diff --git a/interface/web/sites/lib/lang/nl_database.lng b/interface/web/sites/lib/lang/nl_database.lng index 72ff077efd..e7f0b7fb83 100644 --- a/interface/web/sites/lib/lang/nl_database.lng +++ b/interface/web/sites/lib/lang/nl_database.lng @@ -26,3 +26,4 @@ $wb["database_user_error_len"] = 'Databasenaam - {user}- is te lang. De max. len + diff --git a/interface/web/sites/lib/lang/nl_database_admin_list.lng b/interface/web/sites/lib/lang/nl_database_admin_list.lng index 88dd5b97d9..9edaeaed8f 100644 --- a/interface/web/sites/lib/lang/nl_database_admin_list.lng +++ b/interface/web/sites/lib/lang/nl_database_admin_list.lng @@ -10,3 +10,4 @@ $wb["sys_groupid_txt"] = 'Klant'; ?> + diff --git a/interface/web/sites/lib/lang/nl_database_list.lng b/interface/web/sites/lib/lang/nl_database_list.lng index 0f1857ed06..4b10105f26 100644 --- a/interface/web/sites/lib/lang/nl_database_list.lng +++ b/interface/web/sites/lib/lang/nl_database_list.lng @@ -9,3 +9,4 @@ $wb["add_new_record_txt"] = 'Toevoegen nieuwe database'; ?> + diff --git a/interface/web/sites/lib/lang/nl_ftp_user.lng b/interface/web/sites/lib/lang/nl_ftp_user.lng index 1c453f9f72..e9b16e24ad 100644 --- a/interface/web/sites/lib/lang/nl_ftp_user.lng +++ b/interface/web/sites/lib/lang/nl_ftp_user.lng @@ -29,3 +29,4 @@ $wb["parent_domain_id_error_empty"] = 'Geen website geselecteerd.'; + diff --git a/interface/web/sites/lib/lang/nl_ftp_user_list.lng b/interface/web/sites/lib/lang/nl_ftp_user_list.lng index ebe1dfc82d..b3a1df559b 100644 --- a/interface/web/sites/lib/lang/nl_ftp_user_list.lng +++ b/interface/web/sites/lib/lang/nl_ftp_user_list.lng @@ -8,3 +8,4 @@ $wb["add_new_record_txt"] = 'Toevoegen nieuwe FTP-gebruiker'; ?> + diff --git a/interface/web/sites/lib/lang/nl_shell_user.lng b/interface/web/sites/lib/lang/nl_shell_user.lng index 7207352b77..c7a6fe77ec 100644 --- a/interface/web/sites/lib/lang/nl_shell_user.lng +++ b/interface/web/sites/lib/lang/nl_shell_user.lng @@ -24,3 +24,4 @@ $wb["parent_domain_id_error_empty"] = 'Geen website geselecteerd.'; + diff --git a/interface/web/sites/lib/lang/nl_shell_user_list.lng b/interface/web/sites/lib/lang/nl_shell_user_list.lng index 7976881c77..98f77836f9 100644 --- a/interface/web/sites/lib/lang/nl_shell_user_list.lng +++ b/interface/web/sites/lib/lang/nl_shell_user_list.lng @@ -8,3 +8,4 @@ $wb["add_new_record_txt"] = 'Toevoegen nieuwe shell-user'; ?> + diff --git a/interface/web/sites/lib/lang/nl_user_quota_stats_list.lng b/interface/web/sites/lib/lang/nl_user_quota_stats_list.lng index e78d831081..1ccf2d0195 100644 --- a/interface/web/sites/lib/lang/nl_user_quota_stats_list.lng +++ b/interface/web/sites/lib/lang/nl_user_quota_stats_list.lng @@ -8,3 +8,4 @@ $wb["soft_txt"] = 'Zachte limiet'; ?> + diff --git a/interface/web/sites/lib/lang/nl_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/nl_web_aliasdomain_list.lng index ace808bf0f..c76ff410a1 100644 --- a/interface/web/sites/lib/lang/nl_web_aliasdomain_list.lng +++ b/interface/web/sites/lib/lang/nl_web_aliasdomain_list.lng @@ -11,3 +11,4 @@ $wb["domain_error_regex"] = 'Domeinnaam ongeldig.'; ?> + diff --git a/interface/web/sites/lib/lang/nl_web_domain.lng b/interface/web/sites/lib/lang/nl_web_domain.lng index c9457a119e..40d5bf4173 100644 --- a/interface/web/sites/lib/lang/nl_web_domain.lng +++ b/interface/web/sites/lib/lang/nl_web_domain.lng @@ -67,3 +67,4 @@ $wb["custom_php_ini_txt"] = 'Custom php.ini instellingen'; ?> + diff --git a/interface/web/sites/lib/lang/nl_web_domain_admin_list.lng b/interface/web/sites/lib/lang/nl_web_domain_admin_list.lng index 778fe890bd..29d86248ac 100644 --- a/interface/web/sites/lib/lang/nl_web_domain_admin_list.lng +++ b/interface/web/sites/lib/lang/nl_web_domain_admin_list.lng @@ -9,3 +9,4 @@ $wb["add_new_record_txt"] = 'Toevoegen nieuwe website'; ?> + diff --git a/interface/web/sites/lib/lang/nl_web_domain_list.lng b/interface/web/sites/lib/lang/nl_web_domain_list.lng index dd3066ef38..1a0de47476 100644 --- a/interface/web/sites/lib/lang/nl_web_domain_list.lng +++ b/interface/web/sites/lib/lang/nl_web_domain_list.lng @@ -8,3 +8,4 @@ $wb["add_new_record_txt"] = 'Toevoegen nieuwe website'; ?> + diff --git a/interface/web/sites/lib/lang/nl_web_sites_stats_list.lng b/interface/web/sites/lib/lang/nl_web_sites_stats_list.lng index 3d4dd67a10..439a8653d7 100644 --- a/interface/web/sites/lib/lang/nl_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/nl_web_sites_stats_list.lng @@ -8,3 +8,4 @@ $wb["last_year_txt"] = 'Vorig jaar'; ?> + diff --git a/interface/web/sites/lib/lang/nl_web_subdomain.lng b/interface/web/sites/lib/lang/nl_web_subdomain.lng index fac758a21d..417e391047 100644 --- a/interface/web/sites/lib/lang/nl_web_subdomain.lng +++ b/interface/web/sites/lib/lang/nl_web_subdomain.lng @@ -40,3 +40,4 @@ $wb["redirect_error_regex"] = 'Ongeldig redirect pad. Geldige redirects zijn bij ?> + diff --git a/interface/web/sites/lib/lang/nl_web_subdomain_list.lng b/interface/web/sites/lib/lang/nl_web_subdomain_list.lng index c86d541625..2443ee182c 100644 --- a/interface/web/sites/lib/lang/nl_web_subdomain_list.lng +++ b/interface/web/sites/lib/lang/nl_web_subdomain_list.lng @@ -8,3 +8,4 @@ $wb["add_new_record_txt"] = 'Toevoegen nieuw subdomein'; ?> + diff --git a/interface/web/sites/lib/lang/nl_webdav_user.lng b/interface/web/sites/lib/lang/nl_webdav_user.lng index 4f3c624b09..4dac03ab36 100644 --- a/interface/web/sites/lib/lang/nl_webdav_user.lng +++ b/interface/web/sites/lib/lang/nl_webdav_user.lng @@ -17,3 +17,4 @@ $wb['password_strength_txt'] = 'Wachtwoord sterkte'; + diff --git a/interface/web/sites/lib/lang/nl_webdav_user_list.lng b/interface/web/sites/lib/lang/nl_webdav_user_list.lng index aabbe0b39b..2e9d9d1930 100644 --- a/interface/web/sites/lib/lang/nl_webdav_user_list.lng +++ b/interface/web/sites/lib/lang/nl_webdav_user_list.lng @@ -8,3 +8,4 @@ $wb["add_new_record_txt"] = 'Toevoegen nieuwe Webdav-gebruiker'; ?> + diff --git a/interface/web/sites/templates/user_quota_stats_list.htm b/interface/web/sites/templates/user_quota_stats_list.htm index acee81043c..f7b7eaa085 100644 --- a/interface/web/sites/templates/user_quota_stats_list.htm +++ b/interface/web/sites/templates/user_quota_stats_list.htm @@ -9,9 +9,9 @@ - - - + + +   @@ -28,9 +28,9 @@ {tmpl_var name="domain"} {tmpl_var name="system_user"} - {tmpl_var name="used"} - {tmpl_var name="soft"} - {tmpl_var name="hard"} + {tmpl_var name="used"} + {tmpl_var name="soft"} + {tmpl_var name="hard"}
  diff --git a/interface/web/sites/tools.inc.php b/interface/web/sites/tools.inc.php index 1f707ab066..11285e66d2 100644 --- a/interface/web/sites/tools.inc.php +++ b/interface/web/sites/tools.inc.php @@ -106,9 +106,9 @@ function getClientID($dataRecord) { function convertClientName($name){ /** - * only allow 'a'..'z', '_', '-', '0'..'9' + * only allow 'a'..'z', '_', '0'..'9' */ - $allowed = 'abcdefghijklmnopqrstuvwxyz0123456789_-'; + $allowed = 'abcdefghijklmnopqrstuvwxyz0123456789_'; $res = ''; $name = strtolower(trim($name)); for ($i=0; $i < strlen($name); $i++){ diff --git a/interface/web/sites/user_quota_stats.php b/interface/web/sites/user_quota_stats.php index 2e28d0d621..0109dc9d9a 100644 --- a/interface/web/sites/user_quota_stats.php +++ b/interface/web/sites/user_quota_stats.php @@ -17,8 +17,16 @@ $app->auth->check_module_permissions('sites'); $app->load('listform_actions'); -$tmp_rec = $app->db->queryOneRecord("SELECT data from monitor_data WHERE type = 'harddisk_quota' ORDER BY created DESC"); -$monitor_data = unserialize($app->db->unquote($tmp_rec['data'])); +// $tmp_rec = $app->db->queryOneRecord("SELECT data from monitor_data WHERE type = 'harddisk_quota' ORDER BY created DESC"); +// $monitor_data = unserialize($app->db->unquote($tmp_rec['data'])); +$tmp_rec = $app->db->queryAllRecords("SELECT data from monitor_data WHERE type = 'harddisk_quota' ORDER BY created DESC"); +$monitor_data = array(); +if(is_array($tmp_rec)) { + foreach ($tmp_rec as $tmp_mon) { + $monitor_data = array_merge_recursive($monitor_data,unserialize($app->db->unquote($tmp_mon['data']))); + } +} + class list_action extends listform_actions { @@ -33,12 +41,38 @@ class list_action extends listform_actions { $rec['bgcolor'] = $this->DataRowColor; $username = $rec['system_user']; - $rec['used'] = (is_numeric($monitor_data['user'][$username]['used'])) ? round($monitor_data['user'][$username]['used']/1024) .'MB' : $monitor_data['user'][$username]['used'].'B'; - $rec['soft'] = $monitor_data['user'][$username]['soft'].'B'; - $rec['hard'] = $monitor_data['user'][$username]['hard'].'B'; + $rec['used'] = $monitor_data['user'][$username]['used']; + $rec['soft'] = $monitor_data['user'][$username]['soft']; + $rec['hard'] = $monitor_data['user'][$username]['hard']; + + if($rec['used'] > 1024) { + $rec['used'] = round($rec['used'] / 1024,2).' MB'; + } else { + $rec['used'] .= ' KB'; + } + + if($rec['soft'] > 1024) { + $rec['soft'] = round($rec['soft'] / 1024,2).' MB'; + } else { + $rec['soft'] .= ' KB'; + } + + if($rec['hard'] > 1024) { + $rec['hard'] = round($rec['hard'] / 1024,2).' MB'; + } else { + $rec['hard'] .= ' KB'; + } + + + + /* + if(!strstr($rec['used'],'M') && !strstr($rec['used'],'K')) $rec['used'].= ' B'; + if(!strstr($rec['soft'],'M') && !strstr($rec['soft'],'K')) $rec['soft'].= ' B'; + if(!strstr($rec['hard'],'M') && !strstr($rec['hard'],'K')) $rec['hard'].= ' B'; + */ - if($rec['soft'] == '0K') $rec['soft'] = $app->lng('unlimited'); - if($rec['hard'] == '0K') $rec['hard'] = $app->lng('unlimited'); + if($rec['soft'] == '0 B' || $rec['soft'] == '0 KB' || $rec['soft'] == '0') $rec['soft'] = $app->lng('unlimited'); + if($rec['hard'] == '0 B' || $rec['hard'] == '0 KB' || $rec['hard'] == '0') $rec['hard'] = $app->lng('unlimited'); //* The variable "id" contains always the index variable $rec['id'] = $rec[$this->idx_key]; diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php index cf07f2a93c..31469399ab 100644 --- a/interface/web/sites/web_domain_edit.php +++ b/interface/web/sites/web_domain_edit.php @@ -426,6 +426,10 @@ class page_action extends tform_actions { if($this->dataRecord['ssl_organisation_unit'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_organisation_unit_empty').'
'; if($this->dataRecord['ssl_country'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_country_empty').'
'; } + + if(isset($this->dataRecord['ssl_action']) && $this->dataRecord['ssl_action'] == 'save') { + if(trim($this->dataRecord['ssl_cert']) == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_cert_empty').'
'; + } } diff --git a/interface/web/strengthmeter/lib/lang/id_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/id_strengthmeter.lng new file mode 100644 index 0000000000..f95fc2d6aa --- /dev/null +++ b/interface/web/strengthmeter/lib/lang/id_strengthmeter.lng @@ -0,0 +1,9 @@ + + diff --git a/interface/web/strengthmeter/lib/lang/nl_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/nl_strengthmeter.lng index 0aacc6073a..d8ccab671a 100644 --- a/interface/web/strengthmeter/lib/lang/nl_strengthmeter.lng +++ b/interface/web/strengthmeter/lib/lang/nl_strengthmeter.lng @@ -9,3 +9,4 @@ $wb['password_strength_5_txt'] = 'Heel sterk'; + diff --git a/interface/web/themes/default/css/screen/basemod.css b/interface/web/themes/default/css/screen/basemod.css index 13b006a59d..9498535505 100644 --- a/interface/web/themes/default/css/screen/basemod.css +++ b/interface/web/themes/default/css/screen/basemod.css @@ -37,7 +37,13 @@ /* (de) Layout: Breite, Hintergrund, Rahmen */ /*#page_margins { min-width: 980px; max-width: 80%; background: #fff;}*/ /* #page_margins { min-width: 980px; max-width: 80%; background: #fff; display: inline-block;}*/ - #page_margins { min-width: 980px; max-width: 80%; background: #fff; display: table;} + + /*WARNING: ADded a overrode for this setting in main.tpl with javascript to target non chrome browsers, + This has to be changed too in case that page_margins get changed. Reason: Chrome does not support the + display: table; attribute correctly*/ + #page_margins { min-width: 980px; max-width: 80%; background: #fff;} + /*#page_margins { min-width: 980px; max-width: 80%; background: #fff; display: table;}*/ + #page{ padding: 10px; } /* (en) Designing main layout elements */ diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm index d27f64ff4b..160b2d6d7b 100644 --- a/interface/web/themes/default/templates/main.tpl.htm +++ b/interface/web/themes/default/templates/main.tpl.htm @@ -58,6 +58,14 @@ +
diff --git a/interface/web/themes/default_64_navimg/templates/main.tpl.htm b/interface/web/themes/default_64_navimg/templates/main.tpl.htm index 20923820e5..63d0fce788 100644 --- a/interface/web/themes/default_64_navimg/templates/main.tpl.htm +++ b/interface/web/themes/default_64_navimg/templates/main.tpl.htm @@ -59,6 +59,14 @@ +
diff --git a/interface/web/themes/default_no_navimg/templates/main.tpl.htm b/interface/web/themes/default_no_navimg/templates/main.tpl.htm index 6bcf70d53d..31e2b85494 100644 --- a/interface/web/themes/default_no_navimg/templates/main.tpl.htm +++ b/interface/web/themes/default_no_navimg/templates/main.tpl.htm @@ -59,6 +59,14 @@ +
diff --git a/interface/web/tools/lib/lang/id.lng b/interface/web/tools/lib/lang/id.lng new file mode 100644 index 0000000000..f357814f79 --- /dev/null +++ b/interface/web/tools/lib/lang/id.lng @@ -0,0 +1,7 @@ + + diff --git a/interface/web/tools/lib/lang/id_usersettings.lng b/interface/web/tools/lib/lang/id_usersettings.lng new file mode 100644 index 0000000000..0f69cac204 --- /dev/null +++ b/interface/web/tools/lib/lang/id_usersettings.lng @@ -0,0 +1,9 @@ + + diff --git a/interface/web/tools/lib/lang/nl.lng b/interface/web/tools/lib/lang/nl.lng index 70dd45b695..180e9de80f 100644 --- a/interface/web/tools/lib/lang/nl.lng +++ b/interface/web/tools/lib/lang/nl.lng @@ -6,3 +6,4 @@ $wb['Password and Language'] = 'Wachtwoord en taal'; ?> + diff --git a/interface/web/tools/lib/lang/nl_usersettings.lng b/interface/web/tools/lib/lang/nl_usersettings.lng index dfdfc943c2..e765c6c478 100644 --- a/interface/web/tools/lib/lang/nl_usersettings.lng +++ b/interface/web/tools/lib/lang/nl_usersettings.lng @@ -9,3 +9,4 @@ $wb["Settings"] = 'Instellingen'; + diff --git a/server/conf/apache_ispconfig.conf.master b/server/conf/apache_ispconfig.conf.master index 752c8bff2f..42d86aef62 100644 --- a/server/conf/apache_ispconfig.conf.master +++ b/server/conf/apache_ispconfig.conf.master @@ -40,6 +40,7 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m Order allow,deny Allow from all + Alias /awstats-icon "/usr/share/awstats/icon" diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master index db03e77dfd..89b0931f4e 100644 --- a/server/conf/vhost.conf.master +++ b/server/conf/vhost.conf.master @@ -150,15 +150,46 @@ # php as fast-cgi enabled - # SocketPath /tmp/fcgid_sock/ + + # SocketPath /tmp/fcgid_sock/ + + # IdleTimeout n (3600 seconds) + # An idle fastcgi application will be terminated after IdleTimeout seconds. IdleTimeout 3600 + + # ProcessLifeTime n (7200 seconds) + # A fastcgi application will be terminated if lifetime expired, even no error is detected. ProcessLifeTime 7200 + + # MaxProcessCount n (1000) + # The max count of total fastcgi process count. # MaxProcessCount 1000 - DefaultMinClassProcessCount 3 + + # DefaultMinClassProcessCount n (3) + # The minimum number of fastcgi application instances for any one fastcgi application. + # Idle fastcgi will not be killed if their count is less than n + # Set this to 0, and tweak IdleTimeout + DefaultMinClassProcessCount 0 + + # DefaultMaxClassProcessCount n (100) + # The maximum number of fastcgi application instances allowed to run for + # particular one fastcgi application. DefaultMaxClassProcessCount 100 + + # IPCConnectTimeout n (3 seconds) + # The connect timeout to a fastcgi application. IPCConnectTimeout 8 + + # IPCCommTimeout n (20 seconds) + # The communication timeout to a fastcgi application. Please increase this + # value if your CGI have a slow initialization or slow respond. IPCCommTimeout 360 - BusyTimeout 300 + + # BusyTimeout n (300 seconds) + # A fastcgi application will be terminated if handing a single request + # longer than busy timeout. + BusyTimeout 300 + AddHandler fcgid-script .php .php3 .php4 .php5 @@ -348,14 +379,43 @@ # php as fast-cgi enabled # SocketPath /tmp/fcgid_sock/ + # IdleTimeout n (3600 seconds) + # An idle fastcgi application will be terminated after IdleTimeout seconds. IdleTimeout 3600 + + # ProcessLifeTime n (7200 seconds) + # A fastcgi application will be terminated if lifetime expired, even no error is detected. ProcessLifeTime 7200 + + # MaxProcessCount n (1000) + # The max count of total fastcgi process count. # MaxProcessCount 1000 - DefaultMinClassProcessCount 3 + + # DefaultMinClassProcessCount n (3) + # The minimum number of fastcgi application instances for any one fastcgi application. + # Idle fastcgi will not be killed if their count is less than n + # Set this to 0, and tweak IdleTimeout + DefaultMinClassProcessCount 0 + + # DefaultMaxClassProcessCount n (100) + # The maximum number of fastcgi application instances allowed to run for + # particular one fastcgi application. DefaultMaxClassProcessCount 100 + + # IPCConnectTimeout n (3 seconds) + # The connect timeout to a fastcgi application. IPCConnectTimeout 8 + + # IPCCommTimeout n (20 seconds) + # The communication timeout to a fastcgi application. Please increase this + # value if your CGI have a slow initialization or slow respond. IPCCommTimeout 360 - BusyTimeout 300 + + # BusyTimeout n (300 seconds) + # A fastcgi application will be terminated if handing a single request + # longer than busy timeout. + BusyTimeout 300 + AddHandler fcgid-script .php .php3 .php4 .php5 diff --git a/server/cron_daily.php b/server/cron_daily.php index e9aedac20a..e3fc5be333 100644 --- a/server/cron_daily.php +++ b/server/cron_daily.php @@ -295,7 +295,7 @@ if ($app->dbmaster == $app->db) { $maxId = $res['max(action_id)']; $sql = "DELETE FROM sys_remoteaction " . "WHERE tstamp < " . $tstamp . " " . - " AND action_status = 'ok' " . + " AND action_state = 'ok' " . " AND action_id <" . intval($maxId); $app->dbmaster->query($sql); diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php index 1d5579ece0..5de2f81504 100644 --- a/server/lib/classes/system.inc.php +++ b/server/lib/classes/system.inc.php @@ -1157,9 +1157,11 @@ class system{ if($found == 0) { //* add \n if the last line does not end with \n or \r - if(substr($out,-1) != "\n" && substr($out,-1) != "\r") $out .= "\n"; + if(substr($out,-1) != "\n" && substr($out,-1) != "\r" && filesize($filename) > 0) $out .= "\n"; //* add the new line at the end of the file - if($append == 1) $out .= $new_line."\n"; + if($append == 1) { + $out .= $new_line."\n"; + } } file_put_contents($filename,$out); } @@ -1198,8 +1200,8 @@ class system{ $user = escapeshellcmd($user); // I assume that the name of the (vmail group) is the same as the name of the mail user in ISPConfig 3 $group = $user; - chown($dir,$user); - chgrp($dir,$group); + if(is_dir($dir)) chown($dir,$user); + if(is_dir($dir)) chgrp($dir,$group); $chown_mdsub = true; } @@ -1207,7 +1209,7 @@ class system{ $maildirsubs = array('cur','new','tmp'); foreach ($maildirsubs as $mdsub) { - mkdir($dir.'/'.$mdsub, 0700, true); + if(!is_dir($dir.'/'.$mdsub)) mkdir($dir.'/'.$mdsub, 0700, true); if ($chown_mdsub) { chown($dir.'/'.$mdsub, $user); chgrp($dir.'/'.$mdsub, $group); diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php index 4555387d86..43928121ec 100644 --- a/server/mods-available/monitor_core_module.inc.php +++ b/server/mods-available/monitor_core_module.inc.php @@ -238,7 +238,7 @@ class monitor_core_module { $state = 'ok'; /** Fetch the data for all users*/ - $dfData = shell_exec('repquota -asu'); + $dfData = shell_exec('repquota -au'); // split into array $df = explode("\n", $dfData); @@ -253,14 +253,22 @@ class monitor_core_module { */ $s = preg_split ('/[\s]+/', $df[$i]); $username = $s[0]; - $data['user'][$username]['used'] = $s[2]; - $data['user'][$username]['soft'] = $s[3]; - $data['user'][$username]['hard'] = $s[4]; + if(substr($username,0,3) == 'web') { + if(isset($data['user'][$username])) { + $data['user'][$username]['used'] += $s[2]; + $data['user'][$username]['soft'] += $s[3]; + $data['user'][$username]['hard'] += $s[4]; + } else { + $data['user'][$username]['used'] = $s[2]; + $data['user'][$username]['soft'] = $s[3]; + $data['user'][$username]['hard'] = $s[4]; + } + } } } /** Fetch the data for all users*/ - $dfData = shell_exec('repquota -asg'); + $dfData = shell_exec('repquota -ag'); // split into array $df = explode("\n", $dfData); @@ -275,9 +283,17 @@ class monitor_core_module { */ $s = preg_split ('/[\s]+/', $df[$i]); $groupname = $s[0]; - $data['group'][$groupname]['used'] = $s[1]; - $data['group'][$groupname]['soft'] = $s[2]; - $data['group'][$groupname]['hard'] = $s[3]; + if(substr($groupname,0,6) == 'client') { + if(isset($data['group'][$groupname])) { + $data['group'][$groupname]['used'] += $s[1]; + $data['group'][$groupname]['soft'] += $s[2]; + $data['group'][$groupname]['hard'] += $s[3]; + } else { + $data['group'][$groupname]['used'] = $s[1]; + $data['group'][$groupname]['soft'] = $s[2]; + $data['group'][$groupname]['hard'] = $s[3]; + } + } } } diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index d8941a8eb6..fbdfd732f9 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -155,15 +155,15 @@ class apache2_plugin { } //* Save a SSL certificate to disk - if($data['new']['ssl_action'] == 'save') { - $ssl_dir = $data['new']['document_root'].'/ssl'; - $domain = $data['new']['ssl_domain']; - $csr_file = $ssl_dir.'/'.$domain.'.csr'; - $crt_file = $ssl_dir.'/'.$domain.'.crt'; - $bundle_file = $ssl_dir.'/'.$domain.'.bundle'; - file_put_contents($csr_file,$data['new']['ssl_request']); - file_put_contents($crt_file,$data['new']['ssl_cert']); - if(trim($data['new']['ssl_bundle']) != '') file_put_contents($bundle_file,$data['new']['ssl_bundle']); + if($data["new"]["ssl_action"] == 'save') { + $ssl_dir = $data["new"]["document_root"]."/ssl"; + $domain = $data["new"]["ssl_domain"]; + $csr_file = $ssl_dir.'/'.$domain.".csr"; + $crt_file = $ssl_dir.'/'.$domain.".crt"; + $bundle_file = $ssl_dir.'/'.$domain.".bundle"; + if(trim($data["new"]["ssl_request"]) != '') file_put_contents($csr_file,$data["new"]["ssl_request"]); + if(trim($data["new"]["ssl_cert"]) != '') file_put_contents($crt_file,$data["new"]["ssl_cert"]); + if(trim($data["new"]["ssl_bundle"]) != '') file_put_contents($bundle_file,$data["new"]["ssl_bundle"]); /* Update the DB of the (local) Server */ $app->db->query("UPDATE web_domain SET ssl_action = '' WHERE domain = '".$data['new']['domain']."'"); /* Update also the master-DB of the Server-Farm */ @@ -553,7 +553,11 @@ class apache2_plugin { if($data['new']['php'] == 'mod') { $master_php_ini_path = $web_config['php_ini_path_apache']; } else { - $master_php_ini_path = $web_config['php_ini_path_cgi']; + if($data["new"]['php'] == 'fast-cgi' && file_exists($fastcgi_config["fastcgi_phpini_path"])) { + $master_php_ini_path = $fastcgi_config["fastcgi_phpini_path"]; + } else { + $master_php_ini_path = $web_config['php_ini_path_cgi']; + } } if($master_php_ini_path != '' && substr($master_php_ini_path,-7) == 'php.ini' && is_file($master_php_ini_path)) { $php_ini_content .= file_get_contents($master_php_ini_path)."\n"; @@ -890,6 +894,9 @@ class apache2_plugin { $app->log('Apache status is: '.$apache_online_status_before_restart,LOGLEVEL_DEBUG); $app->services->restartService('httpd','restart'); + + // wait a few seconds, before we test the apache status again + sleep(2); //* Check if apache restarted successfully if it was online before $apache_online_status_after_restart = $this->_checkTcp('localhost',80); @@ -911,7 +918,7 @@ class apache2_plugin { } // Remove the backup copy of the config file. - unlink($vhost_file.'~'); + if(@is_file($vhost_file.'~')) unlink($vhost_file.'~'); //* Unset action to clean it for next processed vhost. @@ -1255,8 +1262,13 @@ class apache2_plugin { */ $fn = substr($file, 0, strlen($file) - strlen('.htdigest')); $output .= "\n"; +<<<<<<< .working $output .= " Alias /" . $fn . ' ' . $webdavRoot . '/' . $fn . "\n"; $output .= " \n"; +======= + $output .= " Alias /webdav/" . $fn . ' ' . $webdavRoot . '/' . $fn . "\n"; + $output .= " \n"; +>>>>>>> .merge-right.r2129 $output .= " DAV On\n"; $output .= " AuthType Digest\n"; $output .= " AuthName \"" . $fn . "\"\n"; -- GitLab