Merge remote-tracking branch 'ispconfig3.official/master'
Showing
with
8267 additions
and
2382 deletions
+8267
-2382
- .gitignore .gitignore +2 -1
- .gitlab-ci.yml .gitlab-ci.yml +21 -0
- .phplint.yml .phplint.yml +9 -0
- README.md README.md +4 -0
- helper_scripts/ubuntu-amavisd-new-2.11.patch helper_scripts/ubuntu-amavisd-new-2.11.patch +18 -0
- helper_scripts/utils.sh helper_scripts/utils.sh +4 -0
- install/apps/xmpp_libs/auth_prosody/authenticate_isp.sh install/apps/xmpp_libs/auth_prosody/authenticate_isp.sh +38 -0
- install/apps/xmpp_libs/auth_prosody/db_auth.php install/apps/xmpp_libs/auth_prosody/db_auth.php +0 -0
- install/apps/xmpp_libs/auth_prosody/db_conf.inc.php install/apps/xmpp_libs/auth_prosody/db_conf.inc.php +0 -0
- install/apps/xmpp_libs/auth_prosody/db_isuser.php install/apps/xmpp_libs/auth_prosody/db_isuser.php +0 -0
- install/apps/xmpp_libs/auth_prosody/prosody-purge install/apps/xmpp_libs/auth_prosody/prosody-purge +62 -0
- install/apps/xmpp_libs/mod_auth_external/authenticate_isp.sh install/apps/xmpp_libs/mod_auth_external/authenticate_isp.sh +0 -0
- install/apps/xmpp_libs/mod_auth_external/db_auth.php install/apps/xmpp_libs/mod_auth_external/db_auth.php +48 -0
- install/apps/xmpp_libs/mod_auth_external/db_conf.inc.php install/apps/xmpp_libs/mod_auth_external/db_conf.inc.php +6 -0
- install/apps/xmpp_libs/mod_auth_external/db_isuser.php install/apps/xmpp_libs/mod_auth_external/db_isuser.php +43 -0
- install/apps/xmpp_libs/mod_auth_external/mod_auth_external.lua ...ll/apps/xmpp_libs/mod_auth_external/mod_auth_external.lua +0 -0
- install/apps/xmpp_libs/mod_discoitems.lua install/apps/xmpp_libs/mod_discoitems.lua +0 -0
- install/apps/xmpp_libs/mod_webpresence/icons/status_away.png install/apps/xmpp_libs/mod_webpresence/icons/status_away.png +0 -0
- install/apps/xmpp_libs/mod_webpresence/icons/status_chat.png install/apps/xmpp_libs/mod_webpresence/icons/status_chat.png +0 -0
- install/apps/xmpp_libs/mod_webpresence/icons/status_dnd.png install/apps/xmpp_libs/mod_webpresence/icons/status_dnd.png +0 -0
- install/apps/xmpp_libs/mod_webpresence/icons/status_offline.png ...l/apps/xmpp_libs/mod_webpresence/icons/status_offline.png +0 -0
- install/apps/xmpp_libs/mod_webpresence/icons/status_online.png ...ll/apps/xmpp_libs/mod_webpresence/icons/status_online.png +0 -0
- install/apps/xmpp_libs/mod_webpresence/icons/status_xa.png install/apps/xmpp_libs/mod_webpresence/icons/status_xa.png +0 -0
- install/apps/xmpp_libs/mod_webpresence/mod_webpresence.lua install/apps/xmpp_libs/mod_webpresence/mod_webpresence.lua +0 -0
- install/dist/conf/debian60.conf.php install/dist/conf/debian60.conf.php +11 -2
- install/dist/conf/debian90.conf.php install/dist/conf/debian90.conf.php +11 -2
- install/dist/conf/debiantesting.conf.php install/dist/conf/debiantesting.conf.php +11 -2
- install/dist/conf/ubuntu1604.conf.php install/dist/conf/ubuntu1604.conf.php +11 -2
- install/dist/conf/ubuntu1710.conf.php install/dist/conf/ubuntu1710.conf.php +11 -2
- install/dist/conf/ubuntu1804.conf.php install/dist/conf/ubuntu1804.conf.php +230 -0
- install/dist/lib/debian60.lib.php install/dist/lib/debian60.lib.php +5 -2
- install/dist/lib/fedora.lib.php install/dist/lib/fedora.lib.php +32 -1
- install/dist/lib/gentoo.lib.php install/dist/lib/gentoo.lib.php +16 -2
- install/dist/lib/opensuse.lib.php install/dist/lib/opensuse.lib.php +26 -3
- install/dist/tpl/gentoo/amavisd-ispconfig.conf.master install/dist/tpl/gentoo/amavisd-ispconfig.conf.master +4 -3
- install/install.php install/install.php +18 -7
- install/lib/install.lib.php install/lib/install.lib.php +26 -0
- install/lib/installer_base.lib.php install/lib/installer_base.lib.php +292 -132
- install/lib/update.lib.php install/lib/update.lib.php +16 -7
- install/patches/upd_0086.php install/patches/upd_0086.php +46 -0
- install/sql/incremental/upd_0086.sql install/sql/incremental/upd_0086.sql +5 -0
- install/sql/incremental/upd_dev_collection.sql install/sql/incremental/upd_dev_collection.sql +14 -1
- install/sql/ispconfig3.sql install/sql/ispconfig3.sql +3 -1
- install/tpl/apache_apps.vhost.master install/tpl/apache_apps.vhost.master +15 -0
- install/tpl/apache_ispconfig.conf.master install/tpl/apache_ispconfig.conf.master +5 -1
- install/tpl/apache_ispconfig.vhost.master install/tpl/apache_ispconfig.vhost.master +17 -3
- install/tpl/debian6_dovecot-sql.conf.master install/tpl/debian6_dovecot-sql.conf.master +1 -1
- install/tpl/debian6_dovecot2.conf.master install/tpl/debian6_dovecot2.conf.master +17 -0
- install/tpl/debian_dovecot2.conf.master install/tpl/debian_dovecot2.conf.master +16 -0
- install/tpl/debian_postfix.conf.master install/tpl/debian_postfix.conf.master +1 -1
- install/tpl/fedora_dovecot2.conf.master install/tpl/fedora_dovecot2.conf.master +16 -0
- install/tpl/master_cf_amavis10027.master install/tpl/master_cf_amavis10027.master +2 -2
- install/tpl/mysql-virtual_outgoing_bcc.cf install/tpl/mysql-virtual_outgoing_bcc.cf +0 -8
- install/tpl/mysql-virtual_outgoing_bcc.cf.master install/tpl/mysql-virtual_outgoing_bcc.cf.master +1 -1
- install/tpl/named.conf.options.master install/tpl/named.conf.options.master +1 -2
- install/tpl/nginx_anonlog.master install/tpl/nginx_anonlog.master +20 -0
- install/tpl/nginx_ispconfig.vhost.master install/tpl/nginx_ispconfig.vhost.master +2 -2
- install/tpl/opensuse_dovecot2.conf.master install/tpl/opensuse_dovecot2.conf.master +16 -0
- install/tpl/server.ini.master install/tpl/server.ini.master +7 -2
- install/tpl/system.ini.master install/tpl/system.ini.master +4 -0
- install/tpl/xmpp_metronome_conf_global.master install/tpl/xmpp_metronome_conf_global.master +0 -0
- install/tpl/xmpp_metronome_conf_main.master install/tpl/xmpp_metronome_conf_main.master +0 -0
- install/tpl/xmpp_metronome_conf_ssl.master install/tpl/xmpp_metronome_conf_ssl.master +0 -0
- install/tpl/xmpp_prosody_conf_global.master install/tpl/xmpp_prosody_conf_global.master +94 -0
- install/tpl/xmpp_prosody_conf_main.master install/tpl/xmpp_prosody_conf_main.master +3 -0
- install/tpl/xmpp_prosody_conf_ssl.master install/tpl/xmpp_prosody_conf_ssl.master +48 -0
- install/tpl/xmpp_prosody_conf_storage.master install/tpl/xmpp_prosody_conf_storage.master +9 -0
- install/update.php install/update.php +15 -4
- interface/lib/app.inc.php interface/lib/app.inc.php +10 -6
- interface/lib/classes/aps_guicontroller.inc.php interface/lib/classes/aps_guicontroller.inc.php +16 -23
- interface/lib/classes/custom_datasource.inc.php interface/lib/classes/custom_datasource.inc.php +7 -5
- interface/lib/classes/db_mysql.inc.php interface/lib/classes/db_mysql.inc.php +181 -89
- interface/lib/classes/functions.inc.php interface/lib/classes/functions.inc.php +99 -35
- interface/lib/classes/ids.inc.php interface/lib/classes/ids.inc.php +21 -3
- interface/lib/classes/ini_parser.inc.php interface/lib/classes/ini_parser.inc.php +1 -0
- interface/lib/classes/listform.inc.php interface/lib/classes/listform.inc.php +1 -1
- interface/lib/classes/listform_actions.inc.php interface/lib/classes/listform_actions.inc.php +2 -2
- interface/lib/classes/listform_tpl_generator.inc.php interface/lib/classes/listform_tpl_generator.inc.php +2 -2
- interface/lib/classes/plugin_backuplist.inc.php interface/lib/classes/plugin_backuplist.inc.php +1 -1
- interface/lib/classes/plugin_backuplist_mail.inc.php interface/lib/classes/plugin_backuplist_mail.inc.php +1 -1
- interface/lib/classes/plugin_directive_snippets.inc.php interface/lib/classes/plugin_directive_snippets.inc.php +1 -1
- interface/lib/classes/plugin_listview.inc.php interface/lib/classes/plugin_listview.inc.php +5 -5
- interface/lib/classes/remote.d/admin.inc.php interface/lib/classes/remote.d/admin.inc.php +117 -1
- interface/lib/classes/remote.d/dns.inc.php interface/lib/classes/remote.d/dns.inc.php +93 -34
- interface/lib/classes/remote.d/mail.inc.php interface/lib/classes/remote.d/mail.inc.php +2 -2
- interface/lib/classes/remoting.inc.php interface/lib/classes/remoting.inc.php +6 -4
- interface/lib/classes/remoting_lib.inc.php interface/lib/classes/remoting_lib.inc.php +10 -1
- interface/lib/classes/searchform_actions.inc.php interface/lib/classes/searchform_actions.inc.php +2 -2
- interface/lib/classes/session.inc.php interface/lib/classes/session.inc.php +5 -1
- interface/lib/classes/simplepie.inc.php interface/lib/classes/simplepie.inc.php +1 -1
- interface/lib/classes/tform.inc.php interface/lib/classes/tform.inc.php +23 -11
- interface/lib/classes/tform_actions.inc.php interface/lib/classes/tform_actions.inc.php +1 -1
- interface/lib/classes/tform_base.inc.php interface/lib/classes/tform_base.inc.php +9 -10
- interface/lib/classes/tform_tpl_generator.inc.php interface/lib/classes/tform_tpl_generator.inc.php +1 -1
- interface/lib/classes/tpl.inc.php interface/lib/classes/tpl.inc.php +6 -1
- interface/lib/classes/validate_client.inc.php interface/lib/classes/validate_client.inc.php +9 -11
- interface/lib/classes/validate_cron.inc.php interface/lib/classes/validate_cron.inc.php +1 -1
- interface/lib/classes/validate_domain.inc.php interface/lib/classes/validate_domain.inc.php +48 -1
- interface/lib/classes/validate_password.inc.php interface/lib/classes/validate_password.inc.php +1 -1
- interface/lib/lang/cz.lng interface/lib/lang/cz.lng +21 -18
- interface/lib/lang/nl.lng interface/lib/lang/nl.lng +8 -5
- interface/lib/lang/ru.lng interface/lib/lang/ru.lng +1 -1
- interface/lib/plugins/mail_user_filter_plugin.inc.php interface/lib/plugins/mail_user_filter_plugin.inc.php +12 -9
- interface/web/admin/directive_snippets_edit.php interface/web/admin/directive_snippets_edit.php +3 -3
- interface/web/admin/firewall_edit.php interface/web/admin/firewall_edit.php +1 -1
- interface/web/admin/form/directive_snippets.tform.php interface/web/admin/form/directive_snippets.tform.php +6 -0
- interface/web/admin/form/groups.tform.php interface/web/admin/form/groups.tform.php +10 -0
- interface/web/admin/form/iptables.tform.php interface/web/admin/form/iptables.tform.php +30 -0
- interface/web/admin/form/server.tform.php interface/web/admin/form/server.tform.php +6 -0
- interface/web/admin/form/server_config.tform.php interface/web/admin/form/server_config.tform.php +145 -0
- interface/web/admin/form/server_php.tform.php interface/web/admin/form/server_php.tform.php +43 -0
- interface/web/admin/form/software_package.tform.php interface/web/admin/form/software_package.tform.php +12 -0
- interface/web/admin/form/software_repo.tform.php interface/web/admin/form/software_repo.tform.php +18 -0
- interface/web/admin/form/system_config.tform.php interface/web/admin/form/system_config.tform.php +114 -4
- interface/web/admin/form/tpl_default.tform.php interface/web/admin/form/tpl_default.tform.php +12 -0
- interface/web/admin/language_add.php interface/web/admin/language_add.php +1 -1
- interface/web/admin/language_complete.php interface/web/admin/language_complete.php +1 -1
- interface/web/admin/language_edit.php interface/web/admin/language_edit.php +1 -1
- interface/web/admin/language_export.php interface/web/admin/language_export.php +1 -1
- interface/web/admin/language_import.php interface/web/admin/language_import.php +1 -1
- interface/web/admin/language_list.php interface/web/admin/language_list.php +1 -1
- interface/web/admin/lib/lang/ar_remote_user.lng interface/web/admin/lib/lang/ar_remote_user.lng +3 -0
- interface/web/admin/lib/lang/ar_server_config.lng interface/web/admin/lib/lang/ar_server_config.lng +11 -1
- interface/web/admin/lib/lang/ar_server_php.lng interface/web/admin/lib/lang/ar_server_php.lng +1 -0
- interface/web/admin/lib/lang/ar_users.lng interface/web/admin/lib/lang/ar_users.lng +1 -0
- interface/web/admin/lib/lang/bg_remote_user.lng interface/web/admin/lib/lang/bg_remote_user.lng +3 -0
- interface/web/admin/lib/lang/bg_server_config.lng interface/web/admin/lib/lang/bg_server_config.lng +11 -1
- interface/web/admin/lib/lang/bg_server_php.lng interface/web/admin/lib/lang/bg_server_php.lng +1 -0
- interface/web/admin/lib/lang/bg_users.lng interface/web/admin/lib/lang/bg_users.lng +1 -0
- interface/web/admin/lib/lang/br.lng interface/web/admin/lib/lang/br.lng +0 -1
- interface/web/admin/lib/lang/br_remote_user.lng interface/web/admin/lib/lang/br_remote_user.lng +4 -18
- interface/web/admin/lib/lang/br_server_config.lng interface/web/admin/lib/lang/br_server_config.lng +10 -1
- interface/web/admin/lib/lang/br_server_php.lng interface/web/admin/lib/lang/br_server_php.lng +1 -0
- interface/web/admin/lib/lang/br_system_config.lng interface/web/admin/lib/lang/br_system_config.lng +1 -1
- interface/web/admin/lib/lang/br_users.lng interface/web/admin/lib/lang/br_users.lng +1 -0
- interface/web/admin/lib/lang/ca_remote_user.lng interface/web/admin/lib/lang/ca_remote_user.lng +3 -0
- interface/web/admin/lib/lang/ca_server_config.lng interface/web/admin/lib/lang/ca_server_config.lng +11 -1
- interface/web/admin/lib/lang/ca_server_php.lng interface/web/admin/lib/lang/ca_server_php.lng +1 -0
- interface/web/admin/lib/lang/ca_users.lng interface/web/admin/lib/lang/ca_users.lng +1 -0
- interface/web/admin/lib/lang/cz.lng interface/web/admin/lib/lang/cz.lng +27 -15
- interface/web/admin/lib/lang/cz_login_as.lng interface/web/admin/lib/lang/cz_login_as.lng +0 -11
- interface/web/admin/lib/lang/cz_remote_user.lng interface/web/admin/lib/lang/cz_remote_user.lng +3 -0
- interface/web/admin/lib/lang/cz_server_config.lng interface/web/admin/lib/lang/cz_server_config.lng +12 -2
- interface/web/admin/lib/lang/cz_server_php.lng interface/web/admin/lib/lang/cz_server_php.lng +1 -0
- interface/web/admin/lib/lang/cz_users.lng interface/web/admin/lib/lang/cz_users.lng +1 -0
- interface/web/admin/lib/lang/de_server_config.lng interface/web/admin/lib/lang/de_server_config.lng +12 -1
- interface/web/admin/lib/lang/de_server_php.lng interface/web/admin/lib/lang/de_server_php.lng +1 -0
- interface/web/admin/lib/lang/de_server_php_list.lng interface/web/admin/lib/lang/de_server_php_list.lng +1 -0
- interface/web/admin/lib/lang/de_users.lng interface/web/admin/lib/lang/de_users.lng +1 -0
- interface/web/admin/lib/lang/dk_remote_user.lng interface/web/admin/lib/lang/dk_remote_user.lng +3 -0
- interface/web/admin/lib/lang/dk_server_config.lng interface/web/admin/lib/lang/dk_server_config.lng +11 -1
- interface/web/admin/lib/lang/dk_server_php.lng interface/web/admin/lib/lang/dk_server_php.lng +1 -0
- interface/web/admin/lib/lang/dk_users.lng interface/web/admin/lib/lang/dk_users.lng +1 -0
- interface/web/admin/lib/lang/el_remote_user.lng interface/web/admin/lib/lang/el_remote_user.lng +3 -0
- interface/web/admin/lib/lang/el_server_config.lng interface/web/admin/lib/lang/el_server_config.lng +11 -1
- interface/web/admin/lib/lang/el_server_php.lng interface/web/admin/lib/lang/el_server_php.lng +1 -0
- interface/web/admin/lib/lang/el_users.lng interface/web/admin/lib/lang/el_users.lng +1 -0
- interface/web/admin/lib/lang/en_server_config.lng interface/web/admin/lib/lang/en_server_config.lng +12 -1
- interface/web/admin/lib/lang/en_server_php.lng interface/web/admin/lib/lang/en_server_php.lng +1 -0
- interface/web/admin/lib/lang/en_server_php_list.lng interface/web/admin/lib/lang/en_server_php_list.lng +1 -0
- interface/web/admin/lib/lang/en_system_config.lng interface/web/admin/lib/lang/en_system_config.lng +3 -0
- interface/web/admin/lib/lang/en_users.lng interface/web/admin/lib/lang/en_users.lng +1 -0
- interface/web/admin/lib/lang/es_remote_user.lng interface/web/admin/lib/lang/es_remote_user.lng +3 -0
- interface/web/admin/lib/lang/es_server_config.lng interface/web/admin/lib/lang/es_server_config.lng +11 -1
- interface/web/admin/lib/lang/es_server_php.lng interface/web/admin/lib/lang/es_server_php.lng +1 -0
- interface/web/admin/lib/lang/es_users.lng interface/web/admin/lib/lang/es_users.lng +1 -0
- interface/web/admin/lib/lang/fi_remote_user.lng interface/web/admin/lib/lang/fi_remote_user.lng +3 -0
- interface/web/admin/lib/lang/fi_server_config.lng interface/web/admin/lib/lang/fi_server_config.lng +11 -1
- interface/web/admin/lib/lang/fi_server_php.lng interface/web/admin/lib/lang/fi_server_php.lng +1 -0
- interface/web/admin/lib/lang/fi_users.lng interface/web/admin/lib/lang/fi_users.lng +1 -0
- interface/web/admin/lib/lang/fr_remote_user.lng interface/web/admin/lib/lang/fr_remote_user.lng +3 -0
- interface/web/admin/lib/lang/fr_server_config.lng interface/web/admin/lib/lang/fr_server_config.lng +11 -1
- interface/web/admin/lib/lang/fr_server_php.lng interface/web/admin/lib/lang/fr_server_php.lng +1 -0
- interface/web/admin/lib/lang/fr_users.lng interface/web/admin/lib/lang/fr_users.lng +1 -0
- interface/web/admin/lib/lang/hr_remote_user.lng interface/web/admin/lib/lang/hr_remote_user.lng +3 -0
- interface/web/admin/lib/lang/hr_server_config.lng interface/web/admin/lib/lang/hr_server_config.lng +11 -1
- interface/web/admin/lib/lang/hr_server_php.lng interface/web/admin/lib/lang/hr_server_php.lng +1 -0
- interface/web/admin/lib/lang/hr_users.lng interface/web/admin/lib/lang/hr_users.lng +1 -0
- interface/web/admin/lib/lang/hu_remote_user.lng interface/web/admin/lib/lang/hu_remote_user.lng +3 -0
- interface/web/admin/lib/lang/hu_server_config.lng interface/web/admin/lib/lang/hu_server_config.lng +11 -1
- interface/web/admin/lib/lang/hu_server_php.lng interface/web/admin/lib/lang/hu_server_php.lng +1 -0
- interface/web/admin/lib/lang/hu_users.lng interface/web/admin/lib/lang/hu_users.lng +1 -0
- interface/web/admin/lib/lang/id_remote_user.lng interface/web/admin/lib/lang/id_remote_user.lng +3 -0
- interface/web/admin/lib/lang/id_server_config.lng interface/web/admin/lib/lang/id_server_config.lng +11 -1
- interface/web/admin/lib/lang/id_server_php.lng interface/web/admin/lib/lang/id_server_php.lng +1 -0
- interface/web/admin/lib/lang/id_users.lng interface/web/admin/lib/lang/id_users.lng +1 -0
- interface/web/admin/lib/lang/it_remote_user.lng interface/web/admin/lib/lang/it_remote_user.lng +3 -0
- interface/web/admin/lib/lang/it_server_config.lng interface/web/admin/lib/lang/it_server_config.lng +12 -2
- interface/web/admin/lib/lang/it_server_php.lng interface/web/admin/lib/lang/it_server_php.lng +1 -0
- interface/web/admin/lib/lang/it_users.lng interface/web/admin/lib/lang/it_users.lng +1 -0
- interface/web/admin/lib/lang/ja_remote_user.lng interface/web/admin/lib/lang/ja_remote_user.lng +3 -0
- interface/web/admin/lib/lang/ja_server_config.lng interface/web/admin/lib/lang/ja_server_config.lng +11 -1
- interface/web/admin/lib/lang/ja_server_php.lng interface/web/admin/lib/lang/ja_server_php.lng +1 -0
- interface/web/admin/lib/lang/ja_users.lng interface/web/admin/lib/lang/ja_users.lng +1 -0
- interface/web/admin/lib/lang/nl_remote_user.lng interface/web/admin/lib/lang/nl_remote_user.lng +7 -4
- interface/web/admin/lib/lang/nl_server_config.lng interface/web/admin/lib/lang/nl_server_config.lng +17 -1
- interface/web/admin/lib/lang/nl_server_php.lng interface/web/admin/lib/lang/nl_server_php.lng +1 -0
- interface/web/admin/lib/lang/nl_system_config.lng interface/web/admin/lib/lang/nl_system_config.lng +5 -1
- interface/web/admin/lib/lang/nl_users.lng interface/web/admin/lib/lang/nl_users.lng +1 -0
- interface/web/admin/lib/lang/pl_remote_user.lng interface/web/admin/lib/lang/pl_remote_user.lng +3 -0
- interface/web/admin/lib/lang/pl_server_config.lng interface/web/admin/lib/lang/pl_server_config.lng +11 -1
- interface/web/admin/lib/lang/pl_server_php.lng interface/web/admin/lib/lang/pl_server_php.lng +1 -0
- interface/web/admin/lib/lang/pl_users.lng interface/web/admin/lib/lang/pl_users.lng +1 -0
- interface/web/admin/lib/lang/pt_remote_user.lng interface/web/admin/lib/lang/pt_remote_user.lng +3 -0
- interface/web/admin/lib/lang/pt_server_config.lng interface/web/admin/lib/lang/pt_server_config.lng +11 -1
- interface/web/admin/lib/lang/pt_server_php.lng interface/web/admin/lib/lang/pt_server_php.lng +1 -0
- interface/web/admin/lib/lang/pt_users.lng interface/web/admin/lib/lang/pt_users.lng +1 -0
- interface/web/admin/lib/lang/ro_remote_user.lng interface/web/admin/lib/lang/ro_remote_user.lng +3 -0
- interface/web/admin/lib/lang/ro_server_config.lng interface/web/admin/lib/lang/ro_server_config.lng +11 -1
- interface/web/admin/lib/lang/ro_server_php.lng interface/web/admin/lib/lang/ro_server_php.lng +1 -0
- interface/web/admin/lib/lang/ro_users.lng interface/web/admin/lib/lang/ro_users.lng +1 -0
- interface/web/admin/lib/lang/ru_firewall.lng interface/web/admin/lib/lang/ru_firewall.lng +2 -2
- interface/web/admin/lib/lang/ru_remote_user.lng interface/web/admin/lib/lang/ru_remote_user.lng +3 -0
- interface/web/admin/lib/lang/ru_server_config.lng interface/web/admin/lib/lang/ru_server_config.lng +12 -2
- interface/web/admin/lib/lang/ru_server_php.lng interface/web/admin/lib/lang/ru_server_php.lng +1 -0
- interface/web/admin/lib/lang/ru_system_config.lng interface/web/admin/lib/lang/ru_system_config.lng +2 -3
- interface/web/admin/lib/lang/ru_users.lng interface/web/admin/lib/lang/ru_users.lng +2 -1
- interface/web/admin/lib/lang/se_remote_user.lng interface/web/admin/lib/lang/se_remote_user.lng +3 -0
- interface/web/admin/lib/lang/se_server_config.lng interface/web/admin/lib/lang/se_server_config.lng +11 -1
- interface/web/admin/lib/lang/se_server_php.lng interface/web/admin/lib/lang/se_server_php.lng +1 -0
- interface/web/admin/lib/lang/se_users.lng interface/web/admin/lib/lang/se_users.lng +1 -0
- interface/web/admin/lib/lang/sk_remote_user.lng interface/web/admin/lib/lang/sk_remote_user.lng +3 -0
- interface/web/admin/lib/lang/sk_server_config.lng interface/web/admin/lib/lang/sk_server_config.lng +11 -1
- interface/web/admin/lib/lang/sk_server_php.lng interface/web/admin/lib/lang/sk_server_php.lng +1 -0
- interface/web/admin/lib/lang/sk_users.lng interface/web/admin/lib/lang/sk_users.lng +1 -0
- interface/web/admin/lib/lang/tr_remote_user.lng interface/web/admin/lib/lang/tr_remote_user.lng +3 -0
- interface/web/admin/lib/lang/tr_server_config.lng interface/web/admin/lib/lang/tr_server_config.lng +11 -1
- interface/web/admin/lib/lang/tr_server_php.lng interface/web/admin/lib/lang/tr_server_php.lng +1 -0
- interface/web/admin/lib/lang/tr_users.lng interface/web/admin/lib/lang/tr_users.lng +1 -0
- interface/web/admin/lib/remote.conf.php interface/web/admin/lib/remote.conf.php +1 -1
- interface/web/admin/list/directive_snippets.list.php interface/web/admin/list/directive_snippets.list.php +2 -2
- interface/web/admin/list/firewall.list.php interface/web/admin/list/firewall.list.php +1 -1
- interface/web/admin/list/iptables.list.php interface/web/admin/list/iptables.list.php +1 -1
- interface/web/admin/list/server.list.php interface/web/admin/list/server.list.php +7 -7
- interface/web/admin/list/server_ip.list.php interface/web/admin/list/server_ip.list.php +1 -1
- interface/web/admin/list/server_ip_map.list.php interface/web/admin/list/server_ip_map.list.php +1 -1
- interface/web/admin/list/server_php.list.php interface/web/admin/list/server_php.list.php +9 -0
- interface/web/admin/list/software_repo.list.php interface/web/admin/list/software_repo.list.php +1 -1
- interface/web/admin/list/users.list.php interface/web/admin/list/users.list.php +1 -1
- interface/web/admin/remote_action_ispcupdate.php interface/web/admin/remote_action_ispcupdate.php +1 -1
- interface/web/admin/remote_action_osupdate.php interface/web/admin/remote_action_osupdate.php +1 -1
- interface/web/admin/server_config_edit.php interface/web/admin/server_config_edit.php +8 -0
- interface/web/admin/server_edit.php interface/web/admin/server_edit.php +1 -1
- interface/web/admin/server_ip_map_edit.php interface/web/admin/server_ip_map_edit.php +2 -2
- interface/web/admin/software_package_list.php interface/web/admin/software_package_list.php +1 -1
- interface/web/admin/software_update_list.php interface/web/admin/software_update_list.php +1 -1
- interface/web/admin/templates/server_config_cron_edit.htm interface/web/admin/templates/server_config_cron_edit.htm +2 -2
- interface/web/admin/templates/server_config_dns_edit.htm interface/web/admin/templates/server_config_dns_edit.htm +1 -1
- interface/web/admin/templates/server_config_fastcgi_edit.htm interface/web/admin/templates/server_config_fastcgi_edit.htm +2 -2
- interface/web/admin/templates/server_config_getmail_edit.htm interface/web/admin/templates/server_config_getmail_edit.htm +2 -2
- interface/web/admin/templates/server_config_jailkit_edit.htm interface/web/admin/templates/server_config_jailkit_edit.htm +2 -2
- interface/web/admin/templates/server_config_mail_edit.htm interface/web/admin/templates/server_config_mail_edit.htm +1 -1
- interface/web/admin/templates/server_config_rescue_edit.htm interface/web/admin/templates/server_config_rescue_edit.htm +1 -1
- interface/web/admin/templates/server_config_server_edit.htm interface/web/admin/templates/server_config_server_edit.htm +9 -1
- interface/web/admin/templates/server_config_ufw_edit.htm interface/web/admin/templates/server_config_ufw_edit.htm +2 -2
- interface/web/admin/templates/server_config_vlogger_edit.htm interface/web/admin/templates/server_config_vlogger_edit.htm +2 -2
- interface/web/admin/templates/server_config_web_edit.htm interface/web/admin/templates/server_config_web_edit.htm +16 -2
- interface/web/admin/templates/server_config_xmpp_edit.htm interface/web/admin/templates/server_config_xmpp_edit.htm +7 -2
- interface/web/admin/templates/server_php_list.htm interface/web/admin/templates/server_php_list.htm +4 -1
- interface/web/admin/templates/server_php_name_edit.htm interface/web/admin/templates/server_php_name_edit.htm +4 -2
- interface/web/admin/templates/system_config_misc_edit.htm interface/web/admin/templates/system_config_misc_edit.htm +9 -0
- interface/web/admin/users_edit.php interface/web/admin/users_edit.php +9 -1
- interface/web/client/client_del.php interface/web/client/client_del.php +3 -3
- interface/web/client/client_edit.php interface/web/client/client_edit.php +3 -1
- interface/web/client/client_message.php interface/web/client/client_message.php +4 -4
- interface/web/client/domain_del.php interface/web/client/domain_del.php +1 -1
- interface/web/client/domain_edit.php interface/web/client/domain_edit.php +5 -2
- interface/web/client/form/client.tform.php interface/web/client/form/client.tform.php +141 -3
- interface/web/client/form/client_circle.tform.php interface/web/client/form/client_circle.tform.php +10 -0
- interface/web/client/form/client_template.tform.php interface/web/client/form/client_template.tform.php +18 -0
- interface/web/client/form/message_template.tform.php interface/web/client/form/message_template.tform.php +13 -1
- interface/web/client/form/reseller.tform.php interface/web/client/form/reseller.tform.php +141 -3
- interface/web/client/lib/lang/ar_client_message_template.lng interface/web/client/lib/lang/ar_client_message_template.lng +2 -0
- interface/web/client/lib/lang/ar_clients_list.lng interface/web/client/lib/lang/ar_clients_list.lng +3 -0
- interface/web/client/lib/lang/bg_client_message_template.lng interface/web/client/lib/lang/bg_client_message_template.lng +2 -0
- interface/web/client/lib/lang/bg_clients_list.lng interface/web/client/lib/lang/bg_clients_list.lng +3 -0
- interface/web/client/lib/lang/br_client.lng interface/web/client/lib/lang/br_client.lng +1 -1
- interface/web/client/lib/lang/br_client_message_template.lng interface/web/client/lib/lang/br_client_message_template.lng +2 -0
- interface/web/client/lib/lang/br_client_template.lng interface/web/client/lib/lang/br_client_template.lng +1 -1
- interface/web/client/lib/lang/br_clients_list.lng interface/web/client/lib/lang/br_clients_list.lng +3 -0
- interface/web/client/lib/lang/ca_client_message_template.lng interface/web/client/lib/lang/ca_client_message_template.lng +2 -0
- interface/web/client/lib/lang/ca_clients_list.lng interface/web/client/lib/lang/ca_clients_list.lng +3 -0
- interface/web/client/lib/lang/cz.lng interface/web/client/lib/lang/cz.lng +2 -2
- interface/web/client/lib/lang/cz_client_message_template.lng interface/web/client/lib/lang/cz_client_message_template.lng +2 -0
- interface/web/client/lib/lang/cz_clients_list.lng interface/web/client/lib/lang/cz_clients_list.lng +3 -0
- interface/web/client/lib/lang/de_client_template_list.lng interface/web/client/lib/lang/de_client_template_list.lng +1 -0
- interface/web/client/lib/lang/de_clients_list.lng interface/web/client/lib/lang/de_clients_list.lng +3 -0
- interface/web/client/lib/lang/dk_client_message_template.lng interface/web/client/lib/lang/dk_client_message_template.lng +2 -0
- interface/web/client/lib/lang/dk_clients_list.lng interface/web/client/lib/lang/dk_clients_list.lng +3 -0
- interface/web/client/lib/lang/el_client_message_template.lng interface/web/client/lib/lang/el_client_message_template.lng +2 -0
- interface/web/client/lib/lang/el_clients_list.lng interface/web/client/lib/lang/el_clients_list.lng +3 -0
- interface/web/client/lib/lang/en.lng interface/web/client/lib/lang/en.lng +1 -2
- interface/web/client/lib/lang/en_client.lng interface/web/client/lib/lang/en_client.lng +2 -0
- interface/web/client/lib/lang/en_client_template.lng interface/web/client/lib/lang/en_client_template.lng +2 -0
- interface/web/client/lib/lang/en_client_template_list.lng interface/web/client/lib/lang/en_client_template_list.lng +1 -0
- interface/web/client/lib/lang/en_clients_list.lng interface/web/client/lib/lang/en_clients_list.lng +3 -0
- interface/web/client/lib/lang/en_reseller.lng interface/web/client/lib/lang/en_reseller.lng +2 -0
- interface/web/client/lib/lang/es_client_message_template.lng interface/web/client/lib/lang/es_client_message_template.lng +2 -0
- interface/web/client/lib/lang/es_clients_list.lng interface/web/client/lib/lang/es_clients_list.lng +3 -0
- interface/web/client/lib/lang/fi_client_message_template.lng interface/web/client/lib/lang/fi_client_message_template.lng +2 -0
- interface/web/client/lib/lang/fi_clients_list.lng interface/web/client/lib/lang/fi_clients_list.lng +3 -0
- interface/web/client/lib/lang/fr_client_message_template.lng interface/web/client/lib/lang/fr_client_message_template.lng +2 -0
- interface/web/client/lib/lang/fr_clients_list.lng interface/web/client/lib/lang/fr_clients_list.lng +3 -0
- interface/web/client/lib/lang/hr_client_message_template.lng interface/web/client/lib/lang/hr_client_message_template.lng +2 -0
- interface/web/client/lib/lang/hr_clients_list.lng interface/web/client/lib/lang/hr_clients_list.lng +3 -0
- interface/web/client/lib/lang/hu_client_message_template.lng interface/web/client/lib/lang/hu_client_message_template.lng +2 -0
- interface/web/client/lib/lang/hu_clients_list.lng interface/web/client/lib/lang/hu_clients_list.lng +3 -0
- interface/web/client/lib/lang/id_client_message_template.lng interface/web/client/lib/lang/id_client_message_template.lng +2 -0
- interface/web/client/lib/lang/id_clients_list.lng interface/web/client/lib/lang/id_clients_list.lng +3 -0
- interface/web/client/lib/lang/it_client_message_template.lng interface/web/client/lib/lang/it_client_message_template.lng +2 -0
- interface/web/client/lib/lang/it_clients_list.lng interface/web/client/lib/lang/it_clients_list.lng +3 -0
- interface/web/client/lib/lang/ja_client_message_template.lng interface/web/client/lib/lang/ja_client_message_template.lng +2 -0
- interface/web/client/lib/lang/ja_clients_list.lng interface/web/client/lib/lang/ja_clients_list.lng +3 -0
- interface/web/client/lib/lang/nl_client_message_template.lng interface/web/client/lib/lang/nl_client_message_template.lng +2 -0
- interface/web/client/lib/lang/nl_clients_list.lng interface/web/client/lib/lang/nl_clients_list.lng +3 -0
- interface/web/client/lib/lang/pl_client_message_template.lng interface/web/client/lib/lang/pl_client_message_template.lng +2 -0
- interface/web/client/lib/lang/pl_clients_list.lng interface/web/client/lib/lang/pl_clients_list.lng +3 -0
- interface/web/client/lib/lang/pt_client_message_template.lng interface/web/client/lib/lang/pt_client_message_template.lng +2 -0
- interface/web/client/lib/lang/pt_clients_list.lng interface/web/client/lib/lang/pt_clients_list.lng +3 -0
- interface/web/client/lib/lang/ro_client_message_template.lng interface/web/client/lib/lang/ro_client_message_template.lng +2 -0
- interface/web/client/lib/lang/ro_clients_list.lng interface/web/client/lib/lang/ro_clients_list.lng +3 -0
- interface/web/client/lib/lang/ru_client.lng interface/web/client/lib/lang/ru_client.lng +2 -3
- interface/web/client/lib/lang/ru_client_message_template.lng interface/web/client/lib/lang/ru_client_message_template.lng +2 -0
- interface/web/client/lib/lang/ru_clients_list.lng interface/web/client/lib/lang/ru_clients_list.lng +3 -0
- interface/web/client/lib/lang/ru_reseller.lng interface/web/client/lib/lang/ru_reseller.lng +2 -4
- interface/web/client/lib/lang/se_client_message_template.lng interface/web/client/lib/lang/se_client_message_template.lng +2 -0
- interface/web/client/lib/lang/se_clients_list.lng interface/web/client/lib/lang/se_clients_list.lng +3 -0
- interface/web/client/lib/lang/sk_client_message_template.lng interface/web/client/lib/lang/sk_client_message_template.lng +2 -0
- interface/web/client/lib/lang/sk_clients_list.lng interface/web/client/lib/lang/sk_clients_list.lng +3 -0
- interface/web/client/lib/lang/tr_client_message_template.lng interface/web/client/lib/lang/tr_client_message_template.lng +2 -0
- interface/web/client/lib/lang/tr_clients_list.lng interface/web/client/lib/lang/tr_clients_list.lng +3 -0
- interface/web/client/lib/module.conf.php interface/web/client/lib/module.conf.php +16 -0
- interface/web/client/list/client.list.php interface/web/client/list/client.list.php +9 -0
- interface/web/client/list/client_circle.list.php interface/web/client/list/client_circle.list.php +1 -1
- interface/web/client/list/client_template.list.php interface/web/client/list/client_template.list.php +16 -0
- interface/web/client/list/domain.list.php interface/web/client/list/domain.list.php +1 -1
- interface/web/client/message_template_edit.php interface/web/client/message_template_edit.php +1 -1
- interface/web/client/reseller_edit.php interface/web/client/reseller_edit.php +2 -1
- interface/web/client/templates/client_edit_limits.htm interface/web/client/templates/client_edit_limits.htm +12 -0
- interface/web/client/templates/client_template_edit_limits.htm ...face/web/client/templates/client_template_edit_limits.htm +12 -0
- interface/web/client/templates/client_template_list.htm interface/web/client/templates/client_template_list.htm +6 -3
- interface/web/client/templates/clients_list.htm interface/web/client/templates/clients_list.htm +4 -1
- interface/web/client/templates/reseller_edit_limits.htm interface/web/client/templates/reseller_edit_limits.htm +12 -0
- interface/web/client/templates/resellers_list.htm interface/web/client/templates/resellers_list.htm +1 -1
- interface/web/dashboard/ajax_get_json.php interface/web/dashboard/ajax_get_json.php +1 -0
- interface/web/dashboard/dashboard.php interface/web/dashboard/dashboard.php +8 -5
- interface/web/dashboard/dashlets/databasequota.php interface/web/dashboard/dashlets/databasequota.php +7 -11
- interface/web/dashboard/dashlets/limits.php interface/web/dashboard/dashlets/limits.php +42 -2
- interface/web/dashboard/dashlets/mailquota.php interface/web/dashboard/dashlets/mailquota.php +2 -0
- interface/web/dashboard/dashlets/modules.php interface/web/dashboard/dashlets/modules.php +1 -1
- interface/web/dashboard/dashlets/quota.php interface/web/dashboard/dashlets/quota.php +6 -0
- interface/web/dashboard/dashlets/templates/databasequota.htm interface/web/dashboard/dashlets/templates/databasequota.htm +7 -8
- interface/web/dashboard/dashlets/templates/limits.htm interface/web/dashboard/dashlets/templates/limits.htm +6 -6
- interface/web/dashboard/dashlets/templates/mailquota.htm interface/web/dashboard/dashlets/templates/mailquota.htm +4 -5
- interface/web/dashboard/dashlets/templates/quota.htm interface/web/dashboard/dashlets/templates/quota.htm +3 -4
- interface/web/dashboard/lib/lang/ar_dashlet_limits.lng interface/web/dashboard/lib/lang/ar_dashlet_limits.lng +3 -0
- interface/web/dashboard/lib/lang/bg_dashlet_limits.lng interface/web/dashboard/lib/lang/bg_dashlet_limits.lng +3 -0
- interface/web/dashboard/lib/lang/br_dashlet_limits.lng interface/web/dashboard/lib/lang/br_dashlet_limits.lng +3 -0
- interface/web/dashboard/lib/lang/ca_dashlet_limits.lng interface/web/dashboard/lib/lang/ca_dashlet_limits.lng +3 -0
- interface/web/dashboard/lib/lang/cz.lng interface/web/dashboard/lib/lang/cz.lng +1 -1
- interface/web/dashboard/lib/lang/cz_dashlet_limits.lng interface/web/dashboard/lib/lang/cz_dashlet_limits.lng +3 -0
- interface/web/dashboard/lib/lang/de_dashlet_limits.lng interface/web/dashboard/lib/lang/de_dashlet_limits.lng +3 -0
- interface/web/dashboard/lib/lang/dk_dashlet_limits.lng interface/web/dashboard/lib/lang/dk_dashlet_limits.lng +3 -0
- interface/web/dashboard/lib/lang/el_dashlet_limits.lng interface/web/dashboard/lib/lang/el_dashlet_limits.lng +3 -0
- interface/web/dashboard/lib/lang/en_dashlet_limits.lng interface/web/dashboard/lib/lang/en_dashlet_limits.lng +3 -0
- interface/web/dashboard/lib/lang/es_dashlet_limits.lng interface/web/dashboard/lib/lang/es_dashlet_limits.lng +3 -0
- interface/web/dashboard/lib/lang/fi_dashlet_limits.lng interface/web/dashboard/lib/lang/fi_dashlet_limits.lng +3 -0
- interface/web/dashboard/lib/lang/fr_dashlet_limits.lng interface/web/dashboard/lib/lang/fr_dashlet_limits.lng +3 -0
- interface/web/dashboard/lib/lang/hr_dashlet_limits.lng interface/web/dashboard/lib/lang/hr_dashlet_limits.lng +3 -0
- interface/web/dashboard/lib/lang/hu_dashlet_limits.lng interface/web/dashboard/lib/lang/hu_dashlet_limits.lng +3 -0
- interface/web/dashboard/lib/lang/id_dashlet_limits.lng interface/web/dashboard/lib/lang/id_dashlet_limits.lng +3 -0
- interface/web/dashboard/lib/lang/it_dashlet_limits.lng interface/web/dashboard/lib/lang/it_dashlet_limits.lng +3 -0
- interface/web/dashboard/lib/lang/ja_dashlet_limits.lng interface/web/dashboard/lib/lang/ja_dashlet_limits.lng +3 -0
- interface/web/dashboard/lib/lang/nl.lng interface/web/dashboard/lib/lang/nl.lng +1 -1
- interface/web/dashboard/lib/lang/nl_dashlet_limits.lng interface/web/dashboard/lib/lang/nl_dashlet_limits.lng +3 -0
- interface/web/dashboard/lib/lang/pl_dashlet_limits.lng interface/web/dashboard/lib/lang/pl_dashlet_limits.lng +3 -0
- interface/web/dashboard/lib/lang/pt_dashlet_limits.lng interface/web/dashboard/lib/lang/pt_dashlet_limits.lng +3 -0
- interface/web/dashboard/lib/lang/ro_dashlet_limits.lng interface/web/dashboard/lib/lang/ro_dashlet_limits.lng +3 -0
- interface/web/dashboard/lib/lang/ru_dashlet_limits.lng interface/web/dashboard/lib/lang/ru_dashlet_limits.lng +3 -0
- interface/web/dashboard/lib/lang/se_dashlet_limits.lng interface/web/dashboard/lib/lang/se_dashlet_limits.lng +3 -0
- interface/web/dashboard/lib/lang/sk_dashlet_limits.lng interface/web/dashboard/lib/lang/sk_dashlet_limits.lng +3 -0
- interface/web/dashboard/lib/lang/tr_dashlet_limits.lng interface/web/dashboard/lib/lang/tr_dashlet_limits.lng +3 -0
- interface/web/dns/dns_dkim_edit.php interface/web/dns/dns_dkim_edit.php +3 -3
- interface/web/dns/dns_dmarc_edit.php interface/web/dns/dns_dmarc_edit.php +7 -7
- interface/web/dns/dns_import.php interface/web/dns/dns_import.php +14 -2
- interface/web/dns/dns_slave_edit.php interface/web/dns/dns_slave_edit.php +5 -2
- interface/web/dns/dns_soa_edit.php interface/web/dns/dns_soa_edit.php +8 -5
- interface/web/dns/dns_spf_edit.php interface/web/dns/dns_spf_edit.php +4 -4
- interface/web/dns/dns_srv_edit.php interface/web/dns/dns_srv_edit.php +3 -3
- interface/web/dns/dns_wizard.php interface/web/dns/dns_wizard.php +5 -3
- interface/web/dns/form/dns_ns.tform.php interface/web/dns/form/dns_ns.tform.php +1 -1
- interface/web/dns/form/dns_soa.tform.php interface/web/dns/form/dns_soa.tform.php +12 -1
- interface/web/dns/lib/lang/ar_dns_soa.lng interface/web/dns/lib/lang/ar_dns_soa.lng +1 -1
- interface/web/dns/lib/lang/bg_dns_caa.lng interface/web/dns/lib/lang/bg_dns_caa.lng +16 -16
- interface/web/dns/lib/lang/bg_dns_soa.lng interface/web/dns/lib/lang/bg_dns_soa.lng +1 -1
- interface/web/dns/lib/lang/br.lng interface/web/dns/lib/lang/br.lng +0 -1
- interface/web/dns/lib/lang/br_dns_dkim.lng interface/web/dns/lib/lang/br_dns_dkim.lng +2 -0
- interface/web/dns/lib/lang/br_dns_dmarc.lng interface/web/dns/lib/lang/br_dns_dmarc.lng +5 -5
- interface/web/dns/lib/lang/br_dns_spf.lng interface/web/dns/lib/lang/br_dns_spf.lng +0 -1
- interface/web/dns/lib/lang/br_dns_tlsa.lng interface/web/dns/lib/lang/br_dns_tlsa.lng +2 -2
- interface/web/dns/lib/lang/ca_dns_soa.lng interface/web/dns/lib/lang/ca_dns_soa.lng +1 -1
- interface/web/dns/lib/lang/dk_dns_soa.lng interface/web/dns/lib/lang/dk_dns_soa.lng +1 -1
- interface/web/dns/lib/lang/el_dns_soa.lng interface/web/dns/lib/lang/el_dns_soa.lng +1 -1
- 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/fi_dns_soa.lng interface/web/dns/lib/lang/fi_dns_soa.lng +1 -1
- interface/web/dns/lib/lang/fr_dns_soa.lng interface/web/dns/lib/lang/fr_dns_soa.lng +1 -1
- interface/web/dns/lib/lang/hr_dns_soa.lng interface/web/dns/lib/lang/hr_dns_soa.lng +1 -1
- interface/web/dns/lib/lang/hu_dns_soa.lng interface/web/dns/lib/lang/hu_dns_soa.lng +1 -1
- interface/web/dns/lib/lang/id_dns_soa.lng interface/web/dns/lib/lang/id_dns_soa.lng +1 -1
- interface/web/dns/lib/lang/it_dns_soa.lng interface/web/dns/lib/lang/it_dns_soa.lng +1 -1
- interface/web/dns/lib/lang/ja_dns_soa.lng interface/web/dns/lib/lang/ja_dns_soa.lng +1 -1
- interface/web/dns/lib/lang/nl_dns_caa.lng interface/web/dns/lib/lang/nl_dns_caa.lng +1 -1
- interface/web/dns/lib/lang/nl_dns_soa.lng interface/web/dns/lib/lang/nl_dns_soa.lng +1 -1
- interface/web/dns/lib/lang/pl_dns_soa.lng interface/web/dns/lib/lang/pl_dns_soa.lng +1 -1
- interface/web/dns/lib/lang/pt_dns_soa.lng interface/web/dns/lib/lang/pt_dns_soa.lng +1 -1
- interface/web/dns/lib/lang/ro_dns_soa.lng interface/web/dns/lib/lang/ro_dns_soa.lng +1 -1
- interface/web/dns/lib/lang/ru.lng interface/web/dns/lib/lang/ru.lng +0 -1
- interface/web/dns/lib/lang/ru_dns_hinfo.lng interface/web/dns/lib/lang/ru_dns_hinfo.lng +1 -1
- interface/web/dns/lib/lang/se_dns_soa.lng interface/web/dns/lib/lang/se_dns_soa.lng +1 -1
- interface/web/dns/lib/lang/sk_dns_soa.lng interface/web/dns/lib/lang/sk_dns_soa.lng +1 -1
- interface/web/dns/lib/lang/tr_dns_soa.lng interface/web/dns/lib/lang/tr_dns_soa.lng +1 -1
- interface/web/dns/list/dns_a.list.php interface/web/dns/list/dns_a.list.php +1 -1
- interface/web/dns/list/dns_slave.list.php interface/web/dns/list/dns_slave.list.php +1 -1
- interface/web/dns/list/dns_soa.list.php interface/web/dns/list/dns_soa.list.php +1 -1
- interface/web/dns/list/dns_template.list.php interface/web/dns/list/dns_template.list.php +1 -1
- interface/web/dns/templates/dns_dmarc_edit.htm interface/web/dns/templates/dns_dmarc_edit.htm +1 -1
- interface/web/dns/templates/dns_soa_edit.htm interface/web/dns/templates/dns_soa_edit.htm +3 -2
- interface/web/help/faq_delete.php interface/web/help/faq_delete.php +1 -4
- interface/web/help/faq_edit.php interface/web/help/faq_edit.php +1 -4
- interface/web/help/faq_list.php interface/web/help/faq_list.php +3 -6
- interface/web/help/faq_manage_questions_list.php interface/web/help/faq_manage_questions_list.php +1 -1
- interface/web/help/faq_sections_delete.php interface/web/help/faq_sections_delete.php +1 -4
- interface/web/help/faq_sections_edit.php interface/web/help/faq_sections_edit.php +1 -4
- interface/web/help/faq_sections_list.php interface/web/help/faq_sections_list.php +1 -4
- interface/web/help/form/faq.tform.php interface/web/help/form/faq.tform.php +6 -0
- interface/web/help/form/faq_sections.tform.php interface/web/help/form/faq_sections.tform.php +6 -0
- interface/web/help/form/support_message.tform.php interface/web/help/form/support_message.tform.php +10 -0
- interface/web/help/lib/lang/br_support_message.lng interface/web/help/lib/lang/br_support_message.lng +1 -1
- interface/web/help/lib/lang/cz.lng interface/web/help/lib/lang/cz.lng +1 -1
- interface/web/help/lib/lang/it_support_message.lng interface/web/help/lib/lang/it_support_message.lng +1 -1
- interface/web/help/templates/help_faq_list.htm interface/web/help/templates/help_faq_list.htm +0 -2
- interface/web/index.php interface/web/index.php +2 -2
- interface/web/js/scrigo.js.php interface/web/js/scrigo.js.php +1 -0
- interface/web/login/index.php interface/web/login/index.php +3 -3
- interface/web/login/lib/lang/br_login_as.lng interface/web/login/lib/lang/br_login_as.lng +1 -1
- interface/web/login/lib/lang/cz.lng interface/web/login/lib/lang/cz.lng +12 -12
- interface/web/login/lib/lang/nl_login_as.lng interface/web/login/lib/lang/nl_login_as.lng +1 -1
- interface/web/login/lib/lang/ru_login_as.lng interface/web/login/lib/lang/ru_login_as.lng +3 -3
- interface/web/login/login_as.php interface/web/login/login_as.php +1 -1
- interface/web/login/logout.php interface/web/login/logout.php +1 -1
- interface/web/login/password_reset.php interface/web/login/password_reset.php +2 -2
- interface/web/mail/ajax_get_json.php interface/web/mail/ajax_get_json.php +118 -0
- interface/web/mail/backup_stats.php interface/web/mail/backup_stats.php +7 -4
- interface/web/mail/form/mail_aliasdomain.tform.php interface/web/mail/form/mail_aliasdomain.tform.php +5 -1
- interface/web/mail/form/mail_blacklist.tform.php interface/web/mail/form/mail_blacklist.tform.php +6 -0
- interface/web/mail/form/mail_forward.tform.php interface/web/mail/form/mail_forward.tform.php +3 -1
- interface/web/mail/form/mail_get.tform.php interface/web/mail/form/mail_get.tform.php +6 -0
- interface/web/mail/form/mail_mailinglist.tform.php interface/web/mail/form/mail_mailinglist.tform.php +6 -0
- interface/web/mail/form/mail_relay_recipient.tform.php interface/web/mail/form/mail_relay_recipient.tform.php +12 -0
- interface/web/mail/form/mail_spamfilter.tform.php interface/web/mail/form/mail_spamfilter.tform.php +6 -0
- interface/web/mail/form/mail_transport.tform.php interface/web/mail/form/mail_transport.tform.php +12 -2
- interface/web/mail/form/mail_user.tform.php interface/web/mail/form/mail_user.tform.php +28 -0
- interface/web/mail/form/mail_user_filter.tform.php interface/web/mail/form/mail_user_filter.tform.php +11 -1
- interface/web/mail/form/mail_whitelist.tform.php interface/web/mail/form/mail_whitelist.tform.php +12 -0
- interface/web/mail/form/spamfilter_blacklist.tform.php interface/web/mail/form/spamfilter_blacklist.tform.php +17 -0
- interface/web/mail/form/spamfilter_policy.tform.php interface/web/mail/form/spamfilter_policy.tform.php +114 -0
- interface/web/mail/form/spamfilter_users.tform.php interface/web/mail/form/spamfilter_users.tform.php +15 -1
- interface/web/mail/form/spamfilter_whitelist.tform.php interface/web/mail/form/spamfilter_whitelist.tform.php +11 -1
- interface/web/mail/form/xmpp_domain.tform.php interface/web/mail/form/xmpp_domain.tform.php +36 -4
- interface/web/mail/lib/lang/br.lng interface/web/mail/lib/lang/br.lng +0 -5
- interface/web/mail/lib/lang/br_mail_user.lng interface/web/mail/lib/lang/br_mail_user.lng +2 -2
- interface/web/mail/lib/lang/cz.lng interface/web/mail/lib/lang/cz.lng +1 -1
- interface/web/mail/lib/lang/de_mail_user_filter.lng interface/web/mail/lib/lang/de_mail_user_filter.lng +1 -0
- interface/web/mail/lib/lang/en.lng interface/web/mail/lib/lang/en.lng +1 -4
- interface/web/mail/lib/lang/en_mail_user_filter.lng interface/web/mail/lib/lang/en_mail_user_filter.lng +1 -0
- interface/web/mail/lib/lang/en_xmpp_domain.lng interface/web/mail/lib/lang/en_xmpp_domain.lng +2 -0
- interface/web/mail/lib/lang/es_mail_user.lng interface/web/mail/lib/lang/es_mail_user.lng +1 -1
- interface/web/mail/lib/lang/nl_imail_ml_membership_list.lng interface/web/mail/lib/lang/nl_imail_ml_membership_list.lng +5 -0
- interface/web/mail/lib/lang/nl_mail_mailinglist.lng interface/web/mail/lib/lang/nl_mail_mailinglist.lng +36 -0
- interface/web/mail/lib/lang/nl_mail_ml_membership.lng interface/web/mail/lib/lang/nl_mail_ml_membership.lng +9 -0
- interface/web/mail/lib/lang/nl_mail_ml_membership_list.lng interface/web/mail/lib/lang/nl_mail_ml_membership_list.lng +5 -0
- interface/web/mail/lib/lang/nl_mail_user_filter.lng interface/web/mail/lib/lang/nl_mail_user_filter.lng +1 -0
- interface/web/mail/lib/lang/ru_mail_get.lng interface/web/mail/lib/lang/ru_mail_get.lng +1 -1
- interface/web/mail/lib/lang/ru_mail_user_filter.lng interface/web/mail/lib/lang/ru_mail_user_filter.lng +1 -1
- interface/web/mail/list/backup_stats.list.php interface/web/mail/list/backup_stats.list.php +12 -1
- interface/web/mail/list/mail_alias.list.php interface/web/mail/list/mail_alias.list.php +1 -1
- interface/web/mail/list/mail_aliasdomain.list.php interface/web/mail/list/mail_aliasdomain.list.php +1 -1
- interface/web/mail/list/mail_blacklist.list.php interface/web/mail/list/mail_blacklist.list.php +1 -1
- interface/web/mail/list/mail_content_filter.list.php interface/web/mail/list/mail_content_filter.list.php +1 -1
- interface/web/mail/list/mail_domain.list.php interface/web/mail/list/mail_domain.list.php +1 -1
- interface/web/mail/list/mail_domain_catchall.list.php interface/web/mail/list/mail_domain_catchall.list.php +1 -1
- interface/web/mail/list/mail_forward.list.php interface/web/mail/list/mail_forward.list.php +1 -1
- interface/web/mail/list/mail_get.list.php interface/web/mail/list/mail_get.list.php +1 -1
- interface/web/mail/list/mail_relay_recipient.list.php interface/web/mail/list/mail_relay_recipient.list.php +1 -1
- interface/web/mail/list/mail_spamfilter.list.php interface/web/mail/list/mail_spamfilter.list.php +1 -1
- interface/web/mail/list/mail_transport.list.php interface/web/mail/list/mail_transport.list.php +1 -1
- interface/web/mail/list/mail_user.list.php interface/web/mail/list/mail_user.list.php +5 -5
- interface/web/mail/list/mail_user_stats.list.php interface/web/mail/list/mail_user_stats.list.php +1 -1
- interface/web/mail/list/mail_whitelist.list.php interface/web/mail/list/mail_whitelist.list.php +1 -1
- interface/web/mail/list/spamfilter_blacklist.list.php interface/web/mail/list/spamfilter_blacklist.list.php +1 -1
- interface/web/mail/list/spamfilter_policy.list.php interface/web/mail/list/spamfilter_policy.list.php +4 -4
- interface/web/mail/list/spamfilter_users.list.php interface/web/mail/list/spamfilter_users.list.php +1 -1
- interface/web/mail/list/spamfilter_whitelist.list.php interface/web/mail/list/spamfilter_whitelist.list.php +1 -1
- interface/web/mail/list/user_quota_stats.list.php interface/web/mail/list/user_quota_stats.list.php +0 -1
- interface/web/mail/list/xmpp_domain.list.php interface/web/mail/list/xmpp_domain.list.php +1 -1
- interface/web/mail/mail_alias_edit.php interface/web/mail/mail_alias_edit.php +2 -2
- interface/web/mail/mail_aliasdomain_edit.php interface/web/mail/mail_aliasdomain_edit.php +2 -2
- interface/web/mail/mail_domain_catchall_edit.php interface/web/mail/mail_domain_catchall_edit.php +1 -1
- interface/web/mail/mail_domain_dkim_create.php interface/web/mail/mail_domain_dkim_create.php +0 -163
- interface/web/mail/mail_domain_edit.php interface/web/mail/mail_domain_edit.php +12 -9
- interface/web/mail/mail_forward_edit.php interface/web/mail/mail_forward_edit.php +2 -2
- interface/web/mail/mail_mailinglist_edit.php interface/web/mail/mail_mailinglist_edit.php +7 -4
- interface/web/mail/mail_spamfilter_edit.php interface/web/mail/mail_spamfilter_edit.php +1 -1
- interface/web/mail/mail_transport_edit.php interface/web/mail/mail_transport_edit.php +1 -0
- interface/web/mail/mail_user_edit.php interface/web/mail/mail_user_edit.php +4 -4
- interface/web/mail/mail_user_stats.php interface/web/mail/mail_user_stats.php +4 -89
- interface/web/mail/templates/backup_stats_list.htm interface/web/mail/templates/backup_stats_list.htm +17 -6
- interface/web/mail/templates/mail_domain_edit.htm interface/web/mail/templates/mail_domain_edit.htm +24 -2
- interface/web/mail/templates/mail_user_stats_list.htm interface/web/mail/templates/mail_user_stats_list.htm +5 -5
- interface/web/mail/templates/user_quota_stats_list.htm interface/web/mail/templates/user_quota_stats_list.htm +12 -9
- interface/web/mail/templates/xmpp_domain_edit_modules.htm interface/web/mail/templates/xmpp_domain_edit_modules.htm +19 -0
- interface/web/mail/templates/xmpp_user_list.htm interface/web/mail/templates/xmpp_user_list.htm +2 -0
- interface/web/mail/user_quota_stats.php interface/web/mail/user_quota_stats.php +8 -10
- interface/web/mail/xmpp_domain_edit.php interface/web/mail/xmpp_domain_edit.php +10 -20
- interface/web/mail/xmpp_user_edit.php interface/web/mail/xmpp_user_edit.php +1 -1
- interface/web/mailuser/form/mail_user_autoresponder.tform.php ...rface/web/mailuser/form/mail_user_autoresponder.tform.php +10 -0
- interface/web/mailuser/index.php interface/web/mailuser/index.php +1 -1
- interface/web/mailuser/lib/lang/de_mail_user_filter.lng interface/web/mailuser/lib/lang/de_mail_user_filter.lng +1 -0
- interface/web/mailuser/lib/lang/en_mail_user_filter.lng interface/web/mailuser/lib/lang/en_mail_user_filter.lng +1 -0
- interface/web/mailuser/lib/lang/it_mail_user_autoresponder.lng ...face/web/mailuser/lib/lang/it_mail_user_autoresponder.lng +10 -10
- interface/web/mailuser/lib/lang/it_mail_user_cc.lng interface/web/mailuser/lib/lang/it_mail_user_cc.lng +6 -6
- interface/web/mailuser/lib/lang/it_mail_user_password.lng interface/web/mailuser/lib/lang/it_mail_user_password.lng +6 -6
- interface/web/mailuser/lib/lang/it_mail_user_spamfilter.lng interface/web/mailuser/lib/lang/it_mail_user_spamfilter.lng +3 -3
- interface/web/mailuser/lib/lang/nl_mail_user_filter.lng interface/web/mailuser/lib/lang/nl_mail_user_filter.lng +14 -13
- interface/web/mailuser/lib/lang/ru_mail_user_filter.lng interface/web/mailuser/lib/lang/ru_mail_user_filter.lng +1 -1
- interface/web/mailuser/mail_user_autoresponder_edit.php interface/web/mailuser/mail_user_autoresponder_edit.php +1 -1
- interface/web/mailuser/mail_user_cc_edit.php interface/web/mailuser/mail_user_cc_edit.php +1 -1
- interface/web/mailuser/mail_user_password_edit.php interface/web/mailuser/mail_user_password_edit.php +1 -1
- interface/web/mailuser/mail_user_spamfilter_edit.php interface/web/mailuser/mail_user_spamfilter_edit.php +2 -2
- interface/web/monitor/lib/lang/ar.lng interface/web/monitor/lib/lang/ar.lng +1 -0
- interface/web/monitor/lib/lang/bg.lng interface/web/monitor/lib/lang/bg.lng +1 -0
- interface/web/monitor/lib/lang/br.lng interface/web/monitor/lib/lang/br.lng +1 -1
- interface/web/monitor/lib/lang/ca.lng interface/web/monitor/lib/lang/ca.lng +1 -0
- interface/web/monitor/lib/lang/cz.lng interface/web/monitor/lib/lang/cz.lng +26 -21
- interface/web/monitor/lib/lang/de.lng interface/web/monitor/lib/lang/de.lng +1 -0
- interface/web/monitor/lib/lang/dk.lng interface/web/monitor/lib/lang/dk.lng +1 -0
- interface/web/monitor/lib/lang/el.lng interface/web/monitor/lib/lang/el.lng +1 -0
- interface/web/monitor/lib/lang/en.lng interface/web/monitor/lib/lang/en.lng +2 -1
- interface/web/monitor/lib/lang/es.lng interface/web/monitor/lib/lang/es.lng +1 -0
- interface/web/monitor/lib/lang/fi.lng interface/web/monitor/lib/lang/fi.lng +1 -0
- interface/web/monitor/lib/lang/fr.lng interface/web/monitor/lib/lang/fr.lng +1 -0
- interface/web/monitor/lib/lang/hr.lng interface/web/monitor/lib/lang/hr.lng +1 -0
- interface/web/monitor/lib/lang/hu.lng interface/web/monitor/lib/lang/hu.lng +1 -0
- interface/web/monitor/lib/lang/id.lng interface/web/monitor/lib/lang/id.lng +1 -0
- interface/web/monitor/lib/lang/it.lng interface/web/monitor/lib/lang/it.lng +1 -0
- interface/web/monitor/lib/lang/ja.lng interface/web/monitor/lib/lang/ja.lng +1 -0
- interface/web/monitor/lib/lang/nl.lng interface/web/monitor/lib/lang/nl.lng +5 -0
- interface/web/monitor/lib/lang/pl.lng interface/web/monitor/lib/lang/pl.lng +1 -0
- interface/web/monitor/lib/lang/pt.lng interface/web/monitor/lib/lang/pt.lng +1 -0
- interface/web/monitor/lib/lang/ro.lng interface/web/monitor/lib/lang/ro.lng +1 -0
- interface/web/monitor/lib/lang/ru.lng interface/web/monitor/lib/lang/ru.lng +1 -7
- interface/web/monitor/lib/lang/se.lng interface/web/monitor/lib/lang/se.lng +1 -0
- interface/web/monitor/lib/lang/sk.lng interface/web/monitor/lib/lang/sk.lng +1 -0
- interface/web/monitor/lib/lang/tr.lng interface/web/monitor/lib/lang/tr.lng +1 -0
- interface/web/monitor/show_sys_state.php interface/web/monitor/show_sys_state.php +7 -1
- interface/web/nav.php interface/web/nav.php +1 -1
- interface/web/remote/index.php interface/web/remote/index.php +2 -0
- interface/web/remote/json.php interface/web/remote/json.php +2 -0
- interface/web/remote/rest.php interface/web/remote/rest.php +2 -0
- interface/web/sites/ajax_get_json.php interface/web/sites/ajax_get_json.php +14 -3
- interface/web/sites/aps_install_package.php interface/web/sites/aps_install_package.php +1 -1
- interface/web/sites/aps_packagedetails_show.php interface/web/sites/aps_packagedetails_show.php +1 -1
- interface/web/sites/aps_update_packagelist.php interface/web/sites/aps_update_packagelist.php +1 -1
- interface/web/sites/backup_stats.php interface/web/sites/backup_stats.php +6 -4
- 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 +8 -8
- interface/web/sites/database_quota_stats.php interface/web/sites/database_quota_stats.php +13 -4
- interface/web/sites/database_user_edit.php interface/web/sites/database_user_edit.php +5 -3
- interface/web/sites/form/web_childdomain.tform.php interface/web/sites/form/web_childdomain.tform.php +1 -1
- interface/web/sites/form/web_vhost_domain.tform.php interface/web/sites/form/web_vhost_domain.tform.php +54 -13
- interface/web/sites/form/webdav_user.tform.php interface/web/sites/form/webdav_user.tform.php +6 -0
- interface/web/sites/ftp_sites_stats.php interface/web/sites/ftp_sites_stats.php +9 -86
- interface/web/sites/ftp_user_edit.php interface/web/sites/ftp_user_edit.php +3 -3
- interface/web/sites/lib/lang/ar_web_childdomain.lng interface/web/sites/lib/lang/ar_web_childdomain.lng +2 -0
- interface/web/sites/lib/lang/ar_web_childdomain_list.lng interface/web/sites/lib/lang/ar_web_childdomain_list.lng +1 -0
- interface/web/sites/lib/lang/ar_web_domain.lng interface/web/sites/lib/lang/ar_web_domain.lng +1 -0
- interface/web/sites/lib/lang/ar_web_vhost_domain.lng interface/web/sites/lib/lang/ar_web_vhost_domain.lng +2 -1
- interface/web/sites/lib/lang/bg_web_childdomain.lng interface/web/sites/lib/lang/bg_web_childdomain.lng +2 -0
- interface/web/sites/lib/lang/bg_web_childdomain_list.lng interface/web/sites/lib/lang/bg_web_childdomain_list.lng +1 -0
- interface/web/sites/lib/lang/bg_web_domain.lng interface/web/sites/lib/lang/bg_web_domain.lng +1 -0
- interface/web/sites/lib/lang/bg_web_vhost_domain.lng interface/web/sites/lib/lang/bg_web_vhost_domain.lng +2 -1
- interface/web/sites/lib/lang/br.lng interface/web/sites/lib/lang/br.lng +1 -4
- interface/web/sites/lib/lang/br_cron.lng interface/web/sites/lib/lang/br_cron.lng +2 -2
- interface/web/sites/lib/lang/br_database.lng interface/web/sites/lib/lang/br_database.lng +1 -1
- interface/web/sites/lib/lang/br_database_user.lng interface/web/sites/lib/lang/br_database_user.lng +1 -1
- interface/web/sites/lib/lang/br_ftp_user.lng interface/web/sites/lib/lang/br_ftp_user.lng +2 -2
- interface/web/sites/lib/lang/br_shell_user.lng interface/web/sites/lib/lang/br_shell_user.lng +2 -2
- interface/web/sites/lib/lang/br_web_aliasdomain.lng interface/web/sites/lib/lang/br_web_aliasdomain.lng +2 -2
- interface/web/sites/lib/lang/br_web_childdomain.lng interface/web/sites/lib/lang/br_web_childdomain.lng +10 -8
- interface/web/sites/lib/lang/br_web_childdomain_list.lng interface/web/sites/lib/lang/br_web_childdomain_list.lng +1 -0
- interface/web/sites/lib/lang/br_web_domain.lng interface/web/sites/lib/lang/br_web_domain.lng +3 -2
- interface/web/sites/lib/lang/br_web_subdomain.lng interface/web/sites/lib/lang/br_web_subdomain.lng +1 -1
- interface/web/sites/lib/lang/br_web_vhost_domain.lng interface/web/sites/lib/lang/br_web_vhost_domain.lng +4 -3
- interface/web/sites/lib/lang/br_web_vhost_subdomain.lng interface/web/sites/lib/lang/br_web_vhost_subdomain.lng +5 -5
- interface/web/sites/lib/lang/br_webdav_user.lng interface/web/sites/lib/lang/br_webdav_user.lng +2 -2
- interface/web/sites/lib/lang/ca_web_childdomain.lng interface/web/sites/lib/lang/ca_web_childdomain.lng +2 -0
- interface/web/sites/lib/lang/ca_web_childdomain_list.lng interface/web/sites/lib/lang/ca_web_childdomain_list.lng +1 -0
- interface/web/sites/lib/lang/ca_web_domain.lng interface/web/sites/lib/lang/ca_web_domain.lng +1 -0
- interface/web/sites/lib/lang/ca_web_vhost_domain.lng interface/web/sites/lib/lang/ca_web_vhost_domain.lng +2 -1
- interface/web/sites/lib/lang/cz.lng interface/web/sites/lib/lang/cz.lng +2 -2
- interface/web/sites/lib/lang/cz_web_childdomain.lng interface/web/sites/lib/lang/cz_web_childdomain.lng +2 -0
- interface/web/sites/lib/lang/cz_web_childdomain_list.lng interface/web/sites/lib/lang/cz_web_childdomain_list.lng +1 -0
- interface/web/sites/lib/lang/cz_web_domain.lng interface/web/sites/lib/lang/cz_web_domain.lng +1 -0
- interface/web/sites/lib/lang/cz_web_vhost_domain.lng interface/web/sites/lib/lang/cz_web_vhost_domain.lng +2 -1
- interface/web/sites/lib/lang/de_web_childdomain.lng interface/web/sites/lib/lang/de_web_childdomain.lng +1 -0
- interface/web/sites/lib/lang/de_web_childdomain_list.lng interface/web/sites/lib/lang/de_web_childdomain_list.lng +1 -0
- interface/web/sites/lib/lang/de_web_domain.lng interface/web/sites/lib/lang/de_web_domain.lng +1 -0
- interface/web/sites/lib/lang/de_web_vhost_domain.lng interface/web/sites/lib/lang/de_web_vhost_domain.lng +3 -2
- interface/web/sites/lib/lang/dk_web_childdomain.lng interface/web/sites/lib/lang/dk_web_childdomain.lng +2 -0
- interface/web/sites/lib/lang/dk_web_childdomain_list.lng interface/web/sites/lib/lang/dk_web_childdomain_list.lng +1 -0
- interface/web/sites/lib/lang/dk_web_domain.lng interface/web/sites/lib/lang/dk_web_domain.lng +1 -0
- interface/web/sites/lib/lang/dk_web_vhost_domain.lng interface/web/sites/lib/lang/dk_web_vhost_domain.lng +2 -1
- interface/web/sites/lib/lang/el_web_childdomain.lng interface/web/sites/lib/lang/el_web_childdomain.lng +2 -0
- interface/web/sites/lib/lang/el_web_childdomain_list.lng interface/web/sites/lib/lang/el_web_childdomain_list.lng +1 -0
- interface/web/sites/lib/lang/el_web_domain.lng interface/web/sites/lib/lang/el_web_domain.lng +1 -0
- interface/web/sites/lib/lang/el_web_vhost_domain.lng interface/web/sites/lib/lang/el_web_vhost_domain.lng +2 -1
- interface/web/sites/lib/lang/en_user_quota_stats_list.lng interface/web/sites/lib/lang/en_user_quota_stats_list.lng +2 -1
- interface/web/sites/lib/lang/en_web_childdomain.lng interface/web/sites/lib/lang/en_web_childdomain.lng +1 -0
- interface/web/sites/lib/lang/en_web_childdomain_list.lng interface/web/sites/lib/lang/en_web_childdomain_list.lng +1 -0
- 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/en_web_sites_stats_list.lng interface/web/sites/lib/lang/en_web_sites_stats_list.lng +3 -1
- interface/web/sites/lib/lang/en_web_vhost_domain.lng interface/web/sites/lib/lang/en_web_vhost_domain.lng +3 -1
- interface/web/sites/lib/lang/es_web_childdomain.lng interface/web/sites/lib/lang/es_web_childdomain.lng +2 -0
- interface/web/sites/lib/lang/es_web_childdomain_list.lng interface/web/sites/lib/lang/es_web_childdomain_list.lng +1 -0
- interface/web/sites/lib/lang/es_web_domain.lng interface/web/sites/lib/lang/es_web_domain.lng +1 -0
- interface/web/sites/lib/lang/es_web_vhost_domain.lng interface/web/sites/lib/lang/es_web_vhost_domain.lng +2 -1
- interface/web/sites/lib/lang/fi_web_childdomain.lng interface/web/sites/lib/lang/fi_web_childdomain.lng +2 -0
- interface/web/sites/lib/lang/fi_web_childdomain_list.lng interface/web/sites/lib/lang/fi_web_childdomain_list.lng +1 -0
- interface/web/sites/lib/lang/fi_web_domain.lng interface/web/sites/lib/lang/fi_web_domain.lng +1 -0
- interface/web/sites/lib/lang/fi_web_vhost_domain.lng interface/web/sites/lib/lang/fi_web_vhost_domain.lng +2 -1
- interface/web/sites/lib/lang/fr_web_childdomain.lng interface/web/sites/lib/lang/fr_web_childdomain.lng +2 -0
- interface/web/sites/lib/lang/fr_web_childdomain_list.lng interface/web/sites/lib/lang/fr_web_childdomain_list.lng +1 -0
- interface/web/sites/lib/lang/fr_web_domain.lng interface/web/sites/lib/lang/fr_web_domain.lng +1 -0
- interface/web/sites/lib/lang/fr_web_vhost_domain.lng interface/web/sites/lib/lang/fr_web_vhost_domain.lng +2 -1
- interface/web/sites/lib/lang/hr_web_childdomain.lng interface/web/sites/lib/lang/hr_web_childdomain.lng +2 -0
- interface/web/sites/lib/lang/hr_web_childdomain_list.lng interface/web/sites/lib/lang/hr_web_childdomain_list.lng +1 -0
- interface/web/sites/lib/lang/hr_web_domain.lng interface/web/sites/lib/lang/hr_web_domain.lng +1 -0
- interface/web/sites/lib/lang/hr_web_vhost_domain.lng interface/web/sites/lib/lang/hr_web_vhost_domain.lng +2 -1
- interface/web/sites/lib/lang/hu_web_childdomain.lng interface/web/sites/lib/lang/hu_web_childdomain.lng +2 -0
- interface/web/sites/lib/lang/hu_web_childdomain_list.lng interface/web/sites/lib/lang/hu_web_childdomain_list.lng +1 -0
- interface/web/sites/lib/lang/hu_web_domain.lng interface/web/sites/lib/lang/hu_web_domain.lng +1 -0
- interface/web/sites/lib/lang/hu_web_vhost_domain.lng interface/web/sites/lib/lang/hu_web_vhost_domain.lng +2 -1
- interface/web/sites/lib/lang/id_web_childdomain.lng interface/web/sites/lib/lang/id_web_childdomain.lng +2 -0
- interface/web/sites/lib/lang/id_web_childdomain_list.lng interface/web/sites/lib/lang/id_web_childdomain_list.lng +1 -0
- interface/web/sites/lib/lang/id_web_domain.lng interface/web/sites/lib/lang/id_web_domain.lng +1 -0
- interface/web/sites/lib/lang/id_web_vhost_domain.lng interface/web/sites/lib/lang/id_web_vhost_domain.lng +2 -1
- interface/web/sites/lib/lang/it_web_childdomain.lng interface/web/sites/lib/lang/it_web_childdomain.lng +2 -0
- interface/web/sites/lib/lang/it_web_childdomain_list.lng interface/web/sites/lib/lang/it_web_childdomain_list.lng +1 -0
- interface/web/sites/lib/lang/it_web_domain.lng interface/web/sites/lib/lang/it_web_domain.lng +1 -0
- interface/web/sites/lib/lang/it_web_vhost_domain.lng interface/web/sites/lib/lang/it_web_vhost_domain.lng +2 -1
- interface/web/sites/lib/lang/ja_web_childdomain.lng interface/web/sites/lib/lang/ja_web_childdomain.lng +2 -0
- interface/web/sites/lib/lang/ja_web_childdomain_list.lng interface/web/sites/lib/lang/ja_web_childdomain_list.lng +1 -0
- interface/web/sites/lib/lang/ja_web_domain.lng interface/web/sites/lib/lang/ja_web_domain.lng +1 -0
- interface/web/sites/lib/lang/ja_web_vhost_domain.lng interface/web/sites/lib/lang/ja_web_vhost_domain.lng +2 -1
- interface/web/sites/lib/lang/nl_user_quota_stats_list.lng interface/web/sites/lib/lang/nl_user_quota_stats_list.lng +2 -1
- interface/web/sites/lib/lang/nl_web_childdomain.lng interface/web/sites/lib/lang/nl_web_childdomain.lng +2 -0
- interface/web/sites/lib/lang/nl_web_childdomain_list.lng interface/web/sites/lib/lang/nl_web_childdomain_list.lng +8 -7
- interface/web/sites/lib/lang/nl_web_domain.lng interface/web/sites/lib/lang/nl_web_domain.lng +1 -0
- interface/web/sites/lib/lang/nl_web_folder_user.lng interface/web/sites/lib/lang/nl_web_folder_user.lng +1 -0
- interface/web/sites/lib/lang/nl_web_sites_stats_list.lng interface/web/sites/lib/lang/nl_web_sites_stats_list.lng +2 -0
- interface/web/sites/lib/lang/nl_web_vhost_domain.lng interface/web/sites/lib/lang/nl_web_vhost_domain.lng +7 -5
- interface/web/sites/lib/lang/pl_web_childdomain.lng interface/web/sites/lib/lang/pl_web_childdomain.lng +2 -0
- interface/web/sites/lib/lang/pl_web_childdomain_list.lng interface/web/sites/lib/lang/pl_web_childdomain_list.lng +1 -0
- interface/web/sites/lib/lang/pl_web_domain.lng interface/web/sites/lib/lang/pl_web_domain.lng +1 -0
- interface/web/sites/lib/lang/pl_web_vhost_domain.lng interface/web/sites/lib/lang/pl_web_vhost_domain.lng +2 -1
- interface/web/sites/lib/lang/pt_web_childdomain.lng interface/web/sites/lib/lang/pt_web_childdomain.lng +2 -0
- interface/web/sites/lib/lang/pt_web_childdomain_list.lng interface/web/sites/lib/lang/pt_web_childdomain_list.lng +1 -0
- interface/web/sites/lib/lang/pt_web_domain.lng interface/web/sites/lib/lang/pt_web_domain.lng +1 -0
- interface/web/sites/lib/lang/pt_web_vhost_domain.lng interface/web/sites/lib/lang/pt_web_vhost_domain.lng +2 -1
- interface/web/sites/lib/lang/ro_web_childdomain.lng interface/web/sites/lib/lang/ro_web_childdomain.lng +2 -0
- interface/web/sites/lib/lang/ro_web_childdomain_list.lng interface/web/sites/lib/lang/ro_web_childdomain_list.lng +1 -0
- interface/web/sites/lib/lang/ro_web_domain.lng interface/web/sites/lib/lang/ro_web_domain.lng +1 -0
- interface/web/sites/lib/lang/ro_web_vhost_domain.lng interface/web/sites/lib/lang/ro_web_vhost_domain.lng +2 -1
- interface/web/sites/lib/lang/ru.lng interface/web/sites/lib/lang/ru.lng +1 -1
- interface/web/sites/lib/lang/ru_aps.lng interface/web/sites/lib/lang/ru_aps.lng +8 -8
- interface/web/sites/lib/lang/ru_database.lng interface/web/sites/lib/lang/ru_database.lng +1 -1
- interface/web/sites/lib/lang/ru_database_user.lng interface/web/sites/lib/lang/ru_database_user.lng +1 -1
- interface/web/sites/lib/lang/ru_web_childdomain.lng interface/web/sites/lib/lang/ru_web_childdomain.lng +3 -1
- interface/web/sites/lib/lang/ru_web_childdomain_list.lng interface/web/sites/lib/lang/ru_web_childdomain_list.lng +1 -0
- interface/web/sites/lib/lang/ru_web_domain.lng interface/web/sites/lib/lang/ru_web_domain.lng +1 -0
- interface/web/sites/lib/lang/ru_web_subdomain.lng interface/web/sites/lib/lang/ru_web_subdomain.lng +1 -1
- interface/web/sites/lib/lang/ru_web_vhost_domain.lng interface/web/sites/lib/lang/ru_web_vhost_domain.lng +4 -1
- interface/web/sites/lib/lang/se_web_childdomain.lng interface/web/sites/lib/lang/se_web_childdomain.lng +2 -0
- interface/web/sites/lib/lang/se_web_childdomain_list.lng interface/web/sites/lib/lang/se_web_childdomain_list.lng +1 -0
- interface/web/sites/lib/lang/se_web_domain.lng interface/web/sites/lib/lang/se_web_domain.lng +1 -0
- interface/web/sites/lib/lang/se_web_vhost_domain.lng interface/web/sites/lib/lang/se_web_vhost_domain.lng +2 -1
- interface/web/sites/lib/lang/sk_web_childdomain.lng interface/web/sites/lib/lang/sk_web_childdomain.lng +2 -0
- interface/web/sites/lib/lang/sk_web_childdomain_list.lng interface/web/sites/lib/lang/sk_web_childdomain_list.lng +1 -0
- interface/web/sites/lib/lang/sk_web_domain.lng interface/web/sites/lib/lang/sk_web_domain.lng +1 -0
- interface/web/sites/lib/lang/sk_web_vhost_domain.lng interface/web/sites/lib/lang/sk_web_vhost_domain.lng +2 -1
- interface/web/sites/lib/lang/tr_web_childdomain.lng interface/web/sites/lib/lang/tr_web_childdomain.lng +2 -0
- interface/web/sites/lib/lang/tr_web_childdomain_list.lng interface/web/sites/lib/lang/tr_web_childdomain_list.lng +1 -0
- interface/web/sites/lib/lang/tr_web_domain.lng interface/web/sites/lib/lang/tr_web_domain.lng +1 -0
- interface/web/sites/lib/lang/tr_web_vhost_domain.lng interface/web/sites/lib/lang/tr_web_vhost_domain.lng +2 -1
- interface/web/sites/list/aps_availablepackages.list.php interface/web/sites/list/aps_availablepackages.list.php +2 -2
- interface/web/sites/list/backup_stats.list.php interface/web/sites/list/backup_stats.list.php +12 -1
- interface/web/sites/list/cron.list.php interface/web/sites/list/cron.list.php +1 -1
- interface/web/sites/list/database.list.php interface/web/sites/list/database.list.php +2 -2
- interface/web/sites/list/database_quota_stats.list.php interface/web/sites/list/database_quota_stats.list.php +1 -1
- interface/web/sites/list/ftp_sites_stats.list.php interface/web/sites/list/ftp_sites_stats.list.php +1 -1
- interface/web/sites/list/ftp_user.list.php interface/web/sites/list/ftp_user.list.php +1 -1
- interface/web/sites/list/shell_user.list.php interface/web/sites/list/shell_user.list.php +1 -1
- interface/web/sites/list/user_quota_stats.list.php interface/web/sites/list/user_quota_stats.list.php +1 -1
- interface/web/sites/list/web_childdomain.list.php interface/web/sites/list/web_childdomain.list.php +1 -1
- interface/web/sites/list/web_folder.list.php interface/web/sites/list/web_folder.list.php +1 -1
- interface/web/sites/list/web_folder_user.list.php interface/web/sites/list/web_folder_user.list.php +1 -1
- interface/web/sites/list/web_sites_stats.list.php interface/web/sites/list/web_sites_stats.list.php +1 -1
- interface/web/sites/list/web_vhost_domain.list.php interface/web/sites/list/web_vhost_domain.list.php +1 -1
- interface/web/sites/list/webdav_user.list.php interface/web/sites/list/webdav_user.list.php +1 -1
- interface/web/sites/shell_user_edit.php interface/web/sites/shell_user_edit.php +4 -4
- interface/web/sites/templates/backup_stats_list.htm interface/web/sites/templates/backup_stats_list.htm +42 -29
- interface/web/sites/templates/database_quota_stats_list.htm interface/web/sites/templates/database_quota_stats_list.htm +11 -9
- interface/web/sites/templates/ftp_sites_stats_list.htm interface/web/sites/templates/ftp_sites_stats_list.htm +6 -6
- interface/web/sites/templates/user_quota_stats_list.htm interface/web/sites/templates/user_quota_stats_list.htm +12 -9
- interface/web/sites/templates/web_sites_stats_list.htm interface/web/sites/templates/web_sites_stats_list.htm +15 -9
- interface/web/sites/templates/web_vhost_domain_advanced.htm interface/web/sites/templates/web_vhost_domain_advanced.htm +8 -2
- interface/web/sites/templates/web_vhost_domain_edit.htm interface/web/sites/templates/web_vhost_domain_edit.htm +16 -4
- interface/web/sites/templates/web_vhost_domain_list.htm interface/web/sites/templates/web_vhost_domain_list.htm +1 -1
- interface/web/sites/templates/web_vhost_domain_redirect.htm interface/web/sites/templates/web_vhost_domain_redirect.htm +2 -2
- interface/web/sites/user_quota_stats.php interface/web/sites/user_quota_stats.php +9 -39
- interface/web/sites/web_childdomain_edit.php interface/web/sites/web_childdomain_edit.php +5 -5
- interface/web/sites/web_childdomain_list.php interface/web/sites/web_childdomain_list.php +1 -1
- interface/web/sites/web_sites_stats.php interface/web/sites/web_sites_stats.php +11 -86
- interface/web/sites/web_vhost_domain_edit.php interface/web/sites/web_vhost_domain_edit.php +72 -61
- interface/web/sites/web_vhost_domain_list.php interface/web/sites/web_vhost_domain_list.php +1 -1
- interface/web/sites/webdav_user_edit.php interface/web/sites/webdav_user_edit.php +4 -4
- interface/web/themes/default/assets/javascripts/ispconfig.js interface/web/themes/default/assets/javascripts/ispconfig.js +8 -6
- interface/web/themes/default/assets/stylesheets/ispconfig.css ...rface/web/themes/default/assets/stylesheets/ispconfig.css +35 -2
- interface/web/themes/default/assets/stylesheets/ispconfig.sass ...face/web/themes/default/assets/stylesheets/ispconfig.sass +4 -1
- interface/web/themes/default/templates/main.tpl.htm interface/web/themes/default/templates/main.tpl.htm +3 -3
- interface/web/tools/dns_import_tupa.php interface/web/tools/dns_import_tupa.php +16 -34
- interface/web/tools/import_ispconfig.php interface/web/tools/import_ispconfig.php +11 -10
- interface/web/tools/import_vpopmail.php interface/web/tools/import_vpopmail.php +17 -19
- interface/web/tools/index.php interface/web/tools/index.php +1 -1
- interface/web/tools/lib/lang/ar_resync.lng interface/web/tools/lib/lang/ar_resync.lng +4 -0
- interface/web/tools/lib/lang/bg_resync.lng interface/web/tools/lib/lang/bg_resync.lng +4 -0
- interface/web/tools/lib/lang/br_resync.lng interface/web/tools/lib/lang/br_resync.lng +4 -0
- interface/web/tools/lib/lang/ca_resync.lng interface/web/tools/lib/lang/ca_resync.lng +4 -0
- interface/web/tools/lib/lang/cz.lng interface/web/tools/lib/lang/cz.lng +2 -2
- interface/web/tools/lib/lang/cz_resync.lng interface/web/tools/lib/lang/cz_resync.lng +4 -0
- interface/web/tools/lib/lang/de_resync.lng interface/web/tools/lib/lang/de_resync.lng +4 -0
- interface/web/tools/lib/lang/dk_resync.lng interface/web/tools/lib/lang/dk_resync.lng +4 -0
- interface/web/tools/lib/lang/el_resync.lng interface/web/tools/lib/lang/el_resync.lng +4 -0
- interface/web/tools/lib/lang/en_resync.lng interface/web/tools/lib/lang/en_resync.lng +4 -0
- interface/web/tools/lib/lang/es_resync.lng interface/web/tools/lib/lang/es_resync.lng +4 -0
- interface/web/tools/lib/lang/fi_resync.lng interface/web/tools/lib/lang/fi_resync.lng +4 -0
- interface/web/tools/lib/lang/fr_resync.lng interface/web/tools/lib/lang/fr_resync.lng +4 -0
- interface/web/tools/lib/lang/hr_resync.lng interface/web/tools/lib/lang/hr_resync.lng +4 -0
- interface/web/tools/lib/lang/hu_resync.lng interface/web/tools/lib/lang/hu_resync.lng +4 -0
- interface/web/tools/lib/lang/id_resync.lng interface/web/tools/lib/lang/id_resync.lng +4 -0
- interface/web/tools/lib/lang/it_resync.lng interface/web/tools/lib/lang/it_resync.lng +4 -0
- interface/web/tools/lib/lang/ja_resync.lng interface/web/tools/lib/lang/ja_resync.lng +4 -0
- interface/web/tools/lib/lang/nl_index.lng interface/web/tools/lib/lang/nl_index.lng +1 -1
- interface/web/tools/lib/lang/nl_resync.lng interface/web/tools/lib/lang/nl_resync.lng +4 -0
- interface/web/tools/lib/lang/pl_resync.lng interface/web/tools/lib/lang/pl_resync.lng +4 -0
- interface/web/tools/lib/lang/pt_resync.lng interface/web/tools/lib/lang/pt_resync.lng +4 -0
- interface/web/tools/lib/lang/ro_resync.lng interface/web/tools/lib/lang/ro_resync.lng +4 -0
- interface/web/tools/lib/lang/ru_resync.lng interface/web/tools/lib/lang/ru_resync.lng +4 -0
- interface/web/tools/lib/lang/se_resync.lng interface/web/tools/lib/lang/se_resync.lng +4 -0
- interface/web/tools/lib/lang/sk_resync.lng interface/web/tools/lib/lang/sk_resync.lng +4 -0
- interface/web/tools/lib/lang/tr_resync.lng interface/web/tools/lib/lang/tr_resync.lng +4 -0
- interface/web/tools/resync.php interface/web/tools/resync.php +45 -4
- interface/web/tools/templates/dns_import_tupa.htm interface/web/tools/templates/dns_import_tupa.htm +11 -6
- interface/web/tools/templates/import_vpopmail.htm interface/web/tools/templates/import_vpopmail.htm +11 -6
- interface/web/tools/templates/resync.htm interface/web/tools/templates/resync.htm +14 -1
- interface/web/tools/tpl_default.php interface/web/tools/tpl_default.php +1 -1
- interface/web/tools/user_settings.php interface/web/tools/user_settings.php +4 -6
- interface/web/vm/form/openvz_ostemplate.tform.php interface/web/vm/form/openvz_ostemplate.tform.php +16 -0
- interface/web/vm/form/openvz_template.tform.php interface/web/vm/form/openvz_template.tform.php +22 -0
- interface/web/vm/form/openvz_vm.tform.php interface/web/vm/form/openvz_vm.tform.php +9 -1
- interface/web/vm/lib/lang/cz.lng interface/web/vm/lib/lang/cz.lng +1 -1
- interface/web/vm/list/openvz_ip.list.php interface/web/vm/list/openvz_ip.list.php +1 -1
- interface/web/vm/list/openvz_ostemplate.list.php interface/web/vm/list/openvz_ostemplate.list.php +2 -2
- interface/web/vm/list/openvz_template.list.php interface/web/vm/list/openvz_template.list.php +1 -1
- interface/web/vm/list/openvz_vm.list.php interface/web/vm/list/openvz_vm.list.php +1 -1
- interface/web/vm/openvz_action.php interface/web/vm/openvz_action.php +1 -1
- interface/web/vm/openvz_vm_edit.php interface/web/vm/openvz_vm_edit.php +12 -10
- interface/web/wizard/lib/lang/nl_new_service.lng interface/web/wizard/lib/lang/nl_new_service.lng +48 -0
- interface/web/wizard/lib/lang/nl_template.lng interface/web/wizard/lib/lang/nl_template.lng +82 -0
- interface/web/wizard/lib/lang/nl_wizard_template_list.lng interface/web/wizard/lib/lang/nl_wizard_template_list.lng +2 -0
- remoting_client/cli/README.md remoting_client/cli/README.md +48 -0
- remoting_client/cli/ispconfig-cli remoting_client/cli/ispconfig-cli +495 -0
- remoting_client/cli/ispconfig-cli.conf.example remoting_client/cli/ispconfig-cli.conf.example +6 -0
- remoting_client/examples/client_change_password.php remoting_client/examples/client_change_password.php +13 -3
- remoting_client/examples/mail_user_add.php remoting_client/examples/mail_user_add.php +4 -4
- remoting_client/examples/rest_example.php remoting_client/examples/rest_example.php +2 -0
- remoting_client/examples/rest_example.sh remoting_client/examples/rest_example.sh +38 -0
- remoting_client/examples/soap-database-add.php remoting_client/examples/soap-database-add.php +0 -47
- remoting_client/readme remoting_client/readme +3 -3
- security/apache_directives.blacklist security/apache_directives.blacklist +1 -1
- security/ids.whitelist security/ids.whitelist +13 -1
- security/nginx_directives.blacklist security/nginx_directives.blacklist +1 -0
- security/security_settings.ini security/security_settings.ini +13 -4
- server/conf/apache_apps.vhost.master server/conf/apache_apps.vhost.master +15 -0
- server/conf/apache_ispconfig.conf.master server/conf/apache_ispconfig.conf.master +5 -1
- server/conf/metronome_conf_main.master server/conf/metronome_conf_main.master +0 -3
- server/conf/nginx_vhost.conf.master server/conf/nginx_vhost.conf.master +44 -3
- server/conf/php_fpm_pool.conf.master server/conf/php_fpm_pool.conf.master +18 -0
- server/conf/sieve_filter.master server/conf/sieve_filter.master +1 -1
- server/conf/sieve_filter_1.2.master server/conf/sieve_filter_1.2.master +8 -8
- server/conf/vhost.conf.master server/conf/vhost.conf.master +40 -14
- server/conf/xmpp_conf_ssl.master server/conf/xmpp_conf_ssl.master +0 -0
- server/conf/xmpp_metronome_conf_global.master server/conf/xmpp_metronome_conf_global.master +0 -0
- server/conf/xmpp_metronome_conf_host.master server/conf/xmpp_metronome_conf_host.master +0 -0
- server/conf/xmpp_metronome_conf_status.master server/conf/xmpp_metronome_conf_status.master +0 -0
- server/conf/xmpp_prosody_conf_global.master server/conf/xmpp_prosody_conf_global.master +60 -0
- server/conf/xmpp_prosody_conf_host.master server/conf/xmpp_prosody_conf_host.master +166 -0
- server/conf/xmpp_prosody_conf_status.master server/conf/xmpp_prosody_conf_status.master +20 -0
- server/cron.php server/cron.php +1 -1
- server/cron.sh server/cron.sh +2 -1
- server/lib/app.inc.php server/lib/app.inc.php +12 -4
- server/lib/classes/cron.d/100-monitor_database_size.inc.php server/lib/classes/cron.d/100-monitor_database_size.inc.php +2 -2
- server/lib/classes/cron.d/100-monitor_disk_usage.inc.php server/lib/classes/cron.d/100-monitor_disk_usage.inc.php +1 -1
- server/lib/classes/cron.d/100-monitor_kernel_version.inc.php server/lib/classes/cron.d/100-monitor_kernel_version.inc.php +107 -0
- server/lib/classes/cron.d/100-monitor_openvz.inc.php server/lib/classes/cron.d/100-monitor_openvz.inc.php +2 -2
- server/lib/classes/cron.d/100-monitor_raid.inc.php server/lib/classes/cron.d/100-monitor_raid.inc.php +70 -1
- server/lib/classes/cron.d/100-monitor_rkhunter.inc.php server/lib/classes/cron.d/100-monitor_rkhunter.inc.php +7 -1
- server/lib/classes/cron.d/200-ftplogfiles.inc.php server/lib/classes/cron.d/200-ftplogfiles.inc.php +18 -16
- server/lib/classes/cron.d/200-logfiles.inc.php server/lib/classes/cron.d/200-logfiles.inc.php +56 -39
- server/lib/classes/cron.d/300-quota_notify.inc.php server/lib/classes/cron.d/300-quota_notify.inc.php +7 -3
- server/lib/classes/cron.d/500-backup.inc.php server/lib/classes/cron.d/500-backup.inc.php +19 -5
- server/lib/classes/cron.d/500-backup_mail.inc.php server/lib/classes/cron.d/500-backup_mail.inc.php +20 -6
- server/lib/classes/cron.inc.php server/lib/classes/cron.inc.php +4 -3
- server/lib/classes/db_mysql.inc.php server/lib/classes/db_mysql.inc.php +193 -54
- server/lib/classes/letsencrypt.inc.php server/lib/classes/letsencrypt.inc.php +10 -1
- server/lib/classes/monitor_tools.inc.php server/lib/classes/monitor_tools.inc.php +6 -1
- server/mods-available/web_module.inc.php server/mods-available/web_module.inc.php +43 -50
- server/mods-available/xmpp_module.inc.php server/mods-available/xmpp_module.inc.php +5 -3
- server/plugins-available/apache2_plugin.inc.php server/plugins-available/apache2_plugin.inc.php +86 -26
- server/plugins-available/apps_vhost_plugin.inc.php server/plugins-available/apps_vhost_plugin.inc.php +11 -1
- server/plugins-available/backup_plugin.inc.php server/plugins-available/backup_plugin.inc.php +3 -3
- server/plugins-available/cron_plugin.inc.php server/plugins-available/cron_plugin.inc.php +1 -1
- server/plugins-available/getmail_plugin.inc.php server/plugins-available/getmail_plugin.inc.php +1 -1
- server/plugins-available/mailman_plugin.inc.php server/plugins-available/mailman_plugin.inc.php +3 -0
- server/plugins-available/mysql_clientdb_plugin.inc.php server/plugins-available/mysql_clientdb_plugin.inc.php +2 -2
- server/plugins-available/nginx_plugin.inc.php server/plugins-available/nginx_plugin.inc.php +119 -26
- server/plugins-available/php_fpm_jailkit_plugin.inc.php server/plugins-available/php_fpm_jailkit_plugin.inc.php +310 -0
- server/plugins-available/shelluser_base_plugin.inc.php server/plugins-available/shelluser_base_plugin.inc.php +17 -3
- server/plugins-available/shelluser_jailkit_plugin.inc.php server/plugins-available/shelluser_jailkit_plugin.inc.php +14 -3
- server/plugins-available/website_symlink_plugin.inc.php server/plugins-available/website_symlink_plugin.inc.php +80 -0
- server/plugins-available/xmpp_plugin.inc.php server/plugins-available/xmpp_plugin.inc.php +110 -43
- server/scripts/create_jailkit_chroot.sh server/scripts/create_jailkit_chroot.sh +5 -0
- server/scripts/vlogger server/scripts/vlogger +78 -28
- server/server.php server/server.php +3 -3
- No files found.
.gitlab-ci.yml
0 → 100644
.phplint.yml
0 → 100644
File moved
File moved
File moved
File moved