# Craig Barratt <cbarratt@users.sourceforge.net>
#
# COPYRIGHT
-# Copyright (C) 2003-2007 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 3.1.0, released 25 Nov 2007.
+# 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/;
#
$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 "" ) {
+ if ( BackupPC::Xfer::restoreEnabled( \%Conf ) ) {
#
# Direct restore is enabled
#
# 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}}"));
}
[ \%restoreReq],
[qw(*RestoreReq)]);
$dump->Indent(1);
- mkpath("$TopDir/pc/$hostDest", 0, 0777)
+ eval { mkpath("$TopDir/pc/$hostDest", 0, 0777) }
if ( !-d "$TopDir/pc/$hostDest" );
my $openPath = "$TopDir/pc/$hostDest/$reqFileName";
if ( open(REQ, ">", $openPath) ) {