From 37b29231e47a0c4458dc1c15d98588f16f07e1e2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 06 Aug 2015 03:18:44 -0400
Subject: [PATCH] - don't set password via remoting if field is empty

---
 interface/web/admin/lib/lang/fi_server_config.lng |  239 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 224 insertions(+), 15 deletions(-)

diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng
index e51d9dd..f4f8856 100755
--- a/interface/web/admin/lib/lang/fi_server_config.lng
+++ b/interface/web/admin/lib/lang/fi_server_config.lng
@@ -4,6 +4,7 @@
 $wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted-ohjelmat';
 $wb['website_path_txt'] = 'Verkkotunnuksen kotihakemisto';
 $wb['website_symlinks_txt'] = 'Verkkotunnuksen symmetriset linkit';
+$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
 $wb['vhost_conf_dir_txt'] = 'Virtuaalipalvelimen asetuskansio';
 $wb['vhost_conf_enabled_dir_txt'] = 'Virtuaalipalvelimen käyttöönottokansio';
 $wb['getmail_config_dir_txt'] = 'Getmail-asetuskansio';
@@ -13,17 +14,24 @@
 $wb['fastcgi_phpini_path_txt'] = 'FastCGI:n php.ini-polku';
 $wb['fastcgi_children_txt'] = 'FastCGI-lapsiprosessi';
 $wb['fastcgi_max_requests_txt'] = 'FastCGI-pyyntöraja';
-$wb['fastcgi_bin_txt'] = 'FastCGI-binäri';
+$wb['fastcgi_bin_txt'] = 'FastCGI-binääri';
 $wb['module_txt'] = 'Ohjelmaosio';
 $wb['maildir_path_txt'] = 'Postilaatikon hakemistopolku';
+$wb['maildir_format_txt'] = 'Maildir Format';
 $wb['homedir_path_txt'] = 'Kotikansion hakemistopolku';
 $wb['mailuser_uid_txt'] = 'Käyttäjätunnus';
 $wb['mailuser_gid_txt'] = 'Käyttäjäryhmä';
 $wb['mailuser_name_txt'] = 'Postikäyttäjän nimi';
 $wb['mailuser_group_txt'] = 'Postikäyttäjän ryhmä';
+$wb['mailbox_virtual_uidgid_maps_txt'] = 'Use Websites Linux uid for mailbox';
+$wb['mailbox_virtual_uidgid_maps_info_txt'] = 'only in single web and mail-server-setup';
+$wb['mailbox_virtual_uidgid_maps_error_nosingleserver'] = 'Uid cannot be mapped in multi-server-setup.';
+$wb['mailbox_virtual_uidgid_maps_error_nodovecot'] = 'Uid-mapping can only be used with dovecot.';
+$wb['mailbox_virtual_uidgid_maps_error_alreadyusers'] = 'Uid-mapping cannot be changed if there are already mail users.';
 $wb['relayhost_txt'] = 'Edelleenlähetyspalvelin';
 $wb['relayhost_user_txt'] = 'Edelleenlähetyspalvelimen käyttäjätunnus';
 $wb['relayhost_password_txt'] = 'Edelleenlähetyspalvelimen salasana';
+$wb['reject_sender_login_mismatch_txt'] = 'Reject sender and login mismatch';
 $wb['mailbox_size_limit_txt'] = 'Postilaatikon koko';
 $wb['message_size_limit_txt'] = 'Viestien enimmäiskoko';
 $wb['ip_address_txt'] = 'IP-osoite';
@@ -32,18 +40,219 @@
 $wb['hostname_txt'] = 'Palvelimen nimi';
 $wb['nameservers_txt'] = 'Nimipalvelimet';
 $wb['auto_network_configuration_txt'] = 'Automaattiset verkkoasetukset';
-$wb['website_basedir_txt'] = 'Website basedir';
-$wb['ip_address_error_wrong'] = 'Invalid IP address format.';
-$wb['netmask_error_wrong'] = 'Invalid Netmask format.';
-$wb['gateway_error_wrong'] = 'Invalid Gateway format.';
-$wb['hostname_error_empty'] = 'Hostname is empty.';
-$wb['nameservers_error_empty'] = 'Nameserver is empty.';
-$wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted applications';
-$wb['config_dir_txt'] = 'Config directory';
-$wb['init_script_txt'] = 'Cron init script name';
-$wb['crontab_dir_txt'] = 'Path for individual crontabs';
-$wb['wget_txt'] = 'Path to wget program';
-$wb['security_level_txt'] = 'Security level';
-$wb['web_user_txt'] = 'Apache user';
-$wb['web_group_txt'] = 'Apache group';
+$wb['website_basedir_txt'] = 'Verkkotunnuksen peruskansio';
+$wb['ip_address_error_wrong'] = 'IP-osoite on väärän muotoinen.';
+$wb['netmask_error_wrong'] = 'Verkon peite on väärän muotoinen.';
+$wb['gateway_error_wrong'] = 'Yhdyskäytävä on väärän muotoinen.';
+$wb['hostname_error_empty'] = 'Isäntänimi on tyhjä.';
+$wb['nameservers_error_empty'] = 'Nimipalvelin on tyhjä.';
+$wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrootatut ohjelmat';
+$wb['config_dir_txt'] = 'Asetuskansio';
+$wb['init_script_txt'] = 'Cronin init-skriptin nimi';
+$wb['crontab_dir_txt'] = 'Käyttäjien Crontabien polku';
+$wb['wget_txt'] = 'Wget-binäärin polku';
+$wb['security_level_txt'] = 'Turvallisuustaso';
+$wb['web_user_txt'] = 'Apache-käyttäjä';
+$wb['web_group_txt'] = 'Apache-ryhmä';
+$wb['loglevel_txt'] = 'Logitaso';
+$wb['apps_vhost_port_txt'] = 'Apps-virtuaali-isännän portti';
+$wb['apps_vhost_ip_txt'] = 'Apps-virtuaali-isännän IP-osoite';
+$wb['apps_vhost_servername_txt'] = 'Apps-virtuaali-isännän verkkotunnus';
+$wb['bind_user_txt'] = 'BIND-käyttäjä';
+$wb['bind_group_txt'] = 'BIND-ryhmä';
+$wb['bind_zonefiles_dir_txt'] = 'BIND-aluetiedostojen polku';
+$wb['named_conf_path_txt'] = 'BIND-asetustiedoston polku';
+$wb['bind_user_error_empty'] = 'BIND-käyttäjä on tyhjä.';
+$wb['bind_group_error_empty'] = 'BIND-ryhmä on tyhjä.';
+$wb['bind_zonefiles_dir_error_empty'] = 'BIND-aluetiedostojen kansio on tyhjä.';
+$wb['named_conf_path_error_empty'] = 'BIND-asetustiedoston polku on tyhjä.';
+$wb['named_conf_local_path_error_empty'] = 'BIND:in paikallisen asetustiedoston polku on tyhjä.';
+$wb['mail_filter_syntax_txt'] = 'Postisuodattimien syntaksi';
+$wb['pop3_imap_daemon_txt'] = 'POP3/IMAP-ohjelma';
+$wb['php_open_basedir_txt'] = 'PHP:een avoin peruskansio';
+$wb['php_open_basedir_error_empty'] = 'PHP:een avoin peruskansio on tyhjä.';
+$wb['htaccess_allow_override_txt'] = '.htaccess AllowOverride';
+$wb['htaccess_allow_override_error_empty'] = '.htaccess AllowOverride on tyhjä.';
+$wb['awstats_conf_dir_txt'] = 'awstats conf folder';
+$wb['awstats_data_dir_txt'] = 'awstats data folder';
+$wb['awstats_pl_txt'] = 'awstats.pl script';
+$wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl script';
+$wb['backup_dir_txt'] = 'Backup directory';
+$wb['named_conf_local_path_txt'] = 'BIND named.conf.local path';
+$wb['php_ini_path_cgi_txt'] = 'CGI php.ini path';
+$wb['php_ini_path_apache_txt'] = 'Apache php.ini path';
+$wb['check_apache_config_txt'] = 'Test apache configuration on restart';
+$wb['CA_path_txt'] = 'CA Path';
+$wb['CA_pass_txt'] = 'CA passphrase';
+$wb['ufw_enable_txt'] = 'Enable';
+$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
+$wb['ufw_ipv6_txt'] = 'Enable IPv6';
+$wb['ufw_default_input_policy_txt'] = 'Default Input Policy';
+$wb['ufw_default_output_policy_txt'] = 'Default Output Policy';
+$wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy';
+$wb['ufw_default_application_policy_txt'] = 'Default Application Policy';
+$wb['ufw_log_level_txt'] = 'Log Level';
+$wb['network_config_warning_txt'] = 'The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.';
+$wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax';
+$wb['server_type_txt'] = 'Server Type';
+$wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir';
+$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir';
+$wb['nginx_user_txt'] = 'Nginx user';
+$wb['nginx_group_txt'] = 'Nginx group';
+$wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket';
+$wb['backup_dir_error_empty'] = 'Backup directory is empty.';
+$wb['maildir_path_error_empty'] = 'Maildir Path is empty.';
+$wb['homedir_path_error_empty'] = 'Homedir Path is empty.';
+$wb['mailuser_uid_error_empty'] = 'Mailuser UID is empty.';
+$wb['mailuser_gid_error_empty'] = 'Mailuser GID is empty.';
+$wb['mailuser_name_error_empty'] = 'Mailuser Name is empty.';
+$wb['mailuser_group_error_empty'] = 'Mailuser Group is empty.';
+$wb['getmail_config_dir_error_empty'] = 'Getmail config dir is empty.';
+$wb['website_basedir_error_empty'] = 'Website basedir is empty.';
+$wb['website_path_error_empty'] = 'Website path is empty.';
+$wb['website_symlinks_error_empty'] = 'Website symlinks is empty.';
+$wb['vhost_conf_dir_error_empty'] = 'Vhost config dir is empty.';
+$wb['vhost_conf_enabled_dir_error_empty'] = 'Vhost config enabled dir is empty.';
+$wb['nginx_vhost_conf_dir_error_empty'] = 'Nginx Vhost config dir is empty.';
+$wb['nginx_vhost_conf_enabled_dir_error_empty'] = 'Nginx Vhost config enabled dir is empty.';
+$wb['apache_user_error_empty'] = 'Apache user is empty.';
+$wb['apache_group_error_empty'] = 'Apache group is empty.';
+$wb['nginx_user_error_empty'] = 'Nginx user is empty.';
+$wb['nginx_group_error_empty'] = 'Nginx group is empty.';
+$wb['php_ini_path_apache_error_empty'] = 'Apache php.ini path is empty.';
+$wb['php_ini_path_cgi_error_empty'] = 'CGI php.ini path is empty.';
+$wb['nginx_cgi_socket_empty'] = 'Nginx CGI Socket is empty.';
+$wb['apps_vhost_port_error_empty'] = 'Apps-vhost port is empty.';
+$wb['apps_vhost_ip_error_empty'] = 'Apps-vhost IP is empty.';
+$wb['fastcgi_starter_path_error_empty'] = 'FastCGI starter path is empty.';
+$wb['fastcgi_starter_script_error_empty'] = 'FastCGI starter script is empty.';
+$wb['fastcgi_alias_error_empty'] = 'FastCGI Alias is empty.';
+$wb['fastcgi_phpini_path_error_empty'] = 'FastCGI php.ini Path is empty.';
+$wb['fastcgi_children_error_empty'] = 'FastCGI Children is empty.';
+$wb['fastcgi_max_requests_error_empty'] = 'FastCGI max. Requests is empty.';
+$wb['fastcgi_bin_error_empty'] = 'FastCGI Bin is empty.';
+$wb['jailkit_chroot_home_error_empty'] = 'Jailkit chroot home is empty.';
+$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sections is empty.';
+$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applications is empty.';
+$wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit cron chrooted applications is empty.';
+$wb['vlogger_config_dir_error_empty'] = 'Config directory is empty.';
+$wb['cron_init_script_error_empty'] = 'Cron init script name is empty.';
+$wb['crontab_dir_error_empty'] = 'Path for individual crontabs is empty.';
+$wb['cron_wget_error_empty'] = 'Path to wget program is empty.';
+$wb['php_fpm_init_script_txt'] = 'PHP-FPM init script';
+$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM init script is empty.';
+$wb['php_fpm_ini_path_txt'] = 'PHP-FPM php.ini path';
+$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM php.ini path is empty.';
+$wb['php_fpm_pool_dir_txt'] = 'PHP-FPM pool directory';
+$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM pool directory is empty.';
+$wb['php_fpm_start_port_txt'] = 'PHP-FPM start port';
+$wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.';
+$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
+$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.';
+$wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure';
+$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
+$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
+$wb['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
+$wb['enable_sni_txt'] = 'Enable SNI';
+$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
+$wb['website_autoalias_txt'] = 'Website auto alias';
+$wb['website_autoalias_note_txt'] = 'Placeholders:';
+$wb['backup_mode_txt'] = 'Backup mode';
+$wb['backup_mode_userzip'] = 'Backup web files owned by web user as zip';
+$wb['backup_mode_rootgz'] = 'Backup all files in web directory as root user';
+$wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List';
+$wb['realtime_blackhole_list_note_txt'] = '(Separate RBL\'s with commas)';
+$wb['ssl_settings_txt'] = 'SSL Settings';
+$wb['permissions_txt'] = 'Permissions';
+$wb['php_settings_txt'] = 'PHP Settings';
+$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings';
+$wb['awstats_settings_txt'] = 'AWStats Settings';
+$wb['firewall_txt'] = 'Firewall';
+$wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics';
+$wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
+$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
+$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
+$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
+$wb['overquota_notify_admin_txt'] = 'Send quota warnings to admin';
+$wb['overquota_notify_client_txt'] = 'Send quota warnings to client';
+$wb['overquota_notify_onok_txt'] = 'Send quota ok message to client';
+$wb['overquota_notify_freq_txt'] = 'Send quota warning each X days';
+$wb['overquota_notify_freq_note_txt'] = '0 = send message just once, no repeated messages';
+$wb['admin_notify_events_txt'] = 'Send email to admin starting with the following level';
+$wb['no_notifications_txt'] = 'No Notifications';
+$wb['monit_url_txt'] = 'Monit URL';
+$wb['monit_user_txt'] = 'Monit User';
+$wb['monit_password_txt'] = 'Monit Password';
+$wb['monit_url_error_regex'] = 'Invalid Monit URL';
+$wb['monit_url_note_txt'] = 'Placeholder:';
+$wb['munin_url_txt'] = 'Munin URL';
+$wb['munin_user_txt'] = 'Munin User';
+$wb['munin_password_txt'] = 'Munin Password';
+$wb['munin_url_error_regex'] = 'Invalid Munin URL';
+$wb['munin_url_note_txt'] = 'Placeholder:';
+$wb["dkim_path_txt"] = 'DKIM Path';
+$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
+$wb["v6_prefix_txt"] = 'IPv6 Prefix';
+$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
+$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
+$wb['backup_dir_is_mount_txt'] = 'Backup directory is a mount?';
+$wb['monitor_system_updates_txt'] = 'Check for Linux updates';
+$wb['hostname_error_regex'] = 'Invalid Hostname.';
+$wb['invalid_apache_user_txt'] = 'Invalid apache user.';
+$wb['invalid_apache_group_txt'] = 'Invalid apache group.';
+$wb['backup_dir_error_regex'] = 'Invalid backup directory.';
+$wb['maildir_path_error_regex'] = 'Invalid maildir path.';
+$wb['homedir_path_error_regex'] = 'Invalid homedir path.';
+$wb['mailuser_name_error_regex'] = 'Invalid mailuser name.';
+$wb['mailuser_group_name_error_regex'] = 'Invalid mailuser group name.';
+$wb['mailuser_uid_error_range'] = 'Mailuser uid must be >= 2000';
+$wb['mailuser_gid_error_range'] = 'Mailuser gid must be >= 2000';
+$wb['getmail_config_dir_error_regex'] = 'Invalid getmail config directory.';
+$wb['website_basedir_error_regex'] = 'Invalid website basedir.';
+$wb['website_symlinks_error_regex'] = 'Invalid website symlinks.';
+$wb['vhost_conf_dir_error_regex'] = 'Invalid vhost config directory.';
+$wb['vhost_conf_enabled_dir_error_regex'] = 'Invalid vhost conf enabled directory.';
+$wb['nginx_vhost_conf_dir_error_regex'] = 'Invalid nginx config directory.';
+$wb['nginx_vhost_conf_enabled_dir_error_regex'] = 'Invalid nginx conf enabled directory.';
+$wb['ca_path_error_regex'] = 'Invalid CA path.';
+$wb['invalid_nginx_user_txt'] = 'Invalid nginx user.';
+$wb['invalid_nginx_group_txt'] = 'Invalid nginx group.';
+$wb['php_ini_path_apache_error_regex'] = 'Invalid apache php.ini path.';
+$wb['php_ini_path_cgi_error_regex'] = 'Invalid cgi php.ini path.';
+$wb['php_fpm_init_script_error_regex'] = 'Invalid php-fpm init script.';
+$wb['php_fpm_ini_path_error_regex'] = 'Invalid php-fpm ini path.';
+$wb['php_fpm_pool_dir_error_regex'] = 'Invalid php-fpm pool directory.';
+$wb['php_fpm_socket_dir_error_regex'] = 'Invalid php-fpm socket directory.';
+$wb['php_open_basedir_error_regex'] = 'Invalid php open_basedir.';
+$wb['awstats_data_dir_empty'] = 'awstats data directory is empty';
+$wb['awstats_data_dir_error_regex'] = 'Invalid awstats data directory.';
+$wb['awstats_pl_empty'] = 'awstats.pl setting is empty.';
+$wb['awstats_pl_error_regex'] = 'Invalid awstats.pl path.';
+$wb['awstats_buildstaticpages_pl_empty'] = 'awstats_buildstaticpages.pl is empty';
+$wb['awstats_buildstaticpages_pl_error_regex'] = 'Invalid awstats_buildstaticpages.pl path.';
+$wb['invalid_bind_user_txt'] = 'Invalid BIND user.';
+$wb['invalid_bind_group_txt'] = 'Invalid BIND group.';
+$wb['bind_zonefiles_dir_error_regex'] = 'Invalid BIND zonefiles directory.';
+$wb['named_conf_path_error_regex'] = 'Invalid named.conf path.';
+$wb['named_conf_local_path_error_regex'] = 'Invalid named.conf.local path.';
+$wb['fastcgi_starter_path_error_regex'] = 'Invalid fastcgi starter path.';
+$wb['fastcgi_starter_script_error_regex'] = 'Invalid fastcgi starter script.';
+$wb['fastcgi_alias_error_regex'] = 'Invalid fastcgi alias.';
+$wb['fastcgi_phpini_path_error_regex'] = 'Invalid fastcgi path.';
+$wb['fastcgi_bin_error_regex'] = 'Invalid fastcgi bin.';
+$wb['jailkit_chroot_home_error_regex'] = 'Invalid jaikit chroot home.';
+$wb['jailkit_chroot_app_sections_error_regex'] = 'Invalid jaikit chroot sections.';
+$wb['jailkit_chroot_app_programs_error_regex'] = 'Invalid jaikit chroot app programs.';
+$wb['jailkit_chroot_cron_programs_error_regex'] = 'Invalid jaikit chroot cron programs.';
+$wb['vlogger_config_dir_error_regex'] = 'Invalid vlogger config dir.';
+$wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
+$wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
+$wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
+$wb['network_filesystem_txt'] = 'Network Filesystem';
+$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
 ?>

--
Gitblit v1.9.1