--- loncom/interface/lonbulletin.pm 2002/09/10 20:53:36 1.2 +++ loncom/interface/lonbulletin.pm 2003/09/15 13:38:19 1.13 @@ -1,7 +1,7 @@ # The LearningOnline Network -# Simple Page Editor +# Bulletin Board Handler # -# $Id: lonbulletin.pm,v 1.2 2002/09/10 20:53:36 www Exp $ +# $Id: lonbulletin.pm,v 1.13 2003/09/15 13:38:19 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,6 +33,7 @@ use Apache::Constants qw(:common); use Apache::loncommon; use Apache::lonnet; use Apache::lontexconvert; +use Apache::lonfeedback; sub handler { my $r = shift; @@ -45,12 +46,11 @@ sub handler { The LearningOnline Network with CAPA - ENDDOCUMENT 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'); + $r->print('Not in a course'); return OK; } @@ -70,9 +70,17 @@ ENDDOCUMENT 'bbb_content' => 'Task', 'ccc_webreferences' => 'Web References'); -# --------------------------------------------------------------- Force Student +# ------------------------------------------------------------ Get Query String &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'},['forcestudent']); + ($ENV{'QUERY_STRING'},['forcestudent','register']); +# ----------------------------------------------------- Force menu registration + my $addentries=''; + 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'; }; @@ -80,20 +88,23 @@ ENDDOCUMENT # --------------------------------------- There is such a user, get environment - $r->print(&Apache::loncommon::bodytag - ("Bulletin Board/Discussion",$forcestudent,'','',$dom)); + $r->print(''.&Apache::loncommon::bodytag + ("Bulletin Board/Discussion",$forcestudent,$addentries,'',$dom, + $ENV{'form.register'})); - my $allowed=&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}); + my $allowed=&Apache::lonnet::allowed('mdc',$ENV{'request.course.id'}); if ($forcestudent) { $allowed=0; } if ($allowed) { $r->print( - '

Show Public View

'); + '

'. +&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'
Show Student View'. + &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'

'); } if (($ENV{'form.uploaddoc.filename'}) && ($ENV{'form.storeupl'}) && ($allowed)) { - if ($ENV{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/) { + if ($ENV{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) { $syllabus{'uploaded.photourl'}= &Apache::lonnet::userfileupload('uploaddoc',1); } @@ -104,8 +115,7 @@ ENDDOCUMENT foreach (keys %syllabusfields) { my $field=$ENV{'form.'.$_}; $field=~s/\s+$//s; - $field=~s/\/\>\;/g; + $field=&Apache::lonfeedback::clear_out_html($field,1); $syllabus{$_}=$field; } $syllabus{'uploaded.lastmodified'}=time; @@ -132,7 +142,7 @@ ENDDOCUMENT my $message=$syllabus{$_}; $message=~s/\n/\
/g; $message - =~s/(http\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; + =~s/(https*\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; $message=&Apache::lontexconvert::msgtexconverted($message); unless ($_ eq 'aaa_title') { if (($_ ne 'bbb_content') || ($allowed)) { @@ -141,7 +151,7 @@ ENDDOCUMENT $r->print('
'. $message.'
'); if ($allowed) { - $r->print('
'); } @@ -163,8 +173,9 @@ ENDDOCUMENT } else { $r->print('

No page information provided.

'); } - $r->print(&Apache::lonxml::xmlend(1,'bulletin___'.$marker.'___'. - 'adm/wrapper'.$r->uri).''); + $r->print(&Apache::lonfeedback::list_discussion + (1,'bulletin___'.$marker.'___'. + 'adm/wrapper'.$r->uri).''); return OK; }