--- loncom/interface/lonrss.pm 2009/02/26 16:17:29 1.46 +++ loncom/interface/lonrss.pm 2012/07/03 15:18:54 1.50 @@ -1,7 +1,7 @@ # The LearningOnline Network # RSS Feeder # -# $Id: lonrss.pm,v 1.46 2009/02/26 16:17:29 schafran Exp $ +# $Id: lonrss.pm,v 1.50 2012/07/03 15:18:54 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -61,6 +61,9 @@ sub displayfeedname { my $name=$filterfilename; if ($name=~/^CourseBlog/) { $name=&mt('Course Blog'); + if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Community') { + $name = &mt('Community Blog'); + } if ($env{'course.'.$env{'request.course.id'}.'.description'}) { $name.=' '.$env{'course.'.$env{'request.course.id'}.'.description'}; } @@ -258,9 +261,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 .= '
'. - &Apache::loncommon::build_block_table($startblock, - $endblock,\%setters); + #$output .= '
'. + #&Apache::loncommon::build_block_table($startblock, + # $endblock,\%setters); + my ($blocked, $blocktext) = Apache::loncommon::blocking_status('blogs'); + $output .= '

'.$blocktext; } } else { $output .= &mt('This is because the blog owner is a student in one or more courses in which communication is being blocked.'); @@ -283,7 +288,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; } @@ -390,6 +397,7 @@ sub handler { } # Add a new feed if (($html) && ($edit)) { + $r->print('

' . &mt('New RSS Feed or Blog'). '

'); $r->print('
'); $r->print(&mt('Name').": "); $r->print('');