X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=lib%2FBackupPC%2FCGI%2FArchive.pm;h=18f7ba48abeec9a7b1e3857aa786feb98ff3f976;hp=758cac35ce9538dde7c6b04dbf97d141777aa5ce;hb=c615e1bfc6f2b0604a2658996f5dd6b6cfa9469c;hpb=8f5625f9cdf47f8e04be654c4954838b2df3e26d

diff --git a/lib/BackupPC/CGI/Archive.pm b/lib/BackupPC/CGI/Archive.pm
index 758cac3..18f7ba4 100644
--- a/lib/BackupPC/CGI/Archive.pm
+++ b/lib/BackupPC/CGI/Archive.pm
@@ -10,7 +10,7 @@
 #   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
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 2.1.0beta0, released 20 Mar 2004.
+# Version 3.2.0, released 31 Jul 2010.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -39,6 +39,7 @@ package BackupPC::CGI::Archive;
 use strict;
 use BackupPC::CGI::Lib qw(:all);
 use Data::Dumper;
+use BackupPC::Search;
 
 sub action
 {
@@ -60,6 +61,7 @@ sub action
             my($fullDur, $incrCnt, $fullSize, $fullRate);
             my @Backups = $bpc->BackupInfoRead($host);
             my $fullCnt = $incrCnt = 0;
+
             for ( my $i = 0 ; $i < @Backups ; $i++ ) {
                 if ( $Backups[$i]{type} eq "full" ) {
                     $fullSize = $Backups[$i]{size} / (1024 * 1024);
@@ -71,6 +73,20 @@ sub action
             }
             $fullSizeTot += $fullSize + $incrSizeTot;
             $fullSize = sprintf("%.2f", ($fullSize + $incrSizeTot) / 1000);
+
+		$bpc->ConfigRead($archHost);
+		%Conf = $bpc->Conf();
+
+		my $checkboxes;
+		foreach my $backupnumber ( BackupPC::Search::host_backup_nums($host) ) {
+			$checkboxes .= qq|
+<input type="hidden" name="fcb$checkBoxCnt" value="$host">
+<input type="checkbox" name="backup$checkBoxCnt" value="$backupnumber">$backupnumber
+			|;
+            		$checkBoxCnt++;
+		}
+
+=for ASA extension removed this
             $str = <<EOF;
 <tr>
 <td class="border"><input type="hidden" name="backup$checkBoxCnt" value="$backupnumber"><input type="checkbox" name="fcb$checkBoxCnt" value="$host">&nbsp;${HostLink($host)} </td>
@@ -78,6 +94,20 @@ sub action
 <td align="center" class="border"> $fullSize </td>
 EOF
             $checkBoxCnt++;
+=cut
+
+            $str = <<EOF;
+<tr>
+<td class="border">
+${HostLink($host)}
+$checkboxes
+</td>
+<td align="center" class="border">
+${UserLink($Hosts->{$host}{user})}
+</td>
+<td align="center" class="border"> $fullSize </td>
+EOF
+
             if ( @Backups == 0 ) {
                 $hostCntNone++;
                 $strNone .= $str;
@@ -98,16 +128,23 @@ EOF
     } else {
         my(@HostList, @BackupList, $HostListStr, $hiddenStr, $pathHdr,
            $badFileCnt, $reply, $str);
+
+        #
+        # Pick up the archive host's config file
+        #
+        $bpc->ConfigRead($archHost);
+        %Conf = $bpc->Conf();
+
         my $args = {
-            SplitPath    => $bpc->{Conf}{SplitPath},
-            ParPath      => $bpc->{Conf}{ParPath},
-            CatPath      => $bpc->{Conf}{CatPath},
-            GzipPath     => $bpc->{Conf}{GzipPath},
-            Bzip2Path    => $bpc->{Conf}{Bzip2Path},
-            ArchiveDest  => $bpc->{Conf}{ArchiveDest},
-            ArchiveComp  => $bpc->{Conf}{ArchiveComp},
-            ArchivePar   => $bpc->{Conf}{ArchivePar},
-            ArchiveSplit => $bpc->{Conf}{ArchiveSplit},
+            SplitPath    => $Conf{SplitPath},
+            ParPath      => $Conf{ParPath},
+            CatPath      => $Conf{CatPath},
+            GzipPath     => $Conf{GzipPath},
+            Bzip2Path    => $Conf{Bzip2Path},
+            ArchiveDest  => $Conf{ArchiveDest},
+            ArchiveComp  => $Conf{ArchiveComp},
+            ArchivePar   => $Conf{ArchivePar},
+            ArchiveSplit => $Conf{ArchiveSplit},
             topDir       => $bpc->{TopDir},
         };
 
@@ -117,6 +154,7 @@ EOF
             next if ( !defined($In{"fcb$i"}) );
             my $name = $In{"fcb$i"};
             my $backupno = $In{"backup$i"};
+            next unless defined $backupno; # ASA - skip hosts without backups checked
             push(@HostList, $name);
             push(@BackupList, $backupno);
             $hiddenStr .= <<EOF;
@@ -124,7 +162,7 @@ EOF
 <input type="hidden" name="backup$i" value="$In{'backup' . $i}">
 EOF
             $HostListStr .= <<EOF;
-<li> ${EscHTML($name)}
+<li> ${EscHTML($name)} $i
 EOF
         }
         $hiddenStr .= <<EOF;
@@ -136,42 +174,42 @@ EOF
         }
         my ($ArchiveDest, $ArchiveCompNone, $ArchiveCompGzip,
             $ArchiveCompBzip2, $ArchivePar, $ArchiveSplit);
-        $ArchiveDest = $bpc->{Conf}{ArchiveDest};
-        if ( $bpc->{Conf}{ArchiveComp} eq "none" ) {
+        $ArchiveDest = $Conf{ArchiveDest};
+        if ( $Conf{ArchiveComp} eq "none" ) {
             $ArchiveCompNone   = "checked";
         } else {
             $ArchiveCompNone   = "";
         }
-        if ( $bpc->{Conf}{ArchiveComp} eq "gzip" ) {
+        if ( $Conf{ArchiveComp} eq "gzip" ) {
             $ArchiveCompGzip   = "checked";
         } else {
             $ArchiveCompGzip   = "";
         }
-        if ( $bpc->{Conf}{ArchiveComp} eq "bzip2" ) {
+        if ( $Conf{ArchiveComp} eq "bzip2" ) {
             $ArchiveCompBzip2  = "checked";
         } else {
             $ArchiveCompBzip2  = "";
         }
-        $ArchivePar   = $bpc->{Conf}{ArchivePar};
-        $ArchiveSplit = $bpc->{Conf}{ArchiveSplit};
+        $ArchivePar   = $Conf{ArchivePar};
+        $ArchiveSplit = $Conf{ArchiveSplit};
 
         if ( $In{type} == 1 ) {
             #
             # Tell the user what options they have
             #
             my $paramStr = "";
-            if ( $bpc->{Conf}{ArchiveClientCmd} =~ /\$archiveloc\b/ ) {
+            if ( $Conf{ArchiveClientCmd} =~ /\$archiveloc\b/ ) {
                 $paramStr .= eval("qq{$Lang->{BackupPC_Archive2_location}}");
             }
-            if ( $bpc->{Conf}{ArchiveClientCmd} =~ /\$compression\b/ ) {
+            if ( $Conf{ArchiveClientCmd} =~ /\$compression\b/ ) {
                 $paramStr .= eval("qq{$Lang->{BackupPC_Archive2_compression}}");
             }
-            if ( $bpc->{Conf}{ArchiveClientCmd} =~ /\$parfile\b/
-                    && -x $bpc->{Conf}{ParPath} ) {
+            if ( $Conf{ArchiveClientCmd} =~ /\$parfile\b/
+                    && -x $Conf{ParPath} ) {
                 $paramStr .= eval("qq{$Lang->{BackupPC_Archive2_parity}}");
             }
-            if ( $bpc->{Conf}{ArchiveClientCmd} =~ /\$splitsize\b/
-                    && -x $bpc->{Conf}{SplitPath} ) {
+            if ( $Conf{ArchiveClientCmd} =~ /\$splitsize\b/
+                    && -x $Conf{SplitPath} ) {
                 $paramStr .= eval("qq{$Lang->{BackupPC_Archive2_split}}");
             }
             my $content = eval("qq{$Lang->{BackupPC_Archive2}}");
@@ -195,7 +233,7 @@ EOF
                 $compname = $Conf{CatPath};
                 $compext = '.raw';
             }
-            my $fullsplitsize = $In{splitsize} . '000000';
+            my $fullsplitsize = $In{splitsize} . '000000'; # mb -> bytes
             my %ArchiveReq = (
                 # parameters for the archive
                 archiveloc  => $In{archive_device},
@@ -218,12 +256,13 @@ EOF
                             [  \%ArchiveReq],
                             [qw(*ArchiveReq)]);
             $archive->Indent(1);
-            if ( open(REQ, ">$TopDir/pc/$archivehost/$reqFileName") ) {
+	    my $openPath = "$TopDir/pc/$archivehost/$reqFileName";
+	    if ( open(REQ, ">", $openPath) ) {
                 binmode(REQ);
                 print(REQ $archive->Dump);
                 close(REQ);
             } else {
-                ErrorExit($Lang->{Can_t_open_create} );
+                ErrorExit(eval("qq{$Lang->{Can_t_open_create__openPath}}"));
             }
             $reply = $bpc->ServerMesg("archive $User $archivehost $reqFileName");
             $str = eval("qq{$Lang->{Archive_requested}}");