X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=lib%2FBackupPC%2FCGI%2FRestore.pm;h=494372b0f6172c82accaf2c4a60b0f0f54da2254;hp=c6277129d0e82ed974e4ebfc3994ef6208c0556d;hb=ed8a7f050f4f4d75e900b7721847777f98a846cc;hpb=79e0593c501fd58046feeca20c315cc4ac283435

diff --git a/lib/BackupPC/CGI/Restore.pm b/lib/BackupPC/CGI/Restore.pm
index c627712..494372b 100644
--- a/lib/BackupPC/CGI/Restore.pm
+++ b/lib/BackupPC/CGI/Restore.pm
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 2.1.0beta2, released 23 May 2004.
+# Version 3.0.0beta2, released 11 Nov 2006.
 #
 # 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;
 
 sub action
 {
@@ -73,6 +74,7 @@ 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
@@ -110,37 +112,33 @@ EOF
         #
         # Tell the user what options they have
         #
+        $pathHdr = decode_utf8($pathHdr);
 	$content .= eval("qq{$Lang->{Restore_Options_for__host2}}");
 
-        #
-        # If there is a single host, make sure direct restore is enabled
-        #
         if ( @hosts == 1 ) {
             #
             # Pick up the host's config file
             #
             $bpc->ConfigRead($hosts[0]);
             %Conf = $bpc->Conf();
+	}
 
-            #
-            # 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) ) {
-                $content .= eval(
-                    "qq{$Lang->{Restore_Options_for__host_Option1}}");
-            } else {
-                my $hostDest = $hosts[0];
-                $content .= eval(
-                    "qq{$Lang->{Restore_Options_for__host_Option1_disabled}}");
-            }
-        } else {
-            $content .= eval("qq{$Lang->{Restore_Options_for__host_Option1}}");
-        }
+	#
+	# 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) ) {
+	    $content .= eval(
+		"qq{$Lang->{Restore_Options_for__host_Option1}}");
+	} else {
+	    my $hostDest = $hosts[0];
+	    $content .= eval(
+		"qq{$Lang->{Restore_Options_for__host_Option1_disabled}}");
+	}
 
 	#
 	# Verify that Archive::Zip is available before showing the
@@ -181,14 +179,15 @@ EOF
 	# This is necessary to ensure the output gets to the correct place
 	# under mod_perl.
 	#
-	$bpc->cmdSystemOrEval(["$BinDir/BackupPC_tarCreate",
+	$bpc->cmdSystemOrEvalLong(["$BinDir/BackupPC_tarCreate",
 		 "-h", $host,
 		 "-n", $num,
 		 "-s", $share,
 		 @pathOpts,
 		 @fileList
 	    ],
-	    sub { print(@_); }
+	    sub { print(@_); },
+	    1,			# ignore stderr
 	);
     } elsif ( $In{type} == 2 ) {
         #
@@ -218,7 +217,7 @@ EOF
 	# This is necessary to ensure the output gets to the correct place
 	# under mod_perl.
 	#
-	$bpc->cmdSystemOrEval(["$BinDir/BackupPC_zipCreate",
+	$bpc->cmdSystemOrEvalLong(["$BinDir/BackupPC_zipCreate",
 		 "-h", $host,
 		 "-n", $num,
 		 "-c", $In{compressLevel},
@@ -226,7 +225,8 @@ EOF
 		 @pathOpts,
 		 @fileList
 	    ],
-	    sub { print(@_); }
+	    sub { print(@_); },
+	    1,			# ignore stderr
 	);
     } elsif ( $In{type} == 3 ) {
         #
@@ -264,10 +264,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();
@@ -319,12 +325,13 @@ EOF
         $dump->Indent(1);
         mkpath("$TopDir/pc/$hostDest", 0, 0777)
                                     if ( !-d "$TopDir/pc/$hostDest" );
-        if ( open(REQ, ">$TopDir/pc/$hostDest/$reqFileName") ) {
+	my $openPath = "$TopDir/pc/$hostDest/$reqFileName";
+        if ( open(REQ, ">", $openPath) ) {
 	    binmode(REQ);
             print(REQ $dump->Dump);
             close(REQ);
         } else {
-            ErrorExit(eval("qq{$Lang->{Can_t_open_create}}"));
+            ErrorExit(eval("qq{$Lang->{Can_t_open_create__openPath}}"));
         }
 	$reply = $bpc->ServerMesg("restore ${EscURI($ipAddr)}"
 			. " ${EscURI($hostDest)} $User $reqFileName");