Fix to work-around the bug with time offsets #552

Add support for Terminal to work in Usermin

CHANGELOG.md

@@ -1,5 +1,89 @@
 ## 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
+* Fix search bar in left menu in Framed theme
+
+#### 2.012 (January 18, 2023)
+* Fix to set the correct algorithm when setting up RNDC #1817
+* Fix the loop bug when sourcing other network configs in Debian
+* Fix to include all Debian network config files in backups
+* Fix to stop doing expensive package re-fetch on upgrades
+* Add support for defining hostname for WebSocket connection
+* Add Debian 12 support
+
+#### 2.011 (January 10, 2023)
+* Add ability to set shell character encoding and set `TERM` environmental variable in the new Terminal module
+* Add support for editing network interfaces in include files for Debian systems
+* Add various improvements to the old good Framed Theme
+* Fix to change Gray Framed Theme name to Framed Theme
+* Fix to verify and close WebSocket session, if parent session was closed
+* Fix to remove `RC4` from the list of strong ciphers
+* Fix don't fail LDAP user or group deletion, if they have already been deleted
+* Fix error handling in MySQL/MariaDB Database server module when executing SQL commands
+* Fix adding an extra server attachment field and other bugs in Read User Mail module
+* Fix the link to release notes for Rocky Linux
+* Fix issues with freezing and thawing dynamic reverse zones in BIND DNS Server module
+* Fix bugs for modules granting anonymous access
+* Fix `mailbox_idle_check_interval` option related bugs in Dovecot module [sourceforge.net#5602](https://sourceforge.net/p/webadmin/bugs/5602/)
+* Fix to use correct extension for package file when upgrading Webmin [webmin/authentic-theme#1633](https://github.com/webmin/authentic-theme/issues/1633)
+* Update the Authentic theme to the latest version
+
+#### 2.010 (November 27, 2022)
+* Add a new Terminal module (interactive shell)
+* Add a new `setup-repos.sh` script to setup Webmin repos
+* Add to replace old Gray Theme with Virtualmin Framed Theme
+* Add _systemd_ improvements
+* Add proper support for openSUSE Leap and Tumbleweed
+* Add Linux Lite support
+* Fix connecting to external IPv6 LDAP server
+* Fix self-signed certificate generation
+* Fix setting hostname using `hostnamectl` command on _systemd_ systems
+* Fix to exclude sensors with unknown temperatures
+* Fix for FreeBSD to support Let's Encrypt certificates requests
+* Fix to support attachment filenames with slash in them
+
+#### 2.001 (September 18, 2022)
+* Fix missing origins and action for direct rules in FirewallD module
+* Removed the need for a full restart when updating SSH keys
+* Improved the Javascript for redirects to HTTPS
+
+#### 2.000 (August 21, 2022)
+* Add to enforce HTTP Strict Transport Security (HSTS) policy in SSL enabled mode
+* Add better `http` to `https` redirects when SSL is enabled
+* Add support for installing multiple versions of Webmin on `systemd` systems
+* Add support for AMD CPU thermisters #1714
+* Add better support for Webmin minor (release) versions upgrades
+* Add Webmin and Usermin configuration modules display minor (release) version
+* Add Mint Linux support
+* Add latest Authentic 20.00 [theme update](https://github.com/webmin/authentic-theme/releases/tag/20.00) with number of bug fixes
+* Fix to also restart dependent services (i.e. `fail2ban`) upon `firewalld` restart
+* Fix to preserve service state for Webmin and Usermin upon package upgrades (i.e. don't start stopped)
+* Fix Bind module config incorrectly updated upon Webmin upgrades on CentOS 7
+
 #### 1.999 (August 4, 2022)
 * Fix to allow IPv6 addresses for slaves in BIND module
 * Fix to send `HUP` signal on reload with `systemd`

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">](http://webmin.com/download.html)[<img src="https://github.com/webmin-devel/webmin/blob/master/media/download-23x14-devel.png?raw=true" title="Development Versions">](http://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,22 +39,13 @@ 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](http://www.webmin.com/support.html)) under [latest release assets](https://github.com/webmin/webmin/releases/latest) or from our [download page](http://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.000.tar.gz), and running [_setup.sh_](http://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](http://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
 
 ### Lead developer
 
-* [Jamie Cameron](http://www.webmin.com/about.html) [![](https://github.com/webmin-devel/webmin/blob/master/media/linkedin-15x15.png?raw=true)](https://www.linkedin.com/in/jamiecameron2)
+* [Jamie Cameron](https://www.webmin.com/about.html) [![](https://github.com/webmin-devel/webmin/blob/master/media/linkedin-15x15.png?raw=true)](https://www.linkedin.com/in/jamiecameron2)
 
 ### Developers
 * [Ilia Rostovtsev](https://github.com/iliajie)

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();
 	}
 }
 
@@ -1959,16 +1967,8 @@ my $miniserv = { };
 my @anon = split(/\s+/, $miniserv->{'anonymous'} || "");
 my ($user, $found) = &get_anonymous_access($path, $miniserv);
 return 1 if ($found >= 0);		# Already setup
-
+my $auser = grep { $_->{'name'} eq $user } &list_users();
-# Grant access to the user and path
+if (!$auser) {
-&lock_file(&get_miniserv_config_file());
-$user ||= '';
-push(@anon, "$path=$user");
-$miniserv->{'anonymous'} = join(" ", @anon);
-&put_miniserv_config($miniserv);
-&unlock_file(&get_miniserv_config_file());
-
-if (!$user) {
 	# Create a user if need be
 	$user = "anonymous";
 	my $uinfo = { 'name' => $user,
@@ -1980,16 +1980,23 @@ if (!$user) {
 else {
 	# Make sure the user has the module
 	my ($uinfo) = grep { $_->{'name'} eq $user } &list_users();
-	$uinfo->{'modules'} ||= [];
 	if ($uinfo && &indexof($mod, @{$uinfo->{'modules'}}) < 0) {
+		$uinfo->{'modules'} ||= [];
 		push(@{$uinfo->{'modules'}}, $mod);
 		&modify_user($uinfo->{'name'}, $uinfo);
 		}
 	else {
-		print STDERR "Anonymous access is granted to user $user, but he doesn't exist!\n";
+		print STDERR "Anonymous access attempted to be granted to user $user, but it doesn't exist!\n";
 		}
 	}
 
+# Grant access to the user and path
+&lock_file(&get_miniserv_config_file());
+push(@anon, "$path=$user");
+$miniserv->{'anonymous'} = join(" ", @anon);
+&put_miniserv_config($miniserv);
+&unlock_file(&get_miniserv_config_file());
+
 &reload_miniserv();
 }
 

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 (!$@) {
+		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
@@ -354,6 +356,7 @@ sessions_actions=Optrede..
 sessions_all=Alle sessies..
 sessions_logouts=Toon ook afgemelde sessies..
 sessions_state=staat
+sessions_action=Aksies
 sessions_this=Hierdie aanmelding
 sessions_in=Aangemeld
 sessions_out=Uitgeteken

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
@@ -242,6 +245,7 @@ sessions_actions=أجراءات..
 sessions_all=كل الجلسات..
 sessions_logouts=اعرض أيضًا جلسات تسجيل الخروج..
 sessions_state=حالة
+sessions_action=أجراءات
 sessions_this=هذا تسجيل الدخول
 sessions_in=تسجيل الدخول
 sessions_out=تسجيل الخروج

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
@@ -354,6 +356,7 @@ sessions_actions=Дзеянні..
 sessions_all=Усе сеансы..
 sessions_logouts=Таксама паказаць выходныя сесіі.
 sessions_state=Дзярж
+sessions_action=Дзеянні
 sessions_this=Гэта ўваход
 sessions_in=Ўвайшлі ў
 sessions_out=Выйшаў

acl/lang/bg.auto

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

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,9 +9,12 @@ 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..
+sessions_action=Accions
 
 sql_nocache0=Connexions de memòria cau a la base de dades
 sql_nocache1=Obriu una connexió nova per a cada cerca

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?
 
@@ -64,6 +66,7 @@ sessions_actions=Akce..
 sessions_all=Všechny relace..
 sessions_logouts=Zobrazit také odhlášené relace.
 sessions_state=Stát
+sessions_action=Akce
 sessions_this=Toto přihlášení
 sessions_in=Přihlášen
 sessions_out=Odhlásit

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,9 +9,12 @@ 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..
+sessions_action=Handlinger
 
 sql_nocache0=Cache-forbindelser til databasen
 sql_nocache1=Åbn en ny forbindelse til hvert opslag

acl/lang/de.auto

@@ -1,6 +1,11 @@
+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..
+sessions_action=Aktionen
 
 sql_nocache0=Cache-Verbindungen zur Datenbank
 sql_nocache1=Öffnen Sie für jede Suche eine neue Verbindung

acl/lang/el.auto

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

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,12 +11,15 @@ 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..
 sessions_all=Todas las sesiones..
 sessions_logouts=Mostrar también sesiones cerradas.
 sessions_state=Estado
+sessions_action=Comportamiento
 sessions_this=Este inicio de sesión
 sessions_in=Conectado
 sessions_out=Desconectado

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?
 
@@ -60,6 +62,7 @@ sessions_actions=Ekintzak..
 sessions_all=Saio guztiak..
 sessions_logouts=Erakutsi itxitako saioak ere..
 sessions_state=Estatu
+sessions_action=Ekintzak
 sessions_this=Saioa hasiera
 sessions_in=Saioa hasi
 sessions_out=Saioa amaitu

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=آیا می توانید محدودیت های رمز عبور را تغییر دهید؟
@@ -115,6 +117,7 @@ sessions_actions=اقدامات..
 sessions_all=تمام جلسات..
 sessions_logouts=همچنین جلسات ورود به سیستم را نشان دهید..
 sessions_state=دولت
+sessions_action=اقدامات
 sessions_this=این ورود
 sessions_in=وارد شده
 sessions_out=خارج شد

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
@@ -354,6 +356,7 @@ sessions_actions=Toiminnot..
 sessions_all=Kaikki istunnot..
 sessions_logouts=Näytä myös kirjautuneet istunnot..
 sessions_state=Osavaltio
+sessions_action=Toiminnot
 sessions_this=Tämä kirjautuminen
 sessions_in=Kirjautunut sisään
 sessions_out=Kirjautunut ulos

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
@@ -57,6 +60,7 @@ unix_header=Paramètres d'authentification utilisateur Unix
 unix_utable=Utilisateurs Unix autorisés
 
 sessions_all=Toutes les séances..
+sessions_action=Actions
 
 udeletes_jerr=Échec de l'ajout d'utilisateurs au groupe
 

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 בקבוצות
@@ -354,6 +356,7 @@ sessions_actions=פעולות..
 sessions_all=כל המפגשים..
 sessions_logouts=הראה גם הפעלות לא מחוברות..
 sessions_state=מדינה
+sessions_action=פעולות
 sessions_this=כניסה זו
 sessions_in=מחובר
 sessions_out=התנתק

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?
 
@@ -65,6 +67,7 @@ sessions_actions=Akcije..
 sessions_all=Sve sesije..
 sessions_logouts=Prikaži i odjavljene sesije..
 sessions_state=država
+sessions_action=Radnje
 sessions_this=Ova prijava
 sessions_in=Prijavljeni
 sessions_out=Odjavljen

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?
@@ -91,6 +93,7 @@ sessions_actions=Hozzászólások..
 sessions_all=Minden ülés..
 sessions_logouts=A kijelentkezett munkamenetek megjelenítése is
 sessions_state=Állapot
+sessions_action=Akciók
 sessions_this=Ez a bejelentkezés
 sessions_in=Bejelentkezve
 sessions_out=Kilépett

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
@@ -40,6 +43,7 @@ sessions_actions=Azioni..
 sessions_all=Tutte le sessioni..
 sessions_logouts=Mostra anche sessioni disconnesse.
 sessions_state=Stato
+sessions_action=Azioni
 sessions_this=Questo login
 sessions_in=Connesso
 sessions_out=Disconnesso

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=ユーザーおよびグループデータベースを構成できますか？
 
@@ -62,6 +64,7 @@ sessions_actions=行動..
 sessions_all=すべてのセッション。
 sessions_logouts=ログアウトしたセッションも表示します。
 sessions_state=状態
+sessions_action=行動
 sessions_this=このログイン
 sessions_in=ログイン済み
 sessions_out=ログアウトしました

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=사용자 및 그룹 데이터베이스를 구성 할 수 있습니까?
 
@@ -62,6 +64,7 @@ sessions_actions=행위..
 sessions_all=모든 세션..
 sessions_logouts=로그 아웃 된 세션도 표시하십시오.
 sessions_state=상태
+sessions_action=행위
 sessions_this=이 로그인
 sessions_in=로그인
 sessions_out=로그 아웃

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
@@ -354,6 +356,7 @@ sessions_actions=Veiksmai..
 sessions_all=Visi užsiėmimai..
 sessions_logouts=Taip pat rodyti atsijungusius seansus..
 sessions_state=Valstybė
+sessions_action=Veiksmai
 sessions_this=Šis prisijungimas
 sessions_in=Prisijungęs
 sessions_out=Atsijungęs

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
@@ -354,6 +356,7 @@ sessions_actions=Darbības..
 sessions_all=Visas sesijas..
 sessions_logouts=Rādīt arī atteikšanās sesijas..
 sessions_state=Valsts
+sessions_action=Darbības
 sessions_this=Šī pieteikšanās
 sessions_in=Pieteicies
 sessions_out=Izlogojies

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,12 +11,15 @@ 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..
 sessions_all=Semua sesi..
 sessions_logouts=Juga tunjukkan sesi log keluar..
 sessions_state=Negeri
+sessions_action=Tindakan
 sessions_this=Log masuk ini
 sessions_in=Log masuk
 sessions_out=Logged out

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
@@ -354,6 +356,7 @@ sessions_actions=Azzjonijiet..
 sessions_all=Is-sessjonijiet kollha..
 sessions_logouts=Uri wkoll sessjonijiet illoggjati..
 sessions_state=Stat
+sessions_action=Azzjonijiet
 sessions_this=Dan id-dħul
 sessions_in=Dħalt
 sessions_out=Dħalt

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
@@ -39,6 +42,7 @@ sessions_actions=Acties..
 sessions_all=Alle sessies..
 sessions_logouts=Toon ook uitgelogde sessies..
 sessions_state=Staat
+sessions_action=Acties
 sessions_this=Deze login
 sessions_in=Ingelogd
 sessions_out=Uitgelogd

acl/lang/no.auto

@@ -1,6 +1,11 @@
+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..
+sessions_action=Handlinger
 
 sql_nocache0=Cache-tilkoblinger til databasen
 sql_nocache1=Åpne en ny forbindelse for hvert oppslag

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,12 +9,15 @@ 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..
 sessions_all=Wszystkie sesje...
 sessions_logouts=Pokaż także wylogowane sesje.
 sessions_state=Stan
+sessions_action=działania
 sessions_this=Ten login
 sessions_in=Zalogowany
 sessions_out=Wylogowano

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
@@ -330,6 +332,7 @@ sessions_actions=Ações..
 sessions_all=Todas as sessões..
 sessions_logouts=Mostrar também sessões desconectadas.
 sessions_state=Estado
+sessions_action=Ações
 sessions_this=Este login
 sessions_in=Logado
 sessions_out=Desconectado

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?
 
@@ -58,6 +60,7 @@ sessions_actions=Ações..
 sessions_all=Todas as sessões..
 sessions_logouts=Mostrar também sessões desconectadas.
 sessions_state=Estado
+sessions_action=Ações
 sessions_this=Este login
 sessions_in=Logado
 sessions_out=Desconectado

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
@@ -354,6 +356,7 @@ sessions_actions=Acțiuni..
 sessions_all=Toate sesiunile..
 sessions_logouts=Arată, de asemenea, sesiuni deconectate..
 sessions_state=Stat
+sessions_action=Acțiuni
 sessions_this=Această autentificare
 sessions_in=Conectat
 sessions_out=Delogat

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=Можно настроить базу данных пользователей и групп?
 
@@ -62,6 +64,7 @@ sessions_actions=Действия..
 sessions_all=Все сеансы..
 sessions_logouts=Также показать сеансы выхода из системы.
 sessions_state=состояние
+sessions_action=Действия
 sessions_this=Этот логин
 sessions_in=Войти в систему
 sessions_out=Вышли из

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?
@@ -107,6 +109,7 @@ sessions_actions=Akcia..
 sessions_all=Všetky relácie..
 sessions_logouts=Zobraziť aj odhlásené relácie.
 sessions_state=Štát
+sessions_action=Akcie
 sessions_this=Toto prihlásenie
 sessions_in=Prihlásený
 sessions_out=Odhlasený

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
@@ -354,6 +356,7 @@ sessions_actions=Ukrepi..
 sessions_all=Vse seje..
 sessions_logouts=Prikaži tudi odjavne seje.
 sessions_state=Država
+sessions_action=Dejanja
 sessions_this=Ta prijava
 sessions_in=Prijavljeni
 sessions_out=Odjavljeni

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?
 
@@ -62,6 +64,7 @@ sessions_actions=Handlingar..
 sessions_all=Alla sessioner..
 sessions_logouts=Visa även utloggade sessioner..
 sessions_state=stat
+sessions_action=Åtgärder
 sessions_this=Den här inloggningen
 sessions_in=Inloggad
 sessions_out=Utloggad

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
@@ -354,6 +356,7 @@ sessions_actions=การดำเนินการ..
 sessions_all=ทุกวาระ..
 sessions_logouts=แสดงเซสชันการออกจากระบบด้วย..
 sessions_state=สถานะ
+sessions_action=การกระทำ
 sessions_this=เข้าสู่ระบบนี้
 sessions_in=เข้าสู่ระบบ
 sessions_out=ออกจากระบบ

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?
@@ -123,6 +125,7 @@ sessions_actions=Hareketler..
 sessions_all=Tüm oturumlar..
 sessions_logouts=Oturumu kapatılmış oturumları da göster..
 sessions_state=Durum
+sessions_action=Hareketler
 sessions_this=Bu giriş
 sessions_in=Giriş
 sessions_out=Çıkış yapıldı

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
@@ -349,6 +351,7 @@ sessions_actions=Дії..
 sessions_all=Всі сеанси..
 sessions_logouts=Показати також сеанси виходу з системи..
 sessions_state=Держава
+sessions_action=Дії
 sessions_this=Це логін
 sessions_in=Увійшли в
 sessions_out=Вийшли з системи

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 میں ترمیم کرنے کی اجازت نہیں ہے
@@ -354,6 +356,7 @@ sessions_actions=عمل..
 sessions_all=تمام سیشنز..
 sessions_logouts=لاگ آؤٹ سیشن بھی دکھائیں..
 sessions_state=حالت
+sessions_action=اعمال
 sessions_this=یہ لاگ ان
 sessions_in=لاگ ان
 sessions_out=لاگ آؤٹ

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
@@ -354,6 +356,7 @@ sessions_actions=Hành động..
 sessions_all=Tất cả các phiên..
 sessions_logouts=Cũng hiển thị các phiên đăng xuất..
 sessions_state=Tiểu bang
+sessions_action=Hành động
 sessions_this=Thông tin đăng nhập này
 sessions_in=Đăng nhập
 sessions_out=Đăng xuất

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=可以改变个人主题吗？
@@ -163,6 +165,7 @@ sessions_actions=动作..
 sessions_all=所有会议..
 sessions_logouts=同时显示注销的会话。
 sessions_state=州
+sessions_action=行动
 sessions_this=此登录名
 sessions_in=登录
 sessions_out=登出

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=可以更改密碼限制嗎？
@@ -141,6 +143,7 @@ sessions_actions=動作..
 sessions_all=所有會議..
 sessions_logouts=還顯示註銷的會話。
 sessions_state=州
+sessions_action=行動
 sessions_this=此登錄名
 sessions_in=登錄
 sessions_out=登出

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/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-openSUSE-Linux-15.0-ALL

@@ -0,0 +1,23 @@
+show_list=0
+httpd_dir=/srv/www
+httpd_conf=/etc/apache2/httpd.conf
+mime_types=/etc/apache2/mime.types
+httpd_path=/usr/sbin/httpd
+start_cmd=systemctl start apache2
+stop_cmd=systemctl stop apache2
+apply_cmd=systemctl restart apache2
+show_order=0
+max_servers=100
+test_config=1
+test_manual=0
+test_always=0
+test_apachectl=1
+apachectl_path=/usr/sbin/apache2ctl
+virt_file=/etc/apache2/vhosts.d
+pid_file=/run/httpd.pid
+defines_file=/etc/sysconfig/apache2
+defines_name=APACHE_SERVER_FLAGS
+auto_mods=1
+show_names=0
+allow_virtualmin=0
+format_config=1

at/config-openSUSE-Linux-15.0-ALL

@@ -0,0 +1,4 @@
+at_style=linux
+at_dir=/var/spool/atjobs
+allow_file=/etc/at.allow
+deny_file=/etc/at.deny

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/bacula-backup-lib.pl

@@ -3,6 +3,7 @@
 
 BEGIN { push(@INC, ".."); };
 use WebminCore;
+use JSON::PP;
 &init_config();
 use Time::Local;
 if (&foreign_check("node-groups")) {

bacula-backup/list.cgi

@@ -2,11 +2,9 @@
 # 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();
 
-use JSON::PP;
-
 # Input sanitization
 die "Illegal input" if ($in{'job'} and $in{'job'} !~ /^\d+\z/);
 

bin/disable-proxy

@@ -149,6 +149,6 @@ C</etc/webmin>
 
 =head1 LICENSE AND COPYRIGHT
 
- Copyright 2022 Jamie Cameron <jcameron@webmin.com>
+ Copyright 2018 Jamie Cameron <jcameron@webmin.com>
                 Joe Cooper <joe@virtualmin.com>
 

bin/disable-twofactor

@@ -114,6 +114,6 @@ Name of the user to disable two-factor authentication for.
 =head1 LICENSE AND COPYRIGHT
 
 
- Copyright 2022 Jamie Cameron <jcameron@webmin.com>
+ Copyright 2018 Jamie Cameron <jcameron@webmin.com>
                 Joe Cooper <joe@virtualmin.com>
                 Ilia Rostovtsev <ilia@virtualmin.com>

bin/enable-proxy

@@ -164,5 +164,5 @@ domain.tld)
 
 =head1 LICENSE AND COPYRIGHT
 
- Copyright 2022 Jamie Cameron <jcameron@webmin.com>
+ Copyright 2018 Jamie Cameron <jcameron@webmin.com>
                 Joe Cooper <joe@virtualmin.com>

bin/list-config

@@ -199,5 +199,5 @@ Display the description of the option from the module C<config.info> file, inste
 
 =head1 LICENSE AND COPYRIGHT
 
- Copyright 2022 Jamie Cameron <jcameron@webmin.com>
+ Copyright 2018 Jamie Cameron <jcameron@webmin.com>
                 Joe Cooper <joe@virtualmin.com>

bin/passwd

@@ -258,7 +258,7 @@ Set new user password. Using this option may be unsecure.
 
 =head1 LICENSE AND COPYRIGHT
 
- Copyright 2022 Jamie Cameron <jcameron@webmin.com>
+ Copyright 2018 Jamie Cameron <jcameron@webmin.com>
                 Joe Cooper <joe@virtualmin.com>
                 Ilia Rostovtsev <ilia@virtualmin.com>
 

bin/server

@@ -172,7 +172,7 @@ sub root
 
 =head1 LICENSE AND COPYRIGHT
 
- Copyright 2022 Jamie Cameron <jcameron@webmin.com>
+ Copyright 2018 Jamie Cameron <jcameron@webmin.com>
                 Joe Cooper <joe@virtualmin.com>
                 Ilia Rostovtsev <ilia@virtualmin.com>
 

bin/set-config

@@ -181,5 +181,5 @@ already exist in the file, and was added)
 
 =head1 LICENSE AND COPYRIGHT
 
- Copyright 2022 Jamie Cameron <jcameron@webmin.com>
+ Copyright 2018 Jamie Cameron <jcameron@webmin.com>
                 Joe Cooper <joe@virtualmin.com>

bin/webmin

@@ -431,7 +431,7 @@ Returns Webmin and other modules and themes versions installed (only those for w
 
 =head1 LICENSE AND COPYRIGHT
 
- Copyright 2022 Jamie Cameron <jcameron@webmin.com>
+ Copyright 2018 Jamie Cameron <jcameron@webmin.com>
                 Joe Cooper <joe@virtualmin.com>
                 Ilia Rostovtsev <ilia@virtualmin.com>
 

bind8/backup_config.pl

@@ -27,7 +27,7 @@ foreach my $v (@views) {
 push(@zones, &find("zone", $conf));
 foreach my $z (@zones) {
 	my $tv = &find_value("type", $z->{'members'});
-	next if ($tv ne "master" && $tv ne "hint");
+	next if ($tv ne "master" && $tv ne "primary" && $tv ne "hint");
 	my $file = &find_value("file", $z->{'members'});
 	next if (!$file);
 	if (&is_raw_format_records(&make_chroot($file))) {

bind8/bind8-lib.pl

@@ -35,7 +35,7 @@ my @extra_reverse = split(/\s+/, $config{'extra_reverse'} || '');
 our %is_extra = map { $_, 1 } (@extra_forward, @extra_reverse);
 our %access = &get_module_acl();
 my $zone_names_cache = "$module_config_directory/zone-names";
-my $zone_names_version = 3;
+my $zone_names_version = 4;
 my @list_zone_names_cache;
 my $slave_error;
 my %lines_count;
@@ -131,7 +131,7 @@ my $file = $_[0] || $config{'named_conf'};
 if (!defined($get_config_parent_cache{$file})) {
 	my $conf = &get_config();
 	if (!defined($lines_count{$file})) {
-		my $lref = &read_file_lines($file);
+		my $lref = &read_file_lines($file, 1);
 		$lines_count{$file} = @$lref;
 		}
 	$get_config_parent_cache{$file} =
@@ -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,6 +372,7 @@ 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]);
@@ -410,14 +421,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 +495,22 @@ 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 ($dir->{'values'}) {
+	my @v = @{$dir->{'values'}};
+	$dir->{'value'} = @v ? $v[0] : undef;
+	}
+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",
@@ -802,7 +822,8 @@ if ($ipv6) {
 		$rev = &net_to_ip6int($addr, 4*($i+1));
 		$rev =~ s/\.$//g;
 		foreach my $z (@zl) {
-			if (lc($z->{'name'}) eq $rev && $z->{'type'} eq 'master') {
+			if (lc($z->{'name'}) eq $rev &&
+			    ($z->{'type'} eq 'master' || $z->{'type'} eq 'primary')) {
 				# found the reverse master domain
 				$revconf = $z;
 				last DOMAIN;
@@ -822,7 +843,7 @@ else {
 			$zname =~ s/^(\d+)\/(\d+)\.//;
 			if ((lc($zname) eq $rev ||
 			     lc($zname) eq "$rev.") &&
-			    $z->{'type'} eq "master") {
+			    ($z->{'type'} eq "master" || $z->{'type'} eq "primary")) {
 				# found the reverse master domain
 				$revconf = $z;
 				last DOMAIN;
@@ -870,7 +891,7 @@ DOMAIN: for(my $i=1; $i<@parts; $i++) {
 		my $typed;
 		if ((lc($z->{'name'}) eq $fwd ||
 		     lc($z->{'name'}) eq "$fwd.") &&
-		    $z->{'type'} eq "master") {
+		    ($z->{'type'} eq "master" || $z->{'type'} eq "primary")) {
 			# Found the forward master!
 			$fwdconf = $z;
 			last DOMAIN;
@@ -981,7 +1002,7 @@ sub can_edit_reverse
 return $access{'reverse'} || &can_edit_zone($_[0]);
 }
 
-# record_input(zone-name, view, type, file, origin, [num], [record],
+# record_input(zone-name, view, type, file, origin, [num], [&record],
 #	       [new-name, new-value])
 # Display a form for editing or creating a DNS record
 sub record_input
@@ -1058,8 +1079,12 @@ else {
 	$ttl = $rec{'ttl'} || '';
 	$ttlunit = "";
 	}
+my $defmsg = $text{'default'};
+if ($rec{'realttl'}) {
+	$defmsg .= " ($rec{'realttl'})";
+	}
 print &ui_table_row($text{'edit_ttl'},
-	&ui_opt_textbox("ttl", $ttl, 8, $text{'default'})." ".
+	&ui_opt_textbox("ttl", $ttl, 8, $defmsg)." ".
 	&time_unit_choice("ttlunit", $ttlunit));
 
 # Value(s) fields
@@ -1551,6 +1576,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);
 }
 
@@ -2195,7 +2223,7 @@ return undef;
 sub before_editing
 {
 my ($zone) = @_;
-if (!$freeze_zone_count{$zone->{'name'}}) {
+if ($zone->{'dynamic'} && !$freeze_zone_count{$zone->{'name'}}) {
 	my ($out, $ok) = &try_cmd(
 		"freeze ".quotemeta($zone->{'name'})." IN ".
 		quotemeta($zone->{'view'} || ""));
@@ -2225,15 +2253,21 @@ sub restart_zone
 {
 my ($dom, $view) = @_;
 my ($out, $ex);
+my $zone = &get_zone_name($dom, $view);
+my $dyn = $zone && $zone->{'dynamic'};
 if ($view) {
 	# Reload a zone in a view
+	&try_cmd("freeze ".quotemeta($dom)." IN ".quotemeta($view)) if ($dyn);
 	$out = &try_cmd("reload ".quotemeta($dom)." IN ".quotemeta($view));
 	$ex = $?;
+	&try_cmd("thaw ".quotemeta($dom)." IN ".quotemeta($view)) if ($dyn);
 	}
 else {
 	# Just reload one top-level zone
+	&try_cmd("freeze ".quotemeta($dom)) if ($dyn);
 	$out = &try_cmd("reload ".quotemeta($dom));
 	$ex = $?;
+	&try_cmd("thaw ".quotemeta($dom)) if ($dyn);
 	}
 if ($out =~ /not found/i) {
 	# Zone is not known to BIND yet - do a total reload
@@ -2421,7 +2455,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.
@@ -2451,9 +2485,13 @@ if ($changed || !$znc{'version'} ||
 		foreach my $z (@vz) {
 			my $type = &find_value("type", $z->{'members'});
 			next if (!$type);
+			$type = lc($type);
 			my $file = &find_value("file", $z->{'members'});
+			my $up = &find("update-policy", $z->{'members'});
+			my $au = &find("allow-update", $z->{'members'});
+			my $dynamic = $up || $au ? 1 : 0;
 			$znc{"zone_".($n++)} = join("\t", $z->{'value'},
-				$z->{'index'}, $type, $v->{'value'}, $file);
+			  $z->{'index'}, $type, $v->{'value'}, $dynamic, $file);
 			$files{$z->{'file'}}++;
 			}
 		$znc{"view_".($n++)} = join("\t", $v->{'value'}, $v->{'index'});
@@ -2462,10 +2500,14 @@ if ($changed || !$znc{'version'} ||
 	foreach my $z (&find("zone", $conf)) {
 		my $type = &find_value("type", $z->{'members'});
 		next if (!$type);
+		$type = lc($type);
 		my $file = &find_value("file", $z->{'members'});
 		$file ||= "";	# slaves and other types with no file
+		my $up = &find("update-policy", $z->{'members'});
+		my $au = &find("allow-update", $z->{'members'});
+		my $dynamic = $up || $au ? 1 : 0;
 		$znc{"zone_".($n++)} = join("\t", $z->{'value'},
-			$z->{'index'}, $type, "*", $file);
+			$z->{'index'}, $type, "*", $dynamic, $file);
 		$files{$z->{'file'}}++;
 		}
 
@@ -2496,12 +2538,13 @@ if (scalar(@list_zone_names_cache)) {
 my (@rv, %viewidx);
 foreach my $k (keys %znc) {
 	if ($k =~ /^zone_(\d+)$/) {
-		my ($name, $index, $type, $view, $file) =
+		my ($name, $index, $type, $view, $dynamic, $file) =
-			split(/\t+/, $znc{$k}, 5);
+			split(/\t+/, $znc{$k}, 6);
 		push(@rv, { 'name' => $name,
 			    'type' => $type,
 			    'index' => $index,
 			    'view' => !$view || $view eq '*' ? undef : $view,
+			    'dynamic' => $dynamic,
 			    'file' => $file });
 		}
 	elsif ($k =~ /^view_(\d+)$/) {
@@ -2529,7 +2572,7 @@ undef(@list_zone_names_cache);
 unlink($zone_names_cache);
 }
 
-# get_zone_name(index|name, [viewindex|"any"])
+# get_zone_name(index|name, [viewindex|view-name|"any"])
 # Returns a zone cache object, looked up by name or index
 sub get_zone_name
 {
@@ -2541,7 +2584,8 @@ foreach my $z (@zones) {
 	if ($z->{$field} eq $key &&
 	    ($viewidx eq 'any' ||
 	     $viewidx eq '' && !defined($z->{'viewindex'}) ||
-	     $viewidx ne '' && $z->{'viewindex'} == $_[1])) {
+	     $viewidx =~ /^\d+$/ && $z->{'viewindex'} == $viewidx ||
+	     $viewidx ne '' && $z->{'view'} eq $viewidx)) {
 		return $z;
 		}
 	}
@@ -2977,19 +3021,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",
@@ -3009,6 +3044,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];
@@ -3298,7 +3359,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
@@ -4304,7 +4365,7 @@ my %cache;
 &read_file($dnssec_expiry_cache, \%cache);
 my $changed = 0;
 foreach my $z (&list_zone_names()) {
-	next if ($z->{'type'} ne 'master');
+	next if ($z->{'type'} ne 'master' && $z->{'type'} ne 'primary');
 	my ($t, $e);
 	if ($cache{$z->{'name'}}) {
 		($t, $e) = split(/\s+/, $cache{$z->{'name'}});
@@ -4382,5 +4443,21 @@ my $kvspace = " " x length("@kvalues");
 return join(" ", @kvalues) . " " . join("\n$kvspace ", splice(@krvalues, 6));
 }
 
+# redirect_url(type, [zone], [view])
+# Returns the URL of the appropriate edit_*.cgi page
+sub redirect_url
+{
+my ($type, $zone, $view) = @_;
+my $r = $type eq "master" || $type eq "primary" ? "edit_master.cgi" :
+	$type eq "forward" ? "edit_forward.cgi" : "edit_slave.cgi";
+if ($zone) {
+	$r .= "?zone=".&urlize($zone);
+	if ($view) {
+		$r .= "&view=".&urlize($view);
+		}
+	}
+return $r;
+}
+
 1;
 

bind8/cgi_args.pl

@@ -33,7 +33,8 @@ elsif ($cgi eq 'edit_text.cgi' || $cgi eq 'edit_soa.cgi' ||
        $cgi eq 'edit_zonekey.cgi' || $cgi eq 'edit_recs.cgi' ||
        $cgi eq 'edit_record.cgi') {
 	# Find a master zone
-	my ($z) = grep { $_->{'type'} eq 'master' &&
+	my ($z) = grep { ($_->{'type'} eq 'master' ||
+			  $_->{'type'} eq 'primary') &&
 			 &can_edit_zone($_) } &list_zone_names();
 	return 'none' if (!$z);
 	my $rv = 'zone='.$z->{'zone'}.

bind8/conf_net.cgi

@@ -52,7 +52,7 @@ print &ui_table_row($text{'net_listen'}, $ltable, 3);
 
 # Source address for queries
 my $src = &find("query-source", $mems);
-my $srcstr = join(" ", $src->{'values'});
+my $srcstr = $src ? join(" ", @{$src->{'values'}}) : "";
 my ($sport, $saddr);
 $sport = $1 if ($srcstr =~ /port\s+(\d+)/i);
 $saddr = $1 if ($srcstr =~ /address\s+([0-9\.]+)/i);

bind8/conf_rndc.cgi

@@ -35,7 +35,7 @@ if (!$? && $out !~ /failed/) {
 print &ui_form_start("save_rndc.cgi", "post");
 my $ex = -s $config{'rndc_conf'};
 print &text($ex ? 'rndc_rusure' : 'rndc_rusure2',
-	    "<tt>$config{'rndc_conf'}</tt>"),"<p>\n";
+	    "<tt>$config{'rndc_conf'}</tt>"),"<br>\n";
 print &ui_submit($text{'rndc_ok'});
 print &ui_form_end();
 

bind8/config-AlmaLinux-6.0-ALL

@@ -44,10 +44,6 @@ keygen=dnssec-keygen
 tmpl_dnssec=0
 dnssec_period=21
 tmpl_dnssec_dt=1
-dnssectools_conf=/etc/dnssec-tools/dnssec-tools.conf
-dnssectools_rollrec=/var/named/system.rollrec
-dnssectools_keydir=/var/named/dtkeys
-dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid
 force_random=0
 spf_record=0
 dnssec_info=1