--- loncom/interface/lontemplate.pm 2013/05/10 23:48:12 1.45.6.4 +++ loncom/interface/lontemplate.pm 2025/01/28 19:49:20 1.52 @@ -1,7 +1,7 @@ # The LearningOnline Network # "Template" Functions to generate html output # -# $Id: lontemplate.pm,v 1.45.6.4 2013/05/10 23:48:12 raeburn Exp $ +# $Id: lontemplate.pm,v 1.52 2025/01/28 19:49:20 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -40,6 +40,7 @@ use Apache::lontexconvert; use Apache::lonfeedback; use Apache::lonrss(); use Apache::lonlocal; +use Apache::lonhtmlgateway; use Apache::lonmsgdisplay(); use HTML::Entities(); @@ -85,7 +86,7 @@ sub print_aboutme_content_template { &print_template($r,$syllabusfields{$field},$message,$allowed,'LC_Box'); } if($allowed) { - &print_editbox_template($r,$syllabus{$field},$field); + &print_editbox_template($r,$syllabus{$field},$field,$syllabusfields{$field}); } } else { @@ -129,16 +130,18 @@ sub print_end_template { } sub print_editbox_template { - my ($r,$content,$field) = @_; - $r->print('
'."\n"); &print_saveall_template($r); } sub print_textarea_template { - my ($r, $content, $field, $wysiwyg) = @_; - $r->print('
'); } @@ -164,32 +167,26 @@ sub print_template_fields { } foreach my $field (sort(keys(%fields))) { my $message = $data{$field} if (($data{$field}=~/\w/) || ($allowed)); + my $legacy = 1; my $display = $displays{$field}; unless ($allowed) { next if ($noshow{$field}); } + my $gateway = Apache::lonhtmlgateway->new($target); + $message = &Encode::decode('utf8', $message); + $message = $gateway->process_outgoing_html($message, $legacy); if ((%custom_handlers) && ($custom_handlers{$field})) { - $custom_handlers{$field}->($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed, $display); + $custom_handlers{$field}->($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed, $display); } else { if (($data{$field}=~/\w/) || ($allowed)) { - 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); if ($target ne 'tex') { #output of syllabusfields will be generated here. &Apache::lontemplate::print_start_template($r,$fields{$field},'LC_Box','box_'.$field,$display); $r->print($message); if ($allowed) { $r->print("
"); - &Apache::lontemplate::print_textarea_template($r, $data{$field}, - $field, $default_rich_text); + &print_textarea_template($r, $data{$field}, + $field, $fields{$field}, $default_rich_text); &print_saveall_template($r); $r->print("
"); } @@ -206,6 +203,7 @@ sub print_template_fields { push(@html_ids,$field); } } + undef $gateway; } return @html_ids;