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

Diff for /loncom/interface/lonrss.pm between versions 1.19 and 1.20

version 1.19, 2006/05/11 02:08:48 version 1.20, 2006/05/11 15:27:49
Line 54  sub displayfeedname { Line 54  sub displayfeedname {
     my ($rawname,$uname,$udom)=@_;      my ($rawname,$uname,$udom)=@_;
     my $filterfilename=&filterfeedname($rawname);      my $filterfilename=&filterfeedname($rawname);
 # do we have a stored name?  # do we have a stored name?
     my %stored=&Apache::lonnet::get('nohist_all_rss_feeds',[$filterfilename],$udom,$uname);      my %stored=&Apache::lonnet::get('nohist_all_rss_feeds',[$filterfilename,'feed_display_option_'.$filterfilename],$udom,$uname);
     if ($stored{$filterfilename}) { return $stored{$filterfilename}; }      if ($stored{$filterfilename}) { return ($stored{$filterfilename},$stored{'feed_display_option_'.$filterfilename}); }
 # no, construct a name  # no, construct a name
     my $name=$filterfilename;       my $name=$filterfilename; 
     if ($name=~/^CourseBlog/) {      if ($name=~/^CourseBlog/) {
Line 66  sub displayfeedname { Line 66  sub displayfeedname {
     } else {      } else {
  $name=~s/\_/ /g;   $name=~s/\_/ /g;
     }      }
     return $name;      return ($name,$stored{'feed_display_option_'.$filterfilename});
 }  }
   
 sub namefeed {  sub namefeed {
Line 76  sub namefeed { Line 76  sub namefeed {
  $udom,$uname);   $udom,$uname);
 }  }
   
   sub changefeeddisplay {
       my ($rawname,$uname,$udom,$newstatus)=@_;
       return &Apache::lonnet::put('nohist_all_rss_feeds',
    { 'feed_display_option_'.&filterfeedname($rawname) => $newstatus },
    $udom,$uname);
   }
   
 sub advertisefeeds {  sub advertisefeeds {
     my ($uname,$udom,$edit)=@_;      my ($uname,$udom,$edit)=@_;
     my $feeds='';      my $feeds='';
Line 85  sub advertisefeeds { Line 92  sub advertisefeeds {
  $mode='adm';   $mode='adm';
     }      }
     foreach my $feed (sort(keys(%feednames))) {      foreach my $feed (sort(keys(%feednames))) {
  if ($feed!~/^error\:/) {   if (($feed!~/^error\:/) && ($feed!~/^feed\_display\_option\_/)) {
     my $feedurl='http://'.$ENV{'HTTP_HOST'}.'/public/'.$udom.'/'.$uname.'/'.$feed.'.rss';      my $feedurl='http://'.$ENV{'HTTP_HOST'}.'/public/'.$udom.'/'.$uname.'/'.$feed.'.rss';
     my $htmlurl='http://'.$ENV{'HTTP_HOST'}.'/'.$mode.'/'.$udom.'/'.$uname.'/'.$feed.'_rss.html';      my $htmlurl='http://'.$ENV{'HTTP_HOST'}.'/'.$mode.'/'.$udom.'/'.$uname.'/'.$feed.'_rss.html';
     $feeds.='<li>'.$feednames{$feed}.      if ($feednames{'feed_display_option_'.$feed} eq 'hidden') {
  '<br />'.($edit?&mt('Edit'):'HTML').': <a href="'.$htmlurl.'"><tt>'.$htmlurl.'</tt></a>'.   if ($edit) {
  '<br />RSS: <a href="'.$feedurl.'"><tt>'.$feedurl.'</tt></a></li>';      $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>';
       }
  }   }
     }      }
     if ($feeds) {      if ($feeds) {
Line 192  sub handler { Line 205  sub handler {
   
     my $filterfeedname=&filterfeedname($filename);      my $filterfeedname=&filterfeedname($filename);
     my $feedname=&feedname($filename);      my $feedname=&feedname($filename);
     my $displayfeedname=&displayfeedname($filename,$uname,$udom);      my ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom);
     if ($html) {      if ($html) {
  $r->print(&Apache::loncommon::start_page($displayfeedname,undef,   $r->print(&Apache::loncommon::start_page(($displayfeedname?$displayfeedname:&mt("Available RSS Feeds and Blogs")),undef,
  {'domain'         => $udom,   {'domain'         => $udom,
   'force_register' =>    'force_register' =>
       $env{'form.register'}}).        $env{'form.register'}}).
Line 214  sub handler { Line 227  sub handler {
     if ($html) {      if ($html) {
 # Any new feeds or renaming of feeds?  # Any new feeds or renaming of feeds?
  if ($edit) {   if ($edit) {
   # Hide a feed?
       if ($env{'form.hidethisblog'}) {
    &changefeeddisplay($feedname,$uname,$udom,'hidden');
    ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom);
       }
   # Advertise a feed?
       if ($env{'form.advertisethisblog'}) {
    &changefeeddisplay($feedname,$uname,$udom,'public');
    ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom);
       }
 # New feed?  # New feed?
     if ($env{'form.namenewblog'}=~/\w/) {      if ($env{'form.namenewblog'}=~/\w/) {
  &namefeed($env{'form.namenewblog'},$uname,$udom,$env{'form.namenewblog'});   &namefeed($env{'form.namenewblog'},$uname,$udom,$env{'form.namenewblog'});
Line 222  sub handler { Line 245  sub handler {
     if (($displayfeedname) && ($env{'form.newblogname'}=~/\w/)) {      if (($displayfeedname) && ($env{'form.newblogname'}=~/\w/)) {
  if ($env{'form.newblogname'} ne $displayfeedname) {   if ($env{'form.newblogname'} ne $displayfeedname) {
     &namefeed($feedname,$uname,$udom,$env{'form.newblogname'});      &namefeed($feedname,$uname,$udom,$env{'form.newblogname'});
     $displayfeedname=&displayfeedname($filename,$uname,$udom);      ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom);
  }   }
     }      }
  }   }
Line 267  sub handler { Line 290  sub handler {
     $r->print("\n".      $r->print("\n".
       ($html?'<hr /><h3>':'<title>').        ($html?'<hr /><h3>':'<title>').
       &mt('LON-CAPA Feed "[_1]" for [_2]',$displayfeedname,$name).        &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"><br />'.
       &mt('Name of blog/journal').        &mt('Name of blog/journal').
       ': <input type="text" size="50" name="newblogname" value="'.        ': <input type="text" size="50" name="newblogname" value="'.
Line 345  ENDEDIT Line 369  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('Store Marked Changes').'" />'.
         ($displayoption eq 'hidden'?'<input type="submit" name="advertisethisblog" value="'.&mt('Advertise this Feed').'" />':
          '<input type="submit" name="hidethisblog" value="'.&mt('Hide this Feed').'" />'));
  }   }
     }      }
  } # was a real display feedname   } # was a real display feedname
Removed from v.1.19  
changed lines
  Added in v.1.20

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