X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=lib%2FBackupPC%2FCGI%2FArchive.pm;h=c6f2d40b62b224cd39b98dc9bc8b47288c12f3c0;hp=864a2eafdc1783a9e21ff0e96dabeae4a0f2e9e6;hb=169d1cb4e1293f707c33b6d386ae3e1f6592d66c;hpb=ce708288691ba7dd95a8dac7a468bc0e4c1d6588 diff --git a/lib/BackupPC/CGI/Archive.pm b/lib/BackupPC/CGI/Archive.pm index 864a2ea..c6f2d40 100644 --- a/lib/BackupPC/CGI/Archive.pm +++ b/lib/BackupPC/CGI/Archive.pm @@ -10,7 +10,7 @@ # Craig Barratt # # 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,11 +39,16 @@ package BackupPC::CGI::Archive; use strict; use BackupPC::CGI::Lib qw(:all); use Data::Dumper; +use DBI; sub action { my $archHost = $In{host}; + my $Privileged = CheckPermission(); + if ( !$Privileged ) { + ErrorExit($Lang->{Only_privileged_users_can_archive} ); + } if ( $In{type} == 0 ) { my($fullTot, $fullSizeTot, $incrTot, $incrSizeTot, $str, $strNone, $strGood, $hostCntGood, $hostCntNone, $checkBoxCnt, @@ -51,15 +56,13 @@ sub action $hostCntGood = $hostCntNone = $checkBoxCnt = $fullSizeTot = 0; GetStatusInfo("hosts"); - my $Privileged = CheckPermission(); - if ( !$Privileged ) { - ErrorExit($Lang->{Only_privileged_users_can_archive} ); - } foreach my $host ( sort(keys(%Status)) ) { my($fullDur, $incrCnt, $fullSize, $fullRate); my @Backups = $bpc->BackupInfoRead($host); my $fullCnt = $incrCnt = 0; + my $all_backup_numbers; + for ( my $i = 0 ; $i < @Backups ; $i++ ) { if ( $Backups[$i]{type} eq "full" ) { $fullSize = $Backups[$i]{size} / (1024 * 1024); @@ -68,9 +71,55 @@ sub action $incrSizeTot = $Backups[$i]{size} / (1024 * 1024); } $backupnumber = $Backups[$i]{num}; + $all_backup_numbers->{$backupnumber}++; } $fullSizeTot += $fullSize + $incrSizeTot; $fullSize = sprintf("%.2f", ($fullSize + $incrSizeTot) / 1000); + + $bpc->ConfigRead($archHost); + %Conf = $bpc->Conf(); + +use Data::Dump qw(dump); + + my $dbh = DBI->connect($Conf{SearchDSN}, $Conf{SearchUser}, "", { RaiseError => 1, AutoCommit => 0 }); + my $sth = $dbh->prepare(qq{ + select + backups.num as num, + inc_size, + size, + inc_deleted + from backups + join hosts on hosts.id = hostid + where hosts.name = ? + }); + $sth->execute($host); + # and inc_size < 0 and size > 0 and not inc_deleted + while( my $row = $sth->fetchrow_hashref ) { +warn "# row ",dump $row; + $all_backup_numbers->{ $row->{num} } = + $row->{inc_deleted} ? 0 : + $row->{size} == 0 ? 0 : + $row->{inc_size} < 0 ? 1 : + $row->{size} > 0 ? 1 : + 0; + } + +warn dump($all_backup_numbers); + my @backup_nums = + sort + grep { $all_backup_numbers->{$_} } + keys %$all_backup_numbers; + + my $checkboxes; + foreach my $backupnumber ( @backup_nums ) { + $checkboxes .= qq| + +$backupnumber + |; + $checkBoxCnt++; + } + +=for ASA extension removed this $str = <  ${HostLink($host)} @@ -78,6 +127,20 @@ sub action $fullSize EOF $checkBoxCnt++; +=cut + + $str = < + +${HostLink($host)} +$checkboxes + + +${UserLink($Hosts->{$host}{user})} + + $fullSize +EOF + if ( @Backups == 0 ) { $hostCntNone++; $strNone .= $str; @@ -98,29 +161,33 @@ EOF } else { my(@HostList, @BackupList, $HostListStr, $hiddenStr, $pathHdr, $badFileCnt, $reply, $str); - my $Privileged = CheckPermission(); + + # + # 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}, }; - if ( !$Privileged ) { - ErrorExit($Lang->{Only_privileged_users_can_archive} ); - } ServerConnect(); for ( my $i = 0 ; $i < $In{fcbMax} ; $i++ ) { 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 $HostListStr .= < ${EscHTML($name)} +
  • ${EscHTML($name)} $i EOF } $hiddenStr .= <{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}}"); @@ -222,12 +289,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}}");