--- loncom/interface/lonrss.pm 2008/12/15 16:37:44 1.42
+++ loncom/interface/lonrss.pm 2009/11/04 15:38:27 1.49
@@ -1,7 +1,7 @@
# The LearningOnline Network
# RSS Feeder
#
-# $Id: lonrss.pm,v 1.42 2008/12/15 16:37:44 raeburn Exp $
+# $Id: lonrss.pm,v 1.49 2009/11/04 15:38:27 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.');
@@ -306,8 +311,10 @@ sub handler {
my ($blocked,$blocktext,$disabled,$disabletext);
if (!&Apache::lonnet::is_course($udom,$uname)) {
($blocked,$blocktext) = &blocking_blogdisplay($uname,$udom,$html,$filterfeedname);
- $disabled = &Apache::lonnet::usertools_access($uname,$udom,'blog');
- if ($disabled) {
+ if (&Apache::lonnet::usertools_access($uname,$udom,'blog')) {
+ $disabled = 0;
+ } else {
+ $disabled = 1;
if ($html) {
$disabletext = '