--- loncom/interface/lonrss.pm 2005/11/22 16:16:53 1.7
+++ loncom/interface/lonrss.pm 2006/04/13 18:12:49 1.16
@@ -1,7 +1,7 @@
# The LearningOnline Network
# RSS Feeder
#
-# $Id: lonrss.pm,v 1.7 2005/11/22 16:16:53 albertel Exp $
+# $Id: lonrss.pm,v 1.16 2006/04/13 18:12:49 albertel 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;
}
@@ -74,7 +77,6 @@ sub renamefeed {
}
sub advertisefeeds {
- return;
my ($uname,$udom,$edit)=@_;
my $feeds='';
my %feednames=&Apache::lonnet::dump('nohist_all_rss_feeds',$udom,$uname);
@@ -84,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>'.
@@ -98,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)=@_;
+ 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) },
@@ -139,8 +153,18 @@ sub changestatus {
}
}
+sub changed_js {
+ return <<ENDSCRIPT;
+<script type="text/javascript">
+ function changed(tform,id) {
+ tform.elements[id+"_modified"].checked=true;
+ }
+</script>
+ENDSCRIPT
+}
+
sub handler {
- my $r = shift;
+ my ($r) = @_;
my $edit=0;
my $html=0;
@@ -166,15 +190,11 @@ sub handler {
my $feedname=&feedname($filename);
my $displayfeedname=&displayfeedname($filename,$uname,$udom);
if ($html) {
- $r->print(&Apache::lonxml::xmlbegin().&Apache::loncommon::bodytag
- ($displayfeedname,'','','',$udom,
- $env{'form.register'}).<<ENDSCRIPT);
-<script>
- function changed(tform,id) {
- tform.elements[id+"_modified"].checked=true;
- }
-</script>
-ENDSCRIPT
+ $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.'/'.
@@ -183,6 +203,23 @@ ENDSCRIPT
&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) {
@@ -213,7 +250,7 @@ ENDSCRIPT
}
# 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) {
@@ -223,10 +260,11 @@ ENDSCRIPT
'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>
<label><input name='$id\_status' type="radio" value="public" $status{'public'} onClick="changed(this.form,'$id');" /> $lt{'public'}</label>
@@ -234,7 +272,7 @@ ENDSCRIPT
<label><input name='$id\_status' type="radio" value="hidden" $status{'hidden'} onClick="changed(this.form,'$id');" /> $lt{'hidden'}</label>
-<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 />
@@ -265,7 +303,7 @@ ENDEDIT
}
}
}
- $r->print("\n".($html?'</ul>'.($edit?'<input type="submit" value="'.&mt('Store Marked Changes').'" /></form>':'').'</body></html>':'</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;