--- loncom/interface/lonrss.pm	2010/01/03 21:21:25	1.47.8.1
+++ loncom/interface/lonrss.pm	2013/05/06 16:15:59	1.51
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # RSS Feeder
 #
-# $Id: lonrss.pm,v 1.47.8.1 2010/01/03 21:21:25 raeburn Exp $
+# $Id: lonrss.pm,v 1.51 2013/05/06 16:15:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,10 +60,10 @@ sub displayfeedname {
 # no, construct a name
     my $name=$filterfilename; 
     if ($name=~/^CourseBlog/) {
+        $name=&mt('Course Blog');
         if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Community') {
             $name = &mt('Community Blog'); 
         }
-        $name=&mt('Course Blog');
 	if ($env{'course.'.$env{'request.course.id'}.'.description'}) {
 	    $name.=' '.$env{'course.'.$env{'request.course.id'}.'.description'};
 	}
@@ -88,7 +88,7 @@ sub changefeeddisplay {
 }
 
 sub advertisefeeds {
-    my ($uname,$udom,$edit)=@_;
+    my ($uname,$udom,$edit,$count,$hidden)=@_;
     my $feeds='';
     my %feednames=&Apache::lonnet::dump('nohist_all_rss_feeds',$udom,$uname);
     my $mode='public';
@@ -100,7 +100,20 @@ sub advertisefeeds {
 	next if ($feed =~/^\s*$/    ||
 		 $feed =~ /^error:/ ||
 		 $feed =~ /^feed_display_option_/);
-
+        if ($feednames{'feed_display_option_'.$feed} eq 'hidden') {
+            if (ref($hidden)) {
+                $$hidden ++;
+            }
+            if (ref($count)) {
+                unless ($edit) {
+                    next;
+                }
+            }
+        } else {
+            if (ref($count)) {
+                $$count ++;
+            }
+        }
 	my $feedurl= $server.'/public/'.$udom.'/'.$uname.'/'.$feed.'.rss';
 	my $htmlurl= $server.'/'.$mode.'/'.$udom.'/'.$uname.'/'.$feed.'_rss.html';
 	if ($feednames{'feed_display_option_'.$feed} eq 'hidden') {
@@ -261,9 +274,11 @@ sub blocking_blogdisplay {
         if ($blockcause eq 'user') {
             $output .= &mt('This is because you are a student in one or more courses in which communication is being blocked.');
             if ($html) {
-                $output .= '<br />'.
-                       &Apache::loncommon::build_block_table($startblock,
-                                                        $endblock,\%setters);
+                #$output .= '<br />'.
+                       #&Apache::loncommon::build_block_table($startblock,
+                       #                                 $endblock,\%setters);
+                 my ($blocked, $blocktext) = Apache::loncommon::blocking_status('blogs');
+                 $output .= '<br /><br />'.$blocktext;
             }
         } else {
             $output .= &mt('This is because the blog owner is a student in one or more courses in which communication is being blocked.');
@@ -286,7 +301,9 @@ sub handler {
 	$edit=1;
 	$html=1;
     }
-    if  (($mode eq 'adm') && (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
+    if  (($mode eq 'adm') && (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))
+        && ($uname eq $env{'course.'.$env{'request.course.id'}.'.num'} &&
+            $udom eq $env{'course.'.$env{'request.course.id'}.'.domain'})) {
 	$edit=1;
 	$html=1;
     }