X-Git-Url: http://git.rot13.org//?a=blobdiff_plain;f=lib%2FBackupPC%2FCGI%2FRestore.pm;h=6b8755ce394d4145f30cf205ba507574d96e8212;hb=fda25dc88a63ccac1c80efa2e4994bf0725ca9b7;hp=0310c63621bddb9c9680840adbe04822b927f8ef;hpb=17dcbbebb871212f90b81bb97f8d1feb528bdc43;p=BackupPC.git

diff --git a/lib/BackupPC/CGI/Restore.pm b/lib/BackupPC/CGI/Restore.pm
index 0310c63..6b8755c 100644
--- a/lib/BackupPC/CGI/Restore.pm
+++ b/lib/BackupPC/CGI/Restore.pm
@@ -10,7 +10,7 @@
 #   Craig Barratt  <cbarratt@users.sourceforge.net>
 #
 # COPYRIGHT
-#   Copyright (C) 2003  Craig Barratt
+#   Copyright (C) 2003-2007  Craig Barratt
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 2.1.0, released 20 Jun 2004.
+# Version 3.1.0, released 25 Nov 2007.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -40,6 +40,7 @@ use strict;
 use BackupPC::CGI::Lib qw(:all);
 use Data::Dumper;
 use File::Path;
+use Encode qw/decode_utf8/;
 
 sub action
 {
@@ -73,12 +74,13 @@ sub action
         $hiddenStr .= <<EOF;
 <input type="hidden" name="fcb$i" value="$In{'fcb' . $i}">
 EOF
+        $name = decode_utf8($name);
         $fileListStr .= <<EOF;
 <li> ${EscHTML($name)}
 EOF
     }
     $hiddenStr .= "<input type=\"hidden\" name=\"fcbMax\" value=\"$In{fcbMax}\">\n";
-    $hiddenStr .= "<input type=\"hidden\" name=\"share\" value=\"${EscHTML($share)}\">\n";
+    $hiddenStr .= "<input type=\"hidden\" name=\"share\" value=\"${EscHTML(decode_utf8($share))}\">\n";
     $badFileCnt++ if ( $In{pathHdr} =~ m{(^|/)\.\.(/|$)} );
     $badFileCnt++ if ( $In{num} =~ m{(^|/)\.\.(/|$)} );
     if ( @fileList == 0 ) {
@@ -99,40 +101,55 @@ EOF
 	#
 	# Build list of hosts
 	#
-	my $hostDestSel;
-        my @hosts;
-	foreach my $h ( GetUserHosts(1) ) {
-	    my $sel = " selected" if ( $h eq $In{host} );
-	    $hostDestSel .= "<option value=\"$h\"$sel>${EscHTML($h)}</option>";
-            push(@hosts, $h);
-	}
+	my($hostDestSel, @hosts, $gotThisHost, $directHost);
 
         #
-        # Tell the user what options they have
+        # Check all the hosts this user has permissions for
+        # and make sure direct restore is enabled.
+        # Note: after this loop we have the config for the
+        # last host in @hosts, not the original $In{host}!!
         #
-	$content .= eval("qq{$Lang->{Restore_Options_for__host2}}");
-
-        if ( @hosts == 1 ) {
+        $directHost = $host;
+	foreach my $h ( GetUserHosts(1) ) {
             #
             # Pick up the host's config file
             #
-            $bpc->ConfigRead($hosts[0]);
+            $bpc->ConfigRead($h);
             %Conf = $bpc->Conf();
+            my $cmd = $Conf{XferMethod} eq "smb" ? $Conf{SmbClientRestoreCmd}
+                    : $Conf{XferMethod} eq "tar" ? $Conf{TarClientRestoreCmd}
+                    : $Conf{XferMethod} eq "archive" ? undef
+                    : $Conf{RsyncRestoreArgs};
+            if ( ref($cmd) eq "ARRAY" ? @$cmd : $cmd ne "" ) {
+                #
+                # Direct restore is enabled
+                #
+                push(@hosts, $h);
+                $gotThisHost = 1 if ( $h eq $host );
+            }
 	}
+        $directHost = $hosts[0] if ( !$gotThisHost && @hosts );
+        foreach my $h ( @hosts ) {
+            my $sel = " selected" if ( $h eq $directHost );
+            $hostDestSel .= "<option value=\"$h\"$sel>${EscHTML($h)}</option>";
+        }
+
+        #
+        # Tell the user what options they have
+        #
+        $pathHdr = decode_utf8($pathHdr);
+        $share   = decode_utf8($share);
+	$content = eval("qq{$Lang->{Restore_Options_for__host2}}");
 
 	#
 	# Decide if option 1 (direct restore) is available based
 	# on whether the restore command is set.
 	#
-	my $cmd = $Conf{XferMethod} eq "smb" ? $Conf{SmbClientRestoreCmd}
-		: $Conf{XferMethod} eq "tar" ? $Conf{TarClientRestoreCmd}
-		: $Conf{XferMethod} eq "archive" ? undef
-		: $Conf{RsyncRestoreArgs};
-	if ( defined($cmd) ) {
+	if ( $hostDestSel ne "" ) {
 	    $content .= eval(
 		"qq{$Lang->{Restore_Options_for__host_Option1}}");
 	} else {
-	    my $hostDest = $hosts[0];
+	    my $hostDest = $In{host};
 	    $content .= eval(
 		"qq{$Lang->{Restore_Options_for__host_Option1_disabled}}");
 	}
@@ -261,10 +278,16 @@ EOF
 	    (my $strippedShareDest = $In{shareDest}) =~ s/^\///;
             substr($targetFile, 0, length($pathHdr)) = "/$In{pathHdr}/";
 	    $targetFile =~ s{//+}{/}g;
+            $strippedShareDest = decode_utf8($strippedShareDest);
+            $targetFile = decode_utf8($targetFile);
+            $strippedShare = decode_utf8($strippedShare);
+            $f = decode_utf8($f);
             $fileListStr .= <<EOF;
 <tr><td>$host:/$strippedShare$f</td><td>$In{hostDest}:/$strippedShareDest$targetFile</td></tr>
 EOF
         }
+        $In{shareDest} = decode_utf8($In{shareDest});
+        $In{pathHdr}   = decode_utf8($In{pathHdr});
         my $content = eval("qq{$Lang->{Are_you_sure}}");
         Header(eval("qq{$Lang->{Restore_Confirm_on__host}}"), $content);
         Trailer();