--- loncom/interface/lonrss.pm 2006/05/11 02:08:48 1.19
+++ loncom/interface/lonrss.pm 2006/05/11 15:27:49 1.20
@@ -1,7 +1,7 @@
# The LearningOnline Network
# RSS Feeder
#
-# $Id: lonrss.pm,v 1.19 2006/05/11 02:08:48 www Exp $
+# $Id: lonrss.pm,v 1.20 2006/05/11 15:27:49 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -54,8 +54,8 @@ sub displayfeedname {
my ($rawname,$uname,$udom)=@_;
my $filterfilename=&filterfeedname($rawname);
# do we have a stored name?
- my %stored=&Apache::lonnet::get('nohist_all_rss_feeds',[$filterfilename],$udom,$uname);
- if ($stored{$filterfilename}) { return $stored{$filterfilename}; }
+ my %stored=&Apache::lonnet::get('nohist_all_rss_feeds',[$filterfilename,'feed_display_option_'.$filterfilename],$udom,$uname);
+ if ($stored{$filterfilename}) { return ($stored{$filterfilename},$stored{'feed_display_option_'.$filterfilename}); }
# no, construct a name
my $name=$filterfilename;
if ($name=~/^CourseBlog/) {
@@ -66,7 +66,7 @@ sub displayfeedname {
} else {
$name=~s/\_/ /g;
}
- return $name;
+ return ($name,$stored{'feed_display_option_'.$filterfilename});
}
sub namefeed {
@@ -76,6 +76,13 @@ sub namefeed {
$udom,$uname);
}
+sub changefeeddisplay {
+ my ($rawname,$uname,$udom,$newstatus)=@_;
+ return &Apache::lonnet::put('nohist_all_rss_feeds',
+ { 'feed_display_option_'.&filterfeedname($rawname) => $newstatus },
+ $udom,$uname);
+}
+
sub advertisefeeds {
my ($uname,$udom,$edit)=@_;
my $feeds='';
@@ -85,12 +92,18 @@ sub advertisefeeds {
$mode='adm';
}
foreach my $feed (sort(keys(%feednames))) {
- if ($feed!~/^error\:/) {
+ if (($feed!~/^error\:/) && ($feed!~/^feed\_display\_option\_/)) {
my $feedurl='http://'.$ENV{'HTTP_HOST'}.'/public/'.$udom.'/'.$uname.'/'.$feed.'.rss';
my $htmlurl='http://'.$ENV{'HTTP_HOST'}.'/'.$mode.'/'.$udom.'/'.$uname.'/'.$feed.'_rss.html';
- $feeds.='
'.$feednames{$feed}.
- '
'.($edit?&mt('Edit'):'HTML').': '.$htmlurl.''.
- '
RSS: '.$feedurl.'';
+ if ($feednames{'feed_display_option_'.$feed} eq 'hidden') {
+ if ($edit) {
+ $feeds.=''.$feednames{$feed}.'
'.&mt('Hidden').': '.$htmlurl.'';
+ }
+ } else {
+ $feeds.=''.$feednames{$feed}.
+ '
'.($edit?&mt('Edit'):'HTML').': '.$htmlurl.''.
+ '
RSS: '.$feedurl.'';
+ }
}
}
if ($feeds) {
@@ -192,9 +205,9 @@ sub handler {
my $filterfeedname=&filterfeedname($filename);
my $feedname=&feedname($filename);
- my $displayfeedname=&displayfeedname($filename,$uname,$udom);
+ my ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom);
if ($html) {
- $r->print(&Apache::loncommon::start_page($displayfeedname,undef,
+ $r->print(&Apache::loncommon::start_page(($displayfeedname?$displayfeedname:&mt("Available RSS Feeds and Blogs")),undef,
{'domain' => $udom,
'force_register' =>
$env{'form.register'}}).
@@ -214,6 +227,16 @@ sub handler {
if ($html) {
# Any new feeds or renaming of feeds?
if ($edit) {
+# Hide a feed?
+ if ($env{'form.hidethisblog'}) {
+ &changefeeddisplay($feedname,$uname,$udom,'hidden');
+ ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom);
+ }
+# Advertise a feed?
+ if ($env{'form.advertisethisblog'}) {
+ &changefeeddisplay($feedname,$uname,$udom,'public');
+ ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom);
+ }
# New feed?
if ($env{'form.namenewblog'}=~/\w/) {
&namefeed($env{'form.namenewblog'},$uname,$udom,$env{'form.namenewblog'});
@@ -222,7 +245,7 @@ sub handler {
if (($displayfeedname) && ($env{'form.newblogname'}=~/\w/)) {
if ($env{'form.newblogname'} ne $displayfeedname) {
&namefeed($feedname,$uname,$udom,$env{'form.newblogname'});
- $displayfeedname=&displayfeedname($filename,$uname,$udom);
+ ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom);
}
}
}
@@ -267,6 +290,7 @@ sub handler {
$r->print("\n".
($html?'
':'').
&mt('LON-CAPA Feed "[_1]" for [_2]',$displayfeedname,$name).
+ ($displayoption eq 'hidden'?' ('.&mt('Hidden').')':'').
($html?'
'.($edit?'