--- loncom/interface/lonrss.pm	2006/05/10 15:52:11	1.18
+++ 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.18 2006/05/10 15:52:11 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,16 +66,23 @@ sub displayfeedname {
     } else {
 	$name=~s/\_/ /g;
     }
-    return $name;
+    return ($name,$stored{'feed_display_option_'.$filterfilename});
 }
 
-sub renamefeed {
+sub namefeed {
     my ($rawname,$uname,$udom,$newname)=@_;
     return &Apache::lonnet::put('nohist_all_rss_feeds',
 				{ &filterfeedname($rawname) => $newname },
 				$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.='<li>'.$feednames{$feed}.
-		'<br />'.($edit?&mt('Edit'):'HTML').': <a href="'.$htmlurl.'"><tt>'.$htmlurl.'</tt></a>'.
-		'<br />RSS: <a href="'.$feedurl.'"><tt>'.$feedurl.'</tt></a></li>';
+	    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 />RSS: <a href="'.$feedurl.'"><tt>'.$feedurl.'</tt></a></li>';
+	    }
 	}
     }
     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'}}).
@@ -212,6 +225,30 @@ sub handler {
 # Is this user for real?
     my $homeserver=&Apache::lonnet::homeserver($uname,$udom);
     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'});
+	    }
+# Old feed that is being renamed?
+	    if (($displayfeedname) && ($env{'form.newblogname'}=~/\w/)) {
+		if ($env{'form.newblogname'} ne $displayfeedname) {
+		    &namefeed($feedname,$uname,$udom,$env{'form.newblogname'});
+		    ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom);
+		}
+	    }
+	}
 	$r->print(&advertisefeeds($uname,$udom,$edit));
     } 
     if ($homeserver eq 'no_host') {
@@ -225,6 +262,13 @@ sub handler {
 	} else {
 	    $name=&Apache::loncommon::nickname($uname,$udom);
 	}
+# Add a new feed
+        if (($html) && ($edit)) {
+	    $r->print('<form method="post">');
+            $r->print(&mt('Name for New Blog').": <input type='text' size='40' name='namenewblog' />");
+	    $r->print('<input type="submit" value="'.&mt('Start a New Blog').'" />');
+	    $r->print('</form>');
+	}
         if ($displayfeedname) { # this is an existing feed
 # Anything to store?
 	    if ($edit) {
@@ -241,15 +285,12 @@ sub handler {
 			}
 		    }
 		}
-		if ($env{'form.newblogname'} ne $displayfeedname) {
-		    &Apache::lonnet::put('nohist_all_rss_feeds',{ $filterfeedname => $env{'form.newblogname'} },$udom,$uname);
-		    $displayfeedname=&displayfeedname($filename,$uname,$udom);
-		}
 	    } #done storing
 
 	    $r->print("\n".
-		      ($html?'<h3>':'<title>').
+		      ($html?'<hr /><h3>':'<title>').
 		      &mt('LON-CAPA Feed "[_1]" for [_2]',$displayfeedname,$name).
+		      ($displayoption eq 'hidden'?' ('.&mt('Hidden').')':'').
 		      ($html?'</h3>'.($edit?'<form method="post"><br />'.
 				      &mt('Name of blog/journal').
 				      ': <input type="text" size="50" name="newblogname" value="'.
@@ -328,7 +369,9 @@ ENDEDIT
 	    if ($html) {
 		$r->print('</ul>');
 		if ($edit) {
-		    $r->print('<input type="hidden" name="newid" value="'.$newid.'"/><input type="submit" value="'.&mt('Store Marked Changes').'" />');
+		    $r->print('<input type="hidden" name="newid" value="'.$newid.'"/><input type="submit" value="'.&mt('Store Marked Changes').'" />'.
+			      ($displayoption eq 'hidden'?'<input type="submit" name="advertisethisblog" value="'.&mt('Advertise this Feed').'" />':
+			       '<input type="submit" name="hidethisblog" value="'.&mt('Hide this Feed').'" />'));
 		}
 	    }
 	} # was a real display feedname