--- loncom/interface/lonrss.pm	2006/03/16 19:56:21	1.10
+++ loncom/interface/lonrss.pm	2006/04/22 20:58:32	1.17
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # RSS Feeder
 #
-# $Id: lonrss.pm,v 1.10 2006/03/16 19:56:21 albertel Exp $
+# $Id: lonrss.pm,v 1.17 2006/04/22 20:58:32 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,10 +36,13 @@ use Apache::lontexconvert;
 use Apache::lonlocal;
 use Apache::lonhtmlcommon;
 
+
 sub filterfeedname {
     my $filename=shift;
     $filename=~s/(\_rss\.html|\.rss)$//;
     $filename=~s/\W//g;
+    $filename=~s/\_rssfeed$//;
+    $filename=~s/^nohist\_//;
     return $filename;
 }
 
@@ -83,7 +86,7 @@ sub advertisefeeds {
     }
     foreach my $feed (sort(keys(%feednames))) {
 	if ($feed!~/^error\:/) {
-	    my $feedurl='feed://'.$ENV{'HTTP_HOST'}.'/public/'.$udom.'/'.$uname.'/'.$feed.'.rss';
+	    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>'.
@@ -97,17 +100,29 @@ sub advertisefeeds {
     }
 }
 
+sub rss_link {
+    my ($url) = @_;
+    return qq|<link rel="alternate" type="application/rss+xml" title="Course Announcements" href="$url" />|;
+}
+
 {
     my $feedcounter;
-    sub addentry {
+    sub get_new_feed_id {
 	$feedcounter++;
-	my $id=time.'00000'.$$.'00000'.$feedcounter;
-	return &editentry($id,@_);
+	return time().'00000'.$$.'00000'.$feedcounter;
     }
 }
 
+sub addentry {
+    my $id=&get_new_feed_id();
+    return &editentry($id,@_);
+}
+
 sub editentry {
-    my ($id,$uname,$udom,$filename,$title,$description,$url,$status,$encurl,$enclength,$enctype)=@_;
+    my ($id,$uname,$udom,$filename,$title,$description,$url,$status,$encurl,$enctype)=@_;
+    if ($status eq 'deleted') {
+	return &changestatus($id,$uname,$udom,$filename,$status);
+    }
     my $feedname=&feedname($filename);
     &Apache::lonnet::put('nohist_all_rss_feeds',
 			 { &filterfeedname($filename) => &displayfeedname($filename,$uname,$udom) },
@@ -117,7 +132,6 @@ sub editentry {
 	$id.'_description' => $description,
 	$id.'_link' => $url,
 	$id.'_enclosureurl' => $encurl,
-	$id.'_enclosurelength' => $enclength,
 	$id.'_enclosuretype' => $enctype,
 	$id.'_status' => $status},$udom,$uname);
 }
@@ -130,7 +144,6 @@ sub changestatus {
 					       $id.'_description',
 					       $id.'_link',
 					       $id.'_enclosureurl',
-					       $id.'_enclosurelength',
 					       $id.'_enclosuretype',
 					       $id.'_status'],$udom,$uname);
     } else {
@@ -145,7 +158,13 @@ sub changed_js {
         tform.elements[id+"_modified"].checked=true;
     }
 </script>
-ENDSCRIPT 
+ENDSCRIPT
+}
+
+sub determine_enclosure_types {
+    my ($url)=@_;
+    my ($ending)=($url=~/\.(\w+)$/);
+    return &Apache::loncommon::filemimetype($ending);
 }
 
 sub handler {
@@ -175,12 +194,11 @@ sub handler {
     my $feedname=&feedname($filename);
     my $displayfeedname=&displayfeedname($filename,$uname,$udom);
     if ($html) {
-	$r->print(&Apache::lonxml::xmlbegin().
-		  &Apache::loncommon::head($displayfeedname).
-		  &Apache::loncommon::bodytag($displayfeedname,'','','',$udom,
-					      $env{'form.register'}).
+	$r->print(&Apache::loncommon::start_page($displayfeedname,undef,
+						 {'domain'         => $udom,
+						  'force_register' =>
+						      $env{'form.register'}}).
 		  &changed_js());
-
     } else {
 	$r->print("<rss version='2.0' xmlns:dc='http://purl.org/dc/elements/1.1'>\n<channel>".
 		  "\n<link>http://".$ENV{'HTTP_HOST'}.'/public/'.$udom.'/'.$uname.'/'.
@@ -189,6 +207,23 @@ sub handler {
 		  &mt('An RSS Feed provided by the LON-CAPA Learning Content Management System').
 		  '</description>');
     }
+# Do we have stuff to store?
+    if ($edit) {
+        my %newsfeed=&Apache::lonnet::dump($feedname,$udom,$uname);
+	foreach my $entry (sort(keys(%newsfeed)),$env{'form.newid'}.'_status') {
+	    if ($entry=~/^(\d+)\_status$/) {
+		my $id=$1;
+		if ($env{'form.'.$id.'_modified'}) {
+		    &editentry($id,$uname,$udom,$feedname,
+			       $env{'form.'.$id.'_title'},
+			       $env{'form.'.$id.'_description'},
+			       $env{'form.'.$id.'_url'},
+			       $env{'form.'.$id.'_status'});
+		}
+	    }
+	}
+    }
+    my $newid = &get_new_feed_id();
 # Is this user for real?
     my $homeserver=&Apache::lonnet::homeserver($uname,$udom);
     if ($html) {
@@ -219,7 +254,7 @@ sub handler {
 	}
 # Get feed items
         my %newsfeed=&Apache::lonnet::dump($feedname,$udom,$uname);
-	foreach my $entry (sort(keys(%newsfeed))) {
+	foreach my $entry (sort(keys(%newsfeed)),$newid.'_status') {
 	    if ($entry=~/^(\d+)\_status$/) {
 		my $id=$1;
 		if ($edit) {
@@ -229,10 +264,11 @@ sub handler {
 						       'delete' => 'delete',
 						       'store' => 'Store changes');
 		    my %status=();
+                    unless ($newsfeed{$id.'_status'}) { $newsfeed{$id.'_status'}='public'; }
 		    $status{$newsfeed{$id.'_status'}}='checked="checked"';
 		    $r->print(<<ENDEDIT);
 <li>
-<label><input name='$id\_modified' type='checkbox' /> $lt{'store'}</label>
+<label><input name='$id\_modified' type='checkbox' value="modified" /> $lt{'store'}</label>
 &nbsp;&nbsp;
 <label><input name='$id\_status' type="radio" value="public" $status{'public'} onClick="changed(this.form,'$id');" /> $lt{'public'}</label>
 &nbsp;&nbsp;
@@ -240,7 +276,7 @@ sub handler {
 &nbsp;&nbsp;
 <label><input name='$id\_status' type="radio" value="hidden" $status{'hidden'} onClick="changed(this.form,'$id');" /> $lt{'hidden'}</label>
 &nbsp;&nbsp;
-<label><input name='$id\_status' type="radio" value="delete" onClick="changed(this.form,'$id');" /> $lt{'delete'}</label>
+<label><input name='$id\_status' type="radio" value="deleted" onClick="changed(this.form,'$id');" /> $lt{'delete'}</label>
 <br />
 <input name='$id\_title' type='text' size='80' value='$newsfeed{$id.'_title'}' onChange="changed(this.form,'$id');" /><br />
 <textarea name='$id\_description' rows="6" cols="80" onChange="changed(this.form,'$id');">$newsfeed{$id.'_description'}</textarea><br />
@@ -257,10 +293,16 @@ ENDEDIT
 			      "http://".$ENV{'HTTP_HOST'}.
 			      $newsfeed{$id.'_link'}.
 			      ($html?("'>".&mt('Read more')."</a><br />\n"):"</link>\n"));
+# Enclosure? Get stats
 		    if ($newsfeed{$id.'_enclosureurl'}) {
-			$r->print(($html?"<a href='":"\n<enclosure url='").
-				  $newsfeed{$id.'_enclosureurl'}."' length='".$newsfeed{$id.'_enclosurelength'}.
-				  "' type='".$newsfeed{$id.'_enclosuretype'}.($html?"'>".&mt('Enclosure')."</a>":"' />"));
+			my @stat=&Apache::lonnet::stat_file($newsfeed{$id.'_enclosureurl'});
+			if ($stat[7]) {
+# Has non-zero length (and exists)
+			    my $enclosuretype=$newsfeed{$id.'_enclosetype'};
+			    $r->print(($html?"<a href='":"\n<enclosure url='").
+				      $newsfeed{$id.'_enclosureurl'}."' length='".$stat[7].
+				      "' type='".$enclosuretype.($html?"'>".&mt('Enclosure')."</a>":"' />"));
+			}
 		    }
 		    if ($html) {
 			$r->print("\n<hr /></li>\n");
@@ -271,7 +313,7 @@ ENDEDIT
 	    }
 	}
     }
-    $r->print("\n".($html?'</ul>'.($edit?'<input type="submit" value="'.&mt('Store Marked Changes').'" /></form>':'').&Apache::loncommon::end_page():'</channel></rss>'."\n"));
+    $r->print("\n".($html?'</ul>'.($edit?'<input type="hidden" name="newid" value="'.$newid.'"/><input type="submit" value="'.&mt('Store Marked Changes').'" /></form>':'').&Apache::loncommon::end_page():'</channel></rss>'."\n"));
     return OK;
 } 
 1;