X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=lib%2FBackupPC%2FCGI%2FRestore.pm;h=6b8755ce394d4145f30cf205ba507574d96e8212;hp=f00ce5900924a81bce8be98cef2c332dafe1eaba;hb=fda25dc88a63ccac1c80efa2e4994bf0725ca9b7;hpb=8f5625f9cdf47f8e04be654c4954838b2df3e26d diff --git a/lib/BackupPC/CGI/Restore.pm b/lib/BackupPC/CGI/Restore.pm index f00ce59..6b8755c 100644 --- a/lib/BackupPC/CGI/Restore.pm +++ b/lib/BackupPC/CGI/Restore.pm @@ -10,7 +10,7 @@ # Craig Barratt # # 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.0beta0, released 20 Mar 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 + $name = decode_utf8($name); $fileListStr .= < ${EscHTML($name)} EOF } $hiddenStr .= "\n"; - $hiddenStr .= "\n"; + $hiddenStr .= "\n"; $badFileCnt++ if ( $In{pathHdr} =~ m{(^|/)\.\.(/|$)} ); $badFileCnt++ if ( $In{num} =~ m{(^|/)\.\.(/|$)} ); if ( @fileList == 0 ) { @@ -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} ) { # @@ -102,49 +101,59 @@ EOF # # Build list of hosts # - my $hostDestSel; - my @hosts; - foreach my $h ( GetUserHosts(1) ) { - my $sel = " selected" if ( $h eq $In{host} ); - $hostDestSel .= ""; - push(@hosts, $h); - } + my($hostDestSel, @hosts, $gotThisHost, $directHost); # - # Tell the user what options they have - # - $content .= eval("qq{$Lang->{Restore_Options_for__host2}}"); - + # 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 there is a single host, make sure direct restore is enabled - # - 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 ( ref($cmd) eq "ARRAY" ? @$cmd : $cmd ne "" ) { + # + # 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 .= ""; } + # + # 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 @@ -184,14 +193,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 +231,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 +239,8 @@ EOF @pathOpts, @fileList ], - sub { print(@_); } + sub { print(@_); }, + 1, # ignore stderr ); } elsif ( $In{type} == 3 ) { # @@ -267,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 .= <$host:/$strippedShare$f$In{hostDest}:/$strippedShareDest$targetFile 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(); @@ -322,12 +339,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");