$title

EOF my $hostSelectbox = ""; - my @hosts = GetUserHosts($In{host}, $Conf{CgiNavBarAdminAllHosts}); + my @hosts = GetUserHosts($Conf{CgiNavBarAdminAllHosts}); if ( defined($Hosts) && %$Hosts > 0 && @hosts ) { NavSectionTitle($Lang->{Hosts}); foreach my $host ( @hosts ) { diff --git a/lib/BackupPC/CGI/Restore.pm b/lib/BackupPC/CGI/Restore.pm index 2c1a285..f00ce59 100644 --- a/lib/BackupPC/CGI/Restore.pm +++ b/lib/BackupPC/CGI/Restore.pm @@ -104,7 +104,7 @@ EOF # my $hostDestSel; my @hosts; - foreach my $h ( GetUserHosts() ) { + foreach my $h ( GetUserHosts(1) ) { my $sel = " selected" if ( $h eq $In{host} ); $hostDestSel .= ""; push(@hosts, $h); @@ -265,7 +265,8 @@ EOF my $targetFile = $f; (my $strippedShare = $share) =~ s/^\///; (my $strippedShareDest = $In{shareDest}) =~ s/^\///; - substr($targetFile, 0, length($pathHdr)) = $In{pathHdr}; + substr($targetFile, 0, length($pathHdr)) = "/$In{pathHdr}/"; + $targetFile =~ s{//+}{/}g; $fileListStr .= <$host:/$strippedShare$f$In{hostDest}:/$strippedShareDest$targetFile EOF @@ -293,6 +294,9 @@ EOF $reqFileName = "restoreReq.$$.$i"; last if ( !-f "$TopDir/pc/$hostDest/$reqFileName" ); } + my $inPathHdr = $In{pathHdr}; + $inPathHdr = "/$inPathHdr" if ( $inPathHdr !~ m{^/} ); + $inPathHdr = "$inPathHdr/" if ( $inPathHdr !~ m{/$} ); my %restoreReq = ( # source of restore is hostSrc, #num, path shareSrc/pathHdrSrc num => $In{num}, @@ -303,7 +307,7 @@ EOF # destination of restore is hostDest:shareDest/pathHdrDest hostDest => $hostDest, shareDest => $In{shareDest}, - pathHdrDest => $In{pathHdr}, + pathHdrDest => $inPathHdr, # list of files to restore fileList => \@fileList, diff --git a/lib/BackupPC/CGI/RestoreInfo.pm b/lib/BackupPC/CGI/RestoreInfo.pm index 01b852a..8b7fbc9 100644 --- a/lib/BackupPC/CGI/RestoreInfo.pm +++ b/lib/BackupPC/CGI/RestoreInfo.pm @@ -79,11 +79,12 @@ sub action (my $strippedShareDest = $RestoreReq{shareDest}) =~ s/^\///; substr($targetFile, 0, length($RestoreReq{pathHdrSrc})) = $RestoreReq{pathHdrDest}; + $targetFile =~ s{//+}{/}g; $fileListStr .= <$RestoreReq{hostSrc}:/$strippedShareSrc$f$RestoreReq{hostDest}:/$strippedShareDest$targetFile EOF } - my $content = eval("qq{$Lang->{Restore___num_details_for__host2 }}"); + my $content = eval("qq{$Lang->{Restore___num_details_for__host2}}"); Header(eval("qq{$Lang->{Restore___num_details_for__host}}"),$content); Trailer(); } diff --git a/lib/BackupPC/CGI/Summary.pm b/lib/BackupPC/CGI/Summary.pm index 7ad92c5..fd2444c 100644 --- a/lib/BackupPC/CGI/Summary.pm +++ b/lib/BackupPC/CGI/Summary.pm @@ -48,20 +48,17 @@ sub action GetStatusInfo("hosts"); my $Privileged = CheckPermission(); - foreach my $host ( GetUserHosts(undef, 1) ) { + foreach my $host ( GetUserHosts(1) ) { my($fullDur, $incrCnt, $incrAge, $fullSize, $fullRate, $reasonHilite); my($shortErr); my @Backups = $bpc->BackupInfoRead($host); my $fullCnt = $incrCnt = 0; my $fullAge = $incrAge = -1; - if ( defined(my $error = $bpc->ConfigRead($host)) ) { - print("dump failed: Can't read PC's config file: $error\n"); - exit(1); - } + $bpc->ConfigRead($host); %Conf = $bpc->Conf(); - if ($Conf{XferMethod} eq "archive" ) { + if ( $Conf{XferMethod} eq "archive" ) { next; } diff --git a/lib/BackupPC/Lang/de.pm b/lib/BackupPC/Lang/de.pm index 3b874ff..2391c46 100644 --- a/lib/BackupPC/Lang/de.pm +++ b/lib/BackupPC/Lang/de.pm @@ -857,10 +857,10 @@ EOF # ------------------------------ $Lang{Restore___num_details_for__host} = "BackupServer: Restore #\$num Details für Computer \$host"; -$Lang{Restore___num_details_for__host2 } = < - +

@@ -1009,7 +1009,7 @@ $Lang{Documentation} = "Dokumentation"; #$Lang{Host_or_User_name} = "Computer oder User Name:"; $Lang{Go} = "gehe zu"; $Lang{Hosts} = "Computer"; -$Lang{Select_a_host} = "ENGLISH Select a host..."; +$Lang{Select_a_host} = "Computer auswählen..."; $Lang{There_have_been_no_archives} = "

Es existieren keine Archive

\n"; $Lang{This_PC_has_never_been_backed_up} = "

Dieser Computer wurde nie gesichert!!

\n"; diff --git a/lib/BackupPC/Lang/en.pm b/lib/BackupPC/Lang/en.pm index d209ba8..da86c75 100644 --- a/lib/BackupPC/Lang/en.pm +++ b/lib/BackupPC/Lang/en.pm @@ -860,10 +860,10 @@ EOF # ------------------------------ $Lang{Restore___num_details_for__host} = "BackupPC: Restore #\$num details for \$host"; -$Lang{Restore___num_details_for__host2 } = < -

Nummer	\$Restores[\$i]{num}
beauftragt von	\$RestoreReq{user}
Auftrag Zeitpunkt	\$reqTime

diff --git a/lib/BackupPC/Lang/es.pm b/lib/BackupPC/Lang/es.pm index 275763c..a595948 100644 --- a/lib/BackupPC/Lang/es.pm +++ b/lib/BackupPC/Lang/es.pm @@ -862,10 +862,10 @@ EOF # ------------------------------ $Lang{Restore___num_details_for__host} = "BackupPC: Detalles de la restauración Nº\$num de \$host"; -$Lang{Restore___num_details_for__host2 } = < -

Number	\$Restores[\$i]{num}
Requested by	\$RestoreReq{user}
Request time	\$reqTime

diff --git a/lib/BackupPC/Lang/fr.pm b/lib/BackupPC/Lang/fr.pm index 593ed94..032f6d3 100644 --- a/lib/BackupPC/Lang/fr.pm +++ b/lib/BackupPC/Lang/fr.pm @@ -858,10 +858,10 @@ EOF # ------------------------------ $Lang{Restore___num_details_for__host} = "BackupPC: Détails de la restauration n° \$num pour \$host"; -$Lang{Restore___num_details_for__host2 } = < -

Número	\$Restores[\$i]{num}
Solicitado por	\$RestoreReq{user}
Hora Petición	\$reqTime

diff --git a/lib/BackupPC/Lang/it.pm b/lib/BackupPC/Lang/it.pm index 0960211..65bcd36 100644 --- a/lib/BackupPC/Lang/it.pm +++ b/lib/BackupPC/Lang/it.pm @@ -1,6 +1,6 @@ #!/bin/perl # -# $Id: it.pm,v 1.4 2004/03/21 01:46:46 cbarratt Exp $ +# $Id: it.pm,v 1.5 2004/03/29 19:05:24 cbarratt Exp $ # # Italian i18n file # @@ -869,10 +869,10 @@ EOF # ------------------------------ $Lang{Restore___num_details_for__host} = "BackupPC: dettagli ripristino numero \$num per \$host"; -$Lang{Restore___num_details_for__host2 } = < -

Numéro	\$Restores[\$i]{num}
Demandée par	\$RestoreReq{user}
Demandée à	\$reqTime

diff --git a/lib/BackupPC/PoolWrite.pm b/lib/BackupPC/PoolWrite.pm index f7624ca..a992e7a 100644 --- a/lib/BackupPC/PoolWrite.pm +++ b/lib/BackupPC/PoolWrite.pm @@ -98,8 +98,8 @@ sub new return $self; } -my $BufSize = 1048576; # 1MB or 2^20 -my $MaxFiles = 20; +my $BufSize = 1048576; # 1MB or 2^20 +my $MaxFiles = 20; # max number of compare files open at one time sub write { @@ -119,6 +119,8 @@ sub write # if ( !defined($dataRef) && !defined($a->{digest}) && $a->{fileSize} != length($a->{data}) ) { + #my $newSize = length($a->{data}); + #print("Fixing file size from $a->{fileSize} to $newSize\n"); $a->{fileSize} = length($a->{data}); } @@ -310,6 +312,7 @@ sub write push(@{$a->{errors}}, "Can't rename $a->{fileName} -> $fileName" . " or open during size fixup\n"); } + #print("Using temporary name $fileName\n"); } elsif ( defined($a->{files}) && defined($a->{files}[0]) ) { # # We haven't written anything yet, so just use the @@ -317,6 +320,7 @@ sub write # $fh = $a->{files}[0]->{fh}; $fh->rewind; + #print("Using compare file $a->{files}[0]->{name}\n"); } if ( defined($fh) ) { my $poolWrite = BackupPC::PoolWrite->new($a->{bpc}, $a->{fileName}, diff --git a/lib/BackupPC/Xfer/RsyncFileIO.pm b/lib/BackupPC/Xfer/RsyncFileIO.pm index f987ced..2c25f62 100644 --- a/lib/BackupPC/Xfer/RsyncFileIO.pm +++ b/lib/BackupPC/Xfer/RsyncFileIO.pm @@ -106,6 +106,7 @@ sub csumStart { my($fio, $f, $needMD4, $defBlkSize) = @_; + $defBlkSize ||= $fio->{blockSize}; my $attr = $fio->attribGet($f); $fio->{file} = $f; $fio->csumEnd if ( defined($fio->{csum}) ); diff --git a/makeDist b/makeDist index e58c216..3e8ff3a 100755 --- a/makeDist +++ b/makeDist @@ -42,8 +42,8 @@ use Getopt::Std; umask(0022); -my $Version = "2.1.0beta0"; -my $ReleaseDate = "20 Mar 2004"; +my $Version = "2.1.0beta0_CVS"; +my $ReleaseDate = "29 Mar 2004"; my $DistDir = "dist/BackupPC-$Version"; my @PerlSrc = qw( @@ -188,6 +188,7 @@ foreach my $file ( (@PerlSrc, qw( conf/config.pl conf/hosts + conf/BackupPC_stnd.css init.d/README init.d/src/debian-backuppc init.d/src/gentoo-backuppc @@ -227,7 +228,7 @@ sub InstallFile binmode(FILE); binmode(OUT); while ( ) { - s/^# *Version \d+\.\d+[\.\w]*, released \d+ \w+ \d{4}\.?/# Version __VERSION__, released __RELEASEDATE__./; + s/^([#*\s]+)Version \d+\.\d+[\.\w]*, released \d+ \w+ \d{4}\.?/$1Version __VERSION__, released __RELEASEDATE__./; s/__VERSION__/$Version/g; s/__RELEASEDATE__/$ReleaseDate/g; if ( $file =~ /BackupPC\.html$/ ) { -- 2.20.1

Numero	\$Restores[\$i]{num}
Richiesto da	\$RestoreReq{user}
Data richiesta	\$reqTime