[BACK]Return to lonrss.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonrss.pm between versions 1.34 and 1.37

version 1.34, 2007/01/18 19:27:33 version 1.37, 2007/07/27 00:17:17
Line 94  sub advertisefeeds { Line 94  sub advertisefeeds {
     }      }
     my $server = &Apache::lonnet::absolute_url();      my $server = &Apache::lonnet::absolute_url();
     foreach my $feed (sort(keys(%feednames))) {      foreach my $feed (sort(keys(%feednames))) {
  if (($feed!~/^error\:/) && ($feed!~/^feed\_display\_option\_/)) {   next if ($feed =~/^\s*$/    ||
     my $feedurl= $server.'/public/'.$udom.'/'.$uname.'/'.$feed.'.rss';   $feed =~ /^error:/ ||
     my $htmlurl= $server.'/'.$mode.'/'.$udom.'/'.$uname.'/'.$feed.'_rss.html';   $feed =~ /^feed_display_option_/);
     if ($feednames{'feed_display_option_'.$feed} eq 'hidden') {  
  if ($edit) {   my $feedurl= $server.'/public/'.$udom.'/'.$uname.'/'.$feed.'.rss';
     $feeds.='<li><i>'.$feednames{$feed}.'</i><br />'.&mt('Hidden').': <a href="'.$htmlurl.'"><tt>'.$htmlurl.'</tt></a></li>';   my $htmlurl= $server.'/'.$mode.'/'.$udom.'/'.$uname.'/'.$feed.'_rss.html';
  }   if ($feednames{'feed_display_option_'.$feed} eq 'hidden') {
     } else {      if ($edit) {
  $feeds.='<li><b>'.$feednames{$feed}.   $feeds.='<li><i>'.$feednames{$feed}.'</i><br />'.&mt('Hidden').': <a href="'.$htmlurl.'"><tt>'.$htmlurl.'</tt></a></li>';
     '</b><br />'.($edit?&mt('Edit'):'HTML').': <a href="'.$htmlurl.'"><tt>'.$htmlurl.'</tt></a>'.  
     '<br />'.&mt('Public RSS/podcast (subscribe to)').': <a href="'.$feedurl.'"><tt>'.$feedurl.'</tt></a></li>';  
     }      }
    } else {
       $feeds.='<li><b>'.$feednames{$feed}.
    '</b><br />'.($edit?&mt('Edit'):'HTML').': <a href="'.$htmlurl.'"><tt>'.$htmlurl.'</tt></a>'.
    '<br />'.&mt('Public RSS/podcast (subscribe to)').': <a href="'.$feedurl.'"><tt>'.$feedurl.'</tt></a></li>';
  }   }
     }      }
     if ($feeds) {      if ($feeds) {
Line 116  sub advertisefeeds { Line 118  sub advertisefeeds {
 }  }
   
 sub rss_link {  sub rss_link {
     my ($url) = @_;      my ($uname,$udom)=@_;
     return qq|<link rel="alternate" type="application/rss+xml" title="Course Announcements" href="$url" />|;      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;
 }  }
   
 {  {
Line 294  sub handler { Line 310  sub handler {
     if ($html) {      if ($html) {
  my $title = $displayfeedname?$displayfeedname   my $title = $displayfeedname?$displayfeedname
                                     :"Available RSS Feeds and Blogs";                                      :"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,   {'domain'         => $udom,
   'force_register' =>    'force_register' =>
       $env{'form.register'}}).        $env{'form.register'}}).
Line 466  sub handler { Line 483  sub handler {
             }              }
 # Get feed items  # Get feed items
     my %newsfeed=&Apache::lonnet::dump($feedname,$udom,$uname);      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   if ($entry=~/^(\d+)\_status$/) { # is an entry
     my $id=$1;      my $id=$1;
     if ($edit) {      if ($edit) {
Line 474  sub handler { Line 491  sub handler {
    'private' => 'private',     'private' => 'private',
    'hidden' => 'hidden',     'hidden' => 'hidden',
    'delete' => 'delete',     'delete' => 'delete',
    'store' => 'Store changes',     'store' => 'Save changes',
    'title' => 'Title',     'title' => 'Title',
    'link' => 'Link',     'link' => 'Link',
    'description' => 'Description',     'description' => 'Description',
Line 554  ENDEDIT Line 571  ENDEDIT
     if ($html) {      if ($html) {
  $r->print('</ul>');   $r->print('</ul>');
  if ($edit) {   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 Marked Changes').'" />'.
       ($displayoption eq 'hidden'?'<input type="submit" name="advertisethisblog" value="'.&mt('Advertise this Feed').'" />':        ($displayoption eq 'hidden'?'<input type="submit" name="advertisethisblog" value="'.&mt('Advertise this Feed').'" />':
        '<input type="submit" name="hidethisblog" value="'.&mt('Hide this Feed').'" />'));         '<input type="submit" name="hidethisblog" value="'.&mt('Hide this Feed').'" />'));
  }   }
Removed from v.1.34  
changed lines
  Added in v.1.37

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