# Craig Barratt <cbarratt@users.sourceforge.net>
#
# COPYRIGHT
-# Copyright (C) 2003 Craig Barratt
+# Copyright (C) 2003-2009 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
#
#========================================================================
#
-# Version 2.1.0_CVS, released 8 Feb 2004.
+# Version 3.2.0, released 31 Jul 2010.
#
# See http://backuppc.sourceforge.net.
#
use strict;
use BackupPC::CGI::Lib qw(:all);
+use BackupPC::Xfer;
use Data::Dumper;
use File::Path;
+use Encode qw/decode_utf8/;
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 ) {
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} ) {
#
#
# Build list of hosts
#
- my $hostDestSel;
- my @hosts;
- foreach my $h ( GetUserHosts() ) {
- my $sel = " selected" if ( $h eq $In{host} );
- $hostDestSel .= "<option value=\"$h\"$sel>${EscHTML($h)}</option>";
- push(@hosts, $h);
- }
-
- #
- # Tell the user what options they have
- #
- $content .= eval("qq{$Lang->{Restore_Options_for__host2}}");
+ my($hostDestSel, @hosts, $gotThisHost, $directHost);
#
- # If there is a single host, make sure direct restore is enabled
+ # 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}!!
#
- 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();
-
- #
- # 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}}");
+ if ( BackupPC::Xfer::restoreEnabled( \%Conf ) ) {
+ #
+ # Direct restore is enabled
+ #
+ push(@hosts, $h);
+ $gotThisHost = 1 if ( $h eq $host );
}
- } else {
- $content .= eval("qq{$Lang->{Restore_Options_for__host_Option1}}");
+ }
+ $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.
+ #
+ if ( $hostDestSel ne "" ) {
+ $content .= eval(
+ "qq{$Lang->{Restore_Options_for__host_Option1}}");
+ } else {
+ my $hostDest = $In{host};
+ $content .= eval(
+ "qq{$Lang->{Restore_Options_for__host_Option1_disabled}}");
+ }
+
#
# Verify that Archive::Zip is available before showing the
# zip restore option
# 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 ) {
#
# 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},
@pathOpts,
@fileList
],
- sub { print(@_); }
+ sub { print(@_); },
+ 1, # ignore stderr
);
} elsif ( $In{type} == 3 ) {
#
# 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) ) {
+ unless ( BackupPC::Xfer::restoreEnabled( \%Conf ) ) {
ErrorExit(eval("qq{$Lang->{Restore_Options_for__host_Option1_disabled}}"));
}
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();
$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},
# destination of restore is hostDest:shareDest/pathHdrDest
hostDest => $hostDest,
shareDest => $In{shareDest},
- pathHdrDest => $In{pathHdr},
+ pathHdrDest => $inPathHdr,
# list of files to restore
fileList => \@fileList,
[ \%restoreReq],
[qw(*RestoreReq)]);
$dump->Indent(1);
- mkpath("$TopDir/pc/$hostDest", 0, 0777)
+ eval { 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");
projects / BackupPC.git / blobdiff