Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ISPConfig
ISPConfig 3
Commits
cc65688b
Commit
cc65688b
authored
Mar 26, 2013
by
hellkat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merged revisions 3845-3876 and 3879-3918 from stable branch.
parent
63527811
Changes
634
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
634 changed files
with
2539 additions
and
1395 deletions
+2539
-1395
install/dist/lib/fedora.lib.php
install/dist/lib/fedora.lib.php
+8
-8
install/dist/lib/gentoo.lib.php
install/dist/lib/gentoo.lib.php
+5
-5
install/dist/lib/opensuse.lib.php
install/dist/lib/opensuse.lib.php
+4
-4
install/lib/installer_base.lib.php
install/lib/installer_base.lib.php
+29
-25
install/sql/incremental/upd_0035.sql
install/sql/incremental/upd_0035.sql
+1
-1
install/sql/ispconfig3.sql
install/sql/ispconfig3.sql
+2
-2
install/tpl/apache_ispconfig.conf.master
install/tpl/apache_ispconfig.conf.master
+2
-0
install/tpl/apache_ispconfig.vhost.master
install/tpl/apache_ispconfig.vhost.master
+13
-12
install/tpl/config.inc.php.master
install/tpl/config.inc.php.master
+2
-2
install/tpl/nginx_apps.vhost.master
install/tpl/nginx_apps.vhost.master
+1
-1
install/tpl/nginx_ispconfig.vhost.master
install/tpl/nginx_ispconfig.vhost.master
+1
-1
install/update.php
install/update.php
+1
-1
interface/lib/classes/aps_guicontroller.inc.php
interface/lib/classes/aps_guicontroller.inc.php
+6
-1
interface/lib/classes/db_mysql.inc.php
interface/lib/classes/db_mysql.inc.php
+26
-12
interface/lib/classes/listform_actions.inc.php
interface/lib/classes/listform_actions.inc.php
+10
-3
interface/lib/classes/remoting_lib.inc.php
interface/lib/classes/remoting_lib.inc.php
+49
-27
interface/lib/classes/tools_monitor.inc.php
interface/lib/classes/tools_monitor.inc.php
+1
-1
interface/lib/classes/validate_domain.inc.php
interface/lib/classes/validate_domain.inc.php
+2
-2
interface/lib/lang/cz.lng
interface/lib/lang/cz.lng
+13
-11
interface/lib/lang/pl.lng
interface/lib/lang/pl.lng
+65
-64
interface/web/admin/form/server_config.tform.php
interface/web/admin/form/server_config.tform.php
+4
-2
interface/web/admin/lib/lang/ar_login_as.lng
interface/web/admin/lib/lang/ar_login_as.lng
+3
-3
interface/web/admin/lib/lang/ar_software_package_list.lng
interface/web/admin/lib/lang/ar_software_package_list.lng
+1
-0
interface/web/admin/lib/lang/ar_software_update_list.lng
interface/web/admin/lib/lang/ar_software_update_list.lng
+1
-0
interface/web/admin/lib/lang/bg_login_as.lng
interface/web/admin/lib/lang/bg_login_as.lng
+3
-3
interface/web/admin/lib/lang/bg_software_package_list.lng
interface/web/admin/lib/lang/bg_software_package_list.lng
+1
-0
interface/web/admin/lib/lang/bg_software_update_list.lng
interface/web/admin/lib/lang/bg_software_update_list.lng
+1
-0
interface/web/admin/lib/lang/br_login_as.lng
interface/web/admin/lib/lang/br_login_as.lng
+3
-3
interface/web/admin/lib/lang/br_software_package_list.lng
interface/web/admin/lib/lang/br_software_package_list.lng
+1
-0
interface/web/admin/lib/lang/br_software_update_list.lng
interface/web/admin/lib/lang/br_software_update_list.lng
+1
-0
interface/web/admin/lib/lang/cz.lng
interface/web/admin/lib/lang/cz.lng
+2
-0
interface/web/admin/lib/lang/cz_directive_snippets.lng
interface/web/admin/lib/lang/cz_directive_snippets.lng
+2
-0
interface/web/admin/lib/lang/cz_directive_snippets_list.lng
interface/web/admin/lib/lang/cz_directive_snippets_list.lng
+2
-0
interface/web/admin/lib/lang/cz_firewall.lng
interface/web/admin/lib/lang/cz_firewall.lng
+2
-0
interface/web/admin/lib/lang/cz_firewall_list.lng
interface/web/admin/lib/lang/cz_firewall_list.lng
+2
-0
interface/web/admin/lib/lang/cz_groups.lng
interface/web/admin/lib/lang/cz_groups.lng
+2
-0
interface/web/admin/lib/lang/cz_groups_list.lng
interface/web/admin/lib/lang/cz_groups_list.lng
+2
-0
interface/web/admin/lib/lang/cz_iptables.lng
interface/web/admin/lib/lang/cz_iptables.lng
+2
-0
interface/web/admin/lib/lang/cz_iptables_list.lng
interface/web/admin/lib/lang/cz_iptables_list.lng
+2
-0
interface/web/admin/lib/lang/cz_language_add.lng
interface/web/admin/lib/lang/cz_language_add.lng
+2
-0
interface/web/admin/lib/lang/cz_language_complete.lng
interface/web/admin/lib/lang/cz_language_complete.lng
+2
-0
interface/web/admin/lib/lang/cz_language_edit.lng
interface/web/admin/lib/lang/cz_language_edit.lng
+2
-0
interface/web/admin/lib/lang/cz_language_export.lng
interface/web/admin/lib/lang/cz_language_export.lng
+2
-0
interface/web/admin/lib/lang/cz_language_import.lng
interface/web/admin/lib/lang/cz_language_import.lng
+2
-0
interface/web/admin/lib/lang/cz_language_list.lng
interface/web/admin/lib/lang/cz_language_list.lng
+2
-0
interface/web/admin/lib/lang/cz_login_as.lng
interface/web/admin/lib/lang/cz_login_as.lng
+10
-8
interface/web/admin/lib/lang/cz_package_install.lng
interface/web/admin/lib/lang/cz_package_install.lng
+5
-3
interface/web/admin/lib/lang/cz_remote_action.lng
interface/web/admin/lib/lang/cz_remote_action.lng
+4
-2
interface/web/admin/lib/lang/cz_remote_user.lng
interface/web/admin/lib/lang/cz_remote_user.lng
+16
-14
interface/web/admin/lib/lang/cz_remote_user_list.lng
interface/web/admin/lib/lang/cz_remote_user_list.lng
+2
-0
interface/web/admin/lib/lang/cz_server.lng
interface/web/admin/lib/lang/cz_server.lng
+2
-0
interface/web/admin/lib/lang/cz_server_config.lng
interface/web/admin/lib/lang/cz_server_config.lng
+10
-8
interface/web/admin/lib/lang/cz_server_config_list.lng
interface/web/admin/lib/lang/cz_server_config_list.lng
+2
-0
interface/web/admin/lib/lang/cz_server_ip.lng
interface/web/admin/lib/lang/cz_server_ip.lng
+5
-3
interface/web/admin/lib/lang/cz_server_ip_list.lng
interface/web/admin/lib/lang/cz_server_ip_list.lng
+2
-0
interface/web/admin/lib/lang/cz_server_list.lng
interface/web/admin/lib/lang/cz_server_list.lng
+2
-0
interface/web/admin/lib/lang/cz_server_php.lng
interface/web/admin/lib/lang/cz_server_php.lng
+2
-0
interface/web/admin/lib/lang/cz_server_php_list.lng
interface/web/admin/lib/lang/cz_server_php_list.lng
+2
-0
interface/web/admin/lib/lang/cz_software_package_install.lng
interface/web/admin/lib/lang/cz_software_package_install.lng
+4
-2
interface/web/admin/lib/lang/cz_software_package_list.lng
interface/web/admin/lib/lang/cz_software_package_list.lng
+3
-0
interface/web/admin/lib/lang/cz_software_repo.lng
interface/web/admin/lib/lang/cz_software_repo.lng
+2
-0
interface/web/admin/lib/lang/cz_software_repo_list.lng
interface/web/admin/lib/lang/cz_software_repo_list.lng
+2
-0
interface/web/admin/lib/lang/cz_software_update_list.lng
interface/web/admin/lib/lang/cz_software_update_list.lng
+3
-0
interface/web/admin/lib/lang/cz_system_config.lng
interface/web/admin/lib/lang/cz_system_config.lng
+12
-10
interface/web/admin/lib/lang/cz_tpl_default_admin.lng
interface/web/admin/lib/lang/cz_tpl_default_admin.lng
+2
-0
interface/web/admin/lib/lang/cz_users.lng
interface/web/admin/lib/lang/cz_users.lng
+2
-0
interface/web/admin/lib/lang/cz_users_list.lng
interface/web/admin/lib/lang/cz_users_list.lng
+2
-0
interface/web/admin/lib/lang/de_server_config.lng
interface/web/admin/lib/lang/de_server_config.lng
+1
-0
interface/web/admin/lib/lang/de_software_package_list.lng
interface/web/admin/lib/lang/de_software_package_list.lng
+1
-0
interface/web/admin/lib/lang/de_software_update_list.lng
interface/web/admin/lib/lang/de_software_update_list.lng
+1
-0
interface/web/admin/lib/lang/el_login_as.lng
interface/web/admin/lib/lang/el_login_as.lng
+3
-3
interface/web/admin/lib/lang/el_software_package_list.lng
interface/web/admin/lib/lang/el_software_package_list.lng
+1
-0
interface/web/admin/lib/lang/el_software_update_list.lng
interface/web/admin/lib/lang/el_software_update_list.lng
+1
-0
interface/web/admin/lib/lang/en_server_config.lng
interface/web/admin/lib/lang/en_server_config.lng
+1
-0
interface/web/admin/lib/lang/en_software_package_list.lng
interface/web/admin/lib/lang/en_software_package_list.lng
+1
-0
interface/web/admin/lib/lang/en_software_update_list.lng
interface/web/admin/lib/lang/en_software_update_list.lng
+1
-0
interface/web/admin/lib/lang/es_login_as.lng
interface/web/admin/lib/lang/es_login_as.lng
+3
-3
interface/web/admin/lib/lang/es_software_package_list.lng
interface/web/admin/lib/lang/es_software_package_list.lng
+1
-0
interface/web/admin/lib/lang/es_software_update_list.lng
interface/web/admin/lib/lang/es_software_update_list.lng
+1
-0
interface/web/admin/lib/lang/fi_login_as.lng
interface/web/admin/lib/lang/fi_login_as.lng
+3
-3
interface/web/admin/lib/lang/fi_software_package_list.lng
interface/web/admin/lib/lang/fi_software_package_list.lng
+1
-0
interface/web/admin/lib/lang/fi_software_update_list.lng
interface/web/admin/lib/lang/fi_software_update_list.lng
+1
-0
interface/web/admin/lib/lang/fr_login_as.lng
interface/web/admin/lib/lang/fr_login_as.lng
+3
-3
interface/web/admin/lib/lang/fr_software_package_list.lng
interface/web/admin/lib/lang/fr_software_package_list.lng
+1
-0
interface/web/admin/lib/lang/fr_software_update_list.lng
interface/web/admin/lib/lang/fr_software_update_list.lng
+1
-0
interface/web/admin/lib/lang/hr_login_as.lng
interface/web/admin/lib/lang/hr_login_as.lng
+3
-3
interface/web/admin/lib/lang/hr_software_package_list.lng
interface/web/admin/lib/lang/hr_software_package_list.lng
+1
-0
interface/web/admin/lib/lang/hr_software_update_list.lng
interface/web/admin/lib/lang/hr_software_update_list.lng
+1
-0
interface/web/admin/lib/lang/hu_login_as.lng
interface/web/admin/lib/lang/hu_login_as.lng
+3
-3
interface/web/admin/lib/lang/hu_software_package_list.lng
interface/web/admin/lib/lang/hu_software_package_list.lng
+1
-0
interface/web/admin/lib/lang/hu_software_update_list.lng
interface/web/admin/lib/lang/hu_software_update_list.lng
+1
-0
interface/web/admin/lib/lang/id_login_as.lng
interface/web/admin/lib/lang/id_login_as.lng
+3
-3
interface/web/admin/lib/lang/id_software_package_list.lng
interface/web/admin/lib/lang/id_software_package_list.lng
+1
-0
interface/web/admin/lib/lang/id_software_update_list.lng
interface/web/admin/lib/lang/id_software_update_list.lng
+1
-0
interface/web/admin/lib/lang/it_login_as.lng
interface/web/admin/lib/lang/it_login_as.lng
+3
-3
interface/web/admin/lib/lang/it_software_package_list.lng
interface/web/admin/lib/lang/it_software_package_list.lng
+1
-0
interface/web/admin/lib/lang/it_software_update_list.lng
interface/web/admin/lib/lang/it_software_update_list.lng
+1
-0
interface/web/admin/lib/lang/ja_software_package_list.lng
interface/web/admin/lib/lang/ja_software_package_list.lng
+1
-0
interface/web/admin/lib/lang/ja_software_update_list.lng
interface/web/admin/lib/lang/ja_software_update_list.lng
+1
-0
interface/web/admin/lib/lang/nl_login_as.lng
interface/web/admin/lib/lang/nl_login_as.lng
+3
-3
interface/web/admin/lib/lang/nl_software_package_list.lng
interface/web/admin/lib/lang/nl_software_package_list.lng
+1
-0
interface/web/admin/lib/lang/nl_software_update_list.lng
interface/web/admin/lib/lang/nl_software_update_list.lng
+1
-0
interface/web/admin/lib/lang/pl.lng
interface/web/admin/lib/lang/pl.lng
+31
-30
interface/web/admin/lib/lang/pl_directive_snippets.lng
interface/web/admin/lib/lang/pl_directive_snippets.lng
+8
-7
interface/web/admin/lib/lang/pl_directive_snippets_list.lng
interface/web/admin/lib/lang/pl_directive_snippets_list.lng
+6
-5
interface/web/admin/lib/lang/pl_firewall.lng
interface/web/admin/lib/lang/pl_firewall.lng
+1
-0
interface/web/admin/lib/lang/pl_firewall_list.lng
interface/web/admin/lib/lang/pl_firewall_list.lng
+1
-0
interface/web/admin/lib/lang/pl_groups.lng
interface/web/admin/lib/lang/pl_groups.lng
+1
-0
interface/web/admin/lib/lang/pl_groups_list.lng
interface/web/admin/lib/lang/pl_groups_list.lng
+1
-0
interface/web/admin/lib/lang/pl_iptables.lng
interface/web/admin/lib/lang/pl_iptables.lng
+1
-0
interface/web/admin/lib/lang/pl_iptables_list.lng
interface/web/admin/lib/lang/pl_iptables_list.lng
+1
-0
interface/web/admin/lib/lang/pl_language_add.lng
interface/web/admin/lib/lang/pl_language_add.lng
+1
-0
interface/web/admin/lib/lang/pl_language_complete.lng
interface/web/admin/lib/lang/pl_language_complete.lng
+1
-0
interface/web/admin/lib/lang/pl_language_edit.lng
interface/web/admin/lib/lang/pl_language_edit.lng
+1
-0
interface/web/admin/lib/lang/pl_language_export.lng
interface/web/admin/lib/lang/pl_language_export.lng
+1
-0
interface/web/admin/lib/lang/pl_language_import.lng
interface/web/admin/lib/lang/pl_language_import.lng
+1
-0
interface/web/admin/lib/lang/pl_language_list.lng
interface/web/admin/lib/lang/pl_language_list.lng
+1
-0
interface/web/admin/lib/lang/pl_login_as.lng
interface/web/admin/lib/lang/pl_login_as.lng
+10
-9
interface/web/admin/lib/lang/pl_package_install.lng
interface/web/admin/lib/lang/pl_package_install.lng
+1
-0
interface/web/admin/lib/lang/pl_remote_action.lng
interface/web/admin/lib/lang/pl_remote_action.lng
+1
-0
interface/web/admin/lib/lang/pl_remote_user.lng
interface/web/admin/lib/lang/pl_remote_user.lng
+5
-4
interface/web/admin/lib/lang/pl_remote_user_list.lng
interface/web/admin/lib/lang/pl_remote_user_list.lng
+1
-0
interface/web/admin/lib/lang/pl_server.lng
interface/web/admin/lib/lang/pl_server.lng
+1
-0
interface/web/admin/lib/lang/pl_server_config.lng
interface/web/admin/lib/lang/pl_server_config.lng
+14
-13
interface/web/admin/lib/lang/pl_server_config_list.lng
interface/web/admin/lib/lang/pl_server_config_list.lng
+1
-0
interface/web/admin/lib/lang/pl_server_ip.lng
interface/web/admin/lib/lang/pl_server_ip.lng
+1
-0
interface/web/admin/lib/lang/pl_server_ip_list.lng
interface/web/admin/lib/lang/pl_server_ip_list.lng
+1
-0
interface/web/admin/lib/lang/pl_server_list.lng
interface/web/admin/lib/lang/pl_server_list.lng
+1
-0
interface/web/admin/lib/lang/pl_server_php.lng
interface/web/admin/lib/lang/pl_server_php.lng
+15
-14
interface/web/admin/lib/lang/pl_server_php_list.lng
interface/web/admin/lib/lang/pl_server_php_list.lng
+1
-0
interface/web/admin/lib/lang/pl_software_package_install.lng
interface/web/admin/lib/lang/pl_software_package_install.lng
+1
-0
interface/web/admin/lib/lang/pl_software_package_list.lng
interface/web/admin/lib/lang/pl_software_package_list.lng
+2
-0
interface/web/admin/lib/lang/pl_software_repo.lng
interface/web/admin/lib/lang/pl_software_repo.lng
+1
-0
interface/web/admin/lib/lang/pl_software_repo_list.lng
interface/web/admin/lib/lang/pl_software_repo_list.lng
+1
-0
interface/web/admin/lib/lang/pl_software_update_list.lng
interface/web/admin/lib/lang/pl_software_update_list.lng
+2
-0
interface/web/admin/lib/lang/pl_system_config.lng
interface/web/admin/lib/lang/pl_system_config.lng
+25
-24
interface/web/admin/lib/lang/pl_tpl_default_admin.lng
interface/web/admin/lib/lang/pl_tpl_default_admin.lng
+1
-0
interface/web/admin/lib/lang/pl_users.lng
interface/web/admin/lib/lang/pl_users.lng
+6
-5
interface/web/admin/lib/lang/pl_users_list.lng
interface/web/admin/lib/lang/pl_users_list.lng
+4
-3
interface/web/admin/lib/lang/pt_login_as.lng
interface/web/admin/lib/lang/pt_login_as.lng
+3
-3
interface/web/admin/lib/lang/pt_software_package_list.lng
interface/web/admin/lib/lang/pt_software_package_list.lng
+1
-0
interface/web/admin/lib/lang/pt_software_update_list.lng
interface/web/admin/lib/lang/pt_software_update_list.lng
+1
-0
interface/web/admin/lib/lang/ro_login_as.lng
interface/web/admin/lib/lang/ro_login_as.lng
+3
-3
interface/web/admin/lib/lang/ro_software_package_list.lng
interface/web/admin/lib/lang/ro_software_package_list.lng
+1
-0
interface/web/admin/lib/lang/ro_software_update_list.lng
interface/web/admin/lib/lang/ro_software_update_list.lng
+1
-0
interface/web/admin/lib/lang/ru_login_as.lng
interface/web/admin/lib/lang/ru_login_as.lng
+3
-3
interface/web/admin/lib/lang/ru_software_package_list.lng
interface/web/admin/lib/lang/ru_software_package_list.lng
+1
-0
interface/web/admin/lib/lang/ru_software_update_list.lng
interface/web/admin/lib/lang/ru_software_update_list.lng
+1
-0
interface/web/admin/lib/lang/se_login_as.lng
interface/web/admin/lib/lang/se_login_as.lng
+3
-3
interface/web/admin/lib/lang/se_software_package_list.lng
interface/web/admin/lib/lang/se_software_package_list.lng
+1
-0
interface/web/admin/lib/lang/se_software_update_list.lng
interface/web/admin/lib/lang/se_software_update_list.lng
+1
-0
interface/web/admin/lib/lang/sk_login_as.lng
interface/web/admin/lib/lang/sk_login_as.lng
+3
-3
interface/web/admin/lib/lang/sk_software_package_list.lng
interface/web/admin/lib/lang/sk_software_package_list.lng
+1
-0
interface/web/admin/lib/lang/sk_software_update_list.lng
interface/web/admin/lib/lang/sk_software_update_list.lng
+1
-0
interface/web/admin/lib/lang/tr_login_as.lng
interface/web/admin/lib/lang/tr_login_as.lng
+3
-3
interface/web/admin/lib/lang/tr_software_package_list.lng
interface/web/admin/lib/lang/tr_software_package_list.lng
+1
-0
interface/web/admin/lib/lang/tr_software_update_list.lng
interface/web/admin/lib/lang/tr_software_update_list.lng
+1
-0
interface/web/admin/software_package_list.php
interface/web/admin/software_package_list.php
+5
-2
interface/web/admin/templates/server_config_server_edit.htm
interface/web/admin/templates/server_config_server_edit.htm
+2
-2
interface/web/admin/templates/server_php_list.htm
interface/web/admin/templates/server_php_list.htm
+6
-6
interface/web/admin/templates/software_package_list.htm
interface/web/admin/templates/software_package_list.htm
+6
-4
interface/web/admin/templates/software_update_list.htm
interface/web/admin/templates/software_update_list.htm
+1
-1
interface/web/admin/templates/system_config_sites_edit.htm
interface/web/admin/templates/system_config_sites_edit.htm
+3
-3
interface/web/client/lib/lang/ar_client.lng
interface/web/client/lib/lang/ar_client.lng
+3
-0
interface/web/client/lib/lang/ar_client_template.lng
interface/web/client/lib/lang/ar_client_template.lng
+3
-0
interface/web/client/lib/lang/ar_reseller.lng
interface/web/client/lib/lang/ar_reseller.lng
+3
-0
interface/web/client/lib/lang/bg_client.lng
interface/web/client/lib/lang/bg_client.lng
+3
-0
interface/web/client/lib/lang/bg_client_template.lng
interface/web/client/lib/lang/bg_client_template.lng
+3
-0
interface/web/client/lib/lang/bg_reseller.lng
interface/web/client/lib/lang/bg_reseller.lng
+3
-0
interface/web/client/lib/lang/br_client.lng
interface/web/client/lib/lang/br_client.lng
+3
-0
interface/web/client/lib/lang/br_client_template.lng
interface/web/client/lib/lang/br_client_template.lng
+3
-0
interface/web/client/lib/lang/br_reseller.lng
interface/web/client/lib/lang/br_reseller.lng
+3
-0
interface/web/client/lib/lang/cz.lng
interface/web/client/lib/lang/cz.lng
+2
-0
interface/web/client/lib/lang/cz_client.lng
interface/web/client/lib/lang/cz_client.lng
+5
-0
interface/web/client/lib/lang/cz_client_circle.lng
interface/web/client/lib/lang/cz_client_circle.lng
+2
-0
interface/web/client/lib/lang/cz_client_circle_list.lng
interface/web/client/lib/lang/cz_client_circle_list.lng
+2
-0
interface/web/client/lib/lang/cz_client_del.lng
interface/web/client/lib/lang/cz_client_del.lng
+2
-0
interface/web/client/lib/lang/cz_client_message.lng
interface/web/client/lib/lang/cz_client_message.lng
+2
-0
interface/web/client/lib/lang/cz_client_template.lng
interface/web/client/lib/lang/cz_client_template.lng
+5
-0
interface/web/client/lib/lang/cz_client_template_list.lng
interface/web/client/lib/lang/cz_client_template_list.lng
+2
-0
interface/web/client/lib/lang/cz_clients_list.lng
interface/web/client/lib/lang/cz_clients_list.lng
+2
-0
interface/web/client/lib/lang/cz_domain.lng
interface/web/client/lib/lang/cz_domain.lng
+2
-0
interface/web/client/lib/lang/cz_domain_list.lng
interface/web/client/lib/lang/cz_domain_list.lng
+2
-0
interface/web/client/lib/lang/cz_reseller.lng
interface/web/client/lib/lang/cz_reseller.lng
+5
-0
interface/web/client/lib/lang/cz_resellers_list.lng
interface/web/client/lib/lang/cz_resellers_list.lng
+2
-0
interface/web/client/lib/lang/de_client.lng
interface/web/client/lib/lang/de_client.lng
+2
-2
interface/web/client/lib/lang/de_reseller.lng
interface/web/client/lib/lang/de_reseller.lng
+1
-1
interface/web/client/lib/lang/el_client.lng
interface/web/client/lib/lang/el_client.lng
+3
-0
interface/web/client/lib/lang/el_client_template.lng
interface/web/client/lib/lang/el_client_template.lng
+3
-0
interface/web/client/lib/lang/el_reseller.lng
interface/web/client/lib/lang/el_reseller.lng
+3
-0
interface/web/client/lib/lang/es_client.lng
interface/web/client/lib/lang/es_client.lng
+3
-0
interface/web/client/lib/lang/es_client_template.lng
interface/web/client/lib/lang/es_client_template.lng
+3
-0
interface/web/client/lib/lang/es_reseller.lng
interface/web/client/lib/lang/es_reseller.lng
+3
-0
interface/web/client/lib/lang/fi_client.lng
interface/web/client/lib/lang/fi_client.lng
+3
-0
interface/web/client/lib/lang/fi_client_template.lng
interface/web/client/lib/lang/fi_client_template.lng
+3
-0
interface/web/client/lib/lang/fi_reseller.lng
interface/web/client/lib/lang/fi_reseller.lng
+3
-0
interface/web/client/lib/lang/fr_client.lng
interface/web/client/lib/lang/fr_client.lng
+3
-0
interface/web/client/lib/lang/fr_client_template.lng
interface/web/client/lib/lang/fr_client_template.lng
+3
-0
interface/web/client/lib/lang/fr_reseller.lng
interface/web/client/lib/lang/fr_reseller.lng
+3
-0
interface/web/client/lib/lang/hr_client.lng
interface/web/client/lib/lang/hr_client.lng
+3
-0
interface/web/client/lib/lang/hr_client_template.lng
interface/web/client/lib/lang/hr_client_template.lng
+3
-0
interface/web/client/lib/lang/hr_reseller.lng
interface/web/client/lib/lang/hr_reseller.lng
+3
-0
interface/web/client/lib/lang/hu_client.lng
interface/web/client/lib/lang/hu_client.lng
+3
-0
interface/web/client/lib/lang/hu_client_template.lng
interface/web/client/lib/lang/hu_client_template.lng
+3
-0
interface/web/client/lib/lang/hu_reseller.lng
interface/web/client/lib/lang/hu_reseller.lng
+3
-0
interface/web/client/lib/lang/id_client.lng
interface/web/client/lib/lang/id_client.lng
+3
-0
interface/web/client/lib/lang/id_client_template.lng
interface/web/client/lib/lang/id_client_template.lng
+3
-0
interface/web/client/lib/lang/id_reseller.lng
interface/web/client/lib/lang/id_reseller.lng
+3
-0
interface/web/client/lib/lang/it_client.lng
interface/web/client/lib/lang/it_client.lng
+3
-0
interface/web/client/lib/lang/it_client_template.lng
interface/web/client/lib/lang/it_client_template.lng
+3
-0
interface/web/client/lib/lang/it_reseller.lng
interface/web/client/lib/lang/it_reseller.lng
+3
-0
interface/web/client/lib/lang/ja_client.lng
interface/web/client/lib/lang/ja_client.lng
+3
-0
interface/web/client/lib/lang/ja_client_template.lng
interface/web/client/lib/lang/ja_client_template.lng
+3
-0
interface/web/client/lib/lang/ja_reseller.lng
interface/web/client/lib/lang/ja_reseller.lng
+3
-0
interface/web/client/lib/lang/nl_client.lng
interface/web/client/lib/lang/nl_client.lng
+3
-0
interface/web/client/lib/lang/nl_client_template.lng
interface/web/client/lib/lang/nl_client_template.lng
+3
-0
interface/web/client/lib/lang/nl_reseller.lng
interface/web/client/lib/lang/nl_reseller.lng
+3
-0
interface/web/client/lib/lang/pl.lng
interface/web/client/lib/lang/pl.lng
+13
-12
interface/web/client/lib/lang/pl_client.lng
interface/web/client/lib/lang/pl_client.lng
+51
-47
interface/web/client/lib/lang/pl_client_circle.lng
interface/web/client/lib/lang/pl_client_circle.lng
+1
-0
interface/web/client/lib/lang/pl_client_circle_list.lng
interface/web/client/lib/lang/pl_client_circle_list.lng
+1
-0
interface/web/client/lib/lang/pl_client_del.lng
interface/web/client/lib/lang/pl_client_del.lng
+1
-0
interface/web/client/lib/lang/pl_client_message.lng
interface/web/client/lib/lang/pl_client_message.lng
+17
-16
interface/web/client/lib/lang/pl_client_template.lng
interface/web/client/lib/lang/pl_client_template.lng
+27
-23
interface/web/client/lib/lang/pl_client_template_list.lng
interface/web/client/lib/lang/pl_client_template_list.lng
+1
-0
interface/web/client/lib/lang/pl_clients_list.lng
interface/web/client/lib/lang/pl_clients_list.lng
+2
-1
interface/web/client/lib/lang/pl_domain.lng
interface/web/client/lib/lang/pl_domain.lng
+1
-0
interface/web/client/lib/lang/pl_domain_list.lng
interface/web/client/lib/lang/pl_domain_list.lng
+1
-0
interface/web/client/lib/lang/pl_reseller.lng
interface/web/client/lib/lang/pl_reseller.lng
+39
-35
interface/web/client/lib/lang/pl_resellers_list.lng
interface/web/client/lib/lang/pl_resellers_list.lng
+3
-2
interface/web/client/lib/lang/pt_client.lng
interface/web/client/lib/lang/pt_client.lng
+3
-0
interface/web/client/lib/lang/pt_client_template.lng
interface/web/client/lib/lang/pt_client_template.lng
+3
-0
interface/web/client/lib/lang/pt_reseller.lng
interface/web/client/lib/lang/pt_reseller.lng
+3
-0
interface/web/client/lib/lang/ro_client.lng
interface/web/client/lib/lang/ro_client.lng
+3
-0
interface/web/client/lib/lang/ro_client_template.lng
interface/web/client/lib/lang/ro_client_template.lng
+3
-0
interface/web/client/lib/lang/ro_reseller.lng
interface/web/client/lib/lang/ro_reseller.lng
+3
-0
interface/web/client/lib/lang/ru_client.lng
interface/web/client/lib/lang/ru_client.lng
+3
-0
interface/web/client/lib/lang/ru_client_template.lng
interface/web/client/lib/lang/ru_client_template.lng
+3
-0
interface/web/client/lib/lang/ru_reseller.lng
interface/web/client/lib/lang/ru_reseller.lng
+3
-0
interface/web/client/lib/lang/se_client.lng
interface/web/client/lib/lang/se_client.lng
+3
-0
interface/web/client/lib/lang/se_client_template.lng
interface/web/client/lib/lang/se_client_template.lng
+3
-0
interface/web/client/lib/lang/se_reseller.lng
interface/web/client/lib/lang/se_reseller.lng
+3
-0
interface/web/client/lib/lang/sk_client.lng
interface/web/client/lib/lang/sk_client.lng
+3
-0
interface/web/client/lib/lang/sk_client_template.lng
interface/web/client/lib/lang/sk_client_template.lng
+3
-0
interface/web/client/lib/lang/sk_reseller.lng
interface/web/client/lib/lang/sk_reseller.lng
+3
-0
interface/web/client/lib/lang/tr_client.lng
interface/web/client/lib/lang/tr_client.lng
+3
-0
interface/web/client/lib/lang/tr_client_template.lng
interface/web/client/lib/lang/tr_client_template.lng
+3
-0
interface/web/client/lib/lang/tr_reseller.lng
interface/web/client/lib/lang/tr_reseller.lng
+3
-0
interface/web/client/templates/client_edit_limits.htm
interface/web/client/templates/client_edit_limits.htm
+3
-1
interface/web/dashboard/lib/lang/cz.lng
interface/web/dashboard/lib/lang/cz.lng
+2
-0
interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
+2
-0
interface/web/dashboard/lib/lang/cz_dashlet_modules.lng
interface/web/dashboard/lib/lang/cz_dashlet_modules.lng
+2
-0
interface/web/dashboard/lib/lang/pl.lng
interface/web/dashboard/lib/lang/pl.lng
+1
-0
interface/web/dashboard/lib/lang/pl_dashlet_limits.lng
interface/web/dashboard/lib/lang/pl_dashlet_limits.lng
+1
-0
interface/web/dashboard/lib/lang/pl_dashlet_modules.lng
interface/web/dashboard/lib/lang/pl_dashlet_modules.lng
+1
-0
interface/web/designer/lib/lang/cz.lng
interface/web/designer/lib/lang/cz.lng
+2
-0
interface/web/designer/lib/lang/cz_form_edit.lng
interface/web/designer/lib/lang/cz_form_edit.lng
+2
-0
interface/web/designer/lib/lang/cz_form_list.lng
interface/web/designer/lib/lang/cz_form_list.lng
+2
-0
interface/web/designer/lib/lang/cz_form_show.lng
interface/web/designer/lib/lang/cz_form_show.lng
+2
-0
interface/web/designer/lib/lang/cz_module_edit.lng
interface/web/designer/lib/lang/cz_module_edit.lng
+2
-0
interface/web/designer/lib/lang/cz_module_list.lng
interface/web/designer/lib/lang/cz_module_list.lng
+2
-0
interface/web/designer/lib/lang/cz_module_nav_edit.lng
interface/web/designer/lib/lang/cz_module_nav_edit.lng
+2
-0
interface/web/designer/lib/lang/cz_module_nav_item_edit.lng
interface/web/designer/lib/lang/cz_module_nav_item_edit.lng
+2
-0
interface/web/designer/lib/lang/cz_module_show.lng
interface/web/designer/lib/lang/cz_module_show.lng
+2
-0
interface/web/designer/lib/lang/pl.lng
interface/web/designer/lib/lang/pl.lng
+1
-0
interface/web/designer/lib/lang/pl_form_edit.lng
interface/web/designer/lib/lang/pl_form_edit.lng
+1
-0
interface/web/designer/lib/lang/pl_form_list.lng
interface/web/designer/lib/lang/pl_form_list.lng
+1
-0
interface/web/designer/lib/lang/pl_form_show.lng
interface/web/designer/lib/lang/pl_form_show.lng
+1
-0
interface/web/designer/lib/lang/pl_module_edit.lng
interface/web/designer/lib/lang/pl_module_edit.lng
+1
-0
interface/web/designer/lib/lang/pl_module_list.lng
interface/web/designer/lib/lang/pl_module_list.lng
+1
-0
interface/web/designer/lib/lang/pl_module_nav_edit.lng
interface/web/designer/lib/lang/pl_module_nav_edit.lng
+1
-0
interface/web/designer/lib/lang/pl_module_nav_item_edit.lng
interface/web/designer/lib/lang/pl_module_nav_item_edit.lng
+1
-0
interface/web/designer/lib/lang/pl_module_show.lng
interface/web/designer/lib/lang/pl_module_show.lng
+1
-0
interface/web/dns/dns_mx_edit.php
interface/web/dns/dns_mx_edit.php
+11
-0
interface/web/dns/form/dns_a.tform.php
interface/web/dns/form/dns_a.tform.php
+1
-1
interface/web/dns/lib/lang/cz.lng
interface/web/dns/lib/lang/cz.lng
+2
-0
interface/web/dns/lib/lang/cz_dns_a.lng
interface/web/dns/lib/lang/cz_dns_a.lng
+2
-0
interface/web/dns/lib/lang/cz_dns_a_list.lng
interface/web/dns/lib/lang/cz_dns_a_list.lng
+3
-1
interface/web/dns/lib/lang/cz_dns_aaaa.lng
interface/web/dns/lib/lang/cz_dns_aaaa.lng
+2
-0
interface/web/dns/lib/lang/cz_dns_alias.lng
interface/web/dns/lib/lang/cz_dns_alias.lng
+2
-0
interface/web/dns/lib/lang/cz_dns_cname.lng
interface/web/dns/lib/lang/cz_dns_cname.lng
+3
-1
interface/web/dns/lib/lang/cz_dns_hinfo.lng
interface/web/dns/lib/lang/cz_dns_hinfo.lng
+2
-0
interface/web/dns/lib/lang/cz_dns_import.lng
interface/web/dns/lib/lang/cz_dns_import.lng
+3
-1
interface/web/dns/lib/lang/cz_dns_mx.lng
interface/web/dns/lib/lang/cz_dns_mx.lng
+5
-3
interface/web/dns/lib/lang/cz_dns_ns.lng
interface/web/dns/lib/lang/cz_dns_ns.lng
+2
-0
interface/web/dns/lib/lang/cz_dns_ptr.lng
interface/web/dns/lib/lang/cz_dns_ptr.lng
+2
-0
interface/web/dns/lib/lang/cz_dns_rp.lng
interface/web/dns/lib/lang/cz_dns_rp.lng
+2
-0
interface/web/dns/lib/lang/cz_dns_slave.lng
interface/web/dns/lib/lang/cz_dns_slave.lng
+2
-0
interface/web/dns/lib/lang/cz_dns_slave_list.lng
interface/web/dns/lib/lang/cz_dns_slave_list.lng
+2
-0
interface/web/dns/lib/lang/cz_dns_soa.lng
interface/web/dns/lib/lang/cz_dns_soa.lng
+8
-6
interface/web/dns/lib/lang/cz_dns_soa_list.lng
interface/web/dns/lib/lang/cz_dns_soa_list.lng
+2
-0
interface/web/dns/lib/lang/cz_dns_srv.lng
interface/web/dns/lib/lang/cz_dns_srv.lng
+2
-0
interface/web/dns/lib/lang/cz_dns_template.lng
interface/web/dns/lib/lang/cz_dns_template.lng
+2
-0
interface/web/dns/lib/lang/cz_dns_template_list.lng
interface/web/dns/lib/lang/cz_dns_template_list.lng
+2
-0
interface/web/dns/lib/lang/cz_dns_txt.lng
interface/web/dns/lib/lang/cz_dns_txt.lng
+2
-0
interface/web/dns/lib/lang/cz_dns_wizard.lng
interface/web/dns/lib/lang/cz_dns_wizard.lng
+3
-1
interface/web/dns/lib/lang/de_dns_mx.lng
interface/web/dns/lib/lang/de_dns_mx.lng
+1
-0
interface/web/dns/lib/lang/en_dns_mx.lng
interface/web/dns/lib/lang/en_dns_mx.lng
+1
-0
interface/web/dns/lib/lang/en_dns_soa.lng
interface/web/dns/lib/lang/en_dns_soa.lng
+1
-1
interface/web/dns/lib/lang/pl.lng
interface/web/dns/lib/lang/pl.lng
+3
-2
interface/web/dns/lib/lang/pl_dns_a.lng
interface/web/dns/lib/lang/pl_dns_a.lng
+1
-0
interface/web/dns/lib/lang/pl_dns_a_list.lng
interface/web/dns/lib/lang/pl_dns_a_list.lng
+2
-1
interface/web/dns/lib/lang/pl_dns_aaaa.lng
interface/web/dns/lib/lang/pl_dns_aaaa.lng
+1
-0
interface/web/dns/lib/lang/pl_dns_alias.lng
interface/web/dns/lib/lang/pl_dns_alias.lng
+1
-0
interface/web/dns/lib/lang/pl_dns_cname.lng
interface/web/dns/lib/lang/pl_dns_cname.lng
+1
-0
interface/web/dns/lib/lang/pl_dns_hinfo.lng
interface/web/dns/lib/lang/pl_dns_hinfo.lng
+1
-0
interface/web/dns/lib/lang/pl_dns_import.lng
interface/web/dns/lib/lang/pl_dns_import.lng
+12
-11
interface/web/dns/lib/lang/pl_dns_mx.lng
interface/web/dns/lib/lang/pl_dns_mx.lng
+1
-0
interface/web/dns/lib/lang/pl_dns_ns.lng
interface/web/dns/lib/lang/pl_dns_ns.lng
+1
-0
interface/web/dns/lib/lang/pl_dns_ptr.lng
interface/web/dns/lib/lang/pl_dns_ptr.lng
+1
-0
interface/web/dns/lib/lang/pl_dns_rp.lng
interface/web/dns/lib/lang/pl_dns_rp.lng
+1
-0
interface/web/dns/lib/lang/pl_dns_slave.lng
interface/web/dns/lib/lang/pl_dns_slave.lng
+4
-3
interface/web/dns/lib/lang/pl_dns_slave_list.lng
interface/web/dns/lib/lang/pl_dns_slave_list.lng
+1
-0
interface/web/dns/lib/lang/pl_dns_soa.lng
interface/web/dns/lib/lang/pl_dns_soa.lng
+9
-8
interface/web/dns/lib/lang/pl_dns_soa_list.lng
interface/web/dns/lib/lang/pl_dns_soa_list.lng
+1
-0
interface/web/dns/lib/lang/pl_dns_srv.lng
interface/web/dns/lib/lang/pl_dns_srv.lng
+4
-3
interface/web/dns/lib/lang/pl_dns_template.lng
interface/web/dns/lib/lang/pl_dns_template.lng
+1
-0
interface/web/dns/lib/lang/pl_dns_template_list.lng
interface/web/dns/lib/lang/pl_dns_template_list.lng
+1
-0
interface/web/dns/lib/lang/pl_dns_txt.lng
interface/web/dns/lib/lang/pl_dns_txt.lng
+1
-0
interface/web/dns/lib/lang/pl_dns_wizard.lng
interface/web/dns/lib/lang/pl_dns_wizard.lng
+10
-9
interface/web/help/faq_list.php
interface/web/help/faq_list.php
+2
-2
interface/web/help/lib/lang/cz.lng
interface/web/help/lib/lang/cz.lng
+2
-0
interface/web/help/lib/lang/cz_faq_form.lng
interface/web/help/lib/lang/cz_faq_form.lng
+2
-0
interface/web/help/lib/lang/cz_faq_manage_questions_list.lng
interface/web/help/lib/lang/cz_faq_manage_questions_list.lng
+2
-0
interface/web/help/lib/lang/cz_help_faq_list.lng
interface/web/help/lib/lang/cz_help_faq_list.lng
+2
-0
interface/web/help/lib/lang/cz_help_faq_sections_list.lng
interface/web/help/lib/lang/cz_help_faq_sections_list.lng
+2
-0
interface/web/help/lib/lang/cz_support_message.lng
interface/web/help/lib/lang/cz_support_message.lng
+2
-0
interface/web/help/lib/lang/cz_support_message_list.lng
interface/web/help/lib/lang/cz_support_message_list.lng
+2
-0
interface/web/help/lib/lang/pl.lng
interface/web/help/lib/lang/pl.lng
+2
-1
interface/web/help/lib/lang/pl_faq_form.lng
interface/web/help/lib/lang/pl_faq_form.lng
+1
-0
interface/web/help/lib/lang/pl_faq_manage_questions_list.lng
interface/web/help/lib/lang/pl_faq_manage_questions_list.lng
+1
-0
interface/web/help/lib/lang/pl_faq_sections_form.lng
interface/web/help/lib/lang/pl_faq_sections_form.lng
+1
-0
interface/web/help/lib/lang/pl_help_faq_list.lng
interface/web/help/lib/lang/pl_help_faq_list.lng
+1
-0
interface/web/help/lib/lang/pl_help_faq_sections_list.lng
interface/web/help/lib/lang/pl_help_faq_sections_list.lng
+1
-0
interface/web/help/lib/lang/pl_support_message.lng
interface/web/help/lib/lang/pl_support_message.lng
+2
-1
interface/web/help/lib/lang/pl_support_message_list.lng
interface/web/help/lib/lang/pl_support_message_list.lng
+1
-0
interface/web/login/index.php
interface/web/login/index.php
+1
-1
interface/web/login/lib/lang/cz.lng
interface/web/login/lib/lang/cz.lng
+5
-3
interface/web/login/lib/lang/pl.lng
interface/web/login/lib/lang/pl.lng
+13
-12
interface/web/mail/form/mail_user_filter.tform.php
interface/web/mail/form/mail_user_filter.tform.php
+1
-1
interface/web/mail/lib/lang/cz.lng
interface/web/mail/lib/lang/cz.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_alias.lng
interface/web/mail/lib/lang/cz_mail_alias.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_alias_list.lng
interface/web/mail/lib/lang/cz_mail_alias_list.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_aliasdomain.lng
interface/web/mail/lib/lang/cz_mail_aliasdomain.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng
interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_blacklist.lng
interface/web/mail/lib/lang/cz_mail_blacklist.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_blacklist_list.lng
interface/web/mail/lib/lang/cz_mail_blacklist_list.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_content_filter.lng
interface/web/mail/lib/lang/cz_mail_content_filter.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_content_filter_list.lng
interface/web/mail/lib/lang/cz_mail_content_filter_list.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_domain.lng
interface/web/mail/lib/lang/cz_mail_domain.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng
interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_domain_catchall.lng
interface/web/mail/lib/lang/cz_mail_domain_catchall.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng
interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_domain_list.lng
interface/web/mail/lib/lang/cz_mail_domain_list.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_forward.lng
interface/web/mail/lib/lang/cz_mail_forward.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_forward_list.lng
interface/web/mail/lib/lang/cz_mail_forward_list.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_get.lng
interface/web/mail/lib/lang/cz_mail_get.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_get_list.lng
interface/web/mail/lib/lang/cz_mail_get_list.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_mailinglist.lng
interface/web/mail/lib/lang/cz_mail_mailinglist.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng
interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_relay_recipient.lng
interface/web/mail/lib/lang/cz_mail_relay_recipient.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng
interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_spamfilter.lng
interface/web/mail/lib/lang/cz_mail_spamfilter.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng
interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_transport.lng
interface/web/mail/lib/lang/cz_mail_transport.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_transport_list.lng
interface/web/mail/lib/lang/cz_mail_transport_list.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_user.lng
interface/web/mail/lib/lang/cz_mail_user.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_user_filter.lng
interface/web/mail/lib/lang/cz_mail_user_filter.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_user_filter_list.lng
interface/web/mail/lib/lang/cz_mail_user_filter_list.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_user_list.lng
interface/web/mail/lib/lang/cz_mail_user_list.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_user_stats_list.lng
interface/web/mail/lib/lang/cz_mail_user_stats_list.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_whitelist.lng
interface/web/mail/lib/lang/cz_mail_whitelist.lng
+2
-0
interface/web/mail/lib/lang/cz_mail_whitelist_list.lng
interface/web/mail/lib/lang/cz_mail_whitelist_list.lng
+2
-0
interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng
interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng
+2
-0
interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng
interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng
+2
-0
interface/web/mail/lib/lang/cz_spamfilter_config.lng
interface/web/mail/lib/lang/cz_spamfilter_config.lng
+2
-0
interface/web/mail/lib/lang/cz_spamfilter_config_list.lng
interface/web/mail/lib/lang/cz_spamfilter_config_list.lng
+2
-0
interface/web/mail/lib/lang/cz_spamfilter_policy.lng
interface/web/mail/lib/lang/cz_spamfilter_policy.lng
+2
-0
interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng
interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng
+2
-0
interface/web/mail/lib/lang/cz_spamfilter_users.lng
interface/web/mail/lib/lang/cz_spamfilter_users.lng
+2
-0
interface/web/mail/lib/lang/cz_spamfilter_users_list.lng
interface/web/mail/lib/lang/cz_spamfilter_users_list.lng
+2
-0
interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng
interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng
+2
-0
interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng
interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng
+2
-0
interface/web/mail/lib/lang/cz_user_quota_stats_list.lng
interface/web/mail/lib/lang/cz_user_quota_stats_list.lng
+2
-0
interface/web/mail/lib/lang/pl.lng
interface/web/mail/lib/lang/pl.lng
+2
-1
interface/web/mail/lib/lang/pl_mail_alias.lng
interface/web/mail/lib/lang/pl_mail_alias.lng
+2
-1
interface/web/mail/lib/lang/pl_mail_alias_list.lng
interface/web/mail/lib/lang/pl_mail_alias_list.lng
+1
-0
interface/web/mail/lib/lang/pl_mail_aliasdomain.lng
interface/web/mail/lib/lang/pl_mail_aliasdomain.lng
+1
-0
interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng
interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng
+1
-0
interface/web/mail/lib/lang/pl_mail_blacklist.lng
interface/web/mail/lib/lang/pl_mail_blacklist.lng
+1
-0
interface/web/mail/lib/lang/pl_mail_blacklist_list.lng
interface/web/mail/lib/lang/pl_mail_blacklist_list.lng
+1
-0
interface/web/mail/lib/lang/pl_mail_content_filter.lng
interface/web/mail/lib/lang/pl_mail_content_filter.lng
+1
-0
interface/web/mail/lib/lang/pl_mail_content_filter_list.lng
interface/web/mail/lib/lang/pl_mail_content_filter_list.lng
+1
-0
interface/web/mail/lib/lang/pl_mail_domain.lng
interface/web/mail/lib/lang/pl_mail_domain.lng
+1
-0
interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng
interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng
+1
-0
interface/web/mail/lib/lang/pl_mail_domain_catchall.lng
interface/web/mail/lib/lang/pl_mail_domain_catchall.lng
+3
-2
interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng
interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng
+1
-0
interface/web/mail/lib/lang/pl_mail_domain_list.lng
interface/web/mail/lib/lang/pl_mail_domain_list.lng
+1
-0
interface/web/mail/lib/lang/pl_mail_forward.lng
interface/web/mail/lib/lang/pl_mail_forward.lng
+4
-3
interface/web/mail/lib/lang/pl_mail_forward_list.lng
interface/web/mail/lib/lang/pl_mail_forward_list.lng
+1
-0
interface/web/mail/lib/lang/pl_mail_get.lng
interface/web/mail/lib/lang/pl_mail_get.lng
+2
-1
interface/web/mail/lib/lang/pl_mail_get_list.lng
interface/web/mail/lib/lang/pl_mail_get_list.lng
+1
-0
interface/web/mail/lib/lang/pl_mail_mailinglist.lng
interface/web/mail/lib/lang/pl_mail_mailinglist.lng
+8
-7
interface/web/mail/lib/lang/pl_mail_mailinglist_list.lng
interface/web/mail/lib/lang/pl_mail_mailinglist_list.lng
+1
-0
interface/web/mail/lib/lang/pl_mail_relay_recipient.lng
interface/web/mail/lib/lang/pl_mail_relay_recipient.lng
+1
-0
interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng
interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng
+1
-0
interface/web/mail/lib/lang/pl_mail_spamfilter.lng
interface/web/mail/lib/lang/pl_mail_spamfilter.lng
+1
-0
interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng
interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng
+1
-0
interface/web/mail/lib/lang/pl_mail_transport.lng
interface/web/mail/lib/lang/pl_mail_transport.lng
+1
-0
interface/web/mail/lib/lang/pl_mail_transport_list.lng
interface/web/mail/lib/lang/pl_mail_transport_list.lng
+1
-0
interface/web/mail/lib/lang/pl_mail_user.lng
interface/web/mail/lib/lang/pl_mail_user.lng
+8
-7
interface/web/mail/lib/lang/pl_mail_user_filter.lng
interface/web/mail/lib/lang/pl_mail_user_filter.lng
+1
-0
interface/web/mail/lib/lang/pl_mail_user_filter_list.lng
interface/web/mail/lib/lang/pl_mail_user_filter_list.lng
+1
-0
interface/web/mail/lib/lang/pl_mail_user_list.lng
interface/web/mail/lib/lang/pl_mail_user_list.lng
+1
-0
interface/web/mail/lib/lang/pl_mail_user_stats_list.lng
interface/web/mail/lib/lang/pl_mail_user_stats_list.lng
+1
-0
interface/web/mail/lib/lang/pl_mail_whitelist.lng
interface/web/mail/lib/lang/pl_mail_whitelist.lng
+1
-0
interface/web/mail/lib/lang/pl_mail_whitelist_list.lng
interface/web/mail/lib/lang/pl_mail_whitelist_list.lng
+1
-0
interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng
interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng
+1
-0
interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng
interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng
+1
-0
interface/web/mail/lib/lang/pl_spamfilter_config.lng
interface/web/mail/lib/lang/pl_spamfilter_config.lng
+1
-0
interface/web/mail/lib/lang/pl_spamfilter_config_list.lng
interface/web/mail/lib/lang/pl_spamfilter_config_list.lng
+1
-0
interface/web/mail/lib/lang/pl_spamfilter_policy.lng
interface/web/mail/lib/lang/pl_spamfilter_policy.lng
+1
-0
interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng
interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng
+1
-0
interface/web/mail/lib/lang/pl_spamfilter_users.lng
interface/web/mail/lib/lang/pl_spamfilter_users.lng
+1
-0
interface/web/mail/lib/lang/pl_spamfilter_users_list.lng
interface/web/mail/lib/lang/pl_spamfilter_users_list.lng
+1
-0
interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng
interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng
+1
-0
interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng
interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng
+1
-0
interface/web/mail/lib/lang/pl_user_quota_stats_list.lng
interface/web/mail/lib/lang/pl_user_quota_stats_list.lng
+2
-1
interface/web/mail/templates/mail_user_filter_edit.htm
interface/web/mail/templates/mail_user_filter_edit.htm
+4
-4
interface/web/mail/templates/mail_user_filter_list.htm
interface/web/mail/templates/mail_user_filter_list.htm
+1
-2
interface/web/mail/user_quota_stats.php
interface/web/mail/user_quota_stats.php
+1
-1
interface/web/mailuser/lib/lang/cz.lng
interface/web/mailuser/lib/lang/cz.lng
+2
-0
interface/web/mailuser/lib/lang/cz_index.lng
interface/web/mailuser/lib/lang/cz_index.lng
+2
-0
interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng
...face/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng
+2
-0
interface/web/mailuser/lib/lang/cz_mail_user_cc.lng
interface/web/mailuser/lib/lang/cz_mail_user_cc.lng
+2
-0
interface/web/mailuser/lib/lang/cz_mail_user_filter.lng
interface/web/mailuser/lib/lang/cz_mail_user_filter.lng
+2
-0
interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng
interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng
+2
-0
interface/web/mailuser/lib/lang/cz_mail_user_password.lng
interface/web/mailuser/lib/lang/cz_mail_user_password.lng
+2
-0
interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng
interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng
+2
-0
interface/web/mailuser/lib/lang/pl.lng
interface/web/mailuser/lib/lang/pl.lng
+7
-6
interface/web/mailuser/lib/lang/pl_index.lng
interface/web/mailuser/lib/lang/pl_index.lng
+9
-8
interface/web/mailuser/lib/lang/pl_mail_user_autoresponder.lng
...face/web/mailuser/lib/lang/pl_mail_user_autoresponder.lng
+11
-10
interface/web/mailuser/lib/lang/pl_mail_user_cc.lng
interface/web/mailuser/lib/lang/pl_mail_user_cc.lng
+6
-5
interface/web/mailuser/lib/lang/pl_mail_user_filter.lng
interface/web/mailuser/lib/lang/pl_mail_user_filter.lng
+1
-0
interface/web/mailuser/lib/lang/pl_mail_user_filter_list.lng
interface/web/mailuser/lib/lang/pl_mail_user_filter_list.lng
+7
-6
interface/web/mailuser/lib/lang/pl_mail_user_password.lng
interface/web/mailuser/lib/lang/pl_mail_user_password.lng
+9
-8
interface/web/mailuser/lib/lang/pl_mail_user_spamfilter.lng
interface/web/mailuser/lib/lang/pl_mail_user_spamfilter.lng
+6
-5
interface/web/monitor/lib/lang/cz.lng
interface/web/monitor/lib/lang/cz.lng
+13
-11
interface/web/monitor/lib/lang/cz_datalog_list.lng
interface/web/monitor/lib/lang/cz_datalog_list.lng
+2
-0
interface/web/monitor/lib/lang/cz_syslog_list.lng
interface/web/monitor/lib/lang/cz_syslog_list.lng
+2
-0
interface/web/monitor/lib/lang/pl.lng
interface/web/monitor/lib/lang/pl.lng
+3
-2
interface/web/monitor/lib/lang/pl_datalog_list.lng
interface/web/monitor/lib/lang/pl_datalog_list.lng
+1
-0
interface/web/monitor/lib/lang/pl_syslog_list.lng
interface/web/monitor/lib/lang/pl_syslog_list.lng
+1
-0
interface/web/sites/ajax_get_json.php
interface/web/sites/ajax_get_json.php
+6
-8
interface/web/sites/aps_installedpackages_list.php
interface/web/sites/aps_installedpackages_list.php
+3
-3
interface/web/sites/database_edit.php
interface/web/sites/database_edit.php
+26
-0
interface/web/sites/form/web_domain.tform.php
interface/web/sites/form/web_domain.tform.php
+3
-0
interface/web/sites/form/web_vhost_subdomain.tform.php
interface/web/sites/form/web_vhost_subdomain.tform.php
+1
-7
interface/web/sites/lib/lang/ar_aps.lng
interface/web/sites/lib/lang/ar_aps.lng
+1
-0
interface/web/sites/lib/lang/ar_aps_update_packagelist.lng
interface/web/sites/lib/lang/ar_aps_update_packagelist.lng
+1
-1
interface/web/sites/lib/lang/bg_aps.lng
interface/web/sites/lib/lang/bg_aps.lng
+1
-0
interface/web/sites/lib/lang/bg_aps_update_packagelist.lng
interface/web/sites/lib/lang/bg_aps_update_packagelist.lng
+1
-1
interface/web/sites/lib/lang/br_aps.lng
interface/web/sites/lib/lang/br_aps.lng
+1
-0
interface/web/sites/lib/lang/br_aps_update_packagelist.lng
interface/web/sites/lib/lang/br_aps_update_packagelist.lng
+1
-1
interface/web/sites/lib/lang/cz.lng
interface/web/sites/lib/lang/cz.lng
+2
-0
interface/web/sites/lib/lang/cz_aps.lng
interface/web/sites/lib/lang/cz_aps.lng
+3
-0
interface/web/sites/lib/lang/cz_aps_instances_list.lng
interface/web/sites/lib/lang/cz_aps_instances_list.lng
+2
-0
interface/web/sites/lib/lang/cz_aps_packages_list.lng
interface/web/sites/lib/lang/cz_aps_packages_list.lng
+2
-0
interface/web/sites/lib/lang/cz_aps_update_packagelist.lng
interface/web/sites/lib/lang/cz_aps_update_packagelist.lng
+2
-2
interface/web/sites/lib/lang/cz_cron.lng
interface/web/sites/lib/lang/cz_cron.lng
+2
-0
interface/web/sites/lib/lang/cz_cron_list.lng
interface/web/sites/lib/lang/cz_cron_list.lng
+2
-0
interface/web/sites/lib/lang/cz_database.lng
interface/web/sites/lib/lang/cz_database.lng
+2
-0
interface/web/sites/lib/lang/cz_database_admin_list.lng
interface/web/sites/lib/lang/cz_database_admin_list.lng
+2
-0
interface/web/sites/lib/lang/cz_database_list.lng
interface/web/sites/lib/lang/cz_database_list.lng
+2
-0
interface/web/sites/lib/lang/cz_database_user.lng
interface/web/sites/lib/lang/cz_database_user.lng
+2
-0
interface/web/sites/lib/lang/cz_database_user_admin_list.lng
interface/web/sites/lib/lang/cz_database_user_admin_list.lng
+2
-0
interface/web/sites/lib/lang/cz_database_user_list.lng
interface/web/sites/lib/lang/cz_database_user_list.lng
+2
-0
interface/web/sites/lib/lang/cz_ftp_user.lng
interface/web/sites/lib/lang/cz_ftp_user.lng
+2
-0
interface/web/sites/lib/lang/cz_ftp_user_list.lng
interface/web/sites/lib/lang/cz_ftp_user_list.lng
+2
-0
interface/web/sites/lib/lang/cz_shell_user.lng
interface/web/sites/lib/lang/cz_shell_user.lng
+2
-0
interface/web/sites/lib/lang/cz_shell_user_list.lng
interface/web/sites/lib/lang/cz_shell_user_list.lng
+2
-0
interface/web/sites/lib/lang/cz_user_quota_stats_list.lng
interface/web/sites/lib/lang/cz_user_quota_stats_list.lng
+2
-0
interface/web/sites/lib/lang/cz_web_aliasdomain.lng
interface/web/sites/lib/lang/cz_web_aliasdomain.lng
+8
-6
interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng
interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng
+2
-0
interface/web/sites/lib/lang/cz_web_backup_list.lng
interface/web/sites/lib/lang/cz_web_backup_list.lng
+2
-0
interface/web/sites/lib/lang/cz_web_domain.lng
interface/web/sites/lib/lang/cz_web_domain.lng
+2
-0
interface/web/sites/lib/lang/cz_web_domain_admin_list.lng
interface/web/sites/lib/lang/cz_web_domain_admin_list.lng
+2
-0
interface/web/sites/lib/lang/cz_web_domain_list.lng
interface/web/sites/lib/lang/cz_web_domain_list.lng
+2
-0
interface/web/sites/lib/lang/cz_web_folder.lng
interface/web/sites/lib/lang/cz_web_folder.lng
+2
-0
interface/web/sites/lib/lang/cz_web_folder_list.lng
interface/web/sites/lib/lang/cz_web_folder_list.lng
+2
-0
interface/web/sites/lib/lang/cz_web_folder_user.lng
interface/web/sites/lib/lang/cz_web_folder_user.lng
+2
-0
interface/web/sites/lib/lang/cz_web_folder_user_list.lng
interface/web/sites/lib/lang/cz_web_folder_user_list.lng
+2
-0
interface/web/sites/lib/lang/cz_web_sites_stats_list.lng
interface/web/sites/lib/lang/cz_web_sites_stats_list.lng
+2
-0
interface/web/sites/lib/lang/cz_web_subdomain.lng
interface/web/sites/lib/lang/cz_web_subdomain.lng
+2
-0
interface/web/sites/lib/lang/cz_web_subdomain_list.lng
interface/web/sites/lib/lang/cz_web_subdomain_list.lng
+2
-0
interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
+5
-3
interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
+2
-0
interface/web/sites/lib/lang/cz_webdav_user.lng
interface/web/sites/lib/lang/cz_webdav_user.lng
+2
-0
interface/web/sites/lib/lang/cz_webdav_user_list.lng
interface/web/sites/lib/lang/cz_webdav_user_list.lng
+2
-0
interface/web/sites/lib/lang/de_aps.lng
interface/web/sites/lib/lang/de_aps.lng
+1
-1
interface/web/sites/lib/lang/el_aps.lng
interface/web/sites/lib/lang/el_aps.lng
+1
-0
interface/web/sites/lib/lang/el_aps_update_packagelist.lng
interface/web/sites/lib/lang/el_aps_update_packagelist.lng
+1
-1
interface/web/sites/lib/lang/en_web_domain.lng
interface/web/sites/lib/lang/en_web_domain.lng
+1
-0
interface/web/sites/lib/lang/es_aps.lng
interface/web/sites/lib/lang/es_aps.lng
+1
-0
interface/web/sites/lib/lang/es_aps_update_packagelist.lng
interface/web/sites/lib/lang/es_aps_update_packagelist.lng
+1
-1
interface/web/sites/lib/lang/fi_aps.lng
interface/web/sites/lib/lang/fi_aps.lng
+1
-0
interface/web/sites/lib/lang/fi_aps_update_packagelist.lng
interface/web/sites/lib/lang/fi_aps_update_packagelist.lng
+1
-1
interface/web/sites/lib/lang/fr_aps.lng
interface/web/sites/lib/lang/fr_aps.lng
+1
-0
interface/web/sites/lib/lang/fr_aps_update_packagelist.lng
interface/web/sites/lib/lang/fr_aps_update_packagelist.lng
+1
-1
interface/web/sites/lib/lang/hr_aps.lng
interface/web/sites/lib/lang/hr_aps.lng
+1
-0
interface/web/sites/lib/lang/hr_aps_update_packagelist.lng
interface/web/sites/lib/lang/hr_aps_update_packagelist.lng
+1
-1
interface/web/sites/lib/lang/hu_aps.lng
interface/web/sites/lib/lang/hu_aps.lng
+1
-0
interface/web/sites/lib/lang/hu_aps_update_packagelist.lng
interface/web/sites/lib/lang/hu_aps_update_packagelist.lng
+1
-1
interface/web/sites/lib/lang/id_aps.lng
interface/web/sites/lib/lang/id_aps.lng
+1
-0
interface/web/sites/lib/lang/id_aps_update_packagelist.lng
interface/web/sites/lib/lang/id_aps_update_packagelist.lng
+1
-1
interface/web/sites/lib/lang/it_aps.lng
interface/web/sites/lib/lang/it_aps.lng
+1
-0
interface/web/sites/lib/lang/it_aps_update_packagelist.lng
interface/web/sites/lib/lang/it_aps_update_packagelist.lng
+1
-1
interface/web/sites/lib/lang/ja_aps.lng
interface/web/sites/lib/lang/ja_aps.lng
+1
-0
interface/web/sites/lib/lang/nl_aps.lng
interface/web/sites/lib/lang/nl_aps.lng
+1
-0
interface/web/sites/lib/lang/nl_aps_update_packagelist.lng
interface/web/sites/lib/lang/nl_aps_update_packagelist.lng
+1
-1
interface/web/sites/lib/lang/pl.lng
interface/web/sites/lib/lang/pl.lng
+28
-27
interface/web/sites/lib/lang/pl_aps.lng
interface/web/sites/lib/lang/pl_aps.lng
+57
-55
interface/web/sites/lib/lang/pl_aps_instances_list.lng
interface/web/sites/lib/lang/pl_aps_instances_list.lng
+11
-10
interface/web/sites/lib/lang/pl_aps_packages_list.lng
interface/web/sites/lib/lang/pl_aps_packages_list.lng
+7
-6
interface/web/sites/lib/lang/pl_aps_update_packagelist.lng
interface/web/sites/lib/lang/pl_aps_update_packagelist.lng
+5
-5
interface/web/sites/lib/lang/pl_cron.lng
interface/web/sites/lib/lang/pl_cron.lng
+1
-0
interface/web/sites/lib/lang/pl_cron_list.lng
interface/web/sites/lib/lang/pl_cron_list.lng
+1
-0
interface/web/sites/lib/lang/pl_database.lng
interface/web/sites/lib/lang/pl_database.lng
+22
-21
interface/web/sites/lib/lang/pl_database_admin_list.lng
interface/web/sites/lib/lang/pl_database_admin_list.lng
+1
-0
interface/web/sites/lib/lang/pl_database_list.lng
interface/web/sites/lib/lang/pl_database_list.lng
+1
-0
interface/web/sites/lib/lang/pl_database_user.lng
interface/web/sites/lib/lang/pl_database_user.lng
+1
-0
interface/web/sites/lib/lang/pl_database_user_admin_list.lng
interface/web/sites/lib/lang/pl_database_user_admin_list.lng
+1
-0
interface/web/sites/lib/lang/pl_database_user_list.lng
interface/web/sites/lib/lang/pl_database_user_list.lng
+1
-0
interface/web/sites/lib/lang/pl_ftp_user.lng
interface/web/sites/lib/lang/pl_ftp_user.lng
+7
-6
interface/web/sites/lib/lang/pl_ftp_user_list.lng
interface/web/sites/lib/lang/pl_ftp_user_list.lng
+1
-0
interface/web/sites/lib/lang/pl_shell_user.lng
interface/web/sites/lib/lang/pl_shell_user.lng
+7
-6
interface/web/sites/lib/lang/pl_shell_user_list.lng
interface/web/sites/lib/lang/pl_shell_user_list.lng
+1
-0
interface/web/sites/lib/lang/pl_user_quota_stats_list.lng
interface/web/sites/lib/lang/pl_user_quota_stats_list.lng
+2
-1
interface/web/sites/lib/lang/pl_web_aliasdomain.lng
interface/web/sites/lib/lang/pl_web_aliasdomain.lng
+97
-96
interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng
interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng
+1
-0
interface/web/sites/lib/lang/pl_web_backup_list.lng
interface/web/sites/lib/lang/pl_web_backup_list.lng
+14
-13
interface/web/sites/lib/lang/pl_web_domain.lng
interface/web/sites/lib/lang/pl_web_domain.lng
+37
-36
interface/web/sites/lib/lang/pl_web_domain_admin_list.lng
interface/web/sites/lib/lang/pl_web_domain_admin_list.lng
+1
-0
interface/web/sites/lib/lang/pl_web_domain_list.lng
interface/web/sites/lib/lang/pl_web_domain_list.lng
+1
-0
interface/web/sites/lib/lang/pl_web_folder.lng
interface/web/sites/lib/lang/pl_web_folder.lng
+1
-0
interface/web/sites/lib/lang/pl_web_folder_list.lng
interface/web/sites/lib/lang/pl_web_folder_list.lng
+1
-0
interface/web/sites/lib/lang/pl_web_folder_user.lng
interface/web/sites/lib/lang/pl_web_folder_user.lng
+6
-5
interface/web/sites/lib/lang/pl_web_folder_user_list.lng
interface/web/sites/lib/lang/pl_web_folder_user_list.lng
+1
-0
interface/web/sites/lib/lang/pl_web_sites_stats_list.lng
interface/web/sites/lib/lang/pl_web_sites_stats_list.lng
+2
-1
interface/web/sites/lib/lang/pl_web_subdomain.lng
interface/web/sites/lib/lang/pl_web_subdomain.lng
+5
-4
interface/web/sites/lib/lang/pl_web_subdomain_list.lng
interface/web/sites/lib/lang/pl_web_subdomain_list.lng
+1
-0
interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng
interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng
+100
-99
interface/web/sites/lib/lang/pl_web_vhost_subdomain_list.lng
interface/web/sites/lib/lang/pl_web_vhost_subdomain_list.lng
+1
-0
interface/web/sites/lib/lang/pl_webdav_user.lng
interface/web/sites/lib/lang/pl_webdav_user.lng
+7
-6
interface/web/sites/lib/lang/pl_webdav_user_list.lng
interface/web/sites/lib/lang/pl_webdav_user_list.lng
+1
-0
interface/web/sites/lib/lang/pt_aps.lng
interface/web/sites/lib/lang/pt_aps.lng
+1
-0
interface/web/sites/lib/lang/pt_aps_update_packagelist.lng
interface/web/sites/lib/lang/pt_aps_update_packagelist.lng
+1
-1
interface/web/sites/lib/lang/ro_aps.lng
interface/web/sites/lib/lang/ro_aps.lng
+1
-0
interface/web/sites/lib/lang/ro_aps_update_packagelist.lng
interface/web/sites/lib/lang/ro_aps_update_packagelist.lng
+1
-1
interface/web/sites/lib/lang/ru_aps.lng
interface/web/sites/lib/lang/ru_aps.lng
+1
-0
interface/web/sites/lib/lang/ru_aps_update_packagelist.lng
interface/web/sites/lib/lang/ru_aps_update_packagelist.lng
+1
-1
interface/web/sites/lib/lang/se_aps.lng
interface/web/sites/lib/lang/se_aps.lng
+1
-0
interface/web/sites/lib/lang/se_aps_update_packagelist.lng
interface/web/sites/lib/lang/se_aps_update_packagelist.lng
+1
-1
interface/web/sites/lib/lang/sk_aps.lng
interface/web/sites/lib/lang/sk_aps.lng
+1
-0
interface/web/sites/lib/lang/sk_aps_update_packagelist.lng
interface/web/sites/lib/lang/sk_aps_update_packagelist.lng
+1
-1
interface/web/sites/lib/lang/tr_aps.lng
interface/web/sites/lib/lang/tr_aps.lng
+1
-0
interface/web/sites/lib/lang/tr_aps_update_packagelist.lng
interface/web/sites/lib/lang/tr_aps_update_packagelist.lng
+1
-1
interface/web/sites/templates/aps_install_package.htm
interface/web/sites/templates/aps_install_package.htm
+2
-2
interface/web/sites/templates/web_vhost_subdomain_edit.htm
interface/web/sites/templates/web_vhost_subdomain_edit.htm
+0
-4
interface/web/sites/web_domain_edit.php
interface/web/sites/web_domain_edit.php
+13
-13
interface/web/sites/web_vhost_subdomain_edit.php
interface/web/sites/web_vhost_subdomain_edit.php
+7
-35
interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng
interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng
+2
-0
interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng
interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng
+1
-0
interface/web/themes/default/css/styles.css
interface/web/themes/default/css/styles.css
+2
-0
interface/web/tools/form/interface_settings.tform.php
interface/web/tools/form/interface_settings.tform.php
+3
-1
interface/web/tools/import_vpopmail.php
interface/web/tools/import_vpopmail.php
+1
-1
interface/web/tools/lib/lang/cz.lng
interface/web/tools/lib/lang/cz.lng
+2
-0
interface/web/tools/lib/lang/cz_import_ispconfig.lng
interface/web/tools/lib/lang/cz_import_ispconfig.lng
+2
-0
interface/web/tools/lib/lang/cz_index.lng
interface/web/tools/lib/lang/cz_index.lng
+2
-0
interface/web/tools/lib/lang/cz_interface.lng
interface/web/tools/lib/lang/cz_interface.lng
+2
-0
interface/web/tools/lib/lang/cz_resync.lng
interface/web/tools/lib/lang/cz_resync.lng
+2
-0
interface/web/tools/lib/lang/cz_tpl_default.lng
interface/web/tools/lib/lang/cz_tpl_default.lng
+2
-0
interface/web/tools/lib/lang/cz_usersettings.lng
interface/web/tools/lib/lang/cz_usersettings.lng
+2
-0
interface/web/tools/lib/lang/en_import_vpopmail.lng
interface/web/tools/lib/lang/en_import_vpopmail.lng
+1
-1
interface/web/tools/lib/lang/pl.lng
interface/web/tools/lib/lang/pl.lng
+5
-4
interface/web/tools/lib/lang/pl_import_ispconfig.lng
interface/web/tools/lib/lang/pl_import_ispconfig.lng
+22
-21
interface/web/tools/lib/lang/pl_index.lng
interface/web/tools/lib/lang/pl_index.lng
+3
-2
interface/web/tools/lib/lang/pl_interface.lng
interface/web/tools/lib/lang/pl_interface.lng
+6
-5
interface/web/tools/lib/lang/pl_resync.lng
interface/web/tools/lib/lang/pl_resync.lng
+11
-10
interface/web/tools/lib/lang/pl_tpl_default.lng
interface/web/tools/lib/lang/pl_tpl_default.lng
+6
-5
interface/web/tools/lib/lang/pl_usersettings.lng
interface/web/tools/lib/lang/pl_usersettings.lng
+5
-4
interface/web/tools/lib/module.conf.php
interface/web/tools/lib/module.conf.php
+1
-1
interface/web/tools/templates/import_vpopmail.htm
interface/web/tools/templates/import_vpopmail.htm
+1
-1
interface/web/vm/lib/lang/cz.lng
interface/web/vm/lib/lang/cz.lng
+2
-0
interface/web/vm/lib/lang/cz_openvz_action.lng
interface/web/vm/lib/lang/cz_openvz_action.lng
+2
-0
interface/web/vm/lib/lang/cz_openvz_ip.lng
interface/web/vm/lib/lang/cz_openvz_ip.lng
+2
-0
interface/web/vm/lib/lang/cz_openvz_ip_list.lng
interface/web/vm/lib/lang/cz_openvz_ip_list.lng
+2
-0
interface/web/vm/lib/lang/cz_openvz_ostemplate.lng
interface/web/vm/lib/lang/cz_openvz_ostemplate.lng
+2
-0
interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng
interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng
+2
-0
interface/web/vm/lib/lang/cz_openvz_template.lng
interface/web/vm/lib/lang/cz_openvz_template.lng
+2
-0
interface/web/vm/lib/lang/cz_openvz_template_list.lng
interface/web/vm/lib/lang/cz_openvz_template_list.lng
+2
-0
interface/web/vm/lib/lang/cz_openvz_vm.lng
interface/web/vm/lib/lang/cz_openvz_vm.lng
+2
-0
interface/web/vm/lib/lang/cz_openvz_vm_list.lng
interface/web/vm/lib/lang/cz_openvz_vm_list.lng
+2
-0
interface/web/vm/lib/lang/pl.lng
interface/web/vm/lib/lang/pl.lng
+1
-0
interface/web/vm/lib/lang/pl_openvz_action.lng
interface/web/vm/lib/lang/pl_openvz_action.lng
+1
-0
interface/web/vm/lib/lang/pl_openvz_ip.lng
interface/web/vm/lib/lang/pl_openvz_ip.lng
+1
-0
interface/web/vm/lib/lang/pl_openvz_ip_list.lng
interface/web/vm/lib/lang/pl_openvz_ip_list.lng
+5
-4
interface/web/vm/lib/lang/pl_openvz_ostemplate.lng
interface/web/vm/lib/lang/pl_openvz_ostemplate.lng
+1
-0
interface/web/vm/lib/lang/pl_openvz_ostemplate_list.lng
interface/web/vm/lib/lang/pl_openvz_ostemplate_list.lng
+1
-0
interface/web/vm/lib/lang/pl_openvz_template.lng
interface/web/vm/lib/lang/pl_openvz_template.lng
+1
-0
interface/web/vm/lib/lang/pl_openvz_template_list.lng
interface/web/vm/lib/lang/pl_openvz_template_list.lng
+1
-0
interface/web/vm/lib/lang/pl_openvz_vm.lng
interface/web/vm/lib/lang/pl_openvz_vm.lng
+1
-0
interface/web/vm/lib/lang/pl_openvz_vm_list.lng
interface/web/vm/lib/lang/pl_openvz_vm_list.lng
+1
-0
interface/web/vm/list/openvz_vm.list.php
interface/web/vm/list/openvz_vm.list.php
+1
-1
interface/web/vm/openvz_vm_list.php
interface/web/vm/openvz_vm_list.php
+1
-1
server/conf/apache_ispconfig.conf.master
server/conf/apache_ispconfig.conf.master
+2
-0
server/conf/nginx_apps.vhost.master
server/conf/nginx_apps.vhost.master
+1
-1
server/conf/vhost.conf.master
server/conf/vhost.conf.master
+8
-4
server/lib/classes/aps_installer.inc.php
server/lib/classes/aps_installer.inc.php
+11
-1
server/lib/classes/db_mysql.inc.php
server/lib/classes/db_mysql.inc.php
+13
-2
server/lib/classes/plugins.inc.php
server/lib/classes/plugins.inc.php
+1
-1
server/lib/classes/system.inc.php
server/lib/classes/system.inc.php
+2
-1
server/plugins-available/apache2_plugin.inc.php
server/plugins-available/apache2_plugin.inc.php
+51
-25
server/plugins-available/apps_vhost_plugin.inc.php
server/plugins-available/apps_vhost_plugin.inc.php
+17
-3
server/plugins-available/backup_plugin.inc.php
server/plugins-available/backup_plugin.inc.php
+4
-2
server/plugins-available/bind_dlz_plugin.inc.php
server/plugins-available/bind_dlz_plugin.inc.php
+26
-26
server/plugins-available/bind_plugin.inc.php
server/plugins-available/bind_plugin.inc.php
+2
-2
server/plugins-available/ftpuser_base_plugin.inc.php
server/plugins-available/ftpuser_base_plugin.inc.php
+4
-4
server/plugins-available/maildeliver_plugin.inc.php
server/plugins-available/maildeliver_plugin.inc.php
+12
-1
server/plugins-available/mysql_clientdb_plugin.inc.php
server/plugins-available/mysql_clientdb_plugin.inc.php
+150
-21
server/plugins-available/nginx_plugin.inc.php
server/plugins-available/nginx_plugin.inc.php
+9
-7
server/plugins-available/postfix_server_plugin.inc.php
server/plugins-available/postfix_server_plugin.inc.php
+11
-5
server/plugins-available/webserver_plugin.inc.php
server/plugins-available/webserver_plugin.inc.php
+1
-1
server/server.php
server/server.php
+2
-2
No files found.
install/dist/lib/fedora.lib.php
View file @
cc65688b
...
...
@@ -1024,7 +1024,7 @@ class installer_dist extends installer_base {
//copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
//* and create the symlink
if
(
$this
->
is_update
==
false
)
{
//
if($this->is_update == false) {
if
(
@
is_link
(
"
$vhost_conf_enabled_dir
/ispconfig.vhost"
))
unlink
(
"
$vhost_conf_enabled_dir
/ispconfig.vhost"
);
if
(
!@
is_link
(
"
$vhost_conf_enabled_dir
/000-ispconfig.vhost"
))
{
exec
(
"ln -s
$vhost_conf_dir
/ispconfig.vhost
$vhost_conf_enabled_dir
/000-ispconfig.vhost"
);
...
...
@@ -1039,17 +1039,17 @@ class installer_dist extends installer_base {
replaceLine('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter','PHPRC=','PHPRC=/etc/',0,0);
*/
if
(
!
is_file
(
'/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'
))
{
//
if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
$content
=
rf
(
'tpl/apache_ispconfig_fcgi_starter.master'
);
$content
=
str_replace
(
'{fastcgi_bin}'
,
$conf
[
'fastcgi'
][
'fastcgi_bin'
],
$content
);
$content
=
str_replace
(
'{fastcgi_phpini_path}'
,
$conf
[
'fastcgi'
][
'fastcgi_phpini_path'
],
$content
);
exec
(
'mkdir -p /var/www/php-fcgi-scripts/ispconfig'
);
if
(
!
is_dir
(
'/var/www/php-fcgi-scripts/ispconfig'
))
exec
(
'mkdir -p /var/www/php-fcgi-scripts/ispconfig'
);
wf
(
'/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'
,
$content
);
exec
(
'chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'
);
exec
(
'ln -s /usr/local/ispconfig/interface/web /var/www/ispconfig'
);
if
(
!
is_link
(
'/var/www/ispconfig'
))
exec
(
'ln -s /usr/local/ispconfig/interface/web /var/www/ispconfig'
);
exec
(
'chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig'
);
}
}
//
}
//
}
}
if
(
$conf
[
'nginx'
][
'installed'
]
==
true
&&
$this
->
install_ispconfig_interface
==
true
){
...
...
@@ -1228,7 +1228,7 @@ class installer_dist extends installer_base {
$existing_cron_jobs
=
file
(
'crontab.txt'
);
$cron_jobs
=
array
(
'*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /
var/log/ispconfig/cron.log
'
'*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /
dev/null
'
);
// remove existing ispconfig cronjobs, in case the syntax has changed
...
...
@@ -1247,7 +1247,7 @@ class installer_dist extends installer_base {
}
exec
(
'touch /var/log/ispconfig/cron.log'
);
exec
(
'chmod 66
6
/var/log/ispconfig/cron.log'
);
exec
(
'chmod 66
0
/var/log/ispconfig/cron.log'
);
}
}
...
...
install/dist/lib/gentoo.lib.php
View file @
cc65688b
...
...
@@ -610,8 +610,8 @@ class installer extends installer_base
$this
->
write_config_file
(
"
$vhost_conf_dir
/apps.vhost"
,
$content
);
if
(
!
is_file
(
$conf
[
'web'
][
'website_basedir'
]
.
'/php-fcgi-scripts/apps/.php-fcgi-starter'
)
)
{
//
if ( !is_file($conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter') )
//
{
$content
=
rf
(
'tpl/apache_apps_fcgi_starter.master'
);
$content
=
str_replace
(
'{fastcgi_bin}'
,
$conf
[
'fastcgi'
][
'fastcgi_bin'
],
$content
);
$content
=
str_replace
(
'{fastcgi_phpini_path}'
,
$conf
[
'fastcgi'
][
'fastcgi_phpini_path'
],
$content
);
...
...
@@ -621,7 +621,7 @@ class installer extends installer_base
exec
(
'chmod +x '
.
$conf
[
'web'
][
'website_basedir'
]
.
'/php-fcgi-scripts/apps/.php-fcgi-starter'
);
exec
(
'chown -R ispapps:ispapps '
.
$conf
[
'web'
][
'website_basedir'
]
.
'/php-fcgi-scripts/apps'
);
}
//
}
}
if
(
$conf
[
'nginx'
][
'installed'
]
==
true
){
$apps_vhost_user
=
escapeshellcmd
(
$conf
[
'web'
][
'apps_vhost_user'
]);
...
...
@@ -946,11 +946,11 @@ class installer extends installer_base
$content
=
rf
(
'tpl/apache_ispconfig_fcgi_starter.master'
);
$content
=
str_replace
(
'{fastcgi_bin}'
,
$conf
[
'fastcgi'
][
'fastcgi_bin'
],
$content
);
$content
=
str_replace
(
'{fastcgi_phpini_path}'
,
$conf
[
'fastcgi'
][
'fastcgi_phpini_path'
],
$content
);
mkdir
(
'/var/www/php-fcgi-scripts/ispconfig'
,
0755
,
true
);
@
mkdir
(
'/var/www/php-fcgi-scripts/ispconfig'
,
0755
,
true
);
wf
(
'/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'
,
$content
);
exec
(
'chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'
);
chmod
(
'/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'
,
0755
);
symlink
(
$install_dir
.
'/interface/web'
,
'/var/www/ispconfig'
);
@
symlink
(
$install_dir
.
'/interface/web'
,
'/var/www/ispconfig'
);
exec
(
'chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig'
);
}
}
...
...
install/dist/lib/opensuse.lib.php
View file @
cc65688b
...
...
@@ -1078,7 +1078,7 @@ class installer_dist extends installer_base {
wf
(
"
$vhost_conf_dir
/ispconfig.vhost"
,
$content
);
if
(
!
is_file
(
'/srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'
))
{
//
if(!is_file('/srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
$content
=
rf
(
'tpl/apache_ispconfig_fcgi_starter.master'
);
$content
=
str_replace
(
'{fastcgi_bin}'
,
$conf
[
'fastcgi'
][
'fastcgi_bin'
],
$content
);
$content
=
str_replace
(
'{fastcgi_phpini_path}'
,
$conf
[
'fastcgi'
][
'fastcgi_phpini_path'
],
$content
);
...
...
@@ -1088,7 +1088,7 @@ class installer_dist extends installer_base {
exec
(
'ln -s /usr/local/ispconfig/interface/web /srv/www/ispconfig'
);
exec
(
'chown -R ispconfig:ispconfig /srv/www/php-fcgi-scripts/ispconfig'
);
}
//
}
//copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
//* and create the symlink
...
...
@@ -1280,7 +1280,7 @@ class installer_dist extends installer_base {
$existing_cron_jobs
=
file
(
'crontab.txt'
);
$cron_jobs
=
array
(
'*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /
var/log/ispconfig/cron.log
'
'*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /
dev/null
'
);
// remove existing ispconfig cronjobs, in case the syntax has changed
...
...
@@ -1299,7 +1299,7 @@ class installer_dist extends installer_base {
}
exec
(
'touch /var/log/ispconfig/cron.log'
);
exec
(
'chmod 66
6
/var/log/ispconfig/cron.log'
);
exec
(
'chmod 66
0
/var/log/ispconfig/cron.log'
);
}
}
...
...
install/lib/installer_base.lib.php
View file @
cc65688b
...
...
@@ -567,23 +567,6 @@ class installer_base {
}
}
}
$config_dir
=
$conf
[
'mailman'
][
'config_dir'
]
.
'/'
;
$full_file_name
=
$config_dir
.
'virtual_to_transport.sh'
;
//* Backup exiting virtual_to_transport.sh script
if
(
is_file
(
$full_file_name
))
{
copy
(
$full_file_name
,
$config_dir
.
'virtual_to_transport.sh~'
);
}
copy
(
'tpl/mailman-virtual_to_transport.sh'
,
$full_file_name
);
chgrp
(
$full_file_name
,
'list'
);
chmod
(
$full_file_name
,
0750
);
if
(
!
is_file
(
'/var/lib/mailman/data/transport-mailman'
))
touch
(
'/var/lib/mailman/data/transport-mailman'
);
exec
(
'/usr/sbin/postmap /var/lib/mailman/data/transport-mailman'
);
exec
(
'/usr/lib/mailman/bin/genaliases 2>/dev/null'
);
$virtual_domains
=
''
;
if
(
$status
==
'update'
)
...
...
@@ -608,8 +591,27 @@ class installer_base {
if
(
!
isset
(
$old_options
[
'DEFAULT_SERVER_LANGUAGE'
]))
$old_options
[
'DEFAULT_SERVER_LANGUAGE'
]
=
''
;
$content
=
str_replace
(
'{default_language}'
,
$old_options
[
'DEFAULT_SERVER_LANGUAGE'
],
$content
);
$content
=
str_replace
(
'{virtual_domains}'
,
$virtual_domains
,
$content
);
wf
(
$full_file_name
,
$content
);
//* Write virtual_to_transport.sh script
$config_dir
=
$conf
[
'mailman'
][
'config_dir'
]
.
'/'
;
$full_file_name
=
$config_dir
.
'virtual_to_transport.sh'
;
//* Backup exiting virtual_to_transport.sh script
if
(
is_file
(
$full_file_name
))
{
copy
(
$full_file_name
,
$config_dir
.
'virtual_to_transport.sh~'
);
}
if
(
is_dir
(
'/etc/mailman'
))
{
copy
(
'tpl/mailman-virtual_to_transport.sh'
,
$full_file_name
);
chgrp
(
$full_file_name
,
'list'
);
chmod
(
$full_file_name
,
0750
);
}
//* Create aliasaes
exec
(
'/usr/lib/mailman/bin/genaliases 2>/dev/null'
);
}
public
function
configure_postfix
(
$options
=
''
)
{
...
...
@@ -732,11 +734,13 @@ class installer_base {
touch
(
$config_dir
.
'/body_checks'
);
//* Create the mailman files
exec
(
'mkdir -p /var/lib/mailman/data'
);
if
(
!
is_dir
(
'/var/lib/mailman/data'
))
exec
(
'mkdir -p /var/lib/mailman/data'
);
if
(
!
is_file
(
'/var/lib/mailman/data/aliases'
))
touch
(
'/var/lib/mailman/data/aliases'
);
exec
(
'postalias /var/lib/mailman/data/aliases'
);
if
(
!
is_file
(
'/var/lib/mailman/data/virtual-mailman'
))
touch
(
'/var/lib/mailman/data/virtual-mailman'
);
exec
(
'postmap /var/lib/mailman/data/virtual-mailman'
);
if
(
!
is_file
(
'/var/lib/mailman/data/transport-mailman'
))
touch
(
'/var/lib/mailman/data/transport-mailman'
);
exec
(
'/usr/sbin/postmap /var/lib/mailman/data/transport-mailman'
);
//* Make a backup copy of the main.cf file
copy
(
$config_dir
.
'/main.cf'
,
$config_dir
.
'/main.cf~'
);
...
...
@@ -1921,16 +1925,16 @@ class installer_base {
symlink
(
$vhost_conf_dir
.
'/ispconfig.vhost'
,
$vhost_conf_enabled_dir
.
'/000-ispconfig.vhost'
);
}
}
if
(
!
is_file
(
'/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'
))
{
//
if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
$content
=
rf
(
'tpl/apache_ispconfig_fcgi_starter.master'
);
$content
=
str_replace
(
'{fastcgi_bin}'
,
$conf
[
'fastcgi'
][
'fastcgi_bin'
],
$content
);
$content
=
str_replace
(
'{fastcgi_phpini_path}'
,
$conf
[
'fastcgi'
][
'fastcgi_phpini_path'
],
$content
);
mkdir
(
'/var/www/php-fcgi-scripts/ispconfig'
,
0755
,
true
);
@
mkdir
(
'/var/www/php-fcgi-scripts/ispconfig'
,
0755
,
true
);
wf
(
'/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'
,
$content
);
exec
(
'chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'
);
symlink
(
$install_dir
.
'/interface/web'
,
'/var/www/ispconfig'
);
@
symlink
(
$install_dir
.
'/interface/web'
,
'/var/www/ispconfig'
);
exec
(
'chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig'
);
}
//
}
}
if
(
$conf
[
'nginx'
][
'installed'
]
==
true
&&
$this
->
install_ispconfig_interface
==
true
){
...
...
@@ -2116,7 +2120,7 @@ class installer_base {
$existing_cron_jobs
=
file
(
'crontab.txt'
);
$cron_jobs
=
array
(
'*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>>
'
.
$conf
[
'ispconfig_log_dir'
]
.
'/cron.log
'
'*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>>
/dev/null
'
);
// remove existing ispconfig cronjobs, in case the syntax has changed
...
...
@@ -2135,7 +2139,7 @@ class installer_base {
}
touch
(
$conf
[
'ispconfig_log_dir'
]
.
'/cron.log'
);
chmod
(
$conf
[
'ispconfig_log_dir'
]
.
'/cron.log'
,
066
6
);
chmod
(
$conf
[
'ispconfig_log_dir'
]
.
'/cron.log'
,
066
0
);
}
...
...
install/sql/incremental/upd_0035.sql
View file @
cc65688b
...
...
@@ -20,6 +20,6 @@ INSERT INTO `sys_theme` (`var_id`, `tpl_name`, `username`, `logo_url`) VALUES (N
-- --------------------------------------------------------
ALTER
TABLE
`web_domain`
ADD
`ssl_key`
MEDIUMTEXT
NOT
NULL
AFTER
`ssl_bundle`
;
ALTER
TABLE
`mail_user`
ADD
`disabledoveadm`
enum
(
'n'
,
'y'
)
NOT
NULL
default
'n'
AFTER
`disablelda`
ALTER
TABLE
`mail_user`
ADD
`disabledoveadm`
enum
(
'n'
,
'y'
)
NOT
NULL
default
'n'
AFTER
`disablelda`
;
install/sql/ispconfig3.sql
View file @
cc65688b
...
...
@@ -296,7 +296,7 @@ CREATE TABLE `client_template` (
`limit_shell_user`
int
(
11
)
NOT
NULL
default
'0'
,
`ssh_chroot`
varchar
(
255
)
NOT
NULL
DEFAULT
'no'
,
`limit_webdav_user`
int
(
11
)
NOT
NULL
default
'0'
,
`limit_aps`
int
(
11
)
NOT
NULL
DEFAULT
'
0
'
,
`limit_aps`
int
(
11
)
NOT
NULL
DEFAULT
'
-1
'
,
`limit_dns_zone`
int
(
11
)
NOT
NULL
default
'-1'
,
`limit_dns_slave_zone`
int
(
11
)
NOT
NULL
default
'-1'
,
`limit_dns_record`
int
(
11
)
NOT
NULL
default
'-1'
,
...
...
@@ -2169,6 +2169,6 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`,
-- Dumping data for table `sys_config`
--
INSERT
INTO
sys_config
VALUES
(
'1'
,
'db'
,
'db_version'
,
'3.0.5'
);
INSERT
INTO
sys_config
VALUES
(
'1'
,
'db'
,
'db_version'
,
'3.0.5
.1
'
);
SET
FOREIGN_KEY_CHECKS
=
1
;
\ No newline at end of file
install/tpl/apache_ispconfig.conf.master
View file @
cc65688b
...
...
@@ -50,3 +50,5 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
Alias /awstats-icon "/usr/share/awstats/icon"
NameVirtualHost *:80
NameVirtualHost *:443
\ No newline at end of file
install/tpl/apache_ispconfig.vhost.master
View file @
cc65688b
...
...
@@ -28,18 +28,19 @@ NameVirtualHost *:{vhost_port}
IPCCommTimeout 7200
</IfModule>
# <IfModule mod_php5.c>
# DocumentRoot /usr/local/ispconfig/interface/web/
# AddType application/x-httpd-php .php
# <Directory /usr/local/ispconfig/interface/web>
# # php_admin_value open_basedir "/usr/local/ispconfig/interface:/usr/share:/tmp"
# Options FollowSymLinks
# AllowOverride None
# Order allow,deny
# Allow from all
# php_value magic_quotes_gpc 0
# </Directory>
# </IfModule>
<IfModule mpm_itk_module>
DocumentRoot /usr/local/ispconfig/interface/web/
AssignUserId ispconfig ispconfig
AddType application/x-httpd-php .php
<Directory /usr/local/ispconfig/interface/web>
# php_admin_value open_basedir "/usr/local/ispconfig/interface:/usr/share:/tmp"
Options FollowSymLinks
AllowOverride None
Order allow,deny
Allow from all
php_value magic_quotes_gpc 0
</Directory>
</IfModule>
# ErrorLog /var/log/apache2/error.log
# CustomLog /var/log/apache2/access.log combined
...
...
install/tpl/config.inc.php.master
View file @
cc65688b
<?php
/*
Copyright (c) 2007 - 201
2
, Till Brehm, projektfarm Gmbh
Copyright (c) 2007 - 201
3
, Till Brehm, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
...
...
@@ -56,7 +56,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision);
//** Application
define
(
'ISPC_APP_TITLE'
,
'ISPConfig'
);
define
(
'ISPC_APP_VERSION'
,
'3.0.5'
);
define
(
'ISPC_APP_VERSION'
,
'3.0.5
.1
'
);
define
(
'DEVSYSTEM'
,
0
);
...
...
install/tpl/nginx_apps.vhost.master
View file @
cc65688b
...
...
@@ -46,7 +46,7 @@ server {
fastcgi_pass unix:{fpm_socket};
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PATH_INFO $fastcgi_script_name;
#
fastcgi_param PATH_INFO $fastcgi_script_name;
fastcgi_buffer_size 128k;
fastcgi_buffers 256 4k;
fastcgi_busy_buffers_size 256k;
...
...
install/tpl/nginx_ispconfig.vhost.master
View file @
cc65688b
...
...
@@ -28,7 +28,7 @@ server {
fastcgi_pass unix:{fpm_socket};
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PATH_INFO $fastcgi_script_name;
#
fastcgi_param PATH_INFO $fastcgi_script_name;
fastcgi_buffer_size 128k;
fastcgi_buffers 256 4k;
fastcgi_busy_buffers_size 256k;
...
...
install/update.php
View file @
cc65688b
...
...
@@ -129,7 +129,7 @@ $do_backup = $inst->simple_query('Shall the script create a ISPConfig backup in
if
(
$do_backup
==
'yes'
)
{