X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=lib%2FBackupPC%2FCGI%2FLib.pm;h=280ff53453aabd605b3893150f20f0bc3b59bf24;hp=40950f8c18d74aeae519189d23f62e08936f9e32;hb=e951f787a66c5bd9e9955c3f657a5b44289c0fe1;hpb=8f5625f9cdf47f8e04be654c4954838b2df3e26d;ds=sidebyside
diff --git a/lib/BackupPC/CGI/Lib.pm b/lib/BackupPC/CGI/Lib.pm
index 40950f8..280ff53 100644
--- a/lib/BackupPC/CGI/Lib.pm
+++ b/lib/BackupPC/CGI/Lib.pm
@@ -29,7 +29,7 @@
#
#========================================================================
#
-# Version 2.1.0beta0, released 20 Mar 2004.
+# Version 2.1.0, released 20 Jun 2004.
#
# See http://backuppc.sourceforge.net.
#
@@ -283,7 +283,9 @@ sub GetStatusInfo
eval($reply);
# ignore status related to admin and trashClean jobs
if ( $status =~ /\bhosts\b/ ) {
- delete($Status{$bpc->adminJob});
+ foreach my $host ( grep(/admin/, keys(%Status)) ) {
+ delete($Status{$host}) if ( $bpc->isAdminJob($host) );
+ }
delete($Status{$bpc->trashJob});
}
}
@@ -390,23 +392,23 @@ sub Header
{
my($title, $content, $noBrowse, $contentSub, $contentPost) = @_;
my @adminLinks = (
- { link => "", name => $Lang->{Status},
+ { link => "", name => $Lang->{Status}},
+ { link => "?action=adminOpts", name => $Lang->{Admin_Options},
+ priv => 1},
+ { link => "?action=summary", name => $Lang->{PC_Summary}},
+ { link => "?action=view&type=LOG", name => $Lang->{LOG_file},
+ priv => 1},
+ { link => "?action=LOGlist", name => $Lang->{Old_LOGs},
priv => 1},
- { link => "?action=adminOpts", name => $Lang->{Admin_Options} },
- { link => "?action=summary", name => $Lang->{PC_Summary},
+ { link => "?action=emailSummary", name => $Lang->{Email_summary},
priv => 1},
- { link => "?action=view&type=LOG", name => $Lang->{LOG_file} },
- { link => "?action=LOGlist", name => $Lang->{Old_LOGs} },
- { link => "?action=emailSummary", name => $Lang->{Email_summary} },
- { link => "?action=view&type=config", name => $Lang->{Config_file} },
- { link => "?action=view&type=hosts", name => $Lang->{Hosts_file} },
- { link => "?action=queue", name => $Lang->{Current_queues} },
- { link => "?action=view&type=docs", name => $Lang->{Documentation},
+ { link => "?action=view&type=config", name => $Lang->{Config_file},
priv => 1},
- { link => "http://backuppc.sourceforge.net/faq", name => "FAQ",
+ { link => "?action=view&type=hosts", name => $Lang->{Hosts_file},
priv => 1},
- { link => "http://backuppc.sourceforge.net", name => "SourceForge",
+ { link => "?action=queue", name => $Lang->{Current_queues},
priv => 1},
+ @{$Conf{CgiNavBarLinks} || []},
);
my $host = $In{host};
@@ -418,12 +420,12 @@ sub Header
$Conf{CgiHeaders}
-
+
EOF
if ( defined($Hosts) && defined($host) && defined($Hosts->{$host}) ) {
print "