--- loncom/interface/lonsyllabus.pm 2004/07/27 23:35:34 1.38 +++ loncom/interface/lonsyllabus.pm 2005/11/17 21:33:40 1.42 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.38 2004/07/27 23:35:34 www Exp $ +# $Id: lonsyllabus.pm,v 1.42 2005/11/17 21:33:40 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -46,17 +46,21 @@ sub handler { return OK if $r->header_only; # ------------------------------------------------------------ Print the screen - my $target=$ENV{'form.grade_target'}; + my $target=$env{'form.grade_target'}; + my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri); + my $feedurl='feed://'.$ENV{'HTTP_HOST'}.'/public/'.$cdom.'/'.$cnum.'/Course_Announcements.rss'; if ($target ne 'tex') { + my $html=&Apache::lonxml::xmlbegin(); $r->print(< +$html The LearningOnline Network with CAPA + ENDDOCUMENT } else { - $r->print(&Apache::lonprintout::print_latex_header($ENV{'form.latex_type'})); + $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); } - my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri); + # Is this even a course? my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom); if ($homeserver eq 'no_host') { @@ -86,23 +90,23 @@ ENDDOCUMENT ($ENV{'QUERY_STRING'},['forcestudent','register','forceedit']); # ----------------------------------------------------- Force menu registration my $addentries=''; - if ($ENV{'form.register'}) { + if ($env{'form.register'}) { $addentries=' onLoad="'.&Apache::lonmenu::loadevents(). '" onUnload="'.&Apache::lonmenu::unloadevents().'"'; $r->print(&Apache::lonmenu::registerurl(1)); } # --------------------------------------------------------------- Force Student my $forcestudent=''; - if ($ENV{'form.forcestudent'}) { $forcestudent='student'; }; + if ($env{'form.forcestudent'}) { $forcestudent='student'; }; my $forceedit=''; - if ($ENV{'form.forceedit'}) { $forceedit='edit'; } + if ($env{'form.forceedit'}) { $forceedit='edit'; } # ------------------------------------- There is such a course, get environment my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum); if ($target ne 'tex') { $r->print(&Apache::lonhtmlcommon::htmlareaheaders(). ''.&Apache::loncommon::bodytag - ("Syllabus",$forcestudent,$addentries,'',$cdom,$ENV{'form.register'})); + ("Syllabus",$forcestudent,$addentries,'',$cdom,$env{'form.register'})); $r->print('

'.$courseenv{'description'}.'

'. $Apache::lonnet::domaindescription{$cdom}.'

'); } else { @@ -112,7 +116,9 @@ ENDDOCUMENT # -------------------------------------------------------------- Announcements? if ($target ne 'tex') { $r->print(&Apache::lonannounce::showday(time,2, - &Apache::lonannounce::readcalendar($cdom.'_'.$cnum))); + &Apache::lonannounce::readcalendar($cdom.'_'.$cnum)). + '

'.&mt('Course Announcement RSS Feed').': '. + ''.$feedurl.''); } else { $r->print(&Apache::lonxml::xmlparse($r,'tex', &Apache::lonannounce::showday(time,2, @@ -160,10 +166,10 @@ ENDDOCUMENT # This handler might be called anonymously ... # ----------------------------------------------------- Only if not public call - if ($ENV{'user.environment'}) { + if ($env{'user.environment'}) { # does this user have privileges to post, etc? - if ($ENV{'request.course.id'}) { - $allowed=&Apache::lonnet::allowed('mdc',$ENV{'request.course.id'}); + if ($env{'request.course.id'}) { + $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'}); $privileged=$allowed; if (($syllabus{'uploaded.lastmodified'}) && (!$forceedit)) { $forcestudent='student'; @@ -186,9 +192,9 @@ ENDDOCUMENT &mt('Edit').''); } } - if (($allowed) && ($ENV{'form.storesyl'})) { + if (($allowed) && ($env{'form.storesyl'})) { foreach (keys %syllabusfields) { - my $field=$ENV{'form.'.$_}; + my $field=$env{'form.'.$_}; chomp($field); $field=~s/\s+$//s; $field=~s/^\s+//s; @@ -223,8 +229,8 @@ ENDDOCUMENT $syllabus{$_}=$field; } } - $syllabus{'uploaded.domain'}=$ENV{'user.domain'}; - $syllabus{'uploaded.name'}=$ENV{'user.name'}; + $syllabus{'uploaded.domain'}=$env{'user.domain'}; + $syllabus{'uploaded.name'}=$env{'user.name'}; $syllabus{'uploaded.lastmodified'}=time; &Apache::lonnet::put('syllabus',\%syllabus,$cdom,$cnum); } @@ -284,7 +290,7 @@ ENDDOCUMENT $r->print($message); } } else { - $message=~s/\n/\
/g; + &Apache::lonfeedback::newline_to_br(\$message); $message =~s/(https*\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; if ($allowed) {