--- loncom/interface/lonannounce.pm	2006/09/02 20:47:11	1.60
+++ 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.60 2006/09/02 20:47:11 albertel 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;