[BACK]Return to lontemplate.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lontemplate.pm between versions 1.47 and 1.51

version 1.47, 2013/04/24 02:43:59 version 1.51, 2013/09/22 15:56:24
Line 116  sub print_template { Line 116  sub print_template {
   
 sub print_start_template {  sub print_start_template {
  my ($r,$topic,$boxclass,$id,$display) = @_;   my ($r,$topic,$boxclass,$id,$display) = @_;
         my $idattrib;           my $idattrib;
         if ($id ne '') {          if ($id ne '') {
             $idattrib = ' id="'.$id.'"';              $idattrib = ' id="'.$id.'"';
         }          }
Line 151  sub print_saveall_template { Line 151  sub print_saveall_template {
   
 sub print_template_fields {  sub print_template_fields {
  my ($r, $data_ref, $fields_ref, $target, $allowed, $default_rich_text, $custom_handlers_ref, $group,   my ($r, $data_ref, $fields_ref, $target, $allowed, $default_rich_text, $custom_handlers_ref, $group,
             $displayref) = @_;              $displayref,$noshowref) = @_;
  my @html_ids = ();   my @html_ids = ();
  my %data = %{$data_ref};   my %data = %{$data_ref};
  my %fields = %{$fields_ref};   my %fields = %{$fields_ref};
  my %custom_handlers = %{$custom_handlers_ref};   my %custom_handlers = %{$custom_handlers_ref};
         my %displays;          my (%displays,%noshow);
         if (ref($displayref) eq 'HASH') {          if (ref($displayref) eq 'HASH') {
             %displays = %{$displayref};              %displays = %{$displayref};
         }          }
           if (ref($noshowref) eq 'HASH') {
               %noshow = %{$noshowref};
           }
  foreach my $field (sort(keys(%fields))) {   foreach my $field (sort(keys(%fields))) {
  my $message = $data{$field} if (($data{$field}=~/\w/) || ($allowed));   my $message = $data{$field} if (($data{$field}=~/\w/) || ($allowed));
  my $legacy = 1;   my $legacy = 1;
                 my $display = $displays{$field};                  my $display = $displays{$field};
  my $gateway = Apache::lonhtmlgateway->new($target);                  unless ($allowed) {
         $message = &Encode::decode('utf8', $message);                      next if ($noshow{$field});
         $message = $gateway->process_outgoing_html($message, $legacy);                  }
         if ((%custom_handlers) && ($custom_handlers{$field})) {                  my $gateway = Apache::lonhtmlgateway->new($target);
  $custom_handlers{$field}->($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed, $display);                  $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 {   } else {
  if (($data{$field}=~/\w/) || ($allowed)) {   if (($data{$field}=~/\w/) || ($allowed)) {
  if ($target ne 'tex') {   if ($target ne 'tex') {
Removed from v.1.47  
changed lines
  Added in v.1.51

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>