--- loncom/interface/lontemplate.pm 2010/01/31 06:03:55 1.43
+++ loncom/interface/lontemplate.pm 2012/12/18 15:53:07 1.45.6.3
@@ -1,7 +1,7 @@
# The LearningOnline Network
# "Template" Functions to generate html output
#
-# $Id: lontemplate.pm,v 1.43 2010/01/31 06:03:55 faziophi Exp $
+# $Id: lontemplate.pm,v 1.45.6.3 2012/12/18 15:53:07 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -26,11 +26,11 @@
# http://www.lon-capa.org/
#
-
package Apache::lontemplate;
use strict;
+use utf8;
use Apache::Constants qw(:common);
use Apache::loncommon;
use Apache::lonnet;
@@ -127,9 +127,9 @@ sub print_end_template {
sub print_editbox_template {
my ($r,$content,$field) = @_;
$r->print('
');
+ &HTML::Entities::encode($content,'"&<>').
+ '
'."\n");
+ &print_saveall_template($r);
}
sub print_textarea_template {
@@ -153,20 +153,20 @@ sub print_template_fields {
foreach my $field (sort(keys(%fields))) {
my $message = $data{$field} if (($data{$field}=~/\w/) || ($allowed));
- if ((%custom_handlers) && ($custom_handlers{$field})) {
+ 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 (!&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');
@@ -175,14 +175,18 @@ sub print_template_fields {
$r->print("