--- loncom/interface/lontemplate.pm 2009/05/11 13:34:10 1.33
+++ loncom/interface/lontemplate.pm 2025/01/28 19:49:20 1.52
@@ -1,7 +1,7 @@
# The LearningOnline Network
# "Template" Functions to generate html output
#
-# $Id: lontemplate.pm,v 1.33 2009/05/11 13:34:10 bisitz Exp $
+# $Id: lontemplate.pm,v 1.52 2025/01/28 19:49:20 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;
@@ -40,9 +40,17 @@ use Apache::lontexconvert;
use Apache::lonfeedback;
use Apache::lonrss();
use Apache::lonlocal;
+use Apache::lonhtmlgateway;
use Apache::lonmsgdisplay();
use HTML::Entities();
+use constant {
+ RICH_TEXT_ALWAYS_ON => 'LC_richAlwaysOn',
+ RICH_TEXT_ALWAYS_OFF => 'LC_richAlwaysOff',
+ RICH_TEXT_DEFAULT_ON => 'LC_richDefaultOn',
+ RICH_TEXT_DETECT_HTML => 'LC_richDetectHtml',
+ RICH_TEXT_DEFAULT_OFF => 'LC_richDefaultOff'
+};
sub start_columnSection {
my ($r) = @_;
@@ -62,109 +70,143 @@ sub print_aboutme_content_template {
foreach my $field (sort(keys(%syllabusfields))) {
if (($syllabus{$field}) || ($allowed)) {
my $message=$syllabus{$field};
- &Apache::lonfeedback::newline_to_br(\$message);
- $message
- =~s/(http\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g;
+ if (!&Apache::lonfeedback::contains_block_html($message)) {
+ &Apache::lonfeedback::newline_to_br(\$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 ($allowed) {
- $r->print(' ');
- }
-
if($field eq 'aaa_contactinfo') {
$r->print('