Various changes, including changes in 2.1.1 and 2.1.2 releases.

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

diff --git a/lib/BackupPC/CGI/Restore.pm b/lib/BackupPC/CGI/Restore.pm
index 70c428b..0310c63 100644 (file)
--- 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 2.1.0, released 20 Jun 2004.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -112,35 +112,30 @@ EOF
         #
        $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
@@ -321,12 +316,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");