From: cbarratt Date: Mon, 30 Oct 2006 06:08:46 +0000 (+0000) Subject: * configure.pl checks version of Encode.pm. Reported by Chris Stone. X-Git-Tag: v3_0_0beta2~4 X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=commitdiff_plain;h=a5650695edc5ab99c7da689704882f1b11ce3a7c * configure.pl checks version of Encode.pm. Reported by Chris Stone. * Several fixes to bin/BackupPC_fixupBackupSummary from Stian Jordet. * Fixed table width in backup browsing to avoid Firefox layout anomoly, provided by Jono Woodhouse. * CSS file updates from Jono Woodhouse. Priod (v2) version is included as BackupPC_stnd_orig.css in case people prefer the old skin. * More compact host summary, including disabled host indication, from Jono Woodhouse. * BackupPC.pid is now world readable, suggested by Casper Thomsen. --- diff --git a/ChangeLog b/ChangeLog index 2873269..4818cad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,25 @@ # Version __VERSION__, __RELEASEDATE__ #------------------------------------------------------------------------ +* configure.pl checks version of Encode.pm. Reported by Chris Stone. + +* Several fixes to bin/BackupPC_fixupBackupSummary from Stian Jordet. + +* Fixed table width in backup browsing to avoid Firefox layout anomoly, + provided by Jono Woodhouse. + +* CSS file updates from Jono Woodhouse. Priod (v2) version is included + as BackupPC_stnd_orig.css in case people prefer the old skin. + +* More compact host summary, including disabled host indication, + from Jono Woodhouse. + +* BackupPC.pid is now world readable, suggested by Casper Thomsen. + +#------------------------------------------------------------------------ +# Version 3.0.0beta1, 30 Jul 2006 +#------------------------------------------------------------------------ + * Fixed several Xfer charset conversions. * Added some CGI utf8 conversions from Rodrigo Real and Vincent diff --git a/bin/BackupPC b/bin/BackupPC index 3e55f7f..cf70977 100755 --- a/bin/BackupPC +++ b/bin/BackupPC @@ -345,9 +345,11 @@ sub Main_Initialize # Write out our initial status and save our PID # StatusWrite(); + unlink("$LogDir/BackupPC.pid"); if ( open(PID, ">", "$LogDir/BackupPC.pid") ) { print(PID $$); close(PID); + chmod(0444, "$LogDir/BackupPC.pid"); } # diff --git a/bin/BackupPC_fixupBackupSummary b/bin/BackupPC_fixupBackupSummary index 70177d5..671b186 100755 --- a/bin/BackupPC_fixupBackupSummary +++ b/bin/BackupPC_fixupBackupSummary @@ -30,7 +30,7 @@ # #======================================================================== # -# Version 3.0.0beta1, released 30 Jul 2006. +# Version 3.0.0beta0, released 11 Jul 2006. # # See http://backuppc.sourceforge.net. # @@ -153,13 +153,12 @@ foreach my $host ( @hostList ) { } print(" Reading $file\n"); while ( (my $str = $f->readLine()) ne "" ) { - if ( $str =~ /^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}) (full|incr|partial) backup started for directory / ) { - $startTime = $str; + if ( $str =~ /^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}) (full|incr|partial) backup started / ) { + $startTime = parsedate($1); next; } next if ( $str !~ /^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}) (full|incr|partial) backup (\d+) complete, (\d+) files, (\d+) bytes, (\d+) xferErrs \((\d+) bad files, (\d+) bad shares, (\d+) other\)/ ); - my $endTime = $1; my $type = $2; my $bkupNum = $3; my $nFilesTotal = $4; @@ -167,13 +166,14 @@ foreach my $host ( @hostList ) { my $xferErrs = $6; my $badFiles = $7; my $badShare = $8; + my $endTime = parsedate($1); print(" Got $type backup $bkupNum at $endTime\n"); - next if ( !-d "$dir/$2" ); + next if ( !-d "$dir/$bkupNum" ); $BkupFromLOG->{$bkupNum} = { num => $bkupNum, type => $type, - startTime => parsedate($startTime), - endTime => parsedate($endTime), + startTime => $startTime, + endTime => $endTime, size => $sizeTotal, nFiles => $nFilesTotal, xferErrs => $xferErrs, @@ -232,7 +232,8 @@ foreach my $host ( @hostList ) { if ( $changes ) { @Backups = sort({$a->{num} <=> $b->{num}} @Backups); - print Dumper \@Backups; + # print Dumper \@Backups; + $bpc->BackupInfoWrite($host, @Backups); } else { print(" No changes for host $host\n"); } diff --git a/conf/BackupPC_stnd.css b/conf/BackupPC_stnd.css index 42c81cd..0d0e681 100644 --- a/conf/BackupPC_stnd.css +++ b/conf/BackupPC_stnd.css @@ -1,7 +1,7 @@ /* * BackupPC standard CSS definitions * - * Version 3.0.0beta0, released 11 Jul 2006. + * Version 3.0.0beta1, released 30 Jul 2006. * * See http://backuppc.sourceforge.net. * @@ -13,27 +13,34 @@ */ body { - font-family:arial,sans-serif; - font-size:11pt; + font-family:tahoma,arial,sans-serif,helvetica; + font-size:10pt; background-color:#ffffff; margin:2px 5px 0px 2px; height:100% } + +table { + border-collapse: collapse; + color: #000000; + padding:0px; +} + h1 { - font-family:arial,sans-serif; + font-family:Trebuchet MS,Trebuchet,tahoma,arial,sans-serif,helvetica; font-size:16pt; color:#000000 } h2 { - font-family:arial,sans-serif; + font-family:Trebuchet MS,Trebuchet,tahoma,arial,sans-serif,helvetica; font-size:12pt; color:#000000 } a { - font-family:arial,sans-serif; + font-family:tahoma,arial,sans-serif,helvetica; color:#3333ff } @@ -56,22 +63,22 @@ a.navbar { } .h1 { - font-family:arial,sans-serif; + font-family:Trebuchet MS,Trebuchet,tahoma,arial,sans-serif,helvetica; font-size:16pt; color:#000000; font-weight:bold; - background-color:#99cc33; + background-color:#95B8DB; padding:3px; padding-left:6px; margin-bottom:5px; } .h2 { - font-family:arial,sans-serif; + font-family:Trebuchet MS,Trebuchet,tahoma,arial,sans-serif,helvetica; font-size:12pt; color:#000000; font-weight:bold; - background-color:#ddeeee; + background-color:#eeeeee; padding:3px; padding-left:6px; margin-top:3px; @@ -79,13 +86,13 @@ a.navbar { } .tableStnd { - font-size:11pt; + font-size:10pt; } .tableheader { - font-size:9pt; + font-size:10pt; font-weight:bold; - background-color:#cccccc; + background-color:#eeeeee; } .border { @@ -97,7 +104,7 @@ a.navbar { font-size:12pt; color:#000000; font-weight:bold; - background-color:#99cc33; + background-color:#95B8DB; } .editTabSel { @@ -105,7 +112,7 @@ a.navbar { font-size:14pt; color:#000000; font-weight:bold; - background-color:#99cc33; + background-color:#95B8DB; padding:3px; padding-left:6px; margin-bottom:5px; @@ -138,11 +145,12 @@ a.navbar { .editTextInput { font-family:courier; + font-size:10pt; } .fviewheader { font-weight:bold; - font-size:10pt; + font-size:9pt; color:#ffffff; background-color:#999999; } @@ -150,8 +158,8 @@ a.navbar { .fviewborder { border-bottom:1px solid #000000; border-left:1px dotted #666666; - background-color:#dddddd; - font-size:11pt; + background-color:#eeeeee; + font-size:9pt; } .fviewon { @@ -164,14 +172,14 @@ a.navbar { .fview { font-size:9pt; - font-family:arial,sans-serif; + font-family:tahoma,arial,sans-serif,helvetica; text-decoration:none; line-height:15px; } .fviewbold { - font-size:10pt; - font-family:arial,sans-serif; + font-size:9pt; + font-family:tahoma,arial,sans-serif,helvetica; text-decoration:none; line-height:15px; font-weight:bold; @@ -180,7 +188,7 @@ a.navbar { .histView { border-bottom:1px solid #000000; border-left:2px solid #ffffff; - background-color:#dddddd; + background-color:#eeeeee; font-size:10pt; } @@ -192,20 +200,23 @@ a.navbar { div.NavMenu { width:18%; margin:0px; - background-color:#ddeeee; + font-size:9pt; + background-color:#eeeeee; } div.NavMenu a { - font-size:10pt; + font-size:9pt; + font-family:arial,sans-serif; display:block; margin-left:8px; padding:2px; } div.NavTitle { + font-size:12pt; padding-left:10px; - background-color:#99cc33; - font-family:arial,sans-serif; + background-color:#95B8DB; + font-family:Trebuchet MS,Trebuchet,tahoma,arial,sans-serif,helvetica; color:#000000; font-weight:bold; margin-bottom:2px; diff --git a/conf/BackupPC_stnd_orig.css b/conf/BackupPC_stnd_orig.css new file mode 100644 index 0000000..363ab1e --- /dev/null +++ b/conf/BackupPC_stnd_orig.css @@ -0,0 +1,220 @@ +/* + * BackupPC standard CSS definitions + * + * Version 3.0.0beta1, released 30 Jul 2006. + * + * See http://backuppc.sourceforge.net. + * + * AUTHOR + * Craig Barratt + * + * COPYRIGHT + * Copyright (C) 2004 Craig Barratt + */ + +body { + font-family:arial,sans-serif; + font-size:11pt; + background-color:#ffffff; + margin:2px 5px 0px 2px; + height:100% +} + +h1 { + font-family:arial,sans-serif; + font-size:16pt; + color:#000000 +} + +h2 { + font-family:arial,sans-serif; + font-size:12pt; + color:#000000 +} + +a { + font-family:arial,sans-serif; + color:#3333ff +} + +dt { + color:#3333ff +} + +a:hover { + color:#cc0000; + text-decoration:none +} + +a.NavCurrent { + font-weight:bold; +} + +a.navbar { + padding-left:5px; + padding-right:5px; +} + +.h1 { + font-family:arial,sans-serif; + font-size:16pt; + color:#000000; + font-weight:bold; + background-color:#99cc33; + padding:3px; + padding-left:6px; + margin-bottom:5px; +} + +.h2 { + font-family:arial,sans-serif; + font-size:12pt; + color:#000000; + font-weight:bold; + background-color:#ddeeee; + padding:3px; + padding-left:6px; + margin-top:3px; + margin-bottom:1px; +} + +.tableStnd { + font-size:11pt; +} + +.tableheader { + font-size:9pt; + font-weight:bold; + background-color:#cccccc; +} + +.border { + font-size:10pt; +} + +.editHeader { + font-family:arial,sans-serif; + font-size:12pt; + color:#000000; + font-weight:bold; + background-color:#99cc33; +} + +.editTabSel { + font-family:arial,sans-serif; + font-size:14pt; + color:#000000; + font-weight:bold; + background-color:#99cc33; + padding:3px; + padding-left:6px; + margin-bottom:5px; +} + +.editTabNoSel { + font-family:arial,sans-serif; + font-size:14pt; + color:#000000; + font-weight:bold; + padding:3px; + padding-left:6px; + margin-bottom:5px; +} + +.editSaveButton { + color:#ff0000; + font-size:14pt; + font-weight:bold; +} + +.editError { + color:#ff0000; + font-weight:bold; +} + +.editComment { + font-size:10pt; +} + +.editTextInput { + font-family:courier; +} + +.fviewheader { + font-weight:bold; + font-size:10pt; + color:#ffffff; + background-color:#999999; +} + +.fviewborder { + border-bottom:1px solid #000000; + border-left:1px dotted #666666; + background-color:#dddddd; + font-size:11pt; +} + +.fviewon { + background-color:#cccccc; +} + +.fviewoff { + background-color:#ffffff; +} + +.fview { + font-size:9pt; + font-family:arial,sans-serif; + text-decoration:none; + line-height:15px; +} + +.fviewbold { + font-size:10pt; + font-family:arial,sans-serif; + text-decoration:none; + line-height:15px; + font-weight:bold; +} + +.histView { + border-bottom:1px solid #000000; + border-left:2px solid #ffffff; + background-color:#dddddd; + font-size:10pt; +} + +.histViewMis { + border-bottom:1px solid #000000; + background-color:#ffdddd; +} + +div.NavMenu { + width:18%; + margin:0px; + background-color:#ddeeee; +} + +div.NavMenu a { + font-size:10pt; + display:block; + margin-left:8px; + padding:2px; +} + +div.NavTitle { + padding-left:10px; + background-color:#99cc33; + font-family:arial,sans-serif; + color:#000000; + font-weight:bold; + margin-bottom:2px; +} + +#Content { + float:right; + width:80%; + left:20%; + top:10px; + position:absolute; +} diff --git a/conf/config.pl b/conf/config.pl index 46fd26f..af66a76 100644 --- a/conf/config.pl +++ b/conf/config.pl @@ -1943,6 +1943,8 @@ $Conf{CgiStatusHilightColor} = { Reason_no_ping => '#ffff99', Reason_backup_canceled_by_user => '#ff9900', Status_backup_in_progress => '#66cc99', + Disabled_OnlyManualBackups => '#d1d1d1', + Disabled_AllBackupsDisabled => '#d1d1d1', }; # @@ -1982,10 +1984,14 @@ $Conf{CgiExt2ContentType} = { }; $Conf{CgiImageDirURL} = ''; # -# CSS stylesheet for the CGI interface. It is stored in the -# $Conf{CgiImageDir} directory and accessed via the +# CSS stylesheet "skin" for the CGI interface. It is stored +# in the $Conf{CgiImageDir} directory and accessed via the # $Conf{CgiImageDirURL} URL. # +# For BackupPC v3.x several color, layout and font changes were made. +# The previous v2.x version is available as BackupPC_stnd_orig.css, so +# if you prefer the old skin, change this to BackupPC_stnd_orig.css. +# $Conf{CgiCSSFile} = 'BackupPC_stnd.css'; # @@ -2020,6 +2026,7 @@ $Conf{CgiUserConfigEdit} = { ArchiveInfoKeepCnt => 1, BackupFilesOnly => 1, BackupFilesExclude => 1, + BackupsDisable => 1, BlackoutBadPingLimit => 1, BlackoutGoodCnt => 1, BlackoutPeriods => 1, diff --git a/configure.pl b/configure.pl index 433a016..74a221c 100755 --- a/configure.pl +++ b/configure.pl @@ -49,7 +49,7 @@ use vars qw(%Conf %OrigConf); use lib "./lib"; my @Packages = qw(File::Path File::Spec File::Copy DirHandle Digest::MD5 - Data::Dumper Getopt::Std Getopt::Long Pod::Usage + Data::Dumper Getopt::Std Getopt::Long Encode Pod::Usage BackupPC::Lib BackupPC::FileZIO); foreach my $pkg ( @Packages ) { @@ -58,7 +58,8 @@ foreach my $pkg ( @Packages ) { if ( $pkg =~ /BackupPC/ ) { die <= 1.99\n\n"); + exit(1); +} + my %opts; $opts{"set-perms"} = 1; if ( !GetOptions( @@ -273,13 +281,13 @@ EOF } } -my $Perl56 = system($Conf{PerlPath} - . q{ -e 'exit($^V && $^V ge v5.6.0 ? 1 : 0);'}); +my $Perl58 = system($Conf{PerlPath} + . q{ -e 'exit($^V && $^V ge v5.8.0 ? 1 : 0);'}); -if ( !$Perl56 ) { +if ( !$Perl58 ) { print <\n"; for ( my $i = 0 ; $i < @order ; $i++ ) { - $content .= "$order[$i]\n"; + $content .= "$order[$i]\n"; } $content .= "\n"; for ( my $i = 0 ; $i < @$varValue ; $i++ ) { diff --git a/lib/BackupPC/CGI/Summary.pm b/lib/BackupPC/CGI/Summary.pm index bd7f52e..3fad9f9 100644 --- a/lib/BackupPC/CGI/Summary.pm +++ b/lib/BackupPC/CGI/Summary.pm @@ -49,11 +49,12 @@ sub action my $Privileged = CheckPermission(); foreach my $host ( GetUserHosts(1) ) { - my($fullDur, $incrCnt, $incrAge, $fullSize, $fullRate, $reasonHilite); + my($fullDur, $incrCnt, $incrAge, $fullSize, $fullRate, $reasonHilite, + $lastAge, $tempState, $tempReason); my($shortErr); my @Backups = $bpc->BackupInfoRead($host); my $fullCnt = $incrCnt = 0; - my $fullAge = $incrAge = -1; + my $fullAge = $incrAge = $lastAge = -1; $bpc->ConfigRead($host); %Conf = $bpc->Conf(); @@ -78,6 +79,16 @@ sub action $incrSizeTot += $Backups[$i]{size} / (1024 * 1024); } } + if ( $fullAge > $incrAge && $fullAge >= 0 ) { + $lastAge = $fullAge; + } else { + $lastAge = $incrAge; + } + if ( $lastAge < 0 ) { + $lastAge = ""; + } else { + $lastAge = sprintf("%.1f", (time - $lastAge) / (24 * 3600)); + } if ( $fullAge < 0 ) { $fullAge = ""; $fullRate = ""; @@ -97,9 +108,22 @@ sub action $incrAge = " " if ( $incrAge eq "" ); $reasonHilite = $Conf{CgiStatusHilightColor}{$Status{$host}{reason}} || $Conf{CgiStatusHilightColor}{$Status{$host}{state}}; + if ( $Conf{BackupsDisable} == 1 ) { + $reasonHilite = $Conf{CgiStatusHilightColor}{Disabled_OnlyManualBackups}; + $tempState = "Disabled_OnlyManualBackups"; + $tempReason = ""; + } elsif ($Conf{BackupsDisable} == 2 ) { + $reasonHilite = $Conf{CgiStatusHilightColor}{Disabled_AllBackupsDisabled}; + $tempState = "Disabled_AllBackupsDisabled"; + $tempReason = ""; + } else { + $tempState = $Status{$host}{state}; + $tempReason = $Status{$host}{reason}; + } $reasonHilite = " bgcolor=\"$reasonHilite\"" if ( $reasonHilite ne "" ); - if ( $Status{$host}{state} ne "Status_backup_in_progress" - && $Status{$host}{state} ne "Status_restore_in_progress" + if ( $tempState ne "Status_backup_in_progress" + && $tempState ne "Status_restore_in_progress" + && $Conf{BackupsDisable} == 0 && $Status{$host}{error} ne "" ) { ($shortErr = $Status{$host}{error}) =~ s/(.{48}).*/$1.../; $shortErr = " ($shortErr)"; @@ -115,8 +139,9 @@ sub action $fullRate $incrCnt $incrAge - $Lang->{$Status{$host}{state}} - $Lang->{$Status{$host}{reason}}$shortErr + $lastAge + $Lang->{$tempState} + $Lang->{$tempReason}$shortErr EOF if ( @Backups == 0 ) { $hostCntNone++; diff --git a/lib/BackupPC/Config/Meta.pm b/lib/BackupPC/Config/Meta.pm index fb134b9..89cc286 100644 --- a/lib/BackupPC/Config/Meta.pm +++ b/lib/BackupPC/Config/Meta.pm @@ -341,6 +341,8 @@ use vars qw(%ConfigMeta); Reason_no_ping => "string", Reason_backup_canceled_by_user => "string", Status_backup_in_progress => "string", + Disabled_OnlyManualBackups => "string", + Disabled_AllBackupsDisabled => "string", }, }, CgiHeaders => "bigstring", @@ -372,6 +374,7 @@ use vars qw(%ConfigMeta); ArchiveInfoKeepCnt => "boolean", BackupFilesOnly => "boolean", BackupFilesExclude => "boolean", + BackupsDisable => "boolean", BlackoutBadPingLimit => "boolean", BlackoutGoodCnt => "boolean", BlackoutPeriods => "boolean", diff --git a/lib/BackupPC/Lang/de.pm b/lib/BackupPC/Lang/de.pm index 17a591e..eb2de94 100644 --- a/lib/BackupPC/Lang/de.pm +++ b/lib/BackupPC/Lang/de.pm @@ -153,11 +153,12 @@ Es gibt \$hostCntGood Computer die erfolgreich gesichert wurden, mit insgesamt: Computer Benutzer #Voll - Alter/Tagen - Größe/GB + Alter (Tagen) + Größe (GB) MB/sek #Inkr - Alter/Tage + Alter (Tage) + ENG Last Backup (days) Status Letzte Aktion \$strGood @@ -171,11 +172,12 @@ Es gibt \$hostCntNone Computer ohne Backups !!! Computer Benutzer #Voll - Alter/Tage - Größe/GB - MB/sec + Alter (Tage) + Größe (GB) + MB/sek #Inkr - Alter/Tage + Alter (Tage) + ENG Last Backup (days) Status Letzter Versuch \$strNone @@ -829,8 +831,8 @@ $Lang{Backup_browse_for__host} = <
-
-
+ - - - + + + - + + \$strGood @@ -160,13 +161,14 @@ There are \$hostCntNone hosts with no backups. - - - + + + - - + + + \$strNone
+ \$dirStr
@@ -1230,6 +1232,8 @@ $Lang{Reason_no_ping} = "nicht erreichbar"; $Lang{Reason_backup_canceled_by_user} = "Abbruch durch Benutzer"; $Lang{Reason_restore_canceled_by_user} = "Abbruch durch Benutzer"; $Lang{Reason_archive_canceled_by_user} = "Archivierung abgebrochen durch Benutzer"; +$Lang{Disabled_OnlyManualBackups} = "ENG auto disabled"; +$Lang{Disabled_AllBackupsDisabled} = "ENG disabled"; # --------- # Email messages diff --git a/lib/BackupPC/Lang/en.pm b/lib/BackupPC/Lang/en.pm index 44a0737..b6349fc 100644 --- a/lib/BackupPC/Lang/en.pm +++ b/lib/BackupPC/Lang/en.pm @@ -142,11 +142,12 @@ There are \$hostCntGood hosts that have been backed up, for a total of:
Host User #Full Full Age/days Full Size/GB Speed MB/sec Full Age (days) Full Size (GB) Speed (MB/s) #Incr Incr Age/days Incr Age (days) Last Backup (days) State Last attempt
Host User #Full Full Age/days Full Size/GB Speed MB/sec Full Age (days) Full Size (GB) Speed (MB/s) #Incr Incr Age/days Current State Last backup attempt
Last Backup (days) State Last attempt
EOF @@ -822,8 +824,8 @@ $Lang{Backup_browse_for__host} = <
-
-
+ - - + + - + + \$strGood @@ -161,11 +162,12 @@ Hay \$hostCntNone hosts sin copias de seguridad. - - + + - + + \$strNone @@ -823,8 +825,8 @@ $Lang{Backup_browse_for__host} = <
+ \$dirStr
@@ -1218,10 +1220,10 @@ $Lang{Status_restore_in_progress} = "restore in progress"; $Lang{Status_link_pending} = "link pending"; $Lang{Status_link_running} = "link running"; -$Lang{Reason_backup_done} = "backup done"; +$Lang{Reason_backup_done} = "done"; $Lang{Reason_restore_done} = "restore done"; $Lang{Reason_archive_done} = "archive done"; -$Lang{Reason_nothing_to_do} = "nothing to do"; +$Lang{Reason_nothing_to_do} = "idle"; $Lang{Reason_backup_failed} = "backup failed"; $Lang{Reason_restore_failed} = "restore failed"; $Lang{Reason_archive_failed} = "archive failed"; @@ -1229,6 +1231,9 @@ $Lang{Reason_no_ping} = "no ping"; $Lang{Reason_backup_canceled_by_user} = "backup canceled by user"; $Lang{Reason_restore_canceled_by_user} = "restore canceled by user"; $Lang{Reason_archive_canceled_by_user} = "archive canceled by user"; +$Lang{Disabled_OnlyManualBackups} = "auto disabled"; +$Lang{Disabled_AllBackupsDisabled} = "disabled"; + # --------- # Email messages diff --git a/lib/BackupPC/Lang/es.pm b/lib/BackupPC/Lang/es.pm index 8c63b9b..d90ce40 100644 --- a/lib/BackupPC/Lang/es.pm +++ b/lib/BackupPC/Lang/es.pm @@ -143,11 +143,12 @@ Il y a \$hostCntGood hosts tienen copia de seguridad, de un total de :
Host Usuario #Completo Completo Antig./Días Completo Tamaño/GB Completo Antig. (Días) Completo Tamaño (GB) Velocidad MB/sec #Incrementales Incrementales Antig/Días Incrementales Antig (Días) ENG Last Backup (days) Estado Ultimo Intento
Host Usuario #Completo Completo Antig./Días Completo Tamaño/GB Completo Antig. (Días) Completo Tamaño (GB) Velocidad MB/sec #Incrementales Incrementales Antig/Días Incrementales Antig (Días) ENG Last Backup (days) Estado Ultimo Intento
-
-
+ + \$strGood @@ -165,6 +166,7 @@ Il y a \$hostCntNone h + \$strNone @@ -821,8 +823,8 @@ $Lang{Backup_browse_for__host} = <
+ \$dirStr
@@ -1230,6 +1232,8 @@ $Lang{Reason_no_ping} = "no hay ping"; $Lang{Reason_backup_canceled_by_user} = "copia cancelada por el usuario"; $Lang{Reason_restore_canceled_by_user} = "restauración cancelada por el usuario"; $Lang{Reason_archive_canceled_by_user} = "archivado cancelado por el usuario"; +$Lang{Disabled_OnlyManualBackups} = "ENG auto disabled"; +$Lang{Disabled_AllBackupsDisabled} = "ENG disabled"; # --------- # Email messages diff --git a/lib/BackupPC/Lang/fr.pm b/lib/BackupPC/Lang/fr.pm index f664dea..ebcc768 100644 --- a/lib/BackupPC/Lang/fr.pm +++ b/lib/BackupPC/Lang/fr.pm @@ -147,6 +147,7 @@ Il y a \$hostCntGood h Vitesse (Mo/s) Nb incrémentielles Incrémentielles Âge (jours) ENG Last Backup (days) État actuel Dernière tentative
Vitesse (Mo/s) Nb incrémentielles Incrémentielles Âge (jours) ENG Last Backup (days) État actuel Dernière tentative
-
-
+ + \$strGood @@ -170,6 +171,7 @@ Ci sono \$hostCntNone host senza alcun backup. + \$strNone @@ -829,8 +831,8 @@ $Lang{Backup_browse_for__host} = <
+ \$dirStr
@@ -1227,6 +1229,8 @@ $Lang{Reason_no_ping} = "pas de ping"; $Lang{Reason_backup_canceled_by_user} = "sauvegarde annulée par l'utilisateur"; $Lang{Reason_restore_canceled_by_user} = "restauration annulée par l'utilisateur"; $Lang{Reason_archive_canceled_by_user} = "archivage annulé par l'utilisateur"; +$Lang{Disabled_OnlyManualBackups} = "ENG auto disabled"; +$Lang{Disabled_AllBackupsDisabled} = "ENG disabled"; # --------- # Email messages diff --git a/lib/BackupPC/Lang/it.pm b/lib/BackupPC/Lang/it.pm index f96dc95..74cecf3 100644 --- a/lib/BackupPC/Lang/it.pm +++ b/lib/BackupPC/Lang/it.pm @@ -152,6 +152,7 @@ Ci sono \$hostCntGood host sottoposti a backup per un totale di: Velocità (MB/s) Incrementali Età incrementali (giorni) ENG Last Backup (days) Stato Ultimo tentativo
Velocità (MB/s) Incrementali Età incrementali (giorni) ENG Last Backup (days) Stato Ultimo tentativo
-
-
+ - - - + + + - + + \$strGood @@ -160,11 +161,12 @@ Er zijn \$hostCntNone hosts zonder backup. - - - + + + - + + \$strNone @@ -823,8 +825,8 @@ $Lang{Backup_browse_for__host} = <
+ \$dirStr
@@ -1238,6 +1240,8 @@ $Lang{Reason_no_ping} = "no ping"; $Lang{Reason_backup_canceled_by_user} = "backup annullato dall\'utente"; $Lang{Reason_restore_canceled_by_user} = "ripristino annullato dall\'utente"; $Lang{Reason_archive_canceled_by_user} = "archivio annullato dall\'utente"; +$Lang{Disabled_OnlyManualBackups} = "ENG auto disabled"; +$Lang{Disabled_AllBackupsDisabled} = "ENG disabled"; # --------- # Email messages diff --git a/lib/BackupPC/Lang/nl.pm b/lib/BackupPC/Lang/nl.pm index 94c492f..384e077 100644 --- a/lib/BackupPC/Lang/nl.pm +++ b/lib/BackupPC/Lang/nl.pm @@ -142,11 +142,12 @@ Er zijn \$hostCntGood hosts gebackupt, wat een totaal geeft van:
Machine Gebruiker Aantal Voll. Voll.Lftd/dagen Voll.Grootte/GB Snelheid MB/sec Voll.Lftd (dagen) Voll.Grootte (GB) Snelheid (MB/sec) Aantal Incr. Incr.Lftd/dagen Incr.Lftd (dagen) ENG Last Backup (days) Status Laatste poging
Machine Gebruiker Aantal Voll. Voll.Lftd/dagen Voll.Grootte/GB Snelheid MB/sec Voll.Lftd (dagen) Voll.Grootte (GB) Snelheid (MB/sec) Aantal Incr. Incr.Lftd/dagen Incr.Lftd (dagen) ENG Last Backup (days) Status Laatste poging
-
-
+ - - - + + + - + + \$strGood @@ -165,11 +166,12 @@ Existem \$hostCntNone hosts sem backups. - - - + + + - + + \$strNone @@ -827,8 +829,8 @@ $Lang{Backup_browse_for__host} = <
+ \$dirStr
@@ -1230,6 +1232,8 @@ $Lang{Reason_no_ping} = "geen ping"; $Lang{Reason_backup_canceled_by_user} = "backup geannuleerd door gebruiker"; $Lang{Reason_restore_canceled_by_user} = "herstellen geannuleerd door gebruiker"; $Lang{Reason_archive_canceled_by_user} = "archivering geannuleerd door gebruiker"; +$Lang{Disabled_OnlyManualBackups} = "ENG auto disabled"; +$Lang{Disabled_AllBackupsDisabled} = "ENG disabled"; # --------- # Email messages diff --git a/lib/BackupPC/Lang/pt_br.pm b/lib/BackupPC/Lang/pt_br.pm index 0af3258..e9af551 100644 --- a/lib/BackupPC/Lang/pt_br.pm +++ b/lib/BackupPC/Lang/pt_br.pm @@ -147,11 +147,12 @@ Existem \$hostCntGood hosts com backup, de um total de :
Host Usuario #Completo Completo Antig./Dias Completo Tamanho/GB Velocidade MB/sec Completo Antig. (Dias) Completo Tamanho (GB) Velocidade (MB/sec) #Incrementais Incrementais Antig/Dias Incrementais Antig (Dias) ENG Last Backup (days) Estado Última Tentativa
Host Usuario #Completo Completo Antig./Dias Completo Tamanho/GB Velocidade MB/sec Completo Antig. (Dias) Completo Tamanho (GB) Velocidade (MB/sec) #Incrementais Incrementais Antig/Dias Incrementais Antig (Dias) ENG Last Backup (days) Estado Última tentativa
-
-
+
+ \$dirStr
@@ -1232,6 +1234,8 @@ $Lang{Reason_no_ping} = "sem ping"; $Lang{Reason_backup_canceled_by_user} = "backup cancelado pelo usuário"; $Lang{Reason_restore_canceled_by_user} = "restauração cancelada pelo usuário"; $Lang{Reason_archive_canceled_by_user} = "arquivamento cancelado pelo usuário"; +$Lang{Disabled_OnlyManualBackups} = "ENG auto disabled"; +$Lang{Disabled_AllBackupsDisabled} = "ENG disabled"; # --------- # Email messages diff --git a/makeDist b/makeDist index 13dd9cf..472fb5f 100755 --- a/makeDist +++ b/makeDist @@ -53,8 +53,8 @@ die("BackupPC::Lib->new failed\n") umask(0022); -my $Version = "3.0.0beta1"; -my $ReleaseDate = "30 Jul 2006"; +my $Version = "3.0.0beta2"; +my $ReleaseDate = "31 Oct 2006"; my $DistDir = "dist/BackupPC-$Version"; my @PerlSrc = qw( @@ -221,6 +221,7 @@ foreach my $file ( (@PerlSrc, conf/config.pl conf/hosts conf/BackupPC_stnd.css + conf/BackupPC_stnd_orig.css init.d/README init.d/src/debian-backuppc init.d/src/gentoo-backuppc @@ -530,7 +531,7 @@ sub CheckLangUsage s/#.*//g; s/\$Lang{([^}]*)}/ my $var = $1; - next if ( $var =~ m{^(Reason_|Status_|backupType_)} ); + next if ( $var =~ m{^(Reason_|Status_|backupType_|Disabled_)} ); next if ( $var eq "Documentation" ); if ( !defined($vars->{$var}) ) { print("Unexpected Lang var $var in $f\n");