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

Diff for /loncom/interface/lontemplate.pm between versions 1.43.4.1 and 1.44

version 1.43.4.1, 2011/05/13 19:45:28 version 1.44, 2010/04/27 02:44:57
Line 26 Line 26
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
   
   
 package Apache::lontemplate;  package Apache::lontemplate;
   
   
 use strict;  use strict;
   use utf8;
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 use Apache::loncommon;  use Apache::loncommon;
 use Apache::lonnet;  use Apache::lonnet;
Line 40  use Apache::lontexconvert; Line 40  use Apache::lontexconvert;
 use Apache::lonfeedback;  use Apache::lonfeedback;
 use Apache::lonrss();  use Apache::lonrss();
 use Apache::lonlocal;  use Apache::lonlocal;
   use Apache::lonhtmlgateway;
 use Apache::lonmsgdisplay();  use Apache::lonmsgdisplay();
 use HTML::Entities();  use HTML::Entities();
   
Line 153  sub print_template_fields { Line 154  sub print_template_fields {
   
  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));
  if ((%custom_handlers) && ($custom_handlers{$field})) {   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);   $custom_handlers{$field}->($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed);
  } else {   } else {
  if (($data{$field}=~/\w/) || ($allowed)) {   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') {   if ($target ne 'tex') {
  #output of syllabusfields will be generated here.    #output of syllabusfields will be generated here. 
  &Apache::lontemplate::print_start_template($r,$fields{$field},'LC_Box');   &Apache::lontemplate::print_start_template($r,$fields{$field},'LC_Box');
Line 181  sub print_template_fields { Line 176  sub print_template_fields {
  &Apache::lontemplate::print_end_template($r);   &Apache::lontemplate::print_end_template($r);
  } else {   } else {
     my $safeinit;      my $safeinit;
                                     if ($fields{$field}=~/\w/) {                      $r->print(&Apache::lonxml::xmlparse($r,'tex','<h3>'.$fields{$field}.'</h3>'));
                                         $r->print(&Apache::lonxml::xmlparse($r,'tex','<h3>'.$fields{$field}.'</h3>'));                      $r->print(&Apache::lonxml::xmlparse($r,'tex',$message));
                                     } else {  
                                         $r->print(&Apache::lonxml::xmlparse($r,'tex','<br />'));  
                                     }  
                                     $r->print(&Apache::lonxml::xmlparse($r,'tex',$message));  
  }   }
  push(@html_ids,$field);   push(@html_ids,$field);
  }   }
  }   }
    undef $gateway;
  }   }
   
  return @html_ids;   return @html_ids;
Removed from v.1.43.4.1  
changed lines
  Added in v.1.44

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