diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index aea0a6469efd316c24e2791add5f00871c40a165..e262f31fa52f54ecb89f00695b447d2677728bef 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -2841,9 +2841,9 @@ class installer_base {
// If this is a webserver
if($conf['nginx']['installed'] == true)
- exec("$le_client $certonly $acme_version --nginx --email postmaster@$hostname $renew_hook");
+ exec("$le_client $certonly $acme_version --nginx --email postmaster@$hostname -d $hostname $renew_hook");
elseif($conf['apache']['installed'] == true)
- exec("$le_client $certonly $acme_version --apache --email postmaster@$hostname $renew_hook");
+ exec("$le_client $certonly $acme_version --apache --email postmaster@$hostname -d $hostname $renew_hook");
// Else, it is not webserver, so we use standalone
else
exec("$le_client $certonly $acme_version --standalone --email postmaster@$hostname -d $hostname $hook");
diff --git a/install/tpl/apache_ispconfig.conf.master b/install/tpl/apache_ispconfig.conf.master
index 8c2292d6a383192fe02ab9665a897c8745dc3bff..d200014bd1779f1145619695dbf02fc4f3972798 100644
--- a/install/tpl/apache_ispconfig.conf.master
+++ b/install/tpl/apache_ispconfig.conf.master
@@ -1,3 +1,8 @@
+################################################
+# ISPConfig General Apache Options
+################################################
+ServerTokens ProductOnly
+ServerSignature Off
################################################
# ISPConfig Logfile configuration for vlogger
diff --git a/interface/web/admin/lib/lang/ar_server_config.lng b/interface/web/admin/lib/lang/ar_server_config.lng
index ed8e236071c42a01934b9a1cfa087901e77fd7c6..468db20b066b1db720ad005f4f7e6d1f1b8a916c 100644
--- a/interface/web/admin/lib/lang/ar_server_config.lng
+++ b/interface/web/admin/lib/lang/ar_server_config.lng
@@ -1,5 +1,6 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
diff --git a/interface/web/admin/lib/lang/ar_users.lng b/interface/web/admin/lib/lang/ar_users.lng
index dd4ef0143de1544544ac635454cd3dc9040bbddf..369d56559510f445a96d40969035f4cbfde07ca5 100644
--- a/interface/web/admin/lib/lang/ar_users.lng
+++ b/interface/web/admin/lib/lang/ar_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Username';
$wb['username_err'] = 'The username is too long or contains invalid characters.';
$wb['username_empty'] = 'The username is empty.';
$wb['username_unique'] = 'There is already a user with this username.';
-$wb['passwort_txt'] = 'Password';
+$wb['password_txt'] = 'Password';
$wb['password_strength_txt'] = 'Password strength';
$wb['modules_txt'] = 'Module';
$wb['startmodule_txt'] = 'Startmodule';
diff --git a/interface/web/admin/lib/lang/ar_users_list.lng b/interface/web/admin/lib/lang/ar_users_list.lng
index c59b544d19b1b684f500e2253d9b23bc22f1a9f2..4f7a7469b020b2d31638c6ed69dd2e40a6b595b6 100644
--- a/interface/web/admin/lib/lang/ar_users_list.lng
+++ b/interface/web/admin/lib/lang/ar_users_list.lng
@@ -4,6 +4,6 @@ $wb['username_txt'] = 'Username';
$wb['client_id_txt'] = 'Client ID';
$wb['active_txt'] = 'Active';
$wb['add_new_record_txt'] = 'Add new user';
-$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
+$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing users or groups here may cause data loss!';
$wb['groups_txt'] = 'Groups';
?>
diff --git a/interface/web/admin/lib/lang/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng
index 71e5bfd5c6c5229e6864bd3f0bdca49668aeb46f..283c3a1b234ad735250f3a03bbda1d0f46ca9a9a 100644
--- a/interface/web/admin/lib/lang/bg_server_config.lng
+++ b/interface/web/admin/lib/lang/bg_server_config.lng
@@ -1,5 +1,6 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
diff --git a/interface/web/admin/lib/lang/bg_users.lng b/interface/web/admin/lib/lang/bg_users.lng
index 801d9e70a693b63b0e68dd29122529a49422e0d9..a7d669bd2284be54fffb0e9c9f7be1989db24aac 100644
--- a/interface/web/admin/lib/lang/bg_users.lng
+++ b/interface/web/admin/lib/lang/bg_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'ПотребителÑко име';
$wb['username_err'] = 'ПотребителÑкото име е твърде дълго или Ñъдържа непозволени Ñимволи.';
$wb['username_empty'] = 'Полето Ñ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ñкото име е празно.';
$wb['username_unique'] = 'Вече ÑъщеÑтвува потребител Ñ Ñ‚Ð¾Ð²Ð° потребителÑко име.';
-$wb['passwort_txt'] = 'Парола';
+$wb['password_txt'] = 'Парола';
$wb['password_strength_txt'] = 'Сила на паролата';
$wb['modules_txt'] = 'Модул';
$wb['startmodule_txt'] = 'Старт модул';
diff --git a/interface/web/admin/lib/lang/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng
index e7b59e3cdbb99122565f4e83f4623f8a22b63533..b1c5441ff0ace5ea7b574bfc6aa4821adaff13cc 100644
--- a/interface/web/admin/lib/lang/br_server_config.lng
+++ b/interface/web/admin/lib/lang/br_server_config.lng
@@ -1,5 +1,6 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['ufw_enable_txt'] = 'Habilitar';
diff --git a/interface/web/admin/lib/lang/br_users.lng b/interface/web/admin/lib/lang/br_users.lng
index 18e6085b8322dc49e8eeecb6a571c7b88bd3e878..de664c674dad77d6ea0986b4f00e255f4404e894 100644
--- a/interface/web/admin/lib/lang/br_users.lng
+++ b/interface/web/admin/lib/lang/br_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Usuário';
$wb['username_err'] = 'O nome do usuário é muito longo ou contém caracteres inválidos.';
$wb['username_empty'] = 'O nome do usuário está em branco.';
$wb['username_unique'] = 'Já existe um usuário com este nome.';
-$wb['passwort_txt'] = 'Senha';
+$wb['password_txt'] = 'Senha';
$wb['password_strength_txt'] = 'Dificuldade da senha';
$wb['modules_txt'] = 'Módulo';
$wb['startmodule_txt'] = 'Módulo inicial';
diff --git a/interface/web/admin/lib/lang/ca_server_config.lng b/interface/web/admin/lib/lang/ca_server_config.lng
index effc175e85b921e3d654d57212c595b1a5f9af8b..1552eb019616cd52a54f0e7fca42d2281f3f467a 100644
--- a/interface/web/admin/lib/lang/ca_server_config.lng
+++ b/interface/web/admin/lib/lang/ca_server_config.lng
@@ -1,5 +1,6 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['ufw_enable_txt'] = 'Enable';
diff --git a/interface/web/admin/lib/lang/ca_users.lng b/interface/web/admin/lib/lang/ca_users.lng
index dd4ef0143de1544544ac635454cd3dc9040bbddf..369d56559510f445a96d40969035f4cbfde07ca5 100644
--- a/interface/web/admin/lib/lang/ca_users.lng
+++ b/interface/web/admin/lib/lang/ca_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Username';
$wb['username_err'] = 'The username is too long or contains invalid characters.';
$wb['username_empty'] = 'The username is empty.';
$wb['username_unique'] = 'There is already a user with this username.';
-$wb['passwort_txt'] = 'Password';
+$wb['password_txt'] = 'Password';
$wb['password_strength_txt'] = 'Password strength';
$wb['modules_txt'] = 'Module';
$wb['startmodule_txt'] = 'Startmodule';
diff --git a/interface/web/admin/lib/lang/ca_users_list.lng b/interface/web/admin/lib/lang/ca_users_list.lng
index 00128b512788558211283104b74166ba1b54b19d..dec5cc2c04f2a98ac737ac7f6aefc743831a1938 100644
--- a/interface/web/admin/lib/lang/ca_users_list.lng
+++ b/interface/web/admin/lib/lang/ca_users_list.lng
@@ -5,5 +5,5 @@ $wb['client_id_txt'] = 'User ID';
$wb['active_txt'] = 'Active';
$wb['groups_txt'] = 'Groups';
$wb['add_new_record_txt'] = 'Add new user';
-$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
+$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing users or groups here may cause data loss!';
?>
diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng
index 6e4f4c7faafd114ba50560f411acbd6d59286c45..0a6ecde34b0d91115e43383b7c2f0abe68070d18 100644
--- a/interface/web/admin/lib/lang/cz_server_config.lng
+++ b/interface/web/admin/lib/lang/cz_server_config.lng
@@ -1,5 +1,6 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot adresář';
diff --git a/interface/web/admin/lib/lang/cz_users.lng b/interface/web/admin/lib/lang/cz_users.lng
index 9aa92402f07436b01f6339052f7f1d2571efa02d..00eefa1d5cb2d57d102700fe90fb26d2ab8f5b3c 100644
--- a/interface/web/admin/lib/lang/cz_users.lng
+++ b/interface/web/admin/lib/lang/cz_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Uživatelské jméno';
$wb['username_err'] = 'Uživatelské jméno je pÅ™ÃliÅ¡ dlouhé nebo obsahuje neplatné znaky.';
$wb['username_empty'] = 'Uživatelské jméno je prázdné.';
$wb['username_unique'] = 'Toto uživatelské jméno již existuje.';
-$wb['passwort_txt'] = 'Heslo';
+$wb['password_txt'] = 'Heslo';
$wb['password_strength_txt'] = 'BezpeÄnost hesla';
$wb['modules_txt'] = 'Modul';
$wb['startmodule_txt'] = 'Výchozà modul';
diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng
index 9a236d92e1e8ef3178fcb123926b06e435e1c3c9..d94327f9f25ac88465eae824dd0a91dc7d8e479d 100644
--- a/interface/web/admin/lib/lang/de_server_config.lng
+++ b/interface/web/admin/lib/lang/de_server_config.lng
@@ -1,5 +1,6 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit Chroot home';
diff --git a/interface/web/admin/lib/lang/de_users.lng b/interface/web/admin/lib/lang/de_users.lng
index 9bc13061c0e110fcc3f2aab12bf59ccd49032819..e52090dceaef804ea83f49f7deac564978dc7405 100644
--- a/interface/web/admin/lib/lang/de_users.lng
+++ b/interface/web/admin/lib/lang/de_users.lng
@@ -2,7 +2,7 @@
$wb['users_txt'] = 'Users';
$wb['username_txt'] = 'Benutzername';
$wb['username_err'] = 'Der Benutzername enthält ungültige Zeichen.';
-$wb['passwort_txt'] = 'Passwort';
+$wb['password_txt'] = 'Passwort';
$wb['modules_txt'] = 'Module';
$wb['startmodule_txt'] = 'Startmodul';
$wb['app_theme_txt'] = 'Design';
diff --git a/interface/web/admin/lib/lang/dk_server_config.lng b/interface/web/admin/lib/lang/dk_server_config.lng
index 41eaa1fe758ec8a072447278fe1236249538ae58..2490e98f2659c9882a63632b9b5b377913893bb3 100644
--- a/interface/web/admin/lib/lang/dk_server_config.lng
+++ b/interface/web/admin/lib/lang/dk_server_config.lng
@@ -1,5 +1,6 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['ufw_enable_txt'] = 'Enable';
diff --git a/interface/web/admin/lib/lang/dk_users.lng b/interface/web/admin/lib/lang/dk_users.lng
index f5811d771d1ef1f3265284a8b4c3f1471e6028ed..fa595ed18415832f257a8bcab11a6bdd0bfae91c 100644
--- a/interface/web/admin/lib/lang/dk_users.lng
+++ b/interface/web/admin/lib/lang/dk_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Brugernavn';
$wb['username_err'] = 'Brugernavnet er for langt eller indeholder ugyldige karaktere.';
$wb['username_empty'] = 'Brugernavnet er tomt.';
$wb['username_unique'] = 'Der findes allerede en bruger med dette brugernavn.';
-$wb['passwort_txt'] = 'Adgangskode';
+$wb['password_txt'] = 'Adgangskode';
$wb['password_strength_txt'] = 'Adgangskode styrke';
$wb['modules_txt'] = 'Modul';
$wb['startmodule_txt'] = 'Startmodul';
diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng
index 491aa69cb6b82cc7800b169a9878de1232c044e9..e8b1d5ec26d532f2b365e683199d8eccd89b2df4 100644
--- a/interface/web/admin/lib/lang/el_server_config.lng
+++ b/interface/web/admin/lib/lang/el_server_config.lng
@@ -1,5 +1,6 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
diff --git a/interface/web/admin/lib/lang/el_users.lng b/interface/web/admin/lib/lang/el_users.lng
index e25fbe17fa8dd24f60768db37283dbcda24a6c77..6d07d6632457fc5dc1d854d7243669fffbadfeb6 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_txt'] = 'Όνομα ΧÏήστη';
$wb['username_err'] = 'Το όνομα χÏήστη είναι Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿ ή πεÏιÎχει μη επιτÏεπόμενους χαÏακτήÏες';
$wb['username_empty'] = 'Το όνομα χÏήστη δεν Îχει οÏιστεί.';
$wb['username_unique'] = 'ΥπάÏχει ήδη Îνας χÏήστης με αυτό το όνομα χÏήστη.';
-$wb['passwort_txt'] = 'Συνθηματικό';
+$wb['password_txt'] = 'Συνθηματικό';
$wb['password_strength_txt'] = 'ΔÏναμη ΣυνθηματικοÏ';
$wb['modules_txt'] = 'ΆÏθÏωμα';
$wb['startmodule_txt'] = 'ΆÏθÏωμα Εκκίνησης';
diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng
index 4858ed2eb8ce1a90b4f8fbccf08643a905e9d1a4..bf6c6277473c3a3b0544166dfa41d1aeedc9a773 100644
--- a/interface/web/admin/lib/lang/en_server_config.lng
+++ b/interface/web/admin/lib/lang/en_server_config.lng
@@ -1,5 +1,6 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb["ufw_enable_txt"] = 'Enable';
@@ -182,7 +183,7 @@ $wb["do_not_try_rescue_httpd_txt"] = 'Disable HTTPD monitoring';
$wb["do_not_try_rescue_mongodb_txt"] = 'Disable MongoDB monitoring';
$wb["do_not_try_rescue_mysql_txt"] = 'Disable MySQL monitoring';
$wb["do_not_try_rescue_mail_txt"] = 'Disable Email monitoring';
-$wb["rescue_description_txt"] = '<b>Information:</b> If you want to shut down mysql you have to select the "Disable MySQL monitor" checkbox and then wait 2-3 minutes.<br>If you do not wait 2-3 minutes, rescue will try to restart mysql!';
+$wb["rescue_description_txt"] = '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!';
$wb["enable_sni_txt"] = 'Enable SNI';
$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';
diff --git a/interface/web/admin/lib/lang/en_users.lng b/interface/web/admin/lib/lang/en_users.lng
index 72d93eb4d2249d4dac9ce7df06c01fab56c2287e..dd5942bdf5f6934f23a4a98e511e5e2f55af614c 100644
--- a/interface/web/admin/lib/lang/en_users.lng
+++ b/interface/web/admin/lib/lang/en_users.lng
@@ -4,7 +4,7 @@ $wb["username_txt"] = 'Username';
$wb["username_err"] = 'The username is too long or contains invalid characters.';
$wb["username_empty"] = 'The username is empty.';
$wb["username_unique"] = 'There is already a user with this username.';
-$wb["passwort_txt"] = 'Password';
+$wb["password_txt"] = 'Password';
$wb["password_strength_txt"] = 'Password strength';
$wb["modules_txt"] = 'Module';
$wb["startmodule_txt"] = 'Startmodule';
diff --git a/interface/web/admin/lib/lang/en_users_list.lng b/interface/web/admin/lib/lang/en_users_list.lng
index 9860ab403961fc16a951a225eff8c920f136cab1..d0000a74bbc2dbd2c8a7852a91eccfa0a56df31a 100644
--- a/interface/web/admin/lib/lang/en_users_list.lng
+++ b/interface/web/admin/lib/lang/en_users_list.lng
@@ -5,5 +5,5 @@ $wb["client_id_txt"] = 'User ID';
$wb["active_txt"] = 'Active';
$wb["groups_txt"] = 'Groups';
$wb["add_new_record_txt"] = 'Add new user';
-$wb["warning_txt"] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
+$wb["warning_txt"] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing users or groups here may cause data loss!';
?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng
index 866871de9a35c0bf62b4f21ea86c6d795e64ca5a..ed8bd57a4d1cc7f634919f010f0dae09477f7f2f 100644
--- a/interface/web/admin/lib/lang/es_server_config.lng
+++ b/interface/web/admin/lib/lang/es_server_config.lng
@@ -1,5 +1,6 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['add_web_users_to_sshusers_group_txt'] = 'Añadir usuarios web al grupo -sshusers-';
diff --git a/interface/web/admin/lib/lang/es_users.lng b/interface/web/admin/lib/lang/es_users.lng
index 127d5431e2b1022bf8006623acce65eda82afa8c..5a06c7ed3e3a3319245b7f031391bed4879c2fa5 100644
--- a/interface/web/admin/lib/lang/es_users.lng
+++ b/interface/web/admin/lib/lang/es_users.lng
@@ -17,7 +17,7 @@ $wb['ort_txt'] = 'Ciudad';
$wb['password_match_txt'] = 'Las contraseñas coinciden.';
$wb['password_mismatch_txt'] = 'Las contraseñas no coinciden.';
$wb['password_strength_txt'] = 'Fortaleza de la contraseña';
-$wb['passwort_txt'] = 'Contraseña';
+$wb['password_txt'] = 'Contraseña';
$wb['plz_txt'] = 'Zona postal';
$wb['repeat_password_txt'] = 'Repetir contraseña';
$wb['startmodule_err'] = 'El módulo de inicio no se encuentra entre los módulos.';
diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng
index 61edf1e6020d9aa724ed2e400019730798307720..9b1336b789ea7c0aa4a13086fda6ec0217ddb7ba 100644
--- a/interface/web/admin/lib/lang/fi_server_config.lng
+++ b/interface/web/admin/lib/lang/fi_server_config.lng
@@ -1,5 +1,6 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot-kotikansio';
diff --git a/interface/web/admin/lib/lang/fi_users.lng b/interface/web/admin/lib/lang/fi_users.lng
index 3e44e56678b3a14c391c93e7c39fe55325a21de1..1e5bb588559e0eb4577bc05a9eb65decd3a572ab 100644
--- a/interface/web/admin/lib/lang/fi_users.lng
+++ b/interface/web/admin/lib/lang/fi_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Käyttäjätunnus';
$wb['username_err'] = 'Käyttäjätunnus on liian pitkä tai sisältää kiellettyjä merkkejä.';
$wb['username_empty'] = 'Käyttäjätunnus on tyhjä.';
$wb['username_unique'] = 'Tämä käyttäjätunnus on jo olemassa.';
-$wb['passwort_txt'] = 'Salasana';
+$wb['password_txt'] = 'Salasana';
$wb['modules_txt'] = 'Ohjelmaosiot';
$wb['startmodule_txt'] = 'Aloitusosio';
$wb['app_theme_txt'] = 'Teema';
diff --git a/interface/web/admin/lib/lang/fr_server_config.lng b/interface/web/admin/lib/lang/fr_server_config.lng
index 657a4e1b54bb4027661ef8353167711b44f125e8..44e45a59e3393d1c9e75269139cbf485efaabd65 100644
--- a/interface/web/admin/lib/lang/fr_server_config.lng
+++ b/interface/web/admin/lib/lang/fr_server_config.lng
@@ -1,5 +1,6 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Accueil du chroot Jailkit';
diff --git a/interface/web/admin/lib/lang/fr_users.lng b/interface/web/admin/lib/lang/fr_users.lng
index 2f91cab83a61da3b2a1dbfb6d80fe31de6951182..0f50d10d67c97698be1a92ad9b7b49854c1f3736 100644
--- a/interface/web/admin/lib/lang/fr_users.lng
+++ b/interface/web/admin/lib/lang/fr_users.lng
@@ -2,7 +2,7 @@
$wb['users_txt'] = 'Users';
$wb['username_txt'] = 'Nom d’utilisateur';
$wb['username_err'] = 'Le nom d’utilisateur est trop long ou contient des caractères invalides.';
-$wb['passwort_txt'] = 'Mot de passe';
+$wb['password_txt'] = 'Mot de passe';
$wb['modules_txt'] = 'Module';
$wb['startmodule_txt'] = 'Module de démarrage';
$wb['app_theme_txt'] = 'Thème';
diff --git a/interface/web/admin/lib/lang/hr_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng
index c7be0b3df01d4d5c8331e2449e8219da984afce8..cb9fe34ec0eb8eae71b37f95953ed5b64111dd47 100644
--- a/interface/web/admin/lib/lang/hr_server_config.lng
+++ b/interface/web/admin/lib/lang/hr_server_config.lng
@@ -1,5 +1,6 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot direktorij';
diff --git a/interface/web/admin/lib/lang/hr_users.lng b/interface/web/admin/lib/lang/hr_users.lng
index c274a9498daf7643989d355f2002516ec91ab25e..3a7da2a422baea63b92c33b16d33c341b932117d 100644
--- a/interface/web/admin/lib/lang/hr_users.lng
+++ b/interface/web/admin/lib/lang/hr_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'KorisniÄko ime';
$wb['username_err'] = 'KorisniÄko ime je predugaÄko ili sadrži nedozvoljene znakove.';
$wb['username_empty'] = 'KorisniÄko ime je prazno.';
$wb['username_unique'] = 'Već postoji korisnik sa ovim korisniÄkim imenom.';
-$wb['passwort_txt'] = 'Å ifra';
+$wb['password_txt'] = 'Å ifra';
$wb['password_strength_txt'] = 'JaÄina Å¡ifre';
$wb['modules_txt'] = 'Modul';
$wb['startmodule_txt'] = 'PoÄetni modul';
diff --git a/interface/web/admin/lib/lang/hu_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng
index 979eacb0e8d6f5aed08a64340cacdc283edbc5e5..4d875c235ba6243a584bc0b368fa51ad66818f6b 100644
--- a/interface/web/admin/lib/lang/hu_server_config.lng
+++ b/interface/web/admin/lib/lang/hu_server_config.lng
@@ -1,5 +1,6 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
diff --git a/interface/web/admin/lib/lang/hu_users.lng b/interface/web/admin/lib/lang/hu_users.lng
index 5cb86c850a18046bd76e30e28e745b5b924565bf..6f1ded0b70b1a36c0744badc8fc6af0643ca78f1 100644
--- a/interface/web/admin/lib/lang/hu_users.lng
+++ b/interface/web/admin/lib/lang/hu_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Felhasználónév';
$wb['username_err'] = 'A Felhasználónév túl hosszú vagy érvénytelen karaktereket tartalmaz';
$wb['username_empty'] = 'A Felhasználónév üres.';
$wb['username_unique'] = 'Ez a Felhasználónév már foglalt.';
-$wb['passwort_txt'] = 'Jelszó';
+$wb['password_txt'] = 'Jelszó';
$wb['modules_txt'] = 'Modul';
$wb['startmodule_txt'] = 'Kezdőmodul';
$wb['app_theme_txt'] = 'Kinézet';
diff --git a/interface/web/admin/lib/lang/id_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng
index 717948646926f1eae04b9b25fa9701aedd4b47d4..0d40bdbbe57d6be325bf79c666e48016fceb75f2 100644
--- a/interface/web/admin/lib/lang/id_server_config.lng
+++ b/interface/web/admin/lib/lang/id_server_config.lng
@@ -1,5 +1,6 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Home chroot Jailkit';
diff --git a/interface/web/admin/lib/lang/id_users.lng b/interface/web/admin/lib/lang/id_users.lng
index e6ed3d5befb95050be97122368195af74ce25ac9..bc546d4df4e050b30ee5aeec15926a76e288139e 100644
--- a/interface/web/admin/lib/lang/id_users.lng
+++ b/interface/web/admin/lib/lang/id_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Nama Pengguna';
$wb['username_err'] = 'Nama pengguna terlalu panjang atau mengandung karakter yang tidak valid.';
$wb['username_empty'] = 'Nama pengguna kosong.';
$wb['username_unique'] = 'Sudah ada pengguna yang memakai nama ini.';
-$wb['passwort_txt'] = 'Kata Sandi';
+$wb['password_txt'] = 'Kata Sandi';
$wb['password_strength_txt'] = 'Kekuatan sandi';
$wb['modules_txt'] = 'Modul';
$wb['startmodule_txt'] = 'Modul awal';
diff --git a/interface/web/admin/lib/lang/it_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng
index 9aa049a4889fafe0087addb56f6e94006a04a59a..e3e75b8e789cebc5b53372adb17bdd441f51b399 100644
--- a/interface/web/admin/lib/lang/it_server_config.lng
+++ b/interface/web/admin/lib/lang/it_server_config.lng
@@ -1,5 +1,6 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
diff --git a/interface/web/admin/lib/lang/it_users.lng b/interface/web/admin/lib/lang/it_users.lng
index 60c80063f4f355595cdabce714b912f9223c8613..e657d2ae967e851954ed7778c1a89a4108d8d40a 100644
--- a/interface/web/admin/lib/lang/it_users.lng
+++ b/interface/web/admin/lib/lang/it_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Nome utente';
$wb['username_err'] = 'Nome utente troppo lungo o avente caratteri non validi.';
$wb['username_empty'] = 'Nome utente mancante.';
$wb['username_unique'] = 'Nome utente già utilizzato.';
-$wb['passwort_txt'] = 'Password';
+$wb['password_txt'] = 'Password';
$wb['password_strength_txt'] = 'Solidità password';
$wb['modules_txt'] = 'Modulo';
$wb['startmodule_txt'] = 'Startmodule';
diff --git a/interface/web/admin/lib/lang/ja_server_config.lng b/interface/web/admin/lib/lang/ja_server_config.lng
index 3de4d2ca1ab35fec48efad324b23d441c5ed18f5..6d0c4d8b20faca726a92ca8295920b750e847849 100644
--- a/interface/web/admin/lib/lang/ja_server_config.lng
+++ b/interface/web/admin/lib/lang/ja_server_config.lng
@@ -1,5 +1,6 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'chroot ホーム';
diff --git a/interface/web/admin/lib/lang/ja_users.lng b/interface/web/admin/lib/lang/ja_users.lng
index 7d77bb8ac081802f12ef0dd4b70646df470382cf..45b1faec67c05eadb93286c6826aa7153608c4b0 100644
--- a/interface/web/admin/lib/lang/ja_users.lng
+++ b/interface/web/admin/lib/lang/ja_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'ユーザーå';
$wb['username_err'] = 'ユーザーåãŒé•·ã™ãŽã‚‹ã‹ã€ã¾ãŸã¯ä¸æ£ãªæ–‡å—ã‚’å«ã‚“ã§ã„ã¾ã™ã€‚';
$wb['username_empty'] = 'ユーザーåを入力ã—ã¦ãã ã•ã„。';
$wb['username_unique'] = 'æ—¢ã«ç™»éŒ²æ¸ˆã¿ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼åã§ã™ã€‚別ã®åå‰ã‚’é¸ã‚“ã§ãã ã•ã„。';
-$wb['passwort_txt'] = 'パスワード';
+$wb['password_txt'] = 'パスワード';
$wb['password_strength_txt'] = 'パスワードã®å¼·åº¦';
$wb['modules_txt'] = 'モジュール';
$wb['startmodule_txt'] = 'ãƒã‚°ã‚¤ãƒ³ç›´å¾Œã®ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«';
diff --git a/interface/web/admin/lib/lang/ja_users_list.lng b/interface/web/admin/lib/lang/ja_users_list.lng
index 6a3fac468ff3f6c0620639a51e6d623fea06e1b3..21b07be3c5a80417f2ed47869aab8c9aaf9beacd 100644
--- a/interface/web/admin/lib/lang/ja_users_list.lng
+++ b/interface/web/admin/lib/lang/ja_users_list.lng
@@ -4,6 +4,6 @@ $wb['username_txt'] = 'ユーザーå';
$wb['client_id_txt'] = 'Client ID';
$wb['active_txt'] = 'Active';
$wb['add_new_record_txt'] = 'ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’è¿½åŠ ã™ã‚‹';
-$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
+$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing users or groups here may cause data loss!';
$wb['groups_txt'] = 'Groups';
?>
diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng
index 7e3edc43982b99105169fe53309561d33cb7094c..aa5c6e94a1a4293c540af4ee42293c4c86cfb97c 100644
--- a/interface/web/admin/lib/lang/nl_server_config.lng
+++ b/interface/web/admin/lib/lang/nl_server_config.lng
@@ -1,5 +1,6 @@
<?php
$wb['server_config'] = 'Server Configuratie';
+$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
diff --git a/interface/web/admin/lib/lang/nl_users.lng b/interface/web/admin/lib/lang/nl_users.lng
index 53611ff56ee3ac391407e876b46f8ac62c13a6bf..e1e6609c27d5e998244b8db740709464d7c18ffe 100644
--- a/interface/web/admin/lib/lang/nl_users.lng
+++ b/interface/web/admin/lib/lang/nl_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Gebruikersnaam';
$wb['username_err'] = 'De gebruikersnaam is te lang of bevat ongeldige karakters.';
$wb['username_empty'] = 'De gebruikersnaam is niet ingvuld.';
$wb['username_unique'] = 'Er is al een een gebruiker met deze gebruikersnaam.';
-$wb['passwort_txt'] = 'Wachtwoord';
+$wb['password_txt'] = 'Wachtwoord';
$wb['password_strength_txt'] = 'Wachtwoord sterkte';
$wb['modules_txt'] = 'Module';
$wb['startmodule_txt'] = 'Startmodule';
diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng
index 294ed44ee7b76bfd5262676502e125cfff9d97a1..8e79c26230a3ab7282d71c38feb11782ce546e50 100644
--- a/interface/web/admin/lib/lang/pl_server_config.lng
+++ b/interface/web/admin/lib/lang/pl_server_config.lng
@@ -1,5 +1,6 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Adres roota Jailkit';
diff --git a/interface/web/admin/lib/lang/pl_users.lng b/interface/web/admin/lib/lang/pl_users.lng
index c303b1ab1eb949556f03ee3500acad0b5742759c..f5439f4f5f5fe86dee7e7e7161be928071d6b4de 100644
--- a/interface/web/admin/lib/lang/pl_users.lng
+++ b/interface/web/admin/lib/lang/pl_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Nazwa użytkownika';
$wb['username_err'] = 'Nazwa użytkownika jest za długa lub zawiera niedozwolone znaki.';
$wb['username_empty'] = 'Nazwa użytkownika jest pusta.';
$wb['username_unique'] = 'Istnieje już użytkownik o takiej nazwie.';
-$wb['passwort_txt'] = 'Hasło';
+$wb['password_txt'] = 'Hasło';
$wb['password_strength_txt'] = 'Siła hasła';
$wb['modules_txt'] = 'Moduł';
$wb['startmodule_txt'] = 'Moduł startowy';
diff --git a/interface/web/admin/lib/lang/pt_server_config.lng b/interface/web/admin/lib/lang/pt_server_config.lng
index 8b9d78d151f8523a8d8aeeab5870f37335f089bb..790083f5eb53680781f83ffa42d825068f7facd6 100644
--- a/interface/web/admin/lib/lang/pt_server_config.lng
+++ b/interface/web/admin/lib/lang/pt_server_config.lng
@@ -1,5 +1,6 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Raiz do Chroot Jailkit';
diff --git a/interface/web/admin/lib/lang/pt_users.lng b/interface/web/admin/lib/lang/pt_users.lng
index 3e620e02cd931f885d2148110ed65c8ad99f5de8..7522fb0270d615bcbe2e3d6197ab16baffce1d08 100644
--- a/interface/web/admin/lib/lang/pt_users.lng
+++ b/interface/web/admin/lib/lang/pt_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Utilizador ';
$wb['username_err'] = 'O Nome do utilizador é muito longo ou contém caracteres inválidos!';
$wb['username_empty'] = 'Por favor, entre com um nome de utilizador .';
$wb['username_unique'] = 'Já existe um utilizador com este nome!';
-$wb['passwort_txt'] = 'Senha';
+$wb['password_txt'] = 'Senha';
$wb['password_strength_txt'] = 'Segurança da Senha';
$wb['modules_txt'] = 'Módulos';
$wb['startmodule_txt'] = 'Módulo Inicial';
diff --git a/interface/web/admin/lib/lang/ro_server_config.lng b/interface/web/admin/lib/lang/ro_server_config.lng
index a1ce64839ff9e1cf38ecd0442259a6fa150d07ab..a3314b8f43ee7da18a967020528c8ff8c2301528 100644
--- a/interface/web/admin/lib/lang/ro_server_config.lng
+++ b/interface/web/admin/lib/lang/ro_server_config.lng
@@ -1,5 +1,6 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
diff --git a/interface/web/admin/lib/lang/ro_users.lng b/interface/web/admin/lib/lang/ro_users.lng
index dd4ef0143de1544544ac635454cd3dc9040bbddf..369d56559510f445a96d40969035f4cbfde07ca5 100644
--- a/interface/web/admin/lib/lang/ro_users.lng
+++ b/interface/web/admin/lib/lang/ro_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Username';
$wb['username_err'] = 'The username is too long or contains invalid characters.';
$wb['username_empty'] = 'The username is empty.';
$wb['username_unique'] = 'There is already a user with this username.';
-$wb['passwort_txt'] = 'Password';
+$wb['password_txt'] = 'Password';
$wb['password_strength_txt'] = 'Password strength';
$wb['modules_txt'] = 'Module';
$wb['startmodule_txt'] = 'Startmodule';
diff --git a/interface/web/admin/lib/lang/ro_users_list.lng b/interface/web/admin/lib/lang/ro_users_list.lng
index 13d839ec42b7f6b9772c8ac0b7c6912f4c7d990f..c928d6b86f0f38bae8c151f756f4d00593811146 100644
--- a/interface/web/admin/lib/lang/ro_users_list.lng
+++ b/interface/web/admin/lib/lang/ro_users_list.lng
@@ -4,6 +4,6 @@ $wb['username_txt'] = 'Username';
$wb['client_id_txt'] = 'Client ID';
$wb['active_txt'] = 'Active';
$wb['add_new_record_txt'] = 'Add user nou';
-$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
+$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing users or groups here may cause data loss!';
$wb['groups_txt'] = 'Groups';
?>
diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng
index 8583ccd43464be391edbe9d720d72d68a313a666..3a8d1ef38ea9096f2207a32d6c08a799fc04e543 100644
--- a/interface/web/admin/lib/lang/ru_server_config.lng
+++ b/interface/web/admin/lib/lang/ru_server_config.lng
@@ -1,5 +1,6 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Путь к домашней папке Jailkit chroot';
diff --git a/interface/web/admin/lib/lang/ru_users.lng b/interface/web/admin/lib/lang/ru_users.lng
index 9ed98ca021312fc797d4367b24059072e1e8564e..d805b939116e50996d59f9ef73103b98476a69c0 100644
--- a/interface/web/admin/lib/lang/ru_users.lng
+++ b/interface/web/admin/lib/lang/ru_users.lng
@@ -2,7 +2,7 @@
$wb['users_txt'] = 'Users';
$wb['username_txt'] = 'Логин';
$wb['username_err'] = 'Ошибка в логине';
-$wb['passwort_txt'] = 'Пароль';
+$wb['password_txt'] = 'Пароль';
$wb['modules_txt'] = 'Модуль';
$wb['startmodule_txt'] = 'Стартовый модуль';
$wb['app_theme_txt'] = 'Тема';
diff --git a/interface/web/admin/lib/lang/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng
index ff44861126f5b25bb1b453c5169791a7e6c63bb3..6fa419bb4f0c87d38c4b0a62a50b6b00c6522a1c 100644
--- a/interface/web/admin/lib/lang/se_server_config.lng
+++ b/interface/web/admin/lib/lang/se_server_config.lng
@@ -1,5 +1,6 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
diff --git a/interface/web/admin/lib/lang/se_users.lng b/interface/web/admin/lib/lang/se_users.lng
index 4f8814842cda5c7fadf7ef593f1f48e2a67023dc..60f3829adc9237e5453a4bbe9029e58f2bada62f 100644
--- a/interface/web/admin/lib/lang/se_users.lng
+++ b/interface/web/admin/lib/lang/se_users.lng
@@ -2,7 +2,7 @@
$wb['users_txt'] = 'Users';
$wb['username_txt'] = 'Användarnamn';
$wb['username_err'] = 'användarnamn_fel';
-$wb['passwort_txt'] = 'Lösenord';
+$wb['password_txt'] = 'Lösenord';
$wb['modules_txt'] = 'Modul';
$wb['startmodule_txt'] = 'Startmodul';
$wb['app_theme_txt'] = 'Design';
diff --git a/interface/web/admin/lib/lang/se_users_list.lng b/interface/web/admin/lib/lang/se_users_list.lng
index a6580d3089ca9caa7b40a1cbe11109f187e9292d..a778d44a2e2268ddcdb2a68e43d38e02f1b0f8c2 100644
--- a/interface/web/admin/lib/lang/se_users_list.lng
+++ b/interface/web/admin/lib/lang/se_users_list.lng
@@ -4,6 +4,6 @@ $wb['username_txt'] = 'Användarnamn';
$wb['client_id_txt'] = 'Kund-ID';
$wb['active_txt'] = 'Aktiv';
$wb['add_new_record_txt'] = 'Lägg till ny användare';
-$wb['warning_txt'] = '<b>VARNING:</b> Ändra inte några användarinställningar här. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
+$wb['warning_txt'] = '<b>VARNING:</b> Ändra inte några användarinställningar här. Use the Client- and Reseller settings in the Client module instead. Modifying or changing users or groups here may cause data loss!';
$wb['groups_txt'] = 'Grupper';
?>
diff --git a/interface/web/admin/lib/lang/sk_server_config.lng b/interface/web/admin/lib/lang/sk_server_config.lng
index 1efac9e6e66db15bfcf572e06e136a3bb52b55e4..5a19930a8f5efbdd1ee66cba3065e337492cf96e 100644
--- a/interface/web/admin/lib/lang/sk_server_config.lng
+++ b/interface/web/admin/lib/lang/sk_server_config.lng
@@ -1,5 +1,6 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot domov';
diff --git a/interface/web/admin/lib/lang/sk_users.lng b/interface/web/admin/lib/lang/sk_users.lng
index b037e307c02528ce754da163ec6faa05d53b4b1c..9cc7f87e0d23dc6feb43ad2d26664c3b336e7918 100644
--- a/interface/web/admin/lib/lang/sk_users.lng
+++ b/interface/web/admin/lib/lang/sk_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'UžÃvateľské meno';
$wb['username_err'] = 'UžÃvateľské meno je prÃliÅ¡ dlhá alebo obsahuje neplatné znaky.';
$wb['username_empty'] = 'UžÃvateľské meno je prázdne.';
$wb['username_unique'] = 'V súÄasnosti už existuje užÃvateľ s týmto užÃvateľským menom.';
-$wb['passwort_txt'] = 'Heslo';
+$wb['password_txt'] = 'Heslo';
$wb['password_strength_txt'] = 'Pevnosť hesla';
$wb['modules_txt'] = 'Modul';
$wb['startmodule_txt'] = 'Startmodul';
diff --git a/interface/web/admin/lib/lang/sk_users_list.lng b/interface/web/admin/lib/lang/sk_users_list.lng
index 52bfd29d57304db1e3d5bc88d93b4a02a83f1c73..c393f199928e5c338133613368c407e956065cd3 100644
--- a/interface/web/admin/lib/lang/sk_users_list.lng
+++ b/interface/web/admin/lib/lang/sk_users_list.lng
@@ -4,6 +4,6 @@ $wb['username_txt'] = 'UžÃvateľské meno';
$wb['client_id_txt'] = 'Client ID';
$wb['active_txt'] = 'Active';
$wb['add_new_record_txt'] = 'PridaÅ¥ nového užÃvateľa';
-$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
+$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing users or groups here may cause data loss!';
$wb['groups_txt'] = 'Groups';
?>
diff --git a/interface/web/admin/lib/lang/tr_server_config.lng b/interface/web/admin/lib/lang/tr_server_config.lng
index 25380413fa36a2ad8d269c3642b45e2fd35bb004..8bf708f064a90d3e23df827690b2319159bcca12 100644
--- a/interface/web/admin/lib/lang/tr_server_config.lng
+++ b/interface/web/admin/lib/lang/tr_server_config.lng
@@ -1,5 +1,6 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['ufw_enable_txt'] = 'Etkin';
diff --git a/interface/web/admin/lib/lang/tr_users.lng b/interface/web/admin/lib/lang/tr_users.lng
index 307cdd37b22072e66e56fc21cd49b6ab243b9a1c..84826357b7a91726f0e2120f36c4489ac5b6d210 100644
--- a/interface/web/admin/lib/lang/tr_users.lng
+++ b/interface/web/admin/lib/lang/tr_users.lng
@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Kullanıcı Adı';
$wb['username_err'] = 'Kullanıcı adı çok uzun ya da geçersiz karakterler içeriyor.';
$wb['username_empty'] = 'Kullanıcı adı boş olamaz.';
$wb['username_unique'] = 'Bu adla bir kullanıcı zaten var.';
-$wb['passwort_txt'] = 'Parola';
+$wb['password_txt'] = 'Parola';
$wb['password_strength_txt'] = 'Parola ZorluÄŸu';
$wb['modules_txt'] = 'Modül';
$wb['startmodule_txt'] = 'Başlangıç modülü';
diff --git a/interface/web/admin/templates/server_config_cron_edit.htm b/interface/web/admin/templates/server_config_cron_edit.htm
index 62e6efea76bc85d734cf1d214c38b40f4e22a80d..c337d43a5b6a8284fd716547661a1581c6a8bc99 100644
--- a/interface/web/admin/templates/server_config_cron_edit.htm
+++ b/interface/web/admin/templates/server_config_cron_edit.htm
@@ -1,10 +1,5 @@
-<div class='page-header'>
- <h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
+<div class="alert alert-info"><h4 style="text-align:center"><tmpl_var name="config_for_txt"> {tmpl_var name='server_name'}</h4></div>
-
-
<div class="form-group">
<label for="init_script" class="col-sm-3 control-label">{tmpl_var name='init_script_txt'}</label>
<div class="col-sm-9"><input type="text" name="init_script" id="init_script" value="{tmpl_var name='init_script'}" class="form-control" /></div></div>
@@ -14,10 +9,10 @@
<div class="form-group">
<label for="wget" class="col-sm-3 control-label">{tmpl_var name='wget_txt'}</label>
<div class="col-sm-9"><input type="text" name="wget" id="wget" value="{tmpl_var name='wget'}" class="form-control" /></div></div>
-
-
+
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
-
+
<div class="clear"><div class="right">
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/server_config_edit.php">{tmpl_var name='btn_save_txt'}</button>
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
diff --git a/interface/web/admin/templates/server_config_dns_edit.htm b/interface/web/admin/templates/server_config_dns_edit.htm
index a4f7a26adef5ebe754dde5c9afe1fa95376ced93..995acbf98651c2557ff0f2fb055a420f3f11aaf5 100644
--- a/interface/web/admin/templates/server_config_dns_edit.htm
+++ b/interface/web/admin/templates/server_config_dns_edit.htm
@@ -1,10 +1,7 @@
-<div class='page-header'>
- <h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
+<div class="alert alert-info"><h4 style="text-align:center"><tmpl_var name="config_for_txt"> {tmpl_var name='server_name'}</h4></div>
+
-
<div class="form-group">
<label for="bind_user" class="col-sm-3 control-label">{tmpl_var name='bind_user_txt'}</label>
<div class="col-sm-9"><input type="text" name="bind_user" id="bind_user" value="{tmpl_var name='bind_user'}" class="form-control" /></div></div>
@@ -23,9 +20,9 @@
<div class="form-group">
<label for="disable_bind_log" class="col-sm-3 control-label">{tmpl_var name='disable_bind_log_txt'}</label>
<div class="col-sm-9">{tmpl_var name='disable_bind_log'}</div></div>
-
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
-
+
<div class="clear"><div class="right">
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/server_config_edit.php">{tmpl_var name='btn_save_txt'}</button>
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
diff --git a/interface/web/admin/templates/server_config_fastcgi_edit.htm b/interface/web/admin/templates/server_config_fastcgi_edit.htm
index c36b482e725b69399afc657065c3b0ade563ca02..eb89e21f74143a9520df7b2f69b6eeaa2f8032d9 100644
--- a/interface/web/admin/templates/server_config_fastcgi_edit.htm
+++ b/interface/web/admin/templates/server_config_fastcgi_edit.htm
@@ -1,10 +1,7 @@
-<div class='page-header'>
- <h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
+<div class="alert alert-info"><h4 style="text-align:center"><tmpl_var name="config_for_txt"> {tmpl_var name='server_name'}</h4></div>
+
-
<div class="form-group">
<label for="fastcgi_starter_path" class="col-sm-3 control-label">{tmpl_var name='fastcgi_starter_path_txt'}</label>
<div class="col-sm-9"><input type="text" name="fastcgi_starter_path" id="fastcgi_starter_path" value="{tmpl_var name='fastcgi_starter_path'}" class="form-control" /></div></div>
@@ -32,10 +29,10 @@
{tmpl_var name='fastcgi_config_syntax'}
</select></div>
</div>
-
-
+
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
-
+
<div class="clear"><div class="right">
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/server_config_edit.php">{tmpl_var name='btn_save_txt'}</button>
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
diff --git a/interface/web/admin/templates/server_config_getmail_edit.htm b/interface/web/admin/templates/server_config_getmail_edit.htm
index 84ca1ec73ffbac9a7f4901a2e75a39d220eabb2c..04217f9e840d51c8c85718e56576c17cbf13e040 100644
--- a/interface/web/admin/templates/server_config_getmail_edit.htm
+++ b/interface/web/admin/templates/server_config_getmail_edit.htm
@@ -1,17 +1,14 @@
-<div class='page-header'>
- <h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
+<div class="alert alert-info"><h4 style="text-align:center"><tmpl_var name="config_for_txt"> {tmpl_var name='server_name'}</h4></div>
+
-
<div class="form-group">
<label for="getmail_config_dir" class="col-sm-3 control-label">{tmpl_var name='getmail_config_dir_txt'}</label>
<div class="col-sm-9"><input type="text" name="getmail_config_dir" id="getmail_config_dir" value="{tmpl_var name='getmail_config_dir'}" class="form-control" /></div></div>
-
-
+
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
-
+
<div class="clear"><div class="right">
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/server_config_edit.php">{tmpl_var name='btn_save_txt'}</button>
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
diff --git a/interface/web/admin/templates/server_config_jailkit_edit.htm b/interface/web/admin/templates/server_config_jailkit_edit.htm
index 4b7028bd3b1449dd7eea31592af54b8234eac230..e7f481b0463d34c089f5e55b159c27dd8b170154 100644
--- a/interface/web/admin/templates/server_config_jailkit_edit.htm
+++ b/interface/web/admin/templates/server_config_jailkit_edit.htm
@@ -1,10 +1,7 @@
-<div class='page-header'>
- <h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
+<div class="alert alert-info"><h4 style="text-align:center"><tmpl_var name="config_for_txt"> {tmpl_var name='server_name'}</h4></div>
+
-
<div class="form-group">
<label for="jailkit_chroot_home" class="col-sm-3 control-label">{tmpl_var name='jailkit_chroot_home_txt'}</label>
<div class="col-sm-9"><input type="text" name="jailkit_chroot_home" id="jailkit_chroot_home" value="{tmpl_var name='jailkit_chroot_home'}" class="form-control" /></div></div>
@@ -20,10 +17,10 @@
<div class="form-group">
<label for="jailkit_chroot_authorized_keys_template" class="col-sm-3 control-label">{tmpl_var name='jailkit_chroot_authorized_keys_template_txt'}</label>
<div class="col-sm-9"><input type="text" name="jailkit_chroot_authorized_keys_template" id="jailkit_chroot_authorized_keys_template" value="{tmpl_var name='jailkit_chroot_authorized_keys_template'}" class="form-control" /></div></div>
-
-
+
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
-
+
<div class="clear"><div class="right">
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/server_config_edit.php">{tmpl_var name='btn_save_txt'}</button>
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
diff --git a/interface/web/admin/templates/server_config_mail_edit.htm b/interface/web/admin/templates/server_config_mail_edit.htm
index 1e63cecca8b4a215ccf34e999576d513a3261a4b..51052af8ee7916f92ca21cbdc27585b92e15b3af 100644
--- a/interface/web/admin/templates/server_config_mail_edit.htm
+++ b/interface/web/admin/templates/server_config_mail_edit.htm
@@ -1,10 +1,7 @@
-<div class='page-header'>
- <h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
+<div class="alert alert-info"><h4 style="text-align:center"><tmpl_var name="config_for_txt"> {tmpl_var name='server_name'}</h4></div>
+
-
<div class="form-group">
<label for="module" class="col-sm-3 control-label">{tmpl_var name='module_txt'}</label>
<div class="col-sm-9"><select name="module" id="module" class="form-control">
@@ -145,10 +142,10 @@
{tmpl_var name='overquota_notify_onok'}
</div>
</div>
-
-
+
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
-
+
<div class="clear"><div class="right">
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/server_config_edit.php">{tmpl_var name='btn_save_txt'}</button>
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
@@ -158,13 +155,13 @@
var pword = password(8, false, 1);
jQuery('#rspamd_password').val(pword);
}
-
+
if($('#content_filter').val() === 'rspamd'){
$('.rspamd').show();
} else {
$('.rspamd').hide();
}
-
+
$('#content_filter').change(function(){
if($(this).val() === 'rspamd'){
$('.rspamd').show();
diff --git a/interface/web/admin/templates/server_config_rescue_edit.htm b/interface/web/admin/templates/server_config_rescue_edit.htm
index df8aa97c0714ce4e5ac94a73e978c8a2e71d1f03..eb4a289c81e0f6505b1ca2d53d67e7149a5e6c29 100644
--- a/interface/web/admin/templates/server_config_rescue_edit.htm
+++ b/interface/web/admin/templates/server_config_rescue_edit.htm
@@ -1,7 +1,4 @@
-<div class='page-header'>
- <h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
+<div class="alert alert-info"><h4 style="text-align:center"><tmpl_var name="config_for_txt"> {tmpl_var name='server_name'}</h4></div>
<legend>Rescue</legend>
@@ -37,9 +34,9 @@
{tmpl_var name='do_not_try_rescue_mail'}
</div>
</div>
-
- <tmpl_var name="rescue_description_txt">
+
+ <div class="alert alert-warning"><tmpl_var name="rescue_description_txt"></div>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
diff --git a/interface/web/admin/templates/server_config_server_edit.htm b/interface/web/admin/templates/server_config_server_edit.htm
index 66ead08996f49b6cea69ce5762563b26d27a05f2..394bf55278833f23df18c477a3fe781242213331 100644
--- a/interface/web/admin/templates/server_config_server_edit.htm
+++ b/interface/web/admin/templates/server_config_server_edit.htm
@@ -1,10 +1,7 @@
-<div class='page-header'>
- <h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
+<div class="alert alert-info"><h4 style="text-align:center"><tmpl_var name="config_for_txt"> {tmpl_var name='server_name'}</h4></div>
+
-
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='auto_network_configuration_txt'}</label>
<div class="col-sm-9">
@@ -115,10 +112,10 @@
{tmpl_var name='migration_mode'}
</div>
</div>
-
-
+
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
-
+
<div class="clear"><div class="right">
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/server_config_edit.php">{tmpl_var name='btn_save_txt'}</button>
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
diff --git a/interface/web/admin/templates/server_config_ufw_edit.htm b/interface/web/admin/templates/server_config_ufw_edit.htm
index 85e9c782973dc69cc465323d4ac2d6e22440374d..9a52245d11139b1157c644a916ae4067e1852496 100644
--- a/interface/web/admin/templates/server_config_ufw_edit.htm
+++ b/interface/web/admin/templates/server_config_ufw_edit.htm
@@ -1,7 +1,4 @@
-<div class='page-header'>
- <h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
+<div class="alert alert-info"><h4 style="text-align:center"><tmpl_var name="config_for_txt"> {tmpl_var name='server_name'}</h4></div>
<legend>UFW Firewall</legend>
@@ -53,10 +50,10 @@
{tmpl_var name='ufw_log_level'}
</select></div>
</div>
-
-
+
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
-
+
<div class="clear"><div class="right">
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/server_config_edit.php">{tmpl_var name='btn_save_txt'}</button>
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
diff --git a/interface/web/admin/templates/server_config_vlogger_edit.htm b/interface/web/admin/templates/server_config_vlogger_edit.htm
index a53ab7667682a6942b3733525f87929c33a17749..d79d84387d2bc841638bb413b80695ea7f527497 100644
--- a/interface/web/admin/templates/server_config_vlogger_edit.htm
+++ b/interface/web/admin/templates/server_config_vlogger_edit.htm
@@ -1,17 +1,14 @@
-<div class='page-header'>
- <h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
+<div class="alert alert-info"><h4 style="text-align:center"><tmpl_var name="config_for_txt"> {tmpl_var name='server_name'}</h4></div>
+
-
<div class="form-group">
<label for="config_dir" class="col-sm-3 control-label">{tmpl_var name='config_dir_txt'}</label>
<div class="col-sm-9"><input type="text" name="config_dir" id="config_dir" value="{tmpl_var name='config_dir'}" class="form-control" /></div></div>
-
-
+
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
-
+
<div class="clear"><div class="right">
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/server_config_edit.php">{tmpl_var name='btn_save_txt'}</button>
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm
index 64173549c9a492cf8ddfc9242b7bcb66be448bb6..f98226c104a9d7b3570078fbdaad985a202a9470 100644
--- a/interface/web/admin/templates/server_config_web_edit.htm
+++ b/interface/web/admin/templates/server_config_web_edit.htm
@@ -1,7 +1,4 @@
-<div class='page-header'>
- <h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
+<div class="alert alert-info"><h4 style="text-align:center"><tmpl_var name="config_for_txt"> {tmpl_var name='server_name'}</h4></div>
<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
<div class="panel panel-default">
diff --git a/interface/web/admin/templates/server_config_xmpp_edit.htm b/interface/web/admin/templates/server_config_xmpp_edit.htm
index 4e6eaf0018a21b52ea4c84eb55ed85c4dcc42732..ae9895d15e4d894a37559bccd92d8eb5d05e0e6e 100644
--- a/interface/web/admin/templates/server_config_xmpp_edit.htm
+++ b/interface/web/admin/templates/server_config_xmpp_edit.htm
@@ -1,7 +1,4 @@
-<div class='page-header'>
- <h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
+<div class="alert alert-info"><h4 style="text-align:center"><tmpl_var name="config_for_txt"> {tmpl_var name='server_name'}</h4></div>
diff --git a/interface/web/admin/templates/system_config_dns_ca_edit.htm b/interface/web/admin/templates/system_config_dns_ca_edit.htm
index 739c3f93fea5c3dac21b9e902d6f9d02d7aa0de2..5567f60d538176624dbd11a852ea23a33144834a 100644
--- a/interface/web/admin/templates/system_config_dns_ca_edit.htm
+++ b/interface/web/admin/templates/system_config_dns_ca_edit.htm
@@ -35,7 +35,7 @@
</div>
<div class="clear"><div class="right">
- <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="ISPConfig.changeTab('dns_ca','admin/system_config_edit.php?action=save&id={tmpl_var name='id'}', true);"><span class="icon icon-edit"></span>{tmpl_var name='btn_save_txt'}</button>
- <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/users_list.php">{tmpl_var name='btn_cancel_txt'}</button>
+ <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="ISPConfig.changeTab('dns_ca','admin/system_config_edit.php?action=save&id={tmpl_var name='id'}', true);">{tmpl_var name='btn_save_txt'}</button>
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/system_config_edit.php?next_tab=dns_ca">{tmpl_var name='btn_cancel_txt'}</button>
</div></div>
</tmpl_if>
diff --git a/interface/web/admin/templates/users_list.htm b/interface/web/admin/templates/users_list.htm
index 6486ed344d03e2249b511256558a87e423520d01..5eef7f0f1162e7dee7b8a60e574e8da679fe4100 100644
--- a/interface/web/admin/templates/users_list.htm
+++ b/interface/web/admin/templates/users_list.htm
@@ -5,13 +5,13 @@
<p class="fieldset-legend">{tmpl_var name="toolsarea_head_txt"}</p>
-
+
<button class="btn btn-default formbutton-success" type="button" data-load-content="admin/users_edit.php">{tmpl_var name="add_new_record_txt"}</button>
- <p><tmpl_var name="warning_txt"></p>
-
-
+ <br><br>
+ <div class="alert alert-warning"><p><tmpl_var name="warning_txt"></p></div>
+
+
-
<p class="fieldset-legend"><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
@@ -61,5 +61,3 @@
</tfoot>
</table>
</div>
-
-
\ No newline at end of file
diff --git a/interface/web/admin/templates/users_user_edit.htm b/interface/web/admin/templates/users_user_edit.htm
index baf5f58554d7924d58de57d3b0d0e415ff23abe5..b8c9d9640c3cea19d4ad1732630d9978af707615 100644
--- a/interface/web/admin/templates/users_user_edit.htm
+++ b/interface/web/admin/templates/users_user_edit.htm
@@ -1,10 +1,17 @@
<div class="form-group">
<label for="username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label>
<div class="col-sm-9"><input type="text" name="username" id="username" value="{tmpl_var name='username'}" class="form-control" /></div></div>
- <div class="form-group">
- <label for="passwort" class="col-sm-3 control-label">{tmpl_var name='passwort_txt'}</label>
- <div class="col-sm-6"><input type="password" name="passwort" id="passwort" value="{tmpl_var name='passwort'}" class="form-control" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('passwort','repeat_password');"/></div><div class="col-sm-3 input-sm"> </div><a href="javascript:void(0);" onclick="generatePassword('passwort','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
- </div>
+ <div class="form-group">
+ <label for="password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
+ <div class="col-sm-9">
+ <div class="input-group">
+ <input type="password" name="password" id="password" value="{tmpl_var name='password'}" title="{tmpl_var name='password_click_to_set_txt'}" class="form-control" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />
+ <span class="input-group-btn">
+ <button class="btn btn-default" type="button" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</button>
+ </span>
+ </div>
+ </div>
+ </div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
<div class="col-sm-9 checkbox">
@@ -63,10 +70,10 @@
{tmpl_var name='lost_password_function'}
</div>
</div>
-
-
+
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
-
+
<div class="clear"><div class="right">
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/users_edit.php">{tmpl_var name='btn_save_txt'}</button>
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/users_list.php">{tmpl_var name='btn_cancel_txt'}</button>
diff --git a/interface/web/dns/dns_edit_base.php b/interface/web/dns/dns_edit_base.php
index 4f61b71ce5e4c3079e50a75093bdb5bb9a4a402c..a94bd54946d3cc0fe67d28d6361863ad6a21908a 100644
--- a/interface/web/dns/dns_edit_base.php
+++ b/interface/web/dns/dns_edit_base.php
@@ -112,7 +112,17 @@ class dns_page_action extends tform_actions {
}
}
} // end if user is not admin
-
+
+ // Replace @ to example.com.
+ if($this->dataRecord["name"] === '@') {
+ $this->dataRecord["name"] = $soa['origin'];
+ }
+
+ // Replace * to *.example.com.
+ if($this->dataRecord["name"] === '*') {
+ $this->dataRecord["name"] = '*.' . $soa['origin'];
+ }
+
if($this->checkDuplicate()) $app->tform->errorMessage .= $app->tform->lng("data_error_duplicate")."<br>";
// Set the server ID of the rr record to the same server ID as the parent record.
diff --git a/interface/web/dns/templates/dns_a_list.htm b/interface/web/dns/templates/dns_a_list.htm
index da8a8aaf0629241e8abdaebae3533ad4a151504d..e3e54867639145fea572859d68b8bba812f932e3 100644
--- a/interface/web/dns/templates/dns_a_list.htm
+++ b/interface/web/dns/templates/dns_a_list.htm
@@ -1,6 +1,5 @@
<div class="pnl_toolsarea">
<tmpl_if name='datalog_changes_count' op='>' value='0'>
- <div>
<div class="systemmonitor-state state-info">
<div class="status"></div>
<div class="statusMsg">
@@ -12,32 +11,31 @@
</ul>
{tmpl_var name="datalog_changes_end_txt"}
</div>
- </div><br />
- </div>
+ </div>
</tmpl_if>
<p class="fieldset-legend">{tmpl_var name="toolsarea_head_txt"}</p>
<div class="buttons topbuttons">
- <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_a_edit.php?zone={tmpl_var name='parent_id'}">A</button>
- <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_aaaa_edit.php?zone={tmpl_var name='parent_id'}">AAAA</button>
- <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_alias_edit.php?zone={tmpl_var name='parent_id'}">ALIAS</button>
- <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_caa_edit.php?zone={tmpl_var name='parent_id'}">CAA</button>
- <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_cname_edit.php?zone={tmpl_var name='parent_id'}">CNAME</button>
- <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_dname_edit.php?zone={tmpl_var name='parent_id'}">DNAME</button>
- <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_dkim_edit.php?zone={tmpl_var name='parent_id'}">DKIM</button>
- <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_ds_edit.php?zone={tmpl_var name='parent_id'}">DS</button>
- <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_dmarc_edit.php?zone={tmpl_var name='parent_id'}">DMARC</button>
- <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_hinfo_edit.php?zone={tmpl_var name='parent_id'}">HINFO</button>
- <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_loc_edit.php?zone={tmpl_var name='parent_id'}">LOC</button>
- <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_mx_edit.php?zone={tmpl_var name='parent_id'}">MX</button>
- <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_naptr_edit.php?zone={tmpl_var name='parent_id'}">NAPTR</button>
- <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_ns_edit.php?zone={tmpl_var name='parent_id'}">NS</button>
- <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_ptr_edit.php?zone={tmpl_var name='parent_id'}">PTR</button>
- <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_rp_edit.php?zone={tmpl_var name='parent_id'}">RP</button>
- <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_spf_edit.php?zone={tmpl_var name='parent_id'}">SPF</button>
- <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_srv_edit.php?zone={tmpl_var name='parent_id'}">SRV</button>
- <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_sshfp_edit.php?zone={tmpl_var name='parent_id'}">SSHFP</button>
- <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_tlsa_edit.php?zone={tmpl_var name='parent_id'}">TLSA</button>
- <button class="btn btn-default formbutton-success" type="button" data-load-content="dns/dns_txt_edit.php?zone={tmpl_var name='parent_id'}">TXT</button>
+ <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_a_edit.php?zone={tmpl_var name='parent_id'}">A</button>
+ <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_aaaa_edit.php?zone={tmpl_var name='parent_id'}">AAAA</button>
+ <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_alias_edit.php?zone={tmpl_var name='parent_id'}">ALIAS</button>
+ <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_caa_edit.php?zone={tmpl_var name='parent_id'}">CAA</button>
+ <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_cname_edit.php?zone={tmpl_var name='parent_id'}">CNAME</button>
+ <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_dname_edit.php?zone={tmpl_var name='parent_id'}">DNAME</button>
+ <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_dkim_edit.php?zone={tmpl_var name='parent_id'}">DKIM</button>
+ <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_ds_edit.php?zone={tmpl_var name='parent_id'}">DS</button>
+ <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_dmarc_edit.php?zone={tmpl_var name='parent_id'}">DMARC</button>
+ <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_hinfo_edit.php?zone={tmpl_var name='parent_id'}">HINFO</button>
+ <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_loc_edit.php?zone={tmpl_var name='parent_id'}">LOC</button>
+ <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_mx_edit.php?zone={tmpl_var name='parent_id'}">MX</button>
+ <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_naptr_edit.php?zone={tmpl_var name='parent_id'}">NAPTR</button>
+ <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_ns_edit.php?zone={tmpl_var name='parent_id'}">NS</button>
+ <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_ptr_edit.php?zone={tmpl_var name='parent_id'}">PTR</button>
+ <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_rp_edit.php?zone={tmpl_var name='parent_id'}">RP</button>
+ <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_spf_edit.php?zone={tmpl_var name='parent_id'}">SPF</button>
+ <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_srv_edit.php?zone={tmpl_var name='parent_id'}">SRV</button>
+ <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_sshfp_edit.php?zone={tmpl_var name='parent_id'}">SSHFP</button>
+ <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_tlsa_edit.php?zone={tmpl_var name='parent_id'}">TLSA</button>
+ <button class="btn btn-default dns-record-btn formbutton-success" type="button" data-load-content="dns/dns_txt_edit.php?zone={tmpl_var name='parent_id'}">TXT</button>
</div>
</div>
diff --git a/interface/web/monitor/lib/lang/ar.lng b/interface/web/monitor/lib/lang/ar.lng
index 4a927b37fab843650153e500369e6cd11a42f772..c3604197a3fd51442b1d057cfe39c69247f73077 100644
--- a/interface/web/monitor/lib/lang/ar.lng
+++ b/interface/web/monitor/lib/lang/ar.lng
@@ -41,6 +41,7 @@ $wb['Mail err-Log'] = 'Mail Error-Log';
$wb['System-Log'] = 'System-Log';
$wb['ISPC Cron-Log'] = 'ISPC Cron-Log';
$wb['Freshclam-Log'] = 'Freshclam-Log';
+$wb['Let\'s Encrypt log'] = 'Let\'s Encrypt log';
$wb['Clamav-Log'] = 'Clamav-Log';
$wb['ISPConfig-Log'] = 'ISPConfig-Log';
$wb['RKHunter-Log'] = 'RKHunter-Log';
@@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Mail-Warn - Log';
$wb['monitor_logs_mailerr_txt'] = 'Mail-Error - Log';
$wb['monitor_logs_messages_txt'] = 'System Messages - Log';
$wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Log';
+$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log';
$wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log';
$wb['monitor_logs_clamav_txt'] = 'ClamAV - Log';
$wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log';
diff --git a/interface/web/monitor/lib/lang/bg.lng b/interface/web/monitor/lib/lang/bg.lng
index e28c55e93241d38ae74167bccc46336e6c99d513..b6c94dcc5119adb6ad83182002e548d56d9e2fa9 100644
--- a/interface/web/monitor/lib/lang/bg.lng
+++ b/interface/web/monitor/lib/lang/bg.lng
@@ -36,6 +36,7 @@ $wb['Mail warn-Log'] = 'Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Mail warn-Log';
$wb['Mail err-Log'] = 'Покажи Mail err-Log';
$wb['System-Log'] = 'Покажи System-Log';
$wb['Freshclam-Log'] = 'Покажи Freshclam-Log';
+$wb['Let\'s Encrypt log'] = 'Let\'s Encrypt log';
$wb['Clamav-Log'] = 'Покажи Clamav-Log';
$wb['ISPConfig-Log'] = 'Покажи ISPConfig-Log';
$wb['RKHunter-Log'] = 'Покажи RKHunter-Log';
@@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Mail-Warn - лог';
$wb['monitor_logs_mailerr_txt'] = 'Mail-Error - лог';
$wb['monitor_logs_messages_txt'] = 'System Messages - Log';
$wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Log';
+$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log';
$wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log';
$wb['monitor_logs_clamav_txt'] = 'Clamav - Log';
$wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log';
diff --git a/interface/web/monitor/lib/lang/br.lng b/interface/web/monitor/lib/lang/br.lng
index 8295525e5a0ea5c5401ff5db38027ea593983f53..470f1d84fd6c4107957cb28502e0355bad596ed6 100644
--- a/interface/web/monitor/lib/lang/br.lng
+++ b/interface/web/monitor/lib/lang/br.lng
@@ -43,6 +43,7 @@ $wb['Mail err-Log'] = 'Exibir log de erros de e-mail';
$wb['System-Log'] = 'Exibir log do sistema';
$wb['ISPC Cron-Log'] = 'Exibir log do cron';
$wb['Freshclam-Log'] = 'Exibir log do freshclam';
+$wb['Let\'s Encrypt log'] = 'Let\'s Encrypt log';
$wb['Clamav-Log'] = 'Exibir log do clamav';
$wb['ISPConfig-Log'] = 'Exibir log do ISPConfig';
$wb['RKHunter-Log'] = 'Exibir log do rkhunter';
@@ -70,6 +71,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Log - Alertas de e-mail';
$wb['monitor_logs_mailerr_txt'] = 'Log - Erros de e-mail';
$wb['monitor_logs_messages_txt'] = 'Log - Mensagens do sistema';
$wb['monitor_logs_ispccron_txt'] = 'Log - Tarefas no cron';
+$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log';
$wb['monitor_logs_freshclam_txt'] = 'Log - freshclam';
$wb['monitor_logs_clamav_txt'] = 'Log - clamav';
$wb['monitor_logs_ispc_txt'] = 'Log - ISPConfig';
diff --git a/interface/web/monitor/lib/lang/ca.lng b/interface/web/monitor/lib/lang/ca.lng
index c5de91f008ad59a8f54bfcb5eabf42c5f46af2c0..a1ef67cbae5e05afd5051bdfe465363e7580fa98 100644
--- a/interface/web/monitor/lib/lang/ca.lng
+++ b/interface/web/monitor/lib/lang/ca.lng
@@ -41,6 +41,7 @@ $wb['Mail err-Log'] = 'Voir les logs mails d\'erreur';
$wb['System-Log'] = 'Voir les logs système';
$wb['ISPC Cron-Log'] = 'Voir les logs des crons ISPC';
$wb['Freshclam-Log'] = 'Voir les logs de Freshclam';
+$wb['Let\'s Encrypt log'] = 'Let\'s Encrypt log';
$wb['Clamav-Log'] = 'Voir les logs de Clamav';
$wb['ISPConfig-Log'] = 'Voir les logs dISPConfig';
$wb['RKHunter-Log'] = 'Voir les logs de RKHunter';
@@ -62,6 +63,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Avertissements Mail - Log';
$wb['monitor_logs_mailerr_txt'] = 'Erreurs Mail - Log';
$wb['monitor_logs_messages_txt'] = 'Messages Système - Log';
$wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Log';
+$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log';
$wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log';
$wb['monitor_logs_clamav_txt'] = 'Clamav - Log';
$wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log';
diff --git a/interface/web/monitor/lib/lang/cz.lng b/interface/web/monitor/lib/lang/cz.lng
index 0c4a2633bca54bc9969f9d121b95310ded750759..4d40cba455066f1aa3ec373c93f06f113d99ba0c 100644
--- a/interface/web/monitor/lib/lang/cz.lng
+++ b/interface/web/monitor/lib/lang/cz.lng
@@ -41,6 +41,7 @@ $wb['Mail err-Log'] = 'Zobrazit e-mailový log chyb';
$wb['System-Log'] = 'Zobrazit systémový log';
$wb['ISPC Cron-Log'] = 'Zobrazit ISPConfig cron log';
$wb['Freshclam-Log'] = 'Zobrazit Freshclam log';
+$wb['Let\'s Encrypt log'] = 'Let\'s Encrypt log';
$wb['Clamav-Log'] = 'Zobrazit Clamav log';
$wb['ISPConfig-Log'] = 'Zobrazit ISPConfig log';
$wb['RKHunter-Log'] = 'Zobrazit RKHunter log';
@@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'E-mail - Varovánà - Log';
$wb['monitor_logs_mailerr_txt'] = 'E-mail - Chyby - Log';
$wb['monitor_logs_messages_txt'] = 'Systénové zprávy - Log';
$wb['monitor_logs_ispccron_txt'] = 'ISPConfig cron - Log';
+$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log';
$wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log';
$wb['monitor_logs_clamav_txt'] = 'ClamAV - Log';
$wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log';
diff --git a/interface/web/monitor/lib/lang/de.lng b/interface/web/monitor/lib/lang/de.lng
index 09af90beb03ea066e55c6d64bb9d6f945e3029de..629df19fdd5b3a61ba6411b2969ba1d3f9cedf72 100644
--- a/interface/web/monitor/lib/lang/de.lng
+++ b/interface/web/monitor/lib/lang/de.lng
@@ -36,6 +36,7 @@ $wb['Mail warn-Log'] = 'E-Mail Warn Protokoll anzeigen';
$wb['Mail err-Log'] = 'E-Mail Fehler Protokoll anzeigen';
$wb['System-Log'] = 'System Protokoll anzeigen';
$wb['Freshclam-Log'] = 'Freshclam Protokoll anzeigen';
+$wb['Let\'s Encrypt log'] = 'Let\'s Encrypt log';
$wb['Clamav-Log'] = 'ClamAV Protokoll anzeigen';
$wb['ISPConfig-Log'] = 'ISPConfig Protokoll anzeigen';
$wb['RKHunter-Log'] = 'RKHunter Protokoll anzeigen';
@@ -60,6 +61,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'E-Mail Warnung Protokoll';
$wb['monitor_logs_mailerr_txt'] = 'E-Mail Fehler Protokoll';
$wb['monitor_logs_messages_txt'] = 'Systemmeldungen Protokoll';
$wb['monitor_logs_ispccron_txt'] = 'Cron Protokoll';
+$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log';
$wb['monitor_logs_freshclam_txt'] = 'Freshclam Protokoll';
$wb['monitor_logs_clamav_txt'] = 'ClamAV Protokoll';
$wb['monitor_logs_ispc_txt'] = 'ISPConfig Protokoll';
diff --git a/interface/web/monitor/lib/lang/dk.lng b/interface/web/monitor/lib/lang/dk.lng
index 40b04e37258cbe88111866faee39a52546d02f3d..efcbcc9d4189a91887e1623a85423957f414a88e 100644
--- a/interface/web/monitor/lib/lang/dk.lng
+++ b/interface/web/monitor/lib/lang/dk.lng
@@ -41,6 +41,7 @@ $wb['Mail err-Log'] = 'Vis Mail Fejl-Log';
$wb['System-Log'] = 'Vis System-Log';
$wb['ISPC Cron-Log'] = 'Vis ISPC Cron-Log';
$wb['Freshclam-Log'] = 'Vis Freshclam-Log';
+$wb['Let\'s Encrypt log'] = 'Let\'s Encrypt log';
$wb['Clamav-Log'] = 'Vis Clamav-Log';
$wb['ISPConfig-Log'] = 'Vis ISPConfig-Log';
$wb['RKHunter-Log'] = 'Vis RKHunter-Log';
@@ -62,6 +63,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Mail-Advarsel - Log';
$wb['monitor_logs_mailerr_txt'] = 'Mail-Fejl - Log';
$wb['monitor_logs_messages_txt'] = 'System Meddelelser - Log';
$wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Log';
+$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log';
$wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log';
$wb['monitor_logs_clamav_txt'] = 'ClamAV - Log';
$wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log';
diff --git a/interface/web/monitor/lib/lang/el.lng b/interface/web/monitor/lib/lang/el.lng
index 4b52b71e1ed9e2c7b9899eb19ffc77fe507f6853..798aae223ab9c68a9f12e76a25a9b86aea1d935a 100644
--- a/interface/web/monitor/lib/lang/el.lng
+++ b/interface/web/monitor/lib/lang/el.lng
@@ -41,6 +41,7 @@ $wb['Mail err-Log'] = 'ΑÏχείο σφαλμάτων mail';
$wb['System-Log'] = 'ΑÏχείο καταγÏαφής συστήματος';
$wb['ISPC Cron-Log'] = 'ΑÏχείο καταγÏαφής ISPC Cron';
$wb['Freshclam-Log'] = 'ΑÏχείο καταγÏαφής Freshclam';
+$wb['Let\'s Encrypt log'] = 'Let\'s Encrypt log';
$wb['Clamav-Log'] = 'ΑÏχείο καταγÏαφής Clamav';
$wb['ISPConfig-Log'] = 'ΑÏχείο καταγÏαφής ISPConfig';
$wb['RKHunter-Log'] = 'ΑÏχείο καταγÏαφής RKHunter';
@@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'ΑÏχείο καταγÏαφής Mail-Warn
$wb['monitor_logs_mailerr_txt'] = 'ΑÏχείο καταγÏαφής Mail-Error';
$wb['monitor_logs_messages_txt'] = 'ΑÏχείο καταγÏαφής μηνυμάτων συστήματος';
$wb['monitor_logs_ispccron_txt'] = 'ΑÏχείο καταγÏαφής ISPConfig Cron';
+$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log';
$wb['monitor_logs_freshclam_txt'] = 'ΑÏχείο καταγÏαφής Freshclam';
$wb['monitor_logs_clamav_txt'] = 'ΑÏχείο καταγÏαφής ClamAV';
$wb['monitor_logs_ispc_txt'] = 'ΑÏχείο καταγÏαφής ISPConfig';
diff --git a/interface/web/monitor/lib/lang/en.lng b/interface/web/monitor/lib/lang/en.lng
index ddc1eda3c6bd10b6e50b65a7c9612323780d7904..5bf898a57679c143ab0008987d28c28497de584f 100644
--- a/interface/web/monitor/lib/lang/en.lng
+++ b/interface/web/monitor/lib/lang/en.lng
@@ -42,6 +42,7 @@ $wb['Mail err-Log'] = 'Mail Error-Log';
$wb['System-Log'] = 'System-Log';
$wb['ISPC Cron-Log'] = 'ISPC Cron-Log';
$wb['Freshclam-Log'] = 'Freshclam-Log';
+$wb['Let\'s Encrypt log'] = 'Let\'s Encrypt log';
$wb['Clamav-Log'] = 'Clamav-Log';
$wb['ISPConfig-Log'] = 'ISPConfig-Log';
$wb['RKHunter-Log'] = 'RKHunter-Log';
@@ -69,6 +70,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Mail-Warn - Log';
$wb['monitor_logs_mailerr_txt'] = 'Mail-Error - Log';
$wb['monitor_logs_messages_txt'] = 'System Messages - Log';
$wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Log';
+$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log';
$wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log';
$wb['monitor_logs_clamav_txt'] = 'ClamAV - Log';
$wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log';
diff --git a/interface/web/monitor/lib/lang/es.lng b/interface/web/monitor/lib/lang/es.lng
index 1ffe040c28c0eb65baf26f7377594ac870d817e9..ac044651a3206a9cfc4a1dc8d969fed515a1b910 100644
--- a/interface/web/monitor/lib/lang/es.lng
+++ b/interface/web/monitor/lib/lang/es.lng
@@ -19,6 +19,7 @@ $wb['monitor_diskusage_used_txt'] = 'Usado';
$wb['monitor_general_serverstate_txt'] = 'Estado del Servidor';
$wb['monitor_general_systemstate_txt'] = 'Estado del Sistema';
$wb['monitor_logs_clamav_txt'] = 'Registros de ClamAV';
+$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log';
$wb['monitor_logs_freshclam_txt'] = 'Registros de Freshclam ';
$wb['monitor_logs_ispc_txt'] = 'Registros de ISPConfig';
$wb['monitor_logs_ispccron_txt'] = 'Registros de las tareas programadas de ISPConfig (Cron)';
@@ -135,6 +136,7 @@ $wb['CPU info'] = 'Mostrar información de la CPU';
$wb['Disk usage'] = 'Mostrar el uso del disco';
$wb['fail2ban-Log'] = 'Mostrar el registro de Fail2ban';
$wb['Freshclam-Log'] = 'Mostrar el registro de Freshclam';
+$wb['Let\'s Encrypt log'] = 'Let\'s Encrypt log';
$wb['IPTables'] = 'Mostrar IPTables';
$wb['ISPC Cron-Log'] = 'Tareas programadas de ISPConfig';
$wb['ISPConfig-Log'] = 'Mostrar el registro de ISPConfig';
diff --git a/interface/web/monitor/lib/lang/fi.lng b/interface/web/monitor/lib/lang/fi.lng
index 449c8507c8de2fb454a5c29b11e33318131e32dd..1e7943cc4e6df06be7ef64c954269fef2f7ff027 100644
--- a/interface/web/monitor/lib/lang/fi.lng
+++ b/interface/web/monitor/lib/lang/fi.lng
@@ -40,6 +40,7 @@ $wb['Mail warn-Log'] = 'Näytä postipalvelimen varoitusloki';
$wb['Mail err-Log'] = 'Näytä postipalvelimen virheloki';
$wb['System-Log'] = 'Näytä järjestelmäloki';
$wb['Freshclam-Log'] = 'Näytä Freshclam-Loki';
+$wb['Let\'s Encrypt log'] = 'Let\'s Encrypt log';
$wb['Clamav-Log'] = 'Näytä Clamav-Loki';
$wb['ISPConfig-Log'] = 'Näytä ISPConfig-Loki';
$wb['ISPC Cron-Log'] = 'Näytä ISPC Cron-Loki';
@@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Postipalvelimen varoitusloki';
$wb['monitor_logs_mailerr_txt'] = 'Postipalvelimen virheloki';
$wb['monitor_logs_messages_txt'] = 'Järjestelmän viestiloki';
$wb['monitor_logs_ispccron_txt'] = 'ISPConfig-ajastusloki';
+$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log';
$wb['monitor_logs_freshclam_txt'] = 'Freshclam-päivitysloki';
$wb['monitor_logs_clamav_txt'] = 'Clamav-päivitysloki';
$wb['monitor_logs_ispc_txt'] = 'ISPConfig-pääloki';
diff --git a/interface/web/monitor/lib/lang/fr.lng b/interface/web/monitor/lib/lang/fr.lng
index 89176f2116f01176265328519fe766fa3ea265f0..53124875e9f730e56d85fc5af7522bb3c62a2e11 100644
--- a/interface/web/monitor/lib/lang/fr.lng
+++ b/interface/web/monitor/lib/lang/fr.lng
@@ -41,6 +41,7 @@ $wb['Mail err-Log'] = 'Voir les logs mails d’erreur';
$wb['System-Log'] = 'Voir les logs système';
$wb['ISPC Cron-Log'] = 'Voir les logs des crons ISPC';
$wb['Freshclam-Log'] = 'Voir les logs de Freshclam';
+$wb['Let\'s Encrypt log'] = 'Let\'s Encrypt log';
$wb['Clamav-Log'] = 'Voir les logs de Clamav';
$wb['ISPConfig-Log'] = 'Voir les logs dISPConfig';
$wb['RKHunter-Log'] = 'Voir les logs de RKHunter';
@@ -62,6 +63,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Avertissements Mail - Log';
$wb['monitor_logs_mailerr_txt'] = 'Erreurs Mail - Log';
$wb['monitor_logs_messages_txt'] = 'Messages Système - Log';
$wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Log';
+$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log';
$wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log';
$wb['monitor_logs_clamav_txt'] = 'Clamav - Log';
$wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log';
diff --git a/interface/web/monitor/lib/lang/hr.lng b/interface/web/monitor/lib/lang/hr.lng
index 22e5a57c34e4384e0a8da7911ec47ae33c423775..357527b4ecb366604b622947efc2e0d420e6edb1 100644
--- a/interface/web/monitor/lib/lang/hr.lng
+++ b/interface/web/monitor/lib/lang/hr.lng
@@ -41,6 +41,7 @@ $wb['Mail err-Log'] = 'Prikaži mail log (greške)';
$wb['System-Log'] = 'Prikaži sistemski log';
$wb['ISPC Cron-Log'] = 'Prikaži control panel cron log';
$wb['Freshclam-Log'] = 'Prikaži freshclam log';
+$wb['Let\'s Encrypt log'] = 'Let\'s Encrypt log';
$wb['Clamav-Log'] = 'Prikaži clamav log';
$wb['ISPConfig-Log'] = 'Prikaži control panel log';
$wb['RKHunter-Log'] = 'Prikaži RKHunter log';
@@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Mail log upozorenja';
$wb['monitor_logs_mailerr_txt'] = 'Mail log greške';
$wb['monitor_logs_messages_txt'] = 'Sistemski log-ovi';
$wb['monitor_logs_ispccron_txt'] = 'Control panel cron log-ovi';
+$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log';
$wb['monitor_logs_freshclam_txt'] = 'Freshclam log-ovi';
$wb['monitor_logs_clamav_txt'] = 'ClamAV log-ovi';
$wb['monitor_logs_ispc_txt'] = 'Control panel log-ovi';
diff --git a/interface/web/monitor/lib/lang/hu.lng b/interface/web/monitor/lib/lang/hu.lng
index ddb1e70bd832851d1ab6716609b57b22b987c52e..fe80c1dbb18212bc8b03de90e9a5bde72323eefb 100644
--- a/interface/web/monitor/lib/lang/hu.lng
+++ b/interface/web/monitor/lib/lang/hu.lng
@@ -41,6 +41,7 @@ $wb['Mail err-Log'] = 'Mail err-Log';
$wb['System-Log'] = 'System-Log';
$wb['ISPC Cron-Log'] = 'ISPC Cron-Log';
$wb['Freshclam-Log'] = 'Freshclam-Log';
+$wb['Let\'s Encrypt log'] = 'Let\'s Encrypt log';
$wb['Clamav-Log'] = 'Clamav-Log';
$wb['ISPConfig-Log'] = 'ISPConfig-Log';
$wb['RKHunter-Log'] = 'RKHunter-Log';
@@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Mail-Warn - Napló';
$wb['monitor_logs_mailerr_txt'] = 'Mail-Error - Napló';
$wb['monitor_logs_messages_txt'] = 'System Messages - Log';
$wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Log';
+$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log';
$wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log';
$wb['monitor_logs_clamav_txt'] = 'Clamav - Log';
$wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log';
diff --git a/interface/web/monitor/lib/lang/id.lng b/interface/web/monitor/lib/lang/id.lng
index 660db9090a62de875843339301d3d03857828da6..f36c9df9dd5a6a9520db7dac20c56585e6bff717 100644
--- a/interface/web/monitor/lib/lang/id.lng
+++ b/interface/web/monitor/lib/lang/id.lng
@@ -41,6 +41,7 @@ $wb['Mail err-Log'] = 'Tampilkan Log Kesalahan Mail';
$wb['System-Log'] = 'Tampilkan Log Sistem';
$wb['ISPC Cron-Log'] = 'Tampilkan Log Cron ISPC';
$wb['Freshclam-Log'] = 'Tampilkan Log Freshclam';
+$wb['Let\'s Encrypt log'] = 'Let\'s Encrypt log';
$wb['Clamav-Log'] = 'Tampilkan Log Clamav';
$wb['ISPConfig-Log'] = 'Tampilkan Log ISPConfig';
$wb['RKHunter-Log'] = 'Tampilkan Log RKHunter';
@@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Log - Mail-Warn';
$wb['monitor_logs_mailerr_txt'] = 'Log - Mail-Error';
$wb['monitor_logs_messages_txt'] = 'Log - Pesan Sistem';
$wb['monitor_logs_ispccron_txt'] = 'Log - Cron ISPConfig';
+$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log';
$wb['monitor_logs_freshclam_txt'] = 'Log - Freshclam';
$wb['monitor_logs_clamav_txt'] = 'Log - ClamAV';
$wb['monitor_logs_ispc_txt'] = 'Log - ISPConfig';
diff --git a/interface/web/monitor/lib/lang/it.lng b/interface/web/monitor/lib/lang/it.lng
index 094ea8c048e47f6c1a844e871621c7d63b06d235..ddcabc45e773408a3dce4fccc7ee70e046ee324a 100644
--- a/interface/web/monitor/lib/lang/it.lng
+++ b/interface/web/monitor/lib/lang/it.lng
@@ -35,6 +35,7 @@ $wb['Mail-Log'] = 'Mostra log mail';
$wb['Mail warn-Log'] = 'Mostra log avvisi mail';
$wb['Mail err-Log'] = 'Mostra log errori mail';
$wb['Freshclam-Log'] = 'Mostra log Freshclam';
+$wb['Let\'s Encrypt log'] = 'Let\'s Encrypt log';
$wb['Clamav-Log'] = 'Mostra log Clamav';
$wb['ISPConfig-Log'] = 'Mostra log ISPConfig';
$wb['System-Log'] = 'Mostra log di sistema';
@@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Mail-Warn - Log';
$wb['monitor_logs_mailerr_txt'] = 'Mail-Error - Log';
$wb['monitor_logs_messages_txt'] = 'System Messages - Log';
$wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Log';
+$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log';
$wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log';
$wb['monitor_logs_clamav_txt'] = 'Clamav - Log';
$wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log';
diff --git a/interface/web/monitor/lib/lang/ja.lng b/interface/web/monitor/lib/lang/ja.lng
index 6ebb34052581e425cd189405c2d51dc7947160d9..266a81f3c3eeb07b795de2626ad4a9f67f3f7426 100644
--- a/interface/web/monitor/lib/lang/ja.lng
+++ b/interface/web/monitor/lib/lang/ja.lng
@@ -41,6 +41,7 @@ $wb['Mail err-Log'] = 'メールエラーãƒã‚°ã‚’見る';
$wb['System-Log'] = 'システムãƒã‚°ã‚’見る';
$wb['ISPC Cron-Log'] = 'ISPConfigã®cronãƒã‚°ã‚’見る';
$wb['Freshclam-Log'] = 'Freshclam ã®ãƒã‚°ã‚’見る';
+$wb['Let\'s Encrypt log'] = 'Let\'s Encrypt log';
$wb['Clamav-Log'] = 'Clamav ã®ãƒã‚°ã‚’見る';
$wb['ISPConfig-Log'] = 'ISPConfigã®ãƒã‚°ã‚’見る';
$wb['RKHunter-Log'] = 'RKHunterã®ãƒã‚°ã‚’見る';
@@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'メールè¦å‘Š - ãƒã‚°';
$wb['monitor_logs_mailerr_txt'] = 'メールエラー - ãƒã‚°';
$wb['monitor_logs_messages_txt'] = 'システムメッセージ - ãƒã‚°';
$wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - ãƒã‚°';
+$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log';
$wb['monitor_logs_freshclam_txt'] = 'Freshclam - ãƒã‚°';
$wb['monitor_logs_clamav_txt'] = 'Clamav - ãƒã‚°';
$wb['monitor_logs_ispc_txt'] = 'ISPConfig - ãƒã‚°';
diff --git a/interface/web/monitor/lib/lang/nl.lng b/interface/web/monitor/lib/lang/nl.lng
index e8d3f0b3f96fac98173869ab327962612a0e6ab5..095a45090add0ab452758a28240d066a200704b5 100644
--- a/interface/web/monitor/lib/lang/nl.lng
+++ b/interface/web/monitor/lib/lang/nl.lng
@@ -36,6 +36,7 @@ $wb['Mail warn-Log'] = 'E-Mail warn-log';
$wb['Mail err-Log'] = 'E-Mail mail-err-log';
$wb['System-Log'] = 'Systeem logboek';
$wb['Freshclam-Log'] = 'Freshclam-log';
+$wb['Let\'s Encrypt log'] = 'Let\'s Encrypt log';
$wb['Clamav-Log'] = 'Clamav-Log';
$wb['ISPConfig-Log'] = 'ISPConfig-log';
$wb['RKHunter-Log'] = 'Rootkit Hunter-log';
@@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Mail-Warn - Log';
$wb['monitor_logs_mailerr_txt'] = 'Mail-Error - Log';
$wb['monitor_logs_messages_txt'] = 'Systemberichten - Log';
$wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Log';
+$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log';
$wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log';
$wb['monitor_logs_clamav_txt'] = 'Clamav - Log';
$wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log';
diff --git a/interface/web/monitor/lib/lang/pl.lng b/interface/web/monitor/lib/lang/pl.lng
index 1cba56f8a1ede3f9283e904a999acfda28ff7433..7ddc73035bb675b2476aaaaa5f94208a306836c4 100644
--- a/interface/web/monitor/lib/lang/pl.lng
+++ b/interface/web/monitor/lib/lang/pl.lng
@@ -41,6 +41,7 @@ $wb['Mail err-Log'] = 'Pokaż Log błędów Mail';
$wb['System-Log'] = 'Pokaż Log systemowy';
$wb['ISPC Cron-Log'] = 'Pokaż Log ISPC Crone';
$wb['Freshclam-Log'] = 'Pokaż Log Freshclam';
+$wb['Let\'s Encrypt log'] = 'Let\'s Encrypt log';
$wb['Clamav-Log'] = 'Pokaż Log Clamav';
$wb['ISPConfig-Log'] = 'Pokaż Log ISPConfig';
$wb['RKHunter-Log'] = 'Pokaż Log RKHunter';
@@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Log ostrzeżeń Mail';
$wb['monitor_logs_mailerr_txt'] = 'Log błędów Mail';
$wb['monitor_logs_messages_txt'] = 'Log wiadomości systemu';
$wb['monitor_logs_ispccron_txt'] = 'Log ISPConfig Cron';
+$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log';
$wb['monitor_logs_freshclam_txt'] = 'Log Freshclam';
$wb['monitor_logs_clamav_txt'] = 'Log Clamav';
$wb['monitor_logs_ispc_txt'] = 'Log ISPConfig';
diff --git a/interface/web/monitor/lib/lang/pt.lng b/interface/web/monitor/lib/lang/pt.lng
index e35e72a24f158083979d874b4546f4c9f457ae24..b8ad5e533ef0d450ab59a787389fc02d8743c87b 100644
--- a/interface/web/monitor/lib/lang/pt.lng
+++ b/interface/web/monitor/lib/lang/pt.lng
@@ -41,6 +41,7 @@ $wb['Mail err-Log'] = 'Exibir Log de Erros de Correio';
$wb['System-Log'] = 'Exibir Log de Sistema';
$wb['ISPC Cron-Log'] = 'Exibir ISPC Log do Cron';
$wb['Freshclam-Log'] = 'Exibir Log do Freshclam';
+$wb['Let\'s Encrypt log'] = 'Let\'s Encrypt log';
$wb['Clamav-Log'] = 'Exibir Log do Clamav';
$wb['ISPConfig-Log'] = 'Exibir Log do ISPConfig';
$wb['RKHunter-Log'] = 'Exibir Log do RKHunter';
@@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Log de Avisos';
$wb['monitor_logs_mailerr_txt'] = 'Log de Erros';
$wb['monitor_logs_messages_txt'] = 'Log de Sistema';
$wb['monitor_logs_ispccron_txt'] = 'Log do ISPConfig Cron';
+$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log';
$wb['monitor_logs_freshclam_txt'] = 'Logo do Freshclam';
$wb['monitor_logs_clamav_txt'] = 'Log do Clamav ';
$wb['monitor_logs_ispc_txt'] = 'Log do ISPConfig';
diff --git a/interface/web/monitor/lib/lang/ro.lng b/interface/web/monitor/lib/lang/ro.lng
index 6b5375f7d43e273feae6c2cdee87129d7bb1bf58..9ca3234362f98a524d17caf325a60a5ff97cee43 100644
--- a/interface/web/monitor/lib/lang/ro.lng
+++ b/interface/web/monitor/lib/lang/ro.lng
@@ -41,6 +41,7 @@ $wb['Mail err-Log'] = 'Mail Error-Log';
$wb['System-Log'] = 'System-Log';
$wb['ISPC Cron-Log'] = 'ISPC Cron-Log';
$wb['Freshclam-Log'] = 'Freshclam-Log';
+$wb['Let\'s Encrypt log'] = 'Let\'s Encrypt log';
$wb['Clamav-Log'] = 'Clamav-Log';
$wb['ISPConfig-Log'] = 'ISPConfig-Log';
$wb['RKHunter-Log'] = 'RKHunter-Log';
@@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Mail-Warn - Log';
$wb['monitor_logs_mailerr_txt'] = 'Mail-Error - Log';
$wb['monitor_logs_messages_txt'] = 'System Messages - Log';
$wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Log';
+$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log';
$wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log';
$wb['monitor_logs_clamav_txt'] = 'ClamAV - Log';
$wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log';
diff --git a/interface/web/monitor/lib/lang/ru.lng b/interface/web/monitor/lib/lang/ru.lng
index a0c8a408483d13b3d4bc091cb57084abc027c75c..b5469fa1744fd64f72a0586534da20b7678ce9df 100644
--- a/interface/web/monitor/lib/lang/ru.lng
+++ b/interface/web/monitor/lib/lang/ru.lng
@@ -36,6 +36,7 @@ $wb['Mail warn-Log'] = 'Показать журнал предупрежден
$wb['Mail err-Log'] = 'Показать журнал ошибок почты';
$wb['System-Log'] = 'Показать ÑиÑтемный журнал';
$wb['Freshclam-Log'] = 'Показать журнал Freshclam';
+$wb['Let\'s Encrypt log'] = 'Let\'s Encrypt log';
$wb['Clamav-Log'] = 'Показать журнал Clamav';
$wb['ISPConfig-Log'] = 'Показать журнал ISPConfig';
$wb['RKHunter-Log'] = 'Показать журнал RKHunter';
@@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñ‡Ñ‚Ñ‹ - ж
$wb['monitor_logs_mailerr_txt'] = 'Ошибки почты - журнал';
$wb['monitor_logs_messages_txt'] = 'СиÑтемные ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ - журнал';
$wb['monitor_logs_ispccron_txt'] = 'ISPConfig планировщик - журнал';
+$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log';
$wb['monitor_logs_freshclam_txt'] = 'Freshclam - журнал';
$wb['monitor_logs_clamav_txt'] = 'Clamav - журнал';
$wb['monitor_logs_ispc_txt'] = 'ISPConfig - журнал';
diff --git a/interface/web/monitor/lib/lang/se.lng b/interface/web/monitor/lib/lang/se.lng
index d3a1adacd4e0105363ede19cb6c6998b0bf6859a..9093fb960075104156a4d362513fa4faf5d8129d 100644
--- a/interface/web/monitor/lib/lang/se.lng
+++ b/interface/web/monitor/lib/lang/se.lng
@@ -36,6 +36,7 @@ $wb['Mail warn-Log'] = 'Visa varningslogg epost';
$wb['Mail err-Log'] = 'Visa felloggg epost';
$wb['System-Log'] = 'Visa systemlogg';
$wb['Freshclam-Log'] = 'Visa Freshclam-logg';
+$wb['Let\'s Encrypt log'] = 'Let\'s Encrypt log';
$wb['Clamav-Log'] = 'Visa Clamav-logg';
$wb['ISPConfig-Log'] = 'Visa ISPConfig-logg';
$wb['RKHunter-Log'] = 'Visa RKHunter-logg';
@@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Varningslogg epost';
$wb['monitor_logs_mailerr_txt'] = 'Fellogg epost';
$wb['monitor_logs_messages_txt'] = 'Systemmeddelandelogg';
$wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - logg';
+$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log';
$wb['monitor_logs_freshclam_txt'] = 'Freshclam -logg';
$wb['monitor_logs_clamav_txt'] = 'Clamav - logg';
$wb['monitor_logs_ispc_txt'] = 'ISPConfig - logg';
diff --git a/interface/web/monitor/lib/lang/sk.lng b/interface/web/monitor/lib/lang/sk.lng
index c1d41b3b7cf9e5b87551e21d7e121f18ace07a85..7b23b8c716c4db8f553d2f614d07c895a773ff9b 100644
--- a/interface/web/monitor/lib/lang/sk.lng
+++ b/interface/web/monitor/lib/lang/sk.lng
@@ -41,6 +41,7 @@ $wb['Mail err-Log'] = 'Mail err-Log';
$wb['System-Log'] = 'System-Log';
$wb['ISPC Cron-Log'] = 'ISPC Cron-Log';
$wb['Freshclam-Log'] = 'Freshclam-Log';
+$wb['Let\'s Encrypt log'] = 'Let\'s Encrypt log';
$wb['Clamav-Log'] = 'Clamav-Log';
$wb['ISPConfig-Log'] = 'ISPConfig-Log';
$wb['RKHunter-Log'] = 'RKHunter-Log';
@@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Mail-Warn - Log';
$wb['monitor_logs_mailerr_txt'] = 'Mail-Error - Log';
$wb['monitor_logs_messages_txt'] = 'System Messages - Log';
$wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Log';
+$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log';
$wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log';
$wb['monitor_logs_clamav_txt'] = 'Clamav - Log';
$wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log';
diff --git a/interface/web/monitor/lib/lang/tr.lng b/interface/web/monitor/lib/lang/tr.lng
index ca0e413dcec7f9a80d3ba8e0eec9628f31ef159f..90d96b5e3932842e31e44ff1bcdc9993aea9ebe0 100644
--- a/interface/web/monitor/lib/lang/tr.lng
+++ b/interface/web/monitor/lib/lang/tr.lng
@@ -42,6 +42,7 @@ $wb['Mail err-Log'] = 'E-posta Hata Günlüğü';
$wb['System-Log'] = 'Sistem Günlüğü';
$wb['ISPC Cron-Log'] = 'Zamanlı Görev Günlüğü';
$wb['Freshclam-Log'] = 'Freshclam Günlüğü';
+$wb['Let\'s Encrypt log'] = 'Let\'s Encrypt log';
$wb['Clamav-Log'] = 'Clamav Günlüğü';
$wb['ISPConfig-Log'] = 'ISPConfig Günlüğü';
$wb['RKHunter-Log'] = 'RKHunter Günlüğü';
@@ -68,6 +69,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'E-posta Uyarı Günlüğü';
$wb['monitor_logs_mailerr_txt'] = 'E-posta Hata Günlüğü';
$wb['monitor_logs_messages_txt'] = 'Sistem İletileri Günlüğü';
$wb['monitor_logs_ispccron_txt'] = 'ISPConfig Zamanlı Görev Günlüğü';
+$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log';
$wb['monitor_logs_freshclam_txt'] = 'Freshclam GÜnlüğü';
$wb['monitor_logs_clamav_txt'] = 'Clamav Günlüğü';
$wb['monitor_logs_ispc_txt'] = 'ISPConfig Günlüğü';
diff --git a/interface/web/monitor/lib/module.conf.php b/interface/web/monitor/lib/module.conf.php
index 7742f16ee428057d9949370ce011dd1e29e2e45f..b2788f4dcc6239008a5e1669f57d586bffee5244 100644
--- a/interface/web/monitor/lib/module.conf.php
+++ b/interface/web/monitor/lib/module.conf.php
@@ -186,6 +186,11 @@ $items[] = array( 'title' => "Freshclam-Log",
'link' => 'monitor/show_log.php?log=log_freshclam',
'html_id' => 'log_freshclam');
+$items[] = array( 'title' => "Let's Encrypt log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_log.php?log=log_letsencrypt',
+ 'html_id' => 'log_letsencrypt');
+
$items[] = array( 'title' => "Clamav-Log",
'target' => 'content',
'link' => 'monitor/show_log.php?log=log_clamav',
diff --git a/interface/web/monitor/show_log.php b/interface/web/monitor/show_log.php
index 4889e83dd914ae42168bb211e4c217fc3955cc96..b352b9d021ceac5d99ae50a00b8e7430dd5a5b3b 100644
--- a/interface/web/monitor/show_log.php
+++ b/interface/web/monitor/show_log.php
@@ -79,6 +79,11 @@ case 'log_ispc_cron':
$title = $app->lng("monitor_logs_ispccron_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
$description = '';
break;
+case 'log_letsencrypt':
+ $logId = 'log_letsencrypt';
+ $title = $app->lng("monitor_logs_letsencrypt_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
+ break;
case 'log_freshclam':
$logId = 'log_freshclam';
$title = $app->lng("monitor_logs_freshclam_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
@@ -127,7 +132,7 @@ if(isset($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 $line => $val) {
if (strpos($val, 'ERROR') !== FALSE) {
diff --git a/interface/web/monitor/show_sys_state.php b/interface/web/monitor/show_sys_state.php
index 904519f892e61a97173aeba39bad344117f01856..9e70496a81927067e59eed5f60909d4f5fe709c3 100644
--- a/interface/web/monitor/show_sys_state.php
+++ b/interface/web/monitor/show_sys_state.php
@@ -223,12 +223,12 @@ function _getServerState($serverId, $serverName) {
/*
* Info of a VE inside a OpenVz-Host
*/
-
+
$alert_class = 'alert-info';
if($serverState == 'ok') $alert_class = 'alert-success';
if($serverState == 'warning') $alert_class = 'alert-warning';
if($serverState == 'critical' || $serverState == 'error') $alert_class = 'alert-danger';
-
+
//$html_ve = '<div class="systemmonitor-ve state-' . $serverState . '-ve os-' . $osData['name'] . '">';
//$html_ve = '<div class="systemmonitor state-' . $serverState . ' os-' . $osData['name'] . '">';
$html_server = '<div class="alert '.$alert_class.'" role="alert">';
@@ -254,7 +254,7 @@ function _getServerState($serverId, $serverName) {
* Info of a "normal" Server or a OpenVz-Host
*/
//$html_server = '<div class="systemmonitor-server state-' . $serverState . ' os-' . $osData['name'] . '">';
-
+
/*
switch ($oldState) {
case 'no_state': $oldInt = 0;
@@ -276,7 +276,7 @@ function _getServerState($serverId, $serverName) {
if($serverState == 'ok') $alert_class = 'alert-success';
if($serverState == 'warning') $alert_class = 'alert-warning';
if($serverState == 'critical' || $serverState == 'error') $alert_class = 'alert-danger';
-
+
$html_server = '<div class="alert '.$alert_class.'" role="alert">';
if ($osData != null) {
//$html_server .= '<div class="icoDevice"><p class="status"></p></div>';
@@ -615,6 +615,9 @@ function _processDbState($type, $serverId, $serverState, $messages) {
if ($type == 'log_messages') {
/* this type has no state */
}
+ if ($type == 'log_letsencrypt') {
+ /* this type has no state */
+ }
if ($type == 'rkhunter') {
/* this type has no state */
}
diff --git a/interface/web/sites/form/ftp_user.tform.php b/interface/web/sites/form/ftp_user.tform.php
index 0b48d7a92d59da48a71698fd5fc50a660ad38ddc..e62f5ca40a548b5504cf89f98ce8e9ba752258c5 100644
--- a/interface/web/sites/form/ftp_user.tform.php
+++ b/interface/web/sites/form/ftp_user.tform.php
@@ -203,7 +203,7 @@ if($app->auth->is_admin()) {
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
'errmsg'=> 'directory_error_empty'),
1 => array ( 'type' => 'REGEX',
- 'regex' => '/^\/[a-zA-Z0-9\ \.\-\_\/]{10,128}$/',
+ 'regex' => '/^\/[a-zA-Z0-9\ \.\-\_\/]{7,128}$/',
'errmsg'=> 'directory_error_regex'),
2 => array ( 'type' => 'CUSTOM',
'class' => 'validate_ftpuser',
diff --git a/interface/web/sites/templates/ftp_sites_stats_list.htm b/interface/web/sites/templates/ftp_sites_stats_list.htm
index 678864cb9115c0bc5925f5917b94dc713e412266..9474bb2fdad7317888fe2e410909df0797a52729 100644
--- a/interface/web/sites/templates/ftp_sites_stats_list.htm
+++ b/interface/web/sites/templates/ftp_sites_stats_list.htm
@@ -17,11 +17,11 @@
</tr>
<tr>
<td><input class="form-control" type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
- <td class="this_month"><tmpl_var name="in_out_txt"></td>
- <td class="last_month"><tmpl_var name="in_out_txt"></td>
- <td class="this_year"><tmpl_var name="in_out_txt"></td>
- <td class="last_year"><tmpl_var name="in_out_txt"></td>
- <td class="text-right">
+ <td class="this_month" style="color:black"><tmpl_var name="in_out_txt"></td>
+ <td class="last_month" style="color:black"><tmpl_var name="in_out_txt"></td>
+ <td class="this_year" style="color:black"><tmpl_var name="in_out_txt"></td>
+ <td class="last_year" style="color:black"><tmpl_var name="in_out_txt"></td>
+ <td class="text-right" style="color:black">
<button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" data-submit-form="pageForm" data-form-action="sites/ftp_sites_stats.php"><span class="icon icon-filter"></span></button>
</td>
</tr>
diff --git a/interface/web/themes/default/assets/javascripts/ispconfig.js b/interface/web/themes/default/assets/javascripts/ispconfig.js
index e3a2bee3688d9144d82421c1464529ec0a973211..ff6dc681dc4d4601b9e8190fe512cde68b741a7a 100644
--- a/interface/web/themes/default/assets/javascripts/ispconfig.js
+++ b/interface/web/themes/default/assets/javascripts/ispconfig.js
@@ -86,7 +86,6 @@ var ISPConfig = {
if(ISPConfig.options.useComboBox == true) {
$('#sidebar').find("select:not(.chosen-select)").select2({
placeholder: '',
- width: 'element',
selectOnBlur: true,
allowClear: true
});
@@ -100,7 +99,6 @@ var ISPConfig = {
if(ISPConfig.options.useComboBox == true) {
$('#pageContent').find("select:not(.chosen-select)").select2({
placeholder: '',
- width: 'element',
selectOnBlur: true,
allowClear: true,
formatResult: function(o, cont, qry, escapeMarkup) {
diff --git a/interface/web/themes/default/assets/stylesheets/ispconfig.css b/interface/web/themes/default/assets/stylesheets/ispconfig.css
index 8d679f274049b8482b1e0b05beaafd9458f1f6a9..2c04ee849a1884925d751b0860e183d5449d1f4b 100644
--- a/interface/web/themes/default/assets/stylesheets/ispconfig.css
+++ b/interface/web/themes/default/assets/stylesheets/ispconfig.css
@@ -128,6 +128,10 @@ body {
.btn-group-justified .btn:last-of-type {
border-right-width: 1px; }
+.dns-record-btn {
+ margin-top: 3px;
+}
+
#content {
width: 78%; }
diff --git a/server/lib/classes/cron.d/100-monitor_letsencrypt_log.inc.php b/server/lib/classes/cron.d/100-monitor_letsencrypt_log.inc.php
new file mode 100644
index 0000000000000000000000000000000000000000..401dcd1e553ec5c3ce8f4777d9cd4cc238be403d
--- /dev/null
+++ b/server/lib/classes/cron.d/100-monitor_letsencrypt_log.inc.php
@@ -0,0 +1,105 @@
+<?php
+
+/*
+Copyright (c) 2013, Marius Cramer, pixcept KG
+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.
+*/
+
+class cronjob_monitor_letsencrypt_log extends cronjob {
+
+ // job schedule
+ protected $_schedule = '*/5 * * * *';
+ protected $_run_at_new = true;
+
+ private $_tools = null;
+
+ /* this function is optional if it contains no custom code */
+ public function onPrepare() {
+ global $app;
+
+ parent::onPrepare();
+ }
+
+ /* this function is optional if it contains no custom code */
+ public function onBeforeRun() {
+ global $app;
+
+ return parent::onBeforeRun();
+ }
+
+ public function onRunJob() {
+ global $app, $conf;
+
+ /* used for all monitor cronjobs */
+ $app->load('monitor_tools');
+ $this->_tools = new monitor_tools();
+ /* end global section for monitor cronjobs */
+
+ /* the id of the server as int */
+ $server_id = intval($conf['server_id']);
+
+ /** The type of the data */
+ $type = 'log_letsencrypt';
+
+ /* Get the data of the log */
+ $data = $this->_tools->_getLogData($type);
+
+ /*
+ * actually this info has no state.
+ * maybe someone knows better...???...
+ */
+ $state = 'no_state';
+
+ /*
+ * Return the Result
+ */
+ $res = array();
+ $res['server_id'] = $server_id;
+ $res['type'] = $type;
+ $res['data'] = $data;
+ $res['state'] = $state;
+
+ /*
+ * Insert the data into the database
+ */
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
+ 'VALUES (?, ?, UNIX_TIMESTAMP(), ?, ?)';
+ $app->dbmaster->query($sql, $res['server_id'], $res['type'], serialize($res['data']), $res['state']);
+
+ /* The new data is written, now we can delete the old one */
+ $this->_tools->delOldRecords($res['type'], $res['server_id']);
+
+ parent::onRunJob();
+ }
+
+ /* this function is optional if it contains no custom code */
+ public function onAfterRun() {
+ global $app;
+
+ parent::onAfterRun();
+ }
+}
+?>
diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php
index e349acd12894c2251ae619d423f0226652ada6f2..b4a6d2e86500c915886f95a7a4580f86b82f56c0 100644
--- a/server/lib/classes/monitor_tools.inc.php
+++ b/server/lib/classes/monitor_tools.inc.php
@@ -44,12 +44,12 @@ class monitor_tools {
//** Debian or Ubuntu
if(file_exists('/etc/debian_version')) {
-
+
// Check if this is Ubuntu and not Debian
if (strstr(trim(file_get_contents('/etc/issue')), 'Ubuntu') || (is_file('/etc/os-release') && stristr(file_get_contents('/etc/os-release'), 'Ubuntu'))) {
-
+
$issue = file_get_contents('/etc/issue');
-
+
// Use content of /etc/issue file
if(strstr($issue,'Ubuntu')) {
if (strstr(trim($issue), 'LTS')) {
@@ -75,7 +75,7 @@ class monitor_tools {
} else {
$lts = "";
}
-
+
$distname = 'Ubuntu';
$distid = 'debian40';
$distbaseid = 'debian';
@@ -353,7 +353,7 @@ class monitor_tools {
} else {
die('Unrecognized GNU/Linux distribution');
}
-
+
// Set $distconfid to distid, if no different id for the config is defined
if(!isset($distconfid)) $distconfid = $distid;
@@ -560,6 +560,17 @@ class monitor_tools {
$logfile = '/var/log/cron';
}
break;
+ case 'log_letsencrypt':
+ if ($dist == 'debian') {
+ $logfile = '/var/log/letsencrypt/letsencrypt.log';
+ } elseif ($dist == 'redhat') {
+ $logfile = '/var/log/letsencrypt/letsencrypt.log';
+ } elseif ($dist == 'suse') {
+ $logfile = '/var/log/letsencrypt/letsencrypt.log';
+ } elseif ($dist == 'gentoo') {
+ $logfile = '/var/log/letsencrypt/letsencrypt.log';
+ }
+ break;
case 'log_freshclam':
if ($dist == 'debian') {
$logfile = '/var/log/clamav/freshclam.log';
@@ -832,7 +843,7 @@ class monitor_tools {
$mailBody = strtr($mailBody, $placeholders);
for($r = 0; $r < count($recipients); $r++) {
- mail($recipients[$r], $mailSubject, $mailBody, $mailHeaders);
+ $app->functions->mail($recipients[$r], $mailSubject, $mailBody, $mailHeaders);
}
unset($mailSubject);
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index f6a0a1ce7bb20f2a3328e4e619c83c934d8c94cf..f6403b79698e1bdb13dc6900df0805750f5f8782 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -1491,6 +1491,10 @@ class apache2_plugin {
$tpl->setVar('rewrite_enabled', 0);
}
+ if($data['new']['ssl'] == 'n') {
+ $tpl->setVar('rewrite_to_https', 'n');
+ }
+
//$tpl->setLoop('redirects',$rewrite_rules);
/**