--- loncom/interface/lontemplate.pm 2013/05/10 23:48:12 1.45.6.4 +++ loncom/interface/lontemplate.pm 2012/12/18 15:46:34 1.46 @@ -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.46 2012/12/18 15:46:34 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(); @@ -114,12 +115,8 @@ sub print_template { } sub print_start_template { - my ($r,$topic,$boxclass,$id,$display) = @_; - my $idattrib; - if ($id ne '') { - $idattrib = ' id="'.$id.'"'; - } - $r->print('
'); + my ($r,$topic,$boxclass) = @_; + $r->print('
'); $r->print('

'.$topic.'

'); } @@ -149,42 +146,25 @@ sub print_saveall_template { } sub print_template_fields { - my ($r, $data_ref, $fields_ref, $target, $allowed, $default_rich_text, $custom_handlers_ref, $group, - $displayref,$noshowref) = @_; + my ($r, $data_ref, $fields_ref, $target, $allowed, $default_rich_text, $custom_handlers_ref, $group) = @_; my @html_ids = (); my %data = %{$data_ref}; my %fields = %{$fields_ref}; my %custom_handlers = %{$custom_handlers_ref}; - my (%displays,%noshow); - if (ref($displayref) eq 'HASH') { - %displays = %{$displayref}; - } - if (ref($noshowref) eq 'HASH') { - %noshow = %{$noshowref}; - } + foreach my $field (sort(keys(%fields))) { my $message = $data{$field} if (($data{$field}=~/\w/) || ($allowed)); - my $display = $displays{$field}; - unless ($allowed) { - next if ($noshow{$field}); - } - if ((%custom_handlers) && ($custom_handlers{$field})) { - $custom_handlers{$field}->($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed, $display); + my $legacy = 1; + 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); } 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); + &Apache::lontemplate::print_start_template($r,$fields{$field},'LC_Box'); $r->print($message); if ($allowed) { $r->print("
"); @@ -206,6 +186,7 @@ sub print_template_fields { push(@html_ids,$field); } } + undef $gateway; } return @html_ids; 500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.