Fix mysterious leading space for some languages

Presumably this is Google Translator bug and language translator script does't work around it yet

.gitignore

@@ -20,3 +20,4 @@ core
 # makedist.pl
 tarballs/
 minimal/
+.DS_Store

README.md

@@ -10,7 +10,7 @@
 
 **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). 
 
-[![Quick UI overview 2021](https://rostovtsev.io/pub/media/screenshots/webmin-2021-screenshot-updated.png)](https://www.youtube.com/watch?v=daYG6O4AsEw&feature=emb_logo)
+[![Quick UI overview 2021](https://user-images.githubusercontent.com/4426533/114315375-61a1c480-9b07-11eb-9aaf-4aa949a39ab7.png)
 
 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:
 
@@ -29,7 +29,7 @@ Webmin can be installed in two different ways:
  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)) 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-1.972.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.
+ 2. By downloading, extracting [source file](https://prdownloads.sourceforge.net/webadmin/webmin-1.974.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_ commmand, _sc.exe_ command, and _Win32::Daemon_ Perl module.</kbd>
 
 ## Documentation

acl/edit_sync.cgi

@@ -26,6 +26,8 @@ print &ui_table_row($text{'sync_when'},
 	"<br>\n".
 	&ui_checkbox("delete", 1, $text{'sync_delete'}, $config{'sync_delete'}).
 	"<br>\n".
+	&ui_checkbox("modify", 1, $text{'sync_modify'}, $config{'sync_modify'}).
+	"<br>\n".
 	&ui_checkbox("unix", 1, $text{'sync_unix'}, $config{'sync_unix'}));
 
 # Assign new users to group

acl/edit_user.cgi

@@ -211,14 +211,14 @@ if ($access{'cats'}) {
 			    [ 0, $text{'default'} ] ]));
 	}
 
-my @all = &webmin::list_themes();
+my @all = &webmin::list_visible_themes($user{'theme'});
 my @themes = grep { !$_->{'overlay'} } @all;
 my @overlays = grep { $_->{'overlay'} } @all;
 
 if ($access{'theme'}) {
 	# Current theme
 	my @topts = ( );
-	push(@topts, [ "", $text{'edit_themedef'} ]);
+	push(@topts, !$user{'theme'} ? [ '', $text{'edit_themedef'} ] : ());
 	foreach my $t (@themes) {
 		push(@topts, [ $t->{'dir'}, $t->{'desc'} ]);
 		}

acl/lang/en

@@ -306,6 +306,7 @@ sync_when=When to synchronize
 sync_create=Create a Webmin user when a Unix user is created.
 sync_update=Update the matching Webmin user when a Unix user is updated.
 sync_delete=Delete the matching Webmin user when a Unix user is deleted.
+sync_modify=Rename the matching Webmin user when a Unix user is renamed.
 sync_group=Assign new users to Webmin group
 sync_unix=Set password for new users to Unix authentication.
 sync_ecannot=You are not allowed to configure user synchronization.

acl/save_sync.cgi

@@ -12,6 +12,7 @@ $access{'sync'} && $access{'create'} && $access{'delete'} ||
 &lock_file("$module_config_directory/config");
 $config{'sync_create'} = $in{'create'};
 $config{'sync_delete'} = $in{'delete'};
+$config{'sync_modify'} = $in{'modify'};
 $config{'sync_unix'} = $in{'unix'};
 $config{'sync_group'} = $in{'group'};
 &write_file("$module_config_directory/config", \%config);

acl/useradmin_update.pl

@@ -10,14 +10,15 @@ our (%config, $config_directory);
 # Create a new webmin user in the group
 sub useradmin_create_user
 {
+my ($unix) = @_;
 return if (!$config{'sync_create'});
 my $group = &get_group($config{'sync_group'});
 return if (!$group);
-my $clash = &get_user($_[0]->{'user'}) || &get_group($_[0]->{'user'});
+my $clash = &get_user($unix->{'user'}) || &get_group($unix->{'user'});
 return if ($clash);
-return if ($_[0]->{'user'} !~ /^[A-z0-9\-\_\.]+$/);
-my $user = { 'name' => $_[0]->{'user'},
-	     'pass' => $config{'sync_unix'} ? 'x' : $_[0]->{'pass'},
+return if ($unix->{'user'} !~ /^[A-z0-9\-\_\.]+$/);
+my $user = { 'name' => $unix->{'user'},
+	     'pass' => $config{'sync_unix'} ? 'x' : $unix->{'pass'},
 	     'sync' => 1,
 	     'modules' => $group->{'modules'} };
 &create_user($user);
@@ -40,8 +41,9 @@ foreach my $m (@{$group->{'modules'}}, "") {
 # Delete this webmin user if in sync
 sub useradmin_delete_user
 {
+my ($unix) = @_;
 return if (!$config{'sync_delete'});
-my $u = &get_user($_[0]->{'user'});
+my $u = &get_user($unix->{'user'});
 if ($u) {
 	&delete_user($u->{'name'});
 	&reload_miniserv();
@@ -62,35 +64,36 @@ foreach my $g (&list_groups()) {
 # Update this users password if in sync
 sub useradmin_modify_user
 {
-return if ($_[0]->{'passmode'} == 4 && $_[0]->{'olduser'} eq $_[0]->{'user'});
-my $u = &get_user($_[0]->{'olduser'});
-if ($u && $u->{'sync'}) {
-	if ($_[0]->{'user'} ne $_[0]->{'olduser'}) {
-		# New name might clash (or be invalid)
-		my $clash = &get_user($_[0]->{'user'}) ||
-			       &get_group($_[0]->{'user'});
+my ($unix) = @_;
+return if ($unix->{'passmode'} == 4 && $unix->{'olduser'} eq $unix->{'user'});
+my $u = &get_user($unix->{'olduser'});
+if ($u && ($u->{'sync'} || $config{'sync_modify'})) {
+	if ($unix->{'user'} ne $unix->{'olduser'}) {
+		# User has been renamed .. but name might clash or be invalid
+		my $clash = &get_user($unix->{'user'}) ||
+			       &get_group($unix->{'user'});
 		return if ($clash);
-		return if ($_[0]->{'user'} !~ /^[A-z0-9\-\_\.]+$/);
+		return if ($unix->{'user'} !~ /^[A-z0-9\-\_\.]+$/);
 		}
-	$u->{'name'} = $_[0]->{'user'};
-	if ($u->{'pass'} ne 'x') {
-		$u->{'pass'} = $_[0]->{'passmode'} == 3 ?
-		   &encrypt_password($_[0]->{'plainpass'}) :
-		   $_[0]->{'pass'};
+	$u->{'name'} = $unix->{'user'};
+	if ($u->{'pass'} ne 'x' && $u->{'sync'}) {
+		# Password has been updated
+		$u->{'pass'} = $unix->{'passmode'} == 3 ?
+		   &encrypt_password($unix->{'plainpass'}) :
+		   $unix->{'pass'};
 		}
-	&modify_user($_[0]->{'olduser'}, $u);
+	&modify_user($unix->{'olduser'}, $u);
 	&reload_miniserv();
 	}
 
-
-if ($_[0]->{'olduser'} && $_[0]->{'user'} ne $_[0]->{'olduser'}) {
+if ($unix->{'olduser'} && $unix->{'user'} ne $unix->{'olduser'}) {
 	# Check other users' acl module acls
 	foreach my $u (&list_users()) {
 		my %uaccess = &get_module_acl($u->{'name'});
 		my @au = split(/\s+/, $uaccess{'users'});
-		my $idx = &indexof($_[0]->{'olduser'}, @au);
+		my $idx = &indexof($unix->{'olduser'}, @au);
 		if ($idx != -1) {
-			$au[$idx] = $_[0]->{'user'};
+			$au[$idx] = $unix->{'user'};
 			$uaccess{'users'} = join(" ", @au);
 			&save_module_acl(\%uaccess, $u->{'name'});
 			}
@@ -99,9 +102,9 @@ if ($_[0]->{'olduser'} && $_[0]->{'user'} ne $_[0]->{'olduser'}) {
 	# Rename the user in his group
 	foreach my $g (&list_groups()) {
 		my @mems = @{$g->{'members'}};
-		my $i = &indexof($_[0]->{'olduser'}, @mems);
+		my $i = &indexof($unix->{'olduser'}, @mems);
 		if ($i >= 0) {
-			$mems[$i] = $_[0]->{'user'};
+			$mems[$i] = $unix->{'user'};
 			$g->{'members'} = \@mems;
 			&modify_group($g->{'name'}, $g);
 			}

ajaxterm/index.cgi

@@ -16,7 +16,7 @@ our $module_name;
 &ui_print_header(undef, $text{'index_title'}, "", undef, 1, 1);
 
 # Check for python
-my $python = &get_python_cmd();
+my $python = &has_command("python2") || &has_command("python");
 if (!$python) {
 	&ui_print_endpage(&text('index_epython', "<tt>python</tt>"));
 	}

apache/config-Alma-Linux-7.0-ALL

@@ -0,0 +1,18 @@
+show_list=0
+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

at/freebsd-lib.pl

@@ -6,7 +6,7 @@ our (%config);
 sub list_atjobs
 {
 my @rv;
-opendir(my $DIR, $config{'at_dir'});
+opendir(my $DIR, $config{'at_dir'}) || return ();
 while(my $f = readdir($DIR)) {
 	my $p = "$config{'at_dir'}/$f";
 	if ($f =~ /^c(\S{5})(\S+)$/) {

at/irix-lib.pl

@@ -5,7 +5,7 @@ use POSIX;
 sub list_atjobs
 {
 local @rv;
-opendir(DIR, $config{'at_dir'});
+opendir(DIR, $config{'at_dir'}) || return ();
 while($f = readdir(DIR)) {
 	local $p = "$config{'at_dir'}/$f";
 	if ($f =~ /^(\d+)\.a$/) {

at/linux-lib.pl

@@ -6,7 +6,7 @@ our (%config);
 sub list_atjobs
 {
 my @rv;
-opendir(my $DIR, $config{'at_dir'});
+opendir(my $DIR, $config{'at_dir'}) || return ();
 while(my $f = readdir($DIR)) {
 	my $p = "$config{'at_dir'}/$f";
 	if ($f =~ /^a(\S{5})(\S+)$/) {

at/macos-lib.pl

@@ -6,7 +6,7 @@ our %config;
 sub list_atjobs
 {
 my @rv;
-opendir(my $DIR, $config{'at_dir'});
+opendir(my $DIR, $config{'at_dir'}) || return ();
 while(my $f = readdir($DIR)) {
 	my $p = "$config{'at_dir'}/$f";
 	if ($f =~ /^a(\S+)\.(\d+)$/) {

at/openserver-lib.pl

@@ -5,7 +5,7 @@ use POSIX;
 sub list_atjobs
 {
 local @rv;
-opendir(DIR, $config{'at_dir'});
+opendir(DIR, $config{'at_dir'}) || return ();
 while($f = readdir(DIR)) {
 	local $p = "$config{'at_dir'}/$f";
 	if ($f =~ /^(\d+)\.a(\S+)$/) {

at/solaris-lib.pl

@@ -8,7 +8,7 @@ use POSIX;
 sub list_atjobs
 {
 my @rv;
-opendir(my $DIR, $config{'at_dir'});
+opendir(my $DIR, $config{'at_dir'}) || return ();
 while(my $f = readdir($DIR)) {
 	my $p = "$config{'at_dir'}/$f";
 	if ($f =~ /^(\d+)\.a$/) {

backup-config/backup.cgi

@@ -50,7 +50,8 @@ else {
 	print "Content-type: application/x-gzip\n\n";
 	my $buf;
 	open(TEMP, "<$temp");
-	while(read(TEMP, $buf, 1024)) {
+	my $bs = &get_buffer_size();
+	while(read(TEMP, $buf, $bs)) {
 		print $buf;
 		}
 	close(TEMP);

bacula-backup/bacula-backup-lib.pl

@@ -417,9 +417,10 @@ return @rv;
 
 # bacula_file_button(filesfield, [jobfield], [volume])
 # Pops up a window for selecting multiple files, using a tree-like view
+# Brackets around "window" are to hijack Authentic Theme replacement of popups with modals ("undefined")
 sub bacula_file_button
 {
-return "<input type=button onClick='ifield = form.$_[0]; jfield = form.$_[1]; chooser = window.open(\"treechooser.cgi?volume=".&urlize($_[2])."&files=\"+escape(ifield.value)+\"&job=\"+escape(jfield.value), \"chooser\", \"toolbar=no,menubar=no,scrollbar=no,width=500,height=400\"); chooser.ifield = ifield; window.ifield = ifield' value=\"...\">\n";
+return "<input type=button onClick='ifield = form.$_[0]; jfield = form.$_[1]; chooser = (window).open(\"treechooser.cgi?volume=".&urlize($_[2])."&files=\"+escape(ifield.value)+\"&job=\"+escape(jfield.value), \"chooser\", \"toolbar=no,menubar=no,scrollbar=no,width=500,height=400\"); chooser.ifield = ifield; window.ifield = ifield' value=\"...\">\n";
 }
 
 sub tape_select

bacula-backup/list.cgi

@@ -4,100 +4,149 @@
 $trust_unknown_referers = 1;
 require './bacula-backup-lib.pl';
 &ReadParse();
-print "Content-type: text/plain\n\n";
+
+use JSON::PP;
+
+# Input sanitization
+die "Illegal input" if ($in{'job'} and $in{'job'} !~ /^\d+\z/);
+
+# Output the appropriate content-type
+if ($in{'fmt'} eq "json") {
+	print "Content-type: application/json\n\n";
+}
+else {
+	print "Content-type: text/plain\n\n";
+}
+
+# Format the parent with ending slash if missing
+$d = ($in{'dir'} =~ /\/\z/) ? $in{'dir'} : $in{'dir'}."/";
+$wind = &unix_to_dos($d);
 
 # Get the parent directory ID
 $dbh = &connect_to_database();
-$cmd = $dbh->prepare("select PathId from Path where Path = ?");
-$d = $in{'dir'} eq "/" ? "/" : $in{'dir'}."/";
-$wind = &unix_to_dos($d);
+$cmd = $dbh->prepare("SELECT PathId FROM Path WHERE Path = ?");
 $cmd->execute($wind);
 ($pid) = $cmd->fetchrow();
 $cmd->finish();
 
-if ($in{'job'} ne "") {
-	$jobsql = "and Job.JobId = $in{'job'}";
-	}
+if ($in{'job'}) {
+	$jobsql = "AND Job.JobId = $in{'job'}";
+}
+
+@nodes = ();
 
 if ($in{'volume'}) {
 	# Search just within one volume
 	# Subdirectories of directory, that are on this volume
-	$cmd1 = $dbh->prepare("
-		select Path.Path
-		from Path, File, Job, JobMedia, Media
-		where File.PathId = Path.PathId
-		and File.JobId = Job.JobId
-		and Job.JobId = JobMedia.JobId
-		and JobMedia.MediaId = Media.MediaId
-		and Media.VolumeName = ?
-		$jobsql
-		");
-	$cmd1->execute($in{'volume'}) || die "db error : ".$dbh->errstr;
-	while(($f) = $cmd1->fetchrow()) {
-		$f = &dos_to_unix($f);
-		if ($f =~ /^(\Q$d\E[^\/]+\/)/) {
-			push(@rv, $1);
-			}
-		}
-	$cmd1->finish();
+	$cmd = $dbh->prepare("
+		SELECT DISTINCT Path.Path
+		FROM Job, File, Path, JobMedia, Media
+		WHERE Job.JobId        = File.JobId
+		  AND Job.JobId        = JobMedia.JobId
+		  AND File.PathId      = Path.PathId
+		  AND JobMedia.MediaId = Media.MediaId
+		  AND Media.VolumeName = ?
+		  $jobsql
+		ORDER BY Path.Path
+	");
 
-	# Files in directory, that are on this volume
-	$cmd2 = $dbh->prepare("
-		select Filename.Name
-		from File, Filename, Job, JobMedia, Media
-		where File.FilenameId = Filename.FilenameId
-		and File.PathId = ?
-		and File.JobId = Job.JobId
-		and Job.JobId = JobMedia.JobId
-		and JobMedia.MediaId = Media.MediaId
-		and Media.VolumeName = ?
-		$jobsql
-		");
-	$cmd2->execute($pid, $in{'volume'}) || die "db error : ".$dbh->errstr;
-	while(($f) = $cmd2->fetchrow()) {
-		push(@rv, "$d$f") if ($f =~ /\S/);
-		}
-	$cmd2->finish();
-	}
+	$cmd->execute($in{'volume'}) || die "db error: ".$dbh->errstr;
+}
 else {
 	# Search all files
 	# Subdirectories of directory
-	$cmd1 = $dbh->prepare("
-		select Path
-		from Path, File, Job
-		where File.PathId = Path.PathId
-		and File.JobId = Job.JobId
-		$jobsql
-		");
-	$cmd1->execute() || die "db error : ".$dbh->errstr;
-	while(($f) = $cmd1->fetchrow()) {
-		$f = &dos_to_unix($f);
-		if ($f =~ /^(\Q$d\E[^\/]+\/)/) {
-			push(@rv, $1);
-			}
-		}
-	$cmd1->finish();
+	$cmd = $dbh->prepare("
+		SELECT DISTINCT Path.Path
+		FROM Job, File, Path
+		WHERE Job.JobId   = File.JobId
+		  AND File.PathId = Path.PathId
+		  $jobsql
+		ORDER BY Path.Path
+	");
 
-	# Files in directory
-	$cmd2 = $dbh->prepare("
-		select Filename.Name
-		from File, Filename, Job
-		where File.FilenameId = Filename.FilenameId
-		and File.PathId = ?
-		and File.JobId = Job.JobId
-		$jobsql
-		");
-	$cmd2->execute($pid) || die "db error : ".$dbh->errstr;
-	while(($f) = $cmd2->fetchrow()) {
-		push(@rv, "$d$f") if ($f =~ /\S/);
-		}
-	$cmd2->finish();
+	$cmd->execute() || die "db error: ".$dbh->errstr;
+}
+
+# Push all folders direcly under the starting path
+while(($f) = $cmd->fetchrow()) {
+	$f = &dos_to_unix($f);
+	if ($f =~ /^(\Q$d\E([^\/]+)\/)/) {
+		push(@rv, $1);
 	}
+}
+
+$cmd->finish();
+
+@rv = &unique(@rv);
+
+# Build the nodes structure for folders
+foreach $f (@rv) {
+	$f =~ /([^\/]+)\/\Z/;
+	push @nodes, {
+		text     => $1,
+		fullpath => $f,
+		children => JSON::PP::true,
+		icon     => "jstree-folder"
+	};
+}
+
+if ($in{'volume'}) {
+	# Files in directory, that are on this volume
+	$cmd = $dbh->prepare("
+		SELECT Filename.Name
+		FROM File, Filename, Job, JobMedia, Media
+		WHERE File.FilenameId  = Filename.FilenameId
+		  AND File.JobId       = Job.JobId
+		  AND Job.JobId        = JobMedia.JobId
+		  AND JobMedia.MediaId = Media.MediaId
+		  AND File.PathId      = ?
+		  AND Media.VolumeName = ?
+		  $jobsql
+		ORDER BY Filename.Name
+	");
+
+	$cmd->execute($pid, $in{'volume'}) || die "db error: ".$dbh->errstr;
+}
+else {
+	# Files in directory
+	$cmd = $dbh->prepare("
+		SELECT Filename.Name
+		FROM Job, File, Filename
+		WHERE Job.JobId       = File.JobId
+		  AND File.FilenameId = Filename.FilenameId
+		  AND File.PathId     = ?
+		  $jobsql
+		ORDER BY Filename.Name
+	");
+
+	$cmd->execute($pid) || die "db error: ".$dbh->errstr;
+}
+
+# Push all the files in the starting path
+while(($f) = $cmd->fetchrow()) {
+	if ($f =~ /\S/) {
+		push(@rv, "$d$f");
+
+		# Build the nodes structure for files
+		push @nodes, {
+			text     => $f,
+			fullpath => "$d$f",
+			children => JSON::PP::false,
+			icon     => "jstree-file"
+		};
+	}
+}
+
+$cmd->finish();
 
 # Return output
-@rv = &unique(@rv);
-print "\n";
-foreach $f (@rv) {
-	print $f,"\n";
-	}
 
+if($in{'fmt'} eq "json") {
+	print JSON::PP->new->utf8->encode(\@nodes);
+}
+else {
+	print "\n";
+	foreach $f (@rv) {
+		print $f,"\n";
+	}
+}

bacula-backup/treechooser.cgi

@@ -1,43 +1,94 @@
 #!/usr/local/bin/perl
 # treechooser.cgi
-# Outputs HTML for a java file-chooser tree
+# Outputs HTML for a javascript file-chooser tree
 
 require './bacula-backup-lib.pl';
 &PrintHeader();
 &ReadParse();
 
 $shortest = "/";
-if ($main::session_id) {
-	$session = "<param name=session value=\"sid=$main::session_id\">";
-	}
-
 $in{'job'} =~ s/^(.*)_(\d+)$/$2/g;
 print <<EOF;
-<html><head><title>$text{'tree_title'}</title><body>
+<html>
+<head>
+	<title>$text{'tree_title'}</title>
+	<link rel="stylesheet" href="jstree/themes/default/style.min.css" />
+	<style>
+		body {
+			margin: 0;
+			font-family: Arial, Helvetica, sans-serif;
+			font-size: 0.8em;
+		}
+		.buttons {
+			display: flex;
+			flex-flow: row nowrap;
+			justify-content: center;
+			padding: 5px;
+		}
+		.main-container {
+			display: flex;
+			flex-flow: column nowrap;
+			height: 100%;
+		}
+		.spaced-button {
+			margin: 5px;
+		}
+		#jstree {
+			flex: 1;
+			margin: 10px;
+			margin-bottom: 0px;
+			border: thin solid gray;
+			overflow: auto;
+		}
+	</style>
+</head>
+
+<body>
+
+<div class="main-container">
+	<div id="jstree"></div>
+	<div class="buttons">
+		<button id="confirm" class="ui-button ui-widget ui-corner-all spaced-button">OK</button>
+		<button id="cancel"  class="ui-button ui-widget ui-corner-all spaced-button">Cancel</button>
+	</div>
+</div>
+
+<script src="jstree/jquery-3.6.0.min.js"></script>
+<script src="jstree/jstree.min.js"></script>
 
 <script>
-function clear_files()
-{
-top.ifield.value = "";
-}
+	\$("#cancel").click(function() {
+		window.close();
+	});
 
-function add_file(file)
-{
-top.ifield.value = top.ifield.value + file + "\\n";
-}
+	\$("#confirm").click(function() {
+		let list = \$('#jstree').jstree(true).get_selected(true).map(n => n.original.fullpath).sort().reduce((a, v) => (a + '\\n' + v));
+		\$(top.ifield).val(list);
+		window.close();
+	});
 
-function finished()
-{
-window.close();
-}
+	\$(function () {
+		\$('#jstree').jstree({
+			'plugins' : [ 'checkbox' ],
+			'core' : {
+				'animation': 100,
+				'worker' : false,
+				'force_text': true,
+				'data' : {
+					'url' : function (node) {
+						const r = [];
+						r.push('fmt='    + 'json');
+						r.push('job='    + encodeURIComponent('$in{'job'}'));
+						r.push('volume=' + encodeURIComponent('$in{'volume'}'));
+						r.push('dir='    + ((node.id == '#') ? encodeURIComponent('$shortest') : encodeURIComponent(node.original.fullpath)));
+						return 'list.cgi?' + r.join('&');
+					}
+				}
+			}
+		});
+	});
 </script>
 
-<applet code=TreeChooser name=TreeChooser width=100% height=100% MAYSCRIPT>
-<param name=volume value="$in{'volume'}">
-<param name=root value="$shortest">
-<param name=job value="$in{'job'}">
-$session
-</applet>
-</body></html>
+</body>
+</html>
 EOF
-

bin/passwd

@@ -0,0 +1,240 @@
+#!/usr/bin/env perl
+# passwd - change Webmin users password
+
+use strict;
+use warnings;
+use 5.010;
+
+use Getopt::Long;
+use Pod::Usage;
+use Term::ANSIColor qw(:constants);
+
+sub main
+{
+    my %opt;
+    GetOptions('help|h'       => \$opt{'help'},
+               'config|c=s'   => \$opt{'config'},
+               'user|u=s'     => \$opt{'user'},
+               'password|p=s' => \$opt{'password'});
+
+    # If username passed as regular param
+    my $user = scalar(@ARGV) == 1 && $ARGV[0];
+
+    # Show usage
+    pod2usage(0) if ($opt{'help'} || (!$opt{'user'} && !$user));
+
+    # Assign defaults
+    $opt{'config'} ||= "/etc/webmin";
+    $opt{'user'} = $user if ($user && !$opt{'user'});
+
+    # Catch kill signal
+    my $sigkill = sub {
+        system("stty echo");
+        print "\n^C";
+        print "\n";
+        exit 1;
+    };
+    $SIG{INT} = \&$sigkill;
+
+    # Run change password command
+    change_password(\%opt);
+
+    return 0;
+}
+exit main(\@ARGV) if !caller(0);
+
+sub change_password
+{
+    my ($optref) = @_;
+    my ($minserv_uconf_file, %lusers, @users, %uinfos, %ulines);
+    my $user             = $optref->{'user'};
+    my $pass             = $optref->{'password'};
+    my $confdif          = $optref->{'config'};
+    my $conf             = "$confdif/config";
+    my $mconf            = "$confdif/miniserv.conf";
+    my $encrypt_password = sub {
+        my ($pass, $gconfig) = @_;
+        if ($gconfig->{'md5pass'} == 1) {
+
+            # Use MD5 encryption
+            return &encrypt_md5($pass);
+        } elsif ($gconfig->{'md5pass'} == 2) {
+
+            # Use SHA512 encryption
+            return &encrypt_sha512($pass);
+        } else {
+
+            # Use Unix DES
+            srand(time() ^ $$);
+            return crypt($pass, chr(int(rand(26)) + 65) . chr(int(rand(26)) + 65));
+        }
+    };
+    my $conf_check = sub {
+        my ($configs) = @_;
+        foreach my $config (@{$configs}) {
+            if (!-r $config) {
+                say BRIGHT_RED, "Error: ", RESET, "Failed to read Webmin essential config file: ", BRIGHT_YELLOW, $config,
+                  RESET, " doesn't exist";
+                exit 1;
+            }
+        }
+    };
+    my $root = root($confdif, \&$conf_check);
+
+    # Load libs
+    do "$root/acl/md5-lib.pl";
+    do "$root/web-lib-funcs.pl";
+
+    # Check for main config and miniserv config files
+    &$conf_check([$conf, $mconf]);
+
+    # Read and parse configs
+    my (%config, %gconfig, %uconfig);
+    read_file($mconf, \%config);
+    read_file($conf,  \%gconfig);
+    $minserv_uconf_file = $config{'userfile'};
+
+    # Check for main user file
+    &$conf_check([$minserv_uconf_file]);
+
+    # Read and parse `miniserv.users` config file
+    read_file($minserv_uconf_file, \%lusers, undef, undef, ":");
+    @users = keys %lusers;
+    map {my @uinfo = split(':', "$lusers{$_}"); $uinfos{$_} = \@uinfo} @users;
+
+    # Check if user exists
+    if (!defined($uinfos{$user})) {
+        my $user_str  = scalar(@users) > 1 ? 'users' : 'user';
+        my $user_str2 = scalar(@users) > 1 ? 'are'   : 'is';
+        die(BRIGHT_RED, "Error: ", RESET . "Webmin user ",
+            BRIGHT_YELLOW, $user, RESET, " doesn't exist. Existing Webmin $user_str on your system $user_str2 — ",
+            BRIGHT_YELLOW, join(", ", sort(@users)),
+            RESET,         "\n");
+    }
+
+    # Ask for password on stdin
+    my $suc_pre_msg = "";
+    my $suc_msg     = 'updated successfully';
+    if (!$pass) {
+        print "Enter password for user ", BRIGHT_YELLOW, $user, RESET, ":";
+        system("stty -echo");
+        $pass = <STDIN>;
+        system("stty echo");
+        print "\nRetype new password:";
+        system("stty -echo");
+        my $pass2 = <STDIN>;
+        system("stty echo");
+        print "\n";
+
+        if ($pass ne $pass2) {
+            say BRIGHT_RED, "Error: ", RESET, "Passwords do not match";
+            exit 1;
+        }
+        chomp $pass;
+        if (!$pass) {
+            $suc_pre_msg = BOLD BRIGHT_RED ON_WHITE . 'Warning:' . RESET . " ";
+            $suc_msg     = "has been removed, enabling anyone to login without authentication";
+        }
+    }
+
+    # Update with new password and store timestamp
+    $uinfos{$user}->[0] = &$encrypt_password($pass, \%gconfig);
+    $uinfos{$user}->[5] = time() if ($uinfos{$user}->[5]);
+    map {$ulines{$_} = join(":", @{ $uinfos{$_} })} keys %uinfos;
+
+    # Store original file first
+    copy_source_dest($minserv_uconf_file, "$minserv_uconf_file-");
+
+    # Restart Webmin and write new user config file
+    system("$confdif/stop >/dev/null 2>&1");
+    write_file($minserv_uconf_file, \%ulines, ":");
+    system("$confdif/start >/dev/null 2>&1");
+
+    # Print user message
+    say "${suc_pre_msg}Password for Webmin user ", BRIGHT_YELLOW, $user, RESET, " $suc_msg";
+
+    exit 0;
+}
+
+sub root
+{
+    my ($config, $conf_check) = @_;
+    my $mconf = "$config/miniserv.conf";
+    $conf_check->([$mconf]);
+    open(my $CONF, "<", $mconf);
+    my $root;
+    while (<$CONF>) {
+        if (/^root=(.*)/) {
+            $root = $1;
+        }
+    }
+    close($CONF);
+
+    # Does the Webmin root exist?
+    if ($root) {
+        die BRIGHT_RED, "Error: ", BRIGHT_YELLOW, $root, RESET, " is not a directory\n" unless (-d $root);
+    } else {
+
+        # Try to guess where Webmin lives, since config file didn't know.
+        die BRIGHT_RED, "Error: ", RESET, "Unable to determine Webmin installation directory\n";
+    }
+
+    return $root;
+}
+
+1;
+
+=pod
+
+=head1 NAME
+
+passwd
+
+=head1 DESCRIPTION
+
+This program allows you to change the password of a user in the Webmin password file
+
+=head1 SYNOPSIS
+
+passwd [options]
+
+=head1 OPTIONS
+
+=over
+
+=item --help, -h
+
+Print this usage summary and exit.
+
+Examples of usage:
+
+ - passwd root
+
+ - passwd --user root
+ 
+ - passwd --user root --password ycwyMQRVAZY
+ 
+ - passwd --config /usr/local/etc/webmin --user root --password ycwyMQRVAZY
+
+=item --config, -c
+
+Specify the full path to the Webmin configuration directory. Defaults to C</etc/webmin>
+
+=item --user, -u
+
+Existing Webmin user to change password for
+
+=item --password, -p
+
+Set new user password. Using this option may be unsecure.
+
+
+
+=back
+
+=head1 LICENSE AND COPYRIGHT
+
+Copyright 2021 Jamie Cameron <jcameron@webmin.com>
+               Joe Cooper <joe@virtualmin.com>
+               Ilia Rostovtsev <ilia@virtualmin.com>
+

bin/update-devel

@@ -15,7 +15,7 @@ use Cwd qw(cwd);
 my %opt;
 GetOptions('help|h'      => \$opt{'help'},
            'product|p=s' => \$opt{'product'},
-           'theme|p:s'   => \$opt{'theme'});
+           'theme|t:s'   => \$opt{'theme'});
 pod2usage(0) if ($opt{'help'} || !$opt{'product'});
 
 # Get current path

bind8/backup_config.pl

@@ -28,8 +28,12 @@ foreach my $z (@zones) {
 	next if ($tv ne "master" && $tv ne "hint");
 	my $file = &find_value("file", $z->{'members'});
 	next if (!$file);
-	my @recs = &read_zone_file($file, $z->{'value'});
-	push(@rv, map { $_->{'file'} } @recs);
+	if (&is_raw_format_records(&make_chroot($file))) {
+		push(@rv, $file);
+		}
+	else {
+		push(@rv, &files_in_zone_file($file));
+		}
 	}
 
 return map { &make_chroot($_) } &unique(@rv);

bind8/bind8-lib.pl

@@ -3161,10 +3161,13 @@ my ($zone) = @_;
 my @rv;
 if (!$access{'ro'} && $access{'apply'}) {
 	my $r = $ENV{'REQUEST_METHOD'} eq 'POST' ? 0 : 1;
-	my $zone_name;
+	my $link_params = "";
 	if ($zone) {
-		$zone_name = "&" . "zone=$zone->{'name'}&type=$zone->{'type'}";
-	}
+		$link_params = "&zone=$zone->{'name'}&type=$zone->{'type'}";
+		if ($zone->{'viewindex'}) {
+			$link_params .= "&view=$zone->{'viewindex'}";
+			}
+		}
 	if (&is_bind_running()) {
 		if ($zone && ($access{'apply'} == 1 || $access{'apply'} == 2)) {
 			# Apply this zone
@@ -3175,16 +3178,16 @@ if (!$access{'ro'} && $access{'apply'}) {
 			}
 		# Apply whole config
 		if ($access{'apply'} == 1 || $access{'apply'} == 3) {
-			push(@rv, &ui_link("restart.cgi?return=$r$zone_name", $text{'links_restart'}) );
+			push(@rv, &ui_link("restart.cgi?return=$r$link_params", $text{'links_restart'}) );
 			}
 		if ($access{'apply'} == 1) {
 			# Stop BIND
-			push(@rv, &ui_link("stop.cgi?return=$r$zone_name", $text{'links_stop'}) );
+			push(@rv, &ui_link("stop.cgi?return=$r$link_params", $text{'links_stop'}) );
 			}
 		}
 	elsif ($access{'apply'} == 1) {
 		# Start BIND
-		push(@rv, &ui_link("start.cgi?return=$r$zone_name", $text{'links_start'}));
+		push(@rv, &ui_link("start.cgi?return=$r$link_params", $text{'links_start'}));
 		}
 	}
 return join('<br>', @rv);

bind8/config-Alma-Linux-6.0-ALL

@@ -0,0 +1,56 @@
+soa_style=0
+named_path=/usr/sbin/named
+named_conf=/etc/named.conf
+show_list=0
+records_order=0
+start_cmd=service named start
+stop_cmd=service named stop
+max_zones=50
+rev_def=0
+support_aaaa=1
+allow_comments=0
+allow_wild=1
+allow_long=0
+master_ttl=1
+pid_file=/var/run/named.pid /run/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
+restart_cmd=restart
+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

bind8/config-CentOS-Linux-6.0-ALL

@@ -53,3 +53,4 @@ dnssectools_keydir=/var/named/dtkeys
 dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-Redhat-Enterprise-Linux-6.0-ALL

@@ -46,3 +46,4 @@ other_slaves=1
 restart_cmd=restart
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-Scientific-Linux-6.0-ALL

@@ -46,3 +46,4 @@ other_slaves=1
 restart_cmd=restart
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-aix

@@ -37,3 +37,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-cobalt-linux

@@ -39,3 +39,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-coherent-linux

@@ -43,3 +43,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-corel-linux

@@ -39,3 +39,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-debian-linux

@@ -39,3 +39,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-debian-linux-2.2

@@ -39,3 +39,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-debian-linux-3.0

@@ -42,3 +42,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-debian-linux-3.1-ALL

@@ -43,3 +43,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-freebsd-2.1-2.2

@@ -39,3 +39,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-freebsd-3.0

@@ -39,3 +39,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-freebsd-3.1-3.5

@@ -39,3 +39,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-freebsd-4.0-ALL

@@ -40,3 +40,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 pid_file=/var/run/named/pid
+dnssec_info=1

bind8/config-generic-linux

@@ -40,3 +40,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-gentoo-linux

@@ -42,3 +42,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-hpux

@@ -39,3 +39,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-irix

@@ -39,3 +39,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-macos

@@ -39,3 +39,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-macos-1.3-ALL

@@ -40,3 +40,4 @@ other_slaves=1
 pid_file=/var/run/named/named.pid /private/var/run/named/named.pid
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-mandrake-linux

@@ -42,3 +42,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-mandrake-linux-10.2-ALL

@@ -42,3 +42,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-msc-linux

@@ -41,3 +41,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-netbsd

@@ -39,3 +39,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-open-linux

@@ -41,3 +41,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-openbsd-2.5-3.1

@@ -39,3 +39,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-openbsd-3.2-ALL

@@ -40,3 +40,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-openmamba-linux

@@ -41,3 +41,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-openserver

@@ -39,3 +39,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-osf1

@@ -39,3 +39,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-pardus-linux

@@ -44,3 +44,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-redhat-linux

@@ -41,3 +41,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-redhat-linux-10.0

@@ -46,3 +46,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-redhat-linux-11.0-23.0

@@ -46,3 +46,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-redhat-linux-24.0-ALL

@@ -46,3 +46,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-redhat-linux-7.1-9.0

@@ -42,3 +42,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-slackware-linux

@@ -39,3 +39,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-slackware-linux-8.0-ALL

@@ -40,3 +40,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-sol-linux

@@ -42,3 +42,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-solaris

@@ -40,3 +40,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-solaris-10-ALL

@@ -40,3 +40,4 @@ checkconf=/usr/bin/named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-solaris-7-9

@@ -39,3 +39,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-suse-linux

@@ -39,3 +39,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-suse-linux-8.2

@@ -44,3 +44,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-suse-linux-9.0-9.2

@@ -45,3 +45,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-suse-linux-9.3-ALL

@@ -47,3 +47,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-syno-linux

@@ -34,3 +34,4 @@ updserial_def=0
 other_slaves=1
 updserial_man=1
 master_ttl=1
+dnssec_info=1

bind8/config-trustix-linux

@@ -46,3 +46,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-trustix-linux-2.1

@@ -46,3 +46,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-trustix-linux-2.2-ALL

@@ -46,3 +46,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-turbo-linux

@@ -39,3 +39,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-united-linux

@@ -42,3 +42,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-unixware

@@ -40,3 +40,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config-windows

@@ -57,3 +57,4 @@ checkconf=named-checkconf
 other_slaves=1
 force_random=0
 spf_record=0
+dnssec_info=1

bind8/config.info

@@ -24,6 +24,7 @@ extra_forward=Extra record types for forward zones,0
 extra_reverse=Extra record types for reverse zones,0
 largezones=Show records in zones?,1,0-Yes,1-No (for large zones)
 default_view=Default view for new zones,3,First in list
+dnssec_info=Show DNSSEC expired zones on system information page?,1,1-Yes,0-No
 
 line2=Zone file options,11
 soa_style=Serial number style,1,0-Running number,1-Date based (YYYYMMDDnn),2-Unix time

bind8/index.cgi

@@ -47,6 +47,7 @@ my @zones = grep { $_->{'type'} ne 'view' &&
 		&can_edit_zone($_) &&
 		(!$access{'ro'} || $_->{'name'} ne '.') } @allzones;
 my @views = grep { $_->{'type'} eq 'view' } @allzones;
+@views = sort { $a->{'name'} cmp $b->{'name'} } @views;
 my @hashint = grep { $_->{'type'} ne 'view' &&
 		  $_->{'name'} eq '.' } @allzones;
 
@@ -60,7 +61,7 @@ if (@zones == 1 && $access{'zones'} ne '*' && !$access{'defaults'} &&
 	exit;
 	}
 
-my $chroot = &get_chroot();
+my $chroot = &get_chroot() || "";
 &ui_print_header(undef, $text{'index_title'}, "", undef, 1, 1, 0,
 	&restart_links().'<br>'.
 	&help_search_link("bind", "doc", "google"), undef, undef,
@@ -501,6 +502,8 @@ sub compare_zones
 my @sp0 = split(/\./, lc($_[0] || ""));
 my @sp1 = split(/\./, lc($_[1] || ""));
 for(my $i=0; $i<@sp0 || $i<@sp1; $i++) {
+	$sp0[$i] = "" if (!defined($sp0[$i]));
+	$sp1[$i] = "" if (!defined($sp1[$i]));
 	if ($sp0[$i] =~ /^\d+$/ && $sp1[$i] =~ /^\d+$/) {
 		return -1 if ($sp0[$i] < $sp1[$i]);
 		return 1 if ($sp0[$i] > $sp1[$i]);

bind8/records-lib.pl

@@ -323,6 +323,24 @@ while($i < @tok) {
 return @rv;
 }
 
+# files_in_zone_file(file)
+# Quickly finds all includes in a zone file
+sub files_in_zone_file
+{
+my ($file) = @_;
+my @rv = ( $file );
+my $fh;
+open($fh, "<", $file);
+while(<$fh>) {
+	if (/^\$include\s+(\S+)/) {
+		my $inc = $1;
+		push(@rv, &files_in_zone_file($inc));
+		}
+	}
+close($fh);
+return @rv;
+}
+
 # create_record(file, name, ttl, class, type, values, comment)
 # Add a new record of some type to some zone file
 sub create_record

bind8/restart.cgi

@@ -31,6 +31,9 @@ my $redir_targ = ($in{'type'} eq "master" ? "edit_master.cgi" :
 my $zone;
 if ($in{'zone'}) {
 	$zone = "?zone=$in{'zone'}";
-}
+	if ($in{'view'}) {
+		$zone .= "&view=$in{'view'}";
+		}
+	}
 &redirect($zone && $in{'return'} ? "$redir_targ$zone" : "");
 

bind8/restart_zone.cgi

@@ -18,10 +18,4 @@ my $err = &restart_zone($zone->{'name'}, $zone->{'view'});
 my $tv = $zone->{'type'};
 my $redir_targ = ($tv eq "master" ? "edit_master.cgi" :
 		  $tv eq "forward" ? "edit_forward.cgi" : "edit_slave.cgi");
-if ($in{'return'}) {
-	&redirect($redir_targ . "?zone=$in{'zone'}");
-	}
-else {
-	&redirect($redir_targ . "?zone=$in{'zone'}&view=$in{'view'}");
-	}
-
+&redirect($redir_targ . "?zone=$in{'zone'}&view=$in{'view'}");

bind8/start.cgi

@@ -17,6 +17,9 @@ my $redir_targ = ($in{'type'} eq "master" ? "edit_master.cgi" :
 my $zone;
 if ($in{'zone'}) {
 	$zone = "?zone=$in{'zone'}";
-}
+	if ($in{'view'}) {
+		$zone .= "&view=$in{'view'}";
+		}
+	}
 &redirect($zone && $in{'return'} ? "$redir_targ$zone" : "");
 

bind8/stop.cgi

@@ -13,6 +13,9 @@ my $redir_targ = ($in{'type'} eq "master" ? "edit_master.cgi" :
 my $zone;
 if ($in{'zone'}) {
 	$zone = "?zone=$in{'zone'}";
-}
+	if ($in{'view'}) {
+		$zone .= "&view=$in{'view'}";
+		}
+	}
 &redirect($zone && $in{'return'} ? "$redir_targ$zone" : "");
 

bind8/system_info.pl

@@ -5,7 +5,8 @@ sub list_system_info
 {
 my ($data, $in) = @_;
 my @rv;
-if (&foreign_available($module_name) && $access{'defaults'}) {
+if (&foreign_available($module_name) && $access{'defaults'} &&
+    $config{'dnssec_info'}) {
 	# Show DNSSEC client config errors
 	my $err = &check_dnssec_client();
 	if ($err) {
@@ -14,7 +15,8 @@ if (&foreign_available($module_name) && $access{'defaults'}) {
 			    'warning' => $err });
 		}
 	}
-if (&foreign_available($module_name) && !$access{'noconfig'}) {
+if (&foreign_available($module_name) && !$access{'noconfig'} &&
+    $config{'dnssec_info'}) {
 	# Show DNSSEC expired domains
 	my @exps = &list_dnssec_expired_domains();
 	if (@exps) {