--- loncom/interface/lonbulletin.pm 2009/12/22 06:32:04 1.57 +++ loncom/interface/lonbulletin.pm 2013/09/17 15:04:30 1.67 @@ -1,7 +1,7 @@ # The LearningOnline Network # Bulletin Board Handler # -# $Id: lonbulletin.pm,v 1.57 2009/12/22 06:32:04 faziophi Exp $ +# $Id: lonbulletin.pm,v 1.67 2013/09/17 15:04:30 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,7 +33,8 @@ use Apache::Constants qw(:common); use Apache::loncommon; use Apache::lonnet; use Apache::lontexconvert; -use Apache::lonfeedback; +use Apache::lonfeedback; +use Apache::lonhtmlgateway; use Apache::lonlocal; use Apache::lonhtmlcommon; use HTML::Entities(); @@ -78,7 +79,7 @@ sub handler { # ------------------------------------------------------------ Get Query String &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'},['forcestudent','forceedit','register', + ($ENV{'QUERY_STRING'},['forceedit','register','todocs', 'origpage','group','ref']); # ----------------------------------------------------- Force menu registration my %addentries; @@ -86,11 +87,11 @@ sub handler { $addentries{'onload'} = "document.location='#newpost';"; } # --------------------------------------------------------------- Force Student - my $forcestudent=''; - if ($env{'form.forcestudent'}) { $forcestudent='student'; } - - my $forceedit=''; - if ($env{'form.forceedit'}) { $forceedit='edit'; } + my ($forceedit,$forcestudent); + $forceedit = $env{'form.forceedit'}; + if (!$forceedit) { + $forcestudent=1; + } my $refarg = ''; if (exists($env{'form.ref'})) { $refarg = 'ref='.$env{'form.ref'}; } @@ -125,21 +126,17 @@ sub handler { # --------------------------------------- There is such a user, get environment if ($target ne 'tex') { - my $course_or_group; + my ($course_or_group,$brcrum); if($group eq '') { $course_or_group="Course"; } else { $course_or_group="Group"; } - my $start_page = - &Apache::loncommon::start_page("$course_or_group Discussion Board",undef, - {'function' => $forcestudent, - 'add_entries' => \%addentries, - 'domain' => $dom, - 'force_register' => - $env{'form.register'}}); - $r->print($start_page); + my $registered; if ($group ne '' && $env{'form.group'} eq $group) { + unless ($env{'form.ref'} eq 'grouplist') { + $registered = $env{'form.register'}; + } my $gpterm = &Apache::loncommon::group_term(); my $ucgpterm = $gpterm; $ucgpterm =~ s/^(\w)/uc($1)/e; @@ -149,10 +146,28 @@ sub handler { if ((ref($groupboards) eq 'ARRAY') && (@{$groupboards} > 0)) { $boardtitle = $$boards{$$groupboards[0]}{'title'}; } - $boardurl .= '?register=1&group='.$group; - $r->print(&groupboard_breadcrumbs($dom,$crs,$group,$refarg,$gpterm, - $ucgpterm,$grp_desc,$boardurl,$boardtitle)); + $boardurl .= '?group='.$group; + if ($registered) { + $boardurl .= '&register='.$env{'form.register'}; + } else { + $brcrum = + &groupboard_breadcrumbs($dom,$crs,$group,$refarg,$gpterm, + $ucgpterm,$grp_desc,$boardurl, + $boardtitle); + } + } else { + $registered = $env{'form.register'}; + $brcrum = []; } + my $start_page = + &Apache::loncommon::start_page("$course_or_group Discussion Board",undef, + {'add_entries' => \%addentries, + 'domain' => $dom, + 'bread_crumbs' => $brcrum, + 'group' => $group, + 'force_register' => $registered} + ); + $r->print($start_page); } my ($allowed); if ($group ne '') { @@ -173,37 +188,8 @@ sub handler { $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'}); } - my $privileged=$allowed; - if (($syllabus{'uploaded.lastmodified'}) && (!$forceedit)) { - $forcestudent='student'; - } if ($forcestudent or $target eq 'tex') { $allowed=0; } - if ($allowed) { - my $query_str = 'forcestudent=1'; - if (($group ne '') && ($env{'form.group'} eq $group)) { - $query_str.='&group='.$group.'&'.$refarg; - } - #Function Box for Edit Mode. - my $functionbox = &Apache::lonhtmlcommon::start_funclist(); - $functionbox .= &Apache::lonhtmlcommon::add_item_funclist( - ''.&mt('Show Student View').''. - &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView')); - $functionbox.=&Apache::lonhtmlcommon::end_funclist(); - $r->print(&Apache::loncommon::head_subbox($functionbox).&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes'))); - } elsif ($privileged and $target ne 'tex') { - my $query_str = 'forceedit=edit'; - if (($group ne '') && ($env{'form.group'} eq $group)) { - $query_str.='&group='.$group.'&'.$refarg; - } - #Functionbox for Student view. - my $functionbox = &Apache::lonhtmlcommon::start_funclist(); - $functionbox .= &Apache::lonhtmlcommon::add_item_funclist( - "".&mt('Edit').""); - $functionbox.=&Apache::lonhtmlcommon::end_funclist(); - $r->print(&Apache::loncommon::head_subbox($functionbox)); - } - if (($env{'form.uploaddoc.filename'}) && ($env{'form.storeupl'}) && ($allowed)) { if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) { @@ -212,11 +198,11 @@ sub handler { } if ($group ne '') { $syllabus{'uploaded.photourl'}= - &Apache::lonnet::userfileupload('uploaddoc',1, + &Apache::lonnet::userfileupload('uploaddoc','coursedoc', 'bulletin/'.$group.'/'.$marker); } else { $syllabus{'uploaded.photourl'}= - &Apache::lonnet::userfileupload('uploaddoc',1, + &Apache::lonnet::userfileupload('uploaddoc','coursedoc', 'bulletin/'.$marker); } } @@ -226,8 +212,9 @@ sub handler { if (($allowed) && ($env{'form.storesyl'})) { foreach my $syl_field (keys(%syllabusfields)) { my $field=$env{'form.'.$syl_field}; - $field=~s/\s+$//s; - $field=&Apache::lonfeedback::clear_out_html($field,1); + chomp($field); + my $gateway = Apache::lonhtmlgateway->new(); + $field = $gateway->process_incoming_html($field,1); $syllabus{$syl_field}=$field; } $syllabus{'uploaded.lastmodified'}=time; @@ -259,7 +246,6 @@ sub handler { &Apache::lonnet::allowuploaded('/adm/syllabus', $syllabus{'uploaded.photourl'}); } - my @htmlids=(); #Outputbox and Inputbox for Image upload if ($allowed) { my $message = ''.&mt('Image').''; @@ -267,52 +253,21 @@ sub handler { $r->print($message); $r->print("

"); $r->print( - ''. + ''. ''. - ''. - ''); + ''); &Apache::lontemplate::print_end_template($r); } #Image in Student view. elsif($syllabus{'uploaded.photourl'} && $target ne 'tex'){ $r->print(''.&mt('Image').''); } - foreach my $field (sort(keys(%syllabusfields))) { - if (($syllabus{$field}) || ($allowed)) { - my $message=$syllabus{$field}; - if (!&Apache::lonfeedback::contains_block_html($message)) { - &Apache::lonfeedback::newline_to_br(\$message); - } else { - $message = &Apache::lonfeedback::tidy_html($message); - } - $message=&Apache::lonhtmlcommon::raw_href_to_link($message); - if ($allowed) { - $message=&Apache::lonspeller::markeduptext($message); - } - $message=&Apache::lontexconvert::msgtexconverted($message); - unless ($field eq 'aaa_title') { - if ($target ne 'tex') { - #output of syllabusfields will be generated here. - &Apache::lontemplate::print_start_template($r,$syllabusfields{$field},'LC_Box'); - $r->print($message); - if ($allowed) { - $r->print("
"); - &Apache::lontemplate::print_textarea_template($r, $syllabus{$field}, - $field, Apache::lontemplate->RICH_TEXT_DETECT_HTML); - &Apache::lontemplate::print_saveall_template($r); - $r->print("
"); - } - &Apache::lontemplate::print_end_template($r); - push(@htmlids,$field); - } else { - $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.&Apache::lonxml::xmlparse($r,'tex',$message)); - } - } - } - } + + my %custom_handlers = ( 'aaa_title' => sub {} ); + &Apache::lontemplate::print_template_fields($r, \%syllabus, \%syllabusfields, + $target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML, \%custom_handlers); if ($allowed) { - $r->print(''. - &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids)); + $r->print(''); } if ($target ne 'tex'){ $r->print('


'); @@ -321,7 +276,9 @@ sub handler { $r->print(&Apache::lonxml::xmlparse($r,'tex','


')); } } else { - $r->print('

'.&mt('No page information provided.').'

'); + if ($target ne 'tex') { + $r->print('

'.&mt('No page information provided.').'

'); + } } #Lists discussion posts and box for a new discussion post. if ($target ne 'tex') { @@ -350,25 +307,25 @@ sub groupboard_breadcrumbs { my ($cdom,$cnum,$group,$refarg,$gpterm,$ucgpterm,$description,$boardurl, $boardtitle)= @_; &Apache::lonhtmlcommon::clear_breadcrumbs(); + my $brcrum = []; 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?$refarg", - text=>"$ucgpterm: $description", - title=>"Go to group's home page"}, - {href=>"/adm/groupboards?group=$group&$refarg", - text=>"Discussion Boards", - title=>"Display group discussion boards"}, - {href=>"$boardurl", - text=>"$boardtitle", - title=>"$boardtitle"}, + push(@{$brcrum}, + {href=>"/adm/coursegroups", + text=>"Groups", + title=>"View course groups"}); + } + push(@{$brcrum}, + {href=>"/adm/$cdom/$cnum/$group/smppg?$refarg", + text=>"$ucgpterm: $description", + title=>"Go to group's home page"}, + {href=>"/adm/groupboards?group=$group&$refarg", + text=>"Discussion Boards", + title=>"Display group discussion boards"}, + {href=>"$boardurl", + text=>"$boardtitle", + title=>"$boardtitle"}, ); - my $output .= &Apache::lonhtmlcommon::breadcrumbs(&mt('[_1] discussion boards - [_2]',$gpterm,$description)); - return $output; + return $brcrum; } 1;