--- loncom/interface/lonrss.pm 2005/11/18 13:35:30 1.2 +++ loncom/interface/lonrss.pm 2005/11/22 16:16:53 1.7 @@ -1,7 +1,7 @@ # The LearningOnline Network # RSS Feeder # -# $Id: lonrss.pm,v 1.2 2005/11/18 13:35:30 www Exp $ +# $Id: lonrss.pm,v 1.7 2005/11/22 16:16:53 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,11 +36,9 @@ use Apache::lontexconvert; use Apache::lonlocal; use Apache::lonhtmlcommon; -my $feedcounter=0; - sub filterfeedname { my $filename=shift; - $filename=~s/\.rss$//; + $filename=~s/(\_rss\.html|\.rss)$//; $filename=~s/\W//g; return $filename; } @@ -76,14 +74,21 @@ sub renamefeed { } sub advertisefeeds { - my ($uname,$udom)=@_; + return; + my ($uname,$udom,$edit)=@_; my $feeds=''; my %feednames=&Apache::lonnet::dump('nohist_all_rss_feeds',$udom,$uname); - foreach (sort keys %feednames) { - if ($_!~/^error\:/) { - my $url='feed://'.$ENV{'HTTP_HOST'}.'/public/'.$udom.'/'.$uname.'/'.$_.'.rss'; - $feeds.='
  • '. - $feednames{$_}.'
    '.$url.'
  • '; + my $mode='public'; + if ($edit) { + $mode='adm'; + } + foreach my $feed (sort(keys(%feednames))) { + if ($feed!~/^error\:/) { + my $feedurl='feed://'.$ENV{'HTTP_HOST'}.'/public/'.$udom.'/'.$uname.'/'.$feed.'.rss'; + my $htmlurl='http://'.$ENV{'HTTP_HOST'}.'/'.$mode.'/'.$udom.'/'.$uname.'/'.$feed.'_rss.html'; + $feeds.='
  • '.$feednames{$feed}. + '
    '.($edit?&mt('Edit'):'HTML').': '.$htmlurl.''. + ($edit?'':'
    RSS: '.$feedurl.'').'
  • '; } } if ($feeds) { @@ -93,10 +98,13 @@ sub advertisefeeds { } } -sub addentry { - $feedcounter++; - my $id=time.'00000'.$$.'00000'.$feedcounter; - return &editentry($id,@_); +{ + my $feedcounter; + sub addentry { + $feedcounter++; + my $id=time.'00000'.$$.'00000'.$feedcounter; + return &editentry($id,@_); + } } sub editentry { @@ -133,21 +141,55 @@ sub changestatus { sub handler { my $r = shift; - &Apache::loncommon::content_type($r,'text/xml'); + + my $edit=0; + my $html=0; + my (undef,$mode,$udom,$uname,$filename)=split(/\//,$r->uri); + if (($mode eq 'adm') && ($env{'user.name'} eq $uname) && ($env{'user.domain'} eq $udom)) { + $edit=1; + $html=1; + } + if ($filename=~/\.html$/) { + $html=1; + } + if ($html) { + &Apache::loncommon::content_type($r,'text/html'); + } else { +# Workaround Mozilla/Firefox +# &Apache::loncommon::content_type($r,'application/rss+xml'); + &Apache::loncommon::content_type($r,'text/xml'); + } $r->send_http_header; return OK if $r->header_only; - my (undef,undef,$udom,$uname,$filename)=split(/\//,$r->uri); my $filterfeedname=&filterfeedname($filename); my $feedname=&feedname($filename); my $displayfeedname=&displayfeedname($filename,$uname,$udom); - $r->print("\n". - "\nhttp://".$ENV{'HTTP_HOST'}.'/'. - "\n".&mt('An RSS Feed provided by the LON-CAPA Learning Content Management System').''); + if ($html) { + $r->print(&Apache::lonxml::xmlbegin().&Apache::loncommon::bodytag + ($displayfeedname,'','','',$udom, + $env{'form.register'}).< + function changed(tform,id) { + tform.elements[id+"_modified"].checked=true; + } + +ENDSCRIPT + } else { + $r->print("\n". + "\nhttp://".$ENV{'HTTP_HOST'}.'/public/'.$udom.'/'.$uname.'/'. + $filterfeedname.'_rss.html'. + "\n". + &mt('An RSS Feed provided by the LON-CAPA Learning Content Management System'). + ''); + } # Is this user for real? - my $homeserver=&Apache::lonnet::homeserver($uname,$udom); + my $homeserver=&Apache::lonnet::homeserver($uname,$udom); + if ($html) { + $r->print(&advertisefeeds($uname,$udom,$edit)); + } if ($homeserver eq 'no_host') { - $r->print(''.&mt('No feed available').''); + $r->print(($html?'

    ':'').&mt('No feed available').($html?'</h3>':'')); } else { # Course or user? my $name=''; @@ -157,7 +199,13 @@ sub handler { } else { $name=&Apache::loncommon::nickname($uname,$udom); } - $r->print("\n".&mt('LON-CAPA RSS Feed "[_1]" for [_2]',$displayfeedname,$name).''); + $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)) { @@ -165,25 +213,60 @@ sub handler { } # Get feed items my %newsfeed=&Apache::lonnet::dump($feedname,$udom,$uname); - foreach (sort keys %newsfeed) { - if ($_=~/^(\d+)\_status$/) { + foreach my $entry (sort(keys(%newsfeed))) { + if ($entry=~/^(\d+)\_status$/) { my $id=$1; - if (($newsfeed{$id.'_status'} ne 'public') && ($viewpubliconly)) { next; } - if ($newsfeed{$id.'_status'} eq 'hidden') { next; } - $r->print("\n\n".$newsfeed{$id.'_title'}."\n". - $newsfeed{$id.'_description'}."\n". - $newsfeed{$id.'_link'}."\n"); - if ($newsfeed{$id.'_enclosureurl'}) { - $r->print("\n"); + if ($edit) { + my %lt=&Apache::lonlocal::texthash('public' => 'public', + 'private' => 'private', + 'hidden' => 'hidden', + 'delete' => 'delete', + 'store' => 'Store changes'); + my %status=(); + $status{$newsfeed{$id.'_status'}}='checked="checked"'; + $r->print(< + +   + +   + +   + +   + +
    +
    +
    + +
    +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"); + } } - $r->print("\n".$id.$filterfeedname.'_'.$udom.'_'.$uname."\n"); } } } - $r->print("\n\n"); + $r->print("\n".($html?''.($edit?'':'').'':''."\n")); return OK; } - 1; __END__