Updates in preparation for 3.0.0beta2:

[BackupPC.git] / lib / BackupPC / CGI / Restore.pm

diff --git a/lib/BackupPC/CGI/Restore.pm b/lib/BackupPC/CGI/Restore.pm
index a57422e..494372b 100644 (file)
--- a/lib/BackupPC/CGI/Restore.pm
+++ b/lib/BackupPC/CGI/Restore.pm
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 2.1.0_CVS, released 8 Feb 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
@@ -87,9 +89,6 @@ EOF
     if ( $badFileCnt ) {
         ErrorExit($Lang->{Nice_try__but_you_can_t_put});
     }
-    if ( @fileList == 1 ) {
-       $pathHdr =~ s/(.*)\/.*/$1/;
-    }
     $pathHdr = "/" if ( $pathHdr eq "" );
     if ( $In{type} != 0 && @fileList == $In{fcbMax} ) {
        #
@@ -104,7 +103,7 @@ EOF
        #
        my $hostDestSel;
         my @hosts;
-       foreach my $h ( GetUserHosts() ) {
+       foreach my $h ( GetUserHosts(1) ) {
            my $sel = " selected" if ( $h eq $In{host} );
            $hostDestSel .= "<option value=\"$h\"$sel>${EscHTML($h)}</option>";
             push(@hosts, $h);
@@ -113,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
@@ -184,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 ) {
         #
@@ -221,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},
@@ -229,7 +225,8 @@ EOF
                 @pathOpts,
                 @fileList
            ],
-           sub { print(@_); }
+           sub { print(@_); },
+           1,                  # ignore stderr
        );
     } elsif ( $In{type} == 3 ) {
         #
@@ -265,11 +262,18 @@ EOF
             my $targetFile = $f;
            (my $strippedShare = $share) =~ s/^\///;
            (my $strippedShareDest = $In{shareDest}) =~ s/^\///;
-            substr($targetFile, 0, length($pathHdr)) = $In{pathHdr};
+            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();
@@ -293,6 +297,9 @@ EOF
             $reqFileName = "restoreReq.$$.$i";
             last if ( !-f "$TopDir/pc/$hostDest/$reqFileName" );
         }
+       my $inPathHdr = $In{pathHdr};
+       $inPathHdr = "/$inPathHdr" if ( $inPathHdr !~ m{^/} );
+       $inPathHdr = "$inPathHdr/" if ( $inPathHdr !~ m{/$} );
         my %restoreReq = (
            # source of restore is hostSrc, #num, path shareSrc/pathHdrSrc
             num         => $In{num},
@@ -303,7 +310,7 @@ EOF
            # destination of restore is hostDest:shareDest/pathHdrDest
             hostDest    => $hostDest,
             shareDest   => $In{shareDest},
-            pathHdrDest => $In{pathHdr},
+            pathHdrDest => $inPathHdr,
 
            # list of files to restore
             fileList    => \@fileList,
@@ -318,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");