--- loncom/interface/lonbulletin.pm 2009/02/02 14:31:58 1.47 +++ loncom/interface/lonbulletin.pm 2009/12/08 13:33:12 1.55 @@ -1,7 +1,7 @@ # The LearningOnline Network # Bulletin Board Handler # -# $Id: lonbulletin.pm,v 1.47 2009/02/02 14:31:58 schafran Exp $ +# $Id: lonbulletin.pm,v 1.55 2009/12/08 13:33:12 wenzelju Exp $ # # Copyright Michigan State University Board of Trustees # @@ -48,21 +48,21 @@ sub handler { # ------------------------------------------------------------ Print the screen if ($target eq 'tex') { - $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); + $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); } my (undef,undef,undef,undef,$marker)=split(/\//,$r->uri); # Is this even in a course? if (!$env{'request.course.id'}) { - &Apache::loncommon::simple_error_page($r,'Not in a course', - 'Not in a course'); + &Apache::loncommon::simple_error_page($r,'Not in a course', + 'Not in a course'); return OK; } $marker=~s/\D//g; if (!$marker) { - &Apache::loncommon::simple_error_page($r,'Invalid Call', - 'Invalid Call'); + &Apache::loncommon::simple_error_page($r,'Invalid Call', + 'Invalid Call'); return OK; } @@ -83,7 +83,7 @@ sub handler { # ----------------------------------------------------- Force menu registration my %addentries; if ($env{'form.origpage'}) { - $addentries{'onload'} = "document.location='#newpost';"; + $addentries{'onload'} = "document.location='#newpost';"; } # --------------------------------------------------------------- Force Student my $forcestudent=''; @@ -122,23 +122,23 @@ sub handler { } } } - + # --------------------------------------- There is such a user, get environment - if ($target ne 'tex') { - my $course_or_group; - 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); + if ($target ne 'tex') { + my $course_or_group; + 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); if ($group ne '' && $env{'form.group'} eq $group) { my $gpterm = &Apache::loncommon::group_term(); my $ucgpterm = $gpterm; @@ -164,9 +164,9 @@ sub handler { if (!$allowed) { 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))) { + '/'.$group))) { &print_end_page($r,$target); - return OK; + return OK; } } } else { @@ -175,137 +175,144 @@ sub handler { my $privileged=$allowed; if (($syllabus{'uploaded.lastmodified'}) && (!$forceedit)) { - $forcestudent='student'; + $forcestudent='student'; } - if ($target ne 'tex') { $r->print('
'); } - 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; - } - $r->print( - '

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

'); - } elsif ($privileged and $target ne 'tex') { - my $query_str = 'forceedit=edit'; - if (($group ne '') && ($env{'form.group'} eq $group)) { - $query_str.='&group='.$group.'&'.$refarg; - } - $r->print('' - .&mt('Edit').''); - } - - if (($env{'form.uploaddoc.filename'}) && - ($env{'form.storeupl'}) && ($allowed)) { - if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) { - if ($syllabus{'uploaded.photourl'}) { - &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'}); - } - if ($group ne '') { - $syllabus{'uploaded.photourl'}= - &Apache::lonnet::userfileupload('uploaddoc',1, - 'bulletin/'.$group.'/'.$marker); - } else { - $syllabus{'uploaded.photourl'}= - &Apache::lonnet::userfileupload('uploaddoc',1, + 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) { + if ($syllabus{'uploaded.photourl'}) { + &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'}); + } + 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 my $syl_field (keys(%syllabusfields)) { - my $field=$env{'form.'.$syl_field}; - $field=~s/\s+$//s; - $field=&Apache::lonfeedback::clear_out_html($field,1); - $syllabus{$syl_field}=$field; - } - $syllabus{'uploaded.lastmodified'}=time; - &Apache::lonnet::put('bulletinpage_'.$marker,\%syllabus,$dom,$crs); - } + } + } + $syllabus{'uploaded.lastmodified'}=time; + &Apache::lonnet::put('bulletinpage_'.$marker,\%syllabus,$dom,$crs); + } + 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); + $syllabus{$syl_field}=$field; + } + $syllabus{'uploaded.lastmodified'}=time; + &Apache::lonnet::put('bulletinpage_'.$marker,\%syllabus,$dom,$crs); + } -# ---------------------------------------------------------------- Get syllabus +# ---------------------------------------------------------------- Get discussion board if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { - if ($syllabus{'uploaded.photourl'}) { - &Apache::lonnet::allowuploaded('/adm/syllabus', - $syllabus{'uploaded.photourl'}); - $r->print(''); - } - if ($allowed) { - $r->print( - '
'. - ''. - '

'.&mt('Upload a Photo').'

'. - ''. - ''. - '
'. - ''); - } - 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; - if ($allowed) { - $message=&Apache::lonspeller::markeduptext($message); - } - $message=&Apache::lontexconvert::msgtexconverted($message); - unless ($field eq 'aaa_title') { - if (($field ne 'bbb_content') || ($allowed)) { - if ($target ne 'tex') { - $r->print('

'.$syllabusfields{$field}.'

'); - } else { - $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'); - } - } - if ($target ne 'tex') { - $r->print('
'. - $message.'
'); - } else { - $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$message).' '); - } - if ($allowed) { - $r->print('
'); - } - } else { - if ($target ne 'tex') { - $r->print('

'.$message.'

'); - } else { - $r->print('\\\\\textbf{'.&Apache::lonxml::xmlparse($r,'tex',$message).'}\\\\'); - } + if ($syllabus{'uploaded.photourl'}) { + &Apache::lonnet::allowuploaded('/adm/syllabus', + $syllabus{'uploaded.photourl'}); + } + #Outputbox and Inputbox for Image upload + if ($allowed) { + &Apache::lontemplate::print_template($r, &mt('Upload a Photo'), ''.&mt('Image').'',$allowed,'LC_Box'); + $r->print( + ''. + ''. + ''. + ''. + '
'. + ''); + } + #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); + } + $message=&Apache::lonhtmlcommon::raw_href_to_link($message); if ($allowed) { - $r->print( - '
'.&mt('Topic').'
'); + $message=&Apache::lonspeller::markeduptext($message); + } + $message=&Apache::lontexconvert::msgtexconverted($message); + unless ($field eq 'aaa_title') { + #Outputbox + if ($target ne 'tex') { + &Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message,$allowed,'LC_Box'); + } else { + $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.&Apache::lonxml::xmlparse($r,'tex',$message)); + } + #Inputbox + if ($allowed) { + &Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field); + } + } else { + #Print Topic as Heading + if ($target ne 'tex') { + $r->print('

'.$message.'

'); + } else { + $r->print('\\\\\textbf{'.&Apache::lonxml::xmlparse($r,'tex',$message).'}\\\\'); + } + #Outputbox and Inputbox for Topic + if ($allowed) { + &Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message,$allowed,'LC_Box'); + &Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field); + } } } - } - } - if ($allowed) { - $r->print('
'); - } - if ($target ne 'tex') {$r->print('

');} else {$r->print('\\\\');} + } + if ($allowed) { + $r->print(''); + } + if ($target ne 'tex'){ + $r->print('


'); + } + else { + $r->print(&Apache::lonxml::xmlparse($r,'tex','


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

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

'); + $r->print('

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

'); } - if ($target ne 'tex') { $r->print('
'); } + #Lists discussion posts and box for a new discussion post. if ($target ne 'tex') { - $r->print(&Apache::lonfeedback::list_discussion - ('board','OPEN','bulletin___'.$marker.'___'. - $r->uri,undef,$group)); + $r->print(&Apache::lonfeedback::list_discussion + ('board','OPEN','bulletin___'.$marker.'___'. + $r->uri,undef,$group)); } else { - $r->print('\\\\'.&Apache::lonxml::xmlparse($r,'tex',&Apache::lonfeedback::list_discussion - ('board','OPEN','bulletin___'.$marker.'___'. - $r->uri,undef,$group))); + $r->print('\\\\'.&Apache::lonxml::xmlparse($r,'tex',&Apache::lonfeedback::list_discussion + ('board','OPEN','bulletin___'.$marker.'___'. + $r->uri,undef,$group))); } &print_end_page($r,$target); return OK;