--- loncom/interface/lonrss.pm 2007/05/02 01:33:49 1.35
+++ loncom/interface/lonrss.pm 2009/07/27 12:12:47 1.48
@@ -1,7 +1,7 @@
# The LearningOnline Network
# RSS Feeder
#
-# $Id: lonrss.pm,v 1.35 2007/05/02 01:33:49 albertel Exp $
+# $Id: lonrss.pm,v 1.48 2009/07/27 12:12:47 kalberla Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -94,18 +94,20 @@ sub advertisefeeds {
}
my $server = &Apache::lonnet::absolute_url();
foreach my $feed (sort(keys(%feednames))) {
- if (($feed!~/^error\:/) && ($feed!~/^feed\_display\_option\_/)) {
- 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') {
- if ($edit) {
- $feeds.='<li><i>'.$feednames{$feed}.'</i><br />'.&mt('Hidden').': <a href="'.$htmlurl.'"><tt>'.$htmlurl.'</tt></a></li>';
- }
- } else {
- $feeds.='<li><b>'.$feednames{$feed}.
- '</b><br />'.($edit?&mt('Edit'):'HTML').': <a href="'.$htmlurl.'"><tt>'.$htmlurl.'</tt></a>'.
- '<br />'.&mt('Public RSS/podcast (subscribe to)').': <a href="'.$feedurl.'"><tt>'.$feedurl.'</tt></a></li>';
+ next if ($feed =~/^\s*$/ ||
+ $feed =~ /^error:/ ||
+ $feed =~ /^feed_display_option_/);
+
+ 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') {
+ if ($edit) {
+ $feeds.='<li><i>'.$feednames{$feed}.'</i><br />'.&mt('Hidden').': <a href="'.$htmlurl.'"><tt>'.$htmlurl.'</tt></a></li>';
}
+ } else {
+ $feeds.='<li><b>'.$feednames{$feed}.
+ '</b><br />'.($edit?&mt('Edit'):'HTML').': <a href="'.$htmlurl.'"><tt>'.$feednames{$feed}.' HTML</tt></a>'.
+ '<br />'.&mt('Public RSS/podcast (subscribe to)').': <a href="'.$feedurl.'"><tt>'.$feednames{$feed}.' RSS/Podcast</tt></a></li>';
}
}
if ($feeds) {
@@ -116,8 +118,22 @@ sub advertisefeeds {
}
sub rss_link {
- my ($url) = @_;
- return qq|<link rel="alternate" type="application/rss+xml" title="Course Announcements" href="$url" />|;
+ my ($uname,$udom)=@_;
+ my $result;
+ my $server = &Apache::lonnet::absolute_url();
+ my %feednames=&Apache::lonnet::dump('nohist_all_rss_feeds',$udom,$uname);
+ foreach my $feed (sort(keys(%feednames))) {
+ next if ($feed =~/^\s*$/ ||
+ $feed =~ /^error:/ ||
+ $feed =~/^feed_display_option_/ );
+ my $url= $server.'/public/'.$udom.'/'.$uname.'/'.$feed.'.rss';
+ my $title = $feed;
+ $title =~ s/_/ /g;
+ $result.=qq|
+<link rel="alternate" type="application/rss+xml" title="$title" href="$url" />
+|;
+ }
+ return $result;
}
{
@@ -242,9 +258,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.');
@@ -287,17 +305,33 @@ sub handler {
my $filterfeedname=&filterfeedname($filename);
my $feedname=&feedname($filename);
my ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom);
- my ($blocked,$blocktext);
+ my ($blocked,$blocktext,$disabled,$disabletext);
if (!&Apache::lonnet::is_course($udom,$uname)) {
($blocked,$blocktext) = &blocking_blogdisplay($uname,$udom,$html,$filterfeedname);
+ 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>'.
+ '<li>'.&mt('The administrator of this domain has disabled blog functionality for this specific user.').'</li>'.
+ '<li>'.&mt('The domain has been configured to disable, by default, blog functionality for all users in the domain.').'</li>'.
+ '</ul>';
+ } else {
+ $disabletext = &mt('No user blog available');
+ }
+ }
}
if ($html) {
- my $title = $displayfeedname?$displayfeedname
- :"Available RSS Feeds and Blogs";
- $r->print(&Apache::loncommon::start_page($title,undef,
- {'domain' => $udom,
- 'force_register' =>
- $env{'form.register'}}).
+# 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,
+ {'bread_crumbs' => $brcrumb,
+ 'domain' => $udom,
+ 'force_register' => $env{'form.register'}}).
&changed_js());
} else { # render RSS
my $server = &Apache::lonnet::absolute_url();
@@ -312,7 +346,7 @@ sub handler {
my $newid = &get_new_feed_id();
# Is this user for real?
my $homeserver=&Apache::lonnet::homeserver($uname,$udom);
- if ($html && !$blocked) {
+ if ($html && !$blocked && !$disabled) {
# Any new feeds or renaming of feeds?
if ($edit) {
# Hide a feed?
@@ -344,6 +378,9 @@ sub handler {
} elsif ($blocked) {
$r->print($blocktext);
$r->print(($html?&Apache::loncommon::end_page():'</channel></rss>'."\n"));
+ } elsif ($disabled) {
+ $r->print($disabletext);
+ $r->print(($html?&Apache::loncommon::end_page():'</channel></rss>'."\n"));
} else { # is indeed a user
# Course or user?
my $name='';
@@ -355,9 +392,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
@@ -466,7 +504,7 @@ sub handler {
}
# Get feed items
my %newsfeed=&Apache::lonnet::dump($feedname,$udom,$uname);
- foreach my $entry (sort(keys(%newsfeed)),$newid.'_status') {
+ foreach my $entry (sort {$b cmp $a} (keys(%newsfeed)),$newid.'_status') {
if ($entry=~/^(\d+)\_status$/) { # is an entry
my $id=$1;
if ($edit) {
@@ -474,7 +512,7 @@ sub handler {
'private' => 'private',
'hidden' => 'hidden',
'delete' => 'delete',
- 'store' => 'Save changes',
+ 'store' => 'Select',
'title' => 'Title',
'link' => 'Link',
'description' => 'Description',
@@ -554,7 +592,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').'" />'));
}