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

version 1.20, 2006/05/11 15:27:49 version 1.21, 2006/05/11 17:38:44
Line 180  sub determine_enclosure_types { Line 180  sub determine_enclosure_types {
     return &Apache::loncommon::filemimetype($ending);      return &Apache::loncommon::filemimetype($ending);
 }  }
   
   sub course_blog_link {
       my ($id,$title,$description,$url,$encurl,$enctype)=@_;
       if ($env{'request.course.id'}) {
    return &add_blog_entry_link($id,
       $env{'course.'.$env{'request.course.id'}.'.num'},
       $env{'course.'.$env{'request.course.id'}.'.domain'},
       'Course_Announcements',
       $title,$description,$url,'public',$encurl,$enctype,
       &mt('Add to Course Announcements'));
       } else {
    return '';
       }
   }
   
   sub add_blog_entry_link {
       my ($id,$uname,$udom,$filename,$title,$description,$url,$status,$encurl,$enctype,$linktext)=@_;
       return "<a href='/adm/$udom/$uname/".&filterfeedname($filename).'_rss.html?queryid='.
    &Apache::lonnet::escape($id).
    '&title='.&Apache::lonnet::escape($title).
    '&description='.&Apache::lonnet::escape($description).
    '&url='.&Apache::lonnet::escape($url).
    '&status='.&Apache::lonnet::escape($status).
    '&encurl='.&Apache::lonnet::escape($encurl).
    '&enctype='.&Apache::lonnet::escape($enctype).
    "'>".$linktext.'</a>';
   
   }
   
 sub handler {  sub handler {
     my ($r) = @_;      my ($r) = @_;
   
Line 190  sub handler { Line 218  sub handler {
  $edit=1;   $edit=1;
  $html=1;   $html=1;
     }      }
       if  (($mode eq 'adm') && (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
    $edit=1;
    $html=1;
       }
     if ($filename=~/\.html$/) {      if ($filename=~/\.html$/) {
  $html=1;   $html=1;
     }      }
Line 220  sub handler { Line 252  sub handler {
   &mt('An RSS Feed provided by the LON-CAPA Learning Content Management System').    &mt('An RSS Feed provided by the LON-CAPA Learning Content Management System').
   '</description>');    '</description>');
     }      }
 # Do we have stuff to store?  # This will be the entry id for new additions to the blog
     my $newid = &get_new_feed_id();      my $newid = &get_new_feed_id();
 # Is this user for real?  # Is this user for real?
     my $homeserver=&Apache::lonnet::homeserver($uname,$udom);      my $homeserver=&Apache::lonnet::homeserver($uname,$udom);
Line 265  sub handler { Line 297  sub handler {
 # Add a new feed  # Add a new feed
         if (($html) && ($edit)) {          if (($html) && ($edit)) {
     $r->print('<form method="post">');      $r->print('<form method="post">');
             $r->print(&mt('Name for New Blog').": <input type='text' size='40' name='namenewblog' />");              $r->print(&mt('Name for New Feed').": <input type='text' size='40' name='namenewblog' />");
     $r->print('<input type="submit" value="'.&mt('Start a New Blog').'" />');      $r->print('<input type="submit" value="'.&mt('Start a New Feed').'" />');
     $r->print('</form>');      $r->print('</form>');
  }   }
         if ($displayfeedname) { # this is an existing feed          if ($displayfeedname) { # this is an existing feed
 # Anything to store?  # Anything to store?
     if ($edit) {      if ($edit) {
   # check if this was called with a query string
    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['queryid']);
    if ($env{'form.queryid'}) {
   # yes, collect the remainder
       &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
       ['title',
        'description',
        'url',
        'status',
        'enclosureurl',
        'enclosuretype']);
   #    my ($id,$uname,$udom,$filename,$title,$description,$url,$status,$encurl,$enctype)=@_;
   
       &editentry($env{'form.queryid'},
          $uname,$udom,$filename,
          $env{'form.title'},
          $env{'form.description'},
          $env{'form.url'},
          $env{'form.status'},
          $env{'form.encurl'},
          $env{'form.enctype'}
          );
    }
  my %newsfeed=&Apache::lonnet::dump($feedname,$udom,$uname);   my %newsfeed=&Apache::lonnet::dump($feedname,$udom,$uname);
  foreach my $entry (sort(keys(%newsfeed)),$env{'form.newid'}.'_status') {   foreach my $entry (sort(keys(%newsfeed)),$env{'form.newid'}.'_status') {
     if ($entry=~/^(\d+)\_status$/) {      if ($entry=~/^(\d+)\_status$/) {
Line 281  sub handler { Line 336  sub handler {
        $env{'form.'.$id.'_title'},         $env{'form.'.$id.'_title'},
        $env{'form.'.$id.'_description'},         $env{'form.'.$id.'_description'},
        $env{'form.'.$id.'_url'},         $env{'form.'.$id.'_url'},
        $env{'form.'.$id.'_status'});         $env{'form.'.$id.'_status'},
          $env{'form.'.$id.'_enclosureurl'},
          $env{'form.'.$id.'_enclosuretype'},
          );
  }   }
     }      }
  }   }
Line 292  sub handler { Line 350  sub handler {
       &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"><br />'.        ($html?'</h3>'.($edit?'<form method="post"><br />'.
       &mt('Name of blog/journal').        &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>'));
 # Render private items?  # Render private items?

Removed from v.1.20  
changed lines
  Added in v.1.21


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