--- loncom/interface/lonbulletin.pm 2002/09/11 13:36:50 1.3 +++ loncom/interface/lonbulletin.pm 2003/09/29 16:09:20 1.17 @@ -1,7 +1,7 @@ # The LearningOnline Network -# Simple Page Editor +# Bulletin Board Handler # -# $Id: lonbulletin.pm,v 1.3 2002/09/11 13:36:50 www Exp $ +# $Id: lonbulletin.pm,v 1.17 2003/09/29 16:09:20 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,11 +33,12 @@ use Apache::Constants qw(:common); use Apache::loncommon; use Apache::lonnet; use Apache::lontexconvert; -use Apache::lonxml; +use Apache::lonfeedback; +use Apache::lonlocal; sub handler { my $r = shift; - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK if $r->header_only; @@ -46,12 +47,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; } @@ -66,14 +66,22 @@ ENDDOCUMENT my $crs = $ENV{'course.'.$ENV{'request.course.id'}.'.num'}; # --------------------------------------------------------- The syllabus fields - my %syllabusfields=( + my %syllabusfields=&Apache::lonlocal::texthash( 'aaa_title' => 'Topic', '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'; }; @@ -81,20 +89,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); } @@ -105,8 +116,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; @@ -133,7 +143,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)) { @@ -164,8 +174,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 + ('board','OPEN','bulletin___'.$marker.'___'. + 'adm/wrapper'.$r->uri).''); return OK; }