Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
ISPConfig 3
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lolo888
ISPConfig 3
Commits
72695f03
Commit
72695f03
authored
Feb 12, 2013
by
tbrehm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merged Revisions 3771-3801 from stable branch.
parent
a126d73f
Changes
524
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
524 changed files
with
1942 additions
and
883 deletions
+1942
-883
install/dist/lib/fedora.lib.php
install/dist/lib/fedora.lib.php
+1
-1
install/dist/lib/gentoo.lib.php
install/dist/lib/gentoo.lib.php
+1
-1
install/dist/lib/opensuse.lib.php
install/dist/lib/opensuse.lib.php
+1
-1
install/lib/installer_base.lib.php
install/lib/installer_base.lib.php
+18
-1
install/sql/incremental/upd_0047.sql
install/sql/incremental/upd_0047.sql
+1
-0
install/sql/ispconfig3.sql
install/sql/ispconfig3.sql
+1
-1
install/tpl/apps_php_fpm_pool.conf.master
install/tpl/apps_php_fpm_pool.conf.master
+1
-1
install/tpl/mailman-virtual_to_transport.sh
install/tpl/mailman-virtual_to_transport.sh
+3
-0
install/tpl/mm_cfg.py.master
install/tpl/mm_cfg.py.master
+2
-0
interface/lib/classes/db_mysql.inc.php
interface/lib/classes/db_mysql.inc.php
+20
-9
interface/lib/classes/listform_tpl_generator.inc.php
interface/lib/classes/listform_tpl_generator.inc.php
+7
-0
interface/lib/classes/searchform.inc.php
interface/lib/classes/searchform.inc.php
+2
-0
interface/lib/classes/simplepie.inc.php
interface/lib/classes/simplepie.inc.php
+5
-5
interface/lib/classes/tform.inc.php
interface/lib/classes/tform.inc.php
+35
-22
interface/lib/classes/tpl_error.inc.php
interface/lib/classes/tpl_error.inc.php
+1
-1
interface/lib/lang/cz.lng
interface/lib/lang/cz.lng
+0
-1
interface/lib/lang/en.lng
interface/lib/lang/en.lng
+2
-0
interface/web/admin/lib/lang/ar_login_as.lng
interface/web/admin/lib/lang/ar_login_as.lng
+12
-0
interface/web/admin/lib/lang/ar_server_config.lng
interface/web/admin/lib/lang/ar_server_config.lng
+0
-3
interface/web/admin/lib/lang/ar_users.lng
interface/web/admin/lib/lang/ar_users.lng
+1
-1
interface/web/admin/lib/lang/bg_login_as.lng
interface/web/admin/lib/lang/bg_login_as.lng
+12
-0
interface/web/admin/lib/lang/bg_server_config.lng
interface/web/admin/lib/lang/bg_server_config.lng
+0
-3
interface/web/admin/lib/lang/bg_users.lng
interface/web/admin/lib/lang/bg_users.lng
+1
-1
interface/web/admin/lib/lang/br_login_as.lng
interface/web/admin/lib/lang/br_login_as.lng
+12
-0
interface/web/admin/lib/lang/br_server_config.lng
interface/web/admin/lib/lang/br_server_config.lng
+0
-3
interface/web/admin/lib/lang/br_users.lng
interface/web/admin/lib/lang/br_users.lng
+1
-1
interface/web/admin/lib/lang/cz.lng
interface/web/admin/lib/lang/cz.lng
+0
-1
interface/web/admin/lib/lang/cz_directive_snippets.lng
interface/web/admin/lib/lang/cz_directive_snippets.lng
+0
-1
interface/web/admin/lib/lang/cz_directive_snippets_list.lng
interface/web/admin/lib/lang/cz_directive_snippets_list.lng
+0
-1
interface/web/admin/lib/lang/cz_firewall.lng
interface/web/admin/lib/lang/cz_firewall.lng
+0
-1
interface/web/admin/lib/lang/cz_firewall_list.lng
interface/web/admin/lib/lang/cz_firewall_list.lng
+0
-1
interface/web/admin/lib/lang/cz_groups.lng
interface/web/admin/lib/lang/cz_groups.lng
+0
-1
interface/web/admin/lib/lang/cz_groups_list.lng
interface/web/admin/lib/lang/cz_groups_list.lng
+0
-1
interface/web/admin/lib/lang/cz_iptables.lng
interface/web/admin/lib/lang/cz_iptables.lng
+6
-7
interface/web/admin/lib/lang/cz_iptables_list.lng
interface/web/admin/lib/lang/cz_iptables_list.lng
+6
-7
interface/web/admin/lib/lang/cz_language_add.lng
interface/web/admin/lib/lang/cz_language_add.lng
+0
-1
interface/web/admin/lib/lang/cz_language_complete.lng
interface/web/admin/lib/lang/cz_language_complete.lng
+0
-1
interface/web/admin/lib/lang/cz_language_edit.lng
interface/web/admin/lib/lang/cz_language_edit.lng
+0
-1
interface/web/admin/lib/lang/cz_language_export.lng
interface/web/admin/lib/lang/cz_language_export.lng
+0
-1
interface/web/admin/lib/lang/cz_language_import.lng
interface/web/admin/lib/lang/cz_language_import.lng
+0
-1
interface/web/admin/lib/lang/cz_language_list.lng
interface/web/admin/lib/lang/cz_language_list.lng
+0
-1
interface/web/admin/lib/lang/cz_login_as.lng
interface/web/admin/lib/lang/cz_login_as.lng
+12
-0
interface/web/admin/lib/lang/cz_package_install.lng
interface/web/admin/lib/lang/cz_package_install.lng
+0
-1
interface/web/admin/lib/lang/cz_remote_action.lng
interface/web/admin/lib/lang/cz_remote_action.lng
+0
-1
interface/web/admin/lib/lang/cz_remote_user.lng
interface/web/admin/lib/lang/cz_remote_user.lng
+0
-1
interface/web/admin/lib/lang/cz_remote_user_list.lng
interface/web/admin/lib/lang/cz_remote_user_list.lng
+0
-1
interface/web/admin/lib/lang/cz_server.lng
interface/web/admin/lib/lang/cz_server.lng
+0
-1
interface/web/admin/lib/lang/cz_server_config.lng
interface/web/admin/lib/lang/cz_server_config.lng
+44
-40
interface/web/admin/lib/lang/cz_server_config_list.lng
interface/web/admin/lib/lang/cz_server_config_list.lng
+0
-1
interface/web/admin/lib/lang/cz_server_ip.lng
interface/web/admin/lib/lang/cz_server_ip.lng
+0
-1
interface/web/admin/lib/lang/cz_server_ip_list.lng
interface/web/admin/lib/lang/cz_server_ip_list.lng
+0
-1
interface/web/admin/lib/lang/cz_server_list.lng
interface/web/admin/lib/lang/cz_server_list.lng
+0
-1
interface/web/admin/lib/lang/cz_server_php.lng
interface/web/admin/lib/lang/cz_server_php.lng
+0
-1
interface/web/admin/lib/lang/cz_server_php_list.lng
interface/web/admin/lib/lang/cz_server_php_list.lng
+0
-1
interface/web/admin/lib/lang/cz_software_package_install.lng
interface/web/admin/lib/lang/cz_software_package_install.lng
+0
-1
interface/web/admin/lib/lang/cz_software_package_list.lng
interface/web/admin/lib/lang/cz_software_package_list.lng
+3
-4
interface/web/admin/lib/lang/cz_software_repo.lng
interface/web/admin/lib/lang/cz_software_repo.lng
+0
-1
interface/web/admin/lib/lang/cz_software_repo_list.lng
interface/web/admin/lib/lang/cz_software_repo_list.lng
+0
-1
interface/web/admin/lib/lang/cz_software_update_list.lng
interface/web/admin/lib/lang/cz_software_update_list.lng
+0
-1
interface/web/admin/lib/lang/cz_system_config.lng
interface/web/admin/lib/lang/cz_system_config.lng
+3
-1
interface/web/admin/lib/lang/cz_tpl_default_admin.lng
interface/web/admin/lib/lang/cz_tpl_default_admin.lng
+0
-1
interface/web/admin/lib/lang/cz_users.lng
interface/web/admin/lib/lang/cz_users.lng
+1
-2
interface/web/admin/lib/lang/cz_users_list.lng
interface/web/admin/lib/lang/cz_users_list.lng
+1
-2
interface/web/admin/lib/lang/de_login_as.lng
interface/web/admin/lib/lang/de_login_as.lng
+11
-0
interface/web/admin/lib/lang/de_server_config.lng
interface/web/admin/lib/lang/de_server_config.lng
+0
-3
interface/web/admin/lib/lang/el_login_as.lng
interface/web/admin/lib/lang/el_login_as.lng
+12
-0
interface/web/admin/lib/lang/el_server_config.lng
interface/web/admin/lib/lang/el_server_config.lng
+0
-3
interface/web/admin/lib/lang/el_users.lng
interface/web/admin/lib/lang/el_users.lng
+1
-1
interface/web/admin/lib/lang/en_login_as.lng
interface/web/admin/lib/lang/en_login_as.lng
+12
-0
interface/web/admin/lib/lang/es_login_as.lng
interface/web/admin/lib/lang/es_login_as.lng
+12
-0
interface/web/admin/lib/lang/es_server_config.lng
interface/web/admin/lib/lang/es_server_config.lng
+0
-3
interface/web/admin/lib/lang/es_users.lng
interface/web/admin/lib/lang/es_users.lng
+1
-1
interface/web/admin/lib/lang/fi_login_as.lng
interface/web/admin/lib/lang/fi_login_as.lng
+12
-0
interface/web/admin/lib/lang/fi_server_config.lng
interface/web/admin/lib/lang/fi_server_config.lng
+0
-3
interface/web/admin/lib/lang/fi_users.lng
interface/web/admin/lib/lang/fi_users.lng
+1
-1
interface/web/admin/lib/lang/fr_directive_snippets.lng
interface/web/admin/lib/lang/fr_directive_snippets.lng
+8
-8
interface/web/admin/lib/lang/fr_directive_snippets_list.lng
interface/web/admin/lib/lang/fr_directive_snippets_list.lng
+6
-6
interface/web/admin/lib/lang/fr_login_as.lng
interface/web/admin/lib/lang/fr_login_as.lng
+12
-0
interface/web/admin/lib/lang/fr_server_config.lng
interface/web/admin/lib/lang/fr_server_config.lng
+0
-3
interface/web/admin/lib/lang/fr_users.lng
interface/web/admin/lib/lang/fr_users.lng
+1
-1
interface/web/admin/lib/lang/hr_login_as.lng
interface/web/admin/lib/lang/hr_login_as.lng
+12
-0
interface/web/admin/lib/lang/hr_server_config.lng
interface/web/admin/lib/lang/hr_server_config.lng
+0
-3
interface/web/admin/lib/lang/hr_users.lng
interface/web/admin/lib/lang/hr_users.lng
+1
-1
interface/web/admin/lib/lang/hu_login_as.lng
interface/web/admin/lib/lang/hu_login_as.lng
+12
-0
interface/web/admin/lib/lang/hu_server_config.lng
interface/web/admin/lib/lang/hu_server_config.lng
+0
-3
interface/web/admin/lib/lang/hu_users.lng
interface/web/admin/lib/lang/hu_users.lng
+1
-1
interface/web/admin/lib/lang/id_login_as.lng
interface/web/admin/lib/lang/id_login_as.lng
+12
-0
interface/web/admin/lib/lang/id_server_config.lng
interface/web/admin/lib/lang/id_server_config.lng
+0
-3
interface/web/admin/lib/lang/id_users.lng
interface/web/admin/lib/lang/id_users.lng
+1
-1
interface/web/admin/lib/lang/it_login_as.lng
interface/web/admin/lib/lang/it_login_as.lng
+12
-0
interface/web/admin/lib/lang/it_server_config.lng
interface/web/admin/lib/lang/it_server_config.lng
+0
-3
interface/web/admin/lib/lang/it_users.lng
interface/web/admin/lib/lang/it_users.lng
+1
-1
interface/web/admin/lib/lang/ja_login_as.lng
interface/web/admin/lib/lang/ja_login_as.lng
+12
-0
interface/web/admin/lib/lang/ja_server_config.lng
interface/web/admin/lib/lang/ja_server_config.lng
+0
-3
interface/web/admin/lib/lang/ja_users.lng
interface/web/admin/lib/lang/ja_users.lng
+1
-1
interface/web/admin/lib/lang/nl_login_as.lng
interface/web/admin/lib/lang/nl_login_as.lng
+12
-0
interface/web/admin/lib/lang/nl_server_config.lng
interface/web/admin/lib/lang/nl_server_config.lng
+0
-3
interface/web/admin/lib/lang/nl_users.lng
interface/web/admin/lib/lang/nl_users.lng
+1
-1
interface/web/admin/lib/lang/pl_login_as.lng
interface/web/admin/lib/lang/pl_login_as.lng
+12
-0
interface/web/admin/lib/lang/pl_server_config.lng
interface/web/admin/lib/lang/pl_server_config.lng
+0
-3
interface/web/admin/lib/lang/pl_users.lng
interface/web/admin/lib/lang/pl_users.lng
+1
-1
interface/web/admin/lib/lang/pt_login_as.lng
interface/web/admin/lib/lang/pt_login_as.lng
+12
-0
interface/web/admin/lib/lang/pt_server_config.lng
interface/web/admin/lib/lang/pt_server_config.lng
+0
-3
interface/web/admin/lib/lang/pt_users.lng
interface/web/admin/lib/lang/pt_users.lng
+1
-1
interface/web/admin/lib/lang/ro_login_as.lng
interface/web/admin/lib/lang/ro_login_as.lng
+12
-0
interface/web/admin/lib/lang/ro_server_config.lng
interface/web/admin/lib/lang/ro_server_config.lng
+0
-3
interface/web/admin/lib/lang/ro_users.lng
interface/web/admin/lib/lang/ro_users.lng
+1
-1
interface/web/admin/lib/lang/ru_login_as.lng
interface/web/admin/lib/lang/ru_login_as.lng
+12
-0
interface/web/admin/lib/lang/ru_server_config.lng
interface/web/admin/lib/lang/ru_server_config.lng
+0
-3
interface/web/admin/lib/lang/ru_users.lng
interface/web/admin/lib/lang/ru_users.lng
+1
-1
interface/web/admin/lib/lang/se_login_as.lng
interface/web/admin/lib/lang/se_login_as.lng
+12
-0
interface/web/admin/lib/lang/se_server_config.lng
interface/web/admin/lib/lang/se_server_config.lng
+0
-3
interface/web/admin/lib/lang/se_users.lng
interface/web/admin/lib/lang/se_users.lng
+1
-1
interface/web/admin/lib/lang/sk_login_as.lng
interface/web/admin/lib/lang/sk_login_as.lng
+12
-0
interface/web/admin/lib/lang/sk_server_config.lng
interface/web/admin/lib/lang/sk_server_config.lng
+0
-3
interface/web/admin/lib/lang/sk_users.lng
interface/web/admin/lib/lang/sk_users.lng
+1
-1
interface/web/admin/lib/lang/tr_login_as.lng
interface/web/admin/lib/lang/tr_login_as.lng
+12
-0
interface/web/admin/lib/lang/tr_server_config.lng
interface/web/admin/lib/lang/tr_server_config.lng
+0
-3
interface/web/admin/lib/lang/tr_users.lng
interface/web/admin/lib/lang/tr_users.lng
+1
-1
interface/web/admin/login_as.php
interface/web/admin/login_as.php
+8
-4
interface/web/admin/templates/directive_snippets_list.htm
interface/web/admin/templates/directive_snippets_list.htm
+5
-0
interface/web/admin/templates/firewall_list.htm
interface/web/admin/templates/firewall_list.htm
+5
-0
interface/web/admin/templates/groups_list.htm
interface/web/admin/templates/groups_list.htm
+5
-0
interface/web/admin/templates/iptables_list.htm
interface/web/admin/templates/iptables_list.htm
+5
-0
interface/web/admin/templates/language_complete.htm
interface/web/admin/templates/language_complete.htm
+5
-4
interface/web/admin/templates/remote_action_osupdate.htm
interface/web/admin/templates/remote_action_osupdate.htm
+1
-1
interface/web/admin/templates/remote_user_list.htm
interface/web/admin/templates/remote_user_list.htm
+5
-0
interface/web/admin/templates/server_config_list.htm
interface/web/admin/templates/server_config_list.htm
+5
-0
interface/web/admin/templates/server_ip_list.htm
interface/web/admin/templates/server_ip_list.htm
+5
-0
interface/web/admin/templates/server_list.htm
interface/web/admin/templates/server_list.htm
+5
-0
interface/web/admin/templates/server_php_list.htm
interface/web/admin/templates/server_php_list.htm
+5
-0
interface/web/admin/templates/software_package_list.htm
interface/web/admin/templates/software_package_list.htm
+5
-0
interface/web/admin/templates/software_repo_list.htm
interface/web/admin/templates/software_repo_list.htm
+5
-0
interface/web/admin/templates/software_update_list.htm
interface/web/admin/templates/software_update_list.htm
+5
-0
interface/web/admin/templates/users_list.htm
interface/web/admin/templates/users_list.htm
+5
-0
interface/web/client/client_del.php
interface/web/client/client_del.php
+1
-1
interface/web/client/lib/lang/ar_client.lng
interface/web/client/lib/lang/ar_client.lng
+1
-1
interface/web/client/lib/lang/bg_client.lng
interface/web/client/lib/lang/bg_client.lng
+1
-1
interface/web/client/lib/lang/br_client.lng
interface/web/client/lib/lang/br_client.lng
+1
-1
interface/web/client/lib/lang/cz.lng
interface/web/client/lib/lang/cz.lng
+0
-1
interface/web/client/lib/lang/cz_client.lng
interface/web/client/lib/lang/cz_client.lng
+37
-38
interface/web/client/lib/lang/cz_client_circle.lng
interface/web/client/lib/lang/cz_client_circle.lng
+0
-1
interface/web/client/lib/lang/cz_client_circle_list.lng
interface/web/client/lib/lang/cz_client_circle_list.lng
+0
-1
interface/web/client/lib/lang/cz_client_del.lng
interface/web/client/lib/lang/cz_client_del.lng
+0
-1
interface/web/client/lib/lang/cz_client_message.lng
interface/web/client/lib/lang/cz_client_message.lng
+0
-1
interface/web/client/lib/lang/cz_client_template.lng
interface/web/client/lib/lang/cz_client_template.lng
+28
-29
interface/web/client/lib/lang/cz_client_template_list.lng
interface/web/client/lib/lang/cz_client_template_list.lng
+0
-1
interface/web/client/lib/lang/cz_clients_list.lng
interface/web/client/lib/lang/cz_clients_list.lng
+2
-3
interface/web/client/lib/lang/cz_domain.lng
interface/web/client/lib/lang/cz_domain.lng
+0
-1
interface/web/client/lib/lang/cz_domain_list.lng
interface/web/client/lib/lang/cz_domain_list.lng
+2
-3
interface/web/client/lib/lang/cz_reseller.lng
interface/web/client/lib/lang/cz_reseller.lng
+40
-41
interface/web/client/lib/lang/cz_resellers_list.lng
interface/web/client/lib/lang/cz_resellers_list.lng
+2
-3
interface/web/client/lib/lang/de_client.lng
interface/web/client/lib/lang/de_client.lng
+1
-1
interface/web/client/lib/lang/el_client.lng
interface/web/client/lib/lang/el_client.lng
+1
-1
interface/web/client/lib/lang/es_client.lng
interface/web/client/lib/lang/es_client.lng
+1
-1
interface/web/client/lib/lang/fi_client.lng
interface/web/client/lib/lang/fi_client.lng
+1
-1
interface/web/client/lib/lang/fr_client.lng
interface/web/client/lib/lang/fr_client.lng
+1
-1
interface/web/client/lib/lang/hr_client.lng
interface/web/client/lib/lang/hr_client.lng
+1
-1
interface/web/client/lib/lang/hu_client.lng
interface/web/client/lib/lang/hu_client.lng
+1
-1
interface/web/client/lib/lang/id_client.lng
interface/web/client/lib/lang/id_client.lng
+1
-1
interface/web/client/lib/lang/it_client.lng
interface/web/client/lib/lang/it_client.lng
+1
-1
interface/web/client/lib/lang/ja_client.lng
interface/web/client/lib/lang/ja_client.lng
+1
-1
interface/web/client/lib/lang/nl_client.lng
interface/web/client/lib/lang/nl_client.lng
+1
-1
interface/web/client/lib/lang/pl_client.lng
interface/web/client/lib/lang/pl_client.lng
+1
-1
interface/web/client/lib/lang/pt_client.lng
interface/web/client/lib/lang/pt_client.lng
+1
-1
interface/web/client/lib/lang/ro_client.lng
interface/web/client/lib/lang/ro_client.lng
+1
-1
interface/web/client/lib/lang/ru_client.lng
interface/web/client/lib/lang/ru_client.lng
+1
-1
interface/web/client/lib/lang/se_client.lng
interface/web/client/lib/lang/se_client.lng
+1
-1
interface/web/client/lib/lang/sk_client.lng
interface/web/client/lib/lang/sk_client.lng
+1
-1
interface/web/client/lib/lang/tr_client.lng
interface/web/client/lib/lang/tr_client.lng
+1
-1
interface/web/client/templates/client_circle_list.htm
interface/web/client/templates/client_circle_list.htm
+5
-0
interface/web/client/templates/client_template_list.htm
interface/web/client/templates/client_template_list.htm
+5
-0
interface/web/client/templates/clients_list.htm
interface/web/client/templates/clients_list.htm
+5
-0
interface/web/client/templates/domain_list.htm
interface/web/client/templates/domain_list.htm
+5
-0
interface/web/client/templates/resellers_list.htm
interface/web/client/templates/resellers_list.htm
+5
-0
interface/web/dashboard/lib/lang/cz.lng
interface/web/dashboard/lib/lang/cz.lng
+0
-1
interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
+0
-1
interface/web/dashboard/lib/lang/cz_dashlet_modules.lng
interface/web/dashboard/lib/lang/cz_dashlet_modules.lng
+0
-1
interface/web/designer/lib/lang/cz.lng
interface/web/designer/lib/lang/cz.lng
+0
-1
interface/web/designer/lib/lang/cz_form_edit.lng
interface/web/designer/lib/lang/cz_form_edit.lng
+0
-1
interface/web/designer/lib/lang/cz_form_list.lng
interface/web/designer/lib/lang/cz_form_list.lng
+0
-1
interface/web/designer/lib/lang/cz_form_show.lng
interface/web/designer/lib/lang/cz_form_show.lng
+0
-1
interface/web/designer/lib/lang/cz_module_edit.lng
interface/web/designer/lib/lang/cz_module_edit.lng
+0
-1
interface/web/designer/lib/lang/cz_module_list.lng
interface/web/designer/lib/lang/cz_module_list.lng
+0
-1
interface/web/designer/lib/lang/cz_module_nav_edit.lng
interface/web/designer/lib/lang/cz_module_nav_edit.lng
+0
-1
interface/web/designer/lib/lang/cz_module_nav_item_edit.lng
interface/web/designer/lib/lang/cz_module_nav_item_edit.lng
+0
-1
interface/web/designer/lib/lang/cz_module_show.lng
interface/web/designer/lib/lang/cz_module_show.lng
+0
-1
interface/web/designer/templates/form_list.htm
interface/web/designer/templates/form_list.htm
+5
-0
interface/web/designer/templates/module_list.htm
interface/web/designer/templates/module_list.htm
+5
-0
interface/web/dns/dns_wizard.php
interface/web/dns/dns_wizard.php
+8
-5
interface/web/dns/form/dns_soa.tform.php
interface/web/dns/form/dns_soa.tform.php
+6
-7
interface/web/dns/lib/lang/ar_dns_soa.lng
interface/web/dns/lib/lang/ar_dns_soa.lng
+2
-1
interface/web/dns/lib/lang/bg_dns_soa.lng
interface/web/dns/lib/lang/bg_dns_soa.lng
+1
-0
interface/web/dns/lib/lang/br_dns_soa.lng
interface/web/dns/lib/lang/br_dns_soa.lng
+1
-0
interface/web/dns/lib/lang/cz.lng
interface/web/dns/lib/lang/cz.lng
+0
-1
interface/web/dns/lib/lang/cz_dns_a.lng
interface/web/dns/lib/lang/cz_dns_a.lng
+0
-1
interface/web/dns/lib/lang/cz_dns_a_list.lng
interface/web/dns/lib/lang/cz_dns_a_list.lng
+0
-1
interface/web/dns/lib/lang/cz_dns_aaaa.lng
interface/web/dns/lib/lang/cz_dns_aaaa.lng
+0
-1
interface/web/dns/lib/lang/cz_dns_alias.lng
interface/web/dns/lib/lang/cz_dns_alias.lng
+0
-1
interface/web/dns/lib/lang/cz_dns_cname.lng
interface/web/dns/lib/lang/cz_dns_cname.lng
+0
-1
interface/web/dns/lib/lang/cz_dns_hinfo.lng
interface/web/dns/lib/lang/cz_dns_hinfo.lng
+0
-1
interface/web/dns/lib/lang/cz_dns_import.lng
interface/web/dns/lib/lang/cz_dns_import.lng
+0
-1
interface/web/dns/lib/lang/cz_dns_mx.lng
interface/web/dns/lib/lang/cz_dns_mx.lng
+0
-1
interface/web/dns/lib/lang/cz_dns_ns.lng
interface/web/dns/lib/lang/cz_dns_ns.lng
+0
-1
interface/web/dns/lib/lang/cz_dns_ptr.lng
interface/web/dns/lib/lang/cz_dns_ptr.lng
+0
-1
interface/web/dns/lib/lang/cz_dns_rp.lng
interface/web/dns/lib/lang/cz_dns_rp.lng
+0
-1
interface/web/dns/lib/lang/cz_dns_slave.lng
interface/web/dns/lib/lang/cz_dns_slave.lng
+0
-1
interface/web/dns/lib/lang/cz_dns_slave_list.lng
interface/web/dns/lib/lang/cz_dns_slave_list.lng
+0
-1
interface/web/dns/lib/lang/cz_dns_soa.lng
interface/web/dns/lib/lang/cz_dns_soa.lng
+0
-1
interface/web/dns/lib/lang/cz_dns_soa_list.lng
interface/web/dns/lib/lang/cz_dns_soa_list.lng
+0
-1
interface/web/dns/lib/lang/cz_dns_srv.lng
interface/web/dns/lib/lang/cz_dns_srv.lng
+0
-1
interface/web/dns/lib/lang/cz_dns_template.lng
interface/web/dns/lib/lang/cz_dns_template.lng
+0
-1
interface/web/dns/lib/lang/cz_dns_template_list.lng
interface/web/dns/lib/lang/cz_dns_template_list.lng
+0
-1
interface/web/dns/lib/lang/cz_dns_txt.lng
interface/web/dns/lib/lang/cz_dns_txt.lng
+0
-1
interface/web/dns/lib/lang/cz_dns_wizard.lng
interface/web/dns/lib/lang/cz_dns_wizard.lng
+0
-1
interface/web/dns/lib/lang/de_dns_soa.lng
interface/web/dns/lib/lang/de_dns_soa.lng
+1
-0
interface/web/dns/lib/lang/el_dns_soa.lng
interface/web/dns/lib/lang/el_dns_soa.lng
+1
-0
interface/web/dns/lib/lang/en_dns_soa.lng
interface/web/dns/lib/lang/en_dns_soa.lng
+2
-1
interface/web/dns/lib/lang/en_dns_wizard.lng
interface/web/dns/lib/lang/en_dns_wizard.lng
+1
-1
interface/web/dns/lib/lang/es_dns_soa.lng
interface/web/dns/lib/lang/es_dns_soa.lng
+1
-0
interface/web/dns/lib/lang/fi_dns_soa.lng
interface/web/dns/lib/lang/fi_dns_soa.lng
+1
-0
interface/web/dns/lib/lang/fr_dns_soa.lng
interface/web/dns/lib/lang/fr_dns_soa.lng
+1
-0
interface/web/dns/lib/lang/hr_dns_soa.lng
interface/web/dns/lib/lang/hr_dns_soa.lng
+1
-0
interface/web/dns/lib/lang/hu_dns_soa.lng
interface/web/dns/lib/lang/hu_dns_soa.lng
+1
-0
interface/web/dns/lib/lang/id_dns_soa.lng
interface/web/dns/lib/lang/id_dns_soa.lng
+1
-0
interface/web/dns/lib/lang/it_dns_soa.lng
interface/web/dns/lib/lang/it_dns_soa.lng
+1
-0
interface/web/dns/lib/lang/ja_dns_soa.lng
interface/web/dns/lib/lang/ja_dns_soa.lng
+1
-0
interface/web/dns/lib/lang/nl_dns_soa.lng
interface/web/dns/lib/lang/nl_dns_soa.lng
+1
-0
interface/web/dns/lib/lang/pl_dns_soa.lng
interface/web/dns/lib/lang/pl_dns_soa.lng
+1
-0
interface/web/dns/lib/lang/pt_dns_soa.lng
interface/web/dns/lib/lang/pt_dns_soa.lng
+1
-0
interface/web/dns/lib/lang/ro_dns_soa.lng
interface/web/dns/lib/lang/ro_dns_soa.lng
+1
-0
interface/web/dns/lib/lang/ru_dns_soa.lng
interface/web/dns/lib/lang/ru_dns_soa.lng
+1
-0
interface/web/dns/lib/lang/se_dns_soa.lng
interface/web/dns/lib/lang/se_dns_soa.lng
+1
-0
interface/web/dns/lib/lang/sk_dns_soa.lng
interface/web/dns/lib/lang/sk_dns_soa.lng
+1
-0
interface/web/dns/lib/lang/tr_dns_soa.lng
interface/web/dns/lib/lang/tr_dns_soa.lng
+1
-0
interface/web/dns/templates/dns_a_list.htm
interface/web/dns/templates/dns_a_list.htm
+5
-0
interface/web/dns/templates/dns_slave_list.htm
interface/web/dns/templates/dns_slave_list.htm
+5
-0
interface/web/dns/templates/dns_soa_list.htm
interface/web/dns/templates/dns_soa_list.htm
+5
-0
interface/web/dns/templates/dns_template_list.htm
interface/web/dns/templates/dns_template_list.htm
+5
-0
interface/web/help/lib/lang/cz.lng
interface/web/help/lib/lang/cz.lng
+0
-1
interface/web/help/lib/lang/cz_faq_form.lng
interface/web/help/lib/lang/cz_faq_form.lng
+0
-1
interface/web/help/lib/lang/cz_faq_manage_questions_list.lng
interface/web/help/lib/lang/cz_faq_manage_questions_list.lng
+0
-1
interface/web/help/lib/lang/cz_help_faq_list.lng
interface/web/help/lib/lang/cz_help_faq_list.lng
+0
-1
interface/web/help/lib/lang/cz_help_faq_sections_list.lng
interface/web/help/lib/lang/cz_help_faq_sections_list.lng
+0
-1
interface/web/help/lib/lang/cz_support_message.lng
interface/web/help/lib/lang/cz_support_message.lng
+0
-1
interface/web/help/lib/lang/cz_support_message_list.lng
interface/web/help/lib/lang/cz_support_message_list.lng
+0
-1
interface/web/help/templates/faq_manage_questions_list.htm
interface/web/help/templates/faq_manage_questions_list.htm
+5
-0
interface/web/help/templates/help_faq_list.htm
interface/web/help/templates/help_faq_list.htm
+1
-2
interface/web/help/templates/help_faq_sections_list.htm
interface/web/help/templates/help_faq_sections_list.htm
+5
-0
interface/web/help/templates/support_message_list.htm
interface/web/help/templates/support_message_list.htm
+5
-0
interface/web/js/scrigo.js.php
interface/web/js/scrigo.js.php
+4
-0
interface/web/login/lib/lang/cz.lng
interface/web/login/lib/lang/cz.lng
+0
-1
interface/web/mail/lib/lang/ar.lng
interface/web/mail/lib/lang/ar.lng
+1
-0
interface/web/mail/lib/lang/bg.lng
interface/web/mail/lib/lang/bg.lng
+1
-0
interface/web/mail/lib/lang/br.lng
interface/web/mail/lib/lang/br.lng
+1
-0
interface/web/mail/lib/lang/cz.lng
interface/web/mail/lib/lang/cz.lng
+4
-5
interface/web/mail/lib/lang/cz_mail_alias.lng
interface/web/mail/lib/lang/cz_mail_alias.lng
+0
-1
interface/web/mail/lib/lang/cz_mail_alias_list.lng
interface/web/mail/lib/lang/cz_mail_alias_list.lng
+0
-1
interface/web/mail/lib/lang/cz_mail_aliasdomain.lng
interface/web/mail/lib/lang/cz_mail_aliasdomain.lng
+0
-1
interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng
interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng
+0
-1
interface/web/mail/lib/lang/cz_mail_blacklist.lng
interface/web/mail/lib/lang/cz_mail_blacklist.lng
+0
-1
interface/web/mail/lib/lang/cz_mail_blacklist_list.lng
interface/web/mail/lib/lang/cz_mail_blacklist_list.lng
+0
-1
interface/web/mail/lib/lang/cz_mail_content_filter.lng
interface/web/mail/lib/lang/cz_mail_content_filter.lng
+0
-1
interface/web/mail/lib/lang/cz_mail_content_filter_list.lng
interface/web/mail/lib/lang/cz_mail_content_filter_list.lng
+0
-1
interface/web/mail/lib/lang/cz_mail_domain.lng
interface/web/mail/lib/lang/cz_mail_domain.lng
+1
-2
interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng
interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng
+0
-1
interface/web/mail/lib/lang/cz_mail_domain_catchall.lng
interface/web/mail/lib/lang/cz_mail_domain_catchall.lng
+0
-1
interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng
interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng
+0
-1
interface/web/mail/lib/lang/cz_mail_domain_list.lng
interface/web/mail/lib/lang/cz_mail_domain_list.lng
+0
-1
interface/web/mail/lib/lang/cz_mail_forward.lng
interface/web/mail/lib/lang/cz_mail_forward.lng
+0
-1
interface/web/mail/lib/lang/cz_mail_forward_list.lng
interface/web/mail/lib/lang/cz_mail_forward_list.lng
+0
-1
interface/web/mail/lib/lang/cz_mail_get.lng
interface/web/mail/lib/lang/cz_mail_get.lng
+0
-1
interface/web/mail/lib/lang/cz_mail_get_list.lng
interface/web/mail/lib/lang/cz_mail_get_list.lng
+1
-2
interface/web/mail/lib/lang/cz_mail_mailinglist.lng
interface/web/mail/lib/lang/cz_mail_mailinglist.lng
+8
-9
interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng
interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng
+0
-1
interface/web/mail/lib/lang/cz_mail_relay_recipient.lng
interface/web/mail/lib/lang/cz_mail_relay_recipient.lng
+0
-1
interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng
interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng
+0
-1
interface/web/mail/lib/lang/cz_mail_spamfilter.lng
interface/web/mail/lib/lang/cz_mail_spamfilter.lng
+0
-1
interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng
interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng
+1
-2
interface/web/mail/lib/lang/cz_mail_transport.lng
interface/web/mail/lib/lang/cz_mail_transport.lng
+0
-1
interface/web/mail/lib/lang/cz_mail_transport_list.lng
interface/web/mail/lib/lang/cz_mail_transport_list.lng
+1
-2
interface/web/mail/lib/lang/cz_mail_user.lng
interface/web/mail/lib/lang/cz_mail_user.lng
+0
-1
interface/web/mail/lib/lang/cz_mail_user_filter.lng
interface/web/mail/lib/lang/cz_mail_user_filter.lng
+0
-1
interface/web/mail/lib/lang/cz_mail_user_filter_list.lng
interface/web/mail/lib/lang/cz_mail_user_filter_list.lng
+0
-1
interface/web/mail/lib/lang/cz_mail_user_list.lng
interface/web/mail/lib/lang/cz_mail_user_list.lng
+0
-1
interface/web/mail/lib/lang/cz_mail_user_stats_list.lng
interface/web/mail/lib/lang/cz_mail_user_stats_list.lng
+0
-1
interface/web/mail/lib/lang/cz_mail_whitelist.lng
interface/web/mail/lib/lang/cz_mail_whitelist.lng
+0
-1
interface/web/mail/lib/lang/cz_mail_whitelist_list.lng
interface/web/mail/lib/lang/cz_mail_whitelist_list.lng
+0
-1
interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng
interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng
+0
-1
interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng
interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng
+1
-2
interface/web/mail/lib/lang/cz_spamfilter_config.lng
interface/web/mail/lib/lang/cz_spamfilter_config.lng
+0
-1
interface/web/mail/lib/lang/cz_spamfilter_config_list.lng
interface/web/mail/lib/lang/cz_spamfilter_config_list.lng
+0
-1
interface/web/mail/lib/lang/cz_spamfilter_policy.lng
interface/web/mail/lib/lang/cz_spamfilter_policy.lng
+0
-1
interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng
interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng
+0
-1
interface/web/mail/lib/lang/cz_spamfilter_users.lng
interface/web/mail/lib/lang/cz_spamfilter_users.lng
+0
-1
interface/web/mail/lib/lang/cz_spamfilter_users_list.lng
interface/web/mail/lib/lang/cz_spamfilter_users_list.lng
+0
-1
interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng
interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng
+0
-1
interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng
interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng
+1
-2
interface/web/mail/lib/lang/cz_user_quota_stats_list.lng
interface/web/mail/lib/lang/cz_user_quota_stats_list.lng
+0
-1
interface/web/mail/lib/lang/el.lng
interface/web/mail/lib/lang/el.lng
+1
-0
interface/web/mail/lib/lang/en_mail_mailinglist.lng
interface/web/mail/lib/lang/en_mail_mailinglist.lng
+1
-0
interface/web/mail/lib/lang/es.lng
interface/web/mail/lib/lang/es.lng
+1
-0
interface/web/mail/lib/lang/fi.lng
interface/web/mail/lib/lang/fi.lng
+1
-0
interface/web/mail/lib/lang/fr.lng
interface/web/mail/lib/lang/fr.lng
+1
-0
interface/web/mail/lib/lang/hr.lng
interface/web/mail/lib/lang/hr.lng
+1
-0
interface/web/mail/lib/lang/hu.lng
interface/web/mail/lib/lang/hu.lng
+1
-0
interface/web/mail/lib/lang/id.lng
interface/web/mail/lib/lang/id.lng
+1
-0
interface/web/mail/lib/lang/it.lng
interface/web/mail/lib/lang/it.lng
+1
-0
interface/web/mail/lib/lang/ja.lng
interface/web/mail/lib/lang/ja.lng
+1
-0
interface/web/mail/lib/lang/nl.lng
interface/web/mail/lib/lang/nl.lng
+1
-0
interface/web/mail/lib/lang/pl.lng
interface/web/mail/lib/lang/pl.lng
+1
-0
interface/web/mail/lib/lang/pt.lng
interface/web/mail/lib/lang/pt.lng
+1
-0
interface/web/mail/lib/lang/ro.lng
interface/web/mail/lib/lang/ro.lng
+1
-0
interface/web/mail/lib/lang/ru.lng
interface/web/mail/lib/lang/ru.lng
+1
-0
interface/web/mail/lib/lang/se.lng
interface/web/mail/lib/lang/se.lng
+1
-0
interface/web/mail/lib/lang/sk.lng
interface/web/mail/lib/lang/sk.lng
+1
-0
interface/web/mail/lib/lang/tr.lng
interface/web/mail/lib/lang/tr.lng
+1
-0
interface/web/mail/templates/mail_alias_list.htm
interface/web/mail/templates/mail_alias_list.htm
+5
-0
interface/web/mail/templates/mail_aliasdomain_list.htm
interface/web/mail/templates/mail_aliasdomain_list.htm
+5
-0
interface/web/mail/templates/mail_blacklist_list.htm
interface/web/mail/templates/mail_blacklist_list.htm
+5
-0
interface/web/mail/templates/mail_content_filter_list.htm
interface/web/mail/templates/mail_content_filter_list.htm
+5
-0
interface/web/mail/templates/mail_domain_admin_list.htm
interface/web/mail/templates/mail_domain_admin_list.htm
+5
-0
interface/web/mail/templates/mail_domain_catchall_list.htm
interface/web/mail/templates/mail_domain_catchall_list.htm
+5
-0
interface/web/mail/templates/mail_domain_list.htm
interface/web/mail/templates/mail_domain_list.htm
+5
-0
interface/web/mail/templates/mail_forward_list.htm
interface/web/mail/templates/mail_forward_list.htm
+5
-0
interface/web/mail/templates/mail_get_list.htm
interface/web/mail/templates/mail_get_list.htm
+5
-0
interface/web/mail/templates/mail_mailinglist_list.htm
interface/web/mail/templates/mail_mailinglist_list.htm
+6
-1
interface/web/mail/templates/mail_relay_recipient_list.htm
interface/web/mail/templates/mail_relay_recipient_list.htm
+5
-0
interface/web/mail/templates/mail_transport_list.htm
interface/web/mail/templates/mail_transport_list.htm
+5
-0
interface/web/mail/templates/mail_user_filter_list.htm
interface/web/mail/templates/mail_user_filter_list.htm
+5
-0
interface/web/mail/templates/mail_user_list.htm
interface/web/mail/templates/mail_user_list.htm
+6
-1
interface/web/mail/templates/mail_user_stats_list.htm
interface/web/mail/templates/mail_user_stats_list.htm
+5
-0
interface/web/mail/templates/mail_whitelist_list.htm
interface/web/mail/templates/mail_whitelist_list.htm
+5
-0
interface/web/mail/templates/spamfilter_blacklist_list.htm
interface/web/mail/templates/spamfilter_blacklist_list.htm
+5
-0
interface/web/mail/templates/spamfilter_config_list.htm
interface/web/mail/templates/spamfilter_config_list.htm
+5
-0
interface/web/mail/templates/spamfilter_policy_list.htm
interface/web/mail/templates/spamfilter_policy_list.htm
+5
-0
interface/web/mail/templates/spamfilter_users_list.htm
interface/web/mail/templates/spamfilter_users_list.htm
+5
-0
interface/web/mail/templates/spamfilter_whitelist_list.htm
interface/web/mail/templates/spamfilter_whitelist_list.htm
+5
-0
interface/web/mail/templates/user_quota_stats_list.htm
interface/web/mail/templates/user_quota_stats_list.htm
+5
-0
interface/web/mailuser/lib/lang/cz.lng
interface/web/mailuser/lib/lang/cz.lng
+1
-2
interface/web/mailuser/lib/lang/cz_index.lng
interface/web/mailuser/lib/lang/cz_index.lng
+0
-1
interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng
...face/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng
+0
-1
interface/web/mailuser/lib/lang/cz_mail_user_cc.lng
interface/web/mailuser/lib/lang/cz_mail_user_cc.lng
+0
-1
interface/web/mailuser/lib/lang/cz_mail_user_filter.lng
interface/web/mailuser/lib/lang/cz_mail_user_filter.lng
+0
-1
interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng
interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng
+0
-1
interface/web/mailuser/lib/lang/cz_mail_user_password.lng
interface/web/mailuser/lib/lang/cz_mail_user_password.lng
+0
-1
interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng
interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng
+2
-3
interface/web/mailuser/templates/mail_user_filter_list.htm
interface/web/mailuser/templates/mail_user_filter_list.htm
+5
-0
interface/web/monitor/lib/lang/cz.lng
interface/web/monitor/lib/lang/cz.lng
+7
-8
interface/web/monitor/lib/lang/cz_datalog_list.lng
interface/web/monitor/lib/lang/cz_datalog_list.lng
+0
-1
interface/web/monitor/lib/lang/cz_syslog_list.lng
interface/web/monitor/lib/lang/cz_syslog_list.lng
+0
-1
interface/web/monitor/templates/datalog_list.htm
interface/web/monitor/templates/datalog_list.htm
+5
-0
interface/web/monitor/templates/syslog_list.htm
interface/web/monitor/templates/syslog_list.htm
+5
-0
interface/web/sites/cron_edit.php
interface/web/sites/cron_edit.php
+1
-1
interface/web/sites/database_edit.php
interface/web/sites/database_edit.php
+4
-0
interface/web/sites/lib/lang/ar.lng
interface/web/sites/lib/lang/ar.lng
+2
-0
interface/web/sites/lib/lang/ar_database.lng
interface/web/sites/lib/lang/ar_database.lng
+1
-0
interface/web/sites/lib/lang/ar_web_subdomain.lng
interface/web/sites/lib/lang/ar_web_subdomain.lng
+1
-0
interface/web/sites/lib/lang/bg.lng
interface/web/sites/lib/lang/bg.lng
+2
-0
interface/web/sites/lib/lang/bg_database.lng
interface/web/sites/lib/lang/bg_database.lng
+1
-0
interface/web/sites/lib/lang/bg_web_subdomain.lng
interface/web/sites/lib/lang/bg_web_subdomain.lng
+1
-0
interface/web/sites/lib/lang/br.lng
interface/web/sites/lib/lang/br.lng
+2
-0
interface/web/sites/lib/lang/br_database.lng
interface/web/sites/lib/lang/br_database.lng
+1
-0
interface/web/sites/lib/lang/br_web_subdomain.lng
interface/web/sites/lib/lang/br_web_subdomain.lng
+1
-0
interface/web/sites/lib/lang/cz.lng
interface/web/sites/lib/lang/cz.lng
+6
-6
interface/web/sites/lib/lang/cz_aps.lng
interface/web/sites/lib/lang/cz_aps.lng
+1
-2
interface/web/sites/lib/lang/cz_aps_instances_list.lng
interface/web/sites/lib/lang/cz_aps_instances_list.lng
+6
-7
interface/web/sites/lib/lang/cz_aps_packages_list.lng
interface/web/sites/lib/lang/cz_aps_packages_list.lng
+4
-5
interface/web/sites/lib/lang/cz_cron.lng
interface/web/sites/lib/lang/cz_cron.lng
+0
-1
interface/web/sites/lib/lang/cz_cron_list.lng
interface/web/sites/lib/lang/cz_cron_list.lng
+1
-2
interface/web/sites/lib/lang/cz_database.lng
interface/web/sites/lib/lang/cz_database.lng
+2
-3
interface/web/sites/lib/lang/cz_database_admin_list.lng
interface/web/sites/lib/lang/cz_database_admin_list.lng
+0
-1
interface/web/sites/lib/lang/cz_database_list.lng
interface/web/sites/lib/lang/cz_database_list.lng
+0
-1
interface/web/sites/lib/lang/cz_database_user.lng
interface/web/sites/lib/lang/cz_database_user.lng
+0
-1
interface/web/sites/lib/lang/cz_database_user_admin_list.lng
interface/web/sites/lib/lang/cz_database_user_admin_list.lng
+0
-1
interface/web/sites/lib/lang/cz_database_user_list.lng
interface/web/sites/lib/lang/cz_database_user_list.lng
+0
-1
interface/web/sites/lib/lang/cz_ftp_user.lng
interface/web/sites/lib/lang/cz_ftp_user.lng
+0
-1
interface/web/sites/lib/lang/cz_ftp_user_list.lng
interface/web/sites/lib/lang/cz_ftp_user_list.lng
+0
-1
interface/web/sites/lib/lang/cz_shell_user.lng
interface/web/sites/lib/lang/cz_shell_user.lng
+0
-1
interface/web/sites/lib/lang/cz_shell_user_list.lng
interface/web/sites/lib/lang/cz_shell_user_list.lng
+0
-1
interface/web/sites/lib/lang/cz_user_quota_stats_list.lng
interface/web/sites/lib/lang/cz_user_quota_stats_list.lng
+1
-2
interface/web/sites/lib/lang/cz_web_aliasdomain.lng
interface/web/sites/lib/lang/cz_web_aliasdomain.lng
+0
-1
interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng
interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng
+0
-1
interface/web/sites/lib/lang/cz_web_backup_list.lng
interface/web/sites/lib/lang/cz_web_backup_list.lng
+5
-6
interface/web/sites/lib/lang/cz_web_domain.lng
interface/web/sites/lib/lang/cz_web_domain.lng
+7
-8
interface/web/sites/lib/lang/cz_web_domain_admin_list.lng
interface/web/sites/lib/lang/cz_web_domain_admin_list.lng
+0
-1
interface/web/sites/lib/lang/cz_web_domain_list.lng
interface/web/sites/lib/lang/cz_web_domain_list.lng
+0
-1
interface/web/sites/lib/lang/cz_web_folder.lng
interface/web/sites/lib/lang/cz_web_folder.lng
+3
-4
interface/web/sites/lib/lang/cz_web_folder_list.lng
interface/web/sites/lib/lang/cz_web_folder_list.lng
+1
-2
interface/web/sites/lib/lang/cz_web_folder_user.lng
interface/web/sites/lib/lang/cz_web_folder_user.lng
+2
-3
interface/web/sites/lib/lang/cz_web_folder_user_list.lng
interface/web/sites/lib/lang/cz_web_folder_user_list.lng
+3
-4
interface/web/sites/lib/lang/cz_web_sites_stats_list.lng
interface/web/sites/lib/lang/cz_web_sites_stats_list.lng
+0
-1
interface/web/sites/lib/lang/cz_web_subdomain.lng
interface/web/sites/lib/lang/cz_web_subdomain.lng
+2
-2
interface/web/sites/lib/lang/cz_web_subdomain_list.lng
interface/web/sites/lib/lang/cz_web_subdomain_list.lng
+0
-1
interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
+25
-26
interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
+4
-5
interface/web/sites/lib/lang/cz_webdav_user.lng
interface/web/sites/lib/lang/cz_webdav_user.lng
+2
-3
interface/web/sites/lib/lang/cz_webdav_user_list.lng
interface/web/sites/lib/lang/cz_webdav_user_list.lng
+4
-5
interface/web/sites/lib/lang/de.lng
interface/web/sites/lib/lang/de.lng
+2
-1
interface/web/sites/lib/lang/de_database.lng
interface/web/sites/lib/lang/de_database.lng
+1
-0
interface/web/sites/lib/lang/de_web_subdomain.lng
interface/web/sites/lib/lang/de_web_subdomain.lng
+1
-1
interface/web/sites/lib/lang/el.lng
interface/web/sites/lib/lang/el.lng
+2
-0
interface/web/sites/lib/lang/el_database.lng
interface/web/sites/lib/lang/el_database.lng
+1
-0
interface/web/sites/lib/lang/el_web_subdomain.lng
interface/web/sites/lib/lang/el_web_subdomain.lng
+1
-0
interface/web/sites/lib/lang/en_database.lng
interface/web/sites/lib/lang/en_database.lng
+1
-0
interface/web/sites/lib/lang/en_web_domain.lng
interface/web/sites/lib/lang/en_web_domain.lng
+1
-1
interface/web/sites/lib/lang/en_web_vhost_subdomain.lng
interface/web/sites/lib/lang/en_web_vhost_subdomain.lng
+1
-1
interface/web/sites/lib/lang/es.lng
interface/web/sites/lib/lang/es.lng
+2
-0
interface/web/sites/lib/lang/es_database.lng
interface/web/sites/lib/lang/es_database.lng
+1
-0
interface/web/sites/lib/lang/es_web_subdomain.lng
interface/web/sites/lib/lang/es_web_subdomain.lng
+1
-0
interface/web/sites/lib/lang/fi.lng
interface/web/sites/lib/lang/fi.lng
+2
-0
interface/web/sites/lib/lang/fi_database.lng
interface/web/sites/lib/lang/fi_database.lng
+1
-0
interface/web/sites/lib/lang/fi_web_subdomain.lng
interface/web/sites/lib/lang/fi_web_subdomain.lng
+1
-0
interface/web/sites/lib/lang/fr.lng
interface/web/sites/lib/lang/fr.lng
+2
-0
interface/web/sites/lib/lang/fr_aps.lng
interface/web/sites/lib/lang/fr_aps.lng
+8
-8
interface/web/sites/lib/lang/fr_database.lng
interface/web/sites/lib/lang/fr_database.lng
+1
-0
interface/web/sites/lib/lang/fr_database_user.lng
interface/web/sites/lib/lang/fr_database_user.lng
+17
-17
interface/web/sites/lib/lang/fr_database_user_admin_list.lng
interface/web/sites/lib/lang/fr_database_user_admin_list.lng
+5
-5
interface/web/sites/lib/lang/fr_database_user_list.lng
interface/web/sites/lib/lang/fr_database_user_list.lng
+4
-4
interface/web/sites/lib/lang/fr_web_subdomain.lng
interface/web/sites/lib/lang/fr_web_subdomain.lng
+1
-0
interface/web/sites/lib/lang/fr_web_vhost_subdomain.lng
interface/web/sites/lib/lang/fr_web_vhost_subdomain.lng
+99
-100
interface/web/sites/lib/lang/fr_web_vhost_subdomain_list.lng
interface/web/sites/lib/lang/fr_web_vhost_subdomain_list.lng
+7
-7
interface/web/sites/lib/lang/hr.lng
interface/web/sites/lib/lang/hr.lng
+2
-0
interface/web/sites/lib/lang/hr_database.lng
interface/web/sites/lib/lang/hr_database.lng
+1
-0
interface/web/sites/lib/lang/hr_web_subdomain.lng
interface/web/sites/lib/lang/hr_web_subdomain.lng
+1
-0
interface/web/sites/lib/lang/hu.lng
interface/web/sites/lib/lang/hu.lng
+2
-0
interface/web/sites/lib/lang/hu_database.lng
interface/web/sites/lib/lang/hu_database.lng
+1
-0
interface/web/sites/lib/lang/hu_web_subdomain.lng
interface/web/sites/lib/lang/hu_web_subdomain.lng
+1
-0
interface/web/sites/lib/lang/id.lng
interface/web/sites/lib/lang/id.lng
+2
-0
interface/web/sites/lib/lang/id_database.lng
interface/web/sites/lib/lang/id_database.lng
+1
-0
interface/web/sites/lib/lang/id_web_subdomain.lng
interface/web/sites/lib/lang/id_web_subdomain.lng
+1
-0
interface/web/sites/lib/lang/it.lng
interface/web/sites/lib/lang/it.lng
+2
-0
interface/web/sites/lib/lang/it_database.lng
interface/web/sites/lib/lang/it_database.lng
+1
-0
interface/web/sites/lib/lang/it_web_subdomain.lng
interface/web/sites/lib/lang/it_web_subdomain.lng
+1
-0
interface/web/sites/lib/lang/ja.lng
interface/web/sites/lib/lang/ja.lng
+2
-0
interface/web/sites/lib/lang/ja_database.lng
interface/web/sites/lib/lang/ja_database.lng
+1
-0
interface/web/sites/lib/lang/ja_web_subdomain.lng
interface/web/sites/lib/lang/ja_web_subdomain.lng
+1
-0
interface/web/sites/lib/lang/nl.lng
interface/web/sites/lib/lang/nl.lng
+2
-0
interface/web/sites/lib/lang/nl_database.lng
interface/web/sites/lib/lang/nl_database.lng
+1
-0
interface/web/sites/lib/lang/nl_web_subdomain.lng
interface/web/sites/lib/lang/nl_web_subdomain.lng
+1
-0
interface/web/sites/lib/lang/pl.lng
interface/web/sites/lib/lang/pl.lng
+2
-0
interface/web/sites/lib/lang/pl_database.lng
interface/web/sites/lib/lang/pl_database.lng
+1
-0
interface/web/sites/lib/lang/pl_web_subdomain.lng
interface/web/sites/lib/lang/pl_web_subdomain.lng
+1
-0
interface/web/sites/lib/lang/pt.lng
interface/web/sites/lib/lang/pt.lng
+2
-0
interface/web/sites/lib/lang/pt_database.lng
interface/web/sites/lib/lang/pt_database.lng
+1
-0
interface/web/sites/lib/lang/pt_web_subdomain.lng
interface/web/sites/lib/lang/pt_web_subdomain.lng
+1
-0
interface/web/sites/lib/lang/ro.lng
interface/web/sites/lib/lang/ro.lng
+2
-0
interface/web/sites/lib/lang/ro_database.lng
interface/web/sites/lib/lang/ro_database.lng
+1
-0
interface/web/sites/lib/lang/ro_web_subdomain.lng
interface/web/sites/lib/lang/ro_web_subdomain.lng
+1
-0
interface/web/sites/lib/lang/ru.lng
interface/web/sites/lib/lang/ru.lng
+2
-0
interface/web/sites/lib/lang/ru_database.lng
interface/web/sites/lib/lang/ru_database.lng
+1
-0
interface/web/sites/lib/lang/ru_web_subdomain.lng
interface/web/sites/lib/lang/ru_web_subdomain.lng
+1
-0
interface/web/sites/lib/lang/se.lng
interface/web/sites/lib/lang/se.lng
+2
-0
interface/web/sites/lib/lang/se_database.lng
interface/web/sites/lib/lang/se_database.lng
+1
-0
interface/web/sites/lib/lang/se_web_subdomain.lng
interface/web/sites/lib/lang/se_web_subdomain.lng
+1
-0
interface/web/sites/lib/lang/sk.lng
interface/web/sites/lib/lang/sk.lng
+2
-0
interface/web/sites/lib/lang/sk_database.lng
interface/web/sites/lib/lang/sk_database.lng
+1
-0
interface/web/sites/lib/lang/sk_web_subdomain.lng
interface/web/sites/lib/lang/sk_web_subdomain.lng
+1
-0
interface/web/sites/lib/lang/tr.lng
interface/web/sites/lib/lang/tr.lng
+2
-0
interface/web/sites/lib/lang/tr_database.lng
interface/web/sites/lib/lang/tr_database.lng
+1
-0
interface/web/sites/lib/lang/tr_web_subdomain.lng
interface/web/sites/lib/lang/tr_web_subdomain.lng
+1
-0
interface/web/sites/templates/aps_packages_list.htm
interface/web/sites/templates/aps_packages_list.htm
+5
-0
interface/web/sites/templates/cron_list.htm
interface/web/sites/templates/cron_list.htm
+5
-0
interface/web/sites/templates/database_admin_list.htm
interface/web/sites/templates/database_admin_list.htm
+5
-0
interface/web/sites/templates/database_list.htm
interface/web/sites/templates/database_list.htm
+5
-0
interface/web/sites/templates/database_user_admin_list.htm
interface/web/sites/templates/database_user_admin_list.htm
+5
-0
interface/web/sites/templates/database_user_list.htm
interface/web/sites/templates/database_user_list.htm
+5
-0
interface/web/sites/templates/ftp_user_list.htm
interface/web/sites/templates/ftp_user_list.htm
+5
-0
interface/web/sites/templates/shell_user_list.htm
interface/web/sites/templates/shell_user_list.htm
+5
-0
interface/web/sites/templates/user_quota_stats_list.htm
interface/web/sites/templates/user_quota_stats_list.htm
+5
-0
interface/web/sites/templates/web_aliasdomain_list.htm
interface/web/sites/templates/web_aliasdomain_list.htm
+5
-0
interface/web/sites/templates/web_backup_list.htm
interface/web/sites/templates/web_backup_list.htm
+5
-0
interface/web/sites/templates/web_domain_admin_list.htm
interface/web/sites/templates/web_domain_admin_list.htm
+5
-0
interface/web/sites/templates/web_domain_edit.htm
interface/web/sites/templates/web_domain_edit.htm
+1
-1
interface/web/sites/templates/web_domain_list.htm
interface/web/sites/templates/web_domain_list.htm
+5
-0
interface/web/sites/templates/web_folder_list.htm
interface/web/sites/templates/web_folder_list.htm
+5
-0
interface/web/sites/templates/web_folder_user_list.htm
interface/web/sites/templates/web_folder_user_list.htm
+5
-0
interface/web/sites/templates/web_sites_stats_list.htm
interface/web/sites/templates/web_sites_stats_list.htm
+6
-1
interface/web/sites/templates/web_subdomain_list.htm
interface/web/sites/templates/web_subdomain_list.htm
+5
-0
interface/web/sites/templates/web_vhost_subdomain_edit.htm
interface/web/sites/templates/web_vhost_subdomain_edit.htm
+1
-1
interface/web/sites/templates/web_vhost_subdomain_list.htm
interface/web/sites/templates/web_vhost_subdomain_list.htm
+5
-0
interface/web/sites/templates/webdav_user_list.htm
interface/web/sites/templates/webdav_user_list.htm
+5
-0
interface/web/sites/user_quota_stats.php
interface/web/sites/user_quota_stats.php
+3
-1
interface/web/sites/web_domain_edit.php
interface/web/sites/web_domain_edit.php
+15
-6
interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng
interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng
+0
-1
interface/web/themes/default-304/templates/admin/users_list.htm
...ace/web/themes/default-304/templates/admin/users_list.htm
+5
-0
interface/web/themes/default-304/templates/client/clients_list.htm
.../web/themes/default-304/templates/client/clients_list.htm
+5
-0
interface/web/themes/default-304/templates/client/resellers_list.htm
...eb/themes/default-304/templates/client/resellers_list.htm
+5
-0
interface/web/themes/default/css/styles.css
interface/web/themes/default/css/styles.css
+22
-1
interface/web/tools/import_vpopmail.php
interface/web/tools/import_vpopmail.php
+267
-0
interface/web/tools/lib/lang/cz.lng
interface/web/tools/lib/lang/cz.lng
+0
-1
interface/web/tools/lib/lang/cz_import_ispconfig.lng
interface/web/tools/lib/lang/cz_import_ispconfig.lng
+0
-1
interface/web/tools/lib/lang/cz_index.lng
interface/web/tools/lib/lang/cz_index.lng
+0
-1
interface/web/tools/lib/lang/cz_interface.lng
interface/web/tools/lib/lang/cz_interface.lng
+0
-1
interface/web/tools/lib/lang/cz_resync.lng
interface/web/tools/lib/lang/cz_resync.lng
+0
-1
interface/web/tools/lib/lang/cz_tpl_default.lng
interface/web/tools/lib/lang/cz_tpl_default.lng
+0
-1
interface/web/tools/lib/lang/cz_usersettings.lng
interface/web/tools/lib/lang/cz_usersettings.lng
+0
-1
interface/web/tools/lib/lang/en_import_vpopmail.lng
interface/web/tools/lib/lang/en_import_vpopmail.lng
+8
-0
interface/web/tools/templates/import_vpopmail.htm
interface/web/tools/templates/import_vpopmail.htm
+53
-0
interface/web/vm/lib/lang/cz.lng
interface/web/vm/lib/lang/cz.lng
+0
-1
interface/web/vm/lib/lang/cz_openvz_action.lng
interface/web/vm/lib/lang/cz_openvz_action.lng
+0
-1
interface/web/vm/lib/lang/cz_openvz_ip.lng
interface/web/vm/lib/lang/cz_openvz_ip.lng
+0
-1
interface/web/vm/lib/lang/cz_openvz_ip_list.lng
interface/web/vm/lib/lang/cz_openvz_ip_list.lng
+0
-1
interface/web/vm/lib/lang/cz_openvz_ostemplate.lng
interface/web/vm/lib/lang/cz_openvz_ostemplate.lng
+2
-3
interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng
interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng
+1
-2
interface/web/vm/lib/lang/cz_openvz_template.lng
interface/web/vm/lib/lang/cz_openvz_template.lng
+3
-4
interface/web/vm/lib/lang/cz_openvz_template_list.lng
interface/web/vm/lib/lang/cz_openvz_template_list.lng
+1
-2
interface/web/vm/lib/lang/cz_openvz_vm.lng
interface/web/vm/lib/lang/cz_openvz_vm.lng
+2
-3
interface/web/vm/lib/lang/cz_openvz_vm_list.lng
interface/web/vm/lib/lang/cz_openvz_vm_list.lng
+1
-2
interface/web/vm/templates/openvz_ip_list.htm
interface/web/vm/templates/openvz_ip_list.htm
+5
-0
interface/web/vm/templates/openvz_ostemplate_list.htm
interface/web/vm/templates/openvz_ostemplate_list.htm
+5
-0
interface/web/vm/templates/openvz_template_list.htm
interface/web/vm/templates/openvz_template_list.htm
+5
-0
interface/web/vm/templates/openvz_vm_list.htm
interface/web/vm/templates/openvz_vm_list.htm
+5
-0
server/conf/apache_ispconfig.conf.master
server/conf/apache_ispconfig.conf.master
+18
-0
server/conf/apps_php_fpm_pool.conf.master
server/conf/apps_php_fpm_pool.conf.master
+3
-3
server/conf/index/robots.txt
server/conf/index/robots.txt
+0
-1
server/conf/mm_cfg.py.master
server/conf/mm_cfg.py.master
+2
-0
server/cron_daily.php
server/cron_daily.php
+7
-0
server/lib/classes/db_mysql.inc.php
server/lib/classes/db_mysql.inc.php
+20
-8
server/lib/classes/modules.inc.php
server/lib/classes/modules.inc.php
+1
-3
server/lib/classes/tpl_error.inc.php
server/lib/classes/tpl_error.inc.php
+1
-1
server/plugins-available/apache2_plugin.inc.php
server/plugins-available/apache2_plugin.inc.php
+70
-37
server/plugins-available/nginx_plugin.inc.php
server/plugins-available/nginx_plugin.inc.php
+15
-2
server/server.php
server/server.php
+7
-1
No files found.
install/dist/lib/fedora.lib.php
View file @
72695f03
...
...
@@ -100,7 +100,7 @@ class installer_dist extends installer_base {
'smtpd_tls_security_level = may'
,
'smtpd_tls_cert_file = '
.
$config_dir
.
'/smtpd.cert'
,
'smtpd_tls_key_file = '
.
$config_dir
.
'/smtpd.key'
,
'transport_maps = proxy:mysql:'
.
$config_dir
.
'/mysql-virtual_transports.cf'
,
'transport_maps =
hash:/var/lib/mailman/data/transport-mailman,
proxy:mysql:'
.
$config_dir
.
'/mysql-virtual_transports.cf'
,
'relay_domains = mysql:'
.
$config_dir
.
'/mysql-virtual_relaydomains.cf'
,
'relay_recipient_maps = mysql:'
.
$config_dir
.
'/mysql-virtual_relayrecipientmaps.cf'
,
'proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps'
,
...
...
install/dist/lib/gentoo.lib.php
View file @
72695f03
...
...
@@ -97,7 +97,7 @@ class installer extends installer_base
'smtpd_tls_security_level = may'
,
'smtpd_tls_cert_file = '
.
$config_dir
.
'/smtpd.cert'
,
'smtpd_tls_key_file = '
.
$config_dir
.
'/smtpd.key'
,
'transport_maps = proxy:mysql:'
.
$config_dir
.
'/mysql-virtual_transports.cf'
,
'transport_maps =
hash:/var/lib/mailman/data/transport-mailman,
proxy:mysql:'
.
$config_dir
.
'/mysql-virtual_transports.cf'
,
'relay_domains = mysql:'
.
$config_dir
.
'/mysql-virtual_relaydomains.cf'
,
'proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps'
,
'smtpd_sender_restrictions = check_sender_access mysql:'
.
$config_dir
.
'/mysql-virtual_sender.cf'
,
...
...
install/dist/lib/opensuse.lib.php
View file @
72695f03
...
...
@@ -114,7 +114,7 @@ class installer_dist extends installer_base {
'smtpd_tls_security_level = may'
,
'smtpd_tls_cert_file = '
.
$config_dir
.
'/smtpd.cert'
,
'smtpd_tls_key_file = '
.
$config_dir
.
'/smtpd.key'
,
'transport_maps = proxy:mysql:'
.
$config_dir
.
'/mysql-virtual_transports.cf'
,
'transport_maps =
hash:/var/lib/mailman/data/transport-mailman,
proxy:mysql:'
.
$config_dir
.
'/mysql-virtual_transports.cf'
,
'relay_domains = mysql:'
.
$config_dir
.
'/mysql-virtual_relaydomains.cf'
,
'relay_recipient_maps = mysql:'
.
$config_dir
.
'/mysql-virtual_relayrecipientmaps.cf'
,
'proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps'
,
...
...
install/lib/installer_base.lib.php
View file @
72695f03
...
...
@@ -566,6 +566,23 @@ 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'
);
$virtual_domains
=
''
;
if
(
$status
==
'update'
)
...
...
@@ -681,7 +698,7 @@ class installer_base {
'smtpd_tls_security_level = may'
,
'smtpd_tls_cert_file = '
.
$config_dir
.
'/smtpd.cert'
,
'smtpd_tls_key_file = '
.
$config_dir
.
'/smtpd.key'
,
'transport_maps = proxy:mysql:'
.
$config_dir
.
'/mysql-virtual_transports.cf'
,
'transport_maps =
hash:/var/lib/mailman/data/transport-mailman,
proxy:mysql:'
.
$config_dir
.
'/mysql-virtual_transports.cf'
,
'relay_domains = mysql:'
.
$config_dir
.
'/mysql-virtual_relaydomains.cf'
,
'relay_recipient_maps = mysql:'
.
$config_dir
.
'/mysql-virtual_relayrecipientmaps.cf'
,
'proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps'
,
...
...
install/sql/incremental/upd_0047.sql
0 → 100644
View file @
72695f03
ALTER
TABLE
`client`
CHANGE
`web_php_options`
`web_php_options`
VARCHAR
(
255
)
CHARACTER
SET
utf8
COLLATE
utf8_general_ci
NOT
NULL
DEFAULT
'no,fast-cgi,cgi,mod,suphp,php-fpm'
;
\ No newline at end of file
install/sql/ispconfig3.sql
View file @
72695f03
...
...
@@ -185,7 +185,7 @@ CREATE TABLE `client` (
`limit_web_ip`
text
,
`limit_web_domain`
int
(
11
)
NOT
NULL
DEFAULT
'-1'
,
`limit_web_quota`
int
(
11
)
NOT
NULL
DEFAULT
'-1'
,
`web_php_options`
varchar
(
255
)
NOT
NULL
DEFAULT
'no,fast-cgi,cgi,mod,suphp'
,
`web_php_options`
varchar
(
255
)
NOT
NULL
DEFAULT
'no,fast-cgi,cgi,mod,suphp
,php-fpm
'
,
`limit_cgi`
enum
(
'n'
,
'y'
)
NOT
NULL
DEFAULT
'n'
,
`limit_ssi`
enum
(
'n'
,
'y'
)
NOT
NULL
DEFAULT
'n'
,
`limit_perl`
enum
(
'n'
,
'y'
)
NOT
NULL
DEFAULT
'n'
,
...
...
install/tpl/apps_php_fpm_pool.conf.master
View file @
72695f03
...
...
@@ -9,7 +9,7 @@ user = {fpm_user}
group = {fpm_group}
pm = dynamic
pm.max_children =
1
0
pm.max_children =
5
0
pm.start_servers = 2
pm.min_spare_servers = 1
pm.max_spare_servers = 5
...
...
install/tpl/mailman-virtual_to_transport.sh
0 → 100644
View file @
72695f03
#!/bin/sh
sed
-r
-e
's/(^[^#]\S+\s+).+$/\1local/'
$1
>
/var/lib/mailman/data/transport-mailman
/usr/sbin/postmap /var/lib/mailman/data/transport-mailman
\ No newline at end of file
install/tpl/mm_cfg.py.master
View file @
72695f03
...
...
@@ -102,5 +102,7 @@ POSTFIX_STYLE_VIRTUAL_DOMAINS = [{virtual_domains}]
# http://www.jamesh.id.au/articles/mailman-spamassassin/
# GLOBAL_PIPELINE.insert(1, 'SpamAssassin')
POSTFIX_MAP_CMD
=
'/etc/mailman/virtual_to_transport.sh'
# Note - if you're looking for something that is imported from mm_cfg, but you
# didn't find it above, it's probably in /usr/lib/mailman/Mailman/Defaults.py.
\ No newline at end of file
interface/lib/classes/db_mysql.inc.php
View file @
72695f03
...
...
@@ -45,6 +45,7 @@ class db extends mysqli
public
$errorMessage
=
''
;
// last error message
private
$errorLocation
=
''
;
// last error location
public
$show_error_messages
=
true
;
// false in server, true in interface
private
$isConnected
=
false
;
// needed to know if we have a valid mysqli object from the constructor
// constructor
public
function
__construct
(
$prefix
=
''
)
{
...
...
@@ -58,12 +59,20 @@ class db extends mysqli
$this
->
dbNewLink
=
$conf
[
$prefix
.
'db_new_link'
];
$this
->
dbClientFlags
=
$conf
[
$prefix
.
'db_client_flags'
];
parent
::
__construct
(
$conf
[
$prefix
.
'db_host'
],
$conf
[
$prefix
.
'db_user'
],
$conf
[
$prefix
.
'db_password'
],
$conf
[
$prefix
.
'db_database'
]);
if
(
$this
->
connect_error
)
{
$try
=
0
;
while
(
!
is_null
(
$this
->
connect_error
)
&&
$try
<
5
)
{
if
(
$try
>
0
)
sleep
(
1
);
$try
++
;
$this
->
updateError
(
'DB::__construct'
);
return
false
;
}
else
{
$this
->
setCharacterEncoding
();
parent
::
__construct
(
$conf
[
$prefix
.
'db_host'
],
$conf
[
$prefix
.
'db_user'
],
$conf
[
$prefix
.
'db_password'
],
$conf
[
$prefix
.
'db_database'
]);
}
if
(
is_null
(
$this
->
connect_error
))
$this
->
isConnected
=
true
;
else
return
false
;
$this
->
setCharacterEncoding
();
}
public
function
__destruct
()
{
...
...
@@ -74,7 +83,7 @@ class db extends mysqli
public
function
updateError
(
$location
)
{
global
$app
;
if
(
$this
->
connect_error
)
{
if
(
!
is_null
(
$this
->
connect_error
)
)
{
$this
->
errorNumber
=
$this
->
connect_errno
;
$this
->
errorMessage
=
$this
->
connect_error
;
}
else
{
...
...
@@ -95,18 +104,20 @@ class db extends mysqli
}
private
function
setCharacterEncoding
()
{
if
(
$this
->
isConnected
==
false
)
return
false
;
parent
::
query
(
'SET NAMES '
.
$this
->
dbCharset
);
parent
::
query
(
"SET character_set_results = '"
.
$this
->
dbCharset
.
"', character_set_client = '"
.
$this
->
dbCharset
.
"', character_set_connection = '"
.
$this
->
dbCharset
.
"', character_set_database = '"
.
$this
->
dbCharset
.
"', character_set_server = '"
.
$this
->
dbCharset
.
"'"
);
}
public
function
query
(
$queryString
)
{
if
(
$this
->
isConnected
==
false
)
return
false
;
$try
=
0
;
do
{
$try
++
;
$ok
=
parent
::
ping
();
$ok
=
$this
->
ping
();
if
(
!
$ok
)
{
if
(
!
parent
::
real_connect
(
$this
->
dbHost
,
$this
->
dbUser
,
$this
->
dbPass
,
$this
->
dbName
))
{
if
(
$try
>
9
)
{
if
(
!
$this
->
real_connect
(
$this
->
dbHost
,
$this
->
dbUser
,
$this
->
dbPass
,
$this
->
dbName
))
{
if
(
$try
>
4
)
{
$this
->
updateError
(
'DB::query -> reconnect'
);
return
false
;
}
else
{
...
...
@@ -479,7 +490,7 @@ public function toLower($record) {
// gibt Array mit Tabellennamen zur�ck
public
function
getTables
(
$database_name
=
''
)
{
if
(
$this
->
isConnected
==
false
)
return
false
;
if
(
$database_name
==
''
)
$database_name
=
$this
->
dbName
;
$result
=
parent
::
query
(
"SHOW TABLES FROM
$database_name
"
);
for
(
$i
=
0
;
$i
<
$result
->
num_rows
;
$i
++
)
{
...
...
interface/lib/classes/listform_tpl_generator.inc.php
View file @
72695f03
...
...
@@ -59,10 +59,12 @@ class listform_tpl_generator {
'
;
$lang
[
"list_head_txt"
]
=
$listDef
[
"name"
];
$colcount
=
0
;
foreach
(
$listDef
[
"item"
]
as
$field
)
{
$key
=
$field
[
"field"
];
$html
.
=
" <th class=
\"
tbl_col_"
.
$key
.
"
\"
scope=
\"
col
\"
><tmpl_var name=
\"
"
.
$key
.
"_txt
\"
></th>
\n
"
;
$lang
[
$key
.
"_txt"
]
=
$key
;
$colcount
++
;
}
$html
.
=
' <th class="tbl_col_buttons" scope="col"> </th>
...
...
@@ -99,6 +101,11 @@ class listform_tpl_generator {
</td>
</tr>
</tmpl_loop>
<tmpl_unless name=
\"
records
\"
>
<tr class=
\"
tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>
\"
>
<td colspan=
\"
"
.
$colcount
.
"
\"
>{tmpl_var name='globalsearch_noresults_text_txt'}</td>
</tr>
</tmpl_unless>
</tbody>"
;
$html
.
=
'
<tfoot>
...
...
interface/lib/classes/searchform.inc.php
View file @
72695f03
...
...
@@ -208,6 +208,8 @@ class searchform {
$content
.
=
' '
.
$app
->
lng
(
'Page'
)
.
' '
.
$vars
[
'next_page'
]
.
' '
.
$app
->
lng
(
'of'
)
.
' '
.
$vars
[
'max_pages'
]
.
' '
;
if
(
$vars
[
'show_page_next'
]
==
1
){
$content
.
=
'<a href="'
.
$list_file
.
'?page='
.
$vars
[
'next_page'
]
.
$page_params
.
'"><img src="../themes/iprg/images/btn_next.png" border="0"></a> '
;
}
else
{
$content
.
=
' '
;
}
$content
.
=
'<a href="'
.
$list_file
.
'?page='
.
$vars
[
'pages'
]
.
$page_params
.
'"> <img src="../themes/iprg/images/btn_right.png" border="0"></a>'
;
return
$content
;
...
...
interface/lib/classes/simplepie.inc.php
View file @
72695f03
...
...
@@ -9103,7 +9103,7 @@ class SimplePie_Misc
return
$time
;
}
function
absolutize_url
(
$relative
,
$base
)
static
function
absolutize_url
(
$relative
,
$base
)
{
$iri
=
SimplePie_IRI
::
absolutize
(
new
SimplePie_IRI
(
$base
),
$relative
);
return
$iri
->
get_iri
();
...
...
@@ -9163,7 +9163,7 @@ class SimplePie_Misc
return
$output
.
$input
;
}
function
get_element
(
$realname
,
$string
)
static
function
get_element
(
$realname
,
$string
)
{
$return
=
array
();
$name
=
preg_quote
(
$realname
,
'/'
);
...
...
@@ -11006,7 +11006,7 @@ class SimplePie_Misc
}
}
function
atom_10_construct_type
(
$attribs
)
static
function
atom_10_construct_type
(
$attribs
)
{
if
(
isset
(
$attribs
[
''
][
'type'
]))
{
...
...
@@ -11059,7 +11059,7 @@ class SimplePie_Misc
}
}
function
is_isegment_nz_nc
(
$string
)
static
function
is_isegment_nz_nc
(
$string
)
{
return
(
bool
)
preg_match
(
'/^([A-Za-z0-9\-._~\x{A0}-\x{D7FF}\x{F900}-\x{FDCF}\x{FDF0}-\x{FFEF}\x{10000}-\x{1FFFD}\x{20000}-\x{2FFFD}\x{30000}-\x{3FFFD}\x{40000}-\x{4FFFD}\x{50000}-\x{5FFFD}\x{60000}-\x{6FFFD}\x{70000}-\x{7FFFD}\x{80000}-\x{8FFFD}\x{90000}-\x{9FFFD}\x{A0000}-\x{AFFFD}\x{B0000}-\x{BFFFD}\x{C0000}-\x{CFFFD}\x{D0000}-\x{DFFFD}\x{E1000}-\x{EFFFD}!$&\'()*+,;=@]|(%[0-9ABCDEF]{2}))+$/u'
,
$string
);
}
...
...
@@ -11699,7 +11699,7 @@ class SimplePie_IRI
* @param string $relative Relative IRI
* @return SimplePie_IRI
*/
function
absolutize
(
$base
,
$relative
)
static
function
absolutize
(
$base
,
$relative
)
{
$relative
=
(
string
)
$relative
;
if
(
$relative
!==
''
)
...
...
interface/lib/classes/tform.inc.php
View file @
72695f03
...
...
@@ -937,31 +937,44 @@ class tform {
}
break
;
case
'ISIP'
:
//* Check if its a IPv4 or IPv6 address
if
(
function_exists
(
'filter_var'
))
{
if
(
!
filter_var
(
$field_value
,
FILTER_VALIDATE_IP
))
{
$errmsg
=
$validator
[
'errmsg'
];
if
(
isset
(
$this
->
wordbook
[
$errmsg
]))
{
$this
->
errorMessage
.
=
$this
->
wordbook
[
$errmsg
]
.
"<br />
\r\n
"
;
}
else
{
$this
->
errorMessage
.
=
$errmsg
.
"<br />
\r\n
"
;
}
}
if
(
$validator
[
'allowempty'
]
!=
'y'
)
$validator
[
'allowempty'
]
=
'n'
;
if
(
$validator
[
'allowempty'
]
==
'y'
&&
$field_value
==
''
)
{
//* Do nothing
}
else
{
//* Check content with regex, if we use php < 5.2
$ip_ok
=
0
;
if
(
preg_match
(
"/^(\:\:([a-f0-9]
{
1,4}\:){0,6}?[a-f0-9]{0,4}|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){0,6}?\:\:|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){1,6}?\:\:([a-f0-9]{1,4}\:){1,6}?[a-f0-9]{1,4})(\/\d{1,3
}
)?$/i"
,
$field_value
)){
$ip_ok
=
1
;
}
if
(
preg_match
(
"/^[0-9]
{
1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3
}
$/"
,
$field_value
)){
$ip_ok
=
1
;
//* Check if its a IPv4 or IPv6 address
if
(
isset
(
$validator
[
'separator'
])
&&
$validator
[
'separator'
]
!=
''
)
{
//* When the field may contain several IP addresses, split them by the char defined as separator
$field_value_array
=
explode
(
$validator
[
'separator'
],
$field_value
);
}
else
{
$field_value_array
[]
=
$field_value
;
}
if
(
$ip_ok
==
0
)
{
$errmsg
=
$validator
[
'errmsg'
];
if
(
isset
(
$this
->
wordbook
[
$errmsg
]))
{
$this
->
errorMessage
.
=
$this
->
wordbook
[
$errmsg
]
.
"<br />
\r\n
"
;
foreach
(
$field_value_array
as
$field_value
)
{
if
(
function_exists
(
'filter_var'
))
{
if
(
!
filter_var
(
$field_value
,
FILTER_VALIDATE_IP
))
{
$errmsg
=
$validator
[
'errmsg'
];
if
(
isset
(
$this
->
wordbook
[
$errmsg
]))
{
$this
->
errorMessage
.
=
$this
->
wordbook
[
$errmsg
]
.
"<br />
\r\n
"
;
}
else
{
$this
->
errorMessage
.
=
$errmsg
.
"<br />
\r\n
"
;
}
}
}
else
{
$this
->
errorMessage
.
=
$errmsg
.
"<br />
\r\n
"
;
//* Check content with regex, if we use php < 5.2
$ip_ok
=
0
;
if
(
preg_match
(
"/^(\:\:([a-f0-9]
{
1,4}\:){0,6}?[a-f0-9]{0,4}|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){0,6}?\:\:|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){1,6}?\:\:([a-f0-9]{1,4}\:){1,6}?[a-f0-9]{1,4})(\/\d{1,3
}
)?$/i"
,
$field_value
)){
$ip_ok
=
1
;
}
if
(
preg_match
(
"/^[0-9]
{
1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3
}
$/"
,
$field_value
)){
$ip_ok
=
1
;
}
if
(
$ip_ok
==
0
)
{
$errmsg
=
$validator
[
'errmsg'
];
if
(
isset
(
$this
->
wordbook
[
$errmsg
]))
{
$this
->
errorMessage
.
=
$this
->
wordbook
[
$errmsg
]
.
"<br />
\r\n
"
;
}
else
{
$this
->
errorMessage
.
=
$errmsg
.
"<br />
\r\n
"
;
}
}
}
}
}
...
...
interface/lib/classes/tpl_error.inc.php
View file @
72695f03
...
...
@@ -31,7 +31,7 @@ class vlibTemplateError {
| DO NOT TOUCH ANYTHING IN THIS CLASS IT MAY NOT WORK OTHERWISE |
\-----------------------------------------------------------------------------*/
function
raiseError
(
$code
,
$level
=
null
,
$extra
=
null
)
{
public
static
function
raiseError
(
$code
,
$level
=
null
,
$extra
=
null
)
{
if
(
!
(
$level
&
error_reporting
())
&&
$level
!=
KILL
)
return
;
// binary AND checks for reporting level
$error_codes
=
array
(
...
...
interface/lib/lang/cz.lng
View file @
72695f03
...
...
@@ -132,4 +132,3 @@ $wb['datalog_status_u_web_folder_user'] = 'Aktualizace nastavení uživatele pro
$wb
[
'datalog_status_d_web_folder_user'
]
=
'Odstranění uživatele pro adresáře chráněné heslem'
;
?>
interface/lib/lang/en.lng
View file @
72695f03
...
...
@@ -131,4 +131,6 @@ $wb['datalog_status_d_web_folder'] = 'Delete folder protection';
$wb
[
'datalog_status_i_web_folder_user'
]
=
'Create folder protection user'
;
$wb
[
'datalog_status_u_web_folder_user'
]
=
'Update folder protection user'
;
$wb
[
'datalog_status_d_web_folder_user'
]
=
'Delete folder protection user'
;
$wb
[
'login_as_txt'
]
=
'Log in as'
;
?>
interface/web/admin/lib/lang/ar_login_as.lng
0 → 100644
View file @
72695f03
<?php
$wb
[
"login_1_txt"
]
=
'Do you want to login as user'
;
$wb
[
"login_2_txt"
]
=
'If you do so, you can "go back" by clicking at logout.'
;
$wb
[
"btn_yes_txt"
]
=
'Yes, login as Client'
;
$wb
[
"btn_back_txt"
]
=
'No, back to list'
;
$wb
[
"udp_port_help_txt"
]
=
'Separated by comma'
;
$wb
[
"active_txt"
]
=
'Active'
;
$wb
[
"firewall_error_unique"
]
=
'There is already a firewall record for this server.'
;
$wb
[
"active_txt"
]
=
'Active'
;
$wb
[
"tcp_ports_error_regex"
]
=
'Character not allowed in tcp port definition. Allowed characters are numbers, ":" and ",".'
;
$wb
[
"udp_ports_error_regex"
]
=
'Character not allowed in udp port definition. Allowed characters are numbers, ":" and ",".'
;
?>
\ No newline at end of file
interface/web/admin/lib/lang/ar_server_config.lng
View file @
72695f03
...
...
@@ -170,7 +170,4 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb
[
'web_folder_protection_txt'
]
=
'Make web folders immutable (extended attributes)'
;
$wb
[
'overtraffic_notify_admin_txt'
]
=
'Send overtraffic notification to admin'
;
$wb
[
'overtraffic_notify_client_txt'
]
=
'Send overtraffic notification to client'
;
$wb
[
'v6_prefix_txt'
]
=
'IPv6 Prefix'
;
$wb
[
'vhost_rewrite_v6_txt'
]
=
'Rewrite IPv6 on Mirror'
;
$wb
[
'v6_prefix_wrong'
]
=
'Invalid v6 Netmask format.'
;
?>
interface/web/admin/lib/lang/ar_users.lng
View file @
72695f03
...
...
@@ -29,5 +29,5 @@ $wb['generate_password_txt'] = 'Generate Password';
$wb
[
'repeat_password_txt'
]
=
'Repeat Password'
;
$wb
[
'password_mismatch_txt'
]
=
'The passwords do not match.'
;
$wb
[
'password_match_txt'
]
=
'The passwords do match.'
;
$wb
[
'username_error_collision'
]
=
'The username may not be web or web plus a number.\"'
;
$wb
[
'username_error_collision'
]
=
'The username may not be web or web plus a number.\
\
"'
;
?>
interface/web/admin/lib/lang/bg_login_as.lng
0 → 100644
View file @
72695f03
<?php
$wb
[
"login_1_txt"
]
=
'Do you want to login as user'
;
$wb
[
"login_2_txt"
]
=
'If you do so, you can "go back" by clicking at logout.'
;
$wb
[
"btn_yes_txt"
]
=
'Yes, login as Client'
;
$wb
[
"btn_back_txt"
]
=
'No, back to list'
;
$wb
[
"udp_port_help_txt"
]
=
'Separated by comma'
;
$wb
[
"active_txt"
]
=
'Active'
;
$wb
[
"firewall_error_unique"
]
=
'There is already a firewall record for this server.'
;
$wb
[
"active_txt"
]
=
'Active'
;
$wb
[
"tcp_ports_error_regex"
]
=
'Character not allowed in tcp port definition. Allowed characters are numbers, ":" and ",".'
;
$wb
[
"udp_ports_error_regex"
]
=
'Character not allowed in udp port definition. Allowed characters are numbers, ":" and ",".'
;
?>
\ No newline at end of file
interface/web/admin/lib/lang/bg_server_config.lng
View file @
72695f03
...
...
@@ -170,7 +170,4 @@ $wb['website_autoalias_txt'] = 'Website auto alias';
$wb
[
'website_autoalias_note_txt'
]
=
'Placeholders:'
;