From fb3a98c0f06fb14a188e5a020936768fa04cb205 Mon Sep 17 00:00:00 2001 From: tbrehm Date: Fri, 22 Oct 2010 10:24:31 +0000 Subject: [PATCH] Merged serveral bugfixes and new language files from stable branch (revisions 2055 - 2093) --- docs/INSTALL_DEBIAN_5.0_dovecot_bind.txt | 5 +- docs/INSTALL_DEBIAN_5.0_multiserver.txt | 5 +- docs/INSTALL_DEBIAN_6.0_courier_mydns.txt | 5 +- docs/INSTALL_DEBIAN_6.0_dovecot_bind.txt | 5 +- docs/INSTALL_OPENSUSE_11_3.txt | 5 + install/dist/lib/centos52.lib.php | 2 +- install/dist/lib/centos53.lib.php | 2 +- install/dist/lib/fedora.lib.php | 13 +- install/dist/lib/gentoo.lib.php | 8 +- install/dist/lib/opensuse.lib.php | 10 +- install/lib/install.lib.php | 6 + install/lib/installer_base.lib.php | 14 +- install/sql/incremental/upd_0002.sql | 2 +- install/tpl/debian6_dovecot.conf.master | 2 - install/tpl/debian_dovecot.conf.master | 4 +- install/update.php | 2 +- interface/lib/classes/db_mysql.inc.php | 2 +- interface/lib/lang/en.lng | 1 + interface/lib/lang/nl.lng | 79 ++--- interface/lib/lang/pl.lng | 77 ++--- interface/web/admin/lib/lang/nl.lng | 90 +++--- interface/web/admin/lib/lang/nl_firewall.lng | 25 +- .../web/admin/lib/lang/nl_firewall_list.lng | 18 +- interface/web/admin/lib/lang/nl_groups.lng | 12 +- .../web/admin/lib/lang/nl_groups_list.lng | 16 +- .../web/admin/lib/lang/nl_language_add.lng | 18 +- .../admin/lib/lang/nl_language_complete.lng | 16 +- .../web/admin/lib/lang/nl_language_edit.lng | 19 +- .../web/admin/lib/lang/nl_language_export.lng | 14 +- .../web/admin/lib/lang/nl_language_import.lng | 18 +- .../web/admin/lib/lang/nl_language_list.lng | 17 +- .../web/admin/lib/lang/nl_package_install.lng | 16 +- .../web/admin/lib/lang/nl_remote_action.lng | 23 +- .../web/admin/lib/lang/nl_remote_user.lng | 87 +++--- .../admin/lib/lang/nl_remote_user_list.lng | 18 +- interface/web/admin/lib/lang/nl_server.lng | 28 +- .../web/admin/lib/lang/nl_server_config.lng | 156 +++++----- .../admin/lib/lang/nl_server_config_list.lng | 10 +- interface/web/admin/lib/lang/nl_server_ip.lng | 16 +- .../web/admin/lib/lang/nl_server_ip_list.lng | 14 +- .../web/admin/lib/lang/nl_server_list.lng | 24 +- .../lib/lang/nl_software_package_install.lng | 14 +- .../lib/lang/nl_software_package_list.lng | 23 +- .../web/admin/lib/lang/nl_software_repo.lng | 16 +- .../admin/lib/lang/nl_software_repo_list.lng | 14 +- .../lib/lang/nl_software_update_list.lng | 19 +- .../web/admin/lib/lang/nl_system_config.lng | 47 +-- interface/web/admin/lib/lang/nl_users.lng | 59 ++-- .../web/admin/lib/lang/nl_users_list.lng | 20 +- interface/web/admin/lib/lang/pl.lng | 87 +++--- interface/web/admin/lib/lang/pl_firewall.lng | 23 +- .../web/admin/lib/lang/pl_firewall_list.lng | 17 +- interface/web/admin/lib/lang/pl_groups.lng | 11 +- .../web/admin/lib/lang/pl_groups_list.lng | 15 +- .../web/admin/lib/lang/pl_language_add.lng | 17 +- .../admin/lib/lang/pl_language_complete.lng | 15 +- .../web/admin/lib/lang/pl_language_export.lng | 13 +- .../web/admin/lib/lang/pl_language_import.lng | 17 +- .../web/admin/lib/lang/pl_language_list.lng | 15 +- .../web/admin/lib/lang/pl_package_install.lng | 15 +- .../web/admin/lib/lang/pl_remote_action.lng | 21 +- .../web/admin/lib/lang/pl_remote_user.lng | 85 ++--- .../admin/lib/lang/pl_remote_user_list.lng | 15 +- interface/web/admin/lib/lang/pl_server.lng | 27 +- .../web/admin/lib/lang/pl_server_config.lng | 155 ++++----- .../admin/lib/lang/pl_server_config_list.lng | 9 +- interface/web/admin/lib/lang/pl_server_ip.lng | 15 +- .../web/admin/lib/lang/pl_server_ip_list.lng | 13 +- .../web/admin/lib/lang/pl_server_list.lng | 23 +- .../lib/lang/pl_software_package_install.lng | 13 +- .../lib/lang/pl_software_package_list.lng | 21 +- .../web/admin/lib/lang/pl_software_repo.lng | 15 +- .../admin/lib/lang/pl_software_repo_list.lng | 13 +- .../lib/lang/pl_software_update_list.lng | 17 +- .../web/admin/lib/lang/pl_system_config.lng | 45 +-- interface/web/admin/lib/lang/pl_users.lng | 57 ++-- .../web/admin/lib/lang/pl_users_list.lng | 19 +- interface/web/client/client_del.php | 13 +- interface/web/client/lib/lang/nl.lng | 29 +- interface/web/client/lib/lang/nl_client.lng | 208 +++++++------ .../web/client/lib/lang/nl_client_del.lng | 15 +- .../client/lib/lang/nl_client_template.lng | 130 ++++---- .../lib/lang/nl_client_template_list.lng | 13 +- .../web/client/lib/lang/nl_clients_list.lng | 20 +- interface/web/client/lib/lang/nl_reseller.lng | 203 ++++++------ .../web/client/lib/lang/nl_resellers_list.lng | 20 +- interface/web/client/lib/lang/pl.lng | 27 +- interface/web/client/lib/lang/pl_client.lng | 203 ++++++------ .../web/client/lib/lang/pl_client_del.lng | 13 +- .../client/lib/lang/pl_client_template.lng | 127 ++++---- .../lib/lang/pl_client_template_list.lng | 11 +- .../web/client/lib/lang/pl_clients_list.lng | 19 +- interface/web/client/lib/lang/pl_reseller.lng | 199 ++++++------ .../web/client/lib/lang/pl_resellers_list.lng | 19 +- interface/web/client/lib/module.conf.php | 22 +- interface/web/dashboard/dashboard.php | 14 +- interface/web/dashboard/lib/lang/nl.lng | 11 +- .../dashboard/lib/lang/nl_dashlet_limits.lng | 61 ++-- .../dashboard/lib/lang/nl_dashlet_modules.lng | 9 +- interface/web/dashboard/lib/lang/pl.lng | 9 +- .../dashboard/lib/lang/pl_dashlet_limits.lng | 59 ++-- .../dashboard/lib/lang/pl_dashlet_modules.lng | 7 +- interface/web/designer/lib/lang/nl.lng | 7 +- .../web/designer/lib/lang/nl_form_edit.lng | 52 ++-- .../web/designer/lib/lang/nl_form_list.lng | 16 +- .../web/designer/lib/lang/nl_form_show.lng | 38 +-- .../web/designer/lib/lang/nl_module_edit.lng | 43 +-- .../web/designer/lib/lang/nl_module_list.lng | 12 +- .../designer/lib/lang/nl_module_nav_edit.lng | 14 +- .../lib/lang/nl_module_nav_item_edit.lng | 18 +- .../web/designer/lib/lang/nl_module_show.lng | 35 ++- interface/web/designer/lib/lang/pl.lng | 5 +- .../web/designer/lib/lang/pl_form_edit.lng | 49 +-- .../web/designer/lib/lang/pl_form_list.lng | 15 +- .../web/designer/lib/lang/pl_form_show.lng | 37 +-- .../web/designer/lib/lang/pl_module_edit.lng | 25 +- .../web/designer/lib/lang/pl_module_list.lng | 11 +- .../designer/lib/lang/pl_module_nav_edit.lng | 13 +- .../lib/lang/pl_module_nav_item_edit.lng | 17 +- .../web/designer/lib/lang/pl_module_show.lng | 33 +- interface/web/dns/lib/lang/nl.lng | 44 +-- interface/web/dns/lib/lang/nl_dns_a.lng | 34 +- interface/web/dns/lib/lang/nl_dns_a_list.lng | 30 +- interface/web/dns/lib/lang/nl_dns_aaaa.lng | 32 +- interface/web/dns/lib/lang/nl_dns_alias.lng | 32 +- interface/web/dns/lib/lang/nl_dns_cname.lng | 34 +- interface/web/dns/lib/lang/nl_dns_hinfo.lng | 32 +- interface/web/dns/lib/lang/nl_dns_mx.lng | 34 +- interface/web/dns/lib/lang/nl_dns_ns.lng | 32 +- interface/web/dns/lib/lang/nl_dns_ptr.lng | 32 +- interface/web/dns/lib/lang/nl_dns_rp.lng | 32 +- interface/web/dns/lib/lang/nl_dns_slave.lng | 31 +- .../web/dns/lib/lang/nl_dns_slave_list.lng | 18 +- interface/web/dns/lib/lang/nl_dns_soa.lng | 54 ++-- .../web/dns/lib/lang/nl_dns_soa_list.lng | 22 +- interface/web/dns/lib/lang/nl_dns_srv.lng | 36 ++- .../web/dns/lib/lang/nl_dns_template.lng | 14 +- .../web/dns/lib/lang/nl_dns_template_list.lng | 14 +- interface/web/dns/lib/lang/nl_dns_txt.lng | 32 +- interface/web/dns/lib/lang/nl_dns_wizard.lng | 61 ++-- interface/web/dns/lib/lang/pl.lng | 41 +-- interface/web/dns/lib/lang/pl_dns_a.lng | 33 +- interface/web/dns/lib/lang/pl_dns_a_list.lng | 29 +- interface/web/dns/lib/lang/pl_dns_aaaa.lng | 31 +- interface/web/dns/lib/lang/pl_dns_alias.lng | 31 +- interface/web/dns/lib/lang/pl_dns_cname.lng | 33 +- interface/web/dns/lib/lang/pl_dns_hinfo.lng | 31 +- interface/web/dns/lib/lang/pl_dns_mx.lng | 33 +- interface/web/dns/lib/lang/pl_dns_ns.lng | 31 +- interface/web/dns/lib/lang/pl_dns_ptr.lng | 31 +- interface/web/dns/lib/lang/pl_dns_rp.lng | 31 +- interface/web/dns/lib/lang/pl_dns_slave.lng | 29 +- .../web/dns/lib/lang/pl_dns_slave_list.lng | 17 +- interface/web/dns/lib/lang/pl_dns_soa.lng | 53 ++-- .../web/dns/lib/lang/pl_dns_soa_list.lng | 21 +- interface/web/dns/lib/lang/pl_dns_srv.lng | 35 ++- .../web/dns/lib/lang/pl_dns_template.lng | 13 +- .../web/dns/lib/lang/pl_dns_template_list.lng | 13 +- interface/web/dns/lib/lang/pl_dns_txt.lng | 31 +- interface/web/dns/lib/lang/pl_dns_wizard.lng | 59 ++-- interface/web/domain/lib/lang/nl.lng | 22 +- interface/web/domain/lib/lang/nl_domain.lng | 15 +- .../web/domain/lib/lang/nl_domain_list.lng | 12 +- interface/web/domain/lib/lang/pl.lng | 19 +- interface/web/domain/lib/lang/pl_domain.lng | 13 +- .../web/domain/lib/lang/pl_domain_list.lng | 11 +- interface/web/help/lib/lang/nl.lng | 22 +- .../web/help/lib/lang/nl_support_message.lng | 17 +- .../help/lib/lang/nl_support_message_list.lng | 14 +- interface/web/help/lib/lang/pl.lng | 19 +- .../web/help/lib/lang/pl_support_message.lng | 15 +- .../help/lib/lang/pl_support_message_list.lng | 13 +- interface/web/login/lib/lang/nl.lng | 41 ++- interface/web/login/lib/lang/pl.lng | 35 ++- interface/web/mail/lib/lang/de_mail_user.lng | 2 +- interface/web/mail/lib/lang/nl.lng | 100 +++--- interface/web/mail/lib/lang/nl_mail_alias.lng | 24 +- .../web/mail/lib/lang/nl_mail_alias_list.lng | 18 +- .../web/mail/lib/lang/nl_mail_aliasdomain.lng | 24 +- .../lib/lang/nl_mail_aliasdomain_list.lng | 17 +- .../web/mail/lib/lang/nl_mail_blacklist.lng | 20 +- .../mail/lib/lang/nl_mail_blacklist_list.lng | 22 +- .../mail/lib/lang/nl_mail_content_filter.lng | 20 +- .../lib/lang/nl_mail_content_filter_list.lng | 18 +- .../web/mail/lib/lang/nl_mail_domain.lng | 28 +- .../lib/lang/nl_mail_domain_admin_list.lng | 18 +- .../mail/lib/lang/nl_mail_domain_catchall.lng | 20 +- .../lib/lang/nl_mail_domain_catchall_list.lng | 20 +- .../web/mail/lib/lang/nl_mail_domain_list.lng | 16 +- .../web/mail/lib/lang/nl_mail_forward.lng | 16 +- .../mail/lib/lang/nl_mail_forward_list.lng | 18 +- interface/web/mail/lib/lang/nl_mail_get.lng | 34 +- .../web/mail/lib/lang/nl_mail_get_list.lng | 20 +- .../mail/lib/lang/nl_mail_relay_recipient.lng | 20 +- .../lib/lang/nl_mail_relay_recipient_list.lng | 20 +- .../web/mail/lib/lang/nl_mail_spamfilter.lng | 36 ++- .../mail/lib/lang/nl_mail_spamfilter_list.lng | 18 +- .../web/mail/lib/lang/nl_mail_transport.lng | 22 +- .../mail/lib/lang/nl_mail_transport_list.lng | 20 +- interface/web/mail/lib/lang/nl_mail_user.lng | 87 +++--- .../web/mail/lib/lang/nl_mail_user_filter.lng | 23 +- .../lib/lang/nl_mail_user_filter_list.lng | 16 +- .../web/mail/lib/lang/nl_mail_user_list.lng | 16 +- .../mail/lib/lang/nl_mail_user_stats_list.lng | 18 +- .../web/mail/lib/lang/nl_mail_whitelist.lng | 20 +- .../mail/lib/lang/nl_mail_whitelist_list.lng | 22 +- .../mail/lib/lang/nl_spamfilter_blacklist.lng | 20 +- .../lib/lang/nl_spamfilter_blacklist_list.lng | 20 +- .../mail/lib/lang/nl_spamfilter_config.lng | 42 +-- .../lib/lang/nl_spamfilter_config_list.lng | 12 +- .../mail/lib/lang/nl_spamfilter_policy.lng | 79 ++--- .../lib/lang/nl_spamfilter_policy_list.lng | 20 +- .../web/mail/lib/lang/nl_spamfilter_users.lng | 18 +- .../lib/lang/nl_spamfilter_users_list.lng | 22 +- .../mail/lib/lang/nl_spamfilter_whitelist.lng | 20 +- .../lib/lang/nl_spamfilter_whitelist_list.lng | 20 +- interface/web/mail/lib/lang/pl.lng | 95 +++--- interface/web/mail/lib/lang/pl_mail_alias.lng | 23 +- .../web/mail/lib/lang/pl_mail_alias_list.lng | 17 +- .../web/mail/lib/lang/pl_mail_aliasdomain.lng | 23 +- .../lib/lang/pl_mail_aliasdomain_list.lng | 15 +- .../web/mail/lib/lang/pl_mail_blacklist.lng | 19 +- .../mail/lib/lang/pl_mail_blacklist_list.lng | 21 +- .../mail/lib/lang/pl_mail_content_filter.lng | 19 +- .../lib/lang/pl_mail_content_filter_list.lng | 17 +- .../web/mail/lib/lang/pl_mail_domain.lng | 27 +- .../lib/lang/pl_mail_domain_admin_list.lng | 17 +- .../mail/lib/lang/pl_mail_domain_catchall.lng | 19 +- .../lib/lang/pl_mail_domain_catchall_list.lng | 19 +- .../web/mail/lib/lang/pl_mail_domain_list.lng | 15 +- .../web/mail/lib/lang/pl_mail_forward.lng | 15 +- .../mail/lib/lang/pl_mail_forward_list.lng | 17 +- interface/web/mail/lib/lang/pl_mail_get.lng | 33 +- .../web/mail/lib/lang/pl_mail_get_list.lng | 19 +- .../mail/lib/lang/pl_mail_relay_recipient.lng | 19 +- .../lib/lang/pl_mail_relay_recipient_list.lng | 19 +- .../web/mail/lib/lang/pl_mail_spamfilter.lng | 35 ++- .../mail/lib/lang/pl_mail_spamfilter_list.lng | 17 +- .../web/mail/lib/lang/pl_mail_transport.lng | 21 +- .../mail/lib/lang/pl_mail_transport_list.lng | 19 +- interface/web/mail/lib/lang/pl_mail_user.lng | 85 ++--- .../web/mail/lib/lang/pl_mail_user_filter.lng | 21 +- .../lib/lang/pl_mail_user_filter_list.lng | 15 +- .../web/mail/lib/lang/pl_mail_user_list.lng | 15 +- .../mail/lib/lang/pl_mail_user_stats_list.lng | 17 +- .../web/mail/lib/lang/pl_mail_whitelist.lng | 19 +- .../mail/lib/lang/pl_mail_whitelist_list.lng | 21 +- .../mail/lib/lang/pl_spamfilter_blacklist.lng | 19 +- .../lib/lang/pl_spamfilter_blacklist_list.lng | 19 +- .../mail/lib/lang/pl_spamfilter_config.lng | 41 +-- .../lib/lang/pl_spamfilter_config_list.lng | 11 +- .../mail/lib/lang/pl_spamfilter_policy.lng | 77 ++--- .../lib/lang/pl_spamfilter_policy_list.lng | 19 +- .../web/mail/lib/lang/pl_spamfilter_users.lng | 17 +- .../lib/lang/pl_spamfilter_users_list.lng | 21 +- .../mail/lib/lang/pl_spamfilter_whitelist.lng | 19 +- .../lib/lang/pl_spamfilter_whitelist_list.lng | 19 +- interface/web/mail/mail_domain_edit.php | 10 +- interface/web/monitor/lib/lang/nl.lng | 293 +++++++++--------- .../web/monitor/lib/lang/nl_syslog_list.lng | 16 +- interface/web/monitor/lib/lang/pl.lng | 291 ++++++++--------- .../web/monitor/lib/lang/pl_datalog_list.lng | 17 +- .../web/monitor/lib/lang/pl_syslog_list.lng | 15 +- interface/web/sites/database_edit.php | 25 +- interface/web/sites/lib/lang/nl.lng | 50 +-- interface/web/sites/lib/lang/nl_cron.lng | 44 +-- interface/web/sites/lib/lang/nl_cron_list.lng | 26 +- interface/web/sites/lib/lang/nl_database.lng | 53 ++-- .../sites/lib/lang/nl_database_admin_list.lng | 22 +- .../web/sites/lib/lang/nl_database_list.lng | 20 +- interface/web/sites/lib/lang/nl_ftp_user.lng | 58 ++-- .../web/sites/lib/lang/nl_ftp_user_list.lng | 18 +- .../web/sites/lib/lang/nl_shell_user.lng | 48 +-- .../web/sites/lib/lang/nl_shell_user_list.lng | 18 +- .../lib/lang/nl_user_quota_stats_list.lng | 18 +- .../lib/lang/nl_web_aliasdomain_list.lng | 24 +- .../web/sites/lib/lang/nl_web_domain.lng | 136 ++++---- .../lib/lang/nl_web_domain_admin_list.lng | 20 +- .../web/sites/lib/lang/nl_web_domain_list.lng | 18 +- .../lib/lang/nl_web_sites_stats_list.lng | 18 +- .../web/sites/lib/lang/nl_web_subdomain.lng | 82 ++--- .../sites/lib/lang/nl_web_subdomain_list.lng | 18 +- .../web/sites/lib/lang/nl_webdav_user.lng | 34 +- .../sites/lib/lang/nl_webdav_user_list.lng | 18 +- interface/web/sites/lib/lang/pl.lng | 49 +-- interface/web/sites/lib/lang/pl_cron.lng | 43 +-- interface/web/sites/lib/lang/pl_cron_list.lng | 25 +- interface/web/sites/lib/lang/pl_database.lng | 51 +-- .../sites/lib/lang/pl_database_admin_list.lng | 21 +- .../web/sites/lib/lang/pl_database_list.lng | 19 +- interface/web/sites/lib/lang/pl_ftp_user.lng | 55 ++-- .../web/sites/lib/lang/pl_ftp_user_list.lng | 17 +- .../web/sites/lib/lang/pl_shell_user.lng | 45 +-- .../web/sites/lib/lang/pl_shell_user_list.lng | 17 +- .../lib/lang/pl_user_quota_stats_list.lng | 17 +- .../lib/lang/pl_web_aliasdomain_list.lng | 23 +- .../web/sites/lib/lang/pl_web_domain.lng | 135 ++++---- .../lib/lang/pl_web_domain_admin_list.lng | 19 +- .../web/sites/lib/lang/pl_web_domain_list.lng | 17 +- .../lib/lang/pl_web_sites_stats_list.lng | 17 +- .../web/sites/lib/lang/pl_web_subdomain.lng | 81 ++--- .../sites/lib/lang/pl_web_subdomain_list.lng | 17 +- .../web/sites/lib/lang/pl_webdav_user.lng | 31 +- .../sites/lib/lang/pl_webdav_user_list.lng | 17 +- interface/web/sites/user_quota_stats.php | 6 +- .../lib/lang/nl_strengthmeter.lng | 19 +- .../lib/lang/pl_strengthmeter.lng | 17 +- .../themes/default/css/navigation/nav_top.css | 4 + interface/web/tools/lib/lang/nl.lng | 14 +- .../web/tools/lib/lang/nl_usersettings.lng | 19 +- interface/web/tools/lib/lang/pl.lng | 13 +- .../web/tools/lib/lang/pl_usersettings.lng | 17 +- server/cron_daily.php | 11 + server/lib/app.inc.php | 4 +- server/lib/classes/system.inc.php | 2 + .../monitor_core_module.inc.php | 78 ++--- .../remoteaction_core_module.inc.php | 30 +- .../plugins-available/apache2_plugin.inc.php | 4 +- .../network_settings_plugin.inc.php | 5 +- 319 files changed, 5208 insertions(+), 4611 deletions(-) diff --git a/docs/INSTALL_DEBIAN_5.0_dovecot_bind.txt b/docs/INSTALL_DEBIAN_5.0_dovecot_bind.txt index dfdc85916..17701bf9a 100644 --- a/docs/INSTALL_DEBIAN_5.0_dovecot_bind.txt +++ b/docs/INSTALL_DEBIAN_5.0_dovecot_bind.txt @@ -145,7 +145,10 @@ apt-get -y install bind9 dnsutils 6) Install vlogger and webalizer -apt-get -y install vlogger webalizer +apt-get -y install vlogger webalizer awstats + +mkdir /usr/share/awstats/tools +cp -prf /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl /usr/share/awstats/tools/awstats_buildstaticpages.pl 7) Install Jailkit (optional, only needed if you want to use chrooting for SSH users) diff --git a/docs/INSTALL_DEBIAN_5.0_multiserver.txt b/docs/INSTALL_DEBIAN_5.0_multiserver.txt index 941fba828..03513f2a4 100644 --- a/docs/INSTALL_DEBIAN_5.0_multiserver.txt +++ b/docs/INSTALL_DEBIAN_5.0_multiserver.txt @@ -28,7 +28,10 @@ STANDALONE_OR_INETD=standalone VIRTUALCHROOT=true [...] -apt-get install vlogger webalizer +apt-get install vlogger webalizer awstats + +mkdir /usr/share/awstats/tools +cp -prf /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl /usr/share/awstats/tools/awstats_buildstaticpages.pl apt-get install gcc make diff --git a/docs/INSTALL_DEBIAN_6.0_courier_mydns.txt b/docs/INSTALL_DEBIAN_6.0_courier_mydns.txt index 1402eb8f0..96f469578 100644 --- a/docs/INSTALL_DEBIAN_6.0_courier_mydns.txt +++ b/docs/INSTALL_DEBIAN_6.0_courier_mydns.txt @@ -263,7 +263,10 @@ update-rc.d mydns defaults 6) Install vlogger and webalizer -apt-get -y install vlogger webalizer +apt-get -y install vlogger webalizer awstats + +mkdir /usr/share/awstats/tools +cp -prf /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl /usr/share/awstats/tools/awstats_buildstaticpages.pl 7) Install Jailkit (optional, only needed if you want to use chrooting for SSH users) diff --git a/docs/INSTALL_DEBIAN_6.0_dovecot_bind.txt b/docs/INSTALL_DEBIAN_6.0_dovecot_bind.txt index 6aa9068ca..b9da8f836 100644 --- a/docs/INSTALL_DEBIAN_6.0_dovecot_bind.txt +++ b/docs/INSTALL_DEBIAN_6.0_dovecot_bind.txt @@ -139,7 +139,10 @@ apt-get -y install bind9 dnsutils 6) Install vlogger and webalizer -apt-get -y install vlogger webalizer +apt-get -y install vlogger webalizer awstats + +mkdir /usr/share/awstats/tools +cp -prf /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl /usr/share/awstats/tools/awstats_buildstaticpages.pl 7) Install Jailkit (optional, only needed if you want to use chrooting for SSH users) diff --git a/docs/INSTALL_OPENSUSE_11_3.txt b/docs/INSTALL_OPENSUSE_11_3.txt index 0d0c750ae..e036d6b11 100644 --- a/docs/INSTALL_OPENSUSE_11_3.txt +++ b/docs/INSTALL_OPENSUSE_11_3.txt @@ -64,6 +64,11 @@ then execute: mkdir -p /var/run/clamav ln -s /var/lib/clamav/clamd-socket /var/run/clamav/clamd +# On 64Bit systems, run this command to symlink the dovecot library folder. Thats for 64Bit systems only, so do not exekute the ln command on 32bit systems. + +ln -s /usr/lib64/dovecot/modules /usr/lib/dovecot + + chkconfig --add amavis chkconfig --add clamd /etc/init.d/amavis start diff --git a/install/dist/lib/centos52.lib.php b/install/dist/lib/centos52.lib.php index 782759420..f00414a62 100644 --- a/install/dist/lib/centos52.lib.php +++ b/install/dist/lib/centos52.lib.php @@ -35,7 +35,7 @@ class installer extends installer_dist { // amavisd user config file $configfile = 'fedora_amavisd_conf'; - if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["courier"]["config_dir"].'/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~'); $content = rf("tpl/".$configfile.".master"); $content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content); diff --git a/install/dist/lib/centos53.lib.php b/install/dist/lib/centos53.lib.php index 17293fc13..d69bc0200 100644 --- a/install/dist/lib/centos53.lib.php +++ b/install/dist/lib/centos53.lib.php @@ -35,7 +35,7 @@ class installer extends installer_dist { // amavisd user config file $configfile = 'fedora_amavisd_conf'; - if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["courier"]["config_dir"].'/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~'); $content = rf("tpl/".$configfile.".master"); $content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content); diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php index 8c7710194..20f832b55 100644 --- a/install/dist/lib/fedora.lib.php +++ b/install/dist/lib/fedora.lib.php @@ -345,7 +345,7 @@ class installer_dist extends installer_base { // amavisd user config file $configfile = 'fedora_amavisd_conf'; - if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["courier"]["config_dir"].'/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~'); $content = rf("tpl/".$configfile.".master"); $content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content); @@ -529,7 +529,7 @@ class installer_dist extends 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'"); - if(count($records) > 0) { + if(is_array($records) && count($records) > 0) { foreach($records as $rec) { $content .= "NameVirtualHost ".$rec["ip_address"].":80\n"; $content .= "NameVirtualHost ".$rec["ip_address"].":443\n"; @@ -579,7 +579,7 @@ class installer_dist extends installer_base { $tcp_public_services = ''; $udp_public_services = ''; - $row = $this->db->queryOneRecord("SELECT * FROM firewall WHERE server_id = ".intval($conf['server_id'])); + $row = $this->db->queryOneRecord('SELECT * FROM '.$conf["mysql"]["database"].'.firewall WHERE server_id = '.intval($conf['server_id'])); if(trim($row["tcp_port"]) != '' || trim($row["udp_port"]) != ''){ $tcp_public_services = trim(str_replace(',',' ',$row["tcp_port"])); @@ -698,6 +698,13 @@ class installer_dist extends installer_base { wf("$install_dir/server/lib/$configfile", $content); + //* Create the config file for remote-actions (but only, if it does not exist, because + // the value is a autoinc-value and so changed by the remoteaction_core_module + if (!file_exists($install_dir.'/server/lib/remote_action.inc.php')) { + $content = ''; + wf($install_dir.'/server/lib/remote_action.inc.php', $content); + } + //* Enable the server modules and plugins. // TODO: Implement a selector which modules and plugins shall be enabled. diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php index 51e7e6dff..428cb98ae 100644 --- a/install/dist/lib/gentoo.lib.php +++ b/install/dist/lib/gentoo.lib.php @@ -670,14 +670,14 @@ class installer extends installer_base //* Create the config file for ISPConfig server $this->write_config_file("$install_dir/server/lib/$configfile", $content); - //* Create the config file for remote-actions (but only, if it does not exist, because - //* the value is a autoinc-value and so changed by the remoteaction_core_module + //* Create the config file for remote-actions (but only, if it does not exist, because + // the value is a autoinc-value and so changed by the remoteaction_core_module if (!file_exists($install_dir.'/server/lib/remote_action.inc.php')) { $content = ''; - $this->write_config_file("$install_dir/server/lib/remote_action.inc.php", $content); + wf($install_dir.'/server/lib/remote_action.inc.php', $content); } - //* Enable the server modules and plugins. + // Enable the server modules and plugins. // TODO: Implement a selector which modules and plugins shall be enabled. $dir = $install_dir.'/server/mods-available/'; if (is_dir($dir)) { diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php index 59a07e7d8..ec01255eb 100644 --- a/install/dist/lib/opensuse.lib.php +++ b/install/dist/lib/opensuse.lib.php @@ -541,7 +541,7 @@ class installer_dist extends 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'"); - if(count($records) > 0) { + if(is_array($records) && count($records) > 0) { foreach($records as $rec) { $content .= "NameVirtualHost ".$rec["ip_address"].":80\n"; $content .= "NameVirtualHost ".$rec["ip_address"].":443\n"; @@ -591,7 +591,7 @@ class installer_dist extends installer_base { $tcp_public_services = ''; $udp_public_services = ''; - $row = $this->db->queryOneRecord("SELECT * FROM firewall WHERE server_id = ".intval($conf['server_id'])); + $row = $this->db->queryOneRecord('SELECT * FROM '.$conf["mysql"]["database"].'.firewall WHERE server_id = '.intval($conf['server_id'])); if(trim($row["tcp_port"]) != '' || trim($row["udp_port"]) != ''){ $tcp_public_services = trim(str_replace(',',' ',$row["tcp_port"])); @@ -710,6 +710,12 @@ class installer_dist extends installer_base { wf("$install_dir/server/lib/$configfile", $content); + //* Create the config file for remote-actions (but only, if it does not exist, because + // the value is a autoinc-value and so changed by the remoteaction_core_module + if (!file_exists($install_dir.'/server/lib/remote_action.inc.php')) { + $content = ''; + wf($install_dir.'/server/lib/remote_action.inc.php', $content); + } //* Enable the server modules and plugins. // TODO: Implement a selector which modules and plugins shall be enabled. diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php index 997f9a1ee..44b405246 100644 --- a/install/lib/install.lib.php +++ b/install/lib/install.lib.php @@ -161,6 +161,12 @@ function get_distname() { $distid = 'centos53'; $distbaseid = 'fedora'; swriteln("Operating System: CentOS 5.3 or compatible\n"); + } elseif(stristr($content,'CentOS release 5')) { + $distname = 'CentOS'; + $distver = 'Unknown'; + $distid = 'centos53'; + $distbaseid = 'fedora'; + swriteln("Operating System: CentOS 5 or compatible\n"); } else { $distname = 'Redhat'; $distver = 'Unknown'; diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 4626c22a8..f9c4ba38b 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -292,6 +292,8 @@ class installer_base { * 1) it is a single server * 2) it is the MASTER of n clients */ + $hosts = array(); + if($conf['mysql']['master_slave_setup'] == 'y') { /* * it is a master-slave - Setup so the slave has to grant its rights in the master @@ -326,7 +328,7 @@ class installer_base { } } - if(is_array($hosts)) { + if(count($hosts) > 0) { foreach($hosts as $host => $value) { /* * If a pwd exists, this means, we have to add the new user (and his pwd). @@ -711,11 +713,11 @@ class installer_base { $config_dir = $conf['dovecot']['config_dir']; //* Configure master.cf and add a line for deliver - if(is_file($config_dir.'/master.cf')) { - copy($config_dir.'/master.cf', $config_dir.'/master.cf~2'); + if(is_file($conf['postfix']['config_dir'].'/master.cf')) { + copy($conf['postfix']['config_dir'].'/master.cf', $conf['postfix']['config_dir'].'/master.cf~2'); } - if(is_file($config_dir.'/master.cf~')) { - chmod($config_dir.'/master.cf~2', 0400); + if(is_file($conf['postfix']['config_dir'].'/master.cf~')) { + chmod($conf['postfix']['config_dir'].'/master.cf~2', 0400); } $content = rf($conf['postfix']['config_dir'].'/master.cf'); // Only add the content if we had not addded it before @@ -1058,7 +1060,7 @@ class installer_base { $tcp_public_services = ''; $udp_public_services = ''; - $row = $this->db->queryOneRecord('SELECT * FROM firewall WHERE server_id = '.intval($conf['server_id'])); + $row = $this->db->queryOneRecord('SELECT * FROM '.$conf["mysql"]["database"].'.firewall WHERE server_id = '.intval($conf['server_id'])); if(trim($row['tcp_port']) != '' || trim($row['udp_port']) != '') { $tcp_public_services = trim(str_replace(',',' ',$row['tcp_port'])); diff --git a/install/sql/incremental/upd_0002.sql b/install/sql/incremental/upd_0002.sql index bebbcc2ce..e71e11182 100644 --- a/install/sql/incremental/upd_0002.sql +++ b/install/sql/incremental/upd_0002.sql @@ -1,4 +1,4 @@ -CREATE TABLE `sys_session` ( +CREATE TABLE IF NOT EXISTS `sys_session` ( `session_id` varchar(32) NOT NULL default '', `date_created` datetime NOT NULL default '0000-00-00 00:00:00', `last_updated` datetime NOT NULL default '0000-00-00 00:00:00', diff --git a/install/tpl/debian6_dovecot.conf.master b/install/tpl/debian6_dovecot.conf.master index 51c6910ee..b94e4470e 100644 --- a/install/tpl/debian6_dovecot.conf.master +++ b/install/tpl/debian6_dovecot.conf.master @@ -55,8 +55,6 @@ plugin { #auth_executable = /usr/lib/dovecot/dovecot-auth auth default { mechanisms = plain login - passdb pam { - } # SQL database passdb sql { diff --git a/install/tpl/debian_dovecot.conf.master b/install/tpl/debian_dovecot.conf.master index d25798200..d32537b8a 100644 --- a/install/tpl/debian_dovecot.conf.master +++ b/install/tpl/debian_dovecot.conf.master @@ -847,7 +847,7 @@ auth default { # database (passwd usually), you can use static userdb. # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM # authentication to actually work. - passdb pam { + # passdb pam { # [blocking=yes] [session=yes] [setcred=yes] # [cache_key=] [] # @@ -880,7 +880,7 @@ auth default { # args = session=yes * # args = cache_key=%u dovecot #args = dovecot - } + # } # System users (NSS, /etc/passwd, or similiar) # In many systems nowadays this uses Name Service Switch, which is diff --git a/install/update.php b/install/update.php index 6f39b23a9..ced040b0b 100644 --- a/install/update.php +++ b/install/update.php @@ -198,7 +198,7 @@ updateDbAndIni(); * (if this is done at client side, only this client is updated. * If this is done at server side, all clients are updated. */ -//if($conf['mysql']['master_slave_setup'] == 'y') { +//if($conf_old['dbmaster_user'] != '' or $conf_old['dbmaster_host'] != '') { //** Update master database rights $reconfigure_master_database_rights_answer = $inst->simple_query('Reconfigure Permissions in master database?', array('yes','no'),'no'); diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php index 585de2ccf..5e38e3b50 100644 --- a/interface/lib/classes/db_mysql.inc.php +++ b/interface/lib/classes/db_mysql.inc.php @@ -483,7 +483,7 @@ class db { public function tableInfo($table_name) { //* Tabellenfelder einlesen ? - if($rows = $this->queryAllRecords('SHOW FIELDS FROM $table_name')){ + if($rows = $this->queryAllRecords('SHOW FIELDS FROM '.$table_name)){ foreach($rows as $row) { $name = $row['Field']; $default = $row['Default']; diff --git a/interface/lib/lang/en.lng b/interface/lib/lang/en.lng index 4094c73c0..0f7243221 100644 --- a/interface/lib/lang/en.lng +++ b/interface/lib/lang/en.lng @@ -33,6 +33,7 @@ $wb['top_menu_help'] = 'Help'; $wb['top_menu_billing'] = 'Billing'; $wb['top_menu_domain'] = 'Domains'; $wb['top_menu_dashboard'] = 'Home'; +$wb['top_menu_vm'] = 'VM'; $wb['toolsarea_head_txt'] = 'Tools'; $wb['latest_news_txt'] = 'Latest news'; ?> diff --git a/interface/lib/lang/nl.lng b/interface/lib/lang/nl.lng index c210be2bd..66077a4e2 100644 --- a/interface/lib/lang/nl.lng +++ b/interface/lib/lang/nl.lng @@ -1,38 +1,41 @@ - + + + + diff --git a/interface/lib/lang/pl.lng b/interface/lib/lang/pl.lng index 8dd456e92..e5e51d692 100644 --- a/interface/lib/lang/pl.lng +++ b/interface/lib/lang/pl.lng @@ -1,38 +1,39 @@ - + + diff --git a/interface/web/admin/lib/lang/nl.lng b/interface/web/admin/lib/lang/nl.lng index b51d3f4ae..91791bbcb 100644 --- a/interface/web/admin/lib/lang/nl.lng +++ b/interface/web/admin/lib/lang/nl.lng @@ -1,43 +1,47 @@ - + + + diff --git a/interface/web/admin/lib/lang/nl_firewall.lng b/interface/web/admin/lib/lang/nl_firewall.lng index 26001af2b..1f27d03d2 100644 --- a/interface/web/admin/lib/lang/nl_firewall.lng +++ b/interface/web/admin/lib/lang/nl_firewall.lng @@ -1,11 +1,14 @@ - + + + diff --git a/interface/web/admin/lib/lang/nl_firewall_list.lng b/interface/web/admin/lib/lang/nl_firewall_list.lng index 37f78048c..246150606 100644 --- a/interface/web/admin/lib/lang/nl_firewall_list.lng +++ b/interface/web/admin/lib/lang/nl_firewall_list.lng @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/admin/lib/lang/nl_groups.lng b/interface/web/admin/lib/lang/nl_groups.lng index 0454a672e..0f624ca13 100644 --- a/interface/web/admin/lib/lang/nl_groups.lng +++ b/interface/web/admin/lib/lang/nl_groups.lng @@ -1,5 +1,7 @@ - + + + diff --git a/interface/web/admin/lib/lang/nl_groups_list.lng b/interface/web/admin/lib/lang/nl_groups_list.lng index 43e2729a0..71e230d98 100644 --- a/interface/web/admin/lib/lang/nl_groups_list.lng +++ b/interface/web/admin/lib/lang/nl_groups_list.lng @@ -1,7 +1,9 @@ -LET OP: Uitgevoerde wijzigingen in deze module kunnen gevolgen hebben voor gebruikers gekoppeld aan deze groepen!'; -?> +WAARSCHUWING: Wijzig hier geen enkele gebruikersinstelling. Voor het aanbrengen van wijzigingen gebruikt u de klanten module. Het hier wijzigen van gebruikers of groepen kan dataverlies tot gevolg hebben!!!'; +?> + + diff --git a/interface/web/admin/lib/lang/nl_language_add.lng b/interface/web/admin/lib/lang/nl_language_add.lng index 8a5c5db5f..5cefedbb9 100644 --- a/interface/web/admin/lib/lang/nl_language_add.lng +++ b/interface/web/admin/lib/lang/nl_language_add.lng @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/admin/lib/lang/nl_language_complete.lng b/interface/web/admin/lib/lang/nl_language_complete.lng index 611637131..7fef5c3f7 100644 --- a/interface/web/admin/lib/lang/nl_language_complete.lng +++ b/interface/web/admin/lib/lang/nl_language_complete.lng @@ -1,7 +1,9 @@ - +Dit voegt de nog missende strings toe van de Engelse master taalbestanden naar de geselecteerde taal.'; +$wb["language_select_txt"] = 'Selecteer taal'; +$wb['btn_save_txt'] = 'Voeg bestanden nu samen'; +$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 9656b36a0..7e9e4ed84 100644 --- a/interface/web/admin/lib/lang/nl_language_edit.lng +++ b/interface/web/admin/lib/lang/nl_language_edit.lng @@ -1,8 +1,11 @@ - + + + + diff --git a/interface/web/admin/lib/lang/nl_language_export.lng b/interface/web/admin/lib/lang/nl_language_export.lng index 2c1d78f7d..dca1869b0 100644 --- a/interface/web/admin/lib/lang/nl_language_export.lng +++ b/interface/web/admin/lib/lang/nl_language_export.lng @@ -1,6 +1,8 @@ - + + + diff --git a/interface/web/admin/lib/lang/nl_language_import.lng b/interface/web/admin/lib/lang/nl_language_import.lng index f1d5fa51a..07514c5a1 100644 --- a/interface/web/admin/lib/lang/nl_language_import.lng +++ b/interface/web/admin/lib/lang/nl_language_import.lng @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/admin/lib/lang/nl_language_list.lng b/interface/web/admin/lib/lang/nl_language_list.lng index dc5843af2..ede83dc2b 100644 --- a/interface/web/admin/lib/lang/nl_language_list.lng +++ b/interface/web/admin/lib/lang/nl_language_list.lng @@ -1,7 +1,10 @@ - + + + + diff --git a/interface/web/admin/lib/lang/nl_package_install.lng b/interface/web/admin/lib/lang/nl_package_install.lng index 574dd1162..988918ec9 100644 --- a/interface/web/admin/lib/lang/nl_package_install.lng +++ b/interface/web/admin/lib/lang/nl_package_install.lng @@ -1,7 +1,9 @@ - + + + diff --git a/interface/web/admin/lib/lang/nl_remote_action.lng b/interface/web/admin/lib/lang/nl_remote_action.lng index 949f7eb14..cfdd91a73 100644 --- a/interface/web/admin/lib/lang/nl_remote_action.lng +++ b/interface/web/admin/lib/lang/nl_remote_action.lng @@ -1,10 +1,13 @@ -
USE THIS AT YOUR OWN RISK!'; -$wb['do_ispcupdate_caption'] = 'Do ISPConfig 3 - Update at remote server'; -$wb['do_ispcupdate_desc'] = 'This action does a ISPConfig3 update at your selected server.

USE THIS AT YOUR OWN RISK!'; -$wb['action_scheduled'] = 'The action is scheduled for execution'; -$wb['select_all_server'] = 'All server'; -?> +
GEBRUIK OP EIGEN RISICO!"; +$wb['do_ispcupdate_caption'] = 'Voer een ISPConfig 3 - update uit op de remote server'; +$wb['do_ispcupdate_desc'] = "Deze actie voert een ISPConfig3 update uit op de soor u geselecteerde server.

GEBRUIK OP EIGEN RISICO!"; +$wb['action_scheduled'] = "Deze actie is ingepland om uitgevoerd te worden"; +$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 4f9dc1de3..12165a392 100644 --- a/interface/web/admin/lib/lang/nl_remote_user.lng +++ b/interface/web/admin/lib/lang/nl_remote_user.lng @@ -1,42 +1,45 @@ - + + + + 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 664ea756e..5d9f8fef3 100644 --- a/interface/web/admin/lib/lang/nl_remote_user_list.lng +++ b/interface/web/admin/lib/lang/nl_remote_user_list.lng @@ -1,7 +1,11 @@ - + + + + + diff --git a/interface/web/admin/lib/lang/nl_server.lng b/interface/web/admin/lib/lang/nl_server.lng index f348c7962..097983781 100644 --- a/interface/web/admin/lib/lang/nl_server.lng +++ b/interface/web/admin/lib/lang/nl_server.lng @@ -1,13 +1,15 @@ -
Wijzigen? Zie: Server configuratie'; -$wb['server_name_txt'] = 'Servernaam'; -$wb['mail_server_txt'] = 'Mailserver'; -$wb['web_server_txt'] = 'Webserver'; -$wb['dns_server_txt'] = 'DNS server'; -$wb['file_server_txt'] = 'Fileserver'; -$wb['db_server_txt'] = 'Database server'; -$wb['vserver_server_txt'] = 'VServer-server'; -$wb['active_txt'] = 'Actief?'; -$wb['mirror_server_id_txt'] = 'Deze server is mirror van server'; -$wb['- None -'] = '- niet van toepassing -'; -?> + + + diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng index d7b6b86e4..159ae26b3 100644 --- a/interface/web/admin/lib/lang/nl_server_config.lng +++ b/interface/web/admin/lib/lang/nl_server_config.lng @@ -1,77 +1,79 @@ - + + + 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 3d376e5f1..656be0706 100644 --- a/interface/web/admin/lib/lang/nl_server_config_list.lng +++ b/interface/web/admin/lib/lang/nl_server_config_list.lng @@ -1,4 +1,6 @@ - + + + diff --git a/interface/web/admin/lib/lang/nl_server_ip.lng b/interface/web/admin/lib/lang/nl_server_ip.lng index ef8079ada..f63c399fb 100644 --- a/interface/web/admin/lib/lang/nl_server_ip.lng +++ b/interface/web/admin/lib/lang/nl_server_ip.lng @@ -1,7 +1,9 @@ - + + + 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 acbd83e29..02e043ab4 100644 --- a/interface/web/admin/lib/lang/nl_server_ip_list.lng +++ b/interface/web/admin/lib/lang/nl_server_ip_list.lng @@ -1,6 +1,8 @@ - + + + diff --git a/interface/web/admin/lib/lang/nl_server_list.lng b/interface/web/admin/lib/lang/nl_server_list.lng index 05e7aac6c..a28e332f6 100644 --- a/interface/web/admin/lib/lang/nl_server_list.lng +++ b/interface/web/admin/lib/lang/nl_server_list.lng @@ -1,11 +1,13 @@ - + + + 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 5c8b75643..bffab594e 100644 --- a/interface/web/admin/lib/lang/nl_software_package_install.lng +++ b/interface/web/admin/lib/lang/nl_software_package_install.lng @@ -1,6 +1,8 @@ - + + + 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 326a15a65..dd375c3db 100644 --- a/interface/web/admin/lib/lang/nl_software_package_list.lng +++ b/interface/web/admin/lib/lang/nl_software_package_list.lng @@ -1,10 +1,13 @@ - + + + + diff --git a/interface/web/admin/lib/lang/nl_software_repo.lng b/interface/web/admin/lib/lang/nl_software_repo.lng index bd4c93119..2448e2a38 100644 --- a/interface/web/admin/lib/lang/nl_software_repo.lng +++ b/interface/web/admin/lib/lang/nl_software_repo.lng @@ -1,7 +1,9 @@ - + + + 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 737e5cf43..bf318f507 100644 --- a/interface/web/admin/lib/lang/nl_software_repo_list.lng +++ b/interface/web/admin/lib/lang/nl_software_repo_list.lng @@ -1,6 +1,8 @@ - + + + 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 7c8dc7623..9472a7eeb 100644 --- a/interface/web/admin/lib/lang/nl_software_update_list.lng +++ b/interface/web/admin/lib/lang/nl_software_update_list.lng @@ -1,8 +1,11 @@ - + + + + diff --git a/interface/web/admin/lib/lang/nl_system_config.lng b/interface/web/admin/lib/lang/nl_system_config.lng index dcb2bcd3c..8105a427b 100644 --- a/interface/web/admin/lib/lang/nl_system_config.lng +++ b/interface/web/admin/lib/lang/nl_system_config.lng @@ -1,22 +1,25 @@ - + + + + diff --git a/interface/web/admin/lib/lang/nl_users.lng b/interface/web/admin/lib/lang/nl_users.lng index 4ab27372c..91a77a14e 100644 --- a/interface/web/admin/lib/lang/nl_users.lng +++ b/interface/web/admin/lib/lang/nl_users.lng @@ -1,28 +1,31 @@ - + + + + diff --git a/interface/web/admin/lib/lang/nl_users_list.lng b/interface/web/admin/lib/lang/nl_users_list.lng index 143593400..673311172 100644 --- a/interface/web/admin/lib/lang/nl_users_list.lng +++ b/interface/web/admin/lib/lang/nl_users_list.lng @@ -1,9 +1,11 @@ -LET OP: Verander hier geen gegevens. Gebruik daarvoor de functie Wijzig klant/Wijzig reseller onder de Klanten-module van ISPConfig. Het veranderen van gebruikers in deze module kan dataverlies opleveren!'; -?> +WAARSCHUWING: Wijzig hier geen enkele gebruikersinstelling. Voor het aanbrengen van wijzigingen gebruikt u de klanten module. Het hier wijzigen van gebruikers of groepen kan dataverlies tot gevolg hebben!!!'; +?> + + diff --git a/interface/web/admin/lib/lang/pl.lng b/interface/web/admin/lib/lang/pl.lng index 12cc46c4c..a159636ac 100644 --- a/interface/web/admin/lib/lang/pl.lng +++ b/interface/web/admin/lib/lang/pl.lng @@ -1,43 +1,44 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_firewall.lng b/interface/web/admin/lib/lang/pl_firewall.lng index a216af6b1..31ec1e698 100644 --- a/interface/web/admin/lib/lang/pl_firewall.lng +++ b/interface/web/admin/lib/lang/pl_firewall.lng @@ -1,11 +1,12 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_firewall_list.lng b/interface/web/admin/lib/lang/pl_firewall_list.lng index f7e164040..61b9198d2 100644 --- a/interface/web/admin/lib/lang/pl_firewall_list.lng +++ b/interface/web/admin/lib/lang/pl_firewall_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_groups.lng b/interface/web/admin/lib/lang/pl_groups.lng index b3c8b9ca7..3e548ba88 100644 --- a/interface/web/admin/lib/lang/pl_groups.lng +++ b/interface/web/admin/lib/lang/pl_groups.lng @@ -1,5 +1,6 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_groups_list.lng b/interface/web/admin/lib/lang/pl_groups_list.lng index 14565b0c7..64117d568 100644 --- a/interface/web/admin/lib/lang/pl_groups_list.lng +++ b/interface/web/admin/lib/lang/pl_groups_list.lng @@ -1,7 +1,8 @@ -WARNING: Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!'; -?> +OSTRZEŻENIE: Nie modyfikuj żadnych ustawień użytkownika w tym miejscu. Użyj ustawień Klienta lub Resellera w module Klient. Modyfikacja ustawień użytkownika lub grupy tutaj grozi utratą danych!"; +?> + diff --git a/interface/web/admin/lib/lang/pl_language_add.lng b/interface/web/admin/lib/lang/pl_language_add.lng index 82e42ef72..7a475deb2 100644 --- a/interface/web/admin/lib/lang/pl_language_add.lng +++ b/interface/web/admin/lib/lang/pl_language_add.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_language_complete.lng b/interface/web/admin/lib/lang/pl_language_complete.lng index 0096c69ef..f824a51ef 100644 --- a/interface/web/admin/lib/lang/pl_language_complete.lng +++ b/interface/web/admin/lib/lang/pl_language_complete.lng @@ -1,7 +1,8 @@ -Ta opcja dodaje do wybranego języka brakujące zmienne językowe z plików języka angielskiego.'; -$wb['language_select_txt'] = 'Wybierz język'; -$wb['btn_save_txt'] = 'Połącz pliki teraz'; -$wb['btn_cancel_txt'] = 'Wróć'; -?> +Ta opcja dodaje do wybranego języka brakujące zmienne językowe z plików języka angielskiego.'; +$wb['language_select_txt'] = 'Wybierz język'; +$wb['btn_save_txt'] = 'Połącz pliki teraz'; +$wb['btn_cancel_txt'] = 'Wróć'; +?> + diff --git a/interface/web/admin/lib/lang/pl_language_export.lng b/interface/web/admin/lib/lang/pl_language_export.lng index 82666fcb7..8ef6cde0a 100644 --- a/interface/web/admin/lib/lang/pl_language_export.lng +++ b/interface/web/admin/lib/lang/pl_language_export.lng @@ -1,6 +1,7 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_language_import.lng b/interface/web/admin/lib/lang/pl_language_import.lng index 83e988116..3dd0740eb 100644 --- a/interface/web/admin/lib/lang/pl_language_import.lng +++ b/interface/web/admin/lib/lang/pl_language_import.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_language_list.lng b/interface/web/admin/lib/lang/pl_language_list.lng index 68f710be0..e06544a5f 100644 --- a/interface/web/admin/lib/lang/pl_language_list.lng +++ b/interface/web/admin/lib/lang/pl_language_list.lng @@ -1,7 +1,8 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_package_install.lng b/interface/web/admin/lib/lang/pl_package_install.lng index 574dd1162..86c19d182 100644 --- a/interface/web/admin/lib/lang/pl_package_install.lng +++ b/interface/web/admin/lib/lang/pl_package_install.lng @@ -1,7 +1,8 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_remote_action.lng b/interface/web/admin/lib/lang/pl_remote_action.lng index 949f7eb14..80550b89d 100644 --- a/interface/web/admin/lib/lang/pl_remote_action.lng +++ b/interface/web/admin/lib/lang/pl_remote_action.lng @@ -1,10 +1,11 @@ -
USE THIS AT YOUR OWN RISK!'; -$wb['do_ispcupdate_caption'] = 'Do ISPConfig 3 - Update at remote server'; -$wb['do_ispcupdate_desc'] = 'This action does a ISPConfig3 update at your selected server.

USE THIS AT YOUR OWN RISK!'; -$wb['action_scheduled'] = 'The action is scheduled for execution'; -$wb['select_all_server'] = 'All server'; -?> +aptitude -y upgrade na wybranym serwerze.

UŻYWASZ JEJ NA WŁASNĄ ODPOWIEDZIALNOŚĆ!"; +$wb['do_ispcupdate_caption'] = "Wykonaj zdalną aktualizację ISPConfig 3 na serwerze"; +$wb['do_ispcupdate_desc'] = "Ta akcja przeprowadzi aktualizację ISPConfig3 na wybranym serwerze.

UŻYWASZ JEJ NA WŁASNĄ ODPOWIEDZIALNOŚĆ!"; +$wb['action_scheduled'] = "Akcja zaplanowana do wykonania"; +$wb['select_all_server'] = "Wszystkie serwery"; +?> + diff --git a/interface/web/admin/lib/lang/pl_remote_user.lng b/interface/web/admin/lib/lang/pl_remote_user.lng index cc9335bc5..95575e0f3 100644 --- a/interface/web/admin/lib/lang/pl_remote_user.lng +++ b/interface/web/admin/lib/lang/pl_remote_user.lng @@ -1,42 +1,43 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_remote_user_list.lng b/interface/web/admin/lib/lang/pl_remote_user_list.lng index 152a75fba..46b48b175 100644 --- a/interface/web/admin/lib/lang/pl_remote_user_list.lng +++ b/interface/web/admin/lib/lang/pl_remote_user_list.lng @@ -1,7 +1,8 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_server.lng b/interface/web/admin/lib/lang/pl_server.lng index c027c0b31..8cddefbbd 100644 --- a/interface/web/admin/lib/lang/pl_server.lng +++ b/interface/web/admin/lib/lang/pl_server.lng @@ -1,13 +1,14 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng index cd14bcdd5..8e737684b 100644 --- a/interface/web/admin/lib/lang/pl_server_config.lng +++ b/interface/web/admin/lib/lang/pl_server_config.lng @@ -1,77 +1,78 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_server_config_list.lng b/interface/web/admin/lib/lang/pl_server_config_list.lng index f9e8dcf1b..f49cfad33 100644 --- a/interface/web/admin/lib/lang/pl_server_config_list.lng +++ b/interface/web/admin/lib/lang/pl_server_config_list.lng @@ -1,4 +1,5 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_server_ip.lng b/interface/web/admin/lib/lang/pl_server_ip.lng index 41e0b9416..b25dd1fdb 100644 --- a/interface/web/admin/lib/lang/pl_server_ip.lng +++ b/interface/web/admin/lib/lang/pl_server_ip.lng @@ -1,7 +1,8 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_server_ip_list.lng b/interface/web/admin/lib/lang/pl_server_ip_list.lng index 6ab81c1e5..dfd061307 100644 --- a/interface/web/admin/lib/lang/pl_server_ip_list.lng +++ b/interface/web/admin/lib/lang/pl_server_ip_list.lng @@ -1,6 +1,7 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_server_list.lng b/interface/web/admin/lib/lang/pl_server_list.lng index f61ba5fc8..212dcffdd 100644 --- a/interface/web/admin/lib/lang/pl_server_list.lng +++ b/interface/web/admin/lib/lang/pl_server_list.lng @@ -1,11 +1,12 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_software_package_install.lng b/interface/web/admin/lib/lang/pl_software_package_install.lng index 5c8b75643..12f025e66 100644 --- a/interface/web/admin/lib/lang/pl_software_package_install.lng +++ b/interface/web/admin/lib/lang/pl_software_package_install.lng @@ -1,6 +1,7 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_software_package_list.lng b/interface/web/admin/lib/lang/pl_software_package_list.lng index 82991fa09..4e73cd77f 100644 --- a/interface/web/admin/lib/lang/pl_software_package_list.lng +++ b/interface/web/admin/lib/lang/pl_software_package_list.lng @@ -1,10 +1,11 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_software_repo.lng b/interface/web/admin/lib/lang/pl_software_repo.lng index d11a1b3b3..491865565 100644 --- a/interface/web/admin/lib/lang/pl_software_repo.lng +++ b/interface/web/admin/lib/lang/pl_software_repo.lng @@ -1,7 +1,8 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_software_repo_list.lng b/interface/web/admin/lib/lang/pl_software_repo_list.lng index 7ca6af9f9..abf93b8db 100644 --- a/interface/web/admin/lib/lang/pl_software_repo_list.lng +++ b/interface/web/admin/lib/lang/pl_software_repo_list.lng @@ -1,6 +1,7 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_software_update_list.lng b/interface/web/admin/lib/lang/pl_software_update_list.lng index e38bdf8a3..97a952c45 100644 --- a/interface/web/admin/lib/lang/pl_software_update_list.lng +++ b/interface/web/admin/lib/lang/pl_software_update_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_system_config.lng b/interface/web/admin/lib/lang/pl_system_config.lng index 929c649e6..ff90828b1 100644 --- a/interface/web/admin/lib/lang/pl_system_config.lng +++ b/interface/web/admin/lib/lang/pl_system_config.lng @@ -1,22 +1,23 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_users.lng b/interface/web/admin/lib/lang/pl_users.lng index 3b2472dfe..683760ca8 100644 --- a/interface/web/admin/lib/lang/pl_users.lng +++ b/interface/web/admin/lib/lang/pl_users.lng @@ -1,28 +1,29 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_users_list.lng b/interface/web/admin/lib/lang/pl_users_list.lng index b628eae87..f74bfb295 100644 --- a/interface/web/admin/lib/lang/pl_users_list.lng +++ b/interface/web/admin/lib/lang/pl_users_list.lng @@ -1,9 +1,10 @@ -WARNING: Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!'; -?> +OSTRZEŻENIE: Nie edytuj żadnych ustawień tutaj. Użyj do tego celu ustawień Klienta i Resellera w module Klienta. Zmiana użytkowników i grup w tym miejscu może spowodować utratę danych!"; +?> + diff --git a/interface/web/client/client_del.php b/interface/web/client/client_del.php index 184b8f248..ffb858b37 100644 --- a/interface/web/client/client_del.php +++ b/interface/web/client/client_del.php @@ -54,6 +54,9 @@ class page_action extends tform_actions { function onDelete() { global $app, $conf,$list_def_file,$tform_def_file; + // Loading tform framework + if(!is_object($app->tform)) $app->uses('tform'); + if($_POST["confirm"] == 'yes') { parent::onDelete(); } else { @@ -63,17 +66,16 @@ class page_action extends tform_actions { $app->tpl->setInclude('content_tpl', 'templates/client_del.htm'); include_once($list_def_file); - - // Loading tform framework - if(!is_object($app->tform)) $app->uses('tform'); - - // Load table definition from file + + // Load table definition from file $app->tform->loadFormDef($tform_def_file); $this->id = intval($_REQUEST["id"]); $this->dataRecord = $app->tform->getDataRecord($this->id); $client_id = intval($this->dataRecord['client_id']); + + //$parent_client_id = intval($this->dataRecord['parent_client_id']); //$parent_user = $app->db->queryOneRecord("SELECT userid FROM sys_user WHERE client_id = $parent_client_id"); $client_group = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = $client_id"); @@ -82,6 +84,7 @@ class page_action extends tform_actions { $tables = 'client,dns_rr,dns_soa,dns_slave,ftp_user,mail_access,mail_content_filter,mail_domain,mail_forwarding,mail_get,mail_user,mail_user_filter,shell_user,spamfilter_users,support_message,web_database,web_domain,web_traffic'; $tables_array = explode(',',$tables); $client_group_id = intval($client_group['groupid']); + $table_list = array(); if($client_group_id > 1) { foreach($tables_array as $table) { diff --git a/interface/web/client/lib/lang/nl.lng b/interface/web/client/lib/lang/nl.lng index 0071fa28f..1c76b4134 100644 --- a/interface/web/client/lib/lang/nl.lng +++ b/interface/web/client/lib/lang/nl.lng @@ -1,13 +1,16 @@ - + + + diff --git a/interface/web/client/lib/lang/nl_client.lng b/interface/web/client/lib/lang/nl_client.lng index 8010aa0bf..d9a50600e 100644 --- a/interface/web/client/lib/lang/nl_client.lng +++ b/interface/web/client/lib/lang/nl_client.lng @@ -1,101 +1,107 @@ - + + + + diff --git a/interface/web/client/lib/lang/nl_client_del.lng b/interface/web/client/lib/lang/nl_client_del.lng index a896cbd3c..919366455 100644 --- a/interface/web/client/lib/lang/nl_client_del.lng +++ b/interface/web/client/lib/lang/nl_client_del.lng @@ -1,6 +1,9 @@ - + + + + diff --git a/interface/web/client/lib/lang/nl_client_template.lng b/interface/web/client/lib/lang/nl_client_template.lng index de6681d4f..bc753c93f 100644 --- a/interface/web/client/lib/lang/nl_client_template.lng +++ b/interface/web/client/lib/lang/nl_client_template.lng @@ -1,63 +1,67 @@ - + + + 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 333aeb5bb..44d9d2677 100644 --- a/interface/web/client/lib/lang/nl_client_template_list.lng +++ b/interface/web/client/lib/lang/nl_client_template_list.lng @@ -1,5 +1,8 @@ - + + + + diff --git a/interface/web/client/lib/lang/nl_clients_list.lng b/interface/web/client/lib/lang/nl_clients_list.lng index 0309a475d..d0ffbd570 100644 --- a/interface/web/client/lib/lang/nl_clients_list.lng +++ b/interface/web/client/lib/lang/nl_clients_list.lng @@ -1,9 +1,11 @@ - + + + diff --git a/interface/web/client/lib/lang/nl_reseller.lng b/interface/web/client/lib/lang/nl_reseller.lng index c4089ae38..74084150c 100644 --- a/interface/web/client/lib/lang/nl_reseller.lng +++ b/interface/web/client/lib/lang/nl_reseller.lng @@ -1,99 +1,104 @@ - + 0'; +$wb["limit_web_quota_txt"] = 'Web Quota'; +$wb["limit_traffic_quota_txt"] = 'Traffic Quota'; +$wb["limit_trafficquota_error_notint"] = 'Traffic Quota moet een numerieke waarde zijn.'; +$wb["customer_no_txt"] = 'Klant nr.'; +$wb["vat_id_txt"] = 'BTW ID'; +$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 dd5fd53db..a2c9e3420 100644 --- a/interface/web/client/lib/lang/nl_resellers_list.lng +++ b/interface/web/client/lib/lang/nl_resellers_list.lng @@ -1,9 +1,11 @@ - + + + diff --git a/interface/web/client/lib/lang/pl.lng b/interface/web/client/lib/lang/pl.lng index 771c3b2c2..f94b0bdc6 100644 --- a/interface/web/client/lib/lang/pl.lng +++ b/interface/web/client/lib/lang/pl.lng @@ -1,13 +1,14 @@ - + + diff --git a/interface/web/client/lib/lang/pl_client.lng b/interface/web/client/lib/lang/pl_client.lng index 88315498d..f65a5f699 100644 --- a/interface/web/client/lib/lang/pl_client.lng +++ b/interface/web/client/lib/lang/pl_client.lng @@ -1,101 +1,102 @@ - + + diff --git a/interface/web/client/lib/lang/pl_client_del.lng b/interface/web/client/lib/lang/pl_client_del.lng index a826d64e1..e36fd8e78 100644 --- a/interface/web/client/lib/lang/pl_client_del.lng +++ b/interface/web/client/lib/lang/pl_client_del.lng @@ -1,6 +1,7 @@ - + + diff --git a/interface/web/client/lib/lang/pl_client_template.lng b/interface/web/client/lib/lang/pl_client_template.lng index 7899ba008..7252107ac 100644 --- a/interface/web/client/lib/lang/pl_client_template.lng +++ b/interface/web/client/lib/lang/pl_client_template.lng @@ -1,63 +1,64 @@ - + + diff --git a/interface/web/client/lib/lang/pl_client_template_list.lng b/interface/web/client/lib/lang/pl_client_template_list.lng index 06a39761f..761257dd5 100644 --- a/interface/web/client/lib/lang/pl_client_template_list.lng +++ b/interface/web/client/lib/lang/pl_client_template_list.lng @@ -1,5 +1,6 @@ - + + diff --git a/interface/web/client/lib/lang/pl_clients_list.lng b/interface/web/client/lib/lang/pl_clients_list.lng index 81f0bd855..cb110d5ba 100644 --- a/interface/web/client/lib/lang/pl_clients_list.lng +++ b/interface/web/client/lib/lang/pl_clients_list.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/client/lib/lang/pl_reseller.lng b/interface/web/client/lib/lang/pl_reseller.lng index 1cb16721a..c62a84a9b 100644 --- a/interface/web/client/lib/lang/pl_reseller.lng +++ b/interface/web/client/lib/lang/pl_reseller.lng @@ -1,99 +1,100 @@ - 0'; -$wb['limit_web_quota_txt'] = 'Web Quota'; -$wb['limit_traffic_quota_txt'] = 'Traffic Quota'; -$wb['limit_trafficquota_error_notint'] = 'Traffic Quota must be a number.'; -$wb['customer_no_txt'] = 'Customer No.'; -$wb['vat_id_txt'] = 'VAT ID'; -$wb['required_fields_txt'] = '* Required fields'; -?> + 0"; +$wb['limit_web_quota_txt'] = "Limit przestrzeni"; +$wb['limit_traffic_quota_txt'] = "Limit transferu"; +$wb['limit_trafficquota_error_notint'] = "Limit transferu musi być liczbą"; +$wb['customer_no_txt'] = "Klient nr"; +$wb['vat_id_txt'] = "NIP"; +$wb['required_fields_txt'] = "* Wymagane pola"; +?> + diff --git a/interface/web/client/lib/lang/pl_resellers_list.lng b/interface/web/client/lib/lang/pl_resellers_list.lng index 51abc411a..e8efd2531 100644 --- a/interface/web/client/lib/lang/pl_resellers_list.lng +++ b/interface/web/client/lib/lang/pl_resellers_list.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/client/lib/module.conf.php b/interface/web/client/lib/module.conf.php index c6fea586e..f37461d0d 100644 --- a/interface/web/client/lib/module.conf.php +++ b/interface/web/client/lib/module.conf.php @@ -11,17 +11,19 @@ $module["tab_width"] = ''; */ -$items[] = array( 'title' => "Add Client", - 'target' => 'content', - 'link' => 'client/client_edit.php', - 'html_id' => 'client_add'); + $items[] = array( 'title' => "Edit Client", 'target' => 'content', 'link' => 'client/client_list.php', 'html_id' => 'client_list'); -if($_SESSION["s"]["user"]["typ"] == 'admin'){ +$items[] = array( 'title' => "Add Client", + 'target' => 'content', + 'link' => 'client/client_edit.php', + 'html_id' => 'client_add'); + + if($_SESSION["s"]["user"]["typ"] == 'admin'){ $items[] = array( 'title' => "Edit Client-Templates", 'target' => 'content', 'link' => 'client/client_template_list.php', @@ -37,16 +39,16 @@ unset($items); if($_SESSION["s"]["user"]["typ"] == 'admin'){ -$items[] = array( 'title' => "Add Reseller", - 'target' => 'content', - 'link' => 'client/reseller_edit.php', - 'html_id' => 'reseller_add'); - $items[] = array( 'title' => "Edit Reseller", 'target' => 'content', 'link' => 'client/reseller_list.php', 'html_id' => 'reseller_list'); +$items[] = array( 'title' => "Add Reseller", + 'target' => 'content', + 'link' => 'client/reseller_edit.php', + 'html_id' => 'reseller_add'); + $module["nav"][] = array( 'title' => 'Resellers', 'open' => 1, 'items' => $items); diff --git a/interface/web/dashboard/dashboard.php b/interface/web/dashboard/dashboard.php index a874affb1..027705874 100644 --- a/interface/web/dashboard/dashboard.php +++ b/interface/web/dashboard/dashboard.php @@ -92,7 +92,19 @@ $info = array(); if($_SESSION["s"]["user"]["typ"] == 'admin') { $new_version = @file_get_contents('http://www.ispconfig.org/downloads/ispconfig3_version.txt'); $new_version = trim($new_version); - if($new_version != ISPC_APP_VERSION) { + $this_version = explode(".",ISPC_APP_VERSION); + $this_fullversion = (($this_version[0] < 10) ? '0'.$this_version[0] : $this_version[0]) . + (($this_version[1] < 10) ? '0'.$this_version[1] : $this_version[1]) . + (($this_version[2] < 10) ? '0'.$this_version[2] : $this_version[2]) . + (($this_version[3] < 10) ? (($this_version[3] < 1) ? '00' : '0'.$this_version[3]) : $this_version[3]); + + + $new_version = explode(".",$new_version); + $new_fullversion = (($new_version[0] < 10) ? '0'.$new_version[0] : $new_version[0]) . + (($new_version[1] < 10) ? '0'.$new_version[1] : $new_version[1]) . + (($new_version[2] < 10) ? '0'.$new_version[2] : $new_version[2]) . + (($new_version[3] < 10) ? (($new_version[3] < 1) ? '00' : '0'.$new_version[3]) : $new_version[3]); + if($new_fullversion > $this_fullversion) { $info[] = array('info_msg' => 'There is a new Version of ISPConfig 3 available! See more...'); } } diff --git a/interface/web/dashboard/lib/lang/nl.lng b/interface/web/dashboard/lib/lang/nl.lng index 246054599..72fd5b565 100644 --- a/interface/web/dashboard/lib/lang/nl.lng +++ b/interface/web/dashboard/lib/lang/nl.lng @@ -1,4 +1,7 @@ - + + + + diff --git a/interface/web/dashboard/lib/lang/nl_dashlet_limits.lng b/interface/web/dashboard/lib/lang/nl_dashlet_limits.lng index 9b65b6c1a..3ef33ca64 100644 --- a/interface/web/dashboard/lib/lang/nl_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/nl_dashlet_limits.lng @@ -1,29 +1,32 @@ - + + + + diff --git a/interface/web/dashboard/lib/lang/nl_dashlet_modules.lng b/interface/web/dashboard/lib/lang/nl_dashlet_modules.lng index 6a02127a0..dc5ce84e7 100644 --- a/interface/web/dashboard/lib/lang/nl_dashlet_modules.lng +++ b/interface/web/dashboard/lib/lang/nl_dashlet_modules.lng @@ -1,3 +1,6 @@ - + + + + diff --git a/interface/web/dashboard/lib/lang/pl.lng b/interface/web/dashboard/lib/lang/pl.lng index 246054599..a7566933a 100644 --- a/interface/web/dashboard/lib/lang/pl.lng +++ b/interface/web/dashboard/lib/lang/pl.lng @@ -1,4 +1,5 @@ - + + diff --git a/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng b/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng index 9b65b6c1a..e7472b079 100644 --- a/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng @@ -1,29 +1,30 @@ - + + diff --git a/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng b/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng index 6a02127a0..ab24d80c0 100644 --- a/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng +++ b/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng @@ -1,3 +1,4 @@ - + + diff --git a/interface/web/designer/lib/lang/nl.lng b/interface/web/designer/lib/lang/nl.lng index acb6c3546..5493b5d2d 100644 --- a/interface/web/designer/lib/lang/nl.lng +++ b/interface/web/designer/lib/lang/nl.lng @@ -1,2 +1,5 @@ - + + + diff --git a/interface/web/designer/lib/lang/nl_form_edit.lng b/interface/web/designer/lib/lang/nl_form_edit.lng index bdc764237..140a3a784 100644 --- a/interface/web/designer/lib/lang/nl_form_edit.lng +++ b/interface/web/designer/lib/lang/nl_form_edit.lng @@ -1,24 +1,28 @@ - + + + diff --git a/interface/web/designer/lib/lang/nl_form_list.lng b/interface/web/designer/lib/lang/nl_form_list.lng index 2da972504..5e4ef81d1 100644 --- a/interface/web/designer/lib/lang/nl_form_list.lng +++ b/interface/web/designer/lib/lang/nl_form_list.lng @@ -1,7 +1,9 @@ - + + + diff --git a/interface/web/designer/lib/lang/nl_form_show.lng b/interface/web/designer/lib/lang/nl_form_show.lng index 1c82ea156..7414f5fef 100644 --- a/interface/web/designer/lib/lang/nl_form_show.lng +++ b/interface/web/designer/lib/lang/nl_form_show.lng @@ -1,18 +1,20 @@ - + + + diff --git a/interface/web/designer/lib/lang/nl_module_edit.lng b/interface/web/designer/lib/lang/nl_module_edit.lng index f4234dc28..f56a82a61 100644 --- a/interface/web/designer/lib/lang/nl_module_edit.lng +++ b/interface/web/designer/lib/lang/nl_module_edit.lng @@ -1,22 +1,25 @@ -Description

-Modulename: Naam van de module directory. Alleen cijfers, letters en underscore zijn toegestaan.
-Moduletitle: Zal worden getoond in de hoofdnavigatie (bovenaan).
-Template file: Template bestand van de module. Momenteel beschikbaar: module.tpl.htm en module_tree.tpl.htm. Standaard is de module.tpl.htm.
-NaviFrame: Als de module_tree.tpl.htm geselecteerd is als template bestand, geef het pad op dat verwijst naar het scriptbestand voor het linker frame.
-Default page: Deze pagina wordt getoont wanneer de module is geopend.
-Tab width: Tabbreedte in de hoofdnavigatie. Het veld is standaard leeg. U kunt absolute waarden opgeven in pixels (bijv. 20) of relatieve (bijv. 20%).
-Hint: Alle paden zijn relatief aan de directorie web. -'; -?> +Modulename: Naam van de module directory. Alleen numerieke waarden, karakters en underscore zijn toegestaan.
+Moduletitle: Worden weergegeven in de (bovenste) hoofd navigatiebalk.
+Template file: Template bestand van de module. Momenteel beschikbaar: module.tpl.htm and module_tree.tpl.htm. Standaard is module.tpl.htm.
+NaviFrame: Als module_tree.tpl.htm is geselecteerd als template bestand, geef hier dan het pad op naar het script bestand voor het linker frame.
+Default page: Deze pagina wordt weergegeven wanneer de module is geopened.
+Tab width: Breedte van de tabs in de hoofdnavigatiebalk. Dit veld is standaard leeg. U kunt hier absulute pixel waarden invoeren (bijv. 20) of relatief (bijv. 20%).
+Hint: Alle paden zijn relatief tot de directory "web". +'; + +?> + + diff --git a/interface/web/designer/lib/lang/nl_module_list.lng b/interface/web/designer/lib/lang/nl_module_list.lng index 19ea5e944..c2b9989ab 100644 --- a/interface/web/designer/lib/lang/nl_module_list.lng +++ b/interface/web/designer/lib/lang/nl_module_list.lng @@ -1,5 +1,7 @@ - + + + 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 504b7f754..6187b34ca 100644 --- a/interface/web/designer/lib/lang/nl_module_nav_edit.lng +++ b/interface/web/designer/lib/lang/nl_module_nav_edit.lng @@ -1,6 +1,8 @@ - + + + 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 4c2bddd61..122273850 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 @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/designer/lib/lang/nl_module_show.lng b/interface/web/designer/lib/lang/nl_module_show.lng index 8f605e40f..ceed1c15d 100644 --- a/interface/web/designer/lib/lang/nl_module_show.lng +++ b/interface/web/designer/lib/lang/nl_module_show.lng @@ -1,16 +1,19 @@ - + + + diff --git a/interface/web/designer/lib/lang/pl.lng b/interface/web/designer/lib/lang/pl.lng index acb6c3546..75c42c807 100644 --- a/interface/web/designer/lib/lang/pl.lng +++ b/interface/web/designer/lib/lang/pl.lng @@ -1,2 +1,3 @@ - + + diff --git a/interface/web/designer/lib/lang/pl_form_edit.lng b/interface/web/designer/lib/lang/pl_form_edit.lng index ee4f4c410..5a09bf23f 100644 --- a/interface/web/designer/lib/lang/pl_form_edit.lng +++ b/interface/web/designer/lib/lang/pl_form_edit.lng @@ -1,24 +1,25 @@ - + + diff --git a/interface/web/designer/lib/lang/pl_form_list.lng b/interface/web/designer/lib/lang/pl_form_list.lng index ac8572277..e11c1e90b 100644 --- a/interface/web/designer/lib/lang/pl_form_list.lng +++ b/interface/web/designer/lib/lang/pl_form_list.lng @@ -1,7 +1,8 @@ - + + diff --git a/interface/web/designer/lib/lang/pl_form_show.lng b/interface/web/designer/lib/lang/pl_form_show.lng index db62af16b..7e690c71f 100644 --- a/interface/web/designer/lib/lang/pl_form_show.lng +++ b/interface/web/designer/lib/lang/pl_form_show.lng @@ -1,18 +1,19 @@ - + + diff --git a/interface/web/designer/lib/lang/pl_module_edit.lng b/interface/web/designer/lib/lang/pl_module_edit.lng index 691e55052..4ba343b45 100644 --- a/interface/web/designer/lib/lang/pl_module_edit.lng +++ b/interface/web/designer/lib/lang/pl_module_edit.lng @@ -1,13 +1,13 @@ -Opis

@@ -18,5 +18,6 @@ $wb['description_txt'] = ' Strona domyślna: Ta strona będzie otwierana na początku podczas otwarcia modułu.
Szerokość zakładki: Szerokość zakładek w głownym menu nawigacyjnym. To pole jest domyślnie puste. Możesz podać wartość w pikselach (np.: 20) lub procentach (np.: 20%).
Podpowiedź: Wszystkie ścieżki są względne według strony www.. -'; -?> +'; +?> + diff --git a/interface/web/designer/lib/lang/pl_module_list.lng b/interface/web/designer/lib/lang/pl_module_list.lng index 308d1c688..fb63f774b 100644 --- a/interface/web/designer/lib/lang/pl_module_list.lng +++ b/interface/web/designer/lib/lang/pl_module_list.lng @@ -1,5 +1,6 @@ - + + diff --git a/interface/web/designer/lib/lang/pl_module_nav_edit.lng b/interface/web/designer/lib/lang/pl_module_nav_edit.lng index 5ace229a9..883fe863b 100644 --- a/interface/web/designer/lib/lang/pl_module_nav_edit.lng +++ b/interface/web/designer/lib/lang/pl_module_nav_edit.lng @@ -1,6 +1,7 @@ - + + diff --git a/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng b/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng index 779b3b4b3..8832400ee 100644 --- a/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng +++ b/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/designer/lib/lang/pl_module_show.lng b/interface/web/designer/lib/lang/pl_module_show.lng index 9b98c4948..9f1783e45 100644 --- a/interface/web/designer/lib/lang/pl_module_show.lng +++ b/interface/web/designer/lib/lang/pl_module_show.lng @@ -1,16 +1,17 @@ - + + diff --git a/interface/web/dns/lib/lang/nl.lng b/interface/web/dns/lib/lang/nl.lng index 56e5386c5..6d0c7e4f0 100644 --- a/interface/web/dns/lib/lang/nl.lng +++ b/interface/web/dns/lib/lang/nl.lng @@ -1,20 +1,24 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_a.lng b/interface/web/dns/lib/lang/nl_dns_a.lng index 32bab7464..ac304f898 100644 --- a/interface/web/dns/lib/lang/nl_dns_a.lng +++ b/interface/web/dns/lib/lang/nl_dns_a.lng @@ -1,16 +1,18 @@ - + + + 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 9ffacd242..b167f1139 100644 --- a/interface/web/dns/lib/lang/nl_dns_a_list.lng +++ b/interface/web/dns/lib/lang/nl_dns_a_list.lng @@ -1,14 +1,16 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_aaaa.lng b/interface/web/dns/lib/lang/nl_dns_aaaa.lng index c40ae84d9..9c7c96682 100644 --- a/interface/web/dns/lib/lang/nl_dns_aaaa.lng +++ b/interface/web/dns/lib/lang/nl_dns_aaaa.lng @@ -1,15 +1,17 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_alias.lng b/interface/web/dns/lib/lang/nl_dns_alias.lng index 2f9cccf72..585856fbf 100644 --- a/interface/web/dns/lib/lang/nl_dns_alias.lng +++ b/interface/web/dns/lib/lang/nl_dns_alias.lng @@ -1,15 +1,17 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_cname.lng b/interface/web/dns/lib/lang/nl_dns_cname.lng index 3ffd246f0..93e1d4812 100644 --- a/interface/web/dns/lib/lang/nl_dns_cname.lng +++ b/interface/web/dns/lib/lang/nl_dns_cname.lng @@ -1,16 +1,18 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_hinfo.lng b/interface/web/dns/lib/lang/nl_dns_hinfo.lng index a7287c423..bc2007ffc 100644 --- a/interface/web/dns/lib/lang/nl_dns_hinfo.lng +++ b/interface/web/dns/lib/lang/nl_dns_hinfo.lng @@ -1,15 +1,17 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_mx.lng b/interface/web/dns/lib/lang/nl_dns_mx.lng index f93195c1b..1f91060d0 100644 --- a/interface/web/dns/lib/lang/nl_dns_mx.lng +++ b/interface/web/dns/lib/lang/nl_dns_mx.lng @@ -1,16 +1,18 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_ns.lng b/interface/web/dns/lib/lang/nl_dns_ns.lng index 75a91b41d..26b51efcd 100644 --- a/interface/web/dns/lib/lang/nl_dns_ns.lng +++ b/interface/web/dns/lib/lang/nl_dns_ns.lng @@ -1,15 +1,17 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_ptr.lng b/interface/web/dns/lib/lang/nl_dns_ptr.lng index 4bd156388..392f160f4 100644 --- a/interface/web/dns/lib/lang/nl_dns_ptr.lng +++ b/interface/web/dns/lib/lang/nl_dns_ptr.lng @@ -1,15 +1,17 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_rp.lng b/interface/web/dns/lib/lang/nl_dns_rp.lng index 1195406a1..b1f3673dd 100644 --- a/interface/web/dns/lib/lang/nl_dns_rp.lng +++ b/interface/web/dns/lib/lang/nl_dns_rp.lng @@ -1,15 +1,17 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_slave.lng b/interface/web/dns/lib/lang/nl_dns_slave.lng index 469c98be9..64ca1a2dd 100644 --- a/interface/web/dns/lib/lang/nl_dns_slave.lng +++ b/interface/web/dns/lib/lang/nl_dns_slave.lng @@ -1,14 +1,17 @@ -these IPs (comma separated list)'; -$wb['server_id_error_empty'] = 'No server selected'; -$wb['origin_error_empty'] = 'Zone empty.'; -$wb['origin_error_unique'] = 'There is already a record for this zone.'; -$wb['origin_error_regex'] = 'Zone has a invalid format.'; -$wb['ns_error_regex'] = 'NS has a invalid format.'; -?> +deze IPs (komma gescheiden waarden)'; +$wb["server_id_error_empty"] = 'Geen server geselecteerd'; +$wb["origin_error_empty"] = 'Zone is niet ingvuld.'; +$wb["origin_error_unique"] = 'Er is al een record for deze zone.'; +$wb["origin_error_regex"] = 'Zone heeft een ongeldig formaat.'; +$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 788fd5347..e15aa9e81 100644 --- a/interface/web/dns/lib/lang/nl_dns_slave_list.lng +++ b/interface/web/dns/lib/lang/nl_dns_slave_list.lng @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_soa.lng b/interface/web/dns/lib/lang/nl_dns_soa.lng index e1d149aec..f9fb92974 100644 --- a/interface/web/dns/lib/lang/nl_dns_soa.lng +++ b/interface/web/dns/lib/lang/nl_dns_soa.lng @@ -1,26 +1,28 @@ - +deze IPs (komma gescheiden waarden)'; +$wb["active_txt"] = 'Actief'; +$wb["limit_dns_zone_txt"] = 'Het max. aan DNS records voor uw account is bereikt.'; +$wb["client_txt"] = 'Klant'; +$wb["no_zone_perm"] = 'U heeft geen toestemming om een record toe te voegen aan deze DNS zone.'; +$wb["server_id_error_empty"] = 'Geen server geselecteerd'; +$wb["origin_error_empty"] = 'Zone is niet ingvuld.'; +$wb["origin_error_unique"] = 'Er is al een record voor deze zone.'; +$wb["origin_error_regex"] = 'Zone heeft een ongeldig format.'; +$wb["ns_error_regex"] = 'NS heeft een ongeldig format.'; +$wb["mbox_error_empty"] = 'E-mail is niet ingvuld.'; +$wb["mbox_error_regex"] = 'E-mail formaat ongeldig.'; +$wb["also_notify_txt"] = 'ook notifcatie'; +$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 74983da12..56b3061a1 100644 --- a/interface/web/dns/lib/lang/nl_dns_soa_list.lng +++ b/interface/web/dns/lib/lang/nl_dns_soa_list.lng @@ -1,10 +1,12 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_srv.lng b/interface/web/dns/lib/lang/nl_dns_srv.lng index bb6ed102f..68e3b3bc8 100644 --- a/interface/web/dns/lib/lang/nl_dns_srv.lng +++ b/interface/web/dns/lib/lang/nl_dns_srv.lng @@ -1,17 +1,19 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_template.lng b/interface/web/dns/lib/lang/nl_dns_template.lng index a6f8e0e9b..fdaad7f68 100644 --- a/interface/web/dns/lib/lang/nl_dns_template.lng +++ b/interface/web/dns/lib/lang/nl_dns_template.lng @@ -1,6 +1,8 @@ -
Voorbeeld (in nieuw venster)'; -$wb['visible_txt'] = 'Geactiveerd voor DNS wizard?'; -?> + + + 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 6ca214c55..ea7ba2bc8 100644 --- a/interface/web/dns/lib/lang/nl_dns_template_list.lng +++ b/interface/web/dns/lib/lang/nl_dns_template_list.lng @@ -1,6 +1,8 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_txt.lng b/interface/web/dns/lib/lang/nl_dns_txt.lng index 94dbb3f47..550985b8b 100644 --- a/interface/web/dns/lib/lang/nl_dns_txt.lng +++ b/interface/web/dns/lib/lang/nl_dns_txt.lng @@ -1,15 +1,17 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_wizard.lng b/interface/web/dns/lib/lang/nl_dns_wizard.lng index e7093f01e..a406bddff 100644 --- a/interface/web/dns/lib/lang/nl_dns_wizard.lng +++ b/interface/web/dns/lib/lang/nl_dns_wizard.lng @@ -1,29 +1,32 @@ - + + + diff --git a/interface/web/dns/lib/lang/pl.lng b/interface/web/dns/lib/lang/pl.lng index 0a3f1a9fb..a467ab6a8 100644 --- a/interface/web/dns/lib/lang/pl.lng +++ b/interface/web/dns/lib/lang/pl.lng @@ -1,20 +1,21 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_a.lng b/interface/web/dns/lib/lang/pl_dns_a.lng index 4ad0a7c41..b612fff5c 100644 --- a/interface/web/dns/lib/lang/pl_dns_a.lng +++ b/interface/web/dns/lib/lang/pl_dns_a.lng @@ -1,16 +1,17 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_a_list.lng b/interface/web/dns/lib/lang/pl_dns_a_list.lng index 3d0db059b..90ddca5e2 100644 --- a/interface/web/dns/lib/lang/pl_dns_a_list.lng +++ b/interface/web/dns/lib/lang/pl_dns_a_list.lng @@ -1,14 +1,15 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_aaaa.lng b/interface/web/dns/lib/lang/pl_dns_aaaa.lng index 983fae1a8..6d3a3e777 100644 --- a/interface/web/dns/lib/lang/pl_dns_aaaa.lng +++ b/interface/web/dns/lib/lang/pl_dns_aaaa.lng @@ -1,15 +1,16 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_alias.lng b/interface/web/dns/lib/lang/pl_dns_alias.lng index a950805e3..5e1b745bb 100644 --- a/interface/web/dns/lib/lang/pl_dns_alias.lng +++ b/interface/web/dns/lib/lang/pl_dns_alias.lng @@ -1,15 +1,16 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_cname.lng b/interface/web/dns/lib/lang/pl_dns_cname.lng index 361c8e41b..1ec711bdb 100644 --- a/interface/web/dns/lib/lang/pl_dns_cname.lng +++ b/interface/web/dns/lib/lang/pl_dns_cname.lng @@ -1,16 +1,17 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_hinfo.lng b/interface/web/dns/lib/lang/pl_dns_hinfo.lng index 53b6da226..1fcda15c1 100644 --- a/interface/web/dns/lib/lang/pl_dns_hinfo.lng +++ b/interface/web/dns/lib/lang/pl_dns_hinfo.lng @@ -1,15 +1,16 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_mx.lng b/interface/web/dns/lib/lang/pl_dns_mx.lng index 4a3936a1b..292f52fdd 100644 --- a/interface/web/dns/lib/lang/pl_dns_mx.lng +++ b/interface/web/dns/lib/lang/pl_dns_mx.lng @@ -1,16 +1,17 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_ns.lng b/interface/web/dns/lib/lang/pl_dns_ns.lng index 18d7efd6c..5f24910c3 100644 --- a/interface/web/dns/lib/lang/pl_dns_ns.lng +++ b/interface/web/dns/lib/lang/pl_dns_ns.lng @@ -1,15 +1,16 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_ptr.lng b/interface/web/dns/lib/lang/pl_dns_ptr.lng index eae39817a..bc4486b25 100644 --- a/interface/web/dns/lib/lang/pl_dns_ptr.lng +++ b/interface/web/dns/lib/lang/pl_dns_ptr.lng @@ -1,15 +1,16 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_rp.lng b/interface/web/dns/lib/lang/pl_dns_rp.lng index ece9346e3..c7917a80e 100644 --- a/interface/web/dns/lib/lang/pl_dns_rp.lng +++ b/interface/web/dns/lib/lang/pl_dns_rp.lng @@ -1,15 +1,16 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_slave.lng b/interface/web/dns/lib/lang/pl_dns_slave.lng index 469c98be9..fe8bfe7c8 100644 --- a/interface/web/dns/lib/lang/pl_dns_slave.lng +++ b/interface/web/dns/lib/lang/pl_dns_slave.lng @@ -1,14 +1,15 @@ -these IPs (comma separated list)'; -$wb['server_id_error_empty'] = 'No server selected'; -$wb['origin_error_empty'] = 'Zone empty.'; -$wb['origin_error_unique'] = 'There is already a record for this zone.'; -$wb['origin_error_regex'] = 'Zone has a invalid format.'; -$wb['ns_error_regex'] = 'NS has a invalid format.'; -?> +tych adresów IP (adresy rozdzielaj przecinkiem)"; +$wb['server_id_error_empty'] = "Nazwa serwera jest pusta."; +$wb['origin_error_empty'] = "Strefa jest pusta"; +$wb['origin_error_unique'] = "Jest już rekord w tej strefie."; +$wb['origin_error_regex'] = "Strefa ma niepoprawny format."; +$wb['ns_error_regex'] = "NS ma niepoprawny format."; +?> + diff --git a/interface/web/dns/lib/lang/pl_dns_slave_list.lng b/interface/web/dns/lib/lang/pl_dns_slave_list.lng index 788fd5347..5261e6492 100644 --- a/interface/web/dns/lib/lang/pl_dns_slave_list.lng +++ b/interface/web/dns/lib/lang/pl_dns_slave_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_soa.lng b/interface/web/dns/lib/lang/pl_dns_soa.lng index 868615e08..feb18367f 100644 --- a/interface/web/dns/lib/lang/pl_dns_soa.lng +++ b/interface/web/dns/lib/lang/pl_dns_soa.lng @@ -1,26 +1,27 @@ -tych adresów IP (adresy rozdzielaj przecinkiem)'; -$wb['active_txt'] = 'Aktywny'; -$wb['limit_dns_zone_txt'] = 'Maksymalna ilość stref DNS dla Twojego konta została przekroczona.'; -$wb['client_txt'] = 'Klient'; -$wb['no_zone_perm'] = 'Nie masz uprawnień, aby dodać nowy wpis dla tej strefy DNS.'; -$wb['server_id_error_empty'] = 'Nie wybrano serwera'; -$wb['origin_error_empty'] = 'Strefa jest pusta.'; -$wb['origin_error_unique'] = 'Istnieje już wpis dla tej strefy.'; -$wb['origin_error_regex'] = 'Strefa ma niepoprawny format.'; -$wb['ns_error_regex'] = 'NS ma niepoprawny format.'; -$wb['mbox_error_empty'] = 'E-mail jest pusty.'; -$wb['mbox_error_regex'] = 'E-mail ma niepoprawny format.'; -$wb['also_notify_txt'] = 'Also Notify'; -$wb['update_acl_txt'] = 'Update ACL'; -?> +tych adresów IP (adresy rozdzielaj przecinkiem)"; +$wb['active_txt'] = "Aktywny"; +$wb['limit_dns_zone_txt'] = "Maksymalna ilość stref DNS dla Twojego konta została przekroczona."; +$wb['client_txt'] = "Klient"; +$wb['no_zone_perm'] = "Nie masz uprawnień, aby dodać nowy wpis dla tej strefy DNS."; +$wb['server_id_error_empty'] = "Nie wybrano serwera."; +$wb['origin_error_empty'] = "Strefa jest pusta."; +$wb['origin_error_unique'] = "Istnieje już wpis dla tej strefy."; +$wb['origin_error_regex'] = "Strefa ma niepoprawny format."; +$wb['ns_error_regex'] = "NS ma niepoprawny format."; +$wb['mbox_error_empty'] = "E-mail jest pusty."; +$wb['mbox_error_regex'] = "E-mail ma niepoprawny format."; +$wb['also_notify_txt'] = "Także powiadom"; +$wb['update_acl_txt'] = "Zaktualizuj ACL"; +?> + diff --git a/interface/web/dns/lib/lang/pl_dns_soa_list.lng b/interface/web/dns/lib/lang/pl_dns_soa_list.lng index 1841bca17..b99db5919 100644 --- a/interface/web/dns/lib/lang/pl_dns_soa_list.lng +++ b/interface/web/dns/lib/lang/pl_dns_soa_list.lng @@ -1,10 +1,11 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_srv.lng b/interface/web/dns/lib/lang/pl_dns_srv.lng index 5c2a58403..89434ab47 100644 --- a/interface/web/dns/lib/lang/pl_dns_srv.lng +++ b/interface/web/dns/lib/lang/pl_dns_srv.lng @@ -1,17 +1,18 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_template.lng b/interface/web/dns/lib/lang/pl_dns_template.lng index f3e756357..49cc2c720 100644 --- a/interface/web/dns/lib/lang/pl_dns_template.lng +++ b/interface/web/dns/lib/lang/pl_dns_template.lng @@ -1,6 +1,7 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_template_list.lng b/interface/web/dns/lib/lang/pl_dns_template_list.lng index 7deac3b2f..a95d2328b 100644 --- a/interface/web/dns/lib/lang/pl_dns_template_list.lng +++ b/interface/web/dns/lib/lang/pl_dns_template_list.lng @@ -1,6 +1,7 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_txt.lng b/interface/web/dns/lib/lang/pl_dns_txt.lng index 628d5c047..82fda7369 100644 --- a/interface/web/dns/lib/lang/pl_dns_txt.lng +++ b/interface/web/dns/lib/lang/pl_dns_txt.lng @@ -1,15 +1,16 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_wizard.lng b/interface/web/dns/lib/lang/pl_dns_wizard.lng index a5d6a9099..f9bf27645 100644 --- a/interface/web/dns/lib/lang/pl_dns_wizard.lng +++ b/interface/web/dns/lib/lang/pl_dns_wizard.lng @@ -1,29 +1,30 @@ - + + diff --git a/interface/web/domain/lib/lang/nl.lng b/interface/web/domain/lib/lang/nl.lng index d7d7dcf15..ecd41d774 100644 --- a/interface/web/domain/lib/lang/nl.lng +++ b/interface/web/domain/lib/lang/nl.lng @@ -1,9 +1,13 @@ -'; -?> +'; +?> + + + diff --git a/interface/web/domain/lib/lang/nl_domain.lng b/interface/web/domain/lib/lang/nl_domain.lng index a66a2258a..5c9585ac9 100644 --- a/interface/web/domain/lib/lang/nl_domain.lng +++ b/interface/web/domain/lib/lang/nl_domain.lng @@ -1,6 +1,9 @@ - + + + + diff --git a/interface/web/domain/lib/lang/nl_domain_list.lng b/interface/web/domain/lib/lang/nl_domain_list.lng index 331075936..650aa63c7 100644 --- a/interface/web/domain/lib/lang/nl_domain_list.lng +++ b/interface/web/domain/lib/lang/nl_domain_list.lng @@ -1,5 +1,7 @@ - + + + diff --git a/interface/web/domain/lib/lang/pl.lng b/interface/web/domain/lib/lang/pl.lng index d7d7dcf15..73bf675e1 100644 --- a/interface/web/domain/lib/lang/pl.lng +++ b/interface/web/domain/lib/lang/pl.lng @@ -1,9 +1,10 @@ -'; -?> +"; +?> + diff --git a/interface/web/domain/lib/lang/pl_domain.lng b/interface/web/domain/lib/lang/pl_domain.lng index a66a2258a..6f3723d64 100644 --- a/interface/web/domain/lib/lang/pl_domain.lng +++ b/interface/web/domain/lib/lang/pl_domain.lng @@ -1,6 +1,7 @@ - + + diff --git a/interface/web/domain/lib/lang/pl_domain_list.lng b/interface/web/domain/lib/lang/pl_domain_list.lng index 331075936..9e109e0c5 100644 --- a/interface/web/domain/lib/lang/pl_domain_list.lng +++ b/interface/web/domain/lib/lang/pl_domain_list.lng @@ -1,5 +1,6 @@ - + + diff --git a/interface/web/help/lib/lang/nl.lng b/interface/web/help/lib/lang/nl.lng index 170c3d6ad..6b3991df6 100644 --- a/interface/web/help/lib/lang/nl.lng +++ b/interface/web/help/lib/lang/nl.lng @@ -1,9 +1,13 @@ - + + + + diff --git a/interface/web/help/lib/lang/nl_support_message.lng b/interface/web/help/lib/lang/nl_support_message.lng index d2aed4cb6..59a0cc513 100644 --- a/interface/web/help/lib/lang/nl_support_message.lng +++ b/interface/web/help/lib/lang/nl_support_message.lng @@ -1,7 +1,10 @@ - + + + + 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 0d7b2cb74..3d1b6b7dd 100644 --- a/interface/web/help/lib/lang/nl_support_message_list.lng +++ b/interface/web/help/lib/lang/nl_support_message_list.lng @@ -1,6 +1,8 @@ - + + + diff --git a/interface/web/help/lib/lang/pl.lng b/interface/web/help/lib/lang/pl.lng index 51ca7ccc8..05fa55875 100644 --- a/interface/web/help/lib/lang/pl.lng +++ b/interface/web/help/lib/lang/pl.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/help/lib/lang/pl_support_message.lng b/interface/web/help/lib/lang/pl_support_message.lng index b21539af2..7007f4aa0 100644 --- a/interface/web/help/lib/lang/pl_support_message.lng +++ b/interface/web/help/lib/lang/pl_support_message.lng @@ -1,7 +1,8 @@ - + + diff --git a/interface/web/help/lib/lang/pl_support_message_list.lng b/interface/web/help/lib/lang/pl_support_message_list.lng index bc3285694..f347d9a7c 100644 --- a/interface/web/help/lib/lang/pl_support_message_list.lng +++ b/interface/web/help/lib/lang/pl_support_message_list.lng @@ -1,6 +1,7 @@ - + + diff --git a/interface/web/login/lib/lang/nl.lng b/interface/web/login/lib/lang/nl.lng index 46e1175c8..3e676a232 100644 --- a/interface/web/login/lib/lang/nl.lng +++ b/interface/web/login/lib/lang/nl.lng @@ -1,17 +1,24 @@ - + 64 karakters.'; + +$wb['username_txt'] = "Gebruikersnaam"; +$wb['password_txt'] = "Wachtwoord"; +$wb['login_button_txt'] = "Login"; + +?> + + diff --git a/interface/web/login/lib/lang/pl.lng b/interface/web/login/lib/lang/pl.lng index 52f31b61b..bbff64f32 100644 --- a/interface/web/login/lib/lang/pl.lng +++ b/interface/web/login/lib/lang/pl.lng @@ -1,17 +1,18 @@ - 64 znaki.'; -$wb['error_user_password_empty'] = 'Username or Password empty.'; -$wb['error_user_password_incorrect'] = 'Username or Password wrong.'; -$wb['error_user_blocked'] = 'User is blocked.'; -$wb['error_user_too_many_logins'] = 'To many wrong logins, Please retry it after 15 minutes'; -$wb['username_txt'] = 'Username'; -$wb['password_txt'] = 'Password'; -$wb['login_button_txt'] = 'Login'; -?> + 64 znaki."; +$wb['error_user_password_empty'] = "Pusta nazwa użytkownika lub hasło."; +$wb['error_user_password_incorrect'] = "Niepoprawna nazwa użytownika lub hasło."; +$wb['error_user_blocked'] = "Konto użytkownika zostało zablokowane."; +$wb['error_user_too_many_logins'] = "Zbyt dużo niepoprawnych logowań. Prosimy spróbować ponownie za 15 minut."; +$wb['username_txt'] = "Nazwa użytkownika"; +$wb['password_txt'] = "Hasło"; +$wb['login_button_txt'] = "Zaloguj"; +?> + diff --git a/interface/web/mail/lib/lang/de_mail_user.lng b/interface/web/mail/lib/lang/de_mail_user.lng index cfcac5e76..7308396ff 100644 --- a/interface/web/mail/lib/lang/de_mail_user.lng +++ b/interface/web/mail/lib/lang/de_mail_user.lng @@ -26,7 +26,7 @@ $wb['disableimap_txt'] = 'IMAP deaktivieren'; $wb['disablepop3_txt'] = 'POP3 deaktivieren'; $wb['password_strength_txt'] = 'Passwortkomplexität'; $wb['welcome_mail_fromname_txt'] = 'Support'; -$wb['welcome_mail_fromemail_txt'] = 'suppoert@localhost'; +$wb['welcome_mail_fromemail_txt'] = 'root@localhost'; $wb['duplicate_alias_or_forward_txt'] = 'Es existiert bereits ein Alias oder eine Weiterleitung mit dieser E-Mail Adresse.'; $wb['quota_error_value'] = 'Ungültige Quota Eingabe. Erlaubte Größen sind: 0 für unlimitiert oder Nummern > 1'; $wb['autoresponder_start_date_txt'] = 'Startet am'; diff --git a/interface/web/mail/lib/lang/nl.lng b/interface/web/mail/lib/lang/nl.lng index b903ae51c..3513a241c 100644 --- a/interface/web/mail/lib/lang/nl.lng +++ b/interface/web/mail/lib/lang/nl.lng @@ -1,47 +1,53 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_alias.lng b/interface/web/mail/lib/lang/nl_mail_alias.lng index 5ee32421d..a56cdb189 100644 --- a/interface/web/mail/lib/lang/nl_mail_alias.lng +++ b/interface/web/mail/lib/lang/nl_mail_alias.lng @@ -1,11 +1,13 @@ - + + + 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 28fe08fb0..844e7f150 100644 --- a/interface/web/mail/lib/lang/nl_mail_alias_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_alias_list.lng @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_aliasdomain.lng b/interface/web/mail/lib/lang/nl_mail_aliasdomain.lng index c6d8352dc..727a1367a 100644 --- a/interface/web/mail/lib/lang/nl_mail_aliasdomain.lng +++ b/interface/web/mail/lib/lang/nl_mail_aliasdomain.lng @@ -1,11 +1,13 @@ - + + + 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 860e583ae..e2538961d 100644 --- a/interface/web/mail/lib/lang/nl_mail_aliasdomain_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_aliasdomain_list.lng @@ -1,7 +1,10 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_blacklist.lng b/interface/web/mail/lib/lang/nl_mail_blacklist.lng index f3dd2f487..16dcb77c1 100644 --- a/interface/web/mail/lib/lang/nl_mail_blacklist.lng +++ b/interface/web/mail/lib/lang/nl_mail_blacklist.lng @@ -1,9 +1,11 @@ - + + + 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 a44f067d0..11e48b6ed 100644 --- a/interface/web/mail/lib/lang/nl_mail_blacklist_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_blacklist_list.lng @@ -1,10 +1,12 @@ - + + + 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 97f102ad7..067e48344 100644 --- a/interface/web/mail/lib/lang/nl_mail_content_filter.lng +++ b/interface/web/mail/lib/lang/nl_mail_content_filter.lng @@ -1,9 +1,11 @@ - + + + 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 bb92651dc..fd9489cc3 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 @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_domain.lng b/interface/web/mail/lib/lang/nl_mail_domain.lng index 5fbdeac27..cdc1f8ff9 100644 --- a/interface/web/mail/lib/lang/nl_mail_domain.lng +++ b/interface/web/mail/lib/lang/nl_mail_domain.lng @@ -1,13 +1,15 @@ - + + + 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 aaab4b433..57d1b748f 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 @@ -1,8 +1,10 @@ - + + + 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 d68f7d821..f4d79a912 100644 --- a/interface/web/mail/lib/lang/nl_mail_domain_catchall.lng +++ b/interface/web/mail/lib/lang/nl_mail_domain_catchall.lng @@ -1,9 +1,11 @@ - + + + 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 379f879aa..445135cf2 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 @@ -1,9 +1,11 @@ - + + + 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 0218e9c59..0a6711e59 100644 --- a/interface/web/mail/lib/lang/nl_mail_domain_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_domain_list.lng @@ -1,7 +1,9 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_forward.lng b/interface/web/mail/lib/lang/nl_mail_forward.lng index 180a13846..58348d863 100644 --- a/interface/web/mail/lib/lang/nl_mail_forward.lng +++ b/interface/web/mail/lib/lang/nl_mail_forward.lng @@ -1,7 +1,9 @@ - + + + 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 88cf50b91..fc24d8dac 100644 --- a/interface/web/mail/lib/lang/nl_mail_forward_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_forward_list.lng @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_get.lng b/interface/web/mail/lib/lang/nl_mail_get.lng index f5097afad..c3abb4e03 100644 --- a/interface/web/mail/lib/lang/nl_mail_get.lng +++ b/interface/web/mail/lib/lang/nl_mail_get.lng @@ -1,16 +1,18 @@ - + + + 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 e680ab12c..70df6ab76 100644 --- a/interface/web/mail/lib/lang/nl_mail_get_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_get_list.lng @@ -1,9 +1,11 @@ - + + + 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 68e0739e5..ca392fd64 100644 --- a/interface/web/mail/lib/lang/nl_mail_relay_recipient.lng +++ b/interface/web/mail/lib/lang/nl_mail_relay_recipient.lng @@ -1,9 +1,11 @@ - + + + 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 57e832354..3d0f032ee 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 @@ -1,9 +1,11 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_spamfilter.lng b/interface/web/mail/lib/lang/nl_mail_spamfilter.lng index 707c6f7d3..cb47e7e09 100644 --- a/interface/web/mail/lib/lang/nl_mail_spamfilter.lng +++ b/interface/web/mail/lib/lang/nl_mail_spamfilter.lng @@ -1,17 +1,19 @@ - + + + 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 556cb5da2..acd0db21f 100644 --- a/interface/web/mail/lib/lang/nl_mail_spamfilter_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_spamfilter_list.lng @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_transport.lng b/interface/web/mail/lib/lang/nl_mail_transport.lng index 447fde847..36dfaedb9 100644 --- a/interface/web/mail/lib/lang/nl_mail_transport.lng +++ b/interface/web/mail/lib/lang/nl_mail_transport.lng @@ -1,10 +1,12 @@ - + + + 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 99f3d4175..201bf6314 100644 --- a/interface/web/mail/lib/lang/nl_mail_transport_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_transport_list.lng @@ -1,9 +1,11 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_user.lng b/interface/web/mail/lib/lang/nl_mail_user.lng index bb1349267..6f4ae7b89 100644 --- a/interface/web/mail/lib/lang/nl_mail_user.lng +++ b/interface/web/mail/lib/lang/nl_mail_user.lng @@ -1,42 +1,45 @@ -1)'; -$wb['autoresponder_start_date_txt'] = 'Begin'; -$wb['autoresponder_start_date_isfuture'] = 'Begin-datum kan niet in het verleden liggen.'; -$wb['autoresponder_end_date_txt'] = 'Einde'; -$wb['autoresponder_end_date_isgreater'] = 'Eind-datum mag niet eerder zijn dan de begin-datum.'; -$wb['move_junk_txt'] = 'Verplaats SPAM naar map Ongewenste e-mail'; -$wb['name_txt'] = 'Realname'; -$wb['name_optional_txt'] = '(Optional)'; -$wb['autoresponder_active'] = 'Enable the autoresponder'; -$wb['cc_txt'] = 'Send copy to'; -$wb['cc_error_isemail'] = 'The Send copy to field does not conatin a valid email address'; -?> + 1'; +$wb["move_junk_txt"] = 'Verplaats Spam e-mails naar junk directory'; +$wb["name_txt"] = 'Echte naam'; +$wb["name_optional_txt"] = '(Optioneel)'; +$wb['autoresponder_active'] = 'Inschakelen autoresponder'; +$wb['cc_txt'] = 'Stuur kopie naar'; +$wb['cc_error_isemail'] = 'Het "Stuur kopie naar" veld bevat geen geldig e-mailadres'; +?> + + + 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 1a89f9009..7dea60dea 100644 --- a/interface/web/mail/lib/lang/nl_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/nl_mail_user_filter.lng @@ -1,10 +1,13 @@ - + + + + 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 fc0af5b2f..8c09b729e 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 @@ -1,7 +1,9 @@ - + + + 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 efd76bf79..16d9e94ac 100644 --- a/interface/web/mail/lib/lang/nl_mail_user_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_user_list.lng @@ -1,7 +1,9 @@ - + + + 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 7d9406b49..ca2773a5c 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 @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_whitelist.lng b/interface/web/mail/lib/lang/nl_mail_whitelist.lng index 8bdc7a744..8afc3226d 100644 --- a/interface/web/mail/lib/lang/nl_mail_whitelist.lng +++ b/interface/web/mail/lib/lang/nl_mail_whitelist.lng @@ -1,9 +1,11 @@ - + + + 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 e9ed520fb..d7987e3d4 100644 --- a/interface/web/mail/lib/lang/nl_mail_whitelist_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_whitelist_list.lng @@ -1,10 +1,12 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/nl_spamfilter_blacklist.lng index 7c3d30c94..1fa0d2788 100644 --- a/interface/web/mail/lib/lang/nl_spamfilter_blacklist.lng +++ b/interface/web/mail/lib/lang/nl_spamfilter_blacklist.lng @@ -1,9 +1,11 @@ - + + + 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 adf40b954..9a2698d3b 100644 --- a/interface/web/mail/lib/lang/nl_spamfilter_blacklist_list.lng +++ b/interface/web/mail/lib/lang/nl_spamfilter_blacklist_list.lng @@ -1,9 +1,11 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_spamfilter_config.lng b/interface/web/mail/lib/lang/nl_spamfilter_config.lng index 7e487c94b..7ab6bc16c 100644 --- a/interface/web/mail/lib/lang/nl_spamfilter_config.lng +++ b/interface/web/mail/lib/lang/nl_spamfilter_config.lng @@ -1,20 +1,22 @@ - + + + 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 cbae14cde..18e8e4d63 100644 --- a/interface/web/mail/lib/lang/nl_spamfilter_config_list.lng +++ b/interface/web/mail/lib/lang/nl_spamfilter_config_list.lng @@ -1,5 +1,7 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_spamfilter_policy.lng b/interface/web/mail/lib/lang/nl_spamfilter_policy.lng index d2ea79df2..ece037e6e 100644 --- a/interface/web/mail/lib/lang/nl_spamfilter_policy.lng +++ b/interface/web/mail/lib/lang/nl_spamfilter_policy.lng @@ -1,38 +1,41 @@ - + + + + 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 139e395f8..e3bce031d 100644 --- a/interface/web/mail/lib/lang/nl_spamfilter_policy_list.lng +++ b/interface/web/mail/lib/lang/nl_spamfilter_policy_list.lng @@ -1,9 +1,11 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_spamfilter_users.lng b/interface/web/mail/lib/lang/nl_spamfilter_users.lng index acf65d6ab..686781b88 100644 --- a/interface/web/mail/lib/lang/nl_spamfilter_users.lng +++ b/interface/web/mail/lib/lang/nl_spamfilter_users.lng @@ -1,8 +1,10 @@ - + + + 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 51f63097e..3ecbf6177 100644 --- a/interface/web/mail/lib/lang/nl_spamfilter_users_list.lng +++ b/interface/web/mail/lib/lang/nl_spamfilter_users_list.lng @@ -1,10 +1,12 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/nl_spamfilter_whitelist.lng index 7c3d30c94..321db82f7 100644 --- a/interface/web/mail/lib/lang/nl_spamfilter_whitelist.lng +++ b/interface/web/mail/lib/lang/nl_spamfilter_whitelist.lng @@ -1,9 +1,11 @@ - + + + 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 aa4fe00b3..e414c7f0d 100644 --- a/interface/web/mail/lib/lang/nl_spamfilter_whitelist_list.lng +++ b/interface/web/mail/lib/lang/nl_spamfilter_whitelist_list.lng @@ -1,9 +1,11 @@ - + + + diff --git a/interface/web/mail/lib/lang/pl.lng b/interface/web/mail/lib/lang/pl.lng index 2e9f8d975..507354708 100644 --- a/interface/web/mail/lib/lang/pl.lng +++ b/interface/web/mail/lib/lang/pl.lng @@ -1,47 +1,48 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_alias.lng b/interface/web/mail/lib/lang/pl_mail_alias.lng index 8556be818..a937620fb 100644 --- a/interface/web/mail/lib/lang/pl_mail_alias.lng +++ b/interface/web/mail/lib/lang/pl_mail_alias.lng @@ -1,11 +1,12 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_alias_list.lng b/interface/web/mail/lib/lang/pl_mail_alias_list.lng index b6ce95d0c..26622bc10 100644 --- a/interface/web/mail/lib/lang/pl_mail_alias_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_alias_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_aliasdomain.lng b/interface/web/mail/lib/lang/pl_mail_aliasdomain.lng index 5815d1e60..ca1a605a5 100644 --- a/interface/web/mail/lib/lang/pl_mail_aliasdomain.lng +++ b/interface/web/mail/lib/lang/pl_mail_aliasdomain.lng @@ -1,11 +1,12 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng index d96a63e2a..2f400019f 100644 --- a/interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng @@ -1,7 +1,8 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_blacklist.lng b/interface/web/mail/lib/lang/pl_mail_blacklist.lng index 528f2f741..2fccce9cd 100644 --- a/interface/web/mail/lib/lang/pl_mail_blacklist.lng +++ b/interface/web/mail/lib/lang/pl_mail_blacklist.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng b/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng index ebef66657..bc0556c05 100644 --- a/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng @@ -1,10 +1,11 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_content_filter.lng b/interface/web/mail/lib/lang/pl_mail_content_filter.lng index 54efa4fed..b93d11466 100644 --- a/interface/web/mail/lib/lang/pl_mail_content_filter.lng +++ b/interface/web/mail/lib/lang/pl_mail_content_filter.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_content_filter_list.lng b/interface/web/mail/lib/lang/pl_mail_content_filter_list.lng index 6b0dd9bb8..732fe9a4d 100644 --- a/interface/web/mail/lib/lang/pl_mail_content_filter_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_content_filter_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_domain.lng b/interface/web/mail/lib/lang/pl_mail_domain.lng index 6f9c68cdc..4111148bb 100644 --- a/interface/web/mail/lib/lang/pl_mail_domain.lng +++ b/interface/web/mail/lib/lang/pl_mail_domain.lng @@ -1,13 +1,14 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng index aaab4b433..765c2be41 100644 --- a/interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng b/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng index c77cc73ba..22c7edf8b 100644 --- a/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng +++ b/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng index 1f0aad197..8494e20e6 100644 --- a/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_domain_list.lng b/interface/web/mail/lib/lang/pl_mail_domain_list.lng index ec51e2cdb..77cffc3a7 100644 --- a/interface/web/mail/lib/lang/pl_mail_domain_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_domain_list.lng @@ -1,7 +1,8 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_forward.lng b/interface/web/mail/lib/lang/pl_mail_forward.lng index 4e100d615..f1ec993d2 100644 --- a/interface/web/mail/lib/lang/pl_mail_forward.lng +++ b/interface/web/mail/lib/lang/pl_mail_forward.lng @@ -1,7 +1,8 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_forward_list.lng b/interface/web/mail/lib/lang/pl_mail_forward_list.lng index 1044bd512..3a8b35f60 100644 --- a/interface/web/mail/lib/lang/pl_mail_forward_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_forward_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_get.lng b/interface/web/mail/lib/lang/pl_mail_get.lng index 66fe5a1f8..ff4685f1b 100644 --- a/interface/web/mail/lib/lang/pl_mail_get.lng +++ b/interface/web/mail/lib/lang/pl_mail_get.lng @@ -1,16 +1,17 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_get_list.lng b/interface/web/mail/lib/lang/pl_mail_get_list.lng index cd473d9de..a5c6988ca 100644 --- a/interface/web/mail/lib/lang/pl_mail_get_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_get_list.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_relay_recipient.lng b/interface/web/mail/lib/lang/pl_mail_relay_recipient.lng index b5c8724da..4fab544c1 100644 --- a/interface/web/mail/lib/lang/pl_mail_relay_recipient.lng +++ b/interface/web/mail/lib/lang/pl_mail_relay_recipient.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng index 36045f4e3..1f4352312 100644 --- a/interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_spamfilter.lng b/interface/web/mail/lib/lang/pl_mail_spamfilter.lng index 3879f2424..6792767f1 100644 --- a/interface/web/mail/lib/lang/pl_mail_spamfilter.lng +++ b/interface/web/mail/lib/lang/pl_mail_spamfilter.lng @@ -1,17 +1,18 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng index d6097bb33..dac6ec41d 100644 --- a/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_transport.lng b/interface/web/mail/lib/lang/pl_mail_transport.lng index 035a5b049..613665483 100644 --- a/interface/web/mail/lib/lang/pl_mail_transport.lng +++ b/interface/web/mail/lib/lang/pl_mail_transport.lng @@ -1,10 +1,11 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_transport_list.lng b/interface/web/mail/lib/lang/pl_mail_transport_list.lng index fa5c58431..94500581f 100644 --- a/interface/web/mail/lib/lang/pl_mail_transport_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_transport_list.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_user.lng b/interface/web/mail/lib/lang/pl_mail_user.lng index d317f2403..5d6b8edf3 100644 --- a/interface/web/mail/lib/lang/pl_mail_user.lng +++ b/interface/web/mail/lib/lang/pl_mail_user.lng @@ -1,42 +1,43 @@ - 1'; -$wb['autoresponder_start_date_txt'] = 'Start on'; -$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.'; -$wb['autoresponder_end_date_txt'] = 'End by'; -$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.'; -$wb['move_junk_txt'] = 'Move Spam Emails to Junk directory'; -$wb['name_txt'] = 'Realname'; -$wb['name_optional_txt'] = '(Optional)'; -$wb['autoresponder_active'] = 'Enable the autoresponder'; -$wb['cc_txt'] = 'Send copy to'; -$wb['cc_error_isemail'] = 'The Send copy to field does not conatin a valid email address'; -?> + 1"; +$wb['autoresponder_start_date_txt'] = "Uruchom od"; +$wb['autoresponder_start_date_isfuture'] = "Data uruchomienia nie może być w przeszłości."; +$wb['autoresponder_end_date_txt'] = "Zakończ do"; +$wb['autoresponder_end_date_isgreater'] = "Data zakończenia musi być późniejsza od daty rozpoczęcia"; +$wb['move_junk_txt'] = "Przenoś SPAM do folderu Junk"; +$wb['name_txt'] = "Nazwa rzeczywista"; +$wb['name_optional_txt'] = "(Opcjonalnie)"; +$wb['autoresponder_active'] = "Uruchom autorespondera"; +$wb['cc_txt'] = "Wyślij kopię do"; +$wb['cc_error_isemail'] = "Pole wysyłania kopii nie zawiera poprawnego adresu e-mail"; +?> + diff --git a/interface/web/mail/lib/lang/pl_mail_user_filter.lng b/interface/web/mail/lib/lang/pl_mail_user_filter.lng index 129fdae9d..a3a451024 100644 --- a/interface/web/mail/lib/lang/pl_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/pl_mail_user_filter.lng @@ -1,10 +1,11 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_user_filter_list.lng b/interface/web/mail/lib/lang/pl_mail_user_filter_list.lng index cea7c44db..1ea1e977b 100644 --- a/interface/web/mail/lib/lang/pl_mail_user_filter_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_user_filter_list.lng @@ -1,7 +1,8 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_user_list.lng b/interface/web/mail/lib/lang/pl_mail_user_list.lng index 287f520f6..758d3311b 100644 --- a/interface/web/mail/lib/lang/pl_mail_user_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_user_list.lng @@ -1,7 +1,8 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng b/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng index b9780687d..062107a88 100644 --- a/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_whitelist.lng b/interface/web/mail/lib/lang/pl_mail_whitelist.lng index 203c5bae7..de43dd7d1 100644 --- a/interface/web/mail/lib/lang/pl_mail_whitelist.lng +++ b/interface/web/mail/lib/lang/pl_mail_whitelist.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng b/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng index 10e6dfcf0..5eb94a23b 100644 --- a/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng @@ -1,10 +1,11 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng index 6da8ddc9d..a46788c7c 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng index c237a7a77..f9e14eb02 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_spamfilter_config.lng b/interface/web/mail/lib/lang/pl_spamfilter_config.lng index c750d9593..6370c15e2 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_config.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_config.lng @@ -1,20 +1,21 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng index 45b3f315c..e7df02fd3 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng @@ -1,5 +1,6 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_spamfilter_policy.lng b/interface/web/mail/lib/lang/pl_spamfilter_policy.lng index 0e4df55a3..5fcd414cb 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_policy.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_policy.lng @@ -1,38 +1,39 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng index 43d9d414d..f1c335c96 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_spamfilter_users.lng b/interface/web/mail/lib/lang/pl_spamfilter_users.lng index 573f9bec0..8eb0463f1 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_users.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_users.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng index dde2a62c6..4909170c6 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng @@ -1,10 +1,11 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng index be836015d..228345134 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng index 6517cf41a..2b109f646 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/mail/mail_domain_edit.php b/interface/web/mail/mail_domain_edit.php index 6df171e2c..f44348bcf 100644 --- a/interface/web/mail/mail_domain_edit.php +++ b/interface/web/mail/mail_domain_edit.php @@ -75,7 +75,7 @@ class page_action extends tform_actions { $sql = "SELECT groupid, name FROM sys_group WHERE client_id > 0 ORDER BY name"; } else { $client_group_id = $_SESSION["s"]["user"]["default_group"]; - $sql = "SELECT client.client_id, limit_web_domain, default_webserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"; + $sql = "SELECT client.client_id, limit_web_domain, default_mailserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"; } $clients = $app->db->queryAllRecords($sql); $client_select = ''; @@ -93,11 +93,11 @@ class page_action extends tform_actions { // Get the limits of the client $client_group_id = $_SESSION["s"]["user"]["default_group"]; - $client = $app->db->queryOneRecord("SELECT client.client_id, contact_name FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id order by contact_name"); + $client = $app->db->queryOneRecord("SELECT client.client_id, contact_name, default_mailserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id order by contact_name"); - // Set the webserver to the default server of the client - $tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = $client[default_webserver]"); - $app->tpl->setVar("server_id",""); + // Set the mailserver to the default server of the client + $tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = $client[default_mailserver]"); + $app->tpl->setVar("server_id",""); unset($tmp); // Fill the client select field diff --git a/interface/web/monitor/lib/lang/nl.lng b/interface/web/monitor/lib/lang/nl.lng index abd6a19d6..87938f750 100644 --- a/interface/web/monitor/lib/lang/nl.lng +++ b/interface/web/monitor/lib/lang/nl.lng @@ -1,145 +1,148 @@ -We cant find any of them at your server.

This means we can not support your RAID yet.'; -$wb['monitor_serverstate_beancounterok_txt'] = 'The beancounter is ok'; -$wb['monitor_serverstate_beancounterinfo_txt'] = 'There are vew failure in the beancounter'; -$wb['monitor_serverstate_beancounterwarning_txt'] = 'There are some failure in the beancounter'; -$wb['monitor_serverstate_beancountercritical_txt'] = 'There are many failure in the beancounter'; -$wb['monitor_serverstate_beancountererror_txt'] = 'There are too much failure in the beancounter'; -$wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; -$wb['monitor_beancounter_nosupport_txt'] = 'This server is not a OpenVz VE and has no beancounter information'; -?> +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_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'; +$wb['monitor_serverstate_beancountererror_txt'] = 'In de beancounter bevinden zich te veel foutmeldingen'; +$wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; +$wb['monitor_beancounter_nosupport_txt'] = 'Deze server is geen OpenVz VE en heeft daarom geen beancounter informatie'; +?> + + + diff --git a/interface/web/monitor/lib/lang/nl_syslog_list.lng b/interface/web/monitor/lib/lang/nl_syslog_list.lng index 90a685f68..5b271ed4a 100644 --- a/interface/web/monitor/lib/lang/nl_syslog_list.lng +++ b/interface/web/monitor/lib/lang/nl_syslog_list.lng @@ -1,7 +1,9 @@ - + + + diff --git a/interface/web/monitor/lib/lang/pl.lng b/interface/web/monitor/lib/lang/pl.lng index 44af71bd1..f65bba831 100644 --- a/interface/web/monitor/lib/lang/pl.lng +++ b/interface/web/monitor/lib/lang/pl.lng @@ -1,145 +1,146 @@ -We cant find any of them at your server.

This means we can not support your RAID yet.'; -$wb['monitor_serverstate_beancounterok_txt'] = 'The beancounter is ok'; -$wb['monitor_serverstate_beancounterinfo_txt'] = 'There are vew failure in the beancounter'; -$wb['monitor_serverstate_beancounterwarning_txt'] = 'There are some failure in the beancounter'; -$wb['monitor_serverstate_beancountercritical_txt'] = 'There are many failure in the beancounter'; -$wb['monitor_serverstate_beancountererror_txt'] = 'There are too much failure in the beancounter'; -$wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; -$wb['monitor_beancounter_nosupport_txt'] = 'This server is not a OpenVz VE and has no beancounter information'; -?> +Nie możemy znaleźć żadnego z nich na serwerze.

Oznacza to, że nie możemy wyświetlić informacji o konfiguracji RAID."; +$wb['monitor_serverstate_beancounterok_txt'] = "Beancounter jest w porządku"; +$wb['monitor_serverstate_beancounterinfo_txt'] = "Jest kilka problemów w beancounterze"; +$wb['monitor_serverstate_beancounterwarning_txt'] = "Są jakieś problemy w beancounterze"; +$wb['monitor_serverstate_beancountercritical_txt'] = "Jest wiele problemów w beancounterze"; +$wb['monitor_serverstate_beancountererror_txt'] = "Jest za dużo problemów w beancounterze"; +$wb['monitor_title_beancounter_txt'] = "OpenVz VE BeanCounter"; +$wb['monitor_beancounter_nosupport_txt'] = "Ten serwer nie jest serwerem OpenVz VE i nie posiada informacji o beancounterach"; +?> + diff --git a/interface/web/monitor/lib/lang/pl_datalog_list.lng b/interface/web/monitor/lib/lang/pl_datalog_list.lng index 398ca51ed..b3f1d6865 100644 --- a/interface/web/monitor/lib/lang/pl_datalog_list.lng +++ b/interface/web/monitor/lib/lang/pl_datalog_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/monitor/lib/lang/pl_syslog_list.lng b/interface/web/monitor/lib/lang/pl_syslog_list.lng index 125494bf8..071ee3abe 100644 --- a/interface/web/monitor/lib/lang/pl_syslog_list.lng +++ b/interface/web/monitor/lib/lang/pl_syslog_list.lng @@ -1,7 +1,8 @@ - + + diff --git a/interface/web/sites/database_edit.php b/interface/web/sites/database_edit.php index 58fd92477..baedd9816 100644 --- a/interface/web/sites/database_edit.php +++ b/interface/web/sites/database_edit.php @@ -261,7 +261,18 @@ class page_action extends tform_actions { if(strlen($dbname_prefix . $this->dataRecord['database_name']) > 64) $app->tform->errorMessage .= str_replace('{db}',$dbname_prefix . $this->dataRecord['database_name'],$app->tform->wordbook["database_name_error_len"]).'
'; if(strlen($dbuser_prefix . $this->dataRecord['database_user']) > 16) $app->tform->errorMessage .= str_replace('{user}',$dbuser_prefix . $this->dataRecord['database_user'],$app->tform->wordbook["database_user_error_len"]).'
'; - + + //* Check database name and user against blacklist + $dbname_blacklist = array($conf['db_database'],'mysql'); + if(in_array($dbname_prefix . $this->dataRecord['database_name'],$dbname_blacklist)) { + $app->tform->errorMessage .= $app->lng('Database name not allowed.').'
'; + } + + $dbuser_blacklist = array($conf['db_user'],'mysql','root'); + if(in_array($dbname_prefix . $this->dataRecord['database_user'],$dbname_blacklist)) { + $app->tform->errorMessage .= $app->lng('Database user not allowed.').'
'; + } + if ($app->tform->errorMessage == ''){ /* restrict the names if there is no error */ /* crop user and db names if they are too long -> mysql: user: 16 chars / db: 64 chars */ @@ -287,7 +298,17 @@ class page_action extends tform_actions { if(strlen($dbname_prefix . $this->dataRecord['database_name']) > 64) $app->tform->errorMessage .= str_replace('{db}',$dbname_prefix . $this->dataRecord['database_name'],$app->tform->wordbook["database_name_error_len"]).'
'; if(strlen($dbuser_prefix . $this->dataRecord['database_user']) > 16) $app->tform->errorMessage .= str_replace('{user}',$dbuser_prefix . $this->dataRecord['database_user'],$app->tform->wordbook["database_user_error_len"]).'
'; - + + //* Check database name and user against blacklist + $dbname_blacklist = array($conf['db_database'],'mysql'); + if(in_array($dbname_prefix . $this->dataRecord['database_name'],$dbname_blacklist)) { + $app->tform->errorMessage .= $app->lng('Database name not allowed.').'
'; + } + + $dbuser_blacklist = array($conf['db_user'],'mysql','root'); + if(in_array($dbname_prefix . $this->dataRecord['database_user'],$dbname_blacklist)) { + $app->tform->errorMessage .= $app->lng('Database user not allowed.').'
'; + } /* restrict the names */ /* crop user and db names if they are too long -> mysql: user: 16 chars / db: 64 chars */ diff --git a/interface/web/sites/lib/lang/nl.lng b/interface/web/sites/lib/lang/nl.lng index 54fd28a6c..658119598 100644 --- a/interface/web/sites/lib/lang/nl.lng +++ b/interface/web/sites/lib/lang/nl.lng @@ -1,24 +1,26 @@ - + + + diff --git a/interface/web/sites/lib/lang/nl_cron.lng b/interface/web/sites/lib/lang/nl_cron.lng index f85eca227..d77aed4e2 100644 --- a/interface/web/sites/lib/lang/nl_cron.lng +++ b/interface/web/sites/lib/lang/nl_cron.lng @@ -1,21 +1,23 @@ -(Shell-commando -> sh, URL -> wget)'; -$wb['limit_cron_txt'] = 'Het max. aantal toegestane Cron taken is bereikt.'; -$wb['limit_cron_frequency_txt'] = 'De cronjob frequentie overschrijdt de toegestaande limiet.'; -$wb['run_min_error_format'] = 'Ongeldige indeling voor minuten.'; -$wb['run_hour_error_format'] = 'Ongeldige indeling voor uren.'; -$wb['run_mday_error_format'] = 'Ongeldige indeling voor dagen van maand.'; -$wb['run_month_error_format'] = 'Ongeldige indeling maand.'; -$wb['run_wday_error_format'] = 'Ongeldige indeling voor dagen van week.'; -$wb['command_error_format'] = 'Ongeldige commando indeling. In geval van een URL, alleen http/https wordt ondersteund.'; -$wb['unknown_fieldtype_error'] = 'Een onbekend veld-type wordt gebruikt.'; -?> + + + diff --git a/interface/web/sites/lib/lang/nl_cron_list.lng b/interface/web/sites/lib/lang/nl_cron_list.lng index 1785ec191..e1eaa3073 100644 --- a/interface/web/sites/lib/lang/nl_cron_list.lng +++ b/interface/web/sites/lib/lang/nl_cron_list.lng @@ -1,12 +1,14 @@ - + + + diff --git a/interface/web/sites/lib/lang/nl_database.lng b/interface/web/sites/lib/lang/nl_database.lng index d4dfbf69e..72ff077ef 100644 --- a/interface/web/sites/lib/lang/nl_database.lng +++ b/interface/web/sites/lib/lang/nl_database.lng @@ -1,25 +1,28 @@ -(Komma-gescheiden, lege waarden = iedereen accepteren)'; -$wb['database_remote_error_ips'] = 'Tenminste 1 IP-adres is ongeldig.'; -$wb['database_name_error_len'] = 'Databasenaam - {db} - is te lang. De maximale lengte is 64 tekens.'; -$wb['database_user_error_len'] = 'Database gebruikersnaam - {user} - is te lang. De maximale lengte inclusief prefix is 16 tekens.'; -?> +elk IP-adres)'; +$wb["database_remote_error_ips"] = 'Ten minste één van de ingevulde IP-adressen is ongeldig.'; +$wb["client_txt"] = 'Klant'; +$wb["active_txt"] = 'Actief'; +$wb["database_name_error_empty"] = 'Databasenaam is niet ingvuld.'; +$wb["database_name_error_unique"] = 'Er is al een database met deze naam op de server. Om een unieke naam te verkrijgen, kunt u bijv. uw domeinnaam in de databasenaam opnemen.'; +$wb["database_name_error_regex"] = 'Ongeldige databasenaame. De databasenaam mag deze karakters bevatten: a-z, A-Z, 0-9 en de underscore. Lengte: 2 - 64 karakters.'; +$wb["database_user_error_empty"] = 'Database gebruiker is niet ingvuld.'; +$wb["database_user_error_unique"] = 'Er is al een database gebruiker met deze naam op de server. Om een unieke naam te verkrijgen, kunt u bijv. uw domeinnaam in de gebruikersnaam opnemen.'; +$wb["database_user_error_regex"] = 'Ongeldige database gebruikersnaam. De gebruikersnaam mag deze karakters bevatten: a-z, A-Z, 0-9 en de underscore. Lengte: 2 - 64 karakters.'; +$wb["limit_database_txt"] = 'Het max. aantal databases is bereikt.'; +$wb["database_name_change_txt"] = 'De databasenaam kan niet worden gewijzigd'; +$wb["database_charset_change_txt"] = 'De database karakterset kan niet worden gewijzigd'; +$wb["database_name_error_len"] = 'Databasenaam - {db} - is te lang. De max. lengte van de databasenaam incl. voorvoegsel is 64 karakters.'; +$wb["database_user_error_len"] = 'Databasenaam - {user}- is te lang. De max. lengte van de database gebruikersnaam incl. voorvoegsel is 16 karakters.'; +?> + + + 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 3f05f65e6..88dd5b97d 100644 --- a/interface/web/sites/lib/lang/nl_database_admin_list.lng +++ b/interface/web/sites/lib/lang/nl_database_admin_list.lng @@ -1,10 +1,12 @@ - + + + diff --git a/interface/web/sites/lib/lang/nl_database_list.lng b/interface/web/sites/lib/lang/nl_database_list.lng index 6d9862ce9..0f1857ed0 100644 --- a/interface/web/sites/lib/lang/nl_database_list.lng +++ b/interface/web/sites/lib/lang/nl_database_list.lng @@ -1,9 +1,11 @@ - + + + diff --git a/interface/web/sites/lib/lang/nl_ftp_user.lng b/interface/web/sites/lib/lang/nl_ftp_user.lng index ebf411d45..1c453f9f7 100644 --- a/interface/web/sites/lib/lang/nl_ftp_user.lng +++ b/interface/web/sites/lib/lang/nl_ftp_user.lng @@ -1,27 +1,31 @@ - + + + + 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 449092fca..ebe1dfc82 100644 --- a/interface/web/sites/lib/lang/nl_ftp_user_list.lng +++ b/interface/web/sites/lib/lang/nl_ftp_user_list.lng @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/sites/lib/lang/nl_shell_user.lng b/interface/web/sites/lib/lang/nl_shell_user.lng index c76ea35d8..7207352b7 100644 --- a/interface/web/sites/lib/lang/nl_shell_user.lng +++ b/interface/web/sites/lib/lang/nl_shell_user.lng @@ -1,22 +1,26 @@ - + + + + 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 33568635f..7976881c7 100644 --- a/interface/web/sites/lib/lang/nl_shell_user_list.lng +++ b/interface/web/sites/lib/lang/nl_shell_user_list.lng @@ -1,8 +1,10 @@ - + + + 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 716760b17..e78d83108 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 @@ -1,8 +1,10 @@ - + + + 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 a698fad62..ace808bf0 100644 --- a/interface/web/sites/lib/lang/nl_web_aliasdomain_list.lng +++ b/interface/web/sites/lib/lang/nl_web_aliasdomain_list.lng @@ -1,11 +1,13 @@ - + + + diff --git a/interface/web/sites/lib/lang/nl_web_domain.lng b/interface/web/sites/lib/lang/nl_web_domain.lng index 87c013845..c9457a119 100644 --- a/interface/web/sites/lib/lang/nl_web_domain.lng +++ b/interface/web/sites/lib/lang/nl_web_domain.lng @@ -1,67 +1,69 @@ -zie codes)'; -$wb['ssl_request_txt'] = 'SSL verzoek'; -$wb['ssl_cert_txt'] = 'SSL certificaat'; -$wb['ssl_bundle_txt'] = 'SSL bundel'; -$wb['ssl_action_txt'] = 'SSL actie'; -$wb['server_id_txt'] = 'Server'; -$wb['domain_txt'] = 'Domeinnaam'; -$wb['type_txt'] = 'Type'; -$wb['parent_domain_id_txt'] = 'Koppelen aan website'; -$wb['redirect_type_txt'] = 'Redirect type'; -$wb['redirect_path_txt'] = 'Redirect pad'; -$wb['active_txt'] = 'Actief?'; -$wb['document_root_txt'] = 'Documentroot'; -$wb['system_user_txt'] = 'Linux gebruiker'; -$wb['system_group_txt'] = 'Linux groep'; -$wb['ip_address_txt'] = 'IP-adres'; -$wb['vhost_type_txt'] = 'VHost type'; -$wb['hd_quota_txt'] = 'Schijfruimte limiet'; -$wb['traffic_quota_txt'] = 'Dataverkeer limiet'; -$wb['cgi_txt'] = 'CGI scripts'; -$wb['ssi_txt'] = 'SSI (CGI)'; -$wb['ssl_txt'] = 'SSL'; -$wb['suexec_txt'] = 'SuEXEC'; -$wb['php_txt'] = 'PHP5 module'; -$wb['client_txt'] = 'Klant'; -$wb['limit_web_domain_txt'] = 'Het max. aantal web domeinen voor uw account is bereikt.'; -$wb['limit_web_aliasdomain_txt'] = 'Het max. aantal domeinaliassen voor uw account is bereikt.'; -$wb['limit_web_subdomain_txt'] = 'Het max. aantal web subdomeinen voor uw account is bereikt.'; -$wb['apache_directives_txt'] = 'Apache richtlijnen'; -$wb['domain_error_empty'] = 'Domeinnaam is leeg.'; -$wb['domain_error_unique'] = 'Domein moet uniek zijn.'; -$wb['domain_error_regex'] = 'Domeinnaam is ongeldig.'; -$wb['hd_quota_error_empty'] = 'Schijfruimte limiet is leeg.'; -$wb['traffic_quota_error_empty'] = 'Dataverkeer limiet is leeg.'; -$wb['errordocs_txt'] = 'Eigen fout-paginas'; -$wb['error_ssl_state_empty'] = 'SSL: provincie is leeg.'; -$wb['error_ssl_locality_empty'] = 'SSL: plaats is leeg.'; -$wb['error_ssl_organisation_empty'] = 'SSL: organisatie is leeg.'; -$wb['error_ssl_organisation_unit_empty'] = 'SSL: organsatie afdeling is leeg.'; -$wb['error_ssl_country_empty'] = 'SSL: Land is leeg.'; -$wb['subdomain_txt'] = 'Automatische subdomeinen'; -$wb['client_group_id_txt'] = 'Klant'; -$wb['stats_password_txt'] = 'Website statistieken wachtwoord'; -$wb['ssl_domain_txt'] = 'SSL Domein'; -$wb['allow_override_txt'] = 'Optie: Allow Override'; -$wb['limit_web_quota_free_txt'] = 'Maximale beschikbare schijfruimte-gebruik'; -$wb['ssl_state_error_regex'] = 'Ongeldige SSL Provincie. Geldige tekens zijn: a-z, 0-9 en .,-_'; -$wb['ssl_locality_error_regex'] = 'Ongeldige SSL Plaats. Geldige tekens zijn: a-z, 0-9 en .,-_'; -$wb['ssl_organisation_error_regex'] = 'Ongeldige SSL Organisatie. Geldige tekens zijn: a-z, 0-9 en .,-_'; -$wb['ssl_organistaion_unit_error_regex'] = 'Ongeldige SSL Organisatie afdeling. Geldige tekens zijn: a-z, 0-9 en .,-_'; -$wb['ssl_country_error_regex'] = 'Ongeldige SSL Landcode. Geldige tekens zijn: A-Z'; -$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota'; -$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/'; -$wb['php_open_basedir_txt'] = 'PHP open_basedir'; -$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded'; -$wb['backup_interval_txt'] = 'Backup interval'; -$wb['backup_copies_txt'] = 'Number of backup copies'; -$wb['ruby_txt'] = 'Ruby'; -$wb['stats_user_txt'] = 'Webstatistics username'; -$wb['stats_type_txt'] = 'Webstatistics program'; -$wb['custom_php_ini_txt'] = 'Custom php.ini settings'; -?> + + + 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 b460e2710..778fe890b 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 @@ -1,9 +1,11 @@ - + + + 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 1158d6dd2..dd3066ef3 100644 --- a/interface/web/sites/lib/lang/nl_web_domain_list.lng +++ b/interface/web/sites/lib/lang/nl_web_domain_list.lng @@ -1,8 +1,10 @@ - + + + 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 67ce6f4bf..3d4dd67a1 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 @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/sites/lib/lang/nl_web_subdomain.lng b/interface/web/sites/lib/lang/nl_web_subdomain.lng index 58f5be41f..fac758a21 100644 --- a/interface/web/sites/lib/lang/nl_web_subdomain.lng +++ b/interface/web/sites/lib/lang/nl_web_subdomain.lng @@ -1,40 +1,42 @@ - + + + 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 db8db0946..c86d54162 100644 --- a/interface/web/sites/lib/lang/nl_web_subdomain_list.lng +++ b/interface/web/sites/lib/lang/nl_web_subdomain_list.lng @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/sites/lib/lang/nl_webdav_user.lng b/interface/web/sites/lib/lang/nl_webdav_user.lng index 05c9892a7..4f3c624b0 100644 --- a/interface/web/sites/lib/lang/nl_webdav_user.lng +++ b/interface/web/sites/lib/lang/nl_webdav_user.lng @@ -1,15 +1,19 @@ - + + + + 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 bac283b0a..aabbe0b39 100644 --- a/interface/web/sites/lib/lang/nl_webdav_user_list.lng +++ b/interface/web/sites/lib/lang/nl_webdav_user_list.lng @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/sites/lib/lang/pl.lng b/interface/web/sites/lib/lang/pl.lng index d4aa913d5..49cf22b5d 100644 --- a/interface/web/sites/lib/lang/pl.lng +++ b/interface/web/sites/lib/lang/pl.lng @@ -1,24 +1,25 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_cron.lng b/interface/web/sites/lib/lang/pl_cron.lng index 7771708be..439f004f0 100644 --- a/interface/web/sites/lib/lang/pl_cron.lng +++ b/interface/web/sites/lib/lang/pl_cron.lng @@ -1,21 +1,22 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_cron_list.lng b/interface/web/sites/lib/lang/pl_cron_list.lng index 3c1d83636..3e104ce12 100644 --- a/interface/web/sites/lib/lang/pl_cron_list.lng +++ b/interface/web/sites/lib/lang/pl_cron_list.lng @@ -1,12 +1,13 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_database.lng b/interface/web/sites/lib/lang/pl_database.lng index 75b44c439..60924a37e 100644 --- a/interface/web/sites/lib/lang/pl_database.lng +++ b/interface/web/sites/lib/lang/pl_database.lng @@ -1,25 +1,26 @@ -każdego)'; -$wb['database_remote_error_ips'] = 'Jeden z podanych adresów IP ma niepoprawny format.'; -$wb['client_txt'] = 'Klient'; -$wb['active_txt'] = 'Aktywny'; -$wb['database_name_error_empty'] = 'Nazwa bazy danych jest pusta.'; -$wb['database_name_error_unique'] = 'Istnieje już baza danych o takiej nazwie na serwerze. Aby mieć unikatową nazwę, np.: nazwij bazę danych tak samo jak domenę.'; -$wb['database_name_error_regex'] = 'Nieprawidłowa nazwa bazy danych. Nazwa bazy danych może zawierać znaki takie jak: a-z, A-Z, 0-9 oraz podkreślenie. Długość: 2 - 64 znaków.'; -$wb['database_user_error_empty'] = 'Nazwa użytkownika bazy danych jest pusta.'; -$wb['database_user_error_unique'] = 'Jest już użytkownik bazy danych o takiej nazwie. Aby mieć unikatową nazwę, np.: nazwij użytkownika tak samo jak domenę.'; -$wb['database_user_error_regex'] = 'Nieprawidłowa nazwa użytkownika bazy danych. Nazwa użytkownika bazy danych może zawierać znaki takie jak: a-z, A-Z, 0-9 oraz podkreślenie. Długość: 2 - 64 znaków.'; -$wb['limit_database_txt'] = 'Maksymalna liczba baz danych została przekroczona.'; -$wb['database_name_change_txt'] = 'Nie można zmienić nazwy bazy danych'; -$wb['database_charset_change_txt'] = 'Nie można zmienić kodowania bazy danych'; -$wb['database_name_error_len'] = 'Database name - {db} - too long. The max. database name length incl. prefix is 64 chars.'; -$wb['database_user_error_len'] = 'Database username - {user}- too long. The max. database username length incl. prefix is 16 chars.'; -?> +każdego)"; +$wb['database_remote_error_ips'] = "Jeden z podanych adresów IP ma niepoprawny format."; +$wb['client_txt'] = "Klient"; +$wb['active_txt'] = "Aktywny"; +$wb['database_name_error_empty'] = "Nazwa bazy danych jest pusta."; +$wb['database_name_error_unique'] = "Istnieje już baza danych o takiej nazwie na serwerze. Aby mieć unikatową nazwę, np.: nazwij bazę danych tak samo jak domenę."; +$wb['database_name_error_regex'] = "Nieprawidłowa nazwa bazy danych. Nazwa bazy danych może zawierać znaki takie jak: a-z, A-Z, 0-9 oraz podkreślenie. Długość: 2 - 64 znaków."; +$wb['database_user_error_empty'] = "Nazwa użytkownika bazy danych jest pusta."; +$wb['database_user_error_unique'] = "Jest już użytkownik bazy danych o takiej nazwie. Aby mieć unikatową nazwę, np.: nazwij użytkownika tak samo jak domenę."; +$wb['database_user_error_regex'] = "Nieprawidłowa nazwa użytkownika bazy danych. Nazwa użytkownika bazy danych może zawierać znaki takie jak: a-z, A-Z, 0-9 oraz podkreślenie. Długość: 2 - 64 znaków."; +$wb['limit_database_txt'] = "Maksymalna liczba baz danych została przekroczona."; +$wb['database_name_change_txt'] = "Nie można zmienić nazwy bazy danych."; +$wb['database_charset_change_txt'] = "Nie można zmienić kodowania bazy danych."; +$wb['database_name_error_len'] = "Nazwa bazy danych - {db} - za długa. Maksymalna długość wynosi 64 znaki łącznie z prefiksem."; +$wb['database_user_error_len'] = "Nazwa użytkownika bazy - {user}- za długa. Maksymalna długość wynosi 16 znaków łącznie z prefiksem."; +?> + diff --git a/interface/web/sites/lib/lang/pl_database_admin_list.lng b/interface/web/sites/lib/lang/pl_database_admin_list.lng index 3f05f65e6..342de213c 100644 --- a/interface/web/sites/lib/lang/pl_database_admin_list.lng +++ b/interface/web/sites/lib/lang/pl_database_admin_list.lng @@ -1,10 +1,11 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_database_list.lng b/interface/web/sites/lib/lang/pl_database_list.lng index 4bd22e3b9..0759b7917 100644 --- a/interface/web/sites/lib/lang/pl_database_list.lng +++ b/interface/web/sites/lib/lang/pl_database_list.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_ftp_user.lng b/interface/web/sites/lib/lang/pl_ftp_user.lng index 0c49209b2..8860b92e9 100644 --- a/interface/web/sites/lib/lang/pl_ftp_user.lng +++ b/interface/web/sites/lib/lang/pl_ftp_user.lng @@ -1,27 +1,28 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_ftp_user_list.lng b/interface/web/sites/lib/lang/pl_ftp_user_list.lng index fecbba355..58b2b7659 100644 --- a/interface/web/sites/lib/lang/pl_ftp_user_list.lng +++ b/interface/web/sites/lib/lang/pl_ftp_user_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_shell_user.lng b/interface/web/sites/lib/lang/pl_shell_user.lng index d5dd7231d..1331f4d50 100644 --- a/interface/web/sites/lib/lang/pl_shell_user.lng +++ b/interface/web/sites/lib/lang/pl_shell_user.lng @@ -1,22 +1,23 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_shell_user_list.lng b/interface/web/sites/lib/lang/pl_shell_user_list.lng index 850c0eb91..5e9501b39 100644 --- a/interface/web/sites/lib/lang/pl_shell_user_list.lng +++ b/interface/web/sites/lib/lang/pl_shell_user_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_user_quota_stats_list.lng b/interface/web/sites/lib/lang/pl_user_quota_stats_list.lng index 716760b17..60a0222eb 100644 --- a/interface/web/sites/lib/lang/pl_user_quota_stats_list.lng +++ b/interface/web/sites/lib/lang/pl_user_quota_stats_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng index 6dd8022e9..b3aed2661 100644 --- a/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng +++ b/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng @@ -1,11 +1,12 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_web_domain.lng b/interface/web/sites/lib/lang/pl_web_domain.lng index b345a02d2..869bef17d 100644 --- a/interface/web/sites/lib/lang/pl_web_domain.lng +++ b/interface/web/sites/lib/lang/pl_web_domain.lng @@ -1,67 +1,68 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_web_domain_admin_list.lng b/interface/web/sites/lib/lang/pl_web_domain_admin_list.lng index b460e2710..0b88cb6ea 100644 --- a/interface/web/sites/lib/lang/pl_web_domain_admin_list.lng +++ b/interface/web/sites/lib/lang/pl_web_domain_admin_list.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_web_domain_list.lng b/interface/web/sites/lib/lang/pl_web_domain_list.lng index 62b7455ff..69276848a 100644 --- a/interface/web/sites/lib/lang/pl_web_domain_list.lng +++ b/interface/web/sites/lib/lang/pl_web_domain_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng b/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng index e7b96d715..e5ba58cde 100644 --- a/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_web_subdomain.lng b/interface/web/sites/lib/lang/pl_web_subdomain.lng index 18e5a936c..f5854c8d5 100644 --- a/interface/web/sites/lib/lang/pl_web_subdomain.lng +++ b/interface/web/sites/lib/lang/pl_web_subdomain.lng @@ -1,40 +1,41 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_web_subdomain_list.lng b/interface/web/sites/lib/lang/pl_web_subdomain_list.lng index 9ccb0a3c7..49f50c9e8 100644 --- a/interface/web/sites/lib/lang/pl_web_subdomain_list.lng +++ b/interface/web/sites/lib/lang/pl_web_subdomain_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_webdav_user.lng b/interface/web/sites/lib/lang/pl_webdav_user.lng index 05c9892a7..8034ef183 100644 --- a/interface/web/sites/lib/lang/pl_webdav_user.lng +++ b/interface/web/sites/lib/lang/pl_webdav_user.lng @@ -1,15 +1,16 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_webdav_user_list.lng b/interface/web/sites/lib/lang/pl_webdav_user_list.lng index bac283b0a..5690a6399 100644 --- a/interface/web/sites/lib/lang/pl_webdav_user_list.lng +++ b/interface/web/sites/lib/lang/pl_webdav_user_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/sites/user_quota_stats.php b/interface/web/sites/user_quota_stats.php index ce2c3bc37..2e28d0d62 100644 --- a/interface/web/sites/user_quota_stats.php +++ b/interface/web/sites/user_quota_stats.php @@ -33,9 +33,9 @@ class list_action extends listform_actions { $rec['bgcolor'] = $this->DataRowColor; $username = $rec['system_user']; - $rec['used'] = $monitor_data['user'][$username]['used']; - $rec['soft'] = $monitor_data['user'][$username]['soft']; - $rec['hard'] = $monitor_data['user'][$username]['hard']; + $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'; if($rec['soft'] == '0K') $rec['soft'] = $app->lng('unlimited'); if($rec['hard'] == '0K') $rec['hard'] = $app->lng('unlimited'); diff --git a/interface/web/strengthmeter/lib/lang/nl_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/nl_strengthmeter.lng index 57e86ca70..0aacc6073 100644 --- a/interface/web/strengthmeter/lib/lang/nl_strengthmeter.lng +++ b/interface/web/strengthmeter/lib/lang/nl_strengthmeter.lng @@ -1,8 +1,11 @@ - + + + + diff --git a/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng index df85c9712..b59410542 100644 --- a/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng +++ b/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/themes/default/css/navigation/nav_top.css b/interface/web/themes/default/css/navigation/nav_top.css index e2f7b82ec..13b37f1f4 100644 --- a/interface/web/themes/default/css/navigation/nav_top.css +++ b/interface/web/themes/default/css/navigation/nav_top.css @@ -98,5 +98,9 @@ .topnav-dashboard { background-image: url('../../icons/x32/dashboard.png') !important; } + + .topnav-vm{ + background-image: url('../../icons/x32/drawer.png') !important; + } } \ No newline at end of file diff --git a/interface/web/tools/lib/lang/nl.lng b/interface/web/tools/lib/lang/nl.lng index 5bf2ae7a7..70dd45b69 100644 --- a/interface/web/tools/lib/lang/nl.lng +++ b/interface/web/tools/lib/lang/nl.lng @@ -1,6 +1,8 @@ - + + + diff --git a/interface/web/tools/lib/lang/nl_usersettings.lng b/interface/web/tools/lib/lang/nl_usersettings.lng index cf0fc7160..dfdfc943c 100644 --- a/interface/web/tools/lib/lang/nl_usersettings.lng +++ b/interface/web/tools/lib/lang/nl_usersettings.lng @@ -1,8 +1,11 @@ - + + + + diff --git a/interface/web/tools/lib/lang/pl.lng b/interface/web/tools/lib/lang/pl.lng index adc0178fe..4b8a44835 100644 --- a/interface/web/tools/lib/lang/pl.lng +++ b/interface/web/tools/lib/lang/pl.lng @@ -1,6 +1,7 @@ - + + diff --git a/interface/web/tools/lib/lang/pl_usersettings.lng b/interface/web/tools/lib/lang/pl_usersettings.lng index f8d76658a..426b2cfed 100644 --- a/interface/web/tools/lib/lang/pl_usersettings.lng +++ b/interface/web/tools/lib/lang/pl_usersettings.lng @@ -1,8 +1,9 @@ - + + diff --git a/server/cron_daily.php b/server/cron_daily.php index 05df3d3e9..e9aedac20 100644 --- a/server/cron_daily.php +++ b/server/cron_daily.php @@ -170,6 +170,17 @@ foreach($records as $rec) { $awstats_pl = $web_config['awstats_pl']; $awstats_buildstaticpages_pl = $web_config['awstats_buildstaticpages_pl']; + $awstats_conf_dir = $web_config['awstats_conf_dir']; + $awstats_website_conf_file = $web_config['awstats_conf_dir'].'/awstats.'.$domain.'.conf'; + + if(!is_file($awstats_website_conf_file)) { + $awstats_conf_file_content = 'Include "'.$awstats_conf_dir.'/awstats.conf" +LogFile="/var/log/ispconfig/httpd/'.$domain.'/access.log" +SiteDomain="'.$domain.'" +HostAliases="www.'.$domain.' localhost 127.0.0.1"'; + file_put_contents($awstats_website_conf_file,$awstats_conf_file_content); + } + if(!@is_dir($statsdir)) mkdir($statsdir); diff --git a/server/lib/app.inc.php b/server/lib/app.inc.php index 0a6778ea2..fc2397cbf 100644 --- a/server/lib/app.inc.php +++ b/server/lib/app.inc.php @@ -127,10 +127,10 @@ class app { break; } - if (!fwrite($fp, date('d.m.Y-H:i').' - '.$priority_txt.' - '. $msg."\r\n")) { + if (!fwrite($fp, @date('d.m.Y-H:i').' - '.$priority_txt.' - '. $msg."\r\n")) { die('Unable to write to logfile.'); } - echo date('d.m.Y-H:i').' - '.$priority_txt.' - '. $msg."\n"; + echo @date('d.m.Y-H:i').' - '.$priority_txt.' - '. $msg."\n"; fclose($fp); // Log to database diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php index bd4290308..1d5579ece 100644 --- a/server/lib/classes/system.inc.php +++ b/server/lib/classes/system.inc.php @@ -1191,6 +1191,8 @@ class system{ } else { $dir = escapeshellcmd($maildir_path); } + + if(!is_dir($dir)) mkdir($dir, 0700, true); if($user != '' && $user != 'root' && $this->is_user($user)) { $user = escapeshellcmd($user); diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php index c6879980e..4555387d8 100644 --- a/server/mods-available/monitor_core_module.inc.php +++ b/server/mods-available/monitor_core_module.inc.php @@ -53,7 +53,7 @@ class monitor_core_module { /* * Do the monitor every n minutes and write the result to the db */ - $min = date('i'); + $min = @date('i'); if (($min % $this->interval) == 0) { $this->doMonitor(); } @@ -1082,49 +1082,51 @@ class monitor_core_module { /* * Check, if we have mpt-status installed (LSIsoftware-raid) */ - system('which mpt-status', $retval); - if($retval === 0) { - /* - * Fetch the output - */ - $data['output'] = shell_exec('mpt-status --autoload -n'); + if(file_exists('/proc/mpt/summary')) { + system('which mpt-status', $retval); + if($retval === 0) { + /* + * Fetch the output + */ + $data['output'] = shell_exec('mpt-status --autoload -n'); - /* - * Then calc the state. - */ - $state = 'ok'; - foreach ($data['output'] as $item) { /* - * The output contains information for every RAID and every HDD. - * We only need the state of the RAID + * Then calc the state. */ - if (strpos($item, 'raidlevel:') !== false) { + $state = 'ok'; + foreach ($data['output'] as $item) { /* - * We found a raid, process the state of it + * The output contains information for every RAID and every HDD. + * We only need the state of the RAID */ - if (strpos($item, ' ONLINE ') !== false) { - $this->_setState($state, 'ok'); - } - elseif (strpos($item, ' OPTIMAL ') !== false) { - $this->_setState($state, 'ok'); - } - elseif (strpos($item, ' INITIAL ') !== false) { - $this->_setState($state, 'info'); - } - elseif (strpos($item, ' INACTIVE ') !== false) { - $this->_setState($state, 'critical'); - } - elseif (strpos($item, ' RESYNC ') !== false) { - $this->_setState($state, 'info'); - } - elseif (strpos($item, ' DEGRADED ') !== false) { - $this->_setState($state, 'critical'); - } - else { - /* we don't know the state. so we set the state to critical, that the - * admin is warned, that something is wrong + if (strpos($item, 'raidlevel:') !== false) { + /* + * We found a raid, process the state of it */ - $this->_setState($state, 'critical'); + if (strpos($item, ' ONLINE ') !== false) { + $this->_setState($state, 'ok'); + } + elseif (strpos($item, ' OPTIMAL ') !== false) { + $this->_setState($state, 'ok'); + } + elseif (strpos($item, ' INITIAL ') !== false) { + $this->_setState($state, 'info'); + } + elseif (strpos($item, ' INACTIVE ') !== false) { + $this->_setState($state, 'critical'); + } + elseif (strpos($item, ' RESYNC ') !== false) { + $this->_setState($state, 'info'); + } + elseif (strpos($item, ' DEGRADED ') !== false) { + $this->_setState($state, 'critical'); + } + else { + /* we don't know the state. so we set the state to critical, that the + * admin is warned, that something is wrong + */ + $this->_setState($state, 'critical'); + } } } } diff --git a/server/mods-available/remoteaction_core_module.inc.php b/server/mods-available/remoteaction_core_module.inc.php index 7d9bf5127..7d1f800a4 100644 --- a/server/mods-available/remoteaction_core_module.inc.php +++ b/server/mods-available/remoteaction_core_module.inc.php @@ -110,20 +110,22 @@ class remoteaction_core_module extends modules_base { /* * process all actions */ - foreach ($actions as $action) { - if ($action['action_type'] == 'os_update') { - /* do the update */ - $this->_doOsUpdate($action); - /* this action takes so much time, - * we stop executing the actions not to waste more time */ - return; - } - if ($action['action_type'] == 'ispc_update') { - /* do the update */ - $this->_doIspCUpdate($action); - /* this action takes so much time, - * we stop executing the actions not to waste more time */ - return; + if(is_array($actions)) { + foreach ($actions as $action) { + if ($action['action_type'] == 'os_update') { + /* do the update */ + $this->_doOsUpdate($action); + /* this action takes so much time, + * we stop executing the actions not to waste more time */ + return; + } + if ($action['action_type'] == 'ispc_update') { + /* do the update */ + $this->_doIspCUpdate($action); + /* this action takes so much time, + * we stop executing the actions not to waste more time */ + return; + } } } } diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index e117d13f5..d8941a8eb 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -1246,7 +1246,8 @@ class apache2_plugin { /* * add all the webdav-dirs to the webdav-section */ - $files = scandir($webdavRoot); + $files = @scandir($webdavRoot); + if(is_array($files)) { foreach($files as $file) { if (substr($file, strlen($file) - strlen('.htdigest')) == '.htdigest') { /* @@ -1267,6 +1268,7 @@ class apache2_plugin { $output .= " \n"; } } + } } /* * is the "replace-comment-end" found... diff --git a/server/plugins-available/network_settings_plugin.inc.php b/server/plugins-available/network_settings_plugin.inc.php index 4b0600655..f9c01dabd 100644 --- a/server/plugins-available/network_settings_plugin.inc.php +++ b/server/plugins-available/network_settings_plugin.inc.php @@ -97,7 +97,7 @@ class network_settings_plugin { $network_tpl->setVar('broadcast',$this->broadcast($server_config['ip_address'],$server_config['netmask'])); $network_tpl->setVar('network',$this->network($server_config['ip_address'],$server_config['netmask'])); - $records = $app->db->queryAllRecords("SELECT ip_address FROM server_ip WHERE server_id = ".intval($conf['server_id']) . ' order by ip_address'); + $records = $app->db->queryAllRecords("SELECT ip_address FROM server_ip WHERE server_id = ".intval($conf['server_id']) . ' ORDER BY server_ip_id ASC'); $ip_records = array(); $additionl_ip_records = 0; $n = 0; @@ -129,6 +129,8 @@ class network_settings_plugin { * main-server) because the LAST IP in the list is the IP mysql uses * to determine the host, the user is logging in from. */ + /* + // Disabled this part as it causes problems on multiserver setups if ($additionl_ip_records != 0) { $swap['ip_address'] = $ip_records[$n-1]['ip_address']; @@ -149,6 +151,7 @@ class network_settings_plugin { $network_tpl->setVar('broadcast',$this->broadcast($swap['ip_address'],$swap['netmask'])); $network_tpl->setVar('network',$this->network($swap['ip_address'],$swap['netmask'])); } + */ $network_tpl->setVar('additionl_ip_records',$additionl_ip_records); $network_tpl->setLoop('interfaces',$ip_records); -- GitLab