projects
/
BackupPC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
3.1.0 changes:
[BackupPC.git]
/
lib
/
BackupPC
/
CGI
/
GeneralInfo.pm
diff --git
a/lib/BackupPC/CGI/GeneralInfo.pm
b/lib/BackupPC/CGI/GeneralInfo.pm
index
cbf3bb8
..
2dade4e
100644
(file)
--- a/
lib/BackupPC/CGI/GeneralInfo.pm
+++ b/
lib/BackupPC/CGI/GeneralInfo.pm
@@
-10,7
+10,7
@@
# Craig Barratt <cbarratt@users.sourceforge.net>
#
# COPYRIGHT
# Craig Barratt <cbarratt@users.sourceforge.net>
#
# COPYRIGHT
-# Copyright (C) 2003 Craig Barratt
+# Copyright (C) 2003
-2007
Craig Barratt
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@
-28,7
+28,7
@@
#
#========================================================================
#
#
#========================================================================
#
-# Version
2.1.0_CVS, released 8 Feb 2004
.
+# Version
3.1.0, released 25 Nov 2007
.
#
# See http://backuppc.sourceforge.net.
#
#
# See http://backuppc.sourceforge.net.
#
@@
-49,6
+49,7
@@
sub action
my $startTime = timeStamp2($Jobs{$host}{startTime});
next if ( $host eq $bpc->trashJob
&& $Jobs{$host}{processState} ne "running" );
my $startTime = timeStamp2($Jobs{$host}{startTime});
next if ( $host eq $bpc->trashJob
&& $Jobs{$host}{processState} ne "running" );
+ next if ( !$Privileged && !CheckPermission($host) );
$Jobs{$host}{type} = $Status{$host}{type}
if ( $Jobs{$host}{type} eq "" && defined($Status{$host}));
(my $cmd = $Jobs{$host}{cmd}) =~ s/$BinDir\///g;
$Jobs{$host}{type} = $Status{$host}{type}
if ( $Jobs{$host}{type} eq "" && defined($Status{$host}));
(my $cmd = $Jobs{$host}{cmd}) =~ s/$BinDir\///g;
@@
-70,6
+71,7
@@
EOF
&& $Status{$host}{reason} ne "Reason_restore_failed"
&& (!$Status{$host}{userReq}
|| $Status{$host}{reason} ne "Reason_no_ping") );
&& $Status{$host}{reason} ne "Reason_restore_failed"
&& (!$Status{$host}{userReq}
|| $Status{$host}{reason} ne "Reason_no_ping") );
+ next if ( !$Privileged && !CheckPermission($host) );
my $startTime = timeStamp2($Status{$host}{startTime});
my($errorTime, $XferViewStr);
if ( $Status{$host}{errorTime} > 0 ) {
my $startTime = timeStamp2($Status{$host}{startTime});
my($errorTime, $XferViewStr);
if ( $Status{$host}{errorTime} > 0 ) {
@@
-124,7
+126,9
@@
EOF
} elsif ( $Info{cpoolFileCnt} > 0 ) {
$poolInfo = $cpoolInfo;
}
} elsif ( $Info{cpoolFileCnt} > 0 ) {
$poolInfo = $cpoolInfo;
}
- my $content = eval ("qq{$Lang->{BackupPC_Server_Status}}");
+ my $generalInfo = eval("qq{$Lang->{BackupPC_Server_Status_General_Info}}")
+ if ( $Privileged );
+ my $content = eval("qq{$Lang->{BackupPC_Server_Status}}");
Header($Lang->{H_BackupPC_Server_Status}, $content);
Trailer();
}
Header($Lang->{H_BackupPC_Server_Status}, $content);
Trailer();
}