--- loncom/interface/lonbulletin.pm 2005/06/06 02:29:46 1.30 +++ loncom/interface/lonbulletin.pm 2006/04/10 19:59:53 1.35 @@ -1,7 +1,7 @@ # The LearningOnline Network # Bulletin Board Handler # -# $Id: lonbulletin.pm,v 1.30 2005/06/06 02:29:46 albertel Exp $ +# $Id: lonbulletin.pm,v 1.35 2006/04/10 19:59:53 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -44,27 +44,22 @@ sub handler { my $target=$env{'form.grade_target'}; # ------------------------------------------------------------ Print the screen - if ($target ne 'tex') { - my $html=&Apache::lonxml::xmlbegin(); - $r->print(< -The LearningOnline Network with CAPA -ENDDOCUMENT -} else { + if ($target eq 'tex') { $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); } my (undef,undef,undef,undef,$marker)=split(/\//,$r->uri); # Is this even in a course? - unless ($env{'request.course.id'}) { - $r->print('Not in a course'); + if (!$env{'request.course.id'}) { + &Apache::loncommon::simple_error_page($r,'Not in a course', + 'Not in a course'); return OK; } $marker=~s/\D//g; - unless ($marker) { - $r->print('Invalid call'); + if (!$marker) { + &Apache::loncommon::simple_error_page($r,'Invalid Call', + 'Invalid Call'); return OK; } @@ -81,16 +76,9 @@ ENDDOCUMENT &Apache::loncommon::get_unprocessed_cgi ($ENV{'QUERY_STRING'},['forcestudent','forceedit','register','origpage']); # ----------------------------------------------------- Force menu registration - my $addentries=''; - if ($env{'form.register'}) { - $addentries=' onLoad="'.&Apache::lonmenu::loadevents(); - if ($env{'form.origpage'}) { - $addentries .= "document.location='#newpost';"; - } - $addentries .= '" onUnload="'.&Apache::lonmenu::unloadevents().'"'; - $r->print(&Apache::lonmenu::registerurl(1)); - } elsif ($env{'form.origpage'}) { - $addentries = "onLoad=\"document.location='#newpost';\""; + my %addentries; + if ($env{'form.origpage'}) { + $addentries{'onload'} = "document.location='#newpost';"; } # --------------------------------------------------------------- Force Student my $forcestudent=''; @@ -102,10 +90,15 @@ ENDDOCUMENT my %syllabus=&Apache::lonnet::dump('bulletinpage_'.$marker,$dom,$crs); # --------------------------------------- There is such a user, get environment - if ($target ne 'tex') { - $r->print(''.&Apache::loncommon::bodytag - ("Bulletin Board/Discussion",$forcestudent,$addentries,'',$dom, - $env{'form.register'})); + if ($target ne 'tex') { + my $start_page = + &Apache::loncommon::start_page("Bulletin Board/Discussion",undef, + {'function' => $forcestudent, + 'add_entries' => \%addentries, + 'domain' => $dom, + 'force_register' => + $env{'form.register'}}); + $r->print($start_page); } my $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'}); @@ -172,10 +165,10 @@ ENDDOCUMENT &Apache::lonfeedback::newline_to_br(\$message); $message =~s/(https*\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; - $message=&Apache::lontexconvert::msgtexconverted($message); if ($allowed) { $message=&Apache::lonspeller::markeduptext($message); } + $message=&Apache::lontexconvert::msgtexconverted($message); unless ($_ eq 'aaa_title') { if (($_ ne 'bbb_content') || ($allowed)) { if ($target ne 'tex') { @@ -227,7 +220,11 @@ ENDDOCUMENT ('board','OPEN','bulletin___'.$marker.'___'. $r->uri))); } - if ($target ne 'tex') {$r->print('');} else {$r->print('\end{document}');} + if ($target ne 'tex') { + $r->print(&Apache::loncommon::end_page()); + } else { + $r->print('\end{document}'); + } return OK; }