* Added configuration and host CGI editor.
* Added rsync hardlink support. Requires latest version of
- File::RsyncP.
+ File::RsyncP (0.62).
* Decoupled BackupPC_dump from BackupPC_nightly by making
asynchronous file linking/delete robust to race conditions.
(level 0). Default configuration is all incrementals are level 1.
* Server file names are now in utf8 and optional conversion
- to/from client name charsets is done.
+ to/from client name charsets can be configured. All CGI pages
+ now use the utf8 charset.
* Backup metadata is now additionally saved to pc/HOST/nnn/backupInfo,
in addition to pc/HOST/backups. In case pc/HOST/backups gets trashed,
metadata from pc/HOST/nnn/backupInfo and reconstruct the backups file.
Roberto Moreno also pointed out an early error in the CVS version.
-* In conf/config.pl, changed --devices to -D in $Conf{RsyncArgs}
- and $Conf{RsyncRestoreArgs} to fix "fileListReceive failed" and
- "Can't open .../f%2f for empty output" errors with rsync 2.6.7+.
- Fix proposed by Justin Pessa and Vincent Ho, and confirmed by
- Dan Niles.
-
* Added Storage module and Storage::Text which localizes all the
text data file reading/writing (eg: backups, restores, archives
and config.pl files). Added read verify after all write
* Added Config module, and Config::Meta that contains meta data
about configuration parameters.
+* Added RSS support from Rich Duzenbury.
+
+* Translations of new 3.0 language strings from Guillaume Filion,
+ Reginaldo Ferreira, Ralph Passgang, Lieven Bridts, Guus Houtzager,
+ Rodrigo Real.
+
+* Added optional checking of exit status of Dump/Restore/Archive Pre/Post
+ UserCmd, requested by Kiko Jover, Matthias Bertschy and others.
+
* Added Slackware init.d script from Tony Nelson.
* Fixed error reporting when restore/archive fail to write the
* Applied patch from Marc Prewitt for DumpPreShareCmd and DumpPostShareCmd.
-* Added checking of exit status of Dump/Restore/Archive Pre/Post UserCmd,
- requested by Kiko Jover, Matthias Bertschy and others.
-
* Apply patch from Pete Wenzel to add smbClientPath => $Conf{SmbClientPath}
to DumpPreUserCmd etc.
via the exit status, instead of just the last.
* Added $Conf{EMailHeaders} for additional email headers, requested
- by Ludovic Gasc.
+ by Ludovic Gasc. If the Content-Type charset is set to utf8 then
+ the body of the email is sent in utf8 coding.
* Made shareName argument regexp checking more general to allow parens.
* Documentation updates from Richard Ames, JP Vossen, Torsten Finke.
#------------------------------------------------------------------------
-# Version 2.1.2pl1, __RELEASEDATE__
+# Version 2.1.2pl2, 18 Jun 2006
#------------------------------------------------------------------------
+* In conf/config.pl, changed --devices to -D in $Conf{RsyncArgs}
+ and $Conf{RsyncRestoreArgs} to fix "fileListReceive failed" and
+ "Can't open .../f%2f for empty output" errors with rsync 2.6.7+.
+ Fix proposed by Justin Pessa and Vincent Ho, and confirmed by
+ Dan Niles.
+
* Added patch from Michael (mna.news) to ignore "file is unchanged"
message from tar 1.15.x during incremental backups.
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
unlink($file);
next;
}
+ $lastLog--;
next if ( $file =~ /\.z$/ || !$Conf{CompressLevel} );
BackupPC::FileZIO->compressCopy($file,
"$file.z",
undef,
$Conf{CompressLevel}, 1);
- $lastLog--;
}
}
my $lastIncrTime = 0;
my $partialIdx = -1;
my $partialNum;
+my $lastBkupNum;
my $lastPartial = 0;
#
my($currHours) = $hour + $min / 60 + $sec / 3600;
my $blackout;
- #
- # Handle backward compatibility with original separate scalar
- # parameters.
- #
- if ( defined($Conf{BlackoutHourBegin}) ) {
- push(@{$Conf{BlackoutPeriods}},
- {
- hourBegin => $Conf{BlackoutHourBegin},
- hourEnd => $Conf{BlackoutHourEnd},
- weekDays => $Conf{BlackoutWeekDays},
- }
- );
- }
foreach my $p ( @{$Conf{BlackoutPeriods}} ) {
#
- # Allow blackout to span midnight (specified by BlackoutHourBegin
- # being greater than BlackoutHourEnd)
+ # Allow blackout to span midnight (specified by hourBegin
+ # being greater than hourEnd)
#
next if ( ref($p->{weekDays}) ne "ARRAY"
|| !defined($p->{hourBegin})
|| -f "$Dir/NewFileList.$Backups[$i]{num}" );
if ( $Backups[$i]{type} eq "full" ) {
$incrCntSinceFull = 0;
+ $lastBkupNum = $Backups[$i]{num};
$lastIdxByLevel[0] = $i;
if ( $lastFullTime < $Backups[$i]{startTime} ) {
$lastFullTime = $Backups[$i]{startTime};
}
} elsif ( $Backups[$i]{type} eq "incr" ) {
$incrCntSinceFull++;
+ $lastBkupNum = $Backups[$i]{num};
$lastIdxByLevel[$Backups[$i]{level}] = $i;
$lastIncrTime = $Backups[$i]{startTime}
if ( $lastIncrTime < $Backups[$i]{startTime} );
|| (!$opts{i} && (time - $lastFullTime > $Conf{FullPeriod} * 24*3600
&& time - $lastIncrTime > $Conf{IncrPeriod} * 24*3600)) ) {
$type = "full";
+ $incrLevel = 0;
+ $incrBaseBkupNum = $lastBkupNum;
} elsif ( $opts{i} || (time - $lastIncrTime > $Conf{IncrPeriod} * 24*3600
&& time - $lastFullTime > $Conf{IncrPeriod} * 24*3600) ) {
$type = "incr";
my $idx = $lastIdxByLevel[$i];
next if ( !defined($idx) );
if ( !defined($incrBaseTime)
- || $Backups[$idx]{startTime} < $incrBaseTime ) {
+ || $Backups[$idx]{startTime} > $incrBaseTime ) {
$incrBaseBkupNum = $Backups[$idx]{num};
$incrBaseLevel = $Backups[$idx]{level};
$incrBaseTime = $Backups[$idx]{startTime};
# Can't find any earlier lower-level backup! Shouldn't
# happen - just do full instead
#
- $type = "full" if ( !defined($incrBaseBkupNum) || $incrLevel < 1 );
+ if ( !defined($incrBaseBkupNum) || $incrLevel < 1 ) {
+ $type = "full";
+ $incrBaseBkupNum = $lastBkupNum;
+ }
} else {
NothingToDo($needLink);
}
close(WH);
}
print(LOG $bpc->timeStamp, $logMsg, "\n");
+ $XferLOG->write(\"$logMsg\n");
print("started $type dump, share=$shareName\n");
pidHandler(@xferPid);
# where $Conf{FullKeepCnt} is an array.
#
last if ( !BackupFullExpire($client, \@Backups) );
+ $changes++;
}
$bpc->BackupInfoWrite($client, @Backups) if ( $changes );
}
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
do "$LogDir/UserEmailInfo.pl";
my %opts;
-if ( !getopts("t", \%opts) || @ARGV != 0 ) {
- print("usage: $0 [-t]\n");
+if ( !getopts("ctu:", \%opts) || @ARGV != 0 ) {
+ print <<EOF;
+usage: $0 [-t] [-c] [-u userEmail]
+options:
+
+ -t display the emails that would be sent, without sending them
+
+ -c check if BackupPC is alive and send an email if not
+
+ -u send a test email to userEmail
+EOF
exit(1);
}
my $err = $bpc->ServerConnect($Conf{ServerHost}, $Conf{ServerPort});
if ( $err ) {
+ if ( $opts{c} && $Conf{EMailAdminUserName} ne "" ) {
+ my $headers = $Conf{EMailHeaders};
+ $headers .= "\n" if ( $headers !~ /\n$/ );
+ my $mesg = <<EOF;
+To: $Conf{EMailAdminUserName}
+Subject: BackupPC: can't connect to server
+$headers
+Error: cannot connect to BackupPC server.
+
+Regards,
+PC Backup Genie
+EOF
+ SendMail($mesg);
+ exit(1);
+ }
print("Can't connect to server ($err)\n");
exit(1);
}
+exit(0) if ( $opts{c} );
my $reply = $bpc->ServerMesg("status hosts");
$reply = $1 if ( $reply =~ /(.*)/s );
my(%Status, %Info, %Jobs, @BgQueue, @UserQueue, @CmdQueue);
eval($reply);
+###########################################################################
+# Generate test message if required
+###########################################################################
+if ( $opts{u} ne "" ) {
+ my $headers = $Conf{EMailHeaders};
+ $headers .= "\n" if ( $headers !~ /\n$/ );
+ my $mesg = <<EOF;
+To: $opts{u}
+Subject: BackupPC test email
+$headers
+This is a test message from $0.
+
+Regards,
+PC Backup Genie
+EOF
+ SendMail($mesg);
+ exit(0);
+}
+
###########################################################################
# Generate sysadmin warning messages
###########################################################################
${mesg}Regards,
PC Backup Genie
EOF
- if ( $opts{t} ) {
- print("#" x 75, "\n");
- print $mesg;
- } else {
- SendMail($mesg);
- }
+ SendMail($mesg);
}
###########################################################################
$subj =~ s/\$(\w+)/defined($vars->{$1}) ? $vars->{$1} : "\$$1"/eg;
$vars->{subj} = $subj;
$mesg =~ s/\$(\w+)/defined($vars->{$1}) ? $vars->{$1} : "\$$1"/eg;
- if ( $opts{t} ) {
- print("#" x 75, "\n");
- print $mesg;
- } else {
- SendMail($mesg);
- }
+ SendMail($mesg);
$UserEmailInfo{$user}{lastTime} = time;
$UserEmailInfo{$user}{lastSubj} = $subj;
$UserEmailInfo{$user}{lastHost} = $host;
sub SendMail
{
my($mesg) = @_;
- my($from) = $Conf{EMailFromUserName};
+ my $from = $Conf{EMailFromUserName};
+ my $utf8 = 1
+ if ( $Conf{EMailHeaders} =~ /Content-Type:.*charset="utf-?8"/i );
local(*MAIL);
+ if ( $opts{t} ) {
+ binmode(STDOUT, ":utf8") if ( $utf8 );
+ print("#" x 75, "\n");
+ print $mesg;
+ return;
+ }
$from = "-f $from" if ( $from ne "" );
+ print("Sending test email using $Conf{SendmailPath} -t $from\n")
+ if ( $opts{u} ne "" );
if ( !open(MAIL, "|$Conf{SendmailPath} -t $from") ) {
printf("Can't run sendmail ($Conf{SendmailPath}): $!\n");
return;
}
+ binmode(MAIL, ":utf8") if ( $utf8 );
print MAIL $mesg;
close(MAIL);
}
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
my %ActionDispatch = (
"summary" => "Summary",
- $Lang->{Start_Incr_Backup} => "StartStopBackup",
- $Lang->{Start_Full_Backup} => "StartStopBackup",
- $Lang->{Stop_Dequeue_Backup} => "StartStopBackup",
- $Lang->{Stop_Dequeue_Archive} => "StartStopBackup",
+ "Start_Incr_Backup" => "StartStopBackup",
+ "Start_Full_Backup" => "StartStopBackup",
+ "Stop_Dequeue_Backup" => "StartStopBackup",
+ "Stop_Dequeue_Archive" => "StartStopBackup",
"queue" => "Queue",
"view" => "View",
"LOGlist" => "LOGlist",
"emailSummary" => "EmailSummary",
"browse" => "Browse",
"dirHistory" => "DirHistory",
- $Lang->{Restore} => "Restore",
+ "Restore" => "Restore",
"RestoreFile" => "RestoreFile",
"hostInfo" => "HostInfo",
"generalInfo" => "GeneralInfo",
"restoreInfo" => "RestoreInfo",
"archiveInfo" => "ArchiveInfo",
- $Lang->{Start_Archive} => "Archive",
+ "Start_Archive" => "Archive",
"Archive" => "Archive",
"Reload" => "ReloadServer",
"startServer" => "StartServer",
#
# Set default actions, then call sub handler
#
-$In{action} ||= "hostInfo" if ( defined($In{host}) );
-$In{action} = "generalInfo" if ( !defined($ActionDispatch{$In{action}}) );
-my $action = $ActionDispatch{$In{action}};
+if ( !defined($ActionDispatch{$In{action}}) ) {
+ $In{action} = defined($In{host}) ? "hostInfo" : "generalInfo";
+}
+my $action = $ActionDispatch{$In{action}};
#
# For some reason under mod_perl, the use lib above is unreliable,
/*
* BackupPC standard CSS definitions
*
- * Version 2.1.0, released 20 Jun 2004.
+ * Version 3.0.0beta0, released 11 Jul 2006.
*
* See http://backuppc.sourceforge.net.
*
font-size:10pt;
}
+.editTextInput {
+ font-family:courier;
+}
+
.fviewheader {
font-weight:bold;
font-size:10pt;
'--group',
'-D',
'--links',
+ '--hard-links',
'--times',
'--block-size=2048',
'--recursive',
'--group',
'-D',
'--links',
+ '--hard-links',
'--times',
'--block-size=2048',
'--relative',
$Conf{EMailOutlookBackupMesg} = undef;
#
-# Additional email headers
+# Additional email headers. If you change the charset
+# to utf8 then BackupPC_sendEmail will use utf8 for
+# the email body.
#
$Conf{EMailHeaders} = <<EOF;
MIME-Version: 1.0
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006
+# Version 3.0.0alpha, released 8 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
# /var/log/BackupPC Pid, status and email info (was $TopDir/log)
#
-print <<EOF if ( !$opts{fhs} || !-f "/etc/BackupPC/config.pl" );
-
-Is this a new installation or upgrade for BackupPC? If this is
-an upgrade please tell me the full path of the existing BackupPC
-configuration file (eg: /etc/BackupPC/config.pl). Otherwise, just
-hit return.
-
-EOF
-
#
# Check if this is an upgrade, in which case read the existing
# config file to get all the defaults.
#
my $ConfigPath = "";
+my $ConfigFileOK = 1;
while ( 1 ) {
- if ( -f "/etc/BackupPC/config.pl" ) {
+ if ( $ConfigFileOK && -f "/etc/BackupPC/config.pl" ) {
$ConfigPath = "/etc/BackupPC/config.pl";
$opts{fhs} = 1 if ( !defined($opts{fhs}) );
+ print <<EOF;
+
+Found /etc/BackupPC/config.pl, so this is an upgrade of an
+existing BackupPC installation. We will verify some existing
+information, but you will probably not need to make any
+changes - just hit ENTER to each question.
+EOF
} else {
+ print <<EOF;
+
+Is this a new installation or upgrade for BackupPC? If this is
+an upgrade please tell me the full path of the existing BackupPC
+configuration file (eg: /etc/BackupPC/config.pl). Otherwise, just
+hit return.
+
+EOF
$ConfigPath = prompt("--> Full path to existing main config.pl",
$ConfigPath,
"config-path");
print("Need to specify a valid --config-path for upgrade\n");
exit(1);
}
+ $ConfigFileOK = 0;
}
$opts{fhs} = 1 if ( !defined($opts{fhs}) && $ConfigPath eq "" );
$opts{fhs} = 0 if ( !defined($opts{fhs}) );
#
if ( $opts{fhs} ) {
$Conf{TopDir} ||= "/data/BackupPC";
- $Conf{ConfDir} ||= "/etc/BackupPC";
+ $Conf{ConfDir} ||= $opts{"config-dir"} || "/etc/BackupPC";
$Conf{InstallDir} ||= "/usr/local/BackupPC";
- $Conf{LogDir} ||= "/var/log/BackupPC";
+ $Conf{LogDir} ||= $opts{"log-dir"} || "/var/log/BackupPC";
}
#
directory (these directories will be setup shortly).
The primary group for this user should also be chosen carefully.
-By default the install directories will have group write permission.
-The data directories and files will have group read permission but
-no other permission.
+The data directories and files will have group read permission,
+so group members can access backup files.
EOF
my($name, $passwd, $Uid, $Gid);
lib/BackupPC/Zip
) ) {
next if ( -d "$DestDir$Conf{InstallDir}/$dir" );
- mkpath("$DestDir$Conf{InstallDir}/$dir", 0, 0775);
+ mkpath("$DestDir$Conf{InstallDir}/$dir", 0, 0755);
if ( !-d "$DestDir$Conf{InstallDir}/$dir"
|| !my_chown($Uid, $Gid, "$DestDir$Conf{InstallDir}/$dir") ) {
die("Failed to create or chown $DestDir$Conf{InstallDir}/$dir\n");
#
foreach my $dir ( ($Conf{CgiImageDir}) ) {
next if ( $dir eq "" || -d $dir );
- mkpath("$DestDir$dir", 0, 0775);
+ mkpath("$DestDir$dir", 0, 0755);
if ( !-d "$DestDir$dir" || !my_chown($Uid, $Gid, "$DestDir$dir") ) {
die("Failed to create or chown $DestDir$dir");
} else {
# parameters and deleting ones that are no longer needed.
#
my $dest = "$DestDir$Conf{ConfDir}/config.pl";
-my ($newConf, $newVars) = ConfigParse("conf/config.pl");
+my ($distConf, $distVars) = ConfigParse("conf/config.pl");
my ($oldConf, $oldVars);
+my ($newConf, $newVars) = ($distConf, $distVars);
if ( -f $dest ) {
($oldConf, $oldVars) = ConfigParse($dest);
- $newConf = ConfigMerge($oldConf, $oldVars, $newConf, $newVars);
+ ($newConf, $newVars) = ConfigMerge($oldConf, $oldVars, $distConf, $distVars);
}
-$Conf{EMailFromUserName} ||= $Conf{BackupPCUser};
-$Conf{EMailAdminUserName} ||= $Conf{BackupPCUser};
#
-# Update various config parameters
+# Update various config parameters. The old config is in Conf{}
+# and the new config is an array in text form in $newConf->[].
#
+$Conf{EMailFromUserName} ||= $Conf{BackupPCUser};
+$Conf{EMailAdminUserName} ||= $Conf{BackupPCUser};
#
# Guess $Conf{CgiURL}
delete($Conf{SmbClientTimeout});
}
+#
+# Replace --devices with -D in RsyncArgs and RsyncRestoreArgs
+#
+foreach my $param ( qw(RsyncArgs RsyncRestoreArgs) ) {
+ next if ( !defined($newVars->{$param}) );
+ $newConf->[$newVars->{$param}]{text} =~ s/--devices/-D/g;
+}
+
+#
+# Merge any new user-editable parameters into CgiUserConfigEdit
+# by copying the old settings forward.
+#
+if ( defined($Conf{CgiUserConfigEdit}) ) {
+ #
+ # This is a real hack. The config file merging is done in text
+ # form without actually instantiating the new conf structure.
+ # So we need to extract the new hash of settings, update it,
+ # and merge the text. Ugh...
+ #
+ my $new;
+ my $str = $distConf->[$distVars->{CgiUserConfigEdit}]{text};
+
+ $str =~ s/^\s*\$Conf\{.*?\}\s*=\s*/\$new = /m;
+ eval($str);
+ foreach my $p ( keys(%$new) ) {
+ $new->{$p} = $Conf{CgiUserConfigEdit}{$p}
+ if ( defined($Conf{CgiUserConfigEdit}{$p}) );
+ }
+ $Conf{CgiUserConfigEdit} = $new;
+ my $d = Data::Dumper->new([$new], [*value]);
+ $d->Indent(1);
+ $d->Terse(1);
+ my $value = $d->Dump;
+ $value =~ s/(.*)\n/$1;\n/s;
+ $newConf->[$newVars->{CgiUserConfigEdit}]{text}
+ =~ s/(\s*\$Conf\{.*?\}\s*=\s*).*/$1$value/s;
+}
+
+#
+# Now backup and write the config file
+#
my $confCopy = "$dest.pre-__VERSION__";
if ( -f $dest && !-f $confCopy ) {
#
will need to do:
- Browse through the config file, $Conf{ConfDir}/config.pl,
- and make sure all the settings are correct. In particular, you
- will need to set the smb share password and user name, backup
- policies and check the email message headers and bodies.
+ and make sure all the settings are correct. In particular,
+ you will need to set \$Conf{CgiAdminUsers} so you have
+ administration privileges in the CGI interface.
- Edit the list of hosts to backup in $Conf{ConfDir}/hosts.
{
my($old, $oldVars, $new, $newVars) = @_;
my $posn = 0;
- my $res;
+ my($res, $resVars);
#
# Find which config parameters are not needed any longer
push(@$res, $new);
}
}
- return $res;
+ for ( my $i = 0 ; $i < @$res ; $i++ ) {
+ $resVars->{$res->[$i]{var}} = $i;
+ }
+ return ($res, $resVars);
}
sub my_chown
Set the configuration compression level to N. Default is 3
if Compress::Zlib is installed.
+=item B<--config-dir CONFIG_DIR>
+
+Configuration directory for new installations. Defaults
+to /etc/BackupPC with FHS. Automatically extracted
+from --config-path for existing installations.
+
=item B<--config-path CONFIG_PATH>
Path to the existing config.pl configuration file for BackupPC.
--install-dir /usr/local/BackupPC
+=item B<--log-dir LOG_DIR>
+
+Log directory. Defaults to /var/log/BackupPC with FHS.
+
=item B<--man>
Prints the manual page and exits.
=head2 Overview
BackupPC is a high-performance, enterprise-grade system for backing up
-Unix, Linux and WinXX PCs, desktops and laptops to a server's disk.
-BackupPC is highly configurable and easy to install and maintain.
+Unix, Linux, WinXX, and MacOSX PCs, desktops and laptops to a server's
+disk. BackupPC is highly configurable and easy to install and maintain.
Given the ever decreasing cost of disks and raid systems, it is now
practical and cost effective to backup a large number of machines onto
=item *
-A powerful http/cgi user interface allows administrators to view log
-files, configuration, current status and allows users to initiate and
-cancel backups and browse and restore files from backups.
+A powerful http/cgi user interface allows administrators to view
+the current status, edit configuration, add/delete hosts, view log
+files, and allows users to initiate and cancel backups and browse
+and restore files from backups.
=item *
The http/cgi user interface has internationalization (i18n) support,
-currently providing English, French, German, Spanish, Italian
-and Dutch.
+currently providing English, French, German, Spanish, Italian,
+Dutch and Portuguese-Brazilian.
=item *
-No client-side software is needed. On WinXX the standard smb
-protocol is used to extract backup data. On linux or unix clients,
-rsync or tar (over ssh/rsh/nfs) is used to extract backup data.
-Alternatively, rsync can also be used on WinXX (using cygwin),
-and Samba could be installed on the linux or unix client to
-provide smb shares).
+No client-side software is needed. On WinXX the standard smb protocol is
+used to extract backup data. On linux, unix or MacOSX clients, rsync or
+tar (over ssh/rsh/nfs) is used to extract backup data. Alternatively,
+rsync can also be used on WinXX (using cygwin), and Samba could be
+installed on the linux or unix client to provide smb shares).
=item *
=item Incremental Backup
-An incremental backup is a backup of files that have changed (based on
-their modification time) since the last successful full backup. For
-SMB and tar, BackupPC backups all files that have changed since one
-hour prior to the start of the last successful full backup. Rsync is
-more clever: any files whose attributes have changed (ie: uid, gid,
-mtime, modes, size) since the last full are backed up. Deleted, new
-files and renamed files are detected by Rsync incrementals.
-In constrast, SMB and tar incrementals are not able to detect deleted
-files, renamed files or new files whose modification time is prior to
-the last full dump.
+An incremental backup is a backup of files that have changed
+since the last successful full or incremental backup. Starting
+in BackupPC 3.0 multi-level incrementals are supported.
+A full backup has level 0. A new incremental of level N will
+backup all files that have changed since the most recent backup
+of a lower level. $Conf{IncrLevels} is used to specify the
+level of each successive incremental. The default value is
+all level 1, which makes the behavior the same as earlier
+versions of BackupPC: each incremental will back up all the
+files that changed since the last full (level 0).
+
+For SMB and tar, BackupPC uses the modification time (mtime) to
+determine which files have changed since the last lower-level
+backup. That mean SMB and tar incrementals are not able to detect
+deleted files, renamed files or new files whose modification time
+is prior to the last lower-level backup.
+
+Rsync is more clever: any files whose attributes have changed (ie: uid,
+gid, mtime, modes, size) since the last full are backed up. Deleted,
+new files and renamed files are detected by Rsync incrementals.
BackupPC can also be configured to keep a certain number of incremental
backups, and to keep a smaller number of very old incremental backups.
-(BackupPC does not support multi-level incremental backups, although it
-will in a future version.)
+If multi-level incrementals are specified then it is likely that
+more incrementals will need to be kept since lower-level incrementals
+(and the full backup) are needed to reconstruct a higher-level
+incremental.
-BackupPC's CGI interface "fills-in" incremental backups based on the
-last full backup, giving every backup a "full" appearance. This makes
-browsing and restoring backups easier.
+BackupPC "fills-in" incremental backups when browsing or restoring,
+based on the levels of each backup, giving every backup a "full"
+appearance. This makes browsing and restoring backups much easier:
+you can restore from any one backup independent of whether it was
+an incremental or full.
=item Partial Backup
=item Other Programs of Interest
If you want to mirror linux or unix files or directories to a remote server
-you should use rsync, L<http://rsync.samba.org>. BackupPC now uses
+you should use rsync, L<http://rsync.samba.org>. BackupPC uses
rsync as a transport mechanism; if you are already an rsync user you
can think of BackupPC as adding efficient storage (compression and
pooling) and a convenient user interface to rsync.
-Unison is a utility that can do two-way, interactive, synchronization.
-See L<http://freshmeat.net/projects/unison>. An external wrapper around
-rsync that maintains transfer data to enable two-way synchronization is
-drsync; see L<http://freshmeat.net/projects/drsync>.
-
Two popular open source packages that do tape backup are
Amanda (L<http://www.amanda.org>)
and Bacula (L<http://www.bacula.org>).
Various programs and scripts use rsync to provide hardlinked backups.
See, for example, Mike Rubel's site (L<http://www.mikerubel.org/computers/rsync_snapshots>),
JW Schultz's dirvish (L<http://www.dirvish.org/>),
-Ben Escoto's rdiff-backup (L<http://rdiff-backup.stanford.edu>),
+Ben Escoto's rdiff-backup (L<http://www.nongnu.org/rdiff-backup>),
and John Bowman's rlbackup (L<http://www.math.ualberta.ca/imaging/rlbackup>).
+Unison is a utility that can do two-way, interactive, synchronization.
+See L<http://freshmeat.net/projects/unison>. An external wrapper around
+rsync that maintains transfer data to enable two-way synchronization is
+drsync; see L<http://freshmeat.net/projects/drsync>.
+
BackupPC provides many additional features, such as compressed storage,
hardlinking any matching files (rather than just files with the same name),
-and storing special files without root privileges. But these other scripts
-provide simple and effective solutions and are definitely worthy of
+and storing special files without root privileges. But these other programs
+provide simple, effective and fast solutions and are definitely worthy of
consideration.
=back
If you are using smb to backup WinXX machines you need smbclient and
nmblookup from the samba package. You will also need nmblookup if
you are backing up linux/unix DHCP machines. See L<http://www.samba.org>.
-Version 2.2.0 or later of Samba is required.
Samba versions 3.x are stable and now recommended instead of 2.x.
See L<http://www.samba.org> for source and binaries. It's pretty easy to
1.13.7 at a minimum, with version 1.13.20 or higher recommended. Use
"tar --version" to check your version. Various GNU mirrors have the newest
versions of tar, see for example L<http://www.funet.fi/pub/gnu/alpha/gnu/tar>.
-As of June 2003 the latest version is 1.13.25.
+As of July 2006 the latest version is 1.15.1.
=item *
If you are using rsync to backup linux/unix machines you should have
-version 2.5.5 or higher on each client machine. See
+version 2.6.3 or higher on each client machine. See
L<http://rsync.samba.org>. Use "rsync --version" to check your version.
For BackupPC to use Rsync you will also need to install the perl
File::RsyncP module, which is available from
L<http://perlrsync.sourceforge.net>.
-Version 0.52 or later is required.
+Version 0.70 or later is required.
=item *
In the future there might be packages for Gentoo and other
linux flavors. If the packaged version is older than the
released version then you will probably want to install the
-lastest version as described below.
+latest version as described below.
Otherwise, manually fetching and installing BackupPC is easy.
Start by downloading the latest version from
Archive::Zip, also from L<http://www.cpan.org>.
You can run "perldoc Archive::Zip" to see if this module is installed.
+=item XML::RSS
+
+To support the RSS feature you will need to install XML::RSS, also from
+L<http://www.cpan.org>. There is not need to install this module if you
+don't plan on using RSS. You can run "perldoc XML::RSS" to see if this
+module is installed.
+
=item File::RsyncP
To use rsync and rsyncd with BackupPC you will need to install File::RsyncP.
To build and install these packages, fetch the tar.gz file and
then run these commands:
- tar zxvf Archive-Zip-1.01.tar.gz
- cd Archive-Zip-1.01
+ tar zxvf Archive-Zip-1.16.tar.gz
+ cd Archive-Zip-1.16
perl Makefile.PL
make
make test
BackupPC-__VERSION__plN.diff
-where N is the patch level, eg: pl5 is patch-level 5. These
+where N is the patch level, eg: pl2 is patch-level 2. These
patch files are cumulative: you only need apply the last patch
file, not all the earlier patch files. If a patch file is
-available, eg: BackupPC-__VERSION__pl5.diff, you should apply
+available, eg: BackupPC-__VERSION__pl2.diff, you should apply
the patch after extracting the tar file:
# fetch BackupPC-__VERSION__.tar.gz
- # fetch BackupPC-__VERSION__pl5.diff
+ # fetch BackupPC-__VERSION__pl2.diff
tar zxf BackupPC-__VERSION__.tar.gz
cd BackupPC-__VERSION__
- patch -p0 < ../BackupPC-__VERSION__pl5.diff
+ patch -p0 < ../BackupPC-__VERSION__pl2.diff
perl configure.pl
A patch file includes comments that describe that bug fixes
perldoc configure.pl
+Starting with BackupPC 3.0.0, the configure.pl script by default
+complies with the file system hierarchy conventions. The major
+difference compared to earlier versions is that by default
+configuration files will be stored in /etc/BackupPC
+rather than below the data directory, __TOPDIR__/conf,
+and the log files will be stored in /var/log/BackupPC.
+rather than below the data directory, __TOPDIR__/log.
+
+If you are upgrading from an earlier version the configure.pl script
+will keep the configuration files and log files in their original
+location.
+
When you run configure.pl you will be prompted for the full paths
of various executables, and you will be prompted for the following
-information:
+information.
=over 4
On this installation, this is __BACKUPPCUSER__.
-For security purposes you might choose to configre the BackupPC
+For security purposes you might choose to configure the BackupPC
user with the shell set to /bin/false. Since you might need to
run some BackupPC programs as the BackupPC user for testing
purposes, you can use the -s option to su to explicitly run
a shell, eg:
su -s /bin/bash __BACKUPPCUSER__
-
-Depending upon your configuration you might also need
-the -l option.
+
+Depending upon your configuration you might also need the -l option.
=item Data Directory
=item Install Directory
You should decide where the BackupPC scripts, libraries and documentation
-should be installed, eg: /opt/local/BackupPC.
+should be installed, eg: /usr/local/BackupPC.
On this installation, this is __INSTALLDIR__.
=item CGI bin Directory
You should decide where the BackupPC CGI script resides. This will
-usually below Apache's cgi-bin directory.
+usually be below Apache's cgi-bin directory.
On this installation, this is __CGIDIR__.
serve them. This should be somewhere under Apache's DocumentRoot
directory.
+=item Config and Log directories
+
+In this installation the configuration and log directories are
+located in the following locations:
+
+ __CONFDIR__/config.pl main config file
+ __CONFDIR__/hosts hosts file
+ __CONFDIR__/pc/HOST.pl per-pc config file
+ __LOGDIR__/BackupPC log files, pid, status
+
+The configure.pl script doesn't prompt for these locations but
+they can be set for new installations using command-line options.
+
=back
=head2 Step 3: Setting up config.pl
After running configure.pl, browse through the config file,
-__TOPDIR__/conf/config.pl, and make sure all the default settings
+__CONFDIR__/config.pl, and make sure all the default settings
are correct. In particular, you will need to decide whether to use
smb, tar or rsync transport (or whether to set it on a per-PC basis)
and set the relevant parameters for that transport method.
=head2 Step 4: Setting up the hosts file
-The file __TOPDIR__/conf/hosts contains the list of clients to backup.
+The file __CONFDIR__/hosts contains the list of clients to backup.
BackupPC reads this file in three cases:
=over 4
=head2 Step 5: Client Setup
-Two methods for getting backup data from a client are supported: smb and
-tar. Smb or rsync are the preferred methods for WinXX clients and rsync or
-tar are the preferred methods for linux/unix clients.
+Three methods for getting backup data from a client are supported: smb,
+tar and rsync. Smb or rsync are the preferred methods for WinXX clients
+and rsync or tar are the preferred methods for linux/unix/MacOSX clients.
The transfer method is set using the $Conf{XferMethod} configuration
setting. If you have a mixed environment (ie: you will use smb for some
=item *
As a configuration variable $Conf{SmbSharePasswd} in
-__TOPDIR__/conf/config.pl. If you put the password
+__CONFDIR__/config.pl. If you put the password
here you must make sure this file is not world (other) readable.
=item *
As a configuration variable $Conf{SmbSharePasswd} in the per-PC
-configuration file, __TOPDIR__/pc/$host/config.pl. You will have to
-use this option if the smb share password is different for each host.
-If you put the password here you must make sure this file is not
-world (other) readable.
+configuration file (__CONFDIR__/pc/$host.pl or
+__TOPDIR__/pc/$host/config.pl in non-FHS versions of BackupPC).
+You will have to use this option if the smb share password is different
+for each host. If you put the password here you must make sure this file
+is not world (other) readable.
=back
=item rsync
-You should have at least rsync 2.5.5, and the latest version 2.5.6
-is recommended. Rsync is run on the remote client via rsh or ssh.
+You should have at least rsync 2.6.3, and the latest version is
+recommended. Rsync is run on the remote client via rsh or ssh.
The relevant configuration settings are $Conf{RsyncClientPath},
$Conf{RsyncClientCmd}, $Conf{RsyncClientRestoreCmd}, $Conf{RsyncShareName},
=item rsyncd
-You should have at least rsync 2.5.5, and the latest version 2.6.2
-is recommended. In this case the rsync daemon should be running on
+You should have at least rsync 2.6.3, and the latest version is
+recommended. In this case the rsync daemon should be running on
the client machine and BackupPC connects directly to it.
The relevant configuration settings are $Conf{RsyncdClientPort},
are some instructions for one way to setup ssh. (Check which version
of SSH you have by typing "ssh" or "man ssh".)
-=item Mac OS X
+=item MacOSX
In general this should be similar to Linux/Unix machines.
-Mark Stosberg reports that you can also use hfstar.
-See L<http://fink.sourceforge.net/pdb/package.php/hfstar>.
+In versions 10.4 and later, the native MacOSX tar works,
+and also supports resource forks. xtar is another option,
+and rsync works too (although the MacOSX-supplied rsync
+has an extension for extended attributes that is not
+compatible with standard rsync).
=item SSH Setup
(ie: it does an additional fork).
Any immediate errors will be printed to stderr and BackupPC will quit.
-Otherwise, look in __TOPDIR__/log/LOG and verify that BackupPC reports
+Otherwise, look in __LOGDIR__/LOG and verify that BackupPC reports
it has started and all is ok.
=head2 Step 7: Talking to BackupPC
option to su to explicitly run a shell, eg:
su -s /bin/bash __BACKUPPCUSER__
-
+
Depending upon your configuration you might also need
the -l option.
The jobs status should initially show just BackupPC_trashClean.
The hosts status should produce a list of every host you have listed
-in __TOPDIR__/conf/hosts as part of a big cryptic output line.
+in __CONFDIR__/hosts as part of a big cryptic output line.
You can also request that all hosts be queued:
it will be much easier to see what is going on. That's our
next subject.
-=head2 Step 8: CGI interface
+=head2 Step 8: Checking email delivery
+
+The script BackupPC_sendEmail sends status and error emails to
+the administrator and users. It is usually run each night
+by BackupPC_nightly.
+
+To verify that it can run sendmail and deliver email correctly
+you should ask it to send a test email to you:
+
+ su __BACKUPPCUSER__
+ __INSTALLDIR__/bin/BackupPC_sendEmail -u MYNAME@MYDOMAIN.COM
+
+BackupPC_sendEmail also takes a -c option that checks if BackupPC
+is running, and it sends an email to $Conf{EMailAdminUserName}
+if it is not. That can be used as a keep-alive check by adding
+
+ __INSTALLDIR__/bin/BackupPC_sendEmail -c
+
+to __BACKUPPCUSER__'s cron.
+
+The -t option to BackupPC_sendEmail causes it to print the email
+message instead of invoking sendmail to deliver the message.
+
+=head2 Step 9: CGI interface
The CGI interface script, BackupPC_Admin, is a powerful and flexible
way to see and control what BackupPC is doing. It is written for an
you try to copy the pool the target directory will occupy a lot more
space if the hardlinks aren't re-established.
-The GNU cp program with the -a option is aware of hardlinks and knows
-to re-establish them. So GNU cp -a is the recommended way to copy
-the data directory and pool. Don't forget to stop BackupPC while
-the copy runs.
-
-=item Compressing an existing pool
-
-If you are upgrading BackupPC and want to turn compression on you have
-two choices:
-
-=over 4
-
-=item *
-
-Simply turn on compression. All new backups will be compressed. Both old
-(uncompressed) and new (compressed) backups can be browsed and viewed.
-Eventually, the old backups will expire and all the pool data will be
-compressed. However, until the old backups expire, this approach could
-require 60% or more additional pool storage space to store both
-uncompressed and compressed versions of the backup files.
-
-=item *
-
-Convert all the uncompressed pool files and backups to compressed.
-The script __INSTALLDIR__/bin/BackupPC_compressPool does this.
-BackupPC must not be running when you run BackupPC_compressPool.
-Also, there must be no existing compressed backups when you
-run BackupPC_compressPool.
-
-BackupPC_compressPool compresses all the files in the uncompressed pool
-(__TOPDIR__/pool) and moves them to the compressed pool
-(__TOPDIR__/cpool). It rewrites the files in place, so that the
-existing hardlinks are not disturbed.
-
-=back
-
-The rest of this section discusses how to run BackupPC_compressPool.
-
-BackupPC_compressPool takes three command line options:
-
-=over 4
-
-=item -t
-
-Test mode: do everything except actually replace the pool files.
-Useful for estimating total run time without making any real
-changes.
-
-=item -r
-
-Read check: re-read the compressed file and compare it against
-the original uncompressed file. Can only be used in test mode.
-
-=item -c #
-
-Number of children to fork. BackupPC_compressPool can take a long time
-to run, so to speed things up it spawns four children, each working on a
-different part of the pool. You can change the number of children with
-the -c option.
-
-=back
-
-Here are the recommended steps for running BackupPC_compressPool:
-
-=over 4
-
-=item *
-
-Stop BackupPC (eg: "/etc/init.d/backuppc stop").
-
-=item *
-
-Set $Conf{CompressLevel} to a non-zero number (eg: 3).
-
-=item *
-
-Do a dry run of BackupPC_compressPool. Make sure you run this as
-the BackupPC user (__BACKUPPCUSER__):
-
- BackupPC_compressPool -t -r
-
-The -t option (test mode) makes BackupPC_compressPool do all the steps,
-but not actually change anything. The -r option re-reads the compressed
-file and compares it against the original.
-
-BackupPC_compressPool gives a status as it completes each 1% of the job.
-It also shows the cumulative compression ratio and estimated completion
-time. Once you are comfortable that things look ok, you can kill
-BackupPC_compressPool or wait for it to finish.
-
-=item *
-
-Now you are ready to run BackupPC_compressPool for real. Once again,
-as the BackupPC user (__BACKUPPCUSER__), run:
-
- BackupPC_compressPool
-
-You should put the output into a file and tail this file. (The running
-time could be twice as long as the test mode since the test mode file
-writes are immediately followed by an unlink, so in test mode it is
-likely the file writes never make it to disk.)
-
-It is B<critical> that BackupPC_compressPool runs to completion before
-re-starting BackupPC. Before BackupPC_compressPool completes, none of
-the existing backups will be in a consistent state. If you must stop
-BackupPC_compressPool for some reason, send it an INT or TERM signal
-and give it several seconds (or more) to clean up gracefully.
-After that, you can re-run BackupPC_compressPool and it will start
-again where it left off. Once again, it is critical that it runs
-to 100% completion.
-
-=back
-
-After BackupPC_compressPool completes you should have a complete set
-of compressed backups (and your disk usage should be lower). You
-can now re-start BackupPC.
+The best way to copy a pool file system, if possible, is by copying
+the raw device at the block level (eg: using dd). Application level
+programs that understand hardlinks include the GNU cp program with
+the -a option and rsync -H. However, the large number of hardlinks
+in the pool will make the memory usage large and the copy very slow.
+Don't forget to stop BackupPC while the copy runs.
=back
Press the "Start the Archive" to start archiving the selected hosts with the
parameters displayed.
+=head1 Other CGI Functions
+
+=head2 Configuration and Host Editor
+
+The CGI interface has a complete configuration and host editor.
+Only the administrator can edit the main configuration settings
+and hosts. The edit links are in the left navigation bar.
+
+When changes are made to any parameter a "Save" button appears
+at the top of the page. If you are editing a text box you will
+need to click outside of the text box to make the Save button
+appear. If you don't select Save then the changes won't be saved.
+
+The host-specific configuration can be edited from the host
+summary page using the link in the left navigation bar.
+The administrator can edit any of the host-specific
+configuration settings.
+
+When editing the host-specific configuration, each parameter has
+an "override" setting that denotes the value is host-specific,
+meaning that it overrides the setting in the main configuration.
+If you unselect "override" then the setting is removed from
+the host-specific configuration, and the main configuration
+file is displayed.
+
+User's can edit their host-specific configuration if enabled
+via $Conf{CgiUserConfigEditEnable}. The specific subset
+of configuration settings that a user can edit is specified
+with $Conf{CgiUserConfigEdit}. It is recommended to make this
+list short as possible (you probably don't want your users saving
+dozens of backups) and it is essential that they can't edit any
+of the Cmd configuration settings, otherwise they can specify
+an arbitrary command that will be executed as the BackupPC
+user.
+
+=head2 RSS
+
+BackupPC supports a very basic RSS feed. Provided you have the
+XML::RSS perl module installed, a URL simular to this will
+provide RSS information:
+
+ http://localhost/cgi-bin/BackupPC/BackupPC_Admin?action=rss
+
+This feature is experimental. The information included will
+probably change.
+
=head1 BackupPC Design
=head2 Some design issues
=head2 BackupPC operation
BackupPC reads the configuration information from
-__TOPDIR__/conf/config.pl. It then runs and manages all the backup
+__CONFDIR__/config.pl. It then runs and manages all the backup
activity. It maintains queues of pending backup requests, user backup
requests and administrative commands. Based on the configuration various
requests will be executed simultaneously.
expired backups. Every 5 minutes it wakes up and removes all the files
in __TOPDIR__/trash.
-Also, once each night, BackupPC_nightly is run to complete some additional
-administrative tasks, such as cleaning the pool. This involves removing
-any files in the pool that only have a single hard link (meaning no backups
-are using that file). Again, to avoid race conditions, BackupPC_nightly
-is only run when there are no BackupPC_dump or BackupPC_link processes
-running. Therefore, when it is time to run BackupPC_nightly, no new
-backups are started and BackupPC waits until all backups have finished.
-Then BackupPC_nightly is run, and until it finishes no new backups are
-started. If BackupPC_nightly takes too long to run, the settings
-$Conf{MaxBackupPCNightlyJobs} and $Conf{BackupPCNightlyPeriod} can
-be used to run several BackupPC_nightly processes in parallel, and
-to split its job over several nights.
+Also, once each night, BackupPC_nightly is run to complete some
+additional administrative tasks, such as cleaning the pool. This
+involves removing any files in the pool that only have a single
+hard link (meaning no backups are using that file). Again, to
+avoid race conditions, BackupPC_nightly is only run when there
+are no BackupPC_link processes running. When BackupPC_nightly is
+run no new BackupPC_link jobs are started. If BackupPC_nightly
+takes too long to run, the settings $Conf{MaxBackupPCNightlyJobs}
+and $Conf{BackupPCNightlyPeriod} can be used to run several
+BackupPC_nightly processes in parallel, and to split its job over
+several nights.
=back
=head2 Storage layout
-BackupPC resides in three directories:
+BackupPC resides in several directories:
=over 4
The CGI script BackupPC_Admin resides in this cgi binary directory.
-=item __TOPDIR__
+=item __CONFDIR__
-All of BackupPC's data (PC backup images, logs, configuration information)
-is stored below this directory.
+All the configuration information resides below __CONFDIR__.
+This directory contains:
-=back
-
-Below __TOPDIR__ are several directories:
-
-=over 4
-
-=item __TOPDIR__/conf
-
-The directory __TOPDIR__/conf contains:
+The directory __CONFDIR__ contains:
=over 4
Hosts file, which lists all the PCs to backup.
+=item pc
+
+The directory __CONFDIR__/pc contains per-client configuration files
+that override settings in the main configuration file. Each file
+is named __CONFDIR__/pc/HOST.pl, where HOST is the host name.
+
+In pre-FHS versions of BackupPC these files were located in
+__TOPDIR__/pc/HOST/config.pl.
+
=back
-=item __TOPDIR__/log
+=item __LOGDIR__
-The directory __TOPDIR__/log contains:
+The directory __LOGDIR__ (__TOPDIR__/log on pre-FHS versions
+of BackupPC) contains:
=over 4
=back
+=item __TOPDIR__
+
+All of BackupPC's data (PC backup images, logs, configuration information)
+is stored below this directory.
+
+=back
+
+Below __TOPDIR__ are several directories:
+
+=over 4
+
=item __TOPDIR__/trash
Any directories and files below this directory are periodically deleted
Current log file for this PC from BackupPC_dump.
-=item LOG.0 or LOG.0.z
+=item LOG.DDMMYYYY or LOG.DDMMYYYY.z
Last month's log file. Log files are aged monthly and compressed
(if compression is enabled), and old LOG files are deleted.
+In earlier versions of BackupPC these files used to have
+a suffix of 0, 1, ....
=item XferERR or XferERR.z
=item config.pl
-Optional configuration settings specific to this host. Settings in this
-file override the main configuration file.
+Old location of optional configuration settings specific to this host.
+Settings in this file override the main configuration file.
+In new versions of BackupPC the per-host configuration files are
+stored in __CONFDIR__/pc/HOST.pl.
=item backups
=head1 Configuration File
-The BackupPC configuration file resides in __TOPDIR__/conf/config.pl.
-Optional per-PC configuration files reside in __TOPDIR__/pc/$host/config.pl.
+The BackupPC configuration file resides in __CONFDIR__/config.pl.
+Optional per-PC configuration files reside in __CONFDIR__/pc/$host.pl
+(or __TOPDIR__/pc/$host/config.pl in non-FHS versions of BackupPC).
This file can be used to override settings just for a particular PC.
=head2 Modifying the main configuration file
sure your kill -HUP worked. Errors in parsing the configuration file are
also reported in the LOG file.
-The optional per-PC configuration file (__TOPDIR__/pc/$host/config.pl)
+The optional per-PC configuration file (__CONFDIR__/pc/$host.pl or
+__TOPDIR__/pc/$host/config.pl in non-FHS versions of BackupPC)
is read whenever it is needed by BackupPC_dump, BackupPC_link and others.
-=head2 Configuration file includes
-
-If you have a heterogeneous set of clients (eg: a variety of WinXX and
-linux/unix machines) you will need to create host-specific config.pl files
-for some or all of these machines to customize the default settings from
-the master config.pl file (at a minimum to set $Conf{XferMethod}).
-
-Since the config.pl file is just regular perl code, you can include
-one config file from another. For example, imagine you had three general
-classes of machines: WinXX desktops, linux machines in the DMZ and
-linux desktops. You could create three config files in __TOPDIR__/conf:
-
- __TOPDIR__/conf/ConfigWinDesktop.pl
- __TOPDIR__/conf/ConfigLinuxDMZ.pl
- __TOPDIR__/conf/ConfigLinuxDesktop.pl
-
-From each client's directory you can either add a symbolic link to
-the appropriate config file:
-
- cd __TOPDIR__/pc/$host
- ln -s ../../conf/ConfigWinDesktop.pl config.pl
-
-or, better yet, create a config.pl file in __TOPDIR__/pc/$host
-that includes the default config.pl file using perl's "do"
-command:
-
- do "__TOPDIR__/conf/ConfigWinDesktop.pl";
-
-This alternative allows you to set other configuration options
-specific to each host after the "do" command (perhaps even
-overriding the settings in the included file).
-
-Note that you could also include snippets of configuration settings
-from the main configuration file. However, be aware that the
-modification-time checking that BackupPC does only applies to the
-main configuration file: if you change one of the included files,
-BackupPC won't notice. You will need to either touch the main
-configuration file too, or send BackupPC a HUP (-1) signal.
-
=head1 Configuration Parameters
The configuration parameters are divided into five general groups.
=head1 Copyright
-Copyright (C) 2001-2005 Craig Barratt
+Copyright (C) 2001-2006 Craig Barratt
=head1 Credits
Reginaldo Ferreira provided the Portuguese Brazillian translation
pt_br.pm for v2.2.0.
+Rich Duzenbury provided the RSS feed option to the CGI interface.
+
Many people have reported bugs, made useful suggestions and helped
with testing; see the ChangeLog and the mail lists.
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
use BackupPC::Config::Meta qw(:all);
use BackupPC::Storage;
use Data::Dumper;
+use Encode;
our %ConfigMenu = (
server => {
$bpc->ServerConnect();
if ( $mesg ne "" ) {
(my $mesgBR = $mesg) =~ s/\n/<br>\n/g;
- $content .= <<EOF;
-<tr><td colspan="2" class="border"><span class="editComment">$mesgBR</span></td></tr>
-EOF
+ # uncomment this if you want the changes to be displayed
+# $content .= <<EOF;
+#<tr><td colspan="2" class="border"><span class="editComment">$mesgBR</span></td></tr>
+#EOF
foreach my $str ( split(/\n/, $mesg) ) {
$bpc->ServerMesg("log $str") if ( $str ne "" );
}
#
foreach my $var ( keys(%In) ) {
next if ( $var !~ /^orig_z_/ );
+ my $val = decode_utf8($In{$var});
$contentHidden .= <<EOF;
-<input type="hidden" name="$var" value="${EscHTML($In{$var})}">
+<input type="hidden" name="$var" value="${EscHTML($val)}">
EOF
}
}
$size = $type->{size} if ( defined($type->{size}) );
#
- # These fragments allow inline conent to be turned on and off
+ # These fragments allow inline content to be turned on and off
#
# <tr><td colspan="2"><span id="id_$varName" style="display: none" class="editComment">$comment</span></td></tr>
# <tr><td class="border"><a href="javascript: displayHelp('$varName')">$varName</a>
}
my $textType = ($varName =~ /Passwd/) ? "password" : "text";
$content .= <<EOF;
-<input type="$textType" name="v_z_$varName" size="$size" maxlength="256" value="${EscHTML($varValue)}"$onChange>
+<input type="$textType" class="editTextInput" name="v_z_$varName" size="$size" maxlength="256" value="${EscHTML($varValue)}"$onChange>
EOF
} elsif ( $type->{type} eq "boolean" ) {
# checkbox
my $rowCnt = $varValue =~ tr/\n//;
$rowCnt = 1 if ( $rowCnt < 1 );
$content .= <<EOF;
-<textarea name="v_z_$varName" cols="$size" rows="$rowCnt"$onChange>${EscHTML($varValue)}</textarea>
+<textarea name="v_z_$varName" class="editTextArea" cols="$size" rows="$rowCnt"$onChange>${EscHTML($varValue)}</textarea>
EOF
}
$content .= "</td>\n";
}
}
} else {
- $$value = $In{"v_z_$varName"};
+ $$value = decode_utf8($In{"v_z_$varName"});
$$value =~ s/\r\n/\n/g;
}
$$value = undef if ( $type->{undefIfEmpty} && $$value eq "" );
(my $valueNew2 = $valueNew) =~ s/['\n\r]//g;
(my $valueOld2 = $valueOld) =~ s/['\n\r]//g;
+
+ next if ( $valueOld2 eq $valueNew2 );
+
$valueNew =~ s/\n/\\n/g;
$valueOld =~ s/\n/\\n/g;
$valueNew =~ s/\r/\\r/g;
$valueOld =~ s/\r/\\r/g;
- $mesg .= eval("qq($Lang->{CfgEdit_Log_Change_param_value})")
- if ( $valueOld2 ne $valueNew2 );
+
+ $mesg .= eval("qq($Lang->{CfgEdit_Log_Change_param_value})");
}
}
return $mesg;
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
if ( @Backups ) {
# only allow incremental if there are already some backups
$startIncrStr = <<EOF;
-<input type="submit" value="\$Lang->{Start_Incr_Backup}" name="action">
+<input type="button" value="$Lang->{Start_Incr_Backup}"
+ onClick="document.StartStopForm.action.value='Start_Incr_Backup';
+ document.StartStopForm.submit();">
EOF
}
- $startIncrStr = eval ("qq{$startIncrStr}");
+ $startIncrStr = eval("qq{$startIncrStr}");
my $content = eval("qq{$Lang->{Host__host_Backup_Summary2}}");
Header(eval("qq{$Lang->{Host__host_Backup_Summary}}"), $content);
Trailer();
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
$MyURL = $ENV{SCRIPT_NAME};
$User = $ENV{REMOTE_USER};
+
#
- # Handle LDAP uid=user when using mod_authz_ldap
+ # Handle LDAP uid=user when using mod_authz_ldap and otherwise untaint
#
- $User = $1 if ( $User =~ /uid=([^,]+)/i );
+ $User = $1 if ( $User =~ /uid=([^,]+)/i || $User =~ /(.*)/ );
#
# Clean up %ENV for taint checking
EOF
my $hostSelectbox = "<option value=\"#\">$Lang->{Select_a_host}</option>";
my @hosts = GetUserHosts($Conf{CgiNavBarAdminAllHosts});
+ NavSectionTitle($Lang->{Hosts});
if ( defined($Hosts) && %$Hosts > 0 && @hosts ) {
- NavSectionTitle($Lang->{Hosts});
foreach my $host ( @hosts ) {
NavLink("?host=${EscURI($host)}", $host)
if ( @hosts < $Conf{CgiNavBarAdminAllHosts} );
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
{
my($str, $reply);
- my $start = 1 if ( $In{action} eq $Lang->{Start_Incr_Backup}
- || $In{action} eq $Lang->{Start_Full_Backup} );
- my $doFull = $In{action} eq $Lang->{Start_Full_Backup} ? 1 : 0;
+ my $start = 1 if ( $In{action} eq "Start_Incr_Backup"
+ || $In{action} eq "Start_Full_Backup" );
+ my $doFull = $In{action} eq "Start_Full_Backup" ? 1 : 0;
my $type = $doFull ? $Lang->{Type_full} : $Lang->{Type_incr};
my $host = $In{host};
my $Privileged = CheckPermission($host);
my $checkHost = $host;
$checkHost = $Conf{ClientNameAlias}
if ( $Conf{ClientNameAlias} ne "" );
- my $ipAddr = ConfirmIPAddress($checkHost);
+ my $ipAddr = ConfirmIPAddress($checkHost);
+ my $buttonText = $Lang->{$In{action}};
my $content = eval("qq{$Lang->{Are_you_sure_start}}");
Header(eval("qq{$Lang->{BackupPC__Start_Backup_Confirm_on__host}}"),$content);
} else {
$backoff = sprintf("%.1f",
($StatusHost{backoffTime} - time) / 3600);
}
+ my $buttonText = $Lang->{$In{action}};
my $content = eval ("qq{$Lang->{Are_you_sure_stop}}");
Header(eval("qq{$Lang->{BackupPC__Stop_Backup_Confirm_on__host}}"),
$content);
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
RestorePostUserCmd => {type => "string", undefIfEmpty => 1},
ArchivePreUserCmd => {type => "string", undefIfEmpty => 1},
ArchivePostUserCmd => {type => "string", undefIfEmpty => 1},
- UserCmdCheckStatus => "integer",
+ UserCmdCheckStatus => "boolean",
ClientNameAlias => {type => "string", undefIfEmpty => 1},
IncrKeepCnt => "boolean",
IncrKeepCntMin => "boolean",
IncrAgeMax => "boolean",
+ IncrLevels => "boolean",
PartialAgeMax => "boolean",
IncrFill => "boolean",
RestoreInfoKeepCnt => "boolean",
ArchivePostUserCmd => "boolean",
DumpPostShareCmd => "boolean",
DumpPreShareCmd => "boolean",
+ UserCmdCheckStatus => "boolean",
EMailNotifyMinDays => "boolean",
EMailFromUserName => "boolean",
EMailAdminUserName => "boolean",
EMailNotifyOldOutlookDays => "boolean",
EMailOutlookBackupSubj => "boolean",
EMailOutlookBackupMesg => "boolean",
+ EMailHeaders => "boolean",
},
},
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#!/bin/perl
#
+# by Ralph Passgang <ralph@debianbase.de> (30.06.2006 for V3.0.0)
# by Ralph Passgang <ralph@debianbase.de> (07.06.2004 for V2.1.0beta3)
# by Ralph Passgang <ralph@debianbase.de> (06.05.2004 for V2.1.0beta2)
# by Manfred Herrmann (11.03.2004 for V2.1.0beta0)
\${h1(qq{$Lang{Admin_Options}})}
<br>
\${h2("Server Steuerung")}
-<form action="\$MyURL" method="get">
+<form name="ReloadForm" action="\$MyURL" method="get">
+<input type="hidden" name="action" value="">
<table class="tableStnd">
- <!--<tr><td>Server stoppen:<td><input type="submit" name="action" value="Stop">-->
- <tr><td>Server Konfiguration neu laden:<td><input type="submit" name="action" value="Reload">
+ <tr><td>Server Konfiguration neu laden:<td><input type="button" value="Reload"
+ onClick="document.ReloadForm.action.value='Reload';
+ document.ReloadForm.submit();">
</table>
</form>
<!--
\${h2("Server Konfiguration")}
<ul>
- <li><i>Andere Optionen sind hier möglich ... z.B.,</i>
+ <li><i>Andere Optionen sind hier möglich ... z.B.</i>
<li>Server Konfiguration editieren
</ul>
-->
EOF
$Lang{Unable_to_connect_to_BackupPC_server} = "Kann keine Verbindung zu dem BackupPC Server herstellen!",
"Dieses CGI Script (\$MyURL) kann keine Verbindung zu dem BackupPC"
- . " Server auf \$Conf{ServerHost} Port \$Conf{ServerPort} herstellen. Der Fehler"
+ . " Server auf \$Conf{ServerHost} Port \$Conf{ServerPort} herstellen. Der Fehler"
. " war: \$err.",
"Möglicherweise ist der BackupPC Server Prozess nicht gestartet oder es besteht ein"
- . " Konfigurationsfehler. Bitte teilen Sie diese Fehlermeldung dem Systemadministrator mit.";
+ . " Konfigurationsfehler. Bitte teilen Sie diese Fehlermeldung dem Systemadministrator mit.";
$Lang{Admin_Start_Server} = <<EOF;
\${h1(qq{$Lang{Unable_to_connect_to_BackupPC_server}})}
<form action="\$MyURL" method="get">
<p>
\$generalInfo
-\${h2("Aktuell laufende Aufträge")}
+\${h2("Zur Zeit aktive Aufträge")}
<p>
<table class="tableStnd" border cellspacing="1" cellpadding="3">
<tr class="tableheader"><td> Computer </td>
<table class="tableStnd" border cellspacing="1" cellpadding="3">
\$paramStr
<tr>
- <td colspan=2><input type="submit" value="Archivierung starten" name=""></td>
+ <td colspan=2><input type="submit" value="Archivierung starten" name="ignore"></td>
</tr>
</form>
</table>
<p>
Sie starten ein \$type Backup für \$host.
-<form action="\$MyURL" method="get">
+<form name="Confirm" action="\$MyURL" method="get">
<input type="hidden" name="host" value="\$host">
<input type="hidden" name="hostIP" value="\$ipAddr">
<input type="hidden" name="doit" value="1">
+<input type="hidden" name="action" value="">
Möchten Sie das wirklich tun?
-<input type="submit" value="\$In{action}" name="action">
-<input type="submit" value="Nein" name="">
+<input type="button" value="\$buttonText"
+ onClick="document.Confirm.action.value='\$In{action}';
+ document.Confirm.submit();">
+<input type="submit" value="Nein" name="ignore">
</form>
EOF
# --------------------------------
<p>
Sie werden Backups abbrechen bzw. Aufträge löschen für Computer \$host;
-<form action="\$MyURL" method="get">
-<input type="hidden" name="host" value="\$host">
-<input type="hidden" name="doit" value="1">
+<form name="Confirm" action="\$MyURL" method="get">
+<input type="hidden" name="host" value="\$host">
+<input type="hidden" name="doit" value="1">
+<input type="hidden" name="action" value="">
Zusätzlich bitte keine Backups starten für die Dauer von
<input type="text" name="backoff" size="10" value="\$backoff"> Stunden.
<p>
Möchten Sie das wirklich tun?
-<input type="submit" value="\$In{action}" name="action">
-<input type="submit" value="Nein" name="">
+<input type="button" value="\$buttonText"
+ onClick="document.Confirm.action.value='\$In{action}';
+ document.Confirm.submit();">
+<input type="submit" value="Nein" name="ignore">
</form>
EOF
$Lang{Backup_Queue_Summary} = <<EOF;
\${h1("Backup Warteschlangen Übersicht")}
<br><br>
-\${h2("Übersicht Benutzer Aufträge in der Warteschlange")}
+\${h2("Übersicht Benutzeraufträge in der Warteschlange")}
<p>
-Die folgenden Benutzer Aufträge sind eingereiht:
+Die folgenden Benutzeraufträge sind eingereiht:
</p>
<table class="tableStnd" border cellspacing="1" cellpadding="3" width="80%">
<tr class="tableheader"><td> Computer </td>
\${h2("Übersicht Hintergrund Aufträge in der Warteschlange")}
<p>
-Die folgenden Hintergrund Aufträge sind eingereiht:
+Die folgenden Hintergrundaufträge sind eingereiht:
</p>
<table class="tableStnd" border cellspacing="1" cellpadding="3" width="80%">
<tr class="tableheader"><td> Computer </td>
<br><br>
\${h2("Übersicht Kommando Aufträge in der Warteschlange")}
<p>
-Die folgenden Kommando Aufträge sind eingereiht:
+Die folgenden Kommandoaufträge sind eingereiht:
</p>
<table class="tableStnd" border cellspacing="1" cellpadding="3" width="80%">
<tr class="tableheader"><td> Computer </td>
# ------------------------------
-$Lang{Browse_backup__num_for__host} = "BackupPC: Browsen des Backups \$num für Computer \$host";
+$Lang{Browse_backup__num_for__host} = "BackupPC: Durchsuchen des Backups \$num für Computer \$host";
# ------------------------------
-$Lang{Restore_Options_for__host} = "BackupPC: Restore Optionen für \$host";
+$Lang{Restore_Options_for__host} = "BackupPC: Wiederherstellungsoptionen für \$host";
$Lang{Restore_Options_for__host2} = <<EOF;
\${h1("Restore Optionen für \$host")}
<p>
-Sie haben die folgenden Dateien/Verzeichnisse von der Freigabe \$share aus dem Backup mit der Nnummer #\$num selektiert:
+Sie haben die folgenden Dateien/Verzeichnisse von der Freigabe \$share aus dem Backup mit der Nummer #\$num selektiert:
<ul>
\$fileListStr
</ul>
Sie können diese Wiederherstellung starten um die Dateien/Verzeichnisse direkt auf den Computer
\$host wiederherzustellen. Alternativ können Sie einen anderen Computer und/oder Freigabe als Ziel angeben.
</p><p>
-<b>Warnung:</b> alle aktuell existierenden Dateien/Verzeichnisse die bereits vorhanden sind
-werden überschrieben! (Tip: alternativ eine spezielle Freigabe erstellen mit Schreibrecht für den
+<b>Warnung:</b> alle aktuell existierenden Dateien/Verzeichnisse, die bereits vorhanden sind,
+werden überschrieben! (Tip: Alternativ eine spezielle Freigabe erstellen mit Schreibrecht für den
Backup-Benutzer und die wiederhergestellten Dateien/Verzeichnisse durch Stichproben prüfen, ob die beabsichtigte
Wiederherstellung korrekt ist.)
</p>
<td valign="top"><input type="text" size="40" maxlength="256"
value="\${EscHTML(\$pathHdr)}" name="pathHdr"></td>
</tr><tr>
- <td><input type="submit" value="Wiederherstellung starten" name=""></td>
+ <td><input type="submit" value="Wiederherstellung starten" name="ignore"></td>
</table>
</form>
EOF
Kompression (0=aus, 1=schnelle,...,9=höchste)
<input type="text" size="6" value="5" name="compressLevel">
<br>
-<input type="submit" value="Zip Datei downloaden" name="">
+<input type="submit" value="Zip Datei downloaden" name="ignore">
</form>
EOF
beliebige Dateien entpacken.
</p><p>
<b>Warnung:</b> Abhängig von der Anzahl und Größe der selektierten
-Dateien/Verzeichnisse kann die Tar Archiv Datei extrem groß bzw. zu groß werden. Der Download kann
+Dateien/Verzeichnisse kann die Tar-Archiv Datei extrem groß bzw. zu groß werden. Der Download kann
sehr lange dauern und der Speicherplatz auf Ihrem PC muß ausreichen. Selektieren Sie
evtl. die Dateien/Verzeichnisse erneut und lassen sehr große und unnötige Dateien weg.
</p>
\${EscHTML(\$pathHdr eq "" ? "/" : \$pathHdr)}
(andernfalls enthält die Archiv Datei vollständige Pfade).
<br>
-<input type="submit" value="Tar Datei downloaden" name="">
+<input type="submit" value="Tar Datei downloaden" name="ignore">
</form>
EOF
# ------------------------------
-$Lang{Restore_Confirm_on__host} = "BackupPC: Restore Confirm on \$host";
+$Lang{Restore_Confirm_on__host} = "BackupPC: Bestätigung für die Wiederherstellung auf \$host";
$Lang{Are_you_sure} = <<EOF;
\${h1("Sind Sie sicher?")}
\$fileListStr
</table>
-<form action="\$MyURL" method="post">
+<form name="RestoreForm" action="\$MyURL" method="post">
<input type="hidden" name="host" value="\${EscHTML(\$host)}">
<input type="hidden" name="hostDest" value="\${EscHTML(\$In{hostDest})}">
<input type="hidden" name="shareDest" value="\${EscHTML(\$In{shareDest})}">
<input type="hidden" name="pathHdr" value="\${EscHTML(\$In{pathHdr})}">
<input type="hidden" name="num" value="\$num">
<input type="hidden" name="type" value="4">
+<input type="hidden" name="action" value="">
\$hiddenStr
Wollen Sie das wirklich tun?
-<input type="submit" value="\$In{action}" name="action">
-<input type="submit" value="Nein" name="">
+<input type="button" value="\$Lang->{Restore}"
+ onClick="document.RestoreForm.action.value='Restore';
+ document.RestoreForm.submit();">
+<input type="submit" value="No" name="ignore">
</form>
EOF
</p>
\${h2("Benutzer Aktionen")}
<p>
-<form action="\$MyURL" method="get">
-<input type="hidden" name="host" value="\$host">
+<form name="StartStopForm" action="\$MyURL" method="get">
+<input type="hidden" name="host" value="\$host">
+<input type="hidden" name="action" value="">
\$startIncrStr
-<input type="submit" value="$Lang{Start_Full_Backup}" name="action">
-<input type="submit" value="$Lang{Stop_Dequeue_Backup}" name="action">
+<input type="button" value="\$Lang->{Start_Full_Backup}"
+ onClick="document.StartStopForm.action.value='Start_Full_Backup';
+ document.StartStopForm.submit();">
+<input type="button" value="\$Lang->{Stop_Dequeue_Backup}"
+ onClick="document.StartStopForm.action.value='Stop_Dequeue_Backup';
+ document.StartStopForm.submit();">
</form>
</p>
\${h2("Backup Übersicht")}
<p>
-Klicken Sie auf die Backupnummer um durch Dateien zu browsen und bei Bedarf wiederherzustellen.
+Klicken Sie auf die Backupnummer um die Dateien zu durchsuchen und bei Bedarf wiederherzustellen.
</p>
<table class="tableStnd" border cellspacing="1" cellpadding="3">
<tr class="tableheader"><td align="center"> Backup# </td>
<td align="center"> Typ </td>
<td align="center"> Filled </td>
- <td align="center"> ENG Level </td>
+ <td align="center"> Level </td>
<td align="center"> Start Zeitpunkt </td>
<td align="center"> Dauer/min </td>
<td align="center"> Alter/Tage </td>
<br><br>
EOF
-$Lang{Host__host_Archive_Summary} = "BackupPC: Host \$host Archive Summary";
+$Lang{Host__host_Archive_Summary} = "BackupPC: Host \$host Archiv Übersicht";
$Lang{Host__host_Archive_Summary2} = <<EOF;
\${h1("Host \$host Archiv Übersicht")}
<p>
\${h2("Benutzer Aktionen")}
<p>
-<form action="\$MyURL" method="get">
+<form name="StartStopForm" action="\$MyURL" method="get">
<input type="hidden" name="archivehost" value="\$host">
<input type="hidden" name="host" value="\$host">
-<input type="submit" value="$Lang{Start_Archive}" name="action">
-<input type="submit" value="$Lang{Stop_Dequeue_Archive}" name="action">
+<input type="hidden" name="action" value="">
+<input type="button" value="\$Lang->{Start_Archive}"
+ onClick="document.StartStopForm.action.value='Start_Archive';
+ document.StartStopForm.submit();">
+<input type="button" value="\$Lang->{Stop_Dequeue_Archive}"
+ onClick="document.StartStopForm.action.value='Stop_Dequeue_Archive';
+ document.StartStopForm.submit();">
</form>
\$ArchiveStr
<input type="hidden" name="host" value="\$host">
<input type="hidden" name="share" value="\${EscHTML(\$share)}">
<input type="hidden" name="fcbMax" value="\$checkBoxCnt">
-<input type="hidden" name="action" value="$Lang{Restore}">
+<input type="hidden" name="action" value="Restore">
<br>
<table width="100%">
<tr><td valign="top">
# -----------------------------------
# !! ERROR messages !!
# -----------------------------------
-$Lang{BackupPC__Lib__new_failed__check_apache_error_log} = "BackupPC::Lib->new failed: Überprüfen Sie die Apache error_log\n";
+$Lang{BackupPC__Lib__new_failed__check_apache_error_log} = "BackupPC::Lib->new failed: Überprüfen Sie das Apache error_log\n";
$Lang{Wrong_user__my_userid_is___} =
"Falscher Benutzer: Meine userid ist \$>, anstelle \$uid"
. "(\$Conf{BackupPCUser})\n";
$Lang{Only_privileged_users_can_view_log_or_config_files} = "Nur berechtigte Benutzer können Log oder Config Dateien einsehen.";
$Lang{Only_privileged_users_can_view_log_files} = "Nur berechtigte Benutzer können LOG Dateien einsehen.";
$Lang{Only_privileged_users_can_view_email_summaries} = "Nur berechtigte Benutzer können die Email Übersicht einsehen.";
-$Lang{Only_privileged_users_can_browse_backup_files} = "Nur berechtigte Benutzer können Backup Dateien browsen"
+$Lang{Only_privileged_users_can_browse_backup_files} = "Nur berechtigte Benutzer können Backup Dateien durchsuchen"
. " für computer \${EscHTML(\$In{host})}.";
$Lang{Empty_host_name} = "Kein Hostname.";
$Lang{Directory___EscHTML} = "Verzeichnis \${EscHTML(\"\$TopDir/pc/\$host/\$num\")}"
$Lang{Backups_are_deferred_for_hours_hours_change_this_number} = <<EOF;
<li>Backups sind für die nächsten \$hours Stunden deaktiviert.
-(<a href=\"\$MyURL?action=\${EscURI(\$Lang->{Stop_Dequeue_Archive})}&host=\$host\">diese Zeit ändern</a>).
+(<a href=\"\$MyURL?action=Stop_Dequeue_Backup&host=\$host\">diese Zeit ändern</a>).
EOF
$Lang{tryIP} = " und \$StatusHost{dhcpHostIP}";
</td></tr>
EOF
-#$Lang{on} = "on";
+#$Lang{on} = "an";
$Lang{off} = "aus";
$Lang{backupType_full} = "voll";
angeschlossen wird.
Mit freundlichen Grüßen,
-Ihr BackupServer
+Ihr BackupPC Server
http://backuppc.sourceforge.net
-http://www.zipptec.de
EOF
# No recent backup
Virenbefall unbrauchbar werden.
Mit freundlichen Grüßen,
-Ihr BackupServer
+Ihr BackupPC Server
http://backuppc.sourceforge.net
-http://www.zipptec.de
EOF
# Old Outlook files
$CgiURL?host=$host
Name und Passwort eingeben und dann 2 mal nacheinander
- auf "Starte Backup incrementell" klicken
+ auf "Starte Backup inkrementell" klicken
Klicken Sie auf "Gehe zurück zur ...home page" und beobachten Sie
den Status des Backup-Vorgangs (Browser von Zeit zu Zeit aktualisieren).
Das sollte je nach Dateigröße nur eine kurze Zeit dauern.
Mit freundlichen Grüßen,
-Ihr BackupServer
+Ihr BackupPC Server
http://backuppc.sourceforge.net
-http://www.zipptec.de
EOF
$Lang{howLong_not_been_backed_up} = "Backup nicht erfolgreich";
# RSS strings (all ENGLISH currently)
#######################################################################
$Lang{RSS_Doc_Title} = "BackupPC Server";
-$Lang{RSS_Doc_Description} = "RSS feed for BackupPC";
+$Lang{RSS_Doc_Description} = "RSS Feed für BackupPC";
$Lang{RSS_Host_Summary} = <<EOF;
#Voll: \$fullCnt;
Alter/Tagen: \$fullAge;
# Configuration editor strings (all ENGLISH currently)
#######################################################################
-$Lang{Only_privileged_users_can_edit_config_files} = "Only privileged users can edit configuation settings.";
-$Lang{CfgEdit_Edit_Config} = "Edit Config";
-$Lang{CfgEdit_Edit_Hosts} = "Edit Hosts";
+$Lang{Only_privileged_users_can_edit_config_files} = "Nur privilegierte Nutzer können die Administrationsoptionen ändern.";
+$Lang{CfgEdit_Edit_Config} = "Konfig ändern";
+$Lang{CfgEdit_Edit_Hosts} = "Hosts ändern";
$Lang{CfgEdit_Title_Server} = "Server";
-$Lang{CfgEdit_Title_General_Parameters} = "General Parameters";
-$Lang{CfgEdit_Title_Wakeup_Schedule} = "Wakeup Schedule";
-$Lang{CfgEdit_Title_Concurrent_Jobs} = "Concurrent Jobs";
-$Lang{CfgEdit_Title_Pool_Filesystem_Limits} = "Pool Filesystem Limits";
-$Lang{CfgEdit_Title_Other_Parameters} = "Other Parameters";
-$Lang{CfgEdit_Title_Remote_Apache_Settings} = "Remote Apache Settings";
-$Lang{CfgEdit_Title_Program_Paths} = "Program Paths";
-$Lang{CfgEdit_Title_Install_Paths} = "Install Paths";
+$Lang{CfgEdit_Title_General_Parameters} = "Allgemeine Einstellungen";
+$Lang{CfgEdit_Title_Wakeup_Schedule} = "Aktivierungsplan";
+$Lang{CfgEdit_Title_Concurrent_Jobs} = "gleichzeitige Aufträge";
+$Lang{CfgEdit_Title_Pool_Filesystem_Limits} = "Pooldateisystem Begrenzungen";
+$Lang{CfgEdit_Title_Other_Parameters} = "Andere Einstellungen";
+$Lang{CfgEdit_Title_Remote_Apache_Settings} = "Apache Remote Einstellungen";
+$Lang{CfgEdit_Title_Program_Paths} = "Programpfade";
+$Lang{CfgEdit_Title_Install_Paths} = "Installationspfade";
$Lang{CfgEdit_Title_Email} = "Email";
-$Lang{CfgEdit_Title_Email_settings} = "Email settings";
-$Lang{CfgEdit_Title_Email_User_Messages} = "Email User Messages";
+$Lang{CfgEdit_Title_Email_settings} = "Email Einstellungen";
+$Lang{CfgEdit_Title_Email_User_Messages} = "Email Benutzernachrichten";
$Lang{CfgEdit_Title_CGI} = "CGI";
-$Lang{CfgEdit_Title_Admin_Privileges} = "Admin Privileges";
-$Lang{CfgEdit_Title_Page_Rendering} = "Page Rendering";
-$Lang{CfgEdit_Title_Paths} = "Paths";
-$Lang{CfgEdit_Title_User_URLs} = "User URLs";
-$Lang{CfgEdit_Title_User_Config_Editing} = "User Config Editing";
+$Lang{CfgEdit_Title_Admin_Privileges} = "Admininistrationsprivilegien";
+$Lang{CfgEdit_Title_Page_Rendering} = "Seitenrendering";
+$Lang{CfgEdit_Title_Paths} = "Pfade";
+$Lang{CfgEdit_Title_User_URLs} = "Benutzer URLs";
+$Lang{CfgEdit_Title_User_Config_Editing} = "Benutzer Konfig ändern";
$Lang{CfgEdit_Title_Xfer} = "Xfer";
-$Lang{CfgEdit_Title_Xfer_Settings} = "Xfer Settings";
-$Lang{CfgEdit_Title_Smb_Settings} = "Smb Settings";
-$Lang{CfgEdit_Title_Tar_Settings} = "Tar Settings";
-$Lang{CfgEdit_Title_Rsync_Settings} = "Rsync Settings";
-$Lang{CfgEdit_Title_Rsyncd_Settings} = "Rsyncd Settings";
-$Lang{CfgEdit_Title_BackupPCd_Settings} = "BackupPCd Settings";
-$Lang{CfgEdit_Title_Archive_Settings} = "Archive Settings";
+$Lang{CfgEdit_Title_Xfer_Settings} = "Xfer Einstellungen";
+$Lang{CfgEdit_Title_Smb_Settings} = "Smb Einstellungen";
+$Lang{CfgEdit_Title_Tar_Settings} = "Tar Einstellungen";
+$Lang{CfgEdit_Title_Rsync_Settings} = "Rsync Einstellungen";
+$Lang{CfgEdit_Title_Rsyncd_Settings} = "Rsyncd Einstellungen";
+$Lang{CfgEdit_Title_BackupPCd_Settings} = "BackupPCd Einstellungen";
+$Lang{CfgEdit_Title_Archive_Settings} = "Archive Einstellungen";
$Lang{CfgEdit_Title_Include_Exclude} = "Include/Exclude";
-$Lang{CfgEdit_Title_Smb_Paths_Commands} = "Smb Paths/Commands";
-$Lang{CfgEdit_Title_Tar_Paths_Commands} = "Tar Paths/Commands";
-$Lang{CfgEdit_Title_Rsync_Paths_Commands_Args} = "Rsync Paths/Commands/Args";
-$Lang{CfgEdit_Title_Rsyncd_Port_Args} = "Rsyncd Port/Args";
-$Lang{CfgEdit_Title_Archive_Paths_Commands} = "Archive Paths/Commands";
-$Lang{CfgEdit_Title_Schedule} = "Schedule";
-$Lang{CfgEdit_Title_Full_Backups} = "Full Backups";
-$Lang{CfgEdit_Title_Incremental_Backups} = "Incremental Backups";
+$Lang{CfgEdit_Title_Smb_Paths_Commands} = "Smb Pfade/Kommandos";
+$Lang{CfgEdit_Title_Tar_Paths_Commands} = "Tar Pfade/Kommandos";
+$Lang{CfgEdit_Title_Rsync_Paths_Commands_Args} = "Rsync Pfade/Kommandos/Argumente";
+$Lang{CfgEdit_Title_Rsyncd_Port_Args} = "Rsyncd Port/Argumente";
+$Lang{CfgEdit_Title_Archive_Paths_Commands} = "Archive Pfade/Kommandos";
+$Lang{CfgEdit_Title_Schedule} = "Backupplan";
+$Lang{CfgEdit_Title_Full_Backups} = "volle Backups";
+$Lang{CfgEdit_Title_Incremental_Backups} = "inkrementelle Backups";
$Lang{CfgEdit_Title_Blackouts} = "Blackouts";
-$Lang{CfgEdit_Title_Other} = "Other";
-$Lang{CfgEdit_Title_Backup_Settings} = "Backup Settings";
-$Lang{CfgEdit_Title_Client_Lookup} = "Client Lookup";
-$Lang{CfgEdit_Title_Other} = "Other";
-$Lang{CfgEdit_Title_User_Commands} = "User Commands";
+$Lang{CfgEdit_Title_Other} = "Andere";
+$Lang{CfgEdit_Title_Backup_Settings} = "Backup Einstellungen";
+$Lang{CfgEdit_Title_Client_Lookup} = "Auflösen des Clients";
+$Lang{CfgEdit_Title_Other} = "Andere Werte";
+$Lang{CfgEdit_Title_User_Commands} = "Benutzer Kommandos";
$Lang{CfgEdit_Title_Hosts} = "Hosts";
$Lang{CfgEdit_Hosts_Comment} = <<EOF;
-To add a new host, select Add and then enter the name. To start with
-the per-host configuration from another host, enter the host name
-as NEWHOST=COPYHOST. This will overwrite any existing per-host
-configuration for NEWHOST. You can also do this for an existing
-host. To delete a host, hit the Delete button. For Add, Delete,
-and configuration copy, changes don't take effect until you select
-Save. None of the deleted host's backups will be removed,
-so if you accidently delete a host, simply re-add it. To completely
-remove a host's backups, you need to manually remove the files
-below \$topDir/pc/HOST
+Um einen neuen Hosts hinzuzufügen, wähle Hinzufügen und gib
+dann den Namen ein. Um mit der Konfigurationvorlage eines anderen Hosts
+zu beginnen, gib als Namen NEWHOST=COPYHOST ein. Dies wird alle
+bereits bestehenden hostspezifischen Einstellungen für NEWHOST
+mit den Werten von COPYHOST überschreiben. Du kannst dies auch für einen bereits
+bestehenden Hosts machen. Um einen Host zu löschen, wähle den Löschen Knopf.
+Das Hinzufügen, Löschen und Kopieren von Konfigurationen pro Host
+wird erst durch wählen von Speichern aktiviert. Bereits bestehende
+Backups werden beim Löschen eines Hosts nicht mitgelöscht. Nach einem
+erneuten Anlegen des selben Hosts sind alle alten Backups wieder verfügbar.
+Um Backups vollständig zu entfernen müssen die Dateien unter \$topDir/pc/HOST
+gelöscht werden.
EOF
$Lang{CfgEdit_Header_Main} = <<EOF;
-\${h1("Main Configuration Editor")}
+\${h1("Allgemeiner Konfigurationseditor")}
EOF
$Lang{CfgEdit_Header_Host} = <<EOF;
-\${h1("Host \$host Configuration Editor")}
+\${h1("Host \$host Konfigurationseditor")}
<p>
-Note: Check Override if you want to modify a value specific to this host.
+Beachte: Wähle Überschreiben, wenn du einen host spezifischen Wert verändern willst
EOF
-$Lang{CfgEdit_Button_Save} = "Save";
-$Lang{CfgEdit_Button_Insert} = "Insert";
-$Lang{CfgEdit_Button_Delete} = "Delete";
-$Lang{CfgEdit_Button_Add} = "Add";
-$Lang{CfgEdit_Button_Override} = "Override";
-$Lang{CfgEdit_Button_New_Key} = "New Key";
+$Lang{CfgEdit_Button_Save} = "Speichern";
+$Lang{CfgEdit_Button_Insert} = "Einfügen";
+$Lang{CfgEdit_Button_Delete} = "Löschen";
+$Lang{CfgEdit_Button_Add} = "Hinzufügen";
+$Lang{CfgEdit_Button_Override} = "Überschreiben";
+$Lang{CfgEdit_Button_New_Key} = "Neuer Schlüssel";
$Lang{CfgEdit_Error__must_be_an_integer}
- = "Error: \$var must be an integer";
+ = "Error: \$var muss eine Zahl sein";
$Lang{CfgEdit_Error__must_be_real_valued_number}
- = "Error: \$var must be a real-valued number";
+ = "Error: \$var muss eine ganze Zahl sein";
$Lang{CfgEdit_Error__entry__must_be_an_integer}
- = "Error: \$var entry \$k must be an integer";
+ = "Error: \$var Eintrag \$k muss eine Zahl sein";
$Lang{CfgEdit_Error__entry__must_be_real_valued_number}
- = "Error: \$var entry \$k must be a real-valued number";
+ = "Error: \$var Eintrag \$k muss eine ganze Zahl sein";
$Lang{CfgEdit_Error__must_be_executable_program}
- = "Error: \$var must be a valid executable path";
+ = "Error: \$var muss ein gültiger ausführbarer Pfad sein";
$Lang{CfgEdit_Error__must_be_valid_option}
- = "Error: \$var must be a valid option";
+ = "Error: \$var muss eine gültige Option sein";
$Lang{CfgEdit_Error_Copy_host_does_not_exist}
- = "Copy host \$copyHost doesn't exist; creating full host name \$fullHost. Delete this host if that is not what you wanted.";
+ = "Ursprungs Host \$copyHost existiert nicht; Erstelle den vollen Hostnamen \$fullHost. Lösche den Host wenn das nicht war, was du wolltest.";
$Lang{CfgEdit_Log_Copy_host_config}
- = "\$User copied config from host \$fromHost to \$host\n";
+ = "\$User hat die Konfig von host \$fromHost zu \$host kopiert\n";
$Lang{CfgEdit_Log_Delete_param}
- = "\$User deleted \$p from \$conf\n";
+ = "\$User hat \$p von \$conf gelöscht\n";
$Lang{CfgEdit_Log_Add_param_value}
- = "\$User added \$p to \$conf, set to \$value\n";
+ = "\$User hat \$p zu \$conf hinzugefügt und den Wert \$value gegeben\n";
$Lang{CfgEdit_Log_Change_param_value}
- = "\$User changed \$p in \$conf to \$valueNew from \$valueOld\n";
+ = "\$User änderte \$p in \$conf zu \$valueNew von \$valueOld\n";
$Lang{CfgEdit_Log_Host_Delete}
- = "\$User deleted host \$host\n";
+ = "\$User hat den Host \$host gelöscht\n";
$Lang{CfgEdit_Log_Host_Change}
- = "\$User host \$host changed \$key from \$valueOld to \$valueNew\n";
+ = "\$User Host \$host hat den Schlüssel \$key von \$valueOld zu \$valueNew geändert\n";
$Lang{CfgEdit_Log_Host_Add}
- = "\$User added host \$host: \$value\n";
+ = "\$User hat den Host \$host: \$value hinzugefügt\n";
#end of lang_de.pm
+
\${h1(qq{$Lang{Admin_Options}})}
<br>
\${h2("Server Control")}
-<form action="\$MyURL" method="get">
+<form name="ReloadForm" action="\$MyURL" method="get">
+<input type="hidden" name="action" value="">
<table class="tableStnd">
- <!--<tr><td>Stop the server:<td><input type="submit" name="action" value="Stop">-->
- <tr><td>Reload the server configuration:<td><input type="submit" name="action" value="Reload">
+ <tr><td>Reload the server configuration:<td><input type="button" value="Reload"
+ onClick="document.ReloadForm.action.value='Reload';
+ document.ReloadForm.submit();">
</table>
</form>
<!--
<table class="tableStnd" border cellspacing="1" cellpadding="3">
\$paramStr
<tr>
- <td colspan=2><input type="submit" value="Start the Archive" name=""></td>
+ <td colspan=2><input type="submit" value="Start the Archive" name="ignore"></td>
</tr>
</form>
</table>
<p>
You are about to start a \$type backup on \$host.
-<form action="\$MyURL" method="get">
+<form name="Confirm" action="\$MyURL" method="get">
<input type="hidden" name="host" value="\$host">
<input type="hidden" name="hostIP" value="\$ipAddr">
<input type="hidden" name="doit" value="1">
+<input type="hidden" name="action" value="">
Do you really want to do this?
-<input type="submit" value="\$In{action}" name="action">
-<input type="submit" value="No" name="">
+<input type="button" value="\$buttonText"
+ onClick="document.Confirm.action.value='\$In{action}';
+ document.Confirm.submit();">
+<input type="submit" value="No" name="ignore">
</form>
EOF
# --------------------------------
<p>
You are about to stop/dequeue backups on \$host;
-<form action="\$MyURL" method="get">
-<input type="hidden" name="host" value="\$host">
-<input type="hidden" name="doit" value="1">
+<form name="Confirm" action="\$MyURL" method="get">
+<input type="hidden" name="host" value="\$host">
+<input type="hidden" name="doit" value="1">
+<input type="hidden" name="action" value="">
Also, please don\'t start another backup for
<input type="text" name="backoff" size="10" value="\$backoff"> hours.
<p>
Do you really want to do this?
-<input type="submit" value="\$In{action}" name="action">
-<input type="submit" value="No" name="">
+<input type="button" value="\$buttonText"
+ onClick="document.Confirm.action.value='\$In{action}';
+ document.Confirm.submit();">
+<input type="submit" value="No" name="ignore">
</form>
EOF
<td valign="top"><input type="text" size="40" maxlength="256"
value="\${EscHTML(\$pathHdr)}" name="pathHdr"></td>
</tr><tr>
- <td><input type="submit" value="Start Restore" name=""></td>
+ <td><input type="submit" value="Start Restore" name="ignore"></td>
</table>
</form>
EOF
Compression (0=off, 1=fast,...,9=best)
<input type="text" size="6" value="5" name="compressLevel">
<br>
-<input type="submit" value="Download Zip File" name="">
+<input type="submit" value="Download Zip File" name="ignore">
</form>
EOF
to \${EscHTML(\$pathHdr eq "" ? "/" : \$pathHdr)}
(otherwise archive will contain full paths).
<br>
-<input type="submit" value="Download Tar File" name="">
+<input type="submit" value="Download Tar File" name="ignore">
</form>
EOF
\$fileListStr
</table>
-<form action="\$MyURL" method="post">
+<form name="RestoreForm" action="\$MyURL" method="post">
<input type="hidden" name="host" value="\${EscHTML(\$host)}">
<input type="hidden" name="hostDest" value="\${EscHTML(\$In{hostDest})}">
<input type="hidden" name="shareDest" value="\${EscHTML(\$In{shareDest})}">
<input type="hidden" name="pathHdr" value="\${EscHTML(\$In{pathHdr})}">
<input type="hidden" name="num" value="\$num">
<input type="hidden" name="type" value="4">
+<input type="hidden" name="action" value="">
\$hiddenStr
Do you really want to do this?
-<input type="submit" value="\$In{action}" name="action">
-<input type="submit" value="No" name="">
+<input type="button" value="\$Lang->{Restore}"
+ onClick="document.RestoreForm.action.value='Restore';
+ document.RestoreForm.submit();">
+<input type="submit" value="No" name="ignore">
</form>
EOF
</p>
\${h2("User Actions")}
<p>
-<form action="\$MyURL" method="get">
-<input type="hidden" name="host" value="\$host">
+<form name="StartStopForm" action="\$MyURL" method="get">
+<input type="hidden" name="host" value="\$host">
+<input type="hidden" name="action" value="">
\$startIncrStr
-<input type="submit" value="$Lang{Start_Full_Backup}" name="action">
-<input type="submit" value="$Lang{Stop_Dequeue_Backup}" name="action">
+<input type="button" value="\$Lang->{Start_Full_Backup}"
+ onClick="document.StartStopForm.action.value='Start_Full_Backup';
+ document.StartStopForm.submit();">
+<input type="button" value="\$Lang->{Stop_Dequeue_Backup}"
+ onClick="document.StartStopForm.action.value='Stop_Dequeue_Backup';
+ document.StartStopForm.submit();">
</form>
</p>
\${h2("Backup Summary")}
\${h2("User Actions")}
<p>
-<form action="\$MyURL" method="get">
+<form name="StartStopForm" action="\$MyURL" method="get">
<input type="hidden" name="archivehost" value="\$host">
<input type="hidden" name="host" value="\$host">
-<input type="submit" value="$Lang{Start_Archive}" name="action">
-<input type="submit" value="$Lang{Stop_Dequeue_Archive}" name="action">
+<input type="hidden" name="action" value="">
+<input type="button" value="\$Lang->{Start_Archive}"
+ onClick="document.StartStopForm.action.value='Start_Archive';
+ document.StartStopForm.submit();">
+<input type="button" value="\$Lang->{Stop_Dequeue_Archive}"
+ onClick="document.StartStopForm.action.value='Stop_Dequeue_Archive';
+ document.StartStopForm.submit();">
</form>
\$ArchiveStr
<input type="hidden" name="host" value="\$host">
<input type="hidden" name="share" value="\${EscHTML(\$share)}">
<input type="hidden" name="fcbMax" value="\$checkBoxCnt">
-<input type="hidden" name="action" value="$Lang{Restore}">
+<input type="hidden" name="action" value="Restore">
<br>
<table width="100%">
<tr><td valign="top">
$Lang{Backups_are_deferred_for_hours_hours_change_this_number} = <<EOF;
<li>Backups are deferred for \$hours hours
-(<a href=\"\$MyURL?action=\${EscURI(\$Lang->{Stop_Dequeue_Archive})}&host=\$host\">change this number</a>).
+(<a href=\"\$MyURL?action=Stop_Dequeue_Backup&host=\$host\">change this number</a>).
EOF
$Lang{tryIP} = " and \$StatusHost{dhcpHostIP}";
To: $user$domain
cc:
Subject: $subj
-
+$headers
Dear $userName,
Your PC ($host) has never been successfully backed up by our
To: $user$domain
cc:
Subject: $subj
-
+$headers
Dear $userName,
Your PC ($host) has not been successfully backed up for $days days.
To: $user$domain
cc:
Subject: $subj
-
+$headers
Dear $userName,
The Outlook files on your PC have $howLong.
\${h1(qq{$Lang{Admin_Options}})}
<br>
\${h2("Control del Servidor")}
-<form action="\$MyURL" method="get">
+<form name="ReloadForm" action="\$MyURL" method="get">
+<input type="hidden" name="action" value="">
<table class="tableStnd">
-<!--<tr><td>Para el servidor:<td><input type="submit" name="action" value="Stop">-->
- <tr><td>Actualizar configuración del servidor:<td><input type="submit" name="action" value="Reload">
+ <tr><td>Actualizar configuración del servidor:<td><input type="button" value="Reload"
+ onClick="document.ReloadForm.action.value='Reload';
+ document.ReloadForm.submit();">
</table>
</form>
<!--
<table class="tableStnd" border cellspacing="1" cellpadding="3">
\$paramStr
<tr>
- <td colspan=2><input type="submit" value="Start the Archive" name=""></td>
+ <td colspan=2><input type="submit" value="Start the Archive" name="ignore"></td>
</tr>
</form>
</table>
<p>
Va a hacer comenzar una copia de seguridad \$type en \$host.
-<form action="\$MyURL" method="get">
+<form name="Confirm" action="\$MyURL" method="get">
<input type="hidden" name="host" value="\$host">
<input type="hidden" name="hostIP" value="\$ipAddr">
<input type="hidden" name="doit" value="1">
+<input type="hidden" name="action" value="">
¿Realmente quiere hacer esto?
-<input type="submit" value="\$In{action}" name="action">
-<input type="submit" value="No" name="">
+<input type="button" value="\$buttonText"
+ onClick="document.Confirm.action.value='\$In{action}';
+ document.Confirm.submit();">
+<input type="submit" value="No" name="ignore">
</form>
EOF
# --------------------------------
<p>
Está a punto de parar/quitar de la cola las copias de seguridad en \$host;
-<form action="\$MyURL" method="get">
-<input type="hidden" name="host" value="\$host">
-<input type="hidden" name="doit" value="1">
+<form name="Confirm" action="\$MyURL" method="get">
+<input type="hidden" name="host" value="\$host">
+<input type="hidden" name="doit" value="1">
+<input type="hidden" name="action" value="">
Asimismo, por favor no empiece otra copia de seguridad durante
<input type="text" name="backoff" size="10" value="\$backoff"> horas.
<p>
¿Realmente quiere hacer esto?
-<input type="submit" value="\$In{action}" name="action">
-<input type="submit" value="No" name="">
+<input type="button" value="\$buttonText"
+ onClick="document.Confirm.action.value='\$In{action}';
+ document.Confirm.submit();">
+<input type="submit" value="No" name="ignore">
</form>
EOF
<td valign="top"><input type="text" size="40" maxlength="256"
value="\${EscHTML(\$pathHdr)}" name="pathHdr"></td>
</tr><tr>
- <td><input type="submit" value="Start Restore" name=""></td>
+ <td><input type="submit" value="Start Restore" name="ignore"></td>
</table>
</form>
EOF
Compresión (0=desactivada, 1=rápida,...,9=máxima)
<input type="text" size="6" value="5" name="compressLevel">
<br>
-<input type="submit" value="Download Zip File" name="">
+<input type="submit" value="Download Zip File" name="ignore">
</form>
EOF
relativo a \${EscHTML(\$pathHdr eq "" ? "/" : \$pathHdr)}
(en caso contrario el archivo contendrá las rutas completas).
<br>
-<input type="submit" value="Download Tar File" name="">
+<input type="submit" value="Download Tar File" name="ignore">
</form>
EOF
\$fileListStr
</table>
-<form action="\$MyURL" method="post">
+<form name="RestoreForm" action="\$MyURL" method="post">
<input type="hidden" name="host" value="\${EscHTML(\$host)}">
<input type="hidden" name="hostDest" value="\${EscHTML(\$In{hostDest})}">
<input type="hidden" name="shareDest" value="\${EscHTML(\$In{shareDest})}">
<input type="hidden" name="pathHdr" value="\${EscHTML(\$In{pathHdr})}">
<input type="hidden" name="num" value="\$num">
<input type="hidden" name="type" value="4">
+<input type="hidden" name="action" value="">
\$hiddenStr
¿Realmente quiere hacer esto?
-<input type="submit" value="\$In{action}" name="action">
-<input type="submit" value="No" name="">
+<input type="button" value="\$Lang->{Restore}"
+ onClick="document.RestoreForm.action.value='Restore';
+ document.RestoreForm.submit();">
+<input type="submit" value="No" name="ignore">
</form>
EOF
</p>
\${h2("Acciones del Usuario")}
<p>
-<form action="\$MyURL" method="get">
-<input type="hidden" name="host" value="\$host">
+<form name="StartStopForm" action="\$MyURL" method="get">
+<input type="hidden" name="host" value="\$host">
+<input type="hidden" name="action" value="">
\$startIncrStr
-<input type="submit" value="$Lang{Start_Full_Backup}" name="action">
-<input type="submit" value="$Lang{Stop_Dequeue_Backup}" name="action">
+<input type="button" value="\$Lang->{Start_Full_Backup}"
+ onClick="document.StartStopForm.action.value='Start_Full_Backup';
+ document.StartStopForm.submit();">
+<input type="button" value="\$Lang->{Stop_Dequeue_Backup}"
+ onClick="document.StartStopForm.action.value='Stop_Dequeue_Backup';
+ document.StartStopForm.submit();">
</form>
</p>
\${h2("Resumen de Copia de Seguridad")}
\${h2("Acciones de usuario")}
<p>
-<form action="\$MyURL" method="get">
+<form name="StartStopForm" action="\$MyURL" method="get">
<input type="hidden" name="archivehost" value="\$host">
<input type="hidden" name="host" value="\$host">
-<input type="submit" value="$Lang{Start_Archive}" name="action">
-<input type="submit" value="$Lang{Stop_Dequeue_Archive}" name="action">
+<input type="hidden" name="action" value="">
+<input type="button" value="\$Lang->{Start_Archive}"
+ onClick="document.StartStopForm.action.value='Start_Archive';
+ document.StartStopForm.submit();">
+<input type="button" value="\$Lang->{Stop_Dequeue_Archive}"
+ onClick="document.StartStopForm.action.value='Stop_Dequeue_Archive';
+ document.StartStopForm.submit();">
</form>
\$ArchiveStr
<input type="hidden" name="host" value="\$host">
<input type="hidden" name="share" value="\${EscHTML(\$share)}">
<input type="hidden" name="fcbMax" value="\$checkBoxCnt">
-<input type="hidden" name="action" value="$Lang{Restore}">
+<input type="hidden" name="action" value="Restore">
<br>
<table width="100%">
<tr><td valign="top">
$Lang{Backups_are_deferred_for_hours_hours_change_this_number} = <<EOF;
<li>Las copias de seguridad se retrasarán durante \$hours hours
-(<a href=\"\$MyURL?action=\${EscURI(\$Lang->{Stop_Dequeue_Archive})}&host=\$host\">Cambie este número</a>).
+(<a href=\"\$MyURL?action=Stop_Dequeue_Backup&host=\$host\">Cambie este número</a>).
EOF
$Lang{tryIP} = " y \$StatusHost{dhcpHostIP}";
\${h1(qq{$Lang{Admin_Options}})}
<br>
\${h2("Contrôle du serveur")}
-<form action="\$MyURL" method="get">
+<form name="ReloadForm" action="\$MyURL" method="get">
+<input type="hidden" name="action" value="">
<table class="tableStnd">
-<!--<tr><td>Arrêter le serveur:<td><input type="submit" name="action" value="Arrêter">-->
- <tr><td>Recharger la configuration:<td><input type="submit" name="action" value="Recharger">
+ <tr><td>Recharger la configuration:<td><input type="button" value="Recharger"
+ onClick="document.ReloadForm.action.value='Reload';
+ document.ReloadForm.submit();">
</table>
</form>
<!--
<table class="tableStnd" border cellspacing="1" cellpadding="3">
\$paramStr
<tr>
- <td colspan=2><input type="submit" value="Démarrer l'archivage" name=""></td>
+ <td colspan=2><input type="submit" value="Démarrer l'archivage" name="ignore"></td>
</tr>
</form>
</table>
<p>
Vous allez bientôt démarrer une sauvegarde \$type depuis \$host.
-<form action="\$MyURL" method="get">
+<form name="Confirm" action="\$MyURL" method="get">
<input type="hidden" name="host" value="\$host">
<input type="hidden" name="hostIP" value="\$ipAddr">
<input type="hidden" name="doit" value="1">
+<input type="hidden" name="action" value="">
Voulez-vous vraiment le faire ?
-<input type="submit" value="\$In{action}" name="action">
-<input type="submit" value="Non" name="">
+<input type="button" value="\$buttonText"
+ onClick="document.Confirm.action.value='\$In{action}';
+ document.Confirm.submit();">
+<input type="submit" value="Non" name="ignore">
</form>
EOF
# --------------------------------
<p>
Vous êtes sur le point d\'arrêter/supprimer de la file les sauvegardes de \$host;
-<form action="\$MyURL" method="get">
-<input type="hidden" name="host" value="\$host">
-<input type="hidden" name="doit" value="1">
+<form name="Confirm" action="\$MyURL" method="get">
+<input type="hidden" name="host" value="\$host">
+<input type="hidden" name="doit" value="1">
+<input type="hidden" name="action" value="">
En outre, prière de ne pas démarrer d\'autres sauvegarde pour
<input type="text" name="backoff" size="10" value="\$backoff"> heures.
<p>
Voulez-vous vraiment le faire ?
-<input type="submit" value="\$In{action}" name="action">
-<input type="submit" value="Non" name="">
+<input type="button" value="\$buttonText"
+ onClick="document.Confirm.action.value='\$In{action}';
+ document.Confirm.submit();">
+<input type="submit" value="Non" name="ignore">
</form>
EOF
<td valign="top"><input type="text" size="40" maxlength="256"
value="\${EscHTML(\$pathHdr)}" name="pathHdr"></td>
</tr><tr>
- <td><input type="submit" value="Démarrer la restauration" name=""></td>
+ <td><input type="submit" value="Démarrer la restauration" name="ignore"></td>
</table>
</form>
EOF
Compression (0=désactivée, 1=rapide,...,9=meilleure)
<input type="text" size="6" value="5" name="compressLevel">
<br>
-<input type="submit" value="Télécharger le fichier Zip" name="">
+<input type="submit" value="Télécharger le fichier Zip" name="ignore">
</form>
EOF
\${EscHTML(\$pathHdr eq "" ? "/" : \$pathHdr)}
(Autrement l\'archive contiendra des chemins absolus).
<br>
-<input type="submit" value="Télécharger le fichier Tar" name="">
+<input type="submit" value="Télécharger le fichier Tar" name="ignore">
</form>
EOF
\$fileListStr
</table>
-<form action="\$MyURL" method="post">
+<form name="RestoreForm" action="\$MyURL" method="post">
<input type="hidden" name="host" value="\${EscHTML(\$host)}">
<input type="hidden" name="hostDest" value="\${EscHTML(\$In{hostDest})}">
<input type="hidden" name="shareDest" value="\${EscHTML(\$In{shareDest})}">
<input type="hidden" name="pathHdr" value="\${EscHTML(\$In{pathHdr})}">
<input type="hidden" name="num" value="\$num">
<input type="hidden" name="type" value="4">
+<input type="hidden" name="action" value="">
\$hiddenStr
Voulez-vous vraiment le faire ?
-<input type="submit" value="\$In{action}" name="action">
-<input type="submit" value="Non" name="">
+<input type="button" value="\$Lang->{Restore}"
+ onClick="document.RestoreForm.action.value='Restore';
+ document.RestoreForm.submit();">
+<input type="submit" value="No" name="ignore">
</form>
EOF
</p>
\${h2("Actions de l\'utilisateur")}
<p>
-<form action="\$MyURL" method="get">
-<input type="hidden" name="host" value="\$host">
+<form name="StartStopForm" action="\$MyURL" method="get">
+<input type="hidden" name="host" value="\$host">
+<input type="hidden" name="action" value="">
\$startIncrStr
-<input type="submit" value="$Lang{Start_Full_Backup}" name="action">
-<input type="submit" value="$Lang{Stop_Dequeue_Backup}" name="action">
+<input type="button" value="\$Lang->{Start_Full_Backup}"
+ onClick="document.StartStopForm.action.value='Start_Full_Backup';
+ document.StartStopForm.submit();">
+<input type="button" value="\$Lang->{Stop_Dequeue_Backup}"
+ onClick="document.StartStopForm.action.value='Stop_Dequeue_Backup';
+ document.StartStopForm.submit();">
</form>
</p>
\${h2("Résumé de la sauvegarde")}
\${h2("User Actions")}
<p>
-<form action="\$MyURL" method="get">
+<form name="StartStopForm" action="\$MyURL" method="get">
<input type="hidden" name="archivehost" value="\$host">
<input type="hidden" name="host" value="\$host">
-<input type="submit" value="$Lang{Start_Archive}" name="action">
-<input type="submit" value="$Lang{Stop_Dequeue_Archive}" name="action">
+<input type="hidden" name="action" value="">
+<input type="button" value="\$Lang->{Start_Archive}"
+ onClick="document.StartStopForm.action.value='Start_Archive';
+ document.StartStopForm.submit();">
+<input type="button" value="\$Lang->{Stop_Dequeue_Archive}"
+ onClick="document.StartStopForm.action.value='Stop_Dequeue_Archive';
+ document.StartStopForm.submit();">
</form>
<input type="hidden" name="host" value="\$host">
<input type="hidden" name="share" value="\${EscHTML(\$share)}">
<input type="hidden" name="fcbMax" value="\$checkBoxCnt">
-<input type="hidden" name="action" value="$Lang{Restore}">
+<input type="hidden" name="action" value="Restore">
<br>
<table width="100%">
<tr><td valign="top">
$Lang{Backups_are_deferred_for_hours_hours_change_this_number} = <<EOF;
<li>Les sauvegardes sont reportées pour \$hours heures
-(<a href=\"\$MyURL?action=\${EscURI(\$Lang->{Stop_Dequeue_Archive})}&host=\$host\">changer ce nombre</a>).
+(<a href=\"\$MyURL?action=Stop_Dequeue_Backup&host=\$host\">changer ce nombre</a>).
EOF
$Lang{tryIP} = " et \$StatusHost{dhcpHostIP}";
\${h1(qq{$Lang{Admin_Options}})}
<br>
\${h2("Controllo server")}
-<form action="\$MyURL" method="get">
+<form name="ReloadForm" action="\$MyURL" method="get">
+<input type="hidden" name="action" value="">
<table class="tableStnd">
-<!--<tr><td>Arresta il server:<td><input type="submit" name="action" value="Stop">-->
- <tr><td>Ricarica la configurazione del server:<td><input type="submit" name="action" value="Reload">
+ <tr><td>Ricarica la configurazione del server:<td><input type="button" value="Reload"
+ onClick="document.ReloadForm.action.value='Reload';
+ document.ReloadForm.submit();">
</table>
</form>
<!--
<table class="tableStnd" border cellspacing="1" cellpadding="3">
\$paramStr
<tr>
- <td colspan=2><input type="submit" value="Avvia archiviazione" name=""></td>
+ <td colspan=2><input type="submit" value="Avvia archiviazione" name="ignore"></td>
</tr>
</form>
</table>
<p>
Si sta per avviare un backup \$type per \$host.
-<form action="\$MyURL" method="get">
+<form name="Confirm" action="\$MyURL" method="get">
<input type="hidden" name="host" value="\$host">
<input type="hidden" name="hostIP" value="\$ipAddr">
<input type="hidden" name="doit" value="1">
+<input type="hidden" name="action" value="">
Avviare veramente?
-<input type="submit" value="\$In{action}" name="action">
-<input type="submit" value="No" name="">
+<input type="button" value="\$buttonText"
+ onClick="document.Confirm.action.value='\$In{action}';
+ document.Confirm.submit();">
+<input type="submit" value="No" name="ignore">
</form>
EOF
# --------------------------------
<p>
Si sta per arrestare/disaccodare i backup per \$host;
-<form action="\$MyURL" method="get">
-<input type="hidden" name="host" value="\$host">
-<input type="hidden" name="doit" value="1">
+<form name="Confirm" action="\$MyURL" method="get">
+<input type="hidden" name="host" value="\$host">
+<input type="hidden" name="doit" value="1">
+<input type="hidden" name="action" value="">
Also, please don\'t start another backup for
<input type="text" name="backoff" size="10" value="\$backoff"> hours.
<p>
Arrestare veramente?
-<input type="submit" value="\$In{action}" name="action">
-<input type="submit" value="No" name="">
+<input type="button" value="\$buttonText"
+ onClick="document.Confirm.action.value='\$In{action}';
+ document.Confirm.submit();">
+<input type="submit" value="No" name="ignore">
</form>
EOF
<td valign="top"><input type="text" size="40" maxlength="256"
value="\${EscHTML(\$pathHdr)}" name="pathHdr"></td>
</tr><tr>
- <td><input type="submit" value="Avvio ripristino" name=""></td>
+ <td><input type="submit" value="Avvio ripristino" name="ignore"></td>
</table>
</form>
EOF
Compressione (0=off, 1=fast,...,9=best)
<input type="text" size="6" value="5" name="compressLevel">
<br>
-<input type="submit" value="Scarica file zip" name="">
+<input type="submit" value="Scarica file zip" name="ignore">
</form>
EOF
l\'archivio relativamente a \${EscHTML(\$pathHdr eq "" ? "/" : \$pathHdr)}
(altrimenti l\'archivio conterrà percorsi completi).
<br>
-<input type="submit" value="Scarica file tar" name="">
+<input type="submit" value="Scarica file tar" name="ignore">
</form>
EOF
\$fileListStr
</table>
-<form action="\$MyURL" method="post">
+<form name="RestoreForm" action="\$MyURL" method="post">
<input type="hidden" name="host" value="\${EscHTML(\$host)}">
<input type="hidden" name="hostDest" value="\${EscHTML(\$In{hostDest})}">
<input type="hidden" name="shareDest" value="\${EscHTML(\$In{shareDest})}">
<input type="hidden" name="pathHdr" value="\${EscHTML(\$In{pathHdr})}">
<input type="hidden" name="num" value="\$num">
<input type="hidden" name="type" value="4">
+<input type="hidden" name="action" value="">
\$hiddenStr
Avviare veramente?
-<input type="submit" value="\$In{action}" name="action">
-<input type="submit" value="No" name="">
+<input type="button" value="\$Lang->{Restore}"
+ onClick="document.RestoreForm.action.value='Restore';
+ document.RestoreForm.submit();">
+<input type="submit" value="No" name="ignore">
</form>
EOF
</p>
\${h2("Azioni utente")}
<p>
-<form action="\$MyURL" method="get">
-<input type="hidden" name="host" value="\$host">
+<form name="StartStopForm" action="\$MyURL" method="get">
+<input type="hidden" name="host" value="\$host">
+<input type="hidden" name="action" value="">
\$startIncrStr
-<input type="submit" value="$Lang{Start_Full_Backup}" name="action">
-<input type="submit" value="$Lang{Stop_Dequeue_Backup}" name="action">
+<input type="button" value="\$Lang->{Start_Full_Backup}"
+ onClick="document.StartStopForm.action.value='Start_Full_Backup';
+ document.StartStopForm.submit();">
+<input type="button" value="\$Lang->{Stop_Dequeue_Backup}"
+ onClick="document.StartStopForm.action.value='Stop_Dequeue_Backup';
+ document.StartStopForm.submit();">
</form>
\${h2("Prospetto backup")}
<p>
\${h2("Azioni utente")}
<p>
-<form action="\$MyURL" method="get">
+<form name="StartStopForm" action="\$MyURL" method="get">
<input type="hidden" name="archivehost" value="\$host">
<input type="hidden" name="host" value="\$host">
-<input type="submit" value="$Lang{Start_Archive}" name="action">
-<input type="submit" value="$Lang{Stop_Dequeue_Archive}" name="action">
+<input type="hidden" name="action" value="">
+<input type="button" value="\$Lang->{Start_Archive}"
+ onClick="document.StartStopForm.action.value='Start_Archive';
+ document.StartStopForm.submit();">
+<input type="button" value="\$Lang->{Stop_Dequeue_Archive}"
+ onClick="document.StartStopForm.action.value='Stop_Dequeue_Archive';
+ document.StartStopForm.submit();">
</form>
\$ArchiveStr
<input type="hidden" name="host" value="\$host">
<input type="hidden" name="share" value="\${EscHTML(\$share)}">
<input type="hidden" name="fcbMax" value="\$checkBoxCnt">
-<input type="hidden" name="action" value="$Lang{Restore}">
+<input type="hidden" name="action" value="Restore">
<br>
<table width="100%">
<tr><td valign="top">
$Lang{Backups_are_deferred_for_hours_hours_change_this_number} = <<EOF;
<li>I backup sono stati posticipati per \$hours ore
-(<a href=\"\$MyURL?action=\${EscURI(\$Lang->{Stop_Dequeue_Archive})}&host=\$host\">modifica questo numero</a>).
+(<a href=\"\$MyURL?action=Stop_Dequeue_Backup&host=\$host\">modifica questo numero</a>).
EOF
$Lang{tryIP} = " e \$StatusHost{dhcpHostIP}";
$Lang{Start_Archive} = "Start Archivering";
$Lang{Stop_Dequeue_Archive} = "Stop/Annuleer Archivering";
$Lang{Start_Full_Backup} = "Start volledige backup";
-$Lang{Start_Incr_Backup} = "Start stapsgewijze backup";
+$Lang{Start_Incr_Backup} = "Start incrementele backup";
$Lang{Stop_Dequeue_Backup} = "Stop/Annuleer backup";
-$Lang{Restore} = "Terugplaatsen";
+$Lang{Restore} = "Herstellen";
$Lang{Type_full} = "volledig";
$Lang{Type_incr} = "incrementeel";
$Lang{Admin_Options_Page} = <<EOF;
\${h1(qq{$Lang{Admin_Options}})}
<br>
-\${h2("Controle van de server")}
-<form action="\$MyURL" method="get">
+\${h2("Besturing van de server")}
+<form name="ReloadForm" action="\$MyURL" method="get">
+<input type="hidden" name="action" value="">
<table class="tableStnd">
- <!--<tr><td>Stop de server:<td><input type="submit" name="action" value="Stop">-->
- <tr><td>Herlaad de configuratie van de server:<td><input type="submit" name="action" value="Herlaad">
+ <tr><td>Herlaad de configuratie van de server:<td><input type="button" value="Herlaad"
+ onClick="document.ReloadForm.action.value='Reload';
+ document.ReloadForm.submit();">
</table>
</form>
<!--
</ul>
-->
EOF
-$Lang{Unable_to_connect_to_BackupPC_server} = "Verbinding met de BackupPC server niet mogelijk",
- "Dit CGI script (\$MyURL) kan geen verbinding maken met de BackupPC-server"
+$Lang{Unable_to_connect_to_BackupPC_server} = "Verbinding met de BackupPC server is mislukt",
+ "Dit CGI script (\$MyURL) kon geen verbinding maken met de BackupPC-server"
. " op \$Conf{ServerHost} poort \$Conf{ServerPort}."
. " De foutmelding was: \$err.",
"Mogelijk draait de BackupPC server niet of is er een "
<li> Volgende backupsessie start op \$nextWakeupTime.
<li> Andere informatie:
<ul>
- <li>\$numBgQueue wachtende backupaanvragen sedert laatste geplande wakeup,
+ <li>\$numBgQueue wachtende backupaanvragen sinds laatste geplande wakeup,
<li>\$numUserQueue wachtende backupaanvragen van gebruikers,
- <li>\$numCmdQueue wachtende aanvragen op commando,
+ <li>\$numCmdQueue wachtende opdrachten,
\$poolInfo
- <li>De backupschijf werd het laatst aangevuld tot \$Info{DUlastValue}%
+ <li>Het backup filesystem werd recentelijk aangevuld voor \$Info{DUlastValue}%
op (\$DUlastTime), het maximum van vandaag is \$Info{DUDailyMax}% (\$DUmaxTime)
en het maximum van gisteren was \$Info{DUDailyMaxPrev}%.
</ul>
</table>
<p>
-\${h2("Mislukkingen die aandacht vragen")}
+\${h2("Opgetreden fouten die aandacht vragen")}
<p>
<table class="tableStnd" border cellspacing="1" cellpadding="3">
<tr class="tableheader"><td align="center"> Machine </td>
<td align="center"> Laatste poging </td>
<td align="center"> Details </td>
<td align="center"> Fouttijd </td>
- <td> Laaste fout (verschillend van 'geen ping') </td></tr>
+ <td> Laatste fout (verschillend van 'geen ping') </td></tr>
\$statusStr
</table>
EOF
Er zijn \$hostCntGood hosts gebackupt, wat een totaal geeft van:
<ul>
<li> \$fullTot volledige backups met een totale grootte van \${fullSizeTot}GB
- (vóór definitief wegschrijven en compressie),
+ (voor samenvoegen),
<li> \$incrTot oplopende backups met een totale grootte van \${incrSizeTot}GB
- (vóór definitief wegschrijven en compressie).
+ (voor samenvoegen).
</ul>
</p>
<table class="tableStnd" border cellpadding="3" cellspacing="1">
<table class="tableStnd" border cellpadding="3" cellspacing="1">
<tr class="tableheader"><td> Machine </td>
<td align="center"> Gebruiker </td>
- <td align="center"> tal Voll. </td>
+ <td align="center"> Aantal Voll. </td>
<td align="center"> Voll.Lftd/dagen </td>
<td align="center"> Voll.Grootte/GB </td>
<td align="center"> Snelheid MB/sec </td>
- <td align="center"> tal Incr. </td>
+ <td align="center"> Aantal Incr. </td>
<td align="center"> Incr.Lftd/dagen </td>
<td align="center"> Status </td>
<td align="center"> Laatste poging </td></tr>
<table class="tableStnd" border cellpadding="3" cellspacing="1">
<tr class="tableheader"><td align=center> Machine</td>
<td align="center"> Gebruiker </td>
- <td align="center"> grootte backup </td>
+ <td align="center"> Backupgrootte </td>
\$strGood
\$checkAllHosts
</table>
$Lang{BackupPC_Archive2} = <<EOF;
\${h1(qq{$Lang{BackupPC__Archive}})}
-Klaar om volgende machines te archiveren
+Klaar om de volgende machines te archiveren
<ul>
\$HostListStr
</ul>
<table class="tableStnd" border cellspacing="1" cellpadding="3">
\$paramStr
<tr>
- <td colspan=2><input type="submit" value="Start de archivering" name=""></td>
+ <td colspan=2><input type="submit" value="Start de archivering" name="ignore"></td>
</tr>
</form>
</table>
<p>
Met deze actie start u een \$type backup van machine \$host.
-<form action="\$MyURL" method="get">
+<form name="Confirm" action="\$MyURL" method="get">
<input type="hidden" name="host" value="\$host">
<input type="hidden" name="hostIP" value="\$ipAddr">
<input type="hidden" name="doit" value="1">
+<input type="hidden" name="action" value="">
Wilt u dat nu doen?
-<input type="submit" value="\$In{action}" name="action">
-<input type="submit" value="Neen" name="">
+<input type="button" value="\$buttonText"
+ onClick="document.Confirm.action.value='\$In{action}';
+ document.Confirm.submit();">
+<input type="submit" value="Neen" name="ignore">
</form>
EOF
# --------------------------------
# --------------------------------
$Lang{Are_you_sure_stop} = <<EOF;
-\${h1("Bent u zeker?")}
+\${h1("Weet u het zeker?")}
<p>
Met deze actie annuleert u de backup van pc \$host of haalt u de opdracht uit de wachtrij;
-<form action="\$MyURL" method="get">
-<input type="hidden" name="host" value="\$host">
-<input type="hidden" name="doit" value="1">
+<form name="Confirm" action="\$MyURL" method="get">
+<input type="hidden" name="host" value="\$host">
+<input type="hidden" name="doit" value="1">
+<input type="hidden" name="action" value="">
Start bovendien geen andere backup gedurende
<input type="text" name="backoff" size="10" value="\$backoff"> uur/uren.
<p>
Wilt u dit nu bevestigen?
-<input type="submit" value="\$In{action}" name="action">
-<input type="submit" value="Neen" name="">
+<input type="button" value="\$buttonText"
+ onClick="document.Confirm.action.value='\$In{action}';
+ document.Confirm.submit();">
+<input type="submit" value="Neen" name="ignore">
</form>
EOF
# --------------------------------
-$Lang{Only_privileged_users_can_view_queues_} = "Enkel bevoorrechte gebruikers kunnen de wachtrij bekijken.";
+$Lang{Only_privileged_users_can_view_queues_} = "Enkel gebruikers met bijzondere rechten kunnen de wachtrij bekijken.";
# --------------------------------
-$Lang{Only_privileged_users_can_archive} = "Enkel bevoorechte gebruikers kunnen archiveren.";
+$Lang{Only_privileged_users_can_archive} = "Enkel gebruikers met bijzondere rechten kunnen archiveren.";
# --------------------------------
$Lang{BackupPC__Queue_Summary} = "BackupPC: overzicht wachtrij";
# --------------------------------
EOF
# --------------------------------
-$Lang{skipped__skipped_lines} = "[ \$skipped lijnen overgeslagen ]\n";
+$Lang{skipped__skipped_lines} = "[ \$skipped regels overgeslagen ]\n";
# --------------------------------
$Lang{_pre___Can_t_open_log_file__file} = "<pre>\nKan het logbestand \$file niet openen \n";
$Lang{Browse_backup__num_for__host} = "BackupPC: Overzicht backup nummer \$num van pc \$host";
# ------------------------------
-$Lang{Restore_Options_for__host} = "BackupPC: Opties voor het terugplaatsen van bestanden van machine \$host";
+$Lang{Restore_Options_for__host} = "BackupPC: Opties voor het herstellen van bestanden van machine \$host";
$Lang{Restore_Options_for__host2} = <<EOF;
-\${h1("Opties voor het terugplaatsen van bestanden van machine \$host")}
+\${h1("Opties voor het herstellen van bestanden van machine \$host")}
<p>
U hebt de volgende bestanden/mappen geselecteerd uit
\$share, backup nummer #\$num:
\$fileListStr
</ul>
</p><p>
-Er zijn drie mogelijkheden om deze bestanden/mappen terug te plaatsen.
+Er zijn drie mogelijkheden om deze bestanden/mappen terug te herstellen.
Gelieve een van de onderstaande mogelijkheden te kiezen.
</p>
-\${h2("Optie 1: Rechtstreeks terugplaatsen")}
+\${h2("Optie 1: Rechtstreeks herstellen")}
<p>
EOF
$Lang{Restore_Options_for__host_Option1} = <<EOF;
-U kan deze bestanden rechtstreeks terugplaatsen op pc
+U kan deze bestanden rechtstreeks herstellen naar pc
\$host.
</p><p>
<b>Waarschuwing:</b> bestaande bestanden met dezelfde naam zullen
<td valign="top"><input type="text" size="40" maxlength="256"
value="\${EscHTML(\$pathHdr)}" name="pathHdr"></td>
</tr><tr>
- <td><input type="submit" value="Terugplaatsen starten" name=""></td>
+ <td><input type="submit" value="Herstellen starten" name="ignore"></td>
</table>
</form>
EOF
$Lang{Restore_Options_for__host_Option1_disabled} = <<EOF;
-Rechtstreeks terugplaatsen is gedeactiveerd voor machine \${EscHTML(\$hostDest)}.
-Gelieve een van de andere herstelopties te kiezen.
+Rechtstreeks herstellen is gedeactiveerd voor machine \${EscHTML(\$hostDest)}.
+Gelieve een van de andere opties voor het herstellen te kiezen.
EOF
# ------------------------------
Compressie (0=uit, 1=snel,...,9=hoogst)
<input type="text" size="6" value="5" name="compressLevel">
<br>
-<input type="submit" value="Download Zip-bestand" name="">
+<input type="submit" value="Download Zip-bestand" name="ignore">
</form>
EOF
<p>
\${h2("Optie 2: Download Zip-bestand")}
<p>
-Archive::Zip is niet geïnstalleerd op de backupPC-server en het is
+Archive::Zip is niet geïnstalleerd op de backupPC-server en het is
dus niet mogelijk om een Zip-bestand te downloaden.
Gelieve aan uw systeembeheerder te vragen om Archive::Zip te downloaden van
<a href="http://www.cpan.org">www.cpan.org</a> en te installeren.
aan \${EscHTML(\$pathHdr eq "" ? "/" : \$pathHdr)}
(anders zal het tar-archief volledige padnamen bevatten).
<br>
-<input type="submit" value="Download Tar-bestand" name="">
+<input type="submit" value="Download Tar-bestand" name="ignore">
</form>
EOF
# ------------------------------
-$Lang{Restore_Confirm_on__host} = "BackupPC: Bevestig terugplaatsen voor machine \$host";
+$Lang{Restore_Confirm_on__host} = "BackupPC: Bevestig herstellen voor machine \$host";
$Lang{Are_you_sure} = <<EOF;
-\${h1("Bent u zeker?")}
+\${h1("Weet u het zeker?")}
<p>
U hebt gevraagd om bestanden rechtstreeks terug te zetten op de machine \$In{hostDest}.
-De volgende bestanden zullen teruggeplaatst worden in share \$In{shareDest},
+De volgende bestanden zullen hersteld worden in share \$In{shareDest},
uit backup nummer \$num:
<p>
<table border>
-<tr><td>Oorspronkelijk bestand/map</td><td>zal teruggeplaatst worden in</td></tr>
+<tr><td>Oorspronkelijk bestand/map</td><td>zal hersteld worden in</td></tr>
\$fileListStr
</table>
-<form action="\$MyURL" method="post">
+<form name="RestoreForm" action="\$MyURL" method="post">
<input type="hidden" name="host" value="\${EscHTML(\$host)}">
<input type="hidden" name="hostDest" value="\${EscHTML(\$In{hostDest})}">
<input type="hidden" name="shareDest" value="\${EscHTML(\$In{shareDest})}">
<input type="hidden" name="pathHdr" value="\${EscHTML(\$In{pathHdr})}">
<input type="hidden" name="num" value="\$num">
<input type="hidden" name="type" value="4">
+<input type="hidden" name="action" value="">
\$hiddenStr
Is dit wat u wilt doen? Gelieve te bevestigen.
-<input type="submit" value="\$In{action}" name="action">
-<input type="submit" value="Neen" name="">
+<input type="button" value="\$Lang->{Restore}"
+ onClick="document.RestoreForm.action.value='Restore';
+ document.RestoreForm.submit();">
+<input type="submit" value="No" name="ignore">
</form>
EOF
# --------------------------
-$Lang{Restore_Requested_on__hostDest} = "BackupPC: Terugplaatsen gevraagd van machine \$hostDest";
+$Lang{Restore_Requested_on__hostDest} = "BackupPC: Herstellen aangevraagd van machine \$hostDest";
$Lang{Reply_from_server_was___reply} = <<EOF;
\${h1(\$str)}
<p>
$Lang{Host__host_Backup_Summary} = "BackupPC: Overzicht backup van machine \$host";
$Lang{Host__host_Backup_Summary2} = <<EOF;
-\${h1("Overzicht backup van machine \$host")}
+\${h1("Overzicht backups van machine \$host")}
<p>
\$warnStr
<ul>
</p>
\${h2("Acties door de gebruiker")}
<p>
-<form action="\$MyURL" method="get">
-<input type="hidden" name="host" value="\$host">
+<form name="StartStopForm" action="\$MyURL" method="get">
+<input type="hidden" name="host" value="\$host">
+<input type="hidden" name="action" value="">
\$startIncrStr
-<input type="submit" value="$Lang{Start_Full_Backup}" name="action">
-<input type="submit" value="$Lang{Stop_Dequeue_Backup}" name="action">
+<input type="button" value="\$Lang->{Start_Full_Backup}"
+ onClick="document.StartStopForm.action.value='Start_Full_Backup';
+ document.StartStopForm.submit();">
+<input type="button" value="\$Lang->{Stop_Dequeue_Backup}"
+ onClick="document.StartStopForm.action.value='Stop_Dequeue_Backup';
+ document.StartStopForm.submit();">
</form>
</p>
-\${h2("Overzicht backup")}
+\${h2("Backup overzicht")}
<p>
-Klik op het backupnummer om de inhoud te bekijken of om bestanden terug te plaatsen.
+Klik op het backupnummer om de inhoud te bekijken of om bestanden te herstellen.
</p>
<table class="tableStnd" border cellspacing="1" cellpadding="3">
<tr class="tableheader"><td align="center"> backup nr.</td>
<td align="center"> Type </td>
<td align="center"> Aangevuld </td>
- <td align="center"> ENG Level </td>
+ <td align="center"> Niveau </td>
<td align="center"> Startdatum </td>
<td align="center"> Duurtijd in min. </td>
<td align="center"> Lftd. in dagen </td>
<td align="center" colspan="2"> Nieuwe bestanden </td>
</tr>
<tr class="tableheader">
- <td align="center"> backup nr. </td>
+ <td align="center"> Backup nr. </td>
<td align="center"> Type </td>
<td align="center"> Aantal best.</td>
<td align="center"> Grootte in MB </td>
\${h2("Acties van de gebruiker")}
<p>
-<form action="\$MyURL" method="get">
+<form name="StartStopForm" action="\$MyURL" method="get">
<input type="hidden" name="archivehost" value="\$host">
<input type="hidden" name="host" value="\$host">
-<input type="submit" value="$Lang{Start_Archive}" name="action">
-<input type="submit" value="$Lang{Stop_Dequeue_Archive}" name="action">
+<input type="hidden" name="action" value="">
+<input type="button" value="\$Lang->{Start_Archive}"
+ onClick="document.StartStopForm.action.value='Start_Archive';
+ document.StartStopForm.submit();">
+<input type="button" value="\$Lang->{Stop_Dequeue_Archive}"
+ onClick="document.StartStopForm.action.value='Stop_Dequeue_Archive';
+ document.StartStopForm.submit();">
</form>
\$ArchiveStr
<input type="hidden" name="host" value="\$host">
<input type="hidden" name="share" value="\${EscHTML(\$share)}">
<input type="hidden" name="fcbMax" value="\$checkBoxCnt">
-<input type="hidden" name="action" value="$Lang{Restore}">
+<input type="hidden" name="action" value="Restore">
<br>
<table width="100%">
<tr><td valign="top">
<tr><td class="tableheader"> Duur </td><td class="border"> \$duration min </td></tr>
<tr><td class="tableheader"> Aantal bestanden </td><td class="border"> \$Restores[\$i]{nFiles} </td></tr>
<tr><td class="tableheader"> Totale grootte </td><td class="border"> \${MB} MB </td></tr>
-<tr><td class="tableheader"> Overdrachtsratio </td><td class="border"> \$MBperSec MB/sec </td></tr>
+<tr><td class="tableheader"> Overdrachtssnelheid </td><td class="border"> \$MBperSec MB/sec </td></tr>
<tr><td class="tableheader"> TarCreate fouten </td><td class="border"> \$Restores[\$i]{tarCreateErrs} </td></tr>
<tr><td class="tableheader"> Overdrachtsfouten </td><td class="border"> \$Restores[\$i]{xferErrs} </td></tr>
<tr><td class="tableheader"> Logbestand overdracht </td><td class="border">
\${h1("Lijst bestanden/mappen")}
<p>
<table class="tableStnd" border cellspacing="1" cellpadding="3" width="100%">
-<tr class="tableheader"><td>Oorspronkelijk bestand/map</td><td>Teruggeplaatst naar</td></tr>
+<tr class="tableheader"><td>Oorspronkelijk bestand/map</td><td>hersteld naar</td></tr>
\$fileListStr
</table>
EOF
</tr></tr>
</table>
<p>
-\${h1("Lijst machines")}
+\${h1("Machinelijst")}
<p>
<table class="tableStnd" border cellspacing="1" cellpadding="3" width="80%">
<tr class="tableheader"><td>Machine</td><td>backup nr.</td></tr>
. " is leeg";
$Lang{Can_t_browse_bad_directory_name2} = "Kan niet bladeren door foutieve mapnaam"
. " \${EscHTML(\$relDir)}";
-$Lang{Only_privileged_users_can_restore_backup_files} = "Enkel gebruikers met bijzondere rechten kunnen backupbestanden"
- . " van machine \${EscHTML(\$In{host})} terugplaatsen.";
+$Lang{Only_privileged_users_can_restore_backup_files} = "Enkel gebruikers met bijzondere rechten kunnen backups"
+ . " van machine \${EscHTML(\$In{host})} terugzetten.";
$Lang{Bad_host_name} = "Foutieve of ongeldige machinenaam \${EscHTML(\$host)}";
$Lang{You_haven_t_selected_any_files__please_go_Back_to} = "U hebt geen enkel bestand geselecteerd. Gelieve terug te gaan en"
. " selecteer een of meerdere bestanden.";
$Lang{You_haven_t_selected_any_hosts} = "U hebt geen machine geselecteerd. Gelieve terug te gaan om"
. " een machine te selecteren.";
-$Lang{Nice_try__but_you_can_t_put} = "Goed geprobeerd, maar u kan geen \'..\' in de bestandsnamen plaatsen";
+$Lang{Nice_try__but_you_can_t_put} = "Leuk geprobeerd, maar u kan geen \'..\' in de bestandsnamen plaatsen";
$Lang{Host__doesn_t_exist} = "Machine \${EscHTML(\$In{hostDest})} bestaat niet.";
-$Lang{You_don_t_have_permission_to_restore_onto_host} = "U beschikt niet over de juiste rechten om bestanden terug te plaatsen naar machine "
+$Lang{You_don_t_have_permission_to_restore_onto_host} = "U beschikt niet over de juiste rechten om bestanden te herstellen naar machine "
. " \${EscHTML(\$In{hostDest})}";
$Lang{Can_t_open_create__openPath} = "Ik kan "
. "\${EscHTML(\"\$openPath\")} niet openen of aanmaken";
-$Lang{Only_privileged_users_can_restore_backup_files2} = "Alleen gebruikers met bijzondere rechten kunnen bestanden terugplaatsen"
+$Lang{Only_privileged_users_can_restore_backup_files2} = "Alleen gebruikers met bijzondere rechten kunnen bestanden herstellen"
. " naar machine \${EscHTML(\$host)}.";
$Lang{Empty_host_name} = "Lege machinenaam";
$Lang{Unknown_host_or_user} = "Onbekende machine of gebruiker \${EscHTML(\$host)}";
. " machine \${EscHTML(\$host)} bekijken." ;
$Lang{Only_privileged_users_can_view_archive_information} = "Enkel gebruikers met bijzondere rechten kunnen archiveringsinformatie bekijken.";
$Lang{Only_privileged_users_can_view_restore_information} = "Enkel gebruikers met bijzondere rechten kunnen herstelinformatie bekijken.";
-$Lang{Restore_number__num_for_host__does_not_exist} = "Terugplaatsing nr.\$num van machine \${EscHTML(\$host)}"
+$Lang{Restore_number__num_for_host__does_not_exist} = "Herstel nr.\$num van machine \${EscHTML(\$host)}"
. " bestaat niet.";
$Lang{Archive_number__num_for_host__does_not_exist} = "Archiveringsnr. \$num van machine \${EscHTML(\$host)}"
. " bestaat niet.";
-$Lang{Can_t_find_IP_address_for} = "Ik kan het IP-nummer van \${EscHTML(\$host)} niet vinden.";
+$Lang{Can_t_find_IP_address_for} = "Ik kan het IP-adres van \${EscHTML(\$host)} niet vinden.";
$Lang{host_is_a_DHCP_host} = <<EOF;
-\$host is een DHCP-machine en ik ken zijn IP-nummer niet. Ik controleerde de
+\$host is een DHCP-machine en ik ken zijn IP-adres niet. Ik controleerde de
netbios-naam van \$ENV{REMOTE_ADDR}\$tryIP, en ontdekte dat die machine
niet dezelfde machine als \$host is.
<p>
-In afwachting dat ik machine \$host op een welbepaald DHCP-adres terugvind, kan u
+In afwachting dat ik machine \$host op een bepaald DHCP-adres terugvind, kan u
deze aanvraag enkel doen vanaf die machine zelf.
EOF
. " \$User vanaf \$ENV{REMOTE_ADDR}";
$Lang{Backup_requested_on__host_by__User} = "backup aangevraagd van \$host door \$User";
$Lang{Backup_stopped_dequeued_on__host_by__User} = "backup geannuleerd van \$host door \$User";
-$Lang{Restore_requested_to_host__hostDest__backup___num} = "Terugplaatsing aangevraagd naar machine \$hostDest, backup nr.\$num,"
+$Lang{Restore_requested_to_host__hostDest__backup___num} = "Herstel aangevraagd voor machine \$hostDest, backup nr.\$num,"
. " door \$User vanaf \$ENV{REMOTE_ADDR}";
$Lang{Archive_requested} = "Archivering aangevraagd door \$User vanaf \$ENV{REMOTE_ADDR}";
$Lang{Backups_are_deferred_for_hours_hours_change_this_number} = <<EOF;
<li>backups zijn \$hours uren uitgesteld
-(<a href=\"\$MyURL?action=\${EscURI(\$Lang->{Stop_Dequeue_Archive})}&host=\$host\">Wijzig dit aantal</a>).
+(<a href=\"\$MyURL?action=Stop_Dequeue_Backup&host=\$host\">Wijzig dit aantal</a>).
EOF
$Lang{tryIP} = " en \$StatusHost{dhcpHostIP}";
EOF
$Lang{Restore_Summary} = <<EOF;
-\${h2("Overzicht terugplaatsingen")}
+\${h2("Overzicht herstellingen")}
<p>
-Klik op het terugplaatsingsnummer voor meer details.
+Klik op het nummer voor meer details.
<table class="tableStnd" border cellspacing="1" cellpadding="3" width="80%">
-<tr class="tableheader"><td align="center"> Terugplaatsing nr.</td>
+<tr class="tableheader"><td align="center"> Herstel nr.</td>
<td align="center"> Resultaat </td>
<td align="right"> Startdatum</td>
<td align="right"> Duur(min.)</td>
# ------
# Hosts states and reasons
-$Lang{Status_idle} = "in rust";
+$Lang{Status_idle} = "inactief";
$Lang{Status_backup_starting} = "backup start";
$Lang{Status_backup_in_progress} = "backup bezig";
-$Lang{Status_restore_starting} = "terugplaatsen start";
-$Lang{Status_restore_in_progress} = "terugplaatsen bezig";
+$Lang{Status_restore_starting} = "herstel start";
+$Lang{Status_restore_in_progress} = "herstel bezig";
$Lang{Status_link_pending} = "wacht op linken";
$Lang{Status_link_running} = "linken is bezig";
$Lang{Reason_backup_done} = "backup voltooid";
-$Lang{Reason_restore_done} = "terugplaatsen voltooid";
+$Lang{Reason_restore_done} = "herstel voltooid";
$Lang{Reason_archive_done} = "archivering voltooid";
$Lang{Reason_nothing_to_do} = "niets te doen";
$Lang{Reason_backup_failed} = "backup mislukt";
-$Lang{Reason_restore_failed} = "terugplaatsen mislukt";
+$Lang{Reason_restore_failed} = "herstel mislukt";
$Lang{Reason_archive_failed} = "archivering mislukt";
$Lang{Reason_no_ping} = "geen ping";
$Lang{Reason_backup_canceled_by_user} = "backup geannuleerd door gebruiker";
-$Lang{Reason_restore_canceled_by_user} = "terugplaatsen geannuleerd door gebruiker";
+$Lang{Reason_restore_canceled_by_user} = "herstellen geannuleerd door gebruiker";
$Lang{Reason_archive_canceled_by_user} = "archivering geannuleerd door gebruiker";
# ---------
Als uw pc gedurende geruime tijd (meer dan een paar uur) verbonden
was met het netwerk gedurende de laatste $days dagen, kan u het beste
contact opnemen van uw systeembeheerder. Vraag hem of haar om uit te
-zoeken waarom er geen backups meer genomen worden van uw pc.
+zoeken waarom er geen backups meer gemaakt worden van uw pc.
Anderzijds, als deze pc of notebook zich momenteel niet in het netwerk
bevindt dan kan u hieraan weinig anders doen behalve van belangrijke bestanden
handmatig een kopie te maken op een ander medium (CD, diskette, tape, andere pc,...)
U dient te weten dat *geen enkel bestand* dat u aanmaakte of wijzigde in de
-laatste $days dagen teruggeplaatst zal kunnen worden in geval de harde schijf
+laatste $days dagen hersteld zal kunnen worden in geval de harde schijf
van uw pc zou crashen. Hierin zijn nieuwe e-mail en bijlagen inbegrepen.
EOF
#######################################################################
-# Configuration editor strings (all ENGLISH currently)
+# Configuration editor strings
#######################################################################
-$Lang{Only_privileged_users_can_edit_config_files} = "Only privileged users can edit configuation settings.";
-$Lang{CfgEdit_Edit_Config} = "Edit Config";
-$Lang{CfgEdit_Edit_Hosts} = "Edit Hosts";
+$Lang{Only_privileged_users_can_edit_config_files} = "Enkel gebruikers met bijzondere rechten kunnen de configuratie wijzigen.";
+$Lang{CfgEdit_Edit_Config} = "Wijzig Configuratie";
+$Lang{CfgEdit_Edit_Hosts} = "Wijzig Machines";
$Lang{CfgEdit_Title_Server} = "Server";
-$Lang{CfgEdit_Title_General_Parameters} = "General Parameters";
-$Lang{CfgEdit_Title_Wakeup_Schedule} = "Wakeup Schedule";
-$Lang{CfgEdit_Title_Concurrent_Jobs} = "Concurrent Jobs";
-$Lang{CfgEdit_Title_Pool_Filesystem_Limits} = "Pool Filesystem Limits";
-$Lang{CfgEdit_Title_Other_Parameters} = "Other Parameters";
-$Lang{CfgEdit_Title_Remote_Apache_Settings} = "Remote Apache Settings";
-$Lang{CfgEdit_Title_Program_Paths} = "Program Paths";
-$Lang{CfgEdit_Title_Install_Paths} = "Install Paths";
+$Lang{CfgEdit_Title_General_Parameters} = "Algemene Parameters";
+$Lang{CfgEdit_Title_Wakeup_Schedule} = "Wakeup planning";
+$Lang{CfgEdit_Title_Concurrent_Jobs} = "Parallelle Jobs";
+$Lang{CfgEdit_Title_Pool_Filesystem_Limits} = "Pool Bestandssysteem Limieten";
+$Lang{CfgEdit_Title_Other_Parameters} = "Andere Parameters";
+$Lang{CfgEdit_Title_Remote_Apache_Settings} = "Remote Apache Instellingen";
+$Lang{CfgEdit_Title_Program_Paths} = "Programmapaden";
+$Lang{CfgEdit_Title_Install_Paths} = "Installatiepaden";
$Lang{CfgEdit_Title_Email} = "Email";
-$Lang{CfgEdit_Title_Email_settings} = "Email settings";
-$Lang{CfgEdit_Title_Email_User_Messages} = "Email User Messages";
+$Lang{CfgEdit_Title_Email_settings} = "Email instellingen";
+$Lang{CfgEdit_Title_Email_User_Messages} = "Emailberichten Gebruikers";
$Lang{CfgEdit_Title_CGI} = "CGI";
-$Lang{CfgEdit_Title_Admin_Privileges} = "Admin Privileges";
-$Lang{CfgEdit_Title_Page_Rendering} = "Page Rendering";
-$Lang{CfgEdit_Title_Paths} = "Paths";
-$Lang{CfgEdit_Title_User_URLs} = "User URLs";
-$Lang{CfgEdit_Title_User_Config_Editing} = "User Config Editing";
-$Lang{CfgEdit_Title_Xfer} = "Xfer";
-$Lang{CfgEdit_Title_Xfer_Settings} = "Xfer Settings";
-$Lang{CfgEdit_Title_Smb_Settings} = "Smb Settings";
-$Lang{CfgEdit_Title_Tar_Settings} = "Tar Settings";
-$Lang{CfgEdit_Title_Rsync_Settings} = "Rsync Settings";
-$Lang{CfgEdit_Title_Rsyncd_Settings} = "Rsyncd Settings";
-$Lang{CfgEdit_Title_BackupPCd_Settings} = "BackupPCd Settings";
-$Lang{CfgEdit_Title_Archive_Settings} = "Archive Settings";
-$Lang{CfgEdit_Title_Include_Exclude} = "Include/Exclude";
-$Lang{CfgEdit_Title_Smb_Paths_Commands} = "Smb Paths/Commands";
-$Lang{CfgEdit_Title_Tar_Paths_Commands} = "Tar Paths/Commands";
-$Lang{CfgEdit_Title_Rsync_Paths_Commands_Args} = "Rsync Paths/Commands/Args";
-$Lang{CfgEdit_Title_Rsyncd_Port_Args} = "Rsyncd Port/Args";
-$Lang{CfgEdit_Title_Archive_Paths_Commands} = "Archive Paths/Commands";
-$Lang{CfgEdit_Title_Schedule} = "Schedule";
-$Lang{CfgEdit_Title_Full_Backups} = "Full Backups";
-$Lang{CfgEdit_Title_Incremental_Backups} = "Incremental Backups";
+$Lang{CfgEdit_Title_Admin_Privileges} = "Admin rechten";
+$Lang{CfgEdit_Title_Page_Rendering} = "Pagina opbouw";
+$Lang{CfgEdit_Title_Paths} = "Paden";
+$Lang{CfgEdit_Title_User_URLs} = "Gebruiker URLs";
+$Lang{CfgEdit_Title_User_Config_Editing} = "Wijzigen gebruikersconfiguratie";
+$Lang{CfgEdit_Title_Xfer} = "Overdracht";
+$Lang{CfgEdit_Title_Xfer_Settings} = "Overdracht instellingen";
+$Lang{CfgEdit_Title_Smb_Settings} = "Smb instellingen";
+$Lang{CfgEdit_Title_Tar_Settings} = "Tar instellingen";
+$Lang{CfgEdit_Title_Rsync_Settings} = "Rsync instellingen";
+$Lang{CfgEdit_Title_Rsyncd_Settings} = "Rsyncd instellingen";
+$Lang{CfgEdit_Title_BackupPCd_Settings} = "BackupPCd instellingen";
+$Lang{CfgEdit_Title_Archive_Settings} = "Archivering instellingen";
+$Lang{CfgEdit_Title_Include_Exclude} = "Inclusief/Exclusief";
+$Lang{CfgEdit_Title_Smb_Paths_Commands} = "Smb Pad/Opdrachten";
+$Lang{CfgEdit_Title_Tar_Paths_Commands} = "Tar Pad/Opdrachten";
+$Lang{CfgEdit_Title_Rsync_Paths_Commands_Args} = "Rsync Pad/Opdrachten/Parameters";
+$Lang{CfgEdit_Title_Rsyncd_Port_Args} = "Rsyncd Poort/Parameters";
+$Lang{CfgEdit_Title_Archive_Paths_Commands} = "Archivering Pad/Opdrachten";
+$Lang{CfgEdit_Title_Schedule} = "Planning";
+$Lang{CfgEdit_Title_Full_Backups} = "Volledige Backups";
+$Lang{CfgEdit_Title_Incremental_Backups} = "Incrementele Backups";
$Lang{CfgEdit_Title_Blackouts} = "Blackouts";
-$Lang{CfgEdit_Title_Other} = "Other";
-$Lang{CfgEdit_Title_Backup_Settings} = "Backup Settings";
-$Lang{CfgEdit_Title_Client_Lookup} = "Client Lookup";
-$Lang{CfgEdit_Title_Other} = "Other";
-$Lang{CfgEdit_Title_User_Commands} = "User Commands";
-$Lang{CfgEdit_Title_Hosts} = "Hosts";
-
-$Lang{CfgEdit_Hosts_Comment} = <<EOF;
-To add a new host, select Add and then enter the name. To start with
-the per-host configuration from another host, enter the host name
-as NEWHOST=COPYHOST. This will overwrite any existing per-host
-configuration for NEWHOST. You can also do this for an existing
-host. To delete a host, hit the Delete button. For Add, Delete,
-and configuration copy, changes don't take effect until you select
-Save. None of the deleted host's backups will be removed,
-so if you accidently delete a host, simply re-add it. To completely
-remove a host's backups, you need to manually remove the files
-below \$topDir/pc/HOST
-EOF
+$Lang{CfgEdit_Title_Other} = "Andere";
+$Lang{CfgEdit_Title_Backup_Settings} = "Backup instellingen";
+$Lang{CfgEdit_Title_Client_Lookup} = "Cliënt locatie";
+$Lang{CfgEdit_Title_Other} = "Andere";
+$Lang{CfgEdit_Title_User_Commands} = "Opdrachten van gebruiker";
+$Lang{CfgEdit_Title_Hosts} = "Machines";
+
+$Lang{CfgEdit_Hosts_Comment} = <<eof;
+Om een nieuwe machine toe te voegen: selecteer 'Toevoegen' en geef de naam op.
+Om met de machine-specifieke configuratie van een andere machine als basis te gebruiken:
+Geef de naam van de machine als NIEUWE_MACHINE=TE_KOPIEREN_MACHINE.
+Dit zal de een reeds bestaande machine-specifieke configuratie voor
+NIEUWE_MACHINE overschrijven. Je kan dit ook doen voor een reeds bestaande machine.
+Om een machine te verwijderen: klik op de de Verwijderen-knop.
+Bij 'Toevoegen', 'Verwijderen' en 'Kopiëren' van instellingen, worden de
+wijzigingen pas effectief nadat je op 'Bewaren' hebt geklikt.
+Backups van gewiste machines worden niet verwijderd.
+Als je dus per vergissing een machine hebt verwijderd, kan je deze
+eenvoudig opnieuw toevoegen. Om de backups van een machine volledig
+te verwijderen, moet je de bestanden verwijderen in de map
+\$topdir/pc/MACHINE
+eof
$Lang{CfgEdit_Header_Main} = <<EOF;
-\${h1("Main Configuration Editor")}
+\${h1("Bewerken globale instellingen")}
EOF
$Lang{CfgEdit_Header_Host} = <<EOF;
-\${h1("Host \$host Configuration Editor")}
+\${h1("Bewerken specifieke configuratie van machine \$host ")}
<p>
-Note: Check Override if you want to modify a value specific to this host.
+NB: Selecteer 'Overschrijven' als je een waarde wil wijzigen specifiek voor deze machine.
EOF
-$Lang{CfgEdit_Button_Save} = "Save";
-$Lang{CfgEdit_Button_Insert} = "Insert";
-$Lang{CfgEdit_Button_Delete} = "Delete";
-$Lang{CfgEdit_Button_Add} = "Add";
-$Lang{CfgEdit_Button_Override} = "Override";
-$Lang{CfgEdit_Button_New_Key} = "New Key";
+$Lang{CfgEdit_Button_Save} = "Bewaren";
+$Lang{CfgEdit_Button_Insert} = "Invoegen";
+$Lang{CfgEdit_Button_Delete} = "Verwijderen";
+$Lang{CfgEdit_Button_Add} = "Toevoegen";
+$Lang{CfgEdit_Button_Override} = "Overschrijven";
+$Lang{CfgEdit_Button_New_Key} = "Nieuwe sleutel";
$Lang{CfgEdit_Error__must_be_an_integer}
- = "Error: \$var must be an integer";
+ = "Fout: \$var moet een geheel getal zijn";
$Lang{CfgEdit_Error__must_be_real_valued_number}
- = "Error: \$var must be a real-valued number";
+ = "Fout: \$var moet een reële waarde (nummer) zijn";
$Lang{CfgEdit_Error__entry__must_be_an_integer}
- = "Error: \$var entry \$k must be an integer";
+ = "Fout: \$var ingang \$k moet een geheel getal zijn";
$Lang{CfgEdit_Error__entry__must_be_real_valued_number}
- = "Error: \$var entry \$k must be a real-valued number";
+ = "Fout: \$var ingang \$k moet een reële waarde (nummer) zijn";
$Lang{CfgEdit_Error__must_be_executable_program}
- = "Error: \$var must be a valid executable path";
+ = "Fout: \$var moet een geldig uitvoerbaar pad zijn";
$Lang{CfgEdit_Error__must_be_valid_option}
- = "Error: \$var must be a valid option";
+ = "Fout: \$var is geen geldige optie";
$Lang{CfgEdit_Error_Copy_host_does_not_exist}
- = "Copy host \$copyHost doesn't exist; creating full host name \$fullHost. Delete this host if that is not what you wanted.";
-
+ = "Te kopiëren machine \$copyHost bestaat niet; Machine \$fullHost wordt aangemaakt. Verwijder deze machine indien dit niet is wat je wil.";
+
$Lang{CfgEdit_Log_Copy_host_config}
- = "\$User copied config from host \$fromHost to \$host\n";
+ = "\$User kopieerde de instellingen van machine \$fromHost naar \$host\n";
$Lang{CfgEdit_Log_Delete_param}
- = "\$User deleted \$p from \$conf\n";
+ = "\$User verwijderde \$p van \$conf\n";
$Lang{CfgEdit_Log_Add_param_value}
- = "\$User added \$p to \$conf, set to \$value\n";
+ = "\$User voegde \$p toe aan \$conf, met waarde \$value\n";
$Lang{CfgEdit_Log_Change_param_value}
- = "\$User changed \$p in \$conf to \$valueNew from \$valueOld\n";
+ = "\$User wijzigde \$p in \$conf van \$valueOld naar \$valueNew \n";
$Lang{CfgEdit_Log_Host_Delete}
- = "\$User deleted host \$host\n";
+ = "\$User verwijderde machine \$host\n";
$Lang{CfgEdit_Log_Host_Change}
- = "\$User host \$host changed \$key from \$valueOld to \$valueNew\n";
+ = "\$User machine \$host wijzigde \$key van \$valueOld naar \$valueNew\n";
$Lang{CfgEdit_Log_Host_Add}
- = "\$User added host \$host: \$value\n";
+ = "\$User voegde machine \$host toe: \$value\n";
#end of lang_nl.pm
+
-#!/usr/bin/perl
+#!/bin/perl
#
# By Reginaldo Ferreira <reginaldo@lepper.com.br> (23.07.2004 for V2.1.10)
#
+# Edited by Rodrigo Real <rreal@ucpel.tche.br> (22.06.2006)
#my %lang;
# --------------------------------
$Lang{Start_Archive} = "Iniciar backup";
-$Lang{Stop_Dequeue_Archive} = "Parar/anular backup";
-$Lang{Start_Full_Backup} = "Iniciar Backup Completa";
+$Lang{Stop_Dequeue_Archive} = "Parar/Cancelar backup";
+$Lang{Start_Full_Backup} = "Iniciar Backup Completo";
$Lang{Start_Incr_Backup} = "Iniciar Backup Incremental";
-$Lang{Stop_Dequeue_Backup} = "Parar/Anular Backup";
+$Lang{Stop_Dequeue_Backup} = "Parar/Cancelar Backup";
$Lang{Restore} = "Restaurar";
$Lang{Type_full} = "completo";
\${h1(qq{$Lang{Admin_Options}})}
<br>
\${h2("Controle do Servidor")}
-<form action="\$MyURL" method="get">
+<form name="ReloadForm" action="\$MyURL" method="get">
+<input type="hidden" name="action" value="">
<table class="tableStnd">
-<!--<tr><td>Parar o servidor:<td><input type="submit" name="action" value="Stop">-->
- <tr><td>Atualizar configurações do servidor:<td><input type="submit" name="action" value="Reload">
+ <tr><td>Atualizar configurações do servidor:<td><input type="button" value="Reload"
+ onClick="document.ReloadForm.action.value='Reload';
+ document.ReloadForm.submit();">
</table>
</form>
<!--
-\${h2("Server Configuration")}
+\${h2("Configuração do Servidor")}
<ul>
<li><i>Espaço para outras opções... e.j.,</i>
<li>Editar configurações do servidor
"Este script CGI (\$MyURL) não pode conectar-se ao servidor BackupPC"
. " em \$Conf{ServerHost} porta \$Conf{ServerPort}. O erro"
. " foi: \$err.",
- "Talvez o servidor BackupPC não está ativo ou existe um "
- . " erro de configuração. Por favor informe seu administrador de sistemas.";
+ "Talvez o servidor BackupPC não esteja ativo ou há um "
+ . " erro de configuração. Por favor informe o administrador do sistema.";
$Lang{Admin_Start_Server} = <<EOF;
\${h1(qq{$Lang{Unable_to_connect_to_BackupPC_server}})}
<form action="\$MyURL" method="get">
<table class="tableStnd" border cellspacing="1" cellpadding="3">
<tr class="tableheader"><td> Host </td>
<td> Tipo </td>
- <td> Usuario </td>
- <td> Hora de Inicio </td>
+ <td> Usuário </td>
+ <td> Hora de Início </td>
<td> Comando </td>
<td align="center"> PID </td>
<td align="center"> Transfer. PID </td>
<table class="tableStnd" border cellspacing="1" cellpadding="3">
<tr class="tableheader"><td align="center"> Host </td>
<td align="center"> Tipo </td>
- <td align="center"> Usuario </td>
- <td align="center"> Ultima Tentativa </td>
+ <td align="center"> Usuário </td>
+ <td align="center"> Última Tentativa </td>
<td align="center"> Detalhes </td>
<td align="center"> Hora do erro </td>
<td> Último erro (ping não incluido) </td></tr>
//-->
</script>
-Hay \$hostCntGood hosts que possuem backup com tamanho total de \${fullSizeTot}GB
+Existem \$hostCntGood hosts que possuem backup com tamanho total de \${fullSizeTot}GB
<p>
<form name="form1" method="post" action="\$MyURL">
<input type="hidden" name="fcbMax" value="\$checkBoxCnt">
<table class="tableStnd" border cellspacing="1" cellpadding="3">
\$paramStr
<tr>
- <td colspan=2><input type="submit" value="Iniciar Archive" name=""></td>
+ <td colspan=2><input type="submit" value="Iniciar Archive" name="ignore"></td>
</tr>
</form>
</table>
<p>
Iniciando Backup \$type em \$host.
-<form action="\$MyURL" method="get">
+<form name="Confirm" action="\$MyURL" method="get">
<input type="hidden" name="host" value="\$host">
<input type="hidden" name="hostIP" value="\$ipAddr">
<input type="hidden" name="doit" value="1">
+<input type="hidden" name="action" value="">
Tem certeza desta ação?
-<input type="submit" value="\$In{action}" name="action">
-<input type="submit" value="No" name="">
+<input type="button" value="\$buttonText"
+ onClick="document.Confirm.action.value='\$In{action}';
+ document.Confirm.submit();">
+<input type="submit" value="No" name="ignore">
</form>
EOF
# --------------------------------
<p>
Você está certo de parar/sair da fila de backup em \$host;
-<form action="\$MyURL" method="get">
-<input type="hidden" name="host" value="\$host">
-<input type="hidden" name="doit" value="1">
+<form name="Confirm" action="\$MyURL" method="get">
+<input type="hidden" name="host" value="\$host">
+<input type="hidden" name="doit" value="1">
+<input type="hidden" name="action" value="">
Assim mesmo, por favor não impessa outro backup durante
<input type="text" name="backoff" size="10" value="\$backoff"> horas.
<p>
Tem certeza de que quer fazer isto?
-<input type="submit" value="\$In{action}" name="action">
-<input type="submit" value="No" name="">
+<input type="button" value="\$buttonText"
+ onClick="document.Confirm.action.value='\$In{action}';
+ document.Confirm.submit();">
+<input type="submit" value="No" name="ignore">
</form>
EOF
<td valign="top"><input type="text" size="40" maxlength="256"
value="\${EscHTML(\$pathHdr)}" name="pathHdr"></td>
</tr><tr>
- <td><input type="submit" value="Iniciar Restauração" name=""></td>
+ <td><input type="submit" value="Iniciar Restauração" name="ignore"></td>
</table>
</form>
EOF
Compressão (0=desativada, 1=rápida,...,9=máxima)
<input type="text" size="6" value="5" name="compressLevel">
<br>
-<input type="submit" value="Download Zip File" name="">
+<input type="submit" value="Download Zip File" name="ignore">
</form>
EOF
relativo a \${EscHTML(\$pathHdr eq "" ? "/" : \$pathHdr)}
(caso contrário o arquivo conterá os caminhos completos).
<br>
-<input type="submit" value="Download Tar File" name="">
+<input type="submit" value="Download Tar File" name="ignore">
</form>
EOF
\$fileListStr
</table>
-<form action="\$MyURL" method="post">
+<form name="RestoreForm" action="\$MyURL" method="post">
<input type="hidden" name="host" value="\${EscHTML(\$host)}">
<input type="hidden" name="hostDest" value="\${EscHTML(\$In{hostDest})}">
<input type="hidden" name="shareDest" value="\${EscHTML(\$In{shareDest})}">
<input type="hidden" name="pathHdr" value="\${EscHTML(\$In{pathHdr})}">
<input type="hidden" name="num" value="\$num">
<input type="hidden" name="type" value="4">
+<input type="hidden" name="action" value="">
\$hiddenStr
Tem certeza?
-<input type="submit" value="\$In{action}" name="action">
-<input type="submit" value="No" name="">
+<input type="button" value="\$Lang->{Restore}"
+ onClick="document.RestoreForm.action.value='Restore';
+ document.RestoreForm.submit();">
+<input type="submit" value="No" name="ignore">
</form>
EOF
</p>
\${h2("Ações do Usuário")}
<p>
-<form action="\$MyURL" method="get">
-<input type="hidden" name="host" value="\$host">
+<form name="StartStopForm" action="\$MyURL" method="get">
+<input type="hidden" name="host" value="\$host">
+<input type="hidden" name="action" value="">
\$startIncrStr
-<input type="submit" value="$Lang{Start_Full_Backup}" name="action">
-<input type="submit" value="$Lang{Stop_Dequeue_Backup}" name="action">
+<input type="button" value="\$Lang->{Start_Full_Backup}"
+ onClick="document.StartStopForm.action.value='Start_Full_Backup';
+ document.StartStopForm.submit();">
+<input type="button" value="\$Lang->{Stop_Dequeue_Backup}"
+ onClick="document.StartStopForm.action.value='Stop_Dequeue_Backup';
+ document.StartStopForm.submit();">
</form>
</p>
\${h2("Resumo do Backup")}
\${h2("Ações do usuário")}
<p>
-<form action="\$MyURL" method="get">
+<form name="StartStopForm" action="\$MyURL" method="get">
<input type="hidden" name="archivehost" value="\$host">
<input type="hidden" name="host" value="\$host">
-<input type="submit" value="$Lang{Start_Archive}" name="action">
-<input type="submit" value="$Lang{Stop_Dequeue_Archive}" name="action">
+<input type="hidden" name="action" value="">
+<input type="button" value="\$Lang->{Start_Archive}"
+ onClick="document.StartStopForm.action.value='Start_Archive';
+ document.StartStopForm.submit();">
+<input type="button" value="\$Lang->{Stop_Dequeue_Archive}"
+ onClick="document.StartStopForm.action.value='Stop_Dequeue_Archive';
+ document.StartStopForm.submit();">
</form>
\$ArchiveStr
<input type="hidden" name="host" value="\$host">
<input type="hidden" name="share" value="\${EscHTML(\$share)}">
<input type="hidden" name="fcbMax" value="\$checkBoxCnt">
-<input type="hidden" name="action" value="$Lang{Restore}">
+<input type="hidden" name="action" value="Restore">
<br>
<table width="100%">
<tr><td valign="top">
$Lang{Backups_are_deferred_for_hours_hours_change_this_number} = <<EOF;
<li>Os backups atrazaram-se durante \$hours hours
-(<a href=\"\$MyURL?action=\${EscURI(\$Lang->{Stop_Dequeue_Archive})}&host=\$host\">Troque este número</a>).
+(<a href=\"\$MyURL?action=Stop_Dequeue_Backup&host=\$host\">Troque este número</a>).
EOF
$Lang{tryIP} = " y \$StatusHost{dhcpHostIP}";
#######################################################################
# RSS strings
#######################################################################
-$Lang{RSS_Doc_Title} = "BackupPC Server";
-$Lang{RSS_Doc_Description} = "RSS feed for BackupPC";
+$Lang{RSS_Doc_Title} = "Servidor BackupPC";
+$Lang{RSS_Doc_Description} = "RSS feed do BackupPC";
$Lang{RSS_Host_Summary} = <<EOF;
#Completo: \$fullCnt;
Completo Antig./Dias: \$fullAge;
# Configuration editor strings (all ENGLISH currently)
#######################################################################
-$Lang{Only_privileged_users_can_edit_config_files} = "Only privileged users can edit configuation settings.";
-$Lang{CfgEdit_Edit_Config} = "Edit Config";
-$Lang{CfgEdit_Edit_Hosts} = "Edit Hosts";
-
-$Lang{CfgEdit_Title_Server} = "Server";
-$Lang{CfgEdit_Title_General_Parameters} = "General Parameters";
-$Lang{CfgEdit_Title_Wakeup_Schedule} = "Wakeup Schedule";
-$Lang{CfgEdit_Title_Concurrent_Jobs} = "Concurrent Jobs";
-$Lang{CfgEdit_Title_Pool_Filesystem_Limits} = "Pool Filesystem Limits";
-$Lang{CfgEdit_Title_Other_Parameters} = "Other Parameters";
-$Lang{CfgEdit_Title_Remote_Apache_Settings} = "Remote Apache Settings";
-$Lang{CfgEdit_Title_Program_Paths} = "Program Paths";
-$Lang{CfgEdit_Title_Install_Paths} = "Install Paths";
+$Lang{Only_privileged_users_can_edit_config_files} = "Somente usuários privilegiados podem editar as configurações.";
+$Lang{CfgEdit_Edit_Config} = "Editar Configurações";
+$Lang{CfgEdit_Edit_Hosts} = "Editar Hosts";
+
+$Lang{CfgEdit_Title_Server} = "Servidor";
+$Lang{CfgEdit_Title_General_Parameters} = "Parâmetros Gerais";
+$Lang{CfgEdit_Title_Wakeup_Schedule} = "Agenda de ativação";
+$Lang{CfgEdit_Title_Concurrent_Jobs} = "Trabalhos correntes";
+$Lang{CfgEdit_Title_Pool_Filesystem_Limits} = "Limites do Pool no sistema de arquivos";
+$Lang{CfgEdit_Title_Other_Parameters} = "Outros Parâmetros";
+$Lang{CfgEdit_Title_Remote_Apache_Settings} = "Configurações remotas do Apache";
+$Lang{CfgEdit_Title_Program_Paths} = "Caminho para o programa";
+$Lang{CfgEdit_Title_Install_Paths} = "Caminho de instalação";
$Lang{CfgEdit_Title_Email} = "Email";
-$Lang{CfgEdit_Title_Email_settings} = "Email settings";
-$Lang{CfgEdit_Title_Email_User_Messages} = "Email User Messages";
+$Lang{CfgEdit_Title_Email_settings} = "Configurações de Email";
+$Lang{CfgEdit_Title_Email_User_Messages} = "Mensagens de Email de Usuários";
$Lang{CfgEdit_Title_CGI} = "CGI";
-$Lang{CfgEdit_Title_Admin_Privileges} = "Admin Privileges";
-$Lang{CfgEdit_Title_Page_Rendering} = "Page Rendering";
-$Lang{CfgEdit_Title_Paths} = "Paths";
-$Lang{CfgEdit_Title_User_URLs} = "User URLs";
-$Lang{CfgEdit_Title_User_Config_Editing} = "User Config Editing";
-$Lang{CfgEdit_Title_Xfer} = "Xfer";
-$Lang{CfgEdit_Title_Xfer_Settings} = "Xfer Settings";
-$Lang{CfgEdit_Title_Smb_Settings} = "Smb Settings";
-$Lang{CfgEdit_Title_Tar_Settings} = "Tar Settings";
-$Lang{CfgEdit_Title_Rsync_Settings} = "Rsync Settings";
-$Lang{CfgEdit_Title_Rsyncd_Settings} = "Rsyncd Settings";
-$Lang{CfgEdit_Title_BackupPCd_Settings} = "BackupPCd Settings";
-$Lang{CfgEdit_Title_Archive_Settings} = "Archive Settings";
-$Lang{CfgEdit_Title_Include_Exclude} = "Include/Exclude";
-$Lang{CfgEdit_Title_Smb_Paths_Commands} = "Smb Paths/Commands";
-$Lang{CfgEdit_Title_Tar_Paths_Commands} = "Tar Paths/Commands";
-$Lang{CfgEdit_Title_Rsync_Paths_Commands_Args} = "Rsync Paths/Commands/Args";
-$Lang{CfgEdit_Title_Rsyncd_Port_Args} = "Rsyncd Port/Args";
-$Lang{CfgEdit_Title_Archive_Paths_Commands} = "Archive Paths/Commands";
-$Lang{CfgEdit_Title_Schedule} = "Schedule";
-$Lang{CfgEdit_Title_Full_Backups} = "Full Backups";
-$Lang{CfgEdit_Title_Incremental_Backups} = "Incremental Backups";
+$Lang{CfgEdit_Title_Admin_Privileges} = "Privilégios de Administrador";
+$Lang{CfgEdit_Title_Page_Rendering} = "Renderização de página";
+$Lang{CfgEdit_Title_Paths} = "Caminhos";
+$Lang{CfgEdit_Title_User_URLs} = "URLs do Usuário";
+$Lang{CfgEdit_Title_User_Config_Editing} = "Edição de Configurações do Usuário";
+$Lang{CfgEdit_Title_Xfer} = "Transferência";
+$Lang{CfgEdit_Title_Xfer_Settings} = "Configurações de transferência";
+$Lang{CfgEdit_Title_Smb_Settings} = "Configurações do Smb";
+$Lang{CfgEdit_Title_Tar_Settings} = "Configurações doTar";
+$Lang{CfgEdit_Title_Rsync_Settings} = "Configurações do Rsync";
+$Lang{CfgEdit_Title_Rsyncd_Settings} = "Configurações do Rsyncd";
+$Lang{CfgEdit_Title_BackupPCd_Settings} = "Configurações do BackupPCd";
+$Lang{CfgEdit_Title_Archive_Settings} = "Configurações do Archive";
+$Lang{CfgEdit_Title_Include_Exclude} = "Inclui/Exclui";
+$Lang{CfgEdit_Title_Smb_Paths_Commands} = "Caminhos/Comandos do Smb";
+$Lang{CfgEdit_Title_Tar_Paths_Commands} = "Caminhos/Comandos do Tar";
+$Lang{CfgEdit_Title_Rsync_Paths_Commands_Args} = "Caminhos/Comandos/Args Rsync";
+$Lang{CfgEdit_Title_Rsyncd_Port_Args} = "Porta/Args do Rsyncd";
+$Lang{CfgEdit_Title_Archive_Paths_Commands} = "Caminhos/Comandos do Arquivo";
+$Lang{CfgEdit_Title_Schedule} = "Agenda";
+$Lang{CfgEdit_Title_Full_Backups} = "Backups Completos";
+$Lang{CfgEdit_Title_Incremental_Backups} = "Backups Incrementais";
$Lang{CfgEdit_Title_Blackouts} = "Blackouts";
-$Lang{CfgEdit_Title_Other} = "Other";
-$Lang{CfgEdit_Title_Backup_Settings} = "Backup Settings";
-$Lang{CfgEdit_Title_Client_Lookup} = "Client Lookup";
-$Lang{CfgEdit_Title_Other} = "Other";
-$Lang{CfgEdit_Title_User_Commands} = "User Commands";
+$Lang{CfgEdit_Title_Other} = "Outros";
+$Lang{CfgEdit_Title_Backup_Settings} = "Configurações do Backup";
+$Lang{CfgEdit_Title_Client_Lookup} = "Busca Cliente";
+$Lang{CfgEdit_Title_Other} = "Outro";
+$Lang{CfgEdit_Title_User_Commands} = "Commandos de usuário";
$Lang{CfgEdit_Title_Hosts} = "Hosts";
$Lang{CfgEdit_Hosts_Comment} = <<EOF;
-To add a new host, select Add and then enter the name. To start with
-the per-host configuration from another host, enter the host name
-as NEWHOST=COPYHOST. This will overwrite any existing per-host
-configuration for NEWHOST. You can also do this for an existing
-host. To delete a host, hit the Delete button. For Add, Delete,
-and configuration copy, changes don't take effect until you select
-Save. None of the deleted host's backups will be removed,
-so if you accidently delete a host, simply re-add it. To completely
-remove a host's backups, you need to manually remove the files
-below \$topDir/pc/HOST
+
+Para adicionar um novo host, selecione Adicionar e entre com o
+nome. Para iniciar uma configuração específica para um host a partir
+de uma configuração de outro, indique na forma
+NOVOHOST=HOSTDECOPIA. Isto irá sobre-escrever qualquer configuração
+pré-existente para o NOVOHOST. Você também pode fazer isto para um
+host já existente. Para excluir um host, clique no botão Excluir. As
+mudanças envolvendo as operações de adicionar, excluir e fazer uma
+cópia de configuração só são efetivadas depois de salvas. Nenhum dos
+backups dos hosts excluídos serão apagados, portanto se
+incidentalmente você excluir um host, simplesmente o adicione
+novamente. Para remover completamente backups de um host, você precisa
+remover os arquivos manualmente abaixo de \$topDir/pc/HOST
EOF
$Lang{CfgEdit_Header_Main} = <<EOF;
-\${h1("Main Configuration Editor")}
+\${h1("Editor de configurações principais")}
EOF
$Lang{CfgEdit_Header_Host} = <<EOF;
-\${h1("Host \$host Configuration Editor")}
+\${h1("Editor de configurações do Host \$host")}
<p>
-Note: Check Override if you want to modify a value specific to this host.
+Note: Marque Override se você quiser modificar um valor especificamente neste host.
EOF
-$Lang{CfgEdit_Button_Save} = "Save";
-$Lang{CfgEdit_Button_Insert} = "Insert";
-$Lang{CfgEdit_Button_Delete} = "Delete";
-$Lang{CfgEdit_Button_Add} = "Add";
-$Lang{CfgEdit_Button_Override} = "Override";
+$Lang{CfgEdit_Button_Save} = "Salvar";
+$Lang{CfgEdit_Button_Insert} = "Inserir";
+$Lang{CfgEdit_Button_Delete} = "Excluir";
+$Lang{CfgEdit_Button_Add} = "Adicionar";
+$Lang{CfgEdit_Button_Override} = "Sobrepor";
$Lang{CfgEdit_Button_New_Key} = "New Key";
$Lang{CfgEdit_Error__must_be_an_integer}
- = "Error: \$var must be an integer";
+ = "Erro: \$var precisa ser um inteiro";
$Lang{CfgEdit_Error__must_be_real_valued_number}
- = "Error: \$var must be a real-valued number";
+ = "Erro: \$var precisa ser um número com valor-real";
$Lang{CfgEdit_Error__entry__must_be_an_integer}
- = "Error: \$var entry \$k must be an integer";
+ = "Erro: \$var inserida \$k precisa ser um inteiro";
$Lang{CfgEdit_Error__entry__must_be_real_valued_number}
- = "Error: \$var entry \$k must be a real-valued number";
+ = "Erro: \$var inserida \$k precisa ser um número com valor-real";
$Lang{CfgEdit_Error__must_be_executable_program}
- = "Error: \$var must be a valid executable path";
+ = "Erro: \$var precisa ser um caminho executável válido";
$Lang{CfgEdit_Error__must_be_valid_option}
- = "Error: \$var must be a valid option";
+ = "Erro: \$var precisa ser uma opção válida";
$Lang{CfgEdit_Error_Copy_host_does_not_exist}
- = "Copy host \$copyHost doesn't exist; creating full host name \$fullHost. Delete this host if that is not what you wanted.";
+ = "Copia host \$copyHost não existe; criando nome de host completo \$fullHost. Exclua este hosts se náo for o que você deseja.";
$Lang{CfgEdit_Log_Copy_host_config}
- = "\$User copied config from host \$fromHost to \$host\n";
+ = "\$User configuração copiada do host \$fromHost para \$host\n";
$Lang{CfgEdit_Log_Delete_param}
- = "\$User deleted \$p from \$conf\n";
+ = "\$User excluido \$p do \$conf\n";
$Lang{CfgEdit_Log_Add_param_value}
- = "\$User added \$p to \$conf, set to \$value\n";
+ = "\$User adicionado \$p para \$conf, marcado para \$value\n";
$Lang{CfgEdit_Log_Change_param_value}
- = "\$User changed \$p in \$conf to \$valueNew from \$valueOld\n";
+ = "\$User alterado \$p em \$conf para \$valueNew de \$valueOld\n";
$Lang{CfgEdit_Log_Host_Delete}
- = "\$User deleted host \$host\n";
+ = "\$User excluido host \$host\n";
$Lang{CfgEdit_Log_Host_Change}
- = "\$User host \$host changed \$key from \$valueOld to \$valueNew\n";
+ = "\$User host \$host alterado \$key de \$valueOld para \$valueNew\n";
$Lang{CfgEdit_Log_Host_Add}
- = "\$User added host \$host: \$value\n";
+ = "\$User adicionado host \$host: \$value\n";
#end of lang_pt_BR.pm
+
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
my $bpc = bless {
%$paths,
- Version => '3.0.0alpha',
+ Version => '3.0.0beta0',
}, $class;
$bpc->{storage} = BackupPC::Storage->new($paths);
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
return "$s->{ConfDir}/config.pl" if ( !defined($host) );
if ( $s->{useFHS} ) {
- return "$s->{ConfDir}/host/$host.pl";
+ return "$s->{ConfDir}/pc/$host.pl";
} else {
+ return "$s->{TopDir}/pc/$host/config.pl"
+ if ( -f "$s->{TopDir}/pc/$host/config.pl" );
return "$s->{ConfDir}/$host.pl"
if ( $host ne "config" && -f "$s->{ConfDir}/$host.pl" );
- return "$s->{TopDir}/pc/$host/config.pl";
+ return "$s->{ConfDir}/pc/$host.pl";
}
}
$conf->{$param} = { "*" => $conf->{$param} };
}
+ #
+ # Handle backward compatibility with defunct BlackoutHourBegin,
+ # BlackoutHourEnd, and BlackoutWeekDays parameters.
+ #
+ if ( defined($conf->{BlackoutHourBegin}) ) {
+ push(@{$conf->{BlackoutPeriods}},
+ {
+ hourBegin => $conf->{BlackoutHourBegin},
+ hourEnd => $conf->{BlackoutHourEnd},
+ weekDays => $conf->{BlackoutWeekDays},
+ }
+ );
+ delete($conf->{BlackoutHourBegin});
+ delete($conf->{BlackoutHourEnd});
+ delete($conf->{BlackoutWeekDays});
+ }
+
return (undef, $conf);
}
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
$file = $1 if ( $file =~ /(.*)/ );
next if ( $file eq "attrib" && $mangle
|| $file eq "."
- || $file eq ".." );
+ || $file eq ".."
+ || $file eq "backupInfo"
+ );
my $fileUM = $file;
$fileUM = $m->{bpc}->fileNameUnmangle($fileUM) if ( $mangle );
push(@shareList, $fileUM);
$files->{$fileUM}[$i]{inode} = $s[1];
}
+ #
+ # Flag deleted files
+ #
+ if ( defined($attr) ) {
+ my $a = $attr->get;
+ foreach my $fileUM ( keys(%$a) ) {
+ next if ( $a->{$fileUM}{type} != BPC_FTYPE_DELETED );
+ $files->{$fileUM}[$i]{type} = BPC_FTYPE_DELETED;
+ }
+ }
+
#
# Merge old backups. Don't merge directories from old
# backups because every backup has an accurate directory
$files->{$fileUM}[$i] = $files->{$fileUM}[$k];
}
}
+ }
- #
- # Finally, remove deleted files
- #
- if ( defined($attr) ) {
- my $a = $attr->get;
- foreach my $fileUM ( keys(%$a) ) {
- next if ( $a->{$fileUM}{type} != BPC_FTYPE_DELETED );
- $files->{$fileUM}[$i] = undef if ( defined($files->{$fileUM}) );
- }
- }
+ #
+ # Remove deleted files
+ #
+ for ( $i = 0 ; $i < @{$m->{backups}} ; $i++ ) {
+ foreach my $fileUM ( keys(%$files) ) {
+ next if ( !defined($files->{$fileUM}[$i])
+ || $files->{$fileUM}[$i]{type} != BPC_FTYPE_DELETED );
+ $files->{$fileUM}[$i] = undef;
+ }
}
+
#print STDERR "Returning:\n", Dumper($files);
return $files;
}
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
# Note: also update configure.pl when this version number is changed!
#
- if ( $File::RsyncP::VERSION < 0.52 ) {
+ if ( $File::RsyncP::VERSION < 0.62 ) {
$RsyncLibOK = 0;
$RsyncLibErr = "File::RsyncP module version"
- . " ($File::RsyncP::VERSION) too old: need 0.52";
+ . " ($File::RsyncP::VERSION) too old: need 0.62";
} else {
$RsyncLibOK = 1;
}
if ( $t->{type} eq "full" ) {
if ( $t->{partialNum} ) {
$logMsg = "full backup started for directory $t->{shareName};"
- . " updating partial $t->{partialNum}";
+ . " updating partial #$t->{partialNum}";
} else {
$logMsg = "full backup started for directory $t->{shareName}";
+ if ( $t->{incrBaseBkupNum} ne "" ) {
+ $logMsg .= " (baseline backup #$t->{incrBaseBkupNum})";
+ }
}
} else {
$incrDate = $bpc->timeStamp($t->{incrBaseTime}, 1);
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
sub attribGetWhere
{
- my($fio, $f) = @_;
- my($dir, $fname, $share, $shareM);
+ my($fio, $f, $noCache) = @_;
+ my($dir, $fname, $share, $shareM, $partial, $attr);
$fname = $f->{name};
$fname = "$fio->{xfer}{pathHdrSrc}/$fname"
$dir = "";
$fname = $fio->{share};
}
- $fio->viewCacheDir($share, $dir);
$shareM .= "/$dir" if ( $dir ne "" );
- if ( defined(my $attr = $fio->{viewCache}{$shareM}{$fname}) ) {
- return ($attr, 0);
- } elsif ( defined(my $attr = $fio->{partialCache}{$shareM}{$fname}) ) {
- return ($attr, 1);
+
+ if ( $noCache ) {
+ $share = $fio->{share} if ( !defined($share) );
+ my $dirAttr = $fio->{view}->dirAttrib($fio->{viewNum}, $share, $dir);
+ $attr = $dirAttr->{$fname};
} else {
- return;
+ $fio->viewCacheDir($share, $dir);
+ if ( defined($attr = $fio->{viewCache}{$shareM}{$fname}) ) {
+ $partial = 0;
+ } elsif ( defined($attr = $fio->{partialCache}{$shareM}{$fname}) ) {
+ $partial = 1;
+ } else {
+ return;
+ }
+ if ( $attr->{mode} & S_HLINK_TARGET ) {
+ $attr->{hlink_self} = 1;
+ $attr->{mode} &= ~S_HLINK_TARGET;
+ }
}
+ return ($attr, $partial);
}
sub attribGet
$fio->log("$attr->{fullPath}: redirecting to $target (will trim "
. "$fio->{xfer}{pathHdrSrc})") if ( $fio->{logLevel} >= 4 );
$target =~ s/^\Q$fio->{xfer}{pathHdrSrc}//;
+ $target =~ s{^/+}{};
+ #
+ # Note: overwrites name to point to real file
+ #
$f->{name} = $target;
- $attr = $fio->attribGet($f);
+ ($attr) = $fio->attribGetWhere($f, 1);
$fio->log(" ... now got $attr->{fullPath}")
if ( $fio->{logLevel} >= 4 );
}
my($fh, $fileData);
if ( $fio->{full}
|| !defined($attr)
- || $attr->{type} != $type
- || $attr->{mtime} != $f->{mtime}
- || $attr->{size} != $f->{size}
- || $attr->{uid} != $f->{uid}
- || $attr->{gid} != $f->{gid}
- || $attr->{mode} != $f->{mode}
+ || $attr->{type} != $type
+ || $attr->{mtime} != $f->{mtime}
+ || $attr->{size} != $f->{size}
+ || $attr->{uid} != $f->{uid}
+ || $attr->{gid} != $f->{gid}
+ || $attr->{mode} != $f->{mode}
+ || $attr->{hlink_self} != $f->{hlink_self}
|| !defined($fh = BackupPC::FileZIO->open($attr->{fullPath}, 0,
$attr->{compress}))
|| $fh->read(\$fileData, length($str) + 1) != length($str)
. " ($fio->{rxLocalAttr}{compress} vs $fio->{xfer}{compress})")
if ( $fio->{logLevel} >= 4 );
}
+ #
+ # If the local file is a hardlink then no match
+ #
+ if ( defined($fio->{rxLocalAttr})
+ && $fio->{rxLocalAttr}{type} == BPC_FTYPE_HARDLINK ) {
+ $fio->{rxMatchBlk} = undef;
+ $fio->log("$fio->{rxFile}{name}: no match on hardlinks")
+ if ( $fio->{logLevel} >= 4 );
+ my $fCopy;
+ # need to copy since hardlink attribGet overwrites the name
+ %{$fCopy} = %$f;
+ $fio->{rxHLinkAttr} = $fio->attribGet($fCopy, 1); # hardlink attributes
+ } else {
+ delete($fio->{rxHLinkAttr});
+ }
delete($fio->{rxInFd});
delete($fio->{rxOutFd});
delete($fio->{rxDigest});
my $attr = $fio->{rxLocalAttr};
my $fh;
if ( !defined($fio->{rxInFd}) && !defined($fio->{rxInData}) ) {
+ my $inPath = $attr->{fullPath};
+ $inPath = $fio->{rxHLinkAttr}{fullPath}
+ if ( defined($fio->{rxHLinkAttr}) );
if ( $attr->{compress} ) {
if ( !defined($fh = BackupPC::FileZIO->open(
- $attr->{fullPath},
+ $inPath,
0,
$attr->{compress})) ) {
- $fio->log("Can't open $attr->{fullPath}");
+ $fio->log("Can't open $inPath");
$fio->{stats}{errorCnt}++;
return -1;
}
}
$fh->close;
} else {
- if ( open(F, "<", $attr->{fullPath}) ) {
+ if ( open(F, "<", $inPath) ) {
binmode(F);
$fio->{rxInFd} = *F;
$fio->{rxInName} = $attr->{fullPath};
} else {
- $fio->log("Unable to open $attr->{fullPath}");
+ $fio->log("Unable to open $inPath");
$fio->{stats}{errorCnt}++;
return -1;
}
my $seekPosn = $fio->{rxMatchBlk} * $fio->{rxBlkSize};
if ( defined($fio->{rxInFd})
&& !sysseek($fio->{rxInFd}, $seekPosn, 0) ) {
- $fio->log("Unable to seek $attr->{rxInName} to $seekPosn");
+ $fio->log("Unable to seek $fio->{rxInName} to $seekPosn");
$fio->{stats}{errorCnt}++;
return -1;
}
my $f = $fio->{rxFile};
$fio->logFileAction("same", $f) if ( $fio->{logLevel} >= 1 );
if ( $fio->{full}
- || $attr->{type} != $f->{type}
- || $attr->{mtime} != $f->{mtime}
- || $attr->{size} != $f->{size}
- || $attr->{gid} != $f->{gid}
- || $attr->{mode} != $f->{mode} ) {
+ || $attr->{type} != $f->{type}
+ || $attr->{mtime} != $f->{mtime}
+ || $attr->{size} != $f->{size}
+ || $attr->{uid} != $f->{uid}
+ || $attr->{gid} != $f->{gid}
+ || $attr->{mode} != $f->{mode}
+ || $attr->{hlink_self} != $f->{hlink_self} ) {
#
# In the full case, or if the attributes are different,
# we need to make a link from the previous file and
my $type = $a->{type};
my $extraAttribs = {};
+ if ( $a->{mode} & S_HLINK_TARGET ) {
+ $a->{hlink_self} = 1;
+ $a->{mode} &= ~S_HLINK_TARGET;
+ }
$n =~ s/^\Q$fio->{xfer}{pathHdrSrc}//;
$fio->log("Sending $name (remote=$n) type = $type") if ( $fio->{logLevel} >= 1 );
if ( $type == BPC_FTYPE_CHARDEV
&& ($type == BPC_FTYPE_HARDLINK || $type == BPC_FTYPE_FILE)
&& ($type == BPC_FTYPE_HARDLINK
|| $fio->{protocol_version} < 27
- || ($a->{mode} & S_HLINK_TARGET) ) ) {
+ || $a->{hlink_self}) ) {
#
# Fill in fake inode information so that the remote rsync
# can correctly create hardlinks.
$fio->log("$a->{fullPath}: can't open for hardlink");
$fio->{stats}{errorCnt}++;
}
- } elsif ( $a->{mode} & S_HLINK_TARGET ) {
+ } elsif ( $a->{hlink_self} ) {
if ( defined($fio->{hlinkFile2Num}{$name}) ) {
$inode = $fio->{hlinkFile2Num}{$name};
} else {
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
use File::Path;
use File::Copy;
use Getopt::Std;
+use lib "./lib";
+use BackupPC::Lib;
+use BackupPC::Config::Meta qw(:all);
+
+my $bpc;
+die("BackupPC::Lib->new failed\n")
+ if ( !($bpc = BackupPC::Lib->new(".", ".", "./conf", 1)) );
umask(0022);
-my $Version = "3.0.0alpha";
-my $ReleaseDate = "23 Jan 2006";
+my $Version = "3.0.0beta0";
+my $ReleaseDate = "11 Jul 2006";
my $DistDir = "dist/BackupPC-$Version";
my @PerlSrc = qw(
print OUT "$1'__INSTALLDIR__'$2\n";
} elsif ( $file =~ /Lib.pm/ && /^(\s*my \$useFHS\s*=\s*)\d;/ ) {
print OUT "${1}0;\n";
+ } elsif ( $file =~ /Lib.pm/ && /(.*Version *=> .*)'[\w\d\.]+',/ ) {
+ print OUT "$1'$Version',\n";
} elsif ( $file =~ /configure.pl/ && /__CONFIGURE_BIN_LIST__/ ) {
print OUT " ", join("\n ", grep(/^bin\//, @PerlSrc)), "\n";
} elsif ( $file =~ /configure.pl/ && /__CONFIGURE_LIB_LIST__/ ) {
print("$file missing $v from conf/config.pl\n");
$errors++;
}
+
+ #
+ # Do extra checks that the CgiUserConfigEdit hash in the Meta
+ # file matches the config file
+ #
+ foreach my $p ( keys(%{$ConfigMeta{CgiUserConfigEdit}{child}}) ) {
+ if ( !defined($bpc->{Conf}{CgiUserConfigEdit}{$p}) ) {
+ print("lib/BackupPC/Config/Meta.pm has $p in CgiUserConfigEdit,"
+ . " but conf/config.pl CgiUserConfigEdit does not\n");
+ $errors++;
+ }
+ }
+ foreach my $p ( keys(%{$bpc->{Conf}{CgiUserConfigEdit}}) ) {
+ if ( !defined($ConfigMeta{CgiUserConfigEdit}{child}{$p}) ) {
+ print("conf/config.pl CgiUserConfigEdit has $p, but"
+ . " lib/BackupPC/Config/Meta.pm does not\n");
+ $errors++;
+ }
+ }
return $errors;
}
foreach my $file ( (
qw(cgi-bin/BackupPC_Admin bin/BackupPC_sendEmail),
- <lib/BackupPC/CGI/*pm>
+ <lib/BackupPC/CGI/*pm>,
+ <lib/BackupPC/Lang/en.pm>,
) ) {
open(F, $file) || die("can't open $file");
binmode(F);
projects / BackupPC.git / commitdiff
