--- loncom/interface/lonbulletin.pm 2006/03/21 20:31:08 1.32 +++ 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.32 2006/03/21 20:31:08 albertel Exp $ +# $Id: lonbulletin.pm,v 1.35 2006/04/10 19:59:53 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -50,18 +50,16 @@ sub handler { my (undef,undef,undef,undef,$marker)=split(/\//,$r->uri); # Is this even in a course? if (!$env{'request.course.id'}) { - $r->print(&Apache::loncommon::start_page('Not in a course'). - &mt('Not in a course'). - &Apache::loncommon::end_page()); + &Apache::loncommon::simple_error_page($r,'Not in a course', + 'Not in a course'); return OK; } $marker=~s/\D//g; if (!$marker) { - $r->print(&Apache::loncommon::start_page('Invalid Call'). - &mt('Invalid Call'). - &Apache::loncommon::end_page()); + &Apache::loncommon::simple_error_page($r,'Invalid Call', + 'Invalid Call'); return OK; } @@ -78,16 +76,9 @@ sub handler { &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=''; @@ -103,8 +94,8 @@ sub handler { my $start_page = &Apache::loncommon::start_page("Bulletin Board/Discussion",undef, {'function' => $forcestudent, - 'add_entries' => $addentries, - 'domain' => $domain, + 'add_entries' => \%addentries, + 'domain' => $dom, 'force_register' => $env{'form.register'}}); $r->print($start_page);