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

Diff for /loncom/interface/lonrss.pm between versions 1.46 and 1.52

version 1.46, 2009/02/26 16:17:29 version 1.52, 2013/05/25 21:50:19
Line 61  sub displayfeedname { Line 61  sub displayfeedname {
     my $name=$filterfilename;       my $name=$filterfilename; 
     if ($name=~/^CourseBlog/) {      if ($name=~/^CourseBlog/) {
         $name=&mt('Course Blog');          $name=&mt('Course Blog');
           if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Community') {
               $name = &mt('Community Blog'); 
           }
  if ($env{'course.'.$env{'request.course.id'}.'.description'}) {   if ($env{'course.'.$env{'request.course.id'}.'.description'}) {
     $name.=' '.$env{'course.'.$env{'request.course.id'}.'.description'};      $name.=' '.$env{'course.'.$env{'request.course.id'}.'.description'};
  }   }
Line 85  sub changefeeddisplay { Line 88  sub changefeeddisplay {
 }  }
   
 sub advertisefeeds {  sub advertisefeeds {
     my ($uname,$udom,$edit)=@_;      my ($uname,$udom,$edit,$count,$hidden)=@_;
     my $feeds='';      my $feeds='';
     my %feednames=&Apache::lonnet::dump('nohist_all_rss_feeds',$udom,$uname);      my %feednames=&Apache::lonnet::dump('nohist_all_rss_feeds',$udom,$uname);
     my $mode='public';      my $mode='public';
Line 97  sub advertisefeeds { Line 100  sub advertisefeeds {
  next if ($feed =~/^\s*$/    ||   next if ($feed =~/^\s*$/    ||
  $feed =~ /^error:/ ||   $feed =~ /^error:/ ||
  $feed =~ /^feed_display_option_/);   $feed =~ /^feed_display_option_/);
           if ($feednames{'feed_display_option_'.$feed} eq 'hidden') {
               if (ref($hidden)) {
                   $$hidden ++;
               }
               if (ref($count)) {
                   unless ($edit) {
                       next;
                   }
               }
           } else {
               if (ref($count)) {
                   $$count ++;
               }
           }
  my $feedurl= $server.'/public/'.$udom.'/'.$uname.'/'.$feed.'.rss';   my $feedurl= $server.'/public/'.$udom.'/'.$uname.'/'.$feed.'.rss';
  my $htmlurl= $server.'/'.$mode.'/'.$udom.'/'.$uname.'/'.$feed.'_rss.html';   my $htmlurl= $server.'/'.$mode.'/'.$udom.'/'.$uname.'/'.$feed.'_rss.html';
  if ($feednames{'feed_display_option_'.$feed} eq 'hidden') {   if ($feednames{'feed_display_option_'.$feed} eq 'hidden') {
Line 258  sub blocking_blogdisplay { Line 274  sub blocking_blogdisplay {
         if ($blockcause eq 'user') {          if ($blockcause eq 'user') {
             $output .= &mt('This is because you are a student in one or more courses in which communication is being blocked.');              $output .= &mt('This is because you are a student in one or more courses in which communication is being blocked.');
             if ($html) {              if ($html) {
                 $output .= '<br />'.                  #$output .= '<br />'.
                        &Apache::loncommon::build_block_table($startblock,                         #&Apache::loncommon::build_block_table($startblock,
                                                         $endblock,\%setters);                         #                                 $endblock,\%setters);
                    my ($blocked, $blocktext) = Apache::loncommon::blocking_status('blogs');
                    $output .= '<br /><br />'.$blocktext;
             }              }
         } else {          } else {
             $output .= &mt('This is because the blog owner is a student in one or more courses in which communication is being blocked.');              $output .= &mt('This is because the blog owner is a student in one or more courses in which communication is being blocked.');
Line 283  sub handler { Line 301  sub handler {
  $edit=1;   $edit=1;
  $html=1;   $html=1;
     }      }
     if  (($mode eq 'adm') && (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {      if  (($mode eq 'adm') && (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))
           && ($uname eq $env{'course.'.$env{'request.course.id'}.'.num'} &&
               $udom eq $env{'course.'.$env{'request.course.id'}.'.domain'})) {
  $edit=1;   $edit=1;
  $html=1;   $html=1;
     }      }
Line 390  sub handler { Line 410  sub handler {
  }   }
 # Add a new feed  # Add a new feed
         if (($html) && ($edit)) {          if (($html) && ($edit)) {
     $r->print('<form method="post" name="makenewfeed">');      $r->print('<h4>' . &mt('New RSS Feed or Blog'). '</h4>');
       $r->print('<form method="post" name="makenewfeed" action="">');
             $r->print(&mt('Name').": <input type='text' size='40' name='namenewblog' />");              $r->print(&mt('Name').": <input type='text' size='40' name='namenewblog' />");
     $r->print('<input type="submit" value="'.&mt('New Feed').'" />');      $r->print('<input type="submit" value="'.&mt('New Feed').'" />');
     $r->print('</form>');      $r->print('</form>');
Line 492  sub handler { Line 513  sub handler {
       ($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').')':'').        ($displayoption eq 'hidden'?' ('.&mt('Hidden').')':'').
       ($html?'</h3>'.($edit?'<form method="post" name="lonhomework" enctype="multipart/form-data"><br />'.        ($html?'</h3>'.($edit?'<form method="post" name="lonhomework" enctype="multipart/form-data" action=""><br />'.
       &mt('Name of this Feed').        &mt('Name of this Feed').
       ': <input type="text" size="50" name="newblogname" value="'.        ': <input type="text" size="50" name="newblogname" value="'.
       $displayfeedname.'" />':'').'<ul>':'</title>'));        $displayfeedname.'" />':'').'<ul>':'</title>'));
Line 593  ENDEDIT Line 614  ENDEDIT
       ($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').'" />'));
  }   }
                   $r->print('</form>');
     }      }
  } # was a real display feedname   } # was a real display feedname
  $r->print(($html?'</form>'.&Apache::loncommon::end_page():'</channel></rss>'."\n"));   $r->print(($html?&Apache::loncommon::end_page():'</channel></rss>'."\n"));
     } # a real user      } # a real user
     return OK;      return OK;
 } # end handler  } # end handler
Removed from v.1.46  
changed lines
  Added in v.1.52

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