Allow restore of non-module files from the backup https://sourceforge.net/p/webadmin/bugs/4545/

backup-config/backup-config-lib.pl

@@ -453,7 +453,8 @@ elsif ($mode == 2) {
 return undef;
 }
 
-=head2 execute_restore(&mods, source, &files, apply, [show-only])
+=head2 execute_restore(&mods, source, &files, apply, [show-only],
+		       [&other-files])
 
 Restore configuration files from the specified source for the listed modules.
 Returns undef on success, or an error message.
@@ -461,7 +462,7 @@ Returns undef on success, or an error message.
 =cut
 sub execute_restore
 {
-my ($mods, $src, $files, $apply, $show) = @_;
+my ($mods, $src, $files, $apply, $show, $others) = @_;
 
 # Fetch file if needed
 my ($mode, $user, $pass, $host, $path, $port) = &parse_backup_url($src);
@@ -518,7 +519,7 @@ my @tarfiles = map { "/$_" } split(/\r?\n/, $out);
 my %tarfiles = map { $_, 1 } @tarfiles;
 
 # Extract manifests for each module
-my %hasmod = map { $_, 1 } @{$_[0]};
+my %hasmod = map { $_, 1 } @$mods;
 $hasmod{"_others"} = 1;
 &execute_command("rm -rf ".quotemeta($manifests_dir));
 my $rel_manifests_dir = $manifests_dir;
@@ -548,6 +549,7 @@ while($m = readdir(DIR)) {
 	push(@files, @mfiles);
 	}
 closedir(DIR);
+push(@files, @$others) if ($others);
 if (!@files) {
 	&unlink_file($file) if ($mode != 0);
 	return $text{'backup_enone2'};
@@ -555,15 +557,15 @@ if (!@files) {
 
 # Get descriptions for each module
 my %desc;
-foreach my $m (@{$_[0]}) {
+foreach my $m (@$mods) {
 	my %minfo = &get_module_info($m);
 	$desc{$m} = $minfo{'desc'};
 	}
 
 # Call module pre functions
-foreach my $m (@{$_[0]}) {
+foreach my $m (@$mods) {
 	my $mdir = &module_root_directory($m);
-	if ($m && &foreign_check($m) && !$_[4] &&
+	if ($m && &foreign_check($m) && !$show &&
 	    -r "$mdir/backup_config.pl") {
 		&foreign_require($m, "backup_config.pl");
 		if (&foreign_defined($m, "pre_restore")) {
@@ -577,7 +579,7 @@ foreach my $m (@{$_[0]}) {
 	}
 
 # Lock all files being extracted
-if (!$_[4]) {
+if (!$show) {
 	my $f;
 	foreach $f (@files) {
 		&lock_file($f);
@@ -585,7 +587,7 @@ if (!$_[4]) {
 	}
 
 # Extract contents (only files specified by manifests)
-my $flag = $_[4] ? "t" : "x";
+my $flag = $show ? "t" : "x";
 my $qfiles = join(" ", map { s/^\///; quotemeta($_) } &unique(@files));
 if ($gzipped) {
 	&execute_command("cd / ; gunzip -c $qfile | tar ${flag}f - $qfiles",
@@ -598,7 +600,7 @@ else {
 my $ex = $?;
 
 # Un-lock all files being extracted
-if (!$_[4]) {
+if (!$show) {
 	my $f;
 	foreach $f (@files) {
 		&unlock_file($f);
@@ -611,16 +613,16 @@ if ($ex) {
 	return &text('backup_euntar', "<pre>$out</pre>");
 	}
 
-if ($_[3] && !$_[4]) {
+if ($apply && !$show) {
 	# Call all module apply functions
-	foreach $m (@{$_[0]}) {
+	foreach $m (@$mods) {
 		if (&foreign_defined($m, "post_restore")) {
 			&foreign_call($m, "post_restore", \@files);
 			}
 		}
 	}
 
-@{$_[2]} = @files;
+@$files = split(/\n/, $out);
 return undef;
 }
 

backup-config/index.cgi

@@ -89,6 +89,9 @@ print &ui_table_row($text{'edit_mods2'},
 		       [ map { [ $_->{'dir'}, $_->{'desc'} ] } @mods ],
 		       5, 1));
 
+print &ui_table_row($text{'edit_other2'},
+		    &ui_textarea("others", undef, 3, 50));
+
 print &ui_table_row($text{'edit_dest2'},
 		    &show_backup_destination("src", $config{'dest'}, 1));
 

backup-config/lang/en

@@ -35,6 +35,7 @@ edit_schedyes=Yes, at times selected below ..
 edit_mods=Modules to backup
 edit_dest=Backup destination
 edit_mods2=Modules to restore
+edit_other2=Other files to restore
 edit_dest2=Restore from
 edit_what=Include in backup
 edit_webmin=Webmin module configuration files
@@ -83,6 +84,7 @@ backup_failed=.. failed! $1
 backup_done=.. complete. Final backup size was $1, containing $2 files.
 
 restore_err=Restore failed
+restore_emods=No modules or other files selected
 restore_title=Restore Configuration
 restore_doing=Starting restore of module configuration files from $1 ..
 restore_testing=Extracting contents of backup from $1 ..

backup-config/restore.cgi

@@ -11,7 +11,8 @@ our (%in, %text, %config, $module_config_file);
 &error_setup($text{'restore_err'});
 my $src = &parse_backup_destination("src", \%in);
 my @mods = split(/\0/, $in{'mods'});
-@mods || &error($text{'restore_emods'});
+my @others = split(/[\r\n]+/, $in{'others'});
+@mods || @others || &error($text{'restore_emods'});
 
 # Do it ..
 my ($mode, $user, $pass, $server, $path, $port) = &parse_backup_url($src);
@@ -27,7 +28,8 @@ if ($mode == 3) {
 print &text($in{'test'} ? 'restore_testing' : 'restore_doing',
 	    &nice_dest($src)),"<p>\n";
 my @files;
-my $err = &execute_restore(\@mods, $src, \@files, $in{'apply'}, $in{'test'});
+my $err = &execute_restore(\@mods, $src, \@files, $in{'apply'}, $in{'test'},
+			   \@others);
 &unlink_file($src) if ($mode == 3);
 if ($err) {
 	print &text('restore_failed', $err),"<p>\n";