--- loncom/interface/lonannounce.pm	2006/01/12 22:58:47	1.40
+++ loncom/interface/lonannounce.pm	2006/03/15 21:55:43	1.46
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Announce
 #
-# $Id: lonannounce.pm,v 1.40 2006/01/12 22:58:47 albertel Exp $
+# $Id: lonannounce.pm,v 1.46 2006/03/15 21:55:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,6 +33,7 @@ use Apache::Constants qw(:common);
 use Apache::loncommon;
 use Apache::lonhtmlcommon();
 use Apache::lonlocal;
+use Apache::lonnavmaps();
 use Apache::lonrss();
 use Apache::lonnet;
 use HTML::Entities();
@@ -63,7 +64,7 @@ $help
 <tr><td>$lt{'end'}:</td><td>$enddateform</td></tr></table>
 <textarea name="msg" rows="4" cols="60">$text</textarea>
 <br />
-<!-- <label><input type="checkbox" name="rsspost" /> $lt{'incrss'}</label> -->
+<label><input type="checkbox" name="rsspost" /> $lt{'incrss'}</label>
 <br /><input type="button" onClick="trysubmit()" value="$lt{'post'}" /><hr />
 ENDFORM
 }
@@ -74,12 +75,15 @@ sub readcalendar {
     my $coursedom=$env{'course.'.$courseid.'.domain'};
     my %thiscal=&Apache::lonnet::dump('calendar',$coursedom,$coursenum);
     my %returnhash=();
-    foreach (keys %thiscal) {
-        unless (($_=~/^error\:/) || ($thiscal{$_}=~/^error\:/)) {
-	   $returnhash{$courseid.'@'.$_}=$thiscal{$_};
+    foreach my $item (keys(%thiscal)) {
+        unless (($item=~/^error\:/) || ($thiscal{$item}=~/^error\:/)) {
+	   $returnhash{$courseid.'@'.$item}=$thiscal{$item};
         }
     }
+
     if ($courseid eq $env{'request.course.id'}) {
+	my $can_see_hidden = $env{'request.role.adv'};
+	my $navmap = Apache::lonnavmaps::navmap->new();
 	my %resourcedata=
 	    &Apache::lonnet::dump('resourcedata',$coursedom,$coursenum);
 	foreach my $thiskey (sort keys %resourcedata) {
@@ -101,8 +105,23 @@ sub readcalendar {
 		$middle=~s/\.$//;
 		my $realm=&mt('All Resources');
 		if ($middle=~/^(.+)\_\_\_\(all\)$/) {
-		    $realm=&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1);
+		    my $map_url=$1;
+		    if (!$can_see_hidden && !$navmap) {
+			next;
+		    }
+		    if (!$can_see_hidden) {
+			my $res = $navmap->getResourceByUrl($map_url);
+			if ($res && $res->randomout()) { next; }
+		    }
+		    $realm=&mt('Folder/Map').': '.&Apache::lonnet::gettitle($map_url);
 		} elsif ($middle) {
+		    if (!$can_see_hidden && !$navmap) {
+			next;
+		    }
+		    if (!$can_see_hidden) {
+			my $res = $navmap->getBySymb($middle);
+			if ($res && $res->randomout()) { next; }
+		    }
 		    $realm=&mt('Resource').': '.&Apache::lonnet::gettitle($middle);
 		}
 		my $datetype='';
@@ -146,8 +165,7 @@ sub normalcell {
     foreach my $item (@items) {
         if ($item) {
 	    my $internalflag=0;
-	    my ($courseid,$start,$end,@msg)=split(/\@/,$item);
-            my $msg=join('@',@msg);
+	    my ($courseid,$start,$end,$msg)=split(/\@/,$item,4);
 	    if ($msg=~/INTERNAL\:/) {
 		$msg=~s/INTERNAL\://gs;
 		$internalflag=1;
@@ -188,8 +206,7 @@ sub plaincell {
     my @items=&order($text);
     foreach my $item (@items) {
         if ($item) {
-	    my ($courseid,$start,$end,@msg)=split(/\@/,$item);
-            my $msg=join('@',@msg);
+	    my ($courseid,$start,$end,$msg)=split(/\@/,$item,4);
             my $fullmsg=&mt('Calendar Announcement for ').$env{'course.'.$courseid.'.description'}.
 		'\n'.&Apache::lonlocal::locallocaltime($start);
 	    if ($start!=$end) {
@@ -213,8 +230,7 @@ sub listcell {
     my @items=&order($text);
     foreach my $item (@items) {
         if ($item) {
-	    my ($courseid,$start,$end,@msg)=split(/\@/,$item);
-            my $msg=join('@',@msg);
+	    my ($courseid,$start,$end,$msg)=split(/\@/,$item,4);
 	    $msg=~s/INTERNAL\://gs;
             my $fullmsg=&Apache::lonlocal::locallocaltime($start);
 	    if ($start!=$end) {
@@ -398,8 +414,8 @@ ENDDOCUMENT
 # ------------------------------------------------------------ Process commands
     if ($serverpost) {
 	if ($env{'form.serveraction'}) {
-	    foreach (keys %env) {
-		if ($_=~/^form\.postto\_(\w+)/) {
+	    foreach my $key (keys(%env)) {
+		if ($key=~/^form\.postto\_(\w+)/) {
 		    $r->print( 
 			'<br />Posting '.$1.': '.&Apache::lonnet::postannounce
 			($1,$env{'form.serverannnounce'}));
@@ -415,11 +431,11 @@ Post announcements to the system login a
 Check machines:<br />
 SERVERANNOUNCE
 # list servers
-    foreach (sort keys %Apache::lonnet::hostname) {
-	if (&Apache::lonnet::allowed('psa',$Apache::lonnet::hostdom{$_})) {
-	    $r->print ('<br /><input type="checkbox" name="postto_'.$_.'" /> '.
-		       $_.' <tt>'.$Apache::lonnet::hostname{$_}.'</tt> '.
-		       '<a href="http://'.$Apache::lonnet::hostname{$_}.
+    foreach my $host (sort(keys(%Apache::lonnet::hostname))) {
+	if (&Apache::lonnet::allowed('psa',$Apache::lonnet::hostdom{$host})) {
+	    $r->print ('<br /><input type="checkbox" name="postto_'.$host.'" /> '.
+		       $host.' <tt>'.$Apache::lonnet::hostname{$host}.'</tt> '.
+		       '<a href="http://'.$Apache::lonnet::hostname{$host}.
 		       '/announcement.txt" target="annowin">current</a>');
 	}
     }
@@ -456,8 +472,8 @@ SERVERANNOUNCE
 # ---------------------------------------------------------------- Remove items
         if ($env{'form.action'} eq 'del') {
 	    my @delwhich=();
-            foreach (keys %env) {
-		if ($_=~/^form\.remove\_(.+)$/) {
+            foreach my $key (keys(%env)) {
+		if ($key=~/^form\.remove\_(.+)$/) {
 		    push(@delwhich,$1);
                 }
             }
@@ -472,8 +488,8 @@ SERVERANNOUNCE
     }
 # ----------------------------------------------------- Summarize all calendars
     my %allcal=();
-    foreach (&Apache::loncommon::findallcourses()) {
-	%allcal=(%allcal,&readcalendar($_));
+    foreach my $course (&Apache::loncommon::findallcourses()) {
+	%allcal=(%allcal,&readcalendar($course));
     }
 
 # ------------------------------- Initialize table and forward backward buttons