--- loncom/interface/lonbulletin.pm 2006/07/08 01:23:13 1.36 +++ loncom/interface/lonbulletin.pm 2007/07/03 00:12:30 1.44 @@ -1,7 +1,7 @@ # The LearningOnline Network # Bulletin Board Handler # -# $Id: lonbulletin.pm,v 1.36 2006/07/08 01:23:13 raeburn Exp $ +# $Id: lonbulletin.pm,v 1.44 2007/07/03 00:12:30 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,6 +36,7 @@ use Apache::lontexconvert; use Apache::lonfeedback; use Apache::lonlocal; use Apache::lonhtmlcommon; +use HTML::Entities(); use LONCAPA; sub handler { @@ -78,7 +79,7 @@ sub handler { # ------------------------------------------------------------ Get Query String &Apache::loncommon::get_unprocessed_cgi ($ENV{'QUERY_STRING'},['forcestudent','forceedit','register', - 'origpage','group']); + 'origpage','group','ref']); # ----------------------------------------------------- Force menu registration my %addentries; if ($env{'form.origpage'}) { @@ -90,6 +91,8 @@ sub handler { my $forceedit=''; if ($env{'form.forceedit'}) { $forceedit='edit'; } + my $refarg = ''; + if (exists($env{'form.ref'})) { $refarg = 'ref='.$env{'form.ref'}; } my %syllabus=&Apache::lonnet::dump('bulletinpage_'.$marker,$dom,$crs); @@ -134,23 +137,26 @@ sub handler { my $gpterm = &Apache::loncommon::group_term(); my $ucgpterm = $gpterm; $ucgpterm =~ s/^(\w)/uc($1)/e; - my ($groupboards,$boards) = &Apache::longroup::get_group_bbinfo( - $dom,$crs,$group); - my $boardtitle = $$boards{$marker}{'title'}; + my ($groupboards,$boards) = + &Apache::longroup::get_group_bbinfo($dom,$crs,$group,$boardurl); + my $boardtitle; + if ((ref($groupboards) eq 'ARRAY') && (@{$groupboards} > 0)) { + $boardtitle = $$boards{$$groupboards[0]}{'title'}; + } $boardurl .= '?register=1&group='.$group; - $r->print(&groupboard_breadcrumbs($dom,$crs,$group,$gpterm, + $r->print(&groupboard_breadcrumbs($dom,$crs,$group,$refarg,$gpterm, $ucgpterm,$grp_desc,$boardurl,$boardtitle)); } } my ($allowed); if ($group ne '') { - $allowed=&Apache::lonnet::allowed('mdg',$env{'request.course.id'}); + $allowed=&Apache::lonnet::allowed('mdg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')); if (!$allowed) { $allowed = &Apache::lonnet::allowed('cgb',$env{'request.course.id'}. '/'.$group); } if (!$allowed) { - if ((!&Apache::lonnet::allowed('vcg',$env{'request.course.id'})) && + if ((!&Apache::lonnet::allowed('vcg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) && (!&Apache::lonnet::allowed('vgb',$env{'request.course.id'}. '/'.$group))) { &print_end_page($r,$target); @@ -171,7 +177,7 @@ sub handler { if ($allowed) { my $query_str = 'forcestudent=1'; if (($group ne '') && ($env{'form.group'} eq $group)) { - $query_str.='&group='.$group; + $query_str.='&group='.$group.'&'.$refarg; } $r->print( '

'. @@ -180,7 +186,7 @@ sub handler { } elsif ($privileged and $target ne 'tex') { my $query_str = 'forceedit=edit'; if (($group ne '') && ($env{'form.group'} eq $group)) { - $query_str.='&group='.$group; + $query_str.='&group='.$group.'&'.$refarg; } $r->print('' .&mt('Edit').''); @@ -192,18 +198,25 @@ sub handler { if ($syllabus{'uploaded.photourl'}) { &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'}); } - $syllabus{'uploaded.photourl'}= - &Apache::lonnet::userfileupload('uploaddoc',1,'bulletin'); + if ($group ne '') { + $syllabus{'uploaded.photourl'}= + &Apache::lonnet::userfileupload('uploaddoc',1, + 'bulletin/'.$group.'/'.$marker); + } else { + $syllabus{'uploaded.photourl'}= + &Apache::lonnet::userfileupload('uploaddoc',1, + 'bulletin/'.$marker); + } } $syllabus{'uploaded.lastmodified'}=time; &Apache::lonnet::put('bulletinpage_'.$marker,\%syllabus,$dom,$crs); } if (($allowed) && ($env{'form.storesyl'})) { - foreach (keys %syllabusfields) { - my $field=$env{'form.'.$_}; + foreach my $syl_field (keys(%syllabusfields)) { + my $field=$env{'form.'.$syl_field}; $field=~s/\s+$//s; $field=&Apache::lonfeedback::clear_out_html($field,1); - $syllabus{$_}=$field; + $syllabus{$syl_field}=$field; } $syllabus{'uploaded.lastmodified'}=time; &Apache::lonnet::put('bulletinpage_'.$marker,\%syllabus,$dom,$crs); @@ -226,9 +239,9 @@ sub handler { ''. '

'); } - foreach (sort keys %syllabusfields) { - if (($syllabus{$_}) || ($allowed)) { - my $message=$syllabus{$_}; + foreach my $field (sort(keys(%syllabusfields))) { + if (($syllabus{$field}) || ($allowed)) { + my $message=$syllabus{$field}; &Apache::lonfeedback::newline_to_br(\$message); $message =~s/(https*\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; @@ -236,12 +249,12 @@ sub handler { $message=&Apache::lonspeller::markeduptext($message); } $message=&Apache::lontexconvert::msgtexconverted($message); - unless ($_ eq 'aaa_title') { - if (($_ ne 'bbb_content') || ($allowed)) { + unless ($field eq 'aaa_title') { + if (($field ne 'bbb_content') || ($allowed)) { if ($target ne 'tex') { - $r->print('

'.$syllabusfields{$_}.'

'); + $r->print('

'.$syllabusfields{$field}.'

'); } else { - $r->print('\\\\\textbf{'.$syllabusfields{$_}.'}\\\\'); + $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'); } } if ($target ne 'tex') { @@ -251,9 +264,9 @@ sub handler { $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$message).' '); } if ($allowed) { - $r->print('
'); + $r->print('
'); } } else { if ($target ne 'tex') { @@ -263,9 +276,9 @@ sub handler { } if ($allowed) { $r->print( - '
'.&mt('Topic').'
'); + '
'.&mt('Topic').'
'); } } } @@ -281,11 +294,11 @@ sub handler { if ($target ne 'tex') { $r->print(&Apache::lonfeedback::list_discussion ('board','OPEN','bulletin___'.$marker.'___'. - $r->uri)); + $r->uri,undef,$group)); } else { $r->print('\\\\'.&Apache::lonxml::xmlparse($r,'tex',&Apache::lonfeedback::list_discussion ('board','OPEN','bulletin___'.$marker.'___'. - $r->uri))); + $r->uri,undef,$group))); } &print_end_page($r,$target); return OK; @@ -301,13 +314,20 @@ sub print_end_page { } sub groupboard_breadcrumbs { - my ($cdom,$cnum,$group,$gpterm,$ucgpterm,$description,$boardurl,$boardtitle)= @_; + my ($cdom,$cnum,$group,$refarg,$gpterm,$ucgpterm,$description,$boardurl, + $boardtitle)= @_; &Apache::lonhtmlcommon::clear_breadcrumbs(); + if ($refarg ne '') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/coursegroups", + text=>"Groups", + title=>"View course groups"}); + } &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"/adm/$cdom/$cnum/$group/smppg", + ({href=>"/adm/$cdom/$cnum/$group/smppg?$refarg", text=>"$ucgpterm: $description", title=>"Go to group's home page"}, - {href=>"/adm/groupboards?group=$group", + {href=>"/adm/groupboards?group=$group&$refarg", text=>"Discussion Boards", title=>"Display group discussion boards"}, {href=>"$boardurl",