projects
/
BackupPC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- fixed configure.pl and makeDist.
[BackupPC.git]
/
lib
/
BackupPC
/
CGI
/
HostInfo.pm
diff --git
a/lib/BackupPC/CGI/HostInfo.pm
b/lib/BackupPC/CGI/HostInfo.pm
index
3bdb1c1
..
5c20ef7
100644
(file)
--- a/
lib/BackupPC/CGI/HostInfo.pm
+++ b/
lib/BackupPC/CGI/HostInfo.pm
@@
-28,7
+28,7
@@
#
#========================================================================
#
#
#========================================================================
#
-# Version
2.1.0beta0, released 20 Mar 2004
.
+# Version
3.0.0alpha, released 23 Jan 2006
.
#
# See http://backuppc.sourceforge.net.
#
#
# See http://backuppc.sourceforge.net.
#
@@
-46,14
+46,16
@@
sub action
$host =~ s/^\s+//;
$host =~ s/\s+$//;
$host =~ s/^\s+//;
$host =~ s/\s+$//;
- return Action_GeneralInfo() if ( $host eq "" );
+ if ( $host eq "" ) {
+ ErrorExit(eval("qq{$Lang->{Unknown_host_or_user}}"));
+ }
$host = lc($host)
$host = lc($host)
-
if ( !-d "$TopDir/pc/$host" && -d "$TopDir/pc/" . lc($host) );
+ if ( !-d "$TopDir/pc/$host" && -d "$TopDir/pc/" . lc($host) );
if ( $host =~ /\.\./ || !-d "$TopDir/pc/$host" ) {
#
# try to lookup by user name
#
if ( $host =~ /\.\./ || !-d "$TopDir/pc/$host" ) {
#
# try to lookup by user name
#
- if ( !defined($Hosts->{$host}) ) {
+ if (
$host eq "" ||
!defined($Hosts->{$host}) ) {
foreach my $h ( keys(%$Hosts) ) {
if ( $Hosts->{$h}{user} eq $host
|| lc($Hosts->{$h}{user}) eq lc($host) ) {
foreach my $h ( keys(%$Hosts) ) {
if ( $Hosts->{$h}{user} eq $host
|| lc($Hosts->{$h}{user}) eq lc($host) ) {
@@
-63,7
+65,7
@@
sub action
}
CheckPermission();
ErrorExit(eval("qq{$Lang->{Unknown_host_or_user}}"))
}
CheckPermission();
ErrorExit(eval("qq{$Lang->{Unknown_host_or_user}}"))
-
if ( !defined($Hosts->{$host}) );
+ if ( !defined($Hosts->{$host}) );
}
$In{host} = $host;
}
}
$In{host} = $host;
}
@@
-286,7
+288,8
@@
EOF
if ( $StatusHost{aliveCnt} > 0 ) {
$statusStr .= eval("qq{$Lang->{priorStr_to_host_have_succeeded_StatusHostaliveCnt_consecutive_times}}");
if ( $StatusHost{aliveCnt} > 0 ) {
$statusStr .= eval("qq{$Lang->{priorStr_to_host_have_succeeded_StatusHostaliveCnt_consecutive_times}}");
- if ( $StatusHost{aliveCnt} >= $Conf{BlackoutGoodCnt}
+ if ( (@{$Conf{BlackoutPeriods}} || defined($Conf{BlackoutHourBegin}))
+ && $StatusHost{aliveCnt} >= $Conf{BlackoutGoodCnt}
&& $Conf{BlackoutGoodCnt} >= 0 ) {
#
# Handle backward compatibility with original separate scalar
&& $Conf{BlackoutGoodCnt} >= 0 ) {
#
# Handle backward compatibility with original separate scalar