--- loncom/interface/lonrss.pm 2006/12/04 21:51:31 1.30 +++ loncom/interface/lonrss.pm 2009/07/27 12:12:47 1.48 @@ -1,7 +1,7 @@ # The LearningOnline Network # RSS Feeder # -# $Id: lonrss.pm,v 1.30 2006/12/04 21:51:31 albertel Exp $ +# $Id: lonrss.pm,v 1.48 2009/07/27 12:12:47 kalberla Exp $ # # Copyright Michigan State University Board of Trustees # @@ -29,14 +29,14 @@ package Apache::lonrss; use strict; -use LONCAPA (: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; @@ -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.='<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>'; + 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.='<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>'.$feednames{$feed}.' HTML</tt></a>'. + '<br />'.&mt('Public RSS/podcast (subscribe to)').': <a href="'.$feedurl.'"><tt>'.$feednames{$feed}.' RSS/Podcast</tt></a></li>'; } } if ($feeds) { @@ -116,8 +118,22 @@ sub advertisefeeds { } sub rss_link { - my ($url) = @_; - return qq|<link rel="alternate" type="application/rss+xml" title="Course Announcements" href="$url" />|; + 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| +<link rel="alternate" type="application/rss+xml" title="$title" href="$url" /> +|; + } + return $result; } { @@ -242,9 +258,11 @@ sub blocking_blogdisplay { if ($blockcause eq 'user') { $output .= &mt('This is because you are a student in one or more courses in which communication is being blocked.'); if ($html) { - $output .= '<br />'. - &Apache::loncommon::build_block_table($startblock, - $endblock,\%setters); + #$output .= '<br />'. + #&Apache::loncommon::build_block_table($startblock, + # $endblock,\%setters); + my ($blocked, $blocktext) = Apache::loncommon::blocking_status('blogs'); + $output .= '<br /><br />'.$blocktext; } } else { $output .= &mt('This is because the blog owner is a student in one or more courses in which communication is being blocked.'); @@ -287,17 +305,33 @@ sub handler { my $filterfeedname=&filterfeedname($filename); my $feedname=&feedname($filename); my ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom); - my ($blocked,$blocktext); - if ($uname !~ /^$match_courseid$/) { + my ($blocked,$blocktext,$disabled,$disabletext); + if (!&Apache::lonnet::is_course($udom,$uname)) { ($blocked,$blocktext) = &blocking_blogdisplay($uname,$udom,$html,$filterfeedname); + if (&Apache::lonnet::usertools_access($uname,$udom,'blog')) { + $disabled = 0; + } else { + $disabled = 1; + if ($html) { + $disabletext = '<h2>'.&mt('No user blog available') .'</h2>'. + &mt('This is a result of one of the following:').'<ul>'. + '<li>'.&mt('The administrator of this domain has disabled blog functionality for this specific user.').'</li>'. + '<li>'.&mt('The domain has been configured to disable, by default, blog functionality for all users in the domain.').'</li>'. + '</ul>'; + } else { + $disabletext = &mt('No user blog available'); + } + } } if ($html) { - my $title = $displayfeedname?$displayfeedname - :"Available RSS Feeds and Blogs"; - $r->print(&Apache::loncommon::start_page($title,undef, - {'domain' => $udom, - 'force_register' => - $env{'form.register'}}). +# my $title = $displayfeedname?$displayfeedname:"Available RSS Feeds and Blogs"; + my $title = "My Space"; + my $rss_link = &Apache::lonrss::rss_link($uname,$udom); + my $brcrumb = [{href=>$rss_link,text=>"Available RSS Feeds and Blogs"}]; + $r->print(&Apache::loncommon::start_page($title,$rss_link, + {'bread_crumbs' => $brcrumb, + 'domain' => $udom, + 'force_register' => $env{'form.register'}}). &changed_js()); } else { # render RSS my $server = &Apache::lonnet::absolute_url(); @@ -312,7 +346,7 @@ sub handler { my $newid = &get_new_feed_id(); # Is this user for real? my $homeserver=&Apache::lonnet::homeserver($uname,$udom); - if ($html && !$blocked) { + if ($html && !$blocked && !$disabled) { # Any new feeds or renaming of feeds? if ($edit) { # Hide a feed? @@ -344,10 +378,13 @@ sub handler { } elsif ($blocked) { $r->print($blocktext); $r->print(($html?&Apache::loncommon::end_page():'</channel></rss>'."\n")); + } elsif ($disabled) { + $r->print($disabletext); + $r->print(($html?&Apache::loncommon::end_page():'</channel></rss>'."\n")); } 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,9 +392,10 @@ sub handler { } # 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('<h4>' . &mt('New RSS Feed or Blog'). '</h4>'); + $r->print('<form method="post" name="makenewfeed">'); + $r->print(&mt('Name').": <input type='text' size='40' name='namenewblog' />"); + $r->print('<input type="submit" value="'.&mt('New Feed').'" />'); $r->print('</form>'); } if ($displayfeedname) { # this is an existing feed @@ -374,8 +412,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 +426,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 +444,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 +495,7 @@ sub handler { ($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 />'. + ($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>':'</title>')); @@ -419,7 +504,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 +512,21 @@ sub handler { 'private' => 'private', 'hidden' => 'hidden', 'delete' => 'delete', - 'store' => 'Store changes', + 'store' => 'Select', '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='<tt>'.$newsfeed{$id.'_enclosureurl'}.'</tt>'. + "<input type='hidden' name='$id\_enclosureurl' value='$newsfeed{$id.'_enclosureurl'}' />". + "<input type='hidden' name='$id\_enclosuretype' value='$newsfeed{$id.'_enclosuretype'}' />"; + } my %status=(); unless ($newsfeed{$id.'_status'}) { $newsfeed{$id.'_status'}='public'; } $status{$newsfeed{$id.'_status'}}='checked="checked"'; @@ -451,7 +547,9 @@ $lt{'title'}: $lt{'description'}:<br /> <textarea name='$id\_description' rows="6" cols="80" onChange="changed(this.form,'$id');">$newsfeed{$id.'_description'}</textarea><br /> $lt{'link'}: -<input name='$id\_link' type='text' size='60' value='$newsfeed{$id.'_link'}' onChange="changed(this.form,'$id');" /> +<input name='$id\_link' type='text' size='60' value='$newsfeed{$id.'_link'}' onChange="changed(this.form,'$id');" /><br /> +$lt{'enc'} - +$uploadlink <hr /></li> ENDEDIT } else { # not in edit mode, just displaying @@ -464,18 +562,22 @@ ENDEDIT $r->print("\n".($html?"\n<li><b>":"<item>\n<title>").$newsfeed{$id.'_title'}. ($html?"</b><br />\n":"</title>\n<description>"). $newsfeed{$id.'_description'}. - ($html?"<br />\n<a href='":"</description>\n<link>"). - + ($html?"<br />":"</description>\n"). + ($link?($html?"\n<a href='":"<link>"). $link. - ($html?("'>".&mt('Read more')."</a><br />\n"):"</link>\n")); + ($html?("'>".&mt('Read more')."</a><br />\n"):"</link>\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?"<a href='":"\n<enclosure url='"). - $newsfeed{$id.'_enclosureurl'}."' length='".$stat[7]. + $enclosure."' length='".$stat[7]. "' type='".$enclosuretype.($html?"'>".&mt('Enclosure')."</a>":"' />")); } } @@ -490,7 +592,7 @@ 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('Save Selected').'" />'. ($displayoption eq 'hidden'?'<input type="submit" name="advertisethisblog" value="'.&mt('Advertise this Feed').'" />': '<input type="submit" name="hidethisblog" value="'.&mt('Hide this Feed').'" />')); }