--- loncom/interface/lonbulletin.pm 2002/09/10 19:01:53 1.1 +++ loncom/interface/lonbulletin.pm 2003/02/10 16:22:28 1.5 @@ -1,7 +1,7 @@ # The LearningOnline Network -# Bulletin Board +# Bulletin Board Handler # -# $Id: lonbulletin.pm,v 1.1 2002/09/10 19:01:53 www Exp $ +# $Id: lonbulletin.pm,v 1.5 2003/02/10 16:22:28 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::lonxml; sub handler { my $r = shift; @@ -47,7 +48,7 @@ sub handler { The LearningOnline Network with CAPA ENDDOCUMENT - my (undef,undef,$marker)=split(/\//,$r->uri); + 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'); @@ -66,8 +67,8 @@ ENDDOCUMENT # --------------------------------------------------------- The syllabus fields my %syllabusfields=( - 'aaa_title' => 'Page Title', - 'bbb_content' => 'Content', + 'aaa_title' => 'Topic', + 'bbb_content' => 'Task', 'ccc_webreferences' => 'Web References'); # --------------------------------------------------------------- Force Student @@ -81,7 +82,7 @@ ENDDOCUMENT # --------------------------------------- There is such a user, get environment $r->print(&Apache::loncommon::bodytag - ("Bulletin Board ".$syllabus{'aaa_title'},$forcestudent,'','',$dom)); + ("Bulletin Board/Discussion",$forcestudent,'','',$dom)); my $allowed=&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}); @@ -89,7 +90,8 @@ ENDDOCUMENT if ($allowed) { $r->print( - '

Show Public View

'); + '

Show Public View'. + &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'

'); } if (($ENV{'form.uploaddoc.filename'}) && ($ENV{'form.storeupl'}) && ($allowed)) { @@ -104,8 +106,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; @@ -134,13 +135,26 @@ ENDDOCUMENT $message =~s/(http\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; $message=&Apache::lontexconvert::msgtexconverted($message); - $r->print('

'.$syllabusfields{$_}.'

'. + unless ($_ eq 'aaa_title') { + if (($_ ne 'bbb_content') || ($allowed)) { + $r->print('

'.$syllabusfields{$_}.'

'); + } + $r->print('
'. $message.'
'); - if ($allowed) { - $r->print('
'); - } + } + } else { + $r->print('

'.$message.'

'); + if ($allowed) { + $r->print( + '
Topic
'); + } + } } } if ($allowed) { @@ -150,7 +164,8 @@ ENDDOCUMENT } else { $r->print('

No page information provided.

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