Add ability to control Server: response header #1945

This change:

  1. Adds ability for an admin to set custom response header for `Server:`
  2. Fixes displaying of running Webmin version for unauthenticated user

CHANGELOG.md

@@ -1,5 +1,27 @@
 ## Changelog
 
+#### 2.021 (March 19, 2023)
+* Add ability to set locale in Webmin Users module for consistency
+* Fix an error when `make_date` is called on undefined value #1860
+* Fix clearing packages caches before checking for updates in status collection #1863
+* Update the Authentic theme to the latest version
+
+#### 2.020 (March 08, 2023)
+* Add full locale support
+* Add slave zone file format option in BIND DNS module
+* Add support for editing ACLs in File Manager
+* Add support to configure SSL connection for MySQL/MariaDB module
+* Add support for compressed backups in PostgreSQL module
+* Add support for displaying inodes too in Disk Usage in the Dashboard
+* Add better support for CloudLinux
+* Fix to always default to RSA key type in Let's Encrypt requests
+* Fix setup repository script for Oracle
+* Fix shutdown timeout to avoid termination of running processes
+* Fix support for SpamAssassin 4
+* Fix to use system default hashing format for `htpasswd` file
+* Fix FastRPC issues
+* Update the Authentic theme to the latest version, with sped-up Dashboard performance
+
 #### 2.013 (January 19, 2023)
 * Fix Authentic theme issue with error handling
 * Fix Framed theme to respect selected mode in left menu

README.md

@@ -1,18 +1,31 @@
-## Contents
+ 
+<p align="center"><img src="https://user-images.githubusercontent.com/4426533/218263860-f7baf9d6-cb19-4ddc-86dc-ac1b7a3c3a8a.png" alt="Webmin" width="310px"></p>
+&nbsp;
+<p align="center"> <a href="https://webmin.com/docs/" target="_blank">Documentation</a> &nbsp;&nbsp;|&nbsp;&nbsp; <a href="https://webmin.com/faq/" target="_blank">FAQ</a> &nbsp;&nbsp;|&nbsp;&nbsp; <a href="https://webmin.com/security/" target="_blank">Security</a> &nbsp;&nbsp;|&nbsp;&nbsp; <a href="https://webmin.com/screenshots/" target="_blank">Screenshots</a>&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp; <a href="https://forum.virtualmin.com/c/webmin/12" target="_blank">Forum</a> <br><br> <a href="https://webmin.com/"><img src="https://img.shields.io/badge/downloads-25M+-brightgreen.svg" alt="Downloads"></a> <a href="https://github.com/webmin/webmin/releases/"><img src="https://img.shields.io/github/release/webmin/webmin" alt="Latest release"></a> <a href="https://github.com/webmin/webmin/stargazers"><img src="https://img.shields.io/github/stars/webmin/webmin" alt="Stars"></a> <a href="https://github.com/webmin/webmin/network/members"><img src="https://img.shields.io/github/forks/webmin/webmin" alt="Members"></a> <a href="https://github.com/webmin/webmin/contributors/"><img src="https://img.shields.io/github/contributors/webmin/webmin" alt="Contributors"></a> <a href="https://github.com/webmin/webmin/issues/"><img src="https://img.shields.io/github/issues-raw/webmin/webmin" alt="Issues"></a> <a href="https://github.com/webmin/webmin/blob/master/LICENCE"><img src="https://img.shields.io/github/license/webmin/webmin" alt="License"></a> </p>
+&nbsp;
+
+---
+
+&nbsp;
+
 * [Changelog](https://github.com/webmin/webmin/blob/master/CHANGELOG.md)
 * [About](#about)
-* [Installation](#installation)[<img src="https://github.com/webmin-devel/webmin/blob/master/media/download-23x14-stable.png?raw=true" title="Stable Versions">](https://webmin.com/download.html)[<img src="https://github.com/webmin-devel/webmin/blob/master/media/download-23x14-devel.png?raw=true" title="Development Versions">](https://webmin.com/devel.html)
+* [Installation](#installation)
-* [Documentation](#documentation)
 * [Development](#development)
 * [License](#license)
 
-* [中文版](https://github.com/webmin/webmin/blob/master/README-zh.md)
-
 ## About
 
-**Webmin** is a web-based system administration tool for Unix-like servers, and services with over _1,000,000_ installations worldwide. Using it, it is possible to configure operating system internals, such as users, disk quotas, services or configuration files, as well as modify, and control open-source apps, such as BIND DNS Server, Apache HTTP Server, PHP, MySQL, and [many more](https://doxfer.webmin.com/Webmin/Introduction). 
+**Webmin** is a web-based system administration tool for Unix-like servers, and services with about _1,000,000_ yearly installations worldwide. Using it, it is possible to configure operating system internals, such as users, disk quotas, services or configuration files, as well as modify, and control open-source apps, such as BIND DNS Server, Apache HTTP Server, PHP, MySQL, and many more.
 
-[![Quick UI overview 2021](https://user-images.githubusercontent.com/4426533/114315375-61a1c480-9b07-11eb-9aaf-4aa949a39ab7.png)](https://www.youtube.com/watch?v=daYG6O4AsEw)
+<p align="center">
+  <a href="https://webmin.com/screenshots/#gh-light-mode-only" target="_blank">
+    <img width="1440" alt="Dashboard screenshot" src="https://user-images.githubusercontent.com/4426533/218264253-c08fb45a-8d75-44bf-93b3-37a2ecae3d20.png">
+  </a>
+  <a href="https://webmin.com/screenshots/#gh-dark-mode-only" target="_blank">
+    <img width="1440" alt="Dashboard screenshot" src="https://user-images.githubusercontent.com/4426533/218265232-31140aa6-ada1-4019-bd75-04240aeabc83.png">
+  </a>
+</p>
 
 Usability can be expanded by installing modules, which can be custom made. Aside from this, there are two other major projects that extend its functionality:
 
@@ -26,16 +39,7 @@ Webmin includes _116_ [standard modules](https://doxfer.webmin.com/Webmin/Webmin
 Perl 5.10 or higher.
 
 ## Installation
-Webmin can be installed in two different ways:
+For detailed installation instructions check our guide on [webmin.com/download](https://webmin.com/download) page.
-
- 1. By downloading a pre-built package, available for different distributions (CentOS, Fedora, SuSE, Mandriva, Debian, Ubuntu, Solaris and [other](https://www.webmin.com/support.html)) under [latest release assets](https://github.com/webmin/webmin/releases/latest) or from our [download page](https://webmin.com/download.html);
-  <kbd>Note: It is highly recommended to [add repository](https://doxfer.webmin.com/Webmin/Installation) to your system for having automatic updates.</kbd>
-
- 2. By downloading, extracting [source file](https://prdownloads.sourceforge.net/webadmin/webmin-2.013.tar.gz), and running [_setup.sh_](https://www.webmin.com/tgz.html) script, with no arguments, which will setup to run it directly from this directory, or with a command-line argument, such as targeted directory.
-  <kbd>Note: If you are installing Webmin [on Windows](https://www.webmin.com/windows.html) system, you must run the command `perl setup.pl` instead. The Windows version depends on several programs, and modules that may not be part of the standard distribution. You will need _process.exe_ command, _sc.exe_ command, and _Win32::Daemon_ Perl module.</kbd>
-
-## Documentation
-Complete set of documentation for Webmin and all of its modules can be found at out [Wiki page](https://doxfer.webmin.com/Webmin/Main_Page).
 
 ## Development
 

acl/acl-lib.pl

@@ -88,6 +88,8 @@ while(my $l = <$fh>) {
 		$user{'modules'} = $acl{$user[0]};
 		$user{'lang'} = $gconfig{"lang_$user[0]"};
 		$user{'langauto'} = $gconfig{"langauto_$user[0]"};
+		$user{'locale'} = $gconfig{"locale_$user[0]"};
+		$user{'dateformat'} = $gconfig{"dateformat_$user[0]"};
 		$user{'notabs'} = $gconfig{"notabs_$user[0]"};
 		$user{'rbacdeny'} = $gconfig{"rbacdeny_$user[0]"};
 		if ($gconfig{"theme_$user[0]"}) {
@@ -702,6 +704,10 @@ else {
 	$gconfig{"lang_".$user->{'name'}} = $user->{'lang'} if ($user->{'lang'});
 	delete($gconfig{"langauto_".$username});
 	$gconfig{"langauto_".$user->{'name'}} = $user->{'langauto'} if (defined($user->{'langauto'}));
+	delete($gconfig{"locale_".$username});
+	$gconfig{"locale_".$user->{'name'}} = $user->{'locale'} if (defined($user->{'locale'}));
+	delete($gconfig{"dateformat_".$username});
+	$gconfig{"dateformat_".$user->{'name'}} = $user->{'dateformat'} if (defined($user->{'dateformat'}));
 	delete($gconfig{"notabs_".$username});
 	$gconfig{"notabs_".$user->{'name'}} = $user->{'notabs'}
 		if ($user->{'notabs'});
@@ -768,14 +774,16 @@ if ($oldpass ne $user->{'pass'} &&
 	my $nolock = $oldpass;
 	$nolock =~ s/^\!//;
 	$user->{'olds'} ||= [];
-	unshift(@{$user->{'olds'}}, $nolock);
+	if (&indexof($nolock, @{$user->{'olds'}}) < 0) {
-	if ($miniserv->{'pass_oldblock'}) {
+		unshift(@{$user->{'olds'}}, $nolock);
-		while(scalar(@{$user->{'olds'}}) >
+		if ($miniserv->{'pass_oldblock'}) {
-		      $miniserv->{'pass_oldblock'}) {
+			while(scalar(@{$user->{'olds'}}) >
-			pop(@{$user->{'olds'}});
+			      $miniserv->{'pass_oldblock'}) {
+				pop(@{$user->{'olds'}});
+				}
 			}
+		$user->{'lastchange'} = time();
 		}
-	$user->{'lastchange'} = time();
 	}
 }
 

acl/acl_security.pl

@@ -82,6 +82,6 @@ $o->{'gassign'} = $in{'gassign_def'} ? '*' :
 sub list_acl_yesno_fields
 {
 return ('create', 'delete', 'rename', 'acl', 'cert', 'others', 'chcert',
-	'lang', 'cats', 'theme', 'ips', 'perms', 'sync', 'unix', 'sessions',
+	'lang', 'locale', 'cats', 'theme', 'ips', 'perms', 'sync', 'unix', 'sessions',
 	'switch', 'times', 'pass', 'sql');
 }

acl/config.info

@@ -2,4 +2,4 @@ line1=Configurable options,11
 display=User and group display mode,1,1-Names only,0-Names and modules
 order=Sort users and groups by,1,0-Order in file,1-Name
 line2=System configuration,11
-ssleay=Path to openssl or ssleay program,3,Automatic
+ssleay=Path to <tt>openssl</tt> or <tt>ssleay</tt> program,3,Automatic

acl/defaultacl

@@ -8,6 +8,7 @@ cert=1
 acl=1
 chcert=1
 lang=1
+locale=1
 groups=1
 gassign=*
 perms=0

acl/edit_user.cgi

@@ -7,7 +7,7 @@ use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
 require './acl-lib.pl';
-our (%in, %text, %config, %access, $config_directory, $base_remote_user, $remote_user);
+our (%in, %text, %config, %gconfig, %access, $config_directory, $base_remote_user, $remote_user);
 &foreign_require("webmin", "webmin-lib.pl");
 
 &ReadParse();
@@ -204,6 +204,22 @@ if ($access{'lang'}) {
 		  ]));
 	}
 
+if ($access{'locale'}) {
+	# Current locale
+	eval "use DateTime; use DateTime::Locale; use DateTime::TimeZone;";
+	if (!$@ && $] > 5.011) {
+		my $locales = &list_locales();
+		my %localesrev = reverse %{$locales};
+		my $locale_auto = &parse_accepted_language();
+		print &ui_table_row($text{'edit_locale'},
+			&ui_radio("locale_def", $user{'locale'} ? 0 : 1,
+			  [ [ 1, $text{'default'} ],
+			    [ 0, &ui_select("locale", $user{'locale'} || $gconfig{'locale'} || &get_default_system_locale(),
+					   [ map { [ $localesrev{$_}, $_ ] } sort values %{$locales} ]) ] ]), 
+			undef, [ "valign=middle","valign=middle" ]);
+		}
+	}
+
 if ($access{'cats'}) {
 	# Show categorized modules?
 	print &ui_table_row($text{'edit_notabs'},

acl/lang/af.auto

@@ -57,6 +57,7 @@ edit_twofactorcancel=Verwyder tweefaktor-verifikasievereiste
 edit_twofactornone=Nog geen opstelling nie
 edit_twofactoradd=Aktiveer tweefaktor vir gebruiker
 edit_lang=Taal
+edit_locale=Lokaal
 edit_notabs=Kategoriseer modules?
 edit_logout=Uitlogtyd vir onaktiwiteit
 edit_mins=minute
@@ -197,6 +198,7 @@ acl_delete=Kan gebruikers verwyder?
 acl_rename=Kan gebruikers hernoem word?
 acl_acl=Kan die module toegangsbeheer beheer?
 acl_lang=Kan taal verander?
+acl_locale=Kan jy van plek verander?
 acl_chcert=Kan SSL-sertifikaatnaam verander?
 acl_euser=U mag nie die ACL vir hierdie gebruiker wysig nie
 acl_egroup=U mag nie ACL's vir groepe wysig nie

acl/lang/ar.auto

@@ -27,6 +27,7 @@ edit_twofactorcancel=إزالة متطلبات المصادقة ثنائية
 edit_twofactornone=لا شيء الإعداد بعد
 edit_twofactoradd=تمكين عامل اثنين للمستخدم
 edit_lang=لغة
+edit_locale=لغة
 edit_notabs=تصنيف الوحدات؟
 edit_logout=وقت تسجيل الخمول
 edit_mins=الدقائق
@@ -123,6 +124,8 @@ cert_msg=يسمح لك هذا النموذج بطلب شهادة عميل SSL و
 cert_ou=قسم
 cert_ekey=لم يقدم متصفحك مفتاح SSL جديدًا - ربما لا يدعم شهادات عميل SSL.
 
+acl_locale=يمكن تغيير اللغة؟
+
 log_modify=Modified Webmin user $1
 log_rename=Renamed Webmin user $1 to $2
 log_create=Created Webmin user $1

acl/lang/be.auto

@@ -57,6 +57,7 @@ edit_twofactorcancel=Выдаліце двухфакторную аўтэнты
 edit_twofactornone=Пакуль няма налад
 edit_twofactoradd=Уключыць для карыстальніка два фактары
 edit_lang=Мова
+edit_locale=Лакаль
 edit_notabs=Класіфікаваць модулі?
 edit_logout=Час выхаду з рэжыму бяздзейнасці
 edit_mins=хвілін
@@ -197,6 +198,7 @@ acl_delete=Ці можна выдаляць карыстальнікаў?
 acl_rename=Ці можаце перайменаваць карыстальнікаў?
 acl_acl=Ці можна рэдагаваць кантроль доступу модуля?
 acl_lang=Ці можна змяніць мову?
+acl_locale=Ці можна змяніць лакаль?
 acl_chcert=Ці можна змяніць імя сертыфіката SSL?
 acl_euser=Вам нельга рэдагаваць ACL для гэтага карыстальніка
 acl_egroup=Вам не дазволена рэдагаваць групавыя ACL

acl/lang/bg.auto

@@ -1,6 +1,7 @@
 index_screate=Създайте нов безопасен потребител.
 
 edit_title3=Създайте безопасен потребител на Webmin
+edit_locale=локал
 edit_safe=Ниво на привилегии
 edit_safe0=неограничен
 edit_safe1=Само безопасни модули
@@ -8,6 +9,8 @@ edit_unsafe=Нулиране до неограничено
 
 save_eunixname=Потребителското име '$1' не е потребител на Unix и затова не може да се използва в безопасен режим
 
+acl_locale=Може ли да промени локала?
+
 sync_modify=Преименувайте съответстващия потребител на Webmin, когато потребител на Unix е преименуван.
 
 sessions_all=Всички сесии..

acl/lang/ca.auto

@@ -1,6 +1,7 @@
 index_screate=Creeu un nou usuari segur.
 
 edit_title3=Creeu un usuari Webmin segur
+edit_locale=Localització
 edit_safe=Nivell de privilegi
 edit_safe0=Sense restriccions
 edit_safe1=Només mòduls segurs
@@ -8,6 +9,8 @@ edit_unsafe=Restableix-lo a sense restriccions
 
 save_eunixname=El nom d'usuari '$1' no és un usuari Unix, per la qual cosa no es pot utilitzar en mode segur
 
+acl_locale=Es pot canviar la configuració regional?
+
 sync_modify=Canvieu el nom de l'usuari Webmin coincident quan es canvia el nom d'un usuari Unix.
 
 sessions_all=Totes les sessions..

acl/lang/cs.auto

@@ -10,6 +10,7 @@ edit_twofactorprov=Použití poskytovatele $1 s ID $2
 edit_twofactorcancel=Odstraňte požadavek na dvoufaktorovou autentizaci
 edit_twofactornone=Zatím žádné nastavení
 edit_twofactoradd=Povolit pro uživatele dvoufaktor
+edit_locale=Národní prostředí
 edit_nochange=Vynutit dny změny hesla?
 edit_egone=Vybraný uživatel již neexistuje!
 edit_overlay=Překrytí osobního motivu
@@ -34,6 +35,7 @@ delete_eanonuser=Tento uživatel je používán pro anonymní přístup k modulu
 
 cert_etempdir=Neplatný soubor certifikátu
 
+acl_locale=Lze změnit národní prostředí?
 acl_pass=Lze změnit omezení hesla?
 acl_sql=Lze konfigurovat databázi uživatelů a skupin?
 

acl/lang/da.auto

@@ -1,6 +1,7 @@
 index_screate=Opret en ny sikker bruger.
 
 edit_title3=Opret sikker webmin-bruger
+edit_locale=Lokalitet
 edit_safe=Privilegieniveau
 edit_safe0=Ubegrænset
 edit_safe1=Kun sikre moduler
@@ -8,6 +9,8 @@ edit_unsafe=Nulstil til ubegrænset
 
 save_eunixname=Brugernavnet '$1' er ikke en Unix-bruger, og kan derfor ikke bruges i sikker tilstand
 
+acl_locale=Kan du ændre lokalitet?
+
 sync_modify=Omdøb den matchende Webmin-bruger, når en Unix-bruger omdøbes.
 
 sessions_all=Alle sessioner..

acl/lang/de.auto

@@ -1,3 +1,7 @@
+edit_locale=Gebietsschema
+
+acl_locale=Kann das Gebietsschema ändern?
+
 sync_modify=Benennen Sie den passenden Webmin-Benutzer um, wenn ein Unix-Benutzer umbenannt wird.
 
 sessions_all=Alle Sitzungen..

acl/lang/el.auto

@@ -1,6 +1,7 @@
 index_screate=Δημιουργήστε ένα νέο ασφαλές χρήστη.
 
 edit_title3=Δημιουργία ασφαλούς χρήστη Webmin
+edit_locale=Μικρός λοβός
 edit_safe=Επίπεδο προνομίου
 edit_safe0=Απεριόριστος
 edit_safe1=Μόνο ασφαλή μονάδες
@@ -8,6 +9,8 @@ edit_unsafe=Επαναφορά σε απεριόριστη
 
 save_eunixname=Το όνομα χρήστη '$1' δεν είναι χρήστης Unix και έτσι δεν μπορεί να χρησιμοποιηθεί σε ασφαλή λειτουργία
 
+acl_locale=Μπορεί να αλλάξει τοπική;
+
 sync_modify=Μετονομάστε τον αντίστοιχο χρήστη Webmin όταν μετονομάζεται ένας χρήστης Unix.
 
 sessions_all=Όλες οι συνεδρίες..

acl/lang/en

@@ -57,6 +57,7 @@ edit_twofactorcancel=Remove two-factor authentication requirement
 edit_twofactornone=None setup yet
 edit_twofactoradd=Enable Two-Factor For User
 edit_lang=Language
+edit_locale=Locale
 edit_notabs=Categorize modules?
 edit_logout=Inactivity logout time
 edit_mins=minutes
@@ -197,6 +198,7 @@ acl_delete=Can delete users?
 acl_rename=Can rename users?
 acl_acl=Can edit module access control?
 acl_lang=Can change language?
+acl_locale=Can change locale?
 acl_chcert=Can change SSL certificate name?
 acl_euser=You are not allowed to edit the ACL for this user
 acl_egroup=You are not allowed to edit group ACLs

acl/lang/es.auto

@@ -1,6 +1,7 @@
 index_screate=Crea un nuevo usuario seguro.
 
 edit_title3=Crear usuario seguro de Webmin
+edit_locale=Lugar
 edit_safe=Nivel de privilegio
 edit_safe0=Irrestricto
 edit_safe1=Solo módulos seguros
@@ -10,6 +11,8 @@ save_eunixname=El nombre de usuario '$1' no es un usuario de Unix, por lo que no
 
 delete_eanonuser=Este usuario se está utilizando para acceder al módulo anónimo
 
+acl_locale=¿Se puede cambiar de ubicación?
+
 sync_modify=Cambie el nombre del usuario de Webmin coincidente cuando se cambie el nombre de un usuario de Unix.
 
 sessions_actions=Comportamiento..

acl/lang/eu.auto

@@ -11,6 +11,7 @@ edit_twofactorprov=Hornitzailea $1 erabiliz $2
 edit_twofactorcancel=Kendu bi faktoreen autentikazio baldintza
 edit_twofactornone=Ez dago oraindik konfigurazioa
 edit_twofactoradd=Gaitu erabiltzailearentzako bi faktore
+edit_locale=Tokikoa
 edit_egone=Aukeratutako erabiltzailea ez da existitzen!
 edit_overlay=Gai pertsonalen gainjartzea
 edit_proto=Biltegiratze mota
@@ -30,6 +31,7 @@ delete_eanonuser=Erabiltzaile hau modulu anonimoetarako sarbidea erabiltzen ari
 
 cert_etempdir=Ziurtagiri fitxategi baliogabea
 
+acl_locale=Tokia alda daiteke?
 acl_pass=Pasahitz murrizketak alda ditzakezu?
 acl_sql=Erabiltzaileen eta taldeen datu-basea konfiguratu al dezakezu?
 

acl/lang/fa.auto

@@ -17,6 +17,7 @@ edit_twofactorprov=Using provider $1 with ID $2
 edit_twofactorcancel=نیاز به تأیید اعتبار دو عاملی را حذف کنید
 edit_twofactornone=هنوز هیچ راه اندازی نشده است
 edit_twofactoradd=دو عامل را برای کاربر فعال کنید
+edit_locale=محلی
 edit_logout=زمان خروج از عدم فعالیت
 edit_mins=دقایق
 edit_chars=نامه ها
@@ -62,6 +63,7 @@ delete_eanonuser=این کاربر برای دسترسی به ماژول ناش
 
 cert_etempdir=پرونده گواهی نامعتبر است
 
+acl_locale=آیا می توان منطقه را تغییر داد؟
 acl_egroup=شما مجاز به ویرایش ACL های گروهی نیستید
 acl_times=آیا می توان بار ورود به سیستم مجاز را تغییر داد؟
 acl_pass=آیا می توانید محدودیت های رمز عبور را تغییر دهید؟

acl/lang/fi.auto

@@ -57,6 +57,7 @@ edit_twofactorcancel=Poista kaksifaktorinen todennusvaatimus
 edit_twofactornone=Ei vielä mitään asennusta
 edit_twofactoradd=Ota käyttöön kaksikerroinen käyttäjä
 edit_lang=Kieli
+edit_locale=Alue
 edit_notabs=Luokittele moduulit?
 edit_logout=Toimimattomuudesta poistumisaika
 edit_mins=pöytäkirja
@@ -197,6 +198,7 @@ acl_delete=Voiko käyttäjiä poistaa?
 acl_rename=Voivatko käyttäjät nimetä uudelleen?
 acl_acl=Voiko muokata moduulin pääsynhallintaa?
 acl_lang=Voiko kieltä vaihtaa?
+acl_locale=Voiko aluetta vaihtaa?
 acl_chcert=Voiko SSL-varmenteen nimeä muuttaa?
 acl_euser=Et voi muokata tämän käyttäjän ACL-luetteloa
 acl_egroup=Et voi muokata ryhmän ACL-luetteloita

acl/lang/fr.auto

@@ -12,6 +12,7 @@ edit_twofactorprov=Utilisation du fournisseur $1 avec l'ID $2
 edit_twofactorcancel=Supprimer l'exigence d'authentification à deux facteurs
 edit_twofactornone=Aucune configuration pour le moment
 edit_twofactoradd=Activer deux facteurs pour l'utilisateur
+edit_locale=Lieu
 edit_nochange=Appliquer les jours de changement de mot de passe?
 edit_overlay=Superposition de thème personnel
 edit_temppass=Forcer le changement à la prochaine connexion
@@ -32,6 +33,8 @@ delete_eanonuser=Cet utilisateur est utilisé pour l'accès au module anonyme
 
 cert_etempdir=Fichier de certificat non valide
 
+acl_locale=Peut changer de paramètres régionaux ?
+
 log_joingroup=Ajout de $1 utilisateurs Webmin au groupe $2 
 log_pass=Restrictions de mot de passe modifiées
 log_unix=Authentification utilisateur Unix modifiée

acl/lang/he.auto

@@ -57,6 +57,7 @@ edit_twofactorcancel=הסר את דרישת האימות של שני גורמי
 edit_twofactornone=טרם התקנה
 edit_twofactoradd=הפעל שני גורמים למשתמש
 edit_lang=שפה
+edit_locale=מקום
 edit_notabs=לסווג מודולים?
 edit_logout=זמן יציאה מחוסר פעילות
 edit_mins=דקות
@@ -197,6 +198,7 @@ acl_delete=האם ניתן למחוק משתמשים?
 acl_rename=האם ניתן לשנות שם של משתמשים?
 acl_acl=האם ניתן לערוך בקרת גישה למודול?
 acl_lang=האם ניתן לשנות שפה?
+acl_locale=האם ניתן לשנות מיקום?
 acl_chcert=האם ניתן לשנות את שם אישור ה- SSL?
 acl_euser=אינך רשאי לערוך את ה- ACL למשתמש זה
 acl_egroup=אינך מורשה לערוך רשימות ACL בקבוצות

acl/lang/hr.auto

@@ -11,6 +11,7 @@ edit_twofactorprov=Korištenje davatelja $1 s ID-om $2
 edit_twofactorcancel=Uklonite dvofaktorni zahtjev za provjeru autentičnosti
 edit_twofactornone=Još nema postavljanja
 edit_twofactoradd=Omogući korisniku dva faktora
+edit_locale=Lokalitet
 edit_nochange=Da li provodite dane za promjenu zaporke?
 edit_egone=Odabrani korisnik više ne postoji!
 edit_overlay=Prekrivanje osobne teme
@@ -35,6 +36,7 @@ delete_eanonuser=Ovaj korisnik se koristi za anonimni pristup modulu
 
 cert_etempdir=Nevažeća datoteka certifikata
 
+acl_locale=Može li se promijeniti lokalizacija?
 acl_pass=Mogu li promijeniti ograničenja zaporke?
 acl_sql=Mogu li konfigurirati korisničku i grupnu bazu podataka?
 

acl/lang/hu.auto

@@ -15,6 +15,7 @@ edit_twofactorprov=A $2 azonosítóval
 edit_twofactorcancel=Távolítsa el a kéttényezős hitelesítési követelményt
 edit_twofactornone=Még nincs beállítva
 edit_twofactoradd=Két tényező engedélyezése a felhasználó számára
+edit_locale=Nyelv
 edit_chars=betűk
 edit_minsize=Minimális jelszóhossz
 edit_nochange=Végrehajtja a jelszócsere napjait?
@@ -52,6 +53,7 @@ delete_eanonuser=Ezt a felhasználót anonim modul-hozzáféréshez használják
 
 cert_etempdir=Érvénytelen tanúsítványfájl
 
+acl_locale=Meg lehet változtatni a nyelvet?
 acl_times=Megváltoztathatja az engedélyezett bejelentkezési időket?
 acl_pass=Meg lehet változtatni a jelszó korlátozásait?
 acl_sql=Konfigurálhatunk felhasználói és csoportos adatbázist?

acl/lang/it.auto

@@ -8,6 +8,7 @@ edit_twofactorprov=Utilizzo del provider $1 con ID $2
 edit_twofactorcancel=Rimuovere i requisiti di autenticazione a due fattori
 edit_twofactornone=Nessuna configurazione ancora
 edit_twofactoradd=Abilita due fattori per l'utente
+edit_locale=Locale
 edit_safe=Livello di privilegio
 edit_safe0=illimitato
 edit_safe1=Solo moduli sicuri
@@ -19,6 +20,8 @@ delete_eanonuser=Questo utente viene utilizzato per l'accesso al modulo anonimo
 
 cert_etempdir=File di certificato non valido
 
+acl_locale=È possibile modificare le impostazioni locali?
+
 log_joingroup=Aggiunti $1 utenti Webmin al gruppo $2
 log_twofactor=Utente registrato $1 con provider a due fattori $2
 log_onefactor=Utente non registrato $1 per l'autenticazione a due fattori

acl/lang/ja.auto

@@ -10,6 +10,7 @@ edit_twofactorprov=ID $2 のプロバイダー $1 を使用する
 edit_twofactorcancel=二要素認証要件を削除する
 edit_twofactornone=まだセットアップなし
 edit_twofactoradd=ユーザーの2要素を有効にする
+edit_locale=ロケール
 edit_egone=選択したユーザーは存在しません！
 edit_overlay=個人テーマのオーバーレイ
 edit_overlayglobal=なし-テーマのデフォルトを使用
@@ -32,6 +33,7 @@ delete_eanonuser=このユーザーは匿名モジュールアクセスに使用
 
 cert_etempdir=無効な証明書ファイル
 
+acl_locale=ロケールを変更できますか?
 acl_pass=パスワード制限を変更できますか？
 acl_sql=ユーザーおよびグループデータベースを構成できますか？
 

acl/lang/ko.auto

@@ -10,6 +10,7 @@ edit_twofactorprov=ID가 $2 인 제공자 $1 사용
 edit_twofactorcancel=이중 인증 요구 사항 제거
 edit_twofactornone=아직 설정이 없습니다
 edit_twofactoradd=사용자에 대해 2 단계 요인 사용
+edit_locale=장소
 edit_egone=선택된 사용자가 더 이상 존재하지 않습니다!
 edit_overlay=개인 테마 오버레이
 edit_overlayglobal=없음-테마 기본값 사용
@@ -32,6 +33,7 @@ delete_eanonuser=이 사용자는 익명 모듈 액세스에 사용되고 있습
 
 cert_etempdir=유효하지 않은 인증서 파일
 
+acl_locale=로케일을 변경할 수 있습니까?
 acl_pass=비밀번호 제한을 변경할 수 있습니까?
 acl_sql=사용자 및 그룹 데이터베이스를 구성 할 수 있습니까?
 

acl/lang/lt.auto

@@ -57,6 +57,7 @@ edit_twofactorcancel=Pašalinkite dviejų veiksnių autentifikavimo reikalavimą
 edit_twofactornone=Dar nėra sąrankos
 edit_twofactoradd=Įgalinti dviejų faktorių vartotojui
 edit_lang=Kalba
+edit_locale=Lokalė
 edit_notabs=Klasifikuokite modulius?
 edit_logout=Neaktyvumo atsijungimo laikas
 edit_mins=minučių
@@ -197,6 +198,7 @@ acl_delete=Ar galima ištrinti vartotojus?
 acl_rename=Ar galima pervardyti vartotojus?
 acl_acl=Ar galima redaguoti modulio prieigos valdymą?
 acl_lang=Ar gali pakeisti kalbą?
+acl_locale=Ar galima pakeisti lokalę?
 acl_chcert=Ar galima pakeisti SSL sertifikato pavadinimą?
 acl_euser=Jums neleidžiama redaguoti šio vartotojo ACL
 acl_egroup=Jums neleidžiama redaguoti grupės ACL

acl/lang/lv.auto

@@ -57,6 +57,7 @@ edit_twofactorcancel=Noņemiet divu faktoru autentifikācijas prasību
 edit_twofactornone=Pagaidām nav iestatīta
 edit_twofactoradd=Iespējojiet divfaktoru lietotājam
 edit_lang=Valoda
+edit_locale=Lokalizācija
 edit_notabs=Kategorizēt moduļus?
 edit_logout=Neaktivitātes atteikšanās laiks
 edit_mins=minūtes
@@ -197,6 +198,7 @@ acl_delete=Vai var izdzēst lietotājus?
 acl_rename=Vai lietotājus var pārdēvēt?
 acl_acl=Vai var rediģēt moduļa piekļuves kontroli?
 acl_lang=Vai var mainīt valodu?
+acl_locale=Vai var mainīt lokalizāciju?
 acl_chcert=Vai var mainīt SSL sertifikāta nosaukumu?
 acl_euser=Jums nav atļauts rediģēt šī lietotāja ACL
 acl_egroup=Jums nav atļauts rediģēt grupas ACL

acl/lang/ms.auto

@@ -1,6 +1,7 @@
 index_screate=Buat pengguna selamat yang baru.
 
 edit_title3=Buat Pengguna Webmin Selamat
+edit_locale=Tempatan
 edit_safe=Tahap keistimewaan
 edit_safe0=Tidak terkawal
 edit_safe1=Modul selamat sahaja
@@ -10,6 +11,8 @@ save_eunixname=Nama pengguna '$1' bukan pengguna Unix, dan oleh itu tidak boleh
 
 delete_eanonuser=Pengguna ini sedang digunakan untuk akses modul tanpa nama
 
+acl_locale=Boleh tukar tempat?
+
 sync_modify=Ganti nama pengguna Webmin yang sepadan apabila pengguna Unix dinamakan semula.
 
 sessions_actions=Tindakan..

acl/lang/mt.auto

@@ -57,6 +57,7 @@ edit_twofactorcancel=Neħħi l-ħtieġa ta 'awtentikazzjoni b'żewġ fatturi
 edit_twofactornone=L-ebda setup għadu ma sar
 edit_twofactoradd=Jippermetti Żewġ Fatturi Għall-Utent
 edit_lang=Lingwa
+edit_locale=Lokali
 edit_notabs=Tikkategorizza l-moduli?
 edit_logout=Ħin tat-tluq għall-inattività
 edit_mins=minuti
@@ -197,6 +198,7 @@ acl_delete=Tista 'tħassar l-utenti?
 acl_rename=Jistgħu isemmi l-utenti?
 acl_acl=Jista 'jeditja l-modulu ta' kontroll ta 'aċċess?
 acl_lang=Tista 'tbiddel il-lingwa?
+acl_locale=Tista' tbiddel il-lokal?
 acl_chcert=Tista 'tibdel l-isem taċ-ċertifikat SSL?
 acl_euser=M'għandekx permess teditja l-ACL għal dan l-utent
 acl_egroup=M'għandekx permess teditja l-ACLs tal-grupp

acl/lang/nl.auto

@@ -8,6 +8,7 @@ edit_twofactorprov=Gebruik provider $1 met ID $2
 edit_twofactorcancel=Verwijder twee-factor authenticatie vereiste
 edit_twofactornone=Nog geen configuratie
 edit_twofactoradd=Twee-factor voor gebruiker inschakelen
+edit_locale=Lokaal
 edit_safe=Privilege niveau
 edit_safe0=onbeperkt
 edit_safe1=Alleen veilige modules
@@ -19,6 +20,8 @@ delete_eanonuser=Deze gebruiker wordt gebruikt voor anonieme moduletoegang
 
 cert_etempdir=Ongeldig certificaatbestand
 
+acl_locale=Kan de locatie worden gewijzigd?
+
 log_joingroup= $1 Webmin-gebruikers toegevoegd aan $2 
 log_twofactor=Ingeschreven gebruiker $1 bij two-factor provider $2 
 log_onefactor=Uitgeschreven gebruiker $1 voor tweefactorauthenticatie

acl/lang/no.auto

@@ -1,3 +1,7 @@
+edit_locale=Språk
+
+acl_locale=Kan du endre lokalitet?
+
 sync_modify=Gi nytt navn til den samsvarende Webmin-brukeren når en Unix-bruker får nytt navn.
 
 sessions_all=Alle økter..

acl/lang/pl.auto

@@ -1,6 +1,7 @@
 index_screate=Utwórz nowego bezpiecznego użytkownika.
 
 edit_title3=Utwórz bezpiecznego użytkownika Webmin
+edit_locale=Widownia
 edit_safe=Poziom uprawnień
 edit_safe0=Nieograniczony
 edit_safe1=Tylko bezpieczne moduły
@@ -8,6 +9,8 @@ edit_unsafe=Zresetuj do nieograniczonego
 
 save_eunixname=Nazwa użytkownika „$1” nie jest użytkownikiem systemu Unix, dlatego nie można jej używać w trybie awaryjnym
 
+acl_locale=Czy można zmienić język?
+
 sync_modify=Zmień nazwę pasującego użytkownika Webmin, gdy zmieniona zostanie nazwa użytkownika Uniksa.
 
 sessions_actions=Działania..

acl/lang/pt.auto

@@ -42,6 +42,7 @@ edit_twofactorcancel=Remover requisito de autenticação de dois fatores
 edit_twofactornone=Nenhuma configuração ainda
 edit_twofactoradd=Ativar dois fatores para o usuário
 edit_lang=Língua
+edit_locale=Localidade
 edit_notabs=Categorizar módulos?
 edit_logout=Tempo de logoff de inatividade
 edit_mins=minutos
@@ -173,6 +174,7 @@ acl_delete=Pode excluir usuários?
 acl_rename=Pode renomear usuários?
 acl_acl=Pode editar o controle de acesso do módulo?
 acl_lang=Pode mudar o idioma?
+acl_locale=Pode mudar de localidade?
 acl_chcert=Pode alterar o nome do certificado SSL?
 acl_euser=Você não tem permissão para editar a ACL para este usuário
 acl_egroup=Você não tem permissão para editar ACLs de grupo

acl/lang/pt_BR.auto

@@ -10,6 +10,7 @@ edit_twofactorprov=Usando o provedor $1 com o ID $2
 edit_twofactorcancel=Remover requisito de autenticação de dois fatores
 edit_twofactornone=Nenhuma configuração ainda
 edit_twofactoradd=Ativar dois fatores para o usuário
+edit_locale=Localidade
 edit_egone=O usuário selecionado não existe mais!
 edit_proto=Tipo de armazenamento
 edit_proto_mysql=Banco de dados MySQL
@@ -28,6 +29,7 @@ delete_eanonuser=Este usuário está sendo usado para acesso anônimo ao módulo
 
 cert_etempdir=Arquivo de certificado inválido
 
+acl_locale=Pode mudar de localidade?
 acl_pass=Pode alterar as restrições de senha?
 acl_sql=Pode configurar o banco de dados de usuários e grupos?
 

acl/lang/ro.auto

@@ -57,6 +57,7 @@ edit_twofactorcancel=Eliminați cerința de autentificare cu doi factori
 edit_twofactornone=Nici o configurație nu este încă
 edit_twofactoradd=Activați două factori pentru utilizator
 edit_lang=Limba
+edit_locale=Locale
 edit_notabs=Categorizați modulele?
 edit_logout=Timp de deconectare a inactivității
 edit_mins=minute
@@ -197,6 +198,7 @@ acl_delete=Pot șterge utilizatorii?
 acl_rename=Pot redenumi utilizatorii?
 acl_acl=Poate edita controlul accesului modulului?
 acl_lang=Poate schimba limba?
+acl_locale=Se poate schimba locația?
 acl_chcert=Poate schimba numele certificatului SSL?
 acl_euser=Nu aveți voie să editați ACL pentru acest utilizator
 acl_egroup=Nu aveți voie să editați ACL-urile de grup

acl/lang/ru.auto

@@ -10,6 +10,7 @@ edit_twofactorprov=Использование поставщика $1 с иде
 edit_twofactorcancel=Удалить требование двухфакторной аутентификации
 edit_twofactornone=Нет настройки еще
 edit_twofactoradd=Включить двухфакторный для пользователя
+edit_locale=Регион
 edit_nochange=Принудительно менять дни?
 edit_egone=Выбранный пользователь больше не существует!
 edit_rbacdeny0=RBAC контролирует только выбранные ACL модуля
@@ -30,6 +31,7 @@ delete_eanonuser=Этот пользователь используется дл
 
 cert_etempdir=Неверный файл сертификата
 
+acl_locale=Может сменить локаль?
 acl_pass=Можно ли изменить ограничения пароля?
 acl_sql=Можно настроить базу данных пользователей и групп?
 

acl/lang/sk.auto

@@ -17,6 +17,7 @@ edit_twofactorprov=Použitie poskytovateľa $1 s ID $2
 edit_twofactorcancel=Odstráňte požiadavku dvojfaktorovej autentifikácie
 edit_twofactornone=Zatiaľ žiadne nastavenie
 edit_twofactoradd=Povoliť používateľom dvojfaktorový režim
+edit_locale=Miestne nastavenie
 edit_logout=Čas odhlásenia nečinnosti
 edit_chars=literatúra
 edit_minsize=Minimálna dĺžka hesla
@@ -60,6 +61,7 @@ cert_etempdir=Neplatný súbor certifikátu
 acl_rbac=Získať nastavenia riadenia prístupu z RBAC?
 acl_rbacyes=Áno (prepíše nastavenia nižšie)
 
+acl_locale=Dá sa zmeniť miestne nastavenie?
 acl_times=Môžu zmeniť povolené časy prihlásenia?
 acl_pass=Môžete zmeniť obmedzenia hesiel?
 acl_sql=Môžete nakonfigurovať databázu používateľov a skupín?

acl/lang/sl.auto

@@ -57,6 +57,7 @@ edit_twofactorcancel=Odstranite dvofaktorsko preverjanje pristnosti
 edit_twofactornone=Ni nastavitve še
 edit_twofactoradd=Omogoči dvofaktor za uporabnika
 edit_lang=Jezik
+edit_locale=Locale
 edit_notabs=Razvrstiti module?
 edit_logout=Čas odjave iz neaktivnosti
 edit_mins=minut
@@ -197,6 +198,7 @@ acl_delete=Ali lahko uporabnike izbrišete?
 acl_rename=Ali lahko preimenujete uporabnike?
 acl_acl=Ali lahko urejate nadzor dostopa modula?
 acl_lang=Ali lahko spremenite jezik?
+acl_locale=Ali lahko spremenite jezik?
 acl_chcert=Ali lahko spremenim ime potrdila SSL?
 acl_euser=Nimate dovoljenja za urejanje ACL za tega uporabnika
 acl_egroup=Nimate dovoljenja za urejanje skupinskih ACL-jev

acl/lang/sv.auto

@@ -10,6 +10,7 @@ edit_twofactorprov=Använda leverantör $1 med ID $2
 edit_twofactorcancel=Ta bort tvåfaktors autentiseringskrav
 edit_twofactornone=Ingen installation ännu
 edit_twofactoradd=Aktivera tvåfaktorer för användare
+edit_locale=Plats
 edit_egone=Den valda användaren finns inte längre!
 edit_proto=Lagringstyp
 edit_proto_mysql=MySQL-databas
@@ -30,6 +31,7 @@ delete_eanonuser=Den här användaren används för anonym modulåtkomst
 
 cert_etempdir=Ogiltig certifikatfil
 
+acl_locale=Kan du byta språk?
 acl_pass=Kan ändra lösenordsbegränsningar?
 acl_sql=Kan konfigurera användar- och gruppdatabas?
 

acl/lang/th.auto

@@ -57,6 +57,7 @@ edit_twofactorcancel=ลบข้อกำหนดการตรวจสอ
 edit_twofactornone=ยังไม่มีการตั้งค่า
 edit_twofactoradd=เปิดใช้งาน Two-Factor สำหรับผู้ใช้
 edit_lang=ภาษา
+edit_locale=สถานที่
 edit_notabs=จัดหมวดหมู่โมดูลหรือไม่
 edit_logout=ไม่มีเวลาออกจากระบบ
 edit_mins=นาที
@@ -197,6 +198,7 @@ acl_delete=สามารถลบผู้ใช้ได้หรือไม
 acl_rename=สามารถเปลี่ยนชื่อผู้ใช้?
 acl_acl=สามารถแก้ไขการควบคุมการเข้าถึงโมดูลได้หรือไม่
 acl_lang=เปลี่ยนภาษาได้ไหม
+acl_locale=เปลี่ยนโลแคลได้ไหม
 acl_chcert=สามารถเปลี่ยนชื่อใบรับรอง SSL ได้หรือไม่
 acl_euser=คุณไม่ได้รับอนุญาตให้แก้ไข ACL สำหรับผู้ใช้รายนี้
 acl_egroup=คุณไม่ได้รับอนุญาตให้แก้ไขกลุ่ม ACL

acl/lang/tr.auto

@@ -19,6 +19,7 @@ edit_twofactorprov=$2 kimliğiyle $1 sağlayıcısını kullanma
 edit_twofactorcancel=İki faktörlü kimlik doğrulama gereksinimini kaldırın
 edit_twofactornone=Henüz kurulum yok
 edit_twofactoradd=Kullanıcı için İki Faktörü Etkinleştir
+edit_locale=yerel ayar
 edit_logout=Etkinlik dışı kalma süresi
 edit_mins=dakika
 edit_chars=harfler
@@ -70,6 +71,7 @@ cert_etempdir=Geçersiz sertifika dosyası
 acl_rbac=RBAC'den erişim kontrolü ayarları alınıyor mu?
 acl_rbacyes=Evet (aşağıdaki ayarları geçersiz kılar)
 
+acl_locale=Yerel ayarı değiştirebilir miyim?
 acl_times=İzin verilen giriş zamanlarını değiştirebilir mi?
 acl_pass=Şifre kısıtlamalarını değiştirebilir mi?
 acl_sql=Kullanıcı ve grup veritabanını yapılandırabilir mi?

acl/lang/uk.auto

@@ -55,6 +55,7 @@ edit_twofactorcancel=Видаліть двофакторну аутентифі
 edit_twofactornone=Ще немає налаштувань
 edit_twofactoradd=Увімкнути двофакторну для користувача
 edit_lang=Мову
+edit_locale=Локаль
 edit_notabs=Класифікувати модулі?
 edit_logout=Час виходу з бездіяльності
 edit_mins=хвилин
@@ -193,6 +194,7 @@ acl_delete=Чи можете видалити користувачів?
 acl_rename=Чи можете перейменувати користувачів?
 acl_acl=Чи можна редагувати контроль доступу до модуля?
 acl_lang=Можна змінити мову?
+acl_locale=Чи можна змінити мову?
 acl_chcert=Чи можна змінити ім'я сертифіката SSL?
 acl_euser=Вам заборонено редагувати ACL для цього користувача
 acl_egroup=Вам заборонено редагувати групові ACL

acl/lang/ur.auto

@@ -57,6 +57,7 @@ edit_twofactorcancel=دو عنصر کی توثیق کی ضرورت کو ہٹا
 edit_twofactornone=ابھی تک کوئی سیٹ اپ نہیں ہے
 edit_twofactoradd=صارف کے لئے دو فیکٹر کو فعال کریں
 edit_lang=زبان
+edit_locale=لوکیل
 edit_notabs=ماڈیول کی درجہ بندی کریں؟
 edit_logout=غیر فعال لاگ آؤٹ وقت
 edit_mins=منٹ
@@ -197,6 +198,7 @@ acl_delete=کیا صارفین کو حذف کرسکتے ہیں؟
 acl_rename=کیا صارفین کا نام تبدیل کر سکتے ہیں؟
 acl_acl=کیا ماڈیول ایکسیس کنٹرول میں ترمیم کی جاسکتی ہے؟
 acl_lang=کیا زبان بدل سکتی ہے؟
+acl_locale=لوکل تبدیل کر سکتے ہیں؟
 acl_chcert=کیا SSL سرٹیفکیٹ کا نام تبدیل کر سکتے ہیں؟
 acl_euser=آپ کو اس صارف کے لئے ACL میں ترمیم کرنے کی اجازت نہیں ہے
 acl_egroup=آپ کو گروپ ACL میں ترمیم کرنے کی اجازت نہیں ہے

acl/lang/vi.auto

@@ -57,6 +57,7 @@ edit_twofactorcancel=Xóa yêu cầu xác thực hai yếu tố
 edit_twofactornone=Chưa có thiết lập nào
 edit_twofactoradd=Kích hoạt hai yếu tố cho người dùng
 edit_lang=Ngôn ngữ
+edit_locale=địa phương
 edit_notabs=Phân loại mô-đun?
 edit_logout=Thời gian đăng xuất không hoạt động
 edit_mins=phút
@@ -197,6 +198,7 @@ acl_delete=Có thể xóa người dùng?
 acl_rename=Có thể đổi tên người dùng?
 acl_acl=Có thể chỉnh sửa điều khiển truy cập mô-đun?
 acl_lang=Có thể thay đổi ngôn ngữ?
+acl_locale=Có thể thay đổi ngôn ngữ?
 acl_chcert=Có thể thay đổi tên chứng chỉ SSL?
 acl_euser=Bạn không được phép chỉnh sửa ACL cho người dùng này
 acl_egroup=Bạn không được phép chỉnh sửa ACL nhóm

acl/lang/zh.auto

@@ -21,6 +21,7 @@ edit_twofactorprov=使用提供方 $1 和ID $2
 edit_twofactorcancel=删除两因素身份验证要求
 edit_twofactornone=尚未设定
 edit_twofactoradd=为用户启用两因素
+edit_locale=语言环境
 edit_logout=不活动注销时间
 edit_mins=分钟
 edit_chars=字母
@@ -85,6 +86,7 @@ acl_rbac=从RBAC获得访问控制设置？
 acl_rbacyes=是（覆盖下面的设置）
 
 acl_uthis=该用户
+acl_locale=可以改locale吗？
 acl_sessions=可以查看和取消登录会话吗？
 acl_cats=可以更改分类吗？
 acl_theme=可以改变个人主题吗？

acl/lang/zh_TW.auto

@@ -19,6 +19,7 @@ edit_twofactorprov=使用提供方 $1 和ID $2
 edit_twofactorcancel=刪除兩因素身份驗證要求
 edit_twofactornone=尚未設定
 edit_twofactoradd=為用戶啟用兩因素
+edit_locale=語言環境
 edit_logout=不活動註銷時間
 edit_mins=分鐘
 edit_chars=字母
@@ -75,6 +76,7 @@ acl_reset=重置為完全訪問權限
 acl_rbac=從RBAC獲得訪問控制設置？
 acl_rbacyes=是（覆蓋下面的設置）
 
+acl_locale=可以改locale嗎？
 acl_switch=可以切換到其他用戶嗎？
 acl_times=可以更改允許的登錄時間嗎？
 acl_pass=可以更改密碼限制嗎？

acl/save_user.cgi

@@ -200,6 +200,8 @@ my $salt = chr(int(rand(26))+65).chr(int(rand(26))+65);
 $user{'name'} = $in{'name'};
 $user{'lang'} = !$access{'lang'} ? $old->{'lang'} :
 		$in{'lang_def'} ? undef : $in{'lang'};
+$user{'locale'} = !$access{'locale'} ? $old->{'locale'} :
+		$in{'locale_def'} ? undef : $in{'locale'};
 if (!$access{'theme'}) {
 	$user{'theme'} = $old->{'theme'};
 	$user{'overlay'} = $old->{'overlay'};

acl/system_info.pl

@@ -51,7 +51,6 @@ if (@logins) {
 				$state = "<font color=orange>$state</font>";
 				}
 			}
-		$main::theme_allow_make_date = 1;
 		my @links;
 		if (&foreign_available("webminlog")) {
 		      push(@links,

apache/apache-lib.pl

@@ -38,7 +38,9 @@ if ($module_name ne 'htaccess') {
 		# Need to build list of supported modules
 		local ($ver, $mods, $fullver) = &httpd_info($httpd);
 		if ($ver) {
-			local @mods = map { "$_/$ver" } &configurable_modules();
+			my @allmods = &available_modules();
+			local @mods = map { "$_/$ver" }
+				          &configurable_modules(\@allmods);
 			foreach my $m (@mods) {
 				if ($m =~ /(\S+)\/(\S+)/) {
 					$httpd_modules{$1} = $2;
@@ -47,10 +49,14 @@ if ($module_name ne 'htaccess') {
 			# Call again now that known modules have been set, as
 			# sometimes there are dependencies due to LoadModule
 			# statements in an IfModule block
-			@mods = map { "$_/$ver" } &configurable_modules();
+			undef(@get_config_cache);
+			@allmods = &available_modules();
+			@mods = map { "$_/$ver" }
+				    &configurable_modules(\@allmods);
 			local %site = ( 'size' => $st[7],
 					'path' => $httpd,
 					'modules' => join(' ', @mods),
+					'allmodules' => join(' ', @allmods),
 					'version' => $ver,
 					'fullversion' => $fullver,
 					'webmin' => &get_webmin_version() );
@@ -72,6 +78,9 @@ if (&read_file($site_file, \%site)) {
 			$httpd_modules{$1} = $2;
 			}
 		}
+	foreach $m (split(/\s+/, $site{'allmodules'})) {
+		$all_httpd_modules{$m} = $site{'version'};
+		}
 	foreach $m (keys %httpd_modules) {
 		if (!-r "$module_root_directory/$m.pl") {
 			delete($httpd_modules{$m});
@@ -1825,46 +1834,46 @@ for(my $i=0; $i<$secs; $i++) {
 return 0;
 }
 
-# configurable_modules()
+# configurable_modules([&all-mods])
 # Returns a list of Apaches that are compiled in or dynamically loaded, and
 # supported by Webmin.
 sub configurable_modules
 {
-local ($ver, $mods) = &httpd_info(&find_httpd());
+my ($allmods) = @_;
-local @rv;
+$allmods ||= [ &available_modules() ];
-local $m;
+return grep { -r "$module_root_directory/$_.pl" } @$allmods;
+}
+
+# available_modules()
+# Returns a list of Apaches that are compiled in or dynamically loaded
+sub available_modules
+{
+my ($ver, $mods) = &httpd_info(&find_httpd());
+my @rv;
 
 # Add compiled-in modules
-foreach $m (@$mods) {
+push(@rv, @$mods);
-	if (-r "$module_root_directory/$m.pl") {
-		push(@rv, $m);
-		}
-	}
 
 # Add dynamically loaded modules
-local $conf = &get_config();
+my $conf = &get_config();
-foreach $l (&find_directive_struct("LoadModule", $conf)) {
+foreach my $l (&find_directive_struct("LoadModule", $conf)) {
-	if ($l->{'words'}->[1] =~ /(mod_\S+)\.(so|dll)/ &&
+	if ($l->{'words'}->[1] =~ /(mod_\S+)\.(so|dll)/) {
-	    -r "$module_root_directory/$1.pl") {
 		push(@rv, $1);
 		}
-	elsif ($l->{'words'}->[1] =~ /libssl\.so/ &&
+	elsif ($l->{'words'}->[1] =~ /libssl\.so/) {
-	       -r "$module_root_directory/mod_apachessl.pl") {
 		push(@rv, "mod_apachessl");
 		}
-	elsif ($l->{'words'}->[1] =~ /lib([^\/\s]+)\.(so|dll)/ &&
+	elsif ($l->{'words'}->[1] =~ /lib([^\/\s]+)\.(so|dll)/) {
-	       -r "$module_root_directory/mod_$1.pl") {
 		push(@rv, "mod_$1");
 		}
 	}
-undef(@get_config_cache);	# Cache is no longer valid
 
 # Add dynamically loaded modules
 if ($config{'apachectl_path'}) {
 	&open_execute_command(APACHE,
 		"$config{'apachectl_path'} -M 2>/dev/null", 1);
 	while(<APACHE>) {
-		if (/(\S+)_module/ && -r "$module_root_directory/mod_${1}.pl") {
+		if (/(\S+)_module/) {
 			push(@rv, "mod_${1}");
 			}
 		}

apache/config-CloudLinux-8.0-ALL

@@ -0,0 +1,19 @@
+show_list=1
+httpd_dir=/etc/httpd
+httpd_path=/usr/sbin/httpd
+mime_types=/etc/mime.types
+start_cmd=systemctl start httpd.service
+apply_cmd=systemctl reload httpd.service
+stop_cmd=systemctl stop httpd.service
+show_order=0
+max_servers=100
+test_config=1
+test_manual=0
+apachectl_path=/usr/sbin/apachectl
+test_always=0
+test_apachectl=1
+auto_mods=1
+show_names=0
+allow_virtualmin=0
+pid_file=/run/httpd/httpd.pid
+format_config=1

apache/config-freebsd-11.0-ALL

@@ -0,0 +1,19 @@
+show_list=0
+httpd_dir=/usr/local
+httpd_path=/usr/local/sbin/httpd
+apachectl_path=/usr/local/sbin/apachectl
+httpd_conf=/usr/local/etc/apache24/httpd.conf
+mime_types=/usr/local/etc/apache24/mime.types
+srm_conf=/usr/local/etc/apache24/srm.conf
+access_conf=/usr/local/etc/apache24/access.conf
+show_order=0
+max_servers=100
+test_config=1
+test_manual=0
+test_always=0
+test_apachectl=1
+auto_mods=1
+pid_file=/var/run/httpd.pid
+show_names=0
+allow_virtualmin=0
+format_config=1

apache/config-solaris-11-ALL

@@ -1,11 +1,11 @@
 show_list=0
-httpd_dir=/usr/apache2/2.2
+httpd_dir=/usr/apache2/2.4
-httpd_conf=/etc/apache2/2.2/httpd.conf
+httpd_conf=/etc/apache2/2.4/httpd.conf
-httpd_path=/usr/apache2/2.2/bin/httpd
+httpd_path=/usr/apache2/2.4/bin/httpd
-apachectl_path=/usr/apache2/2.2/bin/apachectl
+apachectl_path=/usr/apache2/2.4/bin/apachectl
-pid_file=/var/run/apache2/2.2/httpd.pid
+pid_file=/var/run/apache2/2.4/httpd.pid
-start_cmd=svcadm enable svc:/network/http:apache22
+start_cmd=svcadm enable svc:/network/http:apache24
-stop_cmd=svcadm disable svc:/network/http:apache22
+stop_cmd=svcadm disable svc:/network/http:apache24
 mime_types=
 srm_conf=
 access_conf=

apache/core.pl

@@ -1041,7 +1041,7 @@ sub edit_LimitRequestBody
 {
 return (1, $text{'core_maxbody'},
 	&opt_input($_[0]->{'value'}, "LimitRequestBody", $text{'core_default'}, 8)
-		.$text{'bytes'});
+		.&ui_space(2).$text{'bytes'});
 }
 sub save_LimitRequestBody
 {
@@ -1052,7 +1052,7 @@ sub edit_LimitXMLRequestBody
 {
 return (1, $text{'core_maxxml'},
 	&opt_input($_[0]->{'value'}, "LimitXMLRequestBody",
-		   $text{'core_default'}, 8).$text{'bytes'});
+		   $text{'core_default'}, 8).&ui_space(2).$text{'bytes'});
 }
 sub save_LimitXMLRequestBody
 {

apache/lang/en

@@ -637,6 +637,7 @@ mod_proxy_preserve=Preserve original Host: header
 mod_proxy_timeout=Proxy request timeout in seconds
 mod_proxy_etimeout=Proxy request timeout must be a number of seconds
 mod_proxy_via=Set Via: headers
+mod_proxy_preserve=Preserve original HTTP host
 mod_proxy_not=None
 
 mod_log_agent_default=Default

apache/mod_proxy.pl

@@ -25,6 +25,7 @@ $rv = [ [ 'ProxyRequests', 0, 13, 'virtual', undef, 11 ],
 	[ 'ProxyMaxForwards', 0, 13, 'virtual', 2.0 ],
 	[ 'ProxyPreserveHost', 0, 13, 'virtual', 2.031 ],
 	[ 'ProxyTimeout', 0, 13, 'virtual', 2.031 ],
+	[ 'ProxyPreserveHost', 0, 13, 'virtual', 2.3 ],
 	[ 'ProxyVia', 0, 13, 'virtual', 2.0 ] ];
 return &make_directives($rv, $_[0], "mod_proxy");
 }
@@ -291,7 +292,16 @@ sub save_ProxyVia
 return &parse_choice("ProxyVia", "");
 }
 
-
+sub edit_ProxyPreserveHost
+{
+return (1, $text{'mod_proxy_preserve'},
+	&choice_input($_[0]->{'value'}, "ProxyPreserveHost", "",
+	      "$text{'yes'},on", "$text{'no'},off", "$text{'default'},"));
+}
+sub save_ProxyPreserveHost
+{
+return &parse_choice("ProxyPreserveHost", "");
+}
 
 1;
 

apache/mod_suexec.pl

@@ -13,6 +13,7 @@ sub edit_SuexecUserGroup
 local $rv;
 $rv .= sprintf "<input type=radio name=SuexecUserGroup_def value=1 %s> %s\n",
 		$_[0] ? "" : "checked", $text{'suexec_none'};
+$rv .= &ui_newline();
 $rv .= sprintf "<input type=radio name=SuexecUserGroup_def value=0 %s>\n",
 		$_[0] ? "checked" : "";
 $rv .= sprintf "%s <input name=SuexecUserGroup_u size=8 value='%s'> %s\n",

backup-config/backup-config-lib.pl

@@ -159,7 +159,9 @@ $rv .= "<table id='show_backup_destination' cellpadding=1 cellspacing=0>";
 # Local file field
 $rv .= "<tr><td>".&ui_oneradio("$_[0]_mode", 0, undef, $mode == 0)."</td>\n";
 $rv .= "<td>$text{'backup_mode0'}&nbsp;</td><td colspan='3'>".
-	&ui_textbox("$_[0]_file", $mode == 0 ? $path : "", 60).
+	&ui_textbox("$_[0]_file", $mode == 0 ? $path : "", 60, undef, undef,
+	    ($_[2] != 1 && $config{'date_subs'}) ?
+	        'placeholder="/backups/configs-%y-%m-%d-%H-%M-%S.tar.gz"' : undef).
 	" ".&file_chooser_button("$_[0]_file")."</td> </tr>\n";
 
 # FTP file fields

backup-config/config

@@ -1,3 +1,3 @@
-date_subs=0
+date_subs=1
 webmin_subs=0
 apply=1

backup-config/index.cgi

@@ -48,13 +48,12 @@ if (@backups) {
 	print &ui_columns_end();
 	}
 else {
-	print "<b>$text{'index_none'}</b><p>\n";
+	print "<strong>$text{'index_none'}</strong><br>\n";
 	}
 print &ui_link("edit.cgi?new=1", $text{'index_add'});
-print "<p>\n";
+print "\n";
 if ($using_strftime && !$config{'date_subs'}) {
-	print "<font color=#ff0000><b>$text{'index_nostrftime'}",
+	print &ui_alert_box($text{'index_nostrftime'}, 'warn'),"\n";
-	      "</b></font><p>\n";
 	}
 print &ui_tabs_end_tab();
 

backup-config/lang/en

@@ -16,7 +16,7 @@ index_now2=Restore Now
 index_apply=Apply configurations?
 index_test=Just show what will be restored?
 index_jobs=Scheduled Backups
-index_nostrftime=Warning - some backup jobs use % in their filenames, but strftime substitution is not enabled on the Module Config page.
+index_nostrftime=Some backup jobs use % in their filenames, but strftime substitution is not enabled on the Module Config page.
 index_tabsched=Scheduled backups
 index_tabbackup=Backup now
 index_tabrestore=Restore now

bacula-backup/BorderPanel.java

@@ -1 +0,0 @@
-../file/BorderPanel.java

bacula-backup/CbButton.java

@@ -1 +0,0 @@
-../file/CbButton.java

bacula-backup/CbScrollbar.java

@@ -1 +0,0 @@
-../file/CbScrollbar.java

bacula-backup/ErrorWindow.java

@@ -1 +0,0 @@
-../file/ErrorWindow.java

bacula-backup/FixedFrame.java

@@ -1 +0,0 @@
-../file/FixedFrame.java

bacula-backup/GrayPanel.java

@@ -1 +0,0 @@
-../file/GrayPanel.java

bacula-backup/Hierarchy.java

@@ -1 +0,0 @@
-../file/Hierarchy.java

bacula-backup/TreeChooser.java

@@ -1,295 +0,0 @@
-import java.awt.*;
-import java.io.*;
-import java.applet.*;
-import java.net.*;
-import java.util.*;
-import netscape.javascript.JSObject;
-
-public class TreeChooser extends Applet
-	implements CbButtonCallback, HierarchyCallback
-{
-	CbButton add_b, remove_b, close_b;
-	Hierarchy tree;
-	BaculaNode root;
-	String volume;
-	String session;
-	String job;
-	Vector added = new Vector();
-
-	public void init()
-	{
-	// Create the root
-	String rpath = getParameter("root");
-	root = new BaculaNode(this, rpath, true, null);
-	volume = getParameter("volume");
-	session = getParameter("session");
-	job = getParameter("job");
-
-	// Build the UI
-	setLayout(new BorderLayout());
-	BorderPanel top = new BorderPanel(2);
-	top.setLayout(new FlowLayout(FlowLayout.LEFT));
-	top.add(add_b = new CbButton("Add", this));
-	top.add(remove_b = new CbButton("Remove", this));
-	top.add(close_b = new CbButton("Close", this));
-	add("North", top);
-	add("Center", tree = new Hierarchy(root, this));
-	}
-
-        Image get_image(String img)
-        {
-        return getImage(getDocumentBase(), "images/"+img);
-        }
-
-        String[] get_text(String url)
-        {
-	Cursor orig = getCursor();
-        try {
-		Cursor busy = Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR);
-		setCursor(busy);
-                long now = System.currentTimeMillis();
-                if (url.indexOf('?') > 0) url += "&rand="+now;
-                else url += "?rand="+now;
-                URL u = new URL(getDocumentBase(), url);
-                URLConnection uc = u.openConnection();
-		set_cookie(uc);
-                String charset = get_charset(uc.getContentType());
-                BufferedReader is = new BufferedReader(
-                        (charset == null) ?
-                        new InputStreamReader(uc.getInputStream()) :
-                        new InputStreamReader(uc.getInputStream(), charset));
-                Vector lv = new Vector();
-                while(true) {
-                        String l = is.readLine();
-                        if (l == null) { break; }
-                        lv.addElement(l);
-                        }
-                is.close();
-                String rv[] = new String[lv.size()];
-                lv.copyInto(rv);
-                return rv;
-                }
-        catch(Exception e) {
-                e.printStackTrace();
-                //return null;
-                String err[] = { e.getMessage() };
-                return err;
-                }
-	finally {
-		setCursor(orig);
-		}
-        }
-
-	void set_cookie(URLConnection conn)
-	{
-	if (session != null)
-		conn.setRequestProperty("Cookie", session);
-	}
-
-        // Gets charset parameter from Content-Type: header
-        String get_charset(String ct)
-        {
-        if (ct == null)
-                return null;
-        StringTokenizer st = new StringTokenizer(ct, ";");
-        while (st.hasMoreTokens()) {
-                String l = st.nextToken().trim().toLowerCase();
-                if (l.startsWith("charset=")) {
-                        // get the value of charset= param.
-                        return l.substring(8);
-                        }
-                }
-        return null;
-        }
-
-	public void openNode(Hierarchy h, HierarchyNode n)
-	{
-	// Get the files under this directory, and expand the tree
-	BaculaNode bn = (BaculaNode)n;
-	bn.fill();
-	}
-
-	public void closeNode(Hierarchy h, HierarchyNode n)
-	{
-	// No need to do anything
-	}
-
-	public void clickNode(Hierarchy h, HierarchyNode n)
-	{
-	// Also no need to do anything
-	}
-
-	public void doubleNode(Hierarchy h, HierarchyNode n)
-	{
-	// add or remove a file
-	BaculaNode sel = (BaculaNode)n;
-	if (sel.added) remove_node(sel);
-	else add_node(sel);
-	}
-
-	public void click(CbButton b)
-	{
-	BaculaNode sel = (BaculaNode)tree.selected();
-	if (b == close_b) {
-		// Close the window, and update the text box
-		try {
-			JSObject win = JSObject.getWindow(this);
-			String params1[] = { "" };
-			win.call("clear_files", params1);
-			for(int i=0; i<added.size(); i++) {
-				BaculaNode n = (BaculaNode)added.elementAt(i);
-				String params2[] = { n.path };
-				if (n.isdir && !n.path.equals("/"))
-					params2[0] = n.path+"/";
-				win.call("add_file", params2);
-				}
-			String params3[] = { "" };
-			win.call("finished", params3);
-			}
-		catch(Exception e) {
-			e.printStackTrace();
-			new ErrorWindow("Failed to set files : "+
-					e.getMessage());
-			}
-		}
-	else if (b == add_b) {
-		// Flag the selected file as added
-		if (sel != null) {
-			add_node(sel);
-			}
-		}
-	else if (b == remove_b) {
-		// Un-flag the selected file
-		if (sel != null) {
-			remove_node(sel);
-			}
-		}
-	}
-
-	void add_node(BaculaNode n)
-	{
-	if (!n.added) {
-		n.added = true;
-		n.set_all_icons();
-		tree.redraw();
-		added.addElement(n);
-		}
-	}
-
-	void remove_node(BaculaNode n)
-	{
-	if (n.added) {
-		n.added = false;
-		n.set_all_icons();
-		tree.redraw();
-		added.removeElement(n);
-		}
-	}
-
-	static String urlize(String s)
-	{
-	StringBuffer rv = new StringBuffer();
-	for(int i=0; i<s.length(); i++) {
-		char c = s.charAt(i);
-		if (c < 16)
-			rv.append("%0"+Integer.toString(c, 16));
-		else if (!Character.isLetterOrDigit(c) && c != '/' &&
-		    c != '.' && c != '_' && c != '-')
-			rv.append("%"+Integer.toString(c, 16));
-		else
-			rv.append(c);
-		}
-	return rv.toString();
-	}
-}
-
-class BaculaNode extends HierarchyNode
-{
-	TreeChooser parent;
-	String path;
-	boolean isdir;
-	boolean known = false;
-	boolean added = false;
-	BaculaNode dir;
-
-	BaculaNode(TreeChooser parent, String path, boolean isdir, BaculaNode dir)
-	{
-	this.parent = parent;
-	this.path = path;
-	this.isdir = isdir;
-	this.dir = dir;
-	open = false;
-	set_icon();
-	ch = isdir ? new Vector() : null;
-	if (path.equals("/"))
-		text = "/";
-	else {
-		String ns = path.endsWith("/") ?
-				path.substring(0, path.length() - 1) : path;
-		int slash = ns.lastIndexOf("/");
-		text = path.substring(slash+1);
-		}
-	}
-
-	void set_icon()
-	{
-	String imname = isdir ? "dir.gif" : "rfile.gif";
-	if (selected()) imname = "s"+imname;
-	im = parent.get_image(imname);
-	}
-
-	void set_all_icons()
-	{
-	set_icon();
-	if (ch != null) {
-		for(int i=0; i<ch.size(); i++) {
-			BaculaNode c = (BaculaNode)ch.elementAt(i);
-			c.set_all_icons();
-			}
-		}
-	}
-
-	void fill()
-	{
-	if (!known && isdir) {
-		ch.removeAllElements();
-		String l[] = parent.get_text("list.cgi?dir="+
-					     parent.urlize(path)+
-					     "&volume="+
-					     parent.urlize(parent.volume)+
-					     "&job="+
-					     parent.urlize(parent.job));
-		if (l[0].length() > 0) {
-			new ErrorWindow("Failed to get files under "+path+
-					" : "+l[0]);
-			return;
-			}
-		for(int i=1; i<l.length; i++) {
-			if (l[i].endsWith("/")) {
-				ch.addElement(
-				    new BaculaNode(
-					    parent, l[i].substring(0, l[i].length()-1),
-					    true, this));
-				}
-			else {
-				ch.addElement(
-				    new BaculaNode(
-				    	parent, l[i], false, this));
-				}
-			}
-		parent.tree.redraw();
-		known = true;
-		}
-	}
-
-	boolean selected()
-	{
-	BaculaNode n = this;
-	while(n != null) {
-		if (n.added) return true;
-		n = n.dir;
-		}
-	return false;
-	}
-}
-

bacula-backup/Util.java

@@ -1 +0,0 @@
-../file/Util.java

bacula-backup/list.cgi

@@ -2,7 +2,7 @@
 # Returns a list of files and directories under some directory
 
 $trust_unknown_referers = 1;
-require './bacula-backup-lib.pl';
+BEGIN { require './bacula-backup-lib.pl'; }
 &ReadParse();
 
 # Input sanitization

bin/language-manager

@@ -11,7 +11,7 @@ use File::Basename;
 use File::Find;
 use JSON::PP;
 use HTTP::Tiny;
-use HTML::Entities;
+eval "use HTML::Entities";
 use List::MoreUtils qw(any uniq);
 use Cwd qw(cwd);
 use Encode qw/encode decode/;
@@ -245,7 +245,16 @@ sub main
         talk('affected', \%opt, \%data);
 
         # Run in overwrite mode
-        if ($opt{'mode'} eq 'full') {
+        if ($opt{'mode'} eq 'clean') {
+            # # Execute clean
+            talk('clean-pre', \%opt, \%data);
+            if (prompt('next')) {
+                go(\%opt, \%data);
+            }
+        }
+
+        # Run in overwrite mode
+        elsif ($opt{'mode'} eq 'full') {
 
             # Execute force transcode/translate
             talk('overwrite-pre', \%opt, \%data);
@@ -949,6 +958,7 @@ sub go
     my $verbose                     = $opt->{'verbose'} || @{$keys_test};
     my $mode_sync                   = $opt->{'mode'} ne 'full';
     my $mode_transcode              = $opt->{'mode'} eq 'transcode';
+    my $mode_clean                  = $opt->{'mode'} eq 'clean';
     my $allow_symlinks              = $opt->{'allow-symlinks'};
     my $verbose_silent_mode         = $mode_sync && $verbose != 2;
 
@@ -966,6 +976,12 @@ sub go
             # Check if there has been something to process, if not print a message
             my $output;
             
+            # If cleaning called in this mode, throw an error
+            if ($mode_clean) {
+                say RED, "Error: Cleaning can only be performed when the target type is unset!", RESET;
+                exit;
+            }
+
             # Build targets first
             talk_log(("Transcoding/translating " . CYAN BOLD, $module, RESET . " module's help .."), $data, 1);
             talk_log(("" . CYAN . "  .. Building list of help files to process" . RESET . ""),       $data, 1);
@@ -1200,6 +1216,7 @@ sub go
             # Set message type
             my $message_type_s1 = 'Transcoding/translating';
             $message_type_s1 = 'Searching/replacing in' if (@{$values_fix});
+            $message_type_s1 = 'Cleaning in' if ($mode_clean);
 
             talk_log(("$message_type_s1 " . BLUE BOLD, $module, RESET . " module .."), $data, 1);
             foreach $language (@{ $data->{'languages_source_list'} }) {
@@ -1223,6 +1240,51 @@ sub go
                 my %language;
                 my %language_auto;
 
+                # If in clean mode delete the file and go next
+                if ($mode_clean) {
+
+                    # Language files
+                    my $cfile = "$mpath/$code";
+                    my $cfileauto = "$cfile.auto";
+                    unlink($cfile);
+                    unlink($cfileauto);
+                    
+                    # Module files
+                    foreach ('module', 'config', 'uconfig') {
+                        my %mdata = %{$data};
+                        $mdata{'type'} = $_;
+                        my (undef, undef, $ffile) = source_data($module, \%mdata, $opt);
+                        $ffile =~ s/\/$_\//\//;
+                        my $cxfile = "$ffile.$code";
+                        my $cxfileauto = "$cxfile.auto";
+                        unlink($cxfile);
+                        unlink($cxfileauto);
+                    }
+
+                    # Help files
+                    my %hdata = %{$data};
+                    $hdata{'type'} = 'help';
+                    my (undef, $hpath) = source_data($module, \%hdata, $opt);
+                    my @hdelete_targets;
+                    if (-d $hpath) {
+                        find(
+                            {
+                               wanted => sub {
+                                   my $found = $File::Find::name;
+                                   if ($found =~ /\.$code\./) {
+                                       push(@hdelete_targets, $found);
+                                   }
+                               },
+                            },
+                            $hpath);
+                        unlink(@hdelete_targets);
+                    }
+
+                    # Go next, don't translate
+                    $output++;
+                    next;
+                }
+
                 my $message_type_s2 = "Processing";
                 $message_type_s2 = "Testing translations for selected keys with" if (@{$keys_test});
 
@@ -1732,6 +1794,10 @@ sub talk
         say GREEN, "Affected languages" . RESET, DARK . " [$languages_count]" . RESET . ": ", YELLOW BOLD,
           "" . $languages . "", RESET;
     }
+    if ($what eq 'clean-pre') {
+        say RED, "Danger! ", RESET, WHITE,
+"The following operation will delete all files related to the affected lang-\nuage, including machine-translated files in all the mentioned modules listed above.",
+    }
     if ($what eq 'overwrite-pre') {
         say RED, "Warning! ", RESET, WHITE,
 "The following operation will force-translate and overwrite mentioned\nlanguages in all mentioned modules listed above, using ",
@@ -1829,9 +1895,13 @@ Test translations for "index_stopmsg,trusted_warning" keys, in Russian and Germa
 
  - webmin language-manager -m=bind8 -t=ru,de -kt=index_stopmsg,trusted_warning
 
+Clean build directory by removing all kind of language files except English.
+
+ - webmin language-manager --mode=clean
+
 =item --mode, -x <sync|full|transcode>
 
-Mode can be either <sync> or <full> or <transcode>. Default is set to "sync" and will only keep the keys found on template language file, while missing keys in target languages (translations), will be deleted, and newly added keys to template language file, will be translated. Mode "full" is meant to perform full translation, keeping human translated strings and overwriting all machine translations done in the past (not recommended to run). Mode "transcode" is useful to fix human translated language files, which stored in "utf-8" encoding already, while still having "&#195;&#173;" or "&#195;&#169;" HTML entities.
+Mode can be either <sync> or <full> or <transcode> or <clean>. Default is set to "sync" and will only keep the keys found on template language file, while missing keys in target languages (translations), will be deleted, and newly added keys to template language file, will be translated. Mode "full" is meant to perform full translation, keeping human translated strings and overwriting all machine translations done in the past (not recommended to run). Mode "transcode" is useful to fix human translated language files, which stored in "utf-8" encoding already, while still having "&#195;&#173;" or "&#195;&#169;" HTML entities. Mode "clean" is useful to clean build package by removing all kind of language files except source language.
 
 =item --type, -w <lang|ulang|help|config|uconfig|module>
 
@@ -1917,4 +1987,4 @@ Verbosely print processed files and provide detailed output. By detault, verbose
 
 =head1 LICENSE AND COPYRIGHT
 
-Copyright 2022 Ilia Rostovtsev <ilia@virtualmin.com>
+Copyright 2020 Ilia Rostovtsev <ilia@virtualmin.com>

bind8/bind8-lib.pl

@@ -65,10 +65,10 @@ our @dnssec_dlv_key = ( 257, 3, 5, '"BEAAAAPHMu/5onzrEE7z1egmhg/WPO0+juoZrW3euWE
 
 my $rand_flag;
 if ($gconfig{'os_type'} =~ /-linux$/ && 
+    $config{'force_random'} eq '0' &&
     -r "/dev/urandom" &&
-    !$config{'force_random'} &&
+    $bind_version =~ /^9\./ &&
-    $bind_version &&
+    &compare_version_numbers($bind_version, '<', '9.14.2')) {
-    &compare_version_numbers($bind_version, '9.14') < 0) {
 	# Version: 9.14.2 deprecated the use of -r option 
 	# in favor of using /dev/random [bugs:#5370]
 	$rand_flag = "-r /dev/urandom";
@@ -144,6 +144,15 @@ if (!defined($get_config_parent_cache{$file})) {
 return $get_config_parent_cache{$file};
 }
 
+# clear_config_cache()
+# Clear all in-memory caches of the BIND config
+sub clear_config_cache
+{
+undef(@get_config_cache);
+undef(%get_config_parent_cache);
+undef(%lines_count);
+}
+
 # read_config_file(file, [expand includes])
 # Reads a config file and returns an array of values
 sub read_config_file
@@ -348,6 +357,7 @@ return \%str;
 }
 
 # find(name, &array)
+# Returns a list of config objects matching some name
 sub find
 {
 my ($name, $conf) = @_;
@@ -362,12 +372,26 @@ return @rv ? wantarray ? @rv : $rv[0]
 }
 
 # find_value(name, &array)
+# Returns a list of config values matching some name
 sub find_value
 {
 my @v = &find($_[0], $_[1]);
-if (!@v) { return undef; }
+if (!@v) {
-elsif (wantarray) { return map { $_->{'value'} } @v; }
+	return undef;
-else { return $v[0]->{'value'}; }
+	}
+elsif (wantarray) {
+	return map { &extract_value($_) } @v;
+	}
+else {
+	return &extract_value($v[0]);
+	}
+}
+
+sub extract_value
+{
+my ($dir) = @_;
+return defined($dir->{'value'}) ? $dir->{'value'} :
+       defined($dir->{'values'}) && @{$dir->{'values'}} ? $dir->{'values'}->[0] : undef;
 }
 
 # base_directory([&config], [no-cache])
@@ -410,14 +434,7 @@ for(my $i=0; $i<@oldv || $i<@newv; $i++) {
 	my $oldeline = $i<@oldv ? $oldv[$i]->{'eline'} : undef;
 	if ($i < @newv) {
 		# Make sure new directive has 'value' set
-		my @v;
+		&recursive_set_value($newv[$i]);
-		if ($newv[$i]->{'values'}) {
-			@v = @{$newv[$i]->{'values'}};
-			}
-		else {
-			@v = undef;
-			}
-		$newv[$i]->{'value'} = @v ? $v[0] : undef;
 		}
 	if ($i >= @oldv && !$_[5]) {
 		# a new directive is being added.. put it at the end of
@@ -491,6 +508,21 @@ for(my $i=0; $i<@oldv || $i<@newv; $i++) {
 	}
 }
 
+# recursive_set_value(&directive)
+# Update the 'value' field based on the first 'values'
+sub recursive_set_value
+{
+my ($dir) = @_;
+if (!defined($dir->{'value'})) {
+	$dir->{'value'} = &extract_value($dir);
+	}
+if ($dir->{'type'} && $dir->{'type'} == 1 && $dir->{'members'}) {
+	foreach my $m (@{$dir->{'members'}}) {
+		&recursive_set_value($m);
+		}
+	}
+}
+
 # directives that need their value to be quoted
 my %need_quote;
 my @need_quote = ( "file", "zone", "view", "pid-file", "statistics-file",
@@ -1556,6 +1588,9 @@ if ($slave && $config{'slave_file_perms'}) {
 elsif ($config{'file_perms'}) {
 	$perms = oct($config{'file_perms'});
 	}
+elsif ($user eq "0" || $user eq "root") {
+	$perms = 0775;
+	}
 &set_ownership_permissions($user, $group, $perms, $file);
 }
 
@@ -2432,7 +2467,7 @@ sub list_zone_names
 {
 my @st = stat($zone_names_cache);
 my %znc;
-&read_file_cached($zone_names_cache, \%znc);
+&read_file_cached_with_stat($zone_names_cache, \%znc);
 
 # Check if any files have changed, or if the master config has changed, or
 # the PID file.
@@ -2987,7 +3022,7 @@ my %on = map { $_, 1 } @{$_[0]};
 &remote_error_setup(\&slave_error_handler);
 my @slaveerrs;
 foreach my $slave (&list_slave_servers()) {
-	next if (%on && !$on{$slave->{'host'}});
+	next if (%on && !$on{$slave->{'nsname'}} && !$on{$slave->{'host'}});
 
 	# Find the PID file
 	$slave_error = undef;
@@ -2998,19 +3033,10 @@ foreach my $slave (&list_slave_servers()) {
 		}
 	my $sver = &remote_foreign_call($slave, "bind8",
 				     "get_webmin_version");
-	my $pidfile;
+	my $pidfile = &remote_foreign_call(
-	if ($sver >= 1.140) {
+		$slave, "bind8", "get_pid_file");
-		# Call new function to get PID file from slave
+	$pidfile = &remote_foreign_call(
-		$pidfile = &remote_foreign_call(
+		$slave, "bind8", "make_chroot", $pidfile, 1);
-			$slave, "bind8", "get_pid_file");
-		$pidfile = &remote_foreign_call(
-			$slave, "bind8", "make_chroot", $pidfile, 1);
-		}
-	else {
-		push(@slaveerrs, [ $slave, &text('restart_eversion',
-						 $slave->{'host'}, 1.140) ]);
-		next;
-		}
 
 	# Read the PID and restart
 	my $pid = &remote_foreign_call($slave, "bind8",
@@ -3030,6 +3056,32 @@ foreach my $slave (&list_slave_servers()) {
 return @slaveerrs;
 }
 
+# restart_zone_on_slaves(domain, [&slave-hostnames])
+# Re-load a zone on all slave servers
+sub restart_zone_on_slaves
+{
+my ($dom, $onslaves) = @_;
+my %on = map { $_, 1 } @$onslaves;
+&remote_error_setup(\&slave_error_handler);
+my @slaveerrs;
+foreach my $slave (&list_slave_servers()) {
+	next if (%on && !$on{$slave->{'host'}});
+
+	&remote_foreign_require($slave, "bind8", "bind8-lib.pl");
+	if ($slave_error) {
+		push(@slaveerrs, [ $slave, $slave_error ]);
+		next;
+		}
+	my $err = &remote_foreign_call($slave, "bind8", "restart_zone", $dom);
+	if ($err) {
+		push(@slaveerrs, [ $slave, &text('restart_esig2',
+						 $slave->{'host'}, $err) ]);
+		}
+	}
+&remote_error_setup();
+return @slaveerrs;
+}
+
 sub slave_error_handler
 {
 $slave_error = $_[0];
@@ -3319,7 +3371,7 @@ sub create_dnssec_key
 {
 my ($z, $alg, $size, $single, $force) = @_;
 my $fn = &get_keys_dir($z);
-$fn || return "Could not work keys directory!";
+$fn || return "Could not work out keys directory!";
 my $dom = $z->{'members'} ? $z->{'values'}->[0] : $z->{'name'};
 
 # Remove all keys for the same zone

bind8/config-CloudLinux-8.0-ALL

@@ -0,0 +1,54 @@
+soa_style=1
+named_path=/usr/sbin/named
+named_conf=/etc/named.conf
+show_list=1
+records_order=0
+max_zones=50
+rev_def=0
+support_aaaa=1
+allow_comments=0
+allow_wild=1
+allow_long=0
+master_ttl=1
+pid_file=/run/named/named.pid
+whois_cmd=whois
+short_names=0
+updserial_def=0
+updserial_on=1
+updserial_man=1
+ndc_cmd=ndc
+forwardzonefilename_format=ZONE.hosts
+reversezonefilename_format=ZONE.rev
+rev_must=0
+ipv6_mode=1
+allow_underscore=1
+by_view=0
+confirm_zone=1
+confirm_rec=0
+no_chroot=0
+relative_paths=0
+rndc_cmd=rndc
+master_dir=/var/named
+slave_dir=/var/named/slaves
+no_pid_chroot=0
+soa_start=0
+rndc_conf=/etc/rndc.conf
+rndcconf_cmd=rndc-confgen
+largezones=0
+checkzone=named-checkzone
+keygen=dnssec-keygen
+signzone=dnssec-signzone
+checkconf=named-checkconf
+other_slaves=1
+keygen=dnssec-keygen
+tmpl_dnssec=0
+dnssec_period=21
+tmpl_dnssec_dt=1
+force_random=0
+spf_record=0
+dnssec_info=1
+start_cmd=systemctl start named
+stop_cmd=systemctl stop named
+restart_cmd=systemctl reload named
+chroot=
+auto_chroot=

bind8/edit_master.cgi

@@ -17,6 +17,14 @@ my $dom = $zone->{'name'};
 &ui_print_header(&zone_subhead($zone), $text{'master_title'}, "",
 		 undef, undef, undef, undef, &restart_links($zone));
 
+my $d = &get_virtualmin_domains($dom);
+if ($d && $d->{'alias'}) {
+	print &ui_alert_box($text{'master_vminalias'}, 'danger');
+	}
+elsif ($d) {
+	print &ui_alert_box($text{'master_vmin'}, 'warn');
+	}
+
 # Find the record types
 my (@rcodes, @recs);
 if (!$config{'largezones'}) {

bind8/edit_soptions.cgi

@@ -44,7 +44,7 @@ print &opt_input($text{'slave_max'}, "max-transfer-time-in",
 		 $zconf, $text{'default'}, 4, $text{'slave_mins'});
 
 # Slave records file
-print &opt_input($text{'slave_file'}, "file", $zconf, $text{'slave_none'}, 40);
+print &opt_input($text{'slave_file'}, "file", $zconf, $text{'slave_none'}, 80);
 
 print &choice_input($text{'slave_check'}, "check-names", $zconf,
 		    $text{'warn'}, "warn", $text{'fail'}, "fail",
@@ -53,6 +53,9 @@ print &choice_input($text{'slave_notify'}, "notify", $zconf,
 		    $text{'yes'}, "yes", $text{'no'}, "no",
 		    $text{'explicit'}, "explicit",
 		    $text{'default'}, undef);
+print &choice_input($text{'slave_format'}, "masterfile-format", $zconf,
+		    $text{'slave_raw'}, "raw", $text{'slave_text'}, "text",
+		    $text{'default'}, undef);
 
 print &addr_match_input($text{'slave_update'}, "allow-update", $zconf);
 print &addr_match_input($text{'slave_transfer'}, "allow-transfer", $zconf);

bind8/lang/af.auto

@@ -185,6 +185,9 @@ slave_max=Maksimum oordragtyd
 slave_file=Rekords lêer
 slave_check=Gaan name na?
 slave_notify=Stel slawe in kennis van veranderinge?
+slave_format=Sone lêer formaat
+slave_raw=Rou binêre
+slave_text=Gewone teks
 slave_update=Laat opdaterings toe van ..
 slave_transfer=Laat oordragte toe vanaf ..
 slave_query=Laat navrae toe van ..
@@ -1282,6 +1285,7 @@ zonekey_expandzone=Wys besonderhede rakende die sleutel in die openbare en priva
 zonekey_noprivate=Webmin kon egter nie die private sleutel vind wat geassosieer word met die sone nie, en sal dit dus nie weer kan onderteken nie.
 zonekey_eprivate=Die privaat sleutel wat met hierdie sone geassosieer word, kon nie gelees word nie : $1
 zonekey_disable=Verwyder sleutel
+zonekey_keep=Behou bestaande sleutel as DNSSEC weer geaktiveer is?
 zonekey_disabledesc=Verwyder die DNSSEC-sleutel uit hierdie sone en alle ondertekeningrekords. Sodra dit gedoen is, sal u 'n nuwe sleutel kan genereer.
 zonekey_sign=Teken sone
 zonekey_signdesc=Teken hierdie sone onmiddellik weer aan, sodat alle wysigings aan rekords wat met die hand gemaak is, by die ondertekeningrekords opgeneem word.

bind8/lang/ar.auto

@@ -185,6 +185,9 @@ slave_max=أقصى وقت نقل
 slave_file=ملف السجلات
 slave_check=تحقق من الأسماء؟
 slave_notify=إخطار العبيد من التغييرات؟
+slave_format=تنسيق ملف المنطقة
+slave_raw=ثنائي خام
+slave_text=نص عادي
 slave_update=السماح بالتحديثات من ..
 slave_transfer=السماح بالتحويلات من ..
 slave_query=السماح بالاستعلامات من ..
@@ -1282,6 +1285,7 @@ zonekey_expandzone=عرض تفاصيل مفتاح المنطقة العامة و
 zonekey_noprivate=ومع ذلك ، لم يتمكن Webmin من العثور على المفتاح الخاص المرتبط بالمنطقة ، وبالتالي لن يتمكن من إعادة تسجيله.
 zonekey_eprivate=The private key associated with this zone could not be read : $1
 zonekey_disable=إزالة المفتاح
+zonekey_keep=الاحتفاظ بالمفتاح الموجود إذا تمت إعادة تمكين DNSSEC؟
 zonekey_disabledesc=يزيل مفتاح DNSSEC من هذه المنطقة ، وجميع سجلات التوقيع. بمجرد الانتهاء من ذلك ، ستتمكن من إنشاء مفتاح جديد.
 zonekey_sign=علامة المنطقة
 zonekey_signdesc=أعد تسجيل هذه المنطقة فورًا ، بحيث يتم تضمين أي تغييرات على السجلات التي يتم إجراؤها يدويًا في سجلات التوقيع.

bind8/lang/be.auto

@@ -185,6 +185,9 @@ slave_max=Максімальны час перадачы
 slave_file=Файл запісаў
 slave_check=Праверце імёны?
 slave_notify=Паведаміць рабаў пра змены?
+slave_format=Фармат файла зоны
+slave_raw=Неапрацаваны двайковы файл
+slave_text=Звычайны тэкст
 slave_update=Дазволіць абнаўлення ад ..
 slave_transfer=Дазволіць пераклады з ..
 slave_query=Дазволіць запыты ад ..
@@ -1282,6 +1285,7 @@ zonekey_expandzone=Паказаць падрабязную інфармацыю
 zonekey_noprivate=Аднак Webmin не змог знайсці прыватны ключ, звязаны з зонай, і таму не зможа паўторна падпісаць яго.
 zonekey_eprivate=Нельга прачытаць закрыты ключ, звязаны з гэтай зонай : $1
 zonekey_disable=Выдаліць ключ
+zonekey_keep=Захаваць існуючы ключ, калі DNSSEC зноў уключаны?
 zonekey_disabledesc=Выдаляе ключ DNSSEC з гэтай зоны і ўсе запісы падпісання. Пасля гэтага вы зможаце згенераваць новы ключ.
 zonekey_sign=Зона зоны
 zonekey_signdesc=Неадкладна паўторна падпішыце гэтую зону, так што любыя змены запісаў, зробленыя ўручную, будуць уключаны ў запісы падпісанняў.

bind8/lang/bg.auto

@@ -4,6 +4,10 @@ delete_vwarn=Тази зона е свързана с домейна Virtualmin
 
 delete_vwarn2=Тази зона е свързана с домейна Virtualmin $1 и $2 други и затова не трябва да се изтрива тук!
 
+slave_format=Зонов файлов формат
+slave_raw=Необработен двоичен файл
+slave_text=Обикновен текст
+
 edit_ecaavalue2=Липсващо или невалидно изглеждащо име на домейн
 edit_enaptrvalue0=Редът на записа трябва да бъде номер
 edit_enaptrvalue1=Предпочитанието за запис трябва да е число
@@ -50,3 +54,4 @@ massdelete_vwarn=Някои зони са свързани с домейна Vir
 massdelete_vwarn2=Някои зони са свързани с домейна Virtualmin $1 и $2 други и затова не трябва да се изтриват тук!
 
 zonekey_algorithm=DNSSEC алгоритъм : $1
+zonekey_keep=Да се запази съществуващият ключ, ако DNSSEC бъде активиран отново?