--- loncom/interface/lontemplate.pm 2013/04/24 02:43:59 1.47 +++ loncom/interface/lontemplate.pm 2013/09/22 15:56:24 1.51 @@ -1,7 +1,7 @@ # The LearningOnline Network # "Template" Functions to generate html output # -# $Id: lontemplate.pm,v 1.47 2013/04/24 02:43:59 raeburn Exp $ +# $Id: lontemplate.pm,v 1.51 2013/09/22 15:56:24 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -116,7 +116,7 @@ sub print_template { sub print_start_template { my ($r,$topic,$boxclass,$id,$display) = @_; - my $idattrib; + my $idattrib; if ($id ne '') { $idattrib = ' id="'.$id.'"'; } @@ -151,24 +151,30 @@ sub print_saveall_template { sub print_template_fields { my ($r, $data_ref, $fields_ref, $target, $allowed, $default_rich_text, $custom_handlers_ref, $group, - $displayref) = @_; + $displayref,$noshowref) = @_; my @html_ids = (); my %data = %{$data_ref}; my %fields = %{$fields_ref}; my %custom_handlers = %{$custom_handlers_ref}; - my %displays; + 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 $legacy = 1; my $display = $displays{$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); + 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); } else { if (($data{$field}=~/\w/) || ($allowed)) { if ($target ne 'tex') {