--- loncom/interface/lonrss.pm 2008/12/17 22:17:43 1.39.2.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.39.2.1 2008/12/17 22:17:43 raeburn Exp $
+# $Id: lonrss.pm,v 1.51 2013/05/06 16:15:59 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'};
}
@@ -85,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';
@@ -97,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') {
@@ -258,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.');
@@ -283,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;
}
@@ -306,8 +326,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 = '<h2>'.&mt('No user blog available') .'</h2>'.
&mt('This is a result of one of the following:').'<ul>'.
@@ -320,13 +342,14 @@ sub handler {
}
}
if ($html) {
- my $title = $displayfeedname?$displayfeedname
- :"Available RSS Feeds and Blogs";
+# my $title = $displayfeedname?$displayfeedname:"Available RSS Feeds and Blogs";
+ my $title = "My Space";
my $rss_link = &Apache::lonrss::rss_link($uname,$udom);
+ my $brcrumb = [{href=>$rss_link,text=>"Available RSS Feeds and Blogs"}];
$r->print(&Apache::loncommon::start_page($title,$rss_link,
- {'domain' => $udom,
- 'force_register' =>
- $env{'form.register'}}).
+ {'bread_crumbs' => $brcrumb,
+ 'domain' => $udom,
+ 'force_register' => $env{'form.register'}}).
&changed_js());
} else { # render RSS
my $server = &Apache::lonnet::absolute_url();
@@ -387,9 +410,10 @@ sub handler {
}
# Add a new feed
if (($html) && ($edit)) {
+ $r->print('<h4>' . &mt('New RSS Feed or Blog'). '</h4>');
$r->print('<form method="post" name="makenewfeed">');
- $r->print(&mt('Name for New Feed').": <input type='text' size='40' name='namenewblog' />");
- $r->print('<input type="submit" value="'.&mt('Start a New Feed').'" />');
+ $r->print(&mt('Name').": <input type='text' size='40' name='namenewblog' />");
+ $r->print('<input type="submit" value="'.&mt('New Feed').'" />');
$r->print('</form>');
}
if ($displayfeedname) { # this is an existing feed
@@ -506,7 +530,7 @@ sub handler {
'private' => 'private',
'hidden' => 'hidden',
'delete' => 'delete',
- 'store' => 'Save changes',
+ 'store' => 'Select',
'title' => 'Title',
'link' => 'Link',
'description' => 'Description',
@@ -586,7 +610,7 @@ ENDEDIT
if ($html) {
$r->print('</ul>');
if ($edit) {
- $r->print('<input type="hidden" name="newid" value="'.$newid.'"/><input type="submit" value="'.&mt('Save Marked Changes').'" />'.
+ $r->print('<input type="hidden" name="newid" value="'.$newid.'"/><input type="submit" value="'.&mt('Save Selected').'" />'.
($displayoption eq 'hidden'?'<input type="submit" name="advertisethisblog" value="'.&mt('Advertise this Feed').'" />':
'<input type="submit" name="hidethisblog" value="'.&mt('Hide this Feed').'" />'));
}