--- loncom/interface/lonrss.pm 2006/04/13 18:12:49 1.16 +++ loncom/interface/lonrss.pm 2006/05/10 15:52:11 1.18 @@ -1,7 +1,7 @@ # The LearningOnline Network # RSS Feeder # -# $Id: lonrss.pm,v 1.16 2006/04/13 18:12:49 albertel Exp $ +# $Id: lonrss.pm,v 1.18 2006/05/10 15:52:11 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -90,7 +90,7 @@ sub advertisefeeds { my $htmlurl='http://'.$ENV{'HTTP_HOST'}.'/'.$mode.'/'.$udom.'/'.$uname.'/'.$feed.'_rss.html'; $feeds.='
  • '.$feednames{$feed}. '
    '.($edit?&mt('Edit'):'HTML').': '.$htmlurl.''. - ($edit?'':'
    RSS: '.$feedurl.'').'
    • '; + '
    RSS: '.$feedurl.''; } } if ($feeds) { @@ -119,7 +119,7 @@ sub addentry { } 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); } @@ -132,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); } @@ -145,7 +144,6 @@ sub changestatus { $id.'_description', $id.'_link', $id.'_enclosureurl', - $id.'_enclosurelength', $id.'_enclosuretype', $id.'_status'],$udom,$uname); } else { @@ -163,6 +161,12 @@ sub changed_js { ENDSCRIPT } +sub determine_enclosure_types { + my ($url)=@_; + my ($ending)=($url=~/\.(\w+)$/); + return &Apache::loncommon::filemimetype($ending); +} + sub handler { my ($r) = @_; @@ -195,7 +199,7 @@ sub handler { 'force_register' => $env{'form.register'}}). &changed_js()); - } else { + } else { # render RSS $r->print("\n". "\nhttp://".$ENV{'HTTP_HOST'}.'/public/'.$udom.'/'.$uname.'/'. $filterfeedname.'_rss.html'. @@ -204,21 +208,6 @@ sub handler { ''); } # 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); @@ -227,7 +216,7 @@ sub handler { } if ($homeserver eq 'no_host') { $r->print(($html?'

    ':'').&mt('No feed available').($html?'</h3>':'')); - } else { + } else { # is indeed a user # Course or user? my $name=''; if ($uname=~/^\d/) { @@ -236,33 +225,58 @@ sub handler { } else { $name=&Apache::loncommon::nickname($uname,$udom); } - $r->print("\n". - ($html?'

    ':''). - &mt('LON-CAPA Feed "[_1]" for [_2]',$displayfeedname,$name). - ($html?'</h3>'.($edit?'<form method="post"><br />'. - &mt('Name of blog/journal'). - ': <input type="text" size="50" name="newblogname" value="'. - $displayfeedname.'" />':'').'<ul>':'')); + if ($displayfeedname) { # this is an existing feed +# Anything 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'}); + } + } + } + if ($env{'form.newblogname'} ne $displayfeedname) { + &Apache::lonnet::put('nohist_all_rss_feeds',{ $filterfeedname => $env{'form.newblogname'} },$udom,$uname); + $displayfeedname=&displayfeedname($filename,$uname,$udom); + } + } #done storing + + $r->print("\n". + ($html?'

    ':''). + &mt('LON-CAPA Feed "[_1]" for [_2]',$displayfeedname,$name). + ($html?'</h3>'.($edit?'<form method="post"><br />'. + &mt('Name of blog/journal'). + ': <input type="text" size="50" name="newblogname" value="'. + $displayfeedname.'" />':'').'<ul>':'')); # Render private items? - my $viewpubliconly=1; - if (($env{'user.name'} eq $uname) && ($env{'user.domain'} eq $udom)) { - $viewpubliconly=0; - } + my $viewpubliconly=1; + if (($env{'user.name'} eq $uname) && ($env{'user.domain'} eq $udom)) { + $viewpubliconly=0; + } # Get feed items - my %newsfeed=&Apache::lonnet::dump($feedname,$udom,$uname); - foreach my $entry (sort(keys(%newsfeed)),$newid.'_status') { - if ($entry=~/^(\d+)\_status$/) { - my $id=$1; - if ($edit) { - my %lt=&Apache::lonlocal::texthash('public' => 'public', - 'private' => 'private', - 'hidden' => 'hidden', - 'delete' => 'delete', - 'store' => 'Store changes'); - my %status=(); - unless ($newsfeed{$id.'_status'}) { $newsfeed{$id.'_status'}='public'; } - $status{$newsfeed{$id.'_status'}}='checked="checked"'; - $r->print(< 'public', + 'private' => 'private', + 'hidden' => 'hidden', + 'delete' => 'delete', + 'store' => 'Store changes', + 'title' => 'Title', + 'link' => 'Link', + 'description' => 'Description'); + my %status=(); + unless ($newsfeed{$id.'_status'}) { $newsfeed{$id.'_status'}='public'; } + $status{$newsfeed{$id.'_status'}}='checked="checked"'; + $r->print(<    @@ -274,37 +288,53 @@ sub handler {   
    -
    +$lt{'title'}: +
    +$lt{'description'}:

    - +$lt{'link'}: +
    ENDEDIT - } else { - if (($newsfeed{$id.'_status'} ne 'public') && ($viewpubliconly)) { next; } - if ($newsfeed{$id.'_status'} eq 'hidden') { next; } - $r->print("\n".($html?"\n
  • ":"\n").$newsfeed{$id.'_title'}. - ($html?"</b><br />\n":"\n"). - $newsfeed{$id.'_description'}. - ($html?"
    \n".&mt('Read more')."
    \n"):"\n")); - if ($newsfeed{$id.'_enclosureurl'}) { - $r->print(($html?"".&mt('Enclosure')."":"' />")); - } - if ($html) { - $r->print("\n
    • \n"); - } else { - $r->print("\n".$id.$filterfeedname.'_'.$udom.'_'.$uname."\n"); - } + } else { # not in edit mode, just displaying + if (($newsfeed{$id.'_status'} ne 'public') && ($viewpubliconly)) { next; } + if ($newsfeed{$id.'_status'} eq 'hidden') { next; } + $r->print("\n".($html?"\n
  • ":"\n").$newsfeed{$id.'_title'}. + ($html?"</b><br />\n":"\n"). + $newsfeed{$id.'_description'}. + ($html?"
    \n".&mt('Read more')."
    \n"):"\n")); +# Enclosure? Get stats + if ($newsfeed{$id.'_enclosureurl'}) { + 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?"".&mt('Enclosure')."":"' />")); + } + } + if ($html) { # is HTML + $r->print("\n
    • \n"); + } else { # is RSS + $r->print("\n".$id.$filterfeedname.'_'.$udom.'_'.$uname."\n"); + } + } # end of "in edit mode" + } # end of rendering a real entry + } # end of loop through all keys + if ($html) { + $r->print(''); + if ($edit) { + $r->print(''); } } - } - } - $r->print("\n".($html?''.($edit?'':'').&Apache::loncommon::end_page():''."\n")); + } # was a real display feedname + $r->print(($html?''.&Apache::loncommon::end_page():''."\n")); + } # a real user return OK; -} +} # end handler 1; __END__