--- loncom/interface/lonbulletin.pm 2004/08/18 21:15:19 1.24.2.1 +++ loncom/interface/lonbulletin.pm 2005/06/06 02:29:46 1.30 @@ -1,7 +1,7 @@ # The LearningOnline Network # Bulletin Board Handler # -# $Id: lonbulletin.pm,v 1.24.2.1 2004/08/18 21:15:19 albertel Exp $ +# $Id: lonbulletin.pm,v 1.30 2005/06/06 02:29:46 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -41,23 +41,22 @@ 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') { + 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,undef,undef,$marker)=split(/\//,$r->uri); # Is this even in a course? - unless ($ENV{'request.course.id'}) { + unless ($env{'request.course.id'}) { $r->print('Not in a course'); return OK; } @@ -69,8 +68,8 @@ ENDDOCUMENT 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,20 +79,25 @@ 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().'"'; + 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';\""; } # --------------------------------------------------------------- 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); @@ -101,9 +105,9 @@ ENDDOCUMENT if ($target ne 'tex') { $r->print(''.&Apache::loncommon::bodytag ("Bulletin Board/Discussion",$forcestudent,$addentries,'',$dom, - $ENV{'form.register'})); + $env{'form.register'})); } - 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)) { @@ -122,9 +126,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 +138,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 +169,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; $message=&Apache::lontexconvert::msgtexconverted($message); - unless ($_ eq 'aaa_title') { + if ($allowed) { + $message=&Apache::lonspeller::markeduptext($message); + } + unless ($_ eq 'aaa_title') { if (($_ ne 'bbb_content') || ($allowed)) { if ($target ne 'tex') { $r->print('

'.$syllabusfields{$_}.'

');