--- loncom/interface/lonannounce.pm 2006/07/03 15:30:52 1.59
+++ loncom/interface/lonannounce.pm 2006/11/29 07:46:39 1.62
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Announce
#
-# $Id: lonannounce.pm,v 1.59 2006/07/03 15:30:52 www Exp $
+# $Id: lonannounce.pm,v 1.62 2006/11/29 07:46:39 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -80,8 +80,13 @@ sub readcalendar {
$returnhash{$courseid.'@'.$item}=$thiscal{$item};
}
}
- my $can_see_hidden = $env{'request.role.adv'};
- my $navmap;# = Apache::lonnavmaps::navmap->new();
+ my $can_see_hidden = ($env{'request.role.adv'} &&
+ ($courseid eq $env{'request.course.id'}));
+
+ my $navmap;
+ if ($courseid eq $env{'request.course.id'}) {
+ $navmap = Apache::lonnavmaps::navmap->new();
+ }
my %resourcedata=
&Apache::lonnet::dump('resourcedata',$coursedom,$coursenum);
foreach my $thiskey (sort keys %resourcedata) {
@@ -353,7 +358,8 @@ ENDDIA
# ----------------------------------------------------- Summarize all calendars
sub get_all_calendars {
my %allcal=();
- foreach my $course (sort(&Apache::loncommon::findallcourses())) {
+ my %courses = &Apache::loncommon::findallcourses();
+ foreach my $course (sort(keys(%courses))) {
%allcal=(%allcal,&readcalendar($course));
}
return %allcal;
@@ -490,9 +496,9 @@ SERVERANNOUNCE
# list servers
foreach my $host (sort(keys(%Apache::lonnet::hostname))) {
if (&Apache::lonnet::allowed('psa',$Apache::lonnet::hostdom{$host})) {
- $r->print ('
'.
+ $r->print ('