From 992797f73c92b413a7fecff02c27c61b7db55b43 Mon Sep 17 00:00:00 2001 From: Marius Cramer Date: Mon, 14 Oct 2013 15:54:49 +0200 Subject: [PATCH] Copied files from svn 3.0.5 stable branch (git migration) --- install/autoupdate.php | 2 +- install/dist/lib/fedora.lib.php | 2 + install/dist/lib/gentoo.lib.php | 1 + install/dist/lib/opensuse.lib.php | 2 + install/install.php | 37 +- install/lib/installer_base.lib.php | 8 +- install/lib/update.lib.php | 48 +- install/patches/upd_0001.php | 21 + install/sql/incremental/upd_0049.sql | 3 +- install/sql/incremental/upd_0052.sql | 6 +- install/sql/incremental/upd_0055.sql | 4 +- install/sql/incremental/upd_0057.sql | 7 + install/sql/incremental/upd_0058.sql | 3 + install/sql/ispconfig3.sql | 238 +- install/tpl/amavisd_user_config.master | 6 - install/tpl/config.inc.php.master | 2 + install/tpl/opensuse_amavisd_conf.master | 6 - install/tpl/server.ini.master | 32 +- install/tpl/system.ini.master | 1 - install/update.php | 14 +- interface/cache/empty.dir | 1 + interface/lib/classes/aps_base.inc.php | 204 +- interface/lib/classes/aps_crawler.inc.php | 1182 +++++----- .../lib/classes/aps_guicontroller.inc.php | 11 +- .../lib/classes/custom_datasource.inc.php | 3 + interface/lib/classes/idn/empty.dir | 1 + interface/lib/classes/listform.inc.php | 7 +- .../lib/classes/plugin_backuplist.inc.php | 7 +- interface/lib/classes/remoting_lib.inc.php | 2 +- interface/lib/classes/simplepie.inc.php | 4 +- interface/lib/classes/tform.inc.php | 1974 ++++++++--------- interface/lib/classes/tform_actions.inc.php | 11 +- interface/lib/classes/tools_monitor.inc.php | 34 - interface/lib/classes/validate_dkim.inc.php | 79 - interface/lib/lang/cz.lng | 9 +- interface/lib/lang/de.lng | 1 + interface/lib/lang/el.lng | 126 +- interface/lib/lang/en.lng | 3 + interface/lib/shelluser_blacklist | 3 +- interface/ssl/empty.dir | 1 + interface/tools/empty.dir | 1 + .../web/admin/form/server_config.tform.php | 122 +- .../web/admin/form/system_config.tform.php | 36 +- interface/web/admin/language_edit.php | 2 +- interface/web/admin/language_import.php | 94 +- .../web/admin/lib/lang/ar_language_import.lng | 1 + .../web/admin/lib/lang/ar_remote_action.lng | 2 +- .../admin/lib/lang/ar_software_package.lng | 8 +- .../web/admin/lib/lang/ar_system_config.lng | 7 + .../web/admin/lib/lang/bg_language_import.lng | 1 + .../web/admin/lib/lang/bg_remote_action.lng | 2 +- .../admin/lib/lang/bg_software_package.lng | 8 +- .../web/admin/lib/lang/bg_system_config.lng | 7 + .../web/admin/lib/lang/br_language_import.lng | 1 + .../web/admin/lib/lang/br_remote_action.lng | 2 +- .../admin/lib/lang/br_software_package.lng | 8 +- .../web/admin/lib/lang/br_system_config.lng | 7 + interface/web/admin/lib/lang/cz.lng | 1 + .../admin/lib/lang/cz_directive_snippets.lng | 1 + .../lib/lang/cz_directive_snippets_list.lng | 1 + interface/web/admin/lib/lang/cz_firewall.lng | 1 + .../web/admin/lib/lang/cz_firewall_list.lng | 1 + interface/web/admin/lib/lang/cz_groups.lng | 1 + .../web/admin/lib/lang/cz_groups_list.lng | 1 + interface/web/admin/lib/lang/cz_iptables.lng | 1 + .../web/admin/lib/lang/cz_iptables_list.lng | 1 + .../web/admin/lib/lang/cz_language_add.lng | 1 + .../admin/lib/lang/cz_language_complete.lng | 1 + .../web/admin/lib/lang/cz_language_edit.lng | 1 + .../web/admin/lib/lang/cz_language_export.lng | 1 + .../web/admin/lib/lang/cz_language_import.lng | 1 + .../web/admin/lib/lang/cz_language_list.lng | 1 + interface/web/admin/lib/lang/cz_login_as.lng | 1 + .../web/admin/lib/lang/cz_package_install.lng | 1 + .../web/admin/lib/lang/cz_remote_action.lng | 1 + .../web/admin/lib/lang/cz_remote_user.lng | 1 + .../admin/lib/lang/cz_remote_user_list.lng | 1 + interface/web/admin/lib/lang/cz_server.lng | 1 + .../web/admin/lib/lang/cz_server_config.lng | 9 +- .../admin/lib/lang/cz_server_config_list.lng | 1 + interface/web/admin/lib/lang/cz_server_ip.lng | 1 + .../web/admin/lib/lang/cz_server_ip_list.lng | 1 + .../web/admin/lib/lang/cz_server_list.lng | 1 + .../web/admin/lib/lang/cz_server_php.lng | 1 + .../web/admin/lib/lang/cz_server_php_list.lng | 1 + .../admin/lib/lang/cz_software_package.lng | 9 +- .../lib/lang/cz_software_package_install.lng | 1 + .../lib/lang/cz_software_package_list.lng | 5 +- .../web/admin/lib/lang/cz_software_repo.lng | 1 + .../admin/lib/lang/cz_software_repo_list.lng | 1 + .../lib/lang/cz_software_update_list.lng | 1 + .../web/admin/lib/lang/cz_system_config.lng | 1 + .../admin/lib/lang/cz_tpl_default_admin.lng | 1 + interface/web/admin/lib/lang/cz_users.lng | 1 + .../web/admin/lib/lang/cz_users_list.lng | 1 + interface/web/admin/lib/lang/de.lng | 1 + .../admin/lib/lang/de_directive_snippets.lng | 3 +- .../lib/lang/de_directive_snippets_list.lng | 1 + interface/web/admin/lib/lang/de_firewall.lng | 1 + .../web/admin/lib/lang/de_firewall_list.lng | 1 + interface/web/admin/lib/lang/de_groups.lng | 1 + .../web/admin/lib/lang/de_groups_list.lng | 1 + interface/web/admin/lib/lang/de_iptables.lng | 3 +- .../web/admin/lib/lang/de_iptables_list.lng | 1 + .../web/admin/lib/lang/de_language_add.lng | 3 +- .../admin/lib/lang/de_language_complete.lng | 3 +- .../web/admin/lib/lang/de_language_edit.lng | 3 +- .../web/admin/lib/lang/de_language_export.lng | 3 +- .../web/admin/lib/lang/de_language_import.lng | 3 +- .../web/admin/lib/lang/de_language_list.lng | 1 + interface/web/admin/lib/lang/de_login_as.lng | 1 + .../web/admin/lib/lang/de_package_install.lng | 1 + .../web/admin/lib/lang/de_remote_action.lng | 1 + .../web/admin/lib/lang/de_remote_user.lng | 29 +- .../admin/lib/lang/de_remote_user_list.lng | 1 + interface/web/admin/lib/lang/de_server.lng | 1 + .../web/admin/lib/lang/de_server_config.lng | 30 +- .../admin/lib/lang/de_server_config_list.lng | 1 + interface/web/admin/lib/lang/de_server_ip.lng | 7 +- .../web/admin/lib/lang/de_server_ip_list.lng | 1 + .../web/admin/lib/lang/de_server_list.lng | 1 + .../web/admin/lib/lang/de_server_php.lng | 1 + .../web/admin/lib/lang/de_server_php_list.lng | 1 + .../admin/lib/lang/de_software_package.lng | 9 +- .../lib/lang/de_software_package_install.lng | 3 +- .../lib/lang/de_software_package_list.lng | 9 +- .../web/admin/lib/lang/de_software_repo.lng | 5 +- .../admin/lib/lang/de_software_repo_list.lng | 5 +- .../lib/lang/de_software_update_list.lng | 1 + .../web/admin/lib/lang/de_system_config.lng | 12 +- .../admin/lib/lang/de_tpl_default_admin.lng | 1 + interface/web/admin/lib/lang/de_users.lng | 1 + .../web/admin/lib/lang/de_users_list.lng | 1 + interface/web/admin/lib/lang/el.lng | 12 +- .../admin/lib/lang/el_directive_snippets.lng | 10 +- .../lib/lang/el_directive_snippets_list.lng | 8 +- interface/web/admin/lib/lang/el_firewall.lng | 2 +- .../web/admin/lib/lang/el_language_import.lng | 1 + interface/web/admin/lib/lang/el_login_as.lng | 18 +- .../web/admin/lib/lang/el_remote_action.lng | 4 +- .../web/admin/lib/lang/el_remote_user.lng | 10 +- .../web/admin/lib/lang/el_server_config.lng | 72 +- interface/web/admin/lib/lang/el_server_ip.lng | 2 +- .../web/admin/lib/lang/el_server_php.lng | 22 +- .../web/admin/lib/lang/el_server_php_list.lng | 8 +- .../admin/lib/lang/el_software_package.lng | 10 +- .../lib/lang/el_software_package_list.lng | 4 +- .../lib/lang/el_software_update_list.lng | 2 +- .../web/admin/lib/lang/el_system_config.lng | 63 +- .../admin/lib/lang/el_tpl_default_admin.lng | 26 +- interface/web/admin/lib/lang/el_users.lng | 12 +- .../web/admin/lib/lang/el_users_list.lng | 2 +- .../web/admin/lib/lang/en_language_import.lng | 1 + .../web/admin/lib/lang/en_server_config.lng | 9 +- .../web/admin/lib/lang/en_system_config.lng | 3 - .../web/admin/lib/lang/es_language_import.lng | 1 + .../admin/lib/lang/es_software_package.lng | 8 +- .../web/admin/lib/lang/es_system_config.lng | 7 + .../web/admin/lib/lang/fi_language_import.lng | 1 + .../web/admin/lib/lang/fi_remote_action.lng | 2 +- .../admin/lib/lang/fi_software_package.lng | 8 +- .../web/admin/lib/lang/fi_system_config.lng | 7 + .../web/admin/lib/lang/fr_language_import.lng | 1 + .../web/admin/lib/lang/fr_remote_action.lng | 2 +- .../admin/lib/lang/fr_software_package.lng | 8 +- .../web/admin/lib/lang/fr_system_config.lng | 7 + .../web/admin/lib/lang/hr_language_import.lng | 1 + .../admin/lib/lang/hr_software_package.lng | 8 +- .../web/admin/lib/lang/hr_system_config.lng | 7 + .../web/admin/lib/lang/hu_language_import.lng | 1 + .../web/admin/lib/lang/hu_remote_action.lng | 2 +- .../admin/lib/lang/hu_software_package.lng | 8 +- .../web/admin/lib/lang/hu_system_config.lng | 7 + .../web/admin/lib/lang/id_language_import.lng | 1 + .../web/admin/lib/lang/id_remote_action.lng | 2 +- .../admin/lib/lang/id_software_package.lng | 8 +- .../web/admin/lib/lang/id_system_config.lng | 7 + .../web/admin/lib/lang/it_language_import.lng | 1 + .../web/admin/lib/lang/it_remote_action.lng | 2 +- .../admin/lib/lang/it_software_package.lng | 8 +- .../web/admin/lib/lang/it_system_config.lng | 7 + .../web/admin/lib/lang/ja_language_import.lng | 1 + .../web/admin/lib/lang/ja_remote_action.lng | 2 +- .../admin/lib/lang/ja_software_package.lng | 8 +- .../web/admin/lib/lang/ja_system_config.lng | 7 + .../web/admin/lib/lang/nl_language_import.lng | 1 + .../web/admin/lib/lang/nl_remote_action.lng | 2 +- .../admin/lib/lang/nl_software_package.lng | 8 +- .../web/admin/lib/lang/nl_system_config.lng | 10 +- .../web/admin/lib/lang/pl_language_import.lng | 1 + .../web/admin/lib/lang/pl_remote_action.lng | 2 +- .../admin/lib/lang/pl_software_package.lng | 8 +- .../web/admin/lib/lang/pl_system_config.lng | 7 + .../web/admin/lib/lang/pt_language_import.lng | 1 + .../web/admin/lib/lang/pt_remote_action.lng | 2 +- .../admin/lib/lang/pt_software_package.lng | 8 +- .../web/admin/lib/lang/pt_system_config.lng | 7 + .../web/admin/lib/lang/ro_language_import.lng | 1 + .../web/admin/lib/lang/ro_remote_action.lng | 2 +- .../admin/lib/lang/ro_software_package.lng | 8 +- .../web/admin/lib/lang/ro_system_config.lng | 7 + .../web/admin/lib/lang/ru_language_import.lng | 1 + .../web/admin/lib/lang/ru_remote_action.lng | 2 +- .../admin/lib/lang/ru_software_package.lng | 8 +- .../web/admin/lib/lang/ru_system_config.lng | 7 + .../web/admin/lib/lang/se_language_import.lng | 1 + .../web/admin/lib/lang/se_remote_action.lng | 2 +- .../admin/lib/lang/se_software_package.lng | 8 +- .../web/admin/lib/lang/se_system_config.lng | 7 + .../web/admin/lib/lang/sk_language_import.lng | 1 + .../web/admin/lib/lang/sk_remote_action.lng | 2 +- .../admin/lib/lang/sk_software_package.lng | 8 +- .../web/admin/lib/lang/sk_system_config.lng | 7 + .../web/admin/lib/lang/tr_language_import.lng | 1 + .../web/admin/lib/lang/tr_remote_action.lng | 2 +- .../admin/lib/lang/tr_software_package.lng | 8 +- .../web/admin/lib/lang/tr_system_config.lng | 7 + .../web/admin/lib/menu.d/tpl_default.menu.php | 30 +- .../web/admin/templates/iptables_edit.htm | 132 +- .../web/admin/templates/iptables_list.htm | 146 +- .../web/admin/templates/language_import.htm | 2 +- .../templates/server_config_mail_edit.htm | 6 +- .../templates/server_config_rescue_edit.htm | 16 +- .../templates/server_config_server_edit.htm | 29 +- .../templates/server_config_web_edit.htm | 36 +- .../system_config_branding_edit.html | 42 +- .../templates/system_config_mail_edit.htm | 20 +- .../templates/system_config_sites_edit.htm | 10 +- interface/web/client/client_message.php | 21 +- interface/web/client/lib/lang/ar_client.lng | 5 + interface/web/client/lib/lang/ar_reseller.lng | 5 + interface/web/client/lib/lang/bg_client.lng | 5 + interface/web/client/lib/lang/bg_reseller.lng | 5 + interface/web/client/lib/lang/br_client.lng | 5 + interface/web/client/lib/lang/br_reseller.lng | 5 + interface/web/client/lib/lang/cz.lng | 1 + interface/web/client/lib/lang/cz_client.lng | 41 +- .../web/client/lib/lang/cz_client_circle.lng | 1 + .../client/lib/lang/cz_client_circle_list.lng | 1 + .../web/client/lib/lang/cz_client_del.lng | 3 +- .../web/client/lib/lang/cz_client_message.lng | 1 + .../client/lib/lang/cz_client_template.lng | 43 +- .../lib/lang/cz_client_template_list.lng | 3 +- .../web/client/lib/lang/cz_clients_list.lng | 1 + interface/web/client/lib/lang/cz_domain.lng | 7 +- .../web/client/lib/lang/cz_domain_list.lng | 1 + interface/web/client/lib/lang/cz_reseller.lng | 43 +- .../web/client/lib/lang/cz_resellers_list.lng | 1 + interface/web/client/lib/lang/de.lng | 3 +- interface/web/client/lib/lang/de_client.lng | 86 +- .../web/client/lib/lang/de_client_circle.lng | 1 + .../client/lib/lang/de_client_circle_list.lng | 1 + .../web/client/lib/lang/de_client_del.lng | 1 + .../web/client/lib/lang/de_client_message.lng | 1 + .../client/lib/lang/de_client_template.lng | 1 + .../lib/lang/de_client_template_list.lng | 1 + .../web/client/lib/lang/de_clients_list.lng | 1 + interface/web/client/lib/lang/de_domain.lng | 1 + .../web/client/lib/lang/de_domain_list.lng | 1 + interface/web/client/lib/lang/de_reseller.lng | 6 +- .../web/client/lib/lang/de_resellers_list.lng | 1 + interface/web/client/lib/lang/el.lng | 20 +- interface/web/client/lib/lang/el_client.lng | 81 +- .../web/client/lib/lang/el_client_circle.lng | 14 +- .../client/lib/lang/el_client_circle_list.lng | 16 +- .../web/client/lib/lang/el_client_message.lng | 32 +- .../client/lib/lang/el_client_template.lng | 38 +- .../web/client/lib/lang/el_clients_list.lng | 4 +- .../web/client/lib/lang/el_domain_list.lng | 2 +- interface/web/client/lib/lang/el_reseller.lng | 65 +- .../web/client/lib/lang/el_resellers_list.lng | 4 +- .../web/client/lib/lang/en_client_message.lng | 2 + interface/web/client/lib/lang/es_client.lng | 5 + interface/web/client/lib/lang/es_reseller.lng | 5 + interface/web/client/lib/lang/fi_client.lng | 5 + interface/web/client/lib/lang/fi_reseller.lng | 5 + interface/web/client/lib/lang/fr_client.lng | 5 + interface/web/client/lib/lang/fr_reseller.lng | 5 + interface/web/client/lib/lang/hr_client.lng | 5 + interface/web/client/lib/lang/hr_reseller.lng | 5 + interface/web/client/lib/lang/hu_client.lng | 5 + interface/web/client/lib/lang/hu_reseller.lng | 5 + interface/web/client/lib/lang/id_client.lng | 5 + interface/web/client/lib/lang/id_reseller.lng | 5 + interface/web/client/lib/lang/it_client.lng | 5 + interface/web/client/lib/lang/it_reseller.lng | 5 + interface/web/client/lib/lang/ja_client.lng | 5 + interface/web/client/lib/lang/ja_reseller.lng | 5 + interface/web/client/lib/lang/nl_client.lng | 5 + interface/web/client/lib/lang/nl_reseller.lng | 5 + interface/web/client/lib/lang/pl_client.lng | 5 + interface/web/client/lib/lang/pl_reseller.lng | 5 + interface/web/client/lib/lang/pt_client.lng | 5 + interface/web/client/lib/lang/pt_reseller.lng | 5 + interface/web/client/lib/lang/ro_client.lng | 5 + interface/web/client/lib/lang/ro_reseller.lng | 5 + interface/web/client/lib/lang/ru_client.lng | 5 + interface/web/client/lib/lang/ru_reseller.lng | 5 + interface/web/client/lib/lang/se_client.lng | 5 + interface/web/client/lib/lang/se_reseller.lng | 5 + interface/web/client/lib/lang/sk_client.lng | 5 + interface/web/client/lib/lang/sk_reseller.lng | 5 + interface/web/client/lib/lang/tr_client.lng | 5 + interface/web/client/lib/lang/tr_reseller.lng | 5 + interface/web/dashboard/form/empty.dir | 1 + .../lib/lang/ar_dashlet_mailquota.lng | 14 +- .../dashboard/lib/lang/ar_dashlet_quota.lng | 14 +- .../lib/lang/bg_dashlet_mailquota.lng | 14 +- .../dashboard/lib/lang/bg_dashlet_quota.lng | 14 +- .../lib/lang/br_dashlet_mailquota.lng | 14 +- .../dashboard/lib/lang/br_dashlet_quota.lng | 14 +- interface/web/dashboard/lib/lang/cz.lng | 1 + .../dashboard/lib/lang/cz_dashlet_limits.lng | 1 + .../lib/lang/cz_dashlet_mailquota.lng | 15 +- .../dashboard/lib/lang/cz_dashlet_modules.lng | 1 + .../dashboard/lib/lang/cz_dashlet_quota.lng | 15 +- interface/web/dashboard/lib/lang/de.lng | 1 + .../dashboard/lib/lang/de_dashlet_limits.lng | 3 +- .../lib/lang/de_dashlet_mailquota.lng | 7 +- .../dashboard/lib/lang/de_dashlet_modules.lng | 1 + .../dashboard/lib/lang/de_dashlet_quota.lng | 5 +- .../dashboard/lib/lang/el_dashlet_limits.lng | 6 +- .../lib/lang/el_dashlet_mailquota.lng | 14 +- .../dashboard/lib/lang/el_dashlet_quota.lng | 14 +- .../lib/lang/es_dashlet_mailquota.lng | 14 +- .../dashboard/lib/lang/es_dashlet_quota.lng | 14 +- .../lib/lang/fi_dashlet_mailquota.lng | 14 +- .../dashboard/lib/lang/fi_dashlet_quota.lng | 14 +- .../lib/lang/fr_dashlet_mailquota.lng | 14 +- .../dashboard/lib/lang/fr_dashlet_quota.lng | 14 +- .../lib/lang/hr_dashlet_mailquota.lng | 14 +- .../dashboard/lib/lang/hr_dashlet_quota.lng | 14 +- .../lib/lang/hu_dashlet_mailquota.lng | 14 +- .../dashboard/lib/lang/hu_dashlet_quota.lng | 14 +- .../lib/lang/id_dashlet_mailquota.lng | 14 +- .../dashboard/lib/lang/id_dashlet_quota.lng | 14 +- .../lib/lang/it_dashlet_mailquota.lng | 14 +- .../dashboard/lib/lang/it_dashlet_quota.lng | 14 +- .../lib/lang/ja_dashlet_mailquota.lng | 14 +- .../dashboard/lib/lang/ja_dashlet_quota.lng | 14 +- .../lib/lang/nl_dashlet_mailquota.lng | 14 +- .../dashboard/lib/lang/nl_dashlet_quota.lng | 14 +- .../lib/lang/pl_dashlet_mailquota.lng | 14 +- .../dashboard/lib/lang/pl_dashlet_quota.lng | 14 +- .../lib/lang/pt_dashlet_mailquota.lng | 14 +- .../dashboard/lib/lang/pt_dashlet_quota.lng | 14 +- .../lib/lang/ro_dashlet_mailquota.lng | 14 +- .../dashboard/lib/lang/ro_dashlet_quota.lng | 14 +- .../lib/lang/ru_dashlet_mailquota.lng | 14 +- .../dashboard/lib/lang/ru_dashlet_quota.lng | 14 +- .../lib/lang/se_dashlet_mailquota.lng | 14 +- .../dashboard/lib/lang/se_dashlet_quota.lng | 14 +- .../lib/lang/sk_dashlet_mailquota.lng | 14 +- .../dashboard/lib/lang/sk_dashlet_quota.lng | 14 +- .../lib/lang/tr_dashlet_mailquota.lng | 14 +- .../dashboard/lib/lang/tr_dashlet_quota.lng | 14 +- interface/web/dashboard/list/empty.dir | 1 + interface/web/designer/form/empty.dir | 1 + interface/web/designer/lib/lang/cz.lng | 1 + .../web/designer/lib/lang/cz_form_edit.lng | 1 + .../web/designer/lib/lang/cz_form_list.lng | 1 + .../web/designer/lib/lang/cz_form_show.lng | 3 +- .../web/designer/lib/lang/cz_module_edit.lng | 12 +- .../web/designer/lib/lang/cz_module_list.lng | 1 + .../designer/lib/lang/cz_module_nav_edit.lng | 1 + .../lib/lang/cz_module_nav_item_edit.lng | 1 + .../web/designer/lib/lang/cz_module_show.lng | 3 +- interface/web/designer/lib/lang/de.lng | 1 + .../web/designer/lib/lang/de_form_edit.lng | 1 + .../web/designer/lib/lang/de_form_list.lng | 1 + .../web/designer/lib/lang/de_form_show.lng | 1 + .../web/designer/lib/lang/de_module_edit.lng | 1 + .../web/designer/lib/lang/de_module_list.lng | 1 + .../designer/lib/lang/de_module_nav_edit.lng | 1 + .../lib/lang/de_module_nav_item_edit.lng | 1 + .../web/designer/lib/lang/de_module_show.lng | 1 + .../web/designer/lib/lang/el_form_edit.lng | 10 +- interface/web/designer/list/empty.dir | 1 + interface/web/dns/dns_dkim_edit.php | 142 -- interface/web/dns/dns_dkim_get.php | 91 - interface/web/dns/dns_wizard.php | 47 +- interface/web/dns/form/dns_dkim.tform.php | 154 -- interface/web/dns/form/dns_rp.tform.php | 8 +- interface/web/dns/form/dns_template.tform.php | 27 +- interface/web/dns/lib/lang/cz.lng | 1 + interface/web/dns/lib/lang/cz_dns_a.lng | 1 + interface/web/dns/lib/lang/cz_dns_a_list.lng | 1 + interface/web/dns/lib/lang/cz_dns_aaaa.lng | 1 + interface/web/dns/lib/lang/cz_dns_alias.lng | 1 + interface/web/dns/lib/lang/cz_dns_cname.lng | 1 + interface/web/dns/lib/lang/cz_dns_hinfo.lng | 1 + interface/web/dns/lib/lang/cz_dns_import.lng | 3 +- interface/web/dns/lib/lang/cz_dns_mx.lng | 3 +- interface/web/dns/lib/lang/cz_dns_ns.lng | 1 + interface/web/dns/lib/lang/cz_dns_ptr.lng | 1 + interface/web/dns/lib/lang/cz_dns_rp.lng | 1 + interface/web/dns/lib/lang/cz_dns_slave.lng | 1 + .../web/dns/lib/lang/cz_dns_slave_list.lng | 1 + interface/web/dns/lib/lang/cz_dns_soa.lng | 1 + .../web/dns/lib/lang/cz_dns_soa_list.lng | 1 + interface/web/dns/lib/lang/cz_dns_srv.lng | 1 + .../web/dns/lib/lang/cz_dns_template.lng | 1 + .../web/dns/lib/lang/cz_dns_template_list.lng | 1 + interface/web/dns/lib/lang/cz_dns_txt.lng | 1 + interface/web/dns/lib/lang/cz_dns_wizard.lng | 1 + interface/web/dns/lib/lang/de.lng | 1 + interface/web/dns/lib/lang/de_dns_a.lng | 1 + interface/web/dns/lib/lang/de_dns_a_list.lng | 1 + interface/web/dns/lib/lang/de_dns_aaaa.lng | 1 + interface/web/dns/lib/lang/de_dns_alias.lng | 1 + interface/web/dns/lib/lang/de_dns_cname.lng | 1 + interface/web/dns/lib/lang/de_dns_hinfo.lng | 1 + interface/web/dns/lib/lang/de_dns_import.lng | 1 + interface/web/dns/lib/lang/de_dns_mx.lng | 1 + interface/web/dns/lib/lang/de_dns_ns.lng | 1 + interface/web/dns/lib/lang/de_dns_ptr.lng | 1 + interface/web/dns/lib/lang/de_dns_rp.lng | 1 + interface/web/dns/lib/lang/de_dns_slave.lng | 1 + .../web/dns/lib/lang/de_dns_slave_list.lng | 1 + interface/web/dns/lib/lang/de_dns_soa.lng | 1 + .../web/dns/lib/lang/de_dns_soa_list.lng | 1 + interface/web/dns/lib/lang/de_dns_srv.lng | 1 + .../web/dns/lib/lang/de_dns_template.lng | 1 + .../web/dns/lib/lang/de_dns_template_list.lng | 1 + interface/web/dns/lib/lang/de_dns_txt.lng | 1 + interface/web/dns/lib/lang/de_dns_wizard.lng | 1 + interface/web/dns/lib/lang/el.lng | 4 +- interface/web/dns/lib/lang/el_dns_alias.lng | 2 +- interface/web/dns/lib/lang/el_dns_hinfo.lng | 2 +- interface/web/dns/lib/lang/el_dns_import.lng | 20 +- interface/web/dns/lib/lang/el_dns_mx.lng | 2 +- interface/web/dns/lib/lang/el_dns_slave.lng | 2 +- interface/web/dns/lib/lang/el_dns_soa.lng | 14 +- interface/web/dns/lib/lang/el_dns_srv.lng | 28 +- interface/web/dns/lib/lang/el_dns_wizard.lng | 18 +- interface/web/dns/lib/lang/en_dns_dkim.lng | 8 - interface/web/dns/lib/lang/en_dns_wizard.lng | 21 +- interface/web/dns/templates/dns_a_list.htm | 13 +- interface/web/dns/templates/dns_dkim_edit.htm | 38 - interface/web/dns/templates/dns_wizard.htm | 17 +- interface/web/help/lib/lang/cz.lng | 1 + interface/web/help/lib/lang/cz_faq_form.lng | 1 + .../lib/lang/cz_faq_manage_questions_list.lng | 1 + .../web/help/lib/lang/cz_help_faq_list.lng | 3 +- .../lib/lang/cz_help_faq_sections_list.lng | 1 + .../web/help/lib/lang/cz_support_message.lng | 7 +- .../help/lib/lang/cz_support_message_list.lng | 3 +- interface/web/help/lib/lang/de.lng | 1 + interface/web/help/lib/lang/de_faq_form.lng | 1 + .../lib/lang/de_faq_manage_questions_list.lng | 1 + .../help/lib/lang/de_faq_sections_form.lng | 1 + .../web/help/lib/lang/de_help_faq_list.lng | 1 + .../lib/lang/de_help_faq_sections_list.lng | 1 + .../web/help/lib/lang/de_support_message.lng | 11 +- .../help/lib/lang/de_support_message_list.lng | 1 + .../web/help/lib/lang/el_help_faq_list.lng | 2 +- interface/web/js/dns_dkim.js | 73 - interface/web/js/js.d/empty.dir | 1 + interface/web/js/mail_domain_dkim.js | 72 - interface/web/login/lib/lang/cz.lng | 1 + interface/web/login/lib/lang/de.lng | 1 + interface/web/login/lib/lang/el.lng | 14 +- interface/web/mail/form/mail_domain.tform.php | 29 +- interface/web/mail/form/mail_user.tform.php | 215 +- interface/web/mail/lib/lang/cz.lng | 3 +- interface/web/mail/lib/lang/cz_mail_alias.lng | 1 + .../web/mail/lib/lang/cz_mail_alias_list.lng | 1 + .../web/mail/lib/lang/cz_mail_aliasdomain.lng | 1 + .../lib/lang/cz_mail_aliasdomain_list.lng | 1 + .../web/mail/lib/lang/cz_mail_blacklist.lng | 1 + .../mail/lib/lang/cz_mail_blacklist_list.lng | 3 +- .../mail/lib/lang/cz_mail_content_filter.lng | 1 + .../lib/lang/cz_mail_content_filter_list.lng | 1 + .../web/mail/lib/lang/cz_mail_domain.lng | 1 + .../lib/lang/cz_mail_domain_admin_list.lng | 1 + .../mail/lib/lang/cz_mail_domain_catchall.lng | 1 + .../lib/lang/cz_mail_domain_catchall_list.lng | 1 + .../web/mail/lib/lang/cz_mail_domain_list.lng | 1 + .../web/mail/lib/lang/cz_mail_forward.lng | 3 +- .../mail/lib/lang/cz_mail_forward_list.lng | 1 + interface/web/mail/lib/lang/cz_mail_get.lng | 1 + .../web/mail/lib/lang/cz_mail_get_list.lng | 1 + .../web/mail/lib/lang/cz_mail_mailinglist.lng | 3 +- .../lib/lang/cz_mail_mailinglist_list.lng | 1 + .../mail/lib/lang/cz_mail_relay_recipient.lng | 3 +- .../lib/lang/cz_mail_relay_recipient_list.lng | 1 + .../web/mail/lib/lang/cz_mail_spamfilter.lng | 1 + .../mail/lib/lang/cz_mail_spamfilter_list.lng | 1 + .../web/mail/lib/lang/cz_mail_transport.lng | 3 +- .../mail/lib/lang/cz_mail_transport_list.lng | 1 + interface/web/mail/lib/lang/cz_mail_user.lng | 3 +- .../web/mail/lib/lang/cz_mail_user_filter.lng | 1 + .../lib/lang/cz_mail_user_filter_list.lng | 1 + .../web/mail/lib/lang/cz_mail_user_list.lng | 1 + .../mail/lib/lang/cz_mail_user_stats_list.lng | 1 + .../web/mail/lib/lang/cz_mail_whitelist.lng | 1 + .../mail/lib/lang/cz_mail_whitelist_list.lng | 1 + .../mail/lib/lang/cz_spamfilter_blacklist.lng | 1 + .../lib/lang/cz_spamfilter_blacklist_list.lng | 3 +- .../mail/lib/lang/cz_spamfilter_config.lng | 1 + .../lib/lang/cz_spamfilter_config_list.lng | 1 + .../mail/lib/lang/cz_spamfilter_policy.lng | 3 +- .../lib/lang/cz_spamfilter_policy_list.lng | 1 + .../web/mail/lib/lang/cz_spamfilter_users.lng | 7 +- .../lib/lang/cz_spamfilter_users_list.lng | 1 + .../mail/lib/lang/cz_spamfilter_whitelist.lng | 1 + .../lib/lang/cz_spamfilter_whitelist_list.lng | 1 + .../lib/lang/cz_user_quota_stats_list.lng | 5 +- interface/web/mail/lib/lang/de.lng | 1 + interface/web/mail/lib/lang/de_mail_alias.lng | 1 + .../web/mail/lib/lang/de_mail_alias_list.lng | 1 + .../web/mail/lib/lang/de_mail_aliasdomain.lng | 1 + .../lib/lang/de_mail_aliasdomain_list.lng | 1 + .../web/mail/lib/lang/de_mail_blacklist.lng | 1 + .../mail/lib/lang/de_mail_blacklist_list.lng | 1 + .../mail/lib/lang/de_mail_content_filter.lng | 1 + .../lib/lang/de_mail_content_filter_list.lng | 1 + .../web/mail/lib/lang/de_mail_domain.lng | 1 + .../lib/lang/de_mail_domain_admin_list.lng | 1 + .../mail/lib/lang/de_mail_domain_catchall.lng | 1 + .../lib/lang/de_mail_domain_catchall_list.lng | 1 + .../web/mail/lib/lang/de_mail_domain_list.lng | 1 + .../web/mail/lib/lang/de_mail_forward.lng | 1 + .../mail/lib/lang/de_mail_forward_list.lng | 1 + interface/web/mail/lib/lang/de_mail_get.lng | 3 +- .../web/mail/lib/lang/de_mail_get_list.lng | 1 + .../web/mail/lib/lang/de_mail_mailinglist.lng | 1 + .../lib/lang/de_mail_mailinglist_list.lng | 1 + .../mail/lib/lang/de_mail_relay_recipient.lng | 1 + .../lib/lang/de_mail_relay_recipient_list.lng | 1 + .../web/mail/lib/lang/de_mail_spamfilter.lng | 1 + .../mail/lib/lang/de_mail_spamfilter_list.lng | 1 + .../web/mail/lib/lang/de_mail_transport.lng | 1 + .../mail/lib/lang/de_mail_transport_list.lng | 1 + interface/web/mail/lib/lang/de_mail_user.lng | 1 + .../web/mail/lib/lang/de_mail_user_filter.lng | 1 + .../lib/lang/de_mail_user_filter_list.lng | 1 + .../web/mail/lib/lang/de_mail_user_list.lng | 1 + .../mail/lib/lang/de_mail_user_stats_list.lng | 1 + .../web/mail/lib/lang/de_mail_whitelist.lng | 1 + .../mail/lib/lang/de_mail_whitelist_list.lng | 1 + .../mail/lib/lang/de_spamfilter_blacklist.lng | 1 + .../lib/lang/de_spamfilter_blacklist_list.lng | 1 + .../mail/lib/lang/de_spamfilter_config.lng | 1 + .../lib/lang/de_spamfilter_config_list.lng | 1 + .../mail/lib/lang/de_spamfilter_policy.lng | 1 + .../lib/lang/de_spamfilter_policy_list.lng | 1 + .../web/mail/lib/lang/de_spamfilter_users.lng | 1 + .../lib/lang/de_spamfilter_users_list.lng | 1 + .../mail/lib/lang/de_spamfilter_whitelist.lng | 1 + .../lib/lang/de_spamfilter_whitelist_list.lng | 1 + .../lib/lang/de_user_quota_stats_list.lng | 1 + interface/web/mail/lib/lang/el.lng | 4 +- interface/web/mail/lib/lang/el_mail_alias.lng | 4 +- .../mail/lib/lang/el_mail_domain_catchall.lng | 4 +- .../web/mail/lib/lang/el_mail_forward.lng | 2 +- interface/web/mail/lib/lang/el_mail_get.lng | 4 +- .../web/mail/lib/lang/el_mail_mailinglist.lng | 18 +- .../web/mail/lib/lang/el_mail_spamfilter.lng | 6 +- .../web/mail/lib/lang/el_mail_transport.lng | 2 +- .../mail/lib/lang/el_mail_transport_list.lng | 4 +- interface/web/mail/lib/lang/el_mail_user.lng | 18 +- .../web/mail/lib/lang/el_mail_user_list.lng | 2 +- .../web/mail/lib/lang/el_spamfilter_users.lng | 4 +- .../lib/lang/el_user_quota_stats_list.lng | 2 +- .../web/mail/lib/lang/en_mail_domain.lng | 11 +- .../web/mail/mail_domain_dkim_create.php | 99 - .../web/mail/templates/mail_domain_edit.htm | 30 +- interface/web/mailuser/lib/lang/cz.lng | 1 + interface/web/mailuser/lib/lang/cz_index.lng | 1 + .../lib/lang/cz_mail_user_autoresponder.lng | 1 + .../web/mailuser/lib/lang/cz_mail_user_cc.lng | 1 + .../mailuser/lib/lang/cz_mail_user_filter.lng | 1 + .../lib/lang/cz_mail_user_filter_list.lng | 1 + .../lib/lang/cz_mail_user_password.lng | 3 +- .../lib/lang/cz_mail_user_spamfilter.lng | 1 + interface/web/mailuser/lib/lang/de.lng | 1 + interface/web/mailuser/lib/lang/de_index.lng | 1 + .../lib/lang/de_mail_user_autoresponder.lng | 1 + .../web/mailuser/lib/lang/de_mail_user_cc.lng | 1 + .../mailuser/lib/lang/de_mail_user_filter.lng | 1 + .../lib/lang/de_mail_user_filter_list.lng | 1 + .../lib/lang/de_mail_user_password.lng | 1 + .../lib/lang/de_mail_user_spamfilter.lng | 1 + interface/web/mailuser/lib/lang/el.lng | 14 +- interface/web/mailuser/lib/lang/el_index.lng | 18 +- .../lib/lang/el_mail_user_autoresponder.lng | 22 +- .../web/mailuser/lib/lang/el_mail_user_cc.lng | 8 +- .../mailuser/lib/lang/el_mail_user_filter.lng | 36 +- .../lib/lang/el_mail_user_filter_list.lng | 12 +- .../lib/lang/el_mail_user_password.lng | 14 +- .../lib/lang/el_mail_user_spamfilter.lng | 8 +- interface/web/monitor/form/empty.dir | 1 + interface/web/monitor/lib/lang/cz.lng | 7 +- .../web/monitor/lib/lang/cz_datalog_list.lng | 1 + .../web/monitor/lib/lang/cz_syslog_list.lng | 1 + interface/web/monitor/lib/lang/de.lng | 4 +- .../web/monitor/lib/lang/de_datalog_list.lng | 1 + interface/web/monitor/lib/lang/el.lng | 14 +- .../web/monitor/lib/lang/el_datalog_list.lng | 10 +- interface/web/monitor/lib/lang/en.lng | 3 - interface/web/monitor/lib/module.conf.php | 7 +- interface/web/monitor/show_data.php | 7 - interface/web/monitor/show_log.php | 15 +- .../web/monitor/templates/show_sys_state.htm | 48 +- interface/web/remote/monitor.php | 5 + .../web/sites/aps_cron_apscrawler_if.php | 124 +- interface/web/sites/aps_do_operation.php | 224 +- interface/web/sites/aps_install_package.php | 420 ++-- .../web/sites/aps_installedpackages_list.php | 284 +-- .../web/sites/aps_meta_packages/empty.dir | 1 + .../web/sites/aps_packagedetails_show.php | 198 +- interface/web/sites/database_user_edit.php | 62 +- interface/web/sites/form/database.tform.php | 9 +- .../web/sites/form/database_user.tform.php | 10 +- interface/web/sites/form/web_domain.tform.php | 6 +- .../sites/form/web_vhost_subdomain.tform.php | 14 +- .../sites/lib/lang/ar_database_admin_list.lng | 1 + .../web/sites/lib/lang/ar_database_list.lng | 1 + .../web/sites/lib/lang/ar_web_domain.lng | 1 + .../sites/lib/lang/bg_database_admin_list.lng | 1 + .../web/sites/lib/lang/bg_database_list.lng | 1 + .../web/sites/lib/lang/bg_web_domain.lng | 1 + .../sites/lib/lang/br_database_admin_list.lng | 1 + .../web/sites/lib/lang/br_database_list.lng | 1 + .../web/sites/lib/lang/br_web_domain.lng | 1 + interface/web/sites/lib/lang/cz.lng | 1 + interface/web/sites/lib/lang/cz_aps.lng | 3 +- .../sites/lib/lang/cz_aps_instances_list.lng | 1 + .../sites/lib/lang/cz_aps_packages_list.lng | 1 + .../lib/lang/cz_aps_update_packagelist.lng | 7 +- interface/web/sites/lib/lang/cz_cron.lng | 5 +- interface/web/sites/lib/lang/cz_cron_list.lng | 1 + interface/web/sites/lib/lang/cz_database.lng | 3 +- .../sites/lib/lang/cz_database_admin_list.lng | 2 + .../web/sites/lib/lang/cz_database_list.lng | 2 + .../web/sites/lib/lang/cz_database_user.lng | 3 +- .../lib/lang/cz_database_user_admin_list.lng | 1 + .../sites/lib/lang/cz_database_user_list.lng | 1 + interface/web/sites/lib/lang/cz_ftp_user.lng | 1 + .../web/sites/lib/lang/cz_ftp_user_list.lng | 1 + .../web/sites/lib/lang/cz_shell_user.lng | 1 + .../web/sites/lib/lang/cz_shell_user_list.lng | 1 + .../lib/lang/cz_user_quota_stats_list.lng | 5 +- .../web/sites/lib/lang/cz_web_aliasdomain.lng | 7 +- .../lib/lang/cz_web_aliasdomain_list.lng | 1 + .../web/sites/lib/lang/cz_web_backup_list.lng | 1 + .../web/sites/lib/lang/cz_web_domain.lng | 12 +- .../lib/lang/cz_web_domain_admin_list.lng | 1 + .../web/sites/lib/lang/cz_web_domain_list.lng | 1 + .../web/sites/lib/lang/cz_web_folder.lng | 1 + .../web/sites/lib/lang/cz_web_folder_list.lng | 1 + .../web/sites/lib/lang/cz_web_folder_user.lng | 5 +- .../lib/lang/cz_web_folder_user_list.lng | 1 + .../lib/lang/cz_web_sites_stats_list.lng | 1 + .../web/sites/lib/lang/cz_web_subdomain.lng | 1 + .../sites/lib/lang/cz_web_subdomain_list.lng | 1 + .../sites/lib/lang/cz_web_vhost_subdomain.lng | 3 +- .../lib/lang/cz_web_vhost_subdomain_list.lng | 1 + .../web/sites/lib/lang/cz_webdav_user.lng | 1 + .../sites/lib/lang/cz_webdav_user_list.lng | 1 + interface/web/sites/lib/lang/de.lng | 9 +- interface/web/sites/lib/lang/de_aps.lng | 3 +- .../sites/lib/lang/de_aps_instances_list.lng | 1 + .../sites/lib/lang/de_aps_packages_list.lng | 1 + .../lib/lang/de_aps_update_packagelist.lng | 3 +- interface/web/sites/lib/lang/de_cron.lng | 5 +- interface/web/sites/lib/lang/de_cron_list.lng | 1 + interface/web/sites/lib/lang/de_database.lng | 13 +- .../sites/lib/lang/de_database_admin_list.lng | 6 +- .../web/sites/lib/lang/de_database_list.lng | 6 +- .../web/sites/lib/lang/de_database_user.lng | 5 +- .../lib/lang/de_database_user_admin_list.lng | 1 + .../sites/lib/lang/de_database_user_list.lng | 1 + interface/web/sites/lib/lang/de_ftp_user.lng | 7 +- .../web/sites/lib/lang/de_ftp_user_list.lng | 1 + .../web/sites/lib/lang/de_shell_user.lng | 11 +- .../web/sites/lib/lang/de_shell_user_list.lng | 1 + .../lib/lang/de_user_quota_stats_list.lng | 7 +- .../web/sites/lib/lang/de_web_aliasdomain.lng | 71 +- .../lib/lang/de_web_aliasdomain_list.lng | 9 +- .../web/sites/lib/lang/de_web_backup_list.lng | 6 +- .../web/sites/lib/lang/de_web_domain.lng | 67 +- .../lib/lang/de_web_domain_admin_list.lng | 1 + .../web/sites/lib/lang/de_web_domain_list.lng | 1 + .../web/sites/lib/lang/de_web_folder.lng | 1 + .../web/sites/lib/lang/de_web_folder_list.lng | 1 + .../web/sites/lib/lang/de_web_folder_user.lng | 1 + .../lib/lang/de_web_folder_user_list.lng | 1 + .../lib/lang/de_web_sites_stats_list.lng | 11 +- .../web/sites/lib/lang/de_web_subdomain.lng | 29 +- .../sites/lib/lang/de_web_subdomain_list.lng | 1 + .../sites/lib/lang/de_web_vhost_subdomain.lng | 55 +- .../lib/lang/de_web_vhost_subdomain_list.lng | 1 + .../web/sites/lib/lang/de_webdav_user.lng | 3 +- .../sites/lib/lang/de_webdav_user_list.lng | 1 + interface/web/sites/lib/lang/el.lng | 24 +- interface/web/sites/lib/lang/el_aps.lng | 110 +- .../sites/lib/lang/el_aps_instances_list.lng | 22 +- .../sites/lib/lang/el_aps_packages_list.lng | 12 +- .../lib/lang/el_aps_update_packagelist.lng | 8 +- interface/web/sites/lib/lang/el_cron.lng | 2 +- interface/web/sites/lib/lang/el_database.lng | 44 +- .../sites/lib/lang/el_database_admin_list.lng | 1 + .../web/sites/lib/lang/el_database_list.lng | 1 + .../web/sites/lib/lang/el_database_user.lng | 42 +- .../lib/lang/el_database_user_admin_list.lng | 8 +- .../sites/lib/lang/el_database_user_list.lng | 6 +- interface/web/sites/lib/lang/el_ftp_user.lng | 14 +- .../web/sites/lib/lang/el_shell_user.lng | 18 +- .../web/sites/lib/lang/el_shell_user_list.lng | 4 +- .../lib/lang/el_user_quota_stats_list.lng | 2 +- .../web/sites/lib/lang/el_web_aliasdomain.lng | 140 +- .../lib/lang/el_web_aliasdomain_list.lng | 6 +- .../web/sites/lib/lang/el_web_backup_list.lng | 26 +- .../web/sites/lib/lang/el_web_domain.lng | 41 +- .../web/sites/lib/lang/el_web_folder_user.lng | 10 +- .../lib/lang/el_web_sites_stats_list.lng | 2 +- .../web/sites/lib/lang/el_web_subdomain.lng | 8 +- .../sites/lib/lang/el_web_vhost_subdomain.lng | 142 +- .../lib/lang/el_web_vhost_subdomain_list.lng | 4 +- .../web/sites/lib/lang/el_webdav_user.lng | 14 +- interface/web/sites/lib/lang/en_aps.lng | 114 +- .../sites/lib/lang/en_aps_instances_list.lng | 24 +- .../sites/lib/lang/en_aps_packages_list.lng | 14 +- .../lib/lang/en_aps_update_packagelist.lng | 12 +- .../sites/lib/lang/en_database_admin_list.lng | 3 +- .../web/sites/lib/lang/en_database_list.lng | 1 - .../web/sites/lib/lang/en_web_backup_list.lng | 16 +- .../sites/lib/lang/en_web_vhost_subdomain.lng | 4 + .../sites/lib/lang/es_database_admin_list.lng | 1 + .../web/sites/lib/lang/es_database_list.lng | 1 + .../web/sites/lib/lang/es_web_domain.lng | 1 + .../sites/lib/lang/fi_database_admin_list.lng | 1 + .../web/sites/lib/lang/fi_database_list.lng | 1 + .../web/sites/lib/lang/fi_web_domain.lng | 1 + .../sites/lib/lang/fr_database_admin_list.lng | 1 + .../web/sites/lib/lang/fr_database_list.lng | 1 + .../web/sites/lib/lang/fr_web_domain.lng | 1 + .../sites/lib/lang/hr_database_admin_list.lng | 1 + .../web/sites/lib/lang/hr_database_list.lng | 1 + .../web/sites/lib/lang/hr_web_domain.lng | 1 + .../sites/lib/lang/hu_database_admin_list.lng | 1 + .../web/sites/lib/lang/hu_database_list.lng | 1 + .../web/sites/lib/lang/hu_web_domain.lng | 1 + .../sites/lib/lang/id_database_admin_list.lng | 1 + .../web/sites/lib/lang/id_database_list.lng | 1 + .../web/sites/lib/lang/id_web_domain.lng | 1 + .../sites/lib/lang/it_database_admin_list.lng | 1 + .../web/sites/lib/lang/it_database_list.lng | 1 + .../web/sites/lib/lang/it_web_domain.lng | 1 + .../sites/lib/lang/ja_database_admin_list.lng | 1 + .../web/sites/lib/lang/ja_database_list.lng | 1 + .../web/sites/lib/lang/ja_web_domain.lng | 1 + .../sites/lib/lang/nl_database_admin_list.lng | 1 + .../web/sites/lib/lang/nl_database_list.lng | 1 + .../web/sites/lib/lang/nl_web_domain.lng | 1 + .../sites/lib/lang/pl_database_admin_list.lng | 1 + .../web/sites/lib/lang/pl_database_list.lng | 1 + .../web/sites/lib/lang/pl_web_domain.lng | 1 + .../sites/lib/lang/pt_database_admin_list.lng | 1 + .../web/sites/lib/lang/pt_database_list.lng | 1 + .../web/sites/lib/lang/pt_web_domain.lng | 1 + .../sites/lib/lang/ro_database_admin_list.lng | 1 + .../web/sites/lib/lang/ro_database_list.lng | 1 + .../web/sites/lib/lang/ro_web_domain.lng | 1 + .../sites/lib/lang/ru_database_admin_list.lng | 1 + .../web/sites/lib/lang/ru_database_list.lng | 1 + .../web/sites/lib/lang/ru_web_domain.lng | 1 + .../sites/lib/lang/se_database_admin_list.lng | 1 + .../web/sites/lib/lang/se_database_list.lng | 1 + .../web/sites/lib/lang/se_web_domain.lng | 1 + .../sites/lib/lang/sk_database_admin_list.lng | 1 + .../web/sites/lib/lang/sk_database_list.lng | 1 + .../web/sites/lib/lang/sk_web_domain.lng | 1 + .../sites/lib/lang/tr_database_admin_list.lng | 1 + .../web/sites/lib/lang/tr_database_list.lng | 1 + .../web/sites/lib/lang/tr_web_domain.lng | 1 + .../sites/list/aps_availablepackages.list.php | 170 +- interface/web/sites/list/database.list.php | 15 +- .../sites/templates/aps_install_package.htm | 112 +- .../sites/templates/aps_instances_list.htm | 122 +- .../templates/aps_packagedetails_show.htm | 280 +-- .../web/sites/templates/aps_packages_list.htm | 108 +- .../sites/templates/database_admin_list.htm | 7 +- .../web/sites/templates/database_list.htm | 7 +- .../templates/web_aliasdomain_advanced.htm | 72 +- .../web/sites/templates/web_backup_list.htm | 34 +- .../templates/web_subdomain_advanced.htm | 74 +- .../web_vhost_subdomain_redirect.htm | 6 + interface/web/sites/web_domain_edit.php | 47 - .../web/sites/web_vhost_subdomain_edit.php | 105 +- .../lib/lang/cz_strengthmeter.lng | 1 + .../lib/lang/de_strengthmeter.lng | 1 + interface/web/temp/empty.dir | 1 + .../redmond/jquery-ui-1.8.16.custom.css | 886 ++++---- .../themes/default-304/css/screen/tipsy.css | 50 +- .../templates/monitor/show_sys_state.htm | 48 +- .../templates/sites/aps_install_package.htm | 110 +- .../templates/sites/aps_instances_list.htm | 122 +- .../sites/aps_packagedetails_show.htm | 276 +-- .../templates/sites/aps_packages_list.htm | 98 +- interface/web/themes/default/CHANGELOG | 62 +- interface/web/themes/default/TODO | 14 +- .../default/css/jquery-ui-1.8.16.custom.css | 890 ++++---- interface/web/tools/import_plesk.php | 243 +- interface/web/tools/import_vpopmail.php | 267 --- .../lib/interface.d/tpl_default.menu.php | 16 +- interface/web/tools/lib/lang/cz.lng | 1 + .../tools/lib/lang/cz_import_ispconfig.lng | 1 + .../web/tools/lib/lang/cz_import_vpopmail.lng | 8 + interface/web/tools/lib/lang/cz_index.lng | 1 + interface/web/tools/lib/lang/cz_interface.lng | 1 + interface/web/tools/lib/lang/cz_resync.lng | 1 + .../web/tools/lib/lang/cz_tpl_default.lng | 1 + .../web/tools/lib/lang/cz_usersettings.lng | 1 + interface/web/tools/lib/lang/de.lng | 1 + .../tools/lib/lang/de_import_ispconfig.lng | 1 + interface/web/tools/lib/lang/de_index.lng | 1 + interface/web/tools/lib/lang/de_interface.lng | 1 + interface/web/tools/lib/lang/de_resync.lng | 1 + .../web/tools/lib/lang/de_tpl_default.lng | 1 + .../web/tools/lib/lang/de_usersettings.lng | 1 + interface/web/tools/lib/lang/el.lng | 8 +- .../tools/lib/lang/el_import_ispconfig.lng | 42 +- interface/web/tools/lib/lang/el_index.lng | 4 +- interface/web/tools/lib/lang/el_interface.lng | 10 +- interface/web/tools/lib/lang/el_resync.lng | 22 +- .../web/tools/lib/lang/el_tpl_default.lng | 10 +- .../web/tools/lib/lang/el_usersettings.lng | 10 +- .../web/tools/lib/lang/en_import_vpopmail.lng | 8 - interface/web/tools/list/empty.dir | 1 + .../web/tools/templates/import_vpopmail.htm | 53 - interface/web/vm/lib/lang/cz.lng | 1 + .../web/vm/lib/lang/cz_openvz_action.lng | 1 + interface/web/vm/lib/lang/cz_openvz_ip.lng | 1 + .../web/vm/lib/lang/cz_openvz_ip_list.lng | 1 + .../web/vm/lib/lang/cz_openvz_ostemplate.lng | 1 + .../vm/lib/lang/cz_openvz_ostemplate_list.lng | 1 + .../web/vm/lib/lang/cz_openvz_template.lng | 1 + .../vm/lib/lang/cz_openvz_template_list.lng | 1 + interface/web/vm/lib/lang/cz_openvz_vm.lng | 1 + .../web/vm/lib/lang/cz_openvz_vm_list.lng | 1 + interface/web/vm/lib/lang/de.lng | 7 +- .../web/vm/lib/lang/de_openvz_action.lng | 1 + interface/web/vm/lib/lang/de_openvz_ip.lng | 1 + .../web/vm/lib/lang/de_openvz_ip_list.lng | 1 + .../web/vm/lib/lang/de_openvz_ostemplate.lng | 1 + .../vm/lib/lang/de_openvz_ostemplate_list.lng | 1 + .../web/vm/lib/lang/de_openvz_template.lng | 1 + .../vm/lib/lang/de_openvz_template_list.lng | 1 + interface/web/vm/lib/lang/de_openvz_vm.lng | 1 + .../web/vm/lib/lang/de_openvz_vm_list.lng | 1 + interface/web/vm/lib/lang/el_openvz_ip.lng | 2 +- .../web/vm/lib/lang/el_openvz_ip_list.lng | 2 +- .../web/vm/lib/lang/el_openvz_template.lng | 20 +- interface/web/vm/lib/lang/el_openvz_vm.lng | 8 +- server/aps_packages/empty.dir | 1 + server/conf-custom/empty.dir | 1 + server/conf-custom/error/empty.dir | 1 + server/conf-custom/index/empty.dir | 1 + server/conf-custom/install/empty.dir | 1 + server/conf-custom/mail/empty.dir | 1 + server/conf/nginx_vhost.conf.master | 2 +- server/cron_daily.php | 277 +-- server/lib/classes/aps_base.inc.php | 204 +- server/lib/classes/aps_installer.inc.php | 1440 ++++++------ server/lib/classes/monitor_tools.inc.php | 61 +- server/lib/classes/system.inc.php | 3 +- .../monitor_core_module.inc.php | 44 +- .../mods-available/rescue_core_module.inc.php | 175 +- server/mods-core/empty.dir | 1 + server/mods-enabled/empty.dir | 1 + .../plugins-available/apache2_plugin.inc.php | 131 +- server/plugins-available/aps_plugin.inc.php | 234 +- .../plugins-available/backup_plugin.inc.php | 66 +- server/plugins-available/mail_plugin.inc.php | 3 +- .../mail_plugin_dkim.inc.php | 266 --- .../mongo_clientdb_plugin.inc.php | 820 ------- server/plugins-available/nginx_plugin.inc.php | 8 +- .../webserver_plugin.inc.php | 166 -- server/plugins-enabled/empty.dir | 1 + server/scripts/ispconfig_patch | 142 ++ server/server.php | 3 - server/temp/empty.dir | 1 + 885 files changed, 9037 insertions(+), 11079 deletions(-) create mode 100644 install/patches/upd_0001.php create mode 100644 install/sql/incremental/upd_0057.sql create mode 100644 install/sql/incremental/upd_0058.sql create mode 100644 interface/cache/empty.dir create mode 100644 interface/lib/classes/idn/empty.dir delete mode 100644 interface/lib/classes/validate_dkim.inc.php create mode 100644 interface/ssl/empty.dir create mode 100644 interface/tools/empty.dir create mode 100644 interface/web/dashboard/form/empty.dir create mode 100644 interface/web/dashboard/list/empty.dir create mode 100644 interface/web/designer/form/empty.dir create mode 100644 interface/web/designer/list/empty.dir delete mode 100644 interface/web/dns/dns_dkim_edit.php delete mode 100644 interface/web/dns/dns_dkim_get.php delete mode 100644 interface/web/dns/form/dns_dkim.tform.php delete mode 100644 interface/web/dns/lib/lang/en_dns_dkim.lng delete mode 100644 interface/web/dns/templates/dns_dkim_edit.htm delete mode 100644 interface/web/js/dns_dkim.js create mode 100644 interface/web/js/js.d/empty.dir delete mode 100644 interface/web/js/mail_domain_dkim.js delete mode 100644 interface/web/mail/mail_domain_dkim_create.php create mode 100644 interface/web/monitor/form/empty.dir create mode 100644 interface/web/sites/aps_meta_packages/empty.dir create mode 100644 interface/web/temp/empty.dir delete mode 100644 interface/web/tools/import_vpopmail.php create mode 100644 interface/web/tools/lib/lang/cz_import_vpopmail.lng delete mode 100644 interface/web/tools/lib/lang/en_import_vpopmail.lng create mode 100644 interface/web/tools/list/empty.dir delete mode 100644 interface/web/tools/templates/import_vpopmail.htm create mode 100644 server/aps_packages/empty.dir create mode 100644 server/conf-custom/empty.dir create mode 100644 server/conf-custom/error/empty.dir create mode 100644 server/conf-custom/index/empty.dir create mode 100644 server/conf-custom/install/empty.dir create mode 100644 server/conf-custom/mail/empty.dir create mode 100644 server/mods-core/empty.dir create mode 100644 server/mods-enabled/empty.dir delete mode 100644 server/plugins-available/mail_plugin_dkim.inc.php delete mode 100644 server/plugins-available/mongo_clientdb_plugin.inc.php delete mode 100644 server/plugins-available/webserver_plugin.inc.php create mode 100644 server/plugins-enabled/empty.dir create mode 100644 server/scripts/ispconfig_patch create mode 100644 server/temp/empty.dir diff --git a/install/autoupdate.php b/install/autoupdate.php index de53b241f6..e43cd51985 100644 --- a/install/autoupdate.php +++ b/install/autoupdate.php @@ -285,7 +285,7 @@ $inst->configure_dbserver(); //if(@is_dir('/etc/Bastille')) { //* Configure Firewall swriteln('Configuring Firewall'); -$inst->configure_bastille_firewall(); +$inst->configure_firewall(); //} //** Configure ISPConfig diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php index 61130a1362..99fd2af543 100644 --- a/install/dist/lib/fedora.lib.php +++ b/install/dist/lib/fedora.lib.php @@ -845,6 +845,7 @@ class installer_dist extends installer_base { $content = str_replace('{language}', $conf['language'], $content); $content = str_replace('{timezone}', $conf['timezone'], $content); $content = str_replace('{theme}', $conf['theme'], $content); + $content = str_replace('{language_file_import_enabled}', ($conf['language_file_import_enabled'] == true)?'true':'false', $content); wf("$install_dir/interface/lib/$configfile", $content); @@ -869,6 +870,7 @@ class installer_dist extends installer_base { $content = str_replace('{language}', $conf['language'], $content); $content = str_replace('{timezone}', $conf['timezone'], $content); $content = str_replace('{theme}', $conf['theme'], $content); + $content = str_replace('{language_file_import_enabled}', ($conf['language_file_import_enabled'] == true)?'true':'false', $content); wf("$install_dir/server/lib/$configfile", $content); diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php index 382689cd55..853208896f 100644 --- a/install/dist/lib/gentoo.lib.php +++ b/install/dist/lib/gentoo.lib.php @@ -725,6 +725,7 @@ class installer extends installer_base $content = str_replace('{language}', $conf['language'], $content); $content = str_replace('{timezone}', $conf['timezone'], $content); $content = str_replace('{theme}', $conf['theme'], $content); + $content = str_replace('{language_file_import_enabled}', ($conf['language_file_import_enabled'] == true)?'true':'false', $content); $this->write_config_file("$install_dir/interface/lib/$configfile", $content); diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php index 7a2fa264db..e087772e46 100644 --- a/install/dist/lib/opensuse.lib.php +++ b/install/dist/lib/opensuse.lib.php @@ -900,6 +900,7 @@ class installer_dist extends installer_base { $content = str_replace('{language}', $conf['language'], $content); $content = str_replace('{timezone}', $conf['timezone'], $content); $content = str_replace('{theme}', $conf['theme'], $content); + $content = str_replace('{language_file_import_enabled}', ($conf['language_file_import_enabled'] == true)?'true':'false', $content); wf("$install_dir/interface/lib/$configfile", $content); @@ -924,6 +925,7 @@ class installer_dist extends installer_base { $content = str_replace('{language}', $conf['language'], $content); $content = str_replace('{timezone}', $conf['timezone'], $content); $content = str_replace('{theme}', $conf['theme'], $content); + $content = str_replace('{language_file_import_enabled}', ($conf['language_file_import_enabled'] == true)?'true':'false', $content); wf("$install_dir/server/lib/$configfile", $content); diff --git a/install/install.php b/install/install.php index c6b85a3beb..adb1db5030 100644 --- a/install/install.php +++ b/install/install.php @@ -34,6 +34,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. error_reporting(E_ALL|E_STRICT); +define('INSTALLER_RUN', true); + //** The banner on the command line echo "\n\n".str_repeat('-',80)."\n"; echo " _____ ___________ _____ __ _ ____ @@ -106,8 +108,9 @@ $inst->find_installed_apps(); $conf['language'] = $inst->simple_query('Select language', array('en','de'), 'en'); $conf['timezone'] = get_system_timezone(); -//* Set defaukt theme +//* Set default theme $conf['theme'] = 'default'; +$conf['language_file_import_enabled'] = true; //** Select installation mode $install_mode = $inst->simple_query('Installation mode', array('standard','expert'), 'standard'); @@ -257,17 +260,10 @@ if($install_mode == 'standard') { $inst->configure_apps_vhost(); //* Configure Firewall - if($conf['ufw']['installed'] == true) { - //* Configure Ubuntu Firewall - $conf['services']['firewall'] = true; - swriteln('Configuring Ubuntu Firewall'); - $inst->configure_ufw_firewall(); - } else { - //* Configure Bastille Firewall - $conf['services']['firewall'] = true; - swriteln('Configuring Bastille Firewall'); - $inst->configure_bastille_firewall(); - } + //* Configure Bastille Firewall + $conf['services']['firewall'] = true; + swriteln('Configuring Bastille Firewall'); + $inst->configure_firewall(); //* Configure Fail2ban if($conf['fail2ban']['installed'] == true) { @@ -335,7 +331,7 @@ if($install_mode == 'standard') { if($conf['bind']['installed'] == true && $conf['bind']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['bind']['init_script'])) system($conf['init_scripts'].'/'.$conf['bind']['init_script'].' restart &> /dev/null'); //if($conf['squid']['installed'] == true && $conf['squid']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['squid']['init_script'])) system($conf['init_scripts'].'/'.$conf['squid']['init_script'].' restart &> /dev/null'); if($conf['nginx']['installed'] == true && $conf['nginx']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['nginx']['init_script'])) system($conf['init_scripts'].'/'.$conf['nginx']['init_script'].' restart &> /dev/null'); - if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['ufw']['init_script'])) system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null'); + //if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['ufw']['init_script'])) system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null'); }else{ //* In expert mode, we select the services in the following steps, only db is always available @@ -551,17 +547,18 @@ if($install_mode == 'standard') { //** Configure Firewall if(strtolower($inst->simple_query('Configure Firewall Server',array('y','n'),'y')) == 'y') { - if($conf['ufw']['installed'] == true) { + //if($conf['bastille']['installed'] == true) { + //* Configure Bastille Firewall + $conf['services']['firewall'] = true; + swriteln('Configuring Bastille Firewall'); + $inst->configure_firewall(); + /*} elseif($conf['ufw']['installed'] == true) { //* Configure Ubuntu Firewall $conf['services']['firewall'] = true; swriteln('Configuring Ubuntu Firewall'); $inst->configure_ufw_firewall(); - } else { - //* Configure Bastille Firewall - $conf['services']['firewall'] = true; - swriteln('Configuring Bastille Firewall'); - $inst->configure_bastille_firewall(); } + */ } //** Configure Firewall @@ -629,4 +626,4 @@ if($install_mode == 'standard') { echo "Installation completed.\n"; -?> +?> \ No newline at end of file diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 1e8459e2a5..7bf502f1a5 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -132,7 +132,7 @@ class installer_base { if(is_installed('named') || is_installed('bind') || is_installed('bind9')) $conf['bind']['installed'] = true; if(is_installed('squid')) $conf['squid']['installed'] = true; if(is_installed('nginx')) $conf['nginx']['installed'] = true; - if(is_installed('iptables') && is_installed('ufw')) $conf['ufw']['installed'] = true; + // if(is_installed('iptables') && is_installed('ufw')) $conf['ufw']['installed'] = true; if(is_installed('fail2ban-server')) $conf['fail2ban']['installed'] = true; if(is_installed('vzctl')) $conf['openvz']['installed'] = true; if(is_dir("/etc/Bastille")) $conf['bastille']['installed'] = true; @@ -1365,6 +1365,7 @@ class installer_base { exec('chown root:root '.$conf["squid"]["config_dir"].'/'.$configfile); } + /* public function configure_ufw_firewall() { $configfile = 'ufw.conf'; @@ -1374,8 +1375,9 @@ class installer_base { exec('chmod 600 /etc/ufw/ufw.conf'); exec('chown root:root /etc/ufw/ufw.conf'); } + */ - public function configure_bastille_firewall() { + public function configure_firewall() { global $conf; $dist_init_scripts = $conf['init_scripts']; @@ -1691,6 +1693,7 @@ class installer_base { $content = str_replace('{language}', $conf['language'], $content); $content = str_replace('{timezone}', $conf['timezone'], $content); $content = str_replace('{theme}', $conf['theme'], $content); + $content = str_replace('{language_file_import_enabled}', ($conf['language_file_import_enabled'] == true)?'true':'false', $content); wf($install_dir.'/interface/lib/'.$configfile, $content); @@ -1715,6 +1718,7 @@ class installer_base { $content = str_replace('{language}', $conf['language'], $content); $content = str_replace('{timezone}', $conf['timezone'], $content); $content = str_replace('{theme}', $conf['theme'], $content); + $content = str_replace('{language_file_import_enabled}', ($conf['language_file_import_enabled'] == true)?'true':'false', $content); wf($install_dir.'/server/lib/'.$configfile, $content); diff --git a/install/lib/update.lib.php b/install/lib/update.lib.php index 5beca81020..b4e73abb1d 100644 --- a/install/lib/update.lib.php +++ b/install/lib/update.lib.php @@ -27,6 +27,15 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +//* Installer patch stub class +class installer_patch_update { + protected function onBeforeSQL() { + } + protected function onAfterSQL() { + } +} + +//* DB dump function function prepareDBDump() { global $conf; @@ -151,16 +160,43 @@ function updateDbAndIni() { $found = true; while($found == true) { $next_db_version = intval($current_db_version + 1); - $patch_filename = realpath(dirname(__FILE__).'/../').'/sql/incremental/upd_'.str_pad($next_db_version, 4, '0', STR_PAD_LEFT).'.sql'; - if(is_file($patch_filename)) { + $sql_patch_filename = realpath(dirname(__FILE__).'/../').'/sql/incremental/upd_'.str_pad($next_db_version, 4, '0', STR_PAD_LEFT).'.sql'; + $php_patch_filename = realpath(dirname(__FILE__).'/../').'/patches/upd_'.str_pad($next_db_version, 4, '0', STR_PAD_LEFT).'.php'; + + if(is_file($sql_patch_filename)) { + + //* Load php patch file and instantiate object + if(is_file($php_patch_filename)) { + $php_patch_class_name = 'upd_'.str_pad($next_db_version, 4, '0', STR_PAD_LEFT); + include_once($php_patch_filename); + if(class_exists($php_patch_class_name)) { + $php_patch = new $php_patch_class_name; + } else { + swriteln($inst->lng('WARNING: PHP patch file').': '.$php_patch_filename.' '.$inst->lng('contains errors.')); + } + } + + //* Exec onBeforeSQL function + if(isset($php_patch) && is_object($php_patch)) { + $php_patch->onBeforeSQL(); + swriteln($inst->lng('Executing PHP patch file').': '.$php_patch_filename); + } + //* Load patch file into database if( !empty($conf["mysql"]["admin_password"]) ) { - system("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." ".escapeshellarg($conf['mysql']['database'])." < ".$patch_filename); + system("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." ".escapeshellarg($conf['mysql']['database'])." < ".$sql_patch_filename); } else { - system("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." ".escapeshellarg($conf['mysql']['database'])." < ".$patch_filename); + system("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." ".escapeshellarg($conf['mysql']['database'])." < ".$sql_patch_filename); + } + swriteln($inst->lng('Loading SQL patch file').': '.$sql_patch_filename); + + //* Exec onAfterSQL function + if(isset($php_patch) && is_object($php_patch)) { + $php_patch->onAfterSQL(); } - swriteln($inst->lng('Loading SQL patch file').': '.$patch_filename); + $current_db_version = $next_db_version; + if(isset($php_patch)) unset($php_patch); } else { $found = false; } @@ -332,4 +368,6 @@ function updateDbAndIni() { unset($new_ini); } + + ?> diff --git a/install/patches/upd_0001.php b/install/patches/upd_0001.php new file mode 100644 index 0000000000..93d6967b9d --- /dev/null +++ b/install/patches/upd_0001.php @@ -0,0 +1,21 @@ + diff --git a/install/sql/incremental/upd_0049.sql b/install/sql/incremental/upd_0049.sql index d55f0dafae..55eff842e0 100644 --- a/install/sql/incremental/upd_0049.sql +++ b/install/sql/incremental/upd_0049.sql @@ -1,2 +1 @@ -ALTER TABLE `client_template` CHANGE `limit_aps` `limit_aps` INT( 11 ) NOT NULL DEFAULT '-1'; -ALTER TABLE `web_backup` ADD `filesize` VARCHAR(10) NOT NULL AFTER `filename`; +ALTER TABLE `client_template` CHANGE `limit_aps` `limit_aps` INT( 11 ) NOT NULL DEFAULT '-1'; \ No newline at end of file diff --git a/install/sql/incremental/upd_0052.sql b/install/sql/incremental/upd_0052.sql index d92bc3265e..7ad62b2d6b 100644 --- a/install/sql/incremental/upd_0052.sql +++ b/install/sql/incremental/upd_0052.sql @@ -1,5 +1 @@ -ALTER TABLE `client_template` CHANGE `limit_aps` `limit_aps` INT( 11 ) NOT NULL DEFAULT '-1'; -ALTER TABLE `mail_domain` ADD `dkim_public` MEDIUMTEXT NOT NULL AFTER `domain`; -ALTER TABLE `mail_domain` ADD `dkim_private` MEDIUMTEXT NOT NULL AFTER `domain`; -ALTER TABLE `mail_domain` ADD `dkim` ENUM( 'n', 'y' ) NOT NULL AFTER `domain`; -ALTER TABLE `client` ADD `default_slave_dnsserver` INT( 11 ) UNSIGNED NOT NULL DEFAULT '1' AFTER `limit_dns_zone`; +ALTER TABLE `client` ADD `default_slave_dnsserver` INT( 11 ) UNSIGNED NOT NULL DEFAULT '1' AFTER `limit_dns_zone`; \ No newline at end of file diff --git a/install/sql/incremental/upd_0055.sql b/install/sql/incremental/upd_0055.sql index 3a7c5d5863..6f7a2e79ec 100644 --- a/install/sql/incremental/upd_0055.sql +++ b/install/sql/incremental/upd_0055.sql @@ -1,3 +1 @@ -ALTER TABLE `web_backup` CHANGE `backup_type` `backup_type` enum('web','mongodb','mysql') NOT NULL DEFAULT 'web'; -ALTER TABLE `web_database_user` ADD `database_password_mongo` varchar(32) DEFAULT NULL AFTER `database_password`; -ALTER TABLE `sys_datalog` ADD `error` MEDIUMTEXT NULL DEFAULT NULL; +ALTER TABLE `sys_datalog` ADD `error` MEDIUMTEXT NULL DEFAULT NULL; \ No newline at end of file diff --git a/install/sql/incremental/upd_0057.sql b/install/sql/incremental/upd_0057.sql new file mode 100644 index 0000000000..b8452fe6e9 --- /dev/null +++ b/install/sql/incremental/upd_0057.sql @@ -0,0 +1,7 @@ +CREATE TABLE IF NOT EXISTS `sys_cron` ( + `name` varchar(50) NOT NULL, + `last_run` datetime NULL DEFAULT NULL, + `next_run` datetime NULL DEFAULT NULL, + `running` tinyint(1) UNSIGNED NOT NULL DEFAULT '0', + PRIMARY KEY (`name`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; diff --git a/install/sql/incremental/upd_0058.sql b/install/sql/incremental/upd_0058.sql new file mode 100644 index 0000000000..087b499c47 --- /dev/null +++ b/install/sql/incremental/upd_0058.sql @@ -0,0 +1,3 @@ +ALTER TABLE `client` ADD COLUMN `can_use_api` enum('n','y') NOT NULL DEFAULT 'n' AFTER `canceled`; + +ALTER TABLE `remote_session` ADD COLUMN `client_login` tinyint(1) unsigned NOT NULL default '0' AFTER `remote_functions`; diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index 8480e76448..24a0a98c47 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -26,24 +26,24 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ --- Includes --- +-- Includes +-- -- iso_country_list.sql --- +-- -- This will create and then populate a MySQL table with a list of the names and -- ISO 3166 codes for countries in existence as of the date below. --- +-- -- For updates to this file, see http://27.org/isocountrylist/ -- For more about ISO 3166, see http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html --- +-- -- Created by getisocountrylist.pl on Sun Nov 2 14:59:20 2003. -- Wm. Rhodes --- +-- --- +-- -- ISPConfig 3 -- DB-Version: 3.0.0.9 --- +-- SET FOREIGN_KEY_CHECKS = 0; @@ -228,6 +228,7 @@ CREATE TABLE `client` ( `created_at` bigint(20) DEFAULT NULL, `locked` enum('n','y') NOT NULL DEFAULT 'n', `canceled` enum('n','y') NOT NULL DEFAULT 'n', + `can_use_api` enum('n','y') NOT NULL DEFAULT 'n', `tmp_data` mediumblob, `id_rsa` varchar(2000) NOT NULL DEFAULT '', `ssh_rsa` varchar(600) NOT NULL DEFAULT '', @@ -256,9 +257,9 @@ CREATE TABLE `client_circle` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `client_template` --- +-- CREATE TABLE `client_template` ( `template_id` int(11) unsigned NOT NULL auto_increment, @@ -266,7 +267,7 @@ CREATE TABLE `client_template` ( `sys_groupid` int(11) unsigned NOT NULL default '0', `sys_perm_user` varchar(5) default NULL, `sys_perm_group` varchar(5) default NULL, - `sys_perm_other` varchar(5) default NULL, + `sys_perm_other` varchar(5) default NULL, `template_name` varchar(64) NOT NULL, `template_type` varchar(1) NOT NULL default 'm', `limit_maildomain` int(11) NOT NULL default '-1', @@ -347,9 +348,9 @@ CREATE TABLE `country` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `cron` --- +-- CREATE TABLE `cron` ( `id` int(11) unsigned NOT NULL auto_increment, `sys_userid` int(11) unsigned NOT NULL default '0', @@ -372,9 +373,9 @@ CREATE TABLE `cron` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `directive_snippets` --- +-- CREATE TABLE IF NOT EXISTS `directive_snippets` ( `directive_snippets_id` int(11) unsigned NOT NULL AUTO_INCREMENT, @@ -392,9 +393,9 @@ CREATE TABLE IF NOT EXISTS `directive_snippets` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `dns_rr` --- +-- CREATE TABLE `dns_rr` ( `id` int(11) unsigned NOT NULL auto_increment, @@ -442,9 +443,9 @@ CREATE TABLE `dns_slave` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `dns_soa` --- +-- CREATE TABLE `dns_soa` ( `id` int(10) unsigned NOT NULL auto_increment, @@ -474,9 +475,9 @@ CREATE TABLE `dns_soa` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `dns_template` --- +-- CREATE TABLE `dns_template` ( `template_id` int(11) unsigned NOT NULL auto_increment, @@ -510,9 +511,9 @@ CREATE TABLE `domain` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `firewall` --- +-- CREATE TABLE `firewall` ( `firewall_id` int(11) unsigned NOT NULL auto_increment, @@ -530,9 +531,9 @@ CREATE TABLE `firewall` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `ftp_user` --- +-- CREATE TABLE `ftp_user` ( `ftp_user_id` int(11) unsigned NOT NULL auto_increment, @@ -624,9 +625,9 @@ CREATE TABLE `iptables` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `mail_access` --- +-- CREATE TABLE `mail_access` ( `access_id` int(11) unsigned NOT NULL auto_increment, @@ -646,9 +647,9 @@ CREATE TABLE `mail_access` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `mail_content_filter` --- +-- CREATE TABLE `mail_content_filter` ( `content_filter_id` int(11) unsigned NOT NULL auto_increment, @@ -668,9 +669,9 @@ CREATE TABLE `mail_content_filter` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `mail_domain` --- +-- CREATE TABLE `mail_domain` ( `domain_id` int(11) unsigned NOT NULL auto_increment, @@ -681,9 +682,6 @@ CREATE TABLE `mail_domain` ( `sys_perm_other` varchar(5) NOT NULL default '', `server_id` int(11) unsigned NOT NULL default '0', `domain` varchar(255) NOT NULL default '', - `dkim` ENUM( 'n', 'y' ) NOT NULL default 'n', - `dkim_private` mediumtext NOT NULL default '', - `dkim_public` mediumtext NOT NULL default '', `active` enum('n','y') NOT NULL, PRIMARY KEY (`domain_id`), KEY `server_id` (`server_id`,`domain`), @@ -692,9 +690,9 @@ CREATE TABLE `mail_domain` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `mail_forwarding` --- +-- CREATE TABLE `mail_forwarding` ( `forwarding_id` int(11) unsigned NOT NULL auto_increment, @@ -715,9 +713,9 @@ CREATE TABLE `mail_forwarding` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `mail_get` --- +-- CREATE TABLE `mail_get` ( `mailget_id` int(11) unsigned NOT NULL auto_increment, @@ -781,9 +779,9 @@ CREATE TABLE IF NOT EXISTS `mail_relay_recipient` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `mail_traffic` --- +-- CREATE TABLE `mail_traffic` ( `traffic_id` int(11) unsigned NOT NULL auto_increment, @@ -796,9 +794,9 @@ CREATE TABLE `mail_traffic` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `mail_transport` --- +-- CREATE TABLE `mail_transport` ( `transport_id` int(11) unsigned NOT NULL auto_increment, @@ -819,9 +817,9 @@ CREATE TABLE `mail_transport` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `mail_user` --- +-- CREATE TABLE `mail_user` ( `mailuser_id` int(11) unsigned NOT NULL auto_increment, @@ -865,9 +863,9 @@ CREATE TABLE `mail_user` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `mail_user_filter` --- +-- CREATE TABLE `mail_user_filter` ( `filter_id` int(11) unsigned NOT NULL auto_increment, @@ -1078,23 +1076,24 @@ CREATE TABLE IF NOT EXISTS `openvz_vm` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `remote_session` --- +-- CREATE TABLE `remote_session` ( `remote_session` varchar(64) NOT NULL, `remote_userid` int(11) unsigned NOT NULL, `remote_functions` text NOT NULL, + `client_login` tinyint(1) unsigned NOT NULL default '0', `tstamp` int(10) unsigned NOT NULL, PRIMARY KEY (`remote_session`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ; -- -------------------------------------------------------- --- +-- -- Table structure for table `remote_user` --- +-- CREATE TABLE `remote_user` ( `remote_userid` int(11) unsigned NOT NULL auto_increment, @@ -1111,9 +1110,9 @@ CREATE TABLE `remote_user` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `server` --- +-- CREATE TABLE `server` ( `server_id` int(11) unsigned NOT NULL auto_increment, @@ -1141,9 +1140,9 @@ CREATE TABLE `server` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `server_ip` --- +-- CREATE TABLE `server_ip` ( `server_ip_id` int(11) unsigned NOT NULL auto_increment, @@ -1217,9 +1216,9 @@ CREATE TABLE `shell_user` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `software_package` --- +-- CREATE TABLE `software_package` ( `package_id` int(11) unsigned NOT NULL auto_increment, @@ -1240,9 +1239,9 @@ CREATE TABLE `software_package` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `software_repo` --- +-- CREATE TABLE `software_repo` ( `software_repo_id` int(11) unsigned NOT NULL auto_increment, @@ -1261,9 +1260,9 @@ CREATE TABLE `software_repo` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `software_update` --- +-- CREATE TABLE `software_update` ( `software_update_id` int(11) unsigned NOT NULL auto_increment, @@ -1283,9 +1282,9 @@ CREATE TABLE `software_update` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `software_update_inst` --- +-- CREATE TABLE `software_update_inst` ( `software_update_inst_id` int(11) unsigned NOT NULL auto_increment, @@ -1299,9 +1298,9 @@ CREATE TABLE `software_update_inst` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `spamfilter_policy` --- +-- CREATE TABLE `spamfilter_policy` ( `id` int(11) unsigned NOT NULL auto_increment, @@ -1352,9 +1351,9 @@ CREATE TABLE `spamfilter_policy` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `spamfilter_users` --- +-- CREATE TABLE `spamfilter_users` ( `id` int(11) unsigned NOT NULL auto_increment, @@ -1375,9 +1374,9 @@ CREATE TABLE `spamfilter_users` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `spamfilter_wblist` --- +-- CREATE TABLE `spamfilter_wblist` ( `wblist_id` int(11) unsigned NOT NULL auto_increment, @@ -1397,9 +1396,9 @@ CREATE TABLE `spamfilter_wblist` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `support_message` --- +-- CREATE TABLE `support_message` ( `support_message_id` int(11) unsigned NOT NULL auto_increment, @@ -1432,9 +1431,24 @@ CREATE TABLE `sys_config` ( -- -------------------------------------------------------- -- --- Table structure for table `sys_datalog` +-- Table structure for table `sys_cron` -- +CREATE TABLE IF NOT EXISTS `sys_cron` ( + `name` varchar(50) NOT NULL, + `last_run` datetime NULL DEFAULT NULL, + `next_run` datetime NULL DEFAULT NULL, + `running` tinyint(1) UNSIGNED NOT NULL DEFAULT '0', + PRIMARY KEY (`name`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + +-- -------------------------------------------------------- + +-- +-- Table structure for table `sys_datalog` +-- + CREATE TABLE `sys_datalog` ( `datalog_id` int(11) unsigned NOT NULL auto_increment, `server_id` int(11) unsigned NOT NULL, @@ -1452,9 +1466,9 @@ CREATE TABLE `sys_datalog` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `sys_dbsync` --- +-- CREATE TABLE `sys_dbsync` ( `id` int(11) unsigned NOT NULL auto_increment, @@ -1476,9 +1490,9 @@ CREATE TABLE `sys_dbsync` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `sys_filesync` --- +-- CREATE TABLE `sys_filesync` ( `id` int(11) unsigned NOT NULL auto_increment, @@ -1496,9 +1510,9 @@ CREATE TABLE `sys_filesync` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `sys_group` --- +-- CREATE TABLE `sys_group` ( `groupid` int(11) unsigned NOT NULL auto_increment, @@ -1510,9 +1524,9 @@ CREATE TABLE `sys_group` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `sys_ini` --- +-- CREATE TABLE `sys_ini` ( `sysini_id` int(11) unsigned NOT NULL auto_increment, @@ -1522,9 +1536,9 @@ CREATE TABLE `sys_ini` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `sys_log` --- +-- CREATE TABLE `sys_log` ( `syslog_id` int(11) unsigned NOT NULL auto_increment, @@ -1590,9 +1604,9 @@ CREATE TABLE IF NOT EXISTS `sys_theme` ( -- -------------------------------------------------------- --- +-- -- Table structure for table `sys_user` --- +-- CREATE TABLE `sys_user` ( `userid` int(11) unsigned NOT NULL auto_increment, @@ -1613,7 +1627,7 @@ CREATE TABLE `sys_user` ( `default_group` int(11) unsigned NOT NULL default '0', `client_id` int(11) unsigned NOT NULL default '0', `id_rsa` VARCHAR( 2000 ) NOT NULL default '', - `ssh_rsa` VARCHAR( 600 ) NOT NULL default '', + `ssh_rsa` VARCHAR( 600 ) NOT NULL default '', PRIMARY KEY (`userid`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -1650,12 +1664,11 @@ CREATE TABLE `web_backup` ( `backup_id` int(10) unsigned NOT NULL AUTO_INCREMENT, `server_id` int(10) unsigned NOT NULL, `parent_domain_id` int(10) unsigned NOT NULL, - `backup_type` enum('web','mongodb','mysql') NOT NULL DEFAULT 'web', - `backup_mode` varchar(64) NOT NULL DEFAULT '', - `tstamp` int(10) unsigned NOT NULL, - `filename` varchar(255) NOT NULL, - `filesize` VARCHAR(10) NOT NULL, - PRIMARY KEY (`backup_id`) + `backup_type` enum('web','mysql') NOT NULL DEFAULT 'web', + `backup_mode` varchar(64) NOT NULL DEFAULT '', + `tstamp` int(10) unsigned NOT NULL, + `filename` varchar(255) NOT NULL, + PRIMARY KEY (`backup_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; -- -------------------------------------------------------- @@ -1706,15 +1719,14 @@ CREATE TABLE IF NOT EXISTS `web_database_user` ( `database_user` varchar(64) DEFAULT NULL, `database_user_prefix` varchar(50) NOT NULL default '', `database_password` varchar(64) DEFAULT NULL, - `database_password_mongo` varchar(32) DEFAULT NULL, PRIMARY KEY (`database_user_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; -- -------------------------------------------------------- --- +-- -- Table structure for table `web_domain` --- +-- CREATE TABLE `web_domain` ( `domain_id` int(11) unsigned NOT NULL auto_increment, @@ -2114,41 +2126,41 @@ INSERT INTO `country` (`iso`, `name`, `printable_name`, `iso3`, `numcode`) VALUE -- -------------------------------------------------------- --- +-- -- Dumping data for table `dns_template` --- +-- INSERT INTO `dns_template` (`template_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `name`, `fields`, `template`, `visible`) VALUES (1, 1, 1, 'riud', 'riud', '', 'Default', 'DOMAIN,IP,NS1,NS2,EMAIL', '[ZONE]\norigin={DOMAIN}.\nns={NS1}.\nmbox={EMAIL}.\nrefresh=7200\nretry=540\nexpire=604800\nminimum=86400\nttl=3600\n\n[DNS_RECORDS]\nA|{DOMAIN}.|{IP}|0|3600\nA|www|{IP}|0|3600\nA|mail|{IP}|0|3600\nNS|{DOMAIN}.|{NS1}.|0|3600\nNS|{DOMAIN}.|{NS2}.|0|3600\nMX|{DOMAIN}.|mail.{DOMAIN}.|10|3600', 'y'); -- -------------------------------------------------------- --- +-- -- Dumping data for table `help_faq` --- +-- INSERT INTO `help_faq` VALUES (1,1,0,'I would like to know ...','Yes, of course.',1,1,'riud','riud','r'); -- -------------------------------------------------------- --- +-- -- Dumping data for table `help_faq_sections` --- +-- INSERT INTO `help_faq_sections` VALUES (1,'General',0,NULL,NULL,NULL,NULL,NULL); -- -------------------------------------------------------- --- +-- -- Dumping data for table `software_repo` --- +-- INSERT INTO `software_repo` (`software_repo_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `repo_name`, `repo_url`, `repo_username`, `repo_password`, `active`) VALUES (1, 1, 1, 'riud', 'riud', '', 'ISPConfig Addons', 'http://repo.ispconfig.org/addons/', '', '', 'n'); -- -------------------------------------------------------- --- +-- -- Dumping data for table `spamfilter_policy` --- +-- INSERT INTO `spamfilter_policy` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `policy_name`, `virus_lover`, `spam_lover`, `banned_files_lover`, `bad_header_lover`, `bypass_virus_checks`, `bypass_spam_checks`, `bypass_banned_checks`, `bypass_header_checks`, `spam_modifies_subj`, `virus_quarantine_to`, `spam_quarantine_to`, `banned_quarantine_to`, `bad_header_quarantine_to`, `clean_quarantine_to`, `other_quarantine_to`, `spam_tag_level`, `spam_tag2_level`, `spam_kill_level`, `spam_dsn_cutoff_level`, `spam_quarantine_cutoff_level`, `addr_extension_virus`, `addr_extension_spam`, `addr_extension_banned`, `addr_extension_bad_header`, `warnvirusrecip`, `warnbannedrecip`, `warnbadhrecip`, `newvirus_admin`, `virus_admin`, `banned_admin`, `bad_header_admin`, `spam_admin`, `spam_subject_tag`, `spam_subject_tag2`, `message_size_limit`, `banned_rulenames`) VALUES(1, 1, 0, 'riud', 'riud', 'r', 'Non-paying', 'N', 'N', 'N', 'N', 'Y', 'Y', 'Y', 'N', 'Y', '', '', '', '', '', '', 3, 7, 10, 0, 0, '', '', '', '', 'N', 'N', 'N', '', '', '', '', '', '', '', 0, ''); INSERT INTO `spamfilter_policy` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `policy_name`, `virus_lover`, `spam_lover`, `banned_files_lover`, `bad_header_lover`, `bypass_virus_checks`, `bypass_spam_checks`, `bypass_banned_checks`, `bypass_header_checks`, `spam_modifies_subj`, `virus_quarantine_to`, `spam_quarantine_to`, `banned_quarantine_to`, `bad_header_quarantine_to`, `clean_quarantine_to`, `other_quarantine_to`, `spam_tag_level`, `spam_tag2_level`, `spam_kill_level`, `spam_dsn_cutoff_level`, `spam_quarantine_cutoff_level`, `addr_extension_virus`, `addr_extension_spam`, `addr_extension_banned`, `addr_extension_bad_header`, `warnvirusrecip`, `warnbannedrecip`, `warnbadhrecip`, `newvirus_admin`, `virus_admin`, `banned_admin`, `bad_header_admin`, `spam_admin`, `spam_subject_tag`, `spam_subject_tag2`, `message_size_limit`, `banned_rulenames`) VALUES(2, 1, 0, 'riud', 'riud', 'r', 'Uncensored', 'Y', 'Y', 'Y', 'Y', 'N', 'N', 'N', 'N', 'N', NULL, NULL, NULL, NULL, NULL, NULL, 3, 999, 999, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); @@ -2160,34 +2172,34 @@ INSERT INTO `spamfilter_policy` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_us -- -------------------------------------------------------- --- +-- -- Dumping data for table `sys_group` --- +-- INSERT INTO `sys_group` (`groupid`, `name`, `description`, `client_id`) VALUES (1, 'admin', 'Administrators group', 0); -- -------------------------------------------------------- --- +-- -- Dumping data for table `sys_ini` --- +-- INSERT INTO `sys_ini` (`sysini_id`, `config`) VALUES (1, ''); -- -------------------------------------------------------- --- +-- -- Dumping data for table `sys_user` --- +-- INSERT INTO `sys_theme` (`var_id`, `tpl_name`, `username`, `logo_url`) VALUES (NULL, 'default', 'global', 'themes/default/images/header_logo.png'); INSERT INTO `sys_theme` (`var_id`, `tpl_name`, `username`, `logo_url`) VALUES (NULL, 'default-v2', 'global', 'themes/default-v2/images/header_logo.png'); -- -------------------------------------------------------- --- +-- -- Dumping data for table `sys_user` --- +-- INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `username`, `passwort`, `modules`, `startmodule`, `app_theme`, `typ`, `active`, `language`, `groups`, `default_group`, `client_id`) VALUES (1, 1, 0, 'riud', 'riud', '', 'admin', '21232f297a57a5a743894a0e4a801fc3', 'dashboard,admin,client,mail,monitor,sites,dns,vm,tools,help', 'dashboard', 'default', 'admin', 1, 'en', '1,2', 1, 0); @@ -2196,7 +2208,7 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`, -- -- Dumping data for table `sys_config` -- - + INSERT INTO sys_config VALUES ('1','db','db_version','3.0.5.3'); -SET FOREIGN_KEY_CHECKS = 1; +SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file diff --git a/install/tpl/amavisd_user_config.master b/install/tpl/amavisd_user_config.master index f37795501d..c89f875883 100644 --- a/install/tpl/amavisd_user_config.master +++ b/install/tpl/amavisd_user_config.master @@ -75,12 +75,6 @@ $LOGFILE = "/var/log/amavis.log"; # (defaults to empty, no log) # Set the log_level to 5 for debugging $log_level = 0; # (defaults to 0) -# DKIM - -$enable_dkim_verification = 1; -$enable_dkim_signing = 1; # load DKIM signing code, -@dkim_signature_options_bysender_maps = ( -{ '.' => { ttl => 21*24*3600, c => 'relaxed/simple' } } ); #------------ Do not modify anything below this line ------------- 1; # insure a defined return diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master index 8c8bedd2b7..b217603e69 100644 --- a/install/tpl/config.inc.php.master +++ b/install/tpl/config.inc.php.master @@ -148,9 +148,11 @@ $conf['theme'] = '{theme}'; $conf['html_content_encoding'] = 'utf-8'; // example: utf-8, iso-8859-1, ... $conf['logo'] = 'themes/default/images/header_logo.png'; + //** Default Language and Timezone $conf['language'] = '{language}'; $conf['debug_language'] = false; +$conf['language_file_import_enabled'] = {language_file_import_enabled}; // Bool value: true / false //* Complete timezone list: http://php.net/manual/en/timezones.php $conf['timezone'] = '{timezone}'; diff --git a/install/tpl/opensuse_amavisd_conf.master b/install/tpl/opensuse_amavisd_conf.master index 5f9f867dc3..d0d8a87773 100644 --- a/install/tpl/opensuse_amavisd_conf.master +++ b/install/tpl/opensuse_amavisd_conf.master @@ -778,11 +778,5 @@ $spam_admin = undef; $DO_SYSLOG = 1; $LOGFILE = "/var/log/amavis.log"; # (defaults to empty, no log) -# DKIM - -$enable_dkim_verification = 1; -$enable_dkim_signing = 1; # load DKIM signing code, -@dkim_signature_options_bysender_maps = ( -{ '.' => { ttl => 21*24*3600, c => 'relaxed/simple' } } ); 1; # insure a defined return diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master index d22a0722f3..b822131cee 100644 --- a/install/tpl/server.ini.master +++ b/install/tpl/server.ini.master @@ -5,13 +5,12 @@ dnsserver=mydns [server] -auto_network_configuration=n -ip_address=0.0.0.0 -netmask=255.255.255.0 -v6_prefix= -gateway=0.0.0.0 -hostname=server1.domain.tld -nameservers=8.8.8.8,8.8.4.4 +auto_network_configuration=n +ip_address=0.0.0.0 +netmask=255.255.255.0 +gateway=0.0.0.0 +hostname=server1.domain.tld +nameservers=8.8.8.8,8.8.4.4 firewall=bastille loglevel=2 admin_notify_events=1 @@ -28,7 +27,6 @@ munin_password= module=postfix_mysql maildir_path=/var/vmail/[domain]/[localpart] homedir_path=/var/vmail -dkim_path=/etc/postfix/dkim pop3_imap_daemon=courier mail_filter_syntax=maildrop mailuser_uid=5000 @@ -46,7 +44,6 @@ overquota_notify_admin=y overquota_notify_client=y overquota_notify_freq=7 overquota_notify_onok=n -sendmail_path=/usr/sbin/sendmail [getmail] getmail_config_dir=/etc/getmail @@ -54,12 +51,12 @@ getmail_config_dir=/etc/getmail [web] server_type=apache website_basedir=/var/www -website_path=/var/www/clients/client[client_id]/web[website_id] -website_symlinks=/var/www/[website_domain]/:/var/www/clients/client[client_id]/[website_domain]/ -website_symlinks_rel=n -vhost_conf_dir=/etc/apache2/sites-available -vhost_conf_enabled_dir=/etc/apache2/sites-enabled -nginx_vhost_conf_dir=/etc/nginx/sites-available +website_path=/var/www/clients/client[client_id]/web[website_id] +website_symlinks=/var/www/[website_domain]/:/var/www/clients/client[client_id]/[website_domain]/ +website_symlinks_rel=n +vhost_conf_dir=/etc/apache2/sites-available +vhost_conf_enabled_dir=/etc/apache2/sites-enabled +nginx_vhost_conf_dir=/etc/nginx/sites-available nginx_vhost_conf_enabled_dir=/etc/nginx/sites-enabled security_level=20 user=www-data @@ -93,12 +90,11 @@ add_web_users_to_sshusers_group=y connect_userid_to_webid=n connect_userid_to_webid_start=10000 web_folder_protection=y -<<<<<<< .minephp_ini_check_minutes=1 -=======overquota_notify_admin=y +overquota_notify_admin=y overquota_notify_client=y overquota_notify_freq=7 overquota_notify_onok=n ->>>>>>> .theirs + [dns] bind_user=root bind_group=bind diff --git a/install/tpl/system.ini.master b/install/tpl/system.ini.master index abb89311cd..14a75e42d2 100644 --- a/install/tpl/system.ini.master +++ b/install/tpl/system.ini.master @@ -23,7 +23,6 @@ dblist_phpmyadmin_link=y phpmyadmin_url=/phpmyadmin webftp_url= client_username_web_check_disabled=n -reseller_can_use_options=n [tools] diff --git a/install/update.php b/install/update.php index b7753dc7e7..1999bc0c2d 100644 --- a/install/update.php +++ b/install/update.php @@ -34,6 +34,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. error_reporting(E_ALL|E_STRICT); +define('INSTALLER_RUN', true); + //** The banner on the command line echo "\n\n".str_repeat('-',80)."\n"; echo " _____ ___________ _____ __ _ ____ @@ -99,6 +101,7 @@ $conf['theme'] = $conf_old['theme']; if($conf['language'] == '{language}') $conf['language'] = 'en'; $conf['timezone'] = (isset($conf_old['timezone']))?$conf_old['timezone']:'UTC'; if($conf['timezone'] == '{timezone}' or trim($conf['timezone']) == '') $conf['timezone'] = 'UTC'; +$conf['language_file_import_enabled'] = (isset($conf_old['language_file_import_enabled']))?$conf_old['language_file_import_enabled']:true; if(isset($conf_old["dbmaster_host"])) $conf["mysql"]["master_host"] = $conf_old["dbmaster_host"]; if(isset($conf_old["dbmaster_database"])) $conf["mysql"]["master_database"] = $conf_old["dbmaster_database"]; @@ -341,15 +344,10 @@ if($reconfigure_services_answer == 'yes') { if($conf['services']['firewall']) { - if($conf['ufw']['installed'] == true) { - //* Configure Ubuntu Firewall - $conf['services']['firewall'] = true; - swriteln('Configuring Ubuntu Firewall'); - $inst->configure_ufw_firewall(); - } else { + if($conf['bastille']['installed'] == true) { //* Configure Bastille Firewall swriteln('Configuring Bastille Firewall'); - $inst->configure_bastille_firewall(); + $inst->configure_firewall(); } } @@ -431,7 +429,7 @@ if($reconfigure_services_answer == 'yes') { } if($conf['services']['firewall']) { - if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['ufw']['init_script'])) system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null'); + //if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['ufw']['init_script'])) system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null'); } } diff --git a/interface/cache/empty.dir b/interface/cache/empty.dir new file mode 100644 index 0000000000..95ba9ef37c --- /dev/null +++ b/interface/cache/empty.dir @@ -0,0 +1 @@ +This empty directory is needed by ISPConfig. diff --git a/interface/lib/classes/aps_base.inc.php b/interface/lib/classes/aps_base.inc.php index 4c1512ba2a..b8f6ad9232 100644 --- a/interface/lib/classes/aps_base.inc.php +++ b/interface/lib/classes/aps_base.inc.php @@ -1,103 +1,103 @@ -log_prefix = $log_prefix; - $this->interface_mode = $interface_mode; - $this->fetch_url = 'apscatalog.com'; - $this->aps_version = '1'; - $this->packages_dir = ISPC_ROOT_PATH.'/aps_packages'; - $this->interface_pkg_dir = ISPC_ROOT_PATH.'/web/sites/aps_meta_packages'; - } - - /** - * Converts a given value to it's native representation in 1024 units - * - * @param $value the size to convert - * @return integer and string - */ - public function convertSize($value) - { - $unit = array('Bytes', 'KB', 'MB', 'GB', 'TB'); - return @round($value/pow(1024, ($i = floor(log($value, 1024)))), 2).' '.$unit[$i]; - } - - /** - * Determine a specific xpath from a given SimpleXMLElement handle. If the - * element is found, it's string representation is returned. If not, - * the return value will stay empty - * - * @param $xml_handle the SimpleXMLElement handle - * @param $query the XPath query - * @param $array define whether to return an array or a string - * @return $ret the return string - */ - protected function getXPathValue($xml_handle, $query, $array = false) - { - $ret = ''; - - $xp_result = @($xml_handle->xpath($query)) ? $xml_handle->xpath($query) : false; - if($xp_result !== false) $ret = (($array === false) ? (string)$xp_result[0] : $xp_result); - - return $ret; - } -} +log_prefix = $log_prefix; + $this->interface_mode = $interface_mode; + $this->fetch_url = 'apscatalog.com'; + $this->aps_version = '1'; + $this->packages_dir = ISPC_ROOT_PATH.'/aps_packages'; + $this->interface_pkg_dir = ISPC_ROOT_PATH.'/web/sites/aps_meta_packages'; + } + + /** + * Converts a given value to it's native representation in 1024 units + * + * @param $value the size to convert + * @return integer and string + */ + public function convertSize($value) + { + $unit = array('Bytes', 'KB', 'MB', 'GB', 'TB'); + return @round($value/pow(1024, ($i = floor(log($value, 1024)))), 2).' '.$unit[$i]; + } + + /** + * Determine a specific xpath from a given SimpleXMLElement handle. If the + * element is found, it's string representation is returned. If not, + * the return value will stay empty + * + * @param $xml_handle the SimpleXMLElement handle + * @param $query the XPath query + * @param $array define whether to return an array or a string + * @return $ret the return string + */ + protected function getXPathValue($xml_handle, $query, $array = false) + { + $ret = ''; + + $xp_result = @($xml_handle->xpath($query)) ? $xml_handle->xpath($query) : false; + if($xp_result !== false) $ret = (($array === false) ? (string)$xp_result[0] : $xp_result); + + return $ret; + } +} ?> \ No newline at end of file diff --git a/interface/lib/classes/aps_crawler.inc.php b/interface/lib/classes/aps_crawler.inc.php index 2c6906efda..00b1d76327 100644 --- a/interface/lib/classes/aps_crawler.inc.php +++ b/interface/lib/classes/aps_crawler.inc.php @@ -1,592 +1,592 @@ -interface_mode) - { - if(!is_writable($this->interface_pkg_dir)) - throw new Exception('the folder '.basename($this->interface_pkg_dir).' is not writable'); - } - else - { - if(!is_writable($this->packages_dir)) - throw new Exception('the folder '.basename($this->packages_dir).' is not writable'); - } - - return true; - } - catch(Exception $e) - { - $app->log($this->log_prefix.'Aborting execution because '.$e->getMessage(), LOGLEVEL_ERROR); - return false; - } - } - - /** - * Remove a directory recursively - * In case of error be silent - * - * @param $dir the directory to remove - */ - private function removeDirectory($dir) - { - if(is_dir($dir)) - { - $files = scandir($dir); - foreach($files as $file) - { - if($file != '.' && $file != '..') - if(filetype($dir.'/'.$file) == 'dir') $this->removeDirectory($dir.'/'.$file); - else @unlink($dir.'/'.$file); - } - reset($files); - @rmdir($dir); - } - } - - - /** - * Fetch HTML data from one or more given URLs - * If a string is given, a string is returned, if an array of URLs should - * be fetched, the responses of the parallel queries are returned as array - * - * @param $input the string or array to fetch - * @return $ret a query response string or array - */ - private function fetchPage($input) - { - $ret = array(); - $url = array(); - $conn = array(); - - // Make sure we are working with an array, further on - if(!is_array($input)) $url[] = $input; - else $url = $input; - - // Build the single cURL handles and add them to a multi handle - $mh = curl_multi_init(); - for($i = 0; $i < count($url); $i++) - { - $conn[$i] = curl_init('http://'.$this->fetch_url.$url[$i]); - curl_setopt($conn[$i], CURLOPT_RETURNTRANSFER, true); - curl_multi_add_handle($mh, $conn[$i]); - } - - $active = 0; - do curl_multi_exec($mh, $active); - while($active > 0); - - // Get the response(s) - for($i = 0; $i < count($url); $i++) - { - $ret[$i] = curl_multi_getcontent($conn[$i]); - curl_multi_remove_handle($mh, $conn[$i]); - curl_close($conn[$i]); - } - curl_multi_close($mh); - - if(count($url) == 1) $ret = $ret[0]; - - return $ret; - } - - /** - * Fetch binary data from a given array - * The data is retrieved in binary mode and - * then directly written to an output file - * - * @param $input a specially structed array - * @see $this->startUpdate() - */ - private function fetchFiles($input) - { - $fh = array(); - $url = array(); - $conn = array(); - - // Build the single cURL handles and add them to a multi handle - $mh = curl_multi_init(); - - // Process each app - for($i = 0; $i < count($input); $i++) - { - $conn[$i] = curl_init($input[$i]['url']); - $fh[$i] = fopen($input[$i]['localtarget'], 'wb'); - - curl_setopt($conn[$i], CURLOPT_BINARYTRANSFER, true); - curl_setopt($conn[$i], CURLOPT_FILE, $fh[$i]); - curl_setopt($conn[$i], CURLOPT_TIMEOUT, 0); - curl_setopt($conn[$i], CURLOPT_FAILONERROR, 1); - curl_setopt($conn[$i], CURLOPT_FOLLOWLOCATION, 1); - - curl_multi_add_handle($mh, $conn[$i]); - } - - $active = 0; - do curl_multi_exec($mh, $active); - while($active > 0); - - // Close the handles - for($i = 0; $i < count($input); $i++) - { - fclose($fh[$i]); - curl_multi_remove_handle($mh, $conn[$i]); - curl_close($conn[$i]); - } - curl_multi_close($mh); - } - - /** - * A method to build query URLs out of a list of vendors - * - */ - private function formatVendorCallback($array_item) - { - $array_item = str_replace(' ', '%20', $array_item); - $array_item = str_replace('http://', '', $array_item); - $array_item = '/'.$this->aps_version.'.atom?vendor='.$array_item.'&pageSize=100'; - return($array_item); - } - - /** - * The main method which performs the actual crawling - */ - public function startCrawler() - { - global $app; - - try - { - // Make sure the requirements are given so that this script can execute - $req_ret = $this->checkRequirements(); - if(!$req_ret) return false; - - // Execute the open task and first fetch all vendors (APS catalog API 1.1, p. 12) - $app->log($this->log_prefix.'Fetching data from '.$this->fetch_url); - - $vendor_page = $this->fetchPage('/all-app/'); //$vendor_page = $this->fetchPage('/'.$this->aps_version.'/'); - preg_match_all("/\ /1.atom?vendor=typo3.org&pageSize=100 - //array_walk($vendors, array($this, 'formatVendorCallback')); - if(is_array($vendors)) { - foreach($vendors as $key => $array_item) { - $vendors[$key] = $this->formatVendorCallback($array_item); - } - } - - // Process all vendors in chunks of 50 entries - $vendor_chunks = array_chunk($vendors, 50); - //var_dump($vendor_chunks); - - // Get all known apps from the database and the highest known version - // Note: A dirty hack is used for numerical sorting of the VARCHAR field Version: +0 -> cast - // A longer but typesafe way would be: ORDER BY CAST(REPLACE(Version, '.', '') AS UNSIGNED) DESC - $existing_apps = $app->db->queryAllRecords("SELECT * FROM ( - SELECT name AS Name, CONCAT(version, '-', CAST(`release` AS CHAR)) AS CurrentVersion - FROM aps_packages ORDER BY REPLACE(version, '.', '')+0 DESC, `release` DESC - ) as Versions GROUP BY name"); - //var_dump($existing_apps); - - // Used for statistics later - $apps_in_repo = 0; - $apps_updated = 0; - $apps_downloaded = 0; - - $apps_to_dl = array(); - - for($i = 0; $i < count($vendor_chunks); $i++) - { - // Fetch all apps for the current chunk of vendors - $apps = $this->fetchPage($vendor_chunks[$i]); - - for($j = 0; $j < count($apps); $j++) - { - // Before parsing, make sure it's worth the work by checking if at least one app exists - $apps_count = substr_count($apps[$j], '0'); - if($apps_count == 0) // obviously this vendor provides one or more apps - { - // Rename namespaces and register them - $xml = str_replace("xmlns=", "ns=", $apps[$j]); - $sxe = new SimpleXMLElement($xml); - $namespaces = $sxe->getDocNamespaces(true); - foreach($namespaces as $ns => $url) $sxe->registerXPathNamespace($ns, $url); - - // Fetching values of interest - $app_name = parent::getXPathValue($sxe, 'entry[position()=1]/a:name'); - $app_version = parent::getXPathValue($sxe, 'entry[position()=1]/a:version'); - $app_release = parent::getXPathValue($sxe, 'entry[position()=1]/a:release'); - - // Find out a (possibly) existing package version - $ex_ver = ''; - /* - array_walk($existing_apps, - create_function('$v, $k, $ex_ver', 'if($v["Name"] == "'.$app_name.'") $ex_ver = $v["CurrentVersion"];'), &$ex_ver); - */ - if(is_array($existing_apps)) { - foreach($existing_apps as $k => $v) { - if($v["Name"] == $app_name) $ex_ver = $v["CurrentVersion"]; - } - } - - $new_ver = $app_version.'-'.$app_release; - $local_intf_folder = $this->interface_pkg_dir.'/'.$app_name.'-'.$new_ver.'.app.zip/'; - - // Proceed if a newer or at least equal version has been found with server mode or - // interface mode is activated and there are no valid APP-META.xml and PKG_URL existing yet - if((!$this->interface_mode && version_compare($new_ver, $ex_ver) >= 0) || ($this->interface_mode && (!file_exists($local_intf_folder.'APP-META.xml') || filesize($local_intf_folder.'APP-META.xml') == 0 || !file_exists($local_intf_folder.'PKG_URL') || filesize($local_intf_folder.'PKG_URL') == 0))){ - // Check if we already have an old version of this app - if(!empty($ex_ver) && version_compare($new_ver, $ex_ver) == 1) $apps_updated++; - - $app_dl = parent::getXPathValue($sxe, "entry[position()=1]/link[@a:type='aps']/@href"); - $app_filesize = parent::getXPathValue($sxe, "entry[position()=1]/link[@a:type='aps']/@length"); - $app_metafile = parent::getXPathValue($sxe, "entry[position()=1]/link[@a:type='meta']/@href"); - - //$this->app_download_url_list[$app_name.'-'.$new_ver.'.app.zip'] = $app_dl; - // Skip ASP.net packages because they can't be used at all - $asp_handler = parent::getXPathValue($sxe, '//aspnet:handler'); - $asp_permissions = parent::getXPathValue($sxe, '//aspnet:permissions'); - $asp_version = parent::getXPathValue($sxe, '//aspnet:version'); - if(!empty($asp_handler) || !empty($asp_permissions) || !empty($asp_version)) continue; - - // Interface mode (download only parts) - if($this->interface_mode) - { - // Delete an obviously out-dated version from the system and DB - if(!empty($ex_ver) && version_compare($new_ver, $ex_ver) == 1) - { - $old_folder = $this->interface_pkg_dir.'/'.$app_name.'-'.$ex_ver.'.app.zip'; - if(file_exists($old_folder)) $this->removeDirectory($old_folder); - - /* - $app->db->query("UPDATE aps_packages SET package_status = '".PACKAGE_OUTDATED."' WHERE name = '". - $app->db->quote($app_name)."' AND CONCAT(version, '-', CAST(`release` AS CHAR)) = '". - $app->db->quote($ex_ver)."';"); - */ - $tmp = $app->db->queryOneRecord("SELECT id FROM aps_packages WHERE name = '". - $app->db->quote($app_name)."' AND CONCAT(version, '-', CAST(`release` AS CHAR)) = '". - $app->db->quote($ex_ver)."';"); - $app->db->datalogUpdate('aps_packages', "package_status = ".PACKAGE_OUTDATED, 'id', $tmp['id']); - unset($tmp); - } - - // Create the local folder if not yet existing - if(!file_exists($local_intf_folder)) @mkdir($local_intf_folder, 0777, true); - - // Save the package URL in an extra file because it's not part of the APP-META.xml file - @file_put_contents($local_intf_folder.'PKG_URL', $app_dl); - - // Download the meta file - $local_metafile = $local_intf_folder.'APP-META.xml'; - if(!file_exists($local_metafile) || filesize($local_metafile) == 0) - { - $apps_to_dl[] = array('name' => 'APP-META.xml', - 'url' => $app_metafile, - 'filesize' => 0, - 'localtarget' => $local_metafile); - $apps_downloaded++; - } - - // Download package license - $license = parent::getXPathValue($sxe, "entry[position()=1]/link[@a:type='eula']/@href"); - if($license != '') - { - $local_license = $local_intf_folder.'LICENSE'; - if(!file_exists($local_license) || filesize($local_license) == 0) - { - $apps_to_dl[] = array('name' => basename($license), - 'url' => $license, - 'filesize' => 0, - 'localtarget' => $local_license); - } - } - - // Download package icon - $icon = parent::getXPathValue($sxe, "entry[position()=1]/link[@a:type='icon']/@href"); - if($icon != '') - { - $local_icon = $local_intf_folder.basename($icon); - if(!file_exists($local_icon) || filesize($local_icon) == 0) - { - $apps_to_dl[] = array('name' => basename($icon), - 'url' => $icon, - 'filesize' => 0, - 'localtarget' => $local_icon); - } - } - - // Download available screenshots - $screenshots = parent::getXPathValue($sxe, "entry[position()=1]/link[@a:type='screenshot']", true); - if(!empty($screenshots)) - { - foreach($screenshots as $screen) - { - $local_screen = $local_intf_folder.basename($screen['href']); - if(!file_exists($local_screen) || filesize($local_screen) == 0) - { - $apps_to_dl[] = array('name' => basename($screen['href']), - 'url' => $screen['href'], - 'filesize' => 0, - 'localtarget' => $local_screen); - } - } - } - } - else // Server mode (download whole ZIP archive) - { - // Delete an obviously out-dated version from the system - if(!empty($ex_ver) && version_compare($new_ver, $ex_ver) == 1) - { - $old_file = $this->packages_dir.'/'.$app_name.'-'.$ex_ver.'.app.zip'; - if(file_exists($old_file)) $this->removeDirectory($old_file); - } - - // Attention: $new_ver can also be == $ex_ver (according to version_compare >= 0) - $local_zip = $this->packages_dir.'/'.$app_name.'-'.$new_ver.'.app.zip'; - - // Before re-downloading a file, make sure it's not yet existing on HDD (due to DB inconsistency) - if((file_exists($local_zip) && (filesize($local_zip) == $app_filesize)) === false) - { - $apps_to_dl[] = array('name' => $app_name, - 'url' => $app_dl, - 'filesize' => $app_filesize, - 'localtarget' => $local_zip); - $apps_downloaded++; - } - } - } - - unset($sxe); - $apps_in_repo++; - } - } - //var_dump($apps); - - // For memory reasons, unset the current vendor and his apps - unset($apps); - } - - // Shuffle the download array (in order to compensate unexpected php aborts) - shuffle($apps_to_dl); - - // After collecting all provisioned apps, download them - $apps_to_dl_chunks = array_chunk($apps_to_dl, 10); - - for($i = 0; $i < count($apps_to_dl_chunks); $i++) - { - $this->fetchFiles($apps_to_dl_chunks[$i]); - - // Check the integrity of all downloaded files - // but exclude cases where no filesize is available (i.e. screenshot or metafile download) - for($j = 0; $j < count($apps_to_dl_chunks[$i]); $j++) - { - if($apps_to_dl_chunks[$i][$j]['filesize'] != 0 && - $apps_to_dl_chunks[$i][$j]['filesize'] != filesize($apps_to_dl_chunks[$i][$j]['localtarget'])) - { - $app->log($this->log_prefix.' The filesize of the package "'. - $apps_to_dl_chunks[$i][$j]['name'].'" is wrong. Download failure?', LOGLEVEL_WARN); - } - } - } - - $app->log($this->log_prefix.'Processed '.$apps_in_repo. - ' apps from the repo. Downloaded '.$apps_updated. - ' updates, '.$apps_downloaded.' new apps'); - } - catch(Exception $e) - { - $app->log($this->log_prefix.$e->getMessage(), LOGLEVEL_ERROR); - return false; - } - } - - /** - * Read in all possible packages from the interface packages folder and - * check if they are not ASP.net code (as this can't be processed). - * - * Note: There's no need to check if the packages to register are newer - * than those in the database because this already happended in startCrawler() - */ - public function parseFolderToDB() - { - global $app; - - try - { - // This method must be used in interface mode - if(!$this->interface_mode) return false; - - $pkg_list = array(); - - // Read in every package having a correct filename - $temp_handle = @dir($this->interface_pkg_dir); - if(!$temp_handle) throw new Exception('The temp directory is not accessible'); - while($folder = $temp_handle->read()) - if(substr($folder, -8) == '.app.zip') $pkg_list[] = $folder; - $temp_handle->close(); - - // If no packages are available -> exception (because at this point there should exist packages) - if(empty($pkg_list)) throw new Exception('No packages to read in'); - - // Get registered packages and mark non-existant packages with an error code to omit the install - $existing_packages = array(); - $path_query = $app->db->queryAllRecords('SELECT path AS Path FROM aps_packages;'); - foreach($path_query as $path) $existing_packages[] = $path['Path']; - $diff = array_diff($existing_packages, $pkg_list); - foreach($diff as $todelete) { - /*$app->db->query("UPDATE aps_packages SET package_status = '".PACKAGE_ERROR_NOMETA."' - WHERE path = '".$app->db->quote($todelete)."';");*/ - $tmp = $app->db->queryOneRecord("SELECT id FROM aps_packages WHERE path = '".$app->db->quote($todelete)."';"); - $app->db->datalogUpdate('aps_packages', "package_status = ".PACKAGE_ERROR_NOMETA, 'id', $tmp['id']); - unset($tmp); - } - - // Register all new packages - $new_packages = array_diff($pkg_list, $existing_packages); - foreach($new_packages as $pkg) - { - // Load in meta file if existing and register its namespaces - $metafile = $this->interface_pkg_dir.'/'.$pkg.'/APP-META.xml'; - if(!file_exists($metafile)) - { - $app->log($this->log_prefix.'Cannot read metadata from '.$pkg, LOGLEVEL_ERROR); - continue; - } - - $metadata = file_get_contents($metafile); - $metadata = str_replace("xmlns=", "ns=", $metadata); - $sxe = new SimpleXMLElement($metadata); - $namespaces = $sxe->getDocNamespaces(true); - foreach($namespaces as $ns => $url) $sxe->registerXPathNamespace($ns, $url); - - // Insert the new package - $pkg_name = parent::getXPathValue($sxe, 'name'); - $pkg_category = parent::getXPathValue($sxe, '//category'); - $pkg_version = parent::getXPathValue($sxe, 'version'); - $pkg_release = parent::getXPathValue($sxe, 'release'); - //$pkg_url = $this->app_download_url_list[$pkg]; - $pkg_url = @file_get_contents($this->interface_pkg_dir.'/'.$pkg.'/PKG_URL'); - - /* - $app->db->query("INSERT INTO `aps_packages` - (`path`, `name`, `category`, `version`, `release`, `package_status`) VALUES - ('".$app->db->quote($pkg)."', '".$app->db->quote($pkg_name)."', - '".$app->db->quote($pkg_category)."', '".$app->db->quote($pkg_version)."', - ".$app->db->quote($pkg_release).", ".PACKAGE_ENABLED.");"); - */ - // Insert only if data is complete - if($pkg != '' && $pkg_name != '' && $pkg_category != '' && $pkg_version != '' && $pkg_release != '' && $pkg_url){ - $insert_data = "(`path`, `name`, `category`, `version`, `release`, `package_url`, `package_status`) VALUES - ('".$app->db->quote($pkg)."', '".$app->db->quote($pkg_name)."', - '".$app->db->quote($pkg_category)."', '".$app->db->quote($pkg_version)."', - ".$app->db->quote($pkg_release).", '".$app->db->quote($pkg_url)."', ".PACKAGE_ENABLED.");"; - - $app->db->datalogInsert('aps_packages', $insert_data, 'id'); - } else { - if(file_exists($this->interface_pkg_dir.'/'.$pkg)) $this->removeDirectory($this->interface_pkg_dir.'/'.$pkg); - } - } - } - catch(Exception $e) - { - $app->log($this->log_prefix.$e->getMessage(), LOGLEVEL_ERROR); - $app->error($e->getMessage()); - return false; - } - } - - /** - * Add missing package URLs to database - */ - public function fixURLs() - { - global $app; - - try - { - // This method must be used in interface mode - if(!$this->interface_mode) return false; - - $incomplete_pkgs = $app->db->queryAllRecords("SELECT * FROM aps_packages WHERE package_url = ''"); - if(is_array($incomplete_pkgs) && !empty($incomplete_pkgs)){ - foreach($incomplete_pkgs as $incomplete_pkg){ - $pkg_url = @file_get_contents($this->interface_pkg_dir.'/'.$incomplete_pkg['path'].'/PKG_URL'); - if($pkg_url != ''){ - $app->db->datalogUpdate('aps_packages', "package_url = '".$pkg_url."'", 'id', $incomplete_pkg['id']); - } - } - } - } - catch(Exception $e) - { - $app->log($this->log_prefix.$e->getMessage(), LOGLEVEL_ERROR); - $app->error($e->getMessage()); - return false; - } - } -} +interface_mode) + { + if(!is_writable($this->interface_pkg_dir)) + throw new Exception('the folder '.basename($this->interface_pkg_dir).' is not writable'); + } + else + { + if(!is_writable($this->packages_dir)) + throw new Exception('the folder '.basename($this->packages_dir).' is not writable'); + } + + return true; + } + catch(Exception $e) + { + $app->log($this->log_prefix.'Aborting execution because '.$e->getMessage(), LOGLEVEL_ERROR); + return false; + } + } + + /** + * Remove a directory recursively + * In case of error be silent + * + * @param $dir the directory to remove + */ + private function removeDirectory($dir) + { + if(is_dir($dir)) + { + $files = scandir($dir); + foreach($files as $file) + { + if($file != '.' && $file != '..') + if(filetype($dir.'/'.$file) == 'dir') $this->removeDirectory($dir.'/'.$file); + else @unlink($dir.'/'.$file); + } + reset($files); + @rmdir($dir); + } + } + + + /** + * Fetch HTML data from one or more given URLs + * If a string is given, a string is returned, if an array of URLs should + * be fetched, the responses of the parallel queries are returned as array + * + * @param $input the string or array to fetch + * @return $ret a query response string or array + */ + private function fetchPage($input) + { + $ret = array(); + $url = array(); + $conn = array(); + + // Make sure we are working with an array, further on + if(!is_array($input)) $url[] = $input; + else $url = $input; + + // Build the single cURL handles and add them to a multi handle + $mh = curl_multi_init(); + for($i = 0; $i < count($url); $i++) + { + $conn[$i] = curl_init('http://'.$this->fetch_url.$url[$i]); + curl_setopt($conn[$i], CURLOPT_RETURNTRANSFER, true); + curl_multi_add_handle($mh, $conn[$i]); + } + + $active = 0; + do curl_multi_exec($mh, $active); + while($active > 0); + + // Get the response(s) + for($i = 0; $i < count($url); $i++) + { + $ret[$i] = curl_multi_getcontent($conn[$i]); + curl_multi_remove_handle($mh, $conn[$i]); + curl_close($conn[$i]); + } + curl_multi_close($mh); + + if(count($url) == 1) $ret = $ret[0]; + + return $ret; + } + + /** + * Fetch binary data from a given array + * The data is retrieved in binary mode and + * then directly written to an output file + * + * @param $input a specially structed array + * @see $this->startUpdate() + */ + private function fetchFiles($input) + { + $fh = array(); + $url = array(); + $conn = array(); + + // Build the single cURL handles and add them to a multi handle + $mh = curl_multi_init(); + + // Process each app + for($i = 0; $i < count($input); $i++) + { + $conn[$i] = curl_init($input[$i]['url']); + $fh[$i] = fopen($input[$i]['localtarget'], 'wb'); + + curl_setopt($conn[$i], CURLOPT_BINARYTRANSFER, true); + curl_setopt($conn[$i], CURLOPT_FILE, $fh[$i]); + curl_setopt($conn[$i], CURLOPT_TIMEOUT, 0); + curl_setopt($conn[$i], CURLOPT_FAILONERROR, 1); + curl_setopt($conn[$i], CURLOPT_FOLLOWLOCATION, 1); + + curl_multi_add_handle($mh, $conn[$i]); + } + + $active = 0; + do curl_multi_exec($mh, $active); + while($active > 0); + + // Close the handles + for($i = 0; $i < count($input); $i++) + { + fclose($fh[$i]); + curl_multi_remove_handle($mh, $conn[$i]); + curl_close($conn[$i]); + } + curl_multi_close($mh); + } + + /** + * A method to build query URLs out of a list of vendors + * + */ + private function formatVendorCallback($array_item) + { + $array_item = str_replace(' ', '%20', $array_item); + $array_item = str_replace('http://', '', $array_item); + $array_item = '/'.$this->aps_version.'.atom?vendor='.$array_item.'&pageSize=100'; + return($array_item); + } + + /** + * The main method which performs the actual crawling + */ + public function startCrawler() + { + global $app; + + try + { + // Make sure the requirements are given so that this script can execute + $req_ret = $this->checkRequirements(); + if(!$req_ret) return false; + + // Execute the open task and first fetch all vendors (APS catalog API 1.1, p. 12) + $app->log($this->log_prefix.'Fetching data from '.$this->fetch_url); + + $vendor_page = $this->fetchPage('/all-app/'); //$vendor_page = $this->fetchPage('/'.$this->aps_version.'/'); + preg_match_all("/\ /1.atom?vendor=typo3.org&pageSize=100 + //array_walk($vendors, array($this, 'formatVendorCallback')); + if(is_array($vendors)) { + foreach($vendors as $key => $array_item) { + $vendors[$key] = $this->formatVendorCallback($array_item); + } + } + + // Process all vendors in chunks of 50 entries + $vendor_chunks = array_chunk($vendors, 50); + //var_dump($vendor_chunks); + + // Get all known apps from the database and the highest known version + // Note: A dirty hack is used for numerical sorting of the VARCHAR field Version: +0 -> cast + // A longer but typesafe way would be: ORDER BY CAST(REPLACE(Version, '.', '') AS UNSIGNED) DESC + $existing_apps = $app->db->queryAllRecords("SELECT * FROM ( + SELECT name AS Name, CONCAT(version, '-', CAST(`release` AS CHAR)) AS CurrentVersion + FROM aps_packages ORDER BY REPLACE(version, '.', '')+0 DESC, `release` DESC + ) as Versions GROUP BY name"); + //var_dump($existing_apps); + + // Used for statistics later + $apps_in_repo = 0; + $apps_updated = 0; + $apps_downloaded = 0; + + $apps_to_dl = array(); + + for($i = 0; $i < count($vendor_chunks); $i++) + { + // Fetch all apps for the current chunk of vendors + $apps = $this->fetchPage($vendor_chunks[$i]); + + for($j = 0; $j < count($apps); $j++) + { + // Before parsing, make sure it's worth the work by checking if at least one app exists + $apps_count = substr_count($apps[$j], '0'); + if($apps_count == 0) // obviously this vendor provides one or more apps + { + // Rename namespaces and register them + $xml = str_replace("xmlns=", "ns=", $apps[$j]); + $sxe = new SimpleXMLElement($xml); + $namespaces = $sxe->getDocNamespaces(true); + foreach($namespaces as $ns => $url) $sxe->registerXPathNamespace($ns, $url); + + // Fetching values of interest + $app_name = parent::getXPathValue($sxe, 'entry[position()=1]/a:name'); + $app_version = parent::getXPathValue($sxe, 'entry[position()=1]/a:version'); + $app_release = parent::getXPathValue($sxe, 'entry[position()=1]/a:release'); + + // Find out a (possibly) existing package version + $ex_ver = ''; + /* + array_walk($existing_apps, + create_function('$v, $k, $ex_ver', 'if($v["Name"] == "'.$app_name.'") $ex_ver = $v["CurrentVersion"];'), &$ex_ver); + */ + if(is_array($existing_apps)) { + foreach($existing_apps as $k => $v) { + if($v["Name"] == $app_name) $ex_ver = $v["CurrentVersion"]; + } + } + + $new_ver = $app_version.'-'.$app_release; + $local_intf_folder = $this->interface_pkg_dir.'/'.$app_name.'-'.$new_ver.'.app.zip/'; + + // Proceed if a newer or at least equal version has been found with server mode or + // interface mode is activated and there are no valid APP-META.xml and PKG_URL existing yet + if((!$this->interface_mode && version_compare($new_ver, $ex_ver) >= 0) || ($this->interface_mode && (!file_exists($local_intf_folder.'APP-META.xml') || filesize($local_intf_folder.'APP-META.xml') == 0 || !file_exists($local_intf_folder.'PKG_URL') || filesize($local_intf_folder.'PKG_URL') == 0))){ + // Check if we already have an old version of this app + if(!empty($ex_ver) && version_compare($new_ver, $ex_ver) == 1) $apps_updated++; + + $app_dl = parent::getXPathValue($sxe, "entry[position()=1]/link[@a:type='aps']/@href"); + $app_filesize = parent::getXPathValue($sxe, "entry[position()=1]/link[@a:type='aps']/@length"); + $app_metafile = parent::getXPathValue($sxe, "entry[position()=1]/link[@a:type='meta']/@href"); + + //$this->app_download_url_list[$app_name.'-'.$new_ver.'.app.zip'] = $app_dl; + // Skip ASP.net packages because they can't be used at all + $asp_handler = parent::getXPathValue($sxe, '//aspnet:handler'); + $asp_permissions = parent::getXPathValue($sxe, '//aspnet:permissions'); + $asp_version = parent::getXPathValue($sxe, '//aspnet:version'); + if(!empty($asp_handler) || !empty($asp_permissions) || !empty($asp_version)) continue; + + // Interface mode (download only parts) + if($this->interface_mode) + { + // Delete an obviously out-dated version from the system and DB + if(!empty($ex_ver) && version_compare($new_ver, $ex_ver) == 1) + { + $old_folder = $this->interface_pkg_dir.'/'.$app_name.'-'.$ex_ver.'.app.zip'; + if(file_exists($old_folder)) $this->removeDirectory($old_folder); + + /* + $app->db->query("UPDATE aps_packages SET package_status = '".PACKAGE_OUTDATED."' WHERE name = '". + $app->db->quote($app_name)."' AND CONCAT(version, '-', CAST(`release` AS CHAR)) = '". + $app->db->quote($ex_ver)."';"); + */ + $tmp = $app->db->queryOneRecord("SELECT id FROM aps_packages WHERE name = '". + $app->db->quote($app_name)."' AND CONCAT(version, '-', CAST(`release` AS CHAR)) = '". + $app->db->quote($ex_ver)."';"); + $app->db->datalogUpdate('aps_packages', "package_status = ".PACKAGE_OUTDATED, 'id', $tmp['id']); + unset($tmp); + } + + // Create the local folder if not yet existing + if(!file_exists($local_intf_folder)) @mkdir($local_intf_folder, 0777, true); + + // Save the package URL in an extra file because it's not part of the APP-META.xml file + @file_put_contents($local_intf_folder.'PKG_URL', $app_dl); + + // Download the meta file + $local_metafile = $local_intf_folder.'APP-META.xml'; + if(!file_exists($local_metafile) || filesize($local_metafile) == 0) + { + $apps_to_dl[] = array('name' => 'APP-META.xml', + 'url' => $app_metafile, + 'filesize' => 0, + 'localtarget' => $local_metafile); + $apps_downloaded++; + } + + // Download package license + $license = parent::getXPathValue($sxe, "entry[position()=1]/link[@a:type='eula']/@href"); + if($license != '') + { + $local_license = $local_intf_folder.'LICENSE'; + if(!file_exists($local_license) || filesize($local_license) == 0) + { + $apps_to_dl[] = array('name' => basename($license), + 'url' => $license, + 'filesize' => 0, + 'localtarget' => $local_license); + } + } + + // Download package icon + $icon = parent::getXPathValue($sxe, "entry[position()=1]/link[@a:type='icon']/@href"); + if($icon != '') + { + $local_icon = $local_intf_folder.basename($icon); + if(!file_exists($local_icon) || filesize($local_icon) == 0) + { + $apps_to_dl[] = array('name' => basename($icon), + 'url' => $icon, + 'filesize' => 0, + 'localtarget' => $local_icon); + } + } + + // Download available screenshots + $screenshots = parent::getXPathValue($sxe, "entry[position()=1]/link[@a:type='screenshot']", true); + if(!empty($screenshots)) + { + foreach($screenshots as $screen) + { + $local_screen = $local_intf_folder.basename($screen['href']); + if(!file_exists($local_screen) || filesize($local_screen) == 0) + { + $apps_to_dl[] = array('name' => basename($screen['href']), + 'url' => $screen['href'], + 'filesize' => 0, + 'localtarget' => $local_screen); + } + } + } + } + else // Server mode (download whole ZIP archive) + { + // Delete an obviously out-dated version from the system + if(!empty($ex_ver) && version_compare($new_ver, $ex_ver) == 1) + { + $old_file = $this->packages_dir.'/'.$app_name.'-'.$ex_ver.'.app.zip'; + if(file_exists($old_file)) $this->removeDirectory($old_file); + } + + // Attention: $new_ver can also be == $ex_ver (according to version_compare >= 0) + $local_zip = $this->packages_dir.'/'.$app_name.'-'.$new_ver.'.app.zip'; + + // Before re-downloading a file, make sure it's not yet existing on HDD (due to DB inconsistency) + if((file_exists($local_zip) && (filesize($local_zip) == $app_filesize)) === false) + { + $apps_to_dl[] = array('name' => $app_name, + 'url' => $app_dl, + 'filesize' => $app_filesize, + 'localtarget' => $local_zip); + $apps_downloaded++; + } + } + } + + unset($sxe); + $apps_in_repo++; + } + } + //var_dump($apps); + + // For memory reasons, unset the current vendor and his apps + unset($apps); + } + + // Shuffle the download array (in order to compensate unexpected php aborts) + shuffle($apps_to_dl); + + // After collecting all provisioned apps, download them + $apps_to_dl_chunks = array_chunk($apps_to_dl, 10); + + for($i = 0; $i < count($apps_to_dl_chunks); $i++) + { + $this->fetchFiles($apps_to_dl_chunks[$i]); + + // Check the integrity of all downloaded files + // but exclude cases where no filesize is available (i.e. screenshot or metafile download) + for($j = 0; $j < count($apps_to_dl_chunks[$i]); $j++) + { + if($apps_to_dl_chunks[$i][$j]['filesize'] != 0 && + $apps_to_dl_chunks[$i][$j]['filesize'] != filesize($apps_to_dl_chunks[$i][$j]['localtarget'])) + { + $app->log($this->log_prefix.' The filesize of the package "'. + $apps_to_dl_chunks[$i][$j]['name'].'" is wrong. Download failure?', LOGLEVEL_WARN); + } + } + } + + $app->log($this->log_prefix.'Processed '.$apps_in_repo. + ' apps from the repo. Downloaded '.$apps_updated. + ' updates, '.$apps_downloaded.' new apps'); + } + catch(Exception $e) + { + $app->log($this->log_prefix.$e->getMessage(), LOGLEVEL_ERROR); + return false; + } + } + + /** + * Read in all possible packages from the interface packages folder and + * check if they are not ASP.net code (as this can't be processed). + * + * Note: There's no need to check if the packages to register are newer + * than those in the database because this already happended in startCrawler() + */ + public function parseFolderToDB() + { + global $app; + + try + { + // This method must be used in interface mode + if(!$this->interface_mode) return false; + + $pkg_list = array(); + + // Read in every package having a correct filename + $temp_handle = @dir($this->interface_pkg_dir); + if(!$temp_handle) throw new Exception('The temp directory is not accessible'); + while($folder = $temp_handle->read()) + if(substr($folder, -8) == '.app.zip') $pkg_list[] = $folder; + $temp_handle->close(); + + // If no packages are available -> exception (because at this point there should exist packages) + if(empty($pkg_list)) throw new Exception('No packages to read in'); + + // Get registered packages and mark non-existant packages with an error code to omit the install + $existing_packages = array(); + $path_query = $app->db->queryAllRecords('SELECT path AS Path FROM aps_packages;'); + foreach($path_query as $path) $existing_packages[] = $path['Path']; + $diff = array_diff($existing_packages, $pkg_list); + foreach($diff as $todelete) { + /*$app->db->query("UPDATE aps_packages SET package_status = '".PACKAGE_ERROR_NOMETA."' + WHERE path = '".$app->db->quote($todelete)."';");*/ + $tmp = $app->db->queryOneRecord("SELECT id FROM aps_packages WHERE path = '".$app->db->quote($todelete)."';"); + $app->db->datalogUpdate('aps_packages', "package_status = ".PACKAGE_ERROR_NOMETA, 'id', $tmp['id']); + unset($tmp); + } + + // Register all new packages + $new_packages = array_diff($pkg_list, $existing_packages); + foreach($new_packages as $pkg) + { + // Load in meta file if existing and register its namespaces + $metafile = $this->interface_pkg_dir.'/'.$pkg.'/APP-META.xml'; + if(!file_exists($metafile)) + { + $app->log($this->log_prefix.'Cannot read metadata from '.$pkg, LOGLEVEL_ERROR); + continue; + } + + $metadata = file_get_contents($metafile); + $metadata = str_replace("xmlns=", "ns=", $metadata); + $sxe = new SimpleXMLElement($metadata); + $namespaces = $sxe->getDocNamespaces(true); + foreach($namespaces as $ns => $url) $sxe->registerXPathNamespace($ns, $url); + + // Insert the new package + $pkg_name = parent::getXPathValue($sxe, 'name'); + $pkg_category = parent::getXPathValue($sxe, '//category'); + $pkg_version = parent::getXPathValue($sxe, 'version'); + $pkg_release = parent::getXPathValue($sxe, 'release'); + //$pkg_url = $this->app_download_url_list[$pkg]; + $pkg_url = @file_get_contents($this->interface_pkg_dir.'/'.$pkg.'/PKG_URL'); + + /* + $app->db->query("INSERT INTO `aps_packages` + (`path`, `name`, `category`, `version`, `release`, `package_status`) VALUES + ('".$app->db->quote($pkg)."', '".$app->db->quote($pkg_name)."', + '".$app->db->quote($pkg_category)."', '".$app->db->quote($pkg_version)."', + ".$app->db->quote($pkg_release).", ".PACKAGE_ENABLED.");"); + */ + // Insert only if data is complete + if($pkg != '' && $pkg_name != '' && $pkg_category != '' && $pkg_version != '' && $pkg_release != '' && $pkg_url){ + $insert_data = "(`path`, `name`, `category`, `version`, `release`, `package_url`, `package_status`) VALUES + ('".$app->db->quote($pkg)."', '".$app->db->quote($pkg_name)."', + '".$app->db->quote($pkg_category)."', '".$app->db->quote($pkg_version)."', + ".$app->db->quote($pkg_release).", '".$app->db->quote($pkg_url)."', ".PACKAGE_ENABLED.");"; + + $app->db->datalogInsert('aps_packages', $insert_data, 'id'); + } else { + if(file_exists($this->interface_pkg_dir.'/'.$pkg)) $this->removeDirectory($this->interface_pkg_dir.'/'.$pkg); + } + } + } + catch(Exception $e) + { + $app->log($this->log_prefix.$e->getMessage(), LOGLEVEL_ERROR); + $app->error($e->getMessage()); + return false; + } + } + + /** + * Add missing package URLs to database + */ + public function fixURLs() + { + global $app; + + try + { + // This method must be used in interface mode + if(!$this->interface_mode) return false; + + $incomplete_pkgs = $app->db->queryAllRecords("SELECT * FROM aps_packages WHERE package_url = ''"); + if(is_array($incomplete_pkgs) && !empty($incomplete_pkgs)){ + foreach($incomplete_pkgs as $incomplete_pkg){ + $pkg_url = @file_get_contents($this->interface_pkg_dir.'/'.$incomplete_pkg['path'].'/PKG_URL'); + if($pkg_url != ''){ + $app->db->datalogUpdate('aps_packages', "package_url = '".$pkg_url."'", 'id', $incomplete_pkg['id']); + } + } + } + } + catch(Exception $e) + { + $app->log($this->log_prefix.$e->getMessage(), LOGLEVEL_ERROR); + $app->error($e->getMessage()); + return false; + } + } +} ?> \ No newline at end of file diff --git a/interface/lib/classes/aps_guicontroller.inc.php b/interface/lib/classes/aps_guicontroller.inc.php index 5a5cbe9a7e..5d1c79fc49 100644 --- a/interface/lib/classes/aps_guicontroller.inc.php +++ b/interface/lib/classes/aps_guicontroller.inc.php @@ -728,9 +728,8 @@ class ApsGUIController extends ApsBase // Using parse_url() to filter malformed URLs $path = dirname(parse_url($_SERVER['PHP_SELF'], PHP_URL_PATH)).'/'. basename($this->interface_pkg_dir).'/'.$pkg['path'].'/'.basename((string)$icon); - // nginx: if $_SERVER['PHP_SELF'] is doubled, remove /sites/aps_packagedetails_show.php from beginning of path - $path = preg_replace('@^/sites/aps_packagedetails_show.php(.*)@', '$1', $path); - + // nginx: if $_SERVER['PHP_SELF'] is doubled, remove /sites/aps_packagedetails_show.php from beginning of path + $path = preg_replace('@^/sites/aps_packagedetails_show.php(.*)@', '$1', $path); $pkg['Icon'] = $path; } else $pkg['Icon'] = ''; @@ -744,8 +743,8 @@ class ApsGUIController extends ApsBase // Using parse_url() to filter malformed URLs $path = dirname(parse_url($_SERVER['PHP_SELF'], PHP_URL_PATH)).'/'. basename($this->interface_pkg_dir).'/'.$pkg['path'].'/'.basename((string)$screen['path']); - // nginx: if $_SERVER['PHP_SELF'] is doubled, remove /sites/aps_packagedetails_show.php from beginning of path - $path = preg_replace('@^/sites/aps_packagedetails_show.php(.*)@', '$1', $path); + // nginx: if $_SERVER['PHP_SELF'] is doubled, remove /sites/aps_packagedetails_show.php from beginning of path + $path = preg_replace('@^/sites/aps_packagedetails_show.php(.*)@', '$1', $path); $pkg['Screenshots'][] = array('ScreenPath' => $path, 'ScreenDescription' => htmlspecialchars(trim((string)$screen->description))); @@ -843,4 +842,4 @@ class ApsGUIController extends ApsBase return $pkg; } } -?> +?> \ No newline at end of file diff --git a/interface/lib/classes/custom_datasource.inc.php b/interface/lib/classes/custom_datasource.inc.php index 17aa7a2952..35bf7d55dc 100644 --- a/interface/lib/classes/custom_datasource.inc.php +++ b/interface/lib/classes/custom_datasource.inc.php @@ -105,6 +105,9 @@ class custom_datasource { case 'default_dnsserver': $field = 'dns_server'; break; + case 'default_slave_dnsserver': + $field = 'dns_server'; + break; case 'default_fileserver': $field = 'file_server'; break; diff --git a/interface/lib/classes/idn/empty.dir b/interface/lib/classes/idn/empty.dir new file mode 100644 index 0000000000..95ba9ef37c --- /dev/null +++ b/interface/lib/classes/idn/empty.dir @@ -0,0 +1 @@ +This empty directory is needed by ISPConfig. diff --git a/interface/lib/classes/listform.inc.php b/interface/lib/classes/listform.inc.php index 197c406483..ef3a52f868 100644 --- a/interface/lib/classes/listform.inc.php +++ b/interface/lib/classes/listform.inc.php @@ -199,9 +199,10 @@ class listform { $_SESSION['search']['limit'] = $app->functions->intval($_POST['search_limit']); } - if(preg_match('{^[0-9]$}',$_SESSION['search']['limit'])){ - $_SESSION['search']['limit'] = 15; - } + //if(preg_match('{^[0-9]$}',$_SESSION['search']['limit'])){ + // $_SESSION['search']['limit'] = 15; + //} + if(intval($_SESSION['search']['limit']) < 1) $_SESSION['search']['limit'] = 15; //* Get Config variables $list_name = $this->listDef['name']; diff --git a/interface/lib/classes/plugin_backuplist.inc.php b/interface/lib/classes/plugin_backuplist.inc.php index 2e0fdc5d3b..a527f233ee 100644 --- a/interface/lib/classes/plugin_backuplist.inc.php +++ b/interface/lib/classes/plugin_backuplist.inc.php @@ -57,7 +57,12 @@ class plugin_backuplist extends plugin_base { //* check if the user is owner of the parent domain $domain_backup = $app->db->queryOneRecord("SELECT parent_domain_id FROM web_backup WHERE backup_id = ".$backup_id); - if(!$app->tform->checkOwnerPermisssions($this->dataRecord["parent_domain_id"])){ + + $check_perm = 'u'; + if($_GET['backup_action'] == 'download') $check_perm = 'r'; // only check read permissions on download, not update permissions + + $get_domain = $app->db->queryOneRecord("SELECT domain_id FROM web_domain WHERE domain_id = ".$app->functions->intval($domain_backup["parent_domain_id"])." AND ".$app->tform->getAuthSQL($check_perm)); + if(empty($get_domain) || !$get_domain) { $app->error($app->tform->lng('no_domain_perm')); } diff --git a/interface/lib/classes/remoting_lib.inc.php b/interface/lib/classes/remoting_lib.inc.php index 0c40a86262..7ecc663362 100644 --- a/interface/lib/classes/remoting_lib.inc.php +++ b/interface/lib/classes/remoting_lib.inc.php @@ -785,7 +785,7 @@ class remoting_lib { } else { if($primary_id != 0) { // update client permissions only if client_id > 0 - if($this->formDef['auth'] == 'yes' && $this->client_id > 0 && $this->sys_userid > 0 && $this->sys_default_group > 0) { + if($this->formDef['auth'] == 'yes' && $this->client_id > 0) { $sql_update .= '`sys_userid` = '.$this->sys_userid.', '; $sql_update .= '`sys_groupid` = '.$this->sys_default_group.', '; } diff --git a/interface/lib/classes/simplepie.inc.php b/interface/lib/classes/simplepie.inc.php index d6d2045ec0..4fcb2c3a7b 100644 --- a/interface/lib/classes/simplepie.inc.php +++ b/interface/lib/classes/simplepie.inc.php @@ -9200,7 +9200,7 @@ class SimplePie_Misc return $return; } - function element_implode($element) + static function element_implode($element) { $full = "<$element[tag]"; foreach ($element['attribs'] as $key => $value) @@ -10879,7 +10879,7 @@ class SimplePie_Misc * @param string $data Input data * @return string Output data */ - function entities_decode($data) + static function entities_decode($data) { $decoder = new SimplePie_Decode_HTML_Entities($data); return $decoder->parse(); diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php index f4ea0d7de1..7cefb223c3 100644 --- a/interface/lib/classes/tform.inc.php +++ b/interface/lib/classes/tform.inc.php @@ -7,14 +7,14 @@ All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of ISPConfig nor the names of its contributors - may be used to endorse or promote products derived from this software without - specific prior written permission. + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of ISPConfig nor the names of its contributors + may be used to endorse or promote products derived from this software without + specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED @@ -60,250 +60,250 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. class tform { - /** - * Definition of the database table (array) - * @var tableDef - */ - var $tableDef; - - /** - * Private - * @var action - */ - var $action; - - /** - * Table name (String) - * @var table_name - */ - var $table_name; - - /** - * Debug Variable - * @var debug - */ - var $debug = 0; - - /** - * name of the primary field of the database table (string) - * @var table_index - */ - var $table_index; - - /** - * contains the error messages - * @var errorMessage - */ - var $errorMessage = ''; - - var $dateformat = "d.m.Y"; - var $formDef = array(); - var $wordbook; - var $module; - var $primary_id; + /** + * Definition of the database table (array) + * @var tableDef + */ + var $tableDef; + + /** + * Private + * @var action + */ + var $action; + + /** + * Table name (String) + * @var table_name + */ + var $table_name; + + /** + * Debug Variable + * @var debug + */ + var $debug = 0; + + /** + * name of the primary field of the database table (string) + * @var table_index + */ + var $table_index; + + /** + * contains the error messages + * @var errorMessage + */ + var $errorMessage = ''; + + var $dateformat = "d.m.Y"; + var $formDef = array(); + var $wordbook; + var $module; + var $primary_id; var $diffrec = array(); - /** - * Loading of the table definition - * - * @param file: path to the form definition file - * @return true - */ - /* - function loadTableDef($file) { - global $app,$conf; - - include_once($file); - $this->tableDef = $table; - $this->table_name = $table_name; - $this->table_index = $table_index; - return true; - } - */ - - function loadFormDef($file,$module = '') { - global $app,$conf; - - include($file); - $this->formDef = $form; - - $this->module = $module; + /** + * Loading of the table definition + * + * @param file: path to the form definition file + * @return true + */ + /* + function loadTableDef($file) { + global $app,$conf; + + include_once($file); + $this->tableDef = $table; + $this->table_name = $table_name; + $this->table_index = $table_index; + return true; + } + */ + + function loadFormDef($file,$module = '') { + global $app,$conf; + + include($file); + $this->formDef = $form; + + $this->module = $module; $wb = array(); - + include_once(ISPC_ROOT_PATH.'/lib/lang/'.$_SESSION['s']['language'].'.lng'); - + if(is_array($wb)) $wb_global = $wb; - - if($module == '') { + + if($module == '') { $lng_file = "lib/lang/".$_SESSION["s"]["language"]."_".$this->formDef["name"].".lng"; if(!file_exists($lng_file)) $lng_file = "lib/lang/en_".$this->formDef["name"].".lng"; include($lng_file); - } else { + } else { $lng_file = "../$module/lib/lang/".$_SESSION["s"]["language"]."_".$this->formDef["name"].".lng"; if(!file_exists($lng_file)) $lng_file = "../$module/lib/lang/en_".$this->formDef["name"].".lng"; include($lng_file); - } + } if(is_array($wb_global)) { $wb = $app->functions->array_merge($wb_global,$wb); } if(isset($wb_global)) unset($wb_global); - - $this->wordbook = $wb; - + + $this->wordbook = $wb; + $this->dateformat = $app->lng('conf_format_dateshort'); - return true; - } + return true; + } - /** - * Converts the data in the array to human readable format - * Datatype conversion e.g. to show the data in lists - * - * @param record - * @return record - */ - function decode($record,$tab) { - global $conf, $app; + /** + * Converts the data in the array to human readable format + * Datatype conversion e.g. to show the data in lists + * + * @param record + * @return record + */ + function decode($record,$tab) { + global $conf, $app; if(!is_array($this->formDef['tabs'][$tab])) $app->error("Tab does not exist or the tab is empty (TAB: $tab)."); - $new_record = ''; + $new_record = ''; $table_idx = $this->formDef['db_table_idx']; if(isset($record[$table_idx])) $new_record[$table_idx] = $app->functions->intval($record[$table_idx ]); - + if(is_array($record)) { foreach($this->formDef['tabs'][$tab]['fields'] as $key => $field) { - + //* Apply filter to record value. if(isset($field['filters']) && is_array($field['filters'])) { $record[$key] = $this->filterField($key, (isset($record[$key]))?$record[$key]:'', $field['filters'], 'SHOW'); } - + switch ($field['datatype']) { - case 'VARCHAR': - $new_record[$key] = $record[$key]; - break; - - case 'TEXT': - $new_record[$key] = $record[$key]; - break; + case 'VARCHAR': + $new_record[$key] = $record[$key]; + break; - case 'DATETSTAMP': - if($record[$key] > 0) { - $new_record[$key] = date($this->dateformat,$record[$key]); - } - break; + case 'TEXT': + $new_record[$key] = $record[$key]; + break; + case 'DATETSTAMP': + if($record[$key] > 0) { + $new_record[$key] = date($this->dateformat,$record[$key]); + } + break; + case 'DATE': - if($record[$key] != '' && $record[$key] != '0000-00-00') { + if($record[$key] != '' && $record[$key] != '0000-00-00') { $tmp = explode('-',$record[$key]); - $new_record[$key] = date($this->dateformat,mktime(0, 0, 0, $tmp[1] , $tmp[2], $tmp[0])); - } - break; - - case 'INTEGER': - $new_record[$key] = $app->functions->intval($record[$key]); - break; - - case 'DOUBLE': - $new_record[$key] = $record[$key]; - break; - - case 'CURRENCY': - $new_record[$key] = $app->functions->currency_format($record[$key]); - break; - - default: - $new_record[$key] = $record[$key]; - } - } - - } - - return $new_record; - } - - /** - * Get the key => value array of a form filled from a datasource definitiom - * - * @param field = array with field definition - * @param record = Dataset as array - * @return key => value array for the value field of a form - */ - - function getDatasourceData($field, $record) { - global $app; + $new_record[$key] = date($this->dateformat,mktime(0, 0, 0, $tmp[1] , $tmp[2], $tmp[0])); + } + break; - $values = array(); + case 'INTEGER': + $new_record[$key] = $app->functions->intval($record[$key]); + break; - if($field["datasource"]["type"] == 'SQL') { + case 'DOUBLE': + $new_record[$key] = $record[$key]; + break; - // Preparing SQL string. We will replace some - // common placeholders - $querystring = $field["datasource"]["querystring"]; - $querystring = str_replace("{USERID}",$_SESSION["s"]["user"]["userid"],$querystring); - $querystring = str_replace("{GROUPID}",$_SESSION["s"]["user"]["default_group"],$querystring); - $querystring = str_replace("{GROUPS}",$_SESSION["s"]["user"]["groups"],$querystring); - $table_idx = $this->formDef['db_table_idx']; + case 'CURRENCY': + $new_record[$key] = $app->functions->currency_format($record[$key]); + break; + default: + $new_record[$key] = $record[$key]; + } + } + + } + + return $new_record; + } + + /** + * Get the key => value array of a form filled from a datasource definitiom + * + * @param field = array with field definition + * @param record = Dataset as array + * @return key => value array for the value field of a form + */ + + function getDatasourceData($field, $record) { + global $app; + + $values = array(); + + if($field["datasource"]["type"] == 'SQL') { + + // Preparing SQL string. We will replace some + // common placeholders + $querystring = $field["datasource"]["querystring"]; + $querystring = str_replace("{USERID}",$_SESSION["s"]["user"]["userid"],$querystring); + $querystring = str_replace("{GROUPID}",$_SESSION["s"]["user"]["default_group"],$querystring); + $querystring = str_replace("{GROUPS}",$_SESSION["s"]["user"]["groups"],$querystring); + $table_idx = $this->formDef['db_table_idx']; + $tmp_recordid = (isset($record[$table_idx]))?$record[$table_idx]:0; - $querystring = str_replace("{RECORDID}",$tmp_recordid,$querystring); + $querystring = str_replace("{RECORDID}",$tmp_recordid,$querystring); unset($tmp_recordid); - - $querystring = str_replace("{AUTHSQL}",$this->getAuthSQL('r'),$querystring); - - // Getting the records - $tmp_records = $app->db->queryAllRecords($querystring); - if($app->db->errorMessage != '') die($app->db->errorMessage); - if(is_array($tmp_records)) { - $key_field = $field["datasource"]["keyfield"]; - $value_field = $field["datasource"]["valuefield"]; - foreach($tmp_records as $tmp_rec) { - $tmp_id = $tmp_rec[$key_field]; - $values[$tmp_id] = $tmp_rec[$value_field]; - } - } - } - - if($field["datasource"]["type"] == 'CUSTOM') { - // Calls a custom class to validate this record - if($field["datasource"]['class'] != '' and $field["datasource"]['function'] != '') { - $datasource_class = $field["datasource"]['class']; - $datasource_function = $field["datasource"]['function']; - $app->uses($datasource_class); - $values = $app->$datasource_class->$datasource_function($field, $record); - } else { - $this->errorMessage .= "Custom datasource class or function is empty
\r\n"; - } - } - - if(isset($field['filters']) && is_array($field['filters'])) { - $new_values = array(); - foreach($values as $index => $value) { - $new_index = $this->filterField($index, $index, $field['filters'], 'SHOW'); - $new_values[$new_index] = $this->filterField($index, (isset($values[$index]))?$values[$index]:'', $field['filters'], 'SHOW'); - } - $values = $new_values; - unset($new_values); - unset($new_index); - } - - return $values; - - } - + + $querystring = str_replace("{AUTHSQL}",$this->getAuthSQL('r'),$querystring); + + // Getting the records + $tmp_records = $app->db->queryAllRecords($querystring); + if($app->db->errorMessage != '') die($app->db->errorMessage); + if(is_array($tmp_records)) { + $key_field = $field["datasource"]["keyfield"]; + $value_field = $field["datasource"]["valuefield"]; + foreach($tmp_records as $tmp_rec) { + $tmp_id = $tmp_rec[$key_field]; + $values[$tmp_id] = $tmp_rec[$value_field]; + } + } + } + + if($field["datasource"]["type"] == 'CUSTOM') { + // Calls a custom class to validate this record + if($field["datasource"]['class'] != '' and $field["datasource"]['function'] != '') { + $datasource_class = $field["datasource"]['class']; + $datasource_function = $field["datasource"]['function']; + $app->uses($datasource_class); + $values = $app->$datasource_class->$datasource_function($field, $record); + } else { + $this->errorMessage .= "Custom datasource class or function is empty
\r\n"; + } + } + + if(isset($field['filters']) && is_array($field['filters'])) { + $new_values = array(); + foreach($values as $index => $value) { + $new_index = $this->filterField($index, $index, $field['filters'], 'SHOW'); + $new_values[$new_index] = $this->filterField($index, (isset($values[$index]))?$values[$index]:'', $field['filters'], 'SHOW'); + } + $values = $new_values; + unset($new_values); + unset($new_index); + } + + return $values; + + } + //* If the parameter 'valuelimit' is set function applyValueLimit($limit,$values) { - + global $app; - + $limit_parts = explode(':',$limit); - + //* values are limited to a comma separated list if($limit_parts[0] == 'list') { $allowed = explode(',',$limit_parts[1]); } - + //* values are limited to a field in the client settings if($limit_parts[0] == 'client') { if($_SESSION["s"]["user"]["typ"] == 'admin') { @@ -314,7 +314,7 @@ class tform { $allowed = explode(',',$client['lm']); } } - + //* values are limited to a field in the reseller settings if($limit_parts[0] == 'reseller') { if($_SESSION["s"]["user"]["typ"] == 'admin') { @@ -326,12 +326,12 @@ class tform { //echo "SELECT parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"; //* If the client belongs to a reseller, we will check against the reseller Limit too if($client['parent_client_id'] != 0) { - + //* first we need to know the groups of this reseller $tmp = $app->db->queryOneRecord("SELECT userid, groups FROM sys_user WHERE client_id = ".$client['parent_client_id']); $reseller_groups = $tmp["groups"]; $reseller_userid = $tmp["userid"]; - + // Get the limits of the reseller of the logged in client $client_group_id = $_SESSION["s"]["user"]["default_group"]; $reseller = $app->db->queryOneRecord("SELECT ".$limit_parts[1]." as lm FROM client WHERE client_id = ".$client['parent_client_id']); @@ -341,7 +341,7 @@ class tform { } } // end if admin } // end if reseller - + //* values are limited to a field in the system settings if($limit_parts[0] == 'system') { $app->uses('getconf'); @@ -349,296 +349,296 @@ class tform { $tmp_key = $limit_parts[2]; $allowed = $tmp_conf[$tmp_key]; } - + $values_new = array(); foreach($values as $key => $val) { if(in_array($key,$allowed)) $values_new[$key] = $val; } - + return $values_new; } - /** - * Prepare the data record to show the data in a form. - * - * @param record = Datensatz als Array - * @param action = NEW oder EDIT - * @return record - */ - function getHTML($record, $tab, $action = 'NEW') { - - global $app; + /** + * Prepare the data record to show the data in a form. + * + * @param record = Datensatz als Array + * @param action = NEW oder EDIT + * @return record + */ + function getHTML($record, $tab, $action = 'NEW') { - $this->action = $action; + global $app; - if(!is_array($this->formDef)) $app->error("No form definition found."); - if(!is_array($this->formDef['tabs'][$tab])) $app->error("The tab is empty or does not exist (TAB: $tab)."); + $this->action = $action; - $new_record = array(); - if($action == 'EDIT') { - $record = $this->decode($record,$tab); - if(is_array($record)) { - foreach($this->formDef['tabs'][$tab]['fields'] as $key => $field) { + if(!is_array($this->formDef)) $app->error("No form definition found."); + if(!is_array($this->formDef['tabs'][$tab])) $app->error("The tab is empty or does not exist (TAB: $tab)."); - if(isset($record[$key])) { + $new_record = array(); + if($action == 'EDIT') { + $record = $this->decode($record,$tab); + if(is_array($record)) { + foreach($this->formDef['tabs'][$tab]['fields'] as $key => $field) { + + if(isset($record[$key])) { $val = $record[$key]; } else { $val = ''; } - // If Datasource is set, get the data from there - if(isset($field['datasource']) && is_array($field['datasource'])) { + // If Datasource is set, get the data from there + if(isset($field['datasource']) && is_array($field['datasource'])) { if(is_array($field["value"])) { //$field["value"] = array_merge($field["value"],$this->getDatasourceData($field, $record)); $field["value"] = $app->functions->array_merge($field["value"],$this->getDatasourceData($field, $record)); } else { - $field["value"] = $this->getDatasourceData($field, $record); + $field["value"] = $this->getDatasourceData($field, $record); } - } - + } + // If a limitation for the values is set if(isset($field['valuelimit']) && is_array($field["value"])) { $field["value"] = $this->applyValueLimit($field['valuelimit'],$field["value"]); } - switch ($field['formtype']) { - case 'SELECT': + switch ($field['formtype']) { + case 'SELECT': $out = ''; - if(is_array($field['value'])) { - foreach($field['value'] as $k => $v) { - $selected = ($k == $val)?' SELECTED':''; + if(is_array($field['value'])) { + foreach($field['value'] as $k => $v) { + $selected = ($k == $val)?' SELECTED':''; if(!empty($this->wordbook[$v])) $v = $this->wordbook[$v]; - $out .= "\r\n"; - } - } - $new_record[$key] = $out; - break; - case 'MULTIPLE': - if(is_array($field['value'])) { - - // Split - $vals = explode($field['separator'],$val); - - // write HTML - $out = ''; - foreach($field['value'] as $k => $v) { - - $selected = ''; - foreach($vals as $tvl) { - if(trim($tvl) == trim($k)) $selected = ' SELECTED'; - } - - $out .= "\r\n"; - } - } - $new_record[$key] = $out; - break; - - case 'PASSWORD': - $new_record[$key] = ''; - break; - - case 'CHECKBOX': - $checked = ($val == $field['value'][1])?' CHECKED':''; - $new_record[$key] = "\r\n"; - break; - - case 'CHECKBOXARRAY': - if(is_array($field['value'])) { - - // aufsplitten ergebnisse - $vals = explode($field['separator'],$val); - - // HTML schreiben - $out = ''; - $elementNo = 0; - foreach($field['value'] as $k => $v) { - - $checked = ''; - foreach($vals as $tvl) { - if(trim($tvl) == trim($k)) $checked = ' CHECKED'; - } - // $out .= "\r\n"; + $out .= "\r\n"; + } + } + $new_record[$key] = $out; + break; + case 'MULTIPLE': + if(is_array($field['value'])) { + + // Split + $vals = explode($field['separator'],$val); + + // write HTML + $out = ''; + foreach($field['value'] as $k => $v) { + + $selected = ''; + foreach($vals as $tvl) { + if(trim($tvl) == trim($k)) $selected = ' SELECTED'; + } + + $out .= "\r\n"; + } + } + $new_record[$key] = $out; + break; + + case 'PASSWORD': + $new_record[$key] = ''; + break; + + case 'CHECKBOX': + $checked = ($val == $field['value'][1])?' CHECKED':''; + $new_record[$key] = "\r\n"; + break; + + case 'CHECKBOXARRAY': + if(is_array($field['value'])) { + + // aufsplitten ergebnisse + $vals = explode($field['separator'],$val); + + // HTML schreiben + $out = ''; + $elementNo = 0; + foreach($field['value'] as $k => $v) { + + $checked = ''; + foreach($vals as $tvl) { + if(trim($tvl) == trim($k)) $checked = ' CHECKED'; + } + // $out .= "\r\n"; $out .= "
\r\n"; - $elementNo++; - } - } - $new_record[$key] = $out; - break; - - case 'RADIO': - if(is_array($field['value'])) { - - // HTML schreiben - $out = ''; - $elementNo = 0; - foreach($field['value'] as $k => $v) { - $checked = ($k == $val)?' CHECKED':''; - //$out .= "\r\n"; + $elementNo++; + } + } + $new_record[$key] = $out; + break; + + case 'RADIO': + if(is_array($field['value'])) { + + // HTML schreiben + $out = ''; + $elementNo = 0; + foreach($field['value'] as $k => $v) { + $checked = ($k == $val)?' CHECKED':''; + //$out .= "\r\n"; $out .= "\r\n"; - $elementNo++; - } - } - $new_record[$key] = $out; - break; - - case 'DATETIME': - if (strtotime($val) !== false) { - $dt_value = $val; - } elseif ( isset($field['default']) && (strtotime($field['default']) !== false) ) { - $dt_value = $field['default']; - } else { - $dt_value = 0; - } - - $display_seconds = (isset($field['display_seconds']) && $field['display_seconds'] == true) ? true : false; - - $new_record[$key] = $this->_getDateTimeHTML($key, $dt_value, $display_seconds); - break; - - default: + $elementNo++; + } + } + $new_record[$key] = $out; + break; + + case 'DATETIME': + if (strtotime($val) !== false) { + $dt_value = $val; + } elseif ( isset($field['default']) && (strtotime($field['default']) !== false) ) { + $dt_value = $field['default']; + } else { + $dt_value = 0; + } + + $display_seconds = (isset($field['display_seconds']) && $field['display_seconds'] == true) ? true : false; + + $new_record[$key] = $this->_getDateTimeHTML($key, $dt_value, $display_seconds); + break; + + default: if(isset($record[$key])) { - $new_record[$key] = htmlspecialchars($record[$key]); + $new_record[$key] = htmlspecialchars($record[$key]); } else { $new_record[$key] = ''; } - } - } - } - } else { - // Action: NEW - foreach($this->formDef['tabs'][$tab]['fields'] as $key => $field) { - - // If Datasource is set, get the data from there - if(@is_array($field['datasource'])) { - if(is_array($field["value"])) { + } + } + } + } else { + // Action: NEW + foreach($this->formDef['tabs'][$tab]['fields'] as $key => $field) { + + // If Datasource is set, get the data from there + if(@is_array($field['datasource'])) { + if(is_array($field["value"])) { $field["value"] = $app->functions->array_merge($field["value"],$this->getDatasourceData($field, $record)); } else { - $field["value"] = $this->getDatasourceData($field, $record); + $field["value"] = $this->getDatasourceData($field, $record); } - } - + } + // If a limitation for the values is set if(isset($field['valuelimit']) && is_array($field["value"])) { $field["value"] = $this->applyValueLimit($field['valuelimit'],$field["value"]); } - switch ($field['formtype']) { - case 'SELECT': - if(is_array($field['value'])) { - $out = ''; - foreach($field['value'] as $k => $v) { - $selected = ($k == $field["default"])?' SELECTED':''; - $out .= "\r\n"; - } - } - if(isset($out)) $new_record[$key] = $out; - break; - case 'MULTIPLE': - if(is_array($field['value'])) { + switch ($field['formtype']) { + case 'SELECT': + if(is_array($field['value'])) { + $out = ''; + foreach($field['value'] as $k => $v) { + $selected = ($k == $field["default"])?' SELECTED':''; + $out .= "\r\n"; + } + } + if(isset($out)) $new_record[$key] = $out; + break; + case 'MULTIPLE': + if(is_array($field['value'])) { - // aufsplitten ergebnisse - $vals = explode($field['separator'],$val); + // aufsplitten ergebnisse + $vals = explode($field['separator'],$val); - // HTML schreiben - $out = ''; - foreach($field['value'] as $k => $v) { + // HTML schreiben + $out = ''; + foreach($field['value'] as $k => $v) { - $out .= "\r\n"; - } - } - $new_record[$key] = $out; - break; + $out .= "\r\n"; + } + } + $new_record[$key] = $out; + break; case 'PASSWORD': //$new_record[$key] = ''; $new_record[$key] = htmlspecialchars($field['default']); break; - case 'CHECKBOX': - // $checked = (empty($field["default"]))?'':' CHECKED'; - $checked = ($field["default"] == $field['value'][1])?' CHECKED':''; - $new_record[$key] = "\r\n"; - break; + case 'CHECKBOX': + // $checked = (empty($field["default"]))?'':' CHECKED'; + $checked = ($field["default"] == $field['value'][1])?' CHECKED':''; + $new_record[$key] = "\r\n"; + break; - case 'CHECKBOXARRAY': - if(is_array($field['value'])) { + case 'CHECKBOXARRAY': + if(is_array($field['value'])) { - // aufsplitten ergebnisse - $vals = explode($field['separator'],$field["default"]); + // aufsplitten ergebnisse + $vals = explode($field['separator'],$field["default"]); - // HTML schreiben - $out = ''; - $elementNo = 0; - foreach($field['value'] as $k => $v) { + // HTML schreiben + $out = ''; + $elementNo = 0; + foreach($field['value'] as $k => $v) { - $checked = ''; - foreach($vals as $tvl) { - if(trim($tvl) == trim($k)) $checked = ' CHECKED'; - } - // $out .= "\r\n"; + $checked = ''; + foreach($vals as $tvl) { + if(trim($tvl) == trim($k)) $checked = ' CHECKED'; + } + // $out .= "\r\n"; $out .= "  \r\n"; - $elementNo++; - } - } - $new_record[$key] = $out; - break; + $elementNo++; + } + } + $new_record[$key] = $out; + break; - case 'RADIO': - if(is_array($field['value'])) { + case 'RADIO': + if(is_array($field['value'])) { - // HTML schreiben - $out = ''; - $elementNo = 0; - foreach($field['value'] as $k => $v) { - $checked = ($k == $field["default"])?' CHECKED':''; - //$out .= "\r\n"; + // HTML schreiben + $out = ''; + $elementNo = 0; + foreach($field['value'] as $k => $v) { + $checked = ($k == $field["default"])?' CHECKED':''; + //$out .= "\r\n"; $out .= "\r\n"; - $elementNo++; - } - } - $new_record[$key] = $out; - break; - - case 'DATETIME': - $dt_value = (isset($field['default'])) ? $field['default'] : 0; - $display_seconds = (isset($field['display_seconds']) && $field['display_seconds'] == true) ? true : false; - - $new_record[$key] = $this->_getDateTimeHTML($key, $dt_value, $display_seconds); - break; + $elementNo++; + } + } + $new_record[$key] = $out; + break; + + case 'DATETIME': + $dt_value = (isset($field['default'])) ? $field['default'] : 0; + $display_seconds = (isset($field['display_seconds']) && $field['display_seconds'] == true) ? true : false; + + $new_record[$key] = $this->_getDateTimeHTML($key, $dt_value, $display_seconds); + break; - default: - $new_record[$key] = htmlspecialchars($field['default']); - } - } + default: + $new_record[$key] = htmlspecialchars($field['default']); + } + } - } + } - if($this->debug == 1) $this->dbg($new_record); + if($this->debug == 1) $this->dbg($new_record); - return $new_record; - } + return $new_record; + } - /** - * Rewrite the record data to be stored in the database - * and check values with regular expressions. - * - * @param record = Datensatz als Array - * @return record - */ - function encode($record,$tab,$dbencode = true) { + /** + * Rewrite the record data to be stored in the database + * and check values with regular expressions. + * + * @param record = Datensatz als Array + * @return record + */ + function encode($record,$tab,$dbencode = true) { global $app; + + if(!is_array($this->formDef['tabs'][$tab])) $app->error("Tab is empty or does not exist (TAB: $tab)."); + //$this->errorMessage = ''; - if(!is_array($this->formDef['tabs'][$tab])) $app->error("Tab is empty or does not exist (TAB: $tab)."); - //$this->errorMessage = ''; - - if(is_array($record)) { - foreach($this->formDef['tabs'][$tab]['fields'] as $key => $field) { - + if(is_array($record)) { + foreach($this->formDef['tabs'][$tab]['fields'] as $key => $field) { + //* Apply filter to record value - if(isset($field['filters']) && is_array($field['filters'])) { + if(isset($field['filters']) && is_array($field['filters'])) { $record[$key] = $this->filterField($key, (isset($record[$key]))?$record[$key]:'', $field['filters'], 'SAVE'); } //* Validate record value @@ -646,31 +646,31 @@ class tform { $this->validateField($key, (isset($record[$key]))?$record[$key]:'', $field['validators']); } - switch ($field['datatype']) { - case 'VARCHAR': - if(!@is_array($record[$key])) { + switch ($field['datatype']) { + case 'VARCHAR': + if(!@is_array($record[$key])) { $new_record[$key] = (isset($record[$key]))?$record[$key]:''; - } else { - $new_record[$key] = implode($field['separator'],$record[$key]); - } - break; - case 'TEXT': - if(!is_array($record[$key])) { - $new_record[$key] = $record[$key]; - } else { - $new_record[$key] = implode($field['separator'],$record[$key]); - } - break; - case 'DATETSTAMP': - if($record[$key] > 0) { - list($tag,$monat,$jahr) = explode('.',$record[$key]); - $new_record[$key] = mktime(0,0,0,$monat,$tag,$jahr); - } else { + } else { + $new_record[$key] = implode($field['separator'],$record[$key]); + } + break; + case 'TEXT': + if(!is_array($record[$key])) { + $new_record[$key] = $record[$key]; + } else { + $new_record[$key] = implode($field['separator'],$record[$key]); + } + break; + case 'DATETSTAMP': + if($record[$key] > 0) { + list($tag,$monat,$jahr) = explode('.',$record[$key]); + $new_record[$key] = mktime(0,0,0,$monat,$tag,$jahr); + } else { $new_record[$key] = 0; } - break; + break; case 'DATE': - if($record[$key] != '' && $record[$key] != '0000-00-00') { + if($record[$key] != '' && $record[$key] != '0000-00-00') { if(function_exists('date_parse_from_format')) { $date_parts = date_parse_from_format($this->dateformat,$record[$key]); //list($tag,$monat,$jahr) = explode('.',$record[$key]); @@ -683,67 +683,67 @@ class tform { $tmp = strtotime($record[$key]); $new_record[$key] = date('Y-m-d',$tmp); } - } else { + } else { $new_record[$key] = '0000-00-00'; } - break; - case 'INTEGER': + break; + case 'INTEGER': $new_record[$key] = (isset($record[$key]))?$app->functions->intval($record[$key]):0; - //if($new_record[$key] != $record[$key]) $new_record[$key] = $field['default']; - //if($key == 'refresh') die($record[$key]); - break; - case 'DOUBLE': - $new_record[$key] = $record[$key]; - break; - case 'CURRENCY': - $new_record[$key] = str_replace(",",".",$record[$key]); - break; - - case 'DATETIME': - if (is_array($record[$key])) - { - $filtered_values = array_map(create_function('$item','return (int)$item;'), $record[$key]); - extract($filtered_values, EXTR_PREFIX_ALL, '_dt'); - - if ($_dt_day != 0 && $_dt_month != 0 && $_dt_year != 0) { - $new_record[$key] = date( 'Y-m-d H:i:s', mktime($_dt_hour, $_dt_minute, $_dt_second, $_dt_month, $_dt_day, $_dt_year) ); - } - } - break; - } - - // The use of the field value is deprecated, use validators instead - if(isset($field['regex']) && $field['regex'] != '') { - // Enable that "." matches also newlines - $field['regex'] .= 's'; - if(!preg_match($field['regex'], $record[$key])) { - $errmsg = $field['errmsg']; - $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n"; - } - } - + //if($new_record[$key] != $record[$key]) $new_record[$key] = $field['default']; + //if($key == 'refresh') die($record[$key]); + break; + case 'DOUBLE': + $new_record[$key] = $record[$key]; + break; + case 'CURRENCY': + $new_record[$key] = str_replace(",",".",$record[$key]); + break; + + case 'DATETIME': + if (is_array($record[$key])) + { + $filtered_values = array_map(create_function('$item','return (int)$item;'), $record[$key]); + extract($filtered_values, EXTR_PREFIX_ALL, '_dt'); + + if ($_dt_day != 0 && $_dt_month != 0 && $_dt_year != 0) { + $new_record[$key] = date( 'Y-m-d H:i:s', mktime($_dt_hour, $_dt_minute, $_dt_second, $_dt_month, $_dt_day, $_dt_year) ); + } + } + break; + } + + // The use of the field value is deprecated, use validators instead + if(isset($field['regex']) && $field['regex'] != '') { + // Enable that "." matches also newlines + $field['regex'] .= 's'; + if(!preg_match($field['regex'], $record[$key])) { + $errmsg = $field['errmsg']; + $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n"; + } + } + //* Add slashes to all records, when we encode data which shall be inserted into mysql. if($dbencode == true) $new_record[$key] = $app->db->quote($new_record[$key]); - } - } - return $new_record; - } - + } + } + return $new_record; + } + /** - * process the filters for a given field. - * - * @param field_name = Name of the field - * @param field_value = value of the field - * @param filters = Array of filters + * process the filters for a given field. + * + * @param field_name = Name of the field + * @param field_value = value of the field + * @param filters = Array of filters * @param filter_event = 'SAVE'or 'SHOW' - * @return record - */ + * @return record + */ - function filterField($field_name, $field_value, $filters, $filter_event) { + function filterField($field_name, $field_value, $filters, $filter_event) { global $app; $returnval = $field_value; - + //* Loop trough all filters foreach($filters as $filter) { if($filter['event'] == $filter_event) { @@ -766,177 +766,179 @@ class tform { } } } - return $returnval; - } - - /** - * process the validators for a given field. - * - * @param field_name = Name of the field - * @param field_value = value of the field - * @param validatoors = Array of validators - * @return record - */ - - function validateField($field_name, $field_value, $validators) { - - global $app; - + return $returnval; + } + + /** + * process the validators for a given field. + * + * @param field_name = Name of the field + * @param field_value = value of the field + * @param validatoors = Array of validators + * @return record + */ + + function validateField($field_name, $field_value, $validators) { + + global $app; + $escape = '`'; - - // loop trough the validators - foreach($validators as $validator) { - - switch ($validator['type']) { - case 'REGEX': - $validator['regex'] .= 's'; - if(!preg_match($validator['regex'], $field_value)) { - $errmsg = $validator['errmsg']; - if(isset($this->wordbook[$errmsg])) { - $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n"; + + // loop trough the validators + foreach($validators as $validator) { + + switch ($validator['type']) { + case 'REGEX': + $validator['regex'] .= 's'; + if(!preg_match($validator['regex'], $field_value)) { + $errmsg = $validator['errmsg']; + if(isset($this->wordbook[$errmsg])) { + $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n"; } else { $this->errorMessage .= $errmsg."
\r\n"; } - } - break; - case 'UNIQUE': + } + break; + case 'UNIQUE': if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n'; if($validator['allowempty'] == 'n' || ($validator['allowempty'] == 'y' && $field_value != '')){ if($this->action == 'NEW') { - $num_rec = $app->db->queryOneRecord("SELECT count(*) as number FROM ".$escape.$this->formDef['db_table'].$escape. " WHERE $field_name = '".$app->db->quote($field_value)."'"); - if($num_rec["number"] > 0) { - $errmsg = $validator['errmsg']; + $num_rec = $app->db->queryOneRecord("SELECT count(*) as number FROM ".$escape.$this->formDef['db_table'].$escape. " WHERE $field_name = '".$app->db->quote($field_value)."'"); + if($num_rec["number"] > 0) { + $errmsg = $validator['errmsg']; if(isset($this->wordbook[$errmsg])) { - $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n"; + $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n"; } else { $this->errorMessage .= $errmsg."
\r\n"; } - } + } } else { - $num_rec = $app->db->queryOneRecord("SELECT count(*) as number FROM ".$escape.$this->formDef['db_table'].$escape. " WHERE $field_name = '".$app->db->quote($field_value)."' AND ".$this->formDef['db_table_idx']." != ".$this->primary_id); - if($num_rec["number"] > 0) { - $errmsg = $validator['errmsg']; - if(isset($this->wordbook[$errmsg])) { - $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n"; + $num_rec = $app->db->queryOneRecord("SELECT count(*) as number FROM ".$escape.$this->formDef['db_table'].$escape. " WHERE $field_name = '".$app->db->quote($field_value)."' AND ".$this->formDef['db_table_idx']." != ".$this->primary_id); + if($num_rec["number"] > 0) { + $errmsg = $validator['errmsg']; + if(isset($this->wordbook[$errmsg])) { + $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n"; } else { $this->errorMessage .= $errmsg."
\r\n"; } - } + } } } - break; - case 'NOTEMPTY': - if(empty($field_value)) { - $errmsg = $validator['errmsg']; - if(isset($this->wordbook[$errmsg])) { - $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n"; + break; + case 'NOTEMPTY': + if(empty($field_value)) { + $errmsg = $validator['errmsg']; + if(isset($this->wordbook[$errmsg])) { + $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n"; } else { $this->errorMessage .= $errmsg."
\r\n"; } - } - break; - case 'ISEMAIL': - if(function_exists('filter_var')) { + } + break; + case 'ISEMAIL': + if(function_exists('filter_var')) { if(filter_var($field_value, FILTER_VALIDATE_EMAIL) === false) { $errmsg = $validator['errmsg']; - if(isset($this->wordbook[$errmsg])) { - $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n"; + if(isset($this->wordbook[$errmsg])) { + $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n"; } else { $this->errorMessage .= $errmsg."
\r\n"; } - } + } } else { if(!preg_match("/^\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\w+\.[a-zA-Z0-9\-]{2,30}$/i", $field_value)) { - $errmsg = $validator['errmsg']; - if(isset($this->wordbook[$errmsg])) { - $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n"; + $errmsg = $validator['errmsg']; + if(isset($this->wordbook[$errmsg])) { + $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n"; } else { $this->errorMessage .= $errmsg."
\r\n"; } - } + } } - break; - case 'ISINT': + break; + case 'ISINT': if(function_exists('filter_var') && $field_value < 2147483647) { if($field_value != '' && filter_var($field_value, FILTER_VALIDATE_INT) === false) { $errmsg = $validator['errmsg']; if(isset($this->wordbook[$errmsg])) { - $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n"; + $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n"; } else { $this->errorMessage .= $errmsg."
\r\n"; } - } + } } else { - $tmpval = $app->functions->intval($field_value); - if($tmpval === 0 and !empty($field_value)) { - $errmsg = $validator['errmsg']; - if(isset($this->wordbook[$errmsg])) { - $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n"; + $tmpval = $app->functions->intval($field_value); + if($tmpval === 0 and !empty($field_value)) { + $errmsg = $validator['errmsg']; + if(isset($this->wordbook[$errmsg])) { + $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n"; } else { $this->errorMessage .= $errmsg."
\r\n"; } - } + } } - break; - case 'ISPOSITIVE': - if(!is_numeric($field_value) || $field_value <= 0){ - $errmsg = $validator['errmsg']; - if(isset($this->wordbook[$errmsg])) { - $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n"; + break; + case 'ISPOSITIVE': + if(!is_numeric($field_value) || $field_value <= 0){ + $errmsg = $validator['errmsg']; + if(isset($this->wordbook[$errmsg])) { + $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n"; } else { $this->errorMessage .= $errmsg."
\r\n"; - } - } - break; - case 'ISV6PREFIX': - $v6_prefix_ok = 0; - $explode_field_value = explode(':',$field_value); - if ($explode_field_value[count($explode_field_value)-1]=='' && $explode_field_value[count($explode_field_value)-2]=='' ){ - if ( count($explode_field_value) <= 9 ) { - if(filter_var(substr($field_value,0,strlen($field_value)-2),FILTER_VALIDATE_IP,FILTER_FLAG_IPV6) or filter_var(substr($field_value,0,strlen($field_value)-2).'::0',FILTER_VALIDATE_IP,FILTER_FLAG_IPV6) or filter_var(substr($field_value,0,strlen($field_value)-2).':0',FILTER_VALIDATE_IP,FILTER_FLAG_IPV6) ) { - $v6_prefix_ok = 1; - } - } - } else { - $v6_prefix_ok = 2; - } - // check subnet against defined server-ipv6 - $sql_v6 = $app->db->queryOneRecord("SELECT ip_address FROM server_ip WHERE ip_type = 'IPv6' AND virtualhost = 'y' LIMIT 0,1"); - $sql_v6_explode=explode(':',$sql_v6['ip_address']); - if ( count($sql_v6_explode) < count($explode_field_value) && isset($sql_v6['ip_address']) ) { - $v6_prefix_ok = 3; - } - if($v6_prefix_ok == 0) { - $errmsg = $validator['errmsg']; - } - if($v6_prefix_ok == 2) { - $errmsg = 'IPv6 Prefix must end with ::'; - } - if($v6_prefix_ok == 3) { - $errmsg = 'IPv6 Prefix too long (according to Server IP Addresses)'; - } - if($v6_prefix_ok <> 1){ - $this->errorMessage .= $errmsg."
\r\n"; - } + } + } + break; + /* + case 'ISV6PREFIX': + $v6_prefix_ok = 0; + $explode_field_value = explode(':',$field_value); + if ($explode_field_value[count($explode_field_value)-1]=='' && $explode_field_value[count($explode_field_value)-2]=='' ){ + if ( count($explode_field_value) <= 9 ) { + if(filter_var(substr($field_value,0,strlen($field_value)-2),FILTER_VALIDATE_IP,FILTER_FLAG_IPV6) or filter_var(substr($field_value,0,strlen($field_value)-2).'::0',FILTER_VALIDATE_IP,FILTER_FLAG_IPV6) or filter_var(substr($field_value,0,strlen($field_value)-2).':0',FILTER_VALIDATE_IP,FILTER_FLAG_IPV6) ) { + $v6_prefix_ok = 1; + } + } + } else { + $v6_prefix_ok = 2; + } + // check subnet against defined server-ipv6 + $sql_v6 = $app->db->queryOneRecord("SELECT ip_address FROM server_ip WHERE ip_type = 'IPv6' AND virtualhost = 'y' LIMIT 0,1"); + $sql_v6_explode=explode(':',$sql_v6['ip_address']); + if ( count($sql_v6_explode) < count($explode_field_value) && isset($sql_v6['ip_address']) ) { + $v6_prefix_ok = 3; + } + if($v6_prefix_ok == 0) { + $errmsg = $validator['errmsg']; + } + if($v6_prefix_ok == 2) { + $errmsg = 'IPv6 Prefix must end with ::'; + } + if($v6_prefix_ok == 3) { + $errmsg = 'IPv6 Prefix too long (according to Server IP Addresses)'; + } + if($v6_prefix_ok <> 1){ + $this->errorMessage .= $errmsg."
\r\n"; + } break; - case 'ISIPV4': - $vip=1; - if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){ + */ + case 'ISIPV4': + $vip=1; + if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){ $groups=explode(".",$field_value); foreach($groups as $group){ if($group<0 OR $group>255) $vip=0; } }else{$vip=0;} - if($vip==0) { + if($vip==0) { $errmsg = $validator['errmsg']; - if(isset($this->wordbook[$errmsg])) { - $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n"; + if(isset($this->wordbook[$errmsg])) { + $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n"; } else { $this->errorMessage .= $errmsg."
\r\n"; } } - break; + break; case 'ISIP': if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n'; if($validator['allowempty'] == 'y' && $field_value == '') { @@ -980,13 +982,13 @@ class tform { } } } - break; + break; case 'RANGE': - //* Checks if the value is within the given range or above / below a value + //* Checks if the value is within the given range or above / below a value //* Range examples: < 10 = ":10", between 2 and 10 = "2:10", above 5 = "5:". $range_parts = explode(':',trim($validator['range'])); $ok = true; - if($range_parts[0] != '' && $field_value < $range_parts[0]) { + if($range_parts[0] != '' && $field_value < $range_parts[0]) { $ok = false; } if($range_parts[1] != '' && $field_value > $range_parts[1]) { @@ -999,76 +1001,76 @@ class tform { } else { $this->errorMessage .= $errmsg."
\r\n"; } - } + } unset($range_parts); - break; - case 'CUSTOM': - // Calls a custom class to validate this record - if($validator['class'] != '' and $validator['function'] != '') { - $validator_class = $validator['class']; - $validator_function = $validator['function']; - $app->uses($validator_class); - $this->errorMessage .= $app->$validator_class->$validator_function($field_name, $field_value, $validator); - } else { - $this->errorMessage .= "Custom validator class or function is empty
\r\n"; - } - break; + break; + case 'CUSTOM': + // Calls a custom class to validate this record + if($validator['class'] != '' and $validator['function'] != '') { + $validator_class = $validator['class']; + $validator_function = $validator['function']; + $app->uses($validator_class); + $this->errorMessage .= $app->$validator_class->$validator_function($field_name, $field_value, $validator); + } else { + $this->errorMessage .= "Custom validator class or function is empty
\r\n"; + } + break; default: $this->errorMessage .= "Unknown Validator: ".$validator['type']; break; - } - - - } - - return true; - } - - /** - * Create SQL statement - * - * @param record = Datensatz als Array - * @param action = INSERT oder UPDATE - * @param primary_id - * @return record - */ - function getSQL($record, $tab, $action = 'INSERT', $primary_id = 0, $sql_ext_where = '') { - - global $app; - - // If there are no data records on the tab, return empty sql string - if(count($this->formDef['tabs'][$tab]['fields']) == 0) return ''; - - // checking permissions - if($this->formDef['auth'] == 'yes' && $_SESSION["s"]["user"]["typ"] != 'admin') { - if($action == "INSERT") { - if(!$this->checkPerm($primary_id,'i')) $this->errorMessage .= "Insert denied.
\r\n"; - } else { - if(!$this->checkPerm($primary_id,'u')) $this->errorMessage .= "Update denied.
\r\n"; - } - } - - $this->action = $action; - $this->primary_id = $primary_id; - - $record = $this->encode($record,$tab,true); - $sql_insert_key = ''; - $sql_insert_val = ''; - $sql_update = ''; - - if(!is_array($this->formDef)) $app->error("Form definition not found."); - if(!is_array($this->formDef['tabs'][$tab])) $app->error("The tab is empty or does not exist (TAB: $tab)."); - - // go trough all fields of the tab - if(is_array($record)) { - foreach($this->formDef['tabs'][$tab]['fields'] as $key => $field) { - // Wenn es kein leeres Passwortfeld ist - if (!($field['formtype'] == 'PASSWORD' and $record[$key] == '')) { - // Erzeuge Insert oder Update Quelltext - if($action == "INSERT") { - if($field['formtype'] == 'PASSWORD') { - $sql_insert_key .= "`$key`, "; - if($field['encryption'] == 'CRYPT') { + } + + + } + + return true; + } + + /** + * Create SQL statement + * + * @param record = Datensatz als Array + * @param action = INSERT oder UPDATE + * @param primary_id + * @return record + */ + function getSQL($record, $tab, $action = 'INSERT', $primary_id = 0, $sql_ext_where = '') { + + global $app; + + // If there are no data records on the tab, return empty sql string + if(count($this->formDef['tabs'][$tab]['fields']) == 0) return ''; + + // checking permissions + if($this->formDef['auth'] == 'yes' && $_SESSION["s"]["user"]["typ"] != 'admin') { + if($action == "INSERT") { + if(!$this->checkPerm($primary_id,'i')) $this->errorMessage .= "Insert denied.
\r\n"; + } else { + if(!$this->checkPerm($primary_id,'u')) $this->errorMessage .= "Update denied.
\r\n"; + } + } + + $this->action = $action; + $this->primary_id = $primary_id; + + $record = $this->encode($record,$tab,true); + $sql_insert_key = ''; + $sql_insert_val = ''; + $sql_update = ''; + + if(!is_array($this->formDef)) $app->error("Form definition not found."); + if(!is_array($this->formDef['tabs'][$tab])) $app->error("The tab is empty or does not exist (TAB: $tab)."); + + // go trough all fields of the tab + if(is_array($record)) { + foreach($this->formDef['tabs'][$tab]['fields'] as $key => $field) { + // Wenn es kein leeres Passwortfeld ist + if (!($field['formtype'] == 'PASSWORD' and $record[$key] == '')) { + // Erzeuge Insert oder Update Quelltext + if($action == "INSERT") { + if($field['formtype'] == 'PASSWORD') { + $sql_insert_key .= "`$key`, "; + if($field['encryption'] == 'CRYPT') { $record[$key] = $app->auth->crypt_password(stripslashes($record[$key])); $sql_insert_val .= "'".$app->db->quote($record[$key])."', "; } elseif ($field['encryption'] == 'MYSQL') { @@ -1077,13 +1079,13 @@ class tform { $sql_insert_val .= "'".$app->db->quote($record[$key])."', "; } elseif ($field['encryption'] == 'CLEARTEXT') { $sql_insert_val .= "'".$app->db->quote($record[$key])."', "; - } else { - $record[$key] = md5(stripslashes($record[$key])); + } else { + $record[$key] = md5(stripslashes($record[$key])); $sql_insert_val .= "'".$app->db->quote($record[$key])."', "; - } - - } elseif ($field['formtype'] == 'CHECKBOX') { - $sql_insert_key .= "`$key`, "; + } + + } elseif ($field['formtype'] == 'CHECKBOX') { + $sql_insert_key .= "`$key`, "; if($record[$key] == '') { // if a checkbox is not set, we set it to the unchecked value $sql_insert_val .= "'".$field['value'][0]."', "; @@ -1091,14 +1093,14 @@ class tform { } else { $sql_insert_val .= "'".$record[$key]."', "; } - } else { - $sql_insert_key .= "`$key`, "; - $sql_insert_val .= "'".$record[$key]."', "; - } - } else { - if($field['formtype'] == 'PASSWORD') { + } else { + $sql_insert_key .= "`$key`, "; + $sql_insert_val .= "'".$record[$key]."', "; + } + } else { + if($field['formtype'] == 'PASSWORD') { if(isset($field['encryption']) && $field['encryption'] == 'CRYPT') { - $record[$key] = $app->auth->crypt_password(stripslashes($record[$key])); + $record[$key] = $app->auth->crypt_password(stripslashes($record[$key])); $sql_update .= "`$key` = '".$app->db->quote($record[$key])."', "; } elseif (isset($field['encryption']) && $field['encryption'] == 'MYSQL') { $tmp = $app->db->queryOneRecord("SELECT PASSWORD('".$app->db->quote(stripslashes($record[$key]))."') as `crypted`"); @@ -1106,12 +1108,12 @@ class tform { $sql_update .= "`$key` = '".$app->db->quote($record[$key])."', "; } elseif (isset($field['encryption']) && $field['encryption'] == 'CLEARTEXT') { $sql_update .= "`$key` = '".$app->db->quote($record[$key])."', "; - } else { - $record[$key] = md5(stripslashes($record[$key])); + } else { + $record[$key] = md5(stripslashes($record[$key])); $sql_update .= "`$key` = '".$app->db->quote($record[$key])."', "; - } - - } elseif ($field['formtype'] == 'CHECKBOX') { + } + + } elseif ($field['formtype'] == 'CHECKBOX') { if($record[$key] == '') { // if a checkbox is not set, we set it to the unchecked value $sql_update .= "`$key` = '".$field['value'][0]."', "; @@ -1119,343 +1121,279 @@ class tform { } else { $sql_update .= "`$key` = '".$record[$key]."', "; } - } else { - $sql_update .= "`$key` = '".$record[$key]."', "; - } - } - } else { - // we unset the password filed, if empty to tell the datalog function + } else { + $sql_update .= "`$key` = '".$record[$key]."', "; + } + } + } else { + // we unset the password filed, if empty to tell the datalog function // that the password has not been changed - unset($record[$key]); + unset($record[$key]); } - } - } - - - // Add backticks for incomplete table names - if(stristr($this->formDef['db_table'],'.')) { - $escape = ''; - } else { - $escape = '`'; - } - - - if($action == "INSERT") { - if($this->formDef['auth'] == 'yes') { - // Set user and group - $sql_insert_key .= "`sys_userid`, "; - $sql_insert_val .= ($this->formDef["auth_preset"]["userid"] > 0)?"'".$this->formDef["auth_preset"]["userid"]."', ":"'".$_SESSION["s"]["user"]["userid"]."', "; - $sql_insert_key .= "`sys_groupid`, "; - $sql_insert_val .= ($this->formDef["auth_preset"]["groupid"] > 0)?"'".$this->formDef["auth_preset"]["groupid"]."', ":"'".$_SESSION["s"]["user"]["default_group"]."', "; - $sql_insert_key .= "`sys_perm_user`, "; - $sql_insert_val .= "'".$this->formDef["auth_preset"]["perm_user"]."', "; - $sql_insert_key .= "`sys_perm_group`, "; - $sql_insert_val .= "'".$this->formDef["auth_preset"]["perm_group"]."', "; - $sql_insert_key .= "`sys_perm_other`, "; - $sql_insert_val .= "'".$this->formDef["auth_preset"]["perm_other"]."', "; - } - $sql_insert_key = substr($sql_insert_key,0,-2); - $sql_insert_val = substr($sql_insert_val,0,-2); - $sql = "INSERT INTO ".$escape.$this->formDef['db_table'].$escape." ($sql_insert_key) VALUES ($sql_insert_val)"; - } else { + } + } + + + // Add backticks for incomplete table names + if(stristr($this->formDef['db_table'],'.')) { + $escape = ''; + } else { + $escape = '`'; + } + + + if($action == "INSERT") { + if($this->formDef['auth'] == 'yes') { + // Set user and group + $sql_insert_key .= "`sys_userid`, "; + $sql_insert_val .= ($this->formDef["auth_preset"]["userid"] > 0)?"'".$this->formDef["auth_preset"]["userid"]."', ":"'".$_SESSION["s"]["user"]["userid"]."', "; + $sql_insert_key .= "`sys_groupid`, "; + $sql_insert_val .= ($this->formDef["auth_preset"]["groupid"] > 0)?"'".$this->formDef["auth_preset"]["groupid"]."', ":"'".$_SESSION["s"]["user"]["default_group"]."', "; + $sql_insert_key .= "`sys_perm_user`, "; + $sql_insert_val .= "'".$this->formDef["auth_preset"]["perm_user"]."', "; + $sql_insert_key .= "`sys_perm_group`, "; + $sql_insert_val .= "'".$this->formDef["auth_preset"]["perm_group"]."', "; + $sql_insert_key .= "`sys_perm_other`, "; + $sql_insert_val .= "'".$this->formDef["auth_preset"]["perm_other"]."', "; + } + $sql_insert_key = substr($sql_insert_key,0,-2); + $sql_insert_val = substr($sql_insert_val,0,-2); + $sql = "INSERT INTO ".$escape.$this->formDef['db_table'].$escape." ($sql_insert_key) VALUES ($sql_insert_val)"; + } else { if($this->formDef['auth'] == 'yes') { - if($primary_id != 0) { - $sql_update = substr($sql_update,0,-2); - $sql = "UPDATE ".$escape.$this->formDef['db_table'].$escape." SET ".$sql_update." WHERE ".$this->getAuthSQL('u')." AND ".$this->formDef['db_table_idx']." = ".$primary_id; - if($sql_ext_where != '') $sql .= " and ".$sql_ext_where; - } else { - $app->error("Primary ID fehlt!"); - } + if($primary_id != 0) { + $sql_update = substr($sql_update,0,-2); + $sql = "UPDATE ".$escape.$this->formDef['db_table'].$escape." SET ".$sql_update." WHERE ".$this->getAuthSQL('u')." AND ".$this->formDef['db_table_idx']." = ".$primary_id; + if($sql_ext_where != '') $sql .= " and ".$sql_ext_where; + } else { + $app->error("Primary ID fehlt!"); + } } else { if($primary_id != 0) { - $sql_update = substr($sql_update,0,-2); - $sql = "UPDATE ".$escape.$this->formDef['db_table'].$escape." SET ".$sql_update." WHERE ".$this->formDef['db_table_idx']." = ".$primary_id; - if($sql_ext_where != '') $sql .= " and ".$sql_ext_where; - } else { - $app->error("Primary ID fehlt!"); - } + $sql_update = substr($sql_update,0,-2); + $sql = "UPDATE ".$escape.$this->formDef['db_table'].$escape." SET ".$sql_update." WHERE ".$this->formDef['db_table_idx']." = ".$primary_id; + if($sql_ext_where != '') $sql .= " and ".$sql_ext_where; + } else { + $app->error("Primary ID fehlt!"); + } } //* return a empty string if there is nothing to update if(trim($sql_update) == '') $sql = ''; - } + } - return $sql; - } + return $sql; + } - /** - * Debugging arrays. - * - * @param array_data - */ - function dbg($array_data) { + /** + * Debugging arrays. + * + * @param array_data + */ + function dbg($array_data) { - echo "
";
-				print_r($array_data);
-				echo "
"; + echo "
";
+                print_r($array_data);
+                echo "
"; - } + } - function showForm() { - global $app,$conf; + function showForm() { + global $app,$conf; - if(!is_array($this->formDef)) die("Form Definition wurde nicht geladen."); + if(!is_array($this->formDef)) die("Form Definition wurde nicht geladen."); - $active_tab = $this->getNextTab(); + $active_tab = $this->getNextTab(); - // go trough the tabs - foreach( $this->formDef["tabs"] as $key => $tab) { + // go trough the tabs + foreach( $this->formDef["tabs"] as $key => $tab) { - $tab['name'] = $key; + $tab['name'] = $key; // Translate the title of the tab $tab['title'] = $this->lng($tab['title']); - - if($tab['name'] == $active_tab) { - - // If module is set, then set the template path relative to the module.. - if($this->module != '') $tab["template"] = "../".$this->module."/".$tab["template"]; - - // Generate the template if it does not exist yet. - - - - if(!is_file($tab["template"])) { - $app->uses('tform_tpl_generator'); - $app->tform_tpl_generator->buildHTML($this->formDef,$tab['name']); - } - $app->tpl->setVar('readonly_tab', (isset($tab['readonly']) && $tab['readonly'] == true)); - $app->tpl->setInclude('content_tpl',$tab["template"]); - $tab["active"] = 1; - $_SESSION["s"]["form"]["tab"] = $tab['name']; - } else { - $tab["active"] = 0; - } - - // Unset unused variables. - unset($tab["fields"]); - unset($tab["plugins"]); - - $frmTab[] = $tab; - } - - // setting form tabs - $app->tpl->setLoop("formTab", $frmTab); - - // Set form action - $app->tpl->setVar('form_action',$this->formDef["action"]); - $app->tpl->setVar('form_active_tab',$active_tab); - - // Set form title - $form_hint = $this->lng($this->formDef["title"]); - if($this->formDef["description"] != '') $form_hint .= '
'.$this->lng($this->formDef["description"]).'
'; - $app->tpl->setVar('form_hint',$form_hint); - - // Set Wordbook for this form - - $app->tpl->setVar($this->wordbook); - } + + if($tab['name'] == $active_tab) { + + // If module is set, then set the template path relative to the module.. + if($this->module != '') $tab["template"] = "../".$this->module."/".$tab["template"]; + + // Generate the template if it does not exist yet. + + + + if(!is_file($tab["template"])) { + $app->uses('tform_tpl_generator'); + $app->tform_tpl_generator->buildHTML($this->formDef,$tab['name']); + } + $app->tpl->setVar('readonly_tab', (isset($tab['readonly']) && $tab['readonly'] == true)); + $app->tpl->setInclude('content_tpl',$tab["template"]); + $tab["active"] = 1; + $_SESSION["s"]["form"]["tab"] = $tab['name']; + } else { + $tab["active"] = 0; + } + + // Unset unused variables. + unset($tab["fields"]); + unset($tab["plugins"]); + + $frmTab[] = $tab; + } + + // setting form tabs + $app->tpl->setLoop("formTab", $frmTab); + + // Set form action + $app->tpl->setVar('form_action',$this->formDef["action"]); + $app->tpl->setVar('form_active_tab',$active_tab); + + // Set form title + $form_hint = $this->lng($this->formDef["title"]); + if($this->formDef["description"] != '') $form_hint .= '
'.$this->lng($this->formDef["description"]).'
'; + $app->tpl->setVar('form_hint',$form_hint); + + // Set Wordbook for this form + + $app->tpl->setVar($this->wordbook); + } function getDataRecord($primary_id) { global $app; $escape = '`'; $sql = "SELECT * FROM ".$escape.$this->formDef['db_table'].$escape." WHERE ".$this->formDef['db_table_idx']." = ".$primary_id." AND ".$this->getAuthSQL('r',$this->formDef['db_table']); - return $app->db->queryOneRecord($sql); + return $app->db->queryOneRecord($sql); } + - - function datalogSave($action,$primary_id, $record_old, $record_new) { - global $app,$conf; - + function datalogSave($action,$primary_id, $record_old, $record_new) { + global $app,$conf; + $app->db->datalogSave($this->formDef['db_table'], $action, $this->formDef['db_table_idx'], $primary_id, $record_old, $record_new); return true; -<<<<<<< .mine - /* - // Add backticks for incomplete table names. - if(stristr($this->formDef['db_table'],'.')) { - $escape = ''; - } else { - $escape = '`'; - } - - $this->diffrec = array(); - - // Full diff records for ISPConfig, they have a different format then the simple diffrec - $diffrec_full = array(); - - if(is_array($record_old) && count($record_old) > 0) { - foreach($record_old as $key => $val) { - //if(isset($record_new[$key]) && $record_new[$key] != $val) { - if(!isset($record_new[$key]) || $record_new[$key] != $val) { - // Record has changed - $diffrec_full['old'][$key] = $val; - $diffrec_full['new'][$key] = $record_new[$key]; - $this->diffrec[$key] = array( 'new' => $record_new[$key], - 'old' => $val); - } else { - $diffrec_full['old'][$key] = $val; - $diffrec_full['new'][$key] = $val; - } - } - } elseif(is_array($record_new)) { - foreach($record_new as $key => $val) { - if(isset($record_new[$key]) && $record_old[$key] != $val) { - // Record has changed - $diffrec_full['new'][$key] = $val; - $diffrec_full['old'][$key] = $record_old[$key]; - $this->diffrec[$key] = array( 'old' => @$record_old[$key], - 'new' => $val); - } else { - $diffrec_full['new'][$key] = $val; - $diffrec_full['old'][$key] = $val; - } - } - } - - //$this->diffrec = $diffrec; - // Insert the server_id, if the record has a server_id - $server_id = (isset($record_old["server_id"]) && $record_old["server_id"] > 0)?$record_old["server_id"]:0; - if(isset($record_new["server_id"])) $server_id = $record_new["server_id"]; - - if(count($this->diffrec) > 0) { - $diffstr = addslashes(serialize($diffrec_full)); - $username = $app->db->quote($_SESSION["s"]["user"]["username"]); - $dbidx = $this->formDef['db_table_idx'].":".$primary_id; - // $action = ($action == 'INSERT')?'i':'u'; - - if($action == 'INSERT') $action = 'i'; - if($action == 'UPDATE') $action = 'u'; - if($action == 'DELETE') $action = 'd'; - $sql = "INSERT INTO sys_datalog (dbtable,dbidx,server_id,action,tstamp,user,data) VALUES ('".$this->formDef['db_table']."','$dbidx','$server_id','$action','".time()."','$username','$diffstr')"; - $app->db->query($sql); - } - - return true; - */ + } -=======>>>>>>> .theirs } - - function getAuthSQL($perm, $table = '') { + function getAuthSQL($perm, $table = '') { if($_SESSION["s"]["user"]["typ"] == 'admin') { return '1'; } else { if ($table != ''){ $table = ' ' . $table . '.'; } - $groups = ( $_SESSION["s"]["user"]["groups"] ) ? $_SESSION["s"]["user"]["groups"] : 0; + $groups = ( $_SESSION["s"]["user"]["groups"] ) ? $_SESSION["s"]["user"]["groups"] : 0; $sql = '('; - $sql .= "(" . $table . "sys_userid = ".$_SESSION["s"]["user"]["userid"]." AND " . $table . "sys_perm_user like '%$perm%') OR "; - $sql .= "(" . $table . "sys_groupid IN (".$groups.") AND " . $table ."sys_perm_group like '%$perm%') OR "; - $sql .= $table . "sys_perm_other like '%$perm%'"; - $sql .= ')'; - - return $sql; - } - } - - /* - This function checks if a user has the parmissions $perm for the data record with the ID $record_id - If record_id = 0, the the permissions are tested against the defaults of the form file. - */ - function checkPerm($record_id,$perm) { - global $app; - - if($record_id > 0) { - // Add backticks for incomplete table names. - if(stristr($this->formDef['db_table'],'.')) { - $escape = ''; - } else { - $escape = '`'; - } - - $sql = "SELECT ".$this->formDef['db_table_idx']." FROM ".$escape.$this->formDef['db_table'].$escape." WHERE ".$this->formDef['db_table_idx']." = ".$record_id." AND ".$this->getAuthSQL($perm); - if($record = $app->db->queryOneRecord($sql)) { - return true; - } else { - return false; - } - } else { - $result = false; - if(@$this->formDef["auth_preset"]["userid"] == $_SESSION["s"]["user"]["userid"] && stristr($perm,$this->formDef["auth_preset"]["perm_user"])) $result = true; - if(@$this->formDef["auth_preset"]["groupid"] == $_SESSION["s"]["user"]["groupid"] && stristr($perm,$this->formDef["auth_preset"]["perm_group"])) $result = true; - if(@stristr($this->formDef["auth_preset"]["perm_other"],$perm)) $result = true; - - // if preset == 0, everyone can insert a record of this type - if($this->formDef["auth_preset"]["userid"] == 0 AND $this->formDef["auth_preset"]["groupid"] == 0 AND (@stristr($this->formDef["auth_preset"]["perm_user"],$perm) OR @stristr($this->formDef["auth_preset"]["perm_group"],$perm))) $result = true; - - return $result; + $sql .= "(" . $table . "sys_userid = ".$_SESSION["s"]["user"]["userid"]." AND " . $table . "sys_perm_user like '%$perm%') OR "; + $sql .= "(" . $table . "sys_groupid IN (".$groups.") AND " . $table ."sys_perm_group like '%$perm%') OR "; + $sql .= $table . "sys_perm_other like '%$perm%'"; + $sql .= ')'; + return $sql; } - - } - - function getNextTab() { - // Which tab is shown - if($this->errorMessage == '') { - // If there is no error - if(isset($_REQUEST["next_tab"]) && $_REQUEST["next_tab"] != '') { - // If the next tab is known - $active_tab = $_REQUEST["next_tab"]; - } else { - // else use the default tab - $active_tab = $this->formDef['tab_default']; - } - } else { - // Show the same tab again in case of an error - $active_tab = $_SESSION["s"]["form"]["tab"]; - } - - return $active_tab; - } - - function getCurrentTab() { - return $_SESSION["s"]["form"]["tab"]; - } - + } + + /* + This function checks if a user has the parmissions $perm for the data record with the ID $record_id + If record_id = 0, the the permissions are tested against the defaults of the form file. + */ + function checkPerm($record_id,$perm) { + global $app; + + if($record_id > 0) { + // Add backticks for incomplete table names. + if(stristr($this->formDef['db_table'],'.')) { + $escape = ''; + } else { + $escape = '`'; + } + + $sql = "SELECT ".$this->formDef['db_table_idx']." FROM ".$escape.$this->formDef['db_table'].$escape." WHERE ".$this->formDef['db_table_idx']." = ".$record_id." AND ".$this->getAuthSQL($perm); + if($record = $app->db->queryOneRecord($sql)) { + return true; + } else { + return false; + } + } else { + $result = false; + if(@$this->formDef["auth_preset"]["userid"] == $_SESSION["s"]["user"]["userid"] && stristr($perm,$this->formDef["auth_preset"]["perm_user"])) $result = true; + if(@$this->formDef["auth_preset"]["groupid"] == $_SESSION["s"]["user"]["groupid"] && stristr($perm,$this->formDef["auth_preset"]["perm_group"])) $result = true; + if(@stristr($this->formDef["auth_preset"]["perm_other"],$perm)) $result = true; + + // if preset == 0, everyone can insert a record of this type + if($this->formDef["auth_preset"]["userid"] == 0 AND $this->formDef["auth_preset"]["groupid"] == 0 AND (@stristr($this->formDef["auth_preset"]["perm_user"],$perm) OR @stristr($this->formDef["auth_preset"]["perm_group"],$perm))) $result = true; + + return $result; + + } + + } + + function getNextTab() { + // Which tab is shown + if($this->errorMessage == '') { + // If there is no error + if(isset($_REQUEST["next_tab"]) && $_REQUEST["next_tab"] != '') { + // If the next tab is known + $active_tab = $_REQUEST["next_tab"]; + } else { + // else use the default tab + $active_tab = $this->formDef['tab_default']; + } + } else { + // Show the same tab again in case of an error + $active_tab = $_SESSION["s"]["form"]["tab"]; + } + + return $active_tab; + } + + function getCurrentTab() { + return $_SESSION["s"]["form"]["tab"]; + } + function isReadonlyTab($tab, $primary_id) { global $app, $conf; - + // Add backticks for incomplete table names. - if(stristr($this->formDef['db_table'],'.')) { - $escape = ''; - } else { - $escape = '`'; - } - + if(stristr($this->formDef['db_table'],'.')) { + $escape = ''; + } else { + $escape = '`'; + } + $sql = "SELECT sys_userid FROM ".$escape.$this->formDef['db_table'].$escape." WHERE ".$this->formDef['db_table_idx']." = ".$primary_id; - $record = $app->db->queryOneRecord($sql); - + $record = $app->db->queryOneRecord($sql); + // return true if the readonly flag of the form is set and the current loggedin user is not the owner of the record. if(isset($this->formDef['tabs'][$tab]['readonly']) && $this->formDef['tabs'][$tab]['readonly'] == true && $record['sys_userid'] != $_SESSION["s"]["user"]["userid"]) { return true; } else { return false; } - } - - + } + + // translation function for forms, tries the form wordbook first and if this fails, it tries the global wordbook function lng($msg) { global $app,$conf; - + if(isset($this->wordbook[$msg])) { return $this->wordbook[$msg]; } else { return $app->lng($msg); } - + } - + function checkClientLimit($limit_name,$sql_where = '') { global $app; - + $check_passed = true; $limit_name = $app->db->quote($limit_name); if($limit_name == '') $app->error('Limit name missing in function checkClientLimit.'); - + // Get the limits of the client that is currently logged in $client_group_id = $_SESSION["s"]["user"]["default_group"]; $client = $app->db->queryOneRecord("SELECT $limit_name as number, parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); - + // Check if the user may add another item if($client["number"] >= 0) { $sql = "SELECT count(".$this->formDef['db_table_idx'].") as number FROM ".$this->formDef['db_table']." WHERE ".$this->getAuthSQL('u'); @@ -1463,33 +1401,33 @@ class tform { $tmp = $app->db->queryOneRecord($sql); if($tmp["number"] >= $client["number"]) $check_passed = false; } - + return $check_passed; } - + function checkResellerLimit($limit_name,$sql_where = '') { global $app; - + $check_passed = true; $limit_name = $app->db->quote($limit_name); if($limit_name == '') $app->error('Limit name missing in function checkClientLimit.'); - + // Get the limits of the client that is currently logged in $client_group_id = $_SESSION["s"]["user"]["default_group"]; $client = $app->db->queryOneRecord("SELECT parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); - + //* If the client belongs to a reseller, we will check against the reseller Limit too if($client['parent_client_id'] != 0) { - + //* first we need to know the groups of this reseller $tmp = $app->db->queryOneRecord("SELECT userid, groups FROM sys_user WHERE client_id = ".$client['parent_client_id']); $reseller_groups = $tmp["groups"]; $reseller_userid = $tmp["userid"]; - + // Get the limits of the reseller of the logged in client $client_group_id = $_SESSION["s"]["user"]["default_group"]; $reseller = $app->db->queryOneRecord("SELECT $limit_name as number FROM client WHERE client_id = ".$client['parent_client_id']); - + // Check if the user may add another item if($reseller["number"] >= 0) { $sql = "SELECT count(".$this->formDef['db_table_idx'].") as number FROM ".$this->formDef['db_table']." WHERE (sys_groupid IN (".$reseller_groups.") or sys_userid = ".$reseller_userid.")"; @@ -1498,13 +1436,13 @@ class tform { if($tmp["number"] >= $reseller["number"]) $check_passed = false; } } - + return $check_passed; } - + //* get the difference record of two arrays function getDiffRecord($record_old,$record_new) { - + if(is_array($record_new) && count($record_new) > 0) { foreach($record_new as $key => $val) { if(@$record_old[$key] != $val) { @@ -1523,17 +1461,17 @@ class tform { } } return $diffrec; - + } - + /** * Generate HTML for DATETIME fields. - * + * * @access private * @param string $form_element Name of the form element. * @param string $default_value Selected value for fields. * @param bool $display_secons Include seconds selection. - * @return string HTML + * @return string HTML */ function _getDateTimeHTML($form_element, $default_value, $display_seconds=false) { @@ -1541,54 +1479,54 @@ class tform { $_showdate = ($_datetime === false) ? false : true; $dselect = array('day','month','year','hour','minute'); - if ($display_seconds === true) { + if ($display_seconds === true) { $dselect[] = 'second'; } - + $out = ''; - + foreach ($dselect as $dt_element) { $dt_options = array(); $dt_space = 1; - + switch ($dt_element) { case 'day': for ($i = 1; $i <= 31; $i++) { - $dt_options[] = array('name' => sprintf('%02d', $i), - 'value' => sprintf('%d', $i)); - } - $selected_value = date('d', $_datetime); + $dt_options[] = array('name' => sprintf('%02d', $i), + 'value' => sprintf('%d', $i)); + } + $selected_value = date('d', $_datetime); break; - + case 'month': for ($i = 1; $i <= 12; $i++) { - $dt_options[] = array('name' => strftime('%b', mktime(0, 0, 0, $i, 1, 2000)), - 'value' => strftime('%m', mktime(0, 0, 0, $i, 1, 2000))); - } - $selected_value = date('n', $_datetime); + $dt_options[] = array('name' => strftime('%b', mktime(0, 0, 0, $i, 1, 2000)), + 'value' => strftime('%m', mktime(0, 0, 0, $i, 1, 2000))); + } + $selected_value = date('n', $_datetime); break; - + case 'year': $start_year = strftime("%Y"); $years = range((int)$start_year, (int)($start_year+3)); - - foreach ($years as $year) { - $dt_options[] = array('name' => $year, - 'value' => $year); - } - $selected_value = date('Y', $_datetime); - $dt_space = 2; + + foreach ($years as $year) { + $dt_options[] = array('name' => $year, + 'value' => $year); + } + $selected_value = date('Y', $_datetime); + $dt_space = 2; break; - + case 'hour': foreach(range(0, 23) as $hour) { $dt_options[] = array('name' => sprintf('%02d', $hour), - 'value' => sprintf('%d', $hour)); + 'value' => sprintf('%d', $hour)); } $selected_value = date('G', $_datetime); break; - + case 'minute': foreach(range(0, 59) as $minute) { if (($minute % 5) == 0) { @@ -1598,23 +1536,23 @@ class tform { } $selected_value = (int)floor(date('i', $_datetime)); break; - - case 'second': + + case 'second': foreach(range(0, 59) as $second) { $dt_options[] = array('name' => sprintf('%02d', $second), - 'value' => sprintf('%d', $second)); + 'value' => sprintf('%d', $second)); } $selected_value = (int)floor(date('s', $_datetime)); break; } - + $out .= "' . str_repeat(' ', $dt_space); } - + return $out; } } diff --git a/interface/lib/classes/tform_actions.inc.php b/interface/lib/classes/tform_actions.inc.php index d60ecbf13b..b181be0198 100644 --- a/interface/lib/classes/tform_actions.inc.php +++ b/interface/lib/classes/tform_actions.inc.php @@ -77,7 +77,16 @@ class tform_actions { function onSubmit() { global $app, $conf; - + + // check if the client is locked - he may not change anything, then. + if(!$app->auth->is_admin()) { + $client_group_id = $_SESSION["s"]["user"]["default_group"]; + $client = $app->db->queryOneRecord("SELECT client.locked FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ".$app->functions->intval($client_group_id)); + if(is_array($client) && $client['locked'] == 'y') { + $app->tform->errorMessage .= $app->lng("client_you_are_locked")."
"; + } + } + // Calling the action functions if($this->id > 0) { $app->tform->action == 'EDIT'; diff --git a/interface/lib/classes/tools_monitor.inc.php b/interface/lib/classes/tools_monitor.inc.php index 42defa07e4..121ab931f4 100644 --- a/interface/lib/classes/tools_monitor.inc.php +++ b/interface/lib/classes/tools_monitor.inc.php @@ -453,40 +453,6 @@ class tools_monitor { return $html; } - function showMongoDB() { - global $app; - - /* fetch the Data from the DB */ - $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'log_mongodb' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc"); - - if(isset($record['data'])) { - $html = - '
-
'; - - /* - * First, we have to detect, if there is any monitoring-data. - * If not (because mongodb is not installed) show this. - */ - $data = unserialize($record['data']); - if ($data == '') { - $html .= '

'. - 'MongoDB is not installed at this server.
' . - 'See more (for debian) here...'. - '

'; - } - else { - $html .= nl2br($data); - } - $html .= '
'; - - } else { - $html = '

There is no data available at the moment.

'; - } - - return $html; - } - function showIPTables() { global $app; $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'iptables_rules' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc"); diff --git a/interface/lib/classes/validate_dkim.inc.php b/interface/lib/classes/validate_dkim.inc.php deleted file mode 100644 index 12c0945875..0000000000 --- a/interface/lib/classes/validate_dkim.inc.php +++ /dev/null @@ -1,79 +0,0 @@ -tform->wordbook[$errmsg])) { - return $app->tform->wordbook[$errmsg]."
\r\n"; - } else { - return $errmsg."
\r\n"; - } - } - - /* Validator function for private DKIM-Key */ - function check_private_key($field_name, $field_value, $validator) { - $dkim_enabled=$_POST['dkim']; - if ($dkim_enabled == 'y') { - if (empty($field_value)) return $this->get_error($validator['errmsg']); - exec('echo '.escapeshellarg($field_value).'|openssl rsa -check',$output,$result); - if($result != 0) return $this->get_error($validator['errmsg']); - } - } - - /* Validator function for DKIM Path */ - function check_dkim_path($field_name, $field_value, $validator) { - if(empty($field_value)) return $this->get_error($validator['errmsg']); - if (substr(sprintf('%o', fileperms($field_value)),-3) <= 600) - return $this->get_error($validator['errmsg']); - } - - /* Check function for DNS-Template */ - function check_template($field_name, $field_value, $validator) { - $dkim=false; - foreach($field_value as $field ) { if($field == 'DKIM') $dkim=true; } - if ($dkim && $field_value[0]!='DOMAIN') return $this->get_error($validator['errmsg']); - } - - /* Validator function for $_POST */ - function validate_post($key,$value) { - switch ($key) { - case 'public': - if (preg_match("/(^-----BEGIN PUBLIC KEY-----)[a-zA-Z0-9\r\n\/\+=]{1,221}(-----END PUBLIC KEY-----(\n|\r)$)/",$value) === 1) { return true; } else { return false; } - break; - case 'private': - if (preg_match("/(^-----BEGIN RSA PRIVATE KEY-----)[a-zA-Z0-9\r\n\/\+=]{1,850}(-----END RSA PRIVATE KEY-----(\n|\r)$)/",$value) === 1) { return true; } else { return false; } - break; - } - } -} - diff --git a/interface/lib/lang/cz.lng b/interface/lib/lang/cz.lng index 0c3071926c..1683c6e112 100644 --- a/interface/lib/lang/cz.lng +++ b/interface/lib/lang/cz.lng @@ -71,7 +71,7 @@ $wb['datepicker_prevText'] = 'Předchozí'; $wb['logout_txt'] = 'Odhlášení'; $wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd'; $wb['submit_confirmation'] = 'Opravdu chcete provést tuto akci ?'; -$wb['top_menu_mailuser'] = 'E-mailový uživatel'; +$wb['top_menu_mailuser'] = 'E-mail. uživ.'; $wb['globalsearch_resultslimit_of_txt'] = 'z'; $wb['globalsearch_resultslimit_results_txt'] = 'výsledky'; $wb['globalsearch_noresults_text_txt'] = 'Žádné výsledky.'; @@ -130,7 +130,8 @@ $wb['datalog_status_d_web_folder'] = 'Odstranění chráněného adresáře hesl $wb['datalog_status_i_web_folder_user'] = 'Vytvoření uživatele pro adresáře chráněné heslem'; $wb['datalog_status_u_web_folder_user'] = 'Aktualizace nastavení uživatele pro adresáře chráněné heslem'; $wb['datalog_status_d_web_folder_user'] = 'Odstranění uživatele pro adresáře chráněné heslem'; -$wb['login_as_txt'] = 'Přihlaste se jako'; -$wb['no_domain_perm'] = 'You have no permission for this domain.'; -$wb['no_destination_perm'] = 'You have no permission for this destination.'; +$wb['login_as_txt'] = 'Přihlašte se jako'; +$wb['no_domain_perm'] = 'Nemáte oprávnění pro tuto doménu. '; +$wb['no_destination_perm'] = 'Nemáte oprávnění pro tuto destinaci.'; ?> + diff --git a/interface/lib/lang/de.lng b/interface/lib/lang/de.lng index 328b5202d4..a5281767a8 100644 --- a/interface/lib/lang/de.lng +++ b/interface/lib/lang/de.lng @@ -134,3 +134,4 @@ $wb['login_as_txt'] = 'Anmelden als'; $wb['no_domain_perm'] = 'Sie haben keine Berechtigung für diese Domain.'; $wb['no_destination_perm'] = 'Sie haben keine Berechtigung für dieses Ziel.'; ?> + diff --git a/interface/lib/lang/el.lng b/interface/lib/lang/el.lng index b633c1b863..580f7370cc 100644 --- a/interface/lib/lang/el.lng +++ b/interface/lib/lang/el.lng @@ -69,68 +69,68 @@ $wb['monthnamesshort_oct'] = 'Οκτ'; $wb['monthnamesshort_nov'] = 'Νοε'; $wb['monthnamesshort_dec'] = 'Δεκ'; $wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd'; -$wb['logout_txt'] = 'Logout'; -$wb['submit_confirmation'] = 'Do you really want to perform this action?'; +$wb['logout_txt'] = 'Αποσύνδεση'; +$wb['submit_confirmation'] = 'Είστε σίγουροι ότι θέλετε να κάνετε αυτή την ενέργεια?'; $wb['top_menu_mailuser'] = 'Mailuser'; -$wb['globalsearch_resultslimit_of_txt'] = 'of'; -$wb['globalsearch_resultslimit_results_txt'] = 'results'; -$wb['globalsearch_noresults_text_txt'] = 'No results.'; -$wb['globalsearch_noresults_limit_txt'] = '0 results'; -$wb['globalsearch_searchfield_watermark_txt'] = 'Search'; -$wb['globalsearch_suggestions_text_txt'] = 'Suggestions'; -$wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.'; -$wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.'; -$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:'; -$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.'; -$wb['datalog_status_i_web_database'] = 'Create new database'; -$wb['datalog_status_u_web_database'] = 'Update database'; -$wb['datalog_status_d_web_database'] = 'Delete database'; -$wb['datalog_status_i_web_database_user'] = 'Create database user for database'; -$wb['datalog_status_u_web_database_user'] = 'Update database user'; -$wb['datalog_status_d_web_database_user'] = 'Delete database user'; -$wb['datalog_status_i_web_domain'] = 'Create new website'; -$wb['datalog_status_u_web_domain'] = 'Update website settings'; -$wb['datalog_status_d_web_domain'] = 'Delete website'; -$wb['datalog_status_i_ftp_user'] = 'Create FTP user'; -$wb['datalog_status_u_ftp_user'] = 'Update FTP user'; -$wb['datalog_status_d_ftp_user'] = 'Delete FTP user'; -$wb['datalog_status_i_mail_domain'] = 'Create email domain'; -$wb['datalog_status_u_mail_domain'] = 'Update email domain'; -$wb['datalog_status_d_mail_domain'] = 'Delete email domain'; -$wb['datalog_status_i_mail_user'] = 'Create email user'; -$wb['datalog_status_u_mail_user'] = 'Update email user'; -$wb['datalog_status_d_mail_user'] = 'Delete email user'; -$wb['datalog_status_i_mail_forwarding'] = 'Create email address'; -$wb['datalog_status_u_mail_forwarding'] = 'Update email address'; -$wb['datalog_status_d_mail_forwarding'] = 'Delete email address'; -$wb['datalog_status_i_dns_rr'] = 'Create DNS record'; -$wb['datalog_status_u_dns_rr'] = 'Update DNS record'; -$wb['datalog_status_d_dns_rr'] = 'Delete DNS record'; -$wb['datalog_status_i_dns_soa'] = 'Create DNS zone'; -$wb['datalog_status_u_dns_soa'] = 'Update DNS zone'; -$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone'; -$wb['datalog_status_i_cron'] = 'Create cron job'; -$wb['datalog_status_u_cron'] = 'Update cron job'; -$wb['datalog_status_d_cron'] = 'Delete cron job'; -$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account'; -$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account'; -$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account'; -$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list'; -$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list'; -$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list'; -$wb['datalog_status_i_shell_user'] = 'Create shell user'; -$wb['datalog_status_u_shell_user'] = 'Update shell user'; -$wb['datalog_status_d_shell_user'] = 'Delete shell user'; -$wb['datalog_status_i_web_folder'] = 'Create folder protection'; -$wb['datalog_status_u_web_folder'] = 'Update folder protection'; -$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['datalog_status_i_spamfilter_users'] = 'Create spam filter settings'; -$wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings'; -$wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings'; -$wb['login_as_txt'] = 'Log in as'; -$wb['no_domain_perm'] = 'You have no permission for this domain.'; -$wb['no_destination_perm'] = 'You have no permission for this destination.'; +$wb['globalsearch_resultslimit_of_txt'] = 'από'; +$wb['globalsearch_resultslimit_results_txt'] = 'αποτελέσματα'; +$wb['globalsearch_noresults_text_txt'] = 'Δεν υπάρχουν αποτελέσματα.'; +$wb['globalsearch_noresults_limit_txt'] = '0 αποτελέσματα'; +$wb['globalsearch_searchfield_watermark_txt'] = 'Αναζήτηση'; +$wb['globalsearch_suggestions_text_txt'] = 'Προτάσεις'; +$wb['global_tabchange_warning_txt'] = 'Τα τροποποιημένα δεδομένα σε αυτή την καρτέλα θα αλλάξουν οριστικά αν πατήσετε ΟΚ. Πατήσετε Άκυρο για να μην συμβεί αυτό..'; +$wb['global_tabchange_discard_txt'] = 'Έχετε μη αποθηκευμένες αλλαγές σε αυτή την καρτέλα. Οι αλλαγές θα χαθούν αν συνεχίσετε.'; +$wb['datalog_changes_txt'] = 'Οι επόμενες αλλαγές δεν έχουν προωθηθεί στους servers:'; +$wb['datalog_changes_end_txt'] = 'Η αποθήκευση των ενημερώσεων μπορεί να διαρκέσει μεχρι και ένα λεπτό. Παρακαλούμε να είστε υπομονετικοί.'; +$wb['datalog_status_i_web_database'] = 'Δημιουργία νέας Βάσης Δεδομένων (ΒΔ)'; +$wb['datalog_status_u_web_database'] = 'Ενημέρωση Βάσης Δεδομένων'; +$wb['datalog_status_d_web_database'] = 'Διαγραφή Βάσης Δεδομένων'; +$wb['datalog_status_i_web_database_user'] = 'Δημιουργία χρήστη για την Βάση Δεδομένων'; +$wb['datalog_status_u_web_database_user'] = 'Ενημέρωση χρήστη Βάσης Δεδομένων'; +$wb['datalog_status_d_web_database_user'] = 'Διαγραφή χρήστη Βάσης Δεδομένων'; +$wb['datalog_status_i_web_domain'] = 'Δημιουργία νέου website'; +$wb['datalog_status_u_web_domain'] = 'Ενημέρωση ρυθμίσεων website'; +$wb['datalog_status_d_web_domain'] = 'Διαγραφή website'; +$wb['datalog_status_i_ftp_user'] = 'Δημιουργία χρήστη FTP'; +$wb['datalog_status_u_ftp_user'] = 'Ενημέρωση FTP user'; +$wb['datalog_status_d_ftp_user'] = 'Διαγραφή FTP user'; +$wb['datalog_status_i_mail_domain'] = 'Δημιουργία email domain'; +$wb['datalog_status_u_mail_domain'] = 'Ενημέρωση email domain'; +$wb['datalog_status_d_mail_domain'] = 'Διαγραφή email domain'; +$wb['datalog_status_i_mail_user'] = 'Δημιουργία χρήστη email'; +$wb['datalog_status_u_mail_user'] = 'Ενημέρωση χρήστη email'; +$wb['datalog_status_d_mail_user'] = 'Διαγραφή χρήστη email'; +$wb['datalog_status_i_mail_forwarding'] = 'Δημιουργία διεύθυνσης email'; +$wb['datalog_status_u_mail_forwarding'] = 'Ενημέρωση διεύθυνσης email'; +$wb['datalog_status_d_mail_forwarding'] = 'Διαγραφή διεύθυνσης email'; +$wb['datalog_status_i_dns_rr'] = 'Δημιουργία εγγραφής DNS'; +$wb['datalog_status_u_dns_rr'] = 'Ενημέρωση εγγραφής DNS'; +$wb['datalog_status_d_dns_rr'] = 'Διαγραφή εγγραφής DNS'; +$wb['datalog_status_i_dns_soa'] = 'Δημιουργία ζώνης DNS'; +$wb['datalog_status_u_dns_soa'] = 'Ενημέρωση ζώνης DNS'; +$wb['datalog_status_d_dns_soa'] = 'Διαγραφή ζώνης DNS'; +$wb['datalog_status_i_cron'] = 'Δημιουργία εργασίας cron'; +$wb['datalog_status_u_cron'] = 'Ενημέρωση εργασίας cron'; +$wb['datalog_status_d_cron'] = 'Διαγραφή εργασίας cron'; +$wb['datalog_status_i_mail_get'] = 'Δημιουργία δημιουργία λογαριασμού mail fetcher'; +$wb['datalog_status_u_mail_get'] = 'Ενημέρωση δημιουργία λογαριασμού mail fetcher'; +$wb['datalog_status_d_mail_get'] = 'Διαγραφή δημιουργία λογαριασμού mail fetcher'; +$wb['datalog_status_i_mail_mailinglist'] = 'Δημιουργία λίστας mail'; +$wb['datalog_status_u_mail_mailinglist'] = 'Ενημέρωση λίστας mail'; +$wb['datalog_status_d_mail_mailinglist'] = 'Διαγραφή λίστας mail'; +$wb['datalog_status_i_shell_user'] = 'Δημιουργία χρήστη shell'; +$wb['datalog_status_u_shell_user'] = 'Ενημέρωση χρήστη shell'; +$wb['datalog_status_d_shell_user'] = 'Διαγραφή χρήστη shell'; +$wb['datalog_status_i_web_folder'] = 'Δημιουργία προστασίας φακέλου'; +$wb['datalog_status_u_web_folder'] = 'Ενημέρωση προστασίας φακέλου'; +$wb['datalog_status_d_web_folder'] = 'Διαγραφή προστασίας φακέλου'; +$wb['datalog_status_i_web_folder_user'] = 'Δημιουργία χρήστη προστασίας φακέλου'; +$wb['datalog_status_u_web_folder_user'] = 'Ενημέρωση χρήστη προστασίας φακέλου'; +$wb['datalog_status_d_web_folder_user'] = 'Διαγραφή χρήστη προστασίας φακέλου'; +$wb['datalog_status_i_spamfilter_users'] = 'Δημιουργία ρυθμίσεων φίλτρου spam'; +$wb['datalog_status_u_spamfilter_users'] = 'Ενημέρωση ρυθμίσεων φίλτρου spam'; +$wb['datalog_status_d_spamfilter_users'] = 'Διαγραφή ρυθμίσεων φίλτρου spam'; +$wb['login_as_txt'] = 'Είσοδος ως'; +$wb['no_domain_perm'] = 'Δεν έχετε δικαιώματα για αυτό το domain.'; +$wb['no_destination_perm'] = 'Δεν έχετε δικαιώματα για αυτόν τον προορισμό.'; ?> diff --git a/interface/lib/lang/en.lng b/interface/lib/lang/en.lng index 47b611586d..1d689f0104 100644 --- a/interface/lib/lang/en.lng +++ b/interface/lib/lang/en.lng @@ -135,4 +135,7 @@ $wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user'; $wb['login_as_txt'] = 'Log in as'; $wb["no_domain_perm"] = 'You have no permission for this domain.'; $wb["no_destination_perm"] = 'You have no permission for this destination.'; +$wb['client_you_are_locked'] = 'You have no permission to change any settings.'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; ?> diff --git a/interface/lib/shelluser_blacklist b/interface/lib/shelluser_blacklist index 4913b64272..c49d825517 100644 --- a/interface/lib/shelluser_blacklist +++ b/interface/lib/shelluser_blacklist @@ -31,5 +31,4 @@ vmail getmail ispconfig courier -dovecot -mongodb +dovecot \ No newline at end of file diff --git a/interface/ssl/empty.dir b/interface/ssl/empty.dir new file mode 100644 index 0000000000..95ba9ef37c --- /dev/null +++ b/interface/ssl/empty.dir @@ -0,0 +1 @@ +This empty directory is needed by ISPConfig. diff --git a/interface/tools/empty.dir b/interface/tools/empty.dir new file mode 100644 index 0000000000..95ba9ef37c --- /dev/null +++ b/interface/tools/empty.dir @@ -0,0 +1 @@ +This empty directory is needed by ISPConfig. diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php index 0bc490f765..c2adbdcc95 100644 --- a/interface/web/admin/form/server_config.tform.php +++ b/interface/web/admin/form/server_config.tform.php @@ -83,20 +83,22 @@ $form["tabs"]['server'] = array( 'errmsg' => 'netmask_error_wrong'), ), 'value' => '', - 'width' => '15', - 'maxlength' => '255' - ), - 'v6_prefix' => array( - 'datatype' => 'VARCHAR', - 'formtype' => 'TEXT', - 'validators' => array(0 => array('type' => 'ISV6PREFIX', - 'errmsg' => 'v6_prefix_wrong'), - ), - 'default' => '' - ), - 'gateway' => array( - 'datatype' => 'VARCHAR', - 'formtype' => 'TEXT', + 'width' => '15', + 'maxlength' => '255' + ), + /* + 'v6_prefix' => array( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'validators' => array(0 => array('type' => 'ISV6PREFIX', + 'errmsg' => 'v6_prefix_wrong'), + ), + 'default' => '' + ), + */ + 'gateway' => array( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', 'default' => '192.168.0.1', 'validators' => array(0 => array('type' => 'ISIPV4', 'errmsg' => 'gateway_error_wrong'), @@ -117,13 +119,13 @@ $form["tabs"]['server'] = array( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', 'default' => 'server1.domain.tld', - 'filters' => array( 0 => array( 'event' => 'SAVE', - 'type' => 'IDNTOASCII'), - 1 => array( 'event' => 'SHOW', - 'type' => 'IDNTOUTF8'), - 2 => array( 'event' => 'SAVE', - 'type' => 'TOLOWER') - ), + 'filters' => array( 0 => array( 'event' => 'SAVE', + 'type' => 'IDNTOASCII'), + 1 => array( 'event' => 'SHOW', + 'type' => 'IDNTOUTF8'), + 2 => array( 'event' => 'SAVE', + 'type' => 'TOLOWER') + ), 'validators' => array(0 => array('type' => 'NOTEMPTY', 'errmsg' => 'hostname_error_empty'), ), @@ -182,9 +184,9 @@ $form["tabs"]['server'] = array( 'formtype' => 'TEXT', 'default' => '', 'validators' => array ( 0 => array ( 'type' => 'REGEX', - 'regex' => '/^[0-9a-zA-Z\:\/\-\.\[\]]{0,255}$/', - 'errmsg'=> 'monit_url_error_regex'), - ), + 'regex' => '/^[0-9a-zA-Z\:\/\-\.\[\]]{0,255}$/', + 'errmsg'=> 'monit_url_error_regex'), + ), 'value' => '', 'width' => '40', 'maxlength' => '255' @@ -210,9 +212,9 @@ $form["tabs"]['server'] = array( 'formtype' => 'TEXT', 'default' => '', 'validators' => array ( 0 => array ( 'type' => 'REGEX', - 'regex' => '/^[0-9a-zA-Z\:\/\-\.\[\]]{0,255}$/', - 'errmsg'=> 'munin_url_error_regex'), - ), + 'regex' => '/^[0-9a-zA-Z\:\/\-\.\[\]]{0,255}$/', + 'errmsg'=> 'munin_url_error_regex'), + ), 'value' => '', 'width' => '40', 'maxlength' => '255' @@ -275,19 +277,6 @@ $form["tabs"]['mail'] = array( 'width' => '40', 'maxlength' => '255' ), - 'dkim_path' => array( - 'datatype' => 'VARCHAR', - 'formtype' => 'TEXT', - 'default' => '/var/db/dkim', - 'validators' => array ( 0 => array ('type' => 'CUSTOM', - 'class' => 'validate_dkim', - 'function' => 'check_dkim_path', - 'errmsg'=> 'dkim_path_error'), - ), - 'value' => '', - 'width' => '40', - 'maxlength' => '255' - ), 'pop3_imap_daemon' => array( 'datatype' => 'VARCHAR', 'formtype' => 'SELECT', @@ -419,8 +408,8 @@ $form["tabs"]['mail'] = array( 'formtype' => 'TEXT', 'default' => '7', 'value' => '', - 'width' => '20', - 'maxlength' => '255' + 'width' => '20', + 'maxlength' => '255' ), 'overquota_notify_onok' => array( 'datatype' => 'VARCHAR', @@ -517,20 +506,20 @@ $form["tabs"]['web'] = array( 'formtype' => 'TEXT', 'default' => '', 'value' => '', - 'width' => '40', - 'maxlength' => '255' - ), -/* -'vhost_rewrite_v6' => array ( -'datatype' => 'VARCHAR', -'formtype' => 'CHECKBOX', -'default' => 'n', -'value' => array(0 => 'n',1 => 'y') -), -*/ - 'vhost_conf_dir' => array( - 'datatype' => 'VARCHAR', - 'formtype' => 'TEXT', + 'width' => '40', + 'maxlength' => '255' + ), +/* +'vhost_rewrite_v6' => array ( +'datatype' => 'VARCHAR', +'formtype' => 'CHECKBOX', +'default' => 'n', +'value' => array(0 => 'n',1 => 'y') +), +*/ + 'vhost_conf_dir' => array( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', 'default' => '', 'validators' => array(0 => array('type' => 'NOTEMPTY', 'errmsg' => 'vhost_conf_dir_error_empty'), @@ -659,8 +648,8 @@ $form["tabs"]['web'] = array( 'formtype' => 'TEXT', 'default' => '7', 'value' => '', - 'width' => '20', - 'maxlength' => '255' + 'width' => '20', + 'maxlength' => '255' ), 'overquota_notify_onok' => array( 'datatype' => 'VARCHAR', @@ -817,17 +806,6 @@ $form["tabs"]['web'] = array( 'width' => '40', 'maxlength' => '4000' ), - 'php_ini_check_minutes' => array( - 'datatype' => 'INTEGER', - 'formtype' => 'TEXT', - 'default' => '1', - 'validators' => array(0 => array('type' => 'NOTEMPTY', - 'errmsg' => 'php_ini_check_minutes_error_empty'), - ), - 'value' => '', - 'width' => '10', - 'maxlength' => '255' - ), 'nginx_cgi_socket' => array( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', @@ -1306,12 +1284,6 @@ $form["tabs"]['rescue'] = array( 'default' => 'n', 'value' => array(0 => 'n', 1 => 'y') ), - 'do_not_try_rescue_mongodb' => array( - 'datatype' => 'VARCHAR', - 'formtype' => 'CHECKBOX', - 'default' => 'n', - 'value' => array(0 => 'n', 1 => 'y') - ), 'do_not_try_rescue_mysql' => array( 'datatype' => 'VARCHAR', 'formtype' => 'CHECKBOX', diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php index f09d4db2e1..d04923bd3a 100644 --- a/interface/web/admin/form/system_config.tform.php +++ b/interface/web/admin/form/system_config.tform.php @@ -160,12 +160,6 @@ $form["tabs"]['sites'] = array ( 'default' => 'n', 'value' => array(0 => 'n',1 => 'y') ), - 'reseller_can_use_options' => array ( - 'datatype' => 'VARCHAR', - 'formtype' => 'CHECKBOX', - 'default' => 'n', - 'value' => array(0 => 'n',1 => 'y') - ), ################################## # ENDE Datatable fields ################################## @@ -180,30 +174,12 @@ $form["tabs"]['mail'] = array ( ################################## # Begin Datatable fields ################################## - 'enable_custom_login' => array( - 'datatype' => 'VARCHAR', - 'formtype' => 'CHECKBOX', - 'default' => 'n', - 'value' => array(0 => 'n', 1 => 'y') - ), - 'mailbox_show_autoresponder_tab' => array ( - 'datatype' => 'VARCHAR', - 'formtype' => 'CHECKBOX', - 'default' => 'y', - 'value' => array(0 => 'n',1 => 'y') - ), - 'mailbox_show_mail_filter_tab' => array ( - 'datatype' => 'VARCHAR', - 'formtype' => 'CHECKBOX', - 'default' => 'y', - 'value' => array(0 => 'n',1 => 'y') - ), - 'mailbox_show_custom_rules_tab' => array ( - 'datatype' => 'VARCHAR', - 'formtype' => 'CHECKBOX', - 'default' => 'y', - 'value' => array(0 => 'n',1 => 'y') - ), + 'enable_custom_login' => array( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'n', + 'value' => array(0 => 'n', 1 => 'y') + ), 'mailboxlist_webmail_link' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'CHECKBOX', diff --git a/interface/web/admin/language_edit.php b/interface/web/admin/language_edit.php index 208f1ac94f..ffba65d61a 100644 --- a/interface/web/admin/language_edit.php +++ b/interface/web/admin/language_edit.php @@ -85,7 +85,7 @@ $app->tpl->setVar("file_path", $file_path); $keyword_list = array(); if(isset($wb) && is_array($wb)) { foreach($wb as $key => $val) { - $keyword_list[] = array('key' => $key, 'val' => htmlentities($val)); + $keyword_list[] = array('key' => $key, 'val' => htmlentities($val,ENT_COMPAT | ENT_HTML401,'UTF-8')); } $app->tpl->setLoop('records', $keyword_list); diff --git a/interface/web/admin/language_import.php b/interface/web/admin/language_import.php index 285be11bdf..c25406ae7f 100644 --- a/interface/web/admin/language_import.php +++ b/interface/web/admin/language_import.php @@ -30,6 +30,86 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. require_once('../../lib/config.inc.php'); require_once('../../lib/app.inc.php'); +function normalize_string($string, $quote, $allow_special = false) { + $escaped = false; + $in_string = true; + $new_string = ''; + + for($c = 0; $c < mb_strlen($string); $c++) { + $char = $string{$c}; + + if($in_string === true && $escaped === false && $char === $quote) { + // this marks a string end (e.g. for concatenation) + $in_string = false; + continue; + } elseif($in_string === false) { + if($escaped === false && $char === $quote) { + $in_string = true; + continue; + } else { + continue; // we strip everything from outside the string! + } + } + + if($char === '"' && $escaped === true && $quote === '"') { + // unescape this + $new_string .= $char; + $escaped = false; + continue; + } elseif($char === "'" && $escaped === false && $quote === '"') { + // escape this + $new_string .= '\\' . $char; + continue; + } + + if($escaped === true) { + // the next character is the escaped one. + if($allow_special === true && ($char === 'n' || $char === 'r' || $char === 't')) { + $new_string .= '\' . "\\' . $char . '" . \''; + } else { + $new_string .= '\\' . $char; + } + $escaped = false; + } else { + if($char === '\\') { + $escaped = true; + } else { + $new_string .= $char; + } + } + } + return $new_string; +} + +function validate_line($line) { + $line = trim($line); + if($line === '' || $line === '') return $line; // don't treat empty lines as malicious + + $ok = preg_match('/^\s*\$wb\[(["\'])(.*?)\\1\]\s*=\s*(["\'])(.*?)\\3\s*;\s*$/', $line, $matches); + if(!$ok) return false; // this line has invalid form and could lead to malfunction + + $keyquote = $matches[1]; // ' or " + $key = $matches[2]; + if(strpos($key, '"') !== false || strpos($key, "'") !== false) return false; + + $textquote = $matches[3]; // ' or " + $text = $matches[4]; + + $new_line = '$wb[\''; + + // validate the language key + $key = normalize_string($key, $keyquote); + + $new_line .= $key . '\'] = \''; + + // validate this text to avoid code injection + $text = normalize_string($text, $textquote, true); + + $new_line .= $text . '\';'; + + return $new_line; +} + //* Check permissions for module $app->auth->check_module_permissions('admin'); @@ -37,6 +117,8 @@ $app->auth->check_module_permissions('admin'); if(!$app->auth->is_admin()) die('only allowed for administrators.'); if($conf['demo_mode'] == true) $app->error('This function is disabled in demo mode.'); +if(!$conf['language_file_import_enabled']) $app->error('Languge import function is disabled in the interface config.inc.php file.'); + $app->uses('tpl'); $app->tpl->newTemplate('form.tpl.htm'); @@ -58,7 +140,9 @@ if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name' $buffer = ''; $langfile_path = ''; // all other lines + $ln = 1; foreach($lines as $line) { + $ln++; $parts = explode('|',$line); if(is_array($parts) && count($parts) > 0 && $parts[0] == '--') { // Write language file, if its not the first file @@ -77,14 +161,18 @@ if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name' $file_name = trim($parts[3]); if(!preg_match("/^[a-z]{2}$/i", $selected_language)) die("unallowed characters in selected language name: $selected_language"); if(!preg_match("/^[a-z_]+$/i", $module_name)) die('unallowed characters in module name.'); - if(!preg_match("/^[a-z\._]+$/i", $file_name) || stristr($file_name,'..')) die("unallowed characters in language file name: '$file_name'"); + if(!preg_match("/^[a-z\._\-]+$/i", $file_name) || stristr($file_name,'..')) die("unallowed characters in language file name: '$file_name'"); if($module_name == 'global') { $langfile_path = trim(ISPC_LIB_PATH."/lang/".$selected_language.".lng"); } else { $langfile_path = trim(ISPC_WEB_PATH.'/'.$module_name.'/lib/lang/'.$file_name); } - } else { - $buffer .= trim($line)."\n"; + } elseif(is_array($parts) && count($parts) > 1 && $parts[0] == '---' && $parts[1] == 'EOF') { + // EOF line, ignore it. + } else { + $line = validate_line($line); + if($line === false) $error .= "Language file contains invalid language entry on line $ln.
"; + else $buffer .= $line."\n"; } } } diff --git a/interface/web/admin/lib/lang/ar_language_import.lng b/interface/web/admin/lib/lang/ar_language_import.lng index 4c31ec3de3..a5831fc954 100644 --- a/interface/web/admin/lib/lang/ar_language_import.lng +++ b/interface/web/admin/lib/lang/ar_language_import.lng @@ -5,4 +5,5 @@ $wb['btn_save_txt'] = 'Import the selected language file'; $wb['language_overwrite_txt'] = 'Overwrite file, if exists.'; $wb['btn_cancel_txt'] = 'Back'; $wb['ignore_version_txt'] = 'Skip ISPConfig version check'; +$wb['list_desc_txt'] = 'WARNING: Do not import language files from untrustworthy sources.'; ?> diff --git a/interface/web/admin/lib/lang/ar_remote_action.lng b/interface/web/admin/lib/lang/ar_remote_action.lng index 3fc3eaf81f..f268527084 100644 --- a/interface/web/admin/lib/lang/ar_remote_action.lng +++ b/interface/web/admin/lib/lang/ar_remote_action.lng @@ -8,5 +8,5 @@ $wb['do_ispcupdate_desc'] = 'This action does a ISPConfig3 update at your select $wb['action_scheduled'] = 'The action is scheduled for execution'; $wb['select_all_server'] = 'All server'; $wb['ispconfig_update_title'] = 'ISPConfig update instructions'; -$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructions'; +$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/ar_software_package.lng b/interface/web/admin/lib/lang/ar_software_package.lng index 62ef734079..faffe38217 100644 --- a/interface/web/admin/lib/lang/ar_software_package.lng +++ b/interface/web/admin/lib/lang/ar_software_package.lng @@ -1,6 +1,6 @@ \ No newline at end of file +?> diff --git a/interface/web/admin/lib/lang/ar_system_config.lng b/interface/web/admin/lib/lang/ar_system_config.lng index 11604d3430..a534fa7425 100644 --- a/interface/web/admin/lib/lang/ar_system_config.lng +++ b/interface/web/admin/lib/lang/ar_system_config.lng @@ -52,4 +52,11 @@ $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail a $wb['webmail_url_error_regex'] = 'Invalid webmail URL'; $wb['phpmyadmin_url_note_txt'] = 'Placeholder:'; $wb['webmail_url_note_txt'] = 'Placeholder:'; +$wb['available_dashlets_note_txt'] = 'Available Dashlets:'; +$wb['admin_dashlets_left_txt'] = 'Left Admin Dashlets'; +$wb['admin_dashlets_right_txt'] = 'Right Admin Dashlets'; +$wb['reseller_dashlets_left_txt'] = 'Left Reseller Dashlets'; +$wb['reseller_dashlets_right_txt'] = 'Right Reseller Dashlets'; +$wb['client_dashlets_left_txt'] = 'Left Client Dashlets'; +$wb['client_dashlets_right_txt'] = 'Right Client Dashlets'; ?> diff --git a/interface/web/admin/lib/lang/bg_language_import.lng b/interface/web/admin/lib/lang/bg_language_import.lng index 0cd38ee91a..40e0633adb 100644 --- a/interface/web/admin/lib/lang/bg_language_import.lng +++ b/interface/web/admin/lib/lang/bg_language_import.lng @@ -5,4 +5,5 @@ $wb['btn_save_txt'] = 'Импортиране'; $wb['language_overwrite_txt'] = 'Презапиши ако съществува'; $wb['btn_cancel_txt'] = 'Отказ'; $wb['ignore_version_txt'] = 'Пропусни ISPConfig проверка на версията'; +$wb['list_desc_txt'] = 'WARNING: Do not import language files from untrustworthy sources.'; ?> diff --git a/interface/web/admin/lib/lang/bg_remote_action.lng b/interface/web/admin/lib/lang/bg_remote_action.lng index 48f35054fc..e9aa121314 100644 --- a/interface/web/admin/lib/lang/bg_remote_action.lng +++ b/interface/web/admin/lib/lang/bg_remote_action.lng @@ -8,5 +8,5 @@ $wb['do_ispcupdate_desc'] = 'Това действие прави ISPConfig 3 о $wb['action_scheduled'] = 'Това действие е насрочено за изпълнение'; $wb['select_all_server'] = 'Целия сървър'; $wb['ispconfig_update_title'] = 'ISPConfig ъпдейт инструкции'; -$wb['ispconfig_update_text'] = 'Логнете се като root потребител през шелла на вашият сървър използвайте командата

ispconfig_update.sh

за да стартирате ISPConfig обновяване.

Click here for detailed update instructions'; +$wb['ispconfig_update_text'] = 'Логнете се като root потребител през шелла на вашият сървър използвайте командата

ispconfig_update.sh

за да стартирате ISPConfig обновяване.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/bg_software_package.lng b/interface/web/admin/lib/lang/bg_software_package.lng index 62ef734079..faffe38217 100644 --- a/interface/web/admin/lib/lang/bg_software_package.lng +++ b/interface/web/admin/lib/lang/bg_software_package.lng @@ -1,6 +1,6 @@ \ No newline at end of file +?> diff --git a/interface/web/admin/lib/lang/bg_system_config.lng b/interface/web/admin/lib/lang/bg_system_config.lng index e3c6678b15..282ab42c29 100644 --- a/interface/web/admin/lib/lang/bg_system_config.lng +++ b/interface/web/admin/lib/lang/bg_system_config.lng @@ -52,4 +52,11 @@ $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail a $wb['webmail_url_error_regex'] = 'Invalid webmail URL'; $wb['phpmyadmin_url_note_txt'] = 'Placeholder:'; $wb['webmail_url_note_txt'] = 'Placeholder:'; +$wb['available_dashlets_note_txt'] = 'Available Dashlets:'; +$wb['admin_dashlets_left_txt'] = 'Left Admin Dashlets'; +$wb['admin_dashlets_right_txt'] = 'Right Admin Dashlets'; +$wb['reseller_dashlets_left_txt'] = 'Left Reseller Dashlets'; +$wb['reseller_dashlets_right_txt'] = 'Right Reseller Dashlets'; +$wb['client_dashlets_left_txt'] = 'Left Client Dashlets'; +$wb['client_dashlets_right_txt'] = 'Right Client Dashlets'; ?> diff --git a/interface/web/admin/lib/lang/br_language_import.lng b/interface/web/admin/lib/lang/br_language_import.lng index 290335b6f0..ba519c5fe6 100644 --- a/interface/web/admin/lib/lang/br_language_import.lng +++ b/interface/web/admin/lib/lang/br_language_import.lng @@ -5,4 +5,5 @@ $wb['btn_save_txt'] = 'Importar Arquivo de Idioma Selecionado'; $wb['language_overwrite_txt'] = 'Sobre escrever o arquivo se existir.'; $wb['btn_cancel_txt'] = 'Voltar'; $wb['ignore_version_txt'] = 'Pular checagem de versão do ISPConfig'; +$wb['list_desc_txt'] = 'WARNING: Do not import language files from untrustworthy sources.'; ?> diff --git a/interface/web/admin/lib/lang/br_remote_action.lng b/interface/web/admin/lib/lang/br_remote_action.lng index 420f2cc56c..d6578c9d6a 100644 --- a/interface/web/admin/lib/lang/br_remote_action.lng +++ b/interface/web/admin/lib/lang/br_remote_action.lng @@ -8,5 +8,5 @@ $wb['do_ispcupdate_desc'] = 'Esta ação fará uma atualização do ISPConfig3 n $wb['action_scheduled'] = 'Esta ação está agendada para execução'; $wb['select_all_server'] = 'Todos os servidores'; $wb['ispconfig_update_title'] = 'ISPConfig update instructions'; -$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructions'; +$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/br_software_package.lng b/interface/web/admin/lib/lang/br_software_package.lng index 62ef734079..faffe38217 100644 --- a/interface/web/admin/lib/lang/br_software_package.lng +++ b/interface/web/admin/lib/lang/br_software_package.lng @@ -1,6 +1,6 @@ \ No newline at end of file +?> diff --git a/interface/web/admin/lib/lang/br_system_config.lng b/interface/web/admin/lib/lang/br_system_config.lng index 3bc0172154..544fcc19d2 100644 --- a/interface/web/admin/lib/lang/br_system_config.lng +++ b/interface/web/admin/lib/lang/br_system_config.lng @@ -52,4 +52,11 @@ $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail a $wb['webmail_url_error_regex'] = 'Invalid webmail URL'; $wb['phpmyadmin_url_note_txt'] = 'Placeholder:'; $wb['webmail_url_note_txt'] = 'Placeholder:'; +$wb['available_dashlets_note_txt'] = 'Available Dashlets:'; +$wb['admin_dashlets_left_txt'] = 'Left Admin Dashlets'; +$wb['admin_dashlets_right_txt'] = 'Right Admin Dashlets'; +$wb['reseller_dashlets_left_txt'] = 'Left Reseller Dashlets'; +$wb['reseller_dashlets_right_txt'] = 'Right Reseller Dashlets'; +$wb['client_dashlets_left_txt'] = 'Left Client Dashlets'; +$wb['client_dashlets_right_txt'] = 'Right Client Dashlets'; ?> diff --git a/interface/web/admin/lib/lang/cz.lng b/interface/web/admin/lib/lang/cz.lng index bc1c9bb83f..23a64d8ba2 100644 --- a/interface/web/admin/lib/lang/cz.lng +++ b/interface/web/admin/lib/lang/cz.lng @@ -48,3 +48,4 @@ $wb['Do OS-Update'] = 'Aktualizovat operační systém'; $wb['Do ISPConfig-Update'] = 'Aktualizovat ISPConfig'; $wb['Directive Snippets'] = 'Directive Snippets'; ?> + diff --git a/interface/web/admin/lib/lang/cz_directive_snippets.lng b/interface/web/admin/lib/lang/cz_directive_snippets.lng index c6a89099c6..085aec4d40 100644 --- a/interface/web/admin/lib/lang/cz_directive_snippets.lng +++ b/interface/web/admin/lib/lang/cz_directive_snippets.lng @@ -7,3 +7,4 @@ $wb['active_txt'] = 'Aktivní'; $wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.'; $wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.'; ?> + diff --git a/interface/web/admin/lib/lang/cz_directive_snippets_list.lng b/interface/web/admin/lib/lang/cz_directive_snippets_list.lng index c6f444b660..c8cedfe36d 100644 --- a/interface/web/admin/lib/lang/cz_directive_snippets_list.lng +++ b/interface/web/admin/lib/lang/cz_directive_snippets_list.lng @@ -5,3 +5,4 @@ $wb['name_txt'] = 'Name of Snippet'; $wb['type_txt'] = 'Verze'; $wb['add_new_record_txt'] = 'Add Directive Snippet'; ?> + diff --git a/interface/web/admin/lib/lang/cz_firewall.lng b/interface/web/admin/lib/lang/cz_firewall.lng index c6146ae93d..abe744f065 100644 --- a/interface/web/admin/lib/lang/cz_firewall.lng +++ b/interface/web/admin/lib/lang/cz_firewall.lng @@ -9,3 +9,4 @@ $wb['firewall_error_unique'] = 'Pro tento server již existuje záznam firewallu $wb['tcp_ports_error_regex'] = 'Znak není povole v definici TCP portu. Povolené symboly jsou čísla, : a ,.'; $wb['udp_ports_error_regex'] = 'Znak není povole v definici UDP portu. Povolené symboly jsou čísla, : a ,.'; ?> + diff --git a/interface/web/admin/lib/lang/cz_firewall_list.lng b/interface/web/admin/lib/lang/cz_firewall_list.lng index aecc4cf06a..76ee5c0f76 100644 --- a/interface/web/admin/lib/lang/cz_firewall_list.lng +++ b/interface/web/admin/lib/lang/cz_firewall_list.lng @@ -6,3 +6,4 @@ $wb['tcp_port_txt'] = 'Otevřené TCP porty'; $wb['udp_port_txt'] = 'Otevřené UDP porty'; $wb['add_new_record_txt'] = 'Přidat záznam'; ?> + diff --git a/interface/web/admin/lib/lang/cz_groups.lng b/interface/web/admin/lib/lang/cz_groups.lng index a6281be247..b7bb634f5e 100644 --- a/interface/web/admin/lib/lang/cz_groups.lng +++ b/interface/web/admin/lib/lang/cz_groups.lng @@ -3,3 +3,4 @@ $wb['description_txt'] = 'Popis'; $wb['name_txt'] = 'Skupina'; $wb['name_err'] = 'Skupina musí mít min. 1, max. 30 znaků.'; ?> + diff --git a/interface/web/admin/lib/lang/cz_groups_list.lng b/interface/web/admin/lib/lang/cz_groups_list.lng index c1d7ef9a8b..9bc2c9eb72 100644 --- a/interface/web/admin/lib/lang/cz_groups_list.lng +++ b/interface/web/admin/lib/lang/cz_groups_list.lng @@ -5,3 +5,4 @@ $wb['name_txt'] = 'Skupina'; $wb['add_new_record_txt'] = 'Přidat skupinu'; $wb['warning_txt'] = 'VAROVÁNÍ: Zde neupravujte uživatelská nastavení. Užijte klientská a distributorská nastavení v klientském modulu. Úprava uživatelý nebo skupin zde může způsobit ztrátu dat!'; ?> + diff --git a/interface/web/admin/lib/lang/cz_iptables.lng b/interface/web/admin/lib/lang/cz_iptables.lng index a40fc0490f..b7d736e15d 100644 --- a/interface/web/admin/lib/lang/cz_iptables.lng +++ b/interface/web/admin/lib/lang/cz_iptables.lng @@ -11,3 +11,4 @@ $wb['source_ip_txt'] = 'Zdrojové adresy'; $wb['active_txt'] = 'Aktivní'; $wb['iptables_error_unique'] = 'Stejný záznam pro firewall je již na tomto serveru použit.'; ?> + diff --git a/interface/web/admin/lib/lang/cz_iptables_list.lng b/interface/web/admin/lib/lang/cz_iptables_list.lng index 65cef7507e..02177f6d99 100644 --- a/interface/web/admin/lib/lang/cz_iptables_list.lng +++ b/interface/web/admin/lib/lang/cz_iptables_list.lng @@ -13,3 +13,4 @@ $wb['source_ip_txt'] = 'Zdrojové adresy'; $wb['active_txt'] = 'Aktivní'; $wb['iptables_error_unique'] = 'Stejný záznam pro firewall je již na tomto serveru použit.'; ?> + diff --git a/interface/web/admin/lib/lang/cz_language_add.lng b/interface/web/admin/lib/lang/cz_language_add.lng index 285dff2761..3af00bf303 100644 --- a/interface/web/admin/lib/lang/cz_language_add.lng +++ b/interface/web/admin/lib/lang/cz_language_add.lng @@ -6,3 +6,4 @@ $wb['language_new_hint_txt'] = '2 znakové ISO 639-1 jazykové kódy (Viz: http: $wb['btn_save_txt'] = 'Vytvořit novou jazykovou sadu souborů'; $wb['btn_cancel_txt'] = 'Zpět'; ?> + diff --git a/interface/web/admin/lib/lang/cz_language_complete.lng b/interface/web/admin/lib/lang/cz_language_complete.lng index f1e6f4924e..5f1b2f75b1 100644 --- a/interface/web/admin/lib/lang/cz_language_complete.lng +++ b/interface/web/admin/lib/lang/cz_language_complete.lng @@ -5,3 +5,4 @@ $wb['language_select_txt'] = 'Vybrat jazyk k doplnění'; $wb['btn_save_txt'] = 'Sloučit / doplnit jazykový soubor'; $wb['btn_cancel_txt'] = 'Zpět'; ?> + diff --git a/interface/web/admin/lib/lang/cz_language_edit.lng b/interface/web/admin/lib/lang/cz_language_edit.lng index 2a71ed0a77..086e166bba 100644 --- a/interface/web/admin/lib/lang/cz_language_edit.lng +++ b/interface/web/admin/lib/lang/cz_language_edit.lng @@ -6,3 +6,4 @@ $wb['lang_file_txt'] = 'Jazykový soubor'; $wb['btn_save_txt'] = 'Uložit'; $wb['btn_cancel_txt'] = 'Zpět'; ?> + diff --git a/interface/web/admin/lib/lang/cz_language_export.lng b/interface/web/admin/lib/lang/cz_language_export.lng index 7998eea017..54f138a2ea 100644 --- a/interface/web/admin/lib/lang/cz_language_export.lng +++ b/interface/web/admin/lib/lang/cz_language_export.lng @@ -4,3 +4,4 @@ $wb['language_select_txt'] = 'Vybrat jazykovou sadu'; $wb['btn_save_txt'] = 'Uložit vybranou jazykovou sadu do souboru'; $wb['btn_cancel_txt'] = 'Zpět'; ?> + diff --git a/interface/web/admin/lib/lang/cz_language_import.lng b/interface/web/admin/lib/lang/cz_language_import.lng index 838c325f7f..11e42f8041 100644 --- a/interface/web/admin/lib/lang/cz_language_import.lng +++ b/interface/web/admin/lib/lang/cz_language_import.lng @@ -6,3 +6,4 @@ $wb['language_overwrite_txt'] = 'Přepsat soubor, pokud existuje.'; $wb['btn_cancel_txt'] = 'Zpět'; $wb['ignore_version_txt'] = 'Přeskočit kontrolu verze ISPConfigu.'; ?> + diff --git a/interface/web/admin/lib/lang/cz_language_list.lng b/interface/web/admin/lib/lang/cz_language_list.lng index b2a7863715..49614e0529 100644 --- a/interface/web/admin/lib/lang/cz_language_list.lng +++ b/interface/web/admin/lib/lang/cz_language_list.lng @@ -5,3 +5,4 @@ $wb['module_txt'] = 'Modul'; $wb['lang_file_txt'] = 'Jazykový soubor'; $wb['lang_file_date_txt'] = 'Poslední úprava'; ?> + diff --git a/interface/web/admin/lib/lang/cz_login_as.lng b/interface/web/admin/lib/lang/cz_login_as.lng index 3f8e8491fc..0f09d105ba 100644 --- a/interface/web/admin/lib/lang/cz_login_as.lng +++ b/interface/web/admin/lib/lang/cz_login_as.lng @@ -9,3 +9,4 @@ $wb['firewall_error_unique'] = 'There is already a firewall record for this serv $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 \\",\\".'; ?> + diff --git a/interface/web/admin/lib/lang/cz_package_install.lng b/interface/web/admin/lib/lang/cz_package_install.lng index 64a190d9a1..843bab6687 100644 --- a/interface/web/admin/lib/lang/cz_package_install.lng +++ b/interface/web/admin/lib/lang/cz_package_install.lng @@ -5,3 +5,4 @@ $wb['repo_username_txt'] = 'Uživatel (volitelné)'; $wb['repo_password_txt'] = 'Heslo (volitelné)'; $wb['active_txt'] = 'Aktivní'; ?> + diff --git a/interface/web/admin/lib/lang/cz_remote_action.lng b/interface/web/admin/lib/lang/cz_remote_action.lng index e1908e2d04..536ccfb357 100644 --- a/interface/web/admin/lib/lang/cz_remote_action.lng +++ b/interface/web/admin/lib/lang/cz_remote_action.lng @@ -10,3 +10,4 @@ $wb['select_all_server'] = 'Všechny servery'; $wb['ispconfig_update_title'] = 'ISPConfig pokyny k aktualizaci'; $wb['ispconfig_update_text'] = 'Přihlaste se jako uživatel root na terminal (shell) serveru a proveďte příkaz

ispconfig_update.sh

spustí se ISPConfig aktualizace.

Klikněte zde pro podrobnější informace o provedení aktualizace'; ?> + diff --git a/interface/web/admin/lib/lang/cz_remote_user.lng b/interface/web/admin/lib/lang/cz_remote_user.lng index 17c4f05b56..c75c165270 100644 --- a/interface/web/admin/lib/lang/cz_remote_user.lng +++ b/interface/web/admin/lib/lang/cz_remote_user.lng @@ -45,3 +45,4 @@ $wb['repeat_password_txt'] = 'Opakujte heslo'; $wb['password_mismatch_txt'] = 'Hesla se neshodují.'; $wb['password_match_txt'] = 'Hesla se shodují.'; ?> + diff --git a/interface/web/admin/lib/lang/cz_remote_user_list.lng b/interface/web/admin/lib/lang/cz_remote_user_list.lng index 66b64946e4..c466a2a8b5 100644 --- a/interface/web/admin/lib/lang/cz_remote_user_list.lng +++ b/interface/web/admin/lib/lang/cz_remote_user_list.lng @@ -5,3 +5,4 @@ $wb['add_new_record_txt'] = 'Přidat uživatele'; $wb['parent_remote_userid_txt'] = 'ID'; $wb['username_txt'] = 'Uživatel'; ?> + diff --git a/interface/web/admin/lib/lang/cz_server.lng b/interface/web/admin/lib/lang/cz_server.lng index a087656a1c..ced7e5fb33 100644 --- a/interface/web/admin/lib/lang/cz_server.lng +++ b/interface/web/admin/lib/lang/cz_server.lng @@ -13,3 +13,4 @@ $wb['- None -'] = '- Žádný -'; $wb['proxy_server_txt'] = 'Proxy-Server'; $wb['firewall_server_txt'] = 'Firewall-Server'; ?> + diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng index 049da2272e..18e833e31a 100644 --- a/interface/web/admin/lib/lang/cz_server_config.lng +++ b/interface/web/admin/lib/lang/cz_server_config.lng @@ -171,11 +171,11 @@ $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attribu $wb['overtraffic_notify_admin_txt'] = 'Při překročení limitu přenesených dat, poslat oznámení adminovi'; $wb['overtraffic_notify_client_txt'] = 'Při překročení limitu přenesených dat, poslat oznámení klientovi'; $wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.'; -$wb['overquota_notify_admin_txt'] = 'Send quota warnings to admin'; -$wb['overquota_notify_client_txt'] = 'Send quota warnings to client'; +$wb['overquota_notify_admin_txt'] = 'Poslat varování o překročení nebo vyčerpání kvót adminovi'; +$wb['overquota_notify_client_txt'] = 'Poslat varování o překročení nebo vyčerpání kvót uživateli'; $wb['overquota_notify_onok_txt'] = 'Send quota ok message to client'; -$wb['overquota_notify_freq_txt'] = 'Send quota warning each X days'; -$wb['overquota_notify_freq_note_txt'] = '0 = send message just once, no repeated messages'; +$wb['overquota_notify_freq_txt'] = 'Poslat varování o kvótách každý X dní'; +$wb['overquota_notify_freq_note_txt'] = '0 = poslat zprávu pouze jednou, žádné opakované zprávy'; $wb['admin_notify_events_txt'] = 'Send email to admin starting with the following level'; $wb['no_notifications_txt'] = 'No Notifications'; $wb['monit_url_txt'] = 'Monit URL'; @@ -189,3 +189,4 @@ $wb['munin_password_txt'] = 'Munin Password'; $wb['munin_url_error_regex'] = 'Invalid Munin URL'; $wb['munin_url_note_txt'] = 'Placeholder:'; ?> + diff --git a/interface/web/admin/lib/lang/cz_server_config_list.lng b/interface/web/admin/lib/lang/cz_server_config_list.lng index 2118c35357..9a56c34e2a 100644 --- a/interface/web/admin/lib/lang/cz_server_config_list.lng +++ b/interface/web/admin/lib/lang/cz_server_config_list.lng @@ -2,3 +2,4 @@ $wb['list_head_txt'] = 'Konfigurace serveru'; $wb['server_name_txt'] = 'Server'; ?> + diff --git a/interface/web/admin/lib/lang/cz_server_ip.lng b/interface/web/admin/lib/lang/cz_server_ip.lng index 43a382a646..4f013b5d9b 100644 --- a/interface/web/admin/lib/lang/cz_server_ip.lng +++ b/interface/web/admin/lib/lang/cz_server_ip.lng @@ -9,3 +9,4 @@ $wb['ip_type_txt'] = 'Verze'; $wb['virtualhost_port_txt'] = 'HTTP Porty'; $wb['error_port_syntax'] = 'Neplatné znaky ve volbě HTTP Portů. Prosím, zadejte pouze číselné hodnoty oddělené čárkami. Příklad: 80,443'; ?> + diff --git a/interface/web/admin/lib/lang/cz_server_ip_list.lng b/interface/web/admin/lib/lang/cz_server_ip_list.lng index 93b0b77c9b..3aaa3abb09 100644 --- a/interface/web/admin/lib/lang/cz_server_ip_list.lng +++ b/interface/web/admin/lib/lang/cz_server_ip_list.lng @@ -8,3 +8,4 @@ $wb['virtualhost_txt'] = 'HTTP Vhost'; $wb['virtualhost_port_txt'] = 'HTTP Ports'; $wb['ip_type_txt'] = 'Verze'; ?> + diff --git a/interface/web/admin/lib/lang/cz_server_list.lng b/interface/web/admin/lib/lang/cz_server_list.lng index ecddbf28e8..437f376284 100644 --- a/interface/web/admin/lib/lang/cz_server_list.lng +++ b/interface/web/admin/lib/lang/cz_server_list.lng @@ -11,3 +11,4 @@ $wb['add_new_record_txt'] = 'Přidat server'; $wb['proxy_server_txt'] = 'Proxy'; $wb['firewall_server_txt'] = 'Firewall'; ?> + diff --git a/interface/web/admin/lib/lang/cz_server_php.lng b/interface/web/admin/lib/lang/cz_server_php.lng index 10aba05dd7..fc8f7ad4af 100644 --- a/interface/web/admin/lib/lang/cz_server_php.lng +++ b/interface/web/admin/lib/lang/cz_server_php.lng @@ -14,3 +14,4 @@ $wb['php_fpm_init_script_txt'] = 'Cesta k PHP-FPM init script'; $wb['php_fpm_ini_dir_txt'] = 'Cesta k php.ini adresáři'; $wb['php_fpm_pool_dir_txt'] = 'Cesta k PHP-FPM pool adresáři'; ?> + diff --git a/interface/web/admin/lib/lang/cz_server_php_list.lng b/interface/web/admin/lib/lang/cz_server_php_list.lng index 36b28fe411..25b95f9c4d 100644 --- a/interface/web/admin/lib/lang/cz_server_php_list.lng +++ b/interface/web/admin/lib/lang/cz_server_php_list.lng @@ -5,3 +5,4 @@ $wb['add_new_record_txt'] = 'Přidat novou verzi PHP'; $wb['client_id_txt'] = 'Klient'; $wb['name_txt'] = 'Verze PHP'; ?> + diff --git a/interface/web/admin/lib/lang/cz_software_package.lng b/interface/web/admin/lib/lang/cz_software_package.lng index 62ef734079..b6421baf17 100644 --- a/interface/web/admin/lib/lang/cz_software_package.lng +++ b/interface/web/admin/lib/lang/cz_software_package.lng @@ -1,6 +1,7 @@ \ No newline at end of file +?> + diff --git a/interface/web/admin/lib/lang/cz_software_package_install.lng b/interface/web/admin/lib/lang/cz_software_package_install.lng index 0d079ef6d3..77941a0ded 100644 --- a/interface/web/admin/lib/lang/cz_software_package_install.lng +++ b/interface/web/admin/lib/lang/cz_software_package_install.lng @@ -4,3 +4,4 @@ $wb['install_key_txt'] = 'Enter install key'; $wb['btn_save_txt'] = 'Spustit instalaci'; $wb['btn_cancel_txt'] = 'Zrušit'; ?> + diff --git a/interface/web/admin/lib/lang/cz_software_package_list.lng b/interface/web/admin/lib/lang/cz_software_package_list.lng index 9d227acb2d..ec1b967fa9 100644 --- a/interface/web/admin/lib/lang/cz_software_package_list.lng +++ b/interface/web/admin/lib/lang/cz_software_package_list.lng @@ -8,6 +8,7 @@ $wb['toolsarea_head_txt'] = 'Balíčky'; $wb['repoupdate_txt'] = 'Aktualizace seznamu balíků'; $wb['package_id_txt'] = 'místní App-ID'; $wb['no_packages_txt'] = 'Žádné balíčky nejsou k dispozici'; -$wb['edit_txt'] = 'Edit'; -$wb['delete_txt'] = 'Delete'; +$wb['edit_txt'] = 'Upravit'; +$wb['delete_txt'] = 'Smazat'; ?> + diff --git a/interface/web/admin/lib/lang/cz_software_repo.lng b/interface/web/admin/lib/lang/cz_software_repo.lng index 6e200d8d12..572d3319c4 100644 --- a/interface/web/admin/lib/lang/cz_software_repo.lng +++ b/interface/web/admin/lib/lang/cz_software_repo.lng @@ -6,3 +6,4 @@ $wb['repo_password_txt'] = 'Heslo (volitelné)'; $wb['active_txt'] = 'Aktivní'; $wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates'; ?> + diff --git a/interface/web/admin/lib/lang/cz_software_repo_list.lng b/interface/web/admin/lib/lang/cz_software_repo_list.lng index 5c82d4c41f..d45b792fbc 100644 --- a/interface/web/admin/lib/lang/cz_software_repo_list.lng +++ b/interface/web/admin/lib/lang/cz_software_repo_list.lng @@ -4,3 +4,4 @@ $wb['active_txt'] = 'Aktivní'; $wb['repo_name_txt'] = 'Repozitář'; $wb['repo_url_txt'] = 'URL'; ?> + diff --git a/interface/web/admin/lib/lang/cz_software_update_list.lng b/interface/web/admin/lib/lang/cz_software_update_list.lng index c48ad8ce30..467fd5f0de 100644 --- a/interface/web/admin/lib/lang/cz_software_update_list.lng +++ b/interface/web/admin/lib/lang/cz_software_update_list.lng @@ -7,3 +7,4 @@ $wb['version_txt'] = 'Verze'; $wb['action_txt'] = 'Akce'; $wb['no_updates_txt'] = 'Žádné aktualizace nejsou k dispozici'; ?> + diff --git a/interface/web/admin/lib/lang/cz_system_config.lng b/interface/web/admin/lib/lang/cz_system_config.lng index 167b933328..40804371ec 100644 --- a/interface/web/admin/lib/lang/cz_system_config.lng +++ b/interface/web/admin/lib/lang/cz_system_config.lng @@ -53,3 +53,4 @@ $wb['webmail_url_error_regex'] = 'Invalid webmail URL'; $wb['phpmyadmin_url_note_txt'] = 'Placeholder:'; $wb['webmail_url_note_txt'] = 'Placeholder:'; ?> + diff --git a/interface/web/admin/lib/lang/cz_tpl_default_admin.lng b/interface/web/admin/lib/lang/cz_tpl_default_admin.lng index 480d504421..efecb6d979 100644 --- a/interface/web/admin/lib/lang/cz_tpl_default_admin.lng +++ b/interface/web/admin/lib/lang/cz_tpl_default_admin.lng @@ -16,3 +16,4 @@ $wb['php_fpm_init_script_txt'] = 'Cesta k PHP-FPM init script'; $wb['php_fpm_ini_dir_txt'] = 'Cesta k php.ini adresáři'; $wb['php_fpm_pool_dir_txt'] = 'Cesta k PHP-FPM pool adresáři'; ?> + diff --git a/interface/web/admin/lib/lang/cz_users.lng b/interface/web/admin/lib/lang/cz_users.lng index 16f4812d68..0324f16a8d 100644 --- a/interface/web/admin/lib/lang/cz_users.lng +++ b/interface/web/admin/lib/lang/cz_users.lng @@ -31,3 +31,4 @@ $wb['password_mismatch_txt'] = 'Hesla se neshodují.'; $wb['password_match_txt'] = 'Hesla se shodují.'; $wb['username_error_collision'] = 'Uživatelské jméno nesmí být web nebo web a číslo.\\"'; ?> + diff --git a/interface/web/admin/lib/lang/cz_users_list.lng b/interface/web/admin/lib/lang/cz_users_list.lng index e5a7d1e4de..37b0e7e29b 100644 --- a/interface/web/admin/lib/lang/cz_users_list.lng +++ b/interface/web/admin/lib/lang/cz_users_list.lng @@ -7,3 +7,4 @@ $wb['add_new_record_txt'] = 'Přidat uživatele'; $wb['warning_txt'] = 'VAROVÁNÍ: Zde neupravujte uživatelská nastavení. Užijte klientská a distributorská nastavení v klientském modulu. Úprava uživatelů nebo skupin zde může způsobit ztrátu dat!'; $wb['groups_txt'] = 'Skupiny'; ?> + diff --git a/interface/web/admin/lib/lang/de.lng b/interface/web/admin/lib/lang/de.lng index 0a7af75131..152c829df6 100644 --- a/interface/web/admin/lib/lang/de.lng +++ b/interface/web/admin/lib/lang/de.lng @@ -48,3 +48,4 @@ $wb['Remote Actions'] = 'Wartung'; $wb['Do OS-Update'] = 'Betriebssystem Update'; $wb['Do ISPConfig-Update'] = 'ISPConfig Update'; ?> + diff --git a/interface/web/admin/lib/lang/de_directive_snippets.lng b/interface/web/admin/lib/lang/de_directive_snippets.lng index 7a9b7563be..9c93c4c8bb 100644 --- a/interface/web/admin/lib/lang/de_directive_snippets.lng +++ b/interface/web/admin/lib/lang/de_directive_snippets.lng @@ -5,5 +5,6 @@ $wb['type_txt'] = 'Typ'; $wb['snippet_txt'] = 'Schnipsel'; $wb['active_txt'] = 'Aktiv'; $wb['directive_snippets_name_empty'] = 'Bitte geben Sie einen Namen für den Schnipsel an.'; -$wb['directive_snippets_name_error_unique'] = 'Es existiert schon ein Direktiven-Schnipsel mit diesem Namen.'; +$wb['directive_snippets_name_error_unique'] = 'Es existiert schon ein Direktiven Schnipsel mit diesem Namen.'; ?> + diff --git a/interface/web/admin/lib/lang/de_directive_snippets_list.lng b/interface/web/admin/lib/lang/de_directive_snippets_list.lng index a19d5e8da4..d3109a19fa 100644 --- a/interface/web/admin/lib/lang/de_directive_snippets_list.lng +++ b/interface/web/admin/lib/lang/de_directive_snippets_list.lng @@ -5,3 +5,4 @@ $wb['name_txt'] = 'Name des Schnipsels'; $wb['type_txt'] = 'Typ'; $wb['add_new_record_txt'] = 'Direktiven Schnipsel hinzufügen'; ?> + diff --git a/interface/web/admin/lib/lang/de_firewall.lng b/interface/web/admin/lib/lang/de_firewall.lng index 92b73270f5..a475290e1c 100644 --- a/interface/web/admin/lib/lang/de_firewall.lng +++ b/interface/web/admin/lib/lang/de_firewall.lng @@ -9,3 +9,4 @@ $wb['firewall_error_unique'] = 'Es gibt bereits einen Firewalldatensatz für die $wb['tcp_ports_error_regex'] = 'Zeichen nicht erlaubt in TCP Port Definition. Erlaubte Zeichen sind Nummern, : und ,.'; $wb['udp_ports_error_regex'] = 'Zeichen nicht erlaubt in UDP Port Definition. Erlaubte Zeichen sind Nummern, : und ,.'; ?> + diff --git a/interface/web/admin/lib/lang/de_firewall_list.lng b/interface/web/admin/lib/lang/de_firewall_list.lng index aefad619ba..77172d054c 100644 --- a/interface/web/admin/lib/lang/de_firewall_list.lng +++ b/interface/web/admin/lib/lang/de_firewall_list.lng @@ -6,3 +6,4 @@ $wb['tcp_port_txt'] = 'Offene TCP Ports'; $wb['udp_port_txt'] = 'Offene UDP Ports'; $wb['add_new_record_txt'] = 'Firewalleintrag hinzufügen'; ?> + diff --git a/interface/web/admin/lib/lang/de_groups.lng b/interface/web/admin/lib/lang/de_groups.lng index 80abd65f76..b29c0996f4 100644 --- a/interface/web/admin/lib/lang/de_groups.lng +++ b/interface/web/admin/lib/lang/de_groups.lng @@ -3,3 +3,4 @@ $wb['description_txt'] = 'Beschreibung'; $wb['name_txt'] = 'Gruppe'; $wb['name_err'] = 'Der Gruppenname muss min. 1, max. 30 Zeichen lang sein.'; ?> + diff --git a/interface/web/admin/lib/lang/de_groups_list.lng b/interface/web/admin/lib/lang/de_groups_list.lng index 2447431771..23492f19f1 100644 --- a/interface/web/admin/lib/lang/de_groups_list.lng +++ b/interface/web/admin/lib/lang/de_groups_list.lng @@ -5,3 +5,4 @@ $wb['name_txt'] = 'Gruppe'; $wb['add_new_record_txt'] = 'Neue Gruppe hinzufügen'; $wb['warning_txt'] = 'WARNUNG: Bitte hier keine Benutzereinstellungen verändern. Benutzen Sie die Kunden- und Resellereinstellungen im Kundenmodul. Modifizieren der Benutzer oder Gruppen hier könnte zum Datenverlust führen!'; ?> + diff --git a/interface/web/admin/lib/lang/de_iptables.lng b/interface/web/admin/lib/lang/de_iptables.lng index 3e5553234d..9d0a395665 100644 --- a/interface/web/admin/lib/lang/de_iptables.lng +++ b/interface/web/admin/lib/lang/de_iptables.lng @@ -6,8 +6,9 @@ $wb['protocol_txt'] = 'Protokoll'; $wb['table_txt'] = 'Table'; $wb['target_txt'] = 'Ziel'; $wb['state_txt'] = 'Status'; -$wb['destination_ip_txt'] = 'Ziel Address'; +$wb['destination_ip_txt'] = 'Ziel Adresse'; $wb['source_ip_txt'] = 'Ausgangs Adresse'; $wb['active_txt'] = 'Aktiv'; $wb['iptables_error_unique'] = 'Es besteht bereits eine Firewall Regel für diesen Server.'; ?> + diff --git a/interface/web/admin/lib/lang/de_iptables_list.lng b/interface/web/admin/lib/lang/de_iptables_list.lng index 378db79555..467368fdee 100644 --- a/interface/web/admin/lib/lang/de_iptables_list.lng +++ b/interface/web/admin/lib/lang/de_iptables_list.lng @@ -13,3 +13,4 @@ $wb['source_ip_txt'] = 'Ausgangs Adresse'; $wb['active_txt'] = 'Aktiv'; $wb['iptables_error_unique'] = 'Es besteht bereits eine Firewall Regel für diesen Server.'; ?> + diff --git a/interface/web/admin/lib/lang/de_language_add.lng b/interface/web/admin/lib/lang/de_language_add.lng index 118bdee049..7d7234a4b1 100644 --- a/interface/web/admin/lib/lang/de_language_add.lng +++ b/interface/web/admin/lib/lang/de_language_add.lng @@ -4,5 +4,6 @@ $wb['language_select_txt'] = 'Sprachbasis auswählen'; $wb['language_new_txt'] = 'Neue Sprache'; $wb['language_new_hint_txt'] = '2 Buchstaben ISO 639-1 Sprachcode (siehe http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)'; $wb['btn_save_txt'] = 'Neues Sprachdateiset erstellen'; -$wb['btn_cancel_txt'] = 'Zurück'; +$wb['btn_cancel_txt'] = 'Abbrechen'; ?> + diff --git a/interface/web/admin/lib/lang/de_language_complete.lng b/interface/web/admin/lib/lang/de_language_complete.lng index 1376e0c8a2..015bd172ee 100644 --- a/interface/web/admin/lib/lang/de_language_complete.lng +++ b/interface/web/admin/lib/lang/de_language_complete.lng @@ -3,5 +3,6 @@ $wb['list_head_txt'] = 'Sprachdatei zusammenführen'; $wb['list_desc_txt'] = 'Die ausgewählte Sprache mit der englischen Master Sprachdatei zusammenführen.
Dies fügt fehlende Sätze aus der englischen Master Sprachdatei in der gewählten Sprache ein.'; $wb['language_select_txt'] = 'Sprache auswählen'; $wb['btn_save_txt'] = 'Dateien jetzt zusammenführen'; -$wb['btn_cancel_txt'] = 'Zurück'; +$wb['btn_cancel_txt'] = 'Abbrechen'; ?> + diff --git a/interface/web/admin/lib/lang/de_language_edit.lng b/interface/web/admin/lib/lang/de_language_edit.lng index 30ab21b28d..139b679390 100644 --- a/interface/web/admin/lib/lang/de_language_edit.lng +++ b/interface/web/admin/lib/lang/de_language_edit.lng @@ -4,5 +4,6 @@ $wb['language_select_txt'] = 'Sprache auswählen'; $wb['module_txt'] = 'Modul'; $wb['lang_file_txt'] = 'Sprachdatei'; $wb['btn_save_txt'] = 'Speichern'; -$wb['btn_cancel_txt'] = 'Zurück'; +$wb['btn_cancel_txt'] = 'Abbrechen'; ?> + diff --git a/interface/web/admin/lib/lang/de_language_export.lng b/interface/web/admin/lib/lang/de_language_export.lng index 70eb466d4c..2674634ba1 100644 --- a/interface/web/admin/lib/lang/de_language_export.lng +++ b/interface/web/admin/lib/lang/de_language_export.lng @@ -2,5 +2,6 @@ $wb['list_head_txt'] = 'Sprachdatei exportieren'; $wb['language_select_txt'] = 'Sprache auswählen'; $wb['btn_save_txt'] = 'Ausgewähltes Sprachdateiset exportieren'; -$wb['btn_cancel_txt'] = 'Zurück'; +$wb['btn_cancel_txt'] = 'Abbrechen'; ?> + diff --git a/interface/web/admin/lib/lang/de_language_import.lng b/interface/web/admin/lib/lang/de_language_import.lng index 29ee030787..bd79ce6710 100644 --- a/interface/web/admin/lib/lang/de_language_import.lng +++ b/interface/web/admin/lib/lang/de_language_import.lng @@ -3,6 +3,7 @@ $wb['list_head_txt'] = 'Sprachdatei importieren'; $wb['language_import_txt'] = 'Sprache auswählen'; $wb['btn_save_txt'] = 'Ausgewählte Sprache importieren'; $wb['language_overwrite_txt'] = 'Datei überschreiben, falls diese schon existiert.'; -$wb['btn_cancel_txt'] = 'Zurück'; +$wb['btn_cancel_txt'] = 'Abbrechen'; $wb['ignore_version_txt'] = 'ISPConfig Versionsüberprüfung überspringen'; ?> + diff --git a/interface/web/admin/lib/lang/de_language_list.lng b/interface/web/admin/lib/lang/de_language_list.lng index bf75420cfc..6d4a7ae77d 100644 --- a/interface/web/admin/lib/lang/de_language_list.lng +++ b/interface/web/admin/lib/lang/de_language_list.lng @@ -5,3 +5,4 @@ $wb['module_txt'] = 'Modul'; $wb['lang_file_txt'] = 'Sprachdatei'; $wb['lang_file_date_txt'] = 'Letzte Änderung'; ?> + diff --git a/interface/web/admin/lib/lang/de_login_as.lng b/interface/web/admin/lib/lang/de_login_as.lng index 1edec36c32..2388e2e3bf 100644 --- a/interface/web/admin/lib/lang/de_login_as.lng +++ b/interface/web/admin/lib/lang/de_login_as.lng @@ -9,3 +9,4 @@ $wb['firewall_error_unique'] = 'Es gibt bereits einen Firewalleintrag für diese $wb['tcp_ports_error_regex'] = 'Es sind nur Zahlen in der TCP Port Definition erlaubt. '; $wb['udp_ports_error_regex'] = 'Es sind nur Zahlen in der UDP Port Definition erlaubt., '; ?> + diff --git a/interface/web/admin/lib/lang/de_package_install.lng b/interface/web/admin/lib/lang/de_package_install.lng index bbacc85d41..f54fbfefb1 100644 --- a/interface/web/admin/lib/lang/de_package_install.lng +++ b/interface/web/admin/lib/lang/de_package_install.lng @@ -5,3 +5,4 @@ $wb['repo_username_txt'] = 'Benutzername (optional)'; $wb['repo_password_txt'] = 'Passwort (optional)'; $wb['active_txt'] = 'Aktiv'; ?> + diff --git a/interface/web/admin/lib/lang/de_remote_action.lng b/interface/web/admin/lib/lang/de_remote_action.lng index 786f03e0ad..3fdfbb811b 100644 --- a/interface/web/admin/lib/lang/de_remote_action.lng +++ b/interface/web/admin/lib/lang/de_remote_action.lng @@ -10,3 +10,4 @@ $wb['select_all_server'] = 'Alle Server'; $wb['ispconfig_update_title'] = 'ISPConfig 3 Update Anweisungen'; $wb['ispconfig_update_text'] = 'Melden Sie sich auf Ihrem Server als root an und führen Sie folgendes Kommando auf der Shell aus

ispconfig_update.sh

um das ISPConfig Update zu starten.

Klicken Sie hier um eine detailierte Beschreibung zu erhalten'; ?> + diff --git a/interface/web/admin/lib/lang/de_remote_user.lng b/interface/web/admin/lib/lang/de_remote_user.lng index 9e7d2a0c79..9f2bdf5eaa 100644 --- a/interface/web/admin/lib/lang/de_remote_user.lng +++ b/interface/web/admin/lib/lang/de_remote_user.lng @@ -6,19 +6,19 @@ $wb['username_error_unique'] = 'Benutzername muss einzigartig sein'; $wb['username_error_empty'] = 'Benutzername darf nicht leer sein'; $wb['password_error_empty'] = 'Passwort darf nicht leer sein'; $wb['password_strength_txt'] = 'Passwortstärke:'; -$wb['Mail domain functions'] = 'Mail Domain Funktionen'; -$wb['Mail user functions'] = 'Mail Benutzer Funktionen'; -$wb['Mail alias functions'] = 'Mail Alias Funktionen'; -$wb['Mail forward functions'] = 'Mail Weiterleitung Funktionen'; -$wb['Mail catchall functions'] = 'Mail Catchall Funktionen'; -$wb['Mail transport functions'] = 'Mail Transport Funktionen'; -$wb['Mail whitelist functions'] = 'Mail Whitelist Funktionen'; -$wb['Mail blacklist functions'] = 'Mail Blacklist Funktionen'; -$wb['Mail spamfilter user functions'] = 'Mail Spamfilter Benutzer Funktionen'; -$wb['Mail spamfilter policy functions'] = 'Mail Spamfilter Richtlinien Funktionen'; -$wb['Mail fetchmail functions'] = 'Mail Fetchmail Funktionen'; -$wb['Mail user filter functions'] = 'Mail Benutzer Filter Funktionen'; -$wb['Mail filter functions'] = 'Mail Filter Funktionen'; +$wb['Mail domain functions'] = 'E-Mail Domain Funktionen'; +$wb['Mail user functions'] = 'E-Mail Benutzer Funktionen'; +$wb['Mail alias functions'] = 'E-Mail Alias Funktionen'; +$wb['Mail forward functions'] = 'E-Mail Weiterleitung Funktionen'; +$wb['Mail catchall functions'] = 'E-Mail Catchall Funktionen'; +$wb['Mail transport functions'] = 'E-Mail Transport Funktionen'; +$wb['Mail whitelist functions'] = 'E-Mail Whitelist Funktionen'; +$wb['Mail blacklist functions'] = 'E-Mail Blacklist Funktionen'; +$wb['Mail spamfilter user functions'] = 'E-Mail Spamfilter Benutzer Funktionen'; +$wb['Mail spamfilter policy functions'] = 'E-Mail Spamfilter Richtlinien Funktionen'; +$wb['Mail fetchmail functions'] = 'E-Mail Fetchmail Funktionen'; +$wb['Mail user filter functions'] = 'E-Mail Benutzer Filter Funktionen'; +$wb['Mail filter functions'] = 'E-Mail Filter Funktionen'; $wb['Client functions'] = 'Kunden Funktionen'; $wb['Sites cron functions'] = 'Webseiten Cron Funktionen'; $wb['Sites database functions'] = 'Webseiten Datenbanken Funktionen'; @@ -39,9 +39,10 @@ $wb['DNS ptr functions'] = 'DNS ptr Funktionen'; $wb['DNS rp functions'] = 'DNS rp Funktionen'; $wb['DNS srv functions'] = 'DNS srv Funktionen'; $wb['DNS txt functions'] = 'DNS txt Funktionen'; -$wb['Mail mailing list functions'] = 'Mail Mailinglisten Funktionen'; +$wb['Mail mailing list functions'] = 'Mailinglisten Funktionen'; $wb['generate_password_txt'] = 'Passwort erzeugen'; $wb['repeat_password_txt'] = 'Passwort wiederholen'; $wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; $wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; ?> + diff --git a/interface/web/admin/lib/lang/de_remote_user_list.lng b/interface/web/admin/lib/lang/de_remote_user_list.lng index 4a3c6fe1d5..a0485a9077 100644 --- a/interface/web/admin/lib/lang/de_remote_user_list.lng +++ b/interface/web/admin/lib/lang/de_remote_user_list.lng @@ -5,3 +5,4 @@ $wb['add_new_record_txt'] = 'Neuen Benutzer hinzufügen'; $wb['parent_remote_userid_txt'] = 'Benutzer ID'; $wb['username_txt'] = 'Benutzername'; ?> + diff --git a/interface/web/admin/lib/lang/de_server.lng b/interface/web/admin/lib/lang/de_server.lng index 50f8090488..12d2ba7527 100644 --- a/interface/web/admin/lib/lang/de_server.lng +++ b/interface/web/admin/lib/lang/de_server.lng @@ -13,3 +13,4 @@ $wb['- None -'] = '- Nichts ausgewählt -'; $wb['proxy_server_txt'] = 'Proxy Server'; $wb['firewall_server_txt'] = 'Firewall Server'; ?> + diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng index acb6b3dd8a..612efe72d4 100644 --- a/interface/web/admin/lib/lang/de_server_config.lng +++ b/interface/web/admin/lib/lang/de_server_config.lng @@ -146,7 +146,6 @@ $wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM Socket Verzeichnis ist leer.'; $wb['fastcgi_config_syntax_txt'] = 'FastCGI Konfigurations Syntax'; $wb['try_rescue_txt'] = 'Aktiviere Service Monitoring und Neustart bei Unerreichbarkeit'; $wb['do_not_try_rescue_httpd_txt'] = 'Deaktiviere HTTPD Monitoring'; -$wb['do_not_try_rescue_mongodb_txt'] = 'Deaktiviere MongoDB Monitoring'; $wb['do_not_try_rescue_mysql_txt'] = 'Deaktiviere MySQL Monitoring'; $wb['do_not_try_rescue_mail_txt'] = 'Deaktiviere E-Mail Monitoring'; $wb['rescue_description_txt'] = 'Information: Falls Sie MySQL stoppen möchten, wählen Sie die Funktion \'Deaktiviere MySQL Monitoring\' und warten Sie 2 bis 3 Minuten. Wenn Sie nicht 2 bis 3 Miunten warten wird ISPConfig versuchen MySQL wieder zu starten.'; @@ -169,24 +168,25 @@ $wb['firewall_txt'] = 'Firewall'; $wb['mailbox_quota_stats_txt'] = 'E-Mailkonto Beschränkung Statistiken'; $wb['enable_ip_wildcard_txt'] = 'IP Adressen Wildcard (*) aktivieren'; $wb['web_folder_protection_txt'] = 'Webverzeichnis unveränderlich machen (erweiterte Attribute)'; -$wb['overtraffic_notify_admin_txt'] = 'Überschreiten des Transfer Limits an den Administrator senden'; -$wb['overtraffic_notify_client_txt'] = 'Überschreiten des Transfer Limits an den Kunden senden'; +$wb['overtraffic_notify_admin_txt'] = 'Überschreiten des Datentransfer Limits an den Administrator senden'; +$wb['overtraffic_notify_client_txt'] = 'Überschreiten des Datentransfer Limits an den Kunden senden'; $wb['rbl_error_regex'] = 'Bitte geben Sie gültige RBL-Hostnamen an.'; -$wb['overquota_notify_admin_txt'] = 'Quota-Warnungen an den Administrator senden'; -$wb['overquota_notify_client_txt'] = 'Quota-Warnungen an den Kunden senden'; -$wb['overquota_notify_onok_txt'] = 'Meldung an den Kunden senden, wenn Belegung wieder ok'; -$wb['overquota_notify_freq_txt'] = 'Quota-Warnung alle X Tage versenden'; +$wb['overquota_notify_admin_txt'] = 'Warung bei Erreichen einer Beschränkung per E-Mail an den Administrator senden'; +$wb['overquota_notify_client_txt'] = 'Warnung bei Erreichen einer Beschränkung per E-Mail an den Kunden senden'; +$wb['overquota_notify_onok_txt'] = 'Meldung an den Kunden senden, wenn Beschränkung wieder OK ist'; +$wb['overquota_notify_freq_txt'] = 'Warnung der Beschränkung alle X Tage versenden'; $wb['overquota_notify_freq_note_txt'] = '0 = Meldung nur einmalig versenden, keine Wiederholung'; $wb['admin_notify_events_txt'] = 'Sende E-Mail an Administrator ab folgendem Level'; $wb['no_notifications_txt'] = 'Keine Benachrichtigungen'; -$wb['monit_url_txt'] = 'Monit-URL'; -$wb['monit_user_txt'] = 'Monit-Benutzer'; -$wb['monit_password_txt'] = 'Monit-Passwort'; -$wb['monit_url_error_regex'] = 'Ungültige Monit-URL'; +$wb['monit_url_txt'] = 'Monit URL'; +$wb['monit_user_txt'] = 'Monit Benutzer'; +$wb['monit_password_txt'] = 'Monit Passwort'; +$wb['monit_url_error_regex'] = 'Ungültige Monit URL'; $wb['monit_url_note_txt'] = 'Platzhalter:'; -$wb['munin_url_txt'] = 'Munin-URL'; -$wb['munin_user_txt'] = 'Munin-Benutzer'; -$wb['munin_password_txt'] = 'Munin-Passwort'; -$wb['munin_url_error_regex'] = 'Ungültige Munin-URL'; +$wb['munin_url_txt'] = 'Munin URL'; +$wb['munin_user_txt'] = 'Munin Benutzer'; +$wb['munin_password_txt'] = 'Munin Passwort'; +$wb['munin_url_error_regex'] = 'Ungültige Munin URL'; $wb['munin_url_note_txt'] = 'Platzhalter:'; ?> + diff --git a/interface/web/admin/lib/lang/de_server_config_list.lng b/interface/web/admin/lib/lang/de_server_config_list.lng index 191b2c8d32..9ff7f9b640 100644 --- a/interface/web/admin/lib/lang/de_server_config_list.lng +++ b/interface/web/admin/lib/lang/de_server_config_list.lng @@ -2,3 +2,4 @@ $wb['list_head_txt'] = 'Serverkonfiguration'; $wb['server_name_txt'] = 'Server'; ?> + diff --git a/interface/web/admin/lib/lang/de_server_ip.lng b/interface/web/admin/lib/lang/de_server_ip.lng index 5757b165cb..26aff5daad 100644 --- a/interface/web/admin/lib/lang/de_server_ip.lng +++ b/interface/web/admin/lib/lang/de_server_ip.lng @@ -1,11 +1,12 @@ + diff --git a/interface/web/admin/lib/lang/de_server_ip_list.lng b/interface/web/admin/lib/lang/de_server_ip_list.lng index 37f237c9e2..9b36a5adf2 100644 --- a/interface/web/admin/lib/lang/de_server_ip_list.lng +++ b/interface/web/admin/lib/lang/de_server_ip_list.lng @@ -8,3 +8,4 @@ $wb['virtualhost_txt'] = 'HTTP vHost'; $wb['virtualhost_port_txt'] = 'HTTP Ports'; $wb['ip_type_txt'] = 'Typ'; ?> + diff --git a/interface/web/admin/lib/lang/de_server_list.lng b/interface/web/admin/lib/lang/de_server_list.lng index e38a5db413..193dbc9ede 100644 --- a/interface/web/admin/lib/lang/de_server_list.lng +++ b/interface/web/admin/lib/lang/de_server_list.lng @@ -11,3 +11,4 @@ $wb['add_new_record_txt'] = 'Neuen Server hinzufügen'; $wb['proxy_server_txt'] = 'Proxyserver'; $wb['firewall_server_txt'] = 'Firewallserver'; ?> + diff --git a/interface/web/admin/lib/lang/de_server_php.lng b/interface/web/admin/lib/lang/de_server_php.lng index 9b26ea3c6d..30f527a56b 100644 --- a/interface/web/admin/lib/lang/de_server_php.lng +++ b/interface/web/admin/lib/lang/de_server_php.lng @@ -14,3 +14,4 @@ $wb['php_fpm_init_script_txt'] = 'Pfad zum PHP-FPM Init Script'; $wb['php_fpm_ini_dir_txt'] = 'Pfad zum php.ini Verzeichnis'; $wb['php_fpm_pool_dir_txt'] = 'Pfad zum PHP-FPM Pool Verzeichnis'; ?> + diff --git a/interface/web/admin/lib/lang/de_server_php_list.lng b/interface/web/admin/lib/lang/de_server_php_list.lng index d775fc6c00..712beda2e7 100644 --- a/interface/web/admin/lib/lang/de_server_php_list.lng +++ b/interface/web/admin/lib/lang/de_server_php_list.lng @@ -5,3 +5,4 @@ $wb['add_new_record_txt'] = 'Neue PHP Version hinzufügen'; $wb['client_id_txt'] = 'Kunde'; $wb['name_txt'] = 'PHP Name'; ?> + diff --git a/interface/web/admin/lib/lang/de_software_package.lng b/interface/web/admin/lib/lang/de_software_package.lng index 4c3431b764..7f1504572b 100644 --- a/interface/web/admin/lib/lang/de_software_package.lng +++ b/interface/web/admin/lib/lang/de_software_package.lng @@ -1,6 +1,7 @@ + diff --git a/interface/web/admin/lib/lang/de_software_package_install.lng b/interface/web/admin/lib/lang/de_software_package_install.lng index 1ef69d13d3..842846df74 100644 --- a/interface/web/admin/lib/lang/de_software_package_install.lng +++ b/interface/web/admin/lib/lang/de_software_package_install.lng @@ -1,6 +1,7 @@ + diff --git a/interface/web/admin/lib/lang/de_software_package_list.lng b/interface/web/admin/lib/lang/de_software_package_list.lng index 75b7504390..3d0555365f 100644 --- a/interface/web/admin/lib/lang/de_software_package_list.lng +++ b/interface/web/admin/lib/lang/de_software_package_list.lng @@ -1,13 +1,14 @@ + diff --git a/interface/web/admin/lib/lang/de_software_repo.lng b/interface/web/admin/lib/lang/de_software_repo.lng index 2a8cf150b0..50e5019038 100644 --- a/interface/web/admin/lib/lang/de_software_repo.lng +++ b/interface/web/admin/lib/lang/de_software_repo.lng @@ -1,8 +1,9 @@ + diff --git a/interface/web/admin/lib/lang/de_software_repo_list.lng b/interface/web/admin/lib/lang/de_software_repo_list.lng index db6f49fd4e..133ef3ab42 100644 --- a/interface/web/admin/lib/lang/de_software_repo_list.lng +++ b/interface/web/admin/lib/lang/de_software_repo_list.lng @@ -1,6 +1,7 @@ + diff --git a/interface/web/admin/lib/lang/de_software_update_list.lng b/interface/web/admin/lib/lang/de_software_update_list.lng index cf31e88154..e5a3ca729a 100644 --- a/interface/web/admin/lib/lang/de_software_update_list.lng +++ b/interface/web/admin/lib/lang/de_software_update_list.lng @@ -7,3 +7,4 @@ $wb['version_txt'] = 'Version'; $wb['action_txt'] = 'Aktion'; $wb['no_updates_txt'] = 'Keine Updates verfügbar'; ?> + diff --git a/interface/web/admin/lib/lang/de_system_config.lng b/interface/web/admin/lib/lang/de_system_config.lng index 217b95de8b..2490768e20 100644 --- a/interface/web/admin/lib/lang/de_system_config.lng +++ b/interface/web/admin/lib/lang/de_system_config.lng @@ -48,15 +48,9 @@ $wb['phpmyadmin_url_error_regex'] = 'Falsche phpMyAdmin URL'; $wb['client_username_web_check_disabled_txt'] = 'Deaktiviere die Kunden Benutzernamen Überprüfung für den Begriff web.'; $wb['mailbox_show_autoresponder_tab_txt'] = 'Zeige Autoresponder Reiter in E-Mail Kontodetails'; $wb['mailbox_show_mail_filter_tab_txt'] = 'Zeige E-Mail Filter Reiter in E-Mail Kontodetails'; -$wb['mailbox_show_custom_rules_tab_txt'] = 'Zeige Benutzerregel Reiter in E-Mail Kontodetails';$wb['webmail_url_error_regex'] = 'Falsche Webmail URL'; -$wb['reseller_can_use_options_txt'] = 'Reseller können den Optionen Reiter bei Webseiten verwenden'; +$wb['mailbox_show_custom_rules_tab_txt'] = 'Zeige Benutzerregel Reiter in E-Mail Kontodetails'; +$wb['webmail_url_error_regex'] = 'Falsche Webmail URL'; $wb['phpmyadmin_url_note_txt'] = 'Platzhalter:'; $wb['webmail_url_note_txt'] = 'Platzhalter:'; -$wb['available_dashlets_note_txt'] = 'Verfügbare Dashlets:'; -$wb['admin_dashlets_left_txt'] = 'Admin-Dashlets links'; -$wb['admin_dashlets_right_txt'] = 'Admin-Dashlets rechts'; -$wb['reseller_dashlets_left_txt'] = 'Reseller-Dashlets links'; -$wb['reseller_dashlets_right_txt'] = 'Reseller-Dashlets rechts'; -$wb['client_dashlets_left_txt'] = 'Kunden-Dashlets links'; -$wb['client_dashlets_right_txt'] = 'Kunden-Dashlets rechts'; ?> + diff --git a/interface/web/admin/lib/lang/de_tpl_default_admin.lng b/interface/web/admin/lib/lang/de_tpl_default_admin.lng index 97674003ee..fda3af0f0c 100644 --- a/interface/web/admin/lib/lang/de_tpl_default_admin.lng +++ b/interface/web/admin/lib/lang/de_tpl_default_admin.lng @@ -16,3 +16,4 @@ $wb['php_fpm_init_script_txt'] = 'Pfad zum PHP-FPM Init Script'; $wb['php_fpm_ini_dir_txt'] = 'Pfad zum php.ini Verzeichnis'; $wb['php_fpm_pool_dir_txt'] = 'Pfad zum PHP-FPM Pool Verzeichnis'; ?> + diff --git a/interface/web/admin/lib/lang/de_users.lng b/interface/web/admin/lib/lang/de_users.lng index 413a402814..fd09475b6d 100644 --- a/interface/web/admin/lib/lang/de_users.lng +++ b/interface/web/admin/lib/lang/de_users.lng @@ -31,3 +31,4 @@ $wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; $wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; $wb['username_error_collision'] = 'Der Benutzername darf nicht web oder web gefolgt von einer Zahl sein.'; ?> + diff --git a/interface/web/admin/lib/lang/de_users_list.lng b/interface/web/admin/lib/lang/de_users_list.lng index c635ba7284..8cb2a46a83 100644 --- a/interface/web/admin/lib/lang/de_users_list.lng +++ b/interface/web/admin/lib/lang/de_users_list.lng @@ -7,3 +7,4 @@ $wb['groups_txt'] = 'Gruppen'; $wb['add_new_record_txt'] = 'Neuen Benutzer hinzufügen'; $wb['warning_txt'] = 'WARNUNG: Bitte hier keine Benutzereinstellungen verändern. Benutzen Sie die Kunden- und Resellereinstellungen im Kundenmodul. Modifizieren der Benutzer oder Gruppen hier könnte zum Datenverlust führen!'; ?> + diff --git a/interface/web/admin/lib/lang/el.lng b/interface/web/admin/lib/lang/el.lng index 010a5506df..4926ef2ad0 100644 --- a/interface/web/admin/lib/lang/el.lng +++ b/interface/web/admin/lib/lang/el.lng @@ -26,13 +26,14 @@ $wb['Web'] = 'Web'; $wb['FastCGI'] = 'FastCGI'; $wb['Jailkit'] = 'Jailkit'; $wb['Rescue'] = 'Rescue'; -$wb['Server IP addresses'] = 'Server IP addresses'; -$wb['Additional PHP Versions'] = 'Additional PHP Versions'; +$wb['Server IP addresses'] = 'Διευθύνσεις IP Server'; +$wb['Additional PHP Versions'] = 'Πρόσθετες εκδόσεις PHP'; +$wb['Directive Snippets'] = 'Directive Snippets'; $wb['Firewall'] = 'Firewall'; -$wb['Interface'] = 'Interface'; -$wb['Interface Config'] = 'Main Config'; +$wb['Interface'] = 'Διεπαφή'; +$wb['Interface Config'] = 'Βασική Διαμόρφωση'; $wb['Domains'] = 'Domains'; -$wb['Misc'] = 'Misc'; +$wb['Misc'] = 'Διάφορα'; $wb['Software'] = 'Εφαρμογές & Πρόσθετα'; $wb['Repositories'] = 'Αποθετήρια'; $wb['Packages'] = 'Πακέτα'; @@ -46,5 +47,4 @@ $wb['Import'] = 'Εισαγωγή'; $wb['Remote Actions'] = 'Απομακρυσμένες Ενέργειες'; $wb['Do OS-Update'] = 'Αναβάθμιση λειτουργικού συστήματος'; $wb['Do ISPConfig-Update'] = 'Αναβάθμιση ISPConfig'; -$wb['Directive Snippets'] = 'Directive Snippets'; ?> diff --git a/interface/web/admin/lib/lang/el_directive_snippets.lng b/interface/web/admin/lib/lang/el_directive_snippets.lng index d836ab0da0..3bdc1e2df1 100644 --- a/interface/web/admin/lib/lang/el_directive_snippets.lng +++ b/interface/web/admin/lib/lang/el_directive_snippets.lng @@ -1,9 +1,9 @@ diff --git a/interface/web/admin/lib/lang/el_directive_snippets_list.lng b/interface/web/admin/lib/lang/el_directive_snippets_list.lng index 4124ea3464..1461c4e4ba 100644 --- a/interface/web/admin/lib/lang/el_directive_snippets_list.lng +++ b/interface/web/admin/lib/lang/el_directive_snippets_list.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/admin/lib/lang/el_firewall.lng b/interface/web/admin/lib/lang/el_firewall.lng index ff31bab28b..a0003f4fa6 100644 --- a/interface/web/admin/lib/lang/el_firewall.lng +++ b/interface/web/admin/lib/lang/el_firewall.lng @@ -5,7 +5,7 @@ $wb['udp_port_txt'] = 'Ανοιχτές θύρες UDP'; $wb['tcp_port_help_txt'] = 'Χωρισμένες με κόμα'; $wb['udp_port_help_txt'] = 'Χωρισμένες με κόμα'; $wb['active_txt'] = 'Ενεργό'; -$wb['firewall_error_unique'] = 'Υπάρχει ήδη μια εγγραφή firewall για αυτό τον σερωερ server.'; +$wb['firewall_error_unique'] = 'Υπάρχει ήδη μια εγγραφή firewall για αυτό τον server.'; $wb['tcp_ports_error_regex'] = 'Οι χαρακτήρες δεν επιτρέπονται στον ορισμό θυρών tcp. Επιτρέπονται μόνο αριθμοί, : και ,.'; $wb['udp_ports_error_regex'] = 'Οι χαρακτήρες δεν επιτρέπονται στον ορισμό θυρών udp. Επιτρέπονται μόνο αριθμοί, : και ,.'; ?> diff --git a/interface/web/admin/lib/lang/el_language_import.lng b/interface/web/admin/lib/lang/el_language_import.lng index 4bb61c4ef5..83504694b5 100644 --- a/interface/web/admin/lib/lang/el_language_import.lng +++ b/interface/web/admin/lib/lang/el_language_import.lng @@ -5,4 +5,5 @@ $wb['btn_save_txt'] = 'Εισαγωγή του επιλεγμένου αρχεί $wb['language_overwrite_txt'] = 'Αντικατάσταση αρχείου, αν υπάρχει.'; $wb['btn_cancel_txt'] = 'Επιστροφή'; $wb['ignore_version_txt'] = 'Παράλειψη ελέγχου έκδοσης ISPConfig'; +$wb['list_desc_txt'] = 'WARNING: Do not import language files from untrustworthy sources.'; ?> diff --git a/interface/web/admin/lib/lang/el_login_as.lng b/interface/web/admin/lib/lang/el_login_as.lng index c660ff1a4b..b93f01bbb5 100644 --- a/interface/web/admin/lib/lang/el_login_as.lng +++ b/interface/web/admin/lib/lang/el_login_as.lng @@ -1,11 +1,11 @@ diff --git a/interface/web/admin/lib/lang/el_remote_action.lng b/interface/web/admin/lib/lang/el_remote_action.lng index fc0e448550..4d94878446 100644 --- a/interface/web/admin/lib/lang/el_remote_action.lng +++ b/interface/web/admin/lib/lang/el_remote_action.lng @@ -7,6 +7,6 @@ $wb['do_ispcupdate_caption'] = 'Εκκίνηση αναβάθμισης ISPConfi $wb['do_ispcupdate_desc'] = 'Αυτή η ενέργεια κάνει αναβάθμιση στο ISPConfig3 στον επιλεγμένο σας server.

ΧΡΗΣΙΜΟΠΟΙΗΣΤΕ ΤΟ ΜΕ ΔΙΚΗ ΣΑΣ ΕΥΘΥΝΗ!'; $wb['action_scheduled'] = 'Η ενέργεια προγραμματίστηκε για εκτέλεση'; $wb['select_all_server'] = 'Σε όλους τους servers'; -$wb['ispconfig_update_title'] = 'ISPConfig update instructions'; -$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructions'; +$wb['ispconfig_update_title'] = 'Οδηγίες ενημέρωσης ISPConfig'; +$wb['ispconfig_update_text'] = 'Εισέλθετε ως χρήστης root σε κάποιο κέλυφος στον server σας και εκτελέστε την εντολή

ispconfig_update.sh

για να εκκινήστε την ενημέρωση του ISPConfig.

Πατήστε εδώ για λεπτομερείς οδηγίες'; ?> diff --git a/interface/web/admin/lib/lang/el_remote_user.lng b/interface/web/admin/lib/lang/el_remote_user.lng index ddffd7072d..8b79d61786 100644 --- a/interface/web/admin/lib/lang/el_remote_user.lng +++ b/interface/web/admin/lib/lang/el_remote_user.lng @@ -5,7 +5,7 @@ $wb['function_txt'] = 'Ενέργειες:'; $wb['username_error_unique'] = 'Το όνομα χρήστη πρέπει να είναι μοναδικό'; $wb['username_error_empty'] = 'Το όνομα χρήστη δεν μπορεί να είναι κενό'; $wb['password_error_empty'] = 'Το συνθηματικό δεν μπορεί να είναι κενό'; -$wb['password_strength_txt'] = 'Δύναμη συνθηματικού'; +$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού'; $wb['Mail domain functions'] = 'Ενέργειες Mail domain'; $wb['Mail user functions'] = 'Ενέργειες Χρήστη Mail'; $wb['Mail alias functions'] = 'Ενέργειες Ψευδωνύμου Mail'; @@ -40,8 +40,8 @@ $wb['DNS rp functions'] = 'Ενέργειες εγγραφών rp του DNS'; $wb['DNS srv functions'] = 'Ενέργειες εγγραφών srv του DNS'; $wb['DNS txt functions'] = 'Ενέργειες εγγραφών txt του DNS'; $wb['Mail mailing list functions'] = 'Ενέργειες Mail mailinglist'; -$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['generate_password_txt'] = 'Δημιουργία Συνθηματικού'; +$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού'; +$wb['password_mismatch_txt'] = 'Τα Συνθηματικά δεν ταιριάζουν.'; +$wb['password_match_txt'] = 'Τα Συνθηματικά ταιριάζουν.'; ?> diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng index 99bdf6f2d2..169a5608d8 100644 --- a/interface/web/admin/lib/lang/el_server_config.lng +++ b/interface/web/admin/lib/lang/el_server_config.lng @@ -148,44 +148,44 @@ $wb['do_not_try_rescue_mail_txt'] = 'Απενεργοποίηση εποπτεί $wb['rescue_description_txt'] = 'Πληροφορία: Αν θέλετε να τερματίσετε την MySQL πρέπει να επιλέξετε την επιλογή Απενεργοποίηση εποπτείας MySQL και μετά να περιμένετε 2-3 λεπτά.
Αν δεν περιμένετε 2-3 λεπτά, η εποπτεία και αποκατάσταση θα προσπαθήσει να επανεκκινήσει την MySQL!'; $wb['enable_sni_txt'] = 'Ενεργοποίηση SNI'; $wb['do_not_try_rescue_httpd_txt'] = 'Απενεργοποίηση εποπτείας HTTPD'; -$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update'; -$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group'; -$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid'; -$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect'; -$wb['website_autoalias_txt'] = 'Website auto alias'; +$wb['set_folder_permissions_on_update_txt'] = 'Ορισμός δικαιωμάτων φακέλων κατά την ενημέρωση'; +$wb['add_web_users_to_sshusers_group_txt'] = 'Προσθήκη των χρηστών web στην ομάδα -sshusers-'; +$wb['connect_userid_to_webid_txt'] = 'Σύνδεση Linux userid στο webid'; +$wb['connect_userid_to_webid_start_txt'] = 'ID εκκίνησης για την σύνδεση userid/webid'; +$wb['website_autoalias_txt'] = 'Αυτόματο ψευδώνυμο Website'; $wb['website_autoalias_note_txt'] = 'Placeholders:'; -$wb['backup_mode_txt'] = 'Backup mode'; -$wb['backup_mode_userzip'] = 'Backup web files owned by web user as zip'; -$wb['backup_mode_rootgz'] = 'Backup all files in web directory as root user'; -$wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List'; -$wb['realtime_blackhole_list_note_txt'] = '(Separate RBL\'s with commas)'; -$wb['ssl_settings_txt'] = 'SSL Settings'; -$wb['permissions_txt'] = 'Permissions'; -$wb['php_settings_txt'] = 'PHP Settings'; -$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings'; -$wb['awstats_settings_txt'] = 'AWStats Settings'; +$wb['backup_mode_txt'] = 'Κατάσταση Backup'; +$wb['backup_mode_userzip'] = 'Να γίνει αντίγραφο ασφαλείας των αρχείων web που ανήκουν στον χρήστη web με τον μορφότυπο zip'; +$wb['backup_mode_rootgz'] = 'Να γίνει αντίγραφο ασφαλείας όλων των αρχείων στον φάκελο web ως χρήστης root'; +$wb['realtime_blackhole_list_txt'] = 'Λίστα Blackhole παρόχων πραγματικού χρόνου (RBL)'; +$wb['realtime_blackhole_list_note_txt'] = '(Διαχωρισμός RBL\'s με κόμματα)'; +$wb['ssl_settings_txt'] = 'Ρυθμίσεις SSL'; +$wb['permissions_txt'] = 'Δικαιώματα'; +$wb['php_settings_txt'] = 'Ρυθμίσεις PHP'; +$wb['apps_vhost_settings_txt'] = 'Ρυθμίσεις Apps Vhost'; +$wb['awstats_settings_txt'] = 'Ρυθμίσεις AWStats'; $wb['firewall_txt'] = 'Firewall'; -$wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics'; -$wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; -$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; -$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin'; -$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client'; -$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.'; -$wb['overquota_notify_admin_txt'] = 'Send quota warnings to admin'; -$wb['overquota_notify_client_txt'] = 'Send quota warnings to client'; -$wb['overquota_notify_onok_txt'] = 'Send quota ok message to client'; -$wb['overquota_notify_freq_txt'] = 'Send quota warning each X days'; -$wb['overquota_notify_freq_note_txt'] = '0 = send message just once, no repeated messages'; -$wb['admin_notify_events_txt'] = 'Send email to admin starting with the following level'; -$wb['no_notifications_txt'] = 'No Notifications'; -$wb['monit_url_txt'] = 'Monit URL'; -$wb['monit_user_txt'] = 'Monit User'; -$wb['monit_password_txt'] = 'Monit Password'; -$wb['monit_url_error_regex'] = 'Invalid Monit URL'; +$wb['mailbox_quota_stats_txt'] = 'Στατιστικά χρήσης χώρου θυρίδας Mail'; +$wb['enable_ip_wildcard_txt'] = 'Ενεργοποίηση IP wildcard (*)'; +$wb['web_folder_protection_txt'] = 'Να γίνουν οι φάκελοι web αμετάβλητοι (εκτεταμένες ιδιότητες)'; +$wb['overtraffic_notify_admin_txt'] = 'Αποστολή ειδοποιήσεων υπέρβασης ορίου μεταφοράς δεδομένων στον διαχειριστή'; +$wb['overtraffic_notify_client_txt'] = 'Αποστολή ειδοποιήσεων υπέρβασης ορίου μεταφοράς δεδομένων στον πελάτη'; +$wb['rbl_error_regex'] = 'Παρακαλούμε ορίστε έγκυρα RBL hostnames.'; +$wb['overquota_notify_admin_txt'] = 'Αποστολή προειδοποιήσεων ορίων στον διαχειριστή'; +$wb['overquota_notify_client_txt'] = 'Αποστολή προειδοποιήσεων ορίων στον πελάτη'; +$wb['overquota_notify_onok_txt'] = 'Αποστολή ΟΚ μηνυμάτων ορίων στον πελάτη'; +$wb['overquota_notify_freq_txt'] = 'Αποστολή προειδοποιήσεων κάθε Χ ημέρες'; +$wb['overquota_notify_freq_note_txt'] = '0 = αποστολή μηνύματος μόνο μία φορά, (οχι επαναληπτικά μηνύματα)'; +$wb['admin_notify_events_txt'] = 'Αποστολή email στον διαχειριστή, ξεκινώντας από το ακόλουθο επίπεδο'; +$wb['no_notifications_txt'] = 'Χωρίς Ειδοποιήσεις'; +$wb['monit_url_txt'] = 'URL Monit'; +$wb['monit_user_txt'] = 'Χρήστης Monit'; +$wb['monit_password_txt'] = 'Συνθηματικό Monit'; +$wb['monit_url_error_regex'] = 'Μη έγκυρο URL Monit'; $wb['monit_url_note_txt'] = 'Placeholder:'; -$wb['munin_url_txt'] = 'Munin URL'; -$wb['munin_user_txt'] = 'Munin User'; -$wb['munin_password_txt'] = 'Munin Password'; -$wb['munin_url_error_regex'] = 'Invalid Munin URL'; +$wb['munin_url_txt'] = 'URL Munin'; +$wb['munin_user_txt'] = 'Χρήστης Munin'; +$wb['munin_password_txt'] = 'Συνθηματικό Munin'; +$wb['munin_url_error_regex'] = 'Μη έγκυρο URL Munin'; $wb['munin_url_note_txt'] = 'Placeholder:'; ?> diff --git a/interface/web/admin/lib/lang/el_server_ip.lng b/interface/web/admin/lib/lang/el_server_ip.lng index 212f432793..c858124141 100644 --- a/interface/web/admin/lib/lang/el_server_ip.lng +++ b/interface/web/admin/lib/lang/el_server_ip.lng @@ -7,5 +7,5 @@ $wb['ip_error_unique'] = 'Η Διεύθυνση IP πρέπει να είναι $wb['client_id_txt'] = 'Πελάτης'; $wb['ip_type_txt'] = 'Τύπος'; $wb['virtualhost_port_txt'] = 'Θύρες HTTP'; -$wb['error_port_syntax'] = 'Invalid chars in port field, please enter only comma separated numbers. Example: 80,443'; +$wb['error_port_syntax'] = 'Μη έγκυροι χαρακτήρες στο πεδίο θύρας, παρακαλούμε εισάγετε μόνο αριθμούς χωρισμένους με κόμματα. Παράδειγμα: 80,443'; ?> diff --git a/interface/web/admin/lib/lang/el_server_php.lng b/interface/web/admin/lib/lang/el_server_php.lng index addbfa4935..be99452b22 100644 --- a/interface/web/admin/lib/lang/el_server_php.lng +++ b/interface/web/admin/lib/lang/el_server_php.lng @@ -1,16 +1,16 @@ diff --git a/interface/web/admin/lib/lang/el_server_php_list.lng b/interface/web/admin/lib/lang/el_server_php_list.lng index b402fd1ed1..06c17a3004 100644 --- a/interface/web/admin/lib/lang/el_server_php_list.lng +++ b/interface/web/admin/lib/lang/el_server_php_list.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/admin/lib/lang/el_software_package.lng b/interface/web/admin/lib/lang/el_software_package.lng index 62ef734079..16be47e587 100644 --- a/interface/web/admin/lib/lang/el_software_package.lng +++ b/interface/web/admin/lib/lang/el_software_package.lng @@ -1,6 +1,6 @@ \ No newline at end of file +$wb['package_title_txt'] = 'Τίτλος Πακέτου'; +$wb['package_key_txt'] = 'Κλειδί Πακέτου'; +$wb['Software Package'] = 'Πακέτο Λογισμικού'; +$wb['Modify software package details'] = 'Επεξεργασία λεπτομερειών Πακέτου'; +?> diff --git a/interface/web/admin/lib/lang/el_software_package_list.lng b/interface/web/admin/lib/lang/el_software_package_list.lng index 1553ea1cea..515dbb792b 100644 --- a/interface/web/admin/lib/lang/el_software_package_list.lng +++ b/interface/web/admin/lib/lang/el_software_package_list.lng @@ -5,9 +5,9 @@ $wb['package_title_txt'] = 'Πακέτο'; $wb['package_description_txt'] = 'Περιγραφή'; $wb['action_txt'] = 'Ενέργεια'; $wb['toolsarea_head_txt'] = 'Πακέτα'; -$wb['repoupdate_txt'] = 'Ενημέρωση λίστας πακκέτων'; +$wb['repoupdate_txt'] = 'Ενημέρωση λίστας πακέτων'; $wb['package_id_txt'] = 'τοπικό App-ID'; -$wb['no_packages_txt'] = 'No packages available'; +$wb['no_packages_txt'] = 'Δεν υπάρχουν διαθέσιμα πακέτα'; $wb['edit_txt'] = 'Edit'; $wb['delete_txt'] = 'Delete'; ?> diff --git a/interface/web/admin/lib/lang/el_software_update_list.lng b/interface/web/admin/lib/lang/el_software_update_list.lng index 42100d0c89..69c7026ab8 100644 --- a/interface/web/admin/lib/lang/el_software_update_list.lng +++ b/interface/web/admin/lib/lang/el_software_update_list.lng @@ -5,5 +5,5 @@ $wb['installed_txt'] = 'Ενέργεια'; $wb['update_title_txt'] = 'Ενημέρωση'; $wb['version_txt'] = 'Έκδοση'; $wb['action_txt'] = 'Ενέργεια'; -$wb['no_updates_txt'] = 'No updates available'; +$wb['no_updates_txt'] = 'Δεν υπάρχουν διαθέσιμες ενημερώσεις'; ?> diff --git a/interface/web/admin/lib/lang/el_system_config.lng b/interface/web/admin/lib/lang/el_system_config.lng index f69e58a83d..1660f18c60 100644 --- a/interface/web/admin/lib/lang/el_system_config.lng +++ b/interface/web/admin/lib/lang/el_system_config.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/admin/lib/lang/el_tpl_default_admin.lng b/interface/web/admin/lib/lang/el_tpl_default_admin.lng index eee3af5fe4..88053dbca5 100644 --- a/interface/web/admin/lib/lang/el_tpl_default_admin.lng +++ b/interface/web/admin/lib/lang/el_tpl_default_admin.lng @@ -2,17 +2,17 @@ $wb['tpl_default_admin_head_txt'] = 'Global Default-Theme Settings'; $wb['tpl_default_admin_desc_txt'] = ''; $wb['server_id_txt'] = 'Server'; -$wb['client_id_txt'] = 'Client'; -$wb['name_txt'] = 'PHP Name'; -$wb['Name'] = 'Name'; -$wb['FastCGI Settings'] = 'FastCGI Settings'; -$wb['PHP-FPM Settings'] = 'PHP-FPM Settings'; -$wb['Additional PHP Versions'] = 'Additional PHP Versions'; -$wb['Form to edit additional PHP versions'] = 'Form to edit additional PHP versions'; -$wb['server_php_name_error_empty'] = 'The Name field must not be empty.'; -$wb['php_fastcgi_binary_txt'] = 'Path to the PHP FastCGI binary'; -$wb['php_fastcgi_ini_dir_txt'] = 'Path to the php.ini directory'; -$wb['php_fpm_init_script_txt'] = 'Path to the PHP-FPM init script'; -$wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory'; -$wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory'; +$wb['client_id_txt'] = 'Πελάτης'; +$wb['name_txt'] = 'Όνομα PHP'; +$wb['Name'] = 'Όνομα'; +$wb['FastCGI Settings'] = 'Ρυθμίσεις FastCGI'; +$wb['PHP-FPM Settings'] = 'Ρυθμίσεις PHP-FPM'; +$wb['Additional PHP Versions'] = 'Πρόσθετες εκδόσεις PHP'; +$wb['Form to edit additional PHP versions'] = 'Φόρμα για την επεξεργασία επιπλέον εκδόσεων PHP'; +$wb['server_php_name_error_empty'] = 'Πρέπει να ορίσετε το πειο Όνομα.'; +$wb['php_fastcgi_binary_txt'] = 'Διαδρομή για το εκτελέσιμο PHP FastCGI'; +$wb['php_fastcgi_ini_dir_txt'] = 'Διαδρομή για τον φάκελο php.ini'; +$wb['php_fpm_init_script_txt'] = 'Διαδρομή για το init script PHP-FPM'; +$wb['php_fpm_ini_dir_txt'] = 'Διαδρομή για τον φάκελο του php.ini'; +$wb['php_fpm_pool_dir_txt'] = 'Διαδρομή για τον φάκελο PHP-FPM'; ?> diff --git a/interface/web/admin/lib/lang/el_users.lng b/interface/web/admin/lib/lang/el_users.lng index 3323424f10..201d831c64 100644 --- a/interface/web/admin/lib/lang/el_users.lng +++ b/interface/web/admin/lib/lang/el_users.lng @@ -4,7 +4,7 @@ $wb['username_err'] = 'Το όνομα χρήστη είναι πολύ μεγά $wb['username_empty'] = 'Το όνομα χρήστη δεν έχει οριστεί.'; $wb['username_unique'] = 'Υπάρχει ήδη ένας χρήστης με αυτό το όνομα χρήστη.'; $wb['passwort_txt'] = 'Συνθηματικό'; -$wb['password_strength_txt'] = 'Δύναμη Συνθηματικού'; +$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού'; $wb['modules_txt'] = 'Άρθρωμα'; $wb['startmodule_txt'] = 'Άρθρωμα Εκκίνησης'; $wb['app_theme_txt'] = 'Θεματική Παραλλαγή'; @@ -25,9 +25,9 @@ $wb['fax_txt'] = 'Fax'; $wb['groups_txt'] = 'Ομάδες'; $wb['default_group_txt'] = 'Προκαθορισμένη Ομάδα'; $wb['startmodule_err'] = 'Το άρθρωμα εκκίνησης δεν υπάρχει στα διαθέσιμα αρθρώματα.'; -$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['generate_password_txt'] = 'Δημιουργία Συνθηματικού'; +$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού'; +$wb['password_mismatch_txt'] = 'Τα Συνθηματικά δεν ταιριάζουν.'; +$wb['password_match_txt'] = 'Τα Συνθηματικά ταιριάζουν.'; +$wb['username_error_collision'] = 'Το όνομα χρήστη δεν μπορεί να αρχίζει από την λέξη -web- ή την λέξη -web- ακολουθούμενη από αριθμό.'; ?> diff --git a/interface/web/admin/lib/lang/el_users_list.lng b/interface/web/admin/lib/lang/el_users_list.lng index b61af25919..a1b33ca0ef 100644 --- a/interface/web/admin/lib/lang/el_users_list.lng +++ b/interface/web/admin/lib/lang/el_users_list.lng @@ -5,5 +5,5 @@ $wb['client_id_txt'] = 'Client ID'; $wb['active_txt'] = 'Active'; $wb['add_new_record_txt'] = 'Νέος Χρήστης'; $wb['warning_txt'] = 'ΠΡΟΕΙΔΟΠΟΙΗΣΗ:Μην επεξεργάζεστε καμία ρύθμιση χρήστη εδώ. Χρησιμοποιήστε τις ρυθμίσεις Πελάτη - και Μεταπωλητή στο άρθρωμα Πελάτης. Η επεξεργασία ομάδων και χρηστών εδώ, μπορεί να προκαλέσει απώλεια δεδομένων!'; -$wb['groups_txt'] = 'Groups'; +$wb['groups_txt'] = 'Ομάδες'; ?> diff --git a/interface/web/admin/lib/lang/en_language_import.lng b/interface/web/admin/lib/lang/en_language_import.lng index a554c6c220..0314af1d77 100644 --- a/interface/web/admin/lib/lang/en_language_import.lng +++ b/interface/web/admin/lib/lang/en_language_import.lng @@ -1,5 +1,6 @@ Information: If you want to shut down mysql you have to select the "Disable MySQL monitor" checkbox and then wait 2-3 minutes.
If you do not wait 2-3 minutes, rescue will try to restart mysql!'; @@ -170,8 +167,8 @@ $wb["awstats_settings_txt"] = 'AWStats Settings'; $wb["firewall_txt"] = 'Firewall'; $wb["mailbox_quota_stats_txt"] = 'Mailbox quota statistics'; $wb["enable_ip_wildcard_txt"] = 'Enable IP wildcard (*)'; -$wb["web_folder_protection_txt"] = 'Make web folders immutable (extended attributes)'; -$wb["overtraffic_notify_admin_txt"] = 'Send overtraffic notification to admin'; +$wb["web_folder_protection_txt"] = 'Make web folders immutable (extended attributes)'; +$wb["overtraffic_notify_admin_txt"] = 'Send overtraffic notification to admin'; $wb["overtraffic_notify_client_txt"] = 'Send overtraffic notification to client'; $wb["rbl_error_regex"] = 'Please specify valid RBL hostnames.'; $wb["overquota_notify_admin_txt"] = 'Send quota warnings to admin'; @@ -191,4 +188,4 @@ $wb['munin_user_txt'] = 'Munin User'; $wb['munin_password_txt'] = 'Munin Password'; $wb['munin_url_error_regex'] = 'Invalid Munin URL'; $wb['munin_url_note_txt'] = 'Placeholder:'; -?> +?> diff --git a/interface/web/admin/lib/lang/en_system_config.lng b/interface/web/admin/lib/lang/en_system_config.lng index 7c5fe6eaf7..1b370b469f 100644 --- a/interface/web/admin/lib/lang/en_system_config.lng +++ b/interface/web/admin/lib/lang/en_system_config.lng @@ -23,9 +23,6 @@ $wb["webdavuser_prefix_error_regex"] = 'Char not allowed in webdav user prefix.' $wb["dblist_phpmyadmin_link_txt"] = 'Link to phpmyadmin in DB list'; $wb['enable_custom_login_txt'] = 'Allow custom login name'; $wb["mailboxlist_webmail_link_txt"] = 'Link to webmail in Mailbox list'; -$wb['mailbox_show_autoresponder_tab_txt'] = 'Show Autoresponder tab in Mailbox detail'; -$wb['mailbox_show_mail_filter_tab_txt'] = 'Show Mail Filter tab in Mailbox detail'; -$wb['mailbox_show_custom_rules_tab_txt'] = 'Show Custom Rules tab in Mailbox detail'; $wb["webmail_url_txt"] = 'Webmail URL'; $wb["mailmailinglist_link_txt"] = 'Link to mailing list in Mailing list list'; $wb["mailmailinglist_url_txt"] = 'Mailing list URL'; diff --git a/interface/web/admin/lib/lang/es_language_import.lng b/interface/web/admin/lib/lang/es_language_import.lng index 7f2b25bc7b..dd1034659d 100644 --- a/interface/web/admin/lib/lang/es_language_import.lng +++ b/interface/web/admin/lib/lang/es_language_import.lng @@ -5,4 +5,5 @@ $wb['btn_save_txt'] = 'Importar el fichero de idioma'; $wb['language_overwrite_txt'] = 'Sobreescribir los ficheros, si existen'; $wb['btn_cancel_txt'] = 'Atrás'; $wb['ignore_version_txt'] = 'Saltar comprobación de la versión ISPConfig'; +$wb['list_desc_txt'] = 'WARNING: Do not import language files from untrustworthy sources.'; ?> diff --git a/interface/web/admin/lib/lang/es_software_package.lng b/interface/web/admin/lib/lang/es_software_package.lng index 62ef734079..faffe38217 100644 --- a/interface/web/admin/lib/lang/es_software_package.lng +++ b/interface/web/admin/lib/lang/es_software_package.lng @@ -1,6 +1,6 @@ \ No newline at end of file +?> diff --git a/interface/web/admin/lib/lang/es_system_config.lng b/interface/web/admin/lib/lang/es_system_config.lng index 118a0dfae8..a4d878cadd 100644 --- a/interface/web/admin/lib/lang/es_system_config.lng +++ b/interface/web/admin/lib/lang/es_system_config.lng @@ -52,4 +52,11 @@ $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail a $wb['webmail_url_error_regex'] = 'Invalid webmail URL'; $wb['phpmyadmin_url_note_txt'] = 'Placeholder:'; $wb['webmail_url_note_txt'] = 'Placeholder:'; +$wb['available_dashlets_note_txt'] = 'Available Dashlets:'; +$wb['admin_dashlets_left_txt'] = 'Left Admin Dashlets'; +$wb['admin_dashlets_right_txt'] = 'Right Admin Dashlets'; +$wb['reseller_dashlets_left_txt'] = 'Left Reseller Dashlets'; +$wb['reseller_dashlets_right_txt'] = 'Right Reseller Dashlets'; +$wb['client_dashlets_left_txt'] = 'Left Client Dashlets'; +$wb['client_dashlets_right_txt'] = 'Right Client Dashlets'; ?> diff --git a/interface/web/admin/lib/lang/fi_language_import.lng b/interface/web/admin/lib/lang/fi_language_import.lng index d8e5eac01b..b7da40ebe3 100755 --- a/interface/web/admin/lib/lang/fi_language_import.lng +++ b/interface/web/admin/lib/lang/fi_language_import.lng @@ -5,4 +5,5 @@ $wb['btn_save_txt'] = 'Asenna valittu kielitiedosto'; $wb['language_overwrite_txt'] = 'Ylikirjoitetaan tiedostot, jos ne on jo olemassa.'; $wb['btn_cancel_txt'] = 'Takaisin'; $wb['ignore_version_txt'] = 'Ohita ISPConfigin version tarkistus'; +$wb['list_desc_txt'] = 'WARNING: Do not import language files from untrustworthy sources.'; ?> diff --git a/interface/web/admin/lib/lang/fi_remote_action.lng b/interface/web/admin/lib/lang/fi_remote_action.lng index 3fc3eaf81f..f268527084 100644 --- a/interface/web/admin/lib/lang/fi_remote_action.lng +++ b/interface/web/admin/lib/lang/fi_remote_action.lng @@ -8,5 +8,5 @@ $wb['do_ispcupdate_desc'] = 'This action does a ISPConfig3 update at your select $wb['action_scheduled'] = 'The action is scheduled for execution'; $wb['select_all_server'] = 'All server'; $wb['ispconfig_update_title'] = 'ISPConfig update instructions'; -$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructions'; +$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/fi_software_package.lng b/interface/web/admin/lib/lang/fi_software_package.lng index 62ef734079..faffe38217 100644 --- a/interface/web/admin/lib/lang/fi_software_package.lng +++ b/interface/web/admin/lib/lang/fi_software_package.lng @@ -1,6 +1,6 @@ \ No newline at end of file +?> diff --git a/interface/web/admin/lib/lang/fi_system_config.lng b/interface/web/admin/lib/lang/fi_system_config.lng index c2c1dab75b..75658ee44e 100755 --- a/interface/web/admin/lib/lang/fi_system_config.lng +++ b/interface/web/admin/lib/lang/fi_system_config.lng @@ -52,4 +52,11 @@ $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail a $wb['webmail_url_error_regex'] = 'Invalid webmail URL'; $wb['phpmyadmin_url_note_txt'] = 'Placeholder:'; $wb['webmail_url_note_txt'] = 'Placeholder:'; +$wb['available_dashlets_note_txt'] = 'Available Dashlets:'; +$wb['admin_dashlets_left_txt'] = 'Left Admin Dashlets'; +$wb['admin_dashlets_right_txt'] = 'Right Admin Dashlets'; +$wb['reseller_dashlets_left_txt'] = 'Left Reseller Dashlets'; +$wb['reseller_dashlets_right_txt'] = 'Right Reseller Dashlets'; +$wb['client_dashlets_left_txt'] = 'Left Client Dashlets'; +$wb['client_dashlets_right_txt'] = 'Right Client Dashlets'; ?> diff --git a/interface/web/admin/lib/lang/fr_language_import.lng b/interface/web/admin/lib/lang/fr_language_import.lng index 710847cc52..a7298a4696 100644 --- a/interface/web/admin/lib/lang/fr_language_import.lng +++ b/interface/web/admin/lib/lang/fr_language_import.lng @@ -5,4 +5,5 @@ $wb['btn_save_txt'] = 'Importer le fichier de langue sélectionné'; $wb['language_overwrite_txt'] = 'Ecraser le fichier sil existe déja.'; $wb['btn_cancel_txt'] = 'Précédent'; $wb['ignore_version_txt'] = 'Ignorer le test de version ISPConfig'; +$wb['list_desc_txt'] = 'WARNING: Do not import language files from untrustworthy sources.'; ?> diff --git a/interface/web/admin/lib/lang/fr_remote_action.lng b/interface/web/admin/lib/lang/fr_remote_action.lng index 58fb49998a..3df14f3554 100644 --- a/interface/web/admin/lib/lang/fr_remote_action.lng +++ b/interface/web/admin/lib/lang/fr_remote_action.lng @@ -8,5 +8,5 @@ $wb['do_ispcupdate_desc'] = 'Cette action met à jour ISPConfig3 sur le serveur $wb['action_scheduled'] = 'Laction est marquée pour exécution'; $wb['select_all_server'] = 'Tout serveur'; $wb['ispconfig_update_title'] = 'ISPConfig update instructions'; -$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructions'; +$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/fr_software_package.lng b/interface/web/admin/lib/lang/fr_software_package.lng index 62ef734079..faffe38217 100644 --- a/interface/web/admin/lib/lang/fr_software_package.lng +++ b/interface/web/admin/lib/lang/fr_software_package.lng @@ -1,6 +1,6 @@ \ No newline at end of file +?> diff --git a/interface/web/admin/lib/lang/fr_system_config.lng b/interface/web/admin/lib/lang/fr_system_config.lng index 561a5d7274..262bbe329e 100644 --- a/interface/web/admin/lib/lang/fr_system_config.lng +++ b/interface/web/admin/lib/lang/fr_system_config.lng @@ -52,4 +52,11 @@ $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail a $wb['webmail_url_error_regex'] = 'Invalid webmail URL'; $wb['phpmyadmin_url_note_txt'] = 'Placeholder:'; $wb['webmail_url_note_txt'] = 'Placeholder:'; +$wb['available_dashlets_note_txt'] = 'Available Dashlets:'; +$wb['admin_dashlets_left_txt'] = 'Left Admin Dashlets'; +$wb['admin_dashlets_right_txt'] = 'Right Admin Dashlets'; +$wb['reseller_dashlets_left_txt'] = 'Left Reseller Dashlets'; +$wb['reseller_dashlets_right_txt'] = 'Right Reseller Dashlets'; +$wb['client_dashlets_left_txt'] = 'Left Client Dashlets'; +$wb['client_dashlets_right_txt'] = 'Right Client Dashlets'; ?> diff --git a/interface/web/admin/lib/lang/hr_language_import.lng b/interface/web/admin/lib/lang/hr_language_import.lng index 6a31f395ad..3f20305349 100644 --- a/interface/web/admin/lib/lang/hr_language_import.lng +++ b/interface/web/admin/lib/lang/hr_language_import.lng @@ -5,4 +5,5 @@ $wb['btn_save_txt'] = 'Importiraj selektiranu jezičnu datoteku'; $wb['language_overwrite_txt'] = 'Prebriši datoteku, ukoliko već postoji.'; $wb['btn_cancel_txt'] = 'Natrag'; $wb['ignore_version_txt'] = 'Preskoči provjeru ISPConfig verzije'; +$wb['list_desc_txt'] = 'WARNING: Do not import language files from untrustworthy sources.'; ?> diff --git a/interface/web/admin/lib/lang/hr_software_package.lng b/interface/web/admin/lib/lang/hr_software_package.lng index 62ef734079..faffe38217 100644 --- a/interface/web/admin/lib/lang/hr_software_package.lng +++ b/interface/web/admin/lib/lang/hr_software_package.lng @@ -1,6 +1,6 @@ \ No newline at end of file +?> diff --git a/interface/web/admin/lib/lang/hr_system_config.lng b/interface/web/admin/lib/lang/hr_system_config.lng index 2ff0cbc9fd..63f816b79e 100644 --- a/interface/web/admin/lib/lang/hr_system_config.lng +++ b/interface/web/admin/lib/lang/hr_system_config.lng @@ -52,4 +52,11 @@ $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail a $wb['webmail_url_error_regex'] = 'Invalid webmail URL'; $wb['phpmyadmin_url_note_txt'] = 'Placeholder:'; $wb['webmail_url_note_txt'] = 'Placeholder:'; +$wb['available_dashlets_note_txt'] = 'Available Dashlets:'; +$wb['admin_dashlets_left_txt'] = 'Left Admin Dashlets'; +$wb['admin_dashlets_right_txt'] = 'Right Admin Dashlets'; +$wb['reseller_dashlets_left_txt'] = 'Left Reseller Dashlets'; +$wb['reseller_dashlets_right_txt'] = 'Right Reseller Dashlets'; +$wb['client_dashlets_left_txt'] = 'Left Client Dashlets'; +$wb['client_dashlets_right_txt'] = 'Right Client Dashlets'; ?> diff --git a/interface/web/admin/lib/lang/hu_language_import.lng b/interface/web/admin/lib/lang/hu_language_import.lng index fe8334409d..a90f3eefc0 100644 --- a/interface/web/admin/lib/lang/hu_language_import.lng +++ b/interface/web/admin/lib/lang/hu_language_import.lng @@ -5,4 +5,5 @@ $wb['btn_save_txt'] = 'A kiválasztott nyelvi fájl importálása'; $wb['language_overwrite_txt'] = 'Létző fájlokat felülírja.'; $wb['btn_cancel_txt'] = 'Vissza'; $wb['ignore_version_txt'] = 'Ne ellenőrizze az ISPConfig verziószámát'; +$wb['list_desc_txt'] = 'WARNING: Do not import language files from untrustworthy sources.'; ?> diff --git a/interface/web/admin/lib/lang/hu_remote_action.lng b/interface/web/admin/lib/lang/hu_remote_action.lng index 6ef0ebe02e..8fe6314d3c 100644 --- a/interface/web/admin/lib/lang/hu_remote_action.lng +++ b/interface/web/admin/lib/lang/hu_remote_action.lng @@ -8,5 +8,5 @@ $wb['do_ispcupdate_desc'] = 'This action does a ISPConfig3 update at your select $wb['action_scheduled'] = 'The action is scheduled for execution'; $wb['select_all_server'] = 'Összes szerver'; $wb['ispconfig_update_title'] = 'ISPConfig update instructions'; -$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructions'; +$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/hu_software_package.lng b/interface/web/admin/lib/lang/hu_software_package.lng index 62ef734079..faffe38217 100644 --- a/interface/web/admin/lib/lang/hu_software_package.lng +++ b/interface/web/admin/lib/lang/hu_software_package.lng @@ -1,6 +1,6 @@ \ No newline at end of file +?> diff --git a/interface/web/admin/lib/lang/hu_system_config.lng b/interface/web/admin/lib/lang/hu_system_config.lng index ee5f429e2f..500828481c 100644 --- a/interface/web/admin/lib/lang/hu_system_config.lng +++ b/interface/web/admin/lib/lang/hu_system_config.lng @@ -52,4 +52,11 @@ $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail a $wb['webmail_url_error_regex'] = 'Invalid webmail URL'; $wb['phpmyadmin_url_note_txt'] = 'Placeholder:'; $wb['webmail_url_note_txt'] = 'Placeholder:'; +$wb['available_dashlets_note_txt'] = 'Available Dashlets:'; +$wb['admin_dashlets_left_txt'] = 'Left Admin Dashlets'; +$wb['admin_dashlets_right_txt'] = 'Right Admin Dashlets'; +$wb['reseller_dashlets_left_txt'] = 'Left Reseller Dashlets'; +$wb['reseller_dashlets_right_txt'] = 'Right Reseller Dashlets'; +$wb['client_dashlets_left_txt'] = 'Left Client Dashlets'; +$wb['client_dashlets_right_txt'] = 'Right Client Dashlets'; ?> diff --git a/interface/web/admin/lib/lang/id_language_import.lng b/interface/web/admin/lib/lang/id_language_import.lng index 5a1b30294b..e5e2b06430 100644 --- a/interface/web/admin/lib/lang/id_language_import.lng +++ b/interface/web/admin/lib/lang/id_language_import.lng @@ -5,4 +5,5 @@ $wb['btn_save_txt'] = 'Impor berkas bahasa yang telah dipilih'; $wb['language_overwrite_txt'] = 'Timpa berkas, jika sudah ada.'; $wb['btn_cancel_txt'] = 'Kembali'; $wb['ignore_version_txt'] = 'Lewati pemeriksaan versi ISPConfig'; +$wb['list_desc_txt'] = 'WARNING: Do not import language files from untrustworthy sources.'; ?> diff --git a/interface/web/admin/lib/lang/id_remote_action.lng b/interface/web/admin/lib/lang/id_remote_action.lng index bfe758aeaf..3a1b8518ec 100644 --- a/interface/web/admin/lib/lang/id_remote_action.lng +++ b/interface/web/admin/lib/lang/id_remote_action.lng @@ -8,5 +8,5 @@ $wb['do_ispcupdate_desc'] = 'Tindakan ini melakukan pemutakhiran ISPConfig3 di s $wb['action_scheduled'] = 'Tindakan dijadwalkan untuk dijalankan'; $wb['select_all_server'] = 'Semua server'; $wb['ispconfig_update_title'] = 'ISPConfig update instructions'; -$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructions'; +$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/id_software_package.lng b/interface/web/admin/lib/lang/id_software_package.lng index 62ef734079..faffe38217 100644 --- a/interface/web/admin/lib/lang/id_software_package.lng +++ b/interface/web/admin/lib/lang/id_software_package.lng @@ -1,6 +1,6 @@ \ No newline at end of file +?> diff --git a/interface/web/admin/lib/lang/id_system_config.lng b/interface/web/admin/lib/lang/id_system_config.lng index ecbf3c72c2..81997b708f 100644 --- a/interface/web/admin/lib/lang/id_system_config.lng +++ b/interface/web/admin/lib/lang/id_system_config.lng @@ -52,4 +52,11 @@ $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail a $wb['webmail_url_error_regex'] = 'Invalid webmail URL'; $wb['phpmyadmin_url_note_txt'] = 'Placeholder:'; $wb['webmail_url_note_txt'] = 'Placeholder:'; +$wb['available_dashlets_note_txt'] = 'Available Dashlets:'; +$wb['admin_dashlets_left_txt'] = 'Left Admin Dashlets'; +$wb['admin_dashlets_right_txt'] = 'Right Admin Dashlets'; +$wb['reseller_dashlets_left_txt'] = 'Left Reseller Dashlets'; +$wb['reseller_dashlets_right_txt'] = 'Right Reseller Dashlets'; +$wb['client_dashlets_left_txt'] = 'Left Client Dashlets'; +$wb['client_dashlets_right_txt'] = 'Right Client Dashlets'; ?> diff --git a/interface/web/admin/lib/lang/it_language_import.lng b/interface/web/admin/lib/lang/it_language_import.lng index 9762557238..a6ce43814c 100644 --- a/interface/web/admin/lib/lang/it_language_import.lng +++ b/interface/web/admin/lib/lang/it_language_import.lng @@ -5,4 +5,5 @@ $wb['btn_save_txt'] = 'Importa il file di lingua selezionato'; $wb['language_overwrite_txt'] = 'Sovrascrivi file, se esiste'; $wb['btn_cancel_txt'] = 'Annulla'; $wb['ignore_version_txt'] = 'Tralascia controllo versione ISPconfig'; +$wb['list_desc_txt'] = 'WARNING: Do not import language files from untrustworthy sources.'; ?> diff --git a/interface/web/admin/lib/lang/it_remote_action.lng b/interface/web/admin/lib/lang/it_remote_action.lng index 3fc3eaf81f..f268527084 100644 --- a/interface/web/admin/lib/lang/it_remote_action.lng +++ b/interface/web/admin/lib/lang/it_remote_action.lng @@ -8,5 +8,5 @@ $wb['do_ispcupdate_desc'] = 'This action does a ISPConfig3 update at your select $wb['action_scheduled'] = 'The action is scheduled for execution'; $wb['select_all_server'] = 'All server'; $wb['ispconfig_update_title'] = 'ISPConfig update instructions'; -$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructions'; +$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/it_software_package.lng b/interface/web/admin/lib/lang/it_software_package.lng index 62ef734079..faffe38217 100644 --- a/interface/web/admin/lib/lang/it_software_package.lng +++ b/interface/web/admin/lib/lang/it_software_package.lng @@ -1,6 +1,6 @@ \ No newline at end of file +?> diff --git a/interface/web/admin/lib/lang/it_system_config.lng b/interface/web/admin/lib/lang/it_system_config.lng index 8ba0b9fcb7..bc26da23ea 100644 --- a/interface/web/admin/lib/lang/it_system_config.lng +++ b/interface/web/admin/lib/lang/it_system_config.lng @@ -52,4 +52,11 @@ $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail a $wb['webmail_url_error_regex'] = 'Invalid webmail URL'; $wb['phpmyadmin_url_note_txt'] = 'Placeholder:'; $wb['webmail_url_note_txt'] = 'Placeholder:'; +$wb['available_dashlets_note_txt'] = 'Available Dashlets:'; +$wb['admin_dashlets_left_txt'] = 'Left Admin Dashlets'; +$wb['admin_dashlets_right_txt'] = 'Right Admin Dashlets'; +$wb['reseller_dashlets_left_txt'] = 'Left Reseller Dashlets'; +$wb['reseller_dashlets_right_txt'] = 'Right Reseller Dashlets'; +$wb['client_dashlets_left_txt'] = 'Left Client Dashlets'; +$wb['client_dashlets_right_txt'] = 'Right Client Dashlets'; ?> diff --git a/interface/web/admin/lib/lang/ja_language_import.lng b/interface/web/admin/lib/lang/ja_language_import.lng index 4c55514953..eab12299c6 100644 --- a/interface/web/admin/lib/lang/ja_language_import.lng +++ b/interface/web/admin/lib/lang/ja_language_import.lng @@ -5,4 +5,5 @@ $wb['btn_save_txt'] = '選んだ言語へインポートする'; $wb['language_overwrite_txt'] = '同名のファイルが存在する場合に上書きする'; $wb['btn_cancel_txt'] = '戻る'; $wb['ignore_version_txt'] = 'Skip ISPConfig version check'; +$wb['list_desc_txt'] = 'WARNING: Do not import language files from untrustworthy sources.'; ?> diff --git a/interface/web/admin/lib/lang/ja_remote_action.lng b/interface/web/admin/lib/lang/ja_remote_action.lng index 3fc3eaf81f..f268527084 100644 --- a/interface/web/admin/lib/lang/ja_remote_action.lng +++ b/interface/web/admin/lib/lang/ja_remote_action.lng @@ -8,5 +8,5 @@ $wb['do_ispcupdate_desc'] = 'This action does a ISPConfig3 update at your select $wb['action_scheduled'] = 'The action is scheduled for execution'; $wb['select_all_server'] = 'All server'; $wb['ispconfig_update_title'] = 'ISPConfig update instructions'; -$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructions'; +$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/ja_software_package.lng b/interface/web/admin/lib/lang/ja_software_package.lng index 62ef734079..faffe38217 100644 --- a/interface/web/admin/lib/lang/ja_software_package.lng +++ b/interface/web/admin/lib/lang/ja_software_package.lng @@ -1,6 +1,6 @@ \ No newline at end of file +?> diff --git a/interface/web/admin/lib/lang/ja_system_config.lng b/interface/web/admin/lib/lang/ja_system_config.lng index 842b65f3e7..df99e6e627 100644 --- a/interface/web/admin/lib/lang/ja_system_config.lng +++ b/interface/web/admin/lib/lang/ja_system_config.lng @@ -52,4 +52,11 @@ $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail a $wb['webmail_url_error_regex'] = 'Invalid webmail URL'; $wb['phpmyadmin_url_note_txt'] = 'Placeholder:'; $wb['webmail_url_note_txt'] = 'Placeholder:'; +$wb['available_dashlets_note_txt'] = 'Available Dashlets:'; +$wb['admin_dashlets_left_txt'] = 'Left Admin Dashlets'; +$wb['admin_dashlets_right_txt'] = 'Right Admin Dashlets'; +$wb['reseller_dashlets_left_txt'] = 'Left Reseller Dashlets'; +$wb['reseller_dashlets_right_txt'] = 'Right Reseller Dashlets'; +$wb['client_dashlets_left_txt'] = 'Left Client Dashlets'; +$wb['client_dashlets_right_txt'] = 'Right Client Dashlets'; ?> diff --git a/interface/web/admin/lib/lang/nl_language_import.lng b/interface/web/admin/lib/lang/nl_language_import.lng index cee58cb4a2..ae407efecb 100644 --- a/interface/web/admin/lib/lang/nl_language_import.lng +++ b/interface/web/admin/lib/lang/nl_language_import.lng @@ -5,4 +5,5 @@ $wb['btn_save_txt'] = 'Importeer het geselecteerde taalbestand'; $wb['language_overwrite_txt'] = 'Overschrijf bestand, als dit bestaat.'; $wb['btn_cancel_txt'] = 'Terug'; $wb['ignore_version_txt'] = 'Sla ISPConfig versie controle over'; +$wb['list_desc_txt'] = 'WARNING: Do not import language files from untrustworthy sources.'; ?> diff --git a/interface/web/admin/lib/lang/nl_remote_action.lng b/interface/web/admin/lib/lang/nl_remote_action.lng index ae286d9ea4..c0046ff019 100644 --- a/interface/web/admin/lib/lang/nl_remote_action.lng +++ b/interface/web/admin/lib/lang/nl_remote_action.lng @@ -8,5 +8,5 @@ $wb['do_ispcupdate_desc'] = 'Deze actie voert een ISPConfig3 update uit op de so $wb['action_scheduled'] = 'Deze actie is ingepland om uitgevoerd te worden'; $wb['select_all_server'] = 'Alle servers'; $wb['ispconfig_update_title'] = 'ISPConfig update instructions'; -$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructions'; +$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/nl_software_package.lng b/interface/web/admin/lib/lang/nl_software_package.lng index 62ef734079..faffe38217 100644 --- a/interface/web/admin/lib/lang/nl_software_package.lng +++ b/interface/web/admin/lib/lang/nl_software_package.lng @@ -1,6 +1,6 @@ \ No newline at end of file +?> diff --git a/interface/web/admin/lib/lang/nl_system_config.lng b/interface/web/admin/lib/lang/nl_system_config.lng index fe3b85e5e9..b49eb07afc 100644 --- a/interface/web/admin/lib/lang/nl_system_config.lng +++ b/interface/web/admin/lib/lang/nl_system_config.lng @@ -16,9 +16,6 @@ $wb['shelluser_prefix_error_regex'] = 'Char niet toegestaan in shell gebruiker v $wb['webdavuser_prefix_error_regex'] = 'Char niet toegestaan in webdav gebruiker voorvoegsel.'; $wb['dblist_phpmyadmin_link_txt'] = 'Link naar phpmyadmin in DB lijst'; $wb['mailboxlist_webmail_link_txt'] = 'Link naar webmail in Mailbox lijst'; -$wb['mailbox_show_autoresponder_tab_txt'] = 'Toon Autoresponder tabblad in Mailbox detail'; -$wb['mailbox_show_mail_filter_tab_txt'] = 'Toon Mail Filter tabblad in Mailbox detail'; -$wb['mailbox_show_custom_rules_tab_txt'] 'Toon Custom Rules tabblad in Mailbox detail'; $wb['webmail_url_txt'] = 'Webmail URL'; $wb['phpmyadmin_url_txt'] = 'PHPMyAdmin URL'; $wb['use_domain_module_txt'] = 'Gebruik de domein-module om nieuwe domeinen toe te voegen'; @@ -55,4 +52,11 @@ $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail a $wb['webmail_url_error_regex'] = 'Invalid webmail URL'; $wb['phpmyadmin_url_note_txt'] = 'Placeholder:'; $wb['webmail_url_note_txt'] = 'Placeholder:'; +$wb['available_dashlets_note_txt'] = 'Available Dashlets:'; +$wb['admin_dashlets_left_txt'] = 'Left Admin Dashlets'; +$wb['admin_dashlets_right_txt'] = 'Right Admin Dashlets'; +$wb['reseller_dashlets_left_txt'] = 'Left Reseller Dashlets'; +$wb['reseller_dashlets_right_txt'] = 'Right Reseller Dashlets'; +$wb['client_dashlets_left_txt'] = 'Left Client Dashlets'; +$wb['client_dashlets_right_txt'] = 'Right Client Dashlets'; ?> diff --git a/interface/web/admin/lib/lang/pl_language_import.lng b/interface/web/admin/lib/lang/pl_language_import.lng index 077d0c00ea..5fd3212ed6 100644 --- a/interface/web/admin/lib/lang/pl_language_import.lng +++ b/interface/web/admin/lib/lang/pl_language_import.lng @@ -5,4 +5,5 @@ $wb['btn_save_txt'] = 'Importuj wybrane pliki języka'; $wb['language_overwrite_txt'] = 'Nadpisz plik jeśli istnieje.'; $wb['btn_cancel_txt'] = 'Wróć'; $wb['ignore_version_txt'] = 'Pomiń sprawdzanie wersji ISPConfig'; +$wb['list_desc_txt'] = 'WARNING: Do not import language files from untrustworthy sources.'; ?> diff --git a/interface/web/admin/lib/lang/pl_remote_action.lng b/interface/web/admin/lib/lang/pl_remote_action.lng index 83fbc9e282..7d03089933 100644 --- a/interface/web/admin/lib/lang/pl_remote_action.lng +++ b/interface/web/admin/lib/lang/pl_remote_action.lng @@ -8,5 +8,5 @@ $wb['do_ispcupdate_desc'] = 'Ta akcja przeprowadzi aktualizację ISPConfig3 na w $wb['action_scheduled'] = 'Akcja zaplanowana do wykonania'; $wb['select_all_server'] = 'Wszystkie serwery'; $wb['ispconfig_update_title'] = 'ISPConfig update instructions'; -$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructions'; +$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/pl_software_package.lng b/interface/web/admin/lib/lang/pl_software_package.lng index 62ef734079..faffe38217 100644 --- a/interface/web/admin/lib/lang/pl_software_package.lng +++ b/interface/web/admin/lib/lang/pl_software_package.lng @@ -1,6 +1,6 @@ \ No newline at end of file +?> diff --git a/interface/web/admin/lib/lang/pl_system_config.lng b/interface/web/admin/lib/lang/pl_system_config.lng index 9d4f6f59ba..a3cd3c6bd9 100644 --- a/interface/web/admin/lib/lang/pl_system_config.lng +++ b/interface/web/admin/lib/lang/pl_system_config.lng @@ -52,4 +52,11 @@ $wb['mailbox_show_custom_rules_tab_txt'] = 'Pokaż zakładkę własnych filtrów $wb['webmail_url_error_regex'] = 'Invalid webmail URL'; $wb['phpmyadmin_url_note_txt'] = 'Placeholder:'; $wb['webmail_url_note_txt'] = 'Placeholder:'; +$wb['available_dashlets_note_txt'] = 'Available Dashlets:'; +$wb['admin_dashlets_left_txt'] = 'Left Admin Dashlets'; +$wb['admin_dashlets_right_txt'] = 'Right Admin Dashlets'; +$wb['reseller_dashlets_left_txt'] = 'Left Reseller Dashlets'; +$wb['reseller_dashlets_right_txt'] = 'Right Reseller Dashlets'; +$wb['client_dashlets_left_txt'] = 'Left Client Dashlets'; +$wb['client_dashlets_right_txt'] = 'Right Client Dashlets'; ?> diff --git a/interface/web/admin/lib/lang/pt_language_import.lng b/interface/web/admin/lib/lang/pt_language_import.lng index 440cee5512..919014da3e 100644 --- a/interface/web/admin/lib/lang/pt_language_import.lng +++ b/interface/web/admin/lib/lang/pt_language_import.lng @@ -5,4 +5,5 @@ $wb['btn_save_txt'] = 'Importar Ficheiro de Idioma Seleccionado'; $wb['language_overwrite_txt'] = 'Sobre-escrever o ficheiro se existir.'; $wb['btn_cancel_txt'] = 'Voltar'; $wb['ignore_version_txt'] = 'Ignorar verificação da versão do ISPConfig'; +$wb['list_desc_txt'] = 'WARNING: Do not import language files from untrustworthy sources.'; ?> diff --git a/interface/web/admin/lib/lang/pt_remote_action.lng b/interface/web/admin/lib/lang/pt_remote_action.lng index 3fc3eaf81f..f268527084 100644 --- a/interface/web/admin/lib/lang/pt_remote_action.lng +++ b/interface/web/admin/lib/lang/pt_remote_action.lng @@ -8,5 +8,5 @@ $wb['do_ispcupdate_desc'] = 'This action does a ISPConfig3 update at your select $wb['action_scheduled'] = 'The action is scheduled for execution'; $wb['select_all_server'] = 'All server'; $wb['ispconfig_update_title'] = 'ISPConfig update instructions'; -$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructions'; +$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/pt_software_package.lng b/interface/web/admin/lib/lang/pt_software_package.lng index 62ef734079..faffe38217 100644 --- a/interface/web/admin/lib/lang/pt_software_package.lng +++ b/interface/web/admin/lib/lang/pt_software_package.lng @@ -1,6 +1,6 @@ \ No newline at end of file +?> diff --git a/interface/web/admin/lib/lang/pt_system_config.lng b/interface/web/admin/lib/lang/pt_system_config.lng index 32ed93f260..49bd93e9cc 100644 --- a/interface/web/admin/lib/lang/pt_system_config.lng +++ b/interface/web/admin/lib/lang/pt_system_config.lng @@ -52,4 +52,11 @@ $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail a $wb['webmail_url_error_regex'] = 'Invalid webmail URL'; $wb['phpmyadmin_url_note_txt'] = 'Placeholder:'; $wb['webmail_url_note_txt'] = 'Placeholder:'; +$wb['available_dashlets_note_txt'] = 'Available Dashlets:'; +$wb['admin_dashlets_left_txt'] = 'Left Admin Dashlets'; +$wb['admin_dashlets_right_txt'] = 'Right Admin Dashlets'; +$wb['reseller_dashlets_left_txt'] = 'Left Reseller Dashlets'; +$wb['reseller_dashlets_right_txt'] = 'Right Reseller Dashlets'; +$wb['client_dashlets_left_txt'] = 'Left Client Dashlets'; +$wb['client_dashlets_right_txt'] = 'Right Client Dashlets'; ?> diff --git a/interface/web/admin/lib/lang/ro_language_import.lng b/interface/web/admin/lib/lang/ro_language_import.lng index fefae80d03..4b36072eb2 100644 --- a/interface/web/admin/lib/lang/ro_language_import.lng +++ b/interface/web/admin/lib/lang/ro_language_import.lng @@ -5,4 +5,5 @@ $wb['btn_save_txt'] = 'Import file limba selectata'; $wb['language_overwrite_txt'] = 'suprascrie file, daca exista'; $wb['btn_cancel_txt'] = 'inapoi'; $wb['ignore_version_txt'] = 'Skip ISPConfig version check'; +$wb['list_desc_txt'] = 'WARNING: Do not import language files from untrustworthy sources.'; ?> diff --git a/interface/web/admin/lib/lang/ro_remote_action.lng b/interface/web/admin/lib/lang/ro_remote_action.lng index 3fc3eaf81f..f268527084 100644 --- a/interface/web/admin/lib/lang/ro_remote_action.lng +++ b/interface/web/admin/lib/lang/ro_remote_action.lng @@ -8,5 +8,5 @@ $wb['do_ispcupdate_desc'] = 'This action does a ISPConfig3 update at your select $wb['action_scheduled'] = 'The action is scheduled for execution'; $wb['select_all_server'] = 'All server'; $wb['ispconfig_update_title'] = 'ISPConfig update instructions'; -$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructions'; +$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/ro_software_package.lng b/interface/web/admin/lib/lang/ro_software_package.lng index 62ef734079..faffe38217 100644 --- a/interface/web/admin/lib/lang/ro_software_package.lng +++ b/interface/web/admin/lib/lang/ro_software_package.lng @@ -1,6 +1,6 @@ \ No newline at end of file +?> diff --git a/interface/web/admin/lib/lang/ro_system_config.lng b/interface/web/admin/lib/lang/ro_system_config.lng index d237d638af..e2b701afc3 100644 --- a/interface/web/admin/lib/lang/ro_system_config.lng +++ b/interface/web/admin/lib/lang/ro_system_config.lng @@ -52,4 +52,11 @@ $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail a $wb['webmail_url_error_regex'] = 'Invalid webmail URL'; $wb['phpmyadmin_url_note_txt'] = 'Placeholder:'; $wb['webmail_url_note_txt'] = 'Placeholder:'; +$wb['available_dashlets_note_txt'] = 'Available Dashlets:'; +$wb['admin_dashlets_left_txt'] = 'Left Admin Dashlets'; +$wb['admin_dashlets_right_txt'] = 'Right Admin Dashlets'; +$wb['reseller_dashlets_left_txt'] = 'Left Reseller Dashlets'; +$wb['reseller_dashlets_right_txt'] = 'Right Reseller Dashlets'; +$wb['client_dashlets_left_txt'] = 'Left Client Dashlets'; +$wb['client_dashlets_right_txt'] = 'Right Client Dashlets'; ?> diff --git a/interface/web/admin/lib/lang/ru_language_import.lng b/interface/web/admin/lib/lang/ru_language_import.lng index c63cc145af..29b5cbf251 100644 --- a/interface/web/admin/lib/lang/ru_language_import.lng +++ b/interface/web/admin/lib/lang/ru_language_import.lng @@ -5,4 +5,5 @@ $wb['btn_save_txt'] = 'Импорт выбранного языкового фа $wb['language_overwrite_txt'] = 'Перезаписать, если есть.'; $wb['btn_cancel_txt'] = 'Назад'; $wb['ignore_version_txt'] = 'Пропустить проверку версий ISPConfig'; +$wb['list_desc_txt'] = 'WARNING: Do not import language files from untrustworthy sources.'; ?> diff --git a/interface/web/admin/lib/lang/ru_remote_action.lng b/interface/web/admin/lib/lang/ru_remote_action.lng index 3fc3eaf81f..f268527084 100644 --- a/interface/web/admin/lib/lang/ru_remote_action.lng +++ b/interface/web/admin/lib/lang/ru_remote_action.lng @@ -8,5 +8,5 @@ $wb['do_ispcupdate_desc'] = 'This action does a ISPConfig3 update at your select $wb['action_scheduled'] = 'The action is scheduled for execution'; $wb['select_all_server'] = 'All server'; $wb['ispconfig_update_title'] = 'ISPConfig update instructions'; -$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructions'; +$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/ru_software_package.lng b/interface/web/admin/lib/lang/ru_software_package.lng index 62ef734079..faffe38217 100644 --- a/interface/web/admin/lib/lang/ru_software_package.lng +++ b/interface/web/admin/lib/lang/ru_software_package.lng @@ -1,6 +1,6 @@ \ No newline at end of file +?> diff --git a/interface/web/admin/lib/lang/ru_system_config.lng b/interface/web/admin/lib/lang/ru_system_config.lng index ee0fc50b07..612fe50539 100644 --- a/interface/web/admin/lib/lang/ru_system_config.lng +++ b/interface/web/admin/lib/lang/ru_system_config.lng @@ -52,4 +52,11 @@ $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail a $wb['webmail_url_error_regex'] = 'Invalid webmail URL'; $wb['phpmyadmin_url_note_txt'] = 'Placeholder:'; $wb['webmail_url_note_txt'] = 'Placeholder:'; +$wb['available_dashlets_note_txt'] = 'Available Dashlets:'; +$wb['admin_dashlets_left_txt'] = 'Left Admin Dashlets'; +$wb['admin_dashlets_right_txt'] = 'Right Admin Dashlets'; +$wb['reseller_dashlets_left_txt'] = 'Left Reseller Dashlets'; +$wb['reseller_dashlets_right_txt'] = 'Right Reseller Dashlets'; +$wb['client_dashlets_left_txt'] = 'Left Client Dashlets'; +$wb['client_dashlets_right_txt'] = 'Right Client Dashlets'; ?> diff --git a/interface/web/admin/lib/lang/se_language_import.lng b/interface/web/admin/lib/lang/se_language_import.lng index 4c31ec3de3..a5831fc954 100644 --- a/interface/web/admin/lib/lang/se_language_import.lng +++ b/interface/web/admin/lib/lang/se_language_import.lng @@ -5,4 +5,5 @@ $wb['btn_save_txt'] = 'Import the selected language file'; $wb['language_overwrite_txt'] = 'Overwrite file, if exists.'; $wb['btn_cancel_txt'] = 'Back'; $wb['ignore_version_txt'] = 'Skip ISPConfig version check'; +$wb['list_desc_txt'] = 'WARNING: Do not import language files from untrustworthy sources.'; ?> diff --git a/interface/web/admin/lib/lang/se_remote_action.lng b/interface/web/admin/lib/lang/se_remote_action.lng index 3fc3eaf81f..f268527084 100644 --- a/interface/web/admin/lib/lang/se_remote_action.lng +++ b/interface/web/admin/lib/lang/se_remote_action.lng @@ -8,5 +8,5 @@ $wb['do_ispcupdate_desc'] = 'This action does a ISPConfig3 update at your select $wb['action_scheduled'] = 'The action is scheduled for execution'; $wb['select_all_server'] = 'All server'; $wb['ispconfig_update_title'] = 'ISPConfig update instructions'; -$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructions'; +$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/se_software_package.lng b/interface/web/admin/lib/lang/se_software_package.lng index 62ef734079..faffe38217 100644 --- a/interface/web/admin/lib/lang/se_software_package.lng +++ b/interface/web/admin/lib/lang/se_software_package.lng @@ -1,6 +1,6 @@ \ No newline at end of file +?> diff --git a/interface/web/admin/lib/lang/se_system_config.lng b/interface/web/admin/lib/lang/se_system_config.lng index d237d638af..e2b701afc3 100644 --- a/interface/web/admin/lib/lang/se_system_config.lng +++ b/interface/web/admin/lib/lang/se_system_config.lng @@ -52,4 +52,11 @@ $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail a $wb['webmail_url_error_regex'] = 'Invalid webmail URL'; $wb['phpmyadmin_url_note_txt'] = 'Placeholder:'; $wb['webmail_url_note_txt'] = 'Placeholder:'; +$wb['available_dashlets_note_txt'] = 'Available Dashlets:'; +$wb['admin_dashlets_left_txt'] = 'Left Admin Dashlets'; +$wb['admin_dashlets_right_txt'] = 'Right Admin Dashlets'; +$wb['reseller_dashlets_left_txt'] = 'Left Reseller Dashlets'; +$wb['reseller_dashlets_right_txt'] = 'Right Reseller Dashlets'; +$wb['client_dashlets_left_txt'] = 'Left Client Dashlets'; +$wb['client_dashlets_right_txt'] = 'Right Client Dashlets'; ?> diff --git a/interface/web/admin/lib/lang/sk_language_import.lng b/interface/web/admin/lib/lang/sk_language_import.lng index d842fc6cf3..5dacacff52 100644 --- a/interface/web/admin/lib/lang/sk_language_import.lng +++ b/interface/web/admin/lib/lang/sk_language_import.lng @@ -5,4 +5,5 @@ $wb['btn_save_txt'] = 'Import zvoleného jazykového súboru'; $wb['language_overwrite_txt'] = 'Prepisať subor ak existuje'; $wb['btn_cancel_txt'] = 'Späť'; $wb['ignore_version_txt'] = 'Skip ISPConfig version check'; +$wb['list_desc_txt'] = 'WARNING: Do not import language files from untrustworthy sources.'; ?> diff --git a/interface/web/admin/lib/lang/sk_remote_action.lng b/interface/web/admin/lib/lang/sk_remote_action.lng index 3fc3eaf81f..f268527084 100644 --- a/interface/web/admin/lib/lang/sk_remote_action.lng +++ b/interface/web/admin/lib/lang/sk_remote_action.lng @@ -8,5 +8,5 @@ $wb['do_ispcupdate_desc'] = 'This action does a ISPConfig3 update at your select $wb['action_scheduled'] = 'The action is scheduled for execution'; $wb['select_all_server'] = 'All server'; $wb['ispconfig_update_title'] = 'ISPConfig update instructions'; -$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructions'; +$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/sk_software_package.lng b/interface/web/admin/lib/lang/sk_software_package.lng index 62ef734079..faffe38217 100644 --- a/interface/web/admin/lib/lang/sk_software_package.lng +++ b/interface/web/admin/lib/lang/sk_software_package.lng @@ -1,6 +1,6 @@ \ No newline at end of file +?> diff --git a/interface/web/admin/lib/lang/sk_system_config.lng b/interface/web/admin/lib/lang/sk_system_config.lng index 3b8b68321e..1340eee8bb 100644 --- a/interface/web/admin/lib/lang/sk_system_config.lng +++ b/interface/web/admin/lib/lang/sk_system_config.lng @@ -52,4 +52,11 @@ $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail a $wb['webmail_url_error_regex'] = 'Invalid webmail URL'; $wb['phpmyadmin_url_note_txt'] = 'Placeholder:'; $wb['webmail_url_note_txt'] = 'Placeholder:'; +$wb['available_dashlets_note_txt'] = 'Available Dashlets:'; +$wb['admin_dashlets_left_txt'] = 'Left Admin Dashlets'; +$wb['admin_dashlets_right_txt'] = 'Right Admin Dashlets'; +$wb['reseller_dashlets_left_txt'] = 'Left Reseller Dashlets'; +$wb['reseller_dashlets_right_txt'] = 'Right Reseller Dashlets'; +$wb['client_dashlets_left_txt'] = 'Left Client Dashlets'; +$wb['client_dashlets_right_txt'] = 'Right Client Dashlets'; ?> diff --git a/interface/web/admin/lib/lang/tr_language_import.lng b/interface/web/admin/lib/lang/tr_language_import.lng index 2caaa07986..77173d506b 100644 --- a/interface/web/admin/lib/lang/tr_language_import.lng +++ b/interface/web/admin/lib/lang/tr_language_import.lng @@ -5,4 +5,5 @@ $wb['btn_save_txt'] = 'Seçili dil dosyasını içe aktar'; $wb['language_overwrite_txt'] = 'Eğer mevcutsa, üstüne yaz.'; $wb['btn_cancel_txt'] = 'Geri'; $wb['ignore_version_txt'] = 'Skip ISPConfig version check'; +$wb['list_desc_txt'] = 'WARNING: Do not import language files from untrustworthy sources.'; ?> diff --git a/interface/web/admin/lib/lang/tr_remote_action.lng b/interface/web/admin/lib/lang/tr_remote_action.lng index 3fc3eaf81f..f268527084 100644 --- a/interface/web/admin/lib/lang/tr_remote_action.lng +++ b/interface/web/admin/lib/lang/tr_remote_action.lng @@ -8,5 +8,5 @@ $wb['do_ispcupdate_desc'] = 'This action does a ISPConfig3 update at your select $wb['action_scheduled'] = 'The action is scheduled for execution'; $wb['select_all_server'] = 'All server'; $wb['ispconfig_update_title'] = 'ISPConfig update instructions'; -$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructions'; +$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command

ispconfig_update.sh

to start the ISPConfig update.

Click here for detailed update instructins'; ?> diff --git a/interface/web/admin/lib/lang/tr_software_package.lng b/interface/web/admin/lib/lang/tr_software_package.lng index 62ef734079..faffe38217 100644 --- a/interface/web/admin/lib/lang/tr_software_package.lng +++ b/interface/web/admin/lib/lang/tr_software_package.lng @@ -1,6 +1,6 @@ \ No newline at end of file +?> diff --git a/interface/web/admin/lib/lang/tr_system_config.lng b/interface/web/admin/lib/lang/tr_system_config.lng index e538a313f9..8a5fd3a86f 100644 --- a/interface/web/admin/lib/lang/tr_system_config.lng +++ b/interface/web/admin/lib/lang/tr_system_config.lng @@ -52,4 +52,11 @@ $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail a $wb['webmail_url_error_regex'] = 'Invalid webmail URL'; $wb['phpmyadmin_url_note_txt'] = 'Placeholder:'; $wb['webmail_url_note_txt'] = 'Placeholder:'; +$wb['available_dashlets_note_txt'] = 'Available Dashlets:'; +$wb['admin_dashlets_left_txt'] = 'Left Admin Dashlets'; +$wb['admin_dashlets_right_txt'] = 'Right Admin Dashlets'; +$wb['reseller_dashlets_left_txt'] = 'Left Reseller Dashlets'; +$wb['reseller_dashlets_right_txt'] = 'Right Reseller Dashlets'; +$wb['client_dashlets_left_txt'] = 'Left Client Dashlets'; +$wb['client_dashlets_right_txt'] = 'Right Client Dashlets'; ?> diff --git a/interface/web/admin/lib/menu.d/tpl_default.menu.php b/interface/web/admin/lib/menu.d/tpl_default.menu.php index d6d071a701..544400246e 100644 --- a/interface/web/admin/lib/menu.d/tpl_default.menu.php +++ b/interface/web/admin/lib/menu.d/tpl_default.menu.php @@ -1,15 +1,15 @@ - 'Default Theme', - 'target' => 'content', - 'link' => 'admin/tpl_default.php', - 'html_id' => 'tpl_default'); - break; - } -} -*/ - -?> + 'Default Theme', + 'target' => 'content', + 'link' => 'admin/tpl_default.php', + 'html_id' => 'tpl_default'); + break; + } +} +*/ + +?> diff --git a/interface/web/admin/templates/iptables_edit.htm b/interface/web/admin/templates/iptables_edit.htm index 23228d4563..283c5e78db 100644 --- a/interface/web/admin/templates/iptables_edit.htm +++ b/interface/web/admin/templates/iptables_edit.htm @@ -1,67 +1,67 @@ -

-

-
- -
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
-

{tmpl_var name='active_txt'}

-
- {tmpl_var name='active'} -
-
-
- -
- - -
-
- +

+

+
+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+

{tmpl_var name='active_txt'}

+
+ {tmpl_var name='active'} +
+
+
+ +
+ + +
+
+
\ No newline at end of file diff --git a/interface/web/admin/templates/iptables_list.htm b/interface/web/admin/templates/iptables_list.htm index 523ec675de..e3747054e3 100644 --- a/interface/web/admin/templates/iptables_list.htm +++ b/interface/web/admin/templates/iptables_list.htm @@ -1,74 +1,74 @@ -

- -
- -
-
Tools -
- -
-
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
- -
{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="table"}{tmpl_var name="protocol"}{tmpl_var name="singleport"}{tmpl_var name="multiport"}{tmpl_var name="state"}{tmpl_var name="target"} - {tmpl_var name='delete_txt'} -
{tmpl_var name='globalsearch_noresults_text_txt'}
-
-
+

+ +
+ +
+
Tools +
+ +
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 
+ +
{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="table"}{tmpl_var name="protocol"}{tmpl_var name="singleport"}{tmpl_var name="multiport"}{tmpl_var name="state"}{tmpl_var name="target"} + {tmpl_var name='delete_txt'} +
{tmpl_var name='globalsearch_noresults_text_txt'}
+
+
\ No newline at end of file diff --git a/interface/web/admin/templates/language_import.htm b/interface/web/admin/templates/language_import.htm index 85ea2a97d1..d674b200a7 100644 --- a/interface/web/admin/templates/language_import.htm +++ b/interface/web/admin/templates/language_import.htm @@ -4,7 +4,7 @@
-
Language Import +
Language Import
diff --git a/interface/web/admin/templates/server_config_mail_edit.htm b/interface/web/admin/templates/server_config_mail_edit.htm index 6ab03eb9bd..752bc22da2 100644 --- a/interface/web/admin/templates/server_config_mail_edit.htm +++ b/interface/web/admin/templates/server_config_mail_edit.htm @@ -19,10 +19,6 @@
-
- - -

{tmpl_var name='pop3_imap_daemon_txt'}

@@ -117,4 +113,4 @@
-
+
\ No newline at end of file diff --git a/interface/web/admin/templates/server_config_rescue_edit.htm b/interface/web/admin/templates/server_config_rescue_edit.htm index 28b5cb4bd5..778225b3e6 100644 --- a/interface/web/admin/templates/server_config_rescue_edit.htm +++ b/interface/web/admin/templates/server_config_rescue_edit.htm @@ -17,12 +17,6 @@ {tmpl_var name='do_not_try_rescue_httpd'}
-
-

{tmpl_var name='do_not_try_rescue_mongodb_txt'}

-
- {tmpl_var name='do_not_try_rescue_mongodb'} -
-

{tmpl_var name='do_not_try_rescue_mysql_txt'}

@@ -36,15 +30,15 @@
- + - + - +
- - + + \ No newline at end of file diff --git a/interface/web/admin/templates/server_config_server_edit.htm b/interface/web/admin/templates/server_config_server_edit.htm index 6dab52f3ab..93158d734b 100644 --- a/interface/web/admin/templates/server_config_server_edit.htm +++ b/interface/web/admin/templates/server_config_server_edit.htm @@ -16,16 +16,17 @@
- - -
-
- - -
-
- - + + +
+ +
+ +
@@ -95,7 +96,7 @@
-
-
- - + + + + diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm index 6656634b16..7e75f50532 100644 --- a/interface/web/admin/templates/server_config_web_edit.htm +++ b/interface/web/admin/templates/server_config_web_edit.htm @@ -32,20 +32,20 @@
- -  {tmpl_var name='website_autoalias_note_txt'} [client_id], [client_username], [website_id], [website_domain] + +  {tmpl_var name='website_autoalias_note_txt'} [client_id], [client_username], [website_id], [website_domain]
- -
- - + --> +
+ +
@@ -219,10 +219,6 @@
-
- - {tmpl_var name='php_ini_check_minutes_info_txt'} -
{tmpl_var name='apps_vhost_settings_txt'}
@@ -284,7 +280,7 @@ jQuery('.apache').hide(); } else { jQuery('.nginx').hide(); - jQuery('.apache').show(); - } - } - + jQuery('.apache').show(); + } + } + diff --git a/interface/web/admin/templates/system_config_branding_edit.html b/interface/web/admin/templates/system_config_branding_edit.html index 2c4c2e1a62..80ab5a5da7 100644 --- a/interface/web/admin/templates/system_config_branding_edit.html +++ b/interface/web/admin/templates/system_config_branding_edit.html @@ -1,22 +1,22 @@ -

-

- -
- -
-
Branding -
-

{tmpl_var name='allow_themechange_txt'}Allow users to change theme

-
- {tmpl_var name='allow_themechange'} -
-
-
- -
- - -
-
- +

+

+ +
+ +
+
Branding +
+

{tmpl_var name='allow_themechange_txt'}Allow users to change theme

+
+ {tmpl_var name='allow_themechange'} +
+
+
+ +
+ + +
+
+
\ No newline at end of file diff --git a/interface/web/admin/templates/system_config_mail_edit.htm b/interface/web/admin/templates/system_config_mail_edit.htm index e9c0c0e5b0..3c8cf2b0bb 100644 --- a/interface/web/admin/templates/system_config_mail_edit.htm +++ b/interface/web/admin/templates/system_config_mail_edit.htm @@ -11,24 +11,6 @@ {tmpl_var name='enable_custom_login'}
-
-

{tmpl_var name='mailbox_show_autoresponder_tab_txt'}

-
- {tmpl_var name='mailbox_show_autoresponder_tab'} -
-
-
-

{tmpl_var name='mailbox_show_mail_filter_tab_txt'}

-
- {tmpl_var name='mailbox_show_mail_filter_tab'} -
-
-
-

{tmpl_var name='mailbox_show_custom_rules_tab_txt'}

-
- {tmpl_var name='mailbox_show_custom_rules_tab'} -
-

{tmpl_var name='mailboxlist_webmail_link_txt'}

@@ -95,4 +77,4 @@
- + \ No newline at end of file diff --git a/interface/web/admin/templates/system_config_sites_edit.htm b/interface/web/admin/templates/system_config_sites_edit.htm index 65f37b7820..78c51b0041 100644 --- a/interface/web/admin/templates/system_config_sites_edit.htm +++ b/interface/web/admin/templates/system_config_sites_edit.htm @@ -45,18 +45,12 @@ {tmpl_var name='vhost_subdomains'} {tmpl_var name='vhost_subdomains_note_txt'} -
+

{tmpl_var name='client_username_web_check_disabled_txt'}

{tmpl_var name='client_username_web_check_disabled'}
-
-

{tmpl_var name='reseller_can_use_options_txt'}

-
- {tmpl_var name='reseller_can_use_options'} -
-
@@ -67,4 +61,4 @@
- + \ No newline at end of file diff --git a/interface/web/client/client_message.php b/interface/web/client/client_message.php index fc9de0bc3c..73c43bb4c6 100644 --- a/interface/web/client/client_message.php +++ b/interface/web/client/client_message.php @@ -91,10 +91,15 @@ if(isset($_POST) && count($_POST) > 1) { //* Parse client details into message $message = $_POST['message']; foreach($client as $key => $val) { - if($key != 'password'){ - $message = str_replace('{'.$key.'}', $val, $message); - } else { - $message = str_replace('{'.$key.'}', '---', $message); + switch ($key) { + case 'password': + $message = str_replace('{'.$key.'}', '---', $message); + break; + case 'gender': + $message = str_replace('{salutation}', $wb['gender_'.$val.'_txt'], $message); + break; + default: + $message = str_replace('{'.$key.'}', $val, $message); } } @@ -145,7 +150,13 @@ $sql = "SHOW COLUMNS FROM client WHERE Field NOT IN ('client_id', 'sys_userid', $field_names = $app->db->queryAllRecords($sql); if(!empty($field_names) && is_array($field_names)){ foreach($field_names as $field_name){ - if($field_name['Field'] != '') $message_variables .= '{'.$field_name['Field'].'} '; + if($field_name['Field'] != ''){ + if($field_name['Field'] == 'gender'){ + $message_variables .= '{salutation} '; + } else { + $message_variables .= '{'.$field_name['Field'].'} '; + } + } } } $app->tpl->setVar('message_variables',trim($message_variables)); diff --git a/interface/web/client/lib/lang/ar_client.lng b/interface/web/client/lib/lang/ar_client.lng index 0c1d0f6367..ab6fb9498c 100644 --- a/interface/web/client/lib/lang/ar_client.lng +++ b/interface/web/client/lib/lang/ar_client.lng @@ -144,4 +144,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked (disables all webs etc.)'; +$wb['canceled_txt'] = 'Canceled (disables client login)'; +$wb['gender_txt'] = 'Title'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; ?> diff --git a/interface/web/client/lib/lang/ar_reseller.lng b/interface/web/client/lib/lang/ar_reseller.lng index 32c9bb1c7c..53c907162a 100644 --- a/interface/web/client/lib/lang/ar_reseller.lng +++ b/interface/web/client/lib/lang/ar_reseller.lng @@ -143,4 +143,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked'; +$wb['canceled_txt'] = 'Canceled'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; +$wb['gender_txt'] = 'Title'; ?> diff --git a/interface/web/client/lib/lang/bg_client.lng b/interface/web/client/lib/lang/bg_client.lng index 229dace93a..032b0e3669 100644 --- a/interface/web/client/lib/lang/bg_client.lng +++ b/interface/web/client/lib/lang/bg_client.lng @@ -144,4 +144,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked (disables all webs etc.)'; +$wb['canceled_txt'] = 'Canceled (disables client login)'; +$wb['gender_txt'] = 'Title'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; ?> diff --git a/interface/web/client/lib/lang/bg_reseller.lng b/interface/web/client/lib/lang/bg_reseller.lng index 857e4a85a5..c028748f4c 100644 --- a/interface/web/client/lib/lang/bg_reseller.lng +++ b/interface/web/client/lib/lang/bg_reseller.lng @@ -143,4 +143,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked'; +$wb['canceled_txt'] = 'Canceled'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; +$wb['gender_txt'] = 'Title'; ?> diff --git a/interface/web/client/lib/lang/br_client.lng b/interface/web/client/lib/lang/br_client.lng index ae2c12280d..115595520e 100644 --- a/interface/web/client/lib/lang/br_client.lng +++ b/interface/web/client/lib/lang/br_client.lng @@ -144,4 +144,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked (disables all webs etc.)'; +$wb['canceled_txt'] = 'Canceled (disables client login)'; +$wb['gender_txt'] = 'Title'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; ?> diff --git a/interface/web/client/lib/lang/br_reseller.lng b/interface/web/client/lib/lang/br_reseller.lng index 2fa5368591..6d248b7def 100644 --- a/interface/web/client/lib/lang/br_reseller.lng +++ b/interface/web/client/lib/lang/br_reseller.lng @@ -143,4 +143,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked'; +$wb['canceled_txt'] = 'Canceled'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; +$wb['gender_txt'] = 'Title'; ?> diff --git a/interface/web/client/lib/lang/cz.lng b/interface/web/client/lib/lang/cz.lng index 8efa987cfa..fa1c78df75 100644 --- a/interface/web/client/lib/lang/cz.lng +++ b/interface/web/client/lib/lang/cz.lng @@ -23,3 +23,4 @@ $wb['error_domain_in webuse'] = 'Tato doména nelze odstranit, protože je v pou $wb['error_client_can_not_add_domain'] = 'Nemůžete přidat novou doménu'; $wb['error_client_group_id_empty'] = 'Musíte vybrat zákazníka
'; ?> + diff --git a/interface/web/client/lib/lang/cz_client.lng b/interface/web/client/lib/lang/cz_client.lng index d5980d1bb0..e0a57d77b4 100644 --- a/interface/web/client/lib/lang/cz_client.lng +++ b/interface/web/client/lib/lang/cz_client.lng @@ -8,7 +8,7 @@ $wb['limit_mailcatchall_txt'] = 'Max. počet e-mailových košů'; $wb['limit_mailrouting_txt'] = 'Max. počet e-mailových směrování'; $wb['limit_mailfilter_txt'] = 'Max. počet e-mailových filtrů'; $wb['limit_fetchmail_txt'] = 'Max. počet účtů externího získávání e-mailů'; -$wb['limit_mailquota_txt'] = 'Mailbox kvóta'; +$wb['limit_mailquota_txt'] = 'Kvóta e-mailové schránky'; $wb['limit_spamfilter_wblist_txt'] = 'Max. počet spamfiltrových bílých / černých listinových filtrů'; $wb['limit_spamfilter_user_txt'] = 'Max. počet spamflitrových uživatelů'; $wb['limit_spamfilter_policy_txt'] = 'Max. počet spamfiltrových politik'; @@ -60,26 +60,26 @@ $wb['limit_shell_user_txt'] = 'Max. počet shell uživatelů'; $wb['limit_client_txt'] = 'Max. počet klientů'; $wb['username_error_empty'] = 'Uživatelské jméno je prázdné.'; $wb['username_error_unique'] = 'Uživatelské jméno musí být unikátní.'; -$wb['limit_maildomain_error_notint'] = 'Limit pro email doménu musí být číslo.'; +$wb['limit_maildomain_error_notint'] = 'Limit pro e-mail doménu musí být číslo.'; $wb['limit_mailbox_error_notint'] = 'Limit pro mailboxy musí být číslo.'; -$wb['limit_mailalias_error_notint'] = 'Limit pro emailové aliasy musí být číslo.'; -$wb['limit_mailaliasdomain_error_notint'] = 'Limit pro emailové doménové aliasy musí být číslo.'; -$wb['limit_mailforward_error_notint'] = 'Limit pro emailové předavače musí být číslo.'; -$wb['limit_mailcatchall_error_notint'] = 'Limit pro emailové koše musí být číslo.'; -$wb['limit_mailrouting_error_notint'] = 'Limit pro emailová směrování musí být číslo.'; -$wb['limit_mailfilter_error_notint'] = 'Limit pro emailové filtry limit musí být číslo.'; -$wb['limit_mailfetchmail_error_notint'] = 'Limit pro externí získávání emailů musí být číslo.'; -$wb['limit_mailquota_error_notint'] = 'Limit pro emailovou kvótu musí být číslo.'; +$wb['limit_mailalias_error_notint'] = 'Limit pro e-mailové aliasy musí být číslo.'; +$wb['limit_mailaliasdomain_error_notint'] = 'Limit pro e-mailové doménové aliasy musí být číslo.'; +$wb['limit_mailforward_error_notint'] = 'Limit pro e-mailové předávání musí být číslo.'; +$wb['limit_mailcatchall_error_notint'] = 'Limit pro e-mailové koše musí být číslo.'; +$wb['limit_mailrouting_error_notint'] = 'Limit pro e-mailová směrování musí být číslo.'; +$wb['limit_mailfilter_error_notint'] = 'Limit pro e-mailové filtry limit musí být číslo.'; +$wb['limit_mailfetchmail_error_notint'] = 'Limit pro externí získávání e-mailů musí být číslo.'; +$wb['limit_mailquota_error_notint'] = 'Limit pro e-mailovou kvótu musí být číslo.'; $wb['limit_spamfilter_wblist_error_notint'] = 'Limit pro spamfiltrové bílé / černé listiny musí být číslo.'; $wb['limit_spamfilter_user_error_notint'] = 'Limit spamfiltrových uživatelů musí být číslo.'; $wb['limit_spamfilter_policy_error_notint'] = 'Limit spamfiltrových politik musí být číslo.'; -$wb['limit_web_domain_error_notint'] = 'Limit webových stránek musí být číslo.'; +$wb['limit_web_domain_error_notint'] = 'Limit webových stránek/domén musí být číslo.'; $wb['limit_web_aliasdomain_error_notint'] = 'Limit webových alias domén musí být číslo.'; $wb['limit_web_subdomain_error_notint'] = 'Limit webových subdomén musí být číslo.'; $wb['limit_ftp_user_error_notint'] = 'Limit FTP uživatelů musí být číslo.'; $wb['limit_shell_user_error_notint'] = 'Limit shell uživatelů musí být číslo.'; $wb['limit_dns_zone_error_notint'] = 'Limit DNS zón musí být číslo.'; -$wb['limit_dns_slave_zone_error_notint'] = 'The dns slave zone limit must be a number.'; +$wb['limit_dns_slave_zone_error_notint'] = 'Limit DNS sekundární zóny musí být číslo.'; $wb['default_dbserver_txt'] = 'Výchozí databázový server'; $wb['limit_database_error_notint'] = 'Limit databází musí být číslo.'; $wb['limit_cron_error_notint'] = 'Limit cronu musí být číslo.'; @@ -94,16 +94,16 @@ $wb['limit_web_quota_txt'] = 'Webová kvóta'; $wb['limit_traffic_quota_txt'] = 'Přenosová kvóta'; $wb['limit_trafficquota_error_notint'] = 'Přenosová kvót musí být číslo.'; $wb['limit_webdav_user_txt'] = 'Max. počet Webdav uživatelů'; -$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.'; +$wb['limit_webdav_user_error_notint'] = 'Limit WebDAV uživatelů musí být číslo.'; $wb['customer_no_txt'] = 'Zákaznické číslo'; $wb['vat_id_txt'] = 'DIČ'; $wb['required_fields_txt'] = '* Povinná pole'; $wb['company_id_txt'] = 'IČO'; $wb['limit_mailmailinglist_txt'] = 'Max. počet e-mailových konferencí'; -$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.'; +$wb['limit_mailmailinglist_error_notint'] = 'Limit pro e-mailové konference musí být číslo.'; $wb['limit_openvz_vm_txt'] = 'Max. počet virtuálních serverů'; -$wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; -$wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['limit_openvz_vm_template_id_txt'] = 'Povinná šablona pro virtuální server'; +$wb['limit_openvz_vm_error_notint'] = 'Limit pro virtuální servery musí být číslo.'; $wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; $wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; $wb['username_error_collision'] = 'The username may not start with the word -web- or -web- followed by a number.'; @@ -140,8 +140,9 @@ $wb['customer_no_error_unique'] = 'Zákaznické číslo musí být jedinečné ( $wb['paypal_email_error_isemail'] = 'Zadejte prosím platnou PayPal e-mail addresu.'; $wb['paypal_email_txt'] = 'PayPal e-mail'; $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.'; -$wb['aps_limits_txt'] = 'APS Installer Limits'; -$wb['limit_aps_txt'] = 'Max. number of APS instances'; -$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; -$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['aps_limits_txt'] = 'APS limity instalátoru'; +$wb['limit_aps_txt'] = 'Max. počet APS instalací'; +$wb['limit_aps_error_notint'] = 'Limit pro APS instalace musí být číslo.'; +$wb['default_slave_dnsserver_txt'] = 'Výchozí sekundární DNS server'; ?> + diff --git a/interface/web/client/lib/lang/cz_client_circle.lng b/interface/web/client/lib/lang/cz_client_circle.lng index f26e2d6d4b..c47f934f6f 100644 --- a/interface/web/client/lib/lang/cz_client_circle.lng +++ b/interface/web/client/lib/lang/cz_client_circle.lng @@ -7,3 +7,4 @@ $wb['client_ids_txt'] = 'Klienti/Distributoři'; $wb['description_txt'] = 'Popis'; $wb['active_txt'] = 'Aktivní'; ?> + diff --git a/interface/web/client/lib/lang/cz_client_circle_list.lng b/interface/web/client/lib/lang/cz_client_circle_list.lng index e827605400..5895f82def 100644 --- a/interface/web/client/lib/lang/cz_client_circle_list.lng +++ b/interface/web/client/lib/lang/cz_client_circle_list.lng @@ -8,3 +8,4 @@ $wb['filter_txt'] = 'Filtr'; $wb['delete_txt'] = 'Smazat'; $wb['active_txt'] = 'Aktivní'; ?> + diff --git a/interface/web/client/lib/lang/cz_client_del.lng b/interface/web/client/lib/lang/cz_client_del.lng index ca1a13f875..255b54217f 100644 --- a/interface/web/client/lib/lang/cz_client_del.lng +++ b/interface/web/client/lib/lang/cz_client_del.lng @@ -3,5 +3,6 @@ $wb['confirm_action_txt'] = 'Potvrdit akci'; $wb['delete_explanation'] = 'Tato akce smaže následující počet záznamů přidružených s tímto klientem'; $wb['btn_save_txt'] = 'Smazat klienta'; $wb['btn_cancel_txt'] = 'Zrušit bez smazání klienta'; -$wb['confirm_client_delete_txt'] = 'Are you sure you want to delete this client?'; +$wb['confirm_client_delete_txt'] = 'Jste si jisti, že chcete smazat tohoto klienta ?'; ?> + diff --git a/interface/web/client/lib/lang/cz_client_message.lng b/interface/web/client/lib/lang/cz_client_message.lng index d980d55012..401908daed 100644 --- a/interface/web/client/lib/lang/cz_client_message.lng +++ b/interface/web/client/lib/lang/cz_client_message.lng @@ -16,3 +16,4 @@ $wb['all_clients_resellers_txt'] = 'Všichni klienti a distributoři (prodejci)' $wb['all_clients_txt'] = 'Všichni klienti'; $wb['variables_txt'] = 'Výběr (možnosti):'; ?> + diff --git a/interface/web/client/lib/lang/cz_client_template.lng b/interface/web/client/lib/lang/cz_client_template.lng index 5c8406915e..22c530104e 100644 --- a/interface/web/client/lib/lang/cz_client_template.lng +++ b/interface/web/client/lib/lang/cz_client_template.lng @@ -9,7 +9,7 @@ $wb['limit_mailcatchall_txt'] = 'Max. počet e-mailových košů'; $wb['limit_mailrouting_txt'] = 'Max. počet e-mailových směrování'; $wb['limit_mailfilter_txt'] = 'Max. počet e-mailových filtrů'; $wb['limit_fetchmail_txt'] = 'Max. počet účtů externího získávání e-mailů'; -$wb['limit_mailquota_txt'] = 'Mailbox kvóta'; +$wb['limit_mailquota_txt'] = 'Kvóta e-mailové schránky'; $wb['limit_spamfilter_wblist_txt'] = 'Max. počet spamfiltrových bílých / černých listinových filtrů'; $wb['limit_spamfilter_user_txt'] = 'Max. počet spamflitrových uživatelů'; $wb['limit_spamfilter_policy_txt'] = 'Max. počet spamfiltrových politik'; @@ -29,25 +29,25 @@ $wb['limit_dns_slave_zone_txt'] = 'Max. počet sekundárních DNS zón'; $wb['limit_dns_record_txt'] = 'Max. počet DNS záznamů'; $wb['limit_shell_user_txt'] = 'Max. počet shell uživatelů'; $wb['limit_client_txt'] = 'Max. počet klientů'; -$wb['limit_maildomain_error_notint'] = 'Limit pro email doménu musí být číslo.'; +$wb['limit_maildomain_error_notint'] = 'Limit pro e-mail doménu musí být číslo.'; $wb['limit_mailbox_error_notint'] = 'Limit pro mailboxy musí být číslo.'; -$wb['limit_mailalias_error_notint'] = 'Limit pro emailové aliasy musí být číslo.'; -$wb['limit_mailaliasdomain_error_notint'] = 'Limit pro emailové doménové aliasy musí být číslo.'; -$wb['limit_mailforward_error_notint'] = 'Limit pro emailové předávání musí být číslo.'; -$wb['limit_mailcatchall_error_notint'] = 'Limit pro emailové koše musí být číslo.'; -$wb['limit_mailrouting_error_notint'] = 'Limit pro emailová směrování musí být číslo.'; -$wb['limit_mailfilter_error_notint'] = 'Limit pro emailové filtry limit musí být číslo.'; -$wb['limit_mailfetchmail_error_notint'] = 'Limit pro externí získávání emailů musí být číslo.'; -$wb['limit_mailquota_error_notint'] = 'Limit pro emailovou kvótu musí být číslo.'; +$wb['limit_mailalias_error_notint'] = 'Limit pro e-mailové aliasy musí být číslo.'; +$wb['limit_mailaliasdomain_error_notint'] = 'Limit pro e-mailové doménové aliasy musí být číslo.'; +$wb['limit_mailforward_error_notint'] = 'Limit pro e-mailové předávání musí být číslo.'; +$wb['limit_mailcatchall_error_notint'] = 'Limit pro e-mailové koše musí být číslo.'; +$wb['limit_mailrouting_error_notint'] = 'Limit pro e-mailová směrování musí být číslo.'; +$wb['limit_mailfilter_error_notint'] = 'Limit pro e-mailové filtry limit musí být číslo.'; +$wb['limit_mailfetchmail_error_notint'] = 'Limit pro externí získávání e-mailů musí být číslo.'; +$wb['limit_mailquota_error_notint'] = 'Limit pro e-mailovou kvótu musí být číslo.'; $wb['limit_spamfilter_wblist_error_notint'] = 'Limit pro spamfiltrové bílé / černé listiny musí být číslo.'; $wb['limit_spamfilter_user_error_notint'] = 'Limit spamfiltrových uživatelů musí být číslo.'; $wb['limit_spamfilter_policy_error_notint'] = 'Limit spamfiltrových politik musí být číslo.'; -$wb['limit_web_domain_error_notint'] = 'Limit webových stránek musí být číslo.'; +$wb['limit_web_domain_error_notint'] = 'Limit webových stránek/domén musí být číslo.'; $wb['limit_web_aliasdomain_error_notint'] = 'Limit webových alias domén musí být číslo.'; $wb['limit_web_subdomain_error_notint'] = 'Limit webových subdomén musí být číslo.'; -$wb['limit_ftp_user_error_notint'] = 'Limit shell uživatelů musí být číslo.'; +$wb['limit_ftp_user_error_notint'] = 'Limit FTP uživatelů musí být číslo.'; $wb['limit_dns_zone_error_notint'] = 'Limit DNS zón musí být číslo.'; -$wb['limit_dns_slave_zone_error_notint'] = 'The dns slave zone limit must be a number.'; +$wb['limit_dns_slave_zone_error_notint'] = 'Limit DNS sekundární zóny musí být číslo.'; $wb['limit_dns_record_error_notint'] = 'Limit DNS záznamů musí být číslo.'; $wb['limit_database_error_notint'] = 'Limit databází musí být číslo.'; $wb['limit_cron_error_notint'] = 'Limit cronu musí být číslo.'; @@ -58,13 +58,13 @@ $wb['limit_traffic_quota_txt'] = 'Přenosová kvóta'; $wb['limit_trafficquota_error_notint'] = 'Přenosová kvót musí být číslo.'; $wb['template_del_aborted_txt'] = 'Smazání přerušeno. Stále existuje klient, který používá tuto šablonu.'; $wb['limit_webdav_user_txt'] = 'Max. počet Webdav uživatelů'; -$wb['limit_shell_user_error_notint'] = 'The shell user limit must be a number.'; -$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.'; +$wb['limit_shell_user_error_notint'] = 'Limit shell uživatelů musí být číslo.'; +$wb['limit_webdav_user_error_notint'] = 'Limit WebDAV uživatelů musí být číslo.'; $wb['limit_mailmailinglist_txt'] = 'Max. počet e-mailových konferencí'; -$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.'; +$wb['limit_mailmailinglist_error_notint'] = 'Limit pro e-mailové konference musí být číslo.'; $wb['limit_openvz_vm_txt'] = 'Max. počet virtuálních serverů'; -$wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; -$wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['limit_openvz_vm_template_id_txt'] = 'Povinná šablona pro virtuální server'; +$wb['limit_openvz_vm_error_notint'] = 'Limit pro virtuální servery musí být číslo.'; $wb['ssh_chroot_txt'] = 'SSH-Chroot Options'; $wb['web_php_options_txt'] = 'PHP Options'; $wb['template_type_txt'] = 'Typ šablony'; @@ -84,7 +84,8 @@ $wb['database_limits_txt'] = 'Databázové limity'; $wb['cron_job_limits_txt'] = 'Cron pracovní limity'; $wb['dns_limits_txt'] = 'DNS limity'; $wb['virtualization_limits_txt'] = 'Virtualizace limity'; -$wb['aps_limits_txt'] = 'APS Installer Limits'; -$wb['limit_aps_txt'] = 'Max. number of APS instances'; -$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; +$wb['aps_limits_txt'] = 'APS limity instalátoru'; +$wb['limit_aps_txt'] = 'Max. počet APS instalací'; +$wb['limit_aps_error_notint'] = 'Limit pro APS instalace musí být číslo.'; ?> + diff --git a/interface/web/client/lib/lang/cz_client_template_list.lng b/interface/web/client/lib/lang/cz_client_template_list.lng index 675da95083..d560efbe53 100644 --- a/interface/web/client/lib/lang/cz_client_template_list.lng +++ b/interface/web/client/lib/lang/cz_client_template_list.lng @@ -2,5 +2,6 @@ $wb['list_head_txt'] = 'Klientské šablony'; $wb['template_type_txt'] = 'Typ'; $wb['template_name_txt'] = 'Název šablony'; -$wb['template_id_txt'] = 'Template ID'; +$wb['template_id_txt'] = 'ID šablony'; ?> + diff --git a/interface/web/client/lib/lang/cz_clients_list.lng b/interface/web/client/lib/lang/cz_clients_list.lng index 9657cb71e8..bceac34bc8 100644 --- a/interface/web/client/lib/lang/cz_clients_list.lng +++ b/interface/web/client/lib/lang/cz_clients_list.lng @@ -9,3 +9,4 @@ $wb['add_new_record_txt'] = 'Přidat klienta'; $wb['username_txt'] = 'Uživatelské jméno'; $wb['customer_no_txt'] = 'Zákaznické číslo'; ?> + diff --git a/interface/web/client/lib/lang/cz_domain.lng b/interface/web/client/lib/lang/cz_domain.lng index 34ba70c11e..eabdb6df34 100644 --- a/interface/web/client/lib/lang/cz_domain.lng +++ b/interface/web/client/lib/lang/cz_domain.lng @@ -1,6 +1,7 @@ + diff --git a/interface/web/client/lib/lang/cz_domain_list.lng b/interface/web/client/lib/lang/cz_domain_list.lng index 6cf7376bd4..88df8383cd 100644 --- a/interface/web/client/lib/lang/cz_domain_list.lng +++ b/interface/web/client/lib/lang/cz_domain_list.lng @@ -4,3 +4,4 @@ $wb['add_new_record_txt'] = 'Přidat novou doménu'; $wb['domain_txt'] = 'Doména'; $wb['user_txt'] = 'Klient'; ?> + diff --git a/interface/web/client/lib/lang/cz_reseller.lng b/interface/web/client/lib/lang/cz_reseller.lng index 07af2a4a3e..3ba47ace66 100644 --- a/interface/web/client/lib/lang/cz_reseller.lng +++ b/interface/web/client/lib/lang/cz_reseller.lng @@ -7,7 +7,7 @@ $wb['limit_mailcatchall_txt'] = 'Max. počet e-mailových košů'; $wb['limit_mailrouting_txt'] = 'Max. počet e-mailových směrování'; $wb['limit_mailfilter_txt'] = 'Max. počet e-mailových filtrů'; $wb['limit_fetchmail_txt'] = 'Max. počet účtů externího získávání e-mailů'; -$wb['limit_mailquota_txt'] = 'Mailbox kvóta'; +$wb['limit_mailquota_txt'] = 'Kvóta e-mailové schránky'; $wb['limit_spamfilter_wblist_txt'] = 'Max. počet spamfiltrových bílých / černých listinových filtrů'; $wb['limit_spamfilter_user_txt'] = 'Max. počet spamflitrových uživatelů'; $wb['limit_spamfilter_policy_txt'] = 'Max. počet spamfiltrových politik'; @@ -59,25 +59,25 @@ $wb['limit_shell_user_txt'] = 'Max. počet shell uživatelů'; $wb['limit_client_txt'] = 'Max. počet klientů'; $wb['username_error_empty'] = 'Uživatelské jméno je prázdné.'; $wb['username_error_unique'] = 'Uživatelské jméno musí být unikátní.'; -$wb['limit_maildomain_error_notint'] = 'Limit pro email doménu musí být číslo.'; +$wb['limit_maildomain_error_notint'] = 'Limit pro e-mail doménu musí být číslo.'; $wb['limit_mailbox_error_notint'] = 'Limit pro mailboxy musí být číslo.'; -$wb['limit_mailalias_error_notint'] = 'Limit pro emailové aliasy musí být číslo.'; -$wb['limit_mailforward_error_notint'] = 'Limit pro emailové předavače musí být číslo.'; -$wb['limit_mailcatchall_error_notint'] = 'Limit pro emailové koše musí být číslo.'; -$wb['limit_mailrouting_error_notint'] = 'Limit pro emailová směrování musí být číslo.'; -$wb['limit_mailfilter_error_notint'] = 'Limit pro emailové filtry limit musí být číslo.'; -$wb['limit_mailfetchmail_error_notint'] = 'Limit pro externí získávání emailů musí být číslo.'; -$wb['limit_mailquota_error_notint'] = 'Limit pro emailovou kvótu musí být číslo.'; +$wb['limit_mailalias_error_notint'] = 'Limit pro e-mailové aliasy musí být číslo.'; +$wb['limit_mailforward_error_notint'] = 'Limit pro e-mailové předávání musí být číslo.'; +$wb['limit_mailcatchall_error_notint'] = 'Limit pro e-mailové koše musí být číslo.'; +$wb['limit_mailrouting_error_notint'] = 'Limit pro e-mailová směrování musí být číslo.'; +$wb['limit_mailfilter_error_notint'] = 'Limit pro e-mailové filtry limit musí být číslo.'; +$wb['limit_mailfetchmail_error_notint'] = 'Limit pro externí získávání e-mailů musí být číslo.'; +$wb['limit_mailquota_error_notint'] = 'Limit pro e-mailovou kvótu musí být číslo.'; $wb['limit_spamfilter_wblist_error_notint'] = 'Limit pro spamfiltrové bílé / černé listiny musí být číslo.'; $wb['limit_spamfilter_user_error_notint'] = 'Limit spamfiltrových uživatelů musí být číslo.'; $wb['limit_spamfilter_policy_error_notint'] = 'Limit spamfiltrových politik musí být číslo.'; -$wb['limit_web_domain_error_notint'] = 'Limit webových stránek musí být číslo.'; +$wb['limit_web_domain_error_notint'] = 'Limit webových stránek/domén musí být číslo.'; $wb['limit_web_aliasdomain_error_notint'] = 'Limit webových alias domén musí být číslo.'; $wb['limit_web_subdomain_error_notint'] = 'Limit webových subdomén musí být číslo.'; $wb['limit_ftp_user_error_notint'] = 'Limit FTP uživatelů musí být číslo.'; $wb['limit_shell_user_error_notint'] = 'Limit shell uživatelů musí být číslo.'; $wb['limit_dns_zone_error_notint'] = 'Limit DNS zón musí být číslo.'; -$wb['limit_dns_slave_zone_error_notint'] = 'The dns slave zone limit must be a number.'; +$wb['limit_dns_slave_zone_error_notint'] = 'Limit DNS sekundární zóny musí být číslo.'; $wb['default_dbserver_txt'] = 'Výchozí databázový server'; $wb['limit_database_error_notint'] = 'Limit databází musí být číslo.'; $wb['limit_cron_error_notint'] = 'Limit cronu musí být číslo.'; @@ -92,18 +92,18 @@ $wb['limit_client_error_positive'] = 'Počet klientů musí být > 0'; $wb['limit_web_quota_txt'] = 'Webová kvóta'; $wb['limit_traffic_quota_txt'] = 'Přenosová kvóta'; $wb['limit_trafficquota_error_notint'] = 'Přenosová kvót musí být číslo.'; -$wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; +$wb['limit_dns_record_error_notint'] = 'Limit DNS záznamů musí být číslo.'; $wb['customer_no_txt'] = 'Zákaznické číslo'; $wb['vat_id_txt'] = 'DIČ'; $wb['required_fields_txt'] = '* Povinná pole'; $wb['limit_webdav_user_txt'] = 'Max. počet Webdav uživatelů'; -$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.'; +$wb['limit_webdav_user_error_notint'] = 'Limit WebDAV uživatelů musí být číslo.'; $wb['limit_mailmailinglist_txt'] = 'Max. počet e-mailových konferencí'; -$wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases'; -$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.'; +$wb['limit_mailaliasdomain_txt'] = 'Max. počet doménových aliasů'; +$wb['limit_mailmailinglist_error_notint'] = 'Limit pro e-mailové konference musí být číslo.'; $wb['limit_openvz_vm_txt'] = 'Max. počet virtuálních serverů'; -$wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; -$wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['limit_openvz_vm_template_id_txt'] = 'Povinná šablona pro virtuální server'; +$wb['limit_openvz_vm_error_notint'] = 'Limit pro virtuální servery musí být číslo.'; $wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; $wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; $wb['username_error_collision'] = 'The username may not start with the word -web- or -web- followed by a number.'; @@ -139,8 +139,9 @@ $wb['bank_code_txt'] = 'Kód banky'; $wb['bank_name_txt'] = 'Název banky'; $wb['bank_account_iban_txt'] = 'IBAN'; $wb['bank_account_swift_txt'] = 'BIC / Swift'; -$wb['aps_limits_txt'] = 'APS Installer Limits'; -$wb['limit_aps_txt'] = 'Max. number of APS instances'; -$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; -$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['aps_limits_txt'] = 'APS limity instalátoru'; +$wb['limit_aps_txt'] = 'Max. počet APS instalací'; +$wb['limit_aps_error_notint'] = 'Limit pro APS instalace musí být číslo.'; +$wb['default_slave_dnsserver_txt'] = 'Výchozí sekundární DNS server'; ?> + diff --git a/interface/web/client/lib/lang/cz_resellers_list.lng b/interface/web/client/lib/lang/cz_resellers_list.lng index 8e72797b4d..859c97f1c2 100644 --- a/interface/web/client/lib/lang/cz_resellers_list.lng +++ b/interface/web/client/lib/lang/cz_resellers_list.lng @@ -9,3 +9,4 @@ $wb['add_new_record_txt'] = 'Přidat distributora'; $wb['customer_no_txt'] = 'Zákaznické číslo'; $wb['username_txt'] = 'Uživatelské jméno'; ?> + diff --git a/interface/web/client/lib/lang/de.lng b/interface/web/client/lib/lang/de.lng index ba66401d9e..9e28df258e 100644 --- a/interface/web/client/lib/lang/de.lng +++ b/interface/web/client/lib/lang/de.lng @@ -1,7 +1,7 @@ '; ?> + diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng index 4aa8abdfcb..985be6d38b 100644 --- a/interface/web/client/lib/lang/de_client.lng +++ b/interface/web/client/lib/lang/de_client.lng @@ -37,7 +37,7 @@ $wb['surname_txt'] = 'Nachname'; $wb['limit_client_txt'] = 'Max. Anzahl an Kunden'; $wb['limit_domain_txt'] = 'Max. Anzahl an Domains'; $wb['limit_subdomain_txt'] = 'Max. Anzahl an Subdomains'; -$wb['limit_webquota_txt'] = 'Max. Webbeschränkung'; +$wb['limit_webquota_txt'] = 'Max. Speicherplatz Beschränkung'; $wb['limit_database_txt'] = 'Max. Anzahl an Datenbanken'; $wb['limit_cron_txt'] = 'Max. Anzahl an Cronjobs'; $wb['limit_cron_type_txt'] = 'Erlaubte Cronjob Typen (chrooted und full erlauben auch url)'; @@ -57,28 +57,28 @@ $wb['limit_dns_record_txt'] = 'Max. Anzahl an DNS Einträgen'; $wb['limit_shell_user_txt'] = 'Max. Anzahl an Shell Benutzer'; $wb['username_error_empty'] = 'Benutzername ist leer.'; $wb['username_error_unique'] = 'Der Benutzername muss einzigartig sein.'; -$wb['limit_maildomain_error_notint'] = 'Das E-Mail Domain Limit muss eine Zahl sein.'; -$wb['limit_mailbox_error_notint'] = 'Das E-Mail Konto Limit muss eine Zahl sein.'; -$wb['limit_mailalias_error_notint'] = 'Das E-Mail Alias Limit muss eine Zahl sein.'; -$wb['limit_mailforward_error_notint'] = 'Das E-Mail Weiterleitung Limit muss eine Zahl sein.'; -$wb['limit_mailcatchall_error_notint'] = 'Das E-Mail Catchall Limit muss eine Zahl sein.'; -$wb['limit_mailrouting_error_notint'] = 'Das E-Mail Routing Limit muss eine Zahl sein.'; -$wb['limit_mailfilter_error_notint'] = 'Das E-Mail Filter Limit muss eine Zahl sein.'; -$wb['limit_mailfetchmail_error_notint'] = 'Das Fetchmail Limit muss eine Zahl sein.'; -$wb['limit_mailquota_error_notint'] = 'Das E-Mailbeschränkungs Limit muss eine Zahl sein.'; -$wb['limit_spamfilter_wblist_error_notint'] = 'Das Spamfilter White-/Blacklist Limit muss eine Zahl sein.'; -$wb['limit_spamfilter_user_error_notint'] = 'Das Spamfilter Benutzer Limit muss eine Zahl sein.'; -$wb['limit_spamfilter_policy_error_notint'] = 'Das Spamfilter Richtlinien Limit muss eine Zahl sein.'; -$wb['limit_web_domain_error_notint'] = 'Das Domain Limit muss eine Zahl sein.'; -$wb['limit_web_aliasdomain_error_notint'] = 'Das Aliasdomain Limit muss eine Zahl sein.'; -$wb['limit_web_subdomain_error_notint'] = 'Das Subdomain Limit muss eine Zahl sein.'; -$wb['limit_ftp_user_error_notint'] = 'Das FTP Benutzer Limit muss eine Zahl sein.'; -$wb['limit_shell_user_error_notint'] = 'Das Shell Benutzer Limit muss eine Zahl sein.'; -$wb['limit_dns_zone_error_notint'] = 'Das DNS Einträge Limit muss eine Zahl sein.'; +$wb['limit_maildomain_error_notint'] = 'Die E-Mail Domain Beschränkung muss eine Zahl sein.'; +$wb['limit_mailbox_error_notint'] = 'Die E-Mail Konto Beschränkung muss eine Zahl sein.'; +$wb['limit_mailalias_error_notint'] = 'Die E-Mail Alias Beschränkung muss eine Zahl sein.'; +$wb['limit_mailforward_error_notint'] = 'Die E-Mail Weiterleitung Beschränkung muss eine Zahl sein.'; +$wb['limit_mailcatchall_error_notint'] = 'Die E-Mail Catchall Beschränkung muss eine Zahl sein.'; +$wb['limit_mailrouting_error_notint'] = 'Die E-Mail Routing Beschränkung muss eine Zahl sein.'; +$wb['limit_mailfilter_error_notint'] = 'Die E-Mail Filter Beschränkung muss eine Zahl sein.'; +$wb['limit_mailfetchmail_error_notint'] = 'Die Fetchmail Beschränkung muss eine Zahl sein.'; +$wb['limit_mailquota_error_notint'] = 'Die E-Mailbeschränkungs Beschränkung muss eine Zahl sein.'; +$wb['limit_spamfilter_wblist_error_notint'] = 'Die Spamfilter White-/Blacklist Limit muss eine Zahl sein.'; +$wb['limit_spamfilter_user_error_notint'] = 'Die Spamfilter Benutzer Beschränkung muss eine Zahl sein.'; +$wb['limit_spamfilter_policy_error_notint'] = 'Die Spamfilter Richtlinien Beschränkung muss eine Zahl sein.'; +$wb['limit_web_domain_error_notint'] = 'Die Domain Beschränkung muss eine Zahl sein.'; +$wb['limit_web_aliasdomain_error_notint'] = 'Die Aliasdomain Beschränkung muss eine Zahl sein.'; +$wb['limit_web_subdomain_error_notint'] = 'Die Subdomain Beschränkung muss eine Zahl sein.'; +$wb['limit_ftp_user_error_notint'] = 'Die FTP Benutzer Beschränkung muss eine Zahl sein.'; +$wb['limit_shell_user_error_notint'] = 'Die Shell Benutzer Beschränkung muss eine Zahl sein.'; +$wb['limit_dns_zone_error_notint'] = 'Die DNS Beschränkung muss eine Zahl sein.'; $wb['default_dbserver_txt'] = 'Standarddatenbankserver'; -$wb['limit_database_error_notint'] = 'Das Datenbank Limit muss eine Zahl sein.'; -$wb['limit_cron_error_notint'] = 'Das Cronjob Limit muss eine Zahl sein.'; -$wb['limit_cron_error_frequency'] = 'Das Cronjob Intervall muss eine Zahl sein.'; +$wb['limit_database_error_notint'] = 'Die Datenbank Beschränkung muss eine Zahl sein.'; +$wb['limit_cron_error_notint'] = 'Die Cronjob Beschränkung muss eine Zahl sein.'; +$wb['limit_cron_error_frequency'] = 'Der Cronjob Intervall muss eine Zahl sein.'; $wb['username_error_regex'] = 'Der Benutzername enthält ungültige Zeichen.'; $wb['password_strength_txt'] = 'Passwortkomplexität'; $wb['template_master_txt'] = 'Mastervorlage'; @@ -97,25 +97,25 @@ $wb['force_suexec_txt'] = 'SuEXEC erzwungen'; $wb['limit_hterror_txt'] = 'Eigene Fehlerseiten verfügbar'; $wb['limit_wildcard_txt'] = 'Wildcard Subdomain verfügbar'; $wb['limit_ssl_txt'] = 'SSL verfügbar'; -$wb['limit_client_error'] = 'Die maximale Anzahl an Kunden wurde erreicht.'; +$wb['limit_client_error'] = 'Die max. Anzahl an Kunden wurde erreicht.'; $wb['limit_mailaliasdomain_txt'] = 'Max. Anzahl an Domain Aliases'; -$wb['limit_mailaliasdomain_error_notint'] = 'Das E-Mail Domain Alias Limit muss eine Zahl sein.'; -$wb['limit_web_quota_txt'] = 'Webbeschränkung'; -$wb['limit_traffic_quota_txt'] = 'Trafficbeschränkung'; -$wb['limit_trafficquota_error_notint'] = 'Trafficbeschränkung muss eine Zahl sein.'; +$wb['limit_mailaliasdomain_error_notint'] = 'Das E-Mail Domain Alias Beschränkung muss eine Zahl sein.'; +$wb['limit_web_quota_txt'] = 'Speicherplatz Beschränkung'; +$wb['limit_traffic_quota_txt'] = 'Datentransfer Beschränkung'; +$wb['limit_trafficquota_error_notint'] = 'Datentransfer Beschränkung muss eine Zahl sein.'; $wb['limit_dns_slave_zone_txt'] = 'Max. Anzahl an Secondary DNS Zonen'; $wb['limit_webdav_user_txt'] = 'Max. Anzahl an WebDAV Benutzern'; -$wb['limit_webdav_user_error_notint'] = 'Das WebDAV Benutzer Limit muss eine Zahl sein.'; -$wb['limit_dns_slave_zone_error_notint'] = 'Das Secondary DNS Zonen Limit muss eine Zahl sein.'; +$wb['limit_webdav_user_error_notint'] = 'Die WebDAV Benutzer Beschränkung muss eine Zahl sein.'; +$wb['limit_dns_slave_zone_error_notint'] = 'Die Secondary DNS Zonen Beschränkung muss eine Zahl sein.'; $wb['customer_no_txt'] = 'Kundennummer'; $wb['vat_id_txt'] = 'USt-ID'; $wb['required_fields_txt'] = '* Benötigte Felder'; $wb['limit_mailmailinglist_txt'] = 'Max. Anzahl an Mailinglisten'; -$wb['limit_mailmailinglist_error_notint'] = 'Das Mailinglisten Limit muss eine Zahl sein.'; +$wb['limit_mailmailinglist_error_notint'] = 'Die Mailinglisten Beschränkung muss eine Zahl sein.'; $wb['company_id_txt'] = 'Firmen/Entrepreneur ID'; $wb['limit_openvz_vm_txt'] = 'Max. Anzahl an virtuellen Servern'; $wb['limit_openvz_vm_template_id_txt'] = 'Template für virtuelle Server erzwingen'; -$wb['limit_openvz_vm_error_notint'] = 'Das Limit virtueller Server muss eine Zahl sein.'; +$wb['limit_openvz_vm_error_notint'] = 'Die Beschränkung virtueller Server muss eine Zahl sein.'; $wb['web_php_options_notempty'] = 'Keine PHP Option ausgewählt. Wähle mindestens eine PHP Option.'; $wb['ssh_chroot_notempty'] = 'Keine SSH Chroot Option ausgewählt. Wähle mindestens eine SSH Option.'; $wb['username_error_collision'] = 'Der Benutzername sollte nicht mit dem Wort -web- oder -web- gefolgt von einer Nummer anfangen.'; @@ -125,12 +125,12 @@ $wb['bank_code_txt'] = 'BLZ'; $wb['bank_name_txt'] = 'Bank'; $wb['bank_account_iban_txt'] = 'IBAN'; $wb['bank_account_swift_txt'] = 'BIC'; -$wb['web_limits_txt'] = 'Web Limits'; -$wb['email_limits_txt'] = 'E-Mail Limits'; -$wb['database_limits_txt'] = 'Datenbank Limits'; -$wb['cron_job_limits_txt'] = 'Cronjob Limits'; -$wb['dns_limits_txt'] = 'DNS Limits'; -$wb['virtualization_limits_txt'] = 'Virtualisierungs Limits'; +$wb['web_limits_txt'] = 'Web Beschränkungen'; +$wb['email_limits_txt'] = 'E-Mail Beschränkungen'; +$wb['database_limits_txt'] = 'Datenbank Beschränkungen'; +$wb['cron_job_limits_txt'] = 'Cronjob Beschränkungen'; +$wb['dns_limits_txt'] = 'DNS Beschränkungen'; +$wb['virtualization_limits_txt'] = 'Virtuelle Server Beschränkungen'; $wb['generate_password_txt'] = 'Passwort erzeugen'; $wb['repeat_password_txt'] = 'Passwort wiederholen'; $wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; @@ -140,13 +140,9 @@ $wb['email_error_isemail'] = 'Bitte geben Sie eine gültige E-Mail Adresse an.'; $wb['paypal_email_error_isemail'] = 'Bitte geben Sie eine gültige PayPal E-Mail Adresse an.'; $wb['paypal_email_txt'] = 'PayPal E-Mail'; $wb['err_msg_master_tpl_set'] = 'Die hier eingestellten Werte werden ignoriert, wenn als Mastervorlage nicht -Custom- ausgewählt ist!'; -$wb['aps_limits_txt'] = 'APS Installationsassistent Limits'; -$wb['limit_aps_txt'] = 'Max. Anzahl an APS-Instanzen'; -$wb['limit_aps_error_notint'] = 'Das APS Instanzen Limit muss eine Zahl sein.'; +$wb['aps_limits_txt'] = 'APS Installationsassistent Beschränkungen'; +$wb['limit_aps_txt'] = 'Max. Anzahl an APS Instanzen'; +$wb['limit_aps_error_notint'] = 'Die APS Instanzen Beschränkung muss eine Zahl sein.'; $wb['default_slave_dnsserver_txt'] = 'Standard Secondary DNS Server'; -$wb['locked_txt'] = 'Gesperrt (deaktiviert alle Webs, etc.)'; -$wb['canceled_txt'] = 'Gekündigt (verhindert Kundenlogin)'; -$wb['gender_txt'] = 'Anrede'; -$wb['gender_m_txt'] = 'Herr'; -$wb['gender_f_txt'] = 'Frau'; ?> + diff --git a/interface/web/client/lib/lang/de_client_circle.lng b/interface/web/client/lib/lang/de_client_circle.lng index b6aee4638d..c13e9a25bd 100644 --- a/interface/web/client/lib/lang/de_client_circle.lng +++ b/interface/web/client/lib/lang/de_client_circle.lng @@ -7,3 +7,4 @@ $wb['client_ids_txt'] = 'Kunden/Reseller'; $wb['description_txt'] = 'Beschreibung'; $wb['active_txt'] = 'Aktiv'; ?> + diff --git a/interface/web/client/lib/lang/de_client_circle_list.lng b/interface/web/client/lib/lang/de_client_circle_list.lng index f69b755ddc..2e7e25e14d 100644 --- a/interface/web/client/lib/lang/de_client_circle_list.lng +++ b/interface/web/client/lib/lang/de_client_circle_list.lng @@ -8,3 +8,4 @@ $wb['filter_txt'] = 'Filter'; $wb['delete_txt'] = 'Löschen'; $wb['active_txt'] = 'Aktiv'; ?> + diff --git a/interface/web/client/lib/lang/de_client_del.lng b/interface/web/client/lib/lang/de_client_del.lng index d13fcfa8fc..54a9621867 100644 --- a/interface/web/client/lib/lang/de_client_del.lng +++ b/interface/web/client/lib/lang/de_client_del.lng @@ -5,3 +5,4 @@ $wb['btn_save_txt'] = 'Kunden löschen'; $wb['btn_cancel_txt'] = 'Abbrechen, ohne den Kunden zu löschen'; $wb['confirm_client_delete_txt'] = 'Sind Sie sicher, daß Sie den Kunden löschen möchten?'; ?> + diff --git a/interface/web/client/lib/lang/de_client_message.lng b/interface/web/client/lib/lang/de_client_message.lng index f4def3017d..457cf6c17a 100644 --- a/interface/web/client/lib/lang/de_client_message.lng +++ b/interface/web/client/lib/lang/de_client_message.lng @@ -16,3 +16,4 @@ $wb['all_clients_resellers_txt'] = 'Alle Kunden und Reseller'; $wb['all_clients_txt'] = 'Alle Kunden'; $wb['variables_txt'] = 'Variablen:'; ?> + diff --git a/interface/web/client/lib/lang/de_client_template.lng b/interface/web/client/lib/lang/de_client_template.lng index 506c61e3f7..c67a4234cc 100644 --- a/interface/web/client/lib/lang/de_client_template.lng +++ b/interface/web/client/lib/lang/de_client_template.lng @@ -88,3 +88,4 @@ $wb['aps_limits_txt'] = 'APS Installationsassistent Limits'; $wb['limit_aps_txt'] = 'Max. Anzahl an APS-Instanzen'; $wb['limit_aps_error_notint'] = 'Das APS Instanzen Limit muss eine Zahl sein.'; ?> + diff --git a/interface/web/client/lib/lang/de_client_template_list.lng b/interface/web/client/lib/lang/de_client_template_list.lng index 552035fd70..5e62e72eba 100644 --- a/interface/web/client/lib/lang/de_client_template_list.lng +++ b/interface/web/client/lib/lang/de_client_template_list.lng @@ -4,3 +4,4 @@ $wb['template_type_txt'] = 'Typ'; $wb['template_name_txt'] = 'Vorlagenname'; $wb['template_id_txt'] = 'Template ID'; ?> + diff --git a/interface/web/client/lib/lang/de_clients_list.lng b/interface/web/client/lib/lang/de_clients_list.lng index a6bdd6a205..65604d8d79 100644 --- a/interface/web/client/lib/lang/de_clients_list.lng +++ b/interface/web/client/lib/lang/de_clients_list.lng @@ -9,3 +9,4 @@ $wb['add_new_record_txt'] = 'Kunden hinzufügen'; $wb['username_txt'] = 'Benutzername'; $wb['customer_no_txt'] = 'Kundennummer'; ?> + diff --git a/interface/web/client/lib/lang/de_domain.lng b/interface/web/client/lib/lang/de_domain.lng index eb4276a3f8..339c6ffd40 100644 --- a/interface/web/client/lib/lang/de_domain.lng +++ b/interface/web/client/lib/lang/de_domain.lng @@ -4,3 +4,4 @@ $wb['domain_error_unique'] = 'Die Domain existiert bereits'; $wb['domain_error_regex'] = 'Dieser Domain Name ist nicht gültig'; $wb['Domain'] = 'Domain'; ?> + diff --git a/interface/web/client/lib/lang/de_domain_list.lng b/interface/web/client/lib/lang/de_domain_list.lng index b066bff572..4198e90962 100644 --- a/interface/web/client/lib/lang/de_domain_list.lng +++ b/interface/web/client/lib/lang/de_domain_list.lng @@ -4,3 +4,4 @@ $wb['add_new_record_txt'] = 'Neue Domain hinzufügen'; $wb['domain_txt'] = 'Domain'; $wb['user_txt'] = 'Kunde'; ?> + diff --git a/interface/web/client/lib/lang/de_reseller.lng b/interface/web/client/lib/lang/de_reseller.lng index 9bc4d53780..ee35eda2f6 100644 --- a/interface/web/client/lib/lang/de_reseller.lng +++ b/interface/web/client/lib/lang/de_reseller.lng @@ -143,9 +143,5 @@ $wb['aps_limits_txt'] = 'APS Installationsassistent Limits'; $wb['limit_aps_txt'] = 'Max. Anzahl an APS-Instanzen'; $wb['limit_aps_error_notint'] = 'Das APS Instanzen Limit muss eine Zahl sein.'; $wb['default_slave_dnsserver_txt'] = 'Standard Secondary DNS Server'; -$wb['locked_txt'] = 'Gesperrt'; -$wb['canceled_txt'] = 'Gekündigt'; -$wb['gender_m_txt'] = 'Herr'; -$wb['gender_f_txt'] = 'Frau'; -$wb['gender_txt'] = 'Anrede'; ?> + diff --git a/interface/web/client/lib/lang/de_resellers_list.lng b/interface/web/client/lib/lang/de_resellers_list.lng index 0f688c54b5..890b484b1e 100644 --- a/interface/web/client/lib/lang/de_resellers_list.lng +++ b/interface/web/client/lib/lang/de_resellers_list.lng @@ -9,3 +9,4 @@ $wb['add_new_record_txt'] = 'Neuen Reseller hinzufügen'; $wb['customer_no_txt'] = 'Kundennummer'; $wb['username_txt'] = 'Benutzername'; ?> + diff --git a/interface/web/client/lib/lang/el.lng b/interface/web/client/lib/lang/el.lng index 6fe28b2631..7d4f4fa535 100644 --- a/interface/web/client/lib/lang/el.lng +++ b/interface/web/client/lib/lang/el.lng @@ -10,16 +10,16 @@ $wb['Add Reseller'] = 'Νέος Μεταπωλητής'; $wb['Edit Reseller'] = 'Επεξεργασία Μεταπωλητή'; $wb['Resellers'] = 'Μεταπωλητές'; $wb['error_has_clients'] = 'Ο Μεταπωλητής έχει πελάτες. Διαγράψτε πρώτα τους πελάτες.'; -$wb['add_additional_template_txt'] = 'Add additional template'; -$wb['delete_additional_template_txt'] = 'Delete additional template'; -$wb['Messaging'] = 'Messaging'; -$wb['Send email'] = 'Send Email'; -$wb['Edit Client Circle'] = 'Edit Client Circle'; +$wb['add_additional_template_txt'] = 'Προσθήκη πρόσθετου προτύπου'; +$wb['delete_additional_template_txt'] = 'Διαγραφή πρόσθετου προτύπου'; +$wb['Messaging'] = 'Μηνύματα'; +$wb['Send email'] = 'Αποστολή Email'; +$wb['Edit Client Circle'] = 'Επεξεργασία Κύκλου Πελάτη'; $wb['Domains'] = 'Domains'; $wb['domain_txt'] = 'Domain'; -$wb['client_txt'] = 'Client'; -$wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is in use as mail-domain'; -$wb['error_domain_in webuse'] = 'This domain cannot be deleted, because it is in use as web-domain'; -$wb['error_client_can_not_add_domain'] = 'You cannot add a new domain'; -$wb['error_client_group_id_empty'] = 'You have to select a customer
'; +$wb['client_txt'] = 'Πελάτης'; +$wb['error_domain_in mailuse'] = 'Το domain δεν μπορεί να διαγραφεί γιατί χρησιμοποιείται ως mail-domain'; +$wb['error_domain_in webuse'] = 'Το domain δεν μπορεί να διαγραφεί γιατί χρησιμοποιείται ως web-domain'; +$wb['error_client_can_not_add_domain'] = 'Δεν μπορείτε να προσθέσετε νέο domain'; +$wb['error_client_group_id_empty'] = 'Πρέπει να επιλέξετε έναν πελάτη
'; ?> diff --git a/interface/web/client/lib/lang/el_client.lng b/interface/web/client/lib/lang/el_client.lng index ba5c6820b7..d66de2553d 100644 --- a/interface/web/client/lib/lang/el_client.lng +++ b/interface/web/client/lib/lang/el_client.lng @@ -17,7 +17,7 @@ $wb['company_name_txt'] = 'Όνομα εταιρίας'; $wb['contact_name_txt'] = 'Πρόσωπο Επικοινωνίας'; $wb['username_txt'] = 'Όνομα Χρήστη'; $wb['password_txt'] = 'Συνθηματικό'; -$wb['password_strength_txt'] = 'Δύναμη συνθηματικού'; +$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού'; $wb['language_txt'] = 'Γλώσσα'; $wb['usertheme_txt'] = 'Θεματική Παραλλαγή'; $wb['street_txt'] = 'Οδός'; @@ -93,8 +93,8 @@ $wb['ssh_chroot_txt'] = 'Ρυθμίσεις SSH-Chroot'; $wb['web_php_options_txt'] = 'Ρυθμίσεις PHP'; $wb['limit_client_error'] = 'Το μέγιστο πλήθος πελατών εξαντλήθηκε.'; $wb['limit_web_quota_txt'] = 'Όριο χώρου Web'; -$wb['limit_traffic_quota_txt'] = 'Όριο κίνησης δεδομένων'; -$wb['limit_trafficquota_error_notint'] = 'Το Όριο κίνησης δεδομένων πρέπει να είναι αριθμός.'; +$wb['limit_traffic_quota_txt'] = 'Όριο μεταφοράς δεδομένων'; +$wb['limit_trafficquota_error_notint'] = 'Το Όριο μεταφοράς δεδομένων πρέπει να είναι αριθμός.'; $wb['customer_no_txt'] = 'Κωδ. Πελάτη'; $wb['vat_id_txt'] = 'Α.Φ.Μ'; $wb['required_fields_txt'] = '* Υποχρεωτικά Πεδία'; @@ -104,44 +104,49 @@ $wb['company_id_txt'] = 'ID Εταιρίας/Επιχείρησης'; $wb['limit_openvz_vm_txt'] = 'Μέγιστο πλήθος εικονικών servers'; $wb['limit_openvz_vm_template_id_txt'] = 'Εξαναγκασμός προτύπου εικονικού server'; $wb['limit_openvz_vm_error_notint'] = 'Το όριο εικονικών server πρέπει να είναι αριθμός.'; -$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; -$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; -$wb['username_error_collision'] = 'The username may not start with the word -web- or -web- followed by a number.'; -$wb['add_additional_template_txt'] = 'Add additional template'; -$wb['delete_additional_template_txt'] = 'Delete additional template'; -$wb['limit_cgi_txt'] = 'CGI available'; -$wb['limit_ssi_txt'] = 'SSI available'; -$wb['limit_perl_txt'] = 'Perl available'; +$wb['web_php_options_notempty'] = 'Δεν επιλέχθηκαν επιλογές PHP. Επιλέξτε τουλάχιστον μία επιλογή PHP.'; +$wb['ssh_chroot_notempty'] = 'Δεν επιλέχθηκαν επιλογές SSH chroot. Επιλέξτε τουλάχιστον μία επιλογή SSH.'; +$wb['username_error_collision'] = 'Το όνομα χρήστη δεν μπορεί να αρχίζει από την λέξη -web- ή την λέξη -web- ακολουθούμενη από αριθμό.'; +$wb['add_additional_template_txt'] = 'Προσθήκη πρόσθετου προτύπου'; +$wb['delete_additional_template_txt'] = 'Διαγραφή πρόσθετου προτύπου'; +$wb['limit_cgi_txt'] = 'Διαθέσιμο CGI'; +$wb['limit_ssi_txt'] = 'Διαθέσιμο SSI'; +$wb['limit_perl_txt'] = 'Διαθέσιμη Perl'; $wb['limit_ruby_txt'] = 'Ruby available'; -$wb['limit_python_txt'] = 'Python available'; -$wb['force_suexec_txt'] = 'SuEXEC forced'; -$wb['limit_hterror_txt'] = 'Custom error docs available'; +$wb['limit_python_txt'] = 'Διαθέσιμη Python'; +$wb['force_suexec_txt'] = 'Εξαναγκασμός SuEXEC'; +$wb['limit_hterror_txt'] = 'Διαθέσιμα έγγραφα προσαρμοσμένων μηνυμάτων σφάλματος'; $wb['limit_wildcard_txt'] = 'Wildcard subdomain available'; -$wb['limit_ssl_txt'] = 'SSL available'; -$wb['bank_account_number_txt'] = 'Bank account no.'; -$wb['bank_code_txt'] = 'Bank code'; -$wb['bank_name_txt'] = 'Bank name'; +$wb['limit_ssl_txt'] = 'Διαθέσιμο SSL'; +$wb['bank_account_number_txt'] = 'Αρ. Λογαριασμού Τράπεζας.'; +$wb['bank_code_txt'] = 'Κωδικός Τράπεζας'; +$wb['bank_name_txt'] = 'Όνομα Τράπεζας'; $wb['bank_account_iban_txt'] = 'IBAN'; -$wb['bank_account_swift_txt'] = 'BIC / Swift'; -$wb['web_limits_txt'] = 'Web Limits'; -$wb['email_limits_txt'] = 'Email Limits'; -$wb['database_limits_txt'] = 'Database Limits'; -$wb['cron_job_limits_txt'] = 'Cron Job Limits'; -$wb['dns_limits_txt'] = 'DNS Limits'; -$wb['virtualization_limits_txt'] = 'Virtualization Limits'; -$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['active_template_additional_txt'] = 'Active Addons'; -$wb['bank_account_owner_txt'] = 'Bank account owner'; -$wb['email_error_isemail'] = 'Please enter a valid email address.'; -$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).'; -$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.'; +$wb['bank_account_swift_txt'] = 'BIC/Swift'; +$wb['web_limits_txt'] = 'Όρια Web'; +$wb['email_limits_txt'] = 'Όρια Email'; +$wb['database_limits_txt'] = 'Όρια Βάσεων Δεδομένων'; +$wb['cron_job_limits_txt'] = 'Όρια Εργασιών Cron'; +$wb['dns_limits_txt'] = 'Όρια DNS'; +$wb['virtualization_limits_txt'] = 'Όρια Virtualization'; +$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού'; +$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού'; +$wb['password_mismatch_txt'] = 'Τα συνθηματικά δεν ταιριάζουν.'; +$wb['password_match_txt'] = 'Τα συνθηματικά ταιριάζουν.'; +$wb['active_template_additional_txt'] = 'Ενεργά Πρόσθετα'; +$wb['bank_account_owner_txt'] = 'Ιδιοκτήτης Λογαριασμού Τράπεζας'; +$wb['email_error_isemail'] = 'Παρακαλούμε εισάγετε έγκυρη διεύθυνση email.'; +$wb['customer_no_error_unique'] = 'Ο κωδικός πελάτη πρέπει να είναι μοναδικός (ή άδειος).'; +$wb['paypal_email_error_isemail'] = 'Παρακαλούμε εισάγετε έγκυρη διεύθυνση email PayPal.'; $wb['paypal_email_txt'] = 'PayPal Email'; -$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.'; -$wb['aps_limits_txt'] = 'APS Installer Limits'; -$wb['limit_aps_txt'] = 'Max. number of APS instances'; -$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; +$wb['err_msg_master_tpl_set'] = 'Όλες οι ρυθμίσεις προσαρμοσμένων ορίων θα αγνοηθούν αν κάποιο βασικό πρότυπο, εκτός του \\"Custom\\", είναι επιλεγμένο.'; +$wb['aps_limits_txt'] = 'Όρια APS Installer'; +$wb['limit_aps_txt'] = 'Μέγιστο πλήθος ενεργών APS'; +$wb['limit_aps_error_notint'] = 'Το μέγιστο πλήθος ενεργών APS πρέπει να είναι αριθμός.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked (disables all webs etc.)'; +$wb['canceled_txt'] = 'Canceled (disables client login)'; +$wb['gender_txt'] = 'Title'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; ?> diff --git a/interface/web/client/lib/lang/el_client_circle.lng b/interface/web/client/lib/lang/el_client_circle.lng index f98a1447fc..54aa0bc6e8 100644 --- a/interface/web/client/lib/lang/el_client_circle.lng +++ b/interface/web/client/lib/lang/el_client_circle.lng @@ -1,9 +1,9 @@ diff --git a/interface/web/client/lib/lang/el_client_circle_list.lng b/interface/web/client/lib/lang/el_client_circle_list.lng index 00fd0b3998..cb7ef18a64 100644 --- a/interface/web/client/lib/lang/el_client_circle_list.lng +++ b/interface/web/client/lib/lang/el_client_circle_list.lng @@ -1,10 +1,10 @@ diff --git a/interface/web/client/lib/lang/el_client_message.lng b/interface/web/client/lib/lang/el_client_message.lng index 12f491ec1d..ea480064f4 100644 --- a/interface/web/client/lib/lang/el_client_message.lng +++ b/interface/web/client/lib/lang/el_client_message.lng @@ -1,18 +1,18 @@ diff --git a/interface/web/client/lib/lang/el_client_template.lng b/interface/web/client/lib/lang/el_client_template.lng index 8829657ebc..2560fc0a95 100644 --- a/interface/web/client/lib/lang/el_client_template.lng +++ b/interface/web/client/lib/lang/el_client_template.lng @@ -57,8 +57,8 @@ $wb['limit_cron_error_notint'] = 'Το όριο εργασιών cron πρέπε $wb['limit_cron_error_frequency'] = 'Το όριο συχνότητας των εργασιών cron πρέπει να είναι αριθμός.'; $wb['error_template_name_empty'] = 'Παρακαλούμε εισάγετε ένα όνομα Προτύπου'; $wb['limit_web_quota_txt'] = 'Όριο Web'; -$wb['limit_traffic_quota_txt'] = 'Όριο Κίνησης δεδομένων'; -$wb['limit_trafficquota_error_notint'] = 'Το Όριο Κίνησης δεδομένων πρέπει να είναι αριθμός.'; +$wb['limit_traffic_quota_txt'] = 'Όριο μεταφοράς δεδομένων'; +$wb['limit_trafficquota_error_notint'] = 'Το Όριο μεταφοράς δεδομένων πρέπει να είναι αριθμός.'; $wb['template_del_aborted_txt'] = 'Η διαγραφή ακυρώθηκε. Υπάρχει τουλάχιστον ένας πελάτης που έχει το πρότυπο ενεργοποιημένο.'; $wb['limit_mailmailinglist_txt'] = 'Μέγιστο πλήθος mailing lists'; $wb['limit_mailmailinglist_error_notint'] = 'Το πλήθος εγγραφών της mailing list πρέπει να είναι αριθμός.'; @@ -69,22 +69,22 @@ $wb['ssh_chroot_txt'] = 'Επιλογές SSH-Chroot'; $wb['web_php_options_txt'] = 'Επιλογές PHP'; $wb['template_type_txt'] = 'Τύπος προτύπου'; $wb['template_name_txt'] = 'Όνομα προτύπου'; -$wb['limit_cgi_txt'] = 'CGI available'; -$wb['limit_ssi_txt'] = 'SSI available'; -$wb['limit_perl_txt'] = 'Perl available'; -$wb['limit_ruby_txt'] = 'Ruby available'; -$wb['limit_python_txt'] = 'Python available'; -$wb['force_suexec_txt'] = 'SuEXEC forced'; -$wb['limit_hterror_txt'] = 'Custom error docs available'; +$wb['limit_cgi_txt'] = 'Διάθεση CGI'; +$wb['limit_ssi_txt'] = 'Διάθεση SSI'; +$wb['limit_perl_txt'] = 'Διάθεση Perl'; +$wb['limit_ruby_txt'] = 'Διάθεση Ruby'; +$wb['limit_python_txt'] = 'Διάθεση Python'; +$wb['force_suexec_txt'] = 'Εξαναγκασμός SuEXEC'; +$wb['limit_hterror_txt'] = 'Διάθεση προσαρμοσμένων αρχείων σφάλματος'; $wb['limit_wildcard_txt'] = 'Wildcard subdomain available'; -$wb['limit_ssl_txt'] = 'SSL available'; -$wb['web_limits_txt'] = 'Web Limits'; -$wb['email_limits_txt'] = 'Email Limits'; -$wb['database_limits_txt'] = 'Database Limits'; -$wb['cron_job_limits_txt'] = 'Cron Job Limits'; -$wb['dns_limits_txt'] = 'DNS Limits'; -$wb['virtualization_limits_txt'] = 'Virtualization Limits'; -$wb['aps_limits_txt'] = 'APS Installer Limits'; -$wb['limit_aps_txt'] = 'Max. number of APS instances'; -$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; +$wb['limit_ssl_txt'] = 'Διαθέσιμο SSL'; +$wb['web_limits_txt'] = 'Όρια Web'; +$wb['email_limits_txt'] = 'Όρια Email'; +$wb['database_limits_txt'] = 'Όρια Βάσεων Δεδομένων'; +$wb['cron_job_limits_txt'] = 'Όρια εργασιών Cron'; +$wb['dns_limits_txt'] = 'Όρια DNS'; +$wb['virtualization_limits_txt'] = 'Όρια Virtualization'; +$wb['aps_limits_txt'] = 'Όρια APS Installer'; +$wb['limit_aps_txt'] = 'Μέγιστο πλήθος ενεργών APS'; +$wb['limit_aps_error_notint'] = 'Το μέγιστο πλήθος ενεργών APS πρέπει να είναι αριθμός.'; ?> diff --git a/interface/web/client/lib/lang/el_clients_list.lng b/interface/web/client/lib/lang/el_clients_list.lng index 56abc6218b..bda08707fe 100644 --- a/interface/web/client/lib/lang/el_clients_list.lng +++ b/interface/web/client/lib/lang/el_clients_list.lng @@ -6,6 +6,6 @@ $wb['contact_name_txt'] = 'Πρόσωπο Επικοινωνίας'; $wb['city_txt'] = 'Πόλη'; $wb['country_txt'] = 'Χώρα'; $wb['add_new_record_txt'] = 'Νέος Πελάτης'; -$wb['username_txt'] = 'Username'; -$wb['customer_no_txt'] = 'Customer No.'; +$wb['username_txt'] = 'Όνομα Χρήστη'; +$wb['customer_no_txt'] = 'Αρ. Πελάτη'; ?> diff --git a/interface/web/client/lib/lang/el_domain_list.lng b/interface/web/client/lib/lang/el_domain_list.lng index 507f895e3b..b152f9313e 100644 --- a/interface/web/client/lib/lang/el_domain_list.lng +++ b/interface/web/client/lib/lang/el_domain_list.lng @@ -2,5 +2,5 @@ $wb['list_head_txt'] = 'Domains'; $wb['add_new_record_txt'] = 'Νέο Domain'; $wb['domain_txt'] = 'Domain'; -$wb['user_txt'] = 'Client'; +$wb['user_txt'] = 'Πελάτης'; ?> diff --git a/interface/web/client/lib/lang/el_reseller.lng b/interface/web/client/lib/lang/el_reseller.lng index c920ab6d21..4746719656 100644 --- a/interface/web/client/lib/lang/el_reseller.lng +++ b/interface/web/client/lib/lang/el_reseller.lng @@ -16,7 +16,7 @@ $wb['company_name_txt'] = 'Όνομα Εταιρίας'; $wb['contact_name_txt'] = 'Πρόσωπο Επικοινωνίας'; $wb['username_txt'] = 'Όνομα Χρήστη'; $wb['password_txt'] = 'Συνθηματικό'; -$wb['password_strength_txt'] = 'Δύναμη Συνθηματικού'; +$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού'; $wb['language_txt'] = 'Γλώσσα'; $wb['usertheme_txt'] = 'Θεματική Παραλλαγή'; $wb['street_txt'] = 'Οδός'; @@ -91,7 +91,7 @@ $wb['web_php_options_txt'] = 'Επιλογές PHP'; $wb['limit_client_error'] = 'Έχετε φτάσει το μέγιστο πλήθος πελατών.'; $wb['limit_client_error_positive'] = 'Το πλήθος πελατών πρέπει να είναι > 0'; $wb['limit_web_quota_txt'] = 'Όριο χώρου Web'; -$wb['limit_traffic_quota_txt'] = 'Όριο ταχύτητας'; +$wb['limit_traffic_quota_txt'] = 'Όριο μεταφοράς δεδομένων'; $wb['limit_trafficquota_error_notint'] = 'Το Όριο ταχύτητας πρέπει να είναι αριθμός.'; $wb['customer_no_txt'] = 'Α/Α Πελάτη'; $wb['vat_id_txt'] = 'Α.Φ.Μ.'; @@ -109,38 +109,43 @@ $wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one $wb['username_error_collision'] = 'The username may not start with the word -web- or -web- followed by a number.'; $wb['add_additional_template_txt'] = 'Add additional template'; $wb['delete_additional_template_txt'] = 'Delete additional template'; -$wb['limit_cgi_txt'] = 'CGI available'; -$wb['limit_ssi_txt'] = 'SSI available'; -$wb['limit_perl_txt'] = 'Perl available'; -$wb['limit_ruby_txt'] = 'Ruby available'; -$wb['limit_python_txt'] = 'Python available'; -$wb['force_suexec_txt'] = 'SuEXEC forced'; -$wb['limit_hterror_txt'] = 'Custom error docs available'; +$wb['limit_cgi_txt'] = 'Διαθέσιμο CGI'; +$wb['limit_ssi_txt'] = 'Διαθέσιμο SSI'; +$wb['limit_perl_txt'] = 'Διαθέσιμη Perl'; +$wb['limit_ruby_txt'] = 'Διαθέσιμη Ruby'; +$wb['limit_python_txt'] = 'Διαθέσιμη Python'; +$wb['force_suexec_txt'] = 'Εξαναγκασμός SuEXEC'; +$wb['limit_hterror_txt'] = 'Διαθέσιμα έγγραφα προσαρμοσμένων μηνυμάτων σφάλματος'; $wb['limit_wildcard_txt'] = 'Wildcard subdomain available'; $wb['limit_ssl_txt'] = 'SSL available'; -$wb['web_limits_txt'] = 'Web Limits'; -$wb['email_limits_txt'] = 'Email Limits'; -$wb['database_limits_txt'] = 'Database Limits'; -$wb['cron_job_limits_txt'] = 'Cron Job Limits'; -$wb['dns_limits_txt'] = 'DNS Limits'; -$wb['virtualization_limits_txt'] = 'Virtualization Limits'; -$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['email_error_isemail'] = 'Please enter a valid email address.'; -$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).'; -$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.'; +$wb['web_limits_txt'] = 'Όρια Web'; +$wb['email_limits_txt'] = 'Όρια Email'; +$wb['database_limits_txt'] = 'Όρια Βάσεων Δεδομένων'; +$wb['cron_job_limits_txt'] = 'Όρια Εργασιών Cron'; +$wb['dns_limits_txt'] = 'Όρια DNS'; +$wb['virtualization_limits_txt'] = 'Όρια Virtualization'; +$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού'; +$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού'; +$wb['password_mismatch_txt'] = 'Τα συνθηματικά δεν ταιριάζουν.'; +$wb['password_match_txt'] = 'Τα συνθηματικά ταιριάζουν.'; +$wb['email_error_isemail'] = 'Παρακαλούμε εισάγετε έγκυρη διεύθυνση email.'; +$wb['customer_no_error_unique'] = 'Ο κωδικός πελάτη πρέπει να είναι μοναδικός (ή άδειος).'; +$wb['paypal_email_error_isemail'] = 'Παρακαλούμε εισάγετε έγκυρη διεύθυνση email PayPal.'; $wb['paypal_email_txt'] = 'PayPal Email'; $wb['company_id_txt'] = 'Company/Entrepreneur ID'; -$wb['bank_account_number_txt'] = 'Bank account no.'; -$wb['bank_account_owner_txt'] = 'Bank account owner'; -$wb['bank_code_txt'] = 'Bank code'; -$wb['bank_name_txt'] = 'Bank name'; +$wb['bank_account_number_txt'] = 'Αριθμός Τραπεζικού Λογαριασμού.'; +$wb['bank_account_owner_txt'] = 'Ιδιοκτήτης Λογαριασμού Τράπεζας'; +$wb['bank_code_txt'] = 'Κωδικός Τράπεζας'; +$wb['bank_name_txt'] = 'Όνομα Τράπεζας'; $wb['bank_account_iban_txt'] = 'IBAN'; -$wb['bank_account_swift_txt'] = 'BIC / Swift'; -$wb['aps_limits_txt'] = 'APS Installer Limits'; -$wb['limit_aps_txt'] = 'Max. number of APS instances'; -$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; +$wb['bank_account_swift_txt'] = 'BIC/Swift'; +$wb['aps_limits_txt'] = 'Όρια Εγκαταστάτη APS'; +$wb['limit_aps_txt'] = 'Μέγιστο πλήθος ενεργών APS'; +$wb['limit_aps_error_notint'] = 'Το μέγιστο πλήθος ενεργών APS πρέπει να είναι αριθμός.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked'; +$wb['canceled_txt'] = 'Canceled'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; +$wb['gender_txt'] = 'Title'; ?> diff --git a/interface/web/client/lib/lang/el_resellers_list.lng b/interface/web/client/lib/lang/el_resellers_list.lng index 74edc051a6..73e35274a5 100644 --- a/interface/web/client/lib/lang/el_resellers_list.lng +++ b/interface/web/client/lib/lang/el_resellers_list.lng @@ -6,6 +6,6 @@ $wb['contact_name_txt'] = 'Πρόσωπο Επικοινωνίας'; $wb['city_txt'] = 'Πόλη'; $wb['country_txt'] = 'Χώρα'; $wb['add_new_record_txt'] = 'Νεός Μεταπωλητής'; -$wb['customer_no_txt'] = 'Customer No.'; -$wb['username_txt'] = 'Username'; +$wb['customer_no_txt'] = 'Αρ. Πελάτη'; +$wb['username_txt'] = 'Όνομα χρήστη'; ?> diff --git a/interface/web/client/lib/lang/en_client_message.lng b/interface/web/client/lib/lang/en_client_message.lng index ab37d76087..c04bd6cda2 100644 --- a/interface/web/client/lib/lang/en_client_message.lng +++ b/interface/web/client/lib/lang/en_client_message.lng @@ -15,4 +15,6 @@ $wb["recipient_txt"] = 'Recipient'; $wb["all_clients_resellers_txt"] = 'All clients and resellers'; $wb["all_clients_txt"] = 'All clients'; $wb["variables_txt"] = 'Variables:'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; ?> diff --git a/interface/web/client/lib/lang/es_client.lng b/interface/web/client/lib/lang/es_client.lng index d38b0b9148..1df85c6659 100644 --- a/interface/web/client/lib/lang/es_client.lng +++ b/interface/web/client/lib/lang/es_client.lng @@ -144,4 +144,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked (disables all webs etc.)'; +$wb['canceled_txt'] = 'Canceled (disables client login)'; +$wb['gender_txt'] = 'Title'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; ?> diff --git a/interface/web/client/lib/lang/es_reseller.lng b/interface/web/client/lib/lang/es_reseller.lng index ea07f21395..98a171c675 100644 --- a/interface/web/client/lib/lang/es_reseller.lng +++ b/interface/web/client/lib/lang/es_reseller.lng @@ -143,4 +143,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked'; +$wb['canceled_txt'] = 'Canceled'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; +$wb['gender_txt'] = 'Title'; ?> diff --git a/interface/web/client/lib/lang/fi_client.lng b/interface/web/client/lib/lang/fi_client.lng index 317c0244b7..791f7c0abf 100755 --- a/interface/web/client/lib/lang/fi_client.lng +++ b/interface/web/client/lib/lang/fi_client.lng @@ -144,4 +144,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked (disables all webs etc.)'; +$wb['canceled_txt'] = 'Canceled (disables client login)'; +$wb['gender_txt'] = 'Title'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; ?> diff --git a/interface/web/client/lib/lang/fi_reseller.lng b/interface/web/client/lib/lang/fi_reseller.lng index ed9ebd1278..4948475857 100644 --- a/interface/web/client/lib/lang/fi_reseller.lng +++ b/interface/web/client/lib/lang/fi_reseller.lng @@ -143,4 +143,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked'; +$wb['canceled_txt'] = 'Canceled'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; +$wb['gender_txt'] = 'Title'; ?> diff --git a/interface/web/client/lib/lang/fr_client.lng b/interface/web/client/lib/lang/fr_client.lng index 84400ca1b3..b6ecfba5fb 100644 --- a/interface/web/client/lib/lang/fr_client.lng +++ b/interface/web/client/lib/lang/fr_client.lng @@ -144,4 +144,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked (disables all webs etc.)'; +$wb['canceled_txt'] = 'Canceled (disables client login)'; +$wb['gender_txt'] = 'Title'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; ?> diff --git a/interface/web/client/lib/lang/fr_reseller.lng b/interface/web/client/lib/lang/fr_reseller.lng index f00be206c6..6090bffaa7 100644 --- a/interface/web/client/lib/lang/fr_reseller.lng +++ b/interface/web/client/lib/lang/fr_reseller.lng @@ -143,4 +143,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked'; +$wb['canceled_txt'] = 'Canceled'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; +$wb['gender_txt'] = 'Title'; ?> diff --git a/interface/web/client/lib/lang/hr_client.lng b/interface/web/client/lib/lang/hr_client.lng index ed38e03ef4..31c8293d45 100644 --- a/interface/web/client/lib/lang/hr_client.lng +++ b/interface/web/client/lib/lang/hr_client.lng @@ -144,4 +144,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked (disables all webs etc.)'; +$wb['canceled_txt'] = 'Canceled (disables client login)'; +$wb['gender_txt'] = 'Title'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; ?> diff --git a/interface/web/client/lib/lang/hr_reseller.lng b/interface/web/client/lib/lang/hr_reseller.lng index 1de56c7db0..f014052796 100644 --- a/interface/web/client/lib/lang/hr_reseller.lng +++ b/interface/web/client/lib/lang/hr_reseller.lng @@ -143,4 +143,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked'; +$wb['canceled_txt'] = 'Canceled'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; +$wb['gender_txt'] = 'Title'; ?> diff --git a/interface/web/client/lib/lang/hu_client.lng b/interface/web/client/lib/lang/hu_client.lng index 7bcaccccb0..dca88c99df 100644 --- a/interface/web/client/lib/lang/hu_client.lng +++ b/interface/web/client/lib/lang/hu_client.lng @@ -144,4 +144,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked (disables all webs etc.)'; +$wb['canceled_txt'] = 'Canceled (disables client login)'; +$wb['gender_txt'] = 'Title'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; ?> diff --git a/interface/web/client/lib/lang/hu_reseller.lng b/interface/web/client/lib/lang/hu_reseller.lng index 019bbc132c..eaeae52ba8 100644 --- a/interface/web/client/lib/lang/hu_reseller.lng +++ b/interface/web/client/lib/lang/hu_reseller.lng @@ -143,4 +143,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked'; +$wb['canceled_txt'] = 'Canceled'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; +$wb['gender_txt'] = 'Title'; ?> diff --git a/interface/web/client/lib/lang/id_client.lng b/interface/web/client/lib/lang/id_client.lng index 339a310785..1788f8794b 100644 --- a/interface/web/client/lib/lang/id_client.lng +++ b/interface/web/client/lib/lang/id_client.lng @@ -144,4 +144,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked (disables all webs etc.)'; +$wb['canceled_txt'] = 'Canceled (disables client login)'; +$wb['gender_txt'] = 'Title'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; ?> diff --git a/interface/web/client/lib/lang/id_reseller.lng b/interface/web/client/lib/lang/id_reseller.lng index 3c49f0464a..2d63f50b38 100644 --- a/interface/web/client/lib/lang/id_reseller.lng +++ b/interface/web/client/lib/lang/id_reseller.lng @@ -143,4 +143,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked'; +$wb['canceled_txt'] = 'Canceled'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; +$wb['gender_txt'] = 'Title'; ?> diff --git a/interface/web/client/lib/lang/it_client.lng b/interface/web/client/lib/lang/it_client.lng index bb6b4e9f9b..8042eef60a 100644 --- a/interface/web/client/lib/lang/it_client.lng +++ b/interface/web/client/lib/lang/it_client.lng @@ -144,4 +144,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked (disables all webs etc.)'; +$wb['canceled_txt'] = 'Canceled (disables client login)'; +$wb['gender_txt'] = 'Title'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; ?> diff --git a/interface/web/client/lib/lang/it_reseller.lng b/interface/web/client/lib/lang/it_reseller.lng index 32c9bb1c7c..53c907162a 100644 --- a/interface/web/client/lib/lang/it_reseller.lng +++ b/interface/web/client/lib/lang/it_reseller.lng @@ -143,4 +143,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked'; +$wb['canceled_txt'] = 'Canceled'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; +$wb['gender_txt'] = 'Title'; ?> diff --git a/interface/web/client/lib/lang/ja_client.lng b/interface/web/client/lib/lang/ja_client.lng index 85e35b9a50..d43672693d 100644 --- a/interface/web/client/lib/lang/ja_client.lng +++ b/interface/web/client/lib/lang/ja_client.lng @@ -144,4 +144,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked (disables all webs etc.)'; +$wb['canceled_txt'] = 'Canceled (disables client login)'; +$wb['gender_txt'] = 'Title'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; ?> diff --git a/interface/web/client/lib/lang/ja_reseller.lng b/interface/web/client/lib/lang/ja_reseller.lng index 9f3251df9a..79bd2aa94e 100644 --- a/interface/web/client/lib/lang/ja_reseller.lng +++ b/interface/web/client/lib/lang/ja_reseller.lng @@ -143,4 +143,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked'; +$wb['canceled_txt'] = 'Canceled'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; +$wb['gender_txt'] = 'Title'; ?> diff --git a/interface/web/client/lib/lang/nl_client.lng b/interface/web/client/lib/lang/nl_client.lng index 42bea6451d..22d2c11605 100644 --- a/interface/web/client/lib/lang/nl_client.lng +++ b/interface/web/client/lib/lang/nl_client.lng @@ -144,4 +144,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked (disables all webs etc.)'; +$wb['canceled_txt'] = 'Canceled (disables client login)'; +$wb['gender_txt'] = 'Title'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; ?> diff --git a/interface/web/client/lib/lang/nl_reseller.lng b/interface/web/client/lib/lang/nl_reseller.lng index cf87157552..9495601c99 100644 --- a/interface/web/client/lib/lang/nl_reseller.lng +++ b/interface/web/client/lib/lang/nl_reseller.lng @@ -143,4 +143,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked'; +$wb['canceled_txt'] = 'Canceled'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; +$wb['gender_txt'] = 'Title'; ?> diff --git a/interface/web/client/lib/lang/pl_client.lng b/interface/web/client/lib/lang/pl_client.lng index 3f8ac0c750..342312aac5 100644 --- a/interface/web/client/lib/lang/pl_client.lng +++ b/interface/web/client/lib/lang/pl_client.lng @@ -144,4 +144,9 @@ $wb['aps_limits_txt'] = 'Limity Instalatora APS'; $wb['limit_aps_txt'] = 'Maks. liczba instalacji APS'; $wb['limit_aps_error_notint'] = 'Limit instalacji APS musi być liczbą'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked (disables all webs etc.)'; +$wb['canceled_txt'] = 'Canceled (disables client login)'; +$wb['gender_txt'] = 'Title'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; ?> diff --git a/interface/web/client/lib/lang/pl_reseller.lng b/interface/web/client/lib/lang/pl_reseller.lng index 63e4c23896..c1bf221c67 100644 --- a/interface/web/client/lib/lang/pl_reseller.lng +++ b/interface/web/client/lib/lang/pl_reseller.lng @@ -143,4 +143,9 @@ $wb['aps_limits_txt'] = 'Limit instalacji APS'; $wb['limit_aps_txt'] = 'Maks. liczba instancji APS'; $wb['limit_aps_error_notint'] = 'Limit instancji APS musi być liczbą'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked'; +$wb['canceled_txt'] = 'Canceled'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; +$wb['gender_txt'] = 'Title'; ?> diff --git a/interface/web/client/lib/lang/pt_client.lng b/interface/web/client/lib/lang/pt_client.lng index 9e43b0fb3f..18d2e62155 100644 --- a/interface/web/client/lib/lang/pt_client.lng +++ b/interface/web/client/lib/lang/pt_client.lng @@ -144,4 +144,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked (disables all webs etc.)'; +$wb['canceled_txt'] = 'Canceled (disables client login)'; +$wb['gender_txt'] = 'Title'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; ?> diff --git a/interface/web/client/lib/lang/pt_reseller.lng b/interface/web/client/lib/lang/pt_reseller.lng index d2f34e9682..2e00895573 100644 --- a/interface/web/client/lib/lang/pt_reseller.lng +++ b/interface/web/client/lib/lang/pt_reseller.lng @@ -143,4 +143,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked'; +$wb['canceled_txt'] = 'Canceled'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; +$wb['gender_txt'] = 'Title'; ?> diff --git a/interface/web/client/lib/lang/ro_client.lng b/interface/web/client/lib/lang/ro_client.lng index 50dd005d66..c2a4f11e41 100644 --- a/interface/web/client/lib/lang/ro_client.lng +++ b/interface/web/client/lib/lang/ro_client.lng @@ -144,4 +144,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked (disables all webs etc.)'; +$wb['canceled_txt'] = 'Canceled (disables client login)'; +$wb['gender_txt'] = 'Title'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; ?> diff --git a/interface/web/client/lib/lang/ro_reseller.lng b/interface/web/client/lib/lang/ro_reseller.lng index 32c9bb1c7c..53c907162a 100644 --- a/interface/web/client/lib/lang/ro_reseller.lng +++ b/interface/web/client/lib/lang/ro_reseller.lng @@ -143,4 +143,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked'; +$wb['canceled_txt'] = 'Canceled'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; +$wb['gender_txt'] = 'Title'; ?> diff --git a/interface/web/client/lib/lang/ru_client.lng b/interface/web/client/lib/lang/ru_client.lng index 1bd8e590a3..cafaf6b952 100644 --- a/interface/web/client/lib/lang/ru_client.lng +++ b/interface/web/client/lib/lang/ru_client.lng @@ -144,4 +144,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked (disables all webs etc.)'; +$wb['canceled_txt'] = 'Canceled (disables client login)'; +$wb['gender_txt'] = 'Title'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; ?> diff --git a/interface/web/client/lib/lang/ru_reseller.lng b/interface/web/client/lib/lang/ru_reseller.lng index 29975f2d1a..f95786f23f 100644 --- a/interface/web/client/lib/lang/ru_reseller.lng +++ b/interface/web/client/lib/lang/ru_reseller.lng @@ -143,4 +143,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked'; +$wb['canceled_txt'] = 'Canceled'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; +$wb['gender_txt'] = 'Title'; ?> diff --git a/interface/web/client/lib/lang/se_client.lng b/interface/web/client/lib/lang/se_client.lng index c2a31de36a..78cecfa702 100644 --- a/interface/web/client/lib/lang/se_client.lng +++ b/interface/web/client/lib/lang/se_client.lng @@ -144,4 +144,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked (disables all webs etc.)'; +$wb['canceled_txt'] = 'Canceled (disables client login)'; +$wb['gender_txt'] = 'Title'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; ?> diff --git a/interface/web/client/lib/lang/se_reseller.lng b/interface/web/client/lib/lang/se_reseller.lng index 32c9bb1c7c..53c907162a 100644 --- a/interface/web/client/lib/lang/se_reseller.lng +++ b/interface/web/client/lib/lang/se_reseller.lng @@ -143,4 +143,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked'; +$wb['canceled_txt'] = 'Canceled'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; +$wb['gender_txt'] = 'Title'; ?> diff --git a/interface/web/client/lib/lang/sk_client.lng b/interface/web/client/lib/lang/sk_client.lng index 42e0f3ca0a..d033ab8afc 100644 --- a/interface/web/client/lib/lang/sk_client.lng +++ b/interface/web/client/lib/lang/sk_client.lng @@ -144,4 +144,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked (disables all webs etc.)'; +$wb['canceled_txt'] = 'Canceled (disables client login)'; +$wb['gender_txt'] = 'Title'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; ?> diff --git a/interface/web/client/lib/lang/sk_reseller.lng b/interface/web/client/lib/lang/sk_reseller.lng index ab954301ad..c5aeabcf24 100644 --- a/interface/web/client/lib/lang/sk_reseller.lng +++ b/interface/web/client/lib/lang/sk_reseller.lng @@ -143,4 +143,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked'; +$wb['canceled_txt'] = 'Canceled'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; +$wb['gender_txt'] = 'Title'; ?> diff --git a/interface/web/client/lib/lang/tr_client.lng b/interface/web/client/lib/lang/tr_client.lng index e3c5c5348b..fda0dc7cf5 100644 --- a/interface/web/client/lib/lang/tr_client.lng +++ b/interface/web/client/lib/lang/tr_client.lng @@ -144,4 +144,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked (disables all webs etc.)'; +$wb['canceled_txt'] = 'Canceled (disables client login)'; +$wb['gender_txt'] = 'Title'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; ?> diff --git a/interface/web/client/lib/lang/tr_reseller.lng b/interface/web/client/lib/lang/tr_reseller.lng index f04edbf5c5..83abc609fc 100644 --- a/interface/web/client/lib/lang/tr_reseller.lng +++ b/interface/web/client/lib/lang/tr_reseller.lng @@ -143,4 +143,9 @@ $wb['aps_limits_txt'] = 'APS Installer Limits'; $wb['limit_aps_txt'] = 'Max. number of APS instances'; $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked'; +$wb['canceled_txt'] = 'Canceled'; +$wb['gender_m_txt'] = 'Mr.'; +$wb['gender_f_txt'] = 'Ms.'; +$wb['gender_txt'] = 'Title'; ?> diff --git a/interface/web/dashboard/form/empty.dir b/interface/web/dashboard/form/empty.dir new file mode 100644 index 0000000000..95ba9ef37c --- /dev/null +++ b/interface/web/dashboard/form/empty.dir @@ -0,0 +1 @@ +This empty directory is needed by ISPConfig. diff --git a/interface/web/dashboard/lib/lang/ar_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/ar_dashlet_mailquota.lng index 2c2b6cd7ae..1ab1e66658 100644 --- a/interface/web/dashboard/lib/lang/ar_dashlet_mailquota.lng +++ b/interface/web/dashboard/lib/lang/ar_dashlet_mailquota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['mailquota_txt'] = 'Mailbox Quota'; +$wb['email_txt'] = 'Email Address'; +$wb['name_txt'] = 'Name'; +$wb['used_txt'] = 'Used Space'; +$wb['quota_txt'] = 'Quota'; +$wb['no_email_accounts_txt'] = 'No email accounts found.'; +?> diff --git a/interface/web/dashboard/lib/lang/ar_dashlet_quota.lng b/interface/web/dashboard/lib/lang/ar_dashlet_quota.lng index 8b2e3d43d0..de7b5a8936 100644 --- a/interface/web/dashboard/lib/lang/ar_dashlet_quota.lng +++ b/interface/web/dashboard/lib/lang/ar_dashlet_quota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['quota_txt'] = 'Website Harddisk Quota'; +$wb['domain_txt'] = 'Domain / Website'; +$wb['used_txt'] = 'Used space'; +$wb['hard_txt'] = 'Hard limit'; +$wb['soft_txt'] = 'Soft limit'; +$wb['no_sites_txt'] = 'No web sites found.'; +?> diff --git a/interface/web/dashboard/lib/lang/bg_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/bg_dashlet_mailquota.lng index 2c2b6cd7ae..1ab1e66658 100644 --- a/interface/web/dashboard/lib/lang/bg_dashlet_mailquota.lng +++ b/interface/web/dashboard/lib/lang/bg_dashlet_mailquota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['mailquota_txt'] = 'Mailbox Quota'; +$wb['email_txt'] = 'Email Address'; +$wb['name_txt'] = 'Name'; +$wb['used_txt'] = 'Used Space'; +$wb['quota_txt'] = 'Quota'; +$wb['no_email_accounts_txt'] = 'No email accounts found.'; +?> diff --git a/interface/web/dashboard/lib/lang/bg_dashlet_quota.lng b/interface/web/dashboard/lib/lang/bg_dashlet_quota.lng index 8b2e3d43d0..de7b5a8936 100644 --- a/interface/web/dashboard/lib/lang/bg_dashlet_quota.lng +++ b/interface/web/dashboard/lib/lang/bg_dashlet_quota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['quota_txt'] = 'Website Harddisk Quota'; +$wb['domain_txt'] = 'Domain / Website'; +$wb['used_txt'] = 'Used space'; +$wb['hard_txt'] = 'Hard limit'; +$wb['soft_txt'] = 'Soft limit'; +$wb['no_sites_txt'] = 'No web sites found.'; +?> diff --git a/interface/web/dashboard/lib/lang/br_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/br_dashlet_mailquota.lng index 2c2b6cd7ae..1ab1e66658 100644 --- a/interface/web/dashboard/lib/lang/br_dashlet_mailquota.lng +++ b/interface/web/dashboard/lib/lang/br_dashlet_mailquota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['mailquota_txt'] = 'Mailbox Quota'; +$wb['email_txt'] = 'Email Address'; +$wb['name_txt'] = 'Name'; +$wb['used_txt'] = 'Used Space'; +$wb['quota_txt'] = 'Quota'; +$wb['no_email_accounts_txt'] = 'No email accounts found.'; +?> diff --git a/interface/web/dashboard/lib/lang/br_dashlet_quota.lng b/interface/web/dashboard/lib/lang/br_dashlet_quota.lng index 8b2e3d43d0..de7b5a8936 100644 --- a/interface/web/dashboard/lib/lang/br_dashlet_quota.lng +++ b/interface/web/dashboard/lib/lang/br_dashlet_quota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['quota_txt'] = 'Website Harddisk Quota'; +$wb['domain_txt'] = 'Domain / Website'; +$wb['used_txt'] = 'Used space'; +$wb['hard_txt'] = 'Hard limit'; +$wb['soft_txt'] = 'Soft limit'; +$wb['no_sites_txt'] = 'No web sites found.'; +?> diff --git a/interface/web/dashboard/lib/lang/cz.lng b/interface/web/dashboard/lib/lang/cz.lng index 9d2a3211cb..15063c03fa 100644 --- a/interface/web/dashboard/lib/lang/cz.lng +++ b/interface/web/dashboard/lib/lang/cz.lng @@ -2,3 +2,4 @@ $wb['welcome_user_txt'] = 'Vítejte %s'; $wb['available_modules_txt'] = 'Dostupné moduly'; ?> + diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng b/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng index bedb98f865..ac3266ec1d 100644 --- a/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng @@ -28,3 +28,4 @@ $wb['limit_client_txt'] = 'Počet klientů'; $wb['limit_database_txt'] = 'Počet databází'; $wb['limit_mailmailinglist_txt'] = 'Počet e-mailových konferencí'; ?> + diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/cz_dashlet_mailquota.lng index 2c2b6cd7ae..db6450afdf 100644 --- a/interface/web/dashboard/lib/lang/cz_dashlet_mailquota.lng +++ b/interface/web/dashboard/lib/lang/cz_dashlet_mailquota.lng @@ -1,8 +1,9 @@ \ No newline at end of file +$wb['mailquota_txt'] = 'Kvóta e-mailové schránky'; +$wb['email_txt'] = 'E-mailové adresy'; +$wb['name_txt'] = 'Jméno'; +$wb['used_txt'] = 'Využité místo'; +$wb['quota_txt'] = 'Kvóta'; +$wb['no_email_accounts_txt'] = 'Nenalezeny žádné e-mailové účty.'; +?> + diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng b/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng index 66275f1d05..be21791ff0 100644 --- a/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng +++ b/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng @@ -1,3 +1,4 @@ + diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_quota.lng b/interface/web/dashboard/lib/lang/cz_dashlet_quota.lng index 8b2e3d43d0..0e3db11eba 100644 --- a/interface/web/dashboard/lib/lang/cz_dashlet_quota.lng +++ b/interface/web/dashboard/lib/lang/cz_dashlet_quota.lng @@ -1,8 +1,9 @@ \ No newline at end of file +$wb['quota_txt'] = 'Kvóty HDD pro webové stránky'; +$wb['domain_txt'] = 'Doména / Webové stránky'; +$wb['used_txt'] = 'Využité místo'; +$wb['hard_txt'] = 'Kvóta max. obsazení'; +$wb['soft_txt'] = 'Kvóta pro upozornění'; +$wb['no_sites_txt'] = 'Nenalezeny žádné webové stránky.'; +?> + diff --git a/interface/web/dashboard/lib/lang/de.lng b/interface/web/dashboard/lib/lang/de.lng index debf75413a..896b1f1474 100644 --- a/interface/web/dashboard/lib/lang/de.lng +++ b/interface/web/dashboard/lib/lang/de.lng @@ -2,3 +2,4 @@ $wb['welcome_user_txt'] = 'Herzlich Willkommen %s'; $wb['available_modules_txt'] = 'Verfügbare Module'; ?> + diff --git a/interface/web/dashboard/lib/lang/de_dashlet_limits.lng b/interface/web/dashboard/lib/lang/de_dashlet_limits.lng index e50ff27594..746b38b3a8 100644 --- a/interface/web/dashboard/lib/lang/de_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/de_dashlet_limits.lng @@ -1,5 +1,5 @@ + diff --git a/interface/web/dashboard/lib/lang/de_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/de_dashlet_mailquota.lng index 9216881193..02a3fffab4 100644 --- a/interface/web/dashboard/lib/lang/de_dashlet_mailquota.lng +++ b/interface/web/dashboard/lib/lang/de_dashlet_mailquota.lng @@ -1,8 +1,9 @@ + diff --git a/interface/web/dashboard/lib/lang/de_dashlet_modules.lng b/interface/web/dashboard/lib/lang/de_dashlet_modules.lng index 3d2c6c6514..d898ac6ecf 100644 --- a/interface/web/dashboard/lib/lang/de_dashlet_modules.lng +++ b/interface/web/dashboard/lib/lang/de_dashlet_modules.lng @@ -1,3 +1,4 @@ + diff --git a/interface/web/dashboard/lib/lang/de_dashlet_quota.lng b/interface/web/dashboard/lib/lang/de_dashlet_quota.lng index c694f1ecf3..daed0dba93 100644 --- a/interface/web/dashboard/lib/lang/de_dashlet_quota.lng +++ b/interface/web/dashboard/lib/lang/de_dashlet_quota.lng @@ -1,8 +1,9 @@ + diff --git a/interface/web/dashboard/lib/lang/el_dashlet_limits.lng b/interface/web/dashboard/lib/lang/el_dashlet_limits.lng index 13940bd52f..4fcf6cf150 100644 --- a/interface/web/dashboard/lib/lang/el_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/el_dashlet_limits.lng @@ -22,9 +22,9 @@ $wb['limit_ftp_user_txt'] = 'Πλήθος χρηστών FTP'; $wb['limit_dns_zone_txt'] = 'Πλήθος ζωνών DNS'; $wb['limit_dns_slave_zone_txt'] = 'Πλήθος δευτερεύουσων ζωνών DNS'; $wb['limit_dns_record_txt'] = 'Πλήθος εγγραφών DNS'; -$wb['limit_shell_user_txt'] = 'Πλήθος χρηστών Shell'; +$wb['limit_shell_user_txt'] = 'Πλήθος χρηστών Κελύφους'; $wb['limit_webdav_user_txt'] = 'Πλήθος χρηστών Webdav'; $wb['limit_client_txt'] = 'Πλήθος Πελατών'; -$wb['limit_database_txt'] = 'Πλήθος Databases'; -$wb['limit_mailmailinglist_txt'] = 'Number of mailing lists'; +$wb['limit_database_txt'] = 'Πλήθος Βάσεων Δεδομένων'; +$wb['limit_mailmailinglist_txt'] = 'Πλήθος λιστών mail'; ?> diff --git a/interface/web/dashboard/lib/lang/el_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/el_dashlet_mailquota.lng index 2c2b6cd7ae..0bea37b959 100644 --- a/interface/web/dashboard/lib/lang/el_dashlet_mailquota.lng +++ b/interface/web/dashboard/lib/lang/el_dashlet_mailquota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['mailquota_txt'] = 'Όρια Mailbox'; +$wb['email_txt'] = 'Διεύθυνση Email'; +$wb['name_txt'] = 'Όνομα'; +$wb['used_txt'] = 'Χώρος σε χρήση'; +$wb['quota_txt'] = 'Όριο'; +$wb['no_email_accounts_txt'] = 'Δεν βρέθηκαν λογαριασμοί email.'; +?> diff --git a/interface/web/dashboard/lib/lang/el_dashlet_quota.lng b/interface/web/dashboard/lib/lang/el_dashlet_quota.lng index 8b2e3d43d0..d56647b7ed 100644 --- a/interface/web/dashboard/lib/lang/el_dashlet_quota.lng +++ b/interface/web/dashboard/lib/lang/el_dashlet_quota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['quota_txt'] = 'Όρια χρήσης δίσκου για Website'; +$wb['domain_txt'] = 'Domain/Website'; +$wb['used_txt'] = 'Χώρος σε χρήση'; +$wb['hard_txt'] = 'Απόλυτο Όριο'; +$wb['soft_txt'] = 'Διαλακτικό Όριο'; +$wb['no_sites_txt'] = 'Δεν βρέθηκαν websites.'; +?> diff --git a/interface/web/dashboard/lib/lang/es_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/es_dashlet_mailquota.lng index 2c2b6cd7ae..1ab1e66658 100644 --- a/interface/web/dashboard/lib/lang/es_dashlet_mailquota.lng +++ b/interface/web/dashboard/lib/lang/es_dashlet_mailquota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['mailquota_txt'] = 'Mailbox Quota'; +$wb['email_txt'] = 'Email Address'; +$wb['name_txt'] = 'Name'; +$wb['used_txt'] = 'Used Space'; +$wb['quota_txt'] = 'Quota'; +$wb['no_email_accounts_txt'] = 'No email accounts found.'; +?> diff --git a/interface/web/dashboard/lib/lang/es_dashlet_quota.lng b/interface/web/dashboard/lib/lang/es_dashlet_quota.lng index 8b2e3d43d0..de7b5a8936 100644 --- a/interface/web/dashboard/lib/lang/es_dashlet_quota.lng +++ b/interface/web/dashboard/lib/lang/es_dashlet_quota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['quota_txt'] = 'Website Harddisk Quota'; +$wb['domain_txt'] = 'Domain / Website'; +$wb['used_txt'] = 'Used space'; +$wb['hard_txt'] = 'Hard limit'; +$wb['soft_txt'] = 'Soft limit'; +$wb['no_sites_txt'] = 'No web sites found.'; +?> diff --git a/interface/web/dashboard/lib/lang/fi_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/fi_dashlet_mailquota.lng index 2c2b6cd7ae..1ab1e66658 100644 --- a/interface/web/dashboard/lib/lang/fi_dashlet_mailquota.lng +++ b/interface/web/dashboard/lib/lang/fi_dashlet_mailquota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['mailquota_txt'] = 'Mailbox Quota'; +$wb['email_txt'] = 'Email Address'; +$wb['name_txt'] = 'Name'; +$wb['used_txt'] = 'Used Space'; +$wb['quota_txt'] = 'Quota'; +$wb['no_email_accounts_txt'] = 'No email accounts found.'; +?> diff --git a/interface/web/dashboard/lib/lang/fi_dashlet_quota.lng b/interface/web/dashboard/lib/lang/fi_dashlet_quota.lng index 8b2e3d43d0..de7b5a8936 100644 --- a/interface/web/dashboard/lib/lang/fi_dashlet_quota.lng +++ b/interface/web/dashboard/lib/lang/fi_dashlet_quota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['quota_txt'] = 'Website Harddisk Quota'; +$wb['domain_txt'] = 'Domain / Website'; +$wb['used_txt'] = 'Used space'; +$wb['hard_txt'] = 'Hard limit'; +$wb['soft_txt'] = 'Soft limit'; +$wb['no_sites_txt'] = 'No web sites found.'; +?> diff --git a/interface/web/dashboard/lib/lang/fr_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/fr_dashlet_mailquota.lng index 2c2b6cd7ae..1ab1e66658 100644 --- a/interface/web/dashboard/lib/lang/fr_dashlet_mailquota.lng +++ b/interface/web/dashboard/lib/lang/fr_dashlet_mailquota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['mailquota_txt'] = 'Mailbox Quota'; +$wb['email_txt'] = 'Email Address'; +$wb['name_txt'] = 'Name'; +$wb['used_txt'] = 'Used Space'; +$wb['quota_txt'] = 'Quota'; +$wb['no_email_accounts_txt'] = 'No email accounts found.'; +?> diff --git a/interface/web/dashboard/lib/lang/fr_dashlet_quota.lng b/interface/web/dashboard/lib/lang/fr_dashlet_quota.lng index 8b2e3d43d0..de7b5a8936 100644 --- a/interface/web/dashboard/lib/lang/fr_dashlet_quota.lng +++ b/interface/web/dashboard/lib/lang/fr_dashlet_quota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['quota_txt'] = 'Website Harddisk Quota'; +$wb['domain_txt'] = 'Domain / Website'; +$wb['used_txt'] = 'Used space'; +$wb['hard_txt'] = 'Hard limit'; +$wb['soft_txt'] = 'Soft limit'; +$wb['no_sites_txt'] = 'No web sites found.'; +?> diff --git a/interface/web/dashboard/lib/lang/hr_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/hr_dashlet_mailquota.lng index 2c2b6cd7ae..1ab1e66658 100644 --- a/interface/web/dashboard/lib/lang/hr_dashlet_mailquota.lng +++ b/interface/web/dashboard/lib/lang/hr_dashlet_mailquota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['mailquota_txt'] = 'Mailbox Quota'; +$wb['email_txt'] = 'Email Address'; +$wb['name_txt'] = 'Name'; +$wb['used_txt'] = 'Used Space'; +$wb['quota_txt'] = 'Quota'; +$wb['no_email_accounts_txt'] = 'No email accounts found.'; +?> diff --git a/interface/web/dashboard/lib/lang/hr_dashlet_quota.lng b/interface/web/dashboard/lib/lang/hr_dashlet_quota.lng index 8b2e3d43d0..de7b5a8936 100644 --- a/interface/web/dashboard/lib/lang/hr_dashlet_quota.lng +++ b/interface/web/dashboard/lib/lang/hr_dashlet_quota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['quota_txt'] = 'Website Harddisk Quota'; +$wb['domain_txt'] = 'Domain / Website'; +$wb['used_txt'] = 'Used space'; +$wb['hard_txt'] = 'Hard limit'; +$wb['soft_txt'] = 'Soft limit'; +$wb['no_sites_txt'] = 'No web sites found.'; +?> diff --git a/interface/web/dashboard/lib/lang/hu_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/hu_dashlet_mailquota.lng index 2c2b6cd7ae..1ab1e66658 100644 --- a/interface/web/dashboard/lib/lang/hu_dashlet_mailquota.lng +++ b/interface/web/dashboard/lib/lang/hu_dashlet_mailquota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['mailquota_txt'] = 'Mailbox Quota'; +$wb['email_txt'] = 'Email Address'; +$wb['name_txt'] = 'Name'; +$wb['used_txt'] = 'Used Space'; +$wb['quota_txt'] = 'Quota'; +$wb['no_email_accounts_txt'] = 'No email accounts found.'; +?> diff --git a/interface/web/dashboard/lib/lang/hu_dashlet_quota.lng b/interface/web/dashboard/lib/lang/hu_dashlet_quota.lng index 8b2e3d43d0..de7b5a8936 100644 --- a/interface/web/dashboard/lib/lang/hu_dashlet_quota.lng +++ b/interface/web/dashboard/lib/lang/hu_dashlet_quota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['quota_txt'] = 'Website Harddisk Quota'; +$wb['domain_txt'] = 'Domain / Website'; +$wb['used_txt'] = 'Used space'; +$wb['hard_txt'] = 'Hard limit'; +$wb['soft_txt'] = 'Soft limit'; +$wb['no_sites_txt'] = 'No web sites found.'; +?> diff --git a/interface/web/dashboard/lib/lang/id_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/id_dashlet_mailquota.lng index 2c2b6cd7ae..1ab1e66658 100644 --- a/interface/web/dashboard/lib/lang/id_dashlet_mailquota.lng +++ b/interface/web/dashboard/lib/lang/id_dashlet_mailquota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['mailquota_txt'] = 'Mailbox Quota'; +$wb['email_txt'] = 'Email Address'; +$wb['name_txt'] = 'Name'; +$wb['used_txt'] = 'Used Space'; +$wb['quota_txt'] = 'Quota'; +$wb['no_email_accounts_txt'] = 'No email accounts found.'; +?> diff --git a/interface/web/dashboard/lib/lang/id_dashlet_quota.lng b/interface/web/dashboard/lib/lang/id_dashlet_quota.lng index 8b2e3d43d0..de7b5a8936 100644 --- a/interface/web/dashboard/lib/lang/id_dashlet_quota.lng +++ b/interface/web/dashboard/lib/lang/id_dashlet_quota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['quota_txt'] = 'Website Harddisk Quota'; +$wb['domain_txt'] = 'Domain / Website'; +$wb['used_txt'] = 'Used space'; +$wb['hard_txt'] = 'Hard limit'; +$wb['soft_txt'] = 'Soft limit'; +$wb['no_sites_txt'] = 'No web sites found.'; +?> diff --git a/interface/web/dashboard/lib/lang/it_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/it_dashlet_mailquota.lng index 2c2b6cd7ae..1ab1e66658 100644 --- a/interface/web/dashboard/lib/lang/it_dashlet_mailquota.lng +++ b/interface/web/dashboard/lib/lang/it_dashlet_mailquota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['mailquota_txt'] = 'Mailbox Quota'; +$wb['email_txt'] = 'Email Address'; +$wb['name_txt'] = 'Name'; +$wb['used_txt'] = 'Used Space'; +$wb['quota_txt'] = 'Quota'; +$wb['no_email_accounts_txt'] = 'No email accounts found.'; +?> diff --git a/interface/web/dashboard/lib/lang/it_dashlet_quota.lng b/interface/web/dashboard/lib/lang/it_dashlet_quota.lng index 8b2e3d43d0..de7b5a8936 100644 --- a/interface/web/dashboard/lib/lang/it_dashlet_quota.lng +++ b/interface/web/dashboard/lib/lang/it_dashlet_quota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['quota_txt'] = 'Website Harddisk Quota'; +$wb['domain_txt'] = 'Domain / Website'; +$wb['used_txt'] = 'Used space'; +$wb['hard_txt'] = 'Hard limit'; +$wb['soft_txt'] = 'Soft limit'; +$wb['no_sites_txt'] = 'No web sites found.'; +?> diff --git a/interface/web/dashboard/lib/lang/ja_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/ja_dashlet_mailquota.lng index 2c2b6cd7ae..1ab1e66658 100644 --- a/interface/web/dashboard/lib/lang/ja_dashlet_mailquota.lng +++ b/interface/web/dashboard/lib/lang/ja_dashlet_mailquota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['mailquota_txt'] = 'Mailbox Quota'; +$wb['email_txt'] = 'Email Address'; +$wb['name_txt'] = 'Name'; +$wb['used_txt'] = 'Used Space'; +$wb['quota_txt'] = 'Quota'; +$wb['no_email_accounts_txt'] = 'No email accounts found.'; +?> diff --git a/interface/web/dashboard/lib/lang/ja_dashlet_quota.lng b/interface/web/dashboard/lib/lang/ja_dashlet_quota.lng index 8b2e3d43d0..de7b5a8936 100644 --- a/interface/web/dashboard/lib/lang/ja_dashlet_quota.lng +++ b/interface/web/dashboard/lib/lang/ja_dashlet_quota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['quota_txt'] = 'Website Harddisk Quota'; +$wb['domain_txt'] = 'Domain / Website'; +$wb['used_txt'] = 'Used space'; +$wb['hard_txt'] = 'Hard limit'; +$wb['soft_txt'] = 'Soft limit'; +$wb['no_sites_txt'] = 'No web sites found.'; +?> diff --git a/interface/web/dashboard/lib/lang/nl_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/nl_dashlet_mailquota.lng index 2c2b6cd7ae..1ab1e66658 100644 --- a/interface/web/dashboard/lib/lang/nl_dashlet_mailquota.lng +++ b/interface/web/dashboard/lib/lang/nl_dashlet_mailquota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['mailquota_txt'] = 'Mailbox Quota'; +$wb['email_txt'] = 'Email Address'; +$wb['name_txt'] = 'Name'; +$wb['used_txt'] = 'Used Space'; +$wb['quota_txt'] = 'Quota'; +$wb['no_email_accounts_txt'] = 'No email accounts found.'; +?> diff --git a/interface/web/dashboard/lib/lang/nl_dashlet_quota.lng b/interface/web/dashboard/lib/lang/nl_dashlet_quota.lng index 8b2e3d43d0..de7b5a8936 100644 --- a/interface/web/dashboard/lib/lang/nl_dashlet_quota.lng +++ b/interface/web/dashboard/lib/lang/nl_dashlet_quota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['quota_txt'] = 'Website Harddisk Quota'; +$wb['domain_txt'] = 'Domain / Website'; +$wb['used_txt'] = 'Used space'; +$wb['hard_txt'] = 'Hard limit'; +$wb['soft_txt'] = 'Soft limit'; +$wb['no_sites_txt'] = 'No web sites found.'; +?> diff --git a/interface/web/dashboard/lib/lang/pl_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/pl_dashlet_mailquota.lng index 2c2b6cd7ae..1ab1e66658 100644 --- a/interface/web/dashboard/lib/lang/pl_dashlet_mailquota.lng +++ b/interface/web/dashboard/lib/lang/pl_dashlet_mailquota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['mailquota_txt'] = 'Mailbox Quota'; +$wb['email_txt'] = 'Email Address'; +$wb['name_txt'] = 'Name'; +$wb['used_txt'] = 'Used Space'; +$wb['quota_txt'] = 'Quota'; +$wb['no_email_accounts_txt'] = 'No email accounts found.'; +?> diff --git a/interface/web/dashboard/lib/lang/pl_dashlet_quota.lng b/interface/web/dashboard/lib/lang/pl_dashlet_quota.lng index 8b2e3d43d0..de7b5a8936 100644 --- a/interface/web/dashboard/lib/lang/pl_dashlet_quota.lng +++ b/interface/web/dashboard/lib/lang/pl_dashlet_quota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['quota_txt'] = 'Website Harddisk Quota'; +$wb['domain_txt'] = 'Domain / Website'; +$wb['used_txt'] = 'Used space'; +$wb['hard_txt'] = 'Hard limit'; +$wb['soft_txt'] = 'Soft limit'; +$wb['no_sites_txt'] = 'No web sites found.'; +?> diff --git a/interface/web/dashboard/lib/lang/pt_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/pt_dashlet_mailquota.lng index 2c2b6cd7ae..1ab1e66658 100644 --- a/interface/web/dashboard/lib/lang/pt_dashlet_mailquota.lng +++ b/interface/web/dashboard/lib/lang/pt_dashlet_mailquota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['mailquota_txt'] = 'Mailbox Quota'; +$wb['email_txt'] = 'Email Address'; +$wb['name_txt'] = 'Name'; +$wb['used_txt'] = 'Used Space'; +$wb['quota_txt'] = 'Quota'; +$wb['no_email_accounts_txt'] = 'No email accounts found.'; +?> diff --git a/interface/web/dashboard/lib/lang/pt_dashlet_quota.lng b/interface/web/dashboard/lib/lang/pt_dashlet_quota.lng index 8b2e3d43d0..de7b5a8936 100644 --- a/interface/web/dashboard/lib/lang/pt_dashlet_quota.lng +++ b/interface/web/dashboard/lib/lang/pt_dashlet_quota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['quota_txt'] = 'Website Harddisk Quota'; +$wb['domain_txt'] = 'Domain / Website'; +$wb['used_txt'] = 'Used space'; +$wb['hard_txt'] = 'Hard limit'; +$wb['soft_txt'] = 'Soft limit'; +$wb['no_sites_txt'] = 'No web sites found.'; +?> diff --git a/interface/web/dashboard/lib/lang/ro_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/ro_dashlet_mailquota.lng index 2c2b6cd7ae..1ab1e66658 100644 --- a/interface/web/dashboard/lib/lang/ro_dashlet_mailquota.lng +++ b/interface/web/dashboard/lib/lang/ro_dashlet_mailquota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['mailquota_txt'] = 'Mailbox Quota'; +$wb['email_txt'] = 'Email Address'; +$wb['name_txt'] = 'Name'; +$wb['used_txt'] = 'Used Space'; +$wb['quota_txt'] = 'Quota'; +$wb['no_email_accounts_txt'] = 'No email accounts found.'; +?> diff --git a/interface/web/dashboard/lib/lang/ro_dashlet_quota.lng b/interface/web/dashboard/lib/lang/ro_dashlet_quota.lng index 8b2e3d43d0..de7b5a8936 100644 --- a/interface/web/dashboard/lib/lang/ro_dashlet_quota.lng +++ b/interface/web/dashboard/lib/lang/ro_dashlet_quota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['quota_txt'] = 'Website Harddisk Quota'; +$wb['domain_txt'] = 'Domain / Website'; +$wb['used_txt'] = 'Used space'; +$wb['hard_txt'] = 'Hard limit'; +$wb['soft_txt'] = 'Soft limit'; +$wb['no_sites_txt'] = 'No web sites found.'; +?> diff --git a/interface/web/dashboard/lib/lang/ru_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/ru_dashlet_mailquota.lng index 2c2b6cd7ae..1ab1e66658 100644 --- a/interface/web/dashboard/lib/lang/ru_dashlet_mailquota.lng +++ b/interface/web/dashboard/lib/lang/ru_dashlet_mailquota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['mailquota_txt'] = 'Mailbox Quota'; +$wb['email_txt'] = 'Email Address'; +$wb['name_txt'] = 'Name'; +$wb['used_txt'] = 'Used Space'; +$wb['quota_txt'] = 'Quota'; +$wb['no_email_accounts_txt'] = 'No email accounts found.'; +?> diff --git a/interface/web/dashboard/lib/lang/ru_dashlet_quota.lng b/interface/web/dashboard/lib/lang/ru_dashlet_quota.lng index 8b2e3d43d0..de7b5a8936 100644 --- a/interface/web/dashboard/lib/lang/ru_dashlet_quota.lng +++ b/interface/web/dashboard/lib/lang/ru_dashlet_quota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['quota_txt'] = 'Website Harddisk Quota'; +$wb['domain_txt'] = 'Domain / Website'; +$wb['used_txt'] = 'Used space'; +$wb['hard_txt'] = 'Hard limit'; +$wb['soft_txt'] = 'Soft limit'; +$wb['no_sites_txt'] = 'No web sites found.'; +?> diff --git a/interface/web/dashboard/lib/lang/se_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/se_dashlet_mailquota.lng index 2c2b6cd7ae..1ab1e66658 100644 --- a/interface/web/dashboard/lib/lang/se_dashlet_mailquota.lng +++ b/interface/web/dashboard/lib/lang/se_dashlet_mailquota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['mailquota_txt'] = 'Mailbox Quota'; +$wb['email_txt'] = 'Email Address'; +$wb['name_txt'] = 'Name'; +$wb['used_txt'] = 'Used Space'; +$wb['quota_txt'] = 'Quota'; +$wb['no_email_accounts_txt'] = 'No email accounts found.'; +?> diff --git a/interface/web/dashboard/lib/lang/se_dashlet_quota.lng b/interface/web/dashboard/lib/lang/se_dashlet_quota.lng index 8b2e3d43d0..de7b5a8936 100644 --- a/interface/web/dashboard/lib/lang/se_dashlet_quota.lng +++ b/interface/web/dashboard/lib/lang/se_dashlet_quota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['quota_txt'] = 'Website Harddisk Quota'; +$wb['domain_txt'] = 'Domain / Website'; +$wb['used_txt'] = 'Used space'; +$wb['hard_txt'] = 'Hard limit'; +$wb['soft_txt'] = 'Soft limit'; +$wb['no_sites_txt'] = 'No web sites found.'; +?> diff --git a/interface/web/dashboard/lib/lang/sk_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/sk_dashlet_mailquota.lng index 2c2b6cd7ae..1ab1e66658 100644 --- a/interface/web/dashboard/lib/lang/sk_dashlet_mailquota.lng +++ b/interface/web/dashboard/lib/lang/sk_dashlet_mailquota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['mailquota_txt'] = 'Mailbox Quota'; +$wb['email_txt'] = 'Email Address'; +$wb['name_txt'] = 'Name'; +$wb['used_txt'] = 'Used Space'; +$wb['quota_txt'] = 'Quota'; +$wb['no_email_accounts_txt'] = 'No email accounts found.'; +?> diff --git a/interface/web/dashboard/lib/lang/sk_dashlet_quota.lng b/interface/web/dashboard/lib/lang/sk_dashlet_quota.lng index 8b2e3d43d0..de7b5a8936 100644 --- a/interface/web/dashboard/lib/lang/sk_dashlet_quota.lng +++ b/interface/web/dashboard/lib/lang/sk_dashlet_quota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['quota_txt'] = 'Website Harddisk Quota'; +$wb['domain_txt'] = 'Domain / Website'; +$wb['used_txt'] = 'Used space'; +$wb['hard_txt'] = 'Hard limit'; +$wb['soft_txt'] = 'Soft limit'; +$wb['no_sites_txt'] = 'No web sites found.'; +?> diff --git a/interface/web/dashboard/lib/lang/tr_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/tr_dashlet_mailquota.lng index 2c2b6cd7ae..1ab1e66658 100644 --- a/interface/web/dashboard/lib/lang/tr_dashlet_mailquota.lng +++ b/interface/web/dashboard/lib/lang/tr_dashlet_mailquota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['mailquota_txt'] = 'Mailbox Quota'; +$wb['email_txt'] = 'Email Address'; +$wb['name_txt'] = 'Name'; +$wb['used_txt'] = 'Used Space'; +$wb['quota_txt'] = 'Quota'; +$wb['no_email_accounts_txt'] = 'No email accounts found.'; +?> diff --git a/interface/web/dashboard/lib/lang/tr_dashlet_quota.lng b/interface/web/dashboard/lib/lang/tr_dashlet_quota.lng index 8b2e3d43d0..de7b5a8936 100644 --- a/interface/web/dashboard/lib/lang/tr_dashlet_quota.lng +++ b/interface/web/dashboard/lib/lang/tr_dashlet_quota.lng @@ -1,8 +1,8 @@ \ No newline at end of file +$wb['quota_txt'] = 'Website Harddisk Quota'; +$wb['domain_txt'] = 'Domain / Website'; +$wb['used_txt'] = 'Used space'; +$wb['hard_txt'] = 'Hard limit'; +$wb['soft_txt'] = 'Soft limit'; +$wb['no_sites_txt'] = 'No web sites found.'; +?> diff --git a/interface/web/dashboard/list/empty.dir b/interface/web/dashboard/list/empty.dir new file mode 100644 index 0000000000..95ba9ef37c --- /dev/null +++ b/interface/web/dashboard/list/empty.dir @@ -0,0 +1 @@ +This empty directory is needed by ISPConfig. diff --git a/interface/web/designer/form/empty.dir b/interface/web/designer/form/empty.dir new file mode 100644 index 0000000000..95ba9ef37c --- /dev/null +++ b/interface/web/designer/form/empty.dir @@ -0,0 +1 @@ +This empty directory is needed by ISPConfig. diff --git a/interface/web/designer/lib/lang/cz.lng b/interface/web/designer/lib/lang/cz.lng index acb6c3546c..29f4a51efe 100644 --- a/interface/web/designer/lib/lang/cz.lng +++ b/interface/web/designer/lib/lang/cz.lng @@ -1,2 +1,3 @@ + diff --git a/interface/web/designer/lib/lang/cz_form_edit.lng b/interface/web/designer/lib/lang/cz_form_edit.lng index 75bf5a5606..00eeb204d0 100644 --- a/interface/web/designer/lib/lang/cz_form_edit.lng +++ b/interface/web/designer/lib/lang/cz_form_edit.lng @@ -22,3 +22,4 @@ $wb['auth_preset_perm_user_txt'] = 'Opr. Uživatel'; $wb['auth_preset_perm_group_txt'] = 'Opr. Skupina'; $wb['auth_preset_perm_other_txt'] = 'Opr. Ostatní'; ?> + diff --git a/interface/web/designer/lib/lang/cz_form_list.lng b/interface/web/designer/lib/lang/cz_form_list.lng index 1e677f2410..edaa422253 100644 --- a/interface/web/designer/lib/lang/cz_form_list.lng +++ b/interface/web/designer/lib/lang/cz_form_list.lng @@ -5,3 +5,4 @@ $wb['module_txt'] = 'Modul'; $wb['title_txt'] = 'Titulek'; $wb['description_txt'] = 'Popis'; ?> + diff --git a/interface/web/designer/lib/lang/cz_form_show.lng b/interface/web/designer/lib/lang/cz_form_show.lng index 381414bdf0..678d5eb696 100644 --- a/interface/web/designer/lib/lang/cz_form_show.lng +++ b/interface/web/designer/lib/lang/cz_form_show.lng @@ -5,7 +5,7 @@ $wb['name_txt'] = 'Formname'; $wb['delete_txt'] = 'Smazat'; $wb['properties_txt'] = 'Properties'; $wb['new_tab_txt'] = 'Tab new'; -$wb['edit_txt'] = 'Edit'; +$wb['edit_txt'] = 'Upravit'; $wb['new_txt'] = 'Neu'; $wb['up_txt'] = '^'; $wb['down_txt'] = 'v'; @@ -16,3 +16,4 @@ $wb['module_del_txt'] = 'Delete the module and all subdirectories?'; $wb['menu_del_txt'] = 'Delete menu with all menuitems?'; $wb['item_del_txt'] = 'Delete menuitem?'; ?> + diff --git a/interface/web/designer/lib/lang/cz_module_edit.lng b/interface/web/designer/lib/lang/cz_module_edit.lng index 847896d302..cc83c99686 100644 --- a/interface/web/designer/lib/lang/cz_module_edit.lng +++ b/interface/web/designer/lib/lang/cz_module_edit.lng @@ -8,15 +8,5 @@ $wb['tab_width_txt'] = 'Šířka záložky'; $wb['save_txt'] = 'Uložit'; $wb['cancel_txt'] = 'Zrušit'; $wb['header_txt'] = 'Vlastnosti modulu'; -$wb['description_txt'] = ' -Popis -

-Název modulu: Název adresáře modulu. Pouze čísla, znaky a podtržitko jsou povoleny.
-Titulek modulu: Bude zobrazen v horní části hlavní navigace.
-Soubor se šablonou: Šablonový soubor modulu. Nyní dostupné: module.tpl.htm a module_tree.tpl.htm.Výchozí je module.tpl.htm.
-NaviFrame: Pokud je vybrán module_tree.tpl.htm jako šablona, zadejte zde cestu ke skriptu pro levý frame.
-Výchozí stránka: Tato stránka bude ukázána, když je modul zobrazen.
-Šířka záložek: Šířka záložek v hlavní navigaci. Pole je ve výchozím stavu prázdné. Můžete zadat absolutní hodnotu v pixelech (např. 20) nebo relativně (např 20%).
-Rada: Všechny cesty jsou relativně k adresáři web web. -'; ?> + diff --git a/interface/web/designer/lib/lang/cz_module_list.lng b/interface/web/designer/lib/lang/cz_module_list.lng index b568f69d63..6617c8c300 100644 --- a/interface/web/designer/lib/lang/cz_module_list.lng +++ b/interface/web/designer/lib/lang/cz_module_list.lng @@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Backend modul'; $wb['module_txt'] = 'Modul'; $wb['title_txt'] = 'Titulek'; ?> + diff --git a/interface/web/designer/lib/lang/cz_module_nav_edit.lng b/interface/web/designer/lib/lang/cz_module_nav_edit.lng index 01f5df68fb..58d5773231 100644 --- a/interface/web/designer/lib/lang/cz_module_nav_edit.lng +++ b/interface/web/designer/lib/lang/cz_module_nav_edit.lng @@ -4,3 +4,4 @@ $wb['header_txt'] = 'Navi vlastnosti'; $wb['save_txt'] = 'Uložit'; $wb['cancel_txt'] = 'Zrušit'; ?> + diff --git a/interface/web/designer/lib/lang/cz_module_nav_item_edit.lng b/interface/web/designer/lib/lang/cz_module_nav_item_edit.lng index 17e31319d7..39aaae8c41 100644 --- a/interface/web/designer/lib/lang/cz_module_nav_item_edit.lng +++ b/interface/web/designer/lib/lang/cz_module_nav_item_edit.lng @@ -6,3 +6,4 @@ $wb['header_txt'] = 'Navi properties'; $wb['save_txt'] = 'Uložit'; $wb['cancel_txt'] = 'Zrušit'; ?> + diff --git a/interface/web/designer/lib/lang/cz_module_show.lng b/interface/web/designer/lib/lang/cz_module_show.lng index 95c2d85723..78fdd9cb1c 100644 --- a/interface/web/designer/lib/lang/cz_module_show.lng +++ b/interface/web/designer/lib/lang/cz_module_show.lng @@ -5,7 +5,7 @@ $wb['name_txt'] = 'Module'; $wb['delete_txt'] = 'Smazat'; $wb['properties_txt'] = 'Properties'; $wb['new_menu_txt'] = 'Menu new'; -$wb['edit_txt'] = 'Edit'; +$wb['edit_txt'] = 'Upravit'; $wb['new_txt'] = 'New'; $wb['up_txt'] = 'Up'; $wb['down_txt'] = 'Down'; @@ -14,3 +14,4 @@ $wb['module_del_txt'] = 'Wollen Sie das Modul und alle im Modul angelegten Datei $wb['menu_del_txt'] = 'Wollen Sie das Menü mit allen Untereinträgen löschen?'; $wb['item_del_txt'] = 'Wollen Sie den Menüeintrag löschen?'; ?> + diff --git a/interface/web/designer/lib/lang/de.lng b/interface/web/designer/lib/lang/de.lng index acb6c3546c..29f4a51efe 100644 --- a/interface/web/designer/lib/lang/de.lng +++ b/interface/web/designer/lib/lang/de.lng @@ -1,2 +1,3 @@ + diff --git a/interface/web/designer/lib/lang/de_form_edit.lng b/interface/web/designer/lib/lang/de_form_edit.lng index 74bf458d90..4eb8e93096 100644 --- a/interface/web/designer/lib/lang/de_form_edit.lng +++ b/interface/web/designer/lib/lang/de_form_edit.lng @@ -22,3 +22,4 @@ $wb['auth_preset_perm_user_txt'] = 'Benutzerberechtigungen'; $wb['auth_preset_perm_group_txt'] = 'Gruppenberechtigungen'; $wb['auth_preset_perm_other_txt'] = 'andere Berechtigungen'; ?> + diff --git a/interface/web/designer/lib/lang/de_form_list.lng b/interface/web/designer/lib/lang/de_form_list.lng index 998a64f702..853ce10003 100644 --- a/interface/web/designer/lib/lang/de_form_list.lng +++ b/interface/web/designer/lib/lang/de_form_list.lng @@ -5,3 +5,4 @@ $wb['module_txt'] = 'Modul'; $wb['title_txt'] = 'Bezeichnung'; $wb['description_txt'] = 'Beschreibung'; ?> + diff --git a/interface/web/designer/lib/lang/de_form_show.lng b/interface/web/designer/lib/lang/de_form_show.lng index b19fd34457..c4b2c1d195 100644 --- a/interface/web/designer/lib/lang/de_form_show.lng +++ b/interface/web/designer/lib/lang/de_form_show.lng @@ -16,3 +16,4 @@ $wb['module_del_txt'] = 'Modul und alle Unterverzeichnisse löschen?'; $wb['menu_del_txt'] = 'Menü samt Menüeinträgen löschen?'; $wb['item_del_txt'] = 'Menüeintrag löschen?'; ?> + diff --git a/interface/web/designer/lib/lang/de_module_edit.lng b/interface/web/designer/lib/lang/de_module_edit.lng index 6eacd64b1d..09d9f390db 100644 --- a/interface/web/designer/lib/lang/de_module_edit.lng +++ b/interface/web/designer/lib/lang/de_module_edit.lng @@ -10,3 +10,4 @@ $wb['cancel_txt'] = 'Abbrechen'; $wb['header_txt'] = 'Moduleigenschaften'; $wb['description_txt'] = 'Beschreibung'; ?> + diff --git a/interface/web/designer/lib/lang/de_module_list.lng b/interface/web/designer/lib/lang/de_module_list.lng index 6040630203..a09b5139b5 100644 --- a/interface/web/designer/lib/lang/de_module_list.lng +++ b/interface/web/designer/lib/lang/de_module_list.lng @@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Backend Module'; $wb['module_txt'] = 'Modul'; $wb['title_txt'] = 'Bezeichnung'; ?> + diff --git a/interface/web/designer/lib/lang/de_module_nav_edit.lng b/interface/web/designer/lib/lang/de_module_nav_edit.lng index d5142f03cb..25e2085ccf 100644 --- a/interface/web/designer/lib/lang/de_module_nav_edit.lng +++ b/interface/web/designer/lib/lang/de_module_nav_edit.lng @@ -4,3 +4,4 @@ $wb['header_txt'] = 'Navigation Eigenschaften'; $wb['save_txt'] = 'Speichern'; $wb['cancel_txt'] = 'Abbrechen'; ?> + diff --git a/interface/web/designer/lib/lang/de_module_nav_item_edit.lng b/interface/web/designer/lib/lang/de_module_nav_item_edit.lng index 8c0c33c1a6..6353a73470 100644 --- a/interface/web/designer/lib/lang/de_module_nav_item_edit.lng +++ b/interface/web/designer/lib/lang/de_module_nav_item_edit.lng @@ -6,3 +6,4 @@ $wb['header_txt'] = 'Navigation Eigenschaften'; $wb['save_txt'] = 'Speichern'; $wb['cancel_txt'] = 'Abbrechen'; ?> + diff --git a/interface/web/designer/lib/lang/de_module_show.lng b/interface/web/designer/lib/lang/de_module_show.lng index f4b2ad11f8..d0c4d4b413 100644 --- a/interface/web/designer/lib/lang/de_module_show.lng +++ b/interface/web/designer/lib/lang/de_module_show.lng @@ -14,3 +14,4 @@ $wb['module_del_txt'] = 'Wollen Sie das Modul und alle im Modul angelegten Datei $wb['menu_del_txt'] = 'Wollen Sie das Menü mit allen Untereinträgen löschen?'; $wb['item_del_txt'] = 'Wollen Sie den Menüeintrag löschen?'; ?> + diff --git a/interface/web/designer/lib/lang/el_form_edit.lng b/interface/web/designer/lib/lang/el_form_edit.lng index 04ebc02db3..2c2673a360 100644 --- a/interface/web/designer/lib/lang/el_form_edit.lng +++ b/interface/web/designer/lib/lang/el_form_edit.lng @@ -16,9 +16,9 @@ $wb['db_history_txt'] = 'Ιστορικό Αναίρεσης'; $wb['tab_default_txt'] = 'Προεπιλεγμένη Καρτέλα'; $wb['list_default_txt'] = 'Προεπιλεγμένη Λίστα'; $wb['auth_txt'] = 'Δικαιώματα'; -$wb['auth_preset_userid_txt'] = 'UserID'; -$wb['auth_preset_groupid_txt'] = 'GroupID'; -$wb['auth_preset_perm_user_txt'] = 'Perm. User'; -$wb['auth_preset_perm_group_txt'] = 'Perm. Group'; -$wb['auth_preset_perm_other_txt'] = 'Perm. Other'; +$wb['auth_preset_userid_txt'] = 'ID Χρήστη'; +$wb['auth_preset_groupid_txt'] = 'ID Ομάδας'; +$wb['auth_preset_perm_user_txt'] = 'Δικαιώμ. Χρήστη'; +$wb['auth_preset_perm_group_txt'] = 'Δικαιώμ. Ομάδας'; +$wb['auth_preset_perm_other_txt'] = 'Δικαιώμ. Άλλων'; ?> diff --git a/interface/web/designer/list/empty.dir b/interface/web/designer/list/empty.dir new file mode 100644 index 0000000000..95ba9ef37c --- /dev/null +++ b/interface/web/designer/list/empty.dir @@ -0,0 +1 @@ +This empty directory is needed by ISPConfig. diff --git a/interface/web/dns/dns_dkim_edit.php b/interface/web/dns/dns_dkim_edit.php deleted file mode 100644 index 61b0bd7fb6..0000000000 --- a/interface/web/dns/dns_dkim_edit.php +++ /dev/null @@ -1,142 +0,0 @@ -auth->check_module_permissions('dns'); - -// Loading classes -$app->uses('tpl,tform,tform_actions,validate_dns'); -$app->load('tform_actions'); - -class page_action extends tform_actions { - - function onShowNew() { - global $app, $conf; - // we will check only users, not admins - if($_SESSION["s"]["user"]["typ"] == 'user') { - - // Get the limits of the client - $client_group_id = $_SESSION["s"]["user"]["default_group"]; - $client = $app->db->queryOneRecord("SELECT limit_dns_record FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); - - // Check if the user may add another record. - if($client["limit_dns_record"] >= 0) { - $tmp = $app->db->queryOneRecord("SELECT count(id) as number FROM dns_rr WHERE sys_groupid = $client_group_id"); - if($tmp["number"] >= $client["limit_dns_record"]) { - $app->error($app->tform->wordbook["limit_dns_record_txt"]); - } - } - } - - parent::onShowNew(); - } - - function onSubmit() { - global $app, $conf; - // Get the parent soa record of the domain - $soa = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = '".$app->functions->intval($_POST["zone"])."' AND ".$app->tform->getAuthSQL('r')); - // Check if Domain belongs to user - if($soa["id"] != $_POST["zone"]) $app->tform->errorMessage .= $app->tform->wordbook["no_zone_perm"]; - - // Check the client limits, if user is not the admin - if($_SESSION["s"]["user"]["typ"] != 'admin') { // if user is not admin - // Get the limits of the client - $client_group_id = $_SESSION["s"]["user"]["default_group"]; - $client = $app->db->queryOneRecord("SELECT limit_dns_record FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); - // Check if the user may add another record. - if($this->id == 0 && $client["limit_dns_record"] >= 0) { - $tmp = $app->db->queryOneRecord("SELECT count(id) as number FROM dns_rr WHERE sys_groupid = $client_group_id"); - if($tmp["number"] >= $client["limit_dns_record"]) { - $app->error($app->tform->wordbook["limit_dns_record_txt"]); - } - } - } // end if user is not admin - - // Set the server ID of the rr record to the same server ID as the parent record. - $this->dataRecord["server_id"] = $soa["server_id"]; - - // add dkim-settings to the public-key in the txt-record - $this->dataRecord['data']='v=DKIM1; t=s; p='.$this->dataRecord['data']; - $this->dataRecord['name']='default._domainkey.'.$this->dataRecord['name']; - - // Update the serial number and timestamp of the RR record - $soa = $app->db->queryOneRecord("SELECT serial FROM dns_rr WHERE id = ".$this->id); - $this->dataRecord["serial"] = $app->validate_dns->increase_serial($soa["serial"]); - $this->dataRecord["stamp"] = date('Y-m-d H:i:s'); - - // check for duplicate entry - $check=$app->db->queryOneRecord("SELECT * FROM dns_rr WHERE zone = ".$this->dataRecord["zone"]." AND type = '".$this->dataRecord["type"]."' AND data ='".$this->dataRecord["data"]."' AND name = '".$this->dataRecord['name']."'"); - if ($check!='') $app->tform->errorMessage .= $app->tform->wordbook["record_exists_txt"]; - - parent::onSubmit(); - } - - function onAfterInsert() { - global $app, $conf; - - //* Set the sys_groupid of the rr record to be the same then the sys_groupid of the soa record - $soa = $app->db->queryOneRecord("SELECT sys_groupid,serial FROM dns_soa WHERE id = '".$app->functions->intval($this->dataRecord["zone"])."' AND ".$app->tform->getAuthSQL('r')); - $app->db->datalogUpdate('dns_rr', "sys_groupid = ".$soa['sys_groupid'], 'id', $this->id); - - //* Update the serial number of the SOA record - $soa_id = $app->functions->intval($_POST["zone"]); - $serial = $app->validate_dns->increase_serial($soa["serial"]); - $app->db->datalogUpdate('dns_soa', "serial = $serial", 'id', $soa_id); - } - - function onAfterUpdate() { - global $app, $conf; - - //* Update the serial number of the SOA record - $soa = $app->db->queryOneRecord("SELECT serial FROM dns_soa WHERE id = '".$app->functions->intval($this->dataRecord["zone"])."' AND ".$app->tform->getAuthSQL('r')); - $soa_id = $app->functions->intval($_POST["zone"]); - $serial = $app->validate_dns->increase_serial($soa["serial"]); - $app->db->datalogUpdate('dns_soa', "serial = $serial", 'id', $soa_id); - } -} - -$page = new page_action; -$page->onLoad(); - -?> diff --git a/interface/web/dns/dns_dkim_get.php b/interface/web/dns/dns_dkim_get.php deleted file mode 100644 index 6b8b90b4c2..0000000000 --- a/interface/web/dns/dns_dkim_get.php +++ /dev/null @@ -1,91 +0,0 @@ -auth->check_module_permissions('dns'); - -global $app, $conf; - -// Loading classes -$app->uses('tform,tform_actions'); - -header('Content-Type: text/xml; charset=utf-8'); -header('Cache-Control: must-revalidate, pre-check=0, no-store, no-cache, max-age=0, post-check=0'); - -/* - This function fix PHP's messing up POST input containing characters space, dot, - open square bracket and others to be compatible with with the deprecated register_globals -*/ -function getRealPOST() { - $pairs = explode("&", file_get_contents("php://input")); - $vars = array(); - foreach ($pairs as $pair) { - $nv = explode("=", $pair, 2); - $name = urldecode($nv[0]); - $value = $nv[1]; - $vars[$name] = $value; - } - return $vars; -} -function pub_key($pubkey) { - $public_key=''; - foreach($pubkey as $values) $public_key=$public_key.$values; - return $public_key; -} - -$_POST=getRealPost(); - -if (ctype_digit($_POST['zone'])) { - // Get the parent soa record of the domain - $soa = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = '".$app->db->quote($_POST['zone'])."' AND ".$app->tform->getAuthSQL('r')); - - $public_key=$app->db->queryOneRecord("SELECT dkim_public FROM mail_domain WHERE domain = '".substr_replace($soa['origin'],'',-1)."' AND ".$app->tform->getAuthSQL('r')); - - $public_key=pub_key($public_key); - - $public_key=str_replace(array('-----BEGIN PUBLIC KEY-----','-----END PUBLIC KEY-----',"\r","\n"),'',$public_key); - - echo "\n"; - echo "\n"; - echo "".$public_key."\n"; - echo "".$soa['origin']."\n"; - echo "\n"; -} -?> diff --git a/interface/web/dns/dns_wizard.php b/interface/web/dns/dns_wizard.php index fb73e1a00e..ad26c431d1 100644 --- a/interface/web/dns/dns_wizard.php +++ b/interface/web/dns/dns_wizard.php @@ -132,6 +132,25 @@ if($_POST['create'] == 1) { $error = ''; + // apply filters + if(isset($_POST['domain']) && $_POST['domain'] != ''){ + $_POST['domain'] = $app->functions->idn_encode($_POST['domain']); + $_POST['domain'] = strtolower($_POST['domain']); + } + if(isset($_POST['ns1']) && $_POST['ns1'] != ''){ + $_POST['ns1'] = $app->functions->idn_encode($_POST['ns1']); + $_POST['ns1'] = strtolower($_POST['ns1']); + } + if(isset($_POST['ns2']) && $_POST['ns2'] != ''){ + $_POST['ns2'] = $app->functions->idn_encode($_POST['ns2']); + $_POST['ns2'] = strtolower($_POST['ns2']); + } + if(isset($_POST['email']) && $_POST['email'] != ''){ + $_POST['email'] = $app->functions->idn_encode($_POST['email']); + $_POST['email'] = strtolower($_POST['email']); + } + + if(isset($_POST['domain']) && $_POST['domain'] == '') $error .= $app->lng('error_domain_empty').'
'; elseif(isset($_POST['domain']) && !preg_match('/^[\w\.\-]{2,64}\.[a-zA-Z0-9\-]{2,30}$/',$_POST['domain'])) $error .= $app->lng('error_domain_regex').'
'; @@ -173,20 +192,12 @@ if($_POST['create'] == 1) { $tpl_content = $template_record['template']; if($_POST['domain'] != '') $tpl_content = str_replace('{DOMAIN}',$_POST['domain'],$tpl_content); if($_POST['ip'] != '') $tpl_content = str_replace('{IP}',$_POST['ip'],$tpl_content); - if($_POST['ns1'] != '') $tpl_content = str_replace('{NS1}',$_POST['ns1'],$tpl_content); - if($_POST['ns2'] != '') $tpl_content = str_replace('{NS2}',$_POST['ns2'],$tpl_content); - if($_POST['email'] != '') $tpl_content = str_replace('{EMAIL}',$_POST['email'],$tpl_content); - if(isset($_POST['dkim']) && preg_match('/^[\w\.\-\/]{2,255}\.[a-zA-Z0-9\-]{2,30}[\.]{0,1}$/',$_POST['domain'])) { - $public_key=$app->db->queryOneRecord("SELECT dkim_public FROM mail_domain WHERE domain = '".$app->db->quote($_POST['domain'])."' AND dkim = 'y' AND ".$app->tform->getAuthSQL('r')); - if ($public_key!='') { - $dns_record=str_replace(array("\r\n", "\n", "\r","-----BEGIN PUBLIC KEY-----","-----END PUBLIC KEY-----"),'',$public_key['dkim_public']); - $tpl_content = str_replace('{DKIM}','TXT|default._domainkey.'.$_POST['domain'].'.|v=DKIM1; t=s; p='.$dns_record,$tpl_content); - } - } - - - // Parse the template - $tpl_rows = explode("\n",$tpl_content); + if($_POST['ns1'] != '') $tpl_content = str_replace('{NS1}',$_POST['ns1'],$tpl_content); + if($_POST['ns2'] != '') $tpl_content = str_replace('{NS2}',$_POST['ns2'],$tpl_content); + if($_POST['email'] != '') $tpl_content = str_replace('{EMAIL}',$_POST['email'],$tpl_content); + + // Parse the template + $tpl_rows = explode("\n",$tpl_content); $section = ''; $vars = array(); $dns_rr = array(); @@ -281,7 +292,7 @@ include($lng_file); $app->tpl->setVar($wb); $app->tpl_defaults(); -$app->tpl->pparse(); - - -?> +$app->tpl->pparse(); + + +?> \ No newline at end of file diff --git a/interface/web/dns/form/dns_dkim.tform.php b/interface/web/dns/form/dns_dkim.tform.php deleted file mode 100644 index ffeee58bf6..0000000000 --- a/interface/web/dns/form/dns_dkim.tform.php +++ /dev/null @@ -1,154 +0,0 @@ - 0 id must match with id of current user -$form["auth_preset"]["groupid"] = 0; // 0 = default groupid of the user, > 0 id must match with groupid of current user -$form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update, d = delete -$form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete -$form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete - -$form["tabs"]['dns'] = array ( - 'title' => "DNS DKIM", - 'width' => 100, - 'template' => "templates/dns_dkim_edit.htm", - 'fields' => array ( - ################################## - # Begin Datatable fields - ################################## - 'server_id' => array ( - 'datatype' => 'INTEGER', - 'formtype' => 'SELECT', - 'default' => '', - 'value' => '', - 'width' => '30', - 'maxlength' => '255' - ), - 'zone' => array ( - 'datatype' => 'INTEGER', - 'formtype' => 'TEXT', - 'default' => @$app->functions->intval($_REQUEST["zone"]), - 'value' => '', - 'width' => '30', - 'maxlength' => '255' - ), - 'name' => array ( - 'datatype' => 'VARCHAR', - 'formtype' => 'TEXT', - 'filters' => array( 0 => array( 'event' => 'SAVE', - 'type' => 'IDNTOASCII'), - 1 => array( 'event' => 'SHOW', - 'type' => 'IDNTOUTF8'), - 2 => array( 'event' => 'SAVE', - 'type' => 'TOLOWER') - ), - 'validators' => array ( 0 => array ( 'type' => 'REGEX', - 'regex' => '/^[\w\.\-]{0,255}$/', - 'errmsg'=> 'name_error_regex'), - ), - 'default' => '', - 'value' => '', - 'width' => '30', - 'maxlength' => '255' - ), - 'type' => array ( - 'datatype' => 'VARCHAR', - 'formtype' => 'TEXT', - 'default' => 'TXT', - 'value' => '', - 'width' => '5', - 'maxlength' => '5' - ), - 'data' => array ( - 'datatype' => 'VARCHAR', - 'formtype' => 'TEXT', - 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', - 'errmsg'=> 'data_error_empty'), - ), - 'default' => '', - 'value' => '', - 'width' => '30', - 'maxlength' => '255' - ), - 'ttl' => array ( - 'datatype' => 'INTEGER', - 'formtype' => 'TEXT', - 'default' => '86400', - 'value' => '', - 'width' => '10', - 'maxlength' => '10' - ), - 'active' => array ( - 'datatype' => 'VARCHAR', - 'formtype' => 'CHECKBOX', - 'default' => 'Y', - 'value' => array(0 => 'N',1 => 'Y') - ), - 'stamp' => array ( - 'datatype' => 'VARCHAR', - 'formtype' => 'TEXT', - 'default' => '', - 'value' => '', - 'width' => '30', - 'maxlength' => '255' - ), - 'serial' => array ( - 'datatype' => 'INTEGER', - 'formtype' => 'TEXT', - 'default' => '', - 'value' => '', - 'width' => '10', - 'maxlength' => '10' - ), - ################################## - # ENDE Datatable fields - ################################## - ) -); - - - -?> diff --git a/interface/web/dns/form/dns_rp.tform.php b/interface/web/dns/form/dns_rp.tform.php index f6a6ef5ee1..5a7ff8314a 100644 --- a/interface/web/dns/form/dns_rp.tform.php +++ b/interface/web/dns/form/dns_rp.tform.php @@ -75,16 +75,16 @@ $form["tabs"]['dns'] = array ( 'width' => '30', 'maxlength' => '255' ), - 'filters' => array( 0 => array( 'event' => 'SAVE', + 'name' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'filters' => array( 0 => array( 'event' => 'SAVE', 'type' => 'IDNTOASCII'), 1 => array( 'event' => 'SHOW', 'type' => 'IDNTOUTF8'), 2 => array( 'event' => 'SAVE', 'type' => 'TOLOWER') ), - 'name' => array ( - 'datatype' => 'VARCHAR', - 'formtype' => 'TEXT', 'validators' => array ( 0 => array ( 'type' => 'REGEX', 'regex' => '/^[\w\.\-]{0,255}$/', 'errmsg'=> 'name_error_regex'), diff --git a/interface/web/dns/form/dns_template.tform.php b/interface/web/dns/form/dns_template.tform.php index b676d1a1f1..1f020da04c 100644 --- a/interface/web/dns/form/dns_template.tform.php +++ b/interface/web/dns/form/dns_template.tform.php @@ -71,18 +71,13 @@ $form["tabs"]['template'] = array ( ), 'fields' => array ( 'datatype' => 'VARCHAR', - 'formtype' => 'CHECKBOXARRAY', - 'default' => '', - 'separator' => ',', - 'value' => array('DOMAIN' => 'Domain','IP' => 'IP Address','NS1' => 'NS 1','NS2' => 'NS 2','EMAIL' => 'Email', 'DKIM' => 'DKIM (use {DKIM}|0|3600 in your Template)'), - 'validators' => array ( 0 => array ('type' => 'CUSTOM', - 'class' => 'validate_dkim', - 'function' => 'check_template', - 'errmsg'=> 'dkim_domain_error'), - ), - ), - 'template' => array ( - 'datatype' => 'TEXT', + 'formtype' => 'CHECKBOXARRAY', + 'default' => '', + 'separator' => ',', + 'value' => array('DOMAIN' => 'Domain','IP' => 'IP Address','NS1' => 'NS 1','NS2' => 'NS 2','EMAIL' => 'Email') + ), + 'template' => array ( + 'datatype' => 'TEXT', 'formtype' => 'TEXTAREA', 'default' => '', 'value' => '', @@ -100,7 +95,7 @@ $form["tabs"]['template'] = array ( ################################## ) ); - - - -?> + + + +?> \ No newline at end of file diff --git a/interface/web/dns/lib/lang/cz.lng b/interface/web/dns/lib/lang/cz.lng index f143b0b922..126fb7ab99 100644 --- a/interface/web/dns/lib/lang/cz.lng +++ b/interface/web/dns/lib/lang/cz.lng @@ -20,3 +20,4 @@ $wb['Templates'] = 'Šablony DNS'; $wb['Secondary Zones'] = 'Sekundární DNS zóny'; $wb['Import Zone File'] = 'Importovat vybraný DNS zonový soubor'; ?> + diff --git a/interface/web/dns/lib/lang/cz_dns_a.lng b/interface/web/dns/lib/lang/cz_dns_a.lng index 8b8c206b63..4631836201 100644 --- a/interface/web/dns/lib/lang/cz_dns_a.lng +++ b/interface/web/dns/lib/lang/cz_dns_a.lng @@ -14,3 +14,4 @@ $wb['data_error_empty'] = 'IP adresa je prázdná'; $wb['data_error_regex'] = 'IP adresa má chybný formát'; $wb['data_error_duplicate'] = 'Duplikace A záznamu'; ?> + diff --git a/interface/web/dns/lib/lang/cz_dns_a_list.lng b/interface/web/dns/lib/lang/cz_dns_a_list.lng index a61265a595..2fde7703c8 100644 --- a/interface/web/dns/lib/lang/cz_dns_a_list.lng +++ b/interface/web/dns/lib/lang/cz_dns_a_list.lng @@ -13,3 +13,4 @@ $wb['page_txt'] = 'Stránka'; $wb['page_of_txt'] = 'z'; $wb['delete_confirmation'] = 'Skutečně chcete smazat tento záznam ?'; ?> + diff --git a/interface/web/dns/lib/lang/cz_dns_aaaa.lng b/interface/web/dns/lib/lang/cz_dns_aaaa.lng index 26c6ae9064..1936207d70 100644 --- a/interface/web/dns/lib/lang/cz_dns_aaaa.lng +++ b/interface/web/dns/lib/lang/cz_dns_aaaa.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.'; $wb['data_error_empty'] = 'IP adresa je prázdná'; $wb['data_error_regex'] = 'IP adresa má chybný formát'; ?> + diff --git a/interface/web/dns/lib/lang/cz_dns_alias.lng b/interface/web/dns/lib/lang/cz_dns_alias.lng index 572478a98b..a32def2ae1 100644 --- a/interface/web/dns/lib/lang/cz_dns_alias.lng +++ b/interface/web/dns/lib/lang/cz_dns_alias.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.'; $wb['data_error_empty'] = 'Cílový Hostname je prázdný'; $wb['data_error_regex'] = 'Cílový Hostname má chybný formát'; ?> + diff --git a/interface/web/dns/lib/lang/cz_dns_cname.lng b/interface/web/dns/lib/lang/cz_dns_cname.lng index 8494b7c293..3a7299a184 100644 --- a/interface/web/dns/lib/lang/cz_dns_cname.lng +++ b/interface/web/dns/lib/lang/cz_dns_cname.lng @@ -14,3 +14,4 @@ $wb['data_error_empty'] = 'Cílový hostname je prázdný'; $wb['data_error_regex'] = 'Cílový hostname má chybný formát'; $wb['data_error_duplicate'] = 'Duplikace A záznamu nebo CNAME-záznamu'; ?> + diff --git a/interface/web/dns/lib/lang/cz_dns_hinfo.lng b/interface/web/dns/lib/lang/cz_dns_hinfo.lng index 5f67d5e826..636600ba22 100644 --- a/interface/web/dns/lib/lang/cz_dns_hinfo.lng +++ b/interface/web/dns/lib/lang/cz_dns_hinfo.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.'; $wb['data_error_empty'] = 'Informace o hostovi je prázdná'; $wb['data_error_regex'] = 'Informace o hostovi má chybný formát'; ?> + diff --git a/interface/web/dns/lib/lang/cz_dns_import.lng b/interface/web/dns/lib/lang/cz_dns_import.lng index 8b25ebac2d..7c6c887760 100644 --- a/interface/web/dns/lib/lang/cz_dns_import.lng +++ b/interface/web/dns/lib/lang/cz_dns_import.lng @@ -5,10 +5,11 @@ $wb['btn_save_txt'] = 'Importovat vybraný DNS zonový soubor'; $wb['btn_cancel_txt'] = 'Zrušit'; $wb['domain_txt'] = 'Doména'; $wb['zone_file_successfully_imported_txt'] = 'Zónový soubor byl úspěšně importován !'; -$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!'; +$wb['error_no_valid_zone_file_txt'] = 'Chyba, neplatný zónový soubor nebo jeho formát !'; $wb['zonefile_to_import_txt'] = 'Vybrat soubor s DNS zónou '; $wb['domain_field_desc_txt'] = 'Může být ponechána nevyplněná, pokud je název domény názvem souboru nebo je v obsahu souboru s DNS zónou.'; $wb['title'] = 'Importovat soubory zón'; $wb['no_file_uploaded_error'] = 'Nelze odeslat DNS zonový soubor'; $wb['zone_file_import_txt'] = 'Importovat vybraný DNS zonový soubor'; ?> + diff --git a/interface/web/dns/lib/lang/cz_dns_mx.lng b/interface/web/dns/lib/lang/cz_dns_mx.lng index 228d9d6cc6..49c98ead5d 100644 --- a/interface/web/dns/lib/lang/cz_dns_mx.lng +++ b/interface/web/dns/lib/lang/cz_dns_mx.lng @@ -13,5 +13,6 @@ $wb['name_error_empty'] = 'Hostname je prázdný.'; $wb['name_error_regex'] = 'Hostname má chybný formát.'; $wb['data_error_empty'] = 'Hostname e-mailového serveru je prázdný'; $wb['data_error_regex'] = 'Hostname e-mailového serveru má chybný formát'; -$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.'; +$wb['duplicate_mx_record_txt'] = 'Duplicitní MX záznam.'; ?> + diff --git a/interface/web/dns/lib/lang/cz_dns_ns.lng b/interface/web/dns/lib/lang/cz_dns_ns.lng index ba38e2a65e..73f897b683 100644 --- a/interface/web/dns/lib/lang/cz_dns_ns.lng +++ b/interface/web/dns/lib/lang/cz_dns_ns.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Zóna má chybný formát.'; $wb['data_error_empty'] = 'Jmenný server je prázdný'; $wb['data_error_regex'] = 'Jmenný server má chybný formát'; ?> + diff --git a/interface/web/dns/lib/lang/cz_dns_ptr.lng b/interface/web/dns/lib/lang/cz_dns_ptr.lng index 9617ea5852..6124f30d30 100644 --- a/interface/web/dns/lib/lang/cz_dns_ptr.lng +++ b/interface/web/dns/lib/lang/cz_dns_ptr.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Název má chybný formát.'; $wb['data_error_empty'] = 'Kanonický hostname je prázdný'; $wb['data_error_regex'] = 'Kanonického hostname má chybný formát'; ?> + diff --git a/interface/web/dns/lib/lang/cz_dns_rp.lng b/interface/web/dns/lib/lang/cz_dns_rp.lng index 8b1e7e442e..10218a7738 100644 --- a/interface/web/dns/lib/lang/cz_dns_rp.lng +++ b/interface/web/dns/lib/lang/cz_dns_rp.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.'; $wb['data_error_empty'] = 'Odpovědná osoba je prázdná'; $wb['data_error_regex'] = 'Odpovědná osoba má chybný formát'; ?> + diff --git a/interface/web/dns/lib/lang/cz_dns_slave.lng b/interface/web/dns/lib/lang/cz_dns_slave.lng index 16617f6c59..2870562a8c 100644 --- a/interface/web/dns/lib/lang/cz_dns_slave.lng +++ b/interface/web/dns/lib/lang/cz_dns_slave.lng @@ -15,3 +15,4 @@ $wb['eg_domain_tld'] = 'např. domena.cz'; $wb['ipv4_form_txt'] = 'IPV4 formát, např. 1.2.3.4'; $wb['secondary_zone_txt'] = 'Sekundární DNS zóna'; ?> + diff --git a/interface/web/dns/lib/lang/cz_dns_slave_list.lng b/interface/web/dns/lib/lang/cz_dns_slave_list.lng index 1e0a3d0106..3f801f97b9 100644 --- a/interface/web/dns/lib/lang/cz_dns_slave_list.lng +++ b/interface/web/dns/lib/lang/cz_dns_slave_list.lng @@ -7,3 +7,4 @@ $wb['ns_txt'] = 'NS'; $wb['add_new_record_txt'] = 'Přidat sekundární DNS zónu'; $wb['eg_domain_tld'] = 'např. domena.cz'; ?> + diff --git a/interface/web/dns/lib/lang/cz_dns_soa.lng b/interface/web/dns/lib/lang/cz_dns_soa.lng index c98cb6d3bd..521ea3cef9 100644 --- a/interface/web/dns/lib/lang/cz_dns_soa.lng +++ b/interface/web/dns/lib/lang/cz_dns_soa.lng @@ -36,3 +36,4 @@ $wb['minimum_range_error'] = 'Minimální doba je 60 sekund.'; $wb['ttl_range_error'] = 'Min. TTL čas je 60 sekund.'; $wb['xfer_error_regex'] = 'Také oznámí: Prosím, použijte IP adresu.'; ?> + diff --git a/interface/web/dns/lib/lang/cz_dns_soa_list.lng b/interface/web/dns/lib/lang/cz_dns_soa_list.lng index beba8a22b2..05834d4933 100644 --- a/interface/web/dns/lib/lang/cz_dns_soa_list.lng +++ b/interface/web/dns/lib/lang/cz_dns_soa_list.lng @@ -8,3 +8,4 @@ $wb['mbox_txt'] = 'E-mail'; $wb['add_new_record_txt'] = 'Přidat DNS zónu (SOA záznam)'; $wb['add_new_record_wizard_txt'] = 'Přidat DNS zónu (dle šablony)'; ?> + diff --git a/interface/web/dns/lib/lang/cz_dns_srv.lng b/interface/web/dns/lib/lang/cz_dns_srv.lng index 6b6708fc01..88b1fc1cbf 100644 --- a/interface/web/dns/lib/lang/cz_dns_srv.lng +++ b/interface/web/dns/lib/lang/cz_dns_srv.lng @@ -17,3 +17,4 @@ $wb['data_error_regex'] = 'Záznam serveru má chybný formát'; $wb['srv_error_regex'] = 'Neplatný formát záznamu serveru. Záznam serveru musí­ obsahovat 3 textové řetězce oddělené mezerami.'; $wb['aux_txt'] = 'Priority'; ?> + diff --git a/interface/web/dns/lib/lang/cz_dns_template.lng b/interface/web/dns/lib/lang/cz_dns_template.lng index be4ac0e949..82e207a83f 100644 --- a/interface/web/dns/lib/lang/cz_dns_template.lng +++ b/interface/web/dns/lib/lang/cz_dns_template.lng @@ -4,3 +4,4 @@ $wb['fields_txt'] = 'Pole'; $wb['template_txt'] = 'Šablona'; $wb['visible_txt'] = 'Viditelný'; ?> + diff --git a/interface/web/dns/lib/lang/cz_dns_template_list.lng b/interface/web/dns/lib/lang/cz_dns_template_list.lng index bdd6e18204..10c3fcfabd 100644 --- a/interface/web/dns/lib/lang/cz_dns_template_list.lng +++ b/interface/web/dns/lib/lang/cz_dns_template_list.lng @@ -4,3 +4,4 @@ $wb['visible_txt'] = 'Viditelný'; $wb['name_txt'] = 'Název'; $wb['add_new_record_txt'] = 'Přidat záznam'; ?> + diff --git a/interface/web/dns/lib/lang/cz_dns_txt.lng b/interface/web/dns/lib/lang/cz_dns_txt.lng index 76047b0ceb..0c07487276 100644 --- a/interface/web/dns/lib/lang/cz_dns_txt.lng +++ b/interface/web/dns/lib/lang/cz_dns_txt.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.'; $wb['data_error_empty'] = 'Text je prázdný'; $wb['data_error_regex'] = 'Text má chybný formát'; ?> + diff --git a/interface/web/dns/lib/lang/cz_dns_wizard.lng b/interface/web/dns/lib/lang/cz_dns_wizard.lng index 1b2e5f7600..493d0bc54b 100644 --- a/interface/web/dns/lib/lang/cz_dns_wizard.lng +++ b/interface/web/dns/lib/lang/cz_dns_wizard.lng @@ -36,3 +36,4 @@ $wb['globalsearch_suggestions_text_txt'] = 'Návrhy'; $wb['list_head_txt'] = 'Průvodce vytvořením DNS zóny'; $wb['list_desc_txt'] = 'Vytvoření DNS zóny pomocí průvodce'; ?> + diff --git a/interface/web/dns/lib/lang/de.lng b/interface/web/dns/lib/lang/de.lng index 822fcd6a79..65f6646fc4 100644 --- a/interface/web/dns/lib/lang/de.lng +++ b/interface/web/dns/lib/lang/de.lng @@ -20,3 +20,4 @@ $wb['Templates'] = 'Vorlagen'; $wb['Secondary Zones'] = 'Slave DNS-Zonen'; $wb['Import Zone File'] = 'Zonen-Datei-Import'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_a.lng b/interface/web/dns/lib/lang/de_dns_a.lng index 409864981a..dd809c3925 100644 --- a/interface/web/dns/lib/lang/de_dns_a.lng +++ b/interface/web/dns/lib/lang/de_dns_a.lng @@ -14,3 +14,4 @@ $wb['data_error_empty'] = 'IPv4 Adresse ist leer'; $wb['data_error_regex'] = 'IPv4 Adressen Format ist ungültig'; $wb['data_error_duplicate'] = 'Doppelter A oder CNAME Eintrag'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_a_list.lng b/interface/web/dns/lib/lang/de_dns_a_list.lng index 6e8f19509f..0fc4419925 100644 --- a/interface/web/dns/lib/lang/de_dns_a_list.lng +++ b/interface/web/dns/lib/lang/de_dns_a_list.lng @@ -13,3 +13,4 @@ $wb['page_txt'] = 'Seite'; $wb['page_of_txt'] = 'von'; $wb['delete_confirmation'] = 'Wollen Sie den Datensatz wirklich löschen?'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_aaaa.lng b/interface/web/dns/lib/lang/de_dns_aaaa.lng index 854d623cff..c2d0e35f51 100644 --- a/interface/web/dns/lib/lang/de_dns_aaaa.lng +++ b/interface/web/dns/lib/lang/de_dns_aaaa.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Der Hostname hat das falsche Format.'; $wb['data_error_empty'] = 'IPv6 Adresse ist leer'; $wb['data_error_regex'] = 'IPv6 Adressen Format ist ungültig'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_alias.lng b/interface/web/dns/lib/lang/de_dns_alias.lng index e950909bb2..48da14fcfe 100644 --- a/interface/web/dns/lib/lang/de_dns_alias.lng +++ b/interface/web/dns/lib/lang/de_dns_alias.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Der Hostname hat ein falsches Format.'; $wb['data_error_empty'] = 'Ziel Hostname ist leer'; $wb['data_error_regex'] = 'Ziel Hostname Format ist ungültig'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_cname.lng b/interface/web/dns/lib/lang/de_dns_cname.lng index a074194853..48efdef90a 100644 --- a/interface/web/dns/lib/lang/de_dns_cname.lng +++ b/interface/web/dns/lib/lang/de_dns_cname.lng @@ -14,3 +14,4 @@ $wb['data_error_empty'] = 'Ziel Hostname ist leer'; $wb['data_error_regex'] = 'Ziel Hostname Format ist ungültig'; $wb['data_error_duplicate'] = 'Doppelter A oder CNAME Eintrag'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_hinfo.lng b/interface/web/dns/lib/lang/de_dns_hinfo.lng index 5fb182c982..e0393c6be5 100644 --- a/interface/web/dns/lib/lang/de_dns_hinfo.lng +++ b/interface/web/dns/lib/lang/de_dns_hinfo.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Der Hostname hat ein falsches Format.'; $wb['data_error_empty'] = 'Host Information ist leer'; $wb['data_error_regex'] = 'Host Information Format ist ungültig'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_import.lng b/interface/web/dns/lib/lang/de_dns_import.lng index 183809de66..e6ca3bb06c 100644 --- a/interface/web/dns/lib/lang/de_dns_import.lng +++ b/interface/web/dns/lib/lang/de_dns_import.lng @@ -12,3 +12,4 @@ $wb['domain_field_desc_txt'] = 'Kann freigelassen werden, falls der Dateiname od $wb['title'] = 'Zonen Datei importieren'; $wb['no_file_uploaded_error'] = 'Keine Datei hochgeladen'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_mx.lng b/interface/web/dns/lib/lang/de_dns_mx.lng index 4920806ad5..63f99c680e 100644 --- a/interface/web/dns/lib/lang/de_dns_mx.lng +++ b/interface/web/dns/lib/lang/de_dns_mx.lng @@ -15,3 +15,4 @@ $wb['data_error_empty'] = 'Mailserver Hostname ist leer'; $wb['data_error_regex'] = 'Mailserver Hostname Format ist ungültig'; $wb['duplicate_mx_record_txt'] = 'Doppelter MX-Eintrag.'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_ns.lng b/interface/web/dns/lib/lang/de_dns_ns.lng index 01662d2f8a..0f61c16938 100644 --- a/interface/web/dns/lib/lang/de_dns_ns.lng +++ b/interface/web/dns/lib/lang/de_dns_ns.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Die Zone hat ein falsches Format.'; $wb['data_error_empty'] = 'Nameserver ist leer.'; $wb['data_error_regex'] = 'Nameserver Format ist ungültig.'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_ptr.lng b/interface/web/dns/lib/lang/de_dns_ptr.lng index 020c7a3286..5ff80e3221 100644 --- a/interface/web/dns/lib/lang/de_dns_ptr.lng +++ b/interface/web/dns/lib/lang/de_dns_ptr.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Der Name hat das falsche Format.'; $wb['data_error_empty'] = 'Kanonischer Hostname ist leer'; $wb['data_error_regex'] = 'Kanonischer Hostname Format ist ungültig'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_rp.lng b/interface/web/dns/lib/lang/de_dns_rp.lng index 8a398d4830..e7cd528500 100644 --- a/interface/web/dns/lib/lang/de_dns_rp.lng +++ b/interface/web/dns/lib/lang/de_dns_rp.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Der Hostname hat das falsche Format.'; $wb['data_error_empty'] = 'Kontaktperson Feld leer'; $wb['data_error_regex'] = 'Kontaktperson Format ungültig'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_slave.lng b/interface/web/dns/lib/lang/de_dns_slave.lng index 1b58088317..de3411ffa2 100644 --- a/interface/web/dns/lib/lang/de_dns_slave.lng +++ b/interface/web/dns/lib/lang/de_dns_slave.lng @@ -15,3 +15,4 @@ $wb['ns_error_regex'] = 'NS hat ein ungültiges Format.'; $wb['eg_domain_tld'] = 'Format: domain.tld.'; $wb['ipv4_form_txt'] = 'IPv4 Format: 1.2.3.4'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_slave_list.lng b/interface/web/dns/lib/lang/de_dns_slave_list.lng index dc60207d98..50b83693e7 100644 --- a/interface/web/dns/lib/lang/de_dns_slave_list.lng +++ b/interface/web/dns/lib/lang/de_dns_slave_list.lng @@ -7,3 +7,4 @@ $wb['ns_txt'] = 'NS'; $wb['add_new_record_txt'] = 'Neue Slave DNS-Zone hinzufügen'; $wb['eg_domain_tld'] = 'Format: domain.tld.'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_soa.lng b/interface/web/dns/lib/lang/de_dns_soa.lng index 8ff7141440..41570e2f09 100644 --- a/interface/web/dns/lib/lang/de_dns_soa.lng +++ b/interface/web/dns/lib/lang/de_dns_soa.lng @@ -36,3 +36,4 @@ $wb['minimum_range_error'] = 'Min. Minimum ist 60 Sekunden.'; $wb['ttl_range_error'] = 'Min. TTL ist 60 Sekunden.'; $wb['xfer_error_regex'] = 'Bitte Beachten: Verwenden Sie eine IP Adresse.'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_soa_list.lng b/interface/web/dns/lib/lang/de_dns_soa_list.lng index 8281fbd222..a6df1ee4d2 100644 --- a/interface/web/dns/lib/lang/de_dns_soa_list.lng +++ b/interface/web/dns/lib/lang/de_dns_soa_list.lng @@ -8,3 +8,4 @@ $wb['mbox_txt'] = 'E-Mail'; $wb['add_new_record_txt'] = 'Neue DNS Zone (SOA) hinzufügen'; $wb['add_new_record_wizard_txt'] = 'Neue DNS Zone per Assistent hinzufügen'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_srv.lng b/interface/web/dns/lib/lang/de_dns_srv.lng index 91eba844a2..7dbeb8e812 100644 --- a/interface/web/dns/lib/lang/de_dns_srv.lng +++ b/interface/web/dns/lib/lang/de_dns_srv.lng @@ -17,3 +17,4 @@ $wb['data_error_regex'] = 'Servereintrag-Format ungültig'; $wb['srv_error_regex'] = 'Ungültiges Server Record Format. Der ServerRecord muss 3 Text Strings getrennt durch Leerzeichen beinhalten.'; $wb['aux_txt'] = 'Priorität'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_template.lng b/interface/web/dns/lib/lang/de_dns_template.lng index 33d1090cba..77cf996184 100644 --- a/interface/web/dns/lib/lang/de_dns_template.lng +++ b/interface/web/dns/lib/lang/de_dns_template.lng @@ -4,3 +4,4 @@ $wb['fields_txt'] = 'Felder'; $wb['template_txt'] = 'Vorlage'; $wb['visible_txt'] = 'Sichtbar'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_template_list.lng b/interface/web/dns/lib/lang/de_dns_template_list.lng index a0f2d9a7d9..3557292fa3 100644 --- a/interface/web/dns/lib/lang/de_dns_template_list.lng +++ b/interface/web/dns/lib/lang/de_dns_template_list.lng @@ -4,3 +4,4 @@ $wb['visible_txt'] = 'Sichtbar'; $wb['name_txt'] = 'Name'; $wb['add_new_record_txt'] = 'Neuen Eintrag hinzufügen'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_txt.lng b/interface/web/dns/lib/lang/de_dns_txt.lng index c0638679a8..39a5dbfeb9 100644 --- a/interface/web/dns/lib/lang/de_dns_txt.lng +++ b/interface/web/dns/lib/lang/de_dns_txt.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Der Hostname hat das falsche Format.'; $wb['data_error_empty'] = 'Text ist leer'; $wb['data_error_regex'] = 'Textformat ungültig'; ?> + diff --git a/interface/web/dns/lib/lang/de_dns_wizard.lng b/interface/web/dns/lib/lang/de_dns_wizard.lng index bb90167b2c..3b247b1ce5 100644 --- a/interface/web/dns/lib/lang/de_dns_wizard.lng +++ b/interface/web/dns/lib/lang/de_dns_wizard.lng @@ -36,3 +36,4 @@ $wb['globalsearch_noresults_limit_txt'] = '0 Treffer'; $wb['globalsearch_searchfield_watermark_txt'] = 'Suche'; $wb['globalsearch_suggestions_text_txt'] = 'Vorschläge'; ?> + diff --git a/interface/web/dns/lib/lang/el.lng b/interface/web/dns/lib/lang/el.lng index f76afed784..3b3bfe84a7 100644 --- a/interface/web/dns/lib/lang/el.lng +++ b/interface/web/dns/lib/lang/el.lng @@ -17,6 +17,6 @@ $wb['DNS TXT'] = 'DNS TXT'; $wb['DNS Wizard'] = 'Οδηγός DNS'; $wb['Add DNS Zone'] = 'Νέα ζώνη DNS'; $wb['Templates'] = 'Πρότυπα'; -$wb['Secondary Zones'] = 'Secondary Zones'; -$wb['Import Zone File'] = 'Import Zone File'; +$wb['Secondary Zones'] = 'Δευτερεύουσες Ζώνες'; +$wb['Import Zone File'] = 'Εισαγωγή Αρχείου Ζώνης'; ?> diff --git a/interface/web/dns/lib/lang/el_dns_alias.lng b/interface/web/dns/lib/lang/el_dns_alias.lng index 9d29354028..2ca9f3b488 100644 --- a/interface/web/dns/lib/lang/el_dns_alias.lng +++ b/interface/web/dns/lib/lang/el_dns_alias.lng @@ -11,5 +11,5 @@ $wb['no_zone_perm'] = 'Δεν έχετε δικαίωμα να προσθέσε $wb['name_error_empty'] = 'Το hostname δεν έχει οριστεί'; $wb['name_error_regex'] = 'Το hostname έχει λάθος μορφοποίηση'; $wb['data_error_empty'] = 'Το hostname Προορισμός δεν έχει οριστεί'; -$wb['data_error_regex'] = 'Το hostname Προορισμός έχει λάθος μορφοποίηση'; +$wb['data_error_regex'] = 'Το hostname Προορισμός δεν έχει σωστή μορφοποίηση'; ?> diff --git a/interface/web/dns/lib/lang/el_dns_hinfo.lng b/interface/web/dns/lib/lang/el_dns_hinfo.lng index 457213e60f..f725ddc8bd 100644 --- a/interface/web/dns/lib/lang/el_dns_hinfo.lng +++ b/interface/web/dns/lib/lang/el_dns_hinfo.lng @@ -11,5 +11,5 @@ $wb['no_zone_perm'] = 'Δεν έχετε δικαίωμα να προσθέσε $wb['name_error_empty'] = 'Το hostname δεν έχει οριστεί'; $wb['name_error_regex'] = 'Το hostname δεν έχει σωστή μορφοποίηση'; $wb['data_error_empty'] = 'Οι πληροφορίες του Host είναι κενές'; -$wb['data_error_regex'] = 'Οι πληροφορίες Host έχουν μη έγκυρη μορφοποίηση'; +$wb['data_error_regex'] = 'Οι πληροφορίες Host δεν έχουν έγκυρη μορφοποίηση'; ?> diff --git a/interface/web/dns/lib/lang/el_dns_import.lng b/interface/web/dns/lib/lang/el_dns_import.lng index 2d1fe083ea..84608d1950 100644 --- a/interface/web/dns/lib/lang/el_dns_import.lng +++ b/interface/web/dns/lib/lang/el_dns_import.lng @@ -1,14 +1,14 @@ diff --git a/interface/web/dns/lib/lang/el_dns_mx.lng b/interface/web/dns/lib/lang/el_dns_mx.lng index 37c967bda4..4e779c47ef 100644 --- a/interface/web/dns/lib/lang/el_dns_mx.lng +++ b/interface/web/dns/lib/lang/el_dns_mx.lng @@ -13,5 +13,5 @@ $wb['name_error_empty'] = 'Το hostname δεν έχει οριστεί.'; $wb['name_error_regex'] = 'Το hostname δεν έχει σωστή μορφοποίηση.'; $wb['data_error_empty'] = 'Το hostname Mailserver δεν έχει οριστεί'; $wb['data_error_regex'] = 'Mailserver hostname με μη έγκυρη μορφοποίηση'; -$wb['duplicate_mx_record_txt'] = 'Duplicate MX record.'; +$wb['duplicate_mx_record_txt'] = 'Διπλοεγγραφή MX.'; ?> diff --git a/interface/web/dns/lib/lang/el_dns_slave.lng b/interface/web/dns/lib/lang/el_dns_slave.lng index 64db9755e8..979c4668f2 100644 --- a/interface/web/dns/lib/lang/el_dns_slave.lng +++ b/interface/web/dns/lib/lang/el_dns_slave.lng @@ -13,5 +13,5 @@ $wb['origin_error_regex'] = 'Η ζώνη δεν έχει έγκυρη μορφο $wb['ns_error_regex'] = 'Ο NS δεν έχει έγκυρη μορφοποίηση.'; $wb['eg_domain_tld'] = 'π.χ. domain.tld.'; $wb['ipv4_form_txt'] = 'μορφή IPv4 - π.χ. 1.2.3.4'; -$wb['secondary_zone_txt'] = 'Secondary DNS Zone'; +$wb['secondary_zone_txt'] = 'Δευτερεύουσα Ζώνη DNS'; ?> diff --git a/interface/web/dns/lib/lang/el_dns_soa.lng b/interface/web/dns/lib/lang/el_dns_soa.lng index 87d5fc7ec5..045270a366 100644 --- a/interface/web/dns/lib/lang/el_dns_soa.lng +++ b/interface/web/dns/lib/lang/el_dns_soa.lng @@ -28,11 +28,11 @@ $wb['seconds_txt'] = 'Δευτερόλεπτα'; $wb['eg_domain_tld'] = 'π.χ. domain.tld'; $wb['eg_ns1_domain_tld'] = 'π.χ. ns1.domain.tld'; $wb['eg_webmaster_domain_tld'] = 'π.χ. webmaster@domain.tld'; -$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'; -$wb['refresh_range_error'] = 'Min. Refresh time is 60 seconds.'; -$wb['retry_range_error'] = 'Min. Retry time is 60 seconds.'; -$wb['expire_range_error'] = 'Min. Expire time is 60 seconds.'; -$wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.'; -$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.'; -$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.'; +$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'Το Domain Δεν μπορεί να αλλαχθεί. Παρακαλούμε επικοινωνήστε με τον Διαχειριστή σας αν θέλετε να γίνει η αλλαγή του ονόματος.'; +$wb['refresh_range_error'] = 'Ελάχιστος χρόνος Ανανέωσης είναι τα 60 δευτερόλεπτα.'; +$wb['retry_range_error'] = 'Ελάχιστος χρόνος Επανάληψης είναι τα 60 δευτερόλεπτα.'; +$wb['expire_range_error'] = 'Ελάχιστος χρόνος Λήξης είναι τα 60 δευτερόλεπτα.'; +$wb['minimum_range_error'] = 'Ελάχιστος χρόνος Ελαχίστου είναι τα 60 δευτερόλεπτα.'; +$wb['ttl_range_error'] = 'Ελάχιστος χρόνος TTL είναι τα 60 δευτερόλεπτα.'; +$wb['xfer_error_regex'] = 'Επιπλέον Ειδοποίηση: Παρακαλούμε χρησιμοποιείστε μια διεύθυσνη IP.'; ?> diff --git a/interface/web/dns/lib/lang/el_dns_srv.lng b/interface/web/dns/lib/lang/el_dns_srv.lng index 4452d6bfc4..53dc3dd2d7 100644 --- a/interface/web/dns/lib/lang/el_dns_srv.lng +++ b/interface/web/dns/lib/lang/el_dns_srv.lng @@ -1,19 +1,19 @@ diff --git a/interface/web/dns/lib/lang/el_dns_wizard.lng b/interface/web/dns/lib/lang/el_dns_wizard.lng index 764e4fafa5..0c59b252fc 100644 --- a/interface/web/dns/lib/lang/el_dns_wizard.lng +++ b/interface/web/dns/lib/lang/el_dns_wizard.lng @@ -26,13 +26,13 @@ $wb['error_domain_regex'] = 'Το Domain περιέχει μη επιτρεπό $wb['error_ns1_regex'] = 'Ο NS1 περιέχει μη επιτρεπόμενους χαρακτήρες'; $wb['error_ns2_regex'] = 'Ο NS2 περιέχει μη επιτρεπόμενους χαρακτήρες'; $wb['error_email_regex'] = 'Το Email δεν περιέχει μια έγκυρη διεύθυνση.'; -$wb['dns_zone_txt'] = 'DNS Zone'; -$wb['globalsearch_resultslimit_of_txt'] = 'of'; -$wb['globalsearch_resultslimit_results_txt'] = 'results'; -$wb['globalsearch_noresults_text_txt'] = 'No results.'; -$wb['globalsearch_noresults_limit_txt'] = '0 results'; -$wb['globalsearch_searchfield_watermark_txt'] = 'Search'; -$wb['globalsearch_suggestions_text_txt'] = 'Suggestions'; -$wb['list_head_txt'] = 'DNS Zone Wizard'; -$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard'; +$wb['dns_zone_txt'] = 'Ζώνη DNS'; +$wb['globalsearch_resultslimit_of_txt'] = 'από'; +$wb['globalsearch_resultslimit_results_txt'] = 'αποτελέσματα'; +$wb['globalsearch_noresults_text_txt'] = 'Δεν υπάρχουν αποτελέσματα.'; +$wb['globalsearch_noresults_limit_txt'] = '0 αποτελέσματα'; +$wb['globalsearch_searchfield_watermark_txt'] = 'Αναζήτηση'; +$wb['globalsearch_suggestions_text_txt'] = 'Προτάσεις'; +$wb['list_head_txt'] = 'Οδηγός Ζώνης DNS'; +$wb['list_desc_txt'] = 'Δημιουργία Ζώνης DNS Zone μέσω Οδηγού'; ?> diff --git a/interface/web/dns/lib/lang/en_dns_dkim.lng b/interface/web/dns/lib/lang/en_dns_dkim.lng deleted file mode 100644 index 526257e909..0000000000 --- a/interface/web/dns/lib/lang/en_dns_dkim.lng +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/interface/web/dns/lib/lang/en_dns_wizard.lng b/interface/web/dns/lib/lang/en_dns_wizard.lng index 8759159a82..f7057b45c7 100644 --- a/interface/web/dns/lib/lang/en_dns_wizard.lng +++ b/interface/web/dns/lib/lang/en_dns_wizard.lng @@ -6,13 +6,12 @@ $wb['template_id_txt'] = 'Template'; $wb['server_id_txt'] = 'Server'; $wb['client_txt'] = 'Client'; $wb["btn_save_txt"] = 'Create DNS-Record'; -$wb["btn_cancel_txt"] = 'Cancel'; -$wb['domain_txt'] = 'Domain'; -$wb['email_txt'] = 'Email'; -$wb['dkim_txt'] = 'DKIM enabled'; -$wb['ns1_txt'] = 'NS 1'; -$wb['ns2_txt'] = 'NS 2'; -$wb['ip_txt'] = 'IP Address'; +$wb["btn_cancel_txt"] = 'Cancel'; +$wb['domain_txt'] = 'Domain'; +$wb['email_txt'] = 'Email'; +$wb['ns1_txt'] = 'NS 1'; +$wb['ns2_txt'] = 'NS 2'; +$wb['ip_txt'] = 'IP Address'; $wb['error_origin_empty'] = 'Origin empty.'; $wb['error_ns_empty'] = 'NS empty.'; $wb['error_mbox_empty'] = 'Mbox empty.'; @@ -33,7 +32,7 @@ $wb['error_email_regex'] = 'Email does not contain a valid email address.'; $wb['globalsearch_resultslimit_of_txt'] = "of"; $wb['globalsearch_resultslimit_results_txt'] = "results"; $wb['globalsearch_noresults_text_txt'] = "No results."; -$wb['globalsearch_noresults_limit_txt'] = "0 results"; -$wb['globalsearch_searchfield_watermark_txt'] = "Search"; -$wb['globalsearch_suggestions_text_txt'] = "Suggestions"; -?> +$wb['globalsearch_noresults_limit_txt'] = "0 results"; +$wb['globalsearch_searchfield_watermark_txt'] = "Search"; +$wb['globalsearch_suggestions_text_txt'] = "Suggestions"; +?> \ No newline at end of file diff --git a/interface/web/dns/templates/dns_a_list.htm b/interface/web/dns/templates/dns_a_list.htm index 06c3f941e5..549f0c345a 100644 --- a/interface/web/dns/templates/dns_a_list.htm +++ b/interface/web/dns/templates/dns_a_list.htm @@ -18,13 +18,12 @@
{tmpl_var name="toolsarea_head_txt"}
- - - - - - - + + + + + + diff --git a/interface/web/dns/templates/dns_dkim_edit.htm b/interface/web/dns/templates/dns_dkim_edit.htm deleted file mode 100644 index cbf8db941a..0000000000 --- a/interface/web/dns/templates/dns_dkim_edit.htm +++ /dev/null @@ -1,38 +0,0 @@ -

-

- -
-
-
-
- - -
-
- - -
- -
-

{tmpl_var name='active_txt'}

-
- {tmpl_var name='active'} -
-
-
- - - - - -
- -
- - -
-
- -
- - diff --git a/interface/web/dns/templates/dns_wizard.htm b/interface/web/dns/templates/dns_wizard.htm index 81eb265a14..849c5b4e15 100644 --- a/interface/web/dns/templates/dns_wizard.htm +++ b/interface/web/dns/templates/dns_wizard.htm @@ -64,17 +64,12 @@
- -
- - - - - - -
- - + + + + + +
diff --git a/interface/web/help/lib/lang/cz.lng b/interface/web/help/lib/lang/cz.lng index 18f8f210b7..95efe025d2 100644 --- a/interface/web/help/lib/lang/cz.lng +++ b/interface/web/help/lib/lang/cz.lng @@ -12,3 +12,4 @@ $wb['Manage Sections'] = 'Spravovat sekce'; $wb['Manage Questions'] = 'Spravovat dotazy'; $wb['Add a Question & Answer Pair'] = 'Přidat otázku a odpověď'; ?> + diff --git a/interface/web/help/lib/lang/cz_faq_form.lng b/interface/web/help/lib/lang/cz_faq_form.lng index 73feee6955..c71ddfa9ac 100644 --- a/interface/web/help/lib/lang/cz_faq_form.lng +++ b/interface/web/help/lib/lang/cz_faq_form.lng @@ -4,3 +4,4 @@ $wb['faq_question_txt'] = 'Otázka'; $wb['faq_answer_txt'] = 'Odpověď'; $wb['faq_section_txt'] = 'Sekce'; ?> + diff --git a/interface/web/help/lib/lang/cz_faq_manage_questions_list.lng b/interface/web/help/lib/lang/cz_faq_manage_questions_list.lng index a9488445ca..7a4a2fd3ad 100644 --- a/interface/web/help/lib/lang/cz_faq_manage_questions_list.lng +++ b/interface/web/help/lib/lang/cz_faq_manage_questions_list.lng @@ -7,3 +7,4 @@ $wb['faq_sections_txt'] = 'Sekce'; $wb['faq_faq_questions_txt'] = 'Často kladené dotazy'; $wb['faq_new_question_txt'] = 'Přidat nový dotaz'; ?> + diff --git a/interface/web/help/lib/lang/cz_help_faq_list.lng b/interface/web/help/lib/lang/cz_help_faq_list.lng index b6c7b460b9..0dcf23b3ba 100644 --- a/interface/web/help/lib/lang/cz_help_faq_list.lng +++ b/interface/web/help/lib/lang/cz_help_faq_list.lng @@ -1,3 +1,4 @@ + diff --git a/interface/web/help/lib/lang/cz_help_faq_sections_list.lng b/interface/web/help/lib/lang/cz_help_faq_sections_list.lng index 967b0abfcd..596a9ef69b 100644 --- a/interface/web/help/lib/lang/cz_help_faq_sections_list.lng +++ b/interface/web/help/lib/lang/cz_help_faq_sections_list.lng @@ -6,3 +6,4 @@ $wb['faq_sections_txt'] = 'Sekce'; $wb['faq_faq_sections_txt'] = 'Sekce FAQ'; $wb['faq_new_section_txt'] = 'Přidat novou sekci'; ?> + diff --git a/interface/web/help/lib/lang/cz_support_message.lng b/interface/web/help/lib/lang/cz_support_message.lng index a6afd5adb5..1d06da314e 100644 --- a/interface/web/help/lib/lang/cz_support_message.lng +++ b/interface/web/help/lib/lang/cz_support_message.lng @@ -5,11 +5,12 @@ $wb['subject_txt'] = 'Předmět'; $wb['message_txt'] = 'Zpráva'; $wb['tstamp_txt'] = 'Časové razítko'; $wb['reply_txt'] = 'Odpovědět'; -$wb['date_txt'] = 'Date'; -$wb['support_request_subject_txt'] = 'Support Request'; +$wb['date_txt'] = 'Datum'; +$wb['support_request_subject_txt'] = 'Žádost o podporu'; $wb['support_request_txt'] = 'You have got a support request. Please don\'t reply to this email, but process the support request inside ISPConfig.'; $wb['answer_to_support_request_txt'] = 'You have got a reply to your support request. Please don\'t reply to this email, but process the message inside ISPConfig.'; $wb['answer_to_support_request_sent_txt'] = 'Your reply to the support request has been sent. Please don\'t reply to this email.'; $wb['support_request_sent_txt'] = 'Your support request has been sent. Please don\'t reply to this email.'; -$wb['recipient_or_sender_email_address_not_valid_txt'] = 'The message could not be sent because the recipient and/or the sender email address is not valid.'; +$wb['recipient_or_sender_email_address_not_valid_txt'] = 'Zprávu nelze odeslat, protože e-mailová adresa příjemce a/nebo odesílatele není platná.'; ?> + diff --git a/interface/web/help/lib/lang/cz_support_message_list.lng b/interface/web/help/lib/lang/cz_support_message_list.lng index c4c43eb872..f31449c9ce 100644 --- a/interface/web/help/lib/lang/cz_support_message_list.lng +++ b/interface/web/help/lib/lang/cz_support_message_list.lng @@ -3,5 +3,6 @@ $wb['list_head_txt'] = 'Zprávy pro podporu'; $wb['sender_id_txt'] = 'Odesílatel'; $wb['subject_txt'] = 'Předmět'; $wb['add_new_record_txt'] = 'Vytvořit zprávu pro podporu'; -$wb['date_txt'] = 'Date'; +$wb['date_txt'] = 'Datum'; ?> + diff --git a/interface/web/help/lib/lang/de.lng b/interface/web/help/lib/lang/de.lng index f9deb2066c..606b4f0399 100644 --- a/interface/web/help/lib/lang/de.lng +++ b/interface/web/help/lib/lang/de.lng @@ -12,3 +12,4 @@ $wb['Manage Sections'] = 'Kategorien verwalten'; $wb['Add a Question & Answer Pair'] = 'Neues Frage/Antwort Paar hinzufügen'; $wb['Manage Questions'] = 'Fragen verwalten'; ?> + diff --git a/interface/web/help/lib/lang/de_faq_form.lng b/interface/web/help/lib/lang/de_faq_form.lng index 35042fa128..90c6a44379 100644 --- a/interface/web/help/lib/lang/de_faq_form.lng +++ b/interface/web/help/lib/lang/de_faq_form.lng @@ -4,3 +4,4 @@ $wb['faq_question_txt'] = 'Frage'; $wb['faq_answer_txt'] = 'Antwort'; $wb['faq_section_txt'] = 'Kategorie'; ?> + diff --git a/interface/web/help/lib/lang/de_faq_manage_questions_list.lng b/interface/web/help/lib/lang/de_faq_manage_questions_list.lng index b47a695890..f3be08c85c 100644 --- a/interface/web/help/lib/lang/de_faq_manage_questions_list.lng +++ b/interface/web/help/lib/lang/de_faq_manage_questions_list.lng @@ -7,3 +7,4 @@ $wb['faq_sections_txt'] = 'Kategorie'; $wb['faq_faq_questions_txt'] = 'Frequently Asked Questions'; $wb['faq_new_question_txt'] = 'Neues Frage/Antwort Paar hinzufügen'; ?> + diff --git a/interface/web/help/lib/lang/de_faq_sections_form.lng b/interface/web/help/lib/lang/de_faq_sections_form.lng index 873dab2c19..f9f7cd4225 100644 --- a/interface/web/help/lib/lang/de_faq_sections_form.lng +++ b/interface/web/help/lib/lang/de_faq_sections_form.lng @@ -1,3 +1,4 @@ + diff --git a/interface/web/help/lib/lang/de_help_faq_list.lng b/interface/web/help/lib/lang/de_help_faq_list.lng index 3a240f4035..66fd26c6b2 100644 --- a/interface/web/help/lib/lang/de_help_faq_list.lng +++ b/interface/web/help/lib/lang/de_help_faq_list.lng @@ -1,3 +1,4 @@ + diff --git a/interface/web/help/lib/lang/de_help_faq_sections_list.lng b/interface/web/help/lib/lang/de_help_faq_sections_list.lng index 190f85a312..5d52ec8093 100644 --- a/interface/web/help/lib/lang/de_help_faq_sections_list.lng +++ b/interface/web/help/lib/lang/de_help_faq_sections_list.lng @@ -6,3 +6,4 @@ $wb['faq_sections_txt'] = 'Kategorie'; $wb['faq_faq_sections_txt'] = 'FAQ Kategorie'; $wb['faq_new_section_txt'] = 'Neue Kategorie hinzufügen'; ?> + diff --git a/interface/web/help/lib/lang/de_support_message.lng b/interface/web/help/lib/lang/de_support_message.lng index 67d68f9984..48a66b92da 100644 --- a/interface/web/help/lib/lang/de_support_message.lng +++ b/interface/web/help/lib/lang/de_support_message.lng @@ -7,9 +7,10 @@ $wb['tstamp_txt'] = 'Zeitpunkt'; $wb['reply_txt'] = 'Antworten'; $wb['date_txt'] = 'Datum'; $wb['support_request_subject_txt'] = 'Supportanfrage'; -$wb['support_request_txt'] = 'Sie haben eine Supportanfrage erhalten. Bitte antworten Sie nicht auf diese Email, sondern bearbeiten Sie die Supportanfrage in ISPConfig.'; -$wb['answer_to_support_request_txt'] = 'Sie haben eine Antwort auf Ihre Supportanfrage erhalten. Bitte antworten Sie nicht auf diese Email, sondern bearbeiten Sie die Nachricht in ISPConfig.'; -$wb['answer_to_support_request_sent_txt'] = 'Ihre Antwort auf die Supportanfrage ist verschickt worden. Bitte antworten Sie nicht auf diese Email.'; -$wb['support_request_sent_txt'] = 'Ihre Supportanfrage ist verschickt worden. Bitte antworten Sie nicht auf diese Email.'; -$wb['recipient_or_sender_email_address_not_valid_txt'] = 'Die Nachricht konnte nicht verschickt werden, da die Empfänger- und/oder die Sender-Email-Adresse nicht gültig ist.'; +$wb['support_request_txt'] = 'Sie haben eine Supportanfrage erhalten. Bitte antworten Sie nicht auf diese E-Mail, sondern bearbeiten Sie die Supportanfrage in ISPConfig.'; +$wb['answer_to_support_request_txt'] = 'Sie haben eine Antwort auf Ihre Supportanfrage erhalten. Bitte antworten Sie nicht auf diese E-Mail, sondern bearbeiten Sie die Nachricht in ISPConfig.'; +$wb['answer_to_support_request_sent_txt'] = 'Ihre Antwort auf die Supportanfrage ist verschickt worden. Bitte antworten Sie nicht auf diese E-Mail.'; +$wb['support_request_sent_txt'] = 'Ihre Supportanfrage ist verschickt worden. Bitte antworten Sie nicht auf diese E-Mail.'; +$wb['recipient_or_sender_email_address_not_valid_txt'] = 'Die Nachricht konnte nicht verschickt werden, da die Empfänger- und/oder die Sender E-Mail-Adresse nicht gültig ist.'; ?> + diff --git a/interface/web/help/lib/lang/de_support_message_list.lng b/interface/web/help/lib/lang/de_support_message_list.lng index 74fbeb2d7e..f6265d21d6 100644 --- a/interface/web/help/lib/lang/de_support_message_list.lng +++ b/interface/web/help/lib/lang/de_support_message_list.lng @@ -5,3 +5,4 @@ $wb['subject_txt'] = 'Betreff'; $wb['add_new_record_txt'] = 'Neue Supportnachricht erstellen'; $wb['date_txt'] = 'Datum'; ?> + diff --git a/interface/web/help/lib/lang/el_help_faq_list.lng b/interface/web/help/lib/lang/el_help_faq_list.lng index b6c7b460b9..30405c58f0 100644 --- a/interface/web/help/lib/lang/el_help_faq_list.lng +++ b/interface/web/help/lib/lang/el_help_faq_list.lng @@ -1,3 +1,3 @@ diff --git a/interface/web/js/dns_dkim.js b/interface/web/js/dns_dkim.js deleted file mode 100644 index 1294fd0249..0000000000 --- a/interface/web/js/dns_dkim.js +++ /dev/null @@ -1,73 +0,0 @@ -/* -Copyright (c) 2007 - 2013, Till Brehm, projektfarm Gmbh -Copyright (c) 2013, Florian Schaal, info@schaal-24.de -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of ISPConfig nor the names of its contributors - may be used to endorse or promote products derived from this software without - specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY -OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - - -This Javascript is invoked by - * dns/templates/dns_dkim_edit.htm to get the public key -*/ - var request = false; - - function setRequest(zone) { - if (window.XMLHttpRequest) {request = new XMLHttpRequest();} - else if (window.ActiveXObject) { - try {request = new ActiveXObject('Msxml2.XMLHTTP');} - catch (e) { - try {request = new ActiveXObject('Microsoft.XMLHTTP');} - catch (e) {} - } - } - if (!request) { - alert("Error creating XMLHTTP-instance"); - return false; - } else { - request.open('POST', 'dns/dns_dkim_get.php', true); - request.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); - request.send('&zone='+zone); - request.onreadystatechange = interpretRequest; - } - } - - function interpretRequest() { - switch (request.readyState) { - case 4: - if (request.status != 200) {alert("Request done but NOK\nError:"+request.status);} - else { - document.getElementsByName('data')[0].value = request.responseXML.getElementsByTagName('data')[0].firstChild.nodeValue; - document.getElementsByName('name')[0].value = request.responseXML.getElementsByTagName('name')[0].firstChild.nodeValue; - } - break; - default: - break; - } - } - -var serverType = jQuery('#zone').val(); -setRequest(serverType); - - diff --git a/interface/web/js/js.d/empty.dir b/interface/web/js/js.d/empty.dir new file mode 100644 index 0000000000..95ba9ef37c --- /dev/null +++ b/interface/web/js/js.d/empty.dir @@ -0,0 +1 @@ +This empty directory is needed by ISPConfig. diff --git a/interface/web/js/mail_domain_dkim.js b/interface/web/js/mail_domain_dkim.js deleted file mode 100644 index b07abc4f3e..0000000000 --- a/interface/web/js/mail_domain_dkim.js +++ /dev/null @@ -1,72 +0,0 @@ -/* -Copyright (c) 2007 - 2013, Till Brehm, projektfarm Gmbh -Copyright (c) 2013, Florian Schaal, info@schaal-24.de -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of ISPConfig nor the names of its contributors - may be used to endorse or promote products derived from this software without - specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY -OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - - -This Javascript is invoked by - * mail/templates/mail_domain_edit.htm to show and/or create the key-pair -*/ - var request = false; - - function setRequest(action,value,privatekey) { - if (window.XMLHttpRequest) {request = new XMLHttpRequest();} - else if (window.ActiveXObject) { - try {request = new ActiveXObject('Msxml2.XMLHTTP');} - catch (e) { - try {request = new ActiveXObject('Microsoft.XMLHTTP');} - catch (e) {} - } - } - if (!request) { - alert("Error creating XMLHTTP-instance"); - return false; - } else { - request.open('POST', 'mail/mail_domain_dkim_create.php', true); - request.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); - request.send('domain='+value+'&action='+action+'&pkey='+privatekey); - request.onreadystatechange = interpretRequest; - } - } - - function interpretRequest() { - switch (request.readyState) { - case 4: - if (request.status != 200) {alert("Request done but NOK\nError:"+request.status);} - else { - document.getElementsByName('dkim_private')[0].value = request.responseXML.getElementsByTagName('privatekey')[0].firstChild.nodeValue; - document.getElementsByName('dkim_public')[0].value = request.responseXML.getElementsByTagName('publickey')[0].firstChild.nodeValue; - } - break; - default: - break; - } - } - -var serverType = jQuery('#dkim_private').val(); -setRequest('show','{tmpl_var name="domain"}',serverType); - diff --git a/interface/web/login/lib/lang/cz.lng b/interface/web/login/lib/lang/cz.lng index f789b21ff4..4ce9a3b821 100644 --- a/interface/web/login/lib/lang/cz.lng +++ b/interface/web/login/lib/lang/cz.lng @@ -23,3 +23,4 @@ $wb['email_txt'] = 'E-mail'; $wb['theme_not_compatible'] = 'Zvolené téma není kompatibilní s aktuální verzí ISPConfig. Zkontrolujte prosím, zda není nová verze tématu.
Výchozí motiv byl aktivován automaticky.'; $wb['back_txt'] = 'Back'; ?> + diff --git a/interface/web/login/lib/lang/de.lng b/interface/web/login/lib/lang/de.lng index 439fa021bd..744643bcfa 100644 --- a/interface/web/login/lib/lang/de.lng +++ b/interface/web/login/lib/lang/de.lng @@ -23,3 +23,4 @@ $wb['error_maintenance_mode'] = 'Diese ISPConfig Installation wird gerade gewart $wb['theme_not_compatible'] = 'Das gewählte Design ist mit dieser ISPConfig Version nicht kompatibel. Bitte prüfen Sie, ob ein Update des Themes verfügbar ist.
Es wurde nun automatisch das Standard Design aktiviert.'; $wb['back_txt'] = 'Zurück'; ?> + diff --git a/interface/web/login/lib/lang/el.lng b/interface/web/login/lib/lang/el.lng index 00646c6db3..6fdfc5e571 100644 --- a/interface/web/login/lib/lang/el.lng +++ b/interface/web/login/lib/lang/el.lng @@ -14,12 +14,12 @@ $wb['pw_error_length'] = 'Το μέγεθος του συνθηματικού ε $wb['username_txt'] = 'Όνομα χρήστη'; $wb['password_txt'] = 'Συνθηματικό'; $wb['login_button_txt'] = 'Είσοδος'; -$wb['pw_lost_txt'] = 'Password lost'; -$wb['error_maintenance_mode'] = 'This ISPConfig installation is currently under maintenance. We should be back shortly. Thank you for your patience.'; -$wb['login_txt'] = 'Login'; -$wb['pw_reset_txt'] = 'Password reset'; -$wb['pw_button_txt'] = 'Resend password'; +$wb['pw_lost_txt'] = 'Χαμένο Συνθηματικό'; +$wb['error_maintenance_mode'] = 'Αυτή η εγκατάσταση ISPConfig βρίσκεται σε κατάσταση συντήρησης. Ευχαριστούμε για την υπομονή σας.'; +$wb['login_txt'] = 'Είσοδος'; +$wb['pw_reset_txt'] = 'Αρχικοποίηση Συνθηματικού'; +$wb['pw_button_txt'] = 'Επαναποστολή Συνθηματικού'; $wb['email_txt'] = 'Email'; -$wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.
The default theme as been activated automatically.'; -$wb['back_txt'] = 'Back'; +$wb['theme_not_compatible'] = 'Η επιλεγμένη θεματική παραλλαγή δεν είναι συμβατη με την τρέχουσα έκδοση ISPConfig. Παρακαλούμε ελέξτε για πιο πρόσφατη έκδοση.
Η προεπιλεγμένη θεματική παραλλαγή ενεργοποιήθηκε αυτόματα.'; +$wb['back_txt'] = 'Επιστροφή'; ?> diff --git a/interface/web/mail/form/mail_domain.tform.php b/interface/web/mail/form/mail_domain.tform.php index caf48d50b3..506f934e38 100644 --- a/interface/web/mail/form/mail_domain.tform.php +++ b/interface/web/mail/form/mail_domain.tform.php @@ -98,33 +98,6 @@ $form["tabs"]['domain'] = array ( 'maxlength' => '255', 'searchable' => 1 ), - 'dkim' => array ( - 'datatype' => 'VARCHAR', - 'formtype' => 'CHECKBOX', - 'default' => 'n', - 'value' => array(0 => 'n',1 => 'y') - ), - 'dkim_private' => array ( - 'datatype' => 'TEXT', - 'formtype' => 'TEXTAREA', - 'default' => '', - 'value' => '', - 'cols' => '30', - 'rows' => '10', - 'validators' => array ( 0 => array ('type' => 'CUSTOM', - 'class' => 'validate_dkim', - 'function' => 'check_private_key', - 'errmsg'=> 'dkim_private_key_error'), - ), - ), - 'dkim_public' => array ( - 'datatype' => 'TEXT', - 'formtype' => 'TEXTAREA', - 'default' => '', - 'value' => '', - 'cols' => '30', - 'rows' => '10' - ), 'active' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'CHECKBOX', @@ -138,4 +111,4 @@ $form["tabs"]['domain'] = array ( ); -?> +?> \ No newline at end of file diff --git a/interface/web/mail/form/mail_user.tform.php b/interface/web/mail/form/mail_user.tform.php index ddccdbf060..5ec0cbce29 100644 --- a/interface/web/mail/form/mail_user.tform.php +++ b/interface/web/mail/form/mail_user.tform.php @@ -38,8 +38,6 @@ */ global $app; -$app->uses('getconf'); -$global_config = $app->getconf->get_global_config(); $form["title"] = "Mailbox"; $form["description"] = ""; @@ -232,118 +230,115 @@ $form["tabs"]['mailuser'] = array ( ) ); -if ($global_config['mail']['mailbox_show_autoresponder_tab'] === 'y') { - $form["tabs"]['autoresponder'] = array ( - 'title' => "Autoresponder", - 'width' => 100, - 'template' => "templates/mail_user_autoresponder_edit.htm", - 'fields' => array ( - ################################## - # Begin Datatable fields - ################################## - 'autoresponder_subject' => array ( - 'datatype' => 'VARCHAR', - 'formtype' => 'TEXT', - 'default' => 'Out of office reply', - 'value' => '', - 'width' => '30', - 'maxlength' => '255' - ), - 'autoresponder_text' => array ( - 'datatype' => 'TEXT', - 'formtype' => 'TEXTAREA', - 'default' => '', - 'value' => '', - 'cols' => '30', - 'rows' => '15' - ), - 'autoresponder' => array ( - 'datatype' => 'VARCHAR', - 'formtype' => 'CHECKBOX', - 'default' => 'n', - 'value' => array(1 => 'y',0 => 'n') - ), - 'autoresponder_start_date' => array ( - 'datatype' => 'DATETIME', - 'formtype' => 'DATETIME', - 'validators'=> array ( 0 => array ( 'type' => 'CUSTOM', - 'class' => 'validate_autoresponder', - 'function' => 'start_date', - 'errmsg'=> 'autoresponder_start_date_is_required'), - ) - ), - 'autoresponder_end_date' => array ( - 'datatype' => 'DATETIME', - 'formtype' => 'DATETIME', - 'validators'=> array ( 0 => array ( 'type' => 'CUSTOM', - 'class' => 'validate_autoresponder', - 'function' => 'end_date', - 'errmsg'=> 'autoresponder_end_date_isgreater'), - ), - ), - ################################## - # END Datatable fields - ################################## - ) - ); -} - +$form["tabs"]['autoresponder'] = array ( + 'title' => "Autoresponder", + 'width' => 100, + 'template' => "templates/mail_user_autoresponder_edit.htm", + 'fields' => array ( + ################################## + # Begin Datatable fields + ################################## + 'autoresponder_subject' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'default' => 'Out of office reply', + 'value' => '', + 'width' => '30', + 'maxlength' => '255' + ), + 'autoresponder_text' => array ( + 'datatype' => 'TEXT', + 'formtype' => 'TEXTAREA', + 'default' => '', + 'value' => '', + 'cols' => '30', + 'rows' => '15' + ), + 'autoresponder' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'n', + 'value' => array(1 => 'y',0 => 'n') + ), + 'autoresponder_start_date' => array ( + 'datatype' => 'DATETIME', + 'formtype' => 'DATETIME', + 'validators'=> array ( 0 => array ( 'type' => 'CUSTOM', + 'class' => 'validate_autoresponder', + 'function' => 'start_date', + 'errmsg'=> 'autoresponder_start_date_is_required'), + ) + ), + 'autoresponder_end_date' => array ( + 'datatype' => 'DATETIME', + 'formtype' => 'DATETIME', + 'validators'=> array ( 0 => array ( 'type' => 'CUSTOM', + 'class' => 'validate_autoresponder', + 'function' => 'end_date', + 'errmsg'=> 'autoresponder_end_date_isgreater'), + ), + ), + ################################## + # END Datatable fields + ################################## + ) +); -if ($global_config['mail']['mailbox_show_mail_filter_tab'] === 'y') { - $form["tabs"]['filter_records'] = array ( - 'title' => "Mail Filter", - 'width' => 100, - 'template' => "templates/mail_user_mailfilter_edit.htm", - 'fields' => array ( - ################################## - # Begin Datatable fields - ################################## - 'move_junk' => array ( - 'datatype' => 'VARCHAR', - 'formtype' => 'CHECKBOX', - 'default' => 'n', - 'value' => array(0 => 'n',1 => 'y') - ), - ################################## - # END Datatable fields - ################################## +$form["tabs"]['filter_records'] = array ( + 'title' => "Mail Filter", + 'width' => 100, + 'template' => "templates/mail_user_mailfilter_edit.htm", + 'fields' => array ( + ################################## + # Begin Datatable fields + ################################## + 'move_junk' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'n', + 'value' => array(0 => 'n',1 => 'y') ), - 'plugins' => array ( - 'filter_records' => array ( - 'class' => 'plugin_listview', - 'options' => array( - 'listdef' => 'list/mail_user_filter.list.php', - 'sqlextwhere' => "mailuser_id = ".@$app->functions->intval(@$_REQUEST['id']), - 'sql_order_by' => "ORDER BY rulename" - ) + ################################## + # END Datatable fields + ################################## + ), + 'plugins' => array ( + 'filter_records' => array ( + 'class' => 'plugin_listview', + 'options' => array( + 'listdef' => 'list/mail_user_filter.list.php', + 'sqlextwhere' => "mailuser_id = ".@$app->functions->intval(@$_REQUEST['id']), + 'sql_order_by' => "ORDER BY rulename" ) - ) - ); -} + ) + ) +); +if($_SESSION["s"]["user"]["typ"] == 'admin') { + +$form["tabs"]['mailfilter'] = array ( + 'title' => "Custom Rules", + 'width' => 100, + 'template' => "templates/mail_user_custom_rules_edit.htm", + 'fields' => array ( + ################################## + # Begin Datatable fields + ################################## + 'custom_mailfilter' => array ( + 'datatype' => 'TEXT', + 'formtype' => 'TEXTAREA', + 'default' => '', + 'value' => '', + 'cols' => '30', + 'rows' => '15' + ), + ################################## + # END Datatable fields + ################################## + ) +); -if ($_SESSION["s"]["user"]["typ"] == 'admin' && $global_config['mail']['mailbox_show_custom_rules_tab'] === 'y') { - $form["tabs"]['mailfilter'] = array ( - 'title' => "Custom Rules", - 'width' => 100, - 'template' => "templates/mail_user_custom_rules_edit.htm", - 'fields' => array ( - ################################## - # Begin Datatable fields - ################################## - 'custom_mailfilter' => array ( - 'datatype' => 'TEXT', - 'formtype' => 'TEXTAREA', - 'default' => '', - 'value' => '', - 'cols' => '30', - 'rows' => '15' - ), - ################################## - # END Datatable fields - ################################## - ) - ); } -?> + +?> \ No newline at end of file diff --git a/interface/web/mail/lib/lang/cz.lng b/interface/web/mail/lib/lang/cz.lng index 6a5afe0685..c4b386b450 100644 --- a/interface/web/mail/lib/lang/cz.lng +++ b/interface/web/mail/lib/lang/cz.lng @@ -44,5 +44,6 @@ $wb['Global Filters'] = 'Globální filtry'; $wb['Domain Alias'] = 'Alias domény'; $wb['Relay Recipients'] = 'Relay adresáti'; $wb['Statistics'] = 'Statistiky'; -$wb['Mailbox quota'] = 'Mailbox kvóta'; +$wb['Mailbox quota'] = 'Kvóta e-mailové schránky'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_alias.lng b/interface/web/mail/lib/lang/cz_mail_alias.lng index 605e06b3c8..119b849739 100644 --- a/interface/web/mail/lib/lang/cz_mail_alias.lng +++ b/interface/web/mail/lib/lang/cz_mail_alias.lng @@ -12,3 +12,4 @@ $wb['domain_txt'] = 'Doména'; $wb['duplicate_email_alias_txt'] = 'Tento e-mail alias již existuje.'; $wb['source_txt'] = 'Alias'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_alias_list.lng b/interface/web/mail/lib/lang/cz_mail_alias_list.lng index de8cc2ef2a..db4fb4f8c7 100644 --- a/interface/web/mail/lib/lang/cz_mail_alias_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_alias_list.lng @@ -6,3 +6,4 @@ $wb['destination_txt'] = 'Cíl'; $wb['email_txt'] = 'E-mail'; $wb['add_new_record_txt'] = 'Přidat nový e-mailový alias'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng b/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng index 74611c2de0..7c74fb6edf 100644 --- a/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng +++ b/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng @@ -9,3 +9,4 @@ $wb['source_error_empty'] = 'Zdrojová doména je prázdná.'; $wb['source_error_unique'] = 'Duplikování zdrojové domény.'; $wb['source_error_regex'] = 'Chybná zdrojová doména.'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng index fd850d6f5f..155a87a7ba 100644 --- a/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng @@ -5,3 +5,4 @@ $wb['source_txt'] = 'Zdroj'; $wb['destination_txt'] = 'Cíl'; $wb['add_new_record_txt'] = 'Přidat doménový alias'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_blacklist.lng b/interface/web/mail/lib/lang/cz_mail_blacklist.lng index e1e6dab48f..93978c72f6 100644 --- a/interface/web/mail/lib/lang/cz_mail_blacklist.lng +++ b/interface/web/mail/lib/lang/cz_mail_blacklist.lng @@ -7,3 +7,4 @@ $wb['source_error_notempty'] = 'Adresa je prázdná.'; $wb['type_txt'] = 'Typ'; $wb['limit_mailfilter_txt'] = 'Dosažen maximální počet email filtrů pro Váš účet.'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng b/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng index 0ef1d3417c..ba76a7ed4b 100644 --- a/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng @@ -2,9 +2,10 @@ $wb['list_head_txt'] = 'E-mail černá listina'; $wb['active_txt'] = 'Aktivní'; $wb['server_id_txt'] = 'Server'; -$wb['source_txt'] = 'Adresy na černé lisitně'; +$wb['source_txt'] = 'Adresy na černé listině'; $wb['type_txt'] = 'Typ'; $wb['recipient_txt'] = 'Příjemce (adresát)'; $wb['add_new_record_txt'] = 'Přidat záznam na černou listinu'; $wb['access_txt'] = 'Přístup'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_content_filter.lng b/interface/web/mail/lib/lang/cz_mail_content_filter.lng index 459ca228a2..240de670e3 100644 --- a/interface/web/mail/lib/lang/cz_mail_content_filter.lng +++ b/interface/web/mail/lib/lang/cz_mail_content_filter.lng @@ -7,3 +7,4 @@ $wb['action_txt'] = 'Akce'; $wb['active_txt'] = 'Aktivní'; $wb['pattern_error_empty'] = 'Vzor je prázdný.'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_content_filter_list.lng b/interface/web/mail/lib/lang/cz_mail_content_filter_list.lng index da9709e7f9..68acaf780c 100644 --- a/interface/web/mail/lib/lang/cz_mail_content_filter_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_content_filter_list.lng @@ -6,3 +6,4 @@ $wb['pattern_txt'] = 'Vzor'; $wb['action_txt'] = 'Akce'; $wb['add_new_record_txt'] = 'Přidat obsahový filtr'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_domain.lng b/interface/web/mail/lib/lang/cz_mail_domain.lng index 026a2f1d27..d497e0502a 100644 --- a/interface/web/mail/lib/lang/cz_mail_domain.lng +++ b/interface/web/mail/lib/lang/cz_mail_domain.lng @@ -11,3 +11,4 @@ $wb['limit_maildomain_txt'] = 'Dosažen maximální počet email domén pro Vá $wb['policy_txt'] = 'Spamový filtr'; $wb['no_policy'] = '- nepovoleno -'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng index b579d2de08..8277ec4848 100644 --- a/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng @@ -6,3 +6,4 @@ $wb['add_new_record_txt'] = 'Přidat doménu'; $wb['active_txt'] = 'Aktivní'; $wb['sys_groupid_txt'] = 'Klient'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng b/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng index 488d0d5176..635091c425 100644 --- a/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng +++ b/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng @@ -9,3 +9,4 @@ $wb['limit_mailcatchall_txt'] = 'Dosažen maximální počet košů účtů pro $wb['source_txt'] = 'Zdroj'; $wb['destination_error_isemail'] = 'Cílová e-mailová adresa není platná.'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng index 3b24645ec8..7fd14a7adf 100644 --- a/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng @@ -7,3 +7,4 @@ $wb['server_id_txt'] = 'Server'; $wb['domain_txt'] = 'E-malová doména'; $wb['add_new_record_txt'] = 'Přidat e-mailový koš'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_domain_list.lng b/interface/web/mail/lib/lang/cz_mail_domain_list.lng index 2abb05cf74..141e9e87d3 100644 --- a/interface/web/mail/lib/lang/cz_mail_domain_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_domain_list.lng @@ -5,3 +5,4 @@ $wb['domain_txt'] = 'Doména'; $wb['add_new_record_txt'] = 'Přidat doménu'; $wb['active_txt'] = 'Aktivní'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_forward.lng b/interface/web/mail/lib/lang/cz_mail_forward.lng index a59bd9b52b..054650aaff 100644 --- a/interface/web/mail/lib/lang/cz_mail_forward.lng +++ b/interface/web/mail/lib/lang/cz_mail_forward.lng @@ -1,9 +1,10 @@ + diff --git a/interface/web/mail/lib/lang/cz_mail_forward_list.lng b/interface/web/mail/lib/lang/cz_mail_forward_list.lng index e5381fe5f8..6cf1f88ca4 100644 --- a/interface/web/mail/lib/lang/cz_mail_forward_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_forward_list.lng @@ -6,3 +6,4 @@ $wb['destination_txt'] = 'Cíl'; $wb['email_txt'] = 'E-mail'; $wb['add_new_record_txt'] = 'Přidat nové přesměrování'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_get.lng b/interface/web/mail/lib/lang/cz_mail_get.lng index 51b9f3403e..b73ddfddb6 100644 --- a/interface/web/mail/lib/lang/cz_mail_get.lng +++ b/interface/web/mail/lib/lang/cz_mail_get.lng @@ -16,3 +16,4 @@ $wb['source_server_error_regex'] = 'POP3/IMAP server není validní doménový n $wb['source_read_all_txt'] = 'Načíst všechny e-maily (včetně již přečtené pošty)'; $wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_get_list.lng b/interface/web/mail/lib/lang/cz_mail_get_list.lng index 9ca8b86dcb..55df9d27d7 100644 --- a/interface/web/mail/lib/lang/cz_mail_get_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_get_list.lng @@ -7,3 +7,4 @@ $wb['source_username_txt'] = 'Uživatelské jméno'; $wb['destination_txt'] = 'Cíl'; $wb['add_new_record_txt'] = 'Přidat účet'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_mailinglist.lng b/interface/web/mail/lib/lang/cz_mail_mailinglist.lng index 2d2278526e..7723f1f0e9 100644 --- a/interface/web/mail/lib/lang/cz_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/cz_mail_mailinglist.lng @@ -18,5 +18,6 @@ $wb['password_mismatch_txt'] = 'Hesla se neshodují.'; $wb['password_match_txt'] = 'Hesla se shodují.'; $wb['listname_error_unique'] = 'Na serveru je již shodný \\"název seznamu\\". Prosím, vyberte si jiný \\"název seznamu\\".'; $wb['email_error_isemail'] = 'E-mailová adresa je neplatná.'; -$wb['mailinglist_txt'] = 'Mailing list'; +$wb['mailinglist_txt'] = 'E-mailové konference'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng b/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng index db31273f59..abd9737338 100644 --- a/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng @@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'E-mailové konference'; $wb['domain_txt'] = 'Doména'; $wb['listname_txt'] = 'Název seznamu'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng b/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng index 0c07059c34..fbbdc48ab5 100644 --- a/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng +++ b/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng @@ -5,5 +5,6 @@ $wb['recipient_txt'] = 'Příjemce (adresát)'; $wb['active_txt'] = 'Aktivní'; $wb['source_error_notempty'] = 'Adresa je prázdná.'; $wb['type_txt'] = 'Typ'; -$wb['limit_mailfilter_txt'] = 'Dosažen maximální počet email filtrů pro Váš účet.'; +$wb['limit_mailfilter_txt'] = 'Dosažen maximální počet e-mail filtrů pro Váš účet.'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng index 1af959966c..19f46821f3 100644 --- a/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng @@ -7,3 +7,4 @@ $wb['recipient_txt'] = 'Příjemce (adresát)'; $wb['add_new_record_txt'] = 'Přidat relay adresáta'; $wb['access_txt'] = 'Přístup'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_spamfilter.lng b/interface/web/mail/lib/lang/cz_mail_spamfilter.lng index 4b6cc2b5d8..b538ad044a 100644 --- a/interface/web/mail/lib/lang/cz_mail_spamfilter.lng +++ b/interface/web/mail/lib/lang/cz_mail_spamfilter.lng @@ -15,3 +15,4 @@ $wb['email_error_unique'] = 'Pro tuto email adresu již existuje filtrovací zá $wb['spam_redirect_maildir_purge_txt'] = 'Vyčistit poté mailový adresář'; $wb['days_txt'] = 'Dny.'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng index 7560b570da..fa5924f2bd 100644 --- a/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng @@ -6,3 +6,4 @@ $wb['server_name_txt'] = 'server_name'; $wb['email_txt'] = 'E-mail'; $wb['add_new_record_txt'] = 'Přidat nový záznam spamfiltru'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_transport.lng b/interface/web/mail/lib/lang/cz_mail_transport.lng index dfe1855084..6a195f39cb 100644 --- a/interface/web/mail/lib/lang/cz_mail_transport.lng +++ b/interface/web/mail/lib/lang/cz_mail_transport.lng @@ -6,6 +6,7 @@ $wb['type_txt'] = 'Typ'; $wb['mx_txt'] = 'Neprovádět MX lookup'; $wb['sort_order_txt'] = 'Třídit podle'; $wb['active_txt'] = 'Aktivní'; -$wb['limit_mailrouting_txt'] = 'Dosažen maximální počet email směrování pro Váš účet.'; +$wb['limit_mailrouting_txt'] = 'Dosažen maximální počet e-mail směrování pro Váš účet.'; $wb['transport_txt'] = 'Transport'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_transport_list.lng b/interface/web/mail/lib/lang/cz_mail_transport_list.lng index e833293a2f..584e329adb 100644 --- a/interface/web/mail/lib/lang/cz_mail_transport_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_transport_list.lng @@ -7,3 +7,4 @@ $wb['transport_txt'] = 'Transport'; $wb['sort_order_txt'] = 'Třídit podle'; $wb['add_new_record_txt'] = 'Přidat transport'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_user.lng b/interface/web/mail/lib/lang/cz_mail_user.lng index 2c441f2aba..48a9ea35c5 100644 --- a/interface/web/mail/lib/lang/cz_mail_user.lng +++ b/interface/web/mail/lib/lang/cz_mail_user.lng @@ -5,7 +5,7 @@ $wb['cryptpwd_txt'] = 'Heslo'; $wb['password_strength_txt'] = 'Bezpečnost hesla'; $wb['active_txt'] = 'Aktivní'; $wb['email_error_isemail'] = 'E-mail adresa je chybná.'; -$wb['email_error_unique'] = 'Duplikování email adresy.'; +$wb['email_error_unique'] = 'Duplikování e-mail adresy.'; $wb['autoresponder_text_txt'] = 'Text'; $wb['autoresponder_txt'] = 'Aktivní'; $wb['autoresponder_start_date_txt'] = 'Začít od'; @@ -48,3 +48,4 @@ $wb['repeat_password_txt'] = 'Opakujte heslo'; $wb['password_mismatch_txt'] = 'Hesla se neshodují.'; $wb['password_match_txt'] = 'Hesla se shodují.'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_user_filter.lng b/interface/web/mail/lib/lang/cz_mail_user_filter.lng index 6cd8ed7e89..0fdd4ba147 100644 --- a/interface/web/mail/lib/lang/cz_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/cz_mail_user_filter.lng @@ -18,3 +18,4 @@ $wb['ends_with_txt'] = 'Končí na'; $wb['move_to_txt'] = 'Přesunout do'; $wb['delete_txt'] = 'Smazat'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_user_filter_list.lng b/interface/web/mail/lib/lang/cz_mail_user_filter_list.lng index 60229ce3b5..f5de2b289b 100644 --- a/interface/web/mail/lib/lang/cz_mail_user_filter_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_user_filter_list.lng @@ -5,3 +5,4 @@ $wb['page_txt'] = 'Stránka'; $wb['page_of_txt'] = 'z'; $wb['delete_confirmation'] = 'Opravdu smazat mailový filtr?'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_user_list.lng b/interface/web/mail/lib/lang/cz_mail_user_list.lng index e6dfd006ed..b4adbdb5d1 100644 --- a/interface/web/mail/lib/lang/cz_mail_user_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_user_list.lng @@ -6,3 +6,4 @@ $wb['add_new_record_txt'] = 'Přidat e-mailovou schránku'; $wb['name_txt'] = 'Skutečný název'; $wb['login_txt'] = 'Přihlášení'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_user_stats_list.lng b/interface/web/mail/lib/lang/cz_mail_user_stats_list.lng index 50cbc31d5c..9c7602dc38 100644 --- a/interface/web/mail/lib/lang/cz_mail_user_stats_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_user_stats_list.lng @@ -6,3 +6,4 @@ $wb['last_month_txt'] = 'Minulý měsíc'; $wb['this_year_txt'] = 'Tento rok'; $wb['last_year_txt'] = 'Minulý rok'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_whitelist.lng b/interface/web/mail/lib/lang/cz_mail_whitelist.lng index db55c18a0b..31dfd7574d 100644 --- a/interface/web/mail/lib/lang/cz_mail_whitelist.lng +++ b/interface/web/mail/lib/lang/cz_mail_whitelist.lng @@ -7,3 +7,4 @@ $wb['source_error_notempty'] = 'Adresa je prázdná.'; $wb['type_txt'] = 'Typ'; $wb['limit_mailfilter_txt'] = 'Dosažen maximální počet email filtrů pro Váš účet.'; ?> + diff --git a/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng b/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng index 7fae368999..bab30222ff 100644 --- a/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng @@ -8,3 +8,4 @@ $wb['recipient_txt'] = 'Příjemce (adresát)'; $wb['add_new_record_txt'] = 'Přidat záznam na bílou listinu'; $wb['access_txt'] = 'Přístup'; ?> + diff --git a/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng index 5e0c6b7799..2b929082c7 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng @@ -7,3 +7,4 @@ $wb['priority_txt'] = 'Priorita'; $wb['active_txt'] = 'Aktivní'; $wb['limit_spamfilter_wblist_txt'] = 'Dosažen maximální počet záznamů pro bílou / černou listinu pro Váš účet.'; ?> + diff --git a/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng index 83a732d6f3..71685de72d 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng @@ -4,6 +4,7 @@ $wb['active_txt'] = 'Aktivní'; $wb['server_id_txt'] = 'Server'; $wb['priority_txt'] = 'Priorita'; $wb['rid_txt'] = 'Uživatel'; -$wb['email_txt'] = 'Emaily na černé listině'; +$wb['email_txt'] = 'E-maily na černé listině'; $wb['add_new_record_txt'] = 'Přidat záznam na černou listinu'; ?> + diff --git a/interface/web/mail/lib/lang/cz_spamfilter_config.lng b/interface/web/mail/lib/lang/cz_spamfilter_config.lng index 0f878cc7d8..7eae43eb2b 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_config.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_config.lng @@ -18,3 +18,4 @@ $wb['relayhost_password_txt'] = 'Relayhost heslo'; $wb['mailbox_size_limit_txt'] = 'Limit velikosti e-mailové schránky'; $wb['message_size_limit_txt'] = 'Limit velikosti zprávy'; ?> + diff --git a/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng index fe2ee8d51c..348fe9b0e5 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng @@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Konfigurace serveru'; $wb['server_name_txt'] = 'Server'; $wb['server_id_txt'] = 'server_id'; ?> + diff --git a/interface/web/mail/lib/lang/cz_spamfilter_policy.lng b/interface/web/mail/lib/lang/cz_spamfilter_policy.lng index 54d0155d74..2740272cf6 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_policy.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_policy.lng @@ -18,7 +18,7 @@ $wb['spam_tag2_level_txt'] = 'SPAM tag2 úroveň'; $wb['spam_kill_level_txt'] = 'SPAM kill úroveň'; $wb['spam_dsn_cutoff_level_txt'] = 'SPAM dsn cutoff úroveň'; $wb['spam_quarantine_cutoff_level_txt'] = 'SPAM karanténa cutoff úroveň'; -$wb['spam_modifies_subj_txt'] = 'SPAM modifies předmět'; +$wb['spam_modifies_subj_txt'] = 'SPAM upravuje předmět'; $wb['spam_subject_tag_txt'] = 'SPAM předmět tag'; $wb['spam_subject_tag2_txt'] = 'SPAM předmět tag2'; $wb['addr_extension_virus_txt'] = 'Adr. rozšíření virus'; @@ -36,3 +36,4 @@ $wb['spam_admin_txt'] = 'SPAM admin'; $wb['message_size_limit_txt'] = 'Limit velikosti zprávy'; $wb['banned_rulenames_txt'] = 'Název pravidel zabanované'; ?> + diff --git a/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng index 9a0c361997..0ff38e1091 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng @@ -7,3 +7,4 @@ $wb['banned_files_lover_txt'] = 'Zabanované soubory'; $wb['bad_header_lover_txt'] = 'Špatné hlavičky'; $wb['add_new_record_txt'] = 'Přidat záznam politiky'; ?> + diff --git a/interface/web/mail/lib/lang/cz_spamfilter_users.lng b/interface/web/mail/lib/lang/cz_spamfilter_users.lng index 4f5c0e867f..40c010147a 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_users.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_users.lng @@ -2,9 +2,10 @@ $wb['server_id_txt'] = 'Server'; $wb['priority_txt'] = 'Priorita'; $wb['policy_id_txt'] = 'Politika'; -$wb['email_txt'] = 'Email (vzor)'; +$wb['email_txt'] = 'E-mail (vzor)'; $wb['fullname_txt'] = 'Název'; $wb['local_txt'] = 'Lokální'; -$wb['email_error_notempty'] = 'The email address must not be empty.'; -$wb['fullname_error_notempty'] = 'The name must not be empty.'; +$wb['email_error_notempty'] = 'E-mailová adresa nesmí být prázdná.'; +$wb['fullname_error_notempty'] = 'Jméno nesmí být prázdné.'; ?> + diff --git a/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng index 36bf3409e3..f4dd015aa6 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng @@ -8,3 +8,4 @@ $wb['fullname_txt'] = 'Jméno'; $wb['email_txt'] = 'E-mail'; $wb['add_new_record_txt'] = 'Přidat spamfiltr uživatele'; ?> + diff --git a/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng index 5e0c6b7799..2b929082c7 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng @@ -7,3 +7,4 @@ $wb['priority_txt'] = 'Priorita'; $wb['active_txt'] = 'Aktivní'; $wb['limit_spamfilter_wblist_txt'] = 'Dosažen maximální počet záznamů pro bílou / černou listinu pro Váš účet.'; ?> + diff --git a/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng index ad13897004..65ac33365c 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng @@ -7,3 +7,4 @@ $wb['rid_txt'] = 'Uživatel'; $wb['email_txt'] = 'Emaily na bílé listině'; $wb['add_new_record_txt'] = 'Přidat záznam na bílou listinu'; ?> + diff --git a/interface/web/mail/lib/lang/cz_user_quota_stats_list.lng b/interface/web/mail/lib/lang/cz_user_quota_stats_list.lng index f60e616517..d53237fb3d 100755 --- a/interface/web/mail/lib/lang/cz_user_quota_stats_list.lng +++ b/interface/web/mail/lib/lang/cz_user_quota_stats_list.lng @@ -1,8 +1,9 @@ + diff --git a/interface/web/mail/lib/lang/de.lng b/interface/web/mail/lib/lang/de.lng index 91418972dd..12b6ba7045 100644 --- a/interface/web/mail/lib/lang/de.lng +++ b/interface/web/mail/lib/lang/de.lng @@ -46,3 +46,4 @@ $wb['Domain Alias'] = 'E-Mail Domain Alias'; $wb['Relay Recipients'] = 'Relay Empfänger'; $wb['Mailbox quota'] = 'E-Mail Konto Speichernutzung'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_alias.lng b/interface/web/mail/lib/lang/de_mail_alias.lng index c11499effa..572c09a9c1 100644 --- a/interface/web/mail/lib/lang/de_mail_alias.lng +++ b/interface/web/mail/lib/lang/de_mail_alias.lng @@ -12,3 +12,4 @@ $wb['domain_txt'] = 'Domain'; $wb['duplicate_email_alias_txt'] = 'Dieser E-Mail Alias existiert bereits.'; $wb['source_txt'] = 'Alias'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_alias_list.lng b/interface/web/mail/lib/lang/de_mail_alias_list.lng index e741d02b3b..7c0c1145ae 100644 --- a/interface/web/mail/lib/lang/de_mail_alias_list.lng +++ b/interface/web/mail/lib/lang/de_mail_alias_list.lng @@ -6,3 +6,4 @@ $wb['destination_txt'] = 'Ziel'; $wb['email_txt'] = 'E-Mail Adresse'; $wb['add_new_record_txt'] = 'Neuen E-Mail Alias hinzufügen'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_aliasdomain.lng b/interface/web/mail/lib/lang/de_mail_aliasdomain.lng index f75bd1659c..38d775f444 100644 --- a/interface/web/mail/lib/lang/de_mail_aliasdomain.lng +++ b/interface/web/mail/lib/lang/de_mail_aliasdomain.lng @@ -9,3 +9,4 @@ $wb['source_error_empty'] = 'Quell Domain ist leer.'; $wb['source_error_unique'] = 'Quell Domain duplizieren.'; $wb['source_error_regex'] = 'Ungültiger Quell Domainname.'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/de_mail_aliasdomain_list.lng index c386d429bc..d7ae9aeaa1 100644 --- a/interface/web/mail/lib/lang/de_mail_aliasdomain_list.lng +++ b/interface/web/mail/lib/lang/de_mail_aliasdomain_list.lng @@ -5,3 +5,4 @@ $wb['source_txt'] = 'Quelle'; $wb['destination_txt'] = 'Ziel'; $wb['add_new_record_txt'] = 'Neuen E-Mail Domain Alias hinzufügen'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_blacklist.lng b/interface/web/mail/lib/lang/de_mail_blacklist.lng index 4611dadd06..474d1ad41a 100644 --- a/interface/web/mail/lib/lang/de_mail_blacklist.lng +++ b/interface/web/mail/lib/lang/de_mail_blacklist.lng @@ -7,3 +7,4 @@ $wb['source_error_notempty'] = 'Adresse ist leer.'; $wb['type_txt'] = 'Typ'; $wb['limit_mailfilter_txt'] = 'Die maximale Anzahl an E-Mail Filter für Ihr Konto wurde erreicht.'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_blacklist_list.lng b/interface/web/mail/lib/lang/de_mail_blacklist_list.lng index b169909112..03b1b46e79 100644 --- a/interface/web/mail/lib/lang/de_mail_blacklist_list.lng +++ b/interface/web/mail/lib/lang/de_mail_blacklist_list.lng @@ -8,3 +8,4 @@ $wb['recipient_txt'] = 'Empfänger'; $wb['add_new_record_txt'] = 'Neuen Blacklist Eintrag hinzufügen'; $wb['access_txt'] = 'Zugriff'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_content_filter.lng b/interface/web/mail/lib/lang/de_mail_content_filter.lng index 9ea5422498..48348b20af 100644 --- a/interface/web/mail/lib/lang/de_mail_content_filter.lng +++ b/interface/web/mail/lib/lang/de_mail_content_filter.lng @@ -7,3 +7,4 @@ $wb['action_txt'] = 'Aktion'; $wb['active_txt'] = 'Aktiv'; $wb['pattern_error_empty'] = 'Zeichenkette ist leer'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_content_filter_list.lng b/interface/web/mail/lib/lang/de_mail_content_filter_list.lng index 126f23ce4e..930f1e5378 100644 --- a/interface/web/mail/lib/lang/de_mail_content_filter_list.lng +++ b/interface/web/mail/lib/lang/de_mail_content_filter_list.lng @@ -6,3 +6,4 @@ $wb['pattern_txt'] = 'Zeichenkette'; $wb['action_txt'] = 'Aktion'; $wb['add_new_record_txt'] = 'Neuen Inhaltsfilter hinzufügen'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_domain.lng b/interface/web/mail/lib/lang/de_mail_domain.lng index ff6da2ab12..85028d9ce5 100644 --- a/interface/web/mail/lib/lang/de_mail_domain.lng +++ b/interface/web/mail/lib/lang/de_mail_domain.lng @@ -11,3 +11,4 @@ $wb['limit_maildomain_txt'] = 'Die maximale Anzahl an E-Mail Domains für Ihr Ko $wb['policy_txt'] = 'Spamfilter'; $wb['no_policy'] = '- nicht aktiviert -'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/de_mail_domain_admin_list.lng index 403bb90fee..3f5bde4e64 100644 --- a/interface/web/mail/lib/lang/de_mail_domain_admin_list.lng +++ b/interface/web/mail/lib/lang/de_mail_domain_admin_list.lng @@ -6,3 +6,4 @@ $wb['add_new_record_txt'] = 'Neue Domain hinzufügen'; $wb['active_txt'] = 'Aktiv'; $wb['sys_groupid_txt'] = 'Kunde'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_domain_catchall.lng b/interface/web/mail/lib/lang/de_mail_domain_catchall.lng index 9f37e56697..6c63bf26e9 100644 --- a/interface/web/mail/lib/lang/de_mail_domain_catchall.lng +++ b/interface/web/mail/lib/lang/de_mail_domain_catchall.lng @@ -9,3 +9,4 @@ $wb['limit_mailcatchall_txt'] = 'Die maximale Anzahl an Catchall Einträgen für $wb['source_txt'] = 'Quelle'; $wb['destination_error_isemail'] = 'Das Ziel ist keine gültige E-Mail Adresse.'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/de_mail_domain_catchall_list.lng index 558cb5c9f9..7ce05d321b 100644 --- a/interface/web/mail/lib/lang/de_mail_domain_catchall_list.lng +++ b/interface/web/mail/lib/lang/de_mail_domain_catchall_list.lng @@ -7,3 +7,4 @@ $wb['server_id_txt'] = 'Server'; $wb['domain_txt'] = 'Domain'; $wb['add_new_record_txt'] = 'Neuen Catchall hinzufügen'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_domain_list.lng b/interface/web/mail/lib/lang/de_mail_domain_list.lng index ff25a5817d..3a7a393142 100644 --- a/interface/web/mail/lib/lang/de_mail_domain_list.lng +++ b/interface/web/mail/lib/lang/de_mail_domain_list.lng @@ -5,3 +5,4 @@ $wb['domain_txt'] = 'Domain'; $wb['add_new_record_txt'] = 'Neue Domain hinzufügen'; $wb['active_txt'] = 'Aktiv'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_forward.lng b/interface/web/mail/lib/lang/de_mail_forward.lng index a392ac4e33..56a82afa6c 100644 --- a/interface/web/mail/lib/lang/de_mail_forward.lng +++ b/interface/web/mail/lib/lang/de_mail_forward.lng @@ -7,3 +7,4 @@ $wb['duplicate_mailbox_txt'] = 'Es existiert bereits ein E-Mail Konto mit dieser $wb['domain_txt'] = 'Domain'; $wb['source_txt'] = 'Quell E-Mail Adresse'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_forward_list.lng b/interface/web/mail/lib/lang/de_mail_forward_list.lng index 99b6ab5ea4..01b295061c 100644 --- a/interface/web/mail/lib/lang/de_mail_forward_list.lng +++ b/interface/web/mail/lib/lang/de_mail_forward_list.lng @@ -6,3 +6,4 @@ $wb['destination_txt'] = 'Ziel'; $wb['email_txt'] = 'E-Mail'; $wb['add_new_record_txt'] = 'Neue E-Mail Weiterleitung hinzufügen'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_get.lng b/interface/web/mail/lib/lang/de_mail_get.lng index e6064caba8..4100c3844b 100644 --- a/interface/web/mail/lib/lang/de_mail_get.lng +++ b/interface/web/mail/lib/lang/de_mail_get.lng @@ -14,5 +14,6 @@ $wb['source_password_error_isempty'] = 'Passwort ist leer.'; $wb['destination_error_isemail'] = 'Kein Ziel gewählt.'; $wb['source_server_error_regex'] = 'POP3/IMAP Server ist kein gültiger Domainname.'; $wb['source_read_all_txt'] = 'Alle E-Mails abrufen (inkl. bereits gelesene E-Mails)'; -$wb['error_delete_read_all_combination'] = 'Unzulässige Kombination von Optionen. Sie können "E-Mails nach Empfang löschen" = nein nicht zusammen mit "Alle E-Mails abrufen (inkl. bereits gelesene E-Mails)" = ja benutzen.'; +$wb['error_delete_read_all_combination'] = 'Unzulässige Kombination von Optionen. Sie können '; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_get_list.lng b/interface/web/mail/lib/lang/de_mail_get_list.lng index d192358122..a0ee458e8a 100644 --- a/interface/web/mail/lib/lang/de_mail_get_list.lng +++ b/interface/web/mail/lib/lang/de_mail_get_list.lng @@ -7,3 +7,4 @@ $wb['source_username_txt'] = 'Benutzername'; $wb['destination_txt'] = 'Ziel'; $wb['add_new_record_txt'] = 'Neues Konto hinzufügen'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_mailinglist.lng b/interface/web/mail/lib/lang/de_mail_mailinglist.lng index 1d143b690c..04320e016b 100644 --- a/interface/web/mail/lib/lang/de_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/de_mail_mailinglist.lng @@ -20,3 +20,4 @@ $wb['listname_error_unique'] = 'Es beseht bereits eine Mailingliste mit diesem N $wb['email_error_isemail'] = 'Die E-Mail Adresse ist falsch.'; $wb['mailinglist_txt'] = 'Mailingliste'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_mailinglist_list.lng b/interface/web/mail/lib/lang/de_mail_mailinglist_list.lng index 3eee785f26..c9959f0007 100644 --- a/interface/web/mail/lib/lang/de_mail_mailinglist_list.lng +++ b/interface/web/mail/lib/lang/de_mail_mailinglist_list.lng @@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Mailinglisten'; $wb['domain_txt'] = 'Domain'; $wb['listname_txt'] = 'Listenname'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_relay_recipient.lng b/interface/web/mail/lib/lang/de_mail_relay_recipient.lng index 37a2401071..1ab7da86d1 100644 --- a/interface/web/mail/lib/lang/de_mail_relay_recipient.lng +++ b/interface/web/mail/lib/lang/de_mail_relay_recipient.lng @@ -7,3 +7,4 @@ $wb['source_error_notempty'] = 'Adresse ist leer.'; $wb['type_txt'] = 'Typ'; $wb['limit_mailfilter_txt'] = 'Die maximale Anzahl an E-Mail Filtern für Ihr Konto wurde erreicht.'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/de_mail_relay_recipient_list.lng index fc5d6f47c5..ec6574a590 100644 --- a/interface/web/mail/lib/lang/de_mail_relay_recipient_list.lng +++ b/interface/web/mail/lib/lang/de_mail_relay_recipient_list.lng @@ -7,3 +7,4 @@ $wb['recipient_txt'] = 'Empfänger'; $wb['add_new_record_txt'] = 'Neuen Relay Empfänger hinzufügen'; $wb['access_txt'] = 'Zugriff'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_spamfilter.lng b/interface/web/mail/lib/lang/de_mail_spamfilter.lng index b133a4129b..f8c0778674 100644 --- a/interface/web/mail/lib/lang/de_mail_spamfilter.lng +++ b/interface/web/mail/lib/lang/de_mail_spamfilter.lng @@ -15,3 +15,4 @@ $wb['email_error_unique'] = 'Es existiert bereits ein Spamfilter Eintrag für di $wb['spam_redirect_maildir_purge_txt'] = 'Lösche E-Mail Verzeichnis nach'; $wb['days_txt'] = 'Tagen.'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/de_mail_spamfilter_list.lng index 95c7d406a5..7ccd9f5ffa 100644 --- a/interface/web/mail/lib/lang/de_mail_spamfilter_list.lng +++ b/interface/web/mail/lib/lang/de_mail_spamfilter_list.lng @@ -6,3 +6,4 @@ $wb['server_name_txt'] = 'Servername'; $wb['email_txt'] = 'E-Mail'; $wb['add_new_record_txt'] = 'Neuen Spamfilter Eintrag hinzufügen'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_transport.lng b/interface/web/mail/lib/lang/de_mail_transport.lng index 873036f947..578afe8e79 100644 --- a/interface/web/mail/lib/lang/de_mail_transport.lng +++ b/interface/web/mail/lib/lang/de_mail_transport.lng @@ -9,3 +9,4 @@ $wb['active_txt'] = 'Aktiv'; $wb['limit_mailrouting_txt'] = 'Die maximale Anzahl an E-Mail Routen für Ihr Konto wurde erreicht.'; $wb['transport_txt'] = 'Transport'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_transport_list.lng b/interface/web/mail/lib/lang/de_mail_transport_list.lng index 6c9f8656c4..213b3d28ae 100644 --- a/interface/web/mail/lib/lang/de_mail_transport_list.lng +++ b/interface/web/mail/lib/lang/de_mail_transport_list.lng @@ -7,3 +7,4 @@ $wb['transport_txt'] = 'Transport'; $wb['sort_order_txt'] = 'Sortiert nach'; $wb['add_new_record_txt'] = 'Neuen Transport hinzufügen'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_user.lng b/interface/web/mail/lib/lang/de_mail_user.lng index 87a55631f2..d97af7b3b4 100644 --- a/interface/web/mail/lib/lang/de_mail_user.lng +++ b/interface/web/mail/lib/lang/de_mail_user.lng @@ -48,3 +48,4 @@ $wb['repeat_password_txt'] = 'Passwort wiederholen'; $wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; $wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_user_filter.lng b/interface/web/mail/lib/lang/de_mail_user_filter.lng index 38c324eb8d..9a8d7dcd51 100644 --- a/interface/web/mail/lib/lang/de_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/de_mail_user_filter.lng @@ -18,3 +18,4 @@ $wb['ends_with_txt'] = 'Endet mit'; $wb['move_to_txt'] = 'Verschieben nach'; $wb['delete_txt'] = 'Löschen'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_user_filter_list.lng b/interface/web/mail/lib/lang/de_mail_user_filter_list.lng index 003ed0e244..695e404c82 100644 --- a/interface/web/mail/lib/lang/de_mail_user_filter_list.lng +++ b/interface/web/mail/lib/lang/de_mail_user_filter_list.lng @@ -5,3 +5,4 @@ $wb['page_txt'] = 'Seite'; $wb['page_of_txt'] = 'von'; $wb['delete_confirmation'] = 'Wollen Sie den Filter wirklich löschen?'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_user_list.lng b/interface/web/mail/lib/lang/de_mail_user_list.lng index a56fb6da14..50580a9469 100644 --- a/interface/web/mail/lib/lang/de_mail_user_list.lng +++ b/interface/web/mail/lib/lang/de_mail_user_list.lng @@ -6,3 +6,4 @@ $wb['add_new_record_txt'] = 'Neues E-Mail Konto hinzufügen'; $wb['name_txt'] = 'Realname'; $wb['login_txt'] = 'Anmelden'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_user_stats_list.lng b/interface/web/mail/lib/lang/de_mail_user_stats_list.lng index e9a1983946..3291ae4270 100644 --- a/interface/web/mail/lib/lang/de_mail_user_stats_list.lng +++ b/interface/web/mail/lib/lang/de_mail_user_stats_list.lng @@ -6,3 +6,4 @@ $wb['last_month_txt'] = 'Vergangenes Monat'; $wb['this_year_txt'] = 'Aktuelles Jahr'; $wb['last_year_txt'] = 'Vergangenes Jahr'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_whitelist.lng b/interface/web/mail/lib/lang/de_mail_whitelist.lng index 1506deba3f..d09be9a48d 100644 --- a/interface/web/mail/lib/lang/de_mail_whitelist.lng +++ b/interface/web/mail/lib/lang/de_mail_whitelist.lng @@ -7,3 +7,4 @@ $wb['source_error_notempty'] = 'E-Mail Adresse ist leer.'; $wb['type_txt'] = 'Typ'; $wb['limit_mailfilter_txt'] = 'Die maximale Anzahl an E-Mail Filtern für Ihr Konto wurde erreicht.'; ?> + diff --git a/interface/web/mail/lib/lang/de_mail_whitelist_list.lng b/interface/web/mail/lib/lang/de_mail_whitelist_list.lng index bcd4ccb4e1..cf511a5654 100644 --- a/interface/web/mail/lib/lang/de_mail_whitelist_list.lng +++ b/interface/web/mail/lib/lang/de_mail_whitelist_list.lng @@ -8,3 +8,4 @@ $wb['recipient_txt'] = 'Empfänger'; $wb['add_new_record_txt'] = 'Whitelist Eintrag hinzufügen'; $wb['access_txt'] = 'Zugriff'; ?> + diff --git a/interface/web/mail/lib/lang/de_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/de_spamfilter_blacklist.lng index 1dd4c6e3fa..9be7f067cf 100644 --- a/interface/web/mail/lib/lang/de_spamfilter_blacklist.lng +++ b/interface/web/mail/lib/lang/de_spamfilter_blacklist.lng @@ -7,3 +7,4 @@ $wb['priority_txt'] = 'Priorität'; $wb['active_txt'] = 'Aktiv'; $wb['limit_spamfilter_wblist_txt'] = 'Die maximale Anzahl an White- oder Blacklist Einträgen für ihr Konto wurde erreicht.'; ?> + diff --git a/interface/web/mail/lib/lang/de_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/de_spamfilter_blacklist_list.lng index 7ba623b657..a0fe0722c7 100644 --- a/interface/web/mail/lib/lang/de_spamfilter_blacklist_list.lng +++ b/interface/web/mail/lib/lang/de_spamfilter_blacklist_list.lng @@ -7,3 +7,4 @@ $wb['rid_txt'] = 'Benutzer'; $wb['email_txt'] = 'Blacklisted E-Mail Adressen'; $wb['add_new_record_txt'] = 'Blacklist Eintrag hinzufügen'; ?> + diff --git a/interface/web/mail/lib/lang/de_spamfilter_config.lng b/interface/web/mail/lib/lang/de_spamfilter_config.lng index 2cf223259b..d00b2b15d0 100644 --- a/interface/web/mail/lib/lang/de_spamfilter_config.lng +++ b/interface/web/mail/lib/lang/de_spamfilter_config.lng @@ -18,3 +18,4 @@ $wb['relayhost_password_txt'] = 'Relayhost Passwort'; $wb['mailbox_size_limit_txt'] = 'E-Mail Kontogrössenlimit'; $wb['message_size_limit_txt'] = 'Nachrichtengrössenlimit'; ?> + diff --git a/interface/web/mail/lib/lang/de_spamfilter_config_list.lng b/interface/web/mail/lib/lang/de_spamfilter_config_list.lng index db92a4bd07..579d3155de 100644 --- a/interface/web/mail/lib/lang/de_spamfilter_config_list.lng +++ b/interface/web/mail/lib/lang/de_spamfilter_config_list.lng @@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Serverkonfiguration'; $wb['server_name_txt'] = 'Server'; $wb['server_id_txt'] = 'Server ID'; ?> + diff --git a/interface/web/mail/lib/lang/de_spamfilter_policy.lng b/interface/web/mail/lib/lang/de_spamfilter_policy.lng index 32acca4686..60f8b86acd 100644 --- a/interface/web/mail/lib/lang/de_spamfilter_policy.lng +++ b/interface/web/mail/lib/lang/de_spamfilter_policy.lng @@ -36,3 +36,4 @@ $wb['spam_admin_txt'] = 'SPAM Administrator'; $wb['message_size_limit_txt'] = 'Nachrichtengrößen Limit'; $wb['banned_rulenames_txt'] = 'Banned Richtliniennamen'; ?> + diff --git a/interface/web/mail/lib/lang/de_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/de_spamfilter_policy_list.lng index b5ec8e98c2..02083ef5d1 100644 --- a/interface/web/mail/lib/lang/de_spamfilter_policy_list.lng +++ b/interface/web/mail/lib/lang/de_spamfilter_policy_list.lng @@ -7,3 +7,4 @@ $wb['banned_files_lover_txt'] = 'Gesperrte Dateien Liebhaber'; $wb['bad_header_lover_txt'] = 'Ungültige Header Liebhaber'; $wb['add_new_record_txt'] = 'Richtlinien Eintrag hinzufügen'; ?> + diff --git a/interface/web/mail/lib/lang/de_spamfilter_users.lng b/interface/web/mail/lib/lang/de_spamfilter_users.lng index b7f6cd496b..cf9f0cd221 100644 --- a/interface/web/mail/lib/lang/de_spamfilter_users.lng +++ b/interface/web/mail/lib/lang/de_spamfilter_users.lng @@ -8,3 +8,4 @@ $wb['local_txt'] = 'Lokal'; $wb['email_error_notempty'] = 'Die E-Mail-Adresse darf nicht leer sein.'; $wb['fullname_error_notempty'] = 'Der Name darf nicht leer sein.'; ?> + diff --git a/interface/web/mail/lib/lang/de_spamfilter_users_list.lng b/interface/web/mail/lib/lang/de_spamfilter_users_list.lng index 8e53193f70..89a5983289 100644 --- a/interface/web/mail/lib/lang/de_spamfilter_users_list.lng +++ b/interface/web/mail/lib/lang/de_spamfilter_users_list.lng @@ -8,3 +8,4 @@ $wb['fullname_txt'] = 'Name'; $wb['email_txt'] = 'E-Mail Adresse'; $wb['add_new_record_txt'] = 'Spamfilterbenutzer hinzufügen'; ?> + diff --git a/interface/web/mail/lib/lang/de_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/de_spamfilter_whitelist.lng index d388432c66..bb8278189d 100644 --- a/interface/web/mail/lib/lang/de_spamfilter_whitelist.lng +++ b/interface/web/mail/lib/lang/de_spamfilter_whitelist.lng @@ -7,3 +7,4 @@ $wb['priority_txt'] = 'Priorität'; $wb['active_txt'] = 'Aktiv'; $wb['limit_spamfilter_wblist_txt'] = 'Die maximale Anzahl an White- oder Blacklist Einträgen für Ihr Konto wurde erreicht.'; ?> + diff --git a/interface/web/mail/lib/lang/de_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/de_spamfilter_whitelist_list.lng index 4d7769d2aa..ed8a220898 100644 --- a/interface/web/mail/lib/lang/de_spamfilter_whitelist_list.lng +++ b/interface/web/mail/lib/lang/de_spamfilter_whitelist_list.lng @@ -7,3 +7,4 @@ $wb['rid_txt'] = 'Benutzer'; $wb['email_txt'] = 'Whitelisted E-Mail Adresse'; $wb['add_new_record_txt'] = 'Whitelist Eintrag hinzufügen'; ?> + diff --git a/interface/web/mail/lib/lang/de_user_quota_stats_list.lng b/interface/web/mail/lib/lang/de_user_quota_stats_list.lng index beb9c18eb9..372c7b37fe 100755 --- a/interface/web/mail/lib/lang/de_user_quota_stats_list.lng +++ b/interface/web/mail/lib/lang/de_user_quota_stats_list.lng @@ -6,3 +6,4 @@ $wb['email_txt'] = 'E-Mail Adresse'; $wb['used_txt'] = 'Verbrauchter Speicherplatz'; $wb['percentage_txt'] = 'Verbraucht in %'; ?> + diff --git a/interface/web/mail/lib/lang/el.lng b/interface/web/mail/lib/lang/el.lng index f8cadc62f0..74c51a8931 100644 --- a/interface/web/mail/lib/lang/el.lng +++ b/interface/web/mail/lib/lang/el.lng @@ -11,7 +11,7 @@ $wb['Email Forward'] = 'Email Προώθησης'; $wb['Get Email'] = 'Λήψη Email'; $wb['Spamfilter'] = 'Φίλτρο Spam'; $wb['Email Routing'] = 'Δρομολόγηση Email'; -$wb['Email transport'] = 'Μεταφορά Email'; +$wb['Email transport'] = 'Δρομολογήση Email'; $wb['Mailbox'] = 'Θυρίδα'; $wb['Autoresponder'] = 'Αυτόματη απάντηση'; $wb['Mail Filter'] = 'Φίλτρο Mail'; @@ -44,5 +44,5 @@ $wb['Content Filter'] = 'Φίλτρο Περιεχομένου'; $wb['Global Filters'] = 'Καθολικά Φίλτρα'; $wb['Domain Alias'] = 'Ψευδώνυμο Domain'; $wb['Relay Recipients'] = 'Παραλήπτες Relay'; -$wb['Mailbox quota'] = 'Mailbox quota'; +$wb['Mailbox quota'] = 'Όριο θυρίδας Mail'; ?> diff --git a/interface/web/mail/lib/lang/el_mail_alias.lng b/interface/web/mail/lib/lang/el_mail_alias.lng index 7915af451c..48d35a01ab 100644 --- a/interface/web/mail/lib/lang/el_mail_alias.lng +++ b/interface/web/mail/lib/lang/el_mail_alias.lng @@ -9,6 +9,6 @@ $wb['destination_error_isemail'] = 'Η διεύθυνση Email παραλήπτ $wb['limit_mailalias_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των ψευδωνύμων email για τον λογαριασμό σας.'; $wb['duplicate_mailbox_txt'] = 'Υπάρχει ήδη μια θυρίδα με αυτή τη διεύθυνση email'; $wb['domain_txt'] = 'Domain'; -$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.'; -$wb['source_txt'] = 'Alias'; +$wb['duplicate_email_alias_txt'] = 'Το ψευδώνυμο για το email υπάρχει ήδη.'; +$wb['source_txt'] = 'Ψευδώνυμο'; ?> diff --git a/interface/web/mail/lib/lang/el_mail_domain_catchall.lng b/interface/web/mail/lib/lang/el_mail_domain_catchall.lng index 43c0bdf565..fc5c0d7bb5 100644 --- a/interface/web/mail/lib/lang/el_mail_domain_catchall.lng +++ b/interface/web/mail/lib/lang/el_mail_domain_catchall.lng @@ -6,6 +6,6 @@ $wb['domain_error_unique'] = 'Υπάρχει ήδη μία εγγραφή Catcha $wb['no_domain_perm'] = 'Δεν έχετε δικαιώματα για αυτό το domain.'; $wb['domain_error_regex'] = 'Μη έγκρυρο όνομα domain ή το όνομα περιέχει μη επιτρεπόμενους χαρακτήρες'; $wb['limit_mailcatchall_txt'] = 'Το μέγιστο πλήθος των email catchall για τον λογαριασμό σας, έχει εξαντληθεί.'; -$wb['source_txt'] = 'Source'; -$wb['destination_error_isemail'] = 'Destination is no valid email address.'; +$wb['source_txt'] = 'Πηγή'; +$wb['destination_error_isemail'] = 'Ο προορισμός δεν είναι έγκυρη διεύθυνση email.'; ?> diff --git a/interface/web/mail/lib/lang/el_mail_forward.lng b/interface/web/mail/lib/lang/el_mail_forward.lng index ba166179d5..78ce691b0b 100644 --- a/interface/web/mail/lib/lang/el_mail_forward.lng +++ b/interface/web/mail/lib/lang/el_mail_forward.lng @@ -5,5 +5,5 @@ $wb['active_txt'] = 'Ενεργό'; $wb['limit_mailforward_txt'] = 'Το μέγιστο πλήθος των email forwarders για τον λογαρισμό σας, έχει εξαντληθεί'; $wb['duplicate_mailbox_txt'] = 'Υπάρχει ήδη μια θυρίδα με αυτή τη διεύθυνση email'; $wb['domain_txt'] = 'Domain'; -$wb['source_txt'] = 'Source Email'; +$wb['source_txt'] = 'Πηγή Email'; ?> diff --git a/interface/web/mail/lib/lang/el_mail_get.lng b/interface/web/mail/lib/lang/el_mail_get.lng index 500b16aba8..1ba5c20ab3 100644 --- a/interface/web/mail/lib/lang/el_mail_get.lng +++ b/interface/web/mail/lib/lang/el_mail_get.lng @@ -4,7 +4,7 @@ $wb['type_txt'] = 'Τύπος'; $wb['source_server_txt'] = 'Pop3/Imap Server'; $wb['source_username_txt'] = 'Όνομα Χρήστη'; $wb['source_password_txt'] = 'Συνθηματικό'; -$wb['source_delete_txt'] = 'Διαγραφή email μετά την απόκτηση'; +$wb['source_delete_txt'] = 'Διαγραφή email μετά την ανάκτηση'; $wb['destination_txt'] = 'Προορισμός'; $wb['active_txt'] = 'Ενεργός'; $wb['limit_fetchmail_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των εγγραφών Fetchmail για τον λογαριασμό σας.'; @@ -14,5 +14,5 @@ $wb['source_password_error_isempty'] = 'Το Συνθηματικό δεν έχ $wb['destination_error_isemail'] = 'Δεν επιλέχθηκε προορισμός.'; $wb['source_server_error_regex'] = 'Το όνομα του Pop3/Imap Server δεν είναι έγκυρο.'; $wb['source_read_all_txt'] = 'Ανάκτηση όλων των emails (συμπερ. αναγνωσμένων mails)'; -$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes'; +$wb['error_delete_read_all_combination'] = 'Μη έγκυρος συνδυασμός επιλογών. Δεν μπορείτε να χρησιμοποιήσετε την επιλογή \\"Διαγραφή email μετά την ανάκτηση\\" = ΟΧΙ μαζί με \\"Ανάκτηση όλων των emails\\" = ΝΑΙ'; ?> diff --git a/interface/web/mail/lib/lang/el_mail_mailinglist.lng b/interface/web/mail/lib/lang/el_mail_mailinglist.lng index 1942ea5a5b..6384e115f2 100644 --- a/interface/web/mail/lib/lang/el_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/el_mail_mailinglist.lng @@ -2,21 +2,21 @@ $wb['limit_mailmailinglist_txt'] = 'Το όριο ξεπεράστηκε.'; $wb['domain_error_empty'] = 'Το Domain είναι άδειο.'; $wb['listname_error_empty'] = 'Η λίστα είναι άδεια.'; -$wb['domain_error_regex'] = 'Το όνομα domain δεν είναι έγκυρο/'; +$wb['domain_error_regex'] = 'Το όνομα domain δεν είναι έγκυρο'; $wb['email_in_use_txt'] = 'Το email χρησιμοποιείται ήδη.'; $wb['no_domain_perm'] = 'Δεν έχετε δικαιώματα σε αυτό το domain.'; -$wb['password_strength_txt'] = 'Δύναμη συνθηματικού'; +$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού'; $wb['server_id_txt'] = 'Server'; $wb['domain_txt'] = 'Domain'; $wb['listname_txt'] = 'Όνομα λίστας'; $wb['client_txt'] = 'Πελάτης'; $wb['email_txt'] = 'Email'; $wb['password_txt'] = 'Συνθηματικό'; -$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['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.'; -$wb['email_error_isemail'] = 'Email address is invalid.'; -$wb['mailinglist_txt'] = 'Mailing list'; +$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού'; +$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού'; +$wb['password_mismatch_txt'] = 'Τα συνθηματικά δεν ταιριάζουν.'; +$wb['password_match_txt'] = 'Τα συνθηματικά ταιριάζουν.'; +$wb['listname_error_unique'] = 'Υπάρχει ήδη μια λίστα mail με αυτό το όνομα στον server. Παρακαλούμε επιλέξτε ένα διαφορετικό όνομα.'; +$wb['email_error_isemail'] = 'Η διεύθυνση email δεν είναι έγκυρη'; +$wb['mailinglist_txt'] = 'Λίστα Mail'; ?> diff --git a/interface/web/mail/lib/lang/el_mail_spamfilter.lng b/interface/web/mail/lib/lang/el_mail_spamfilter.lng index 48c4eaa4cd..5c6d90431f 100644 --- a/interface/web/mail/lib/lang/el_mail_spamfilter.lng +++ b/interface/web/mail/lib/lang/el_mail_spamfilter.lng @@ -1,12 +1,12 @@ diff --git a/interface/web/mail/lib/lang/el_mail_transport_list.lng b/interface/web/mail/lib/lang/el_mail_transport_list.lng index 249eee9e5c..d809edf0b1 100644 --- a/interface/web/mail/lib/lang/el_mail_transport_list.lng +++ b/interface/web/mail/lib/lang/el_mail_transport_list.lng @@ -3,7 +3,7 @@ $wb['list_head_txt'] = 'Προχωρημένη Δρομολογήση Email '; $wb['active_txt'] = 'Ενεργό'; $wb['server_id_txt'] = 'Server'; $wb['domain_txt'] = 'Domain'; -$wb['transport_txt'] = 'Μεταφορά'; +$wb['transport_txt'] = 'Δρομολογήση'; $wb['sort_order_txt'] = 'Ταξινόμηση κατά'; -$wb['add_new_record_txt'] = 'Νέα μεταφορά'; +$wb['add_new_record_txt'] = 'Νέα Δρομολογήση'; ?> diff --git a/interface/web/mail/lib/lang/el_mail_user.lng b/interface/web/mail/lib/lang/el_mail_user.lng index 528e35c3a9..9d2fcdadab 100644 --- a/interface/web/mail/lib/lang/el_mail_user.lng +++ b/interface/web/mail/lib/lang/el_mail_user.lng @@ -2,7 +2,7 @@ $wb['custom_mailfilter_txt'] = 'Προσαρμοσμένο φίλτρο'; $wb['email_txt'] = 'Email'; $wb['cryptpwd_txt'] = 'Συνθηματικό'; -$wb['password_strength_txt'] = 'Δύναμη Συνθηματικού'; +$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού'; $wb['active_txt'] = 'Ενεργό'; $wb['email_error_isemail'] = 'Η διεύθυνση Email δεν είναι έγκυρη.'; $wb['email_error_unique'] = 'Διπλή διεύθυνση Email.'; @@ -16,13 +16,13 @@ $wb['no_domain_perm'] = 'Δεν έχετε δικαιώματα σε αυτό τ $wb['error_no_pwd'] = 'Το συνθηματικό δεν έχει οριστεί.'; $wb['quota_error_isint'] = 'Το μέγεθος της θυρίδας πρέπει να είναι αριθμός.'; $wb['quota_txt'] = 'Όριο χώρου'; -$wb['server_id_txt'] = 'Aerver_id'; +$wb['server_id_txt'] = 'Server_id'; $wb['password_txt'] = 'Συνθηματικό'; $wb['maildir_txt'] = 'Maildir'; $wb['postfix_txt'] = 'Ενεργοποίηση Λήψης'; $wb['access_txt'] = 'Ενεργοποίηση Πρόσβασης'; $wb['policy_txt'] = 'Φίλτρο Spam'; -$wb['no_policy'] = '- ανενεργή -'; +$wb['no_policy'] = '- ανενεργό -'; $wb['limit_mailbox_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των θυρίδων για τον λογαριασμό σας.'; $wb['limit_mailquota_txt'] = 'Έχετε φτάσει στο μέγεστο χώρο της θυρίδα σας.Ο μέγιστος διαθέσιμος χώρος σε MB είναι'; $wb['disableimap_txt'] = 'Απενεργοποίηση IMAP'; @@ -41,10 +41,10 @@ $wb['login_error_unique'] = 'Το όνομα χρησιμοποιείται ήδ $wb['login_error_regex'] = 'Έγγυροι χαρακτήρες είναι οι A-Z, a-z, 0-9, ., _ και -.'; $wb['login_txt'] = 'Login (προαιτερικά)'; $wb['error_login_email_txt'] = 'Το όνομα δεν επιτρέπεται. Παρακαλούμε εισάγεται ένα διαφορετικό όνομα ή χρησιμοποιείστε την διεύθυνση e-mail.'; -$wb['autoresponder_subject_txt'] = 'Email Subject'; -$wb['autoresponder_subject'] = 'Out of office reply'; -$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['autoresponder_subject_txt'] = 'Θέμα Email'; +$wb['autoresponder_subject'] = 'Εκτός γραφείου'; +$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού'; +$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού'; +$wb['password_mismatch_txt'] = 'Τα συνθηματικά δεν ταιριάζουν.'; +$wb['password_match_txt'] = 'Τα συνθηματικά ταιριάζουν.'; ?> diff --git a/interface/web/mail/lib/lang/el_mail_user_list.lng b/interface/web/mail/lib/lang/el_mail_user_list.lng index 7e3f57bb72..09613b4c4d 100644 --- a/interface/web/mail/lib/lang/el_mail_user_list.lng +++ b/interface/web/mail/lib/lang/el_mail_user_list.lng @@ -4,5 +4,5 @@ $wb['email_txt'] = 'Email'; $wb['autoresponder_txt'] = 'Αυτόματη απάντηση'; $wb['add_new_record_txt'] = 'Νέα Θυρίδα'; $wb['name_txt'] = 'Πραγματικό Όνομα'; -$wb['login_txt'] = 'Login'; +$wb['login_txt'] = 'Είσοδος'; ?> diff --git a/interface/web/mail/lib/lang/el_spamfilter_users.lng b/interface/web/mail/lib/lang/el_spamfilter_users.lng index 0a896b1b00..e838bb4495 100644 --- a/interface/web/mail/lib/lang/el_spamfilter_users.lng +++ b/interface/web/mail/lib/lang/el_spamfilter_users.lng @@ -5,6 +5,6 @@ $wb['policy_id_txt'] = 'Πολιτική'; $wb['email_txt'] = 'Email (Μοτίβο)'; $wb['fullname_txt'] = 'Όνομα'; $wb['local_txt'] = 'Τοπικός'; -$wb['email_error_notempty'] = 'The email address must not be empty.'; -$wb['fullname_error_notempty'] = 'The name must not be empty.'; +$wb['email_error_notempty'] = 'Η διεύθυνση email δεν πρέπει να είναι κενή.'; +$wb['fullname_error_notempty'] = 'Το όνομα δεν πρέπει να είναι κενό.'; ?> diff --git a/interface/web/mail/lib/lang/el_user_quota_stats_list.lng b/interface/web/mail/lib/lang/el_user_quota_stats_list.lng index 8c40407037..2e8651f89d 100755 --- a/interface/web/mail/lib/lang/el_user_quota_stats_list.lng +++ b/interface/web/mail/lib/lang/el_user_quota_stats_list.lng @@ -4,5 +4,5 @@ $wb['quota_txt'] = 'Όριο'; $wb['name_txt'] = 'Όνομα'; $wb['email_txt'] = 'Διεύθυνση Email'; $wb['used_txt'] = 'Χώρος σε χρήση'; -$wb['percentage_txt'] = 'Used %'; +$wb['percentage_txt'] = 'Χρήση %'; ?> diff --git a/interface/web/mail/lib/lang/en_mail_domain.lng b/interface/web/mail/lib/lang/en_mail_domain.lng index 5ae48bad0b..ad93100696 100644 --- a/interface/web/mail/lib/lang/en_mail_domain.lng +++ b/interface/web/mail/lib/lang/en_mail_domain.lng @@ -2,19 +2,12 @@ $wb["server_id_txt"] = 'Server'; $wb["domain_txt"] = 'Domain'; $wb["type_txt"] = 'Type'; -$wb["active_txt"] = 'Active'; -$wb["dkim_txt"] = 'enable DKIM'; -$wb["dkim_private_txt"] = 'DKIM Private-key'; -$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only'; -$wb["dkim_generate_txt"] = 'Generate DKIM Private-key'; -$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)

add this record to your DNS'; -$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key'; +$wb["active_txt"] = 'Active'; $wb["domain_error_empty"] = 'Domain is empty.'; $wb["domain_error_unique"] = 'Duplicate Domain.'; $wb["domain_error_regex"] = 'Invalid domain name.'; -$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)'; $wb["client_txt"] = 'Client'; $wb["limit_maildomain_txt"] = 'The max. number of email domains for your account is reached.'; $wb["policy_txt"] = 'Spamfilter'; $wb["no_policy"] = '- not enabled -'; -?> +?> \ No newline at end of file diff --git a/interface/web/mail/mail_domain_dkim_create.php b/interface/web/mail/mail_domain_dkim_create.php deleted file mode 100644 index aab83a6d33..0000000000 --- a/interface/web/mail/mail_domain_dkim_create.php +++ /dev/null @@ -1,99 +0,0 @@ -auth->check_module_permissions('mail'); - -header('Content-Type: text/xml; charset=utf-8'); -header('Cache-Control: must-revalidate, pre-check=0, no-store, no-cache, max-age=0, post-check=0'); - -/* - This function fix PHP's messing up POST input containing characters space, dot, - open square bracket and others to be compatible with with the deprecated register_globals -*/ -function getRealPOST() { - $pairs = explode("&", file_get_contents("php://input")); - $vars = array(); - foreach ($pairs as $pair) { - $nv = explode("=", $pair, 2); - $name = urldecode($nv[0]); - $value = $nv[1]; - $vars[$name] = $value; - } - return $vars; -} - -function pub_key($pubkey) { - $public_key=''; - foreach($pubkey as $values) $public_key=$public_key.$values."\n"; - return $public_key; -} -$_POST=getRealPOST(); - -switch ($_POST['action']) { - case 'create': /* create DKIM Private-key */ - exec('openssl rand -out /usr/local/ispconfig/server/temp/random-data.bin 4096',$output,$result); - exec('openssl genrsa -rand /usr/local/ispconfig/server/temp/random-data.bin 1024',$privkey,$result); - unlink("/usr/local/ispconfig/server/temp/random-data.bin"); - $private_key=''; - foreach($privkey as $values) $private_key=$private_key.$values."\n"; - if($validate_dkim->validate_post('private',$private_key)) { /* validate the $_POST-value */ - exec('echo '.escapeshellarg($private_key).'|openssl rsa -pubout -outform PEM',$pubkey,$result); - $public_key=pub_key($pubkey); - } else { $public_key='invalid key'; } - break; - case 'show': /* show the DNS-Record onLoad */ - $private_key=$_POST['pkey']; - if($validate_dkim->validate_post('private',$private_key)) { /* validate the $_POST-value */ - /* get the public-key */ - exec('echo '.escapeshellarg($private_key).'|openssl rsa -pubout -outform PEM',$pubkey,$result); - $public_key=pub_key($pubkey); - } else { $public_key='invalid key'; } - break; -} -echo "\n"; -echo "\n"; -echo "".$private_key."\n"; -echo "".$public_key."\n"; -echo "\n"; -?> diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm index 6426e67bad..5a1b613792 100644 --- a/interface/web/mail/templates/mail_domain_edit.htm +++ b/interface/web/mail/templates/mail_domain_edit.htm @@ -59,27 +59,8 @@ {tmpl_var name='active'}
-
{tmpl_var name='dkim_settings_txt'}
-
-
-

{tmpl_var name='dkim_txt'}

-
- {tmpl_var name='dkim'} -
-
-
- - -{tmpl_var name='dkim_generate_txt'} -
-
- - -
- -
- - + + @@ -87,7 +68,6 @@ - - - - + + + \ No newline at end of file diff --git a/interface/web/mailuser/lib/lang/cz.lng b/interface/web/mailuser/lib/lang/cz.lng index 8b4b58bc42..4c947bd5f8 100644 --- a/interface/web/mailuser/lib/lang/cz.lng +++ b/interface/web/mailuser/lib/lang/cz.lng @@ -7,3 +7,4 @@ $wb['Send copy'] = 'Poslat kopii na e-mail'; $wb['Spamfilter'] = 'Spamový filtr'; $wb['Email Filters'] = 'E-mailové filtry'; ?> + diff --git a/interface/web/mailuser/lib/lang/cz_index.lng b/interface/web/mailuser/lib/lang/cz_index.lng index 45af56ee8d..cb39d65ad6 100644 --- a/interface/web/mailuser/lib/lang/cz_index.lng +++ b/interface/web/mailuser/lib/lang/cz_index.lng @@ -10,3 +10,4 @@ $wb['unlimited_txt'] = 'Neomezený'; $wb['mb_txt'] = 'MB'; $wb['none_txt'] = 'Nenastaveno'; ?> + diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng index ef3aeb42da..5ed9a1f46e 100644 --- a/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng +++ b/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng @@ -11,3 +11,4 @@ $wb['autoresponder_active'] = 'Povolit automatický odpovídač'; $wb['now_txt'] = 'Nyní'; $wb['autoresponder_subject_txt'] = 'Předmět e-mailu'; ?> + diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng b/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng index 36f11a9baa..ef00aa2365 100644 --- a/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng +++ b/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng @@ -5,3 +5,4 @@ $wb['email_txt'] = 'E-mail'; $wb['cc_error_isemail'] = 'Vyplněná e-mailová adresa neplatná'; $wb['email_is_cc_error'] = 'Vyplněná e-mailová adresa a poslat kopii na e-mail adresu, nemůžou být stejné.'; ?> + diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng b/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng index 3df9d38c72..60bd6642a2 100644 --- a/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng @@ -18,3 +18,4 @@ $wb['ends_with_txt'] = 'Končí na'; $wb['move_to_txt'] = 'Přesunout do'; $wb['delete_txt'] = 'Smazat'; ?> + diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng index 3c2593d6d4..c7198afa8e 100644 --- a/interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng +++ b/interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng @@ -6,3 +6,4 @@ $wb['page_txt'] = 'Stránka'; $wb['page_of_txt'] = 'z'; $wb['delete_confirmation'] = 'Opravdu chcete odstranit e-mail filter?'; ?> + diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_password.lng b/interface/web/mailuser/lib/lang/cz_mail_user_password.lng index 36555a2030..2d09b753b6 100644 --- a/interface/web/mailuser/lib/lang/cz_mail_user_password.lng +++ b/interface/web/mailuser/lib/lang/cz_mail_user_password.lng @@ -1,5 +1,5 @@ + diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng index 2a53036be6..00720f859d 100644 --- a/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng @@ -5,3 +5,4 @@ $wb['email_txt'] = 'E-mail'; $wb['no_policy'] = '- nepovoleno -'; $wb['policy_txt'] = 'Politika'; ?> + diff --git a/interface/web/mailuser/lib/lang/de.lng b/interface/web/mailuser/lib/lang/de.lng index b373d456a0..7a40aa419a 100644 --- a/interface/web/mailuser/lib/lang/de.lng +++ b/interface/web/mailuser/lib/lang/de.lng @@ -7,3 +7,4 @@ $wb['Send copy'] = 'Kopie senden an'; $wb['Spamfilter'] = 'Spamfilter'; $wb['Email Filters'] = 'E-Mailfilter'; ?> + diff --git a/interface/web/mailuser/lib/lang/de_index.lng b/interface/web/mailuser/lib/lang/de_index.lng index 522ddbc8db..d8eec65c23 100644 --- a/interface/web/mailuser/lib/lang/de_index.lng +++ b/interface/web/mailuser/lib/lang/de_index.lng @@ -10,3 +10,4 @@ $wb['unlimited_txt'] = 'Unlimitiert'; $wb['mb_txt'] = 'MB'; $wb['none_txt'] = 'Niemanden'; ?> + diff --git a/interface/web/mailuser/lib/lang/de_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/de_mail_user_autoresponder.lng index f8d4e46b12..ce28da041f 100644 --- a/interface/web/mailuser/lib/lang/de_mail_user_autoresponder.lng +++ b/interface/web/mailuser/lib/lang/de_mail_user_autoresponder.lng @@ -11,3 +11,4 @@ $wb['autoresponder_active'] = 'Autoresponder aktivieren'; $wb['now_txt'] = 'Jetzt'; $wb['autoresponder_subject_txt'] = 'Betreff'; ?> + diff --git a/interface/web/mailuser/lib/lang/de_mail_user_cc.lng b/interface/web/mailuser/lib/lang/de_mail_user_cc.lng index b85077ea7c..6292bb5745 100644 --- a/interface/web/mailuser/lib/lang/de_mail_user_cc.lng +++ b/interface/web/mailuser/lib/lang/de_mail_user_cc.lng @@ -5,3 +5,4 @@ $wb['email_txt'] = 'E-Mail'; $wb['cc_error_isemail'] = 'E-Mail Adresse ungültig im -Kopie senden an- Feld'; $wb['email_is_cc_error'] = 'E-Mail Adresse und '; ?> + diff --git a/interface/web/mailuser/lib/lang/de_mail_user_filter.lng b/interface/web/mailuser/lib/lang/de_mail_user_filter.lng index fd93e64658..53cd51e16a 100644 --- a/interface/web/mailuser/lib/lang/de_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/de_mail_user_filter.lng @@ -18,3 +18,4 @@ $wb['ends_with_txt'] = 'Endet mit'; $wb['move_to_txt'] = 'Verschieben nach'; $wb['delete_txt'] = 'Löschen'; ?> + diff --git a/interface/web/mailuser/lib/lang/de_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/de_mail_user_filter_list.lng index 9abd40d7e3..a0b80bdb0d 100644 --- a/interface/web/mailuser/lib/lang/de_mail_user_filter_list.lng +++ b/interface/web/mailuser/lib/lang/de_mail_user_filter_list.lng @@ -6,3 +6,4 @@ $wb['page_txt'] = 'Seite'; $wb['page_of_txt'] = 'von'; $wb['delete_confirmation'] = 'Möchten Sie die E-Mailfilter Regel wirklich löschen?'; ?> + diff --git a/interface/web/mailuser/lib/lang/de_mail_user_password.lng b/interface/web/mailuser/lib/lang/de_mail_user_password.lng index 5e5fe5e933..062ba6b22f 100644 --- a/interface/web/mailuser/lib/lang/de_mail_user_password.lng +++ b/interface/web/mailuser/lib/lang/de_mail_user_password.lng @@ -8,3 +8,4 @@ $wb['repeat_password_txt'] = 'Passwort wiederholen'; $wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; $wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; ?> + diff --git a/interface/web/mailuser/lib/lang/de_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/de_mail_user_spamfilter.lng index 47ac53a006..019679a829 100644 --- a/interface/web/mailuser/lib/lang/de_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/de_mail_user_spamfilter.lng @@ -5,3 +5,4 @@ $wb['email_txt'] = 'E-Mail'; $wb['no_policy'] = '- nicht aktiviert -'; $wb['policy_txt'] = 'Richtlinie'; ?> + diff --git a/interface/web/mailuser/lib/lang/el.lng b/interface/web/mailuser/lib/lang/el.lng index 114dec9b91..fae2ad9061 100644 --- a/interface/web/mailuser/lib/lang/el.lng +++ b/interface/web/mailuser/lib/lang/el.lng @@ -1,9 +1,9 @@ diff --git a/interface/web/mailuser/lib/lang/el_index.lng b/interface/web/mailuser/lib/lang/el_index.lng index 29fe9ea4f3..b182b45871 100644 --- a/interface/web/mailuser/lib/lang/el_index.lng +++ b/interface/web/mailuser/lib/lang/el_index.lng @@ -1,12 +1,12 @@ diff --git a/interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng index 79f386a7dc..529ba60cac 100644 --- a/interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng +++ b/interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng @@ -1,13 +1,13 @@ diff --git a/interface/web/mailuser/lib/lang/el_mail_user_cc.lng b/interface/web/mailuser/lib/lang/el_mail_user_cc.lng index dc2165a4fc..7b2080bbc5 100644 --- a/interface/web/mailuser/lib/lang/el_mail_user_cc.lng +++ b/interface/web/mailuser/lib/lang/el_mail_user_cc.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/mailuser/lib/lang/el_mail_user_filter.lng b/interface/web/mailuser/lib/lang/el_mail_user_filter.lng index 2e74ffd4f7..bec79e639f 100644 --- a/interface/web/mailuser/lib/lang/el_mail_user_filter.lng +++ b/interface/web/mailuser/lib/lang/el_mail_user_filter.lng @@ -1,20 +1,20 @@ diff --git a/interface/web/mailuser/lib/lang/el_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/el_mail_user_filter_list.lng index fb6b9dfa5d..dd2ae1d6ca 100644 --- a/interface/web/mailuser/lib/lang/el_mail_user_filter_list.lng +++ b/interface/web/mailuser/lib/lang/el_mail_user_filter_list.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/mailuser/lib/lang/el_mail_user_password.lng b/interface/web/mailuser/lib/lang/el_mail_user_password.lng index cdf9674e70..61b976191d 100644 --- a/interface/web/mailuser/lib/lang/el_mail_user_password.lng +++ b/interface/web/mailuser/lib/lang/el_mail_user_password.lng @@ -1,10 +1,10 @@ diff --git a/interface/web/mailuser/lib/lang/el_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/el_mail_user_spamfilter.lng index be4bad9050..15ea90c9b8 100644 --- a/interface/web/mailuser/lib/lang/el_mail_user_spamfilter.lng +++ b/interface/web/mailuser/lib/lang/el_mail_user_spamfilter.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/monitor/form/empty.dir b/interface/web/monitor/form/empty.dir new file mode 100644 index 0000000000..95ba9ef37c --- /dev/null +++ b/interface/web/monitor/form/empty.dir @@ -0,0 +1 @@ +This empty directory is needed by ISPConfig. diff --git a/interface/web/monitor/lib/lang/cz.lng b/interface/web/monitor/lib/lang/cz.lng index 2379533c0f..662d73ad3b 100644 --- a/interface/web/monitor/lib/lang/cz.lng +++ b/interface/web/monitor/lib/lang/cz.lng @@ -145,11 +145,12 @@ $wb['monitor_beancounter_nosupport_txt'] = 'Tento server nemá nainstalován VE $wb['monitor_title_iptables_txt'] = 'IPTables Pravidla'; $wb['Show fail2ban-Log'] = 'Zobrazit Fail2Ban Log'; $wb['Show IPTables'] = 'Zobrazit IPTables pravidla'; -$wb['Show OpenVz VE BeanCounter'] = 'Ukázat OpenVz VE BeanCounter'; -$wb['Show Monit'] = 'Show Monit'; +$wb['Show OpenVz VE BeanCounter'] = 'Zobrazit OpenVz VE BeanCounter'; +$wb['Show Monit'] = 'Zobrazit Monit'; $wb['no_monit_url_defined_txt'] = 'No Monit URL defined.'; $wb['no_permissions_to_view_monit_txt'] = 'You are not allowed to access Monit.'; -$wb['Show Munin'] = 'Show Munin'; +$wb['Show Munin'] = 'Zobrazit Munin'; $wb['no_munin_url_defined_txt'] = 'No Munin URL defined.'; $wb['no_permissions_to_view_munin_txt'] = 'You are not allowed to access Munin.'; ?> + diff --git a/interface/web/monitor/lib/lang/cz_datalog_list.lng b/interface/web/monitor/lib/lang/cz_datalog_list.lng index c9e9a86555..29d8cbb448 100644 --- a/interface/web/monitor/lib/lang/cz_datalog_list.lng +++ b/interface/web/monitor/lib/lang/cz_datalog_list.lng @@ -6,3 +6,4 @@ $wb['dbtable_txt'] = 'DB tabulka'; $wb['action_txt'] = 'Akce'; $wb['status_txt'] = 'Stav'; ?> + diff --git a/interface/web/monitor/lib/lang/cz_syslog_list.lng b/interface/web/monitor/lib/lang/cz_syslog_list.lng index 990662552b..864232ed0d 100644 --- a/interface/web/monitor/lib/lang/cz_syslog_list.lng +++ b/interface/web/monitor/lib/lang/cz_syslog_list.lng @@ -5,3 +5,4 @@ $wb['server_id_txt'] = 'Server'; $wb['loglevel_txt'] = 'Logovací úroveň'; $wb['message_txt'] = 'Zpráva'; ?> + diff --git a/interface/web/monitor/lib/lang/de.lng b/interface/web/monitor/lib/lang/de.lng index a46050ee49..304ac73331 100644 --- a/interface/web/monitor/lib/lang/de.lng +++ b/interface/web/monitor/lib/lang/de.lng @@ -122,7 +122,6 @@ $wb['monitor_services_smtp_txt'] = 'SMTP Server:'; $wb['monitor_services_pop_txt'] = 'POP3 Server:'; $wb['monitor_services_imap_txt'] = 'IMAP Server:'; $wb['monitor_services_mydns_txt'] = 'DNS Server:'; -$wb['monitor_services_mongodb_txt'] = 'MongoDB Server:'; $wb['monitor_services_mysql_txt'] = 'MySQL Server:'; $wb['monitor_settings_datafromdate_txt'] = 'Daten vom: '; $wb['monitor_settings_datetimeformat_txt'] = 'd.m.Y H:i'; @@ -135,7 +134,6 @@ $wb['monitor_title_raidstate_txt'] = 'RAID Status'; $wb['monitor_title_rkhunterlog_txt'] = 'RKHunter Protokoll'; $wb['monitor_updates_nosupport_txt'] = 'Ihre Distribution wird für die Überwachung nicht unterstützt'; $wb['monitor_title_fail2ban_txt'] = 'Fail2Ban Protokoll'; -$wb['monitor_title_mongodb_txt'] = 'MongoDB Protokoll'; $wb['monitor_nosupportedraid1_txt'] = 'At the moment, we support mdadm or mpt-status for monitoring the RAID.
We cant find any of them at your server.

This means we can not support your RAID yet.'; $wb['monitor_serverstate_beancounterok_txt'] = 'The beancounter is ok'; $wb['monitor_serverstate_beancounterinfo_txt'] = 'There are vew failure in the beancounter'; @@ -146,7 +144,6 @@ $wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; $wb['monitor_beancounter_nosupport_txt'] = 'This server is not a OpenVz VE and has no beancounter information'; $wb['monitor_title_iptables_txt'] = 'IPTables Regeln'; $wb['Show fail2ban-Log'] = 'Fail2ban Protokoll anzeigen'; -$wb['Show MongoDB-Log'] = 'MongoDB Protokoll anzeigen'; $wb['Show IPTables'] = 'IPTables anzeigen'; $wb['Show OpenVz VE BeanCounter'] = 'OpenVz VE BeanCounter anzeigen'; $wb['Show Monit'] = 'Monit anzeigen'; @@ -156,3 +153,4 @@ $wb['Show Munin'] = 'Munin anzeigen'; $wb['no_munin_url_defined_txt'] = 'Keine Munin-URL definiert.'; $wb['no_permissions_to_view_munin_txt'] = 'Sie haben nicht die Berechtigung, auf Munin zuzugreifen.'; ?> + diff --git a/interface/web/monitor/lib/lang/de_datalog_list.lng b/interface/web/monitor/lib/lang/de_datalog_list.lng index 0b6bf9a4bb..8939cab064 100644 --- a/interface/web/monitor/lib/lang/de_datalog_list.lng +++ b/interface/web/monitor/lib/lang/de_datalog_list.lng @@ -6,3 +6,4 @@ $wb['dbtable_txt'] = 'Datenbanktabelle'; $wb['action_txt'] = 'Aktion'; $wb['status_txt'] = 'Status'; ?> + diff --git a/interface/web/monitor/lib/lang/el.lng b/interface/web/monitor/lib/lang/el.lng index d840b6bb68..eb91a59960 100644 --- a/interface/web/monitor/lib/lang/el.lng +++ b/interface/web/monitor/lib/lang/el.lng @@ -145,11 +145,11 @@ $wb['monitor_title_iptables_txt'] = 'Κανόνες IPTables'; $wb['Show fail2ban-Log'] = 'Εμφάνιση fail2ban-Log'; $wb['Show IPTables'] = 'Εμφάνιση IPTables'; $wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; -$wb['monitor_serverstate_raidresync_txt'] = 'Your RAID is in RESYNC mode'; -$wb['Show Monit'] = 'Show Monit'; -$wb['no_monit_url_defined_txt'] = 'No Monit URL defined.'; -$wb['no_permissions_to_view_monit_txt'] = 'You are not allowed to access Monit.'; -$wb['Show Munin'] = 'Show Munin'; -$wb['no_munin_url_defined_txt'] = 'No Munin URL defined.'; -$wb['no_permissions_to_view_munin_txt'] = 'You are not allowed to access Munin.'; +$wb['monitor_serverstate_raidresync_txt'] = 'Το RAID βρίσκεται σε κατάσταση επανασυγχρονισμού'; +$wb['Show Monit'] = 'Εμφάνιση Monit'; +$wb['no_monit_url_defined_txt'] = 'Δεν καθορίστηκε URL για το Monit.'; +$wb['no_permissions_to_view_monit_txt'] = 'Δεν επιτρέπεται η πρόσβαση στο Monit.'; +$wb['Show Munin'] = 'Εμφάνιση Munin'; +$wb['no_munin_url_defined_txt'] = 'Δεν καθορίστηκε URL για το Munin.'; +$wb['no_permissions_to_view_munin_txt'] = 'Δεν επιτρέπεται η πρόσβαση στο Munin.'; ?> diff --git a/interface/web/monitor/lib/lang/el_datalog_list.lng b/interface/web/monitor/lib/lang/el_datalog_list.lng index 8ad63ffd42..f2a5d32732 100644 --- a/interface/web/monitor/lib/lang/el_datalog_list.lng +++ b/interface/web/monitor/lib/lang/el_datalog_list.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/monitor/lib/lang/en.lng b/interface/web/monitor/lib/lang/en.lng index ec5ca7325f..20cf1fbb3b 100644 --- a/interface/web/monitor/lib/lang/en.lng +++ b/interface/web/monitor/lib/lang/en.lng @@ -46,7 +46,6 @@ $wb['Show ISPConfig-Log'] = 'Show ISPConfig-Log'; $wb['Show RKHunter-Log'] = 'Show RKHunter-Log'; $wb['Show Jobqueue'] = 'Show Jobqueue'; $wb['Show fail2ban-Log'] = 'Show fail2ban-Log'; -$wb['Show MongoDB-Log'] = 'Show MongoDB-Log'; $wb['Show IPTables'] = 'Show IPTables'; $wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; $wb['monitor_general_serverstate_txt'] = 'Server State'; @@ -132,7 +131,6 @@ $wb['monitor_services_smtp_txt'] = 'SMTP-Server:'; $wb['monitor_services_pop_txt'] = 'POP3-Server:'; $wb['monitor_services_imap_txt'] = 'IMAP-Server:'; $wb['monitor_services_mydns_txt'] = 'DNS-Server:'; -$wb['monitor_services_mongodb_txt'] = 'MongoDB-Server:'; $wb['monitor_services_mysql_txt'] = 'mySQL-Server:'; $wb['monitor_settings_datafromdate_txt'] = 'Data from: '; $wb['monitor_settings_datetimeformat_txt'] = 'Y-m-d H:i'; @@ -144,7 +142,6 @@ $wb['monitor_title_mailq_txt'] = 'Mail Queue'; $wb['monitor_title_raidstate_txt'] = 'RAID Status'; $wb['monitor_title_rkhunterlog_txt'] = 'RKHunter Log'; $wb['monitor_title_fail2ban_txt'] = 'Fail2Ban Log'; -$wb['monitor_title_mongodb_txt'] = 'MongoDB Log'; $wb['monitor_title_iptables_txt'] = 'IPTables Rules'; $wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; $wb['monitor_updates_nosupport_txt'] = 'Your distribution is not supported for this monitoring'; diff --git a/interface/web/monitor/lib/module.conf.php b/interface/web/monitor/lib/module.conf.php index c019b84e46..1d4e5e1c34 100644 --- a/interface/web/monitor/lib/module.conf.php +++ b/interface/web/monitor/lib/module.conf.php @@ -190,11 +190,6 @@ $items[] = array( 'title' => "Show fail2ban-Log", 'link' => 'monitor/show_data.php?type=fail2ban', 'html_id' => 'fai2ban'); -$items[] = array( 'title' => "Show MongoDB-Log", - 'target' => 'content', - 'link' => 'monitor/show_data.php?type=mongodb', - 'html_id' => 'mongodb'); - $items[] = array( 'title' => "Show IPTables", 'target' => 'content', 'link' => 'monitor/show_data.php?type=iptables', @@ -203,4 +198,4 @@ $items[] = array( 'title' => "Show IPTables", $module["nav"][] = array( 'title' => 'Logfiles', 'open' => 1, 'items' => $items); -?> +?> \ No newline at end of file diff --git a/interface/web/monitor/show_data.php b/interface/web/monitor/show_data.php index 92c66a486b..1cd4baf525 100644 --- a/interface/web/monitor/show_data.php +++ b/interface/web/monitor/show_data.php @@ -124,13 +124,6 @@ switch($dataType) { $title = $app->lng("monitor_title_fail2ban_txt") . ' (' . $monTransSrv . ' : ' . $_SESSION['monitor']['server_name'] . ')'; $description = ''; break; - case 'mongodb': - $template = 'templates/show_data.htm'; - $output .= $app->tools_monitor->showMongoDB(); - $time = $app->tools_monitor->getDataTime('log_mongodb'); - $title = $app->lng("monitor_title_mongodb_txt") . ' (' . $monTransSrv . ' : ' . $_SESSION['monitor']['server_name'] . ')'; - $description = ''; - break; case 'iptables': $template = 'templates/show_data.htm'; $output .= $app->tools_monitor->showIPTables(); diff --git a/interface/web/monitor/show_log.php b/interface/web/monitor/show_log.php index cb9e4c1074..ec10a982b1 100644 --- a/interface/web/monitor/show_log.php +++ b/interface/web/monitor/show_log.php @@ -125,20 +125,7 @@ $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE t if(isset($record['data'])) { $data = unserialize($record['data']); - $logData = explode("\n", htmlspecialchars($data)); - $logDataHtml = ''; - /* set css class for each line of log, depending on key words in each line */ - foreach($logData as $val) { - if (strpos($val, 'ERROR') !== FALSE) { - $logDataHtml .= "
$val
"; - } elseif (strpos($val, 'WARN') !== FALSE) { - $logDataHtml .= "
$val
"; - } elseif (strpos($val, 'INFO') !== FALSE) { - $logDataHtml .= "
$val
"; - } else { - $logDataHtml .= "
$val
"; - } - } + $logData = nl2br(htmlspecialchars($data)); $app->tpl->setVar("log_data", $logData); } else { diff --git a/interface/web/monitor/templates/show_sys_state.htm b/interface/web/monitor/templates/show_sys_state.htm index ceb419573d..55aeeb28a2 100644 --- a/interface/web/monitor/templates/show_sys_state.htm +++ b/interface/web/monitor/templates/show_sys_state.htm @@ -1,25 +1,25 @@ -

-

- -
- -
-
-
-
- - -
-
-
-
- -
-
-
-
-
- +

+

+ +
+ +
+
+
+
+ + +
+
+
+
+ +
+
+
+
+
+
\ No newline at end of file diff --git a/interface/web/remote/monitor.php b/interface/web/remote/monitor.php index ae138d536d..f49b1695d0 100644 --- a/interface/web/remote/monitor.php +++ b/interface/web/remote/monitor.php @@ -29,6 +29,11 @@ if($token == '' or $secret == '' or $token != $secret) { if($type == 'serverlist') { $sql = 'SELECT server_id, server_name FROM server WHERE 1 ORDER BY server_id'; $records = $app->db->queryAllRecords($sql); + foreach($records as $index => $rec) { + $rec = $app->db->queryOneRecord("SELECT * FROM monitor_data WHERE server_id = " . $rec['server_id'] . " AND state NOT IN ('ok', 'no_state', 'info')"); + if($rec) $records[$index]['state'] = 'warn'; + else $records[$index]['state'] = 'ok'; + } $out['state'] = 'ok'; $out['data'] = $records; $out['time'] = date('Y-m-d H:i',$rec['created']); diff --git a/interface/web/sites/aps_cron_apscrawler_if.php b/interface/web/sites/aps_cron_apscrawler_if.php index caa9b02d75..d1e15cc963 100644 --- a/interface/web/sites/aps_cron_apscrawler_if.php +++ b/interface/web/sites/aps_cron_apscrawler_if.php @@ -1,63 +1,63 @@ -load('aps_crawler'); - -if(!@ini_get('allow_url_fopen')) $app->error('allow_url_fopen is not enabled.'); -if(!function_exists('curl_version')) $app->error('The PHP CURL extension is not available.'); - -$log_prefix = 'APS crawler cron: '; - -$aps = new ApsCrawler($app, true); // true = Interface mode, false = Server mode - -$app->log($log_prefix.'Used mem at begin: '.$aps->convertSize(memory_get_usage(true))); - -$time_start = microtime(true); -$aps->startCrawler(); -$aps->parseFolderToDB(); -$aps->fixURLs(); -$time = microtime(true) - $time_start; - -$app->log($log_prefix.'Used mem at end: '.$aps->convertSize(memory_get_usage(true))); -$app->log($log_prefix.'Mem peak during execution: '.$aps->convertSize(memory_get_peak_usage(true))); -$app->log($log_prefix.'Execution time: '.round($time, 3).' seconds'); - -// Load the language file -$lngfile = 'lib/lang/'.$_SESSION['s']['language'].'_aps.lng'; -$app->load_language_file('web/sites/'.$lngfile); - -echo '

'.$app->lng('packagelist_update_finished_txt').'

'; - - - +load('aps_crawler'); + +if(!@ini_get('allow_url_fopen')) $app->error('allow_url_fopen is not enabled.'); +if(!function_exists('curl_version')) $app->error('The PHP CURL extension is not available.'); + +$log_prefix = 'APS crawler cron: '; + +$aps = new ApsCrawler($app, true); // true = Interface mode, false = Server mode + +$app->log($log_prefix.'Used mem at begin: '.$aps->convertSize(memory_get_usage(true))); + +$time_start = microtime(true); +$aps->startCrawler(); +$aps->parseFolderToDB(); +$aps->fixURLs(); +$time = microtime(true) - $time_start; + +$app->log($log_prefix.'Used mem at end: '.$aps->convertSize(memory_get_usage(true))); +$app->log($log_prefix.'Mem peak during execution: '.$aps->convertSize(memory_get_peak_usage(true))); +$app->log($log_prefix.'Execution time: '.round($time, 3).' seconds'); + +// Load the language file +$lngfile = 'lib/lang/'.$_SESSION['s']['language'].'_aps.lng'; +$app->load_language_file('web/sites/'.$lngfile); + +echo '

'.$app->lng('packagelist_update_finished_txt').'

'; + + + ?> \ No newline at end of file diff --git a/interface/web/sites/aps_do_operation.php b/interface/web/sites/aps_do_operation.php index ada193c759..ad165f33bc 100644 --- a/interface/web/sites/aps_do_operation.php +++ b/interface/web/sites/aps_do_operation.php @@ -1,112 +1,112 @@ -load('aps_guicontroller'); - -// Check the module permissions -$app->auth->check_module_permissions('sites'); - -$gui = new ApsGUIController($app); - -// An action and ID are required in any case -if(!isset($_GET['action'])) die('No action'); - -// List of operations which can be performed -if($_GET['action'] == 'change_status') -{ - // Only admins can perform this operation - if($_SESSION['s']['user']['typ'] != 'admin') die('For admin use only.'); - - // Make sure a valid package ID is given - if(!$gui->isValidPackageID($_GET['id'], true)) die($app->lng('Invalid ID')); - - // Change the existing status to the opposite - $get_status = $app->db->queryOneRecord("SELECT package_status FROM aps_packages WHERE id = '".$app->functions->intval($_GET['id'])."';"); - if($get_status['package_status'] == strval(PACKAGE_LOCKED)) - { - $app->db->query("UPDATE aps_packages SET package_status = ".PACKAGE_ENABLED." WHERE id = '".$app->functions->intval($_GET['id'])."';"); - echo '
'.$app->lng('Yes').'
'; - } - else - { - $app->db->query("UPDATE aps_packages SET Package_status = ".PACKAGE_LOCKED." WHERE id = '".$app->functions->intval($_GET['id'])."';"); - echo '
'.$app->lng('No').'
'; - } -} -else if($_GET['action'] == 'delete_instance') -{ - // Make sure a valid package ID is given (also corresponding to the calling user) - $client_id = 0; - $is_admin = ($_SESSION['s']['user']['typ'] == 'admin') ? true : false; - if(!$is_admin) - { - $cid = $app->db->queryOneRecord("SELECT client_id FROM client WHERE username = '".$app->db->quote($_SESSION['s']['user']['username'])."';"); - $client_id = $cid['client_id']; - } - - // Assume that the given instance belongs to the currently calling client_id. Unimportant if status is admin - if(!$gui->isValidInstanceID($_GET['id'], $client_id, $is_admin)) die($app->lng('Invalid ID')); - - // Only delete the instance if the status is "installed" or "flawed" - $check = $app->db->queryOneRecord("SELECT id FROM aps_instances - WHERE id = ".$app->db->quote($_GET['id'])." AND - (instance_status = ".INSTANCE_SUCCESS." OR instance_status = ".INSTANCE_ERROR.");"); - if($check['id'] > 0) $gui->deleteInstance($_GET['id']); - //echo $app->lng('Installation_remove'); - @header('Location:aps_installedpackages_list.php'); -} -else if($_GET['action'] == 'reinstall_instance') -{ - // Make sure a valid package ID is given (also corresponding to the calling user) - $client_id = 0; - $is_admin = ($_SESSION['s']['user']['typ'] == 'admin') ? true : false; - if(!$is_admin) - { - $cid = $app->db->queryOneRecord("SELECT client_id FROM client WHERE username = '".$app->db->quote($_SESSION['s']['user']['username'])."';"); - $client_id = $cid['client_id']; - } - // Assume that the given instance belongs to the currently calling client_id. Unimportant if status is admin - if(!$gui->isValidInstanceID($_GET['id'], $client_id, $is_admin)) die($app->lng('Invalid ID')); - - // We've an InstanceID, so make sure the package is not enabled and InstanceStatus is still "installed" - $check = $app->db->queryOneRecord("SELECT aps_instances.id FROM aps_instances, aps_packages - WHERE aps_instances.package_id = aps_packages.id - AND aps_instances.instance_status = ".INSTANCE_SUCCESS." - AND aps_packages.package_status = ".PACKAGE_ENABLED." - AND aps_instances.id = ".$app->db->quote($_GET['id']).";"); - if(!$check) die('Check failed'); // normally this might not happen at all, so just die - - $gui->reinstallInstance($_GET['id']); - //echo $app->lng('Installation_task'); - @header('Location:aps_installedpackages_list.php'); -} -?> +load('aps_guicontroller'); + +// Check the module permissions +$app->auth->check_module_permissions('sites'); + +$gui = new ApsGUIController($app); + +// An action and ID are required in any case +if(!isset($_GET['action'])) die('No action'); + +// List of operations which can be performed +if($_GET['action'] == 'change_status') +{ + // Only admins can perform this operation + if($_SESSION['s']['user']['typ'] != 'admin') die('For admin use only.'); + + // Make sure a valid package ID is given + if(!$gui->isValidPackageID($_GET['id'], true)) die($app->lng('Invalid ID')); + + // Change the existing status to the opposite + $get_status = $app->db->queryOneRecord("SELECT package_status FROM aps_packages WHERE id = '".$app->functions->intval($_GET['id'])."';"); + if($get_status['package_status'] == strval(PACKAGE_LOCKED)) + { + $app->db->query("UPDATE aps_packages SET package_status = ".PACKAGE_ENABLED." WHERE id = '".$app->functions->intval($_GET['id'])."';"); + echo '
'.$app->lng('Yes').'
'; + } + else + { + $app->db->query("UPDATE aps_packages SET Package_status = ".PACKAGE_LOCKED." WHERE id = '".$app->functions->intval($_GET['id'])."';"); + echo '
'.$app->lng('No').'
'; + } +} +else if($_GET['action'] == 'delete_instance') +{ + // Make sure a valid package ID is given (also corresponding to the calling user) + $client_id = 0; + $is_admin = ($_SESSION['s']['user']['typ'] == 'admin') ? true : false; + if(!$is_admin) + { + $cid = $app->db->queryOneRecord("SELECT client_id FROM client WHERE username = '".$app->db->quote($_SESSION['s']['user']['username'])."';"); + $client_id = $cid['client_id']; + } + + // Assume that the given instance belongs to the currently calling client_id. Unimportant if status is admin + if(!$gui->isValidInstanceID($_GET['id'], $client_id, $is_admin)) die($app->lng('Invalid ID')); + + // Only delete the instance if the status is "installed" or "flawed" + $check = $app->db->queryOneRecord("SELECT id FROM aps_instances + WHERE id = ".$app->db->quote($_GET['id'])." AND + (instance_status = ".INSTANCE_SUCCESS." OR instance_status = ".INSTANCE_ERROR.");"); + if($check['id'] > 0) $gui->deleteInstance($_GET['id']); + //echo $app->lng('Installation_remove'); + @header('Location:aps_installedpackages_list.php'); +} +else if($_GET['action'] == 'reinstall_instance') +{ + // Make sure a valid package ID is given (also corresponding to the calling user) + $client_id = 0; + $is_admin = ($_SESSION['s']['user']['typ'] == 'admin') ? true : false; + if(!$is_admin) + { + $cid = $app->db->queryOneRecord("SELECT client_id FROM client WHERE username = '".$app->db->quote($_SESSION['s']['user']['username'])."';"); + $client_id = $cid['client_id']; + } + // Assume that the given instance belongs to the currently calling client_id. Unimportant if status is admin + if(!$gui->isValidInstanceID($_GET['id'], $client_id, $is_admin)) die($app->lng('Invalid ID')); + + // We've an InstanceID, so make sure the package is not enabled and InstanceStatus is still "installed" + $check = $app->db->queryOneRecord("SELECT aps_instances.id FROM aps_instances, aps_packages + WHERE aps_instances.package_id = aps_packages.id + AND aps_instances.instance_status = ".INSTANCE_SUCCESS." + AND aps_packages.package_status = ".PACKAGE_ENABLED." + AND aps_instances.id = ".$app->db->quote($_GET['id']).";"); + if(!$check) die('Check failed'); // normally this might not happen at all, so just die + + $gui->reinstallInstance($_GET['id']); + //echo $app->lng('Installation_task'); + @header('Location:aps_installedpackages_list.php'); +} +?> diff --git a/interface/web/sites/aps_install_package.php b/interface/web/sites/aps_install_package.php index ccad334993..b7bed71be3 100644 --- a/interface/web/sites/aps_install_package.php +++ b/interface/web/sites/aps_install_package.php @@ -1,211 +1,211 @@ -load('aps_guicontroller'); - -// Check the module permissions -$app->auth->check_module_permissions('sites'); - -// Load needed classes -$app->uses('tpl,tform'); -$app->tpl->newTemplate("form.tpl.htm"); -$app->tpl->setInclude('content_tpl', 'templates/aps_install_package.htm'); - -// Load the language file -$lngfile = 'lib/lang/'.$_SESSION['s']['language'].'_aps.lng'; -require_once($lngfile); -$app->tpl->setVar($wb); -$app->load_language_file('web/sites/'.$lngfile); - -// we will check only users, not admins -if($_SESSION["s"]["user"]["typ"] == 'user') { - $app->tform->formDef['db_table_idx'] = 'client_id'; - $app->tform->formDef['db_table'] = 'client'; - if(!$app->tform->checkClientLimit('limit_aps')) { - $app->error($app->lng("limit_aps_txt")); - } - if(!$app->tform->checkResellerLimit('limit_aps')) { - $app->error('Reseller: '.$wb["limit_aps_txt"]); - } -} - - -$adminflag = ($_SESSION['s']['user']['typ'] == 'admin') ? true : false; -$gui = new ApsGUIController($app); -$pkg_id = (isset($_GET['id'])) ? $app->db->quote($_GET['id']) : ''; - -// Check if a newer version is available for the current package -// Note: It's intended that here is no strict ID check (see below) -if(isset($pkg_id)) -{ - $newest_pkg_id = $gui->getNewestPackageID($pkg_id); - if($newest_pkg_id != 0) $pkg_id = $newest_pkg_id; -} - -// Make sure an integer ID is given -if(!isset($pkg_id) || !$gui->isValidPackageID($pkg_id, $adminflag)) - $app->error($app->lng('Invalid ID')); - -// Get package details -$details = $gui->getPackageDetails($pkg_id); -if(isset($details['error'])) $app->error($details['error']); -$settings = $gui->getPackageSettings($pkg_id); -if(isset($settings['error'])) $app->error($settings['error']); - -// Get domain list -$domains = array(); -$domain_for_user = ''; -if(!$adminflag) $domain_for_user = "AND (sys_userid = '".$app->db->quote($_SESSION['s']['user']['userid'])."' - OR sys_groupid = '".$app->db->quote($_SESSION['s']['user']['userid'])."' )"; -$domains_assoc = $app->db->queryAllRecords("SELECT domain FROM web_domain WHERE document_root != '' AND (type = 'vhost' OR type = 'vhostsubdomain') AND active = 'y' ".$domain_for_user." ORDER BY domain;"); -if(!empty($domains_assoc)) foreach($domains_assoc as $domain) $domains[] = $domain['domain']; - -// If data has been submitted, validate it -$result['input'] = array(); -if(count($_POST) > 1) -{ - $result = $gui->validateInstallerInput($_POST, $details, $domains, $settings); - if(empty($result['error'])) - { - $gui->createPackageInstance($result['input'], $pkg_id); - @header('Location:aps_installedpackages_list.php'); - } - else - { - $app->tpl->setVar('error', implode('
', $result['error'])); - - // Set memorized values (license, db password, install location) - if(!empty($result['input'])) - foreach($result['input'] as $key => $value) $app->tpl->setVar('inp_'.$key, $value); - } -} -else $app->tpl->setVar('inp_main_database_password', ucfirst(substr(md5(crypt(rand(0, 10))), 0, 16))); - -// Pass the package details to the template -foreach($details as $key => $value) -{ - if(!is_array($value)) $app->tpl->setVar('pkg_'.str_replace(' ', '_', strtolower($key)), $value); - else if($key == 'Requirements PHP settings') $app->tpl->setLoop('pkg_requirements_php_settings', $details['Requirements PHP settings']); -} - -// Parse the template as far as possible, then do the rest manually -$app->tpl_defaults(); -$parsed_tpl = $app->tpl->grab(); - - -// ISPConfig has a very old and functionally limited template engine. We have to style parts on our own... - -// Print the domain list -$domains_tpl = ''; -if(!empty($domains)) -{ - $set = array(); - $set[] = ''; - - $domains_tpl = implode("\n", $set); -} -$parsed_tpl = str_replace('DOMAIN_LIST_SPACE', $domains_tpl, $parsed_tpl); - -// Print the packgae settings -$settings_tpl = ''; -if(!empty($settings)) -{ - $set = array(); - $set[] = ''.$app->lng('package_settings_txt').''; - foreach($settings as $setting) - { - $set[] = '
'; - $set[] = ''; - if($setting['SettingInputType'] == 'string' || $setting['SettingInputType'] == 'password') - { - $input_type = ($setting['SettingInputType'] == 'string') ? 'text' : 'password'; - - $input_value = ''; - if((count($_POST) > 1) - && (isset($result['input'][$setting['SettingID']]))) - $input_value = $result['input'][$setting['SettingID']]; - else $input_value = @$setting['SettingDefaultValue']; - - $set[] = ' -

'.$setting['SettingDescription'].'

'; - } - else if($setting['SettingInputType'] == 'checkbox') - { - $checked = ''; - if((count($_POST) > 1) - && (isset($result['input'][$setting['SettingID']]) - && ($result['input'][$setting['SettingID']] == 'true'))) - $checked = 'checked '; - else if($setting['SettingDefaultValue'] == '1') $checked = 'checked '; - - $set[] = ' -

'.$setting['SettingDescription'].'

'; - } - else if($setting['SettingInputType'] == 'select') - { - $set[] = ' -

'.$setting['SettingDescription'].'

'; - } - - $set[] = '
'; - } - $settings_tpl = implode("\n", $set); -} -$parsed_tpl = str_replace('PKG_SETTINGS_SPACE', $settings_tpl, $parsed_tpl); - -echo $parsed_tpl; +load('aps_guicontroller'); + +// Check the module permissions +$app->auth->check_module_permissions('sites'); + +// Load needed classes +$app->uses('tpl,tform'); +$app->tpl->newTemplate("form.tpl.htm"); +$app->tpl->setInclude('content_tpl', 'templates/aps_install_package.htm'); + +// Load the language file +$lngfile = 'lib/lang/'.$_SESSION['s']['language'].'_aps.lng'; +require_once($lngfile); +$app->tpl->setVar($wb); +$app->load_language_file('web/sites/'.$lngfile); + +// we will check only users, not admins +if($_SESSION["s"]["user"]["typ"] == 'user') { + $app->tform->formDef['db_table_idx'] = 'client_id'; + $app->tform->formDef['db_table'] = 'client'; + if(!$app->tform->checkClientLimit('limit_aps')) { + $app->error($app->lng("limit_aps_txt")); + } + if(!$app->tform->checkResellerLimit('limit_aps')) { + $app->error('Reseller: '.$wb["limit_aps_txt"]); + } +} + + +$adminflag = ($_SESSION['s']['user']['typ'] == 'admin') ? true : false; +$gui = new ApsGUIController($app); +$pkg_id = (isset($_GET['id'])) ? $app->db->quote($_GET['id']) : ''; + +// Check if a newer version is available for the current package +// Note: It's intended that here is no strict ID check (see below) +if(isset($pkg_id)) +{ + $newest_pkg_id = $gui->getNewestPackageID($pkg_id); + if($newest_pkg_id != 0) $pkg_id = $newest_pkg_id; +} + +// Make sure an integer ID is given +if(!isset($pkg_id) || !$gui->isValidPackageID($pkg_id, $adminflag)) + $app->error($app->lng('Invalid ID')); + +// Get package details +$details = $gui->getPackageDetails($pkg_id); +if(isset($details['error'])) $app->error($details['error']); +$settings = $gui->getPackageSettings($pkg_id); +if(isset($settings['error'])) $app->error($settings['error']); + +// Get domain list +$domains = array(); +$domain_for_user = ''; +if(!$adminflag) $domain_for_user = "AND (sys_userid = '".$app->db->quote($_SESSION['s']['user']['userid'])."' + OR sys_groupid = '".$app->db->quote($_SESSION['s']['user']['userid'])."' )"; +$domains_assoc = $app->db->queryAllRecords("SELECT domain FROM web_domain WHERE document_root != '' AND (type = 'vhost' OR type = 'vhostsubdomain') AND active = 'y' ".$domain_for_user." ORDER BY domain;"); +if(!empty($domains_assoc)) foreach($domains_assoc as $domain) $domains[] = $domain['domain']; + +// If data has been submitted, validate it +$result['input'] = array(); +if(count($_POST) > 1) +{ + $result = $gui->validateInstallerInput($_POST, $details, $domains, $settings); + if(empty($result['error'])) + { + $gui->createPackageInstance($result['input'], $pkg_id); + @header('Location:aps_installedpackages_list.php'); + } + else + { + $app->tpl->setVar('error', implode('
', $result['error'])); + + // Set memorized values (license, db password, install location) + if(!empty($result['input'])) + foreach($result['input'] as $key => $value) $app->tpl->setVar('inp_'.$key, $value); + } +} +else $app->tpl->setVar('inp_main_database_password', ucfirst(substr(md5(crypt(rand(0, 10))), 0, 16))); + +// Pass the package details to the template +foreach($details as $key => $value) +{ + if(!is_array($value)) $app->tpl->setVar('pkg_'.str_replace(' ', '_', strtolower($key)), $value); + else if($key == 'Requirements PHP settings') $app->tpl->setLoop('pkg_requirements_php_settings', $details['Requirements PHP settings']); +} + +// Parse the template as far as possible, then do the rest manually +$app->tpl_defaults(); +$parsed_tpl = $app->tpl->grab(); + + +// ISPConfig has a very old and functionally limited template engine. We have to style parts on our own... + +// Print the domain list +$domains_tpl = ''; +if(!empty($domains)) +{ + $set = array(); + $set[] = ''; + + $domains_tpl = implode("\n", $set); +} +$parsed_tpl = str_replace('DOMAIN_LIST_SPACE', $domains_tpl, $parsed_tpl); + +// Print the packgae settings +$settings_tpl = ''; +if(!empty($settings)) +{ + $set = array(); + $set[] = ''.$app->lng('package_settings_txt').''; + foreach($settings as $setting) + { + $set[] = '
'; + $set[] = ''; + if($setting['SettingInputType'] == 'string' || $setting['SettingInputType'] == 'password') + { + $input_type = ($setting['SettingInputType'] == 'string') ? 'text' : 'password'; + + $input_value = ''; + if((count($_POST) > 1) + && (isset($result['input'][$setting['SettingID']]))) + $input_value = $result['input'][$setting['SettingID']]; + else $input_value = @$setting['SettingDefaultValue']; + + $set[] = ' +

'.$setting['SettingDescription'].'

'; + } + else if($setting['SettingInputType'] == 'checkbox') + { + $checked = ''; + if((count($_POST) > 1) + && (isset($result['input'][$setting['SettingID']]) + && ($result['input'][$setting['SettingID']] == 'true'))) + $checked = 'checked '; + else if($setting['SettingDefaultValue'] == '1') $checked = 'checked '; + + $set[] = ' +

'.$setting['SettingDescription'].'

'; + } + else if($setting['SettingInputType'] == 'select') + { + $set[] = ' +

'.$setting['SettingDescription'].'

'; + } + + $set[] = '
'; + } + $settings_tpl = implode("\n", $set); +} +$parsed_tpl = str_replace('PKG_SETTINGS_SPACE', $settings_tpl, $parsed_tpl); + +echo $parsed_tpl; ?> \ No newline at end of file diff --git a/interface/web/sites/aps_installedpackages_list.php b/interface/web/sites/aps_installedpackages_list.php index e3c318f93e..00d7b258b1 100644 --- a/interface/web/sites/aps_installedpackages_list.php +++ b/interface/web/sites/aps_installedpackages_list.php @@ -1,142 +1,142 @@ -load('aps_base'); - -// Path to the list definition file -$list_def_file = "list/aps_installedpackages.list.php"; - -// Check the module permissions -$app->auth->check_module_permissions('sites'); - -// Load needed classes -$app->uses('tpl,tform,listform,listform_actions'); - -// Show further information only to admins or resellers -if($_SESSION['s']['user']['typ'] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) - $app->tpl->setVar('is_noclient', 1); - -// Show each user the own packages (if not admin) -$client_ext = ''; -$is_admin = ($_SESSION['s']['user']['typ'] == 'admin') ? true : false; -if(!$is_admin) -{ - $cid = $app->db->queryOneRecord('SELECT client_id FROM client WHERE username = "'.$app->db->quote($_SESSION['s']['user']['username']).'";'); - //$client_ext = ' AND aps_instances.customer_id = '.$cid['client_id']; - $client_ext = ' AND '.$app->tform->getAuthSQL('r', 'aps_instances'); -} -$app->listform_actions->SQLExtWhere = 'aps_instances.package_id = aps_packages.id'.$client_ext; -$app->listform_actions->SQLOrderBy = 'ORDER BY package_name'; - -// We are using parts of listform_actions because ISPConfig doesn't allow -// queries over multiple tables so we construct them ourselves -$_SESSION['s']['form']['return_to'] = ''; - -// Load the list template -$app->listform->loadListDef($list_def_file); -if(!is_file('templates/'.$app->listform->listDef["name"].'_list.htm')) -{ -$app->uses('listform_tpl_generator'); -$app->listform_tpl_generator->buildHTML($app->listform->listDef); -} -$app->tpl->newTemplate("listpage.tpl.htm"); -$app->tpl->setInclude('content_tpl', 'templates/'.$app->listform->listDef["name"].'_list.htm'); - -// Build the WHERE query for search -$sql_where = ''; -if($app->listform_actions->SQLExtWhere != '') - $sql_where .= ' '.$app->listform_actions->SQLExtWhere.' and'; -$sql_where = $app->listform->getSearchSQL($sql_where); -$app->tpl->setVar($app->listform->searchValues); - -// Paging -$limit_sql = $app->listform->getPagingSQL($sql_where); -$app->tpl->setVar('paging', $app->listform->pagingHTML); - -if(!$is_admin) { -// Our query over multiple tables -$query = "SELECT aps_instances.id AS id, aps_instances.package_id AS package_id, - aps_instances.customer_id AS customer_id, client.username AS customer_name, - aps_instances.instance_status AS instance_status, aps_packages.name AS package_name, - aps_packages.version AS package_version, aps_packages.release AS package_release, - aps_packages.package_status AS package_status, - CONCAT((SELECT value FROM aps_instances_settings WHERE name='main_domain' AND instance_id = aps_instances.id), - '/', (SELECT value FROM aps_instances_settings WHERE name='main_location' AND instance_id = aps_instances.id)) - AS install_location - FROM aps_instances, aps_packages, client - WHERE client.client_id = aps_instances.customer_id AND ".$sql_where." ".$app->listform_actions->SQLOrderBy." ".$limit_sql; -} else { -$query = "SELECT aps_instances.id AS id, aps_instances.package_id AS package_id, - aps_instances.customer_id AS customer_id, sys_group.name AS customer_name, - aps_instances.instance_status AS instance_status, aps_packages.name AS package_name, - aps_packages.version AS package_version, aps_packages.release AS package_release, - aps_packages.package_status AS package_status, - CONCAT((SELECT value FROM aps_instances_settings WHERE name='main_domain' AND instance_id = aps_instances.id), - '/', (SELECT value FROM aps_instances_settings WHERE name='main_location' AND instance_id = aps_instances.id)) - AS install_location - FROM aps_instances, aps_packages, sys_group - WHERE sys_group.client_id = aps_instances.customer_id AND ".$sql_where." ".$app->listform_actions->SQLOrderBy." ".$limit_sql; - -} - -$records = $app->db->queryAllRecords($query); -$app->listform_actions->DataRowColor = '#FFFFFF'; - -// Re-form all result entries and add extra entries -$records_new = ''; -if(is_array($records)) -{ - $app->listform_actions->idx_key = $app->listform->listDef["table_idx"]; - foreach($records as $rec) - { - // Set an abbreviated install location to beware the page layout - $ils = ''; - if(strlen($rec['Install_location']) >= 38) $ils = substr($rec['Install_location'], 0, 35).'...'; - else $ils = $rec['install_location']; - $rec['install_location_short'] = $ils; - - // Also set a boolean-like variable for the reinstall button (vlibTemplate doesn't allow variable comparisons) - // For a reinstall, the package must be already installed successfully and (still be) enabled - if($rec['instance_status'] == INSTANCE_SUCCESS && $rec['package_status'] == PACKAGE_ENABLED) - $rec['reinstall_possible'] = 'true'; - // Of course an instance can only then be removed when it's not already tagged for removal - if($rec['instance_status'] != INSTANCE_REMOVE && $rec['instance_status'] != INSTANCE_INSTALL) - $rec['delete_possible'] = 'true'; - - $records_new[] = $app->listform_actions->prepareDataRow($rec); - } -} -$app->tpl->setLoop('records', $records_new); - -$app->listform_actions->onShow(); -?> +load('aps_base'); + +// Path to the list definition file +$list_def_file = "list/aps_installedpackages.list.php"; + +// Check the module permissions +$app->auth->check_module_permissions('sites'); + +// Load needed classes +$app->uses('tpl,tform,listform,listform_actions'); + +// Show further information only to admins or resellers +if($_SESSION['s']['user']['typ'] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) + $app->tpl->setVar('is_noclient', 1); + +// Show each user the own packages (if not admin) +$client_ext = ''; +$is_admin = ($_SESSION['s']['user']['typ'] == 'admin') ? true : false; +if(!$is_admin) +{ + $cid = $app->db->queryOneRecord('SELECT client_id FROM client WHERE username = "'.$app->db->quote($_SESSION['s']['user']['username']).'";'); + //$client_ext = ' AND aps_instances.customer_id = '.$cid['client_id']; + $client_ext = ' AND '.$app->tform->getAuthSQL('r', 'aps_instances'); +} +$app->listform_actions->SQLExtWhere = 'aps_instances.package_id = aps_packages.id'.$client_ext; +$app->listform_actions->SQLOrderBy = 'ORDER BY package_name'; + +// We are using parts of listform_actions because ISPConfig doesn't allow +// queries over multiple tables so we construct them ourselves +$_SESSION['s']['form']['return_to'] = ''; + +// Load the list template +$app->listform->loadListDef($list_def_file); +if(!is_file('templates/'.$app->listform->listDef["name"].'_list.htm')) +{ +$app->uses('listform_tpl_generator'); +$app->listform_tpl_generator->buildHTML($app->listform->listDef); +} +$app->tpl->newTemplate("listpage.tpl.htm"); +$app->tpl->setInclude('content_tpl', 'templates/'.$app->listform->listDef["name"].'_list.htm'); + +// Build the WHERE query for search +$sql_where = ''; +if($app->listform_actions->SQLExtWhere != '') + $sql_where .= ' '.$app->listform_actions->SQLExtWhere.' and'; +$sql_where = $app->listform->getSearchSQL($sql_where); +$app->tpl->setVar($app->listform->searchValues); + +// Paging +$limit_sql = $app->listform->getPagingSQL($sql_where); +$app->tpl->setVar('paging', $app->listform->pagingHTML); + +if(!$is_admin) { +// Our query over multiple tables +$query = "SELECT aps_instances.id AS id, aps_instances.package_id AS package_id, + aps_instances.customer_id AS customer_id, client.username AS customer_name, + aps_instances.instance_status AS instance_status, aps_packages.name AS package_name, + aps_packages.version AS package_version, aps_packages.release AS package_release, + aps_packages.package_status AS package_status, + CONCAT((SELECT value FROM aps_instances_settings WHERE name='main_domain' AND instance_id = aps_instances.id), + '/', (SELECT value FROM aps_instances_settings WHERE name='main_location' AND instance_id = aps_instances.id)) + AS install_location + FROM aps_instances, aps_packages, client + WHERE client.client_id = aps_instances.customer_id AND ".$sql_where." ".$app->listform_actions->SQLOrderBy." ".$limit_sql; +} else { +$query = "SELECT aps_instances.id AS id, aps_instances.package_id AS package_id, + aps_instances.customer_id AS customer_id, sys_group.name AS customer_name, + aps_instances.instance_status AS instance_status, aps_packages.name AS package_name, + aps_packages.version AS package_version, aps_packages.release AS package_release, + aps_packages.package_status AS package_status, + CONCAT((SELECT value FROM aps_instances_settings WHERE name='main_domain' AND instance_id = aps_instances.id), + '/', (SELECT value FROM aps_instances_settings WHERE name='main_location' AND instance_id = aps_instances.id)) + AS install_location + FROM aps_instances, aps_packages, sys_group + WHERE sys_group.client_id = aps_instances.customer_id AND ".$sql_where." ".$app->listform_actions->SQLOrderBy." ".$limit_sql; + +} + +$records = $app->db->queryAllRecords($query); +$app->listform_actions->DataRowColor = '#FFFFFF'; + +// Re-form all result entries and add extra entries +$records_new = ''; +if(is_array($records)) +{ + $app->listform_actions->idx_key = $app->listform->listDef["table_idx"]; + foreach($records as $rec) + { + // Set an abbreviated install location to beware the page layout + $ils = ''; + if(strlen($rec['Install_location']) >= 38) $ils = substr($rec['Install_location'], 0, 35).'...'; + else $ils = $rec['install_location']; + $rec['install_location_short'] = $ils; + + // Also set a boolean-like variable for the reinstall button (vlibTemplate doesn't allow variable comparisons) + // For a reinstall, the package must be already installed successfully and (still be) enabled + if($rec['instance_status'] == INSTANCE_SUCCESS && $rec['package_status'] == PACKAGE_ENABLED) + $rec['reinstall_possible'] = 'true'; + // Of course an instance can only then be removed when it's not already tagged for removal + if($rec['instance_status'] != INSTANCE_REMOVE && $rec['instance_status'] != INSTANCE_INSTALL) + $rec['delete_possible'] = 'true'; + + $records_new[] = $app->listform_actions->prepareDataRow($rec); + } +} +$app->tpl->setLoop('records', $records_new); + +$app->listform_actions->onShow(); +?> \ No newline at end of file diff --git a/interface/web/sites/aps_meta_packages/empty.dir b/interface/web/sites/aps_meta_packages/empty.dir new file mode 100644 index 0000000000..95ba9ef37c --- /dev/null +++ b/interface/web/sites/aps_meta_packages/empty.dir @@ -0,0 +1 @@ +This empty directory is needed by ISPConfig. diff --git a/interface/web/sites/aps_packagedetails_show.php b/interface/web/sites/aps_packagedetails_show.php index 94f5eaa0ae..737bd54a9a 100644 --- a/interface/web/sites/aps_packagedetails_show.php +++ b/interface/web/sites/aps_packagedetails_show.php @@ -1,100 +1,100 @@ -load('aps_guicontroller'); - -// Check the module permissions -$app->auth->check_module_permissions('sites'); - -// Load needed classes -$app->uses('tpl'); -$app->tpl->newTemplate("listpage.tpl.htm"); -$app->tpl->setInclude('content_tpl', 'templates/aps_packagedetails_show.htm'); - -// Load the language file -$lngfile = 'lib/lang/'.$_SESSION['s']['language'].'_aps.lng'; -require_once($lngfile); -$app->tpl->setVar($wb); - -$gui = new ApsGUIController($app); -$pkg_id = (isset($_GET['id'])) ? $app->db->quote($_GET['id']) : ''; - -// Check if a newer version is available for the current package -// Note: It's intended that here is no strict ID check (see below) -if(isset($pkg_id)) -{ - $newest_pkg_id = $gui->getNewestPackageID($pkg_id); - if($newest_pkg_id != 0) $pkg_id = $newest_pkg_id; -} - -// Make sure an integer ID is given -$adminflag = ($_SESSION['s']['user']['typ'] == 'admin') ? true : false; -if(!isset($pkg_id) || !$gui->isValidPackageID($pkg_id, $adminflag)) - $app->error($app->lng('Invalid ID')); - -// Get package details -$details = $gui->getPackageDetails($pkg_id); -if(isset($details['error'])) $app->error($details['error']); - -// Set the active and default tab -$next_tab = 'details'; -if(isset($_POST['next_tab']) || isset($_GET['next_tab'])) -{ - $tab = (isset($_POST['next_tab']) ? $_POST['next_tab'] : $_GET['next_tab']); - switch($tab) - { - case 'details': $next_tab = 'details'; break; - case 'settings': $next_tab = 'settings'; break; - case 'changelog': $next_tab = 'changelog'; break; - case 'screenshots': $next_tab = 'screenshots'; break; - default: $next_tab = 'details'; - } -} -$app->tpl->setVar('next_tab', $next_tab); - -// Parse the package details to the template -foreach($details as $key => $value) -{ - if(!is_array($value)) $app->tpl->setVar('pkg_'.str_replace(' ', '_', strtolower($key)), $value); - else // Special cases - { - if($key == 'Changelog') $app->tpl->setLoop('pkg_changelog', $details['Changelog']); - elseif($key == 'Screenshots') $app->tpl->setLoop('pkg_screenshots', $details['Screenshots']); - elseif($key == 'Requirements PHP settings') $app->tpl->setLoop('pkg_requirements_php_settings', $details['Requirements PHP settings']); - } -} -//print_r($details['Requirements PHP settings']); - -$app->tpl_defaults(); -$app->tpl->pparse(); +load('aps_guicontroller'); + +// Check the module permissions +$app->auth->check_module_permissions('sites'); + +// Load needed classes +$app->uses('tpl'); +$app->tpl->newTemplate("listpage.tpl.htm"); +$app->tpl->setInclude('content_tpl', 'templates/aps_packagedetails_show.htm'); + +// Load the language file +$lngfile = 'lib/lang/'.$_SESSION['s']['language'].'_aps.lng'; +require_once($lngfile); +$app->tpl->setVar($wb); + +$gui = new ApsGUIController($app); +$pkg_id = (isset($_GET['id'])) ? $app->db->quote($_GET['id']) : ''; + +// Check if a newer version is available for the current package +// Note: It's intended that here is no strict ID check (see below) +if(isset($pkg_id)) +{ + $newest_pkg_id = $gui->getNewestPackageID($pkg_id); + if($newest_pkg_id != 0) $pkg_id = $newest_pkg_id; +} + +// Make sure an integer ID is given +$adminflag = ($_SESSION['s']['user']['typ'] == 'admin') ? true : false; +if(!isset($pkg_id) || !$gui->isValidPackageID($pkg_id, $adminflag)) + $app->error($app->lng('Invalid ID')); + +// Get package details +$details = $gui->getPackageDetails($pkg_id); +if(isset($details['error'])) $app->error($details['error']); + +// Set the active and default tab +$next_tab = 'details'; +if(isset($_POST['next_tab']) || isset($_GET['next_tab'])) +{ + $tab = (isset($_POST['next_tab']) ? $_POST['next_tab'] : $_GET['next_tab']); + switch($tab) + { + case 'details': $next_tab = 'details'; break; + case 'settings': $next_tab = 'settings'; break; + case 'changelog': $next_tab = 'changelog'; break; + case 'screenshots': $next_tab = 'screenshots'; break; + default: $next_tab = 'details'; + } +} +$app->tpl->setVar('next_tab', $next_tab); + +// Parse the package details to the template +foreach($details as $key => $value) +{ + if(!is_array($value)) $app->tpl->setVar('pkg_'.str_replace(' ', '_', strtolower($key)), $value); + else // Special cases + { + if($key == 'Changelog') $app->tpl->setLoop('pkg_changelog', $details['Changelog']); + elseif($key == 'Screenshots') $app->tpl->setLoop('pkg_screenshots', $details['Screenshots']); + elseif($key == 'Requirements PHP settings') $app->tpl->setLoop('pkg_requirements_php_settings', $details['Requirements PHP settings']); + } +} +//print_r($details['Requirements PHP settings']); + +$app->tpl_defaults(); +$app->tpl->pparse(); ?> \ No newline at end of file diff --git a/interface/web/sites/database_user_edit.php b/interface/web/sites/database_user_edit.php index 4f6979fc4e..1b71196f69 100644 --- a/interface/web/sites/database_user_edit.php +++ b/interface/web/sites/database_user_edit.php @@ -57,17 +57,17 @@ class page_action extends tform_actions { * If the names are restricted -> remove the restriction, so that the * data can be edited */ - + //* Get the database user prefix $app->uses('getconf,tools_sites'); $global_config = $app->getconf->get_global_config('sites'); $dbuser_prefix = $app->tools_sites->replacePrefix($global_config['dbuser_prefix'], $this->dataRecord); - + if ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSION['s']['user']['userid'])) { // Get the limits of the client $client_group_id = $_SESSION["s"]["user"]["default_group"]; $client = $app->db->queryOneRecord("SELECT client.company_name, client.contact_name, client.client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); - + // Fill the client select field $sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY sys_group.name"; $records = $app->db->queryAllRecords($sql); @@ -96,24 +96,24 @@ class page_action extends tform_actions { } $app->tpl->setVar("client_group_id",$client_select); } - - + + if ($this->dataRecord['database_user'] != ""){ /* REMOVE the restriction */ $app->tpl->setVar("database_user", $app->tools_sites->removePrefix($this->dataRecord['database_user'], $this->dataRecord['database_user_prefix'], $dbuser_prefix)); } - - + + $app->tpl->setVar("database_user_prefix", $app->tools_sites->getPrefix($this->dataRecord['database_user_prefix'], $dbuser_prefix, $global_config['dbuser_prefix'])); - + parent::onShowEnd(); } - + function onSubmit() { global $app; - + if($_SESSION['s']['user']['typ'] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) unset($this->dataRecord["client_group_id"]); - + parent::onSubmit(); } @@ -126,40 +126,35 @@ class page_action extends tform_actions { $dbuser_prefix = $app->tools_sites->replacePrefix($global_config['dbuser_prefix'], $this->dataRecord); $this->oldDataRecord = $app->db->queryOneRecord("SELECT * FROM web_database_user WHERE database_user_id = '".$this->id."'"); - + $dbuser_prefix = $app->tools_sites->getPrefix($this->oldDataRecord['database_user_prefix'], $dbuser_prefix); $this->dataRecord['database_user_prefix'] = $dbuser_prefix; - + //* Database username shall not be empty if($this->dataRecord['database_user'] == '') $app->tform->errorMessage .= $app->tform->wordbook["database_user_error_empty"].'
'; if(strlen($dbuser_prefix . $this->dataRecord['database_user']) > 16) $app->tform->errorMessage .= str_replace('{user}',$dbuser_prefix . $this->dataRecord['database_user'],$app->tform->wordbook["database_user_error_len"]).'
'; - + //* Check database user against blacklist $dbuser_blacklist = array($conf['db_user'],'mysql','root'); if(in_array($dbuser_prefix . $this->dataRecord['database_user'],$dbuser_blacklist)) { $app->tform->errorMessage .= $app->lng('Database user not allowed.').'
'; } - + if ($app->tform->errorMessage == ''){ /* restrict the names if there is no error */ /* crop user and db names if they are too long -> mysql: user: 16 chars / db: 64 chars */ $this->dataRecord['database_user'] = substr($dbuser_prefix . $this->dataRecord['database_user'], 0, 16); } - - /* prepare password for MongoDB */ - // TODO: this still doens't work as when only the username changes we have no database_password. - // taking the one from oldData doesn't work as it's encrypted...shit! - $this->dataRecord['database_password_mongo'] = $this->dataRecord['database_user'].":mongo:".$this->dataRecord['database_password']; - + $this->dataRecord['server_id'] = 0; // we need this on all servers - + parent::onBeforeUpdate(); } function onBeforeInsert() { global $app, $conf, $interfaceConf; - + //* Database username shall not be empty if($this->dataRecord['database_user'] == '') $app->tform->errorMessage .= $app->tform->wordbook["database_user_error_empty"].'
'; @@ -167,11 +162,11 @@ class page_action extends tform_actions { $app->uses('getconf,tools_sites'); $global_config = $app->getconf->get_global_config('sites'); $dbuser_prefix = $app->tools_sites->replacePrefix($global_config['dbuser_prefix'], $this->dataRecord); - + $this->dataRecord['database_user_prefix'] = $dbuser_prefix; - + if(strlen($dbuser_prefix . $this->dataRecord['database_user']) > 16) $app->tform->errorMessage .= str_replace('{user}',$dbuser_prefix . $this->dataRecord['database_user'],$app->tform->wordbook["database_user_error_len"]).'
'; - + //* Check database user against blacklist $dbuser_blacklist = array($conf['db_user'],'mysql','root'); if(is_array($dbuser_blacklist) && in_array($dbuser_prefix . $this->dataRecord['database_user'],$dbuser_blacklist)) { @@ -183,18 +178,15 @@ class page_action extends tform_actions { if ($app->tform->errorMessage == ''){ $this->dataRecord['database_user'] = substr($dbuser_prefix . $this->dataRecord['database_user'], 0, 16); } - - $this->dataRecord['server_id'] = 0; // we need this on all servers - - /* prepare password for MongoDB */ - $this->dataRecord['database_password_mongo'] = $this->dataRecord['database_user'].":mongo:".$this->dataRecord['database_password']; - + + $this->dataRecord['server_id'] = 0; // we need this on all servers + parent::onBeforeInsert(); } function onAfterInsert() { global $app, $conf; - + if($_SESSION["s"]["user"]["typ"] == 'admin' && isset($this->dataRecord["client_group_id"])) { $client_group_id = $app->functions->intval($this->dataRecord["client_group_id"]); $app->db->query("UPDATE web_database_user SET sys_groupid = $client_group_id, sys_perm_group = 'riud' WHERE database_user_id = ".$this->id); @@ -216,9 +208,9 @@ class page_action extends tform_actions { $client_group_id = $app->functions->intval($this->dataRecord["client_group_id"]); $app->db->query("UPDATE web_database_user SET sys_groupid = $client_group_id, sys_perm_group = 'riud' WHERE database_user_id = ".$this->id); } - + /*$password = $app->db->queryOneRecord("SELECT database_password FROM web_database_user WHERE database_user_id = ".$this->id); - + $records = $app->db->queryAllRecords("SELECT DISTINCT server_id FROM web_database WHERE database_user_id = '".$app->functions->intval($this->id)."' UNION SELECT DISTINCT server_id FROM web_database WHERE database_ro_user_id = '".$app->functions->intval($this->id)."'"); foreach($records as $rec) { $new_rec = $this->dataRecord; diff --git a/interface/web/sites/form/database.tform.php b/interface/web/sites/form/database.tform.php index 4cbfa12fef..e390f7276c 100644 --- a/interface/web/sites/form/database.tform.php +++ b/interface/web/sites/form/database.tform.php @@ -29,7 +29,7 @@ Hint: The ID field of the database table is not part of the datafield definition. The ID field must be always auto incement (int or bigint). - + Search: - searchable = 1 or searchable = 2 include the field in the search - searchable = 1: this field will be the title of the search result @@ -89,10 +89,7 @@ $form["tabs"]['database'] = array ( 'datatype' => 'VARCHAR', 'formtype' => 'SELECT', 'default' => 'y', - 'value' => array( - 'mongo' => 'MongoDB', - 'mysql' => 'MySQL' - ) + 'value' => array('mysql' => 'MySQL') ), 'database_name' => array ( 'datatype' => 'VARCHAR', @@ -177,4 +174,4 @@ $form["tabs"]['database'] = array ( ); -?> +?> \ No newline at end of file diff --git a/interface/web/sites/form/database_user.tform.php b/interface/web/sites/form/database_user.tform.php index d2a2defe7b..fa2b2d3a32 100644 --- a/interface/web/sites/form/database_user.tform.php +++ b/interface/web/sites/form/database_user.tform.php @@ -29,7 +29,7 @@ Hint: The ID field of the database table is not part of the datafield definition. The ID field must be always auto incement (int or bigint). - + Search: - searchable = 1 or searchable = 2 include the field in the search - searchable = 1: this field will be the title of the search result @@ -108,14 +108,6 @@ $form["tabs"]['database_user'] = array ( 'width' => '30', 'maxlength' => '255' ), - 'database_password_mongo' => array ( - 'datatype' => 'VARCHAR', - 'formtype' => 'PASSWORD', - 'default' => '', - 'value' => '', - 'width' => '30', - 'maxlength' => '255' - ), ################################## # ENDE Datatable fields ################################## diff --git a/interface/web/sites/form/web_domain.tform.php b/interface/web/sites/form/web_domain.tform.php index 233b464b8a..f2c6fa7b55 100644 --- a/interface/web/sites/form/web_domain.tform.php +++ b/interface/web/sites/form/web_domain.tform.php @@ -72,9 +72,6 @@ if(!$app->auth->is_admin()) { if($client['limit_ssl'] != 'y') $ssl_available = false; } -$app->uses('getconf'); -$web_config = $app->getconf->get_global_config('sites'); - $form["tabs"]['domain'] = array ( 'title' => "Domain", 'width' => 100, @@ -538,8 +535,7 @@ $form["tabs"]['backup'] = array ( // } -if($_SESSION["s"]["user"]["typ"] == 'admin' - || ($web_config['reseller_can_use_options'] == 'y' && $app->auth->has_clients($_SESSION['s']['user']['userid']))) { +if($_SESSION["s"]["user"]["typ"] == 'admin') { $form["tabs"]['advanced'] = array ( 'title' => "Options", diff --git a/interface/web/sites/form/web_vhost_subdomain.tform.php b/interface/web/sites/form/web_vhost_subdomain.tform.php index 3aa304982a..116428cb6f 100644 --- a/interface/web/sites/form/web_vhost_subdomain.tform.php +++ b/interface/web/sites/form/web_vhost_subdomain.tform.php @@ -64,9 +64,6 @@ if(!$app->auth->is_admin()) { if($client['limit_ssl'] != 'y') $ssl_available = false; } -$app->uses('getconf'); -$web_config = $app->getconf->get_global_config('sites'); - $form["tabs"]['domain'] = array ( 'title' => "Domain", 'width' => 100, @@ -308,6 +305,14 @@ $form["tabs"]['redirect'] = array ( 'default' => '', 'value' => array('' => 'no_redirect_txt', 'non_www_to_www' => 'domain.tld => www.domain.tld', 'www_to_non_www' => 'www.domain.tld => domain.tld', '*_domain_tld_to_domain_tld' => '*.doman.tld => domain.tld', '*_domain_tld_to_www_domain_tld' => '*.domain.tld => www.domain.tld', '*_to_domain_tld' => '* => domain.tld', '*_to_www_domain_tld' => '* => www.domain.tld') ), + 'rewrite_rules' => array ( + 'datatype' => 'TEXT', + 'formtype' => 'TEXT', + 'default' => '', + 'value' => '', + 'width' => '30', + 'maxlength' => '255' + ), ################################## # ENDE Datatable fields ################################## @@ -520,8 +525,7 @@ $form["tabs"]['backup'] = array ( // } -if($_SESSION["s"]["user"]["typ"] == 'admin' - || ($web_config['reseller_can_use_options'] == 'y' && $app->auth->has_clients($_SESSION['s']['user']['userid']))) { +if($_SESSION["s"]["user"]["typ"] == 'admin') { $form["tabs"]['advanced'] = array ( 'title' => "Options", diff --git a/interface/web/sites/lib/lang/ar_database_admin_list.lng b/interface/web/sites/lib/lang/ar_database_admin_list.lng index 3f05f65e62..27e62b9ac6 100644 --- a/interface/web/sites/lib/lang/ar_database_admin_list.lng +++ b/interface/web/sites/lib/lang/ar_database_admin_list.lng @@ -7,4 +7,5 @@ $wb['database_user_txt'] = 'Database user'; $wb['database_name_txt'] = 'Database name'; $wb['add_new_record_txt'] = 'Add new Database'; $wb['sys_groupid_txt'] = 'Client'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/ar_database_list.lng b/interface/web/sites/lib/lang/ar_database_list.lng index e56806e45a..6039a9e0f9 100644 --- a/interface/web/sites/lib/lang/ar_database_list.lng +++ b/interface/web/sites/lib/lang/ar_database_list.lng @@ -6,4 +6,5 @@ $wb['server_id_txt'] = 'Server'; $wb['database_user_txt'] = 'Database user'; $wb['database_name_txt'] = 'Database name'; $wb['add_new_record_txt'] = 'Add new Database'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/ar_web_domain.lng b/interface/web/sites/lib/lang/ar_web_domain.lng index 8bdb312c9b..3148cbbfc6 100644 --- a/interface/web/sites/lib/lang/ar_web_domain.lng +++ b/interface/web/sites/lib/lang/ar_web_domain.lng @@ -119,4 +119,5 @@ $wb['monthly_backup_txt'] = 'Monthly'; $wb['rewrite_rules_txt'] = 'Rewrite Rules'; $wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules'; $wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:'; +$wb['configuration_error_txt'] = 'CONFIGURATION ERROR'; ?> diff --git a/interface/web/sites/lib/lang/bg_database_admin_list.lng b/interface/web/sites/lib/lang/bg_database_admin_list.lng index c4cff5076e..ce6887654e 100644 --- a/interface/web/sites/lib/lang/bg_database_admin_list.lng +++ b/interface/web/sites/lib/lang/bg_database_admin_list.lng @@ -7,4 +7,5 @@ $wb['database_user_txt'] = 'Потребителско име на база да $wb['database_name_txt'] = 'Име на базата данни'; $wb['add_new_record_txt'] = 'Добави нова база данни'; $wb['sys_groupid_txt'] = 'Клиент'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/bg_database_list.lng b/interface/web/sites/lib/lang/bg_database_list.lng index 3683aa32c0..01d4d83c69 100644 --- a/interface/web/sites/lib/lang/bg_database_list.lng +++ b/interface/web/sites/lib/lang/bg_database_list.lng @@ -6,4 +6,5 @@ $wb['server_id_txt'] = 'Сървър'; $wb['database_name_txt'] = 'База данни'; $wb['add_new_record_txt'] = 'Нова база данни'; $wb['database_user_txt'] = 'Database user'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/bg_web_domain.lng b/interface/web/sites/lib/lang/bg_web_domain.lng index dc2d3ff679..dfc1dd07a3 100644 --- a/interface/web/sites/lib/lang/bg_web_domain.lng +++ b/interface/web/sites/lib/lang/bg_web_domain.lng @@ -119,4 +119,5 @@ $wb['monthly_backup_txt'] = 'Monthly'; $wb['rewrite_rules_txt'] = 'Rewrite Rules'; $wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules'; $wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:'; +$wb['configuration_error_txt'] = 'CONFIGURATION ERROR'; ?> diff --git a/interface/web/sites/lib/lang/br_database_admin_list.lng b/interface/web/sites/lib/lang/br_database_admin_list.lng index 3f05f65e62..27e62b9ac6 100644 --- a/interface/web/sites/lib/lang/br_database_admin_list.lng +++ b/interface/web/sites/lib/lang/br_database_admin_list.lng @@ -7,4 +7,5 @@ $wb['database_user_txt'] = 'Database user'; $wb['database_name_txt'] = 'Database name'; $wb['add_new_record_txt'] = 'Add new Database'; $wb['sys_groupid_txt'] = 'Client'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/br_database_list.lng b/interface/web/sites/lib/lang/br_database_list.lng index 449baa8bba..51c43bfc16 100644 --- a/interface/web/sites/lib/lang/br_database_list.lng +++ b/interface/web/sites/lib/lang/br_database_list.lng @@ -6,4 +6,5 @@ $wb['server_id_txt'] = 'Servidor'; $wb['database_user_txt'] = 'Usuário do Banco'; $wb['database_name_txt'] = 'Nome do banco'; $wb['add_new_record_txt'] = 'Adcionar um novo banco'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/br_web_domain.lng b/interface/web/sites/lib/lang/br_web_domain.lng index b2abb2ac90..4feeb04191 100644 --- a/interface/web/sites/lib/lang/br_web_domain.lng +++ b/interface/web/sites/lib/lang/br_web_domain.lng @@ -119,4 +119,5 @@ $wb['monthly_backup_txt'] = 'Monthly'; $wb['rewrite_rules_txt'] = 'Rewrite Rules'; $wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules'; $wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:'; +$wb['configuration_error_txt'] = 'CONFIGURATION ERROR'; ?> diff --git a/interface/web/sites/lib/lang/cz.lng b/interface/web/sites/lib/lang/cz.lng index 71ccd165f6..3a37df3f91 100644 --- a/interface/web/sites/lib/lang/cz.lng +++ b/interface/web/sites/lib/lang/cz.lng @@ -33,3 +33,4 @@ $wb['Update Packagelist'] = 'Aktualizace seznamu balíčků'; $wb['Subdomain (Vhost)'] = 'Subdoména (Vhost)'; $wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> + diff --git a/interface/web/sites/lib/lang/cz_aps.lng b/interface/web/sites/lib/lang/cz_aps.lng index 176d76da5a..69887b589a 100644 --- a/interface/web/sites/lib/lang/cz_aps.lng +++ b/interface/web/sites/lib/lang/cz_aps.lng @@ -54,5 +54,6 @@ $wb['installation_remove_txt'] = 'Odstranění plánu'; $wb['packagelist_update_finished_txt'] = 'APS aktualizace seznamu balíčků dokončena.'; $wb['btn_install_txt'] = 'Instalovat'; $wb['btn_cancel_txt'] = 'Zrušit'; -$wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.'; +$wb['limit_aps_txt'] = 'Max. počet APS instancí u vašeho účtu je dosaženo.'; ?> + diff --git a/interface/web/sites/lib/lang/cz_aps_instances_list.lng b/interface/web/sites/lib/lang/cz_aps_instances_list.lng index 7b7b6dd6f0..16e863ee9c 100644 --- a/interface/web/sites/lib/lang/cz_aps_instances_list.lng +++ b/interface/web/sites/lib/lang/cz_aps_instances_list.lng @@ -11,3 +11,4 @@ $wb['filter_txt'] = 'Hledat'; $wb['delete_txt'] = 'Smazat'; $wb['reinstall_txt'] = 'Přeinstalovat'; ?> + diff --git a/interface/web/sites/lib/lang/cz_aps_packages_list.lng b/interface/web/sites/lib/lang/cz_aps_packages_list.lng index 52ef6ebcd9..cf0d2b69d9 100644 --- a/interface/web/sites/lib/lang/cz_aps_packages_list.lng +++ b/interface/web/sites/lib/lang/cz_aps_packages_list.lng @@ -6,3 +6,4 @@ $wb['category_txt'] = 'Kategorie'; $wb['status_txt'] = 'Odemčený'; $wb['filter_txt'] = 'Hledat'; ?> + diff --git a/interface/web/sites/lib/lang/cz_aps_update_packagelist.lng b/interface/web/sites/lib/lang/cz_aps_update_packagelist.lng index 91a6ed46a4..edf9c2a081 100644 --- a/interface/web/sites/lib/lang/cz_aps_update_packagelist.lng +++ b/interface/web/sites/lib/lang/cz_aps_update_packagelist.lng @@ -1,7 +1,8 @@ + diff --git a/interface/web/sites/lib/lang/cz_cron.lng b/interface/web/sites/lib/lang/cz_cron.lng index d4e6c1767c..9e23b5a87d 100644 --- a/interface/web/sites/lib/lang/cz_cron.lng +++ b/interface/web/sites/lib/lang/cz_cron.lng @@ -10,12 +10,13 @@ $wb['run_month_txt'] = 'Měsíce'; $wb['run_wday_txt'] = 'Dny týdne'; $wb['command_txt'] = 'Příkaz ke spuštění (příkazy jsou spuštěny přes sh, url přes wget)'; $wb['limit_cron_txt'] = 'Dosažen maximální počet cron úloh pro Váš účet.'; -$wb['limit_cron_frequency_txt'] = 'Frekvence cron úloh překročila povolený limit'; +$wb['limit_cron_frequency_txt'] = 'Frekvence cron úloh překročila povolený limit (standardní povolená nejnižší hodnota je 1 x za 5 min. */5)'; $wb['run_min_error_format'] = 'Chybný formát pro minuty.'; $wb['run_hour_error_format'] = 'Chybný formát pror hodiny.'; $wb['run_mday_error_format'] = 'Chybný formát pro dny měsíce.'; $wb['run_month_error_format'] = 'Chybný formát pro měsíce.'; $wb['run_wday_error_format'] = 'Chybný formát pro dny týdne.'; $wb['command_error_format'] = 'Chybná formát příkazu. V případě URL je povoleno volání pouze http/https.'; -$wb['unknown_fieldtype_error'] = 'Bylp použito pole neznámého typu.'; +$wb['unknown_fieldtype_error'] = 'Bylo použito pole neznámého typu.'; ?> + diff --git a/interface/web/sites/lib/lang/cz_cron_list.lng b/interface/web/sites/lib/lang/cz_cron_list.lng index f50dee2faf..dfabfa46ac 100644 --- a/interface/web/sites/lib/lang/cz_cron_list.lng +++ b/interface/web/sites/lib/lang/cz_cron_list.lng @@ -11,3 +11,4 @@ $wb['command_txt'] = 'Příkaz'; $wb['add_new_cron_txt'] = 'Přidat novou cron úlohu'; $wb['parent_domain_id_txt'] = 'Webové stránky'; ?> + diff --git a/interface/web/sites/lib/lang/cz_database.lng b/interface/web/sites/lib/lang/cz_database.lng index c316f0ac97..a13b7791ba 100644 --- a/interface/web/sites/lib/lang/cz_database.lng +++ b/interface/web/sites/lib/lang/cz_database.lng @@ -42,5 +42,6 @@ $wb['optional_txt'] = 'Volitelný'; $wb['select_dbuser_txt'] = 'Vyberte uživatele databáze'; $wb['no_dbuser_txt'] = 'Žádný'; $wb['database_client_differs_txt'] = 'Klient mateřského webu a databáze se neshodují.'; -$wb['database_user_missing_txt'] = 'Please select a database user for this database.'; +$wb['database_user_missing_txt'] = 'Prosím vyberte uživatele databáze pro tuto databázi.'; ?> + diff --git a/interface/web/sites/lib/lang/cz_database_admin_list.lng b/interface/web/sites/lib/lang/cz_database_admin_list.lng index a0069404d8..f9aa5571a2 100644 --- a/interface/web/sites/lib/lang/cz_database_admin_list.lng +++ b/interface/web/sites/lib/lang/cz_database_admin_list.lng @@ -7,4 +7,6 @@ $wb['database_user_txt'] = 'Uživatel databáze'; $wb['database_name_txt'] = 'Jméno databáze'; $wb['add_new_record_txt'] = 'Přidat nové databáze'; $wb['sys_groupid_txt'] = 'Klient'; +$wb['parent_domain_id_txt'] = 'webová stránka'; ?> + diff --git a/interface/web/sites/lib/lang/cz_database_list.lng b/interface/web/sites/lib/lang/cz_database_list.lng index 9bb80dd945..f76bcf02c8 100644 --- a/interface/web/sites/lib/lang/cz_database_list.lng +++ b/interface/web/sites/lib/lang/cz_database_list.lng @@ -6,4 +6,6 @@ $wb['server_id_txt'] = 'Server'; $wb['database_user_txt'] = 'Uživatel databáze'; $wb['database_name_txt'] = 'Název databáze'; $wb['add_new_record_txt'] = 'Přidat databázi'; +$wb['parent_domain_id_txt'] = 'Webová stránka'; ?> + diff --git a/interface/web/sites/lib/lang/cz_database_user.lng b/interface/web/sites/lib/lang/cz_database_user.lng index 8a64cb5225..127d1a39c1 100644 --- a/interface/web/sites/lib/lang/cz_database_user.lng +++ b/interface/web/sites/lib/lang/cz_database_user.lng @@ -1,6 +1,6 @@ + diff --git a/interface/web/sites/lib/lang/cz_database_user_admin_list.lng b/interface/web/sites/lib/lang/cz_database_user_admin_list.lng index 8703e713e1..127be4f973 100644 --- a/interface/web/sites/lib/lang/cz_database_user_admin_list.lng +++ b/interface/web/sites/lib/lang/cz_database_user_admin_list.lng @@ -4,3 +4,4 @@ $wb['database_user_txt'] = 'Uživatel databáze'; $wb['add_new_record_txt'] = 'Vytvořit nového uživatele databáze'; $wb['sys_groupid_txt'] = 'Klient'; ?> + diff --git a/interface/web/sites/lib/lang/cz_database_user_list.lng b/interface/web/sites/lib/lang/cz_database_user_list.lng index 42cf36d703..5fc1fc39b5 100644 --- a/interface/web/sites/lib/lang/cz_database_user_list.lng +++ b/interface/web/sites/lib/lang/cz_database_user_list.lng @@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Uživatelé databáze'; $wb['database_user_txt'] = 'Uživatelé databáze'; $wb['add_new_record_txt'] = 'Přidat nového uživatele databáze'; ?> + diff --git a/interface/web/sites/lib/lang/cz_ftp_user.lng b/interface/web/sites/lib/lang/cz_ftp_user.lng index 876ad5108c..494ecda153 100644 --- a/interface/web/sites/lib/lang/cz_ftp_user.lng +++ b/interface/web/sites/lib/lang/cz_ftp_user.lng @@ -32,3 +32,4 @@ $wb['repeat_password_txt'] = 'Opakujte heslo'; $wb['password_mismatch_txt'] = 'Hesla se neshodují.'; $wb['password_match_txt'] = 'Hesla se shodují.'; ?> + diff --git a/interface/web/sites/lib/lang/cz_ftp_user_list.lng b/interface/web/sites/lib/lang/cz_ftp_user_list.lng index 41649df7f9..965e1c7256 100644 --- a/interface/web/sites/lib/lang/cz_ftp_user_list.lng +++ b/interface/web/sites/lib/lang/cz_ftp_user_list.lng @@ -6,3 +6,4 @@ $wb['parent_domain_id_txt'] = 'Webová stránka'; $wb['username_txt'] = 'Uživatelské jméno'; $wb['add_new_record_txt'] = 'Přidat FTP uživatele'; ?> + diff --git a/interface/web/sites/lib/lang/cz_shell_user.lng b/interface/web/sites/lib/lang/cz_shell_user.lng index 711475eba8..09377dae84 100644 --- a/interface/web/sites/lib/lang/cz_shell_user.lng +++ b/interface/web/sites/lib/lang/cz_shell_user.lng @@ -29,3 +29,4 @@ $wb['password_match_txt'] = 'Hesla se shodují.'; $wb['username_must_not_exceed_32_chars_txt'] = 'The username must not exceed 32 characters.'; $wb['username_not_allowed_txt'] = 'The username is not allowed.'; ?> + diff --git a/interface/web/sites/lib/lang/cz_shell_user_list.lng b/interface/web/sites/lib/lang/cz_shell_user_list.lng index 1d6bc198d7..cdc729c9fe 100644 --- a/interface/web/sites/lib/lang/cz_shell_user_list.lng +++ b/interface/web/sites/lib/lang/cz_shell_user_list.lng @@ -6,3 +6,4 @@ $wb['parent_domain_id_txt'] = 'Stránka'; $wb['username_txt'] = 'Uživatelské jméno'; $wb['add_new_record_txt'] = 'Přidat shell uživatele'; ?> + diff --git a/interface/web/sites/lib/lang/cz_user_quota_stats_list.lng b/interface/web/sites/lib/lang/cz_user_quota_stats_list.lng index 4531944549..efb766bd99 100644 --- a/interface/web/sites/lib/lang/cz_user_quota_stats_list.lng +++ b/interface/web/sites/lib/lang/cz_user_quota_stats_list.lng @@ -3,7 +3,8 @@ $wb['list_head_txt'] = 'Disková kvóta'; $wb['domain_txt'] = 'Doména / Webová stránka'; $wb['system_user_txt'] = 'Linuxový uživatel'; $wb['used_txt'] = 'Využité místo'; -$wb['hard_txt'] = 'Tvrdý limit'; -$wb['soft_txt'] = 'Měkký limit'; +$wb['hard_txt'] = 'Kvóta max. obsazení'; +$wb['soft_txt'] = 'Kvóta pro upozornění'; $wb['files_txt'] = 'Jednotlivé soubory'; ?> + diff --git a/interface/web/sites/lib/lang/cz_web_aliasdomain.lng b/interface/web/sites/lib/lang/cz_web_aliasdomain.lng index 3a5d150406..c82c428313 100644 --- a/interface/web/sites/lib/lang/cz_web_aliasdomain.lng +++ b/interface/web/sites/lib/lang/cz_web_aliasdomain.lng @@ -1,7 +1,7 @@ + diff --git a/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng index 22a4ffe32f..a3ae2a954d 100644 --- a/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng +++ b/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng @@ -12,3 +12,4 @@ $wb['no_redirect_txt'] = 'Žádné přesměrování'; $wb['no_flag_txt'] = 'Žádný příznak'; $wb['none_txt'] = 'Žádná'; ?> + diff --git a/interface/web/sites/lib/lang/cz_web_backup_list.lng b/interface/web/sites/lib/lang/cz_web_backup_list.lng index 3c9cfc8ef5..ae06162d72 100644 --- a/interface/web/sites/lib/lang/cz_web_backup_list.lng +++ b/interface/web/sites/lib/lang/cz_web_backup_list.lng @@ -13,3 +13,4 @@ $wb['restore_pending_txt'] = 'There is already a pending backup restore job.'; $wb['backup_type_mysql'] = 'MySQL Database'; $wb['backup_type_web'] = 'Website files'; ?> + diff --git a/interface/web/sites/lib/lang/cz_web_domain.lng b/interface/web/sites/lib/lang/cz_web_domain.lng index 49ee278fa4..ab82df12ed 100644 --- a/interface/web/sites/lib/lang/cz_web_domain.lng +++ b/interface/web/sites/lib/lang/cz_web_domain.lng @@ -111,12 +111,14 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; $wb['proxy_directives_txt'] = 'Proxy Directives'; $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; -$wb['no_server_error'] = 'No server selected.'; -$wb['no_backup_txt'] = 'No backup'; -$wb['daily_backup_txt'] = 'Daily'; -$wb['weekly_backup_txt'] = 'Weekly'; -$wb['monthly_backup_txt'] = 'Monthly'; +$wb['no_server_error'] = 'Nebyl zvolen žádný server'; +$wb['no_backup_txt'] = 'Žádné zálohování'; +$wb['daily_backup_txt'] = 'Denně'; +$wb['weekly_backup_txt'] = 'Týdně'; +$wb['monthly_backup_txt'] = 'Měsíčně'; $wb['rewrite_rules_txt'] = 'Rewrite Rules'; $wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules'; $wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:'; +$wb['configuration_error_txt'] = 'CONFIGURATION ERROR'; ?> + diff --git a/interface/web/sites/lib/lang/cz_web_domain_admin_list.lng b/interface/web/sites/lib/lang/cz_web_domain_admin_list.lng index e52a794428..4a20c10f55 100644 --- a/interface/web/sites/lib/lang/cz_web_domain_admin_list.lng +++ b/interface/web/sites/lib/lang/cz_web_domain_admin_list.lng @@ -7,3 +7,4 @@ $wb['server_id_txt'] = 'Server'; $wb['domain_txt'] = 'Doména'; $wb['add_new_record_txt'] = 'Přidat webovou stránku'; ?> + diff --git a/interface/web/sites/lib/lang/cz_web_domain_list.lng b/interface/web/sites/lib/lang/cz_web_domain_list.lng index cbf025e79b..78296799a1 100644 --- a/interface/web/sites/lib/lang/cz_web_domain_list.lng +++ b/interface/web/sites/lib/lang/cz_web_domain_list.lng @@ -6,3 +6,4 @@ $wb['server_id_txt'] = 'Server'; $wb['domain_txt'] = 'Doména'; $wb['add_new_record_txt'] = 'Přidat webovou stránku'; ?> + diff --git a/interface/web/sites/lib/lang/cz_web_folder.lng b/interface/web/sites/lib/lang/cz_web_folder.lng index f9f623dc2b..0d1090f5a5 100644 --- a/interface/web/sites/lib/lang/cz_web_folder.lng +++ b/interface/web/sites/lib/lang/cz_web_folder.lng @@ -5,3 +5,4 @@ $wb['path_txt'] = 'Cesta'; $wb['active_txt'] = 'Aktivní'; $wb['path_error_regex'] = 'Neplatná cesta ke složce.'; ?> + diff --git a/interface/web/sites/lib/lang/cz_web_folder_list.lng b/interface/web/sites/lib/lang/cz_web_folder_list.lng index b75c0e80da..74b4d323c1 100644 --- a/interface/web/sites/lib/lang/cz_web_folder_list.lng +++ b/interface/web/sites/lib/lang/cz_web_folder_list.lng @@ -5,3 +5,4 @@ $wb['server_id_txt'] = 'Server'; $wb['parent_domain_id_txt'] = 'Webové stránky'; $wb['path_txt'] = 'Cesta'; ?> + diff --git a/interface/web/sites/lib/lang/cz_web_folder_user.lng b/interface/web/sites/lib/lang/cz_web_folder_user.lng index d55cb29d8d..d3d3709918 100644 --- a/interface/web/sites/lib/lang/cz_web_folder_user.lng +++ b/interface/web/sites/lib/lang/cz_web_folder_user.lng @@ -3,11 +3,12 @@ $wb['web_folder_id_txt'] = 'Složka'; $wb['username_txt'] = 'Uživatelské jméno'; $wb['password_txt'] = 'Heslo'; $wb['active_txt'] = 'Aktivní'; -$wb['folder_error_empty'] = 'No web folder selecetd.'; +$wb['folder_error_empty'] = 'Nebyla vybrána žádná webová složka.'; $wb['password_strength_txt'] = 'Síla hesla'; $wb['generate_password_txt'] = 'Generovat heslo'; $wb['repeat_password_txt'] = 'Opakujte heslo'; $wb['password_mismatch_txt'] = 'Hesla se neshodují.'; $wb['password_match_txt'] = 'Hesla se shodují.'; -$wb['no_folder_perm'] = 'You have no permission for this folder.'; +$wb['no_folder_perm'] = 'Nemáte oprávnění pro tuto složku.'; ?> + diff --git a/interface/web/sites/lib/lang/cz_web_folder_user_list.lng b/interface/web/sites/lib/lang/cz_web_folder_user_list.lng index 99fe62051c..c4621250b1 100644 --- a/interface/web/sites/lib/lang/cz_web_folder_user_list.lng +++ b/interface/web/sites/lib/lang/cz_web_folder_user_list.lng @@ -4,3 +4,4 @@ $wb['active_txt'] = 'Aktivní'; $wb['web_folder_id_txt'] = 'Složka'; $wb['username_txt'] = 'Uživatelské jméno'; ?> + diff --git a/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng b/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng index ed93596824..a70ccfb9b7 100644 --- a/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng @@ -7,3 +7,4 @@ $wb['this_year_txt'] = 'Tento rok'; $wb['last_year_txt'] = 'Minulý rok'; $wb['sum_txt'] = 'Součet'; ?> + diff --git a/interface/web/sites/lib/lang/cz_web_subdomain.lng b/interface/web/sites/lib/lang/cz_web_subdomain.lng index de1445f5de..b40c927524 100644 --- a/interface/web/sites/lib/lang/cz_web_subdomain.lng +++ b/interface/web/sites/lib/lang/cz_web_subdomain.lng @@ -44,3 +44,4 @@ $wb['proxy_directives_txt'] = 'Proxy Directives'; $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; $wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; ?> + diff --git a/interface/web/sites/lib/lang/cz_web_subdomain_list.lng b/interface/web/sites/lib/lang/cz_web_subdomain_list.lng index 8a0bafe0f9..d1ad2834fe 100644 --- a/interface/web/sites/lib/lang/cz_web_subdomain_list.lng +++ b/interface/web/sites/lib/lang/cz_web_subdomain_list.lng @@ -6,3 +6,4 @@ $wb['parent_domain_id_txt'] = 'Webová stránka'; $wb['domain_txt'] = 'Subdoména'; $wb['add_new_record_txt'] = 'Přidat subdoménu'; ?> + diff --git a/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng index c76dffd07c..ab47f26dc4 100644 --- a/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng @@ -45,7 +45,7 @@ $wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your acc $wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.'; $wb['apache_directives_txt'] = 'Apache Directives'; $wb['domain_error_empty'] = 'Doména je prázdná.'; -$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.'; +$wb['domain_error_unique'] = 'Webové stránky nebo sub-doména / alias-domény již existuje s tímto doménovým jménem.'; $wb['domain_error_regex'] = 'Neplatné doménové jméno.'; $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.'; @@ -116,3 +116,4 @@ $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snipp $wb['proxy_directives_txt'] = 'Proxy Directives'; $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; ?> + diff --git a/interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng index a54e19a5ad..e15402b067 100644 --- a/interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng +++ b/interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng @@ -6,3 +6,4 @@ $wb['parent_domain_id_txt'] = 'Webové stránky'; $wb['domain_txt'] = 'Subdoména'; $wb['add_new_record_txt'] = 'Přidat novou poddoménu'; ?> + diff --git a/interface/web/sites/lib/lang/cz_webdav_user.lng b/interface/web/sites/lib/lang/cz_webdav_user.lng index 3e89a1e625..c21555e78e 100644 --- a/interface/web/sites/lib/lang/cz_webdav_user.lng +++ b/interface/web/sites/lib/lang/cz_webdav_user.lng @@ -19,3 +19,4 @@ $wb['repeat_password_txt'] = 'Opakujte heslo'; $wb['password_mismatch_txt'] = 'Hesla se neshodují.'; $wb['password_match_txt'] = 'Hesla se shodují.'; ?> + diff --git a/interface/web/sites/lib/lang/cz_webdav_user_list.lng b/interface/web/sites/lib/lang/cz_webdav_user_list.lng index 0c1148b53e..af8bfea749 100644 --- a/interface/web/sites/lib/lang/cz_webdav_user_list.lng +++ b/interface/web/sites/lib/lang/cz_webdav_user_list.lng @@ -6,3 +6,4 @@ $wb['parent_domain_id_txt'] = 'Webové stránky'; $wb['username_txt'] = 'Uživatelské jméno'; $wb['add_new_record_txt'] = 'Přidat nového WebDAV uživatele'; ?> + diff --git a/interface/web/sites/lib/lang/de.lng b/interface/web/sites/lib/lang/de.lng index 4ef7509e4e..7f956ef31e 100644 --- a/interface/web/sites/lib/lang/de.lng +++ b/interface/web/sites/lib/lang/de.lng @@ -10,12 +10,12 @@ $wb['FTP-User'] = 'FTP Benutzer'; $wb['Webdav-User'] = 'WebDAV Benutzer'; $wb['Folder'] = 'Geschützte Ordner'; $wb['Folder users'] = 'Geschützte Ordner Benutzer'; -$wb['Command Line'] = 'Kommando Zeile'; +$wb['Command Line'] = 'Kommandozeile'; $wb['Shell-User'] = 'Shell Benutzer'; $wb['Cron Jobs'] = 'Cronjobs'; $wb['Statistics'] = 'Statistik'; -$wb['Web traffic'] = 'Web Datentransfer'; -$wb['Website quota (Harddisk)'] = 'Webseitenbeschränkung (Festplatte)'; +$wb['Web traffic'] = 'Datentransfer'; +$wb['Website quota (Harddisk)'] = 'Speicherplatzbeschränkung'; $wb['Cron'] = 'Cron'; $wb['Stats'] = 'Statistiken'; $wb['Shell'] = 'Shell'; @@ -23,7 +23,7 @@ $wb['Webdav'] = 'WebDAV'; $wb['FTP'] = 'FTP'; $wb['Options'] = 'Optionen'; $wb['Domain'] = 'Domain'; -$wb['Redirect'] = 'Umleitung'; +$wb['Redirect'] = 'Weiterleitung'; $wb['SSL'] = 'SSL'; $wb['Sites'] = 'Seiten'; $wb['APS Installer'] = 'APS Installationsassistent'; @@ -33,3 +33,4 @@ $wb['Update Packagelist'] = 'Paketliste aktualisieren'; $wb['error_proxy_requires_url'] = 'Weiterleitungstyp '; $wb['Subdomain (Vhost)'] = 'Subdomain (vHost)'; ?> + diff --git a/interface/web/sites/lib/lang/de_aps.lng b/interface/web/sites/lib/lang/de_aps.lng index aab6f4edf7..b97d0a0c87 100644 --- a/interface/web/sites/lib/lang/de_aps.lng +++ b/interface/web/sites/lib/lang/de_aps.lng @@ -54,5 +54,6 @@ $wb['installation_error_txt'] = 'Installationsfehler'; $wb['installation_success_txt'] = 'Installiert'; $wb['installation_remove_txt'] = 'Deinstallation vorgemerkt'; $wb['packagelist_update_finished_txt'] = 'APS Paketlistenupdate beendet.'; -$wb['limit_aps_txt'] = 'Die maximale Anzahl an APS-Instanzen für Ihr Konto wurde erreicht.'; +$wb['limit_aps_txt'] = 'Die maximale Anzahl an APS Instanzen für Ihr Konto wurde erreicht.'; ?> + diff --git a/interface/web/sites/lib/lang/de_aps_instances_list.lng b/interface/web/sites/lib/lang/de_aps_instances_list.lng index e5f8b7b7f1..753ba3b8af 100644 --- a/interface/web/sites/lib/lang/de_aps_instances_list.lng +++ b/interface/web/sites/lib/lang/de_aps_instances_list.lng @@ -11,3 +11,4 @@ $wb['filter_txt'] = 'Suche'; $wb['delete_txt'] = 'Löschen'; $wb['reinstall_txt'] = 'Neuinstallieren'; ?> + diff --git a/interface/web/sites/lib/lang/de_aps_packages_list.lng b/interface/web/sites/lib/lang/de_aps_packages_list.lng index 6cada812b2..ab21a14771 100644 --- a/interface/web/sites/lib/lang/de_aps_packages_list.lng +++ b/interface/web/sites/lib/lang/de_aps_packages_list.lng @@ -6,3 +6,4 @@ $wb['category_txt'] = 'Kategorie'; $wb['status_txt'] = 'Verfügbar'; $wb['filter_txt'] = 'Suche'; ?> + diff --git a/interface/web/sites/lib/lang/de_aps_update_packagelist.lng b/interface/web/sites/lib/lang/de_aps_update_packagelist.lng index e0326cbb3c..4ca36cfb10 100644 --- a/interface/web/sites/lib/lang/de_aps_update_packagelist.lng +++ b/interface/web/sites/lib/lang/de_aps_update_packagelist.lng @@ -1,7 +1,8 @@ + diff --git a/interface/web/sites/lib/lang/de_cron.lng b/interface/web/sites/lib/lang/de_cron.lng index 8cebfa9c5f..8fd195820b 100644 --- a/interface/web/sites/lib/lang/de_cron.lng +++ b/interface/web/sites/lib/lang/de_cron.lng @@ -8,8 +8,8 @@ $wb['run_hour_txt'] = 'Stunden'; $wb['run_mday_txt'] = 'Tage des Monats'; $wb['run_month_txt'] = 'Monate'; $wb['run_wday_txt'] = 'Tage der Woche'; -$wb['command_txt'] = 'Auszuführender Befehl (Befehle werden mit sh ausgeführt, urls mit wget)'; -$wb['limit_cron_txt'] = 'Die maximale Anzahl von erlaubten Cronjobs ist bereits erreicht.'; +$wb['command_txt'] = 'Auszuführender Befehl (Befehle werden mit sh ausgeführt, URLs mit wget)'; +$wb['limit_cron_txt'] = 'Die max. Anzahl von erlaubten Cronjobs ist bereits erreicht.'; $wb['limit_cron_frequency_txt'] = 'Die Ausführungshäufigkeit übersteigt Ihr erlaubtes Limit.'; $wb['run_min_error_format'] = 'Das Format für Minuten ist nicht korrekt.'; $wb['run_hour_error_format'] = 'Das Format für Stunden ist nicht korrekt.'; @@ -19,3 +19,4 @@ $wb['run_wday_error_format'] = 'Das Format für Wochentage ist nicht korrekt.'; $wb['command_error_format'] = 'Das Format für den Befehl ist nicht korrekt. Beachten Sie, dass bei einem URL Aufruf nur http und https erlaubt ist.'; $wb['unknown_fieldtype_error'] = 'Es wurde ein unbekanntes Feld verwendet.'; ?> + diff --git a/interface/web/sites/lib/lang/de_cron_list.lng b/interface/web/sites/lib/lang/de_cron_list.lng index 687505b4a3..029cd59b75 100644 --- a/interface/web/sites/lib/lang/de_cron_list.lng +++ b/interface/web/sites/lib/lang/de_cron_list.lng @@ -11,3 +11,4 @@ $wb['command_txt'] = 'Befehl'; $wb['add_new_cron_txt'] = 'Neuen Cronjob anlegen'; $wb['parent_domain_id_txt'] = 'Webseite'; ?> + diff --git a/interface/web/sites/lib/lang/de_database.lng b/interface/web/sites/lib/lang/de_database.lng index 716fd7a20e..a38dd8d8d8 100644 --- a/interface/web/sites/lib/lang/de_database.lng +++ b/interface/web/sites/lib/lang/de_database.lng @@ -10,20 +10,20 @@ $wb['database_charset_txt'] = 'Datenbank Zeichensatz'; $wb['select_dbuser_txt'] = 'Datenbankbenutzer auswählen'; $wb['no_dbuser_txt'] = 'Keiner'; $wb['remote_access_txt'] = 'Entfernter Zugriff'; -$wb['remote_ips_txt'] = 'Entfernter Zugriff IP Adressen (Mehrere mit Komma trennen, keine Eingabe für alle)'; -$wb['database_remote_error_ips'] = 'Mindestens eine der eingegebenen IP Adressen ist ungültig.'; +$wb['remote_ips_txt'] = 'Entfernter Zugriff IP Adressen (Mehrere mit Komma trennen, keine Angabe für alle)'; +$wb['database_remote_error_ips'] = 'Mindestens eine der angegebenen IP Adressen ist ungültig.'; $wb['client_txt'] = 'Kunde'; $wb['active_txt'] = 'Aktiv'; $wb['database_client_differs_txt'] = 'Der Kunde dieser Datenbank passt nicht zum Kunden des Datenbankbenutzers.'; -$wb['database_name_error_empty'] = 'Datenbank Name ist leer.'; +$wb['database_name_error_empty'] = 'Datenbankname ist leer.'; $wb['database_name_error_unique'] = 'Es existiert bereits eine Datenbank mit diesem Namen am Server. Um einen eindeutigen Namen zu erhalten können sie z.B. den Domainnamen vor dem Datenbanknamen verwenden.'; -$wb['database_name_error_regex'] = 'Ungültiger Datenbankname. Der Datenbankname darf die Zeichen: a-z, A-Z, 0-9 und den Unterstrich beinhalten. Länge: 2 - 64 Zeichen.'; +$wb['database_name_error_regex'] = 'Ungültiger Datenbankname. Der Datenbank Name darf die Zeichen: a-z, A-Z, 0-9 und den Unterstrich beinhalten. Länge: 2 - 64 Zeichen.'; $wb['database_user_error_empty'] = 'Datenbankbenutzer ist leer.'; $wb['database_user_error_unique'] = 'Es existiert bereits ein Benutzer mit diesem Namen am Server. Um einen eindeutigen Namen zu erhalten können sie z.B. den Domainnamen vor dem Benutzernamen verwenden.'; $wb['database_user_error_regex'] = 'Ungültiger Benutzername. Der Benutzername darf die Zeichen: a-z, A-Z, 0-9 und den Unterstrich beinhalten. Länge: 2 - 64 Zeichen.'; -$wb['limit_database_txt'] = 'Die maximale Anzahl an Datenbanken wurde erreicht.'; +$wb['limit_database_txt'] = 'Die max. Anzahl an Datenbanken wurde erreicht.'; $wb['database_name_change_txt'] = 'Der Datenbankname kann nicht geändert werden.'; -$wb['database_user_missing_txt'] = 'Bitte wählen Sie einen Datenbanknutzer für die Datenbank aus.'; +$wb['database_user_missing_txt'] = 'Bitte wählen Sie einen Datenbankbennutzer für die Datenbank aus.'; $wb['database_charset_change_txt'] = 'Der Zeichensatz der Datenbank kann nicht geändert werden.'; $wb['password_strength_txt'] = 'Passwortkomplexität'; $wb['database_name_error_len'] = 'Datenbankname - {db} - zu lang. Die max. Datenbanknamen Länge inkl. Präfix ist 64 Zeichen.'; @@ -44,3 +44,4 @@ $wb['globalsearch_noresults_limit_txt'] = '0 Treffer'; $wb['globalsearch_searchfield_watermark_txt'] = 'Suche'; $wb['globalsearch_suggestions_text_txt'] = 'Vorschläge'; ?> + diff --git a/interface/web/sites/lib/lang/de_database_admin_list.lng b/interface/web/sites/lib/lang/de_database_admin_list.lng index f77b4ca89d..ad742ff38d 100644 --- a/interface/web/sites/lib/lang/de_database_admin_list.lng +++ b/interface/web/sites/lib/lang/de_database_admin_list.lng @@ -1,12 +1,12 @@ + diff --git a/interface/web/sites/lib/lang/de_database_list.lng b/interface/web/sites/lib/lang/de_database_list.lng index d355181b2d..93dc2779dc 100644 --- a/interface/web/sites/lib/lang/de_database_list.lng +++ b/interface/web/sites/lib/lang/de_database_list.lng @@ -2,10 +2,10 @@ $wb['list_head_txt'] = 'Datenbank'; $wb['active_txt'] = 'Aktiv'; $wb['remote_access_txt'] = 'Remotezugriff'; -$wb['type_txt'] = 'Typ'; $wb['server_id_txt'] = 'Server'; -$wb['database_name_txt'] = 'Datenbankname'; +$wb['database_name_txt'] = 'Datenbank Name'; $wb['add_new_record_txt'] = 'Neue Datenbank hinzufügen'; -$wb['database_user_txt'] = 'Database user'; +$wb['database_user_txt'] = 'Datenbank Benutzer'; $wb['parent_domain_id_txt'] = 'Domain'; ?> + diff --git a/interface/web/sites/lib/lang/de_database_user.lng b/interface/web/sites/lib/lang/de_database_user.lng index 78884bc3b8..d81bc52d0c 100644 --- a/interface/web/sites/lib/lang/de_database_user.lng +++ b/interface/web/sites/lib/lang/de_database_user.lng @@ -1,6 +1,6 @@ + diff --git a/interface/web/sites/lib/lang/de_database_user_admin_list.lng b/interface/web/sites/lib/lang/de_database_user_admin_list.lng index 82c09fcf13..4cbdc9dbda 100644 --- a/interface/web/sites/lib/lang/de_database_user_admin_list.lng +++ b/interface/web/sites/lib/lang/de_database_user_admin_list.lng @@ -4,3 +4,4 @@ $wb['add_new_record_txt'] = 'Neuen Benutzer hinzufügen'; $wb['database_user_txt'] = 'Datenbank Benutzer'; $wb['sys_groupid_txt'] = 'Kunde'; ?> + diff --git a/interface/web/sites/lib/lang/de_database_user_list.lng b/interface/web/sites/lib/lang/de_database_user_list.lng index 7ee8222dcb..d746d2f2c2 100644 --- a/interface/web/sites/lib/lang/de_database_user_list.lng +++ b/interface/web/sites/lib/lang/de_database_user_list.lng @@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Datenbank Benutzer'; $wb['add_new_record_txt'] = 'Neuen Benutzer hinzufügen'; $wb['database_user_txt'] = 'Datenbank Benutzer'; ?> + diff --git a/interface/web/sites/lib/lang/de_ftp_user.lng b/interface/web/sites/lib/lang/de_ftp_user.lng index c367ffffbb..897f70057a 100644 --- a/interface/web/sites/lib/lang/de_ftp_user.lng +++ b/interface/web/sites/lib/lang/de_ftp_user.lng @@ -12,13 +12,13 @@ $wb['server_id_txt'] = 'Server'; $wb['parent_domain_id_txt'] = 'Domain'; $wb['username_txt'] = 'Benutzername'; $wb['password_txt'] = 'Passwort'; -$wb['quota_size_txt'] = 'Festplatten Quota'; +$wb['quota_size_txt'] = 'Speicherplatz Beschränkung'; $wb['active_txt'] = 'Aktiv'; -$wb['limit_ftp_user_txt'] = 'Die maximale Anzahl an FTP Benutzer für Ihr Konto wurde erreicht.'; +$wb['limit_ftp_user_txt'] = 'Die max. Anzahl an FTP Benutzer für Ihr Konto wurde erreicht.'; $wb['username_error_empty'] = 'Benutzername ist leer.'; $wb['username_error_unique'] = 'Der Benutzername muss einzigartig sein.'; $wb['username_error_regex'] = 'Der Benutzername enthält nicht erlaubte Zeichen.'; -$wb['quota_size_error_empty'] = 'Beschränkung ist leer.'; +$wb['quota_size_error_empty'] = 'Speicherplatz Beschränkung ist leer.'; $wb['uid_error_empty'] = 'GID ist leer.'; $wb['directory_error_empty'] = 'Verzeichnis ist leer.'; $wb['password_strength_txt'] = 'Passwortkomplexität'; @@ -32,3 +32,4 @@ $wb['repeat_password_txt'] = 'Passwort wiederholen'; $wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; $wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; ?> + diff --git a/interface/web/sites/lib/lang/de_ftp_user_list.lng b/interface/web/sites/lib/lang/de_ftp_user_list.lng index 8d1b0817a6..d39ff1f526 100644 --- a/interface/web/sites/lib/lang/de_ftp_user_list.lng +++ b/interface/web/sites/lib/lang/de_ftp_user_list.lng @@ -6,3 +6,4 @@ $wb['parent_domain_id_txt'] = 'Domain'; $wb['username_txt'] = 'Benutzername'; $wb['add_new_record_txt'] = 'Neuen FTP Benutzer hinzufügen'; ?> + diff --git a/interface/web/sites/lib/lang/de_shell_user.lng b/interface/web/sites/lib/lang/de_shell_user.lng index 9de369f90d..8a825b47b6 100644 --- a/interface/web/sites/lib/lang/de_shell_user.lng +++ b/interface/web/sites/lib/lang/de_shell_user.lng @@ -6,20 +6,20 @@ $wb['parent_domain_id_txt'] = 'Webseite'; $wb['username_txt'] = 'Benutzername'; $wb['password_txt'] = 'Passwort'; $wb['chroot_txt'] = 'Chroot Shell'; -$wb['quota_size_txt'] = 'Quota'; +$wb['quota_size_txt'] = 'Beschränkung'; $wb['active_txt'] = 'Aktiv'; $wb['username_error_empty'] = 'Benutzername ist leer.'; $wb['username_error_unique'] = 'Der Benutzername muss eindeutig sein.'; $wb['username_error_regex'] = 'Der Benutzername enthält ungültige Zeichen.'; -$wb['quota_size_error_empty'] = 'Quota ist leer'; +$wb['quota_size_error_empty'] = 'Beschränkung ist leer'; $wb['uid_error_empty'] = 'GID ist leer.'; $wb['directory_error_empty'] = 'Verzeichnis ist leer.'; -$wb['limit_shell_user_txt'] = 'Die maximale Anzahl an Shell Benutzer wurde erreicht.'; +$wb['limit_shell_user_txt'] = 'Die max. Anzahl an Shell Benutzer wurde erreicht.'; $wb['password_strength_txt'] = 'Passwortkomplexität'; $wb['parent_domain_id_error_empty'] = 'Keine Webseite ausgewählt.'; $wb['puser_txt'] = 'Web Benutzername'; $wb['pgroup_txt'] = 'Web Gruppe'; -$wb['ssh_rsa_txt'] = 'SSH RSA Public Key (für key-basierte Logins)'; +$wb['ssh_rsa_txt'] = 'SSH RSA öffentlicher Schlüssel (Für Schlüssel basierte Logins)'; $wb['dir_dot_error'] = 'Kein .. im Pfad erlaubt.'; $wb['dir_slashdot_error'] = 'Kein ./ im Pfad erlaubt.'; $wb['generate_password_txt'] = 'Passwort erzeugen'; @@ -27,5 +27,6 @@ $wb['repeat_password_txt'] = 'Passwort wiederholen'; $wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; $wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; $wb['username_must_not_exceed_32_chars_txt'] = 'Der Benutzername darf 32 Zeichen nicht überschreiten.'; -$wb['username_not_allowed_txt'] = 'Der Benutzername ist nicht erlaubt.'; +$wb['username_not_allowed_txt'] = 'Dieser Benutzername ist nicht erlaubt.'; ?> + diff --git a/interface/web/sites/lib/lang/de_shell_user_list.lng b/interface/web/sites/lib/lang/de_shell_user_list.lng index c953cf6b05..176a4e5970 100644 --- a/interface/web/sites/lib/lang/de_shell_user_list.lng +++ b/interface/web/sites/lib/lang/de_shell_user_list.lng @@ -6,3 +6,4 @@ $wb['parent_domain_id_txt'] = 'Webseite'; $wb['username_txt'] = 'Benutzername'; $wb['add_new_record_txt'] = 'Neuen Shell Benutzer hinzufügen'; ?> + diff --git a/interface/web/sites/lib/lang/de_user_quota_stats_list.lng b/interface/web/sites/lib/lang/de_user_quota_stats_list.lng index 74a0b17476..c207ad7314 100644 --- a/interface/web/sites/lib/lang/de_user_quota_stats_list.lng +++ b/interface/web/sites/lib/lang/de_user_quota_stats_list.lng @@ -1,9 +1,10 @@ + diff --git a/interface/web/sites/lib/lang/de_web_aliasdomain.lng b/interface/web/sites/lib/lang/de_web_aliasdomain.lng index ccb3bdfa24..d568bd26bc 100644 --- a/interface/web/sites/lib/lang/de_web_aliasdomain.lng +++ b/interface/web/sites/lib/lang/de_web_aliasdomain.lng @@ -2,11 +2,11 @@ $wb['domain_txt'] = 'Aliasdomain'; $wb['backup_interval_txt'] = 'Backup Intervall'; $wb['backup_copies_txt'] = 'Anzahl der Backups'; -$wb['ssl_state_txt'] = 'Land'; +$wb['ssl_state_txt'] = 'Bundesland'; $wb['ssl_locality_txt'] = 'Ort'; -$wb['ssl_organisation_txt'] = 'Organisation'; -$wb['ssl_organisation_unit_txt'] = 'Organisation Abteilung'; -$wb['ssl_country_txt'] = 'Bundesland'; +$wb['ssl_organisation_txt'] = 'Firma'; +$wb['ssl_organisation_unit_txt'] = 'Abteilung'; +$wb['ssl_country_txt'] = 'Land'; $wb['ssl_key_txt'] = 'SSL Schlüssel'; $wb['ssl_request_txt'] = 'SSL Anfrage'; $wb['ssl_cert_txt'] = 'SSL Zertifikat'; @@ -14,20 +14,20 @@ $wb['ssl_bundle_txt'] = 'SSL Bundle'; $wb['ssl_action_txt'] = 'SSL Aktion'; $wb['ssl_domain_txt'] = 'SSL Domain'; $wb['server_id_txt'] = 'Server'; -$wb['web_folder_error_regex'] = 'Ungültige Verzeichnisangabe. Bitte geben Sie keine Schrägstrich ein.'; +$wb['web_folder_error_regex'] = 'Ungültige Ordnerangabe. Bitte geben Sie keinen Schrägstrich ein.'; $wb['type_txt'] = 'Typ'; $wb['parent_domain_id_txt'] = 'Hauptwebseite'; -$wb['redirect_type_txt'] = 'Weiterleitungs Typ'; -$wb['redirect_path_txt'] = 'Weiterleitungs Pfad'; +$wb['redirect_type_txt'] = 'Weiterleitungstyp'; +$wb['redirect_path_txt'] = 'Weiterleitungsziel'; $wb['active_txt'] = 'Aktiv'; $wb['document_root_txt'] = 'Documentroot'; -$wb['system_user_txt'] = 'Linux Benutzer'; -$wb['system_group_txt'] = 'Linux Gruppe'; +$wb['system_user_txt'] = 'System Benutzer'; +$wb['system_group_txt'] = 'System Gruppe'; $wb['ip_address_txt'] = 'IPv4 Adresse'; $wb['ipv6_address_txt'] = 'IPv6 Adresse'; $wb['vhost_type_txt'] = 'vHost Typ'; -$wb['hd_quota_txt'] = 'Festplatten Beschränkung'; -$wb['traffic_quota_txt'] = 'Transfer Beschränkung'; +$wb['hd_quota_txt'] = 'Speicherplatz Beschränkung'; +$wb['traffic_quota_txt'] = 'Datentransfer Beschränkung'; $wb['cgi_txt'] = 'CGI'; $wb['ssi_txt'] = 'SSI'; $wb['errordocs_txt'] = 'Eigene Fehlerseiten'; @@ -36,43 +36,43 @@ $wb['ssl_txt'] = 'SSL'; $wb['suexec_txt'] = 'SuEXEC'; $wb['php_txt'] = 'PHP'; $wb['client_txt'] = 'Kunde'; -$wb['limit_web_domain_txt'] = 'Die max. Anzahl an Web Domains für Ihr Konto ist erreicht.'; -$wb['limit_web_aliasdomain_txt'] = 'Die max. Anzahl an Alias Domains für Ihr Konto ist erreicht.'; +$wb['limit_web_domain_txt'] = 'Die max. Anzahl an Webdomains für Ihr Konto ist erreicht.'; +$wb['limit_web_aliasdomain_txt'] = 'Die max. Anzahl an Aliasdomains für Ihr Konto ist erreicht.'; $wb['limit_web_subdomain_txt'] = 'Die max. Anzahl an Web Subdomains für Ihr Konto ist erreicht.'; $wb['apache_directives_txt'] = 'Apache Direktiven'; $wb['domain_error_empty'] = 'Domain ist leer.'; -$wb['domain_error_unique'] = 'Es existiert bereits eine Webseite oder Sub- Alias Domain mit diesem Domain Namen.'; +$wb['domain_error_unique'] = 'Es existiert bereits eine Webseite oder Sub- Aliasdomain mit diesem Domain Namen.'; $wb['domain_error_regex'] = 'Domain Name ungültig.'; $wb['domain_error_autosub'] = 'Es existiert bereits eine Subdomain mit diesen Einstellungen.'; -$wb['hd_quota_error_empty'] = 'Festplatten Beschränkung ist 0 oder leer.'; -$wb['traffic_quota_error_empty'] = 'Transfer Beschränkung ist leer.'; -$wb['error_ssl_state_empty'] = 'SSL Staat ist leet.'; +$wb['hd_quota_error_empty'] = 'Speicherplatz Beschränkung ist 0 oder leer.'; +$wb['traffic_quota_error_empty'] = 'Datentransfer Beschränkung ist leer.'; +$wb['error_ssl_state_empty'] = 'SSL Bundesland ist leet.'; $wb['error_ssl_locality_empty'] = 'SSL Ort ist leer.'; -$wb['error_ssl_organisation_empty'] = 'SSL Organisation ist leer.'; -$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Abteilung ist leer.'; -$wb['error_ssl_country_empty'] = 'SSL Bundeland ist leer.'; +$wb['error_ssl_organisation_empty'] = 'SSL Firma ist leer.'; +$wb['error_ssl_organisation_unit_empty'] = 'SSL Abteilung ist leer.'; +$wb['error_ssl_country_empty'] = 'SSL Land ist leer.'; $wb['error_ssl_cert_empty'] = 'SSL Zertifikat Feld ist leer.'; $wb['client_group_id_txt'] = 'Kunde'; $wb['stats_password_txt'] = 'Webstatistiken Passwort'; $wb['allow_override_txt'] = 'Apache AllowOverride'; -$wb['limit_web_quota_free_txt'] = 'Max. verfügbare Festplatten Beschränkung'; -$wb['ssl_state_error_regex'] = 'Ungültiger SSL Staat. Mögliche Zeichen sind: a-z, 0-9 and .,-_'; +$wb['limit_web_quota_free_txt'] = 'Max. verfügbarer Speicherplatz'; +$wb['ssl_state_error_regex'] = 'Ungültiges SSL Bundesland. Mögliche Zeichen sind: a-z, 0-9 and .,-_'; $wb['ssl_locality_error_regex'] = 'Ungültiger SSL Ort. Mögliche Zeichen sind: a-z, 0-9 and .,-_'; -$wb['ssl_organisation_error_regex'] = 'Ungültige SSL Organisation. Mögliche Zeichen sind: a-z, 0-9 and .,-_'; -$wb['ssl_organistaion_unit_error_regex'] = 'Ungültige SSL Organisation Abteilung. Mögliche Zeichen sind: a-z, 0-9 and .,-_'; -$wb['ssl_country_error_regex'] = 'Ungültiges SSL Bundesland. Mögliche Zeichen sind: A-Z'; -$wb['limit_traffic_quota_free_txt'] = 'Max. verfügbare Transfer Beschränkung'; -$wb['redirect_error_regex'] = 'Ungültiger weiterleitungs Pfad. Gültige weiterleitungs Pfade sind zum Beispiel: /test/ oder http://www.domain.tld/test/'; +$wb['ssl_organisation_error_regex'] = 'Ungültige SSL Firma. Mögliche Zeichen sind: a-z, 0-9 and .,-_'; +$wb['ssl_organistaion_unit_error_regex'] = 'Ungültige SSL Abteilung. Mögliche Zeichen sind: a-z, 0-9 and .,-_'; +$wb['ssl_country_error_regex'] = 'Ungültiges SSL Land. Mögliche Zeichen sind: A-Z'; +$wb['limit_traffic_quota_free_txt'] = 'Max. verfügbarer Datentransfer'; +$wb['redirect_error_regex'] = 'Ungültiges Weiterleitungsziel. Gültige Weiterleitungsziele sind zum Beispiel: /test/ oder http://www.domain.tld/test/'; $wb['php_open_basedir_txt'] = 'PHP open_basedir'; -$wb['traffic_quota_exceeded_txt'] = 'Transfer Beschränkung überschritten'; +$wb['traffic_quota_exceeded_txt'] = 'Datentransfervolumen überschritten'; $wb['ruby_txt'] = 'Ruby'; $wb['stats_user_txt'] = 'Webstatistiken Benutzername'; $wb['stats_type_txt'] = 'Webstatistiken Programm'; $wb['custom_php_ini_txt'] = 'Benutzerdefinierte php.ini Einstellungen'; -$wb['none_txt'] = 'Keine'; +$wb['none_txt'] = 'Keine Subdomain'; $wb['disabled_txt'] = 'Deaktiviert'; $wb['no_redirect_txt'] = 'Keine Weiterleitung'; -$wb['no_flag_txt'] = 'Kein Flag'; +$wb['no_flag_txt'] = 'Keine Option'; $wb['save_certificate_txt'] = 'Zertifikat speichern'; $wb['create_certificate_txt'] = 'Zertifikat erstellen'; $wb['delete_certificate_txt'] = 'Zertifikat löschen'; @@ -81,7 +81,7 @@ $wb['seo_redirect_txt'] = 'SEO Weiterleitung'; $wb['non_www_to_www_txt'] = 'Non-www -> www'; $wb['www_to_non_www_txt'] = 'www -> non-www'; $wb['php_fpm_use_socket_txt'] = 'Verwende Socket für PHP-FPM'; -$wb['error_no_sni_txt'] = 'SNI ist für SSL ist auf diesem Server nicht aktiviert. Sie können nur ein SSL Zertifikate pro IP Adresse aktivieren.'; +$wb['error_no_sni_txt'] = 'SNI ist für SSL ist auf diesem Server nicht aktiviert. Sie können nur ein SSL Zertifikat pro IP Adresse aktivieren.'; $wb['python_txt'] = 'Python'; $wb['perl_txt'] = 'Perl'; $wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children'; @@ -93,15 +93,15 @@ $wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children muss ein positiver $wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers muss ein positiver integer Wert sein.'; $wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers muss ein positiver integer Wert sein.'; $wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers muss ein positiver integer Wert sein.'; -$wb['hd_quota_error_regex'] = 'Festplatten Beschränkung ist ungültig.'; -$wb['traffic_quota_error_regex'] = 'Transfer Beschränkung ist ungültig.'; +$wb['hd_quota_error_regex'] = 'Speicherplatz Beschränkung ist ungültig.'; +$wb['traffic_quota_error_regex'] = 'Datentransfer Beschränkung ist ungültig.'; $wb['fastcgi_php_version_txt'] = 'PHP Version'; $wb['pm_txt'] = 'PHP-FPM Prozess Manager'; $wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout'; $wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests'; $wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout muss eine positiver integer Wert sein.'; $wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests muss ein integer Wert >= 0 sein.'; -$wb['pm_ondemand_hint_txt'] = 'Bitte beachte Sie, daß Sie mindesten PHP Version >= 5.3.9 verwenden um den Ondemand Prozess Manager zu verwenden. Wenn Sie Ondemand für eine ältere PHP Version aktivieren wird PHP nicht mehr funktionieren!'; +$wb['pm_ondemand_hint_txt'] = 'Bitte beachte Sie, dass Sie mindesten PHP Version >= 5.3.9 verwenden um den Ondemand Prozess Manager zu verwenden. Wenn Sie Ondemand für eine ältere PHP Version aktivieren wird PHP nicht mehr funktionieren!'; $wb['generate_password_txt'] = 'Passwort generieren'; $wb['repeat_password_txt'] = 'Passwort wiederholen'; $wb['password_mismatch_txt'] = 'Die Passwörter stimmer nicht überein.'; @@ -111,5 +111,6 @@ $wb['available_apache_directive_snippets_txt'] = 'Verfügbare Apache Direktiven $wb['available_nginx_directive_snippets_txt'] = 'Verfügbare nginx Direktiven Schnipsel:'; $wb['proxy_directives_txt'] = 'Proxy Direktiven'; $wb['available_proxy_directive_snippets_txt'] = 'Verfügbare Proxy Direktiven Schnipsel:'; -$wb['Domain'] = 'Alias Domain'; +$wb['Domain'] = 'Aliasdomain'; ?> + diff --git a/interface/web/sites/lib/lang/de_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/de_web_aliasdomain_list.lng index df8ebc683e..1fe7f8477c 100644 --- a/interface/web/sites/lib/lang/de_web_aliasdomain_list.lng +++ b/interface/web/sites/lib/lang/de_web_aliasdomain_list.lng @@ -6,9 +6,10 @@ $wb['parent_domain_id_txt'] = 'Domain'; $wb['domain_txt'] = 'Aliasdomain'; $wb['add_new_record_txt'] = 'Neue Aliasdomain hinzufügen'; $wb['domain_error_empty'] = 'Domain ist leer.'; -$wb['domain_error_unique'] = 'Domain muss eindeutig sein.'; +$wb['domain_error_unique'] = 'Domain ist schon als Webdomain in Verwendung.'; $wb['domain_error_regex'] = 'Domain Name ist ungültig.'; -$wb['no_redirect_txt'] = 'Kein Redirect'; -$wb['no_flag_txt'] = 'Kein Flag'; -$wb['none_txt'] = 'keine'; +$wb['no_redirect_txt'] = 'Keine Weiterleitung'; +$wb['no_flag_txt'] = 'Keine Optionen'; +$wb['none_txt'] = 'Keine'; ?> + diff --git a/interface/web/sites/lib/lang/de_web_backup_list.lng b/interface/web/sites/lib/lang/de_web_backup_list.lng index 499fb4f754..87fb0aa7ad 100644 --- a/interface/web/sites/lib/lang/de_web_backup_list.lng +++ b/interface/web/sites/lib/lang/de_web_backup_list.lng @@ -5,12 +5,12 @@ $wb['backup_type_txt'] = 'Typ'; $wb['filename_txt'] = 'Backup Datei'; $wb['restore_backup_txt'] = 'Backup wiederherstellen'; $wb['download_backup_txt'] = 'Backup herunterladen'; -$wb['download_info_txt'] = 'Die Backup Datei steht in ein paar Minuten als Download im Backup-Verzeichnis zur Verfügung.'; +$wb['download_info_txt'] = 'Die Backup Datei steht in ein paar Minuten als Download im Backup Verzeichnis zur Verfügung.'; $wb['restore_info_txt'] = 'Die Wiederherstellung des Backups hat begonnen. Diese Aktion kann bis zur Fertigstellung einige Minuten dauern.'; -$wb['restore_confirm_txt'] = 'Die Wiederherstellung wird existierende Dateien in Ihrer Website überschreiben. Möchten Sie dieses Backup wirklich zurückspielen?'; +$wb['restore_confirm_txt'] = 'Die Wiederherstellung wird existierende Dateien in Ihrer Website überschreiben. Möchten Sie dieses Backup wirklich wiederherstellen?'; $wb['download_pending_txt'] = 'Es liegt bereits ein Backup Download Job an.'; $wb['restore_pending_txt'] = 'Es liegt bereits ein Backup Wiederherstellungs Job an.'; -$wb['backup_type_mongodb'] = 'MongoDB Datenbank'; $wb['backup_type_mysql'] = 'MySQL Datenbank'; $wb['backup_type_web'] = 'Webseiten Dateien'; ?> + diff --git a/interface/web/sites/lib/lang/de_web_domain.lng b/interface/web/sites/lib/lang/de_web_domain.lng index 15bbcfd575..18fd6dbdb8 100644 --- a/interface/web/sites/lib/lang/de_web_domain.lng +++ b/interface/web/sites/lib/lang/de_web_domain.lng @@ -4,8 +4,8 @@ $wb['ssl_locality_txt'] = 'Ort'; $wb['ssl_organisation_txt'] = 'Firma'; $wb['ssl_organisation_unit_txt'] = 'Abteilung'; $wb['ssl_country_txt'] = 'Land'; -$wb['ssl_key_txt'] = 'SSL Key'; -$wb['ssl_request_txt'] = 'SSL Request'; +$wb['ssl_key_txt'] = 'SSL Schlüssel'; +$wb['ssl_request_txt'] = 'SSL Anfrage'; $wb['ssl_cert_txt'] = 'SSL Zertifikat'; $wb['ssl_bundle_txt'] = 'SSL Bundle'; $wb['ssl_action_txt'] = 'SSL Aktion'; @@ -13,56 +13,56 @@ $wb['server_id_txt'] = 'Server'; $wb['domain_txt'] = 'Domain'; $wb['type_txt'] = 'Typ'; $wb['parent_domain_id_txt'] = 'Zugehörige Webseite'; -$wb['web_folder_error_regex'] = 'Ungültige Verzeichnisangabe, bitte keinen / eingeben.'; +$wb['web_folder_error_regex'] = 'Ungültige Ordnerangabe, bitte keinen / eingeben.'; $wb['redirect_type_txt'] = 'Weiterleitungstyp'; $wb['redirect_path_txt'] = 'Weiterleitungspfad'; $wb['active_txt'] = 'Aktiv'; $wb['document_root_txt'] = 'Documentroot'; -$wb['system_user_txt'] = 'Linux Benutzer'; -$wb['system_group_txt'] = 'Linux Gruppe'; +$wb['system_user_txt'] = 'System Benutzer'; +$wb['system_group_txt'] = 'System Gruppe'; $wb['ip_address_txt'] = 'IP Adresse'; -$wb['vhost_type_txt'] = 'VHost Type'; -$wb['hd_quota_txt'] = 'Speicherplatzbeschränkung'; -$wb['traffic_quota_txt'] = 'Transfervolumenbeschränkung'; +$wb['vhost_type_txt'] = 'vHost Type'; +$wb['hd_quota_txt'] = 'Speicherplatz Beschränkung'; +$wb['traffic_quota_txt'] = 'Datentransfer Beschränkung'; $wb['cgi_txt'] = 'CGI'; $wb['ssi_txt'] = 'SSI'; $wb['ssl_txt'] = 'SSL'; $wb['suexec_txt'] = 'SuEXEC'; $wb['php_txt'] = 'PHP'; $wb['client_txt'] = 'Kunde'; -$wb['limit_web_domain_txt'] = 'Die maximale Anzahl an Webdomains für Ihr Konto wurde erreicht.'; -$wb['limit_web_aliasdomain_txt'] = 'Die maximale Anzahl an Aliasdomains für Ihr Konto wurde erreicht.'; -$wb['limit_web_subdomain_txt'] = 'Die maximale Anzahl an Subdomains für Ihr Konto wurde erreicht.'; +$wb['limit_web_domain_txt'] = 'Die max. Anzahl an Webdomains für Ihr Konto wurde erreicht.'; +$wb['limit_web_aliasdomain_txt'] = 'Die max. Anzahl an Aliasdomains für Ihr Konto wurde erreicht.'; +$wb['limit_web_subdomain_txt'] = 'Die max. Anzahl an Subdomains für Ihr Konto wurde erreicht.'; $wb['apache_directives_txt'] = 'Apache Direktiven'; $wb['domain_error_empty'] = 'Domain ist leer.'; -$wb['domain_error_unique'] = 'Domain muss eindeutig sein'; +$wb['domain_error_unique'] = 'Domain ist schon als Aliasdomain in Verwendung'; $wb['domain_error_regex'] = 'Domain Name ungültig.'; $wb['domain_error_autosub'] = 'Es existiert bereits eine Subdomain mit diesen Einstellungen.'; -$wb['hd_quota_error_empty'] = 'Speicherplatzbeschränkung ist leer.'; -$wb['traffic_quota_error_empty'] = 'Transfervolumenbeschränkung ist leer.'; +$wb['hd_quota_error_empty'] = 'Speicherplatz Beschränkung ist leer.'; +$wb['traffic_quota_error_empty'] = 'Datentransfer Beschränkung ist leer.'; $wb['errordocs_txt'] = 'Eigene Fehlerseiten'; -$wb['error_ssl_state_empty'] = 'SSL Status ist leer.'; -$wb['error_ssl_locality_empty'] = 'Ort (SSL) ist leer.'; -$wb['error_ssl_organisation_empty'] = 'Organisation (SSL) ist leer.'; -$wb['error_ssl_organisation_unit_empty'] = 'Abteilung (SSL) ist leer.'; -$wb['error_ssl_country_empty'] = 'Land (SSL) ist leer.'; +$wb['error_ssl_state_empty'] = 'SSL Bundesland ist leer.'; +$wb['error_ssl_locality_empty'] = 'SSL Ort ist leer.'; +$wb['error_ssl_organisation_empty'] = 'SSL Firma ist leer.'; +$wb['error_ssl_organisation_unit_empty'] = 'SSL Abteilung ist leer.'; +$wb['error_ssl_country_empty'] = 'SSL Land ist leer.'; $wb['subdomain_txt'] = 'Auto Subdomain'; $wb['client_group_id_txt'] = 'Kunde'; $wb['stats_password_txt'] = 'Webstatistik Passwort'; $wb['ssl_domain_txt'] = 'SSL Domain'; $wb['allow_override_txt'] = 'Allow Override'; -$wb['limit_web_quota_free_txt'] = 'Max. mögliche Speicherplatzbeschränkung'; -$wb['ssl_state_error_regex'] = 'Ungültige SSL State. Gültige Zeichen sind: a-z, 0-9 und .,-_'; -$wb['ssl_locality_error_regex'] = 'Ungültige SSL Locality. Gülige Zeichen sind: a-z, 0-9 und .,-_'; -$wb['ssl_organisation_error_regex'] = 'Ungültige SSL Organisation. Gültige Zeichen sind: a-z, 0-9 und .,-_'; -$wb['ssl_organistaion_unit_error_regex'] = 'Ungültige SSL Organisation Unit. Gültige Zeichen sind: a-z, 0-9 und .,-_'; +$wb['limit_web_quota_free_txt'] = 'Max. möglicher Speicherplatz'; +$wb['ssl_state_error_regex'] = 'Ungültiges SSL Bundesland. Gültige Zeichen sind: a-z, 0-9 und .,-_'; +$wb['ssl_locality_error_regex'] = 'Ungültiger SSL Ort. Gülige Zeichen sind: a-z, 0-9 und .,-_'; +$wb['ssl_organisation_error_regex'] = 'Ungültige SSL Firma. Gültige Zeichen sind: a-z, 0-9 und .,-_'; +$wb['ssl_organistaion_unit_error_regex'] = 'Ungültige SSL Abteilung. Gültige Zeichen sind: a-z, 0-9 und .,-_'; $wb['ssl_country_error_regex'] = 'Ungültiges SSL Land. Gültige Zeichen sind: A-Z'; -$wb['limit_traffic_quota_free_txt'] = 'Max. mögliche Transfervolumenbeschränkung'; +$wb['limit_traffic_quota_free_txt'] = 'Max. möglicher Datentransfer'; $wb['redirect_error_regex'] = 'Ungültiger Weiterleitungspfad. Gültige Angaben sind beispielsweise: /test/ oder http://www.domain.tld/test/'; $wb['php_open_basedir_txt'] = 'PHP open_basedir'; $wb['backup_interval_txt'] = 'Backup Intervall'; $wb['backup_copies_txt'] = 'Anzahl an Backups'; -$wb['traffic_quota_exceeded_txt'] = 'Transfervolumen verbraucht.'; +$wb['traffic_quota_exceeded_txt'] = 'Das Datentransfervolumen ist verbraucht.'; $wb['ruby_txt'] = 'Ruby'; $wb['stats_user_txt'] = 'Webstatistik Benutzername'; $wb['stats_type_txt'] = 'Webstatistik Programm'; @@ -70,13 +70,13 @@ $wb['custom_php_ini_txt'] = 'Individuelle php.ini Einstellungen'; $wb['error_ssl_cert_empty'] = 'SSL Zertifikat Feld ist leer.'; $wb['none_txt'] = 'Keine'; $wb['disabled_txt'] = 'Deaktiviert'; -$wb['no_redirect_txt'] = 'Kein Redirect'; -$wb['no_flag_txt'] = 'Kein Flag'; +$wb['no_redirect_txt'] = 'Keine Weiterleitung'; +$wb['no_flag_txt'] = 'Keine Option'; $wb['save_certificate_txt'] = 'Zertifikat speichern'; $wb['create_certificate_txt'] = 'Zertifikat erstellen'; $wb['delete_certificate_txt'] = 'Zertifikat löschen'; $wb['nginx_directives_txt'] = 'nginx Direktiven'; -$wb['seo_redirect_txt'] = 'SEO Redirect'; +$wb['seo_redirect_txt'] = 'SEO Weiterleitung'; $wb['non_www_to_www_txt'] = 'Nicht-www -> www'; $wb['www_to_non_www_txt'] = 'www -> Nicht-www'; $wb['php_fpm_use_socket_txt'] = 'Benutze Socket für PHP-FPM'; @@ -93,8 +93,8 @@ $wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children muß eine positive $wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers muß eine positive ganze Zahl sein.'; $wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers muß eine positive ganze Zahl sein.'; $wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers muß eine positive ganze Zahl sein.'; -$wb['hd_quota_error_regex'] = 'Speicherplatzbeschränkung ist ungültig.'; -$wb['traffic_quota_error_regex'] = 'Transfervolumenbeschränkung ist ungültig.'; +$wb['hd_quota_error_regex'] = 'Speicherplatz Beschränkung ist ungültig.'; +$wb['traffic_quota_error_regex'] = 'Datentransfer Beschränkung ist ungültig.'; $wb['fastcgi_php_version_txt'] = 'PHP Version'; $wb['pm_txt'] = 'PHP-FPM FastCGI Prozess Manager'; $wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout'; @@ -111,7 +111,7 @@ $wb['available_apache_directive_snippets_txt'] = 'Verfügbare Apache Direktiven $wb['available_nginx_directive_snippets_txt'] = 'Verfügbare nginx Direktiven Schnipsel:'; $wb['proxy_directives_txt'] = 'Proxy Direktiven'; $wb['available_proxy_directive_snippets_txt'] = 'Verfügbare Proxy Direktiven Schnipsel:'; -$wb['no_server_error'] = 'Kein server ausgewählt.'; +$wb['no_server_error'] = 'Kein Server ausgewählt.'; $wb['no_backup_txt'] = 'Kein Backup'; $wb['daily_backup_txt'] = 'Täglich'; $wb['weekly_backup_txt'] = 'Wöchentlich'; @@ -119,5 +119,6 @@ $wb['monthly_backup_txt'] = 'Monatlich'; $wb['rewrite_rules_txt'] = 'Rewrite Rules'; $wb['invalid_rewrite_rules_txt'] = 'Unzulässige Rewrite Rules'; $wb['allowed_rewrite_rule_directives_txt'] = 'Erlaubte Direktiven:'; -$wb['configuration_error_txt'] = "KONFIGURATIONSFEHLER"; +$wb['configuration_error_txt'] = 'KONFIGURATIONSFEHLER'; ?> + diff --git a/interface/web/sites/lib/lang/de_web_domain_admin_list.lng b/interface/web/sites/lib/lang/de_web_domain_admin_list.lng index d9dc65c6c0..276696c705 100644 --- a/interface/web/sites/lib/lang/de_web_domain_admin_list.lng +++ b/interface/web/sites/lib/lang/de_web_domain_admin_list.lng @@ -7,3 +7,4 @@ $wb['server_id_txt'] = 'Server'; $wb['domain_txt'] = 'Domain'; $wb['add_new_record_txt'] = 'Neue Webseite hinzufügen'; ?> + diff --git a/interface/web/sites/lib/lang/de_web_domain_list.lng b/interface/web/sites/lib/lang/de_web_domain_list.lng index ce56a1cd1f..b722783e72 100644 --- a/interface/web/sites/lib/lang/de_web_domain_list.lng +++ b/interface/web/sites/lib/lang/de_web_domain_list.lng @@ -6,3 +6,4 @@ $wb['server_id_txt'] = 'Server'; $wb['domain_txt'] = 'Domain'; $wb['add_new_record_txt'] = 'Neue Domain hinzufügen'; ?> + diff --git a/interface/web/sites/lib/lang/de_web_folder.lng b/interface/web/sites/lib/lang/de_web_folder.lng index 8defc36f4c..615e34050f 100644 --- a/interface/web/sites/lib/lang/de_web_folder.lng +++ b/interface/web/sites/lib/lang/de_web_folder.lng @@ -5,3 +5,4 @@ $wb['path_txt'] = 'Pfad'; $wb['active_txt'] = 'Aktiv'; $wb['path_error_regex'] = 'Ungültiger Pfad.'; ?> + diff --git a/interface/web/sites/lib/lang/de_web_folder_list.lng b/interface/web/sites/lib/lang/de_web_folder_list.lng index 5491202ac6..2ac8f0399a 100644 --- a/interface/web/sites/lib/lang/de_web_folder_list.lng +++ b/interface/web/sites/lib/lang/de_web_folder_list.lng @@ -5,3 +5,4 @@ $wb['server_id_txt'] = 'Server'; $wb['parent_domain_id_txt'] = 'Webseite'; $wb['path_txt'] = 'Pfad'; ?> + diff --git a/interface/web/sites/lib/lang/de_web_folder_user.lng b/interface/web/sites/lib/lang/de_web_folder_user.lng index 6983dc136e..6ab959ca7c 100644 --- a/interface/web/sites/lib/lang/de_web_folder_user.lng +++ b/interface/web/sites/lib/lang/de_web_folder_user.lng @@ -11,3 +11,4 @@ $wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; $wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; $wb['no_folder_perm'] = 'Sie haben keine Berechtigung für diesen Ordner.'; ?> + diff --git a/interface/web/sites/lib/lang/de_web_folder_user_list.lng b/interface/web/sites/lib/lang/de_web_folder_user_list.lng index 5357760eb4..cd41dbff36 100644 --- a/interface/web/sites/lib/lang/de_web_folder_user_list.lng +++ b/interface/web/sites/lib/lang/de_web_folder_user_list.lng @@ -4,3 +4,4 @@ $wb['active_txt'] = 'Aktiv'; $wb['web_folder_id_txt'] = 'Ordner'; $wb['username_txt'] = 'Benutzername'; ?> + diff --git a/interface/web/sites/lib/lang/de_web_sites_stats_list.lng b/interface/web/sites/lib/lang/de_web_sites_stats_list.lng index f7d8d424cc..84a2676509 100644 --- a/interface/web/sites/lib/lang/de_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/de_web_sites_stats_list.lng @@ -1,9 +1,10 @@ + diff --git a/interface/web/sites/lib/lang/de_web_subdomain.lng b/interface/web/sites/lib/lang/de_web_subdomain.lng index d0c7b3010b..29de073359 100644 --- a/interface/web/sites/lib/lang/de_web_subdomain.lng +++ b/interface/web/sites/lib/lang/de_web_subdomain.lng @@ -1,7 +1,7 @@ + diff --git a/interface/web/sites/lib/lang/de_web_subdomain_list.lng b/interface/web/sites/lib/lang/de_web_subdomain_list.lng index 042b9f02c5..91970764d5 100644 --- a/interface/web/sites/lib/lang/de_web_subdomain_list.lng +++ b/interface/web/sites/lib/lang/de_web_subdomain_list.lng @@ -6,3 +6,4 @@ $wb['parent_domain_id_txt'] = 'Webseite'; $wb['domain_txt'] = 'Subdomain'; $wb['add_new_record_txt'] = 'Neue Subdomain hinzufügen'; ?> + diff --git a/interface/web/sites/lib/lang/de_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/de_web_vhost_subdomain.lng index e41b71757a..d128a5ee7b 100644 --- a/interface/web/sites/lib/lang/de_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/de_web_vhost_subdomain.lng @@ -8,8 +8,8 @@ $wb['ssl_locality_txt'] = 'Ort'; $wb['ssl_organisation_txt'] = 'Firma'; $wb['ssl_organisation_unit_txt'] = 'Abteilung'; $wb['ssl_country_txt'] = 'Land'; -$wb['ssl_key_txt'] = 'SSL Key'; -$wb['ssl_request_txt'] = 'SSL Request'; +$wb['ssl_key_txt'] = 'SSL Schlüssel'; +$wb['ssl_request_txt'] = 'SSL Anfrage'; $wb['ssl_cert_txt'] = 'SSL Zertifikat'; $wb['ssl_bundle_txt'] = 'SSL Bundle'; $wb['ssl_action_txt'] = 'SSL Aktion'; @@ -18,32 +18,32 @@ $wb['domain_txt'] = 'Domain'; $wb['host_txt'] = 'Host'; $wb['type_txt'] = 'Typ'; $wb['web_folder_error_regex'] = 'Ungültige Ordnerangabe, bitte keinen / eingeben.'; -$wb['redirect_type_txt'] = 'Redirect Typ'; -$wb['redirect_path_txt'] = 'Redirect Pfad'; +$wb['redirect_type_txt'] = 'WeiterleitungsTyp'; +$wb['redirect_path_txt'] = 'Weiterleitungsziel'; $wb['active_txt'] = 'Aktiv'; $wb['document_root_txt'] = 'Documentroot'; $wb['system_user_txt'] = 'Linux Benutzer'; $wb['system_group_txt'] = 'Linux Gruppe'; $wb['ip_address_txt'] = 'IP Adresse'; -$wb['vhost_type_txt'] = 'VHost Type'; -$wb['hd_quota_txt'] = 'Festplatten Quota'; -$wb['traffic_quota_txt'] = 'Traffic Quota'; +$wb['vhost_type_txt'] = 'vHost Type'; +$wb['hd_quota_txt'] = 'Speicherplatz Beschränkung'; +$wb['traffic_quota_txt'] = 'Datentransfer Beschränkung'; $wb['cgi_txt'] = 'CGI'; $wb['ssi_txt'] = 'SSI'; $wb['ssl_txt'] = 'SSL'; $wb['suexec_txt'] = 'SuEXEC'; $wb['php_txt'] = 'PHP'; $wb['client_txt'] = 'Kunde'; -$wb['limit_web_domain_txt'] = 'Die maximale Anzahl an Webdomains für Ihr Konto wurde erreicht.'; -$wb['limit_web_aliasdomain_txt'] = 'Die maximale Anzahl an Aliasdomains für Ihr Konto wurde erreicht.'; -$wb['limit_web_subdomain_txt'] = 'Die maximale Anzahl an Subdomains für Ihr Konto wurde erreicht.'; +$wb['limit_web_domain_txt'] = 'Die max. Anzahl an Webdomains für Ihr Konto wurde erreicht.'; +$wb['limit_web_aliasdomain_txt'] = 'Die max. Anzahl an Aliasdomains für Ihr Konto wurde erreicht.'; +$wb['limit_web_subdomain_txt'] = 'Die max. Anzahl an Subdomains für Ihr Konto wurde erreicht.'; $wb['apache_directives_txt'] = 'Apache Direktiven'; $wb['domain_error_empty'] = 'Domain ist leer.'; -$wb['domain_error_unique'] = 'Domain muss eindeutig sein'; +$wb['domain_error_unique'] = 'Domain ist schon in Verwendung'; $wb['domain_error_regex'] = 'Domain Name ungültig.'; $wb['domain_error_wildcard'] = 'Wildcard Subdomains sind nicht erlaubt.'; -$wb['hd_quota_error_empty'] = 'Harddisk Quota ist leer.'; -$wb['traffic_quota_error_empty'] = 'Traffic Quota ist leer.'; +$wb['hd_quota_error_empty'] = 'Speicherplatz Beschränkung ist leer.'; +$wb['traffic_quota_error_empty'] = 'Datentransfer Beschränkung ist leer.'; $wb['errordocs_txt'] = 'Eigene Fehlerseiten'; $wb['error_ssl_state_empty'] = 'SSL Status ist leer.'; $wb['error_ssl_locality_empty'] = 'Ort (SSL) ist leer.'; @@ -55,18 +55,18 @@ $wb['client_group_id_txt'] = 'Kunde'; $wb['stats_password_txt'] = 'Webstatistik Passwort'; $wb['ssl_domain_txt'] = 'SSL Domain'; $wb['allow_override_txt'] = 'Allow Override'; -$wb['limit_web_quota_free_txt'] = 'Max. möglicher Festplatten Quota'; -$wb['ssl_state_error_regex'] = 'Ungültige SSL State. Gültige Zeichen sind: a-z, 0-9 und .,-_'; -$wb['ssl_locality_error_regex'] = 'Ungültige SSL Locality. Gülige Zeichen sind: a-z, 0-9 und .,-_'; -$wb['ssl_organisation_error_regex'] = 'Ungültige SSL Organisation. Gültige Zeichen sind: a-z, 0-9 und .,-_'; -$wb['ssl_organistaion_unit_error_regex'] = 'Ungültige SSL Organisation Unit. Gültige Zeichen sind: a-z, 0-9 und .,-_'; +$wb['limit_web_quota_free_txt'] = 'Max. mögliche Festplattenspeicher Beschränkung'; +$wb['ssl_state_error_regex'] = 'Ungültiges SSL Bundesland. Gültige Zeichen sind: a-z, 0-9 und .,-_'; +$wb['ssl_locality_error_regex'] = 'Ungültiger SSL Ort. Gülige Zeichen sind: a-z, 0-9 und .,-_'; +$wb['ssl_organisation_error_regex'] = 'Ungültige SSL Firma. Gültige Zeichen sind: a-z, 0-9 und .,-_'; +$wb['ssl_organistaion_unit_error_regex'] = 'Ungültige SSL Abteilung. Gültige Zeichen sind: a-z, 0-9 und .,-_'; $wb['ssl_country_error_regex'] = 'Ungültiges SSL Land. Gültige Zeichen sind: A-Z'; -$wb['limit_traffic_quota_free_txt'] = 'Max. möglicher Traffic Quota'; +$wb['limit_traffic_quota_free_txt'] = 'Max. mögliche Datentransfer Beschränkung'; $wb['redirect_error_regex'] = 'Ungültiger redirect Pfad. Gültige Angaben sind beispielsweise: /test/ oder http://www.domain.tld/test/'; $wb['php_open_basedir_txt'] = 'PHP open_basedir'; $wb['backup_interval_txt'] = 'Backup Intervall'; $wb['backup_copies_txt'] = 'Anzahl an Backups'; -$wb['traffic_quota_exceeded_txt'] = 'Übertragungs Volumen verbraucht.'; +$wb['traffic_quota_exceeded_txt'] = 'Max. Datentransfer verbraucht.'; $wb['ruby_txt'] = 'Ruby'; $wb['stats_user_txt'] = 'Webstatistik Benutzername'; $wb['stats_type_txt'] = 'Webstatistik Programm'; @@ -74,13 +74,13 @@ $wb['custom_php_ini_txt'] = 'Individuelle php.ini Einstellungen'; $wb['error_ssl_cert_empty'] = 'SSL Zertifikat Feld ist leer.'; $wb['none_txt'] = 'Keine'; $wb['disabled_txt'] = 'Deaktiviert'; -$wb['no_redirect_txt'] = 'Kein Redirect'; -$wb['no_flag_txt'] = 'Kein Flag'; +$wb['no_redirect_txt'] = 'Keine Weiterleitung'; +$wb['no_flag_txt'] = 'Keine Option'; $wb['save_certificate_txt'] = 'Zertifikat speichern'; $wb['create_certificate_txt'] = 'Zertifikat erstellen'; $wb['delete_certificate_txt'] = 'Zertifikat löschen'; $wb['nginx_directives_txt'] = 'nginx Direktiven'; -$wb['seo_redirect_txt'] = 'SEO Redirect'; +$wb['seo_redirect_txt'] = 'SEO Weiterleitung'; $wb['non_www_to_www_txt'] = 'Nicht-www -> www'; $wb['www_to_non_www_txt'] = 'www -> Nicht-www'; $wb['php_fpm_use_socket_txt'] = 'Benutze Socket für PHP-FPM'; @@ -97,8 +97,8 @@ $wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children muß eine positive $wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers muß eine positive ganze Zahl sein.'; $wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers muß eine positive ganze Zahl sein.'; $wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers muß eine positive ganze Zahl sein.'; -$wb['hd_quota_error_regex'] = 'Harddisk Quota ist ungültig.'; -$wb['traffic_quota_error_regex'] = 'Traffic Quota ist ungültig.'; +$wb['hd_quota_error_regex'] = 'Festplattenspeicher Beschränkung ist ungültig.'; +$wb['traffic_quota_error_regex'] = 'Datentransfer Beschränkung ist ungültig.'; $wb['fastcgi_php_version_txt'] = 'PHP Version'; $wb['pm_txt'] = 'PHP-FPM Prozess Manager'; $wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout'; @@ -115,4 +115,9 @@ $wb['available_apache_directive_snippets_txt'] = 'Verfügbare Apache Direktiven $wb['available_nginx_directive_snippets_txt'] = 'Verfügbare nginx Direktiven Schnipsel:'; $wb['proxy_directives_txt'] = 'Proxy Direktiven'; $wb['available_proxy_directive_snippets_txt'] = 'Verfügbare Proxy Direktiven Schnipsel:'; +$wb['rewrite_rules_txt'] = 'Rewrite Rules'; +$wb['invalid_rewrite_rules_txt'] = 'Unzulässige Rewrite Rules'; +$wb['allowed_rewrite_rule_directives_txt'] = 'Erlaubte Direktiven:'; +$wb['configuration_error_txt'] = 'KONFIGURATIONSFEHLER'; ?> + diff --git a/interface/web/sites/lib/lang/de_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/de_web_vhost_subdomain_list.lng index 042b9f02c5..91970764d5 100644 --- a/interface/web/sites/lib/lang/de_web_vhost_subdomain_list.lng +++ b/interface/web/sites/lib/lang/de_web_vhost_subdomain_list.lng @@ -6,3 +6,4 @@ $wb['parent_domain_id_txt'] = 'Webseite'; $wb['domain_txt'] = 'Subdomain'; $wb['add_new_record_txt'] = 'Neue Subdomain hinzufügen'; ?> + diff --git a/interface/web/sites/lib/lang/de_webdav_user.lng b/interface/web/sites/lib/lang/de_webdav_user.lng index eeefda85ee..25c7b0995a 100644 --- a/interface/web/sites/lib/lang/de_webdav_user.lng +++ b/interface/web/sites/lib/lang/de_webdav_user.lng @@ -6,7 +6,7 @@ $wb['username_txt'] = 'Benutzername'; $wb['password_txt'] = 'Passwort'; $wb['password_strength_txt'] = 'Passwortkomplexität'; $wb['active_txt'] = 'Aktiv'; -$wb['limit_webdav_user_txt'] = 'Die maximale Anzahl an WebDAV Benutzer für Ihr Konto wurde erreicht.'; +$wb['limit_webdav_user_txt'] = 'Die max. Anzahl an WebDAV Benutzer für Ihr Konto wurde erreicht.'; $wb['username_error_empty'] = 'Benutzername ist leer.'; $wb['username_error_unique'] = 'Der Benutzername muss einzigartig sein.'; $wb['username_error_regex'] = 'Der Benutzername enthält nicht erlaubte Zeichen.'; @@ -19,3 +19,4 @@ $wb['repeat_password_txt'] = 'Passwort wiederholen'; $wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; $wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; ?> + diff --git a/interface/web/sites/lib/lang/de_webdav_user_list.lng b/interface/web/sites/lib/lang/de_webdav_user_list.lng index 927bfbb2de..84b9fadcf8 100644 --- a/interface/web/sites/lib/lang/de_webdav_user_list.lng +++ b/interface/web/sites/lib/lang/de_webdav_user_list.lng @@ -6,3 +6,4 @@ $wb['parent_domain_id_txt'] = 'Webseite'; $wb['username_txt'] = 'Benutzername'; $wb['add_new_record_txt'] = 'Neuen WebDAV Benutzer hinzufügen'; ?> + diff --git a/interface/web/sites/lib/lang/el.lng b/interface/web/sites/lib/lang/el.lng index 2d726140fd..f7d1e4f872 100644 --- a/interface/web/sites/lib/lang/el.lng +++ b/interface/web/sites/lib/lang/el.lng @@ -4,17 +4,17 @@ $wb['Website'] = 'Website'; $wb['Subdomain'] = 'Subdomain για το website'; $wb['Aliasdomain'] = 'Ψευδώνυμο domain για το website'; $wb['Database'] = 'Βάση Δεδομένων'; -$wb['Web Access'] = 'Web Access'; +$wb['Web Access'] = 'Πρόσβαση Web'; $wb['FTP-User'] = 'Χρήστης FTP'; $wb['Webdav-User'] = 'Χρήστης Webdav'; -$wb['Folder'] = 'Protected Folders'; -$wb['Folder users'] = 'Protected Folder Users'; -$wb['Command Line'] = 'Command Line'; -$wb['Shell-User'] = 'Χρήστης Shell'; +$wb['Folder'] = 'Προστατευμένοι Φάκελοι'; +$wb['Folder users'] = 'Χρήστες Προστατευμένων Φακέλων'; +$wb['Command Line'] = 'Γραμμή Εντολών'; +$wb['Shell-User'] = 'Χρήστης Κελύφους'; $wb['Cron Jobs'] = 'Εργασίες Cron'; $wb['Statistics'] = 'Στατιστικά'; $wb['Web traffic'] = 'Κίνηση Web'; -$wb['Website quota (Harddisk)'] = 'Όριο δίσκου Website (Harddisk)'; +$wb['Website quota (Harddisk)'] = 'Όριο δίσκου Website (Δίσκος)'; $wb['Cron'] = 'Cron'; $wb['Stats'] = 'Στατιστικά'; $wb['Shell'] = 'Shell'; @@ -25,11 +25,11 @@ $wb['Domain'] = 'Domain'; $wb['Redirect'] = 'Ανακατεύθυνση'; $wb['SSL'] = 'SSL'; $wb['Sites'] = 'Sites'; -$wb['Database User'] = 'Database Users'; -$wb['APS Installer'] = 'APS Installer'; -$wb['Available packages'] = 'Available packages'; -$wb['Installed packages'] = 'Installed packages'; -$wb['Update Packagelist'] = 'Update Packagelist'; +$wb['Database User'] = 'Χρήστες Βάσης Δεδομένων'; +$wb['APS Installer'] = 'Εγκαταστάτης APS'; +$wb['Available packages'] = 'Διαθέσιμα Πακέτα'; +$wb['Installed packages'] = 'Εγκατεστημένα Πακέτα'; +$wb['Update Packagelist'] = 'Ενημέρωση Λίστας Πακέτων'; $wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)'; -$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; +$wb['error_proxy_requires_url'] = 'Ο τύπος ανακατεύθυνσης \\"proxy\\" απαιτεί ένα URL ως το μονοπάτι ανακατεύθυνσης.'; ?> diff --git a/interface/web/sites/lib/lang/el_aps.lng b/interface/web/sites/lib/lang/el_aps.lng index 29fb7b6a40..ee6105eff3 100644 --- a/interface/web/sites/lib/lang/el_aps.lng +++ b/interface/web/sites/lib/lang/el_aps.lng @@ -1,58 +1,58 @@ diff --git a/interface/web/sites/lib/lang/el_aps_instances_list.lng b/interface/web/sites/lib/lang/el_aps_instances_list.lng index 052d834a71..55e0aba1fa 100644 --- a/interface/web/sites/lib/lang/el_aps_instances_list.lng +++ b/interface/web/sites/lib/lang/el_aps_instances_list.lng @@ -1,13 +1,13 @@ diff --git a/interface/web/sites/lib/lang/el_aps_packages_list.lng b/interface/web/sites/lib/lang/el_aps_packages_list.lng index 68c378085f..4226d907bd 100644 --- a/interface/web/sites/lib/lang/el_aps_packages_list.lng +++ b/interface/web/sites/lib/lang/el_aps_packages_list.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/sites/lib/lang/el_aps_update_packagelist.lng b/interface/web/sites/lib/lang/el_aps_update_packagelist.lng index ce9fcf68fb..ffe73d0a96 100644 --- a/interface/web/sites/lib/lang/el_aps_update_packagelist.lng +++ b/interface/web/sites/lib/lang/el_aps_update_packagelist.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/sites/lib/lang/el_cron.lng b/interface/web/sites/lib/lang/el_cron.lng index 3e8f7eb704..291ab1f4de 100644 --- a/interface/web/sites/lib/lang/el_cron.lng +++ b/interface/web/sites/lib/lang/el_cron.lng @@ -17,5 +17,5 @@ $wb['run_mday_error_format'] = 'Η μορφοποίηση για τις μέρε $wb['run_month_error_format'] = 'Η μορφοποίηση για τους μήνες δεν είναι έγκυρη'; $wb['run_wday_error_format'] = 'Η μορφοποίηση για τις ημέρες της εβδομάδας δεν είναι έγκυρη'; $wb['command_error_format'] = 'Η μορφοποίηση για την εντολή δεν είναι έγκυρη. Παρακαλούμε σημειώστε ότι στην περίπτωση του url μόνο τα http/https επιτρέπονται.'; -$wb['unknown_fieldtype_error'] = 'Χρησιμοποιήθηκε άγνωστός τύπος πεδίου.'; +$wb['unknown_fieldtype_error'] = 'Χρησιμοποιήθηκε άγνωστος τύπος πεδίου.'; ?> diff --git a/interface/web/sites/lib/lang/el_database.lng b/interface/web/sites/lib/lang/el_database.lng index 14f05ea353..4776b59217 100644 --- a/interface/web/sites/lib/lang/el_database.lng +++ b/interface/web/sites/lib/lang/el_database.lng @@ -4,7 +4,7 @@ $wb['type_txt'] = 'Τύπος'; $wb['database_name_txt'] = 'Όνομα Βάσης Δεδομένων'; $wb['database_user_txt'] = 'Όνομα Χρήστη Βάσης Δεδομένων'; $wb['database_password_txt'] = 'Συνθηματικό Βάσης Δεδομένων'; -$wb['password_strength_txt'] = 'Δύναμη συνθηματικού'; +$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού'; $wb['database_charset_txt'] = 'Κωδικοποίηση Χαρακτήρων Βάσης Δεδομένων'; $wb['remote_access_txt'] = 'Απομακρυσμένη πρόσβαση'; $wb['remote_ips_txt'] = 'Διευθύνσεις IP απομ. πρόσβασης (χωρισμένες με , και αφήστε κενό για οποιαδήποτε)'; @@ -14,7 +14,7 @@ $wb['active_txt'] = 'Ενεργή'; $wb['database_name_error_empty'] = 'Το όνομα της βάσης δεδομένων δεν έχει οριστεί.'; $wb['database_name_error_unique'] = 'Υπάρχει ήδη μία βάση δεδομένων με αυτό το όνομα στον server. Για να φτιάξετε ένα μοναδικό όνομα, π.χ. βάλτε μπροστά από το όνομα της, το όνομα του domain.'; $wb['database_name_error_regex'] = 'Μή έγκυρο όνομα βάσης δεδομένων. Το όνομα της βάσης μπορεί να περιέχει αυτούς τους χαρακτήρες: a-z, A-Z, 0-9 και την κάτω παύλα. Μέγεθος: 2 - 64 χαρακτήρες.'; -$wb['database_user_error_empty'] = 'Το όνομα της βάσης δεδομένων δεν έχει οριστεί.'; +$wb['database_user_error_empty'] = 'Το όνομα χρήστη δεν έχει οριστεί.'; $wb['database_user_error_unique'] = 'Υπάρχει ήδη ένας χρήστης με αυτό το όνομα στον server. Για να φτιάξετε ένα μοναδικό όνομα, π.χ. βάλτε μπροστά από το όνομα, το όνομα του domain.'; $wb['database_user_error_regex'] = 'Μη έγκυρο όνομα χρήστη. Το όνομα χρήστη μπορεί να περιέχει αυτούς τους χαρακτήρες: a-z, A-Z, 0-9 και την κάτω παύλα. Μέγεθος: 2 - 64 χαρακτήρες.'; $wb['limit_database_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των βάσεων δεδομένων.'; @@ -23,24 +23,24 @@ $wb['database_charset_change_txt'] = 'Η κωδικοποίηση χαρακτή $wb['database_name_error_len'] = 'Το όνομα της βάσης δεδομένων - {db} - είναι πολύ μεγάλο. Το συνολικό μέγιστο μέγεθος δεν μπορεί να ξεπερνά τους 64 χαρακτήρες.'; $wb['database_user_error_len'] = 'Το όνομα χρήστη της βάσης δεδομένων - {user}- είναι πολύ μεγάλο. Το συνολικό μέγιστο μέγεθος δεν μπορεί να ξεπερνά τους 16 χαρακτήρες.'; $wb['parent_domain_id_txt'] = 'Site'; -$wb['database_site_error_empty'] = 'Select the site to which the database belongs.'; -$wb['select_site_txt'] = '- Select Site -'; -$wb['btn_save_txt'] = 'Save'; -$wb['btn_cancel_txt'] = 'Cancel'; -$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['globalsearch_resultslimit_of_txt'] = 'of'; -$wb['globalsearch_resultslimit_results_txt'] = 'results'; -$wb['globalsearch_noresults_text_txt'] = 'No results.'; -$wb['globalsearch_noresults_limit_txt'] = '0 results'; -$wb['globalsearch_searchfield_watermark_txt'] = 'Search'; -$wb['globalsearch_suggestions_text_txt'] = 'Suggestions'; -$wb['database_ro_user_txt'] = 'Read-only database user'; -$wb['optional_txt'] = 'optional'; -$wb['select_dbuser_txt'] = 'Select database user'; -$wb['no_dbuser_txt'] = 'None'; -$wb['database_client_differs_txt'] = 'The client of the parent web and the database do not match.'; -$wb['database_user_missing_txt'] = 'Please select a database user for this database.'; +$wb['database_site_error_empty'] = 'Επιλέξτε το site στο οποίο ανήκει η βάση δεδομένων.'; +$wb['select_site_txt'] = '- Επιλογή Site -'; +$wb['btn_save_txt'] = 'Αποθήκευση'; +$wb['btn_cancel_txt'] = 'Άκυρο'; +$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού'; +$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού'; +$wb['password_mismatch_txt'] = 'Τα Συνθηματικά δεν ταιριάζουν.'; +$wb['password_match_txt'] = 'Τα Συνθηματικά ταιριάζουν.'; +$wb['globalsearch_resultslimit_of_txt'] = 'από'; +$wb['globalsearch_resultslimit_results_txt'] = 'αποτελέσματα'; +$wb['globalsearch_noresults_text_txt'] = 'Δεν υπάρχουν αποτελέσματα.'; +$wb['globalsearch_noresults_limit_txt'] = '0 αποτελέσματα'; +$wb['globalsearch_searchfield_watermark_txt'] = 'Αναζήτηση'; +$wb['globalsearch_suggestions_text_txt'] = 'Προτάσεις'; +$wb['database_ro_user_txt'] = 'Χρήστης Βάσης δεδομένων μόνο για άναγνωση'; +$wb['optional_txt'] = 'προαιρετικό'; +$wb['select_dbuser_txt'] = 'Επιλογή χρήστη Βάσης Δεδομένων'; +$wb['no_dbuser_txt'] = 'Κανένας'; +$wb['database_client_differs_txt'] = 'Ο πελάτης του γονικού website και η Βάση Δεδομένων δεν ταιριάζουν.'; +$wb['database_user_missing_txt'] = 'Παρακαλούμε επιλέξτε ένα χρήστη για αυτή την Βάση Δεδομένων.'; ?> diff --git a/interface/web/sites/lib/lang/el_database_admin_list.lng b/interface/web/sites/lib/lang/el_database_admin_list.lng index f414200740..c5d1992f76 100644 --- a/interface/web/sites/lib/lang/el_database_admin_list.lng +++ b/interface/web/sites/lib/lang/el_database_admin_list.lng @@ -7,4 +7,5 @@ $wb['database_user_txt'] = 'Όνομα χρήστη'; $wb['database_name_txt'] = 'Όνομα βάσης'; $wb['add_new_record_txt'] = 'Νέα βάση δεδομένων'; $wb['sys_groupid_txt'] = 'Πελάτης'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/el_database_list.lng b/interface/web/sites/lib/lang/el_database_list.lng index ce54134293..246827506a 100644 --- a/interface/web/sites/lib/lang/el_database_list.lng +++ b/interface/web/sites/lib/lang/el_database_list.lng @@ -6,4 +6,5 @@ $wb['server_id_txt'] = 'Server'; $wb['database_user_txt'] = 'Όνομα Χρήστη Βάσης Δεδομένων'; $wb['database_name_txt'] = 'Όνομα Βάσης Δεδομένων'; $wb['add_new_record_txt'] = 'Νέα Βάσης Δεδομένων'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/el_database_user.lng b/interface/web/sites/lib/lang/el_database_user.lng index 66a0718349..e6d8e1397b 100644 --- a/interface/web/sites/lib/lang/el_database_user.lng +++ b/interface/web/sites/lib/lang/el_database_user.lng @@ -1,23 +1,23 @@ diff --git a/interface/web/sites/lib/lang/el_database_user_admin_list.lng b/interface/web/sites/lib/lang/el_database_user_admin_list.lng index d7f88c4c36..02a4c41211 100644 --- a/interface/web/sites/lib/lang/el_database_user_admin_list.lng +++ b/interface/web/sites/lib/lang/el_database_user_admin_list.lng @@ -1,6 +1,6 @@ diff --git a/interface/web/sites/lib/lang/el_database_user_list.lng b/interface/web/sites/lib/lang/el_database_user_list.lng index 8c226496a6..b1bb3766b9 100644 --- a/interface/web/sites/lib/lang/el_database_user_list.lng +++ b/interface/web/sites/lib/lang/el_database_user_list.lng @@ -1,5 +1,5 @@ diff --git a/interface/web/sites/lib/lang/el_ftp_user.lng b/interface/web/sites/lib/lang/el_ftp_user.lng index 2f89d27bdf..d65aef5ebe 100644 --- a/interface/web/sites/lib/lang/el_ftp_user.lng +++ b/interface/web/sites/lib/lang/el_ftp_user.lng @@ -12,7 +12,7 @@ $wb['server_id_txt'] = 'Server'; $wb['parent_domain_id_txt'] = 'Website'; $wb['username_txt'] = 'Όνομα Χρήστη'; $wb['password_txt'] = 'Συνθηματικό'; -$wb['password_strength_txt'] = 'Δύναμη Συνθηματικου'; +$wb['password_strength_txt'] = 'Ισχύς Συνθηματικου'; $wb['quota_size_txt'] = 'Όριο χρήσης αποθηκευτικού χώρου'; $wb['active_txt'] = 'Ενεργός'; $wb['limit_ftp_user_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των χρηστών FTP για τον λογαριασμό σας.'; @@ -25,10 +25,10 @@ $wb['directory_error_empty'] = 'Ο Φάκελος δεν έχει οριστεί $wb['directory_error_notinweb'] = 'Ο φάκελος δεν βρίσκεται μέσα στον ριζικό φάκελο web.'; $wb['parent_domain_id_error_empty'] = 'Δεν επιλέχθηκε website.'; $wb['quota_size_error_regex'] = 'Όριο: εισάγετε -1 για απεριόριστα ή έναν αριθμό > 0'; -$wb['dir_dot_error'] = 'No .. in path allowed.'; -$wb['dir_slashdot_error'] = 'No ./ in path allowed.'; -$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['dir_dot_error'] = 'Δεν επιτρέπονται .. στη διαδρομη.'; +$wb['dir_slashdot_error'] = 'Δεν επιτρέπεται ./ στη διαδρομη.'; +$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού'; +$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού'; +$wb['password_mismatch_txt'] = 'Τα Συνθηματικά δεν ταιριάζουν.'; +$wb['password_match_txt'] = 'Τα Συνθηματικά ταιριάζουν.'; ?> diff --git a/interface/web/sites/lib/lang/el_shell_user.lng b/interface/web/sites/lib/lang/el_shell_user.lng index 3c3ea316ce..6513f99121 100644 --- a/interface/web/sites/lib/lang/el_shell_user.lng +++ b/interface/web/sites/lib/lang/el_shell_user.lng @@ -1,14 +1,14 @@ diff --git a/interface/web/sites/lib/lang/el_shell_user_list.lng b/interface/web/sites/lib/lang/el_shell_user_list.lng index 5468905bbf..d0b7a169b4 100644 --- a/interface/web/sites/lib/lang/el_shell_user_list.lng +++ b/interface/web/sites/lib/lang/el_shell_user_list.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/sites/lib/lang/el_user_quota_stats_list.lng b/interface/web/sites/lib/lang/el_user_quota_stats_list.lng index a4b080eecd..5b83022fed 100644 --- a/interface/web/sites/lib/lang/el_user_quota_stats_list.lng +++ b/interface/web/sites/lib/lang/el_user_quota_stats_list.lng @@ -5,5 +5,5 @@ $wb['system_user_txt'] = 'Χρήστης Linux'; $wb['used_txt'] = 'Χρησιμοποιούμενος χώρος'; $wb['hard_txt'] = 'Απόλυτο όριο'; $wb['soft_txt'] = 'Διαλακτικό όριο'; -$wb['files_txt'] = 'Single files'; +$wb['files_txt'] = 'Μεμονωμένα Αρχεία'; ?> diff --git a/interface/web/sites/lib/lang/el_web_aliasdomain.lng b/interface/web/sites/lib/lang/el_web_aliasdomain.lng index 4149c71149..ba8c6900e2 100644 --- a/interface/web/sites/lib/lang/el_web_aliasdomain.lng +++ b/interface/web/sites/lib/lang/el_web_aliasdomain.lng @@ -1,12 +1,12 @@ = 0.'; $wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; -$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; -$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; -$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού'; +$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού'; +$wb['password_mismatch_txt'] = 'Τα Συνθηματικά δεν ταιριάζουν.'; +$wb['password_match_txt'] = 'Τα Συνθηματικά ταιριάζουν.'; +$wb['available_php_directive_snippets_txt'] = 'Διαθέσιμα PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Διαθέσιμα Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Διαθέσιμα nginx Directive Snippets:'; $wb['proxy_directives_txt'] = 'Proxy Directives'; -$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; -$wb['Domain'] = 'Aliasdomain'; +$wb['available_proxy_directive_snippets_txt'] = 'Διαθέσιμα Proxy Directive Snippets:'; +$wb['Domain'] = 'Ψευδώνυμο domain'; ?> diff --git a/interface/web/sites/lib/lang/el_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/el_web_aliasdomain_list.lng index b12aba2a56..6ea60e8c20 100644 --- a/interface/web/sites/lib/lang/el_web_aliasdomain_list.lng +++ b/interface/web/sites/lib/lang/el_web_aliasdomain_list.lng @@ -8,7 +8,7 @@ $wb['add_new_record_txt'] = 'Νέο ψευδωνύμο domain'; $wb['domain_error_empty'] = 'Το Domain δεν έχει οριστεί.'; $wb['domain_error_unique'] = 'Το Domain πρέπει να είναι μοναδικό.'; $wb['domain_error_regex'] = 'Το όνομα Domain δεν είναι έγκυρο.'; -$wb['no_redirect_txt'] = 'No redirect'; -$wb['no_flag_txt'] = 'No flag'; -$wb['none_txt'] = 'None'; +$wb['no_redirect_txt'] = 'Χωρίς Ανακατεύθυνση'; +$wb['no_flag_txt'] = 'Χωρίς σημαία'; +$wb['none_txt'] = 'Κανένα'; ?> diff --git a/interface/web/sites/lib/lang/el_web_backup_list.lng b/interface/web/sites/lib/lang/el_web_backup_list.lng index 9a10ca6d07..2fa2a77cb1 100644 --- a/interface/web/sites/lib/lang/el_web_backup_list.lng +++ b/interface/web/sites/lib/lang/el_web_backup_list.lng @@ -1,15 +1,15 @@ diff --git a/interface/web/sites/lib/lang/el_web_domain.lng b/interface/web/sites/lib/lang/el_web_domain.lng index 6cdc3d7c56..e515e59a2e 100644 --- a/interface/web/sites/lib/lang/el_web_domain.lng +++ b/interface/web/sites/lib/lang/el_web_domain.lng @@ -1,5 +1,5 @@ = 0.'; $wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; -$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['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.'; -$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.'; -$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; -$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; -$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού'; +$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού'; +$wb['password_mismatch_txt'] = 'Τα Συνθηματικά δεν ταιριάζουν.'; +$wb['password_match_txt'] = 'Τα Συνθηματικά ταιριάζουν.'; +$wb['web_folder_error_regex'] = 'Εισάγατε μη έγκυρο φάκελο. Μην εισάγετε την κάθετο'; +$wb['domain_error_autosub'] = 'Υπάρχει ήδη ένα subdomain με αυτές τις ρυθμίσεις.'; +$wb['available_php_directive_snippets_txt'] = 'Διαθέσιμα PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Διαθέσιμα Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Διαθέσιμα nginx Directive Snippets:'; $wb['proxy_directives_txt'] = 'Proxy Directives'; -$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; -$wb['no_server_error'] = 'No server selected.'; +$wb['available_proxy_directive_snippets_txt'] = 'Διαθέσιμα Proxy Directive Snippets:'; +$wb['no_server_error'] = 'Δεν επιλέχθηκε server.'; $wb['no_backup_txt'] = 'No backup'; $wb['daily_backup_txt'] = 'Daily'; $wb['weekly_backup_txt'] = 'Weekly'; @@ -119,4 +119,5 @@ $wb['monthly_backup_txt'] = 'Monthly'; $wb['rewrite_rules_txt'] = 'Rewrite Rules'; $wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules'; $wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:'; +$wb['configuration_error_txt'] = 'CONFIGURATION ERROR'; ?> diff --git a/interface/web/sites/lib/lang/el_web_folder_user.lng b/interface/web/sites/lib/lang/el_web_folder_user.lng index 6835eaaaf1..ae898255b9 100644 --- a/interface/web/sites/lib/lang/el_web_folder_user.lng +++ b/interface/web/sites/lib/lang/el_web_folder_user.lng @@ -4,10 +4,10 @@ $wb['username_txt'] = 'Όνομα Χρήστη'; $wb['password_txt'] = 'Συνθηματικό'; $wb['active_txt'] = 'Ενεργός'; $wb['folder_error_empty'] = 'Δεν επιλέχθηκε φάκελος web.'; -$wb['password_strength_txt'] = 'Password strength'; -$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['password_strength_txt'] = 'Ισχύς Συνθηματικού'; +$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού'; +$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού'; +$wb['password_mismatch_txt'] = 'Τα Συνθηματικά δεν ταιριάζουν.'; +$wb['password_match_txt'] = 'Τα Συνθηματικά ταιριάζουν.'; $wb['no_folder_perm'] = 'You have no permission for this folder.'; ?> diff --git a/interface/web/sites/lib/lang/el_web_sites_stats_list.lng b/interface/web/sites/lib/lang/el_web_sites_stats_list.lng index 9916646017..dc58324fda 100644 --- a/interface/web/sites/lib/lang/el_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/el_web_sites_stats_list.lng @@ -5,5 +5,5 @@ $wb['this_month_txt'] = 'Αυτό το μήνα'; $wb['last_month_txt'] = 'Το τελευταίο μήνα'; $wb['this_year_txt'] = 'Αυτό το χρόνο'; $wb['last_year_txt'] = 'Τον τελευταίο χρόνο'; -$wb['sum_txt'] = 'Sum'; +$wb['sum_txt'] = 'Σύνολο'; ?> diff --git a/interface/web/sites/lib/lang/el_web_subdomain.lng b/interface/web/sites/lib/lang/el_web_subdomain.lng index 8f5148b99d..6183fbabb8 100644 --- a/interface/web/sites/lib/lang/el_web_subdomain.lng +++ b/interface/web/sites/lib/lang/el_web_subdomain.lng @@ -21,7 +21,7 @@ $wb['system_group_txt'] = 'Ομάδα Linux'; $wb['ip_address_txt'] = 'Διεύθυνση IP'; $wb['vhost_type_txt'] = 'Τύπος VHost'; $wb['hd_quota_txt'] = 'Όριο αποθηκευτικού χώρου'; -$wb['traffic_quota_txt'] = 'Όριο κίνησης δεδομένων'; +$wb['traffic_quota_txt'] = 'Όριο μεταφοράς δεδομένων'; $wb['cgi_txt'] = 'CGI'; $wb['ssi_txt'] = 'SSI'; $wb['ssl_txt'] = 'SSL'; @@ -39,8 +39,8 @@ $wb['host_txt'] = 'Host'; $wb['redirect_error_regex'] = 'Η διαδρομή ανακατεύθυνσης δεν είναι έγκυρη. Έγκυρες διαδρομές είναι για παράδειγμα οι: /test/ ή http://www.domain.tld/test/'; $wb['no_redirect_txt'] = 'Χωρίς Ανακατεύθυνση'; $wb['no_flag_txt'] = 'Χωρίς Σημαία'; -$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.'; +$wb['domain_error_wildcard'] = 'Wildcard subdomains δεν επιτρέπονται.'; $wb['proxy_directives_txt'] = 'Proxy Directives'; -$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; -$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.'; +$wb['available_proxy_directive_snippets_txt'] = 'Διαθέσιμα Proxy Directive Snippets:'; +$wb['error_proxy_requires_url'] = 'Ο τύπος ανακατεύθυνσης \\"proxy\\" απαιτεί ένα URL ως μονοπάτι ανακατεύθυνσης.'; ?> diff --git a/interface/web/sites/lib/lang/el_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/el_web_vhost_subdomain.lng index b87c788126..7381df6bf7 100644 --- a/interface/web/sites/lib/lang/el_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/el_web_vhost_subdomain.lng @@ -1,15 +1,15 @@ = 0.'; $wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!'; -$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:'; -$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:'; -$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; +$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού'; +$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού'; +$wb['password_mismatch_txt'] = 'Τα Συνθηματικά δεν ταιριάζουν.'; +$wb['password_match_txt'] = 'Τα Συνθηματικά ταιριάζουν.'; +$wb['available_php_directive_snippets_txt'] = 'Διαθέσιμα PHP Directive Snippets:'; +$wb['available_apache_directive_snippets_txt'] = 'Διαθέσιμα Apache Directive Snippets:'; +$wb['available_nginx_directive_snippets_txt'] = 'Διαθέσιμα nginx Directive Snippets:'; $wb['proxy_directives_txt'] = 'Proxy Directives'; -$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +$wb['available_proxy_directive_snippets_txt'] = 'Διαθέσιμα Proxy Directive Snippets:'; ?> diff --git a/interface/web/sites/lib/lang/el_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/el_web_vhost_subdomain_list.lng index 1c16bcda28..a4426cf3ce 100644 --- a/interface/web/sites/lib/lang/el_web_vhost_subdomain_list.lng +++ b/interface/web/sites/lib/lang/el_web_vhost_subdomain_list.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/sites/lib/lang/el_webdav_user.lng b/interface/web/sites/lib/lang/el_webdav_user.lng index b33b553f8f..bf7e10f2eb 100644 --- a/interface/web/sites/lib/lang/el_webdav_user.lng +++ b/interface/web/sites/lib/lang/el_webdav_user.lng @@ -4,7 +4,7 @@ $wb['server_id_txt'] = 'Server'; $wb['parent_domain_id_txt'] = 'Website'; $wb['username_txt'] = 'Όνομα Χρήστη'; $wb['password_txt'] = 'Συνθηματικό'; -$wb['password_strength_txt'] = 'Δύναμη Συνθηματικού'; +$wb['password_strength_txt'] = 'Ισχύς Συνθηματικού'; $wb['active_txt'] = 'Ενεργός'; $wb['limit_webdav_user_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των webdav users για τον λογαριασμό σας.'; $wb['username_error_empty'] = 'Όνομα Χρήστη δεν έχει οριστεί.'; @@ -12,10 +12,10 @@ $wb['username_error_unique'] = 'Το Όνομα Χρήστη πρέπει να $wb['username_error_regex'] = 'Το Όνομα Χρήστη περιέχει μη επιτρεπόμενους χαρακτήρες.'; $wb['directory_error_empty'] = 'Ο φάκελος δεν έχει οριστεί.'; $wb['parent_domain_id_error_empty'] = 'Δεν επιλέχθηκε website.'; -$wb['dir_dot_error'] = 'No .. in path allowed.'; -$wb['dir_slashdot_error'] = 'No ./ in path allowed.'; -$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['dir_dot_error'] = 'Δεν επιτρέπονται οι .. στην διαδρομή.'; +$wb['dir_slashdot_error'] = 'Δεν επιτρέπεται το ./ στην διαδρομή.'; +$wb['generate_password_txt'] = 'Δημιουργία Συνθηματικού'; +$wb['repeat_password_txt'] = 'Επανάληψη Συνθηματικού'; +$wb['password_mismatch_txt'] = 'Τα συνθηματικά δεν ταιριάζουν.'; +$wb['password_match_txt'] = 'Τα συνθηματικά ταιριάζουν.'; ?> diff --git a/interface/web/sites/lib/lang/en_aps.lng b/interface/web/sites/lib/lang/en_aps.lng index bd33c1884a..e240d57873 100644 --- a/interface/web/sites/lib/lang/en_aps.lng +++ b/interface/web/sites/lib/lang/en_aps.lng @@ -1,58 +1,58 @@ - \ No newline at end of file diff --git a/interface/web/sites/lib/lang/en_aps_instances_list.lng b/interface/web/sites/lib/lang/en_aps_instances_list.lng index 611c37efa6..3b9c7e943a 100644 --- a/interface/web/sites/lib/lang/en_aps_instances_list.lng +++ b/interface/web/sites/lib/lang/en_aps_instances_list.lng @@ -1,13 +1,13 @@ - \ No newline at end of file diff --git a/interface/web/sites/lib/lang/en_aps_packages_list.lng b/interface/web/sites/lib/lang/en_aps_packages_list.lng index ed6303a64e..12cc30d023 100644 --- a/interface/web/sites/lib/lang/en_aps_packages_list.lng +++ b/interface/web/sites/lib/lang/en_aps_packages_list.lng @@ -1,8 +1,8 @@ - \ No newline at end of file diff --git a/interface/web/sites/lib/lang/en_aps_update_packagelist.lng b/interface/web/sites/lib/lang/en_aps_update_packagelist.lng index 20a7360b64..1a40a3394f 100644 --- a/interface/web/sites/lib/lang/en_aps_update_packagelist.lng +++ b/interface/web/sites/lib/lang/en_aps_update_packagelist.lng @@ -1,7 +1,7 @@ - \ No newline at end of file diff --git a/interface/web/sites/lib/lang/en_database_admin_list.lng b/interface/web/sites/lib/lang/en_database_admin_list.lng index e68d9935f3..fdafd68aee 100644 --- a/interface/web/sites/lib/lang/en_database_admin_list.lng +++ b/interface/web/sites/lib/lang/en_database_admin_list.lng @@ -2,11 +2,10 @@ $wb["list_head_txt"] = 'Database'; $wb["active_txt"] = 'Active'; $wb["remote_access_txt"] = 'Remote Access'; -$wb['type_txt'] = 'Type'; $wb["server_id_txt"] = 'Server'; $wb["database_user_txt"] = 'Database user'; $wb["database_name_txt"] = 'Database name'; $wb["add_new_record_txt"] = 'Add new Database'; $wb["sys_groupid_txt"] = 'Client'; $wb["parent_domain_id_txt"] = 'Website'; -?> +?> \ No newline at end of file diff --git a/interface/web/sites/lib/lang/en_database_list.lng b/interface/web/sites/lib/lang/en_database_list.lng index 13bb304033..e87ad2a9b7 100644 --- a/interface/web/sites/lib/lang/en_database_list.lng +++ b/interface/web/sites/lib/lang/en_database_list.lng @@ -2,7 +2,6 @@ $wb["list_head_txt"] = 'Database'; $wb["active_txt"] = 'Active'; $wb["remote_access_txt"] = 'Remote Access'; -$wb['type_txt'] = 'Type'; $wb["server_id_txt"] = 'Server'; $wb["database_user_txt"] = 'Database user'; $wb["database_name_txt"] = 'Database name'; diff --git a/interface/web/sites/lib/lang/en_web_backup_list.lng b/interface/web/sites/lib/lang/en_web_backup_list.lng index aea21f8046..74bcbd9b7e 100644 --- a/interface/web/sites/lib/lang/en_web_backup_list.lng +++ b/interface/web/sites/lib/lang/en_web_backup_list.lng @@ -1,18 +1,16 @@ +?> \ No newline at end of file diff --git a/interface/web/sites/lib/lang/en_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/en_web_vhost_subdomain.lng index 82a3d25ef7..ae8873813e 100644 --- a/interface/web/sites/lib/lang/en_web_vhost_subdomain.lng +++ b/interface/web/sites/lib/lang/en_web_vhost_subdomain.lng @@ -116,4 +116,8 @@ $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Sni $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:'; $wb['proxy_directives_txt'] = 'Proxy Directives'; $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:'; +$wb['rewrite_rules_txt'] = 'Rewrite Rules'; +$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules'; +$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:'; +$wb['configuration_error_txt'] = "CONFIGURATION ERROR"; ?> \ No newline at end of file diff --git a/interface/web/sites/lib/lang/es_database_admin_list.lng b/interface/web/sites/lib/lang/es_database_admin_list.lng index 511a4572ad..b6f4cb3365 100644 --- a/interface/web/sites/lib/lang/es_database_admin_list.lng +++ b/interface/web/sites/lib/lang/es_database_admin_list.lng @@ -7,4 +7,5 @@ $wb['database_user_txt'] = 'Usuario Base de Datos'; $wb['database_name_txt'] = 'Nombre Base de Datos'; $wb['add_new_record_txt'] = 'Añadir nueva Base de Datos'; $wb['sys_groupid_txt'] = 'Cliente'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/es_database_list.lng b/interface/web/sites/lib/lang/es_database_list.lng index 19bb11034c..157cdd52b7 100644 --- a/interface/web/sites/lib/lang/es_database_list.lng +++ b/interface/web/sites/lib/lang/es_database_list.lng @@ -6,4 +6,5 @@ $wb['server_id_txt'] = 'Servidor'; $wb['database_name_txt'] = 'Nombre de la base de datos'; $wb['add_new_record_txt'] = 'Añadir nueva base de datos'; $wb['database_user_txt'] = 'Usuario de Basos Datos'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/es_web_domain.lng b/interface/web/sites/lib/lang/es_web_domain.lng index b3f466018e..37695c57e9 100644 --- a/interface/web/sites/lib/lang/es_web_domain.lng +++ b/interface/web/sites/lib/lang/es_web_domain.lng @@ -119,4 +119,5 @@ $wb['monthly_backup_txt'] = 'Monthly'; $wb['rewrite_rules_txt'] = 'Rewrite Rules'; $wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules'; $wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:'; +$wb['configuration_error_txt'] = 'CONFIGURATION ERROR'; ?> diff --git a/interface/web/sites/lib/lang/fi_database_admin_list.lng b/interface/web/sites/lib/lang/fi_database_admin_list.lng index 3f05f65e62..27e62b9ac6 100644 --- a/interface/web/sites/lib/lang/fi_database_admin_list.lng +++ b/interface/web/sites/lib/lang/fi_database_admin_list.lng @@ -7,4 +7,5 @@ $wb['database_user_txt'] = 'Database user'; $wb['database_name_txt'] = 'Database name'; $wb['add_new_record_txt'] = 'Add new Database'; $wb['sys_groupid_txt'] = 'Client'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/fi_database_list.lng b/interface/web/sites/lib/lang/fi_database_list.lng index 2ce0989e55..cf5e75ceca 100755 --- a/interface/web/sites/lib/lang/fi_database_list.lng +++ b/interface/web/sites/lib/lang/fi_database_list.lng @@ -6,4 +6,5 @@ $wb['server_id_txt'] = 'Palvelin'; $wb['database_name_txt'] = 'Tietokannnan nimi'; $wb['add_new_record_txt'] = 'Lisää uusi tietokanta'; $wb['database_user_txt'] = 'Tietokannan käyttäjä'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/fi_web_domain.lng b/interface/web/sites/lib/lang/fi_web_domain.lng index 1c4055aa1d..b910463e71 100755 --- a/interface/web/sites/lib/lang/fi_web_domain.lng +++ b/interface/web/sites/lib/lang/fi_web_domain.lng @@ -119,4 +119,5 @@ $wb['monthly_backup_txt'] = 'Monthly'; $wb['rewrite_rules_txt'] = 'Rewrite Rules'; $wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules'; $wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:'; +$wb['configuration_error_txt'] = 'CONFIGURATION ERROR'; ?> diff --git a/interface/web/sites/lib/lang/fr_database_admin_list.lng b/interface/web/sites/lib/lang/fr_database_admin_list.lng index d6be240fd7..651aa20fd1 100644 --- a/interface/web/sites/lib/lang/fr_database_admin_list.lng +++ b/interface/web/sites/lib/lang/fr_database_admin_list.lng @@ -7,4 +7,5 @@ $wb['database_user_txt'] = 'Utilisateur de la base de données'; $wb['database_name_txt'] = 'Nom de la base de données'; $wb['add_new_record_txt'] = 'Ajouter une base de données'; $wb['sys_groupid_txt'] = 'Client'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/fr_database_list.lng b/interface/web/sites/lib/lang/fr_database_list.lng index b530a6e5af..3ff3eac31f 100644 --- a/interface/web/sites/lib/lang/fr_database_list.lng +++ b/interface/web/sites/lib/lang/fr_database_list.lng @@ -6,4 +6,5 @@ $wb['server_id_txt'] = 'Serveur'; $wb['database_name_txt'] = 'Nom de la base'; $wb['add_new_record_txt'] = 'Nouvelle base de données'; $wb['database_user_txt'] = 'Utilisateur BDD'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/fr_web_domain.lng b/interface/web/sites/lib/lang/fr_web_domain.lng index d96e6ad75f..10c52ee893 100644 --- a/interface/web/sites/lib/lang/fr_web_domain.lng +++ b/interface/web/sites/lib/lang/fr_web_domain.lng @@ -119,4 +119,5 @@ $wb['monthly_backup_txt'] = 'Monthly'; $wb['rewrite_rules_txt'] = 'Rewrite Rules'; $wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules'; $wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:'; +$wb['configuration_error_txt'] = 'CONFIGURATION ERROR'; ?> diff --git a/interface/web/sites/lib/lang/hr_database_admin_list.lng b/interface/web/sites/lib/lang/hr_database_admin_list.lng index aee31601c6..19c99568b5 100644 --- a/interface/web/sites/lib/lang/hr_database_admin_list.lng +++ b/interface/web/sites/lib/lang/hr_database_admin_list.lng @@ -7,4 +7,5 @@ $wb['database_user_txt'] = 'Korisnik baze'; $wb['database_name_txt'] = 'Naziv baze'; $wb['add_new_record_txt'] = 'Dodaj bazu'; $wb['sys_groupid_txt'] = 'Klijent'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/hr_database_list.lng b/interface/web/sites/lib/lang/hr_database_list.lng index dcfe205ff2..baec9d4cd0 100644 --- a/interface/web/sites/lib/lang/hr_database_list.lng +++ b/interface/web/sites/lib/lang/hr_database_list.lng @@ -6,4 +6,5 @@ $wb['server_id_txt'] = 'Server'; $wb['database_user_txt'] = 'Korisnik baze'; $wb['database_name_txt'] = 'Naziv baze'; $wb['add_new_record_txt'] = 'Dodaj bazu'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/hr_web_domain.lng b/interface/web/sites/lib/lang/hr_web_domain.lng index 8c47934df7..b14d67a248 100644 --- a/interface/web/sites/lib/lang/hr_web_domain.lng +++ b/interface/web/sites/lib/lang/hr_web_domain.lng @@ -119,4 +119,5 @@ $wb['monthly_backup_txt'] = 'Monthly'; $wb['rewrite_rules_txt'] = 'Rewrite Rules'; $wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules'; $wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:'; +$wb['configuration_error_txt'] = 'CONFIGURATION ERROR'; ?> diff --git a/interface/web/sites/lib/lang/hu_database_admin_list.lng b/interface/web/sites/lib/lang/hu_database_admin_list.lng index 77f27e80dd..d844905c1a 100644 --- a/interface/web/sites/lib/lang/hu_database_admin_list.lng +++ b/interface/web/sites/lib/lang/hu_database_admin_list.lng @@ -7,4 +7,5 @@ $wb['database_user_txt'] = 'Felhasználó'; $wb['database_name_txt'] = 'Adatbázis'; $wb['add_new_record_txt'] = 'Új adatbázis'; $wb['sys_groupid_txt'] = 'Ügyfél'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/hu_database_list.lng b/interface/web/sites/lib/lang/hu_database_list.lng index bafb54867d..db4bd2b8aa 100644 --- a/interface/web/sites/lib/lang/hu_database_list.lng +++ b/interface/web/sites/lib/lang/hu_database_list.lng @@ -6,4 +6,5 @@ $wb['server_id_txt'] = 'Szerver'; $wb['database_name_txt'] = 'Adatbázis neve'; $wb['add_new_record_txt'] = 'Új adatbázis'; $wb['database_user_txt'] = 'Adatbázis Felhasználó'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/hu_web_domain.lng b/interface/web/sites/lib/lang/hu_web_domain.lng index 0060787254..0e53fae4d0 100644 --- a/interface/web/sites/lib/lang/hu_web_domain.lng +++ b/interface/web/sites/lib/lang/hu_web_domain.lng @@ -119,4 +119,5 @@ $wb['monthly_backup_txt'] = 'Monthly'; $wb['rewrite_rules_txt'] = 'Rewrite Rules'; $wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules'; $wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:'; +$wb['configuration_error_txt'] = 'CONFIGURATION ERROR'; ?> diff --git a/interface/web/sites/lib/lang/id_database_admin_list.lng b/interface/web/sites/lib/lang/id_database_admin_list.lng index 782e4e4272..6f81d66858 100644 --- a/interface/web/sites/lib/lang/id_database_admin_list.lng +++ b/interface/web/sites/lib/lang/id_database_admin_list.lng @@ -7,4 +7,5 @@ $wb['database_user_txt'] = 'Pengguna Database'; $wb['database_name_txt'] = 'Nama Database'; $wb['add_new_record_txt'] = 'Tambah Database Baru'; $wb['sys_groupid_txt'] = 'Klien'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/id_database_list.lng b/interface/web/sites/lib/lang/id_database_list.lng index 9b44571f64..1221632978 100644 --- a/interface/web/sites/lib/lang/id_database_list.lng +++ b/interface/web/sites/lib/lang/id_database_list.lng @@ -6,4 +6,5 @@ $wb['server_id_txt'] = 'Server'; $wb['database_user_txt'] = 'Pengguna Database'; $wb['database_name_txt'] = 'Nama Database'; $wb['add_new_record_txt'] = 'Tambah Database Baru'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/id_web_domain.lng b/interface/web/sites/lib/lang/id_web_domain.lng index 5bcfb28baa..0d240c93f5 100644 --- a/interface/web/sites/lib/lang/id_web_domain.lng +++ b/interface/web/sites/lib/lang/id_web_domain.lng @@ -119,4 +119,5 @@ $wb['monthly_backup_txt'] = 'Monthly'; $wb['rewrite_rules_txt'] = 'Rewrite Rules'; $wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules'; $wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:'; +$wb['configuration_error_txt'] = 'CONFIGURATION ERROR'; ?> diff --git a/interface/web/sites/lib/lang/it_database_admin_list.lng b/interface/web/sites/lib/lang/it_database_admin_list.lng index 3f05f65e62..27e62b9ac6 100644 --- a/interface/web/sites/lib/lang/it_database_admin_list.lng +++ b/interface/web/sites/lib/lang/it_database_admin_list.lng @@ -7,4 +7,5 @@ $wb['database_user_txt'] = 'Database user'; $wb['database_name_txt'] = 'Database name'; $wb['add_new_record_txt'] = 'Add new Database'; $wb['sys_groupid_txt'] = 'Client'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/it_database_list.lng b/interface/web/sites/lib/lang/it_database_list.lng index 0ce261e5ae..7e66ceb09b 100644 --- a/interface/web/sites/lib/lang/it_database_list.lng +++ b/interface/web/sites/lib/lang/it_database_list.lng @@ -6,4 +6,5 @@ $wb['server_id_txt'] = 'Server'; $wb['database_name_txt'] = 'Nome Database'; $wb['add_new_record_txt'] = 'Aggiungi nuovo Database'; $wb['database_user_txt'] = 'Database user'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/it_web_domain.lng b/interface/web/sites/lib/lang/it_web_domain.lng index d605e88dfb..eb60687242 100644 --- a/interface/web/sites/lib/lang/it_web_domain.lng +++ b/interface/web/sites/lib/lang/it_web_domain.lng @@ -119,4 +119,5 @@ $wb['monthly_backup_txt'] = 'Monthly'; $wb['rewrite_rules_txt'] = 'Rewrite Rules'; $wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules'; $wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:'; +$wb['configuration_error_txt'] = 'CONFIGURATION ERROR'; ?> diff --git a/interface/web/sites/lib/lang/ja_database_admin_list.lng b/interface/web/sites/lib/lang/ja_database_admin_list.lng index 3f05f65e62..27e62b9ac6 100644 --- a/interface/web/sites/lib/lang/ja_database_admin_list.lng +++ b/interface/web/sites/lib/lang/ja_database_admin_list.lng @@ -7,4 +7,5 @@ $wb['database_user_txt'] = 'Database user'; $wb['database_name_txt'] = 'Database name'; $wb['add_new_record_txt'] = 'Add new Database'; $wb['sys_groupid_txt'] = 'Client'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/ja_database_list.lng b/interface/web/sites/lib/lang/ja_database_list.lng index 9a0ad45c71..afbda1b528 100644 --- a/interface/web/sites/lib/lang/ja_database_list.lng +++ b/interface/web/sites/lib/lang/ja_database_list.lng @@ -6,4 +6,5 @@ $wb['server_id_txt'] = 'サーバー'; $wb['database_name_txt'] = 'データベース名'; $wb['add_new_record_txt'] = 'データベースを追加する'; $wb['database_user_txt'] = 'Database user'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/ja_web_domain.lng b/interface/web/sites/lib/lang/ja_web_domain.lng index a6dbbf6dcc..e0402c01c3 100644 --- a/interface/web/sites/lib/lang/ja_web_domain.lng +++ b/interface/web/sites/lib/lang/ja_web_domain.lng @@ -119,4 +119,5 @@ $wb['monthly_backup_txt'] = 'Monthly'; $wb['rewrite_rules_txt'] = 'Rewrite Rules'; $wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules'; $wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:'; +$wb['configuration_error_txt'] = 'CONFIGURATION ERROR'; ?> diff --git a/interface/web/sites/lib/lang/nl_database_admin_list.lng b/interface/web/sites/lib/lang/nl_database_admin_list.lng index 3ad586efd3..e49d882658 100644 --- a/interface/web/sites/lib/lang/nl_database_admin_list.lng +++ b/interface/web/sites/lib/lang/nl_database_admin_list.lng @@ -7,4 +7,5 @@ $wb['database_user_txt'] = 'Database gebruiker'; $wb['database_name_txt'] = 'Database naam'; $wb['add_new_record_txt'] = 'Toevoegen nieuwe database'; $wb['sys_groupid_txt'] = 'Klant'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/nl_database_list.lng b/interface/web/sites/lib/lang/nl_database_list.lng index aa6dc3cdc7..c2af6476a1 100644 --- a/interface/web/sites/lib/lang/nl_database_list.lng +++ b/interface/web/sites/lib/lang/nl_database_list.lng @@ -6,4 +6,5 @@ $wb['server_id_txt'] = 'Server'; $wb['database_user_txt'] = 'Database gebruiker'; $wb['database_name_txt'] = 'Database naam'; $wb['add_new_record_txt'] = 'Toevoegen nieuwe database'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/nl_web_domain.lng b/interface/web/sites/lib/lang/nl_web_domain.lng index e2bb5cbeab..2d357819c0 100644 --- a/interface/web/sites/lib/lang/nl_web_domain.lng +++ b/interface/web/sites/lib/lang/nl_web_domain.lng @@ -119,4 +119,5 @@ $wb['monthly_backup_txt'] = 'Monthly'; $wb['rewrite_rules_txt'] = 'Rewrite Rules'; $wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules'; $wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:'; +$wb['configuration_error_txt'] = 'CONFIGURATION ERROR'; ?> diff --git a/interface/web/sites/lib/lang/pl_database_admin_list.lng b/interface/web/sites/lib/lang/pl_database_admin_list.lng index 5785a779fd..4795a90ecb 100644 --- a/interface/web/sites/lib/lang/pl_database_admin_list.lng +++ b/interface/web/sites/lib/lang/pl_database_admin_list.lng @@ -7,4 +7,5 @@ $wb['database_user_txt'] = 'Nazwa użytkownika bazy'; $wb['database_name_txt'] = 'Nazwa bazy danych'; $wb['add_new_record_txt'] = 'Dodaj nową bazę danych'; $wb['sys_groupid_txt'] = 'Klient'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/pl_database_list.lng b/interface/web/sites/lib/lang/pl_database_list.lng index 2162a15a21..60e1ecff23 100644 --- a/interface/web/sites/lib/lang/pl_database_list.lng +++ b/interface/web/sites/lib/lang/pl_database_list.lng @@ -6,4 +6,5 @@ $wb['server_id_txt'] = 'Serwer'; $wb['database_name_txt'] = 'Nazwa bazy danych'; $wb['add_new_record_txt'] = 'Dodaj nową bazę danych'; $wb['database_user_txt'] = 'Użytkownik bazy danych'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/pl_web_domain.lng b/interface/web/sites/lib/lang/pl_web_domain.lng index c08113e9e6..ae5c3e1cd3 100644 --- a/interface/web/sites/lib/lang/pl_web_domain.lng +++ b/interface/web/sites/lib/lang/pl_web_domain.lng @@ -119,4 +119,5 @@ $wb['monthly_backup_txt'] = 'Monthly'; $wb['rewrite_rules_txt'] = 'Rewrite Rules'; $wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules'; $wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:'; +$wb['configuration_error_txt'] = 'CONFIGURATION ERROR'; ?> diff --git a/interface/web/sites/lib/lang/pt_database_admin_list.lng b/interface/web/sites/lib/lang/pt_database_admin_list.lng index 3f05f65e62..27e62b9ac6 100644 --- a/interface/web/sites/lib/lang/pt_database_admin_list.lng +++ b/interface/web/sites/lib/lang/pt_database_admin_list.lng @@ -7,4 +7,5 @@ $wb['database_user_txt'] = 'Database user'; $wb['database_name_txt'] = 'Database name'; $wb['add_new_record_txt'] = 'Add new Database'; $wb['sys_groupid_txt'] = 'Client'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/pt_database_list.lng b/interface/web/sites/lib/lang/pt_database_list.lng index 40e888b8ae..9e886921d0 100644 --- a/interface/web/sites/lib/lang/pt_database_list.lng +++ b/interface/web/sites/lib/lang/pt_database_list.lng @@ -6,4 +6,5 @@ $wb['server_id_txt'] = 'Servidor'; $wb['database_name_txt'] = 'Nome da Base de Dados'; $wb['add_new_record_txt'] = 'Adicionar uma nova base de dados'; $wb['database_user_txt'] = 'Database user'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/pt_web_domain.lng b/interface/web/sites/lib/lang/pt_web_domain.lng index 787e1c71da..e7f3fd2fb0 100644 --- a/interface/web/sites/lib/lang/pt_web_domain.lng +++ b/interface/web/sites/lib/lang/pt_web_domain.lng @@ -119,4 +119,5 @@ $wb['monthly_backup_txt'] = 'Monthly'; $wb['rewrite_rules_txt'] = 'Rewrite Rules'; $wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules'; $wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:'; +$wb['configuration_error_txt'] = 'CONFIGURATION ERROR'; ?> diff --git a/interface/web/sites/lib/lang/ro_database_admin_list.lng b/interface/web/sites/lib/lang/ro_database_admin_list.lng index 3f05f65e62..27e62b9ac6 100644 --- a/interface/web/sites/lib/lang/ro_database_admin_list.lng +++ b/interface/web/sites/lib/lang/ro_database_admin_list.lng @@ -7,4 +7,5 @@ $wb['database_user_txt'] = 'Database user'; $wb['database_name_txt'] = 'Database name'; $wb['add_new_record_txt'] = 'Add new Database'; $wb['sys_groupid_txt'] = 'Client'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/ro_database_list.lng b/interface/web/sites/lib/lang/ro_database_list.lng index 6e1597f1e8..3b835ce3d5 100644 --- a/interface/web/sites/lib/lang/ro_database_list.lng +++ b/interface/web/sites/lib/lang/ro_database_list.lng @@ -6,4 +6,5 @@ $wb['server_id_txt'] = 'Server'; $wb['database_name_txt'] = 'Database name'; $wb['add_new_record_txt'] = 'Adauga Database'; $wb['database_user_txt'] = 'Database user'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/ro_web_domain.lng b/interface/web/sites/lib/lang/ro_web_domain.lng index 31e0112ee6..4ff6a0d186 100644 --- a/interface/web/sites/lib/lang/ro_web_domain.lng +++ b/interface/web/sites/lib/lang/ro_web_domain.lng @@ -119,4 +119,5 @@ $wb['monthly_backup_txt'] = 'Monthly'; $wb['rewrite_rules_txt'] = 'Rewrite Rules'; $wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules'; $wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:'; +$wb['configuration_error_txt'] = 'CONFIGURATION ERROR'; ?> diff --git a/interface/web/sites/lib/lang/ru_database_admin_list.lng b/interface/web/sites/lib/lang/ru_database_admin_list.lng index 3f05f65e62..27e62b9ac6 100644 --- a/interface/web/sites/lib/lang/ru_database_admin_list.lng +++ b/interface/web/sites/lib/lang/ru_database_admin_list.lng @@ -7,4 +7,5 @@ $wb['database_user_txt'] = 'Database user'; $wb['database_name_txt'] = 'Database name'; $wb['add_new_record_txt'] = 'Add new Database'; $wb['sys_groupid_txt'] = 'Client'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/ru_database_list.lng b/interface/web/sites/lib/lang/ru_database_list.lng index 0d737de5c6..4647c0c158 100644 --- a/interface/web/sites/lib/lang/ru_database_list.lng +++ b/interface/web/sites/lib/lang/ru_database_list.lng @@ -6,4 +6,5 @@ $wb['server_id_txt'] = 'Сервер'; $wb['database_name_txt'] = 'Имя БД'; $wb['add_new_record_txt'] = 'Добавить новую БД'; $wb['database_user_txt'] = 'Database user'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/ru_web_domain.lng b/interface/web/sites/lib/lang/ru_web_domain.lng index 5f6aafdc33..964d9f488b 100644 --- a/interface/web/sites/lib/lang/ru_web_domain.lng +++ b/interface/web/sites/lib/lang/ru_web_domain.lng @@ -119,4 +119,5 @@ $wb['monthly_backup_txt'] = 'Monthly'; $wb['rewrite_rules_txt'] = 'Rewrite Rules'; $wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules'; $wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:'; +$wb['configuration_error_txt'] = 'CONFIGURATION ERROR'; ?> diff --git a/interface/web/sites/lib/lang/se_database_admin_list.lng b/interface/web/sites/lib/lang/se_database_admin_list.lng index 3f05f65e62..27e62b9ac6 100644 --- a/interface/web/sites/lib/lang/se_database_admin_list.lng +++ b/interface/web/sites/lib/lang/se_database_admin_list.lng @@ -7,4 +7,5 @@ $wb['database_user_txt'] = 'Database user'; $wb['database_name_txt'] = 'Database name'; $wb['add_new_record_txt'] = 'Add new Database'; $wb['sys_groupid_txt'] = 'Client'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/se_database_list.lng b/interface/web/sites/lib/lang/se_database_list.lng index 59f563d011..b05ba127ab 100644 --- a/interface/web/sites/lib/lang/se_database_list.lng +++ b/interface/web/sites/lib/lang/se_database_list.lng @@ -6,4 +6,5 @@ $wb['server_id_txt'] = 'Server'; $wb['database_name_txt'] = 'Database name'; $wb['add_new_record_txt'] = 'Add new Database'; $wb['database_user_txt'] = 'Database user'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/se_web_domain.lng b/interface/web/sites/lib/lang/se_web_domain.lng index 3e309ed5d1..2d9e432374 100644 --- a/interface/web/sites/lib/lang/se_web_domain.lng +++ b/interface/web/sites/lib/lang/se_web_domain.lng @@ -119,4 +119,5 @@ $wb['monthly_backup_txt'] = 'Monthly'; $wb['rewrite_rules_txt'] = 'Rewrite Rules'; $wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules'; $wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:'; +$wb['configuration_error_txt'] = 'CONFIGURATION ERROR'; ?> diff --git a/interface/web/sites/lib/lang/sk_database_admin_list.lng b/interface/web/sites/lib/lang/sk_database_admin_list.lng index 3f05f65e62..27e62b9ac6 100644 --- a/interface/web/sites/lib/lang/sk_database_admin_list.lng +++ b/interface/web/sites/lib/lang/sk_database_admin_list.lng @@ -7,4 +7,5 @@ $wb['database_user_txt'] = 'Database user'; $wb['database_name_txt'] = 'Database name'; $wb['add_new_record_txt'] = 'Add new Database'; $wb['sys_groupid_txt'] = 'Client'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/sk_database_list.lng b/interface/web/sites/lib/lang/sk_database_list.lng index f8acec2b7e..98422c41f7 100644 --- a/interface/web/sites/lib/lang/sk_database_list.lng +++ b/interface/web/sites/lib/lang/sk_database_list.lng @@ -6,4 +6,5 @@ $wb['server_id_txt'] = 'Server'; $wb['database_name_txt'] = 'Meno databáza'; $wb['add_new_record_txt'] = 'Pridať novú databázu'; $wb['database_user_txt'] = 'Database user'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/sk_web_domain.lng b/interface/web/sites/lib/lang/sk_web_domain.lng index 952216fe80..40b00bde65 100644 --- a/interface/web/sites/lib/lang/sk_web_domain.lng +++ b/interface/web/sites/lib/lang/sk_web_domain.lng @@ -119,4 +119,5 @@ $wb['monthly_backup_txt'] = 'Monthly'; $wb['rewrite_rules_txt'] = 'Rewrite Rules'; $wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules'; $wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:'; +$wb['configuration_error_txt'] = 'CONFIGURATION ERROR'; ?> diff --git a/interface/web/sites/lib/lang/tr_database_admin_list.lng b/interface/web/sites/lib/lang/tr_database_admin_list.lng index 3f05f65e62..27e62b9ac6 100644 --- a/interface/web/sites/lib/lang/tr_database_admin_list.lng +++ b/interface/web/sites/lib/lang/tr_database_admin_list.lng @@ -7,4 +7,5 @@ $wb['database_user_txt'] = 'Database user'; $wb['database_name_txt'] = 'Database name'; $wb['add_new_record_txt'] = 'Add new Database'; $wb['sys_groupid_txt'] = 'Client'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/tr_database_list.lng b/interface/web/sites/lib/lang/tr_database_list.lng index 5e9d258c8b..c3b3eb49ef 100644 --- a/interface/web/sites/lib/lang/tr_database_list.lng +++ b/interface/web/sites/lib/lang/tr_database_list.lng @@ -6,4 +6,5 @@ $wb['server_id_txt'] = 'Sunucu'; $wb['database_name_txt'] = 'Veritabanı adı'; $wb['add_new_record_txt'] = 'Yeni Veritabanı'; $wb['database_user_txt'] = 'Database user'; +$wb['parent_domain_id_txt'] = 'Website'; ?> diff --git a/interface/web/sites/lib/lang/tr_web_domain.lng b/interface/web/sites/lib/lang/tr_web_domain.lng index 23a5374b0a..1b330059e9 100644 --- a/interface/web/sites/lib/lang/tr_web_domain.lng +++ b/interface/web/sites/lib/lang/tr_web_domain.lng @@ -119,4 +119,5 @@ $wb['monthly_backup_txt'] = 'Monthly'; $wb['rewrite_rules_txt'] = 'Rewrite Rules'; $wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules'; $wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:'; +$wb['configuration_error_txt'] = 'CONFIGURATION ERROR'; ?> diff --git a/interface/web/sites/list/aps_availablepackages.list.php b/interface/web/sites/list/aps_availablepackages.list.php index b6f52cff82..d07b85a4fe 100644 --- a/interface/web/sites/list/aps_availablepackages.list.php +++ b/interface/web/sites/list/aps_availablepackages.list.php @@ -1,86 +1,86 @@ - 'name', - 'datatype' => 'VARCHAR', - 'formtype' => 'TEXT', - 'op' => 'like', - 'prefix' => '%', - 'suffix' => '%', - 'width' => '', - 'value' => ''); - -$liste["item"][] = array('field' => 'version', - 'datatype' => 'VARCHAR', - 'formtype' => 'TEXT', - 'op' => 'like', - 'prefix' => '%', - 'suffix' => '%', - 'width' => '', - 'value' => ''); - -$liste["item"][] = array('field' => 'category', - 'datatype' => 'VARCHAR', - 'formtype' => 'SELECT', - 'op' => '=', - 'prefix' => '', - 'suffix' => '', - 'datasource' => array('type' => 'SQL', - 'querystring' => 'SELECT category FROM aps_packages ORDER BY category', - 'keyfield' => 'category', - 'valuefield' => 'category'), - 'width' => '', - 'value' => ''); - -if($_SESSION['s']['user']['typ'] == 'admin') -{ -$liste['item'][] = array('field' => 'package_status', - 'datatype' => 'VARCHAR', - 'formtype' => 'SELECT', - 'op' => '=', - 'prefix' => '', - 'suffix' => '', - 'width' => '', - 'value' => array(PACKAGE_ENABLED => '
'.$app->lng('Yes').'
', - PACKAGE_LOCKED => '
'.$app->lng('No').'
')); -} + 'name', + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'op' => 'like', + 'prefix' => '%', + 'suffix' => '%', + 'width' => '', + 'value' => ''); + +$liste["item"][] = array('field' => 'version', + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'op' => 'like', + 'prefix' => '%', + 'suffix' => '%', + 'width' => '', + 'value' => ''); + +$liste["item"][] = array('field' => 'category', + 'datatype' => 'VARCHAR', + 'formtype' => 'SELECT', + 'op' => '=', + 'prefix' => '', + 'suffix' => '', + 'datasource' => array('type' => 'SQL', + 'querystring' => 'SELECT category FROM aps_packages ORDER BY category', + 'keyfield' => 'category', + 'valuefield' => 'category'), + 'width' => '', + 'value' => ''); + +if($_SESSION['s']['user']['typ'] == 'admin') +{ +$liste['item'][] = array('field' => 'package_status', + 'datatype' => 'VARCHAR', + 'formtype' => 'SELECT', + 'op' => '=', + 'prefix' => '', + 'suffix' => '', + 'width' => '', + 'value' => array(PACKAGE_ENABLED => '
'.$app->lng('Yes').'
', + PACKAGE_LOCKED => '
'.$app->lng('No').'
')); +} ?> \ No newline at end of file diff --git a/interface/web/sites/list/database.list.php b/interface/web/sites/list/database.list.php index 76dbec54fd..56bf15dc40 100644 --- a/interface/web/sites/list/database.list.php +++ b/interface/web/sites/list/database.list.php @@ -70,19 +70,6 @@ $liste["item"][] = array( 'field' => "remote_access", 'width' => "", 'value' => array('y' => "
Yes
",'n' => "
No
")); -$liste["item"][] = array( 'field' => "type", - 'datatype' => "VARCHAR", - 'formtype' => "SELECT", - 'op' => "=", - 'prefix' => "", - 'suffix' => "", - 'width' => "", - 'value' => array( - 'mongo' => "MongoDB", - 'mysql' => "MySQL" - ) - ); - if($_SESSION['s']['user']['typ'] == 'admin') { $liste["item"][] = array( 'field' => "sys_groupid", 'datatype' => "INTEGER", @@ -153,4 +140,4 @@ $liste["item"][] = array( 'field' => "database_name", 'width' => "", 'value' => ""); -?> +?> \ No newline at end of file diff --git a/interface/web/sites/templates/aps_install_package.htm b/interface/web/sites/templates/aps_install_package.htm index c911ced39e..4e0c9bd517 100644 --- a/interface/web/sites/templates/aps_install_package.htm +++ b/interface/web/sites/templates/aps_install_package.htm @@ -1,56 +1,56 @@ -

- {tmpl_var name='installation_txt'}: {tmpl_var name='pkg_name'} {tmpl_var name='pkg_version'}-{tmpl_var name='pkg_release'} - - - {tmpl_var name='pkg_name'} - - -

- - -

ERROR

    {tmpl_var name='error'}
- - -
- -
-
- {tmpl_var name='basic_settings_txt'} -
- -
http(s):// 
DOMAIN_LIST_SPACE
 / 
- -
- -
- - -
- - - PKG_SETTINGS_SPACE - - {tmpl_var name='license_txt'} -
- - {tmpl_var name='pkg_license_name'}
 - - {tmpl_var name='pkg_license_content'} - - - -
-
- - checked />  {tmpl_var name='acceptance_text'} -
-
- - -
- - -
-
- -
+

+ {tmpl_var name='installation_txt'}: {tmpl_var name='pkg_name'} {tmpl_var name='pkg_version'}-{tmpl_var name='pkg_release'} + + + {tmpl_var name='pkg_name'} + + +

+ + +

ERROR

    {tmpl_var name='error'}
+ + +
+ +
+
+ {tmpl_var name='basic_settings_txt'} +
+ +
http(s):// 
DOMAIN_LIST_SPACE
 / 
+ +
+ +
+ + +
+ + + PKG_SETTINGS_SPACE + + {tmpl_var name='license_txt'} +
+ + {tmpl_var name='pkg_license_name'}
 + + {tmpl_var name='pkg_license_content'} + + + +
+
+ + checked />  {tmpl_var name='acceptance_text'} +
+
+ + +
+ + +
+
+ +
\ No newline at end of file diff --git a/interface/web/sites/templates/aps_instances_list.htm b/interface/web/sites/templates/aps_instances_list.htm index 2d9c50f6da..48da5232e6 100644 --- a/interface/web/sites/templates/aps_instances_list.htm +++ b/interface/web/sites/templates/aps_instances_list.htm @@ -1,62 +1,62 @@ -

{tmpl_var name="list_head_txt"}

- -
- -
-
{tmpl_var name="list_head_txt"} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{tmpl_var name='name_txt'}{tmpl_var name='version_txt'}{tmpl_var name='install_location_txt'}{tmpl_var name='status_txt'} 
  - -
{tmpl_var name='package_name'}{tmpl_var name='package_version'}-{tmpl_var name='package_release'}{tmpl_var name='install_location_short'}{tmpl_var name='instance_status'} - - {tmpl_var name='delete_txt'} - - - {tmpl_var name='reinstall_txt'} - -
{tmpl_var name='paging'}
-
-
- +

{tmpl_var name="list_head_txt"}

+ +
+ +
+
{tmpl_var name="list_head_txt"} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{tmpl_var name='name_txt'}{tmpl_var name='version_txt'}{tmpl_var name='install_location_txt'}{tmpl_var name='status_txt'} 
  + +
{tmpl_var name='package_name'}{tmpl_var name='package_version'}-{tmpl_var name='package_release'}{tmpl_var name='install_location_short'}{tmpl_var name='instance_status'} + + {tmpl_var name='delete_txt'} + + + {tmpl_var name='reinstall_txt'} + +
{tmpl_var name='paging'}
+
+
+
\ No newline at end of file diff --git a/interface/web/sites/templates/aps_packagedetails_show.htm b/interface/web/sites/templates/aps_packagedetails_show.htm index 5456a89850..a09c26f203 100644 --- a/interface/web/sites/templates/aps_packagedetails_show.htm +++ b/interface/web/sites/templates/aps_packagedetails_show.htm @@ -1,141 +1,141 @@ -

- - {tmpl_var name='pkg_name'} - - {tmpl_var name='pkg_name'} -

-{tmpl_var name='pkg_summary'} -

 

- -
-
-
- -
-
-
-

 

 

- - -
- - -
-

 

- -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{tmpl_var name='version_txt'}{tmpl_var name='pkg_version'} (Release {tmpl_var name='pkg_release'})
{tmpl_var name='category_txt'}{tmpl_var name='pkg_category'}
{tmpl_var name='description_txt'}{tmpl_var name='pkg_description'}
{tmpl_var name='homepage_txt'} - {tmpl_var name='pkg_homepage'} -
{tmpl_var name='installed_size_txt'}{tmpl_var name='pkg_installed_size'}
{tmpl_var name='supported_languages_txt'}{tmpl_var name='pkg_languages'}
{tmpl_var name='config_script_txt'}{tmpl_var name='pkg_config_script'}
{tmpl_var name='license_txt'} - {tmpl_var name='pkg_license_name'}
 - {tmpl_var name='pkg_license_content'} - - - -
- - {tmpl_var name='ScreenDescription'}
- {tmpl_var name='ScreenDescription'}

- -
-
    - -
  • {tmpl_var name='ChangelogVersion'}
    • -
      - -
    • {tmpl_var name='ChangelogDescription'}
      • -       -
    -     -
-
{tmpl_var name='php_extensions_txt'}{tmpl_var name='pkg_requirements_php_extensions'}
{tmpl_var name='php_settings_txt'} - {tmpl_var name='PHPSettingName'} = {tmpl_var name='PHPSettingValue'}
 -
{tmpl_var name='supported_php_versions_txt'}{tmpl_var name='pkg_requirements_supported_php_versions'}
{tmpl_var name='database_txt'}{tmpl_var name='pkg_requirements_database'}
-
- +

+ + {tmpl_var name='pkg_name'} + + {tmpl_var name='pkg_name'} +

+{tmpl_var name='pkg_summary'} +

 

+ +
+
+
+ +
+
+
+

 

 

+ + +
+ + +
+

 

+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{tmpl_var name='version_txt'}{tmpl_var name='pkg_version'} (Release {tmpl_var name='pkg_release'})
{tmpl_var name='category_txt'}{tmpl_var name='pkg_category'}
{tmpl_var name='description_txt'}{tmpl_var name='pkg_description'}
{tmpl_var name='homepage_txt'} + {tmpl_var name='pkg_homepage'} +
{tmpl_var name='installed_size_txt'}{tmpl_var name='pkg_installed_size'}
{tmpl_var name='supported_languages_txt'}{tmpl_var name='pkg_languages'}
{tmpl_var name='config_script_txt'}{tmpl_var name='pkg_config_script'}
{tmpl_var name='license_txt'} + {tmpl_var name='pkg_license_name'}
 + {tmpl_var name='pkg_license_content'} + + + +
+ + {tmpl_var name='ScreenDescription'}
+ {tmpl_var name='ScreenDescription'}

+ +
+
    + +
  • {tmpl_var name='ChangelogVersion'}
    • +
      + +
    • {tmpl_var name='ChangelogDescription'}
      • +       +
    +     +
+
{tmpl_var name='php_extensions_txt'}{tmpl_var name='pkg_requirements_php_extensions'}
{tmpl_var name='php_settings_txt'} + {tmpl_var name='PHPSettingName'} = {tmpl_var name='PHPSettingValue'}
 +
{tmpl_var name='supported_php_versions_txt'}{tmpl_var name='pkg_requirements_supported_php_versions'}
{tmpl_var name='database_txt'}{tmpl_var name='pkg_requirements_database'}
+
+
\ No newline at end of file diff --git a/interface/web/sites/templates/aps_packages_list.htm b/interface/web/sites/templates/aps_packages_list.htm index 1042e71169..4765f2edef 100644 --- a/interface/web/sites/templates/aps_packages_list.htm +++ b/interface/web/sites/templates/aps_packages_list.htm @@ -1,55 +1,55 @@ -

{tmpl_var name="list_head_txt"}

- -
- -
-
{tmpl_var name="list_head_txt"} ({tmpl_var name='package_count'}) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{tmpl_var name='name_txt'}{tmpl_var name='version_txt'}{tmpl_var name='category_txt'}{tmpl_var name='status_txt'} 
{tmpl_var name='name'}{tmpl_var name='version'}-{tmpl_var name='release'}{tmpl_var name='category'}{tmpl_var name='package_status'} 
{tmpl_var name='globalsearch_noresults_text_txt'}
{tmpl_var name='paging'}
-
-
- +

{tmpl_var name="list_head_txt"}

+ +
+ +
+
{tmpl_var name="list_head_txt"} ({tmpl_var name='package_count'}) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{tmpl_var name='name_txt'}{tmpl_var name='version_txt'}{tmpl_var name='category_txt'}{tmpl_var name='status_txt'} 
{tmpl_var name='name'}{tmpl_var name='version'}-{tmpl_var name='release'}{tmpl_var name='category'}{tmpl_var name='package_status'} 
{tmpl_var name='globalsearch_noresults_text_txt'}
{tmpl_var name='paging'}
+
+
+
\ No newline at end of file diff --git a/interface/web/sites/templates/database_admin_list.htm b/interface/web/sites/templates/database_admin_list.htm index e4aefdbd87..a7021656e0 100644 --- a/interface/web/sites/templates/database_admin_list.htm +++ b/interface/web/sites/templates/database_admin_list.htm @@ -19,7 +19,6 @@ - @@ -30,7 +29,6 @@ - @@ -46,7 +44,6 @@ {tmpl_var name="active"} {tmpl_var name="remote_access"} - {tmpl_var name="type"} {tmpl_var name="sys_groupid"} {tmpl_var name="server_id"} {tmpl_var name="parent_domain_id"} @@ -57,7 +54,7 @@ {tmpl_var name='admin_txt'} {tmpl_var name='edit_txt'} - {tmpl_var name='delete_txt'} + {tmpl_var name='delete_txt'} @@ -76,4 +73,4 @@
-
+
\ No newline at end of file diff --git a/interface/web/sites/templates/database_list.htm b/interface/web/sites/templates/database_list.htm index 15a8ae77cf..ec2d55fdb2 100644 --- a/interface/web/sites/templates/database_list.htm +++ b/interface/web/sites/templates/database_list.htm @@ -36,7 +36,6 @@ - @@ -46,7 +45,6 @@ - @@ -61,7 +59,6 @@ {tmpl_var name="active"} {tmpl_var name="remote_access"} - {tmpl_var name="type"} {tmpl_var name="server_id"} {tmpl_var name="parent_domain_id"} {tmpl_var name="database_user_id"} @@ -71,7 +68,7 @@ {tmpl_var name='admin_txt'} {tmpl_var name='edit_txt'} - {tmpl_var name='delete_txt'} + {tmpl_var name='delete_txt'} @@ -90,4 +87,4 @@
- + \ No newline at end of file diff --git a/interface/web/sites/templates/web_aliasdomain_advanced.htm b/interface/web/sites/templates/web_aliasdomain_advanced.htm index 4c605ca94c..293b871244 100644 --- a/interface/web/sites/templates/web_aliasdomain_advanced.htm +++ b/interface/web/sites/templates/web_aliasdomain_advanced.htm @@ -1,37 +1,37 @@ -

-

- -
- -
-
Options -
- -  {tmpl_var name="available_proxy_directive_snippets_txt"}

 {tmpl_var name="proxy_directive_snippets_txt"} -
-
- - - -
- - -
-
- -
- \ No newline at end of file diff --git a/interface/web/sites/templates/web_backup_list.htm b/interface/web/sites/templates/web_backup_list.htm index 55944730b0..3248812e8b 100644 --- a/interface/web/sites/templates/web_backup_list.htm +++ b/interface/web/sites/templates/web_backup_list.htm @@ -13,23 +13,21 @@ - - - - - - - + + + + + + - - - - - + + + @@ -42,7 +40,7 @@
{tmpl_var name='search_limit'}
{tmpl_var name='search_limit'}
{tmpl_var name="date"}{tmpl_var name="backup_type"}{tmpl_var name="filename"}{tmpl_var name="filesize"} -
- +
{tmpl_var name="date"}{tmpl_var name="backup_type"}{tmpl_var name="filename"} +
+
- - - - + + + + \ No newline at end of file diff --git a/interface/web/sites/templates/web_subdomain_advanced.htm b/interface/web/sites/templates/web_subdomain_advanced.htm index 3924362a36..d2beb4275d 100644 --- a/interface/web/sites/templates/web_subdomain_advanced.htm +++ b/interface/web/sites/templates/web_subdomain_advanced.htm @@ -1,37 +1,37 @@ -

-

- -
- -
-
Options -
- -  {tmpl_var name="available_proxy_directive_snippets_txt"}

 {tmpl_var name="proxy_directive_snippets_txt"} -
-
- - - -
- - -
-
- -
- +

+

+ +
+ +
+
Options +
+ +  {tmpl_var name="available_proxy_directive_snippets_txt"}

 {tmpl_var name="proxy_directive_snippets_txt"} +
+
+ + + +
+ + +
+
+ +
+ diff --git a/interface/web/sites/templates/web_vhost_subdomain_redirect.htm b/interface/web/sites/templates/web_vhost_subdomain_redirect.htm index 5f441467be..c00b866748 100644 --- a/interface/web/sites/templates/web_vhost_subdomain_redirect.htm +++ b/interface/web/sites/templates/web_vhost_subdomain_redirect.htm @@ -20,6 +20,10 @@ + +
+ +  {tmpl_var name="allowed_rewrite_rule_directives_txt"}

 break
 if
 return
 rewrite
 set

 http://wiki.nginx.org/HttpRewriteModule
@@ -58,6 +62,7 @@ jQuery('#redirect_type option[value="R,L"]').hide(); jQuery('#redirect_type option[value="R=301,L"]').hide(); if(selected != "no" && selected != "" && selected != "last" && selected != "break" && selected != "redirect" && selected != "permanent" && selected != "proxy") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected'); + jQuery('.nginx').show(); } else { jQuery('#redirect_type option[value="last"]').attr('disabled','disabled'); jQuery('#redirect_type option[value="break"]').attr('disabled','disabled'); @@ -71,6 +76,7 @@ jQuery('#redirect_type option[value="permanent"]').hide(); jQuery('#redirect_type option[value="proxy"]').hide(); if(selected != "no" && selected != "" && selected != "R" && selected != "L" && selected != "R,L" && selected != "R=301,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected'); + jQuery('.nginx').hide(); } }); } diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php index 062529fda3..ffc29e84cc 100644 --- a/interface/web/sites/web_domain_edit.php +++ b/interface/web/sites/web_domain_edit.php @@ -259,53 +259,6 @@ class page_action extends tform_actions { // add limits to template to be able to hide settings foreach($read_limits as $limit) $app->tpl->setVar($limit, $client[$limit]); - $sites_config = $app->getconf->get_global_config('sites'); - if($sites_config['reseller_can_use_options']) { - // Directive Snippets - $php_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'php' AND active = 'y'"); - $php_directive_snippets_txt = ''; - if(is_array($php_directive_snippets) && !empty($php_directive_snippets)){ - foreach($php_directive_snippets as $php_directive_snippet){ - $php_directive_snippets_txt .= '['.$php_directive_snippet['name'].'] '; - } - } - if($php_directive_snippets_txt == '') $php_directive_snippets_txt = '------'; - $app->tpl->setVar("php_directive_snippets_txt",$php_directive_snippets_txt); - - if($server_type == 'apache'){ - $apache_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'apache' AND active = 'y'"); - $apache_directive_snippets_txt = ''; - if(is_array($apache_directive_snippets) && !empty($apache_directive_snippets)){ - foreach($apache_directive_snippets as $apache_directive_snippet){ - $apache_directive_snippets_txt .= '['.$apache_directive_snippet['name'].'] '; - } - } - if($apache_directive_snippets_txt == '') $apache_directive_snippets_txt = '------'; - $app->tpl->setVar("apache_directive_snippets_txt",$apache_directive_snippets_txt); - } - - if($server_type == 'nginx'){ - $nginx_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'nginx' AND active = 'y'"); - $nginx_directive_snippets_txt = ''; - if(is_array($nginx_directive_snippets) && !empty($nginx_directive_snippets)){ - foreach($nginx_directive_snippets as $nginx_directive_snippet){ - $nginx_directive_snippets_txt .= '['.$nginx_directive_snippet['name'].'] '; - } - } - if($nginx_directive_snippets_txt == '') $nginx_directive_snippets_txt = '------'; - $app->tpl->setVar("nginx_directive_snippets_txt",$nginx_directive_snippets_txt); - } - - $proxy_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'proxy' AND active = 'y'"); - $proxy_directive_snippets_txt = ''; - if(is_array($proxy_directive_snippets) && !empty($proxy_directive_snippets)){ - foreach($proxy_directive_snippets as $proxy_directive_snippet){ - $proxy_directive_snippets_txt .= '['.$proxy_directive_snippet['name'].'] '; - } - } - if($proxy_directive_snippets_txt == '') $proxy_directive_snippets_txt = '------'; - $app->tpl->setVar("proxy_directive_snippets_txt",$proxy_directive_snippets_txt); - } //* Admin: If the logged in user is admin } else { diff --git a/interface/web/sites/web_vhost_subdomain_edit.php b/interface/web/sites/web_vhost_subdomain_edit.php index 97e84f4f59..0322726bc4 100644 --- a/interface/web/sites/web_vhost_subdomain_edit.php +++ b/interface/web/sites/web_vhost_subdomain_edit.php @@ -164,53 +164,6 @@ class page_action extends tform_actions { // add limits to template to be able to hide settings foreach($read_limits as $limit) $app->tpl->setVar($limit, $client[$limit]); - $sites_config = $app->getconf->get_global_config('sites'); - if($sites_config['reseller_can_use_options']) { - // Directive Snippets - $php_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'php' AND active = 'y'"); - $php_directive_snippets_txt = ''; - if(is_array($php_directive_snippets) && !empty($php_directive_snippets)){ - foreach($php_directive_snippets as $php_directive_snippet){ - $php_directive_snippets_txt .= '['.$php_directive_snippet['name'].'] '; - } - } - if($php_directive_snippets_txt == '') $php_directive_snippets_txt = '------'; - $app->tpl->setVar("php_directive_snippets_txt",$php_directive_snippets_txt); - - if($server_type == 'apache'){ - $apache_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'apache' AND active = 'y'"); - $apache_directive_snippets_txt = ''; - if(is_array($apache_directive_snippets) && !empty($apache_directive_snippets)){ - foreach($apache_directive_snippets as $apache_directive_snippet){ - $apache_directive_snippets_txt .= '['.$apache_directive_snippet['name'].'] '; - } - } - if($apache_directive_snippets_txt == '') $apache_directive_snippets_txt = '------'; - $app->tpl->setVar("apache_directive_snippets_txt",$apache_directive_snippets_txt); - } - - if($server_type == 'nginx'){ - $nginx_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'nginx' AND active = 'y'"); - $nginx_directive_snippets_txt = ''; - if(is_array($nginx_directive_snippets) && !empty($nginx_directive_snippets)){ - foreach($nginx_directive_snippets as $nginx_directive_snippet){ - $nginx_directive_snippets_txt .= '['.$nginx_directive_snippet['name'].'] '; - } - } - if($nginx_directive_snippets_txt == '') $nginx_directive_snippets_txt = '------'; - $app->tpl->setVar("nginx_directive_snippets_txt",$nginx_directive_snippets_txt); - } - - $proxy_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'proxy' AND active = 'y'"); - $proxy_directive_snippets_txt = ''; - if(is_array($proxy_directive_snippets) && !empty($proxy_directive_snippets)){ - foreach($proxy_directive_snippets as $proxy_directive_snippet){ - $proxy_directive_snippets_txt .= '['.$proxy_directive_snippet['name'].'] '; - } - } - if($proxy_directive_snippets_txt == '') $proxy_directive_snippets_txt = '------'; - $app->tpl->setVar("proxy_directive_snippets_txt",$proxy_directive_snippets_txt); - } //* Admin: If the logged in user is admin } else { @@ -529,6 +482,62 @@ class page_action extends tform_actions { $app->tform->errorMessage .= $app->tform->lng("error_php_fpm_pm_settings_txt").'
'; } } + + // Check rewrite rules + $server_type = $web_config['server_type']; + + if($server_type == 'nginx' && isset($this->dataRecord['rewrite_rules']) && trim($this->dataRecord['rewrite_rules']) != '') { + $rewrite_rules = trim($this->dataRecord['rewrite_rules']); + $rewrites_are_valid = true; + // use this counter to make sure all curly brackets are properly closed + $if_level = 0; + // Make sure we only have Unix linebreaks + $rewrite_rules = str_replace("\r\n", "\n", $rewrite_rules); + $rewrite_rules = str_replace("\r", "\n", $rewrite_rules); + $rewrite_rule_lines = explode("\n", $rewrite_rules); + if(is_array($rewrite_rule_lines) && !empty($rewrite_rule_lines)){ + foreach($rewrite_rule_lines as $rewrite_rule_line){ + // ignore comments + if(substr(ltrim($rewrite_rule_line),0,1) == '#') continue; + // empty lines + if(trim($rewrite_rule_line) == '') continue; + // rewrite + if(preg_match('@^\s*rewrite\s+(^/)?\S+(\$)?\s+\S+(\s+(last|break|redirect|permanent|))?\s*;\s*$@', $rewrite_rule_line)) continue; + // if + if(preg_match('@^\s*if\s+\(\s*\$\S+(\s+(\!?(=|~|~\*))\s+(\S+|\".+\"))?\s*\)\s*\{\s*$@', $rewrite_rule_line)){ + $if_level += 1; + continue; + } + // if - check for files, directories, etc. + if(preg_match('@^\s*if\s+\(\s*\!?-(f|d|e|x)\s+\S+\s*\)\s*\{\s*$@', $rewrite_rule_line)){ + $if_level += 1; + continue; + } + // break + if(preg_match('@^\s*break\s*;\s*$@', $rewrite_rule_line)){ + continue; + } + // return code [ text ] + if(preg_match('@^\s*return\s+\d\d\d.*;\s*$@', $rewrite_rule_line)) continue; + // return code URL + // return URL + if(preg_match('@^\s*return(\s+\d\d\d)?\s+(http|https|ftp)\://([a-zA-Z0-9\.\-]+(\:[a-zA-Z0-9\.&%\$\-]+)*\@)*((25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9])\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[0-9])|localhost|([a-zA-Z0-9\-]+\.)*[a-zA-Z0-9\-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(\:[0-9]+)*(/($|[a-zA-Z0-9\.\,\?\'\\\+&%\$#\=~_\-]+))*\s*;\s*$@', $rewrite_rule_line)) continue; + // set + if(preg_match('@^\s*set\s+\$\S+\s+\S+\s*;\s*$@', $rewrite_rule_line)) continue; + // closing curly bracket + if(trim($rewrite_rule_line) == '}'){ + $if_level -= 1; + continue; + } + $rewrites_are_valid = false; + break; + } + } + + if(!$rewrites_are_valid || $if_level != 0){ + $app->tform->errorMessage .= $app->tform->lng("invalid_rewrite_rules_txt").'
'; + } + } parent::onSubmit(); } @@ -600,4 +609,4 @@ class page_action extends tform_actions { $page = new page_action; $page->onLoad(); -?> +?> \ No newline at end of file diff --git a/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng index cff29d541a..136f5e2273 100644 --- a/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng +++ b/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng @@ -6,3 +6,4 @@ $wb['password_strength_3_txt'] = 'Dobré'; $wb['password_strength_4_txt'] = 'Silné'; $wb['password_strength_5_txt'] = 'Velmi silné'; ?> + diff --git a/interface/web/strengthmeter/lib/lang/de_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/de_strengthmeter.lng index 52f10189e0..dbfdce3aee 100644 --- a/interface/web/strengthmeter/lib/lang/de_strengthmeter.lng +++ b/interface/web/strengthmeter/lib/lang/de_strengthmeter.lng @@ -6,3 +6,4 @@ $wb['password_strength_3_txt'] = 'Gut'; $wb['password_strength_4_txt'] = 'Stark'; $wb['password_strength_5_txt'] = 'Sehr stark'; ?> + diff --git a/interface/web/temp/empty.dir b/interface/web/temp/empty.dir new file mode 100644 index 0000000000..95ba9ef37c --- /dev/null +++ b/interface/web/temp/empty.dir @@ -0,0 +1 @@ +This empty directory is needed by ISPConfig. diff --git a/interface/web/themes/default-304/css/screen/redmond/jquery-ui-1.8.16.custom.css b/interface/web/themes/default-304/css/screen/redmond/jquery-ui-1.8.16.custom.css index e3e05d1d9e..88353fe6a8 100644 --- a/interface/web/themes/default-304/css/screen/redmond/jquery-ui-1.8.16.custom.css +++ b/interface/web/themes/default-304/css/screen/redmond/jquery-ui-1.8.16.custom.css @@ -1,444 +1,444 @@ -/* - * jQuery UI CSS Framework 1.8.16 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Theming/API - */ - -/* Layout helpers -----------------------------------*/ -.ui-helper-hidden { display: none; } -.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); } -.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } -.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } -.ui-helper-clearfix { display: inline-block; } -/* required comment for clearfix to work in Opera \*/ -* html .ui-helper-clearfix { height:1%; } -.ui-helper-clearfix { display:block; } -/* end clearfix */ -.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } - - -/* Interaction Cues -----------------------------------*/ -.ui-state-disabled { cursor: default !important; } - - -/* Icons -----------------------------------*/ - -/* states and images */ -.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; } - - -/* Misc visuals -----------------------------------*/ - -/* Overlays */ -.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; } - - -/* - * jQuery UI CSS Framework 1.8.16 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Theming/API - * - * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Lucida%20Grande,%20Lucida%20Sans,%20Arial,%20sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=0px&bgColorHeader=5c9ccc&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=55&borderColorHeader=4297d7&fcHeader=ffffff&iconColorHeader=d8e7f3&bgColorContent=fcfdfd&bgTextureContent=06_inset_hard.png&bgImgOpacityContent=100&borderColorContent=a6c9e2&fcContent=222222&iconColorContent=469bdd&bgColorDefault=dfeffc&bgTextureDefault=02_glass.png&bgImgOpacityDefault=85&borderColorDefault=c5dbec&fcDefault=2e6e9e&iconColorDefault=6da8d5&bgColorHover=d0e5f5&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=79b7e7&fcHover=1d5987&iconColorHover=217bc0&bgColorActive=f5f8f9&bgTextureActive=06_inset_hard.png&bgImgOpacityActive=100&borderColorActive=79b7e7&fcActive=e17009&iconColorActive=f9bd01&bgColorHighlight=fbec88&bgTextureHighlight=01_flat.png&bgImgOpacityHighlight=55&borderColorHighlight=fad42e&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=0px - */ - - -/* Component containers -----------------------------------*/ -.ui-widget { font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1.1em; } -.ui-widget .ui-widget { font-size: 1em; } -.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1em; } -.ui-widget-content { border: 1px solid #a6c9e2; background: #fcfdfd url(images/ui-bg_inset-hard_100_fcfdfd_1x100.png) 50% bottom repeat-x; color: #222222; } -.ui-widget-content a { color: #222222; } -.ui-widget-header { border: 1px solid #4297d7; background: #5c9ccc url(images/ui-bg_gloss-wave_55_5c9ccc_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; } -.ui-widget-header a { color: #ffffff; } - -/* Interaction states -----------------------------------*/ -.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #c5dbec; background: #dfeffc url(images/ui-bg_glass_85_dfeffc_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #2e6e9e; } -.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #2e6e9e; text-decoration: none; } -.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #79b7e7; background: #d0e5f5 url(images/ui-bg_glass_75_d0e5f5_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #1d5987; } -.ui-state-hover a, .ui-state-hover a:hover { color: #1d5987; text-decoration: none; } -.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #79b7e7; background: #f5f8f9 url(images/ui-bg_inset-hard_100_f5f8f9_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #e17009; } -.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #e17009; text-decoration: none; } -.ui-widget :active { outline: none; } - -/* Interaction Cues -----------------------------------*/ -.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fad42e; background: #fbec88 url(images/ui-bg_flat_55_fbec88_40x100.png) 50% 50% repeat-x; color: #363636; } -.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; } -.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; } -.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; } -.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; } -.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; } -.ui-priority-secondary, .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; } -.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; } - -/* Icons -----------------------------------*/ - -/* states and images */ -.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_469bdd_256x240.png); } -.ui-widget-content .ui-icon {background-image: url(images/ui-icons_469bdd_256x240.png); } -.ui-widget-header .ui-icon {background-image: url(images/ui-icons_d8e7f3_256x240.png); } -.ui-state-default .ui-icon { background-image: url(images/ui-icons_6da8d5_256x240.png); } -.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_217bc0_256x240.png); } -.ui-state-active .ui-icon {background-image: url(images/ui-icons_f9bd01_256x240.png); } -.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); } -.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); } - -/* positioning */ -.ui-icon-carat-1-n { background-position: 0 0; } -.ui-icon-carat-1-ne { background-position: -16px 0; } -.ui-icon-carat-1-e { background-position: -32px 0; } -.ui-icon-carat-1-se { background-position: -48px 0; } -.ui-icon-carat-1-s { background-position: -64px 0; } -.ui-icon-carat-1-sw { background-position: -80px 0; } -.ui-icon-carat-1-w { background-position: -96px 0; } -.ui-icon-carat-1-nw { background-position: -112px 0; } -.ui-icon-carat-2-n-s { background-position: -128px 0; } -.ui-icon-carat-2-e-w { background-position: -144px 0; } -.ui-icon-triangle-1-n { background-position: 0 -16px; } -.ui-icon-triangle-1-ne { background-position: -16px -16px; } -.ui-icon-triangle-1-e { background-position: -32px -16px; } -.ui-icon-triangle-1-se { background-position: -48px -16px; } -.ui-icon-triangle-1-s { background-position: -64px -16px; } -.ui-icon-triangle-1-sw { background-position: -80px -16px; } -.ui-icon-triangle-1-w { background-position: -96px -16px; } -.ui-icon-triangle-1-nw { background-position: -112px -16px; } -.ui-icon-triangle-2-n-s { background-position: -128px -16px; } -.ui-icon-triangle-2-e-w { background-position: -144px -16px; } -.ui-icon-arrow-1-n { background-position: 0 -32px; } -.ui-icon-arrow-1-ne { background-position: -16px -32px; } -.ui-icon-arrow-1-e { background-position: -32px -32px; } -.ui-icon-arrow-1-se { background-position: -48px -32px; } -.ui-icon-arrow-1-s { background-position: -64px -32px; } -.ui-icon-arrow-1-sw { background-position: -80px -32px; } -.ui-icon-arrow-1-w { background-position: -96px -32px; } -.ui-icon-arrow-1-nw { background-position: -112px -32px; } -.ui-icon-arrow-2-n-s { background-position: -128px -32px; } -.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; } -.ui-icon-arrow-2-e-w { background-position: -160px -32px; } -.ui-icon-arrow-2-se-nw { background-position: -176px -32px; } -.ui-icon-arrowstop-1-n { background-position: -192px -32px; } -.ui-icon-arrowstop-1-e { background-position: -208px -32px; } -.ui-icon-arrowstop-1-s { background-position: -224px -32px; } -.ui-icon-arrowstop-1-w { background-position: -240px -32px; } -.ui-icon-arrowthick-1-n { background-position: 0 -48px; } -.ui-icon-arrowthick-1-ne { background-position: -16px -48px; } -.ui-icon-arrowthick-1-e { background-position: -32px -48px; } -.ui-icon-arrowthick-1-se { background-position: -48px -48px; } -.ui-icon-arrowthick-1-s { background-position: -64px -48px; } -.ui-icon-arrowthick-1-sw { background-position: -80px -48px; } -.ui-icon-arrowthick-1-w { background-position: -96px -48px; } -.ui-icon-arrowthick-1-nw { background-position: -112px -48px; } -.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; } -.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; } -.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; } -.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; } -.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; } -.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; } -.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; } -.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; } -.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; } -.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; } -.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; } -.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; } -.ui-icon-arrowreturn-1-w { background-position: -64px -64px; } -.ui-icon-arrowreturn-1-n { background-position: -80px -64px; } -.ui-icon-arrowreturn-1-e { background-position: -96px -64px; } -.ui-icon-arrowreturn-1-s { background-position: -112px -64px; } -.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; } -.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; } -.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; } -.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; } -.ui-icon-arrow-4 { background-position: 0 -80px; } -.ui-icon-arrow-4-diag { background-position: -16px -80px; } -.ui-icon-extlink { background-position: -32px -80px; } -.ui-icon-newwin { background-position: -48px -80px; } -.ui-icon-refresh { background-position: -64px -80px; } -.ui-icon-shuffle { background-position: -80px -80px; } -.ui-icon-transfer-e-w { background-position: -96px -80px; } -.ui-icon-transferthick-e-w { background-position: -112px -80px; } -.ui-icon-folder-collapsed { background-position: 0 -96px; } -.ui-icon-folder-open { background-position: -16px -96px; } -.ui-icon-document { background-position: -32px -96px; } -.ui-icon-document-b { background-position: -48px -96px; } -.ui-icon-note { background-position: -64px -96px; } -.ui-icon-mail-closed { background-position: -80px -96px; } -.ui-icon-mail-open { background-position: -96px -96px; } -.ui-icon-suitcase { background-position: -112px -96px; } -.ui-icon-comment { background-position: -128px -96px; } -.ui-icon-person { background-position: -144px -96px; } -.ui-icon-print { background-position: -160px -96px; } -.ui-icon-trash { background-position: -176px -96px; } -.ui-icon-locked { background-position: -192px -96px; } -.ui-icon-unlocked { background-position: -208px -96px; } -.ui-icon-bookmark { background-position: -224px -96px; } -.ui-icon-tag { background-position: -240px -96px; } -.ui-icon-home { background-position: 0 -112px; } -.ui-icon-flag { background-position: -16px -112px; } -.ui-icon-calendar { background-position: -32px -112px; } -.ui-icon-cart { background-position: -48px -112px; } -.ui-icon-pencil { background-position: -64px -112px; } -.ui-icon-clock { background-position: -80px -112px; } -.ui-icon-disk { background-position: -96px -112px; } -.ui-icon-calculator { background-position: -112px -112px; } -.ui-icon-zoomin { background-position: -128px -112px; } -.ui-icon-zoomout { background-position: -144px -112px; } -.ui-icon-search { background-position: -160px -112px; } -.ui-icon-wrench { background-position: -176px -112px; } -.ui-icon-gear { background-position: -192px -112px; } -.ui-icon-heart { background-position: -208px -112px; } -.ui-icon-star { background-position: -224px -112px; } -.ui-icon-link { background-position: -240px -112px; } -.ui-icon-cancel { background-position: 0 -128px; } -.ui-icon-plus { background-position: -16px -128px; } -.ui-icon-plusthick { background-position: -32px -128px; } -.ui-icon-minus { background-position: -48px -128px; } -.ui-icon-minusthick { background-position: -64px -128px; } -.ui-icon-close { background-position: -80px -128px; } -.ui-icon-closethick { background-position: -96px -128px; } -.ui-icon-key { background-position: -112px -128px; } -.ui-icon-lightbulb { background-position: -128px -128px; } -.ui-icon-scissors { background-position: -144px -128px; } -.ui-icon-clipboard { background-position: -160px -128px; } -.ui-icon-copy { background-position: -176px -128px; } -.ui-icon-contact { background-position: -192px -128px; } -.ui-icon-image { background-position: -208px -128px; } -.ui-icon-video { background-position: -224px -128px; } -.ui-icon-script { background-position: -240px -128px; } -.ui-icon-alert { background-position: 0 -144px; } -.ui-icon-info { background-position: -16px -144px; } -.ui-icon-notice { background-position: -32px -144px; } -.ui-icon-help { background-position: -48px -144px; } -.ui-icon-check { background-position: -64px -144px; } -.ui-icon-bullet { background-position: -80px -144px; } -.ui-icon-radio-off { background-position: -96px -144px; } -.ui-icon-radio-on { background-position: -112px -144px; } -.ui-icon-pin-w { background-position: -128px -144px; } -.ui-icon-pin-s { background-position: -144px -144px; } -.ui-icon-play { background-position: 0 -160px; } -.ui-icon-pause { background-position: -16px -160px; } -.ui-icon-seek-next { background-position: -32px -160px; } -.ui-icon-seek-prev { background-position: -48px -160px; } -.ui-icon-seek-end { background-position: -64px -160px; } -.ui-icon-seek-start { background-position: -80px -160px; } -/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */ -.ui-icon-seek-first { background-position: -80px -160px; } -.ui-icon-stop { background-position: -96px -160px; } -.ui-icon-eject { background-position: -112px -160px; } -.ui-icon-volume-off { background-position: -128px -160px; } -.ui-icon-volume-on { background-position: -144px -160px; } -.ui-icon-power { background-position: 0 -176px; } -.ui-icon-signal-diag { background-position: -16px -176px; } -.ui-icon-signal { background-position: -32px -176px; } -.ui-icon-battery-0 { background-position: -48px -176px; } -.ui-icon-battery-1 { background-position: -64px -176px; } -.ui-icon-battery-2 { background-position: -80px -176px; } -.ui-icon-battery-3 { background-position: -96px -176px; } -.ui-icon-circle-plus { background-position: 0 -192px; } -.ui-icon-circle-minus { background-position: -16px -192px; } -.ui-icon-circle-close { background-position: -32px -192px; } -.ui-icon-circle-triangle-e { background-position: -48px -192px; } -.ui-icon-circle-triangle-s { background-position: -64px -192px; } -.ui-icon-circle-triangle-w { background-position: -80px -192px; } -.ui-icon-circle-triangle-n { background-position: -96px -192px; } -.ui-icon-circle-arrow-e { background-position: -112px -192px; } -.ui-icon-circle-arrow-s { background-position: -128px -192px; } -.ui-icon-circle-arrow-w { background-position: -144px -192px; } -.ui-icon-circle-arrow-n { background-position: -160px -192px; } -.ui-icon-circle-zoomin { background-position: -176px -192px; } -.ui-icon-circle-zoomout { background-position: -192px -192px; } -.ui-icon-circle-check { background-position: -208px -192px; } -.ui-icon-circlesmall-plus { background-position: 0 -208px; } -.ui-icon-circlesmall-minus { background-position: -16px -208px; } -.ui-icon-circlesmall-close { background-position: -32px -208px; } -.ui-icon-squaresmall-plus { background-position: -48px -208px; } -.ui-icon-squaresmall-minus { background-position: -64px -208px; } -.ui-icon-squaresmall-close { background-position: -80px -208px; } -.ui-icon-grip-dotted-vertical { background-position: 0 -224px; } -.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; } -.ui-icon-grip-solid-vertical { background-position: -32px -224px; } -.ui-icon-grip-solid-horizontal { background-position: -48px -224px; } -.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; } -.ui-icon-grip-diagonal-se { background-position: -80px -224px; } - - -/* Misc visuals -----------------------------------*/ - -/* Corner radius */ - -/* Overlays */ -.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); } -.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }/* - * jQuery UI Autocomplete 1.8.16 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Autocomplete#theming - */ -.ui-autocomplete { position: absolute; cursor: default; } - -/* workarounds */ -* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */ - -/* - * jQuery UI Menu 1.8.16 - * - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Menu#theming - */ -.ui-menu { - list-style:none; - padding: 2px; - margin: 0; - display:block; - float: left; -} -.ui-menu .ui-menu { - margin-top: -3px; -} -.ui-menu .ui-menu-item { - margin:0; - padding: 0; - zoom: 1; - float: left; - clear: left; - width: 100%; -} -.ui-menu .ui-menu-item a { - text-decoration:none; - display:block; - padding:.2em .4em; - line-height:1.5; - zoom:1; -} -.ui-menu .ui-menu-item a.ui-state-hover, -.ui-menu .ui-menu-item a.ui-state-active { - font-weight: normal; - margin: -1px; -} -/* - * jQuery UI Button 1.8.16 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Button#theming - */ -.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */ -.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */ -button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */ -.ui-button-icons-only { width: 3.4em; } -button.ui-button-icons-only { width: 3.7em; } - -/*button text element */ -.ui-button .ui-button-text { display: block; line-height: 1.4; } -.ui-button-text-only .ui-button-text { padding: .4em 1em; } -.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; } -.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; } -.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; } -.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; } -/* no icon support for input elements, provide padding by default */ -input.ui-button { padding: .4em 1em; } - -/*button icon element(s) */ -.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; } -.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; } -.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; } -.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; } -.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; } - -/*button sets*/ -.ui-buttonset { margin-right: 7px; } -.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; } - -/* workarounds */ -button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */ -/* - * jQuery UI Datepicker 1.8.16 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Datepicker#theming - */ -.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; } -.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; } -.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; } -.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; } -.ui-datepicker .ui-datepicker-prev { left:2px; } -.ui-datepicker .ui-datepicker-next { right:2px; } -.ui-datepicker .ui-datepicker-prev-hover { left:1px; } -.ui-datepicker .ui-datepicker-next-hover { right:1px; } -.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; } -.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; } -.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; } -.ui-datepicker select.ui-datepicker-month-year {width: 100%;} -.ui-datepicker select.ui-datepicker-month, -.ui-datepicker select.ui-datepicker-year { width: 49%;} -.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; } -.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0; } -.ui-datepicker td { border: 0; padding: 1px; } -.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; } -.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; } -.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; } -.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; } - -/* with multiple calendars */ -.ui-datepicker.ui-datepicker-multi { width:auto; } -.ui-datepicker-multi .ui-datepicker-group { float:left; } -.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; } -.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; } -.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; } -.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; } -.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; } -.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; } -.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; } -.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; } - -/* RTL support */ -.ui-datepicker-rtl { direction: rtl; } -.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; } -.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; } -.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; } -.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; } -.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; } -.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; } -.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; } -.ui-datepicker-rtl .ui-datepicker-group { float:right; } -.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; } -.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; } - -/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */ -.ui-datepicker-cover { - display: none; /*sorry for IE5*/ - display/**/: block; /*sorry for IE5*/ - position: absolute; /*must have*/ - z-index: -1; /*must have*/ - filter: mask(); /*must have*/ - top: -4px; /*must have*/ - left: -4px; /*must have*/ - width: 200px; /*must have*/ - height: 200px; /*must have*/ +/* + * jQuery UI CSS Framework 1.8.16 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Theming/API + */ + +/* Layout helpers +----------------------------------*/ +.ui-helper-hidden { display: none; } +.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); } +.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } +.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } +.ui-helper-clearfix { display: inline-block; } +/* required comment for clearfix to work in Opera \*/ +* html .ui-helper-clearfix { height:1%; } +.ui-helper-clearfix { display:block; } +/* end clearfix */ +.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } + + +/* Interaction Cues +----------------------------------*/ +.ui-state-disabled { cursor: default !important; } + + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; } + + +/* Misc visuals +----------------------------------*/ + +/* Overlays */ +.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; } + + +/* + * jQuery UI CSS Framework 1.8.16 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Theming/API + * + * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Lucida%20Grande,%20Lucida%20Sans,%20Arial,%20sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=0px&bgColorHeader=5c9ccc&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=55&borderColorHeader=4297d7&fcHeader=ffffff&iconColorHeader=d8e7f3&bgColorContent=fcfdfd&bgTextureContent=06_inset_hard.png&bgImgOpacityContent=100&borderColorContent=a6c9e2&fcContent=222222&iconColorContent=469bdd&bgColorDefault=dfeffc&bgTextureDefault=02_glass.png&bgImgOpacityDefault=85&borderColorDefault=c5dbec&fcDefault=2e6e9e&iconColorDefault=6da8d5&bgColorHover=d0e5f5&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=79b7e7&fcHover=1d5987&iconColorHover=217bc0&bgColorActive=f5f8f9&bgTextureActive=06_inset_hard.png&bgImgOpacityActive=100&borderColorActive=79b7e7&fcActive=e17009&iconColorActive=f9bd01&bgColorHighlight=fbec88&bgTextureHighlight=01_flat.png&bgImgOpacityHighlight=55&borderColorHighlight=fad42e&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=0px + */ + + +/* Component containers +----------------------------------*/ +.ui-widget { font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1.1em; } +.ui-widget .ui-widget { font-size: 1em; } +.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1em; } +.ui-widget-content { border: 1px solid #a6c9e2; background: #fcfdfd url(images/ui-bg_inset-hard_100_fcfdfd_1x100.png) 50% bottom repeat-x; color: #222222; } +.ui-widget-content a { color: #222222; } +.ui-widget-header { border: 1px solid #4297d7; background: #5c9ccc url(images/ui-bg_gloss-wave_55_5c9ccc_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; } +.ui-widget-header a { color: #ffffff; } + +/* Interaction states +----------------------------------*/ +.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #c5dbec; background: #dfeffc url(images/ui-bg_glass_85_dfeffc_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #2e6e9e; } +.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #2e6e9e; text-decoration: none; } +.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #79b7e7; background: #d0e5f5 url(images/ui-bg_glass_75_d0e5f5_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #1d5987; } +.ui-state-hover a, .ui-state-hover a:hover { color: #1d5987; text-decoration: none; } +.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #79b7e7; background: #f5f8f9 url(images/ui-bg_inset-hard_100_f5f8f9_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #e17009; } +.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #e17009; text-decoration: none; } +.ui-widget :active { outline: none; } + +/* Interaction Cues +----------------------------------*/ +.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fad42e; background: #fbec88 url(images/ui-bg_flat_55_fbec88_40x100.png) 50% 50% repeat-x; color: #363636; } +.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; } +.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; } +.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; } +.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; } +.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; } +.ui-priority-secondary, .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; } +.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; } + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_469bdd_256x240.png); } +.ui-widget-content .ui-icon {background-image: url(images/ui-icons_469bdd_256x240.png); } +.ui-widget-header .ui-icon {background-image: url(images/ui-icons_d8e7f3_256x240.png); } +.ui-state-default .ui-icon { background-image: url(images/ui-icons_6da8d5_256x240.png); } +.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_217bc0_256x240.png); } +.ui-state-active .ui-icon {background-image: url(images/ui-icons_f9bd01_256x240.png); } +.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); } +.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); } + +/* positioning */ +.ui-icon-carat-1-n { background-position: 0 0; } +.ui-icon-carat-1-ne { background-position: -16px 0; } +.ui-icon-carat-1-e { background-position: -32px 0; } +.ui-icon-carat-1-se { background-position: -48px 0; } +.ui-icon-carat-1-s { background-position: -64px 0; } +.ui-icon-carat-1-sw { background-position: -80px 0; } +.ui-icon-carat-1-w { background-position: -96px 0; } +.ui-icon-carat-1-nw { background-position: -112px 0; } +.ui-icon-carat-2-n-s { background-position: -128px 0; } +.ui-icon-carat-2-e-w { background-position: -144px 0; } +.ui-icon-triangle-1-n { background-position: 0 -16px; } +.ui-icon-triangle-1-ne { background-position: -16px -16px; } +.ui-icon-triangle-1-e { background-position: -32px -16px; } +.ui-icon-triangle-1-se { background-position: -48px -16px; } +.ui-icon-triangle-1-s { background-position: -64px -16px; } +.ui-icon-triangle-1-sw { background-position: -80px -16px; } +.ui-icon-triangle-1-w { background-position: -96px -16px; } +.ui-icon-triangle-1-nw { background-position: -112px -16px; } +.ui-icon-triangle-2-n-s { background-position: -128px -16px; } +.ui-icon-triangle-2-e-w { background-position: -144px -16px; } +.ui-icon-arrow-1-n { background-position: 0 -32px; } +.ui-icon-arrow-1-ne { background-position: -16px -32px; } +.ui-icon-arrow-1-e { background-position: -32px -32px; } +.ui-icon-arrow-1-se { background-position: -48px -32px; } +.ui-icon-arrow-1-s { background-position: -64px -32px; } +.ui-icon-arrow-1-sw { background-position: -80px -32px; } +.ui-icon-arrow-1-w { background-position: -96px -32px; } +.ui-icon-arrow-1-nw { background-position: -112px -32px; } +.ui-icon-arrow-2-n-s { background-position: -128px -32px; } +.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; } +.ui-icon-arrow-2-e-w { background-position: -160px -32px; } +.ui-icon-arrow-2-se-nw { background-position: -176px -32px; } +.ui-icon-arrowstop-1-n { background-position: -192px -32px; } +.ui-icon-arrowstop-1-e { background-position: -208px -32px; } +.ui-icon-arrowstop-1-s { background-position: -224px -32px; } +.ui-icon-arrowstop-1-w { background-position: -240px -32px; } +.ui-icon-arrowthick-1-n { background-position: 0 -48px; } +.ui-icon-arrowthick-1-ne { background-position: -16px -48px; } +.ui-icon-arrowthick-1-e { background-position: -32px -48px; } +.ui-icon-arrowthick-1-se { background-position: -48px -48px; } +.ui-icon-arrowthick-1-s { background-position: -64px -48px; } +.ui-icon-arrowthick-1-sw { background-position: -80px -48px; } +.ui-icon-arrowthick-1-w { background-position: -96px -48px; } +.ui-icon-arrowthick-1-nw { background-position: -112px -48px; } +.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; } +.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; } +.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; } +.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; } +.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; } +.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; } +.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; } +.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; } +.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; } +.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; } +.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; } +.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; } +.ui-icon-arrowreturn-1-w { background-position: -64px -64px; } +.ui-icon-arrowreturn-1-n { background-position: -80px -64px; } +.ui-icon-arrowreturn-1-e { background-position: -96px -64px; } +.ui-icon-arrowreturn-1-s { background-position: -112px -64px; } +.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; } +.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; } +.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; } +.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; } +.ui-icon-arrow-4 { background-position: 0 -80px; } +.ui-icon-arrow-4-diag { background-position: -16px -80px; } +.ui-icon-extlink { background-position: -32px -80px; } +.ui-icon-newwin { background-position: -48px -80px; } +.ui-icon-refresh { background-position: -64px -80px; } +.ui-icon-shuffle { background-position: -80px -80px; } +.ui-icon-transfer-e-w { background-position: -96px -80px; } +.ui-icon-transferthick-e-w { background-position: -112px -80px; } +.ui-icon-folder-collapsed { background-position: 0 -96px; } +.ui-icon-folder-open { background-position: -16px -96px; } +.ui-icon-document { background-position: -32px -96px; } +.ui-icon-document-b { background-position: -48px -96px; } +.ui-icon-note { background-position: -64px -96px; } +.ui-icon-mail-closed { background-position: -80px -96px; } +.ui-icon-mail-open { background-position: -96px -96px; } +.ui-icon-suitcase { background-position: -112px -96px; } +.ui-icon-comment { background-position: -128px -96px; } +.ui-icon-person { background-position: -144px -96px; } +.ui-icon-print { background-position: -160px -96px; } +.ui-icon-trash { background-position: -176px -96px; } +.ui-icon-locked { background-position: -192px -96px; } +.ui-icon-unlocked { background-position: -208px -96px; } +.ui-icon-bookmark { background-position: -224px -96px; } +.ui-icon-tag { background-position: -240px -96px; } +.ui-icon-home { background-position: 0 -112px; } +.ui-icon-flag { background-position: -16px -112px; } +.ui-icon-calendar { background-position: -32px -112px; } +.ui-icon-cart { background-position: -48px -112px; } +.ui-icon-pencil { background-position: -64px -112px; } +.ui-icon-clock { background-position: -80px -112px; } +.ui-icon-disk { background-position: -96px -112px; } +.ui-icon-calculator { background-position: -112px -112px; } +.ui-icon-zoomin { background-position: -128px -112px; } +.ui-icon-zoomout { background-position: -144px -112px; } +.ui-icon-search { background-position: -160px -112px; } +.ui-icon-wrench { background-position: -176px -112px; } +.ui-icon-gear { background-position: -192px -112px; } +.ui-icon-heart { background-position: -208px -112px; } +.ui-icon-star { background-position: -224px -112px; } +.ui-icon-link { background-position: -240px -112px; } +.ui-icon-cancel { background-position: 0 -128px; } +.ui-icon-plus { background-position: -16px -128px; } +.ui-icon-plusthick { background-position: -32px -128px; } +.ui-icon-minus { background-position: -48px -128px; } +.ui-icon-minusthick { background-position: -64px -128px; } +.ui-icon-close { background-position: -80px -128px; } +.ui-icon-closethick { background-position: -96px -128px; } +.ui-icon-key { background-position: -112px -128px; } +.ui-icon-lightbulb { background-position: -128px -128px; } +.ui-icon-scissors { background-position: -144px -128px; } +.ui-icon-clipboard { background-position: -160px -128px; } +.ui-icon-copy { background-position: -176px -128px; } +.ui-icon-contact { background-position: -192px -128px; } +.ui-icon-image { background-position: -208px -128px; } +.ui-icon-video { background-position: -224px -128px; } +.ui-icon-script { background-position: -240px -128px; } +.ui-icon-alert { background-position: 0 -144px; } +.ui-icon-info { background-position: -16px -144px; } +.ui-icon-notice { background-position: -32px -144px; } +.ui-icon-help { background-position: -48px -144px; } +.ui-icon-check { background-position: -64px -144px; } +.ui-icon-bullet { background-position: -80px -144px; } +.ui-icon-radio-off { background-position: -96px -144px; } +.ui-icon-radio-on { background-position: -112px -144px; } +.ui-icon-pin-w { background-position: -128px -144px; } +.ui-icon-pin-s { background-position: -144px -144px; } +.ui-icon-play { background-position: 0 -160px; } +.ui-icon-pause { background-position: -16px -160px; } +.ui-icon-seek-next { background-position: -32px -160px; } +.ui-icon-seek-prev { background-position: -48px -160px; } +.ui-icon-seek-end { background-position: -64px -160px; } +.ui-icon-seek-start { background-position: -80px -160px; } +/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */ +.ui-icon-seek-first { background-position: -80px -160px; } +.ui-icon-stop { background-position: -96px -160px; } +.ui-icon-eject { background-position: -112px -160px; } +.ui-icon-volume-off { background-position: -128px -160px; } +.ui-icon-volume-on { background-position: -144px -160px; } +.ui-icon-power { background-position: 0 -176px; } +.ui-icon-signal-diag { background-position: -16px -176px; } +.ui-icon-signal { background-position: -32px -176px; } +.ui-icon-battery-0 { background-position: -48px -176px; } +.ui-icon-battery-1 { background-position: -64px -176px; } +.ui-icon-battery-2 { background-position: -80px -176px; } +.ui-icon-battery-3 { background-position: -96px -176px; } +.ui-icon-circle-plus { background-position: 0 -192px; } +.ui-icon-circle-minus { background-position: -16px -192px; } +.ui-icon-circle-close { background-position: -32px -192px; } +.ui-icon-circle-triangle-e { background-position: -48px -192px; } +.ui-icon-circle-triangle-s { background-position: -64px -192px; } +.ui-icon-circle-triangle-w { background-position: -80px -192px; } +.ui-icon-circle-triangle-n { background-position: -96px -192px; } +.ui-icon-circle-arrow-e { background-position: -112px -192px; } +.ui-icon-circle-arrow-s { background-position: -128px -192px; } +.ui-icon-circle-arrow-w { background-position: -144px -192px; } +.ui-icon-circle-arrow-n { background-position: -160px -192px; } +.ui-icon-circle-zoomin { background-position: -176px -192px; } +.ui-icon-circle-zoomout { background-position: -192px -192px; } +.ui-icon-circle-check { background-position: -208px -192px; } +.ui-icon-circlesmall-plus { background-position: 0 -208px; } +.ui-icon-circlesmall-minus { background-position: -16px -208px; } +.ui-icon-circlesmall-close { background-position: -32px -208px; } +.ui-icon-squaresmall-plus { background-position: -48px -208px; } +.ui-icon-squaresmall-minus { background-position: -64px -208px; } +.ui-icon-squaresmall-close { background-position: -80px -208px; } +.ui-icon-grip-dotted-vertical { background-position: 0 -224px; } +.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; } +.ui-icon-grip-solid-vertical { background-position: -32px -224px; } +.ui-icon-grip-solid-horizontal { background-position: -48px -224px; } +.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; } +.ui-icon-grip-diagonal-se { background-position: -80px -224px; } + + +/* Misc visuals +----------------------------------*/ + +/* Corner radius */ + +/* Overlays */ +.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); } +.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }/* + * jQuery UI Autocomplete 1.8.16 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Autocomplete#theming + */ +.ui-autocomplete { position: absolute; cursor: default; } + +/* workarounds */ +* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */ + +/* + * jQuery UI Menu 1.8.16 + * + * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Menu#theming + */ +.ui-menu { + list-style:none; + padding: 2px; + margin: 0; + display:block; + float: left; +} +.ui-menu .ui-menu { + margin-top: -3px; +} +.ui-menu .ui-menu-item { + margin:0; + padding: 0; + zoom: 1; + float: left; + clear: left; + width: 100%; +} +.ui-menu .ui-menu-item a { + text-decoration:none; + display:block; + padding:.2em .4em; + line-height:1.5; + zoom:1; +} +.ui-menu .ui-menu-item a.ui-state-hover, +.ui-menu .ui-menu-item a.ui-state-active { + font-weight: normal; + margin: -1px; +} +/* + * jQuery UI Button 1.8.16 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Button#theming + */ +.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */ +.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */ +button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */ +.ui-button-icons-only { width: 3.4em; } +button.ui-button-icons-only { width: 3.7em; } + +/*button text element */ +.ui-button .ui-button-text { display: block; line-height: 1.4; } +.ui-button-text-only .ui-button-text { padding: .4em 1em; } +.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; } +.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; } +.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; } +.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; } +/* no icon support for input elements, provide padding by default */ +input.ui-button { padding: .4em 1em; } + +/*button icon element(s) */ +.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; } +.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; } +.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; } +.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; } +.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; } + +/*button sets*/ +.ui-buttonset { margin-right: 7px; } +.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; } + +/* workarounds */ +button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */ +/* + * jQuery UI Datepicker 1.8.16 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Datepicker#theming + */ +.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; } +.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; } +.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; } +.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; } +.ui-datepicker .ui-datepicker-prev { left:2px; } +.ui-datepicker .ui-datepicker-next { right:2px; } +.ui-datepicker .ui-datepicker-prev-hover { left:1px; } +.ui-datepicker .ui-datepicker-next-hover { right:1px; } +.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; } +.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; } +.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; } +.ui-datepicker select.ui-datepicker-month-year {width: 100%;} +.ui-datepicker select.ui-datepicker-month, +.ui-datepicker select.ui-datepicker-year { width: 49%;} +.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; } +.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0; } +.ui-datepicker td { border: 0; padding: 1px; } +.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; } +.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; } +.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; } +.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; } + +/* with multiple calendars */ +.ui-datepicker.ui-datepicker-multi { width:auto; } +.ui-datepicker-multi .ui-datepicker-group { float:left; } +.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; } +.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; } +.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; } +.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; } +.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; } +.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; } +.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; } +.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; } + +/* RTL support */ +.ui-datepicker-rtl { direction: rtl; } +.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; } +.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; } +.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; } +.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; } +.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; } +.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; } +.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; } +.ui-datepicker-rtl .ui-datepicker-group { float:right; } +.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; } +.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; } + +/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */ +.ui-datepicker-cover { + display: none; /*sorry for IE5*/ + display/**/: block; /*sorry for IE5*/ + position: absolute; /*must have*/ + z-index: -1; /*must have*/ + filter: mask(); /*must have*/ + top: -4px; /*must have*/ + left: -4px; /*must have*/ + width: 200px; /*must have*/ + height: 200px; /*must have*/ } \ No newline at end of file diff --git a/interface/web/themes/default-304/css/screen/tipsy.css b/interface/web/themes/default-304/css/screen/tipsy.css index ea735c7627..3d62954088 100644 --- a/interface/web/themes/default-304/css/screen/tipsy.css +++ b/interface/web/themes/default-304/css/screen/tipsy.css @@ -1,25 +1,25 @@ -.tipsy { font-size: 10px; position: absolute; padding: 5px; z-index: 100000; } - .tipsy-inner { background-color: #000; color: #FFF; max-width: 350px; padding: 5px 8px 4px 8px; text-align: left; } - - /* Rounded corners */ - .tipsy-inner { border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; } - - /* Uncomment for shadow */ - /*.tipsy-inner { box-shadow: 0 0 5px #000000; -webkit-box-shadow: 0 0 5px #000000; -moz-box-shadow: 0 0 5px #000000; }*/ - - .tipsy-arrow { position: absolute; width: 0; height: 0; line-height: 0; border: 5px dashed #000; } - - /* Rules to colour arrows */ - .tipsy-arrow-n { border-bottom-color: #000; } - .tipsy-arrow-s { border-top-color: #000; } - .tipsy-arrow-e { border-left-color: #000; } - .tipsy-arrow-w { border-right-color: #000; } - - .tipsy-n .tipsy-arrow { top: 0px; left: 50%; margin-left: -5px; border-bottom-style: solid; border-top: none; border-left-color: transparent; border-right-color: transparent; } - .tipsy-nw .tipsy-arrow { top: 0; left: 10px; border-bottom-style: solid; border-top: none; border-left-color: transparent; border-right-color: transparent;} - .tipsy-ne .tipsy-arrow { top: 0; right: 10px; border-bottom-style: solid; border-top: none; border-left-color: transparent; border-right-color: transparent;} - .tipsy-s .tipsy-arrow { bottom: 0; left: 50%; margin-left: -5px; border-top-style: solid; border-bottom: none; border-left-color: transparent; border-right-color: transparent; } - .tipsy-sw .tipsy-arrow { bottom: 0; left: 10px; border-top-style: solid; border-bottom: none; border-left-color: transparent; border-right-color: transparent; } - .tipsy-se .tipsy-arrow { bottom: 0; right: 10px; border-top-style: solid; border-bottom: none; border-left-color: transparent; border-right-color: transparent; } - .tipsy-e .tipsy-arrow { right: 0; top: 50%; margin-top: -5px; border-left-style: solid; border-right: none; border-top-color: transparent; border-bottom-color: transparent; } - .tipsy-w .tipsy-arrow { left: 0; top: 50%; margin-top: -5px; border-right-style: solid; border-left: none; border-top-color: transparent; border-bottom-color: transparent; } +.tipsy { font-size: 10px; position: absolute; padding: 5px; z-index: 100000; } + .tipsy-inner { background-color: #000; color: #FFF; max-width: 350px; padding: 5px 8px 4px 8px; text-align: left; } + + /* Rounded corners */ + .tipsy-inner { border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; } + + /* Uncomment for shadow */ + /*.tipsy-inner { box-shadow: 0 0 5px #000000; -webkit-box-shadow: 0 0 5px #000000; -moz-box-shadow: 0 0 5px #000000; }*/ + + .tipsy-arrow { position: absolute; width: 0; height: 0; line-height: 0; border: 5px dashed #000; } + + /* Rules to colour arrows */ + .tipsy-arrow-n { border-bottom-color: #000; } + .tipsy-arrow-s { border-top-color: #000; } + .tipsy-arrow-e { border-left-color: #000; } + .tipsy-arrow-w { border-right-color: #000; } + + .tipsy-n .tipsy-arrow { top: 0px; left: 50%; margin-left: -5px; border-bottom-style: solid; border-top: none; border-left-color: transparent; border-right-color: transparent; } + .tipsy-nw .tipsy-arrow { top: 0; left: 10px; border-bottom-style: solid; border-top: none; border-left-color: transparent; border-right-color: transparent;} + .tipsy-ne .tipsy-arrow { top: 0; right: 10px; border-bottom-style: solid; border-top: none; border-left-color: transparent; border-right-color: transparent;} + .tipsy-s .tipsy-arrow { bottom: 0; left: 50%; margin-left: -5px; border-top-style: solid; border-bottom: none; border-left-color: transparent; border-right-color: transparent; } + .tipsy-sw .tipsy-arrow { bottom: 0; left: 10px; border-top-style: solid; border-bottom: none; border-left-color: transparent; border-right-color: transparent; } + .tipsy-se .tipsy-arrow { bottom: 0; right: 10px; border-top-style: solid; border-bottom: none; border-left-color: transparent; border-right-color: transparent; } + .tipsy-e .tipsy-arrow { right: 0; top: 50%; margin-top: -5px; border-left-style: solid; border-right: none; border-top-color: transparent; border-bottom-color: transparent; } + .tipsy-w .tipsy-arrow { left: 0; top: 50%; margin-top: -5px; border-right-style: solid; border-left: none; border-top-color: transparent; border-bottom-color: transparent; } diff --git a/interface/web/themes/default-304/templates/monitor/show_sys_state.htm b/interface/web/themes/default-304/templates/monitor/show_sys_state.htm index 9a5830c19c..740141b269 100644 --- a/interface/web/themes/default-304/templates/monitor/show_sys_state.htm +++ b/interface/web/themes/default-304/templates/monitor/show_sys_state.htm @@ -1,25 +1,25 @@ -

-

- -
- -
-
-
-
- - -
-
-
-
- -
-
-
-
-
- +

+

+ +
+ +
+
+
+
+ + +
+
+
+
+ +
+
+
+
+
+
\ No newline at end of file diff --git a/interface/web/themes/default-304/templates/sites/aps_install_package.htm b/interface/web/themes/default-304/templates/sites/aps_install_package.htm index eeed54f970..e6ce02a445 100644 --- a/interface/web/themes/default-304/templates/sites/aps_install_package.htm +++ b/interface/web/themes/default-304/templates/sites/aps_install_package.htm @@ -1,56 +1,56 @@ -

- {tmpl_var name='installation_txt'}: {tmpl_var name='pkg_name'} {tmpl_var name='pkg_version'}-{tmpl_var name='pkg_release'} - - - {tmpl_var name='pkg_name'} - - -

- - -

ERROR

    {tmpl_var name='error'}
- - -
- -
-
- {tmpl_var name='basic_settings_txt'} -
- -
http(s):// 
DOMAIN_LIST_SPACE
 / 
- -
- -
- - -
- - - PKG_SETTINGS_SPACE - - {tmpl_var name='license_txt'} -
- - {tmpl_var name='pkg_license_name'}
 - - {tmpl_var name='pkg_license_content'} - - - -
-
- - checked />  {tmpl_var name='acceptance_text'} -
-
- - -
- - -
-
- +

+ {tmpl_var name='installation_txt'}: {tmpl_var name='pkg_name'} {tmpl_var name='pkg_version'}-{tmpl_var name='pkg_release'} + + + {tmpl_var name='pkg_name'} + + +

+ + +

ERROR

    {tmpl_var name='error'}
+ + +
+ +
+
+ {tmpl_var name='basic_settings_txt'} +
+ +
http(s):// 
DOMAIN_LIST_SPACE
 / 
+ +
+ +
+ + +
+ + + PKG_SETTINGS_SPACE + + {tmpl_var name='license_txt'} +
+ + {tmpl_var name='pkg_license_name'}
 + + {tmpl_var name='pkg_license_content'} + + + +
+
+ + checked />  {tmpl_var name='acceptance_text'} +
+
+ + +
+ + +
+
+
\ No newline at end of file diff --git a/interface/web/themes/default-304/templates/sites/aps_instances_list.htm b/interface/web/themes/default-304/templates/sites/aps_instances_list.htm index 6f4ab80e87..640c0bb96c 100644 --- a/interface/web/themes/default-304/templates/sites/aps_instances_list.htm +++ b/interface/web/themes/default-304/templates/sites/aps_instances_list.htm @@ -1,62 +1,62 @@ -

{tmpl_var name="list_head_txt"}

- -
- -
-
{tmpl_var name="list_head_txt"} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{tmpl_var name='name_txt'}{tmpl_var name='version_txt'}{tmpl_var name='customer_txt'}{tmpl_var name='install_location_txt'}{tmpl_var name='status_txt'} 
  - -
{tmpl_var name='package_name'}{tmpl_var name='package_version'}-{tmpl_var name='package_release'}{tmpl_var name='customer_name'}{tmpl_var name='install_location_short'}{tmpl_var name='instance_status'} -
- {tmpl_var name='delete_txt'} - {tmpl_var name='reinstall_txt'} -
-
{tmpl_var name='paging'}
-
-
- +

{tmpl_var name="list_head_txt"}

+ +
+ +
+
{tmpl_var name="list_head_txt"} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{tmpl_var name='name_txt'}{tmpl_var name='version_txt'}{tmpl_var name='customer_txt'}{tmpl_var name='install_location_txt'}{tmpl_var name='status_txt'} 
  + +
{tmpl_var name='package_name'}{tmpl_var name='package_version'}-{tmpl_var name='package_release'}{tmpl_var name='customer_name'}{tmpl_var name='install_location_short'}{tmpl_var name='instance_status'} +
+ {tmpl_var name='delete_txt'} + {tmpl_var name='reinstall_txt'} +
+
{tmpl_var name='paging'}
+
+
+
\ No newline at end of file diff --git a/interface/web/themes/default-304/templates/sites/aps_packagedetails_show.htm b/interface/web/themes/default-304/templates/sites/aps_packagedetails_show.htm index 18a6fc9e96..351d3ac046 100644 --- a/interface/web/themes/default-304/templates/sites/aps_packagedetails_show.htm +++ b/interface/web/themes/default-304/templates/sites/aps_packagedetails_show.htm @@ -1,139 +1,139 @@ -

- - {tmpl_var name='pkg_name'} - - {tmpl_var name='pkg_name'} -

-{tmpl_var name='pkg_summary'} -

 

- -
-
- -
-

 

 

-
- - -
- - -
-

 

- -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{tmpl_var name='version_txt'}{tmpl_var name='pkg_version'} (Release {tmpl_var name='pkg_release'})
{tmpl_var name='category_txt'}{tmpl_var name='pkg_category'}
{tmpl_var name='description_txt'}{tmpl_var name='pkg_description'}
{tmpl_var name='homepage_txt'} - {tmpl_var name='pkg_homepage'} -
{tmpl_var name='installed_size_txt'}{tmpl_var name='pkg_installed_size'}
{tmpl_var name='supported_languages_txt'}{tmpl_var name='pkg_languages'}
{tmpl_var name='config_script_txt'}{tmpl_var name='pkg_config_script'}
{tmpl_var name='license_txt'} - {tmpl_var name='pkg_license_name'}
 - {tmpl_var name='pkg_license_content'} - - - -
- - {tmpl_var name='ScreenDescription'}
- {tmpl_var name='ScreenDescription'}

- -
-
    - -
  • {tmpl_var name='ChangelogVersion'}
    • -
      - -
    • {tmpl_var name='ChangelogDescription'}
      • -       -
    -     -
-
{tmpl_var name='php_extensions_txt'}{tmpl_var name='pkg_requirements_php_extensions'}
{tmpl_var name='php_settings_txt'} - {tmpl_var name='PHPSettingName'} = {tmpl_var name='PHPSettingValue'}
 -
{tmpl_var name='supported_php_versions_txt'}{tmpl_var name='pkg_requirements_supported_php_versions'}
{tmpl_var name='database_txt'}{tmpl_var name='pkg_requirements_database'}
-
- +

+ + {tmpl_var name='pkg_name'} + + {tmpl_var name='pkg_name'} +

+{tmpl_var name='pkg_summary'} +

 

+ +
+
+ +
+

 

 

+
+ + +
+ + +
+

 

+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{tmpl_var name='version_txt'}{tmpl_var name='pkg_version'} (Release {tmpl_var name='pkg_release'})
{tmpl_var name='category_txt'}{tmpl_var name='pkg_category'}
{tmpl_var name='description_txt'}{tmpl_var name='pkg_description'}
{tmpl_var name='homepage_txt'} + {tmpl_var name='pkg_homepage'} +
{tmpl_var name='installed_size_txt'}{tmpl_var name='pkg_installed_size'}
{tmpl_var name='supported_languages_txt'}{tmpl_var name='pkg_languages'}
{tmpl_var name='config_script_txt'}{tmpl_var name='pkg_config_script'}
{tmpl_var name='license_txt'} + {tmpl_var name='pkg_license_name'}
 + {tmpl_var name='pkg_license_content'} + + + +
+ + {tmpl_var name='ScreenDescription'}
+ {tmpl_var name='ScreenDescription'}

+ +
+
    + +
  • {tmpl_var name='ChangelogVersion'}
    • +
      + +
    • {tmpl_var name='ChangelogDescription'}
      • +       +
    +     +
+
{tmpl_var name='php_extensions_txt'}{tmpl_var name='pkg_requirements_php_extensions'}
{tmpl_var name='php_settings_txt'} + {tmpl_var name='PHPSettingName'} = {tmpl_var name='PHPSettingValue'}
 +
{tmpl_var name='supported_php_versions_txt'}{tmpl_var name='pkg_requirements_supported_php_versions'}
{tmpl_var name='database_txt'}{tmpl_var name='pkg_requirements_database'}
+
+
\ No newline at end of file diff --git a/interface/web/themes/default-304/templates/sites/aps_packages_list.htm b/interface/web/themes/default-304/templates/sites/aps_packages_list.htm index fe99743039..e7db3e84a4 100644 --- a/interface/web/themes/default-304/templates/sites/aps_packages_list.htm +++ b/interface/web/themes/default-304/templates/sites/aps_packages_list.htm @@ -1,50 +1,50 @@ -

{tmpl_var name="list_head_txt"}

- -
- -
-
{tmpl_var name="list_head_txt"} ({tmpl_var name='package_count'}) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{tmpl_var name='name_txt'}{tmpl_var name='version_txt'}{tmpl_var name='category_txt'}{tmpl_var name='status_txt'} 
{tmpl_var name='name'}{tmpl_var name='version'}-{tmpl_var name='release'}{tmpl_var name='category'}{tmpl_var name='package_status'} 
{tmpl_var name='paging'}
-
-
- +

{tmpl_var name="list_head_txt"}

+ +
+ +
+
{tmpl_var name="list_head_txt"} ({tmpl_var name='package_count'}) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{tmpl_var name='name_txt'}{tmpl_var name='version_txt'}{tmpl_var name='category_txt'}{tmpl_var name='status_txt'} 
{tmpl_var name='name'}{tmpl_var name='version'}-{tmpl_var name='release'}{tmpl_var name='category'}{tmpl_var name='package_status'} 
{tmpl_var name='paging'}
+
+
+
\ No newline at end of file diff --git a/interface/web/themes/default/CHANGELOG b/interface/web/themes/default/CHANGELOG index 454964210b..cae152a05c 100644 --- a/interface/web/themes/default/CHANGELOG +++ b/interface/web/themes/default/CHANGELOG @@ -1,32 +1,32 @@ -CHANGELOG -default -> default-v2 -source: default $3241 07/06/2012 @ 12:00 UTC+2 -resources @ https://github.com/foe-services/ispc-resources - -- changed doctype to (HTML5) -- rm yaml/* -- rm css/patches/* -- cp yaml/patches/iehacks.css css/* -- rm