--- loncom/interface/lonrss.pm 2006/12/04 22:10:28 1.31 +++ loncom/interface/lonrss.pm 2007/01/18 19:02:00 1.33 @@ -1,7 +1,7 @@ # The LearningOnline Network # RSS Feeder # -# $Id: lonrss.pm,v 1.31 2006/12/04 22:10:28 albertel Exp $ +# $Id: lonrss.pm,v 1.33 2007/01/18 19:02:00 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -29,14 +29,14 @@ package Apache::lonrss; use strict; -use LONCAPA qw(:DEFAULT :match); +use LONCAPA; use Apache::Constants qw(:common); use Apache::loncommon; use Apache::lonnet; use Apache::lontexconvert; use Apache::lonlocal; use Apache::lonhtmlcommon; - +use Apache::inputtags(); sub filterfeedname { my $filename=shift; @@ -288,7 +288,7 @@ sub handler { my $feedname=&feedname($filename); my ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom); my ($blocked,$blocktext); - if ($uname !~ /^$match_courseid$/) { + if (!&Apache::lonnet::is_course($udom,$uname)) { ($blocked,$blocktext) = &blocking_blogdisplay($uname,$udom,$html,$filterfeedname); } if ($html) { @@ -347,7 +347,7 @@ sub handler { } else { # is indeed a user # Course or user? my $name=''; - if ($uname =~ /^$match_courseid$/) { + if (&Apache::lonnet::is_course($udom,$uname)) { my %cenv=&Apache::lonnet::dump('environment',$udom,$uname); $name=$cenv{'description'}; } else { @@ -355,7 +355,7 @@ sub handler { } # Add a new feed if (($html) && ($edit)) { - $r->print('
'); @@ -374,8 +374,10 @@ sub handler { 'status', 'enclosureurl', 'enclosuretype']); + # my ($id,$uname,$udom,$filename,$title,$description,$url,$status,$encurl,$enctype)=@_; + &editentry($env{'form.queryid'}, $uname,$udom,$filename, $env{'form.title'}, @@ -386,6 +388,8 @@ sub handler { $env{'form.enctype'} ); } + +# store away the fields modified in the online form my %newsfeed=&Apache::lonnet::dump($feedname,$udom,$uname); foreach my $entry (sort(keys(%newsfeed)),$env{'form.newid'}.'_status') { if ($entry=~/^(\d+)\_status$/) { @@ -402,6 +406,49 @@ sub handler { } } } + +# see if we have any uploaded or portfolio files + my @uploadeditems=(); + + if ($env{'form.HWFILE0_0'}) { +# We have an uploaded file - store it away. + $uploadeditems[0]=&Apache::lonnet::userfileupload('HWFILE0_0',undef,'portfolio/podcasts'); + } + if ($env{'form.HWPORT0_0'}) { +# Selected portfolio files + foreach my $filename (split(/\,/,$env{'form.HWPORT0_0'})) { + if ($filename) { +# construct full path and remember + push(@uploadeditems,'/uploaded/'.$env{'user.domain'}.'/'.$env{'user.name'}.'/portfolio'.$filename); + } + } + } +# the zeroth item should be stored together with the last displayed (newid) field + if ($uploadeditems[0]) { + my $id=$env{'form.newid'}; + &editentry($id,$uname,$udom,$feedname, + $env{'form.'.$id.'_title'}, + $env{'form.'.$id.'_description'}, + $env{'form.'.$id.'_link'}, + $env{'form.'.$id.'_status'}, + $uploadeditems[0], + &Apache::loncommon::filemimetype(($uploadeditems[0]=~/\.(\w+)$/)[0]), + ); + &Apache::lonnet::make_public_indefinitely($uploadeditems[0]); + } +# if there are more files, they need new entries, since each can only have one enclosure + for (my $i=1; $i<=$#uploadeditems; $i++) { + my $id = &get_new_feed_id().$i; + &editentry($id,$uname,$udom,$feedname, + 'New Entry', + '', + '', + 'public', + $uploadeditems[$i], + &Apache::loncommon::filemimetype(($uploadeditems[$i]=~/\.(\w+)$/)[0]), + ); + &Apache::lonnet::make_public_indefinitely($uploadeditems[$i]); + } } #done storing # Render private items? @@ -410,7 +457,7 @@ sub handler { ($html?'