Diff for /loncom/interface/lonrss.pm between versions 1.22 and 1.28

version 1.22, 2006/05/11 17:50:52 version 1.28, 2006/10/02 16:47:57
Line 139  sub editentry { Line 139  sub editentry {
     }      }
     my $feedname=&feedname($filename);      my $feedname=&feedname($filename);
     &Apache::lonnet::put('nohist_all_rss_feeds',      &Apache::lonnet::put('nohist_all_rss_feeds',
  { &filterfeedname($filename) => &displayfeedname($filename,$uname,$udom) },   { &filterfeedname($filename) => 
          (&displayfeedname($filename,$uname,$udom))[0] },
  $udom,$uname);   $udom,$uname);
     return &Apache::lonnet::put($feedname,{      return &Apache::lonnet::put($feedname,{
  $id.'_title' => $title,   $id.'_title' => $title,
Line 199  sub add_blog_entry_link { Line 200  sub add_blog_entry_link {
     my ($id,$uname,$udom,$filename,$title,$description,$url,$status,$encurl,$enctype,$linktext)=@_;      my ($id,$uname,$udom,$filename,$title,$description,$url,$status,$encurl,$enctype,$linktext)=@_;
     return "<a href='/adm/$udom/$uname/".&filterfeedname($filename).'_rss.html?queryid='.      return "<a href='/adm/$udom/$uname/".&filterfeedname($filename).'_rss.html?queryid='.
  &escape($id).   &escape($id).
  '&title='.&escape($title).   '&amp;title='.&escape($title).
  '&description='.&escape($description).   '&amp;description='.&escape($description).
  '&url='.&escape($url).   '&amp;url='.&escape($url).
  '&status='.&escape($status).   '&amp;status='.&escape($status).
  '&encurl='.&escape($encurl).   '&amp;encurl='.&escape($encurl).
  '&enctype='.&escape($enctype).   '&amp;enctype='.&escape($enctype).
  "'>".$linktext.'</a>';   "'>".$linktext.'</a>';
   
 }  }
Line 240  sub handler { Line 241  sub handler {
     my $feedname=&feedname($filename);      my $feedname=&feedname($filename);
     my ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom);      my ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom);
     if ($html) {      if ($html) {
  $r->print(&Apache::loncommon::start_page(($displayfeedname?$displayfeedname:&mt("Available RSS Feeds and Blogs")),undef,   my $title = $displayfeedname?$displayfeedname
                                       :"Available RSS Feeds and Blogs";
    $r->print(&Apache::loncommon::start_page($title,undef,
  {'domain'         => $udom,   {'domain'         => $udom,
   'force_register' =>    'force_register' =>
       $env{'form.register'}}).        $env{'form.register'}}).
Line 336  sub handler { Line 339  sub handler {
     &editentry($id,$uname,$udom,$feedname,      &editentry($id,$uname,$udom,$feedname,
        $env{'form.'.$id.'_title'},         $env{'form.'.$id.'_title'},
        $env{'form.'.$id.'_description'},         $env{'form.'.$id.'_description'},
        $env{'form.'.$id.'_url'},         $env{'form.'.$id.'_link'},
        $env{'form.'.$id.'_status'},         $env{'form.'.$id.'_status'},
        $env{'form.'.$id.'_enclosureurl'},         $env{'form.'.$id.'_enclosureurl'},
        $env{'form.'.$id.'_enclosuretype'},         $env{'form.'.$id.'_enclosuretype'},
Line 399  ENDEDIT Line 402  ENDEDIT
     } else { # not in edit mode, just displaying      } else { # not in edit mode, just displaying
  if (($newsfeed{$id.'_status'} ne 'public') && ($viewpubliconly)) { next; }   if (($newsfeed{$id.'_status'} ne 'public') && ($viewpubliconly)) { next; }
  if ($newsfeed{$id.'_status'} eq 'hidden') { next; }   if ($newsfeed{$id.'_status'} eq 'hidden') { next; }
    my $link =  $newsfeed{$id.'_link'};
    if ($link =~ m|^/| ) {
       $link = "http://".$ENV{'HTTP_HOST'}.$link;
    }
  $r->print("\n".($html?"\n<li><b>":"<item>\n<title>").$newsfeed{$id.'_title'}.   $r->print("\n".($html?"\n<li><b>":"<item>\n<title>").$newsfeed{$id.'_title'}.
   ($html?"</b><br />\n":"</title>\n<description>").    ($html?"</b><br />\n":"</title>\n<description>").
   $newsfeed{$id.'_description'}.    $newsfeed{$id.'_description'}.
   ($html?"<br />\n<a href='":"</description>\n<link>").    ($html?"<br />\n<a href='":"</description>\n<link>").
   "http://".$ENV{'HTTP_HOST'}.    
   $newsfeed{$id.'_link'}.    $link.
   ($html?("'>".&mt('Read more')."</a><br />\n"):"</link>\n"));    ($html?("'>".&mt('Read more')."</a><br />\n"):"</link>\n"));
 # Enclosure? Get stats  # Enclosure? Get stats
  if ($newsfeed{$id.'_enclosureurl'}) {   if ($newsfeed{$id.'_enclosureurl'}) {

Removed from v.1.22  
changed lines
  Added in v.1.28


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>