--- loncom/interface/lonrss.pm	2006/05/10 15:52:11	1.18
+++ loncom/interface/lonrss.pm	2006/06/03 21:28:33	1.26
@@ -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.26 2006/06/03 21:28:33 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,6 +29,7 @@
 package Apache::lonrss;
 
 use strict;
+use LONCAPA;
 use Apache::Constants qw(:common);
 use Apache::loncommon;
 use Apache::lonnet;
@@ -54,8 +55,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 +67,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 +93,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) {
@@ -125,7 +139,8 @@ sub editentry {
     }
     my $feedname=&feedname($filename);
     &Apache::lonnet::put('nohist_all_rss_feeds',
-			 { &filterfeedname($filename) => &displayfeedname($filename,$uname,$udom) },
+			 { &filterfeedname($filename) => 
+			       (&displayfeedname($filename,$uname,$udom))[0] },
 			 $udom,$uname);
     return &Apache::lonnet::put($feedname,{
 	$id.'_title' => $title,
@@ -167,6 +182,34 @@ sub determine_enclosure_types {
     return &Apache::loncommon::filemimetype($ending);
 }
 
+sub course_blog_link {
+    my ($id,$title,$description,$url,$encurl,$enctype)=@_;
+    if ($env{'request.course.id'}) {
+	return &add_blog_entry_link($id,
+				    $env{'course.'.$env{'request.course.id'}.'.num'},
+				    $env{'course.'.$env{'request.course.id'}.'.domain'},
+				    'Course_Announcements',
+				    $title,$description,$url,'public',$encurl,$enctype,
+				    &mt('Add to Course Announcements'));
+    } else {
+	return '';
+    }
+}
+
+sub add_blog_entry_link {
+    my ($id,$uname,$udom,$filename,$title,$description,$url,$status,$encurl,$enctype,$linktext)=@_;
+    return "<a href='/adm/$udom/$uname/".&filterfeedname($filename).'_rss.html?queryid='.
+	&escape($id).
+	'&title='.&escape($title).
+	'&description='.&escape($description).
+	'&url='.&escape($url).
+	'&status='.&escape($status).
+	'&encurl='.&escape($encurl).
+	'&enctype='.&escape($enctype).
+	"'>".$linktext.'</a>';
+
+}
+
 sub handler {
     my ($r) = @_;
 
@@ -177,6 +220,10 @@ sub handler {
 	$edit=1;
 	$html=1;
     }
+    if  (($mode eq 'adm') && (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
+	$edit=1;
+	$html=1;
+    }
     if ($filename=~/\.html$/) {
 	$html=1;
     }
@@ -192,9 +239,11 @@ 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,
+	my $title = $displayfeedname?$displayfeedname
+                                    :"Available RSS Feeds and Blogs";
+	$r->print(&Apache::loncommon::start_page($title,undef,
 						 {'domain'         => $udom,
 						  'force_register' =>
 						      $env{'form.register'}}).
@@ -207,11 +256,35 @@ sub handler {
 		  &mt('An RSS Feed provided by the LON-CAPA Learning Content Management System').
 		  '</description>');
     }
-# Do we have stuff to store?
+# This will be the entry id for new additions to the blog
     my $newid = &get_new_feed_id();
 # 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,9 +298,39 @@ 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 Feed').": <input type='text' size='40' name='namenewblog' />");
+	    $r->print('<input type="submit" value="'.&mt('Start a New Feed').'" />');
+	    $r->print('</form>');
+	}
         if ($displayfeedname) { # this is an existing feed
 # Anything to store?
 	    if ($edit) {
+# check if this was called with a query string
+		&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['queryid']);
+		if ($env{'form.queryid'}) {
+# yes, collect the remainder
+		    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+							    ['title',
+							     'description',
+							     'url',
+							     'status',
+							     'enclosureurl',
+							     'enclosuretype']);
+#    my ($id,$uname,$udom,$filename,$title,$description,$url,$status,$encurl,$enctype)=@_;
+
+		    &editentry($env{'form.queryid'},
+			       $uname,$udom,$filename,
+			       $env{'form.title'},
+			       $env{'form.description'},
+			       $env{'form.url'},
+			       $env{'form.status'},
+			       $env{'form.encurl'},
+			       $env{'form.enctype'}
+			       );
+		}
 		my %newsfeed=&Apache::lonnet::dump($feedname,$udom,$uname);
 		foreach my $entry (sort(keys(%newsfeed)),$env{'form.newid'}.'_status') {
 		    if ($entry=~/^(\d+)\_status$/) {
@@ -237,21 +340,21 @@ sub handler {
 				       $env{'form.'.$id.'_title'},
 				       $env{'form.'.$id.'_description'},
 				       $env{'form.'.$id.'_url'},
-				       $env{'form.'.$id.'_status'});
+				       $env{'form.'.$id.'_status'},
+				       $env{'form.'.$id.'_enclosureurl'},
+				       $env{'form.'.$id.'_enclosuretype'},
+				       );
 			}
 		    }
 		}
-		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').
+				      &mt('Name of this Feed').
 				      ': <input type="text" size="50" name="newblogname" value="'.
 				      $displayfeedname.'" />':'').'<ul>':'</title>'));
 # Render private items?
@@ -328,7 +431,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