--- loncom/interface/lonrss.pm 2006/12/01 20:17:47 1.29 +++ loncom/interface/lonrss.pm 2007/07/27 00:17:17 1.37 @@ -1,7 +1,7 @@ # The LearningOnline Network # RSS Feeder # -# $Id: lonrss.pm,v 1.29 2006/12/01 20:17:47 raeburn Exp $ +# $Id: lonrss.pm,v 1.37 2007/07/27 00:17:17 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,7 +36,7 @@ use Apache::lonnet; use Apache::lontexconvert; use Apache::lonlocal; use Apache::lonhtmlcommon; - +use Apache::inputtags(); sub filterfeedname { my $filename=shift; @@ -94,18 +94,20 @@ sub advertisefeeds { } my $server = &Apache::lonnet::absolute_url(); foreach my $feed (sort(keys(%feednames))) { - if (($feed!~/^error\:/) && ($feed!~/^feed\_display\_option\_/)) { - my $feedurl= $server.'/public/'.$udom.'/'.$uname.'/'.$feed.'.rss'; - my $htmlurl= $server.'/'.$mode.'/'.$udom.'/'.$uname.'/'.$feed.'_rss.html'; - if ($feednames{'feed_display_option_'.$feed} eq 'hidden') { - if ($edit) { - $feeds.='
  • '.$feednames{$feed}.'
    '.&mt('Hidden').': '.$htmlurl.'
    • '; - } - } else { - $feeds.='
  • '.$feednames{$feed}. - '
    '.($edit?&mt('Edit'):'HTML').': '.$htmlurl.''. - '
    RSS: '.$feedurl.'
    • '; + next if ($feed =~/^\s*$/ || + $feed =~ /^error:/ || + $feed =~ /^feed_display_option_/); + + my $feedurl= $server.'/public/'.$udom.'/'.$uname.'/'.$feed.'.rss'; + my $htmlurl= $server.'/'.$mode.'/'.$udom.'/'.$uname.'/'.$feed.'_rss.html'; + if ($feednames{'feed_display_option_'.$feed} eq 'hidden') { + if ($edit) { + $feeds.='
  • '.$feednames{$feed}.'
    '.&mt('Hidden').': '.$htmlurl.'
    • '; } + } else { + $feeds.='
  • '.$feednames{$feed}. + '
    '.($edit?&mt('Edit'):'HTML').': '.$htmlurl.''. + '
    '.&mt('Public RSS/podcast (subscribe to)').': '.$feedurl.'
    • '; } } if ($feeds) { @@ -116,8 +118,22 @@ sub advertisefeeds { } sub rss_link { - my ($url) = @_; - return qq||; + my ($uname,$udom)=@_; + my $result; + my $server = &Apache::lonnet::absolute_url(); + my %feednames=&Apache::lonnet::dump('nohist_all_rss_feeds',$udom,$uname); + foreach my $feed (sort(keys(%feednames))) { + next if ($feed =~/^\s*$/ || + $feed =~ /^error:/ || + $feed =~/^feed_display_option_/ ); + my $url= $server.'/public/'.$udom.'/'.$uname.'/'.$feed.'.rss'; + my $title = $feed; + $title =~ s/_/ /g; + $result.=qq| + +|; + } + return $result; } { @@ -288,13 +304,14 @@ sub handler { my $feedname=&feedname($filename); my ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom); my ($blocked,$blocktext); - if ($uname !~ /^\d\w\d[\w\-.]+$/) { + if (!&Apache::lonnet::is_course($udom,$uname)) { ($blocked,$blocktext) = &blocking_blogdisplay($uname,$udom,$html,$filterfeedname); } if ($html) { my $title = $displayfeedname?$displayfeedname :"Available RSS Feeds and Blogs"; - $r->print(&Apache::loncommon::start_page($title,undef, + my $rss_link = &Apache::lonrss::rss_link($uname,$udom); + $r->print(&Apache::loncommon::start_page($title,$rss_link, {'domain' => $udom, 'force_register' => $env{'form.register'}}). @@ -347,7 +364,7 @@ sub handler { } else { # is indeed a user # Course or user? my $name=''; - if ($uname =~ /^\d\w\d[\w\-.]+$/) { + if (&Apache::lonnet::is_course($udom,$uname)) { my %cenv=&Apache::lonnet::dump('environment',$udom,$uname); $name=$cenv{'description'}; } else { @@ -355,7 +372,7 @@ sub handler { } # Add a new feed if (($html) && ($edit)) { - $r->print('
    '); + $r->print(''); $r->print(&mt('Name for New Feed').": "); $r->print(''); $r->print('
    '); @@ -374,8 +391,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 +405,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 +423,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 +474,7 @@ sub handler { ($html?'

    ':''). &mt('LON-CAPA Feed "[_1]" for [_2]',$displayfeedname,$name). ($displayoption eq 'hidden'?' ('.&mt('Hidden').')':''). - ($html?'</h3>'.($edit?'<form method="post"><br />'. + ($html?'</h3>'.($edit?'<form method="post" name="lonhomework" enctype="multipart/form-data"><br />'. &mt('Name of this Feed'). ': <input type="text" size="50" name="newblogname" value="'. $displayfeedname.'" />':'').'<ul>':'')); @@ -419,7 +483,7 @@ sub handler { } # Get feed items my %newsfeed=&Apache::lonnet::dump($feedname,$udom,$uname); - foreach my $entry (sort(keys(%newsfeed)),$newid.'_status') { + foreach my $entry (sort {$b cmp $a} (keys(%newsfeed)),$newid.'_status') { if ($entry=~/^(\d+)\_status$/) { # is an entry my $id=$1; if ($edit) { @@ -427,10 +491,21 @@ sub handler { 'private' => 'private', 'hidden' => 'hidden', 'delete' => 'delete', - 'store' => 'Store changes', + 'store' => 'Save changes', 'title' => 'Title', 'link' => 'Link', - 'description' => 'Description'); + 'description' => 'Description', + 'enc' => 'Podcasted enclosure'); + my $uploadlink; + if ($entry==$newid) { +# Generate upload link only for last (new) entry + $uploadlink=&Apache::inputtags::file_selector(0,0,'*','both'); + } else { +# Otherwise, display + $uploadlink=''.$newsfeed{$id.'_enclosureurl'}.''. + "". + ""; + } my %status=(); unless ($newsfeed{$id.'_status'}) { $newsfeed{$id.'_status'}='public'; } $status{$newsfeed{$id.'_status'}}='checked="checked"'; @@ -451,7 +526,9 @@ $lt{'title'}: $lt{'description'}:

    $lt{'link'}: - +
    +$lt{'enc'} - +$uploadlink
    ENDEDIT } else { # not in edit mode, just displaying @@ -464,18 +541,22 @@ ENDEDIT $r->print("\n".($html?"\n
  • ":"\n").$newsfeed{$id.'_title'}. ($html?"</b><br />\n":"\n"). $newsfeed{$id.'_description'}. - ($html?"
    \n"). $link. - ($html?("'>".&mt('Read more')."
    \n"):"\n")); + ($html?("'>".&mt('Read more')."
    \n"):"\n"):'')); + my $enclosure=$newsfeed{$id.'_enclosureurl'}; # Enclosure? Get stats - if ($newsfeed{$id.'_enclosureurl'}) { - my @stat=&Apache::lonnet::stat_file($newsfeed{$id.'_enclosureurl'}); + if ($enclosure) { + my @stat=&Apache::lonnet::stat_file($enclosure); if ($stat[7]) { # Has non-zero length (and exists) - my $enclosuretype=$newsfeed{$id.'_enclosetype'}; + my $enclosuretype=$newsfeed{$id.'_enclosuretype'}; + if ($enclosure =~ m|^/| ) { + $enclosure = "http://".$ENV{'HTTP_HOST'}.$enclosure; + } $r->print(($html?"".&mt('Enclosure')."":"' />")); } } @@ -490,7 +571,7 @@ ENDEDIT if ($html) { $r->print(''); if ($edit) { - $r->print(''. + $r->print(''. ($displayoption eq 'hidden'?'': '')); }