From 8eccdeacde1bc57951fca43e5242cb1df3f3712e Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 26 May 2010 08:57:33 -0400
Subject: [PATCH] Merged revisions 1673,1676-1679 from trunk.
---
interface/web/admin/lib/lang/ru_groups_list.lng | 1
interface/web/client/templates/resellers_list.htm | 2
interface/web/dns/lib/lang/ru_dns_mx.lng | 1
interface/web/admin/lib/lang/ru_users_list.lng | 1
interface/web/admin/lib/lang/ru_groups.lng | 1
interface/web/login/lib/lang/ru.lng | 1
interface/web/mail/lib/lang/ru_mail_whitelist.lng | 1
interface/web/mail/lib/lang/ru_spamfilter_config.lng | 1
interface/web/mail/lib/lang/ru_mail_content_filter_list.lng | 1
interface/web/dns/lib/lang/ru_dns_a_list.lng | 1
interface/web/dns/lib/lang/ru_dns_rp.lng | 1
interface/web/mail/lib/lang/ru_spamfilter_whitelist_list.lng | 1
interface/web/sites/lib/lang/ru_web_domain_list.lng | 1
interface/web/admin/lib/lang/ru_firewall_list.lng | 1
interface/web/mail/lib/lang/ru_mail_transport_list.lng | 1
interface/web/sites/lib/lang/ru_shell_user.lng | 1
interface/web/mail/lib/lang/ru_spamfilter_blacklist.lng | 1
interface/web/dns/lib/lang/ru_dns_template_list.lng | 1
interface/web/sites/lib/lang/ru_cron.lng | 1
interface/web/sites/lib/lang/ru_cron_list.lng | 1
interface/web/help/lib/lang/ru_support_message_list.lng | 1
interface/web/mail/lib/lang/ru_mail_relay_recipient.lng | 1
interface/web/admin/lib/lang/ru_server_ip.lng | 1
interface/web/designer/lib/lang/ru.lng | 1
interface/web/mail/lib/lang/ru_mail_blacklist.lng | 1
interface/web/mail/lib/lang/ru_spamfilter_users_list.lng | 1
interface/web/designer/lib/lang/ru_form_show.lng | 1
interface/web/mail/lib/lang/ru_mail_get_list.lng | 1
interface/web/mail/lib/lang/ru_mail_aliasdomain_list.lng | 1
interface/web/admin/lib/lang/ru_language_import.lng | 1
interface/web/designer/lib/lang/ru_module_nav_item_edit.lng | 1
interface/web/mail/lib/lang/ru_mail_domain_list.lng | 1
interface/web/dns/lib/lang/ru_dns_cname.lng | 1
interface/web/admin/lib/lang/ru_software_repo_list.lng | 1
interface/web/sites/lib/lang/ru_web_aliasdomain_list.lng | 1
interface/web/monitor/lib/lang/ru.lng | 1
interface/web/sites/lib/lang/ru_web_sites_stats_list.lng | 1
interface/web/admin/lib/lang/ru_server_config.lng | 1
interface/web/mail/lib/lang/ru_mail_domain_catchall.lng | 1
interface/web/admin/lib/lang/ru_software_update_list.lng | 1
interface/web/admin/lib/lang/ru_server_list.lng | 7 +
interface/web/client/lib/lang/ru_clients_list.lng | 1
interface/web/admin/lib/lang/ru_remote_user_list.lng | 1
docs/INSTALL_DEBIAN_5.0_multiserver.txt | 2
interface/web/client/lib/lang/ru.lng | 1
interface/web/admin/lib/lang/ru_server_config_list.lng | 1
interface/lib/classes/tform.inc.php | 3
interface/web/dns/lib/lang/ru_dns_ns.lng | 1
interface/web/client/lib/lang/ru_client.lng | 1
interface/web/admin/lib/lang/ru_firewall.lng | 1
interface/web/admin/lib/lang/ru_server_ip_list.lng | 1
interface/web/mail/lib/lang/ru_mail_domain.lng | 1
interface/web/mail/lib/lang/ru_mail_relay_recipient_list.lng | 1
interface/web/mail/lib/lang/ru_spamfilter_policy_list.lng | 1
interface/web/sites/lib/lang/ru_web_domain.lng | 1
interface/web/mail/lib/lang/ru_mail_spamfilter.lng | 1
interface/web/sites/lib/lang/ru_shell_user_list.lng | 1
interface/web/dns/lib/lang/ru_dns_alias.lng | 1
interface/web/admin/lib/lang/ru_language_add.lng | 1
interface/web/mail/lib/lang/ru_spamfilter_config_list.lng | 1
interface/web/dns/lib/lang/ru_dns_aaaa.lng | 1
interface/web/mail/lib/lang/ru_mail_user.lng | 1
interface/web/mail/lib/lang/ru_mail_alias_list.lng | 1
docs/INSTALL_DEBIAN_5.0_courier_mydns.txt | 8 ++
interface/web/dns/lib/lang/ru_dns_soa.lng | 1
interface/web/admin/lib/lang/ru_language_list.lng | 1
interface/web/designer/lib/lang/ru_module_edit.lng | 1
interface/web/dns/lib/lang/ru_dns_soa_list.lng | 1
interface/web/admin/lib/lang/ru.lng | 1
interface/web/admin/lib/lang/ru_users.lng | 1
interface/web/client/lib/lang/ru_resellers_list.lng | 1
install/sql/ispconfig3.sql | 2
interface/web/mail/lib/lang/ru_mail_alias.lng | 1
interface/web/client/lib/lang/ru_client_del.lng | 1
interface/web/sites/lib/lang/ru.lng | 1
interface/web/dns/lib/lang/ru_dns_template.lng | 1
interface/web/dns/lib/lang/ru.lng | 1
interface/web/mail/lib/lang/ru_mail_blacklist_list.lng | 1
interface/web/sites/lib/lang/ru_web_subdomain.lng | 1
interface/web/designer/lib/lang/ru_module_list.lng | 1
interface/web/designer/lib/lang/ru_module_show.lng | 1
interface/web/help/lib/lang/ru.lng | 15 ++-
interface/web/mail/lib/lang/ru_spamfilter_whitelist.lng | 1
interface/web/mail/lib/lang/ru_mail_domain_catchall_list.lng | 1
interface/web/mail/lib/lang/ru_spamfilter_users.lng | 1
interface/web/admin/lib/lang/ru_software_package_list.lng | 1
interface/web/dns/lib/lang/ru_dns_wizard.lng | 1
interface/web/mail/lib/lang/ru_mail_transport.lng | 1
interface/web/designer/lib/lang/ru_form_list.lng | 1
interface/web/mail/lib/lang/ru_mail_get.lng | 1
interface/web/sites/lib/lang/ru_database.lng | 1
interface/web/dns/lib/lang/ru_dns_hinfo.lng | 1
interface/web/sites/lib/lang/ru_ftp_user.lng | 1
interface/web/admin/lib/lang/ru_language_edit.lng | 1
interface/web/admin/lib/lang/ru_software_repo.lng | 1
interface/web/mail/lib/lang/ru_mail_forward.lng | 1
interface/web/mail/lib/lang/ru_spamfilter_blacklist_list.lng | 1
interface/web/client/lib/lang/ru_reseller.lng | 1
interface/web/mail/lib/lang/ru_mail_spamfilter_list.lng | 1
interface/web/monitor/lib/lang/ru_datalog_list.lng | 1
interface/web/admin/lib/lang/ru_server.lng | 1
interface/web/sites/lib/lang/ru_ftp_user_list.lng | 1
interface/web/mail/lib/lang/ru_mail_forward_list.lng | 1
interface/web/client/lib/lang/ru_client_template.lng | 1
docs/INSTALL_DEBIAN_5.0_dovecot_bind.txt | 5 +
interface/lib/lang/ru.lng | 5
interface/web/sites/lib/lang/ru_web_subdomain_list.lng | 1
interface/web/mail/lib/lang/ru_mail_user_filter_list.lng | 1
interface/web/mail/lib/lang/ru.lng | 1
interface/web/mail/lib/lang/ru_mail_whitelist_list.lng | 1
interface/web/strengthmeter/lib/lang/ru_strengthmeter.lng | 1
server/cron_daily.php | 14 +++
interface/web/dns/lib/lang/ru_dns_txt.lng | 1
interface/web/mail/lib/lang/ru_mail_user_list.lng | 1
interface/web/admin/lib/lang/ru_language_export.lng | 1
interface/web/help/lib/lang/ru_support_message.lng | 1
interface/web/admin/lib/lang/ru_system_config.lng | 1
interface/web/client/templates/clients_list.htm | 2
interface/web/designer/lib/lang/ru_module_nav_edit.lng | 1
interface/web/client/lib/lang/ru_client_template_list.lng | 1
interface/web/dns/lib/lang/ru_dns_a.lng | 1
interface/web/mail/lib/lang/ru_mail_content_filter.lng | 1
interface/web/sites/lib/lang/ru_database_list.lng | 1
interface/web/dns/lib/lang/ru_dns_srv.lng | 1
interface/web/mail/lib/lang/ru_mail_user_stats_list.lng | 1
interface/web/admin/lib/lang/ru_language_complete.lng | 1
interface/web/designer/lib/lang/ru_form_edit.lng | 1
interface/web/admin/lib/lang/ru_remote_user.lng | 1
interface/web/mail/lib/lang/ru_mail_user_filter.lng | 1
interface/web/tools/lib/lang/ru.lng | 1
interface/web/mail/lib/lang/ru_mail_aliasdomain.lng | 1
interface/web/tools/lib/lang/ru_usersettings.lng | 1
interface/web/dns/lib/lang/ru_dns_ptr.lng | 1
interface/web/mail/lib/lang/ru_spamfilter_policy.lng | 1
134 files changed, 171 insertions(+), 17 deletions(-)
diff --git a/docs/INSTALL_DEBIAN_5.0_courier_mydns.txt b/docs/INSTALL_DEBIAN_5.0_courier_mydns.txt
index 138f881..eb0849b 100644
--- a/docs/INSTALL_DEBIAN_5.0_courier_mydns.txt
+++ b/docs/INSTALL_DEBIAN_5.0_courier_mydns.txt
@@ -23,6 +23,14 @@
127.0.0.1 localhost.localdomain localhost
192.168.0.100 ispconfig.example.com ispconfig
+# Run:
+
+/etc/init.d/hostname.sh
+
+# enable the Debian volaitile repository to get a newer clamav version
+
+echo "deb http://volatile.debian.org/debian-volatile lenny/volatile main contrib non-free" >> /etc/apt/sources.list
+apt-get update
# Some optional choices
diff --git a/docs/INSTALL_DEBIAN_5.0_dovecot_bind.txt b/docs/INSTALL_DEBIAN_5.0_dovecot_bind.txt
index 8d6d66a..9ee449b 100644
--- a/docs/INSTALL_DEBIAN_5.0_dovecot_bind.txt
+++ b/docs/INSTALL_DEBIAN_5.0_dovecot_bind.txt
@@ -26,6 +26,11 @@
/etc/init.d/hostname.sh
+# enable the Debian volaitile repository to get a newer clamav version
+
+echo "deb http://volatile.debian.org/debian-volatile lenny/volatile main contrib non-free" >> /etc/apt/sources.list
+apt-get update
+
# Some optional choices
opt0.1) Optionally install SSH-server to get remote shell
diff --git a/docs/INSTALL_DEBIAN_5.0_multiserver.txt b/docs/INSTALL_DEBIAN_5.0_multiserver.txt
index 778b842..c6541e7 100644
--- a/docs/INSTALL_DEBIAN_5.0_multiserver.txt
+++ b/docs/INSTALL_DEBIAN_5.0_multiserver.txt
@@ -8,6 +8,8 @@
apt-get install mysql-server
apt-get install apache2 apache2.2-common apache2-doc apache2-mpm-prefork apache2-utils libexpat1 ssl-cert libapache2-mod-php5 php5 php5-common php5-gd php5-mysql php5-imap phpmyadmin php5-cli php5-cgi libapache2-mod-fcgid apache2-suexec php-pear php-auth php5-mcrypt mcrypt php5-imagick imagemagick libapache2-mod-suphp
+a2enmod suexec rewrite ssl actions include
+
apt-get install pure-ftpd-common pure-ftpd-mysql quota quotatool
vi /etc/default/pure-ftpd-common
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index aa6656b..709ce7a 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1207,7 +1207,7 @@
INSERT INTO `spamfilter_policy` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `policy_name`, `virus_lover`, `spam_lover`, `banned_files_lover`, `bad_header_lover`, `bypass_virus_checks`, `bypass_spam_checks`, `bypass_banned_checks`, `bypass_header_checks`, `spam_modifies_subj`, `virus_quarantine_to`, `spam_quarantine_to`, `banned_quarantine_to`, `bad_header_quarantine_to`, `clean_quarantine_to`, `other_quarantine_to`, `spam_tag_level`, `spam_tag2_level`, `spam_kill_level`, `spam_dsn_cutoff_level`, `spam_quarantine_cutoff_level`, `addr_extension_virus`, `addr_extension_spam`, `addr_extension_banned`, `addr_extension_bad_header`, `warnvirusrecip`, `warnbannedrecip`, `warnbadhrecip`, `newvirus_admin`, `virus_admin`, `banned_admin`, `bad_header_admin`, `spam_admin`, `spam_subject_tag`, `spam_subject_tag2`, `message_size_limit`, `banned_rulenames`) VALUES(2, 1, 0, 'riud', 'riud', 'r', 'Uncensored', 'Y', 'Y', 'Y', 'Y', 'N', 'N', 'N', 'N', 'N', NULL, NULL, NULL, NULL, NULL, NULL, 3, 999, 999, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `spamfilter_policy` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `policy_name`, `virus_lover`, `spam_lover`, `banned_files_lover`, `bad_header_lover`, `bypass_virus_checks`, `bypass_spam_checks`, `bypass_banned_checks`, `bypass_header_checks`, `spam_modifies_subj`, `virus_quarantine_to`, `spam_quarantine_to`, `banned_quarantine_to`, `bad_header_quarantine_to`, `clean_quarantine_to`, `other_quarantine_to`, `spam_tag_level`, `spam_tag2_level`, `spam_kill_level`, `spam_dsn_cutoff_level`, `spam_quarantine_cutoff_level`, `addr_extension_virus`, `addr_extension_spam`, `addr_extension_banned`, `addr_extension_bad_header`, `warnvirusrecip`, `warnbannedrecip`, `warnbadhrecip`, `newvirus_admin`, `virus_admin`, `banned_admin`, `bad_header_admin`, `spam_admin`, `spam_subject_tag`, `spam_subject_tag2`, `message_size_limit`, `banned_rulenames`) VALUES(3, 1, 0, 'riud', 'riud', 'r', 'Wants all spam', 'N', 'Y', 'N', 'N', 'N', 'N', 'N', 'N', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, 3, 999, 999, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `spamfilter_policy` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `policy_name`, `virus_lover`, `spam_lover`, `banned_files_lover`, `bad_header_lover`, `bypass_virus_checks`, `bypass_spam_checks`, `bypass_banned_checks`, `bypass_header_checks`, `spam_modifies_subj`, `virus_quarantine_to`, `spam_quarantine_to`, `banned_quarantine_to`, `bad_header_quarantine_to`, `clean_quarantine_to`, `other_quarantine_to`, `spam_tag_level`, `spam_tag2_level`, `spam_kill_level`, `spam_dsn_cutoff_level`, `spam_quarantine_cutoff_level`, `addr_extension_virus`, `addr_extension_spam`, `addr_extension_banned`, `addr_extension_bad_header`, `warnvirusrecip`, `warnbannedrecip`, `warnbadhrecip`, `newvirus_admin`, `virus_admin`, `banned_admin`, `bad_header_admin`, `spam_admin`, `spam_subject_tag`, `spam_subject_tag2`, `message_size_limit`, `banned_rulenames`) VALUES(4, 1, 0, 'riud', 'riud', 'r', 'Wants viruses', 'Y', 'N', 'Y', 'Y', 'N', 'N', 'N', 'N', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, 3, 6.9, 6.9, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `spamfilter_policy` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `policy_name`, `virus_lover`, `spam_lover`, `banned_files_lover`, `bad_header_lover`, `bypass_virus_checks`, `bypass_spam_checks`, `bypass_banned_checks`, `bypass_header_checks`, `spam_modifies_subj`, `virus_quarantine_to`, `spam_quarantine_to`, `banned_quarantine_to`, `bad_header_quarantine_to`, `clean_quarantine_to`, `other_quarantine_to`, `spam_tag_level`, `spam_tag2_level`, `spam_kill_level`, `spam_dsn_cutoff_level`, `spam_quarantine_cutoff_level`, `addr_extension_virus`, `addr_extension_spam`, `addr_extension_banned`, `addr_extension_bad_header`, `warnvirusrecip`, `warnbannedrecip`, `warnbadhrecip`, `newvirus_admin`, `virus_admin`, `banned_admin`, `bad_header_admin`, `spam_admin`, `spam_subject_tag`, `spam_subject_tag2`, `message_size_limit`, `banned_rulenames`) VALUES(5, 1, 0, 'riud', 'riud', 'r', 'Normal', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'Y', '', '', '', '', '', '', 1, 4.5, 50, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '***SPAM***', '', NULL, NULL);
+INSERT INTO `spamfilter_policy` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `policy_name`, `virus_lover`, `spam_lover`, `banned_files_lover`, `bad_header_lover`, `bypass_virus_checks`, `bypass_spam_checks`, `bypass_banned_checks`, `bypass_header_checks`, `spam_modifies_subj`, `virus_quarantine_to`, `spam_quarantine_to`, `banned_quarantine_to`, `bad_header_quarantine_to`, `clean_quarantine_to`, `other_quarantine_to`, `spam_tag_level`, `spam_tag2_level`, `spam_kill_level`, `spam_dsn_cutoff_level`, `spam_quarantine_cutoff_level`, `addr_extension_virus`, `addr_extension_spam`, `addr_extension_banned`, `addr_extension_bad_header`, `warnvirusrecip`, `warnbannedrecip`, `warnbadhrecip`, `newvirus_admin`, `virus_admin`, `banned_admin`, `bad_header_admin`, `spam_admin`, `spam_subject_tag`, `spam_subject_tag2`, `message_size_limit`, `banned_rulenames`) VALUES(5, 1, 0, 'riud', 'riud', 'r', 'Normal', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'Y', '', '', '', '', '', '', 1, 4.5, 50, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '***SPAM***', NULL, NULL);
INSERT INTO `spamfilter_policy` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `policy_name`, `virus_lover`, `spam_lover`, `banned_files_lover`, `bad_header_lover`, `bypass_virus_checks`, `bypass_spam_checks`, `bypass_banned_checks`, `bypass_header_checks`, `spam_modifies_subj`, `virus_quarantine_to`, `spam_quarantine_to`, `banned_quarantine_to`, `bad_header_quarantine_to`, `clean_quarantine_to`, `other_quarantine_to`, `spam_tag_level`, `spam_tag2_level`, `spam_kill_level`, `spam_dsn_cutoff_level`, `spam_quarantine_cutoff_level`, `addr_extension_virus`, `addr_extension_spam`, `addr_extension_banned`, `addr_extension_bad_header`, `warnvirusrecip`, `warnbannedrecip`, `warnbadhrecip`, `newvirus_admin`, `virus_admin`, `banned_admin`, `bad_header_admin`, `spam_admin`, `spam_subject_tag`, `spam_subject_tag2`, `message_size_limit`, `banned_rulenames`) VALUES(6, 1, 0, 'riud', 'riud', 'r', 'Trigger happy', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, 3, 5, 5, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `spamfilter_policy` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `policy_name`, `virus_lover`, `spam_lover`, `banned_files_lover`, `bad_header_lover`, `bypass_virus_checks`, `bypass_spam_checks`, `bypass_banned_checks`, `bypass_header_checks`, `spam_modifies_subj`, `virus_quarantine_to`, `spam_quarantine_to`, `banned_quarantine_to`, `bad_header_quarantine_to`, `clean_quarantine_to`, `other_quarantine_to`, `spam_tag_level`, `spam_tag2_level`, `spam_kill_level`, `spam_dsn_cutoff_level`, `spam_quarantine_cutoff_level`, `addr_extension_virus`, `addr_extension_spam`, `addr_extension_banned`, `addr_extension_bad_header`, `warnvirusrecip`, `warnbannedrecip`, `warnbadhrecip`, `newvirus_admin`, `virus_admin`, `banned_admin`, `bad_header_admin`, `spam_admin`, `spam_subject_tag`, `spam_subject_tag2`, `message_size_limit`, `banned_rulenames`) VALUES(7, 1, 0, 'riud', 'riud', 'r', 'Permissive', 'N', 'N', 'N', 'Y', 'N', 'N', 'N', 'N', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, 3, 10, 20, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
index 9c2ec9c..7a7c958 100644
--- a/interface/lib/classes/tform.inc.php
+++ b/interface/lib/classes/tform.inc.php
@@ -476,8 +476,7 @@
if(is_array($field['value'])) {
$out = '';
foreach($field['value'] as $k => $v) {
- //$selected = ($k == $val)?' SELECTED':'';
- $selected = '';
+ $selected = ($k == $field["default"])?' SELECTED':'';
$out .= "<option value='$k'$selected>$v</option>\r\n";
}
}
diff --git a/interface/lib/lang/ru.lng b/interface/lib/lang/ru.lng
index 99382ad..5f66bf7 100644
--- a/interface/lib/lang/ru.lng
+++ b/interface/lib/lang/ru.lng
@@ -25,10 +25,11 @@
$wb['page_and_txt'] = 'и';
$wb['top_menu_system'] = 'Система';
$wb['top_menu_client'] = 'Клиент';
-$wb['top_menu_email'] = 'Email';
+$wb['top_menu_email'] = 'Почта';
$wb['top_menu_monitor'] = 'Монитор';
$wb['top_menu_sites'] = 'Сайты';
-$wb['top_menu_dns'] = 'DNS';
+$wb['top_menu_dns'] = 'ДНС';
$wb['top_menu_tools'] = 'Утилиты';
$wb['top_menu_help'] = 'Помощь';
?>
+
diff --git a/interface/web/admin/lib/lang/ru.lng b/interface/web/admin/lib/lang/ru.lng
index 8c300ee..19d632e 100644
--- a/interface/web/admin/lib/lang/ru.lng
+++ b/interface/web/admin/lib/lang/ru.lng
@@ -38,3 +38,4 @@
$wb['Merge'] = 'Объеденить';
$wb['Remote Users'] = 'Удаленные пользователи';
?>
+
diff --git a/interface/web/admin/lib/lang/ru_firewall.lng b/interface/web/admin/lib/lang/ru_firewall.lng
index 630a74f..dfe0c10 100644
--- a/interface/web/admin/lib/lang/ru_firewall.lng
+++ b/interface/web/admin/lib/lang/ru_firewall.lng
@@ -9,3 +9,4 @@
$wb['tcp_ports_error_regex'] = 'Недопустимый символ в указании tcp порта. Допустимые сиволы - цифры, : и ,';
$wb['udp_ports_error_regex'] = 'Недопустимый символ в указании udp порта. Допустимые сиволы - цифры, : и ,';
?>
+
diff --git a/interface/web/admin/lib/lang/ru_firewall_list.lng b/interface/web/admin/lib/lang/ru_firewall_list.lng
index f45169f..fc2fffa 100644
--- a/interface/web/admin/lib/lang/ru_firewall_list.lng
+++ b/interface/web/admin/lib/lang/ru_firewall_list.lng
@@ -6,3 +6,4 @@
$wb['udp_port_txt'] = 'Открытые UDP порты';
$wb['add_new_record_txt'] = 'Добавить запись Firewall';
?>
+
diff --git a/interface/web/admin/lib/lang/ru_groups.lng b/interface/web/admin/lib/lang/ru_groups.lng
index 88451b7..d377f5f 100644
--- a/interface/web/admin/lib/lang/ru_groups.lng
+++ b/interface/web/admin/lib/lang/ru_groups.lng
@@ -3,3 +3,4 @@
$wb['name_txt'] = 'Группа';
$wb['name_err'] = 'Группа должна иметь от 1 до 30 символов.';
?>
+
diff --git a/interface/web/admin/lib/lang/ru_groups_list.lng b/interface/web/admin/lib/lang/ru_groups_list.lng
index 91f1a1c..1495e69 100644
--- a/interface/web/admin/lib/lang/ru_groups_list.lng
+++ b/interface/web/admin/lib/lang/ru_groups_list.lng
@@ -5,3 +5,4 @@
$wb['add_new_record_txt'] = 'Добавить новую группу';
$wb['warning_txt'] = '<b>ВНИМАНИЕ:</b>Не удаляйте и не меняйте никаких настроек здесь. Используйте настройки клиента и реселлера в модуле КЛИЕНТ. Изменение пользователей или групп здесь может вызвать потерю данных!';
?>
+
diff --git a/interface/web/admin/lib/lang/ru_language_add.lng b/interface/web/admin/lib/lang/ru_language_add.lng
index 441769b..5d1d154 100644
--- a/interface/web/admin/lib/lang/ru_language_add.lng
+++ b/interface/web/admin/lib/lang/ru_language_add.lng
@@ -6,3 +6,4 @@
$wb['btn_cancel_txt'] = 'Назад';
$wb['language_new_hint_txt'] = '2 символа в языковом обозначении ISO 639-1 (Смотри http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)';
?>
+
diff --git a/interface/web/admin/lib/lang/ru_language_complete.lng b/interface/web/admin/lib/lang/ru_language_complete.lng
index ba6bc36..c7ade3c 100644
--- a/interface/web/admin/lib/lang/ru_language_complete.lng
+++ b/interface/web/admin/lib/lang/ru_language_complete.lng
@@ -5,3 +5,4 @@
$wb['btn_cancel_txt'] = 'Назад';
$wb['list_desc_txt'] = 'Объеденить выбранный язык с английским мастер-языком. <br />Это добавит пропущенные строки из мастер-языка.';
?>
+
diff --git a/interface/web/admin/lib/lang/ru_language_edit.lng b/interface/web/admin/lib/lang/ru_language_edit.lng
index 3a92ac2..b5cbb16 100644
--- a/interface/web/admin/lib/lang/ru_language_edit.lng
+++ b/interface/web/admin/lib/lang/ru_language_edit.lng
@@ -6,3 +6,4 @@
$wb['btn_save_txt'] = 'Сохранить';
$wb['btn_cancel_txt'] = 'Назад';
?>
+
diff --git a/interface/web/admin/lib/lang/ru_language_export.lng b/interface/web/admin/lib/lang/ru_language_export.lng
index 2ba7266..9a4a929 100644
--- a/interface/web/admin/lib/lang/ru_language_export.lng
+++ b/interface/web/admin/lib/lang/ru_language_export.lng
@@ -4,3 +4,4 @@
$wb['btn_save_txt'] = 'Экспортировать выбранный язык в файл';
$wb['btn_cancel_txt'] = 'Назад';
?>
+
diff --git a/interface/web/admin/lib/lang/ru_language_import.lng b/interface/web/admin/lib/lang/ru_language_import.lng
index c63cc14..f0b767e 100644
--- a/interface/web/admin/lib/lang/ru_language_import.lng
+++ b/interface/web/admin/lib/lang/ru_language_import.lng
@@ -6,3 +6,4 @@
$wb['btn_cancel_txt'] = 'Назад';
$wb['ignore_version_txt'] = 'Пропустить проверку версий ISPConfig';
?>
+
diff --git a/interface/web/admin/lib/lang/ru_language_list.lng b/interface/web/admin/lib/lang/ru_language_list.lng
index ac9f03b..72561a7 100644
--- a/interface/web/admin/lib/lang/ru_language_list.lng
+++ b/interface/web/admin/lib/lang/ru_language_list.lng
@@ -5,3 +5,4 @@
$wb['lang_file_txt'] = 'Выбрать язык';
$wb['lang_file_date_txt'] = 'Последнее изменение';
?>
+
diff --git a/interface/web/admin/lib/lang/ru_remote_user.lng b/interface/web/admin/lib/lang/ru_remote_user.lng
index fd75493..ceee7b9 100644
--- a/interface/web/admin/lib/lang/ru_remote_user.lng
+++ b/interface/web/admin/lib/lang/ru_remote_user.lng
@@ -40,3 +40,4 @@
$wb['DNS srv functions'] = 'Функции DNS srv';
$wb['DNS txt functions'] = 'Функции DNS txt';
?>
+
diff --git a/interface/web/admin/lib/lang/ru_remote_user_list.lng b/interface/web/admin/lib/lang/ru_remote_user_list.lng
index 0867e84..f1bcdf9 100644
--- a/interface/web/admin/lib/lang/ru_remote_user_list.lng
+++ b/interface/web/admin/lib/lang/ru_remote_user_list.lng
@@ -5,3 +5,4 @@
$wb['parent_remote_userid_txt'] = 'ID';
$wb['username_txt'] = 'Логин';
?>
+
diff --git a/interface/web/admin/lib/lang/ru_server.lng b/interface/web/admin/lib/lang/ru_server.lng
index 1ecad84..5575e65 100644
--- a/interface/web/admin/lib/lang/ru_server.lng
+++ b/interface/web/admin/lib/lang/ru_server.lng
@@ -11,3 +11,4 @@
$wb['mirror_server_id_txt'] = 'Зеркало сервера';
$wb['- None -'] = '- нет -';
?>
+
diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng
index 3afd074..c0530b6 100644
--- a/interface/web/admin/lib/lang/ru_server_config.lng
+++ b/interface/web/admin/lib/lang/ru_server_config.lng
@@ -66,3 +66,4 @@
$wb['htaccess_allow_override_txt'] = '.htaccess AllowOverride';
$wb['htaccess_allow_override_error_empty'] = '.htaccess AllowOverride пустой.';
?>
+
diff --git a/interface/web/admin/lib/lang/ru_server_config_list.lng b/interface/web/admin/lib/lang/ru_server_config_list.lng
index c0afd83..351caaf 100644
--- a/interface/web/admin/lib/lang/ru_server_config_list.lng
+++ b/interface/web/admin/lib/lang/ru_server_config_list.lng
@@ -2,3 +2,4 @@
$wb['list_head_txt'] = 'Настройки сервера';
$wb['server_name_txt'] = 'Сервер';
?>
+
diff --git a/interface/web/admin/lib/lang/ru_server_ip.lng b/interface/web/admin/lib/lang/ru_server_ip.lng
index 62dd69d..a835da0 100644
--- a/interface/web/admin/lib/lang/ru_server_ip.lng
+++ b/interface/web/admin/lib/lang/ru_server_ip.lng
@@ -5,3 +5,4 @@
$wb['ip_error_wrong'] = 'Неверный IP адрес';
$wb['ip_error_unique'] = 'IP адрес должен быть уникальным';
?>
+
diff --git a/interface/web/admin/lib/lang/ru_server_ip_list.lng b/interface/web/admin/lib/lang/ru_server_ip_list.lng
index c1af3c1..8e06c0a 100644
--- a/interface/web/admin/lib/lang/ru_server_ip_list.lng
+++ b/interface/web/admin/lib/lang/ru_server_ip_list.lng
@@ -4,3 +4,4 @@
$wb['ip_address_txt'] = 'IP адрес';
$wb['add_new_record_txt'] = 'Добавить новый IP адрес';
?>
+
diff --git a/interface/web/admin/lib/lang/ru_server_list.lng b/interface/web/admin/lib/lang/ru_server_list.lng
index 15bded6..4290a69 100644
--- a/interface/web/admin/lib/lang/ru_server_list.lng
+++ b/interface/web/admin/lib/lang/ru_server_list.lng
@@ -1,11 +1,12 @@
<?php
$wb['list_head_txt'] = 'Сервер';
$wb['server_name_txt'] = 'Имя';
-$wb['mail_server_txt'] = 'Mail';
-$wb['web_server_txt'] = 'Web';
-$wb['dns_server_txt'] = 'DNS';
+$wb['mail_server_txt'] = 'Почта';
+$wb['web_server_txt'] = 'Веб';
+$wb['dns_server_txt'] = 'ДНС';
$wb['file_server_txt'] = 'Файл';
$wb['db_server_txt'] = 'БД';
$wb['vserver_server_txt'] = 'VСервер';
$wb['add_new_record_txt'] = 'Добавить новый сервер';
?>
+
diff --git a/interface/web/admin/lib/lang/ru_software_package_list.lng b/interface/web/admin/lib/lang/ru_software_package_list.lng
index 7277987..7c4fbd8 100644
--- a/interface/web/admin/lib/lang/ru_software_package_list.lng
+++ b/interface/web/admin/lib/lang/ru_software_package_list.lng
@@ -5,3 +5,4 @@
$wb['package_description_txt'] = 'Описание';
$wb['action_txt'] = 'Действие';
?>
+
diff --git a/interface/web/admin/lib/lang/ru_software_repo.lng b/interface/web/admin/lib/lang/ru_software_repo.lng
index 74fb30e..7d5abbc 100644
--- a/interface/web/admin/lib/lang/ru_software_repo.lng
+++ b/interface/web/admin/lib/lang/ru_software_repo.lng
@@ -5,3 +5,4 @@
$wb['repo_password_txt'] = 'Пароль (опционально)';
$wb['active_txt'] = 'Активен?';
?>
+
diff --git a/interface/web/admin/lib/lang/ru_software_repo_list.lng b/interface/web/admin/lib/lang/ru_software_repo_list.lng
index 22b0ad8..7989ba4 100644
--- a/interface/web/admin/lib/lang/ru_software_repo_list.lng
+++ b/interface/web/admin/lib/lang/ru_software_repo_list.lng
@@ -4,3 +4,4 @@
$wb['repo_name_txt'] = 'Репозитарии';
$wb['repo_url_txt'] = 'URL';
?>
+
diff --git a/interface/web/admin/lib/lang/ru_software_update_list.lng b/interface/web/admin/lib/lang/ru_software_update_list.lng
index b0af5ed..41fcbd4 100644
--- a/interface/web/admin/lib/lang/ru_software_update_list.lng
+++ b/interface/web/admin/lib/lang/ru_software_update_list.lng
@@ -6,3 +6,4 @@
$wb['action_txt'] = 'Действие';
$wb['server_select_txt'] = 'Выберите сервер';
?>
+
diff --git a/interface/web/admin/lib/lang/ru_system_config.lng b/interface/web/admin/lib/lang/ru_system_config.lng
index 23eab03..823cb74 100644
--- a/interface/web/admin/lib/lang/ru_system_config.lng
+++ b/interface/web/admin/lib/lang/ru_system_config.lng
@@ -13,3 +13,4 @@
$wb['webmail_url_txt'] = 'Webmail URL';
$wb['phpmyadmin_url_txt'] = 'PHPMyAdmin URL';
?>
+
diff --git a/interface/web/admin/lib/lang/ru_users.lng b/interface/web/admin/lib/lang/ru_users.lng
index 1ad0008..b29c020 100644
--- a/interface/web/admin/lib/lang/ru_users.lng
+++ b/interface/web/admin/lib/lang/ru_users.lng
@@ -26,3 +26,4 @@
$wb['password_strength_txt'] = 'Стойкость пароля';
$wb['startmodule_err'] = 'Стартовый модуль вне дозволенных модулей';
?>
+
diff --git a/interface/web/admin/lib/lang/ru_users_list.lng b/interface/web/admin/lib/lang/ru_users_list.lng
index f39233d..62f17c6 100644
--- a/interface/web/admin/lib/lang/ru_users_list.lng
+++ b/interface/web/admin/lib/lang/ru_users_list.lng
@@ -7,3 +7,4 @@
$wb['add_new_record_txt'] = 'Добавить нового пользователя';
$wb['warning_txt'] = '<b>ВНИМАНИЕ:</b>Не удаляйте и не меняйте никаких настроек здесь. Используйте настройки клиента и реселлера в модуле КЛИЕНТ. Изменение пользователей или групп здесь может вызвать потерю данных!';
?>
+
diff --git a/interface/web/client/lib/lang/ru.lng b/interface/web/client/lib/lang/ru.lng
index bc900f9..a2679b2 100644
--- a/interface/web/client/lib/lang/ru.lng
+++ b/interface/web/client/lib/lang/ru.lng
@@ -11,3 +11,4 @@
$wb['Resellers'] = 'Реселлеры';
$wb['error_has_clients'] = 'У реселлера есть клиенты. Вначале удалите их.';
?>
+
diff --git a/interface/web/client/lib/lang/ru_client.lng b/interface/web/client/lib/lang/ru_client.lng
index 36817aa..e1a38d4 100644
--- a/interface/web/client/lib/lang/ru_client.lng
+++ b/interface/web/client/lib/lang/ru_client.lng
@@ -92,3 +92,4 @@
$wb['limit_traffic_quota_txt'] = 'Квота трафика';
$wb['limit_trafficquota_error_notint'] = 'Квота трафика должна быть числом.';
?>
+
diff --git a/interface/web/client/lib/lang/ru_client_del.lng b/interface/web/client/lib/lang/ru_client_del.lng
index 96a5774..d792617 100644
--- a/interface/web/client/lib/lang/ru_client_del.lng
+++ b/interface/web/client/lib/lang/ru_client_del.lng
@@ -4,3 +4,4 @@
$wb['btn_save_txt'] = 'Удалить клиента';
$wb['btn_cancel_txt'] = 'Отменить без удаления';
?>
+
diff --git a/interface/web/client/lib/lang/ru_client_template.lng b/interface/web/client/lib/lang/ru_client_template.lng
index 9ab2eba..d630f34 100644
--- a/interface/web/client/lib/lang/ru_client_template.lng
+++ b/interface/web/client/lib/lang/ru_client_template.lng
@@ -55,3 +55,4 @@
$wb['limit_traffic_quota_txt'] = 'Квота трафика';
$wb['limit_trafficquota_error_notint'] = 'Квота трафика должа быть числом.';
?>
+
diff --git a/interface/web/client/lib/lang/ru_client_template_list.lng b/interface/web/client/lib/lang/ru_client_template_list.lng
index b1a90d8..9aab2f5 100644
--- a/interface/web/client/lib/lang/ru_client_template_list.lng
+++ b/interface/web/client/lib/lang/ru_client_template_list.lng
@@ -3,3 +3,4 @@
$wb['template_type_txt'] = 'Тип';
$wb['template_name_txt'] = 'Имя шаблона';
?>
+
diff --git a/interface/web/client/lib/lang/ru_clients_list.lng b/interface/web/client/lib/lang/ru_clients_list.lng
index b9786d5..3621300 100644
--- a/interface/web/client/lib/lang/ru_clients_list.lng
+++ b/interface/web/client/lib/lang/ru_clients_list.lng
@@ -7,3 +7,4 @@
$wb['client_id_txt'] = 'ID';
$wb['add_new_record_txt'] = 'Добавить клиента';
?>
+
diff --git a/interface/web/client/lib/lang/ru_reseller.lng b/interface/web/client/lib/lang/ru_reseller.lng
index da0ef8d..0976344 100644
--- a/interface/web/client/lib/lang/ru_reseller.lng
+++ b/interface/web/client/lib/lang/ru_reseller.lng
@@ -91,3 +91,4 @@
$wb['limit_traffic_quota_txt'] = 'Квота трафика';
$wb['limit_trafficquota_error_notint'] = 'Квота трафика должна быть числом.';
?>
+
diff --git a/interface/web/client/lib/lang/ru_resellers_list.lng b/interface/web/client/lib/lang/ru_resellers_list.lng
index 7db8343..3d89767 100644
--- a/interface/web/client/lib/lang/ru_resellers_list.lng
+++ b/interface/web/client/lib/lang/ru_resellers_list.lng
@@ -7,3 +7,4 @@
$wb['country_txt'] = 'Страна';
$wb['add_new_record_txt'] = 'Добавить реселлера';
?>
+
diff --git a/interface/web/client/templates/clients_list.htm b/interface/web/client/templates/clients_list.htm
index 76e9bd1..d241577 100644
--- a/interface/web/client/templates/clients_list.htm
+++ b/interface/web/client/templates/clients_list.htm
@@ -43,7 +43,7 @@
<td class="tbl_col_city"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="city"}</a></td>
<td class="tbl_col_country"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="country"}</a></td>
<td class="tbl_col_buttons">
- <div class="buttons icons16">
+ <div class="buttons icons16" style="width:60px;">
<a class="icons16 icoLoginAs" href="#" onclick="loadContent('admin/login_as.php?cid={tmpl_var name='id'}');"><span>{tmpl_var name='login_as_txt'}</span></a>
<a class="icons16 icoDelete" href="javascript: del_record('client/client_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
</div>
diff --git a/interface/web/client/templates/resellers_list.htm b/interface/web/client/templates/resellers_list.htm
index b6c1707..10cdf9b 100644
--- a/interface/web/client/templates/resellers_list.htm
+++ b/interface/web/client/templates/resellers_list.htm
@@ -43,7 +43,7 @@
<td class="tbl_col_city"><a href="#" onClick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="city"}</a></td>
<td class="tbl_col_country"><a href="#" onClick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="country"}</a></td>
<td class="tbl_col_buttons">
- <div class="buttons icons16">
+ <div class="buttons icons16" style="width:60px;">
<a class="icons16 icoLoginAs" href="#" onclick="loadContent('admin/login_as.php?cid={tmpl_var name='id'}');"><span>{tmpl_var name='login_as_txt'}</span></a>
<a class="icons16 icoDelete" href="javascript: del_record('client/reseller_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
</div>
diff --git a/interface/web/designer/lib/lang/ru.lng b/interface/web/designer/lib/lang/ru.lng
index acb6c35..29f4a51 100644
--- a/interface/web/designer/lib/lang/ru.lng
+++ b/interface/web/designer/lib/lang/ru.lng
@@ -1,2 +1,3 @@
<?php
?>
+
diff --git a/interface/web/designer/lib/lang/ru_form_edit.lng b/interface/web/designer/lib/lang/ru_form_edit.lng
index 36c0bf4..f1f6768 100644
--- a/interface/web/designer/lib/lang/ru_form_edit.lng
+++ b/interface/web/designer/lib/lang/ru_form_edit.lng
@@ -22,3 +22,4 @@
$wb['auth_preset_perm_group_txt'] = 'Perm. Group';
$wb['auth_preset_perm_other_txt'] = 'Perm. Other';
?>
+
diff --git a/interface/web/designer/lib/lang/ru_form_list.lng b/interface/web/designer/lib/lang/ru_form_list.lng
index 3db8db8..d29fdbe 100644
--- a/interface/web/designer/lib/lang/ru_form_list.lng
+++ b/interface/web/designer/lib/lang/ru_form_list.lng
@@ -5,3 +5,4 @@
$wb['title_txt'] = 'Заголовок';
$wb['description_txt'] = 'Описание';
?>
+
diff --git a/interface/web/designer/lib/lang/ru_form_show.lng b/interface/web/designer/lib/lang/ru_form_show.lng
index 8b0132b..204f866 100644
--- a/interface/web/designer/lib/lang/ru_form_show.lng
+++ b/interface/web/designer/lib/lang/ru_form_show.lng
@@ -16,3 +16,4 @@
$wb['menu_del_txt'] = 'Удалить меню и подменю?';
$wb['item_del_txt'] = 'Удалить menuitem?';
?>
+
diff --git a/interface/web/designer/lib/lang/ru_module_edit.lng b/interface/web/designer/lib/lang/ru_module_edit.lng
index b7c2aaf..0b60784 100644
--- a/interface/web/designer/lib/lang/ru_module_edit.lng
+++ b/interface/web/designer/lib/lang/ru_module_edit.lng
@@ -20,3 +20,4 @@
<b>Подсказка:</b> Все пути в директории web относительные.
';
?>
+
diff --git a/interface/web/designer/lib/lang/ru_module_list.lng b/interface/web/designer/lib/lang/ru_module_list.lng
index 2401318..e305b40 100644
--- a/interface/web/designer/lib/lang/ru_module_list.lng
+++ b/interface/web/designer/lib/lang/ru_module_list.lng
@@ -3,3 +3,4 @@
$wb['module_txt'] = 'Модуль';
$wb['title_txt'] = 'Заголовок';
?>
+
diff --git a/interface/web/designer/lib/lang/ru_module_nav_edit.lng b/interface/web/designer/lib/lang/ru_module_nav_edit.lng
index 6fb4cc7..ad02af8 100644
--- a/interface/web/designer/lib/lang/ru_module_nav_edit.lng
+++ b/interface/web/designer/lib/lang/ru_module_nav_edit.lng
@@ -4,3 +4,4 @@
$wb['save_txt'] = 'Сохранить';
$wb['cancel_txt'] = 'Отмена';
?>
+
diff --git a/interface/web/designer/lib/lang/ru_module_nav_item_edit.lng b/interface/web/designer/lib/lang/ru_module_nav_item_edit.lng
index ab458ee..f42aafd 100644
--- a/interface/web/designer/lib/lang/ru_module_nav_item_edit.lng
+++ b/interface/web/designer/lib/lang/ru_module_nav_item_edit.lng
@@ -6,3 +6,4 @@
$wb['save_txt'] = 'Сохранить';
$wb['cancel_txt'] = 'Закончить';
?>
+
diff --git a/interface/web/designer/lib/lang/ru_module_show.lng b/interface/web/designer/lib/lang/ru_module_show.lng
index 25dc983..ddb1a5f 100644
--- a/interface/web/designer/lib/lang/ru_module_show.lng
+++ b/interface/web/designer/lib/lang/ru_module_show.lng
@@ -14,3 +14,4 @@
$wb['menu_del_txt'] = 'Хотите удалить меню вместе с пунктами?';
$wb['item_del_txt'] = 'Хотите удалить пункт меню?';
?>
+
diff --git a/interface/web/dns/lib/lang/ru.lng b/interface/web/dns/lib/lang/ru.lng
index 72b8517..b47936e 100644
--- a/interface/web/dns/lib/lang/ru.lng
+++ b/interface/web/dns/lib/lang/ru.lng
@@ -18,3 +18,4 @@
$wb['Add DNS Zone'] = 'Добавить зону DNS';
$wb['Templates'] = 'Шаблоны';
?>
+
diff --git a/interface/web/dns/lib/lang/ru_dns_a.lng b/interface/web/dns/lib/lang/ru_dns_a.lng
index f96785b..81647b9 100644
--- a/interface/web/dns/lib/lang/ru_dns_a.lng
+++ b/interface/web/dns/lib/lang/ru_dns_a.lng
@@ -14,3 +14,4 @@
$wb['data_error_regex'] = 'Формат IP-адреса неправилен';
$wb['data_error_duplicate'] = 'Дубль A-записи';
?>
+
diff --git a/interface/web/dns/lib/lang/ru_dns_a_list.lng b/interface/web/dns/lib/lang/ru_dns_a_list.lng
index 4fe0594..803d4d6 100644
--- a/interface/web/dns/lib/lang/ru_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/ru_dns_a_list.lng
@@ -12,3 +12,4 @@
$wb['page_of_txt'] = 'из';
$wb['delete_confirmation'] = 'Вы действительно хотите удалить эту запись?';
?>
+
diff --git a/interface/web/dns/lib/lang/ru_dns_aaaa.lng b/interface/web/dns/lib/lang/ru_dns_aaaa.lng
index 6c01f2c..8692069 100644
--- a/interface/web/dns/lib/lang/ru_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/ru_dns_aaaa.lng
@@ -13,3 +13,4 @@
$wb['data_error_empty'] = 'Пустой IP-адрес';
$wb['data_error_regex'] = 'Неверный формат IP-адреса';
?>
+
diff --git a/interface/web/dns/lib/lang/ru_dns_alias.lng b/interface/web/dns/lib/lang/ru_dns_alias.lng
index 049fc13..784f99e 100644
--- a/interface/web/dns/lib/lang/ru_dns_alias.lng
+++ b/interface/web/dns/lib/lang/ru_dns_alias.lng
@@ -13,3 +13,4 @@
$wb['data_error_empty'] = 'Целевое имя узла пустое';
$wb['data_error_regex'] = 'Целевое имя узла в неправильном формате';
?>
+
diff --git a/interface/web/dns/lib/lang/ru_dns_cname.lng b/interface/web/dns/lib/lang/ru_dns_cname.lng
index 9789c0d..6089373 100644
--- a/interface/web/dns/lib/lang/ru_dns_cname.lng
+++ b/interface/web/dns/lib/lang/ru_dns_cname.lng
@@ -13,3 +13,4 @@
$wb['data_error_empty'] = 'Целевое имя узла пустое';
$wb['data_error_regex'] = 'Целевое имя узла имеет неправильный формат';
?>
+
diff --git a/interface/web/dns/lib/lang/ru_dns_hinfo.lng b/interface/web/dns/lib/lang/ru_dns_hinfo.lng
index 4b66195..986891e 100644
--- a/interface/web/dns/lib/lang/ru_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/ru_dns_hinfo.lng
@@ -13,3 +13,4 @@
$wb['data_error_empty'] = 'Информация об узле отсутсвует';
$wb['data_error_regex'] = 'Поле Host Information имеет неправильный формат';
?>
+
diff --git a/interface/web/dns/lib/lang/ru_dns_mx.lng b/interface/web/dns/lib/lang/ru_dns_mx.lng
index d4ec0ad..d1bcbb2 100644
--- a/interface/web/dns/lib/lang/ru_dns_mx.lng
+++ b/interface/web/dns/lib/lang/ru_dns_mx.lng
@@ -14,3 +14,4 @@
$wb['data_error_empty'] = 'Mailserver имя узла пустое';
$wb['data_error_regex'] = 'Mailserver имя узла в неправильном формате';
?>
+
diff --git a/interface/web/dns/lib/lang/ru_dns_ns.lng b/interface/web/dns/lib/lang/ru_dns_ns.lng
index d48542b..8e9f7d6 100644
--- a/interface/web/dns/lib/lang/ru_dns_ns.lng
+++ b/interface/web/dns/lib/lang/ru_dns_ns.lng
@@ -13,3 +13,4 @@
$wb['data_error_empty'] = 'Nameserver пустой';
$wb['data_error_regex'] = 'Nameserver имеет неправильный формат';
?>
+
diff --git a/interface/web/dns/lib/lang/ru_dns_ptr.lng b/interface/web/dns/lib/lang/ru_dns_ptr.lng
index 18f6fc9..2e5e000 100644
--- a/interface/web/dns/lib/lang/ru_dns_ptr.lng
+++ b/interface/web/dns/lib/lang/ru_dns_ptr.lng
@@ -13,3 +13,4 @@
$wb['data_error_empty'] = 'Canonical hostname пустой';
$wb['data_error_regex'] = 'Canonical hostname имеет неправильный формат';
?>
+
diff --git a/interface/web/dns/lib/lang/ru_dns_rp.lng b/interface/web/dns/lib/lang/ru_dns_rp.lng
index f0d8e09..2201506 100644
--- a/interface/web/dns/lib/lang/ru_dns_rp.lng
+++ b/interface/web/dns/lib/lang/ru_dns_rp.lng
@@ -13,3 +13,4 @@
$wb['data_error_empty'] = 'Поле ответственная особа пустое';
$wb['data_error_regex'] = 'Поле ответственная особа имеет неправильный формат';
?>
+
diff --git a/interface/web/dns/lib/lang/ru_dns_soa.lng b/interface/web/dns/lib/lang/ru_dns_soa.lng
index 7723d71..03dfdeb 100644
--- a/interface/web/dns/lib/lang/ru_dns_soa.lng
+++ b/interface/web/dns/lib/lang/ru_dns_soa.lng
@@ -24,3 +24,4 @@
$wb['also_notify_txt'] = 'Известить';
$wb['update_acl_txt'] = 'Обновить ACL';
?>
+
diff --git a/interface/web/dns/lib/lang/ru_dns_soa_list.lng b/interface/web/dns/lib/lang/ru_dns_soa_list.lng
index 908b3ca..250f49a 100644
--- a/interface/web/dns/lib/lang/ru_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/ru_dns_soa_list.lng
@@ -7,3 +7,4 @@
$wb['mbox_txt'] = 'Email';
$wb['add_new_record_txt'] = 'Добавить новую DNS Zone (SOA)';
?>
+
diff --git a/interface/web/dns/lib/lang/ru_dns_srv.lng b/interface/web/dns/lib/lang/ru_dns_srv.lng
index a6abe8d..dece24a 100644
--- a/interface/web/dns/lib/lang/ru_dns_srv.lng
+++ b/interface/web/dns/lib/lang/ru_dns_srv.lng
@@ -14,3 +14,4 @@
$wb['data_error_regex'] = 'Сервер record имеет неправильный формат';
$wb['srv_error_regex'] = 'Неверный формат сервера record. Сервер record должен содержать 3 текстовые строки разделенные пробелом.';
?>
+
diff --git a/interface/web/dns/lib/lang/ru_dns_template.lng b/interface/web/dns/lib/lang/ru_dns_template.lng
index a187abd..9b9b0c1 100644
--- a/interface/web/dns/lib/lang/ru_dns_template.lng
+++ b/interface/web/dns/lib/lang/ru_dns_template.lng
@@ -4,3 +4,4 @@
$wb['template_txt'] = 'Шаблон';
$wb['visible_txt'] = 'Видимый';
?>
+
diff --git a/interface/web/dns/lib/lang/ru_dns_template_list.lng b/interface/web/dns/lib/lang/ru_dns_template_list.lng
index 0d706d0..b9c4fc3 100644
--- a/interface/web/dns/lib/lang/ru_dns_template_list.lng
+++ b/interface/web/dns/lib/lang/ru_dns_template_list.lng
@@ -4,3 +4,4 @@
$wb['name_txt'] = 'Имя';
$wb['add_new_record_txt'] = 'Добавить запись';
?>
+
diff --git a/interface/web/dns/lib/lang/ru_dns_txt.lng b/interface/web/dns/lib/lang/ru_dns_txt.lng
index e53273c..98e342f 100644
--- a/interface/web/dns/lib/lang/ru_dns_txt.lng
+++ b/interface/web/dns/lib/lang/ru_dns_txt.lng
@@ -13,3 +13,4 @@
$wb['data_error_empty'] = 'Текст пустой';
$wb['data_error_regex'] = 'Формат неправилен';
?>
+
diff --git a/interface/web/dns/lib/lang/ru_dns_wizard.lng b/interface/web/dns/lib/lang/ru_dns_wizard.lng
index 4081db4..62f2759 100644
--- a/interface/web/dns/lib/lang/ru_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/ru_dns_wizard.lng
@@ -27,3 +27,4 @@
$wb['error_ns2_regex'] = 'NS2 содержит неверные символы.';
$wb['error_email_regex'] = 'E-mail не содержит правильного e-mail адреса.';
?>
+
diff --git a/interface/web/help/lib/lang/ru.lng b/interface/web/help/lib/lang/ru.lng
index 16a245d..be5e01d 100644
--- a/interface/web/help/lib/lang/ru.lng
+++ b/interface/web/help/lib/lang/ru.lng
@@ -1,9 +1,10 @@
<?php
-$wb['Support Message'] = 'Support Message';
-$wb['Message'] = 'Message';
-$wb['Send message'] = 'Send message';
-$wb['View messages'] = 'View messages';
-$wb['Support'] = 'Support';
-$wb['About ISPConfig'] = 'About ISPConfig';
-$wb['Version'] = 'Version';
+$wb['Support Message'] = 'Подготовка запроса';
+$wb['Message'] = 'Сообщение';
+$wb['Send message'] = 'Послать сообщение';
+$wb['View messages'] = 'Просмотр сообщений';
+$wb['Support'] = 'Поддержка';
+$wb['About ISPConfig'] = 'Об ISPConfig';
+$wb['Version'] = 'Показать версию';
?>
+
diff --git a/interface/web/help/lib/lang/ru_support_message.lng b/interface/web/help/lib/lang/ru_support_message.lng
index 93e2a03..d59eb1f 100644
--- a/interface/web/help/lib/lang/ru_support_message.lng
+++ b/interface/web/help/lib/lang/ru_support_message.lng
@@ -5,3 +5,4 @@
$wb['message_txt'] = 'Сообщение';
$wb['tstamp_txt'] = 'Штамп времени';
?>
+
diff --git a/interface/web/help/lib/lang/ru_support_message_list.lng b/interface/web/help/lib/lang/ru_support_message_list.lng
index a25816b..679d55c 100644
--- a/interface/web/help/lib/lang/ru_support_message_list.lng
+++ b/interface/web/help/lib/lang/ru_support_message_list.lng
@@ -4,3 +4,4 @@
$wb['subject_txt'] = 'Тема';
$wb['add_new_record_txt'] = 'Создайте новое сообщение службы поддержки';
?>
+
diff --git a/interface/web/login/lib/lang/ru.lng b/interface/web/login/lib/lang/ru.lng
index 55ee5e9..200d43d 100644
--- a/interface/web/login/lib/lang/ru.lng
+++ b/interface/web/login/lib/lang/ru.lng
@@ -15,3 +15,4 @@
$wb['password_txt'] = 'Пароль';
$wb['login_button_txt'] = 'Войти';
?>
+
diff --git a/interface/web/mail/lib/lang/ru.lng b/interface/web/mail/lib/lang/ru.lng
index 8dca4b7..eaeaf4d 100644
--- a/interface/web/mail/lib/lang/ru.lng
+++ b/interface/web/mail/lib/lang/ru.lng
@@ -45,3 +45,4 @@
$wb['Domain Alias'] = 'Алиасы доменов';
$wb['Relay Recipients'] = 'Relay получатели';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_mail_alias.lng b/interface/web/mail/lib/lang/ru_mail_alias.lng
index 7844037..31408f9 100644
--- a/interface/web/mail/lib/lang/ru_mail_alias.lng
+++ b/interface/web/mail/lib/lang/ru_mail_alias.lng
@@ -9,3 +9,4 @@
$wb['limit_mailalias_txt'] = 'Максимальное число алиасов достигнуто.';
$wb['duplicate_mailbox_txt'] = 'Ящик с таким e-mail уже существует';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_mail_alias_list.lng b/interface/web/mail/lib/lang/ru_mail_alias_list.lng
index c6c2513..079c769 100644
--- a/interface/web/mail/lib/lang/ru_mail_alias_list.lng
+++ b/interface/web/mail/lib/lang/ru_mail_alias_list.lng
@@ -6,3 +6,4 @@
$wb['email_txt'] = 'Email';
$wb['add_new_record_txt'] = 'Добавить новый Email алиас';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_mail_aliasdomain.lng b/interface/web/mail/lib/lang/ru_mail_aliasdomain.lng
index 1397912..10f6db6 100644
--- a/interface/web/mail/lib/lang/ru_mail_aliasdomain.lng
+++ b/interface/web/mail/lib/lang/ru_mail_aliasdomain.lng
@@ -9,3 +9,4 @@
$wb['source_error_unique'] = 'Дублирование исходного домена.';
$wb['source_error_regex'] = 'Неверное имя исходного домена.';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/ru_mail_aliasdomain_list.lng
index 879d09f..cfc1338 100644
--- a/interface/web/mail/lib/lang/ru_mail_aliasdomain_list.lng
+++ b/interface/web/mail/lib/lang/ru_mail_aliasdomain_list.lng
@@ -5,3 +5,4 @@
$wb['destination_txt'] = 'Назначение';
$wb['add_new_record_txt'] = 'Добавить алиас';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_mail_blacklist.lng b/interface/web/mail/lib/lang/ru_mail_blacklist.lng
index 9a01670..e0136d2 100644
--- a/interface/web/mail/lib/lang/ru_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/ru_mail_blacklist.lng
@@ -7,3 +7,4 @@
$wb['type_txt'] = 'Тип';
$wb['limit_mailfilter_txt'] = 'Максимальное число почтовых фильтров достигнуто.';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_mail_blacklist_list.lng b/interface/web/mail/lib/lang/ru_mail_blacklist_list.lng
index 78b58a9..2397416 100644
--- a/interface/web/mail/lib/lang/ru_mail_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/ru_mail_blacklist_list.lng
@@ -8,3 +8,4 @@
$wb['add_new_record_txt'] = 'Добавить новую запись в чернрый список';
$wb['access_txt'] = 'доступ';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_mail_content_filter.lng b/interface/web/mail/lib/lang/ru_mail_content_filter.lng
index 560786b..74514c3 100644
--- a/interface/web/mail/lib/lang/ru_mail_content_filter.lng
+++ b/interface/web/mail/lib/lang/ru_mail_content_filter.lng
@@ -7,3 +7,4 @@
$wb['active_txt'] = 'Активен?';
$wb['pattern_error_empty'] = 'Шаблон пустой.';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_mail_content_filter_list.lng b/interface/web/mail/lib/lang/ru_mail_content_filter_list.lng
index 24850fd..f392584 100644
--- a/interface/web/mail/lib/lang/ru_mail_content_filter_list.lng
+++ b/interface/web/mail/lib/lang/ru_mail_content_filter_list.lng
@@ -6,3 +6,4 @@
$wb['action_txt'] = 'Действие';
$wb['add_new_record_txt'] = 'Добавить новый контентный фильтр';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_mail_domain.lng b/interface/web/mail/lib/lang/ru_mail_domain.lng
index d59edee..1ce7bcf 100644
--- a/interface/web/mail/lib/lang/ru_mail_domain.lng
+++ b/interface/web/mail/lib/lang/ru_mail_domain.lng
@@ -11,3 +11,4 @@
$wb['policy_txt'] = 'Спам-фильтр';
$wb['no_policy'] = '- не включено -';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_mail_domain_catchall.lng b/interface/web/mail/lib/lang/ru_mail_domain_catchall.lng
index 027a4db..c33e7ed 100644
--- a/interface/web/mail/lib/lang/ru_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/ru_mail_domain_catchall.lng
@@ -7,3 +7,4 @@
$wb['domain_error_regex'] = 'Неправльная запись или неразрешенные символы.';
$wb['limit_mailcatchall_txt'] = 'Максимальное число catchall записей, достигнуто.';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/ru_mail_domain_catchall_list.lng
index 7641364..53fba7f 100644
--- a/interface/web/mail/lib/lang/ru_mail_domain_catchall_list.lng
+++ b/interface/web/mail/lib/lang/ru_mail_domain_catchall_list.lng
@@ -7,3 +7,4 @@
$wb['domain_txt'] = 'Домен';
$wb['add_new_record_txt'] = 'Добавить Catchall';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_mail_domain_list.lng b/interface/web/mail/lib/lang/ru_mail_domain_list.lng
index ab1987d..d791191 100644
--- a/interface/web/mail/lib/lang/ru_mail_domain_list.lng
+++ b/interface/web/mail/lib/lang/ru_mail_domain_list.lng
@@ -5,3 +5,4 @@
$wb['add_new_record_txt'] = 'Добавить новый домен';
$wb['active_txt'] = 'Активен?';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_mail_forward.lng b/interface/web/mail/lib/lang/ru_mail_forward.lng
index 398cd45..91c8de4 100644
--- a/interface/web/mail/lib/lang/ru_mail_forward.lng
+++ b/interface/web/mail/lib/lang/ru_mail_forward.lng
@@ -5,3 +5,4 @@
$wb['limit_mailforward_txt'] = 'Максимальное число forwarders достигнуто.';
$wb['duplicate_mailbox_txt'] = 'Ящик с таким именем уже существует';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_mail_forward_list.lng b/interface/web/mail/lib/lang/ru_mail_forward_list.lng
index 79437ec..6fbccc2 100644
--- a/interface/web/mail/lib/lang/ru_mail_forward_list.lng
+++ b/interface/web/mail/lib/lang/ru_mail_forward_list.lng
@@ -6,3 +6,4 @@
$wb['email_txt'] = 'Email';
$wb['add_new_record_txt'] = 'Добавить новую Email пересылку';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_mail_get.lng b/interface/web/mail/lib/lang/ru_mail_get.lng
index 7a06123..d1df0ca 100644
--- a/interface/web/mail/lib/lang/ru_mail_get.lng
+++ b/interface/web/mail/lib/lang/ru_mail_get.lng
@@ -14,3 +14,4 @@
$wb['destination_error_isemail'] = 'Не выбран получатель.';
$wb['source_server_error_regex'] = 'Неверное доменное имя для сервера Pop3/Imap.';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_mail_get_list.lng b/interface/web/mail/lib/lang/ru_mail_get_list.lng
index f7f31e7..6243568 100644
--- a/interface/web/mail/lib/lang/ru_mail_get_list.lng
+++ b/interface/web/mail/lib/lang/ru_mail_get_list.lng
@@ -7,3 +7,4 @@
$wb['destination_txt'] = 'Получатель';
$wb['add_new_record_txt'] = 'Добавить новый счет';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_mail_relay_recipient.lng b/interface/web/mail/lib/lang/ru_mail_relay_recipient.lng
index e44a613..f01fe73 100644
--- a/interface/web/mail/lib/lang/ru_mail_relay_recipient.lng
+++ b/interface/web/mail/lib/lang/ru_mail_relay_recipient.lng
@@ -7,3 +7,4 @@
$wb['type_txt'] = 'Тип';
$wb['limit_mailfilter_txt'] = 'Достигнуто макс. количество почтовых фильтров для вашего аккаунта.';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/ru_mail_relay_recipient_list.lng
index d0aa578..e319641 100644
--- a/interface/web/mail/lib/lang/ru_mail_relay_recipient_list.lng
+++ b/interface/web/mail/lib/lang/ru_mail_relay_recipient_list.lng
@@ -7,3 +7,4 @@
$wb['add_new_record_txt'] = 'Добавить нового relay получателя';
$wb['access_txt'] = 'доступ';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_mail_spamfilter.lng b/interface/web/mail/lib/lang/ru_mail_spamfilter.lng
index c56c923..4b9003b 100644
--- a/interface/web/mail/lib/lang/ru_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/ru_mail_spamfilter.lng
@@ -15,3 +15,4 @@
$wb['spam_redirect_maildir_purge_txt'] = 'Очищать Maildir после';
$wb['days_txt'] = 'дней.';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/ru_mail_spamfilter_list.lng
index 114031b..60ea0a8 100644
--- a/interface/web/mail/lib/lang/ru_mail_spamfilter_list.lng
+++ b/interface/web/mail/lib/lang/ru_mail_spamfilter_list.lng
@@ -6,3 +6,4 @@
$wb['add_new_record_txt'] = 'Добавить новую спам запись';
$wb['list_head_txt'] = 'Спам-фильтр';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_mail_transport.lng b/interface/web/mail/lib/lang/ru_mail_transport.lng
index 0afb26d..8120616 100644
--- a/interface/web/mail/lib/lang/ru_mail_transport.lng
+++ b/interface/web/mail/lib/lang/ru_mail_transport.lng
@@ -8,3 +8,4 @@
$wb['active_txt'] = 'Активен?';
$wb['limit_mailrouting_txt'] = 'Достигнуто макс. количество маршрутов для вашего аккаунта.';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_mail_transport_list.lng b/interface/web/mail/lib/lang/ru_mail_transport_list.lng
index ed0bbc7..7a83161 100644
--- a/interface/web/mail/lib/lang/ru_mail_transport_list.lng
+++ b/interface/web/mail/lib/lang/ru_mail_transport_list.lng
@@ -7,3 +7,4 @@
$wb['sort_order_txt'] = 'Сортировать по';
$wb['add_new_record_txt'] = 'Добавить новый транспорт';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_mail_user.lng b/interface/web/mail/lib/lang/ru_mail_user.lng
index ed5c5c6..e704e5b 100644
--- a/interface/web/mail/lib/lang/ru_mail_user.lng
+++ b/interface/web/mail/lib/lang/ru_mail_user.lng
@@ -39,3 +39,4 @@
$wb['name_txt'] = 'Realname';
$wb['name_optional_txt'] = '(Optional)';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_mail_user_filter.lng b/interface/web/mail/lib/lang/ru_mail_user_filter.lng
index 6c4856a..2c4ec75 100644
--- a/interface/web/mail/lib/lang/ru_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/ru_mail_user_filter.lng
@@ -8,3 +8,4 @@
$wb['source_txt'] = 'Источник';
$wb['target_error_regex'] = 'Назначение может содержать только следующие символы: a-z, 0-9, -, . и _';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_mail_user_filter_list.lng b/interface/web/mail/lib/lang/ru_mail_user_filter_list.lng
index d732d73..31cdd36 100644
--- a/interface/web/mail/lib/lang/ru_mail_user_filter_list.lng
+++ b/interface/web/mail/lib/lang/ru_mail_user_filter_list.lng
@@ -5,3 +5,4 @@
$wb['page_of_txt'] = 'из';
$wb['delete_confirmation'] = 'Вы действительно хотите удалить почтовый фильтр?';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_mail_user_list.lng b/interface/web/mail/lib/lang/ru_mail_user_list.lng
index 4166893..50504e9 100644
--- a/interface/web/mail/lib/lang/ru_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/ru_mail_user_list.lng
@@ -5,3 +5,4 @@
$wb['add_new_record_txt'] = 'Добавить новый ящик';
$wb['name_txt'] = 'Realname';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_mail_user_stats_list.lng b/interface/web/mail/lib/lang/ru_mail_user_stats_list.lng
index 2d2f654..8d2d0a5 100644
--- a/interface/web/mail/lib/lang/ru_mail_user_stats_list.lng
+++ b/interface/web/mail/lib/lang/ru_mail_user_stats_list.lng
@@ -6,3 +6,4 @@
$wb['this_year_txt'] = 'Этот год';
$wb['last_year_txt'] = 'Последний год';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_mail_whitelist.lng b/interface/web/mail/lib/lang/ru_mail_whitelist.lng
index cb7b6fa..b2da250 100644
--- a/interface/web/mail/lib/lang/ru_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/ru_mail_whitelist.lng
@@ -7,3 +7,4 @@
$wb['type_txt'] = 'Тип';
$wb['limit_mailfilter_txt'] = 'Максимальное число почтовых фильтров записей, достигнуто.';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_mail_whitelist_list.lng b/interface/web/mail/lib/lang/ru_mail_whitelist_list.lng
index 131c78c..9d1bc96 100644
--- a/interface/web/mail/lib/lang/ru_mail_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/ru_mail_whitelist_list.lng
@@ -8,3 +8,4 @@
$wb['add_new_record_txt'] = 'Добавить новую запись в белый список';
$wb['access_txt'] = 'доступ';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/ru_spamfilter_blacklist.lng
index ad7fddb..2254ce9 100644
--- a/interface/web/mail/lib/lang/ru_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/ru_spamfilter_blacklist.lng
@@ -7,3 +7,4 @@
$wb['active_txt'] = 'Активен?';
$wb['limit_spamfilter_wblist_txt'] = 'Макс. чило белых/черных списков для вашего аккаунта достигнуто.';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/ru_spamfilter_blacklist_list.lng
index 75da628..2a9bad5 100644
--- a/interface/web/mail/lib/lang/ru_spamfilter_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/ru_spamfilter_blacklist_list.lng
@@ -7,3 +7,4 @@
$wb['email_txt'] = 'Белый список адресов';
$wb['add_new_record_txt'] = 'Добавить запись в черный список';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_spamfilter_config.lng b/interface/web/mail/lib/lang/ru_spamfilter_config.lng
index f432d79..96ab7c2 100644
--- a/interface/web/mail/lib/lang/ru_spamfilter_config.lng
+++ b/interface/web/mail/lib/lang/ru_spamfilter_config.lng
@@ -18,3 +18,4 @@
$wb['mailbox_size_limit_txt'] = 'Лимит объема почтового ящика';
$wb['message_size_limit_txt'] = 'Лимит объема сообщения';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_spamfilter_config_list.lng b/interface/web/mail/lib/lang/ru_spamfilter_config_list.lng
index ae0a88a..8d7fb32 100644
--- a/interface/web/mail/lib/lang/ru_spamfilter_config_list.lng
+++ b/interface/web/mail/lib/lang/ru_spamfilter_config_list.lng
@@ -3,3 +3,4 @@
$wb['server_name_txt'] = 'Сервер';
$wb['server_id_txt'] = 'server_id';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_spamfilter_policy.lng b/interface/web/mail/lib/lang/ru_spamfilter_policy.lng
index 333ac9a..39c0843 100644
--- a/interface/web/mail/lib/lang/ru_spamfilter_policy.lng
+++ b/interface/web/mail/lib/lang/ru_spamfilter_policy.lng
@@ -36,3 +36,4 @@
$wb['message_size_limit_txt'] = 'Превышен размер сообщения';
$wb['banned_rulenames_txt'] = 'Правила банов';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/ru_spamfilter_policy_list.lng
index d50ea6d..e629986 100644
--- a/interface/web/mail/lib/lang/ru_spamfilter_policy_list.lng
+++ b/interface/web/mail/lib/lang/ru_spamfilter_policy_list.lng
@@ -7,3 +7,4 @@
$wb['bad_header_lover_txt'] = 'Любитель неправильных заголовков';
$wb['add_new_record_txt'] = 'Добавить новую политику';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_spamfilter_users.lng b/interface/web/mail/lib/lang/ru_spamfilter_users.lng
index 6c66658..d529a41 100644
--- a/interface/web/mail/lib/lang/ru_spamfilter_users.lng
+++ b/interface/web/mail/lib/lang/ru_spamfilter_users.lng
@@ -6,3 +6,4 @@
$wb['fullname_txt'] = 'Имя';
$wb['local_txt'] = 'Локальный';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_spamfilter_users_list.lng b/interface/web/mail/lib/lang/ru_spamfilter_users_list.lng
index 108a665..f7bd251 100644
--- a/interface/web/mail/lib/lang/ru_spamfilter_users_list.lng
+++ b/interface/web/mail/lib/lang/ru_spamfilter_users_list.lng
@@ -8,3 +8,4 @@
$wb['email_txt'] = 'Email';
$wb['add_new_record_txt'] = 'Добавить пользователя спам-фильтра';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/ru_spamfilter_whitelist.lng
index 5140d1c..df2fb91 100644
--- a/interface/web/mail/lib/lang/ru_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/ru_spamfilter_whitelist.lng
@@ -7,3 +7,4 @@
$wb['active_txt'] = 'Активен?';
$wb['limit_spamfilter_wblist_txt'] = 'Макс. число белого/черного списка для вашего аккаунта достигнуто.';
?>
+
diff --git a/interface/web/mail/lib/lang/ru_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/ru_spamfilter_whitelist_list.lng
index 0036fe8..b81b3e9 100644
--- a/interface/web/mail/lib/lang/ru_spamfilter_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/ru_spamfilter_whitelist_list.lng
@@ -7,3 +7,4 @@
$wb['email_txt'] = 'Белый список адресов';
$wb['add_new_record_txt'] = 'Добавить запись в белый список';
?>
+
diff --git a/interface/web/monitor/lib/lang/ru.lng b/interface/web/monitor/lib/lang/ru.lng
index 4c7b664..a4eb131 100644
--- a/interface/web/monitor/lib/lang/ru.lng
+++ b/interface/web/monitor/lib/lang/ru.lng
@@ -136,3 +136,4 @@
$wb['monitor_updates_nosupport_txt'] = 'Ваш дистрибутив не поддерживает мониторинг';
$wb['monitor_title_fail2ban_txt'] = 'Fail2Ban Log';
?>
+
diff --git a/interface/web/monitor/lib/lang/ru_datalog_list.lng b/interface/web/monitor/lib/lang/ru_datalog_list.lng
index 6395af1..1ad3c88 100644
--- a/interface/web/monitor/lib/lang/ru_datalog_list.lng
+++ b/interface/web/monitor/lib/lang/ru_datalog_list.lng
@@ -6,3 +6,4 @@
$wb['action_txt'] = 'Действие';
$wb['status_txt'] = 'Статус';
?>
+
diff --git a/interface/web/sites/lib/lang/ru.lng b/interface/web/sites/lib/lang/ru.lng
index a0ecfb8..93f0501 100644
--- a/interface/web/sites/lib/lang/ru.lng
+++ b/interface/web/sites/lib/lang/ru.lng
@@ -20,3 +20,4 @@
$wb['Statistics'] = 'Статистика';
$wb['Web traffic'] = 'Трафик Web';
?>
+
diff --git a/interface/web/sites/lib/lang/ru_cron.lng b/interface/web/sites/lib/lang/ru_cron.lng
index caf5b2c..daa4ed3 100644
--- a/interface/web/sites/lib/lang/ru_cron.lng
+++ b/interface/web/sites/lib/lang/ru_cron.lng
@@ -19,3 +19,4 @@
$wb['command_error_format'] = 'Неверный формат команды. Учтите, что тип вызов url может быть только http/https.';
$wb['unknown_fieldtype_error'] = 'Неверный тип поля был использован.';
?>
+
diff --git a/interface/web/sites/lib/lang/ru_cron_list.lng b/interface/web/sites/lib/lang/ru_cron_list.lng
index b13098f..49c6cbe 100644
--- a/interface/web/sites/lib/lang/ru_cron_list.lng
+++ b/interface/web/sites/lib/lang/ru_cron_list.lng
@@ -10,3 +10,4 @@
$wb['command_txt'] = 'Команда';
$wb['add_new_cron_txt'] = 'Добавить задачу Cron';
?>
+
diff --git a/interface/web/sites/lib/lang/ru_database.lng b/interface/web/sites/lib/lang/ru_database.lng
index 4f3384e..ae0ebea 100644
--- a/interface/web/sites/lib/lang/ru_database.lng
+++ b/interface/web/sites/lib/lang/ru_database.lng
@@ -23,3 +23,4 @@
$wb['database_name_error_len'] = 'Имя БД - {db} - cлишком длинное. Максимальная длина имени БД включая префикс - 64 символа';
$wb['database_user_error_len'] = 'Логин для БД - {user} - cлишком длинное. Максимальная длина логина - 16 символов';
?>
+
diff --git a/interface/web/sites/lib/lang/ru_database_list.lng b/interface/web/sites/lib/lang/ru_database_list.lng
index 68b4f47..707b9f5 100644
--- a/interface/web/sites/lib/lang/ru_database_list.lng
+++ b/interface/web/sites/lib/lang/ru_database_list.lng
@@ -6,3 +6,4 @@
$wb['database_name_txt'] = 'Имя БД';
$wb['add_new_record_txt'] = 'Добавить новую БД';
?>
+
diff --git a/interface/web/sites/lib/lang/ru_ftp_user.lng b/interface/web/sites/lib/lang/ru_ftp_user.lng
index 1412186..26a4cc1 100644
--- a/interface/web/sites/lib/lang/ru_ftp_user.lng
+++ b/interface/web/sites/lib/lang/ru_ftp_user.lng
@@ -25,3 +25,4 @@
$wb['directory_error_notinweb'] = 'Директория снаружи web-root папки.';
$wb['parent_domain_id_error_empty'] = 'Web-сайт не выбран.';
?>
+
diff --git a/interface/web/sites/lib/lang/ru_ftp_user_list.lng b/interface/web/sites/lib/lang/ru_ftp_user_list.lng
index 9e111d1..1ba6ad5 100644
--- a/interface/web/sites/lib/lang/ru_ftp_user_list.lng
+++ b/interface/web/sites/lib/lang/ru_ftp_user_list.lng
@@ -6,3 +6,4 @@
$wb['username_txt'] = 'Пользователь';
$wb['add_new_record_txt'] = 'Добавить нового FTP-Пользователя';
?>
+
diff --git a/interface/web/sites/lib/lang/ru_shell_user.lng b/interface/web/sites/lib/lang/ru_shell_user.lng
index 9ca40e4..b0a7c7c 100644
--- a/interface/web/sites/lib/lang/ru_shell_user.lng
+++ b/interface/web/sites/lib/lang/ru_shell_user.lng
@@ -20,3 +20,4 @@
$wb['limit_shell_user_txt'] = 'Достигнуто допустимое количество пользователей shell';
$wb['parent_domain_id_error_empty'] = 'Web-сайт не выбран';
?>
+
diff --git a/interface/web/sites/lib/lang/ru_shell_user_list.lng b/interface/web/sites/lib/lang/ru_shell_user_list.lng
index c8521d7..54e40c3 100644
--- a/interface/web/sites/lib/lang/ru_shell_user_list.lng
+++ b/interface/web/sites/lib/lang/ru_shell_user_list.lng
@@ -6,3 +6,4 @@
$wb['username_txt'] = 'Пользователь';
$wb['add_new_record_txt'] = 'Добавить Shell-пользователя';
?>
+
diff --git a/interface/web/sites/lib/lang/ru_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/ru_web_aliasdomain_list.lng
index 42aed3b..5bda44b 100644
--- a/interface/web/sites/lib/lang/ru_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/ru_web_aliasdomain_list.lng
@@ -9,3 +9,4 @@
$wb['domain_error_unique'] = 'Домен должен быть уникальным.';
$wb['domain_error_regex'] = 'Имя домена неправильно.';
?>
+
diff --git a/interface/web/sites/lib/lang/ru_web_domain.lng b/interface/web/sites/lib/lang/ru_web_domain.lng
index 47b1eda..3699776 100644
--- a/interface/web/sites/lib/lang/ru_web_domain.lng
+++ b/interface/web/sites/lib/lang/ru_web_domain.lng
@@ -58,3 +58,4 @@
$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';
?>
+
diff --git a/interface/web/sites/lib/lang/ru_web_domain_list.lng b/interface/web/sites/lib/lang/ru_web_domain_list.lng
index 018e365..4e3d84c 100644
--- a/interface/web/sites/lib/lang/ru_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/ru_web_domain_list.lng
@@ -6,3 +6,4 @@
$wb['add_new_record_txt'] = 'Добавить новый вебсайт';
$wb['domain_id_txt'] = 'ID';
?>
+
diff --git a/interface/web/sites/lib/lang/ru_web_sites_stats_list.lng b/interface/web/sites/lib/lang/ru_web_sites_stats_list.lng
index 8a6ddb1..edd1db2 100644
--- a/interface/web/sites/lib/lang/ru_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/ru_web_sites_stats_list.lng
@@ -6,3 +6,4 @@
$wb['this_year_txt'] = 'Этот год';
$wb['last_year_txt'] = 'Последний год';
?>
+
diff --git a/interface/web/sites/lib/lang/ru_web_subdomain.lng b/interface/web/sites/lib/lang/ru_web_subdomain.lng
index 9c2ba82..7a7212b 100644
--- a/interface/web/sites/lib/lang/ru_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/ru_web_subdomain.lng
@@ -38,3 +38,4 @@
$wb['host_txt'] = 'Хост';
$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
?>
+
diff --git a/interface/web/sites/lib/lang/ru_web_subdomain_list.lng b/interface/web/sites/lib/lang/ru_web_subdomain_list.lng
index 86b42c6..a13d519 100644
--- a/interface/web/sites/lib/lang/ru_web_subdomain_list.lng
+++ b/interface/web/sites/lib/lang/ru_web_subdomain_list.lng
@@ -6,3 +6,4 @@
$wb['domain_txt'] = 'Субдомен';
$wb['add_new_record_txt'] = 'Добавить новый Субдомен';
?>
+
diff --git a/interface/web/strengthmeter/lib/lang/ru_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/ru_strengthmeter.lng
index 57f5e17..afe7d6e 100644
--- a/interface/web/strengthmeter/lib/lang/ru_strengthmeter.lng
+++ b/interface/web/strengthmeter/lib/lang/ru_strengthmeter.lng
@@ -6,3 +6,4 @@
$wb['password_strength_4_txt'] = 'Сильный';
$wb['password_strength_5_txt'] = 'Очень стойкий';
?>
+
diff --git a/interface/web/tools/lib/lang/ru.lng b/interface/web/tools/lib/lang/ru.lng
index 9d18b08..084bbb8 100644
--- a/interface/web/tools/lib/lang/ru.lng
+++ b/interface/web/tools/lib/lang/ru.lng
@@ -4,3 +4,4 @@
$wb['ISPConfig Tools'] = 'ISPConfig утилиты';
$wb['Password and Language'] = 'Пароли и языки';
?>
+
diff --git a/interface/web/tools/lib/lang/ru_usersettings.lng b/interface/web/tools/lib/lang/ru_usersettings.lng
index 8db0c35..a097b7b 100644
--- a/interface/web/tools/lib/lang/ru_usersettings.lng
+++ b/interface/web/tools/lib/lang/ru_usersettings.lng
@@ -6,3 +6,4 @@
$wb['Form to edit the user password and language.'] = 'Форма для изменения языка и паролей';
$wb['Settings'] = 'Настройки';
?>
+
diff --git a/server/cron_daily.php b/server/cron_daily.php
index 7e1a237..4d9fc07 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -179,6 +179,7 @@
// Cleanup website tmp directories
#######################################################################################################
+/*
$sql = "SELECT domain_id, domain, document_root, system_user FROM web_domain WHERE server_id = ".$conf["server_id"];
$records = $app->db->queryAllRecords($sql);
$app->uses('system');
@@ -192,6 +193,19 @@
}
}
}
+*/
+
+$sql = "SELECT domain_id, domain, document_root, system_user FROM web_domain WHERE server_id = ".$conf["server_id"];
+$records = $app->db->queryAllRecords($sql);
+$app->uses('system');
+if(is_array($records)) {
+ foreach($records as $rec){
+ $tmp_path = realpath(escapeshellcmd($rec["document_root"].'/tmp'));
+ if($tmp_path != '' && strlen($tmp_path) > 10 && is_dir($tmp_path) && $app->system->is_user($rec['system_user'])){
+ exec("cd ".$tmp_path."; find -mtime +2 -name 'sess_*' | grep -v -w .no_delete | xargs rm &> /dev/null 2> /dev/null");
+ }
+ }
+}
#######################################################################################################
// Cleanup logs in master database (only the "master-server")
--
Gitblit v1.9.1