--- loncom/interface/lonannounce.pm	2006/01/12 23:36:45	1.43
+++ 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.43 2006/01/12 23:36:45 albertel Exp $
+# $Id: lonannounce.pm,v 1.46 2006/03/15 21:55:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -64,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
 }
@@ -106,15 +106,21 @@ sub readcalendar {
 		my $realm=&mt('All Resources');
 		if ($middle=~/^(.+)\_\_\_\(all\)$/) {
 		    my $map_url=$1;
+		    if (!$can_see_hidden && !$navmap) {
+			next;
+		    }
 		    if (!$can_see_hidden) {
 			my $res = $navmap->getResourceByUrl($map_url);
-			if ($res->randomout()) { next; }
+			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->randomout()) { next; }
+			if ($res && $res->randomout()) { next; }
 		    }
 		    $realm=&mt('Resource').': '.&Apache::lonnet::gettitle($middle);
 		}