added only_increment param to all action=browse links

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

diff --git a/lib/BackupPC/CGI/Archive.pm b/lib/BackupPC/CGI/Archive.pm
index cbf5f63..18f7ba4 100644 (file)
--- a/lib/BackupPC/CGI/Archive.pm
+++ b/lib/BackupPC/CGI/Archive.pm
@@ -39,7 +39,7 @@ package BackupPC::CGI::Archive;
 use strict;
 use BackupPC::CGI::Lib qw(:all);
 use Data::Dumper;
-use DBI;
+use BackupPC::Search;
 
 sub action
 {
@@ -61,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);
@@ -76,17 +77,8 @@ sub action
                $bpc->ConfigRead($archHost);
                %Conf = $bpc->Conf();
 
-               my $dbh = DBI->connect($Conf{SearchDSN}, $Conf{SearchUser}, "", { RaiseError => 1, AutoCommit => 0 });
-               my $backup_nums = $dbh->selectcol_arrayref(qq{
-                       select
-                               backups.num as num
-                       from backups
-                       join hosts on hosts.id = hostid
-                       where hosts.name = ? and inc_size < 0 and size > 0 and not inc_deleted
-               }, {}, $host);
-
                my $checkboxes;
-               foreach my $backupnumber ( sort @$backup_nums ) {
+               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
@@ -162,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;
@@ -240,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},