--- loncom/interface/lonbulletin.pm 2004/05/10 18:44:40 1.24 +++ 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.24 2004/05/10 18:44:40 sakharuk Exp $ +# $Id: lonbulletin.pm,v 1.35 2006/04/10 19:59:53 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -41,36 +41,30 @@ sub handler { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK if $r->header_only; - my $target=$ENV{'form.grade_target'}; + my $target=$env{'form.grade_target'}; - -# &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['previous']); # ------------------------------------------------------------ Print the screen - if ($target ne 'tex') { - $r->print(< - -The LearningOnline Network with CAPA -ENDDOCUMENT -} else { - $r->print(&Apache::lonprintout::print_latex_header($ENV{'form.latex_type'})); + 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; } - my $dom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; - my $crs = $ENV{'course.'.$ENV{'request.course.id'}.'.num'}; + my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + my $crs = $env{'course.'.$env{'request.course.id'}.'.num'}; # --------------------------------------------------------- The syllabus fields my %syllabusfields=&Apache::lonlocal::texthash( @@ -80,36 +74,39 @@ ENDDOCUMENT # ------------------------------------------------------------ Get Query String &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'},['forcestudent','forceedit','register']); + ($ENV{'QUERY_STRING'},['forcestudent','forceedit','register','origpage']); # ----------------------------------------------------- Force menu registration - my $addentries=''; - if ($ENV{'form.register'}) { - $addentries=' onLoad="'.&Apache::lonmenu::loadevents(). - '" onUnload="'.&Apache::lonmenu::unloadevents().'"'; - $r->print(&Apache::lonmenu::registerurl(1)); + my %addentries; + if ($env{'form.origpage'}) { + $addentries{'onload'} = "document.location='#newpost';"; } # --------------------------------------------------------------- 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'; } 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'}); + my $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'}); my $privileged=$allowed; if (($syllabus{'uploaded.lastmodified'}) && (!$forceedit)) { $forcestudent='student'; } - + if ($target ne 'tex') { $r->print('
'); } if ($forcestudent or $target eq 'tex') { $allowed=0; } if ($allowed) { @@ -122,9 +119,9 @@ ENDDOCUMENT .&mt('Edit').''); } - if (($ENV{'form.uploaddoc.filename'}) && - ($ENV{'form.storeupl'}) && ($allowed)) { - if ($ENV{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) { + if (($env{'form.uploaddoc.filename'}) && + ($env{'form.storeupl'}) && ($allowed)) { + if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) { if ($syllabus{'uploaded.photourl'}) { &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'}); } @@ -134,9 +131,9 @@ ENDDOCUMENT $syllabus{'uploaded.lastmodified'}=time; &Apache::lonnet::put('bulletinpage_'.$marker,\%syllabus,$dom,$crs); } - if (($allowed) && ($ENV{'form.storesyl'})) { + if (($allowed) && ($env{'form.storesyl'})) { foreach (keys %syllabusfields) { - my $field=$ENV{'form.'.$_}; + my $field=$env{'form.'.$_}; $field=~s/\s+$//s; $field=&Apache::lonfeedback::clear_out_html($field,1); $syllabus{$_}=$field; @@ -165,11 +162,14 @@ ENDDOCUMENT foreach (sort keys %syllabusfields) { if (($syllabus{$_}) || ($allowed)) { my $message=$syllabus{$_}; - $message=~s/\n/\
/g; - $message + &Apache::lonfeedback::newline_to_br(\$message); + $message =~s/(https*\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; + if ($allowed) { + $message=&Apache::lonspeller::markeduptext($message); + } $message=&Apache::lontexconvert::msgtexconverted($message); - unless ($_ eq 'aaa_title') { + unless ($_ eq 'aaa_title') { if (($_ ne 'bbb_content') || ($allowed)) { if ($target ne 'tex') { $r->print('

'.$syllabusfields{$_}.'

'); @@ -210,6 +210,7 @@ ENDDOCUMENT } else { $r->print('

'.&mt('No page information provided.').'

'); } + if ($target ne 'tex') { $r->print('
'); } if ($target ne 'tex') { $r->print(&Apache::lonfeedback::list_discussion ('board','OPEN','bulletin___'.$marker.'___'. @@ -219,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; }